diff --git a/config/attack/blunt_mid_hit_down.tres b/config/attack/blunt_mid_hit_down.tres index c9ad0fc..2c6ce56 100644 --- a/config/attack/blunt_mid_hit_down.tres +++ b/config/attack/blunt_mid_hit_down.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://dr70nrjjk754r"] +[gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://cdkjjljp81p56"] [ext_resource type="Script" uid="uid://bm8fn2yciam1g" path="res://script/config/attack_cfg.gd" id="1_esnha"] @@ -12,7 +12,7 @@ is_floating = true is_rebound = false is_throw_check = false is_throw_end = false -hit_back_speed = 7.0 +hit_back_speed = 0.0 hit_up_speed = -7.0 hit_back_duration = 0.05 hit_up_duration = 0.05 diff --git a/config/attack/blunt_mid_hit_down_forward.tres b/config/attack/blunt_mid_hit_down_forward.tres new file mode 100644 index 0000000..c9ad0fc --- /dev/null +++ b/config/attack/blunt_mid_hit_down_forward.tres @@ -0,0 +1,18 @@ +[gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://dr70nrjjk754r"] + +[ext_resource type="Script" uid="uid://bm8fn2yciam1g" path="res://script/config/attack_cfg.gd" id="1_esnha"] + +[resource] +script = ExtResource("1_esnha") +damage_rate = 1.0 +break_level = 2 +stun_attack = 10.0 +damage_type = 1 +is_floating = true +is_rebound = false +is_throw_check = false +is_throw_end = false +hit_back_speed = 7.0 +hit_up_speed = -7.0 +hit_back_duration = 0.05 +hit_up_duration = 0.05 diff --git a/config/attack_box/box_high.tres b/config/attack_box/box_high.tres new file mode 100644 index 0000000..25e7d39 --- /dev/null +++ b/config/attack_box/box_high.tres @@ -0,0 +1,14 @@ +[gd_resource type="Resource" script_class="AttackBoxCfg" load_steps=3 format=3 uid="uid://qp5sy3u3rlpe"] + +[ext_resource type="Script" uid="uid://dekrsow0vntqs" path="res://script/config/attack_box_cfg.gd" id="1_05sfw"] + +[sub_resource type="BoxShape3D" id="BoxShape3D_87jhu"] +size = Vector3(1, 1.6, 1) + +[resource] +script = ExtResource("1_05sfw") +shape = SubResource("BoxShape3D_87jhu") +offset = Vector2(0.5, 0.8) +is_throw = false +is_direct = false +is_hit_self = false diff --git a/config/attack_box/box_large.tres b/config/attack_box/box_large.tres index 16ed6ec..c5f52f6 100644 --- a/config/attack_box/box_large.tres +++ b/config/attack_box/box_large.tres @@ -3,12 +3,12 @@ [ext_resource type="Script" uid="uid://dekrsow0vntqs" path="res://script/config/attack_box_cfg.gd" id="1_661yg"] [sub_resource type="BoxShape3D" id="BoxShape3D_87jhu"] -size = Vector3(2, 0.8, 1) +size = Vector3(2, 1.2, 1) [resource] script = ExtResource("1_661yg") shape = SubResource("BoxShape3D_87jhu") -offset = Vector2(1, 0.4) +offset = Vector2(1, 0.6) is_throw = false is_direct = false is_hit_self = false diff --git a/config/attack_box/circle_large.tres b/config/attack_box/circle_large.tres index 204140b..395c0fc 100644 --- a/config/attack_box/circle_large.tres +++ b/config/attack_box/circle_large.tres @@ -3,13 +3,13 @@ [ext_resource type="Script" uid="uid://dekrsow0vntqs" path="res://script/config/attack_box_cfg.gd" id="1_aqwel"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_pmh6g"] -height = 0.8 +height = 1.2 radius = 1.0 [resource] script = ExtResource("1_aqwel") shape = SubResource("CylinderShape3D_pmh6g") -offset = Vector2(0, 0) +offset = Vector2(0, 0.6) is_throw = false is_direct = false is_hit_self = false diff --git a/config/attack_box/circle_mid.tres b/config/attack_box/circle_mid.tres index 3cf3270..c604ece 100644 --- a/config/attack_box/circle_mid.tres +++ b/config/attack_box/circle_mid.tres @@ -9,7 +9,7 @@ radius = 0.6 [resource] script = ExtResource("1_w2uwt") shape = SubResource("CylinderShape3D_pmh6g") -offset = Vector2(0, 0) +offset = Vector2(0, 0.4) is_throw = false is_direct = false is_hit_self = false diff --git a/config/attack_box/circle_normal.tres b/config/attack_box/circle_normal.tres index 6556652..947f669 100644 --- a/config/attack_box/circle_normal.tres +++ b/config/attack_box/circle_normal.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="AttackBoxCfg" load_steps=3 format=3 uid="uid://57sukcw6ewqo"] -[ext_resource type="Script" path="res://script/config/attack_box_cfg.gd" id="1_8rhve"] +[ext_resource type="Script" uid="uid://dekrsow0vntqs" path="res://script/config/attack_box_cfg.gd" id="1_8rhve"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_pmh6g"] height = 0.8 @@ -11,3 +11,5 @@ script = ExtResource("1_8rhve") shape = SubResource("CylinderShape3D_pmh6g") offset = Vector2(0, 0) is_throw = false +is_direct = false +is_hit_self = false diff --git a/config/attack_box/circle_normal_thin.tres b/config/attack_box/circle_normal_thin.tres index 87c94c6..13dff20 100644 --- a/config/attack_box/circle_normal_thin.tres +++ b/config/attack_box/circle_normal_thin.tres @@ -11,3 +11,4 @@ shape = SubResource("CylinderShape3D_pmh6g") offset = Vector2(0, 0.5) is_throw = false is_direct = false +is_hit_self = false diff --git a/config/skill_player_weapon/hero01_fist_air_attack03.tres b/config/skill_player_weapon/hero01_fist_air_attack03.tres index 143b54f..99f3db3 100644 --- a/config/skill_player_weapon/hero01_fist_air_attack03.tres +++ b/config/skill_player_weapon/hero01_fist_air_attack03.tres @@ -1,8 +1,8 @@ [gd_resource type="Resource" script_class="SkillWeaponCfg" load_steps=7 format=3 uid="uid://0nysxqwoq5tj"] -[ext_resource type="Resource" uid="uid://dr70nrjjk754r" path="res://config/attack/blunt_mid_hit_down.tres" id="1_w8lg4"] +[ext_resource type="Resource" uid="uid://dr70nrjjk754r" path="res://config/attack/blunt_mid_hit_down_forward.tres" id="1_w8lg4"] [ext_resource type="Resource" uid="uid://bqejjllfy03h3" path="res://config/attack_box/box_normal.tres" id="2_2gnst"] -[ext_resource type="Script" path="res://script/config/skill_weapon_cfg.gd" id="3_ghxjs"] +[ext_resource type="Script" uid="uid://dgwtu2wj5033u" path="res://script/config/skill_weapon_cfg.gd" id="3_ghxjs"] [ext_resource type="Animation" uid="uid://dfe8krunqdf3m" path="res://resource/skill_animation/hero01_fist_air_attack03.tres" id="4_y802t"] [ext_resource type="SpriteFrames" uid="uid://bhsotj76tuovy" path="res://resource/animation/character/hero01_fist_attack.aseprite" id="5_pslv2"] [ext_resource type="Resource" uid="uid://c6alg8pmqfdxm" path="res://config/weapon/fist.tres" id="6_t7m8t"] diff --git a/config/skill_player_weapon/hero01_fist_skill01_add.tres b/config/skill_player_weapon/hero01_fist_skill01_add.tres new file mode 100644 index 0000000..d7e494e --- /dev/null +++ b/config/skill_player_weapon/hero01_fist_skill01_add.tres @@ -0,0 +1,33 @@ +[gd_resource type="Resource" script_class="SkillWeaponCfg" load_steps=7 format=3 uid="uid://dvnwgl10tljft"] + +[ext_resource type="Resource" uid="uid://4o4v0ruyag5a" path="res://config/attack/blunt_throw_end_hit_down.tres" id="1_dh40s"] +[ext_resource type="Resource" uid="uid://dp8schthpyl3l" path="res://config/attack_box/throw.tres" id="2_1sc65"] +[ext_resource type="Script" uid="uid://dgwtu2wj5033u" path="res://script/config/skill_weapon_cfg.gd" id="3_8mjpe"] +[ext_resource type="Animation" uid="uid://bnqll5kf8t8qs" path="res://resource/skill_animation/hero01_fist_skill01_add.tres" id="4_mq2d2"] +[ext_resource type="SpriteFrames" uid="uid://cajgs8smbkjan" path="res://resource/animation/character/hero01_fist_skill01.aseprite" id="5_kkp4n"] +[ext_resource type="Resource" uid="uid://c6alg8pmqfdxm" path="res://config/weapon/fist.tres" id="6_12y4k"] + +[resource] +script = ExtResource("3_8mjpe") +weapon = ExtResource("6_12y4k") +action = "none" +name = "" +skill_animation = ExtResource("4_mq2d2") +stance_from = 99 +stance_to = 3 +break_level = 3 +is_charging = false +attack1 = ExtResource("1_dh40s") +attack1_box = ExtResource("2_1sc65") +attack1_with_stop = false +attack2_with_stop = false +mp_cost = 0 +mp_sub_cost = false +free_lock = false +ignore_push = false +is_lock_x = true +is_lock_x_move = false +range = 0.0 +warn_type = 0 +sprite_frames = ExtResource("5_kkp4n") +animation_name = "fist_skill01_add" diff --git a/config/skill_player_weapon/hero01_fist_skill02.tres b/config/skill_player_weapon/hero01_fist_skill02.tres index f0dcd26..fcef6ac 100644 --- a/config/skill_player_weapon/hero01_fist_skill02.tres +++ b/config/skill_player_weapon/hero01_fist_skill02.tres @@ -1,28 +1,33 @@ -[gd_resource type="Resource" script_class="SkillWeaponCfg" load_steps=7 format=3 uid="uid://dvnwgl10tljft"] +[gd_resource type="Resource" script_class="SkillWeaponCfg" load_steps=7 format=3 uid="uid://dbviuasvknl8q"] -[ext_resource type="Resource" uid="uid://4o4v0ruyag5a" path="res://config/attack/blunt_throw_end_hit_down.tres" id="1_dh40s"] -[ext_resource type="Resource" uid="uid://dp8schthpyl3l" path="res://config/attack_box/throw.tres" id="2_1sc65"] -[ext_resource type="Script" path="res://script/config/skill_weapon_cfg.gd" id="3_8mjpe"] -[ext_resource type="Animation" uid="uid://batvpnk7jfc2a" path="res://resource/skill_animation/hero01_fist_skill02.tres" id="4_mq2d2"] -[ext_resource type="SpriteFrames" uid="uid://cajgs8smbkjan" path="res://resource/animation/character/hero01_fist_skill01.aseprite" id="5_kkp4n"] -[ext_resource type="Resource" uid="uid://c6alg8pmqfdxm" path="res://config/weapon/fist.tres" id="6_12y4k"] +[ext_resource type="Resource" uid="uid://ctbdt77yyubxn" path="res://config/attack/blunt_normal_hit_up.tres" id="1_ywehi"] +[ext_resource type="Resource" uid="uid://decgfcx2xsj8i" path="res://config/attack_box/circle_mid.tres" id="2_ywehi"] +[ext_resource type="Script" uid="uid://dgwtu2wj5033u" path="res://script/config/skill_weapon_cfg.gd" id="3_6wryu"] +[ext_resource type="Animation" uid="uid://mnmlwnqk4aqq" path="res://resource/skill_animation/hero01_fist_skill02.tres" id="4_c7ye6"] +[ext_resource type="SpriteFrames" uid="uid://cajgs8smbkjan" path="res://resource/animation/character/hero01_fist_skill01.aseprite" id="5_sjxkh"] +[ext_resource type="Resource" uid="uid://c6alg8pmqfdxm" path="res://config/weapon/fist.tres" id="6_aemq5"] [resource] -script = ExtResource("3_8mjpe") -weapon = ExtResource("6_12y4k") -action = "none" +script = ExtResource("3_6wryu") +weapon = ExtResource("6_aemq5") +action = "attack_heavy" name = "" -skill_animation = ExtResource("4_mq2d2") -range = 0.0 -free_lock = false -ignore_push = false -attack1 = ExtResource("1_dh40s") -attack1_box = ExtResource("2_1sc65") -stance_from = 99 +skill_animation = ExtResource("4_c7ye6") +stance_from = 2 stance_to = 3 break_level = 3 is_charging = false +attack1 = ExtResource("1_ywehi") +attack1_box = ExtResource("2_ywehi") +attack1_with_stop = false +attack2_with_stop = false mp_cost = 0 -refresh_animation = false -sprite_frames = ExtResource("5_kkp4n") -animation_name = "" +mp_sub_cost = false +free_lock = false +ignore_push = true +is_lock_x = true +is_lock_x_move = false +range = 0.0 +warn_type = 0 +sprite_frames = ExtResource("5_sjxkh") +animation_name = "fist_skill02" diff --git a/config/skill_player_weapon/hero01_fist_skill03.tres b/config/skill_player_weapon/hero01_fist_skill03.tres index ec57d99..7e2eb6e 100644 --- a/config/skill_player_weapon/hero01_fist_skill03.tres +++ b/config/skill_player_weapon/hero01_fist_skill03.tres @@ -1,9 +1,9 @@ -[gd_resource type="Resource" script_class="SkillWeaponCfg" load_steps=7 format=3 uid="uid://dbviuasvknl8q"] +[gd_resource type="Resource" script_class="SkillWeaponCfg" load_steps=7 format=3 uid="uid://dpaa7dflbjk62"] -[ext_resource type="Resource" uid="uid://ctbdt77yyubxn" path="res://config/attack/blunt_normal_hit_up.tres" id="1_ywehi"] -[ext_resource type="Resource" uid="uid://decgfcx2xsj8i" path="res://config/attack_box/circle_mid.tres" id="2_ywehi"] +[ext_resource type="Resource" uid="uid://cdkjjljp81p56" path="res://config/attack/blunt_mid_hit_down.tres" id="1_ywehi"] +[ext_resource type="Resource" uid="uid://qp5sy3u3rlpe" path="res://config/attack_box/box_high.tres" id="2_ywehi"] [ext_resource type="Script" uid="uid://dgwtu2wj5033u" path="res://script/config/skill_weapon_cfg.gd" id="3_6wryu"] -[ext_resource type="Animation" uid="uid://mnmlwnqk4aqq" path="res://resource/skill_animation/hero01_fist_skill03.tres" id="4_c7ye6"] +[ext_resource type="Animation" uid="uid://by2e51w02ka8s" path="res://resource/skill_animation/hero01_fist_skill03.tres" id="4_c7ye6"] [ext_resource type="SpriteFrames" uid="uid://cajgs8smbkjan" path="res://resource/animation/character/hero01_fist_skill01.aseprite" id="5_sjxkh"] [ext_resource type="Resource" uid="uid://c6alg8pmqfdxm" path="res://config/weapon/fist.tres" id="6_aemq5"] @@ -13,8 +13,8 @@ weapon = ExtResource("6_aemq5") action = "attack_heavy" name = "" skill_animation = ExtResource("4_c7ye6") -stance_from = 2 -stance_to = 3 +stance_from = 3 +stance_to = 30 break_level = 3 is_charging = false attack1 = ExtResource("1_ywehi") @@ -25,7 +25,6 @@ mp_cost = 0 mp_sub_cost = false free_lock = false ignore_push = true -with_stop = false is_lock_x = true is_lock_x_move = false range = 0.0 diff --git a/config/skill_player_weapon/hero01_long_air_skill02.tres b/config/skill_player_weapon/hero01_long_air_skill02.tres index 12a2970..b476e64 100644 --- a/config/skill_player_weapon/hero01_long_air_skill02.tres +++ b/config/skill_player_weapon/hero01_long_air_skill02.tres @@ -2,7 +2,7 @@ [ext_resource type="Resource" uid="uid://bv4uoey1liqoq" path="res://config/attack/sharp_heavy_hit_blow.tres" id="1_m5u18"] [ext_resource type="Resource" uid="uid://bnfnjdw0tms3h" path="res://config/attack_box/box_large.tres" id="2_0351a"] -[ext_resource type="Script" path="res://script/config/skill_weapon_cfg.gd" id="3_to21l"] +[ext_resource type="Script" uid="uid://dgwtu2wj5033u" path="res://script/config/skill_weapon_cfg.gd" id="3_to21l"] [ext_resource type="Animation" uid="uid://cjc6sis2xn1yy" path="res://resource/skill_animation/hero01_long_air_skill02.tres" id="4_u7aq7"] [ext_resource type="SpriteFrames" uid="uid://dhfqj1dxldqao" path="res://resource/animation/character/hero01_long_skill01.aseprite" id="5_6p3pi"] [ext_resource type="Resource" uid="uid://cy3wwalxeyro0" path="res://config/weapon/long.tres" id="6_vj7l0"] @@ -13,25 +13,21 @@ weapon = ExtResource("6_vj7l0") action = "attack_heavy" name = "" skill_animation = ExtResource("4_u7aq7") -range = 0.0 -free_lock = false -ignore_push = true -attack1 = ExtResource("1_m5u18") -attack1_box = ExtResource("2_0351a") -attack1_with_pause_frame = false -attack1_with_stop = false -attack2_with_pause_frame = false -attack2_with_stop = false stance_from = 12 stance_to = 10 break_level = 3 is_charging = false +attack1 = ExtResource("1_m5u18") +attack1_box = ExtResource("2_0351a") +attack1_with_stop = false +attack2_with_stop = false mp_cost = 0 mp_sub_cost = false -warn_type = 0 -with_stop = false +free_lock = false +ignore_push = true is_lock_x = true is_lock_x_move = true -refresh_animation = false +range = 0.0 +warn_type = 0 sprite_frames = ExtResource("5_6p3pi") animation_name = "long_air_skill02" diff --git a/config/skill_player_weapon/hero01_long_stab02.tres b/config/skill_player_weapon/hero01_long_stab02.tres index 9fe4a50..151daa1 100644 --- a/config/skill_player_weapon/hero01_long_stab02.tres +++ b/config/skill_player_weapon/hero01_long_stab02.tres @@ -25,7 +25,6 @@ mp_cost = 0 mp_sub_cost = false free_lock = false ignore_push = true -with_stop = false is_lock_x = true is_lock_x_move = true range = 0.0 diff --git a/config/skill_player_weapon/hero01_long_stab03.tres b/config/skill_player_weapon/hero01_long_stab03.tres index e0fd8bd..55a949c 100644 --- a/config/skill_player_weapon/hero01_long_stab03.tres +++ b/config/skill_player_weapon/hero01_long_stab03.tres @@ -27,7 +27,6 @@ mp_cost = 0 mp_sub_cost = false free_lock = false ignore_push = true -with_stop = false is_lock_x = true is_lock_x_move = true range = 0.0 diff --git a/config/skill_player_weapon/hero01_short_attack03.tres b/config/skill_player_weapon/hero01_short_attack03.tres index f674432..b53d705 100644 --- a/config/skill_player_weapon/hero01_short_attack03.tres +++ b/config/skill_player_weapon/hero01_short_attack03.tres @@ -2,8 +2,8 @@ [ext_resource type="Resource" uid="uid://bhhrt6fpjccga" path="res://config/attack/blunt_normal_none.tres" id="1_er265"] [ext_resource type="Resource" uid="uid://bqejjllfy03h3" path="res://config/attack_box/box_normal.tres" id="2_jmcul"] -[ext_resource type="Resource" uid="uid://dr70nrjjk754r" path="res://config/attack/blunt_mid_hit_down.tres" id="3_0i2p5"] -[ext_resource type="Script" path="res://script/config/skill_weapon_cfg.gd" id="3_8rsme"] +[ext_resource type="Resource" uid="uid://dr70nrjjk754r" path="res://config/attack/blunt_mid_hit_down_forward.tres" id="3_0i2p5"] +[ext_resource type="Script" uid="uid://dgwtu2wj5033u" path="res://script/config/skill_weapon_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"] [ext_resource type="Resource" uid="uid://pnhii1a83axg" path="res://config/weapon/short.tres" id="6_pclwt"] diff --git a/config/skill_player_weapon/hero01_short_skill01.tres b/config/skill_player_weapon/hero01_short_skill01.tres index 01185c7..f8c6b8d 100644 --- a/config/skill_player_weapon/hero01_short_skill01.tres +++ b/config/skill_player_weapon/hero01_short_skill01.tres @@ -21,7 +21,6 @@ mp_cost = 0 mp_sub_cost = false free_lock = false ignore_push = false -with_stop = false is_lock_x = true is_lock_x_move = false range = 0.0 diff --git a/config/skill_player_weapon/hero01_short_stab01.tres b/config/skill_player_weapon/hero01_short_stab01.tres index 0403dcf..bcc3839 100644 --- a/config/skill_player_weapon/hero01_short_stab01.tres +++ b/config/skill_player_weapon/hero01_short_stab01.tres @@ -27,7 +27,6 @@ mp_cost = 0 mp_sub_cost = false free_lock = false ignore_push = true -with_stop = false is_lock_x = false is_lock_x_move = false range = 0.0 diff --git a/render/trail_mesh/flare_blunt.tres b/render/trail_mesh/flare_blunt.tres index ad8ddc0..8ac228f 100644 --- a/render/trail_mesh/flare_blunt.tres +++ b/render/trail_mesh/flare_blunt.tres @@ -1,6 +1,6 @@ [gd_resource type="RibbonTrailMesh" load_steps=3 format=3 uid="uid://cv0787wcswb6d"] -[ext_resource type="Shader" path="res://render/shader/trail.gdshader" id="1_lp8r8"] +[ext_resource type="Shader" uid="uid://bey68hqql2gfr" path="res://render/shader/trail.gdshader" id="1_lp8r8"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_od7xi"] render_priority = 0 diff --git a/resource/animation/character/hero01_fist_skill01.aseprite b/resource/animation/character/hero01_fist_skill01.aseprite index fdf307d..6c7968c 100644 Binary files a/resource/animation/character/hero01_fist_skill01.aseprite and b/resource/animation/character/hero01_fist_skill01.aseprite differ diff --git a/resource/animation/character/hero01_fist_skill01.png b/resource/animation/character/hero01_fist_skill01.png index 79c2776..f5caee0 100644 Binary files a/resource/animation/character/hero01_fist_skill01.png and b/resource/animation/character/hero01_fist_skill01.png differ diff --git a/resource/animation/character/hero01_soul_move.aseprite b/resource/animation/character/hero01_soul_move.aseprite index 4b43a69..140f422 100644 Binary files a/resource/animation/character/hero01_soul_move.aseprite and b/resource/animation/character/hero01_soul_move.aseprite differ diff --git a/resource/animation/character/hero01_soul_move.png b/resource/animation/character/hero01_soul_move.png index 564e972..fae07db 100644 Binary files a/resource/animation/character/hero01_soul_move.png and b/resource/animation/character/hero01_soul_move.png differ diff --git a/resource/skill_animation/hero01_fist_skill01_add.tres b/resource/skill_animation/hero01_fist_skill01_add.tres new file mode 100644 index 0000000..3dbc0f7 --- /dev/null +++ b/resource/skill_animation/hero01_fist_skill01_add.tres @@ -0,0 +1,145 @@ +[gd_resource type="Animation" load_steps=2 format=3 uid="uid://bnqll5kf8t8qs"] + +[ext_resource type="SpriteFrames" uid="uid://cajgs8smbkjan" path="res://resource/animation/character/hero01_fist_skill01.aseprite" id="1_mf7r8"] + +[resource] +resource_name = "hero01_fist_skill01_add" +step = 0.1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("View:sprite_frames") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [ExtResource("1_mf7r8")] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("View:animation") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [&"fist_skill01_add"] +} +tracks/2/type = "position_3d" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("%Throw") +tracks/2/interp = 0 +tracks/2/loop_wrap = true +tracks/2/keys = PackedFloat32Array(0, 1, 0.75, 0.4, 0, 0.1, 1, 0.5, 0.5, 0, 0.2, 1, 0, 0.8, 0, 0.3, 1, 0, 0.8, 0) +tracks/3/type = "scale_3d" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("%Throw") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = PackedFloat32Array(0, 1, -1, 1, 1) +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath("%Throw:animation") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0, 0.2), +"transitions": PackedFloat32Array(1, 1), +"update": 1, +"values": [&"airhit1", &"airhit3"] +} +tracks/5/type = "value" +tracks/5/imported = false +tracks/5/enabled = true +tracks/5/path = NodePath("%Throw:frame") +tracks/5/interp = 1 +tracks/5/loop_wrap = true +tracks/5/keys = { +"times": PackedFloat32Array(0, 0.1, 0.2, 0.3), +"transitions": PackedFloat32Array(1, 1, 1, 1), +"update": 1, +"values": [0, 1, 2, 3] +} +tracks/6/type = "value" +tracks/6/imported = false +tracks/6/enabled = true +tracks/6/path = NodePath("Status:break_level") +tracks/6/interp = 1 +tracks/6/loop_wrap = true +tracks/6/keys = { +"times": PackedFloat32Array(0, 0.6, 0.8), +"transitions": PackedFloat32Array(1, 1, 1), +"update": 1, +"values": [0, 3, 4] +} +tracks/7/type = "value" +tracks/7/imported = false +tracks/7/enabled = true +tracks/7/path = NodePath("Status:speed_up_rate") +tracks/7/interp = 1 +tracks/7/loop_wrap = true +tracks/7/keys = { +"times": PackedFloat32Array(0.1, 0.4), +"transitions": PackedFloat32Array(1, 1), +"update": 1, +"values": [-0.5, -1.0] +} +tracks/8/type = "value" +tracks/8/imported = false +tracks/8/enabled = true +tracks/8/path = NodePath("Status:skill_move_speed") +tracks/8/interp = 1 +tracks/8/loop_wrap = true +tracks/8/keys = { +"times": PackedFloat32Array(0.1, 0.4), +"transitions": PackedFloat32Array(1, 1), +"update": 1, +"values": [2.0, 0.0] +} +tracks/9/type = "method" +tracks/9/imported = false +tracks/9/enabled = true +tracks/9/path = NodePath("Battle") +tracks/9/interp = 1 +tracks/9/loop_wrap = true +tracks/9/keys = { +"times": PackedFloat32Array(0.4), +"transitions": PackedFloat32Array(1), +"values": [{ +"args": [], +"method": &"attack1" +}] +} +tracks/10/type = "method" +tracks/10/imported = false +tracks/10/enabled = true +tracks/10/path = NodePath("Effect") +tracks/10/interp = 1 +tracks/10/loop_wrap = true +tracks/10/keys = { +"times": PackedFloat32Array(0.3), +"transitions": PackedFloat32Array(1), +"values": [{ +"args": [], +"method": &"cast_attack_particle1" +}] +} +tracks/11/type = "value" +tracks/11/imported = false +tracks/11/enabled = true +tracks/11/path = NodePath("View:frame") +tracks/11/interp = 1 +tracks/11/loop_wrap = true +tracks/11/keys = { +"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1), +"update": 1, +"values": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] +} diff --git a/resource/skill_animation/hero01_fist_skill02.tres b/resource/skill_animation/hero01_fist_skill02.tres index cd854d8..d25c56f 100644 --- a/resource/skill_animation/hero01_fist_skill02.tres +++ b/resource/skill_animation/hero01_fist_skill02.tres @@ -1,9 +1,10 @@ -[gd_resource type="Animation" load_steps=2 format=3 uid="uid://bnqll5kf8t8qs"] +[gd_resource type="Animation" load_steps=2 format=3 uid="uid://mnmlwnqk4aqq"] -[ext_resource type="SpriteFrames" uid="uid://cajgs8smbkjan" path="res://resource/animation/character/hero01_fist_skill01.aseprite" id="1_mf7r8"] +[ext_resource type="SpriteFrames" uid="uid://cajgs8smbkjan" path="res://resource/animation/character/hero01_fist_skill01.aseprite" id="1_o5821"] [resource] resource_name = "hero01_fist_skill02" +length = 0.7 step = 0.1 tracks/0/type = "value" tracks/0/imported = false @@ -15,7 +16,7 @@ tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [ExtResource("1_mf7r8")] +"values": [ExtResource("1_o5821")] } tracks/1/type = "value" tracks/1/imported = false @@ -29,117 +30,84 @@ tracks/1/keys = { "update": 1, "values": ["fist_skill02"] } -tracks/2/type = "position_3d" +tracks/2/type = "value" tracks/2/imported = false tracks/2/enabled = true -tracks/2/path = NodePath("%Throw") -tracks/2/interp = 0 +tracks/2/path = NodePath("Status:break_level") +tracks/2/interp = 1 tracks/2/loop_wrap = true -tracks/2/keys = PackedFloat32Array(0, 1, 0.75, 0.4, 0, 0.1, 1, 0.5, 0.5, 0, 0.2, 1, 0, 0.8, 0, 0.3, 1, 0, 0.8, 0) -tracks/3/type = "scale_3d" +tracks/2/keys = { +"times": PackedFloat32Array(0, 0.4, 0.5), +"transitions": PackedFloat32Array(1, 1, 1), +"update": 1, +"values": [0, 3, 4] +} +tracks/3/type = "value" tracks/3/imported = false tracks/3/enabled = true -tracks/3/path = NodePath("%Throw") +tracks/3/path = NodePath("Status:skill_move_speed") tracks/3/interp = 1 tracks/3/loop_wrap = true -tracks/3/keys = PackedFloat32Array(0, 1, -1, 1, 1) -tracks/4/type = "value" +tracks/3/keys = { +"times": PackedFloat32Array(0, 0.1, 0.2, 0.3), +"transitions": PackedFloat32Array(1, 1, 1, 1), +"update": 1, +"values": [2.0, 8.0, 6.0, 0.0] +} +tracks/4/type = "method" tracks/4/imported = false tracks/4/enabled = true -tracks/4/path = NodePath("%Throw:animation") +tracks/4/path = NodePath("Battle") tracks/4/interp = 1 tracks/4/loop_wrap = true tracks/4/keys = { -"times": PackedFloat32Array(0, 0.2), -"transitions": PackedFloat32Array(1, 1), -"update": 1, -"values": [&"airhit1", &"airhit3"] +"times": PackedFloat32Array(0.1, 0.2, 0.3), +"transitions": PackedFloat32Array(1, 1, 1), +"values": [{ +"args": [], +"method": &"attack1" +}, { +"args": [], +"method": &"attack1" +}, { +"args": [], +"method": &"attack1" +}] } -tracks/5/type = "value" +tracks/5/type = "method" tracks/5/imported = false tracks/5/enabled = true -tracks/5/path = NodePath("%Throw:frame") +tracks/5/path = NodePath("Effect") tracks/5/interp = 1 tracks/5/loop_wrap = true tracks/5/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2, 0.3), -"transitions": PackedFloat32Array(1, 1, 1, 1), -"update": 1, -"values": [0, 1, 2, 3] +"times": PackedFloat32Array(0.1), +"transitions": PackedFloat32Array(1), +"values": [{ +"args": [], +"method": &"cast_attack_particle1" +}] } -tracks/6/type = "value" +tracks/6/type = "method" tracks/6/imported = false tracks/6/enabled = true -tracks/6/path = NodePath("Status:break_level") +tracks/6/path = NodePath("Battle") tracks/6/interp = 1 tracks/6/loop_wrap = true tracks/6/keys = { -"times": PackedFloat32Array(0, 0.6, 0.8), -"transitions": PackedFloat32Array(1, 1, 1), -"update": 1, -"values": [0, 3, 4] +"times": PackedFloat32Array(), +"transitions": PackedFloat32Array(), +"values": [] } tracks/7/type = "value" tracks/7/imported = false tracks/7/enabled = true -tracks/7/path = NodePath("Status:speed_up_rate") +tracks/7/path = NodePath("View:frame") tracks/7/interp = 1 tracks/7/loop_wrap = true tracks/7/keys = { -"times": PackedFloat32Array(0.1, 0.4), -"transitions": PackedFloat32Array(1, 1), -"update": 1, -"values": [-0.5, -1.0] -} -tracks/8/type = "value" -tracks/8/imported = false -tracks/8/enabled = true -tracks/8/path = NodePath("Status:skill_move_speed") -tracks/8/interp = 1 -tracks/8/loop_wrap = true -tracks/8/keys = { -"times": PackedFloat32Array(0.1, 0.4), -"transitions": PackedFloat32Array(1, 1), -"update": 1, -"values": [2.0, 0.0] -} -tracks/9/type = "method" -tracks/9/imported = false -tracks/9/enabled = true -tracks/9/path = NodePath("Battle") -tracks/9/interp = 1 -tracks/9/loop_wrap = true -tracks/9/keys = { -"times": PackedFloat32Array(0.4), -"transitions": PackedFloat32Array(1), -"values": [{ -"args": [], -"method": &"attack1" -}] -} -tracks/10/type = "method" -tracks/10/imported = false -tracks/10/enabled = true -tracks/10/path = NodePath("Effect") -tracks/10/interp = 1 -tracks/10/loop_wrap = true -tracks/10/keys = { -"times": PackedFloat32Array(0.3), -"transitions": PackedFloat32Array(1), -"values": [{ -"args": [], -"method": &"cast_attack_particle1" -}] -} -tracks/11/type = "value" -tracks/11/imported = false -tracks/11/enabled = true -tracks/11/path = NodePath("View:frame") -tracks/11/interp = 1 -tracks/11/loop_wrap = true -tracks/11/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1), +"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1), "update": 1, -"values": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] +"values": [0, 1, 2, 3, 4, 5, 6] } diff --git a/resource/skill_animation/hero01_fist_skill03.tres b/resource/skill_animation/hero01_fist_skill03.tres index 8f24e65..258e2f5 100644 --- a/resource/skill_animation/hero01_fist_skill03.tres +++ b/resource/skill_animation/hero01_fist_skill03.tres @@ -1,10 +1,10 @@ -[gd_resource type="Animation" load_steps=2 format=3 uid="uid://mnmlwnqk4aqq"] +[gd_resource type="Animation" load_steps=2 format=3 uid="uid://by2e51w02ka8s"] [ext_resource type="SpriteFrames" uid="uid://cajgs8smbkjan" path="res://resource/animation/character/hero01_fist_skill01.aseprite" id="1_o5821"] [resource] resource_name = "hero01_fist_skill03" -length = 0.7 +length = 0.9 step = 0.1 tracks/0/type = "value" tracks/0/imported = false @@ -37,7 +37,7 @@ tracks/2/path = NodePath("Status:break_level") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/keys = { -"times": PackedFloat32Array(0, 0.4, 0.5), +"times": PackedFloat32Array(0, 0.3, 0.5), "transitions": PackedFloat32Array(1, 1, 1), "update": 1, "values": [0, 3, 4] @@ -49,10 +49,10 @@ tracks/3/path = NodePath("Status:skill_move_speed") tracks/3/interp = 1 tracks/3/loop_wrap = true tracks/3/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2, 0.3), -"transitions": PackedFloat32Array(1, 1, 1, 1), +"times": PackedFloat32Array(0, 0.1), +"transitions": PackedFloat32Array(1, 1), "update": 1, -"values": [2.0, 8.0, 6.0, 0.0] +"values": [4.0, 0.0] } tracks/4/type = "method" tracks/4/imported = false @@ -61,17 +61,11 @@ tracks/4/path = NodePath("Battle") tracks/4/interp = 1 tracks/4/loop_wrap = true tracks/4/keys = { -"times": PackedFloat32Array(0.1, 0.2, 0.3), -"transitions": PackedFloat32Array(1, 1, 1), +"times": PackedFloat32Array(0.2), +"transitions": PackedFloat32Array(1), "values": [{ "args": [], "method": &"attack1" -}, { -"args": [], -"method": &"attack1" -}, { -"args": [], -"method": &"attack1" }] } tracks/5/type = "method" @@ -81,7 +75,7 @@ tracks/5/path = NodePath("Effect") tracks/5/interp = 1 tracks/5/loop_wrap = true tracks/5/keys = { -"times": PackedFloat32Array(0.1), +"times": PackedFloat32Array(0.2), "transitions": PackedFloat32Array(1), "values": [{ "args": [], @@ -95,19 +89,8 @@ tracks/6/path = NodePath("View:frame") tracks/6/interp = 1 tracks/6/loop_wrap = true tracks/6/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1), +"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1), "update": 1, -"values": [0, 1, 2, 3, 4, 5, 6] -} -tracks/7/type = "method" -tracks/7/imported = false -tracks/7/enabled = true -tracks/7/path = NodePath("Battle") -tracks/7/interp = 1 -tracks/7/loop_wrap = true -tracks/7/keys = { -"times": PackedFloat32Array(), -"transitions": PackedFloat32Array(), -"values": [] +"values": [0, 1, 2, 3, 4, 5, 6, 7, 8] } diff --git a/resource/skill_animation/hero01_long_skill01.tres b/resource/skill_animation/hero01_long_skill01.tres index 91832f7..fb091d6 100644 --- a/resource/skill_animation/hero01_long_skill01.tres +++ b/resource/skill_animation/hero01_long_skill01.tres @@ -37,7 +37,7 @@ tracks/2/path = NodePath("Status:break_level") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/keys = { -"times": PackedFloat32Array(0, 0.6, 0.7), +"times": PackedFloat32Array(0, 0.3, 0.7), "transitions": PackedFloat32Array(1, 1, 1), "update": 1, "values": [0, 3, 4] diff --git a/resource/skill_animation/hero01_long_skill02.tres b/resource/skill_animation/hero01_long_skill02.tres index 21c90fb..ab4ceb5 100644 --- a/resource/skill_animation/hero01_long_skill02.tres +++ b/resource/skill_animation/hero01_long_skill02.tres @@ -85,11 +85,14 @@ tracks/6/path = NodePath("Battle") tracks/6/interp = 1 tracks/6/loop_wrap = true tracks/6/keys = { -"times": PackedFloat32Array(0.2), -"transitions": PackedFloat32Array(1), +"times": PackedFloat32Array(0.1, 0.2), +"transitions": PackedFloat32Array(1, 1), "values": [{ "args": [], "method": &"attack1" +}, { +"args": [], +"method": &"attack1" }] } tracks/7/type = "method" @@ -99,11 +102,14 @@ tracks/7/path = NodePath("Effect") tracks/7/interp = 1 tracks/7/loop_wrap = true tracks/7/keys = { -"times": PackedFloat32Array(0.2), -"transitions": PackedFloat32Array(1), +"times": PackedFloat32Array(0.1, 0.2), +"transitions": PackedFloat32Array(1, 1), "values": [{ "args": [], "method": &"cast_attack_particle1" +}, { +"args": [], +"method": &"cast_attack_particle1" }] } tracks/8/type = "value" diff --git a/resource/skill_animation_library/animation_library.tres b/resource/skill_animation_library/animation_library.tres index 947b81c..3f50c70 100644 --- a/resource/skill_animation_library/animation_library.tres +++ b/resource/skill_animation_library/animation_library.tres @@ -1,4 +1,4 @@ -[gd_resource type="AnimationLibrary" load_steps=57 format=3 uid="uid://croik07a1qko5"] +[gd_resource type="AnimationLibrary" load_steps=58 format=3 uid="uid://croik07a1qko5"] [ext_resource type="Animation" uid="uid://t01a4jvp8srr" path="res://resource/skill_animation/hero01_fist_attack01.tres" id="1_4bwwm"] [ext_resource type="Animation" uid="uid://cfapnjkj5dkws" path="res://resource/skill_animation/hero01_basic_flash.tres" id="1_46f01"] @@ -41,10 +41,11 @@ [ext_resource type="Animation" uid="uid://uxuayi0qf3b7" path="res://resource/skill_animation/hero01_long_air_skill01.tres" id="20_0ey8y"] [ext_resource type="Animation" uid="uid://cjc6sis2xn1yy" path="res://resource/skill_animation/hero01_long_air_skill02.tres" id="21_ks43l"] [ext_resource type="Animation" uid="uid://b0a1nnw2e13sg" path="res://resource/skill_animation/hero01_fist_skill_charging01.tres" id="23_12bpf"] -[ext_resource type="Animation" uid="uid://mnmlwnqk4aqq" path="res://resource/skill_animation/hero01_fist_skill03.tres" id="23_541fl"] +[ext_resource type="Animation" uid="uid://by2e51w02ka8s" path="res://resource/skill_animation/hero01_fist_skill03.tres" id="23_541fl"] [ext_resource type="Animation" uid="uid://bbq4e0a0eyrke" path="res://resource/skill_animation/hero01_fist_skill_charging02.tres" id="24_j0oqq"] [ext_resource type="Animation" uid="uid://by0w3sn21f1v0" path="res://resource/skill_animation/hero01_fist_skill01.tres" id="24_qdhvi"] -[ext_resource type="Animation" uid="uid://bnqll5kf8t8qs" path="res://resource/skill_animation/hero01_fist_skill02.tres" id="25_j3bpt"] +[ext_resource type="Animation" uid="uid://bnqll5kf8t8qs" path="res://resource/skill_animation/hero01_fist_skill01_add.tres" id="25_j3bpt"] +[ext_resource type="Animation" uid="uid://mnmlwnqk4aqq" path="res://resource/skill_animation/hero01_fist_skill02.tres" id="28_p1ciy"] [ext_resource type="Animation" uid="uid://h8hm3kbecdx8" path="res://resource/skill_animation/hero01_remote01.tres" id="33_7i37k"] [ext_resource type="Animation" uid="uid://q7qlw0a7hfjt" path="res://resource/skill_animation/hero01_slash01.tres" id="38_lyels"] [ext_resource type="Animation" uid="uid://b7f0rdven8gdc" path="res://resource/skill_animation/hero01_long_skill03.tres" id="42_d2bqv"] @@ -84,7 +85,8 @@ _data = { &"hero01_fist_attack04": ExtResource("4_087em"), &"hero01_fist_attack05": ExtResource("2_y7w3h"), &"hero01_fist_skill01": ExtResource("24_qdhvi"), -&"hero01_fist_skill02": ExtResource("25_j3bpt"), +&"hero01_fist_skill01_add": ExtResource("25_j3bpt"), +&"hero01_fist_skill02": ExtResource("28_p1ciy"), &"hero01_fist_skill03": ExtResource("23_541fl"), &"hero01_fist_skill_charging": ExtResource("1_nd54y"), &"hero01_fist_skill_charging01": ExtResource("23_12bpf"), diff --git a/scene/ai/bullet_simple.tscn b/scene/ai/bullet_simple.tscn index 3fefba1..24469e9 100644 --- a/scene/ai/bullet_simple.tscn +++ b/scene/ai/bullet_simple.tscn @@ -11,7 +11,7 @@ [node name="BeehaveTree" type="Node" node_paths=PackedStringArray("blackboard")] script = ExtResource("1_7oi2o") -blackboard = NodePath("@Node@25099") +blackboard = NodePath("@Node@25084") [node name="SequenceComposite" type="Node" parent="."] script = ExtResource("3_i33jf") diff --git a/scene/ai/monster01.tscn b/scene/ai/monster01.tscn index 0733337..0e82f45 100644 --- a/scene/ai/monster01.tscn +++ b/scene/ai/monster01.tscn @@ -11,7 +11,7 @@ [node name="BeehaveTree" type="Node" node_paths=PackedStringArray("blackboard")] script = ExtResource("1_bbyao") -blackboard = NodePath("@Node@25100") +blackboard = NodePath("@Node@25085") [node name="SequenceComposite" type="Node" parent="."] script = ExtResource("2_04nig") diff --git a/scene/character/character.tscn b/scene/character/character.tscn index e837ee1..0f7dbc9 100644 --- a/scene/character/character.tscn +++ b/scene/character/character.tscn @@ -4,7 +4,7 @@ [ext_resource type="Script" uid="uid://cms637d0jt6sk" path="res://script/character/hitbox.gd" id="2_6xf87"] [ext_resource type="Script" uid="uid://bfi4gneebe3oq" path="res://script/character/status.gd" id="2_txdip"] [ext_resource type="Script" uid="uid://cnaqs44siwa45" path="res://script/character/move.gd" id="4_66r53"] -[ext_resource type="SpriteFrames" uid="uid://ce83cuqwgwwi4" path="res://resource/animation/character/hero01_long_attack.aseprite" id="4_sox5o"] +[ext_resource type="SpriteFrames" uid="uid://cajgs8smbkjan" path="res://resource/animation/character/hero01_fist_skill01.aseprite" id="4_sox5o"] [ext_resource type="Script" uid="uid://c247mf44qb3uf" path="res://script/character/view.gd" id="4_vijjv"] [ext_resource type="Script" uid="uid://c24is3uqqcmcn" path="res://script/character/skill.gd" id="6_h4xqy"] [ext_resource type="AnimationLibrary" uid="uid://croik07a1qko5" path="res://resource/skill_animation_library/animation_library.tres" id="6_pakq5"] @@ -124,7 +124,7 @@ shape = SubResource("CylinderShape3D_ehwx5") [node name="Status" type="Node3D" parent="."] unique_name_in_owner = true script = ExtResource("2_txdip") -speed_up_rate = -0.5 +speed_up_rate = -1.0 skill_move_speed = 2.0 skill_float_speed = 0.1 @@ -138,7 +138,7 @@ pixel_size = 0.02 double_sided = false texture_filter = 0 sprite_frames = ExtResource("4_sox5o") -animation = &"long_air_attack03" +animation = &"fist_skill03" script = ExtResource("4_vijjv") [node name="Move" type="Node3D" parent="."] @@ -187,7 +187,7 @@ script = ExtResource("14_gua01") [node name="Throw" type="AnimatedSprite3D" parent="."] unique_name_in_owner = true -transform = Transform3D(-1, 0, 0, 0, 1, 0, 0, 0, 1, 0.75, 0.4, 0) +transform = Transform3D(-1, 0, 0, 0, 1, -8.74228e-08, 0, 8.74228e-08, 1, 0.75, 0.4, 0) visible = false pixel_size = 0.02 sprite_frames = ExtResource("15_70jx1") diff --git a/scene/effect/particle/_particle_fist1.tscn b/scene/effect/particle/_particle_fist1.tscn index 6aa3708..f2dc640 100644 --- a/scene/effect/particle/_particle_fist1.tscn +++ b/scene/effect/particle/_particle_fist1.tscn @@ -1,14 +1,14 @@ [gd_scene load_steps=36 format=3 uid="uid://cohy1qv35n57q"] -[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_2o8k8"] -[ext_resource type="Shader" path="res://render/shader/effect_slash.gdshader" id="2_f3m3g"] +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_2o8k8"] +[ext_resource type="Shader" uid="uid://b4x52xwsln0sq" path="res://render/shader/effect_slash.gdshader" id="2_f3m3g"] [ext_resource type="Texture2D" uid="uid://c4byf37he3mjt" path="res://render/texture/particle/noise/noise1.png" id="3_paeu0"] [ext_resource type="Texture2D" uid="uid://dg6i5l05y3vww" path="res://render/texture/particle/gradient/gradient2.png" id="3_yyp7i"] [ext_resource type="Texture2D" uid="uid://b5nr3mq3u5tjn" path="res://render/texture/particle/mask/mask13.png" id="5_4pjvu"] [ext_resource type="Texture2D" uid="uid://dd3e7ol8qa5eq" path="res://render/texture/particle/noise/noise2.png" id="5_yf7h5"] [ext_resource type="ArrayMesh" uid="uid://dq207a0waxk0j" path="res://render/mesh/slash1.obj" id="7_tkeme"] [ext_resource type="Texture2D" uid="uid://hcpxvwtjhvag" path="res://render/texture/particle/mask/mask11.png" id="8_7gljn"] -[ext_resource type="Shader" path="res://render/shader/effect_slash_dark.gdshader" id="9_ocwqc"] +[ext_resource type="Shader" uid="uid://yl3qwpecny54" path="res://render/shader/effect_slash_dark.gdshader" id="9_ocwqc"] [ext_resource type="Texture2D" uid="uid://ciusodtprwghg" path="res://render/texture/particle/gradient/gradient4.png" id="10_x51x7"] [ext_resource type="Texture2D" uid="uid://c61nspskft0to" path="res://render/texture/particle/mask/mask14.png" id="11_uxv6d"] [ext_resource type="RibbonTrailMesh" uid="uid://cv0787wcswb6d" path="res://render/trail_mesh/flare_blunt.tres" id="12_ukx45"] @@ -38,7 +38,7 @@ metadata/_snap_enabled = true curve = SubResource("Curve_4ofb5") [sub_resource type="Curve" id="Curve_q5uf1"] -max_value = 1.1 +_limits = [0.0, 1.1, 0.0, 1.0] _data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(1, 1.1), 0.0, 0.0, 0, 0] point_count = 2 @@ -136,6 +136,7 @@ emission_ring_axis = Vector3(0, 1, 0) emission_ring_height = 0.2 emission_ring_radius = 1.25 emission_ring_inner_radius = 1.0 +emission_ring_cone_angle = 90.0 radial_velocity_min = 2.99998 radial_velocity_max = 3.99998 radial_velocity_curve = SubResource("CurveTexture_73qq2") diff --git a/scene/effect/particle/hero01_fist_skill03.tscn b/scene/effect/particle/hero01_fist_skill03.tscn new file mode 100644 index 0000000..b8996e2 --- /dev/null +++ b/scene/effect/particle/hero01_fist_skill03.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=3 format=3 uid="uid://dg35c5r582lry"] + +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_ua8eh"] +[ext_resource type="PackedScene" uid="uid://cohy1qv35n57q" path="res://scene/effect/particle/_particle_fist1.tscn" id="2_8oawf"] + +[node name="Particle" type="Node3D"] +script = ExtResource("1_ua8eh") + +[node name="Particle" parent="." instance=ExtResource("2_8oawf")] +transform = Transform3D(0.8, 0, 0, 0, -3.49691e-08, -0.8, 0, 0.8, -3.49691e-08, 0, 0, 0) diff --git a/script/character/battle.gd b/script/character/battle.gd index 19550b0..30ae5fe 100644 --- a/script/character/battle.gd +++ b/script/character/battle.gd @@ -67,10 +67,27 @@ func add_attack(attack_info: Struct.AttackInfo) -> void: result = target else: battle_attack_area.refresh_attack_area(attack_info) + var offset_xz: Vector2 = attack_info.attack_dir * attack_info.attack_box.offset.x + var offset_y: float = attack_info.attack_box.offset.y + var offset: Vector3 = Vector3(offset_xz.x, offset_y, offset_xz.y) + var shape: Shape3D = attack_info.attack_box.shape + _debug_draw_attack_box(shape, offset) return on_attack_character(result, attack_info) +func _debug_draw_attack_box(shape: Shape3D, offset: Vector3) -> void: + if not get_tree().debug_collisions_hint: + return + if shape is BoxShape3D: + var box_scale: Vector3 = shape.size + character.cast_particle(ResourceManager.particle_debug_box, false, offset, box_scale) + elif shape is CylinderShape3D: + var box_scale: Vector3 = Vector3(shape.radius, shape.height, shape.radius) + character.cast_particle(ResourceManager.particle_debug_cylinder, false, offset, box_scale) + return + + func on_attack_character(result: Character, attack_info: Struct.AttackInfo) -> void: if attack_info.attack_box.is_hit_self != (result.team() == character.team()): return @@ -472,7 +489,7 @@ func on_hero01_long_stab01_cast(): func on_hero01_fist_skill01_break(): var target: int = status.throw_target - skill.cast_skill_by_name("hero01_fist_skill02", status.move_dir) + skill.cast_skill_by_name("hero01_fist_skill01_add", status.move_dir) status.throw_target = target diff --git a/script/character/skill.gd b/script/character/skill.gd index 95e1651..b2f6c2a 100644 --- a/script/character/skill.gd +++ b/script/character/skill.gd @@ -177,6 +177,7 @@ func break_skill(): status.is_hit_wall = false status.set_skill_break_level_add(0) buff.remove_buff("charging") + buff.remove_buff("pause") battle_attack_area.set_active(false) if status.throw_target != 0: var character_to: Character = Global.character_mgr.get_character(status.throw_target) diff --git a/script/manager/camera_manager.gd b/script/manager/camera_manager.gd index 70f308e..abe8eb9 100644 --- a/script/manager/camera_manager.gd +++ b/script/manager/camera_manager.gd @@ -12,7 +12,7 @@ var level_size: Vector2 = Vector2(12.8, 7.68) var level_pos: Vector2 = Vector2.ZERO var offset: float = 10 var shake_offset_x: float -var camera_limit: Vector3 = Vector3(6.4, 1.7, 3.58) #x,z-up,z-down +var camera_limit: Vector3 = Vector3(6.4, 1.7, 3.28) #x,z-up,z-down var camera_size: float = 7.2 var basic_size: Vector2 = Vector2(640, 360) var scale_y: float = cos(deg_to_rad(45.0)) * 2.0 #1.414 @@ -102,7 +102,7 @@ func on_character_create(id: int, type: int, pos: Vector3): func on_character_pos_changed(id: int, pos: Vector3): if id == target: target_character_pos.x = pos.x - target_character_pos.y = pos.z + target_character_pos.y = pos.z - 0.4 target_pos_y = pos.y refresh_target_pos()