diff --git a/config/attack/blunt_heavy_hit_blow.tres b/config/attack/blunt_heavy_hit_blow.tres new file mode 100644 index 0000000..e474647 --- /dev/null +++ b/config/attack/blunt_heavy_hit_blow.tres @@ -0,0 +1,23 @@ +[gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://bwe8xlgfhx1gl"] + +[ext_resource type="Script" path="res://script/config/attack_cfg.gd" id="1_fpmns"] + +[resource] +script = ExtResource("1_fpmns") +damage_rate = 1.0 +break_level = 3 +stun_attack = 10.0 +damage_type = 1 +is_floating = true +is_hit_down = false +is_rebound = false +hit_back_speed = 8.0 +hit_up_speed = 4.0 +hit_back_duration = 0.05 +hit_up_duration = 0.05 +pause_time = 0.4 +is_force_pause = false +height = 2.0 +radius = 0.0 +size = Vector2(2, 1) +offset = Vector2(1, 0) diff --git a/config/attack/blunt_mid_hit_blow.tres b/config/attack/blunt_mid_hit_blow.tres new file mode 100644 index 0000000..3d5dc01 --- /dev/null +++ b/config/attack/blunt_mid_hit_blow.tres @@ -0,0 +1,23 @@ +[gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://duu05cr8gk5v4"] + +[ext_resource type="Script" path="res://script/config/attack_cfg.gd" id="1_xyhsk"] + +[resource] +script = ExtResource("1_xyhsk") +damage_rate = 1.0 +break_level = 2 +stun_attack = 10.0 +damage_type = 1 +is_floating = true +is_hit_down = false +is_rebound = false +hit_back_speed = 4.0 +hit_up_speed = 3.0 +hit_back_duration = 0.05 +hit_up_duration = 0.05 +pause_time = 0.15 +is_force_pause = false +height = 2.0 +radius = 0.0 +size = Vector2(2, 1) +offset = Vector2(1, 0) diff --git a/config/attack/blunt_normal_hit.tres b/config/attack/blunt_normal_hit.tres new file mode 100644 index 0000000..daea2d3 --- /dev/null +++ b/config/attack/blunt_normal_hit.tres @@ -0,0 +1,23 @@ +[gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://dib6g7t6p5ac2"] + +[ext_resource type="Script" path="res://script/config/attack_cfg.gd" id="1_w5b6b"] + +[resource] +script = ExtResource("1_w5b6b") +damage_rate = 1.0 +break_level = 1 +stun_attack = 10.0 +damage_type = 1 +is_floating = false +is_hit_down = false +is_rebound = false +hit_back_speed = 2.0 +hit_up_speed = 1.0 +hit_back_duration = 0.05 +hit_up_duration = 0.05 +pause_time = 0.05 +is_force_pause = false +height = 2.0 +radius = 0.0 +size = Vector2(2, 1) +offset = Vector2(1, 0) diff --git a/config/attack/blunt_normal_hit_back.tres b/config/attack/blunt_normal_hit_back.tres new file mode 100644 index 0000000..e9cad42 --- /dev/null +++ b/config/attack/blunt_normal_hit_back.tres @@ -0,0 +1,23 @@ +[gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://c87w2x5qfqdns"] + +[ext_resource type="Script" path="res://script/config/attack_cfg.gd" id="1_egjnk"] + +[resource] +script = ExtResource("1_egjnk") +damage_rate = 1.0 +break_level = 2 +stun_attack = 10.0 +damage_type = 1 +is_floating = false +is_hit_down = false +is_rebound = false +hit_back_speed = 4.0 +hit_up_speed = 2.0 +hit_back_duration = 0.05 +hit_up_duration = 0.05 +pause_time = 0.05 +is_force_pause = false +height = 2.0 +radius = 0.0 +size = Vector2(2, 1) +offset = Vector2(1, 0) diff --git a/config/attack/blunt_normal_hit_up.tres b/config/attack/blunt_normal_hit_up.tres new file mode 100644 index 0000000..58dc42c --- /dev/null +++ b/config/attack/blunt_normal_hit_up.tres @@ -0,0 +1,23 @@ +[gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://ctbdt77yyubxn"] + +[ext_resource type="Script" path="res://script/config/attack_cfg.gd" id="1_r7m5n"] + +[resource] +script = ExtResource("1_r7m5n") +damage_rate = 1.0 +break_level = 1 +stun_attack = 10.0 +damage_type = 1 +is_floating = true +is_hit_down = false +is_rebound = false +hit_back_speed = 0.0 +hit_up_speed = 3.0 +hit_back_duration = 0.05 +hit_up_duration = 0.1 +pause_time = 0.05 +is_force_pause = true +height = 2.0 +radius = 0.0 +size = Vector2(2, 1) +offset = Vector2(1, 0) diff --git a/config/attack/rebound.tres b/config/attack/rebound.tres index c16041e..5d90d85 100644 --- a/config/attack/rebound.tres +++ b/config/attack/rebound.tres @@ -7,14 +7,15 @@ script = ExtResource("1_2fwsa") damage_rate = 1.0 break_level = 1 stun_attack = 10.0 -hit_back_speed = 0.0 -hit_back_duration = 0.0 -hit_up_speed = 3.0 -hit_up_duration = 0.05 -pause_time = 0.2 +damage_type = 1 is_floating = true is_hit_down = false is_rebound = true +hit_back_speed = 0.0 +hit_up_speed = 3.0 +hit_back_duration = 0.0 +hit_up_duration = 0.05 +pause_time = 0.15 is_force_pause = false height = 2.0 radius = 0.0 diff --git a/config/attack/heavy_hit_blow.tres b/config/attack/sharp_heavy_hit_blow.tres similarity index 93% rename from config/attack/heavy_hit_blow.tres rename to config/attack/sharp_heavy_hit_blow.tres index 360f60c..f12a18a 100644 --- a/config/attack/heavy_hit_blow.tres +++ b/config/attack/sharp_heavy_hit_blow.tres @@ -7,14 +7,15 @@ script = ExtResource("1_j177j") damage_rate = 1.0 break_level = 3 stun_attack = 10.0 +damage_type = 0 +is_floating = false +is_hit_down = false +is_rebound = false hit_back_speed = 10.0 -hit_back_duration = 0.05 hit_up_speed = 2.0 +hit_back_duration = 0.05 hit_up_duration = 0.05 pause_time = 0.3 -is_floating = true -is_hit_down = false -is_rebound = false is_force_pause = false height = 2.0 radius = 0.0 diff --git a/config/attack/mid_hit.tres b/config/attack/sharp_mid_hit.tres similarity index 87% rename from config/attack/mid_hit.tres rename to config/attack/sharp_mid_hit.tres index f5fce80..db19996 100644 --- a/config/attack/mid_hit.tres +++ b/config/attack/sharp_mid_hit.tres @@ -1,20 +1,21 @@ [gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://cae3dxpuqfcux"] -[ext_resource type="Script" path="res://script/config/attack_cfg.gd" id="1_lveis"] +[ext_resource type="Script" path="res://script/config/attack_cfg.gd" id="1_ijso0"] [resource] -script = ExtResource("1_lveis") +script = ExtResource("1_ijso0") damage_rate = 1.0 break_level = 2 stun_attack = 10.0 +damage_type = 0 +is_floating = false +is_hit_down = false +is_rebound = false hit_back_speed = 3.0 -hit_back_duration = 0.05 hit_up_speed = 1.0 +hit_back_duration = 0.05 hit_up_duration = 0.05 pause_time = 0.1 -is_floating = false -is_hit_down = false -is_rebound = false is_force_pause = false height = 2.0 radius = 0.0 diff --git a/config/attack/mid_hit_blow.tres b/config/attack/sharp_mid_hit_blow.tres similarity index 100% rename from config/attack/mid_hit_blow.tres rename to config/attack/sharp_mid_hit_blow.tres diff --git a/config/attack/mid_hit_down.tres b/config/attack/sharp_mid_hit_down.tres similarity index 84% rename from config/attack/mid_hit_down.tres rename to config/attack/sharp_mid_hit_down.tres index 04d8697..1da4c00 100644 --- a/config/attack/mid_hit_down.tres +++ b/config/attack/sharp_mid_hit_down.tres @@ -1,20 +1,21 @@ [gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://rqjggte0qh84"] -[ext_resource type="Script" path="res://script/config/attack_cfg.gd" id="1_077t2"] +[ext_resource type="Script" path="res://script/config/attack_cfg.gd" id="1_l5a6t"] [resource] -script = ExtResource("1_077t2") +script = ExtResource("1_l5a6t") damage_rate = 1.0 break_level = 2 stun_attack = 10.0 +damage_type = 0 +is_floating = false +is_hit_down = true +is_rebound = false hit_back_speed = 6.0 -hit_back_duration = 0.05 hit_up_speed = -6.0 +hit_back_duration = 0.05 hit_up_duration = 0.05 pause_time = 0.1 -is_floating = true -is_hit_down = true -is_rebound = false is_force_pause = false height = 2.0 radius = 0.0 diff --git a/config/attack/normal_hit.tres b/config/attack/sharp_normal_hit.tres similarity index 87% rename from config/attack/normal_hit.tres rename to config/attack/sharp_normal_hit.tres index 98c375d..85dd650 100644 --- a/config/attack/normal_hit.tres +++ b/config/attack/sharp_normal_hit.tres @@ -1,20 +1,21 @@ [gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://bsqk3q6mccllg"] -[ext_resource type="Script" path="res://script/config/attack_cfg.gd" id="1_wn06b"] +[ext_resource type="Script" path="res://script/config/attack_cfg.gd" id="1_v2kmn"] [resource] -script = ExtResource("1_wn06b") +script = ExtResource("1_v2kmn") damage_rate = 1.0 break_level = 1 stun_attack = 10.0 +damage_type = 0 +is_floating = false +is_hit_down = false +is_rebound = false hit_back_speed = 2.0 -hit_back_duration = 0.05 hit_up_speed = 1.0 +hit_back_duration = 0.05 hit_up_duration = 0.05 pause_time = 0.02 -is_floating = false -is_hit_down = false -is_rebound = false is_force_pause = false height = 2.0 radius = 0.0 diff --git a/config/attack/normal_hit_back.tres b/config/attack/sharp_normal_hit_back.tres similarity index 87% rename from config/attack/normal_hit_back.tres rename to config/attack/sharp_normal_hit_back.tres index 71187dc..9faca7c 100644 --- a/config/attack/normal_hit_back.tres +++ b/config/attack/sharp_normal_hit_back.tres @@ -1,20 +1,21 @@ [gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://ckeuv5lhfk2s0"] -[ext_resource type="Script" path="res://script/config/attack_cfg.gd" id="1_7f5fg"] +[ext_resource type="Script" path="res://script/config/attack_cfg.gd" id="1_4245c"] [resource] -script = ExtResource("1_7f5fg") +script = ExtResource("1_4245c") damage_rate = 1.0 break_level = 2 stun_attack = 10.0 +damage_type = 0 +is_floating = false +is_hit_down = false +is_rebound = false hit_back_speed = 4.0 -hit_back_duration = 0.05 hit_up_speed = 2.0 +hit_back_duration = 0.05 hit_up_duration = 0.05 pause_time = 0.02 -is_floating = false -is_hit_down = false -is_rebound = false is_force_pause = false height = 2.0 radius = 0.0 diff --git a/config/attack/normal_hit_blow.tres b/config/attack/sharp_normal_hit_blow.tres similarity index 100% rename from config/attack/normal_hit_blow.tres rename to config/attack/sharp_normal_hit_blow.tres diff --git a/config/attack/normal_hit_down.tres b/config/attack/sharp_normal_hit_down.tres similarity index 100% rename from config/attack/normal_hit_down.tres rename to config/attack/sharp_normal_hit_down.tres diff --git a/config/attack/normal_hit_up.tres b/config/attack/sharp_normal_hit_up.tres similarity index 100% rename from config/attack/normal_hit_up.tres rename to config/attack/sharp_normal_hit_up.tres diff --git a/config/skill_player_common/hero01_common_skill02.tres b/config/skill_player_common/hero01_common_skill02.tres index 6e4950c..4f30387 100644 --- a/config/skill_player_common/hero01_common_skill02.tres +++ b/config/skill_player_common/hero01_common_skill02.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=5 format=3 uid="uid://iyqp5jwc75b1"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="1_e1byx"] -[ext_resource type="Resource" uid="uid://dbs2wjw20s0hu" path="res://config/attack/heavy_hit_blow.tres" id="1_ihbmo"] +[ext_resource type="Resource" uid="uid://dbs2wjw20s0hu" path="res://config/attack/sharp_heavy_hit_blow.tres" id="1_ihbmo"] [ext_resource type="Animation" uid="uid://dkkqys8el1u6g" path="res://resource/skill_animation/hero01_common_skill02.tres" id="2_n2c7s"] [ext_resource type="SpriteFrames" uid="uid://ce83cuqwgwwi4" path="res://resource/animation/character/hero01_long_attack.aseprite" id="3_roc1y"] diff --git a/config/skill_player_weapon/hero01_fist_air_skill01.tres b/config/skill_player_weapon/hero01_fist_air_skill01.tres index 112ce5e..381943c 100644 --- a/config/skill_player_weapon/hero01_fist_air_skill01.tres +++ b/config/skill_player_weapon/hero01_fist_air_skill01.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://dkxgra6y2u30l"] -[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/normal_hit.tres" id="1_h0ykq"] +[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/sharp_normal_hit.tres" id="1_h0ykq"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="2_mje6b"] [ext_resource type="Animation" uid="uid://dxgqn5fa7aokj" path="res://resource/skill_animation/hero01_fist_air_skill01.tres" id="3_q461t"] [ext_resource type="SpriteFrames" uid="uid://cajgs8smbkjan" path="res://resource/animation/character/hero01_fist_skill01.aseprite" id="4_seudu"] diff --git a/config/skill_player_weapon/hero01_fist_attack01.tres b/config/skill_player_weapon/hero01_fist_attack01.tres index a317920..38846d5 100644 --- a/config/skill_player_weapon/hero01_fist_attack01.tres +++ b/config/skill_player_weapon/hero01_fist_attack01.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://7e4fnj5sg72s"] -[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/normal_hit.tres" id="1_bu2a5"] +[ext_resource type="Resource" uid="uid://dib6g7t6p5ac2" path="res://config/attack/blunt_normal_hit.tres" id="1_cl2eu"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="2_yc8jq"] [ext_resource type="Animation" uid="uid://t01a4jvp8srr" path="res://resource/skill_animation/hero01_fist_attack01.tres" id="3_b2pdb"] [ext_resource type="SpriteFrames" uid="uid://bhsotj76tuovy" path="res://resource/animation/character/hero01_fist_attack.aseprite" id="4_ymqrn"] @@ -15,7 +15,7 @@ break_level = 3 action = "attack_light" name = "" skill_animation = ExtResource("3_b2pdb") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_bu2a5")]) +attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_cl2eu")]) sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false refresh_animation = false diff --git a/config/skill_player_weapon/hero01_fist_attack02.tres b/config/skill_player_weapon/hero01_fist_attack02.tres index 7e5bf3a..d45f3ba 100644 --- a/config/skill_player_weapon/hero01_fist_attack02.tres +++ b/config/skill_player_weapon/hero01_fist_attack02.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://dubkvm86cj32f"] -[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/normal_hit.tres" id="1_5lw1c"] +[ext_resource type="Resource" uid="uid://c87w2x5qfqdns" path="res://config/attack/blunt_normal_hit_back.tres" id="1_ne108"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="2_h70wx"] [ext_resource type="Animation" uid="uid://cyu0yin1rpiak" path="res://resource/skill_animation/hero01_fist_attack02.tres" id="3_tllt1"] [ext_resource type="SpriteFrames" uid="uid://bhsotj76tuovy" path="res://resource/animation/character/hero01_fist_attack.aseprite" id="4_fevaa"] @@ -15,7 +15,7 @@ break_level = 3 action = "attack_light" name = "" skill_animation = ExtResource("3_tllt1") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_5lw1c")]) +attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_ne108")]) sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false refresh_animation = false diff --git a/config/skill_player_weapon/hero01_fist_attack03.tres b/config/skill_player_weapon/hero01_fist_attack03.tres index 9aa3e37..4f94ea0 100644 --- a/config/skill_player_weapon/hero01_fist_attack03.tres +++ b/config/skill_player_weapon/hero01_fist_attack03.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://dekpkk8o6o8hk"] -[ext_resource type="Resource" uid="uid://68h2b6wmwfiq" path="res://config/attack/normal_hit_blow.tres" id="1_6jcku"] +[ext_resource type="Resource" uid="uid://duu05cr8gk5v4" path="res://config/attack/blunt_mid_hit_blow.tres" id="1_vxltf"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="2_fde7v"] [ext_resource type="Animation" uid="uid://c6mk8tfdpniys" path="res://resource/skill_animation/hero01_fist_attack03.tres" id="3_6rajt"] [ext_resource type="SpriteFrames" uid="uid://bhsotj76tuovy" path="res://resource/animation/character/hero01_fist_attack.aseprite" id="4_orcy6"] @@ -15,7 +15,7 @@ break_level = 3 action = "attack_light" name = "" skill_animation = ExtResource("3_6rajt") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_6jcku")]) +attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_vxltf")]) sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false refresh_animation = false diff --git a/config/skill_player_weapon/hero01_fist_attack04.tres b/config/skill_player_weapon/hero01_fist_attack04.tres index 25bd9ea..b0fdaeb 100644 --- a/config/skill_player_weapon/hero01_fist_attack04.tres +++ b/config/skill_player_weapon/hero01_fist_attack04.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://b4aysymwqtvtd"] -[ext_resource type="Resource" uid="uid://2bkub7vmxjeu" path="res://config/attack/mid_hit_blow.tres" id="1_ejw6g"] +[ext_resource type="Resource" uid="uid://duu05cr8gk5v4" path="res://config/attack/blunt_mid_hit_blow.tres" id="1_i4hus"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="2_mhuew"] [ext_resource type="Animation" uid="uid://6u3dhxly760l" path="res://resource/skill_animation/hero01_fist_attack04.tres" id="3_bst70"] [ext_resource type="SpriteFrames" uid="uid://bhsotj76tuovy" path="res://resource/animation/character/hero01_fist_attack.aseprite" id="4_hyek5"] @@ -15,7 +15,7 @@ break_level = 3 action = "attack_light" name = "" skill_animation = ExtResource("3_bst70") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_ejw6g")]) +attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_i4hus")]) sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false refresh_animation = false diff --git a/config/skill_player_weapon/hero01_fist_attack05.tres b/config/skill_player_weapon/hero01_fist_attack05.tres index 11ccc71..374001d 100644 --- a/config/skill_player_weapon/hero01_fist_attack05.tres +++ b/config/skill_player_weapon/hero01_fist_attack05.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://0n2jnkdrwa2l"] -[ext_resource type="Resource" uid="uid://dbs2wjw20s0hu" path="res://config/attack/heavy_hit_blow.tres" id="1_n24bv"] +[ext_resource type="Resource" uid="uid://bwe8xlgfhx1gl" path="res://config/attack/blunt_heavy_hit_blow.tres" id="1_k5vfx"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="2_ym7q1"] [ext_resource type="Animation" uid="uid://b2xdmgnem1h4g" path="res://resource/skill_animation/hero01_fist_attack05.tres" id="3_dbjmb"] [ext_resource type="SpriteFrames" uid="uid://bhsotj76tuovy" path="res://resource/animation/character/hero01_fist_attack.aseprite" id="4_mhr07"] @@ -15,7 +15,7 @@ break_level = 3 action = "attack_light" name = "" skill_animation = ExtResource("3_dbjmb") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_n24bv")]) +attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_k5vfx")]) sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false refresh_animation = false diff --git a/config/skill_player_weapon/hero01_long_air_attack01.tres b/config/skill_player_weapon/hero01_long_air_attack01.tres index 4873236..8d1e1f3 100644 --- a/config/skill_player_weapon/hero01_long_air_attack01.tres +++ b/config/skill_player_weapon/hero01_long_air_attack01.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://bsdspblvefgpv"] -[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/normal_hit.tres" id="1_mxlqc"] +[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/sharp_normal_hit.tres" id="1_mxlqc"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="2_hh5ph"] [ext_resource type="Animation" uid="uid://p8l0puqxrkwh" path="res://resource/skill_animation/hero01_long_air_attack01.tres" id="3_3pp8a"] [ext_resource type="SpriteFrames" uid="uid://ce83cuqwgwwi4" path="res://resource/animation/character/hero01_long_attack.aseprite" id="4_q0bln"] diff --git a/config/skill_player_weapon/hero01_long_air_attack02.tres b/config/skill_player_weapon/hero01_long_air_attack02.tres index bee3bae..ed785a6 100644 --- a/config/skill_player_weapon/hero01_long_air_attack02.tres +++ b/config/skill_player_weapon/hero01_long_air_attack02.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://drxg06dvcx4oj"] -[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/normal_hit.tres" id="1_qfkyy"] +[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/sharp_normal_hit.tres" id="1_qfkyy"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="2_gjjhv"] [ext_resource type="Animation" uid="uid://cjfy6ia1ukyiu" path="res://resource/skill_animation/hero01_long_air_attack02.tres" id="3_76yga"] [ext_resource type="SpriteFrames" uid="uid://ce83cuqwgwwi4" path="res://resource/animation/character/hero01_long_attack.aseprite" id="4_ahm2t"] diff --git a/config/skill_player_weapon/hero01_long_air_attack03.tres b/config/skill_player_weapon/hero01_long_air_attack03.tres index a9023d8..9abab2b 100644 --- a/config/skill_player_weapon/hero01_long_air_attack03.tres +++ b/config/skill_player_weapon/hero01_long_air_attack03.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://c8l7h74abqlhb"] -[ext_resource type="Resource" uid="uid://rqjggte0qh84" path="res://config/attack/mid_hit_down.tres" id="1_gddcp"] +[ext_resource type="Resource" uid="uid://rqjggte0qh84" path="res://config/attack/sharp_mid_hit_down.tres" id="1_gddcp"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="2_0x7hh"] [ext_resource type="Animation" uid="uid://bh5s2t3cbobpp" path="res://resource/skill_animation/hero01_long_air_attack03.tres" id="3_1erk8"] [ext_resource type="SpriteFrames" uid="uid://ce83cuqwgwwi4" path="res://resource/animation/character/hero01_long_attack.aseprite" id="4_wrd60"] diff --git a/config/skill_player_weapon/hero01_long_attack01.tres b/config/skill_player_weapon/hero01_long_attack01.tres index 6388e8e..de724d0 100644 --- a/config/skill_player_weapon/hero01_long_attack01.tres +++ b/config/skill_player_weapon/hero01_long_attack01.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://b6x3jdiqtum6"] -[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/normal_hit.tres" id="1_6ven2"] +[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/sharp_normal_hit.tres" id="1_6ven2"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="1_gik08"] [ext_resource type="Animation" uid="uid://daopmieibx3b7" path="res://resource/skill_animation/hero01_long_attack01.tres" id="2_6nbpq"] [ext_resource type="Resource" uid="uid://cy3wwalxeyro0" path="res://config/weapon/long.tres" id="4_id85o"] diff --git a/config/skill_player_weapon/hero01_long_attack02.tres b/config/skill_player_weapon/hero01_long_attack02.tres index b1113ea..58e9e1d 100644 --- a/config/skill_player_weapon/hero01_long_attack02.tres +++ b/config/skill_player_weapon/hero01_long_attack02.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://cs32884hwqxd7"] -[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/normal_hit.tres" id="1_8fm1u"] +[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/sharp_normal_hit.tres" id="1_8fm1u"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="1_e0fqi"] [ext_resource type="Animation" uid="uid://bf6jaraltouun" path="res://resource/skill_animation/hero01_long_attack02.tres" id="2_jrgan"] [ext_resource type="SpriteFrames" uid="uid://ce83cuqwgwwi4" path="res://resource/animation/character/hero01_long_attack.aseprite" id="3_jidy7"] diff --git a/config/skill_player_weapon/hero01_long_attack03.tres b/config/skill_player_weapon/hero01_long_attack03.tres index a67a82e..36ab501 100644 --- a/config/skill_player_weapon/hero01_long_attack03.tres +++ b/config/skill_player_weapon/hero01_long_attack03.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://huxlxrmyulo"] -[ext_resource type="Resource" uid="uid://ckeuv5lhfk2s0" path="res://config/attack/normal_hit_back.tres" id="1_7ai5j"] +[ext_resource type="Resource" uid="uid://ckeuv5lhfk2s0" path="res://config/attack/sharp_normal_hit_back.tres" id="1_7ai5j"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="1_uaib7"] [ext_resource type="Resource" uid="uid://cy3wwalxeyro0" path="res://config/weapon/long.tres" id="2_8uqiw"] [ext_resource type="Animation" uid="uid://c8yueqe7rjn60" path="res://resource/skill_animation/hero01_long_attack03.tres" id="2_ugt3f"] diff --git a/config/skill_player_weapon/hero01_long_attack04.tres b/config/skill_player_weapon/hero01_long_attack04.tres index 62136ae..c94dd23 100644 --- a/config/skill_player_weapon/hero01_long_attack04.tres +++ b/config/skill_player_weapon/hero01_long_attack04.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://chuv8k5d44ln4"] -[ext_resource type="Resource" uid="uid://dbs2wjw20s0hu" path="res://config/attack/heavy_hit_blow.tres" id="1_7tise"] +[ext_resource type="Resource" uid="uid://dbs2wjw20s0hu" path="res://config/attack/sharp_heavy_hit_blow.tres" id="1_7tise"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="1_xsxbs"] [ext_resource type="Animation" uid="uid://dk1o3gqhjmuvh" path="res://resource/skill_animation/hero01_long_attack04.tres" id="2_sam6s"] [ext_resource type="SpriteFrames" uid="uid://ce83cuqwgwwi4" path="res://resource/animation/character/hero01_long_attack.aseprite" id="3_w7h1m"] diff --git a/config/skill_player_weapon/hero01_long_skill01.tres b/config/skill_player_weapon/hero01_long_skill01.tres index 26f5ea5..198cc69 100644 --- a/config/skill_player_weapon/hero01_long_skill01.tres +++ b/config/skill_player_weapon/hero01_long_skill01.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://bi2ipbximefsr"] -[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/normal_hit.tres" id="1_p5wrw"] +[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/sharp_normal_hit.tres" id="1_p5wrw"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="1_ud5ph"] [ext_resource type="Animation" uid="uid://bjnkrte7660pt" path="res://resource/skill_animation/hero01_long_skill01.tres" id="2_ewts2"] [ext_resource type="SpriteFrames" uid="uid://dhfqj1dxldqao" path="res://resource/animation/character/hero01_long_skill01.aseprite" id="3_qwjfl"] diff --git a/config/skill_player_weapon/hero01_long_skill02.tres b/config/skill_player_weapon/hero01_long_skill02.tres index 4432b1c..8bf3387 100644 --- a/config/skill_player_weapon/hero01_long_skill02.tres +++ b/config/skill_player_weapon/hero01_long_skill02.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://4whbnu8f7qyo"] -[ext_resource type="Resource" uid="uid://ckbf40c75bfqf" path="res://config/attack/normal_hit_up.tres" id="1_edtv7"] +[ext_resource type="Resource" uid="uid://ckbf40c75bfqf" path="res://config/attack/sharp_normal_hit_up.tres" id="1_edtv7"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="2_1xtt1"] [ext_resource type="Animation" uid="uid://iprcbf277rf4" path="res://resource/skill_animation/hero01_long_skill02.tres" id="3_b7s0y"] [ext_resource type="SpriteFrames" uid="uid://dhfqj1dxldqao" path="res://resource/animation/character/hero01_long_skill01.aseprite" id="4_rbnly"] diff --git a/config/skill_player_weapon/hero01_short_attack01.tres b/config/skill_player_weapon/hero01_short_attack01.tres index b97e9eb..aeb58bf 100644 --- a/config/skill_player_weapon/hero01_short_attack01.tres +++ b/config/skill_player_weapon/hero01_short_attack01.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://bcxglqq08pymr"] -[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/normal_hit.tres" id="1_r3o2x"] +[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/sharp_normal_hit.tres" id="1_r3o2x"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="3_gsnqk"] [ext_resource type="Animation" uid="uid://bkre61dn64j2f" path="res://resource/skill_animation/hero01_short_attack01.tres" id="4_f30l7"] [ext_resource type="SpriteFrames" uid="uid://cndpnxtdh37ii" path="res://resource/animation/character/hero01_short_attack.aseprite" id="5_8vcrr"] diff --git a/config/skill_player_weapon/hero01_short_attack02.tres b/config/skill_player_weapon/hero01_short_attack02.tres index e1b48dc..0e60102 100644 --- a/config/skill_player_weapon/hero01_short_attack02.tres +++ b/config/skill_player_weapon/hero01_short_attack02.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://cm7nbxogmlvp5"] -[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/normal_hit.tres" id="1_nmank"] +[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/sharp_normal_hit.tres" id="1_nmank"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="3_8ixmd"] [ext_resource type="Animation" uid="uid://xfuwfwtw4cna" path="res://resource/skill_animation/hero01_short_attack02.tres" id="4_mepfm"] [ext_resource type="SpriteFrames" uid="uid://cndpnxtdh37ii" path="res://resource/animation/character/hero01_short_attack.aseprite" id="5_dxfya"] diff --git a/config/skill_player_weapon/hero01_short_attack03.tres b/config/skill_player_weapon/hero01_short_attack03.tres index a8c770a..ba1cc61 100644 --- a/config/skill_player_weapon/hero01_short_attack03.tres +++ b/config/skill_player_weapon/hero01_short_attack03.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://bex4a43t6ettj"] -[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/normal_hit.tres" id="1_5om0v"] +[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/sharp_normal_hit.tres" id="1_5om0v"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="3_8rsme"] [ext_resource type="Animation" uid="uid://bdyjvq185tdk6" path="res://resource/skill_animation/hero01_short_attack03.tres" id="4_7ws6s"] [ext_resource type="SpriteFrames" uid="uid://cndpnxtdh37ii" path="res://resource/animation/character/hero01_short_attack.aseprite" id="5_40215"] diff --git a/config/skill_player_weapon/hero01_short_attack04.tres b/config/skill_player_weapon/hero01_short_attack04.tres index f187875..e0e7255 100644 --- a/config/skill_player_weapon/hero01_short_attack04.tres +++ b/config/skill_player_weapon/hero01_short_attack04.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://cya7i41k08jgc"] -[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/normal_hit.tres" id="1_hd2st"] +[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/sharp_normal_hit.tres" id="1_hd2st"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="3_44lu2"] [ext_resource type="Animation" uid="uid://c8qll8wcn633m" path="res://resource/skill_animation/hero01_short_attack04.tres" id="4_rcj2c"] [ext_resource type="SpriteFrames" uid="uid://cndpnxtdh37ii" path="res://resource/animation/character/hero01_short_attack.aseprite" id="5_owk7o"] diff --git a/render/shader/trail.gdshader b/render/shader/trail.gdshader new file mode 100644 index 0000000..53d34e3 --- /dev/null +++ b/render/shader/trail.gdshader @@ -0,0 +1,10 @@ +shader_type spatial; +render_mode blend_add,unshaded,particle_trails; + +uniform sampler2D tex_main : source_color; + +void fragment() { + vec4 col = texture(tex_main, UV); + ALBEDO = COLOR.rgb * col.r; + ALPHA = COLOR.a * col.r; +} diff --git a/render/texture/particle/shape/flare.png b/render/texture/particle/shape/flare1.png similarity index 100% rename from render/texture/particle/shape/flare.png rename to render/texture/particle/shape/flare1.png diff --git a/render/texture/particle/shape/flare.png.import b/render/texture/particle/shape/flare1.png.import similarity index 71% rename from render/texture/particle/shape/flare.png.import rename to render/texture/particle/shape/flare1.png.import index a20dc6f..28b23ad 100644 --- a/render/texture/particle/shape/flare.png.import +++ b/render/texture/particle/shape/flare1.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bb0yfk0u4lqqn" -path="res://.godot/imported/flare.png-97e47c07f4cdcd90f4926e0bac2a678f.ctex" +path="res://.godot/imported/flare1.png-83f5920deb7ad485a7c7b680e8e08898.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://render/texture/particle/shape/flare.png" -dest_files=["res://.godot/imported/flare.png-97e47c07f4cdcd90f4926e0bac2a678f.ctex"] +source_file="res://render/texture/particle/shape/flare1.png" +dest_files=["res://.godot/imported/flare1.png-83f5920deb7ad485a7c7b680e8e08898.ctex"] [params] diff --git a/render/texture/particle/shape/flare2.png b/render/texture/particle/shape/flare2.png new file mode 100644 index 0000000..4334191 Binary files /dev/null and b/render/texture/particle/shape/flare2.png differ diff --git a/render/texture/particle/shape/flare2.png.import b/render/texture/particle/shape/flare2.png.import new file mode 100644 index 0000000..684ddbd --- /dev/null +++ b/render/texture/particle/shape/flare2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ccl81e2qroccb" +path="res://.godot/imported/flare2.png-af7398ece2bd1f0ad1250f7ad6f45639.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://render/texture/particle/shape/flare2.png" +dest_files=["res://.godot/imported/flare2.png-af7398ece2bd1f0ad1250f7ad6f45639.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=0 +compress/normal_map=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=false +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/render/texture/particle/shape/flare3.png b/render/texture/particle/shape/flare3.png new file mode 100644 index 0000000..5d9b865 Binary files /dev/null and b/render/texture/particle/shape/flare3.png differ diff --git a/render/texture/particle/shape/flare3.png.import b/render/texture/particle/shape/flare3.png.import new file mode 100644 index 0000000..8fcc176 --- /dev/null +++ b/render/texture/particle/shape/flare3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bslhqlcg8cw2l" +path="res://.godot/imported/flare3.png-137a481b5f54cd13335eafb2c9324230.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://render/texture/particle/shape/flare3.png" +dest_files=["res://.godot/imported/flare3.png-137a481b5f54cd13335eafb2c9324230.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=0 +compress/normal_map=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=false +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/scene/effect/particle/particle_hit_ground.tscn b/scene/effect/particle/_particle_hit_ground.tscn similarity index 100% rename from scene/effect/particle/particle_hit_ground.tscn rename to scene/effect/particle/_particle_hit_ground.tscn diff --git a/scene/effect/particle/particle_slash.tscn b/scene/effect/particle/_particle_slash.tscn similarity index 100% rename from scene/effect/particle/particle_slash.tscn rename to scene/effect/particle/_particle_slash.tscn diff --git a/scene/effect/particle/hero01_common_skill02.tscn b/scene/effect/particle/hero01_common_skill02.tscn index b6befc2..4bd6c46 100644 --- a/scene/effect/particle/hero01_common_skill02.tscn +++ b/scene/effect/particle/hero01_common_skill02.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://cswp0rj0gep6c"] -[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/particle_slash.tscn" id="1_qyqjx"] +[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash.tscn" id="1_qyqjx"] [node name="Particle" instance=ExtResource("1_qyqjx")] transform = Transform3D(1.5, 0, 0, 0, 1, 0, 0, 0, 1.2, 0, 0, 0) diff --git a/scene/effect/particle/hero01_fist_air_skill01_1.tscn b/scene/effect/particle/hero01_fist_air_skill01_1.tscn index ee00c38..c32eaec 100644 --- a/scene/effect/particle/hero01_fist_air_skill01_1.tscn +++ b/scene/effect/particle/hero01_fist_air_skill01_1.tscn @@ -1,5 +1,5 @@ [gd_scene load_steps=2 format=3 uid="uid://ds7mp5l20ypb6"] -[ext_resource type="PackedScene" uid="uid://5d1a3s6x77wd" path="res://scene/effect/particle/particle_hit_ground.tscn" id="1_tw6qm"] +[ext_resource type="PackedScene" uid="uid://5d1a3s6x77wd" path="res://scene/effect/particle/_particle_hit_ground.tscn" id="1_tw6qm"] [node name="Particle" instance=ExtResource("1_tw6qm")] diff --git a/scene/effect/particle/hero01_long_attack01.tscn b/scene/effect/particle/hero01_long_attack01.tscn index 3384e42..c7aef60 100644 --- a/scene/effect/particle/hero01_long_attack01.tscn +++ b/scene/effect/particle/hero01_long_attack01.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://c101pt8hqvmbk"] -[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/particle_slash.tscn" id="1_glj7d"] +[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash.tscn" id="1_glj7d"] [node name="Particle" instance=ExtResource("1_glj7d")] transform = Transform3D(1, 0, 0, 0, 0.707107, -0.353553, 0, 0.707107, 0.353553, 0, 0, 0) diff --git a/scene/effect/particle/hero01_long_attack02.tscn b/scene/effect/particle/hero01_long_attack02.tscn index 1c87ed8..f4a3015 100644 --- a/scene/effect/particle/hero01_long_attack02.tscn +++ b/scene/effect/particle/hero01_long_attack02.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://ns84g1jmmm56"] -[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/particle_slash.tscn" id="1_hciuf"] +[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash.tscn" id="1_hciuf"] [node name="Particle" instance=ExtResource("1_hciuf")] transform = Transform3D(1, 0, 0, 0, -0.707107, 0.353553, 0, -0.707107, -0.353553, 0, 0, 0) diff --git a/scene/effect/particle/hero01_long_attack03_0.tscn b/scene/effect/particle/hero01_long_attack03_0.tscn index 0135d06..da0a434 100644 --- a/scene/effect/particle/hero01_long_attack03_0.tscn +++ b/scene/effect/particle/hero01_long_attack03_0.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://bn2ktr7iynt5"] -[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/particle_slash.tscn" id="1_p44mg"] +[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash.tscn" id="1_p44mg"] [node name="Particle" instance=ExtResource("1_p44mg")] transform = Transform3D(1, 0, 0, 0, -0.707107, 0.353553, 0, -0.707107, -0.353553, 0, 0, 0) diff --git a/scene/effect/particle/hero01_long_attack03_1.tscn b/scene/effect/particle/hero01_long_attack03_1.tscn index 5bde22e..ccafda6 100644 --- a/scene/effect/particle/hero01_long_attack03_1.tscn +++ b/scene/effect/particle/hero01_long_attack03_1.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://dj04l4oge27f0"] -[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/particle_slash.tscn" id="1_078jk"] +[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash.tscn" id="1_078jk"] [node name="Particle" instance=ExtResource("1_078jk")] transform = Transform3D(1, 0, 0, 0, 0.5, 0.433012, 0, -0.866026, 0.25, 0, 0, 0) diff --git a/scene/effect/particle/hero01_long_attack04.tscn b/scene/effect/particle/hero01_long_attack04.tscn index 12fc0ce..1e36a1b 100644 --- a/scene/effect/particle/hero01_long_attack04.tscn +++ b/scene/effect/particle/hero01_long_attack04.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://c5srkd0js0bwc"] -[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/particle_slash.tscn" id="1_5b0hk"] +[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash.tscn" id="1_5b0hk"] [node name="Particle" instance=ExtResource("1_5b0hk")] transform = Transform3D(1.2, 0, 0, 0, 0.707107, -0.353553, 0, 0.707107, 0.353553, 0, 0, 0) diff --git a/scene/effect/particle/particle_hit_blunt.tscn b/scene/effect/particle/particle_hit_blunt.tscn new file mode 100644 index 0000000..ae73556 --- /dev/null +++ b/scene/effect/particle/particle_hit_blunt.tscn @@ -0,0 +1,202 @@ +[gd_scene load_steps=39 format=3 uid="uid://chau5lnq43oku"] + +[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_qxvm2"] +[ext_resource type="Shader" path="res://render/shader/particle.gdshader" id="2_hr443"] +[ext_resource type="Texture2D" uid="uid://ccl81e2qroccb" path="res://render/texture/particle/shape/flare2.png" id="3_07ceg"] +[ext_resource type="Texture2D" uid="uid://bslhqlcg8cw2l" path="res://render/texture/particle/shape/flare3.png" id="3_wm7km"] +[ext_resource type="Texture2D" uid="uid://b0bmvub81xvmf" path="res://render/texture/particle/shape/glow.png" id="5_8l08i"] +[ext_resource type="Texture2D" uid="uid://colhtjt8jon3v" path="res://render/texture/particle/shape/smoke.png" id="5_loelc"] +[ext_resource type="Shader" path="res://render/shader/trail.gdshader" id="5_rglhw"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_dkmkb"] +render_priority = 0 +shader = ExtResource("2_hr443") +shader_parameter/is_billboard = null +shader_parameter/tex_main = ExtResource("3_07ceg") + +[sub_resource type="Curve" id="Curve_n5hkj"] +_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] +point_count = 2 + +[sub_resource type="CurveTexture" id="CurveTexture_hdmmt"] +curve = SubResource("Curve_n5hkj") + +[sub_resource type="Gradient" id="Gradient_wb6fx"] +offsets = PackedFloat32Array(0, 0.291429, 1) +colors = PackedColorArray(1, 1, 1, 1, 1, 1, 0.649479, 1, 1, 1, 0.223529, 1) + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_8ltar"] +gradient = SubResource("Gradient_wb6fx") + +[sub_resource type="Curve" id="Curve_2o6rl"] +max_value = 1.5 +_data = [Vector2(0, 0.758242), 0.0, 2.00769, 0, 0, Vector2(0.0394089, 1.08791), 0.0, 0.0, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0] +point_count = 3 + +[sub_resource type="CurveTexture" id="CurveTexture_5ce5r"] +curve = SubResource("Curve_2o6rl") + +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_acw2w"] +particle_flag_disable_z = true +angle_min = 1.07288e-05 +angle_max = 720.0 +gravity = Vector3(0, 0, 0) +scale_curve = SubResource("CurveTexture_5ce5r") +color_ramp = SubResource("GradientTexture1D_8ltar") +alpha_curve = SubResource("CurveTexture_hdmmt") + +[sub_resource type="QuadMesh" id="QuadMesh_0j7av"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_i0f24"] +render_priority = 0 +shader = ExtResource("2_hr443") +shader_parameter/is_billboard = null +shader_parameter/tex_main = ExtResource("3_wm7km") + +[sub_resource type="Curve" id="Curve_3uvr5"] +_data = [Vector2(0, 0.461538), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] +point_count = 2 + +[sub_resource type="CurveTexture" id="CurveTexture_1og0n"] +curve = SubResource("Curve_3uvr5") + +[sub_resource type="Gradient" id="Gradient_tj5v6"] +offsets = PackedFloat32Array(0.0171429, 0.182857) +colors = PackedColorArray(0.952941, 1, 1, 1, 0.976471, 1, 0.396078, 1) + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_g0jyv"] +gradient = SubResource("Gradient_tj5v6") + +[sub_resource type="Curve" id="Curve_8klc5"] +max_value = 2.0 +_data = [Vector2(0, 0.615385), 0.0, 1.4, 0, 0, Vector2(1, 2), 0.0, 0.0, 0, 0] +point_count = 2 + +[sub_resource type="CurveTexture" id="CurveTexture_k3cwo"] +curve = SubResource("Curve_8klc5") + +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_3w28u"] +particle_flag_disable_z = true +angle_min = 1.07288e-05 +angle_max = 720.0 +gravity = Vector3(0, 0, 0) +scale_curve = SubResource("CurveTexture_k3cwo") +color_ramp = SubResource("GradientTexture1D_g0jyv") +alpha_curve = SubResource("CurveTexture_1og0n") + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_vkw8i"] +render_priority = 0 +shader = ExtResource("2_hr443") +shader_parameter/is_billboard = false +shader_parameter/tex_main = ExtResource("5_loelc") + +[sub_resource type="Curve" id="Curve_didyq"] +_data = [Vector2(0, 0.32967), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] +point_count = 2 + +[sub_resource type="CurveTexture" id="CurveTexture_3pi6l"] +curve = SubResource("Curve_didyq") + +[sub_resource type="Curve" id="Curve_6dnuy"] +max_value = 4.0 +_data = [Vector2(0, 1.75824), 0.0, 0.0, 0, 0, Vector2(1, 2.76923), 0.0, 0.0, 0, 0] +point_count = 2 + +[sub_resource type="CurveTexture" id="CurveTexture_skg43"] +curve = SubResource("Curve_6dnuy") + +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_gjwvd"] +particle_flag_disable_z = true +angle_min = 1.07288e-05 +angle_max = 720.0 +velocity_pivot = Vector3(0, 0, 1) +spread = 180.0 +initial_velocity_max = 0.2 +gravity = Vector3(0, 0, 0) +scale_curve = SubResource("CurveTexture_skg43") +color = Color(0.521569, 0.509804, 0.501961, 1) +alpha_curve = SubResource("CurveTexture_3pi6l") + +[sub_resource type="QuadMesh" id="QuadMesh_0kefl"] + +[sub_resource type="Curve" id="Curve_axcwu"] +_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] +point_count = 2 + +[sub_resource type="CurveTexture" id="CurveTexture_wpjie"] +curve = SubResource("Curve_axcwu") + +[sub_resource type="Gradient" id="Gradient_q1rex"] +offsets = PackedFloat32Array(0, 0.285714, 1) +colors = PackedColorArray(1, 1, 1, 1, 1, 1, 0.52549, 1, 0, 0, 0, 1) + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_x4ksg"] +gradient = SubResource("Gradient_q1rex") + +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_5lomq"] +spread = 180.0 +initial_velocity_min = 4.0 +initial_velocity_max = 5.0 +color_ramp = SubResource("GradientTexture1D_x4ksg") +alpha_curve = SubResource("CurveTexture_wpjie") + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_hrjt4"] +render_priority = 0 +shader = ExtResource("5_rglhw") +shader_parameter/tex_main = ExtResource("5_8l08i") + +[sub_resource type="RibbonTrailMesh" id="RibbonTrailMesh_urftu"] +material = SubResource("ShaderMaterial_hrjt4") +size = 0.1 + +[node name="Particle" type="Node3D"] +script = ExtResource("1_qxvm2") + +[node name="Slash" type="GPUParticles3D" parent="."] +layers = 512 +material_override = SubResource("ShaderMaterial_dkmkb") +cast_shadow = 0 +emitting = false +amount = 1 +lifetime = 0.15 +one_shot = true +fixed_fps = 60 +local_coords = true +process_material = SubResource("ParticleProcessMaterial_acw2w") +draw_pass_1 = SubResource("QuadMesh_0j7av") + +[node name="Slash2" type="GPUParticles3D" parent="."] +layers = 512 +material_override = SubResource("ShaderMaterial_i0f24") +cast_shadow = 0 +emitting = false +amount = 1 +lifetime = 0.15 +one_shot = true +fixed_fps = 60 +local_coords = true +process_material = SubResource("ParticleProcessMaterial_3w28u") +draw_pass_1 = SubResource("QuadMesh_0j7av") + +[node name="Smoke" type="GPUParticles3D" parent="."] +layers = 512 +material_override = SubResource("ShaderMaterial_vkw8i") +cast_shadow = 0 +emitting = false +amount = 2 +lifetime = 2.0 +one_shot = true +explosiveness = 1.0 +local_coords = true +process_material = SubResource("ParticleProcessMaterial_gjwvd") +draw_pass_1 = SubResource("QuadMesh_0kefl") + +[node name="Flare" type="GPUParticles3D" parent="."] +emitting = false +lifetime = 0.3 +one_shot = true +explosiveness = 1.0 +trail_enabled = true +trail_lifetime = 0.1 +process_material = SubResource("ParticleProcessMaterial_5lomq") +draw_pass_1 = SubResource("RibbonTrailMesh_urftu") diff --git a/scene/effect/particle/particle_hit.tscn b/scene/effect/particle/particle_hit_sharp.tscn similarity index 65% rename from scene/effect/particle/particle_hit.tscn rename to scene/effect/particle/particle_hit_sharp.tscn index 4349d9a..f127d29 100644 --- a/scene/effect/particle/particle_hit.tscn +++ b/scene/effect/particle/particle_hit_sharp.tscn @@ -1,9 +1,11 @@ -[gd_scene load_steps=19 format=3 uid="uid://io1yfgjm480t"] +[gd_scene load_steps=28 format=3 uid="uid://io1yfgjm480t"] [ext_resource type="Script" path="res://script/effect/particle.gd" id="1_qxvm2"] [ext_resource type="Shader" path="res://render/shader/particle.gdshader" id="2_hr443"] -[ext_resource type="Texture2D" uid="uid://bb0yfk0u4lqqn" path="res://render/texture/particle/shape/flare.png" id="3_c5vjp"] +[ext_resource type="Texture2D" uid="uid://bb0yfk0u4lqqn" path="res://render/texture/particle/shape/flare1.png" id="3_c5vjp"] +[ext_resource type="Texture2D" uid="uid://b0bmvub81xvmf" path="res://render/texture/particle/shape/glow.png" id="5_8l08i"] [ext_resource type="Texture2D" uid="uid://colhtjt8jon3v" path="res://render/texture/particle/shape/smoke.png" id="5_loelc"] +[ext_resource type="Shader" path="res://render/shader/trail.gdshader" id="5_rglhw"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_dkmkb"] render_priority = 0 @@ -27,8 +29,9 @@ point_count = 4 curve = SubResource("Curve_2o6rl") [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_acw2w"] -angle_min = -72.3 -angle_max = -72.3 +particle_flag_disable_z = true +angle_min = 1.07288e-05 +angle_max = 720.0 gravity = Vector3(0, 0, 0) scale_curve = SubResource("CurveTexture_5ce5r") color = Color(0.635294, 0.827451, 1, 1) @@ -58,6 +61,7 @@ point_count = 2 curve = SubResource("Curve_6dnuy") [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_gjwvd"] +particle_flag_disable_z = true angle_min = 1.07288e-05 angle_max = 720.0 velocity_pivot = Vector3(0, 0, 1) @@ -70,6 +74,36 @@ alpha_curve = SubResource("CurveTexture_3pi6l") [sub_resource type="QuadMesh" id="QuadMesh_0kefl"] +[sub_resource type="Curve" id="Curve_axcwu"] +_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] +point_count = 2 + +[sub_resource type="CurveTexture" id="CurveTexture_wpjie"] +curve = SubResource("Curve_axcwu") + +[sub_resource type="Gradient" id="Gradient_q1rex"] +offsets = PackedFloat32Array(0, 0.285714, 1) +colors = PackedColorArray(1, 1, 1, 1, 1, 1, 0.52549, 1, 0, 0, 0, 1) + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_x4ksg"] +gradient = SubResource("Gradient_q1rex") + +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_5lomq"] +spread = 180.0 +initial_velocity_min = 4.0 +initial_velocity_max = 5.0 +color_ramp = SubResource("GradientTexture1D_x4ksg") +alpha_curve = SubResource("CurveTexture_wpjie") + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_hrjt4"] +render_priority = 0 +shader = ExtResource("5_rglhw") +shader_parameter/tex_main = ExtResource("5_8l08i") + +[sub_resource type="RibbonTrailMesh" id="RibbonTrailMesh_urftu"] +material = SubResource("ShaderMaterial_hrjt4") +size = 0.1 + [node name="Particle" type="Node3D"] script = ExtResource("1_qxvm2") @@ -95,5 +129,16 @@ amount = 2 lifetime = 2.0 one_shot = true explosiveness = 1.0 +local_coords = true process_material = SubResource("ParticleProcessMaterial_gjwvd") draw_pass_1 = SubResource("QuadMesh_0kefl") + +[node name="Flare" type="GPUParticles3D" parent="."] +emitting = false +lifetime = 0.3 +one_shot = true +explosiveness = 1.0 +trail_enabled = true +trail_lifetime = 0.1 +process_material = SubResource("ParticleProcessMaterial_5lomq") +draw_pass_1 = SubResource("RibbonTrailMesh_urftu") diff --git a/script/_global/enum.gd b/script/_global/enum.gd index b96dd5e..4ef4f07 100644 --- a/script/_global/enum.gd +++ b/script/_global/enum.gd @@ -2,6 +2,7 @@ extends Node3D enum EActionType {Pressed, Released} +enum EDamageType {Sharp, Blunt} enum ECharacterType {Player, Monster, Bullet} enum ETeam {Player, Monster} enum EStance { @@ -12,5 +13,4 @@ enum EStance { } enum EBreakLevel {None, Cancel, Jump, Break, Walk} #不可打断 取消技打断 跳跃打断 连招打断 行走打断 enum ECoreType {Free ,Lock, Passive} - enum EGlobalEffect {CameraSize,CameraShake,ColorShift,Blur} diff --git a/script/character/battle.gd b/script/character/battle.gd index 87e38f1..1bd2b12 100644 --- a/script/character/battle.gd +++ b/script/character/battle.gd @@ -160,7 +160,9 @@ func settle(hit_info:HitInfo) -> bool: character_to.add_buff("hit_up",attack.hit_up_duration) #受击特效 - character_to.cast_particle(ResourceManager.particle_hit,false) + match attack.damage_type: + Enum.EDamageType.Sharp:character_to.cast_particle(ResourceManager.particle_hit_sharp,false) + Enum.EDamageType.Blunt:character_to.cast_particle(ResourceManager.particle_hit_blunt,false) #抖动 character_to.add_buff("shake_x",0.2,true) diff --git a/script/character/effect.gd b/script/character/effect.gd index dbcc480..5efea50 100644 --- a/script/character/effect.gd +++ b/script/character/effect.gd @@ -14,6 +14,8 @@ class_name Effect var rediness : Decal var is_pause : bool var is_right : bool +var particle_list = [] +var temp_release_particle_list = [] func init(type:Enum.ECharacterType ,body_scale:Vector3): match type: @@ -34,16 +36,18 @@ func _process(delta): #flip if is_right != status.is_right: is_right = status.is_right - for child in get_children(): - if child is Particle: - child.scale.x = 1 if is_right else -1 + for particle:Particle in particle_list: + particle.scale.x = 1 if is_right else -1 #pause if is_pause != status.is_pause: is_pause = status.is_pause - for child in get_children(): - if child is Particle: - var particle = child as Particle - particle.set_pause(is_pause) + for particle:Particle in particle_list: + particle.set_pause(is_pause) + if !is_pause: + for particle:Particle in temp_release_particle_list: + _release_effect(particle) + particle_list.erase(particle) + temp_release_particle_list.clear() func cast_image(res:Resource): var new_afterimage = afterimage.instantiate() as Afterimage @@ -81,18 +85,20 @@ func _cast_particle(resource:Resource ,is_attach:bool): var angle = dir.angle_to(Vector2.RIGHT) new_particle.rotation.y = angle if is_right else -angle new_particle.scale.x = abs(new_particle.scale.x) * (1 if is_right else -1) - if is_attach: - new_particle.position = status.basic_offset - add_child(new_particle) - else: - new_particle.position = character.view_pos() - SignalManager.effect_create.emit(new_particle) + new_particle.position = status.basic_offset + add_child(new_particle) + particle_list.append(new_particle) + if !is_attach: + temp_release_particle_list.append(new_particle) func release_effect(): - for child in get_children(): - if child is Particle: - var particle = child as Particle - particle.position = character.view_pos() - remove_child(particle) - SignalManager.effect_create.emit(particle) + for particle:Particle in particle_list: + _release_effect(particle) + particle_list.clear() +func _release_effect(particle:Particle): + particle.set_pause(false) + particle.position = character.view_pos() + remove_child(particle) + SignalManager.effect_create.emit(particle) + diff --git a/script/config/attack_cfg.gd b/script/config/attack_cfg.gd index 2b82211..d330b08 100644 --- a/script/config/attack_cfg.gd +++ b/script/config/attack_cfg.gd @@ -2,18 +2,28 @@ extends Resource class_name AttackCfg +@export_group("数值") @export var damage_rate : float = 1 #伤害系数 @export var break_level : int = 1 #硬直等级 @export var stun_attack : float = 10 #眩晕值伤害 -@export var hit_back_speed : float #击退速度 -@export var hit_back_duration : float #击退持续时间 -@export var hit_up_speed : float #击飞速度 -@export var hit_up_duration : float #击飞持续时间 -@export var pause_time : float #卡帧时间 + +@export_group("类型标记") +@export var damage_type : Enum.EDamageType = Enum.EDamageType.Sharp # 伤害类型 @export var is_floating : bool #是否浮空技 @export var is_hit_down : bool #是否击落技 @export var is_rebound : bool #是否地面反弹技能 + +@export_group("强制位移") +@export var hit_back_speed : float #击退速度 +@export var hit_up_speed : float #击飞速度 +@export var hit_back_duration : float = 0.05 #击退持续时间 +@export var hit_up_duration : float = 0.05 #击飞持续时间 + +@export_group("卡帧") +@export var pause_time : float #卡帧时间 @export var is_force_pause : bool #是否强制卡帧 + +@export_group("判定框") @export var height : float = 2 #判定框高度 @export var radius : float #圆形判定框 半径 @export var size : Vector2 = Vector2(2,1) #矩形判定框 大小 diff --git a/script/manager/resource_manager.gd b/script/manager/resource_manager.gd index f5b6e96..c7ab8b1 100644 --- a/script/manager/resource_manager.gd +++ b/script/manager/resource_manager.gd @@ -10,7 +10,8 @@ var material_character = load("res://render/material/character.tres") var material_character_sub = load("res://render/material/character_sub.tres") #==effect== -var particle_hit = load("res://scene/effect/particle/particle_hit.tscn") +var particle_hit_sharp = load("res://scene/effect/particle/particle_hit_sharp.tscn") +var particle_hit_blunt = load("res://scene/effect/particle/particle_hit_blunt.tscn") #==config== #character