diff --git a/config/skill_core/hero01_soul_hit01.tres b/config/skill_core/hero01_soul_hit01.tres index 8051b92..3e463d4 100644 --- a/config/skill_core/hero01_soul_hit01.tres +++ b/config/skill_core/hero01_soul_hit01.tres @@ -20,6 +20,7 @@ free_lock = false ignore_push = false is_lock_x = true is_lock_x_move = false +is_lock_x_move_sub = true range = 0.0 warn_type = 0 animation_name = "none" diff --git a/config/skill_core/hero01_soul_slash.tres b/config/skill_core/hero01_soul_slash.tres index 24e48af..0be9dad 100644 --- a/config/skill_core/hero01_soul_slash.tres +++ b/config/skill_core/hero01_soul_slash.tres @@ -21,6 +21,7 @@ free_lock = false ignore_push = false is_lock_x = true is_lock_x_move = false +is_lock_x_move_sub = true range = 0.0 warn_type = 0 sprite_frames = ExtResource("3_7738e") diff --git a/config/skill_player_basic/hero01_basic_air_flash.tres b/config/skill_player_basic/hero01_basic_air_flash.tres index a018706..22c81e1 100644 --- a/config/skill_player_basic/hero01_basic_air_flash.tres +++ b/config/skill_player_basic/hero01_basic_air_flash.tres @@ -22,6 +22,7 @@ free_lock = true ignore_push = true is_lock_x = false is_lock_x_move = false +is_lock_x_move_sub = false range = 0.0 warn_type = 0 sprite_frames = ExtResource("3_ciqr7") diff --git a/config/skill_player_basic/hero01_basic_flash.tres b/config/skill_player_basic/hero01_basic_flash.tres index daab31d..48aa182 100644 --- a/config/skill_player_basic/hero01_basic_flash.tres +++ b/config/skill_player_basic/hero01_basic_flash.tres @@ -22,6 +22,7 @@ free_lock = true ignore_push = true is_lock_x = false is_lock_x_move = false +is_lock_x_move_sub = false range = 0.0 warn_type = 0 sprite_frames = ExtResource("3_i6jjr") diff --git a/config/skill_player_weapon/hero01_fist_air_attack01.tres b/config/skill_player_weapon/hero01_fist_air_attack01.tres index b9d4fe9..348804f 100644 --- a/config/skill_player_weapon/hero01_fist_air_attack01.tres +++ b/config/skill_player_weapon/hero01_fist_air_attack01.tres @@ -2,7 +2,7 @@ [ext_resource type="Resource" uid="uid://dib6g7t6p5ac2" path="res://config/attack/blunt_normal_hit.tres" id="1_v7ajo"] [ext_resource type="Resource" uid="uid://dja8jwx16njmf" path="res://config/attack_box/box_small.tres" id="2_ipoga"] -[ext_resource type="Script" path="res://script/config/skill_weapon_cfg.gd" id="3_v1wiv"] +[ext_resource type="Script" uid="uid://dgwtu2wj5033u" path="res://script/config/skill_weapon_cfg.gd" id="3_v1wiv"] [ext_resource type="Animation" uid="uid://chj3rlh6krt66" path="res://resource/skill_animation/hero01_fist_air_attack01.tres" id="4_nfkff"] [ext_resource type="SpriteFrames" uid="uid://bhsotj76tuovy" path="res://resource/animation/character/hero01_fist_attack.aseprite" id="5_7yyxp"] [ext_resource type="Resource" uid="uid://c6alg8pmqfdxm" path="res://config/weapon/fist.tres" id="6_aclp5"] @@ -12,25 +12,24 @@ script = ExtResource("3_v1wiv") weapon = ExtResource("6_aclp5") action = "attack_light" name = "" +sub_character_count = 0 skill_animation = ExtResource("4_nfkff") -range = 0.0 -free_lock = false -ignore_push = false -attack1 = ExtResource("1_v7ajo") -attack1_box = ExtResource("2_ipoga") -attack1_with_pause_frame = true -attack1_with_stop = true -attack2_with_pause_frame = false -attack2_with_stop = false stance_from = 10 stance_to = 11 break_level = 3 is_charging = false +attack1 = ExtResource("1_v7ajo") +attack1_box = ExtResource("2_ipoga") +attack1_with_stop = true +attack2_with_stop = false mp_cost = 0 mp_sub_cost = false +free_lock = false +ignore_push = false +is_lock_x = false +is_lock_x_move = false +is_lock_x_move_sub = true +range = 0.0 warn_type = 0 -with_stop = false -is_lock_x = true -refresh_animation = false sprite_frames = ExtResource("5_7yyxp") animation_name = "fist_air_attack01" diff --git a/config/skill_player_weapon/hero01_fist_air_attack02.tres b/config/skill_player_weapon/hero01_fist_air_attack02.tres index 72e728e..b23e79b 100644 --- a/config/skill_player_weapon/hero01_fist_air_attack02.tres +++ b/config/skill_player_weapon/hero01_fist_air_attack02.tres @@ -2,7 +2,7 @@ [ext_resource type="Resource" uid="uid://dib6g7t6p5ac2" path="res://config/attack/blunt_normal_hit.tres" id="1_cut8n"] [ext_resource type="Resource" uid="uid://dja8jwx16njmf" path="res://config/attack_box/box_small.tres" id="2_8enki"] -[ext_resource type="Script" path="res://script/config/skill_weapon_cfg.gd" id="3_agxba"] +[ext_resource type="Script" uid="uid://dgwtu2wj5033u" path="res://script/config/skill_weapon_cfg.gd" id="3_agxba"] [ext_resource type="Animation" uid="uid://dia1xwl6foafg" path="res://resource/skill_animation/hero01_fist_air_attack02.tres" id="4_jbb00"] [ext_resource type="SpriteFrames" uid="uid://bhsotj76tuovy" path="res://resource/animation/character/hero01_fist_attack.aseprite" id="5_byipk"] [ext_resource type="Resource" uid="uid://c6alg8pmqfdxm" path="res://config/weapon/fist.tres" id="6_ad202"] @@ -12,25 +12,24 @@ script = ExtResource("3_agxba") weapon = ExtResource("6_ad202") action = "attack_light" name = "" +sub_character_count = 0 skill_animation = ExtResource("4_jbb00") -range = 0.0 -free_lock = false -ignore_push = false -attack1 = ExtResource("1_cut8n") -attack1_box = ExtResource("2_8enki") -attack1_with_pause_frame = true -attack1_with_stop = true -attack2_with_pause_frame = false -attack2_with_stop = false stance_from = 11 stance_to = 12 break_level = 3 is_charging = false +attack1 = ExtResource("1_cut8n") +attack1_box = ExtResource("2_8enki") +attack1_with_stop = true +attack2_with_stop = false mp_cost = 0 mp_sub_cost = false -warn_type = 0 -with_stop = false +free_lock = false +ignore_push = false is_lock_x = true -refresh_animation = false +is_lock_x_move = false +is_lock_x_move_sub = true +range = 0.0 +warn_type = 0 sprite_frames = ExtResource("5_byipk") animation_name = "fist_air_attack02" diff --git a/config/skill_player_weapon/hero01_fist_air_attack03.tres b/config/skill_player_weapon/hero01_fist_air_attack03.tres index 99f3db3..1a442a7 100644 --- a/config/skill_player_weapon/hero01_fist_air_attack03.tres +++ b/config/skill_player_weapon/hero01_fist_air_attack03.tres @@ -12,25 +12,24 @@ script = ExtResource("3_ghxjs") weapon = ExtResource("6_t7m8t") action = "attack_light" name = "" +sub_character_count = 0 skill_animation = ExtResource("4_y802t") -range = 0.0 -free_lock = false -ignore_push = false -attack1 = ExtResource("1_w8lg4") -attack1_box = ExtResource("2_2gnst") -attack1_with_pause_frame = true -attack1_with_stop = true -attack2_with_pause_frame = false -attack2_with_stop = false stance_from = 12 stance_to = 13 break_level = 3 is_charging = false +attack1 = ExtResource("1_w8lg4") +attack1_box = ExtResource("2_2gnst") +attack1_with_stop = true +attack2_with_stop = false mp_cost = 0 mp_sub_cost = false -warn_type = 0 -with_stop = false +free_lock = false +ignore_push = false is_lock_x = true -refresh_animation = false +is_lock_x_move = false +is_lock_x_move_sub = true +range = 0.0 +warn_type = 0 sprite_frames = ExtResource("5_pslv2") animation_name = "fist_air_attack03" diff --git a/config/skill_player_weapon/hero01_fist_air_skill04.tres b/config/skill_player_weapon/hero01_fist_air_skill04.tres index b0adbbb..5ad618f 100644 --- a/config/skill_player_weapon/hero01_fist_air_skill04.tres +++ b/config/skill_player_weapon/hero01_fist_air_skill04.tres @@ -2,7 +2,7 @@ [ext_resource type="Resource" uid="uid://dqgmfpqv2vn3v" path="res://config/attack/blunt_mid_hit_down_back.tres" id="1_re6l4"] [ext_resource type="Resource" uid="uid://diedb7vw7eyxp" path="res://config/attack_box/box_mid.tres" id="2_anqor"] -[ext_resource type="Script" path="res://script/config/skill_weapon_cfg.gd" id="3_ty4r5"] +[ext_resource type="Script" uid="uid://dgwtu2wj5033u" path="res://script/config/skill_weapon_cfg.gd" id="3_ty4r5"] [ext_resource type="Animation" uid="uid://c2esjf8ouf22c" path="res://resource/skill_animation/hero01_fist_air_skill04.tres" id="4_p4vkr"] [ext_resource type="SpriteFrames" uid="uid://cajgs8smbkjan" path="res://resource/animation/character/hero01_fist_skill01.aseprite" id="5_xtg56"] [ext_resource type="Resource" uid="uid://c6alg8pmqfdxm" path="res://config/weapon/fist.tres" id="6_on1ob"] @@ -12,19 +12,24 @@ script = ExtResource("3_ty4r5") weapon = ExtResource("6_on1ob") action = "attack_heavy" name = "" +sub_character_count = 0 skill_animation = ExtResource("4_p4vkr") -range = 0.0 -free_lock = false -ignore_push = false -attack1 = ExtResource("1_re6l4") -attack1_box = ExtResource("2_anqor") stance_from = 12 stance_to = 10 break_level = 3 is_charging = false +attack1 = ExtResource("1_re6l4") +attack1_box = ExtResource("2_anqor") +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 +is_lock_x_move_sub = true +range = 0.0 warn_type = 0 -with_stop = false -refresh_animation = false sprite_frames = ExtResource("5_xtg56") animation_name = "fist_air_skill04" diff --git a/config/skill_player_weapon/hero01_fist_air_skill_charging.tres b/config/skill_player_weapon/hero01_fist_air_skill_charging.tres index 48ca6d9..48f9711 100644 --- a/config/skill_player_weapon/hero01_fist_air_skill_charging.tres +++ b/config/skill_player_weapon/hero01_fist_air_skill_charging.tres @@ -31,6 +31,7 @@ free_lock = false ignore_push = true is_lock_x = false is_lock_x_move = false +is_lock_x_move_sub = false range = 0.0 warn_type = 0 animation_name = "fist_air_skill_charging" diff --git a/config/skill_player_weapon/hero01_fist_attack05.tres b/config/skill_player_weapon/hero01_fist_attack05.tres index 54de87c..4d33b96 100644 --- a/config/skill_player_weapon/hero01_fist_attack05.tres +++ b/config/skill_player_weapon/hero01_fist_attack05.tres @@ -27,6 +27,7 @@ free_lock = false ignore_push = false is_lock_x = true is_lock_x_move = false +is_lock_x_move_sub = true range = 0.0 warn_type = 0 animation_name = "fist_attack05" diff --git a/config/skill_player_weapon/hero01_fist_skill03.tres b/config/skill_player_weapon/hero01_fist_skill03.tres index fe9f504..47817d3 100644 --- a/config/skill_player_weapon/hero01_fist_skill03.tres +++ b/config/skill_player_weapon/hero01_fist_skill03.tres @@ -27,6 +27,7 @@ free_lock = false ignore_push = true is_lock_x = true is_lock_x_move = false +is_lock_x_move_sub = true range = 0.0 warn_type = 0 animation_name = "fist_skill03" diff --git a/config/skill_player_weapon/hero01_fist_skill04.tres b/config/skill_player_weapon/hero01_fist_skill04.tres new file mode 100644 index 0000000..4e27b50 --- /dev/null +++ b/config/skill_player_weapon/hero01_fist_skill04.tres @@ -0,0 +1,35 @@ +[gd_resource type="Resource" script_class="SkillWeaponCfg" load_steps=7 format=3 uid="uid://c4qwbcc5ut6ki"] + +[ext_resource type="Resource" uid="uid://by6jd5xqjml2m" path="res://config/attack/blunt_starfall_1.tres" id="1_7hju6"] +[ext_resource type="Resource" uid="uid://qp5sy3u3rlpe" path="res://config/attack_box/box_high.tres" id="2_7hju6"] +[ext_resource type="Script" uid="uid://dgwtu2wj5033u" path="res://script/config/skill_weapon_cfg.gd" id="3_6gc3n"] +[ext_resource type="Animation" uid="uid://dh1d2vg2hd1lr" path="res://resource/skill_animation/hero01_fist_skill04.tres" id="4_7hju6"] +[ext_resource type="SpriteFrames" uid="uid://cajgs8smbkjan" path="res://resource/animation/character/hero01_fist_skill01.aseprite" id="5_6gc3n"] +[ext_resource type="Resource" uid="uid://c6alg8pmqfdxm" path="res://config/weapon/fist.tres" id="5_pwj34"] + +[resource] +script = ExtResource("3_6gc3n") +weapon = ExtResource("5_pwj34") +action = "attack_heavy" +name = "" +sub_character_count = 0 +skill_animation = ExtResource("4_7hju6") +stance_from = 4 +stance_to = 10 +break_level = 3 +is_charging = false +attack1 = ExtResource("1_7hju6") +attack1_box = ExtResource("2_7hju6") +attack1_with_stop = false +attack2_with_stop = false +mp_cost = 0 +mp_sub_cost = false +free_lock = false +ignore_push = true +is_lock_x = true +is_lock_x_move = false +is_lock_x_move_sub = true +range = 0.0 +warn_type = 0 +sprite_frames = ExtResource("5_6gc3n") +animation_name = "fist_skill04" diff --git a/config/skill_player_weapon/hero01_fist_skill_special01.tres b/config/skill_player_weapon/hero01_fist_skill_special01.tres index b2a9446..dfad47b 100644 --- a/config/skill_player_weapon/hero01_fist_skill_special01.tres +++ b/config/skill_player_weapon/hero01_fist_skill_special01.tres @@ -27,6 +27,7 @@ free_lock = false ignore_push = true is_lock_x = true is_lock_x_move = false +is_lock_x_move_sub = true range = 0.0 warn_type = 0 animation_name = "fist_skill_special01" diff --git a/config/skill_player_weapon/hero01_long_air_attack03.tres b/config/skill_player_weapon/hero01_long_air_attack03.tres index 5e5ea5a..2fb20ae 100644 --- a/config/skill_player_weapon/hero01_long_air_attack03.tres +++ b/config/skill_player_weapon/hero01_long_air_attack03.tres @@ -27,6 +27,7 @@ free_lock = false ignore_push = false is_lock_x = true is_lock_x_move = false +is_lock_x_move_sub = true range = 0.0 warn_type = 0 animation_name = "" diff --git a/config/skill_player_weapon/hero01_long_air_skill02.tres b/config/skill_player_weapon/hero01_long_air_skill02.tres index 5bc8753..6ed1295 100644 --- a/config/skill_player_weapon/hero01_long_air_skill02.tres +++ b/config/skill_player_weapon/hero01_long_air_skill02.tres @@ -27,6 +27,7 @@ free_lock = false ignore_push = true is_lock_x = true is_lock_x_move = true +is_lock_x_move_sub = true range = 0.0 warn_type = 0 animation_name = "long_air_skill02" diff --git a/config/skill_player_weapon/hero01_long_skill01.tres b/config/skill_player_weapon/hero01_long_skill01.tres index 2ec0075..3252347 100644 --- a/config/skill_player_weapon/hero01_long_skill01.tres +++ b/config/skill_player_weapon/hero01_long_skill01.tres @@ -1,7 +1,8 @@ -[gd_resource type="Resource" script_class="SkillWeaponCfg" load_steps=7 format=3 uid="uid://cwqbhrv8bd5vn"] +[gd_resource type="Resource" script_class="SkillWeaponCfg" load_steps=8 format=3 uid="uid://cwqbhrv8bd5vn"] [ext_resource type="Resource" uid="uid://2bkub7vmxjeu" path="res://config/attack/sharp_mid_hit_blow.tres" id="1_blbi2"] -[ext_resource type="Script" path="res://script/config/skill_weapon_cfg.gd" id="1_ud5ph"] +[ext_resource type="Script" uid="uid://dgwtu2wj5033u" path="res://script/config/skill_weapon_cfg.gd" id="1_ud5ph"] +[ext_resource type="Resource" uid="uid://d3mcp8sf6qbmd" path="res://config/attack/sharp_normal_hit.tres" id="1_yey4n"] [ext_resource type="Animation" uid="uid://bjnkrte7660pt" path="res://resource/skill_animation/hero01_long_skill01.tres" id="2_ewts2"] [ext_resource type="Resource" uid="uid://hg1w2k1u3wn" path="res://config/attack_box/circle_large.tres" id="2_fayd5"] [ext_resource type="SpriteFrames" uid="uid://dhfqj1dxldqao" path="res://resource/animation/character/hero01_long_skill01.aseprite" id="3_qwjfl"] @@ -12,25 +13,26 @@ script = ExtResource("1_ud5ph") weapon = ExtResource("4_3bf64") action = "attack_heavy" name = "" +sub_character_count = 0 skill_animation = ExtResource("2_ewts2") -range = 0.0 -free_lock = false -ignore_push = false -attack1 = ExtResource("1_blbi2") -attack1_box = ExtResource("2_fayd5") -attack1_with_pause_frame = true -attack1_with_stop = true -attack2_with_pause_frame = false -attack2_with_stop = false stance_from = 1 stance_to = 2 break_level = 3 is_charging = false +attack1 = ExtResource("1_yey4n") +attack1_box = ExtResource("2_fayd5") +attack1_with_stop = false +attack2 = ExtResource("1_blbi2") +attack2_box = ExtResource("2_fayd5") +attack2_with_stop = true mp_cost = 0 mp_sub_cost = false -warn_type = 0 -with_stop = false +free_lock = false +ignore_push = false is_lock_x = true -refresh_animation = false +is_lock_x_move = false +is_lock_x_move_sub = true +range = 0.0 +warn_type = 0 sprite_frames = ExtResource("3_qwjfl") animation_name = "long_skill01" diff --git a/config/skill_player_weapon/hero01_long_stab02.tres b/config/skill_player_weapon/hero01_long_stab02.tres index 2c4e7fa..3abd099 100644 --- a/config/skill_player_weapon/hero01_long_stab02.tres +++ b/config/skill_player_weapon/hero01_long_stab02.tres @@ -27,6 +27,7 @@ free_lock = false ignore_push = true is_lock_x = true is_lock_x_move = true +is_lock_x_move_sub = true range = 0.0 warn_type = 0 animation_name = "long_skill_stab02" diff --git a/config/skill_player_weapon/hero01_long_stab03.tres b/config/skill_player_weapon/hero01_long_stab03.tres index fb66e7b..960fdab 100644 --- a/config/skill_player_weapon/hero01_long_stab03.tres +++ b/config/skill_player_weapon/hero01_long_stab03.tres @@ -29,6 +29,7 @@ free_lock = false ignore_push = true is_lock_x = true is_lock_x_move = true +is_lock_x_move_sub = true range = 0.0 warn_type = 0 animation_name = "long_skill_stab02" diff --git a/config/skill_player_weapon/hero01_short_skill01.tres b/config/skill_player_weapon/hero01_short_skill01.tres index 7195748..7270373 100644 --- a/config/skill_player_weapon/hero01_short_skill01.tres +++ b/config/skill_player_weapon/hero01_short_skill01.tres @@ -23,6 +23,7 @@ free_lock = false ignore_push = false is_lock_x = true is_lock_x_move = false +is_lock_x_move_sub = true range = 0.0 warn_type = 0 animation_name = "short_skill_stab01" diff --git a/config/skill_player_weapon/hero01_short_stab01.tres b/config/skill_player_weapon/hero01_short_stab01.tres index 62f72f1..53a7dbb 100644 --- a/config/skill_player_weapon/hero01_short_stab01.tres +++ b/config/skill_player_weapon/hero01_short_stab01.tres @@ -29,6 +29,7 @@ free_lock = false ignore_push = true is_lock_x = false is_lock_x_move = false +is_lock_x_move_sub = true range = 0.0 warn_type = 0 animation_name = "long_skill_stab01" diff --git a/render/trail_mesh/flare_blunt_slash.tres b/render/trail_mesh/flare_blunt_slash.tres index 241a828..3cd66e3 100644 --- a/render/trail_mesh/flare_blunt_slash.tres +++ b/render/trail_mesh/flare_blunt_slash.tres @@ -1,6 +1,6 @@ [gd_resource type="RibbonTrailMesh" load_steps=4 format=3 uid="uid://c3hyy5yknwsfl"] -[ext_resource type="Shader" path="res://render/shader/trail.gdshader" id="1_oq8oa"] +[ext_resource type="Shader" uid="uid://bey68hqql2gfr" path="res://render/shader/trail.gdshader" id="1_oq8oa"] [ext_resource type="Texture2D" uid="uid://bt32dgn3mag0w" path="res://render/texture/particle/gradient/gradient5.png" id="2_u7sma"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_sawav"] diff --git a/resource/animation/character/hero01_fist_skill01.aseprite b/resource/animation/character/hero01_fist_skill01.aseprite index a341a85..83659ec 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 f5caee0..9087c99 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_long_skill01.aseprite b/resource/animation/character/hero01_long_skill01.aseprite index 3944709..0e26f82 100644 Binary files a/resource/animation/character/hero01_long_skill01.aseprite and b/resource/animation/character/hero01_long_skill01.aseprite differ diff --git a/resource/animation/character/hero01_long_skill01.png b/resource/animation/character/hero01_long_skill01.png index 2efa07e..3dd4099 100644 Binary files a/resource/animation/character/hero01_long_skill01.png and b/resource/animation/character/hero01_long_skill01.png differ diff --git a/resource/mesh_library/mesh_library_main.tres b/resource/mesh_library/mesh_library_main.tres index d9123cb..dcf4180 100644 --- a/resource/mesh_library/mesh_library_main.tres +++ b/resource/mesh_library/mesh_library_main.tres @@ -1,7 +1,7 @@ [gd_resource type="MeshLibrary" load_steps=30 format=3 uid="uid://bmyo1828sbetg"] [ext_resource type="ArrayMesh" path="res://.godot/imported/main_cave_full.vox-d3ff94dc223d1a52d1f31079c8e2a62a.mesh" id="1_tdu4k"] -[ext_resource type="Shape3D" uid="uid://od6oviel3ny2" path="res://resource/mesh_library/default_shape_large_full.tres" id="2_r143j"] +[ext_resource type="Shape3D" uid="uid://ch7a55vopmlvc" path="res://resource/mesh_library/default_shape_large_full.tres" id="2_r143j"] [ext_resource type="ArrayMesh" path="res://.godot/imported/main_graybox_full.vox-a58be67573bdd21889eb5ca069ec437f.mesh" id="3_lru8n"] [ext_resource type="Shape3D" uid="uid://bu7jdmo4po5n7" path="res://resource/mesh_library/default_shape_large_stair1.tres" id="4_0ehrt"] [ext_resource type="ArrayMesh" path="res://.godot/imported/main_graybox_half.vox-7ddcfdc027de1ffda730ae0a6b0e66c7.mesh" id="4_2i7gw"] diff --git a/resource/skill_animation/hero01_fist_air_attack01.tres b/resource/skill_animation/hero01_fist_air_attack01.tres index 6cd135e..533a5ad 100644 --- a/resource/skill_animation/hero01_fist_air_attack01.tres +++ b/resource/skill_animation/hero01_fist_air_attack01.tres @@ -5,6 +5,7 @@ [resource] resource_name = "hero01_fist_air_attack01" length = 0.9 +step = 0.1 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true @@ -98,7 +99,7 @@ tracks/7/path = NodePath("Effect") tracks/7/interp = 1 tracks/7/loop_wrap = true tracks/7/keys = { -"times": PackedFloat32Array(0.1), +"times": PackedFloat32Array(0.2), "transitions": PackedFloat32Array(1), "values": [{ "args": [], diff --git a/resource/skill_animation/hero01_fist_air_attack02.tres b/resource/skill_animation/hero01_fist_air_attack02.tres index 745de68..b5fe672 100644 --- a/resource/skill_animation/hero01_fist_air_attack02.tres +++ b/resource/skill_animation/hero01_fist_air_attack02.tres @@ -5,6 +5,7 @@ [resource] resource_name = "hero01_fist_air_attack02" length = 0.7 +step = 0.1 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true @@ -98,7 +99,7 @@ tracks/7/path = NodePath("Effect") tracks/7/interp = 1 tracks/7/loop_wrap = true tracks/7/keys = { -"times": PackedFloat32Array(0.1), +"times": PackedFloat32Array(0.2), "transitions": PackedFloat32Array(1), "values": [{ "args": [], diff --git a/resource/skill_animation/hero01_fist_air_skill03.tres b/resource/skill_animation/hero01_fist_air_skill03.tres index cad5973..b17b456 100644 --- a/resource/skill_animation/hero01_fist_air_skill03.tres +++ b/resource/skill_animation/hero01_fist_air_skill03.tres @@ -87,17 +87,23 @@ tracks/5/path = NodePath("Effect") tracks/5/interp = 1 tracks/5/loop_wrap = true tracks/5/keys = { -"times": PackedFloat32Array(0.0999999, 0.4, 0.9), -"transitions": PackedFloat32Array(1, 1, 1), +"times": PackedFloat32Array(0.2, 0.3, 0.5, 0.6, 1), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1), "values": [{ "args": [], "method": &"cast_attack_particle1" }, { "args": [], +"method": &"cast_attack_particle2" +}, { +"args": [], "method": &"cast_attack_particle1" }, { "args": [], "method": &"cast_attack_particle2" +}, { +"args": [], +"method": &"cast_attack_particle3" }] } tracks/6/type = "value" diff --git a/resource/skill_animation/hero01_fist_air_skill04.tres b/resource/skill_animation/hero01_fist_air_skill04.tres index 8cd2573..866b83b 100644 --- a/resource/skill_animation/hero01_fist_air_skill04.tres +++ b/resource/skill_animation/hero01_fist_air_skill04.tres @@ -99,7 +99,7 @@ tracks/7/path = NodePath("Effect") tracks/7/interp = 1 tracks/7/loop_wrap = true tracks/7/keys = { -"times": PackedFloat32Array(0.1), +"times": PackedFloat32Array(0.2), "transitions": PackedFloat32Array(1), "values": [{ "args": [], diff --git a/resource/skill_animation/hero01_fist_skill01.tres b/resource/skill_animation/hero01_fist_skill01.tres index 49e87b6..46985ad 100644 --- a/resource/skill_animation/hero01_fist_skill01.tres +++ b/resource/skill_animation/hero01_fist_skill01.tres @@ -5,6 +5,7 @@ [resource] resource_name = "hero01_fist_skill01" length = 0.8 +step = 0.1 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true @@ -86,7 +87,7 @@ tracks/6/path = NodePath("Effect") tracks/6/interp = 1 tracks/6/loop_wrap = true tracks/6/keys = { -"times": PackedFloat32Array(0.1), +"times": PackedFloat32Array(0.2), "transitions": PackedFloat32Array(1), "values": [{ "args": [], diff --git a/resource/skill_animation/hero01_fist_skill01_add.tres b/resource/skill_animation/hero01_fist_skill01_add.tres index 3dbc0f7..421c111 100644 --- a/resource/skill_animation/hero01_fist_skill01_add.tres +++ b/resource/skill_animation/hero01_fist_skill01_add.tres @@ -124,12 +124,9 @@ 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" -}] +"times": PackedFloat32Array(), +"transitions": PackedFloat32Array(), +"values": [] } tracks/11/type = "value" tracks/11/imported = false diff --git a/resource/skill_animation/hero01_fist_skill04.tres b/resource/skill_animation/hero01_fist_skill04.tres new file mode 100644 index 0000000..144e54c --- /dev/null +++ b/resource/skill_animation/hero01_fist_skill04.tres @@ -0,0 +1,114 @@ +[gd_resource type="Animation" load_steps=2 format=3 uid="uid://dh1d2vg2hd1lr"] + +[ext_resource type="SpriteFrames" uid="uid://cajgs8smbkjan" path="res://resource/animation/character/hero01_fist_skill01.aseprite" id="1_yu44b"] + +[resource] +resource_name = "hero01_fist_skill04" +length = 0.9 +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_yu44b")] +} +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_skill04"] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("View:frame") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"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, 7, 8] +} +tracks/3/type = "value" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("Status:break_level") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { +"times": PackedFloat32Array(0, 0.3, 0.4), +"transitions": PackedFloat32Array(1, 1, 1), +"update": 1, +"values": [0, 3, 4] +} +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath("Status:skill_move_speed") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0.1, 0.3), +"transitions": PackedFloat32Array(1, 1), +"update": 1, +"values": [4.0, 0.0] +} +tracks/5/type = "method" +tracks/5/imported = false +tracks/5/enabled = true +tracks/5/path = NodePath("Battle") +tracks/5/interp = 1 +tracks/5/loop_wrap = true +tracks/5/keys = { +"times": PackedFloat32Array(0.2, 0.3), +"transitions": PackedFloat32Array(1, 1), +"values": [{ +"args": [], +"method": &"attack1" +}, { +"args": [], +"method": &"attack1" +}] +} +tracks/6/type = "method" +tracks/6/imported = false +tracks/6/enabled = true +tracks/6/path = NodePath("Effect") +tracks/6/interp = 1 +tracks/6/loop_wrap = true +tracks/6/keys = { +"times": PackedFloat32Array(0.2, 0.3), +"transitions": PackedFloat32Array(1, 1), +"values": [{ +"args": [], +"method": &"cast_attack_particle1" +}, { +"args": [], +"method": &"cast_attack_particle1" +}] +} +tracks/7/type = "value" +tracks/7/imported = false +tracks/7/enabled = true +tracks/7/path = NodePath("Status:skill_float_speed") +tracks/7/interp = 1 +tracks/7/loop_wrap = true +tracks/7/keys = { +"times": PackedFloat32Array(0.1, 0.3), +"transitions": PackedFloat32Array(1, 1), +"update": 1, +"values": [4.0, 0.0] +} diff --git a/resource/skill_animation/hero01_long_skill01.tres b/resource/skill_animation/hero01_long_skill01.tres index 200b098..71efb57 100644 --- a/resource/skill_animation/hero01_long_skill01.tres +++ b/resource/skill_animation/hero01_long_skill01.tres @@ -4,7 +4,6 @@ [resource] resource_name = "hero01_long_skill01" -length = 0.9 step = 0.1 tracks/0/type = "value" tracks/0/imported = false @@ -37,7 +36,7 @@ tracks/2/path = NodePath("Status:break_level") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/keys = { -"times": PackedFloat32Array(0, 0.5, 0.7), +"times": PackedFloat32Array(0, 0.4, 0.8), "transitions": PackedFloat32Array(1, 1, 1), "update": 1, "values": [0, 3, 4] @@ -49,7 +48,7 @@ tracks/3/path = NodePath("Status:speed_up_rate") tracks/3/interp = 1 tracks/3/loop_wrap = true tracks/3/keys = { -"times": PackedFloat32Array(0.1, 0.2), +"times": PackedFloat32Array(0, 0.1), "transitions": PackedFloat32Array(1, 1), "update": 1, "values": [-0.5, -1.0] @@ -61,10 +60,10 @@ tracks/4/path = NodePath("Status:skill_move_speed") tracks/4/interp = 1 tracks/4/loop_wrap = true tracks/4/keys = { -"times": PackedFloat32Array(0.1, 0.4), +"times": PackedFloat32Array(0.1, 0.5), "transitions": PackedFloat32Array(1, 1), "update": 1, -"values": [8.0, 0.0] +"values": [5.0, 0.0] } tracks/5/type = "method" tracks/5/imported = false @@ -73,11 +72,17 @@ tracks/5/path = NodePath("Battle") tracks/5/interp = 1 tracks/5/loop_wrap = true tracks/5/keys = { -"times": PackedFloat32Array(0.4), -"transitions": PackedFloat32Array(1), +"times": PackedFloat32Array(0.2, 0.3, 0.5), +"transitions": PackedFloat32Array(1, 1, 1), "values": [{ "args": [], "method": &"attack1" +}, { +"args": [], +"method": &"attack1" +}, { +"args": [], +"method": &"attack2" }] } tracks/6/type = "method" @@ -87,34 +92,37 @@ tracks/6/path = NodePath("Effect") tracks/6/interp = 1 tracks/6/loop_wrap = true tracks/6/keys = { -"times": PackedFloat32Array(0.4), -"transitions": PackedFloat32Array(1), +"times": PackedFloat32Array(0.2, 0.5), +"transitions": PackedFloat32Array(1, 1), "values": [{ "args": [], "method": &"cast_attack_particle1" +}, { +"args": [], +"method": &"cast_attack_particle2" }] } tracks/7/type = "value" tracks/7/imported = false tracks/7/enabled = true -tracks/7/path = NodePath("View:frame") +tracks/7/path = NodePath("Status:is_speed_y_freeze") tracks/7/interp = 1 tracks/7/loop_wrap = true tracks/7/keys = { -"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), +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), "update": 1, -"values": [0, 1, 2, 3, 4, 5, 6, 7, 8] +"values": [true] } tracks/8/type = "value" tracks/8/imported = false tracks/8/enabled = true -tracks/8/path = NodePath("Status:is_speed_y_freeze") +tracks/8/path = NodePath("View:frame") tracks/8/interp = 1 tracks/8/loop_wrap = true tracks/8/keys = { -"times": PackedFloat32Array(0, 0.4), -"transitions": PackedFloat32Array(1, 1), +"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": [true, false] +"values": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] } diff --git a/resource/skill_animation_library/animation_library.tres b/resource/skill_animation_library/animation_library.tres index 18bdb06..0d2fa3e 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=61 format=3 uid="uid://croik07a1qko5"] +[gd_resource type="AnimationLibrary" load_steps=62 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"] @@ -47,6 +47,7 @@ [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_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://dh1d2vg2hd1lr" path="res://resource/skill_animation/hero01_fist_skill04.tres" id="30_ptcx6"] [ext_resource type="Animation" uid="uid://b73xq7qwltbo2" path="res://resource/skill_animation/hero01_fist_skill_special01.tres" id="32_43goe"] [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"] @@ -92,6 +93,7 @@ _data = { &"hero01_fist_skill01_add": ExtResource("25_j3bpt"), &"hero01_fist_skill02": ExtResource("28_p1ciy"), &"hero01_fist_skill03": ExtResource("23_541fl"), +&"hero01_fist_skill04": ExtResource("30_ptcx6"), &"hero01_fist_skill_charging": ExtResource("1_nd54y"), &"hero01_fist_skill_charging01": ExtResource("23_12bpf"), &"hero01_fist_skill_charging02": ExtResource("24_j0oqq"), diff --git a/scene/character/character.tscn b/scene/character/character.tscn index a50cf30..8bfb6a6 100644 --- a/scene/character/character.tscn +++ b/scene/character/character.tscn @@ -1,10 +1,10 @@ -[gd_scene load_steps=25 format=3 uid="uid://8rcvw1vnjcf7"] +[gd_scene load_steps=26 format=3 uid="uid://8rcvw1vnjcf7"] [ext_resource type="Script" uid="uid://cdvtgxvof33j3" path="res://script/character/character.gd" id="1_tonbs"] [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://jpxh0jr8wp8g" path="res://resource/animation/character/hero01_basic.aseprite" id="4_sox5o"] +[ext_resource type="SpriteFrames" uid="uid://dhfqj1dxldqao" path="res://resource/animation/character/hero01_long_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"] @@ -18,6 +18,7 @@ [ext_resource type="Script" uid="uid://b573l3rqq52j7" path="res://script/character/throw.gd" id="16_ot265"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_l0gkv"] +margin = 0.01 height = 1.0 [sub_resource type="Curve" id="Curve_v7nnw"] @@ -32,6 +33,13 @@ radius = 1.0 _data = [Vector2(0, 0), 0.0, 0.0, 0, 1, Vector2(0.62982, 0), 0.0, 0.0, 0, 0, Vector2(1, 0.762586), 2.06004, 0.0, 1, 0] point_count = 3 +[sub_resource type="Curve" id="Curve_sox5o"] +_limits = [0.0, 2.0, -1.0, 1.0] +_data = [Vector2(-1, 0), 0.0, 0.4, 0, 1, Vector2(-0.5, 0.2), 0.852417, 0.852417, 0, 0, Vector2(1.49012e-08, 1), 0.505867, 0.505867, 0, 0, Vector2(1, 2), 1.50002, 0.0, 1, 0] +point_count = 4 +metadata/_snap_enabled = true +metadata/_snap_count = 20 + [sub_resource type="Animation" id="Animation_dbjx6"] length = 0.001 tracks/0/type = "value" @@ -137,13 +145,14 @@ gi_mode = 0 pixel_size = 0.02 alpha_cut = 1 sprite_frames = ExtResource("4_sox5o") -animation = &"basic_air_flash" +animation = &"long_skill01" script = ExtResource("4_vijjv") [node name="Move" type="Node3D" parent="."] unique_name_in_owner = true script = ExtResource("4_66r53") after_image_speed_curve = SubResource("Curve_1lu0a") +speed_curve = SubResource("Curve_sox5o") [node name="Skill" type="AnimationPlayer" parent="."] unique_name_in_owner = true @@ -186,7 +195,7 @@ script = ExtResource("14_gua01") [node name="Throw" type="AnimatedSprite3D" parent="."] unique_name_in_owner = true -transform = Transform3D(-1, 0, 0, 0, 1, -1.50996e-07, 0, 1.50996e-07, 1, 0.75, 0.4, 0) +transform = Transform3D(-1, 0, 0, 0, -1, 1.50996e-07, 0, -1.50996e-07, -1, 0.75, 0.4, 0) visible = false pixel_size = 0.02 sprite_frames = ExtResource("15_70jx1") diff --git a/scene/effect/particle/_particle_dash1.tscn b/scene/effect/particle/_particle_dash1.tscn index 9fc28a0..c1e1333 100644 --- a/scene/effect/particle/_particle_dash1.tscn +++ b/scene/effect/particle/_particle_dash1.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=13 format=3 uid="uid://cxopc3y11lwg1"] -[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_2qqsc"] -[ext_resource type="Shader" path="res://render/shader/effect_dash.gdshader" id="2_b7c5p"] +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_2qqsc"] +[ext_resource type="Shader" uid="uid://cv5aoog7et2oy" path="res://render/shader/effect_dash.gdshader" id="2_b7c5p"] [ext_resource type="Texture2D" uid="uid://c4byf37he3mjt" path="res://render/texture/particle/noise/noise1.png" id="3_srlkl"] [ext_resource type="Texture2D" uid="uid://vy3c8opc6uju" path="res://render/texture/particle/mask/mask17.png" id="4_1upic"] [ext_resource type="Texture2D" uid="uid://dd3e7ol8qa5eq" path="res://render/texture/particle/noise/noise2.png" id="5_yrr1g"] diff --git a/scene/effect/particle/_particle_fist2.tscn b/scene/effect/particle/_particle_fist2.tscn index e143727..622018f 100644 --- a/scene/effect/particle/_particle_fist2.tscn +++ b/scene/effect/particle/_particle_fist2.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=28 format=3 uid="uid://cjgt2myahbtci"] -[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_uf2ls"] -[ext_resource type="Shader" path="res://render/shader/effect_slash.gdshader" id="2_eqart"] +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_uf2ls"] +[ext_resource type="Shader" uid="uid://b4x52xwsln0sq" path="res://render/shader/effect_slash.gdshader" id="2_eqart"] [ext_resource type="Texture2D" uid="uid://dg6i5l05y3vww" path="res://render/texture/particle/gradient/gradient2.png" id="3_wii60"] [ext_resource type="Texture2D" uid="uid://c4byf37he3mjt" path="res://render/texture/particle/noise/noise1.png" id="4_8g8a4"] [ext_resource type="Texture2D" uid="uid://n5eob6sceoxj" path="res://render/texture/particle/mask/mask8.png" id="5_lbv4e"] @@ -35,7 +35,7 @@ metadata/_snap_enabled = true curve = SubResource("Curve_4ikwb") [sub_resource type="Curve" id="Curve_ru6ll"] -max_value = 5.0 +_limits = [0.0, 5.0, 0.0, 1.0] _data = [Vector2(0, 5), 0.0, 0.0, 0, 0, Vector2(0.1, 2.5), -8.34728, -8.34728, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] point_count = 3 metadata/_snap_enabled = true @@ -44,7 +44,7 @@ metadata/_snap_enabled = true curve = SubResource("Curve_ru6ll") [sub_resource type="Curve" id="Curve_s1p8b"] -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 @@ -91,7 +91,7 @@ metadata/_snap_enabled = true curve = SubResource("Curve_7np7a") [sub_resource type="Curve" id="Curve_x385q"] -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 diff --git a/scene/effect/particle/_particle_hit_ground_heavy.tscn b/scene/effect/particle/_particle_hit_ground_heavy.tscn index 3551d63..ba09184 100644 --- a/scene/effect/particle/_particle_hit_ground_heavy.tscn +++ b/scene/effect/particle/_particle_hit_ground_heavy.tscn @@ -1,13 +1,13 @@ [gd_scene load_steps=14 format=3 uid="uid://5d1a3s6x77wd"] -[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_2t2j1"] +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_2t2j1"] [ext_resource type="Texture2D" uid="uid://bjv7f83tdgq17" path="res://render/texture/decal/decal_explode.png" id="2_vkpca"] -[ext_resource type="Script" path="res://script/effect/particle_decal.gd" id="3_dwi0o"] -[ext_resource type="Shader" path="res://render/shader/particle_ground.gdshader" id="4_ppovm"] +[ext_resource type="Script" uid="uid://m2tgb0yymupx" path="res://script/effect/particle_decal.gd" id="3_dwi0o"] +[ext_resource type="Shader" uid="uid://wbnso7r87cpj" path="res://render/shader/particle_ground.gdshader" id="4_ppovm"] [ext_resource type="Texture2D" uid="uid://cvm7ouwqnp235" path="res://render/texture/particle/shape/circle4.png" id="5_ckrbk"] [sub_resource type="Curve" id="Curve_w5jkx"] -max_value = 0.6 +_limits = [0.0, 0.6, 0.0, 1.0] _data = [Vector2(0, 0), 0.0, 0.84, 0, 0, Vector2(0.0196078, 0.6), 0.0, 0.0, 0, 0, Vector2(1, 0.6), 0.0, 0.0, 0, 0] point_count = 3 @@ -24,7 +24,7 @@ point_count = 2 curve = SubResource("Curve_yx8ux") [sub_resource type="Curve" id="Curve_o1uxt"] -max_value = 2.0 +_limits = [0.0, 2.0, 0.0, 1.0] _data = [Vector2(0, 0.369062), 0.0, 1.4, 0, 0, Vector2(0.0923077, 1.60414), 0.0, 0.0, 0, 0, Vector2(1, 2), 0.0, 0.0, 0, 0] point_count = 3 diff --git a/scene/effect/particle/_particle_hit_ground_normal.tscn b/scene/effect/particle/_particle_hit_ground_normal.tscn index 7b969d2..3b92354 100644 --- a/scene/effect/particle/_particle_hit_ground_normal.tscn +++ b/scene/effect/particle/_particle_hit_ground_normal.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=11 format=3 uid="uid://b1eg05rgvdjk"] -[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_2t2j1"] -[ext_resource type="Shader" path="res://render/shader/particle_ground.gdshader" id="4_riq1c"] +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_2t2j1"] +[ext_resource type="Shader" uid="uid://wbnso7r87cpj" path="res://render/shader/particle_ground.gdshader" id="4_riq1c"] [ext_resource type="Texture2D" uid="uid://cvm7ouwqnp235" path="res://render/texture/particle/shape/circle4.png" id="5_feq6c"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_0b0aa"] @@ -17,7 +17,7 @@ point_count = 2 curve = SubResource("Curve_ll1if") [sub_resource type="Curve" id="Curve_63se2"] -max_value = 1.5 +_limits = [0.0, 1.5, 0.0, 1.0] _data = [Vector2(0, 0.561815), 0.0, 0.332521, 0, 1, Vector2(1, 0.894336), 0.332521, 0.0, 1, 0] point_count = 2 diff --git a/scene/effect/particle/_particle_slash_blunt1.tscn b/scene/effect/particle/_particle_slash_blunt1.tscn index 35d13cd..ab1b9f2 100644 --- a/scene/effect/particle/_particle_slash_blunt1.tscn +++ b/scene/effect/particle/_particle_slash_blunt1.tscn @@ -1,13 +1,13 @@ [gd_scene load_steps=27 format=3 uid="uid://bm6snwwg2ddok"] -[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_u2esg"] -[ext_resource type="Shader" path="res://render/shader/effect_slash.gdshader" id="2_wet7j"] +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_u2esg"] +[ext_resource type="Shader" uid="uid://b4x52xwsln0sq" path="res://render/shader/effect_slash.gdshader" id="2_wet7j"] [ext_resource type="Texture2D" uid="uid://bt32dgn3mag0w" path="res://render/texture/particle/gradient/gradient5.png" id="3_aflcg"] [ext_resource type="Texture2D" uid="uid://c4byf37he3mjt" path="res://render/texture/particle/noise/noise1.png" id="4_b2ehl"] [ext_resource type="Texture2D" uid="uid://hcpxvwtjhvag" path="res://render/texture/particle/mask/mask11.png" id="5_jmpun"] [ext_resource type="Texture2D" uid="uid://dd3e7ol8qa5eq" path="res://render/texture/particle/noise/noise2.png" id="6_50pya"] [ext_resource type="ArrayMesh" uid="uid://dq207a0waxk0j" path="res://render/mesh/slash1.obj" id="7_t17g5"] -[ext_resource type="Shader" path="res://render/shader/effect_slash_dark.gdshader" id="8_mdgl2"] +[ext_resource type="Shader" uid="uid://yl3qwpecny54" path="res://render/shader/effect_slash_dark.gdshader" id="8_mdgl2"] [ext_resource type="Texture2D" uid="uid://ciusodtprwghg" path="res://render/texture/particle/gradient/gradient4.png" id="9_pwem4"] [ext_resource type="Texture2D" uid="uid://c61nspskft0to" path="res://render/texture/particle/mask/mask14.png" id="10_n0i6s"] [ext_resource type="RibbonTrailMesh" uid="uid://c3hyy5yknwsfl" path="res://render/trail_mesh/flare_blunt_slash.tres" id="11_kifh3"] @@ -92,6 +92,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_cokjk") diff --git a/scene/effect/particle/_particle_slash_blunt2.tscn b/scene/effect/particle/_particle_slash_blunt2.tscn index 0ccba25..9f0b260 100644 --- a/scene/effect/particle/_particle_slash_blunt2.tscn +++ b/scene/effect/particle/_particle_slash_blunt2.tscn @@ -1,13 +1,13 @@ [gd_scene load_steps=27 format=3 uid="uid://nj3tp7sk7ggp"] -[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_tvjg8"] -[ext_resource type="Shader" path="res://render/shader/effect_slash.gdshader" id="2_mde7d"] +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_tvjg8"] +[ext_resource type="Shader" uid="uid://b4x52xwsln0sq" path="res://render/shader/effect_slash.gdshader" id="2_mde7d"] [ext_resource type="Texture2D" uid="uid://bt32dgn3mag0w" path="res://render/texture/particle/gradient/gradient5.png" id="3_5nhix"] [ext_resource type="Texture2D" uid="uid://c4byf37he3mjt" path="res://render/texture/particle/noise/noise1.png" id="4_e7v1w"] [ext_resource type="Texture2D" uid="uid://dd3e7ol8qa5eq" path="res://render/texture/particle/noise/noise2.png" id="6_dxrrr"] [ext_resource type="ArrayMesh" uid="uid://dq207a0waxk0j" path="res://render/mesh/slash1.obj" id="7_jrlck"] [ext_resource type="Texture2D" uid="uid://hcpxvwtjhvag" path="res://render/texture/particle/mask/mask11.png" id="8_m3081"] -[ext_resource type="Shader" path="res://render/shader/effect_slash_dark.gdshader" id="9_dsdqk"] +[ext_resource type="Shader" uid="uid://yl3qwpecny54" path="res://render/shader/effect_slash_dark.gdshader" id="9_dsdqk"] [ext_resource type="Texture2D" uid="uid://ciusodtprwghg" path="res://render/texture/particle/gradient/gradient4.png" id="10_23j2l"] [ext_resource type="RibbonTrailMesh" uid="uid://c3hyy5yknwsfl" path="res://render/trail_mesh/flare_blunt_slash.tres" id="11_6e8pb"] [ext_resource type="Texture2D" uid="uid://c61nspskft0to" path="res://render/texture/particle/mask/mask14.png" id="11_bwmh1"] @@ -92,6 +92,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_cokjk") diff --git a/scene/effect/particle/_particle_stab3.tscn b/scene/effect/particle/_particle_stab3.tscn index c2bc616..ab2b59d 100644 --- a/scene/effect/particle/_particle_stab3.tscn +++ b/scene/effect/particle/_particle_stab3.tscn @@ -72,7 +72,6 @@ emitting = false amount = 1 lifetime = 5.0 one_shot = true -seed = 1352074707 fixed_fps = 60 local_coords = true process_material = SubResource("ParticleProcessMaterial_gc3w6") diff --git a/scene/effect/particle/bullet_hero01_short_stab01.tscn b/scene/effect/particle/bullet_hero01_short_stab01.tscn index 3767a38..c9b9c36 100644 --- a/scene/effect/particle/bullet_hero01_short_stab01.tscn +++ b/scene/effect/particle/bullet_hero01_short_stab01.tscn @@ -9,4 +9,3 @@ transform = Transform3D(0.5, 0, 0, 0, 1, 0, 0, 0, 0.5, 0, 0, 0) emitting = true lifetime = 600.0 one_shot = false -seed = 300733846 diff --git a/scene/effect/particle/hero01_fist_air_attack01.tscn b/scene/effect/particle/hero01_fist_air_attack01.tscn new file mode 100644 index 0000000..74563ce --- /dev/null +++ b/scene/effect/particle/hero01_fist_air_attack01.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=3 format=3 uid="uid://cgx1mhxv0ceud"] + +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_spf86"] +[ext_resource type="PackedScene" uid="uid://cjgt2myahbtci" path="res://scene/effect/particle/_particle_fist2.tscn" id="2_rm1x6"] + +[node name="Particle" type="Node3D"] +script = ExtResource("1_spf86") + +[node name="Particle" parent="." instance=ExtResource("2_rm1x6")] +transform = Transform3D(0.906308, -0.422618, 0, 0.422618, 0.906308, 0, 0, 0, 1, 0, -0.2, 0) diff --git a/scene/effect/particle/hero01_fist_air_attack02.tscn b/scene/effect/particle/hero01_fist_air_attack02.tscn new file mode 100644 index 0000000..9a950a6 --- /dev/null +++ b/scene/effect/particle/hero01_fist_air_attack02.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=3 format=3 uid="uid://deivjgrdis8jm"] + +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_xein8"] +[ext_resource type="PackedScene" uid="uid://cohy1qv35n57q" path="res://scene/effect/particle/_particle_fist1.tscn" id="2_xein8"] + +[node name="Particle" type="Node3D"] +script = ExtResource("1_xein8") + +[node name="Particle" parent="." instance=ExtResource("2_xein8")] +transform = Transform3D(0.7, 0, 0, 0, -3.0598e-08, 0.7, 0, -0.7, -3.0598e-08, 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 da26ce7..446caca 100644 --- a/scene/effect/particle/hero01_fist_air_skill01_1.tscn +++ b/scene/effect/particle/hero01_fist_air_skill01_1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=3 format=3 uid="uid://d10hh1e4u544w"] +[gd_scene load_steps=3 format=3 uid="uid://d4cg1dy0t0ojw"] [ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_buiuf"] [ext_resource type="PackedScene" uid="uid://cxopc3y11lwg1" path="res://scene/effect/particle/_particle_dash1.tscn" id="1_eappe"] diff --git a/scene/effect/particle/hero01_fist_air_skill03_1.tscn b/scene/effect/particle/hero01_fist_air_skill03_1.tscn new file mode 100644 index 0000000..6826f42 --- /dev/null +++ b/scene/effect/particle/hero01_fist_air_skill03_1.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=3 format=3 uid="uid://dnnlwpr6lcsy4"] + +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_tgess"] +[ext_resource type="PackedScene" uid="uid://cohy1qv35n57q" path="res://scene/effect/particle/_particle_fist1.tscn" id="2_5xueu"] + +[node name="Particle" type="Node3D"] +script = ExtResource("1_tgess") + +[node name="Particle" parent="." instance=ExtResource("2_5xueu")] +transform = Transform3D(0.590885, 0.104189, 6.03983e-08, 0.104189, -0.590885, -1.7958e-16, 8.92211e-08, 1.57321e-08, -0.4, 0, -0.2, 0) diff --git a/scene/effect/particle/hero01_fist_air_skill03_2.tscn b/scene/effect/particle/hero01_fist_air_skill03_2.tscn new file mode 100644 index 0000000..27efa40 --- /dev/null +++ b/scene/effect/particle/hero01_fist_air_skill03_2.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=3 format=3 uid="uid://b2lvsrv0rdf1k"] + +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_au0r7"] +[ext_resource type="PackedScene" uid="uid://cohy1qv35n57q" path="res://scene/effect/particle/_particle_fist1.tscn" id="2_cs1mb"] + +[node name="Particle" type="Node3D"] +script = ExtResource("1_au0r7") + +[node name="Particle" parent="." instance=ExtResource("2_cs1mb")] +transform = Transform3D(0.751754, 0.273616, 6.03983e-08, 0.273616, -0.751754, 0, 1.13512e-07, 4.13149e-08, -0.4, 0, -0.2, 0) diff --git a/scene/effect/particle/hero01_fist_air_skill03_3.tscn b/scene/effect/particle/hero01_fist_air_skill03_3.tscn new file mode 100644 index 0000000..b82321c --- /dev/null +++ b/scene/effect/particle/hero01_fist_air_skill03_3.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=3 format=3 uid="uid://crbji7geunibj"] + +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_0vpbh"] +[ext_resource type="PackedScene" uid="uid://cohy1qv35n57q" path="res://scene/effect/particle/_particle_fist1.tscn" id="2_7sohp"] + +[node name="Particle" type="Node3D"] +script = ExtResource("1_0vpbh") + +[node name="Particle" parent="." instance=ExtResource("2_7sohp")] +transform = Transform3D(0.787846, 0.138919, 6.11959e-08, 0.138919, -0.787846, 0, 6.88757e-08, 1.21447e-08, -0.7, 0, -0.2, 0) diff --git a/scene/effect/particle/hero01_fist_attack01.tscn b/scene/effect/particle/hero01_fist_attack01.tscn index 0bd8705..71ef14c 100644 --- a/scene/effect/particle/hero01_fist_attack01.tscn +++ b/scene/effect/particle/hero01_fist_attack01.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://13wmsk01u2sk"] -[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_rh714"] +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_rh714"] [ext_resource type="PackedScene" uid="uid://cjgt2myahbtci" path="res://scene/effect/particle/_particle_fist2.tscn" id="1_yvekh"] [node name="Particle" type="Node3D"] diff --git a/scene/effect/particle/hero01_fist_attack02.tscn b/scene/effect/particle/hero01_fist_attack02.tscn index b3e8484..e97bda7 100644 --- a/scene/effect/particle/hero01_fist_attack02.tscn +++ b/scene/effect/particle/hero01_fist_attack02.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://dkefudneuw51g"] -[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_jrbsi"] +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_jrbsi"] [ext_resource type="PackedScene" uid="uid://cjgt2myahbtci" path="res://scene/effect/particle/_particle_fist2.tscn" id="2_iymvk"] [node name="Particle" type="Node3D"] diff --git a/scene/effect/particle/hero01_fist_attack03.tscn b/scene/effect/particle/hero01_fist_attack03.tscn index e7cd682..4d6c40d 100644 --- a/scene/effect/particle/hero01_fist_attack03.tscn +++ b/scene/effect/particle/hero01_fist_attack03.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://664eepl2dhc3"] -[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_t4xot"] +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_t4xot"] [ext_resource type="PackedScene" uid="uid://cjgt2myahbtci" path="res://scene/effect/particle/_particle_fist2.tscn" id="2_c4jod"] [node name="Particle" type="Node3D"] diff --git a/scene/effect/particle/hero01_fist_attack04.tscn b/scene/effect/particle/hero01_fist_attack04.tscn index 0eda978..7836a6c 100644 --- a/scene/effect/particle/hero01_fist_attack04.tscn +++ b/scene/effect/particle/hero01_fist_attack04.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=3 format=3 uid="uid://dpv38662ndoxd"] [ext_resource type="PackedScene" uid="uid://cohy1qv35n57q" path="res://scene/effect/particle/_particle_fist1.tscn" id="1_p3hpt"] -[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_vhqjo"] +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_vhqjo"] [node name="Particle" type="Node3D"] script = ExtResource("1_vhqjo") [node name="Particle" parent="." instance=ExtResource("1_p3hpt")] -transform = Transform3D(0.751754, 0.34202, -4.52987e-08, 0.273616, -0.939693, -6.25961e-16, -1.13512e-07, -5.16436e-08, -0.3, 0, -0.2, 0) +transform = Transform3D(0.640125, 0.112871, -5.68248e-08, 0.112871, -0.640125, 0, -5.59615e-08, -9.86753e-09, -0.65, 0, -0.2, 0) diff --git a/scene/effect/particle/hero01_fist_attack05.tscn b/scene/effect/particle/hero01_fist_attack05.tscn index ec6d81f..ee8d206 100644 --- a/scene/effect/particle/hero01_fist_attack05.tscn +++ b/scene/effect/particle/hero01_fist_attack05.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://2jydaphvfpvd"] -[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_vr0wa"] +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_vr0wa"] [ext_resource type="PackedScene" uid="uid://cjgt2myahbtci" path="res://scene/effect/particle/_particle_fist2.tscn" id="2_w3gpl"] [node name="Particle" type="Node3D"] diff --git a/scene/effect/particle/hero01_fist_skill01.tscn b/scene/effect/particle/hero01_fist_skill01.tscn new file mode 100644 index 0000000..f6e47d5 --- /dev/null +++ b/scene/effect/particle/hero01_fist_skill01.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=3 format=3 uid="uid://b7o38lg06fl4g"] + +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_vrach"] +[ext_resource type="PackedScene" uid="uid://cjgt2myahbtci" path="res://scene/effect/particle/_particle_fist2.tscn" id="2_5qtie"] + +[node name="Particle" type="Node3D"] +script = ExtResource("1_vrach") + +[node name="Particle" parent="." instance=ExtResource("2_5qtie")] +transform = Transform3D(0.906308, -0.422618, 0, 0.422618, 0.906308, 0, 0, 0, 1, 0, -0.2, 0) diff --git a/scene/effect/particle/hero01_fist_skill03.tscn b/scene/effect/particle/hero01_fist_skill03.tscn deleted file mode 100644 index b8996e2..0000000 --- a/scene/effect/particle/hero01_fist_skill03.tscn +++ /dev/null @@ -1,10 +0,0 @@ -[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/scene/effect/particle/hero01_long_air_skill01.tscn b/scene/effect/particle/hero01_long_air_skill01.tscn index dd43cd6..66ca7b4 100644 --- a/scene/effect/particle/hero01_long_air_skill01.tscn +++ b/scene/effect/particle/hero01_long_air_skill01.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=3 format=3 uid="uid://cxecnqr1dnb7r"] +[gd_scene load_steps=3 format=3 uid="uid://dxudtren7l8uh"] [ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_15uh7"] [ext_resource type="PackedScene" uid="uid://c2uyg7ktya04f" path="res://scene/effect/particle/_particle_slash2.tscn" id="1_oea3n"] diff --git a/scene/effect/particle/hero01_long_skill01.tscn b/scene/effect/particle/hero01_long_skill01.tscn deleted file mode 100644 index 75ec15e..0000000 --- a/scene/effect/particle/hero01_long_skill01.tscn +++ /dev/null @@ -1,6 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://causskv1ei4uj"] - -[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash1.tscn" id="1_evguo"] - -[node name="Particle" instance=ExtResource("1_evguo")] -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_skill01_1.tscn b/scene/effect/particle/hero01_long_skill01_1.tscn new file mode 100644 index 0000000..2d91766 --- /dev/null +++ b/scene/effect/particle/hero01_long_skill01_1.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=3 format=3 uid="uid://b2e6gp4412y67"] + +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_wiaej"] +[ext_resource type="PackedScene" uid="uid://c2uyg7ktya04f" path="res://scene/effect/particle/_particle_slash2.tscn" id="2_t2o6b"] + +[node name="Particle" type="Node3D"] +script = ExtResource("1_wiaej") + +[node name="Particle" parent="." instance=ExtResource("2_t2o6b")] +transform = Transform3D(0.8, 0, 0, 0, -0.8, 5.24537e-08, 0, -6.99382e-08, -0.6, 0, 0, 0) diff --git a/scene/effect/particle/hero01_long_skill01_2.tscn b/scene/effect/particle/hero01_long_skill01_2.tscn new file mode 100644 index 0000000..cadacf2 --- /dev/null +++ b/scene/effect/particle/hero01_long_skill01_2.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=3 format=3 uid="uid://dwb7rtr0p10t0"] + +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_sxg7p"] +[ext_resource type="PackedScene" uid="uid://c2uyg7ktya04f" path="res://scene/effect/particle/_particle_slash2.tscn" id="2_sstlf"] + +[node name="Particle" type="Node3D"] +script = ExtResource("1_sxg7p") + +[node name="Particle" parent="." instance=ExtResource("2_sstlf")] +transform = Transform3D(1, 0, 0, 0, -1, 6.99382e-08, 0, -8.74228e-08, -0.8, 0, 0, 0) diff --git a/scene/effect/particle/hero01_long_skill02.tscn b/scene/effect/particle/hero01_long_skill02.tscn index 46d12c2..24e25b1 100644 --- a/scene/effect/particle/hero01_long_skill02.tscn +++ b/scene/effect/particle/hero01_long_skill02.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=2 format=3 uid="uid://bwapjpr0eg56t"] +[gd_scene load_steps=2 format=3 uid="uid://cojqv1heoo3ta"] [ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash1.tscn" id="1_o7nef"] diff --git a/scene/effect/particle/particle_blood_decal.tscn b/scene/effect/particle/particle_blood_decal.tscn index a75ca46..6f3d5dd 100644 --- a/scene/effect/particle/particle_blood_decal.tscn +++ b/scene/effect/particle/particle_blood_decal.tscn @@ -1,15 +1,15 @@ [gd_scene load_steps=6 format=3 uid="uid://ccxyyunj4ohqt"] -[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_6r6qw"] +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_6r6qw"] [ext_resource type="Texture2D" uid="uid://dhq41finyfgpk" path="res://render/texture/decal/blood.png" id="2_op8c3"] -[ext_resource type="Script" path="res://script/effect/particle_decal.gd" id="3_yeg2u"] +[ext_resource type="Script" uid="uid://m2tgb0yymupx" path="res://script/effect/particle_decal.gd" id="3_yeg2u"] [sub_resource type="Gradient" id="Gradient_lwltf"] offsets = PackedFloat32Array(0, 0.641834, 1) colors = PackedColorArray(0, 0, 0, 0.701961, 0, 0, 0, 0.629552, 0, 0, 0, 0) [sub_resource type="Curve" id="Curve_w5jkx"] -max_value = 0.6 +_limits = [0.0, 0.6, 0.0, 1.0] _data = [Vector2(0, 0.31259), 0.0, 0.953112, 0, 0, Vector2(0.0795756, 0.6), 0.0, 0.0, 0, 0, Vector2(1, 0.6), 0.0, 0.0, 0, 0] point_count = 3 diff --git a/scene/effect/particle/particle_blood_fragment.tscn b/scene/effect/particle/particle_blood_fragment.tscn index 2431249..517e4f0 100644 --- a/scene/effect/particle/particle_blood_fragment.tscn +++ b/scene/effect/particle/particle_blood_fragment.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=6 format=3 uid="uid://b0ogpoluxbsxx"] -[ext_resource type="Script" path="res://script/effect/fragment.gd" id="1_cgwed"] +[ext_resource type="Script" uid="uid://d1gkchvlp7w3j" path="res://script/effect/fragment.gd" id="1_cgwed"] [ext_resource type="PackedScene" uid="uid://ccxyyunj4ohqt" path="res://scene/effect/particle/particle_blood_decal.tscn" id="2_2xoel"] [ext_resource type="Material" uid="uid://b3mpocbc8svx2" path="res://render/material/fragment.tres" id="3_8m7fg"] [ext_resource type="Texture2D" uid="uid://bcrr12gbos636" path="res://render/texture/particle/shape/fragment1.png" id="4_4mpud"] diff --git a/scene/effect/particle/particle_common_fragment.tscn b/scene/effect/particle/particle_common_fragment.tscn index 330d6c2..e912610 100644 --- a/scene/effect/particle/particle_common_fragment.tscn +++ b/scene/effect/particle/particle_common_fragment.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://bfnwt1jr830pa"] -[ext_resource type="Script" path="res://script/effect/fragment.gd" id="1_14ie3"] +[ext_resource type="Script" uid="uid://d1gkchvlp7w3j" path="res://script/effect/fragment.gd" id="1_14ie3"] [ext_resource type="Material" uid="uid://b3mpocbc8svx2" path="res://render/material/fragment.tres" id="3_0tado"] [ext_resource type="Texture2D" uid="uid://bcrr12gbos636" path="res://render/texture/particle/shape/fragment1.png" id="4_0awd6"] diff --git a/scene/effect/particle/particle_debug_box.tscn b/scene/effect/particle/particle_debug_box.tscn index eac410c..e094073 100644 --- a/scene/effect/particle/particle_debug_box.tscn +++ b/scene/effect/particle/particle_debug_box.tscn @@ -1,11 +1,12 @@ [gd_scene load_steps=6 format=3 uid="uid://ceblxqdmgyu0j"] -[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_bgrcd"] -[ext_resource type="Shader" path="res://render/shader/effect_debug.gdshader" id="2_xpi14"] +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_bgrcd"] +[ext_resource type="Shader" uid="uid://4mnjdo06f0o7" path="res://render/shader/effect_debug.gdshader" id="2_xpi14"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_hupcc"] render_priority = 0 shader = ExtResource("2_xpi14") +shader_parameter/is_hide = false [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_f5m0v"] particle_flag_rotate_y = true diff --git a/scene/effect/particle/particle_debug_cylinder.tscn b/scene/effect/particle/particle_debug_cylinder.tscn index aa13d66..fb109b2 100644 --- a/scene/effect/particle/particle_debug_cylinder.tscn +++ b/scene/effect/particle/particle_debug_cylinder.tscn @@ -1,11 +1,12 @@ [gd_scene load_steps=6 format=3 uid="uid://bm0unv0m2osgf"] -[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_pded4"] -[ext_resource type="Shader" path="res://render/shader/effect_debug.gdshader" id="2_qehyu"] +[ext_resource type="Script" uid="uid://dxoik7jm7xm2q" path="res://script/effect/particle.gd" id="1_pded4"] +[ext_resource type="Shader" uid="uid://4mnjdo06f0o7" path="res://render/shader/effect_debug.gdshader" id="2_qehyu"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_hupcc"] render_priority = 0 shader = ExtResource("2_qehyu") +shader_parameter/is_hide = false [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_f5m0v"] particle_flag_rotate_y = true diff --git a/scene/launcher.tscn b/scene/launcher.tscn index 7648af0..8bfa998 100644 --- a/scene/launcher.tscn +++ b/scene/launcher.tscn @@ -59,7 +59,7 @@ script = ExtResource("2_ewhkj") transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 0, 4.01178, 2.85449) environment = ExtResource("8_mbfoj") current = true -fov = 6.0 +fov = 7.2 size = 7.2 script = ExtResource("4_yqiun") global_effect_curve = SubResource("Curve_f8hvs") diff --git a/script/character/move.gd b/script/character/move.gd index 27d62b4..c8a35c2 100644 --- a/script/character/move.gd +++ b/script/character/move.gd @@ -2,6 +2,7 @@ extends Node3D class_name Move @export var after_image_speed_curve: Curve +@export var speed_curve: Curve var after_image_speed_max: float = 10 @@ -66,7 +67,8 @@ func update_speed_y(delta) -> void: func update_move(delta): - var move_velocity: Vector2 = status.move_dir.normalized() * (status.cfg.move.speed * (1 + status.speed_up_rate)) + var speed_rate = speed_curve.sample(status.speed_up_rate) + var move_velocity: Vector2 = status.move_dir.normalized() * (status.cfg.move.speed * speed_rate) var skill_velocity: Vector2 = status.skill_move_dir * status.skill_move_speed if not status.skill_move_stop else Vector2.ZERO var hit_back_velocity: Vector2 = status.hit_back_dir * status.hit_back_speed move_velocity += skill_velocity + hit_back_velocity @@ -98,7 +100,7 @@ func update_deformation(_delta): var dir_y: int = 1 if (velocity_change_y > 1) or (velocity_change_x < -1) else 0 if dir_x or dir_y: status.deformation_dir = Vector2(dir_x, dir_y) - character.add_buff("deformation", 0.2) + character.add_buff("deformation", 0.4) func update_move_effect(delta): diff --git a/script/character/player/combo.gd b/script/character/player/combo.gd index 3a03649..e0c6361 100644 --- a/script/character/player/combo.gd +++ b/script/character/player/combo.gd @@ -21,7 +21,7 @@ func _ready(): # test add_basic_skill() add_weapon(load("res://config/weapon/long.tres") as WeaponCfg) - add_weapon(load("res://config/weapon/short.tres") as WeaponCfg) + # add_weapon(load("res://config/weapon/short.tres") as WeaponCfg) add_weapon(load("res://config/weapon/fist.tres") as WeaponCfg) core.set_active_core(0, load("res://config/core/hero01_soul_slash.tres") as CoreCfg) diff --git a/script/character/skill.gd b/script/character/skill.gd index a0da59a..f530e2b 100644 --- a/script/character/skill.gd +++ b/script/character/skill.gd @@ -131,7 +131,7 @@ func cast_skill(cfg: SkillCfg, cast_dir: Vector2, action_key: String = "") -> vo skill_move_dir = skill_move_dir.normalized() if skill_move_dir.length() == 0: skill_move_dir = Vector2.RIGHT if status.is_right else Vector2.LEFT - else: + elif cfg.is_lock_x_move_sub: #限定释放方向为左右45度以内 var angle: float = skill_move_dir.angle() if angle > PI / 4 and angle < PI * 3 / 4: diff --git a/script/character/view.gd b/script/character/view.gd index a90817d..0dcefac 100644 --- a/script/character/view.gd +++ b/script/character/view.gd @@ -187,7 +187,7 @@ func _update_material(): var material: ShaderMaterial = material_override as ShaderMaterial var material2: ShaderMaterial = material_override.next_pass as ShaderMaterial var tex: Texture2D = sprite_frames.get_frame_texture(animation, frame) - var deformation_rate: float = status.deformation_rate * (0.5 if status.is_floating else 0.4) + var deformation_rate: float = status.deformation_rate * (0.6 if status.is_floating else 0.4) if material: material.set_shader_parameter("flash_white", status.flash_white_rate) material.set_shader_parameter("deformation_dir", status.deformation_dir) diff --git a/script/config/skill_cfg.gd b/script/config/skill_cfg.gd index d81a066..213169b 100644 --- a/script/config/skill_cfg.gd +++ b/script/config/skill_cfg.gd @@ -25,8 +25,9 @@ var refresh_animation: Callable = check_animation @export var mp_sub_cost: bool @export var free_lock: bool @export var ignore_push: bool -@export var is_lock_x: bool = true -@export var is_lock_x_move: bool = false +@export var is_lock_x: bool = true # 技能释放方向锁定到x轴 +@export var is_lock_x_move: bool = false # 技能移动方向锁定到x轴 +@export var is_lock_x_move_sub: bool = true # 技能移动方向锁定到x轴45度偏差内 @export_group("辅助参数") @export var range: float @export var warn_type: Enum.ESkillWarnType = Enum.ESkillWarnType.None @@ -37,7 +38,7 @@ var owner: CharacterCfg func check_animation() -> bool: var res_name: String = get_res_name() - var path: String = "res://resource/skill_animation/%s.tres" % res_name + var path: String = "res://resource/skill_animation/%s.tres" % res_name if sprite_frames == null: print("未设置技能动画资源:", res_name) return false @@ -57,20 +58,20 @@ func check_animation() -> bool: return true -func get_attack1()->AttackCfg: return attack1 +func get_attack1() -> AttackCfg: return attack1 -func get_attack1_box()->AttackBoxCfg: return attack1_box +func get_attack1_box() -> AttackBoxCfg: return attack1_box -func get_attack2()->AttackCfg: return attack2 +func get_attack2() -> AttackCfg: return attack2 -func get_attack2_box()->AttackBoxCfg: return attack2_box +func get_attack2_box() -> AttackBoxCfg: return attack2_box -func get_attack_particle(index: int)->Resource: - var res_name: String = get_res_name() +func get_attack_particle(index: int) -> Resource: + var res_name: String = get_res_name() var path_index: String = "res://scene/effect/particle/%s_%d.tscn" % [res_name, index] if ResourceLoader.exists(path_index): attack_particle[index] = load(path_index) @@ -86,8 +87,7 @@ func get_attack_particle(index: int)->Resource: func get_owner() -> CharacterCfg: if not owner: var owner_name: String = get_res_name().split("_")[0] - var path: String = "res://config/character/%s.tres" % owner_name + var path: String = "res://config/character/%s.tres" % owner_name if ResourceLoader.exists(path): owner = load(path) as CharacterCfg return owner - diff --git a/script/manager/camera_manager.gd b/script/manager/camera_manager.gd index 28e2d74..120c581 100644 --- a/script/manager/camera_manager.gd +++ b/script/manager/camera_manager.gd @@ -10,7 +10,7 @@ var target_pos_y: float var target_pos_now: Vector2 = Vector2.ZERO var level_size: Vector2 = Vector2(12.8, 7.68) var level_pos: Vector2 = Vector2.ZERO -var offset: float = 50 +var offset: float = 40 var shake_offset_x: float var camera_limit: Vector3 = Vector3(6.4, 1.7, 2.95) # x,z-up,z-down var camera_size: float = 7.2 @@ -59,9 +59,10 @@ func update_global_effect(delta): match global_effect.effect_type: Enum.EGlobalEffect.CameraSize: size = camera_size * (1 - value) + fov = camera_size * (1 - value) refresh_target_pos() Enum.EGlobalEffect.CameraShake: - shake_offset_x = (sin(rate * PI * 10) - 0.5) * 0.04 * value + shake_offset_x = (sin(rate * PI * 10) - 0.5) * 0.1 * value Enum.EGlobalEffect.ColorShift: Global.view_mgr.set_post_processing("shift_strength", value) Enum.EGlobalEffect.Blur: @@ -164,10 +165,10 @@ func effect(pause_time) -> void: var basic_pause_time: float = 0.3 var effect_time = pause_time * 2 var rate = pause_time / basic_pause_time - add_global_effect(Enum.EGlobalEffect.CameraShake, effect_time, 0.8 * rate) - add_global_effect(Enum.EGlobalEffect.CameraSize, effect_time, 0.1 * rate) - add_global_effect(Enum.EGlobalEffect.ColorShift, effect_time, 0.8 * rate) - add_global_effect(Enum.EGlobalEffect.Blur, effect_time, 0.8 * rate) + add_global_effect(Enum.EGlobalEffect.CameraShake, effect_time, 0.2 * rate) + add_global_effect(Enum.EGlobalEffect.CameraSize, effect_time, 0.15 * rate) + add_global_effect(Enum.EGlobalEffect.ColorShift, effect_time, 1.2 * rate) + add_global_effect(Enum.EGlobalEffect.Blur, effect_time, 1.0 * rate) #add_global_effect(Enum.EGlobalEffect.SpeedLine,effect_time,0.2* rate) return