短刀普攻

config/attack/blunt_heavy_hit_blow.tres

@@ -17,5 +17,4 @@ hit_back_speed = 8.0
 hit_up_speed = 4.0
 hit_back_duration = 0.05
 hit_up_duration = 0.05
-pause_time = 0.4
 is_force_pause = false

config/attack/blunt_mid_hit_blow.tres

@@ -17,5 +17,4 @@ hit_back_speed = 3.0
 hit_up_speed = 3.0
 hit_back_duration = 0.05
 hit_up_duration = 0.05
-pause_time = 0.15
 is_force_pause = false

config/attack/blunt_mid_hit_down.tres

@@ -17,5 +17,4 @@ hit_back_speed = 7.0
 hit_up_speed = -7.0
 hit_back_duration = 0.05
 hit_up_duration = 0.05
-pause_time = 0.15
 is_force_pause = false

config/attack/blunt_mid_hit_down_back.tres

@@ -17,5 +17,4 @@ hit_back_speed = -6.0
 hit_up_speed = -6.0
 hit_back_duration = 0.05
 hit_up_duration = 0.05
-pause_time = 0.15
 is_force_pause = true

config/attack/blunt_normal_hit.tres

@@ -17,5 +17,4 @@ hit_back_speed = 2.0
 hit_up_speed = 1.5
 hit_back_duration = 0.05
 hit_up_duration = 0.05
-pause_time = 0.05
 is_force_pause = false

config/attack/blunt_normal_hit_back.tres

@@ -17,5 +17,4 @@ hit_back_speed = 3.0
 hit_up_speed = 1.0
 hit_back_duration = 0.05
 hit_up_duration = 0.05
-pause_time = 0.05
 is_force_pause = false

config/attack/blunt_normal_hit_sweep.tres

@@ -17,5 +17,4 @@ hit_back_speed = 2.0
 hit_up_speed = 1.5
 hit_back_duration = 0.05
 hit_up_duration = 0.05
-pause_time = 0.05
 is_force_pause = true

config/attack/blunt_normal_hit_up_back.tres

@@ -17,5 +17,4 @@ hit_back_speed = -2.5
 hit_up_speed = 3.5
 hit_back_duration = 0.05
 hit_up_duration = 0.05
-pause_time = 0.05
 is_force_pause = true

config/attack/blunt_starfall_2.tres

@@ -17,5 +17,4 @@ hit_back_speed = 3.0
 hit_up_speed = 3.0
 hit_back_duration = 0.05
 hit_up_duration = 0.05
-pause_time = 0.05
 is_force_pause = true

config/attack/blunt_tackle.tres

@@ -17,5 +17,4 @@ hit_back_speed = 0.0
 hit_up_speed = 4.0
 hit_back_duration = 0.05
 hit_up_duration = 0.05
-pause_time = 0.1
 is_force_pause = true

config/attack/blunt_throw_end_hit_down.tres

@@ -17,5 +17,4 @@ hit_back_speed = 7.0
 hit_up_speed = -7.0
 hit_back_duration = 0.05
 hit_up_duration = 0.05
-pause_time = 0.0
 is_force_pause = false

config/attack/sharp_heavy_hit_up_flash.tres

@@ -0,0 +1,20 @@
+[gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://cw7rb4rlfw33q"]
+
+[ext_resource type="Script" path="res://script/config/attack_cfg.gd" id="1_xmict"]
+
+[resource]
+script = ExtResource("1_xmict")
+damage_rate = 1.0
+break_level = 3
+stun_attack = 10.0
+damage_type = 0
+is_floating = true
+is_rebound = false
+is_stop_self = false
+is_throw_check = false
+is_throw_end = false
+hit_back_speed = 0.0
+hit_up_speed = 6.0
+hit_back_duration = 0.05
+hit_up_duration = 0.05
+is_force_pause = true

config/attack/sharp_normal_hit.tres

@@ -17,5 +17,4 @@ hit_back_speed = 2.0
 hit_up_speed = 1.0
 hit_back_duration = 0.05
 hit_up_duration = 0.05
-pause_time = 0.02
 is_force_pause = false

config/attack_box/box_large.tres

@@ -10,3 +10,4 @@ script = ExtResource("1_661yg")
 shape = SubResource("BoxShape3D_87jhu")
 offset = Vector2(1, 0.4)
 is_throw = false
+is_direct = false

config/attack_box/box_mid.tres

@@ -10,3 +10,4 @@ script = ExtResource("1_hxvsy")
 shape = SubResource("BoxShape3D_87jhu")
 offset = Vector2(0.8, 0.4)
 is_throw = false
+is_direct = false

config/attack_box/box_normal.tres

@@ -10,3 +10,4 @@ script = ExtResource("1_d4mqn")
 shape = SubResource("BoxShape3D_87jhu")
 offset = Vector2(0.6, 0.4)
 is_throw = false
+is_direct = false

config/attack_box/box_small.tres

@@ -10,3 +10,4 @@ script = ExtResource("1_gmrbh")
 shape = SubResource("BoxShape3D_87jhu")
 offset = Vector2(0.4, 0.4)
 is_throw = false
+is_direct = false

config/attack_box/circle_foot.tres

@@ -10,3 +10,4 @@ script = ExtResource("1_utw7p")
 shape = SubResource("CylinderShape3D_78ng8")
 offset = Vector2(0, 0)
 is_throw = false
+is_direct = false

config/attack_box/circle_large.tres

@@ -11,3 +11,4 @@ script = ExtResource("1_aqwel")
 shape = SubResource("CylinderShape3D_pmh6g")
 offset = Vector2(0, 0)
 is_throw = false
+is_direct = false

config/attack_box/circle_mid.tres

@@ -11,3 +11,4 @@ script = ExtResource("1_w2uwt")
 shape = SubResource("CylinderShape3D_pmh6g")
 offset = Vector2(0, 0)
 is_throw = false
+is_direct = false

config/character_mp/player.tres

@@ -4,7 +4,7 @@
 
 [resource]
 script = ExtResource("1_1adyr")
-mp_max = 5
+mp_max = 3
 mp_sub_max = 100.0
 recover_speed = -10.0
 recover_cd = 2.0

config/skill_player_weapon/hero01_short_attack01.tres

@@ -1,6 +1,7 @@
-[gd_resource type="Resource" script_class="SkillWeaponCfg" load_steps=6 format=3 uid="uid://ddc14ei2mwen6"]
+[gd_resource type="Resource" script_class="SkillWeaponCfg" load_steps=7 format=3 uid="uid://ddc14ei2mwen6"]
 
 [ext_resource type="Resource" uid="uid://dib6g7t6p5ac2" path="res://config/attack/blunt_normal_hit.tres" id="1_4lnv2"]
+[ext_resource type="Resource" uid="uid://bqejjllfy03h3" path="res://config/attack_box/box_normal.tres" id="2_sl4n4"]
 [ext_resource type="Script" path="res://script/config/skill_weapon_cfg.gd" id="3_gsnqk"]
 [ext_resource type="Animation" uid="uid://bkre61dn64j2f" path="res://resource/skill_animation/hero01_short_attack01.tres" id="4_f30l7"]
 [ext_resource type="SpriteFrames" uid="uid://cndpnxtdh37ii" path="res://resource/animation/character/hero01_short_attack.aseprite" id="5_8vcrr"]
@@ -16,11 +17,16 @@ range = 0.0
 free_lock = false
 ignore_push = false
 attack1 = ExtResource("1_4lnv2")
+attack1_box = ExtResource("2_sl4n4")
 stance_from = 0
 stance_to = 1
 break_level = 3
 is_charging = false
 mp_cost = 0
+mp_sub_cost = false
+warn_type = 0
+with_stop = false
+is_lock_x = true
 refresh_animation = false
 sprite_frames = ExtResource("5_8vcrr")
 animation_name = "short_attack01"

config/skill_player_weapon/hero01_short_attack02.tres

@@ -1,6 +1,7 @@
-[gd_resource type="Resource" script_class="SkillWeaponCfg" load_steps=6 format=3 uid="uid://d2pyl8sqnljtw"]
+[gd_resource type="Resource" script_class="SkillWeaponCfg" load_steps=7 format=3 uid="uid://d2pyl8sqnljtw"]
 
 [ext_resource type="Resource" uid="uid://dib6g7t6p5ac2" path="res://config/attack/blunt_normal_hit.tres" id="1_hnewa"]
+[ext_resource type="Resource" uid="uid://bqejjllfy03h3" path="res://config/attack_box/box_normal.tres" id="2_j6y4b"]
 [ext_resource type="Script" path="res://script/config/skill_weapon_cfg.gd" id="3_8ixmd"]
 [ext_resource type="Animation" uid="uid://xfuwfwtw4cna" path="res://resource/skill_animation/hero01_short_attack02.tres" id="4_mepfm"]
 [ext_resource type="SpriteFrames" uid="uid://cndpnxtdh37ii" path="res://resource/animation/character/hero01_short_attack.aseprite" id="5_dxfya"]
@@ -16,11 +17,16 @@ range = 0.0
 free_lock = false
 ignore_push = false
 attack1 = ExtResource("1_hnewa")
+attack1_box = ExtResource("2_j6y4b")
 stance_from = 1
 stance_to = 2
 break_level = 3
 is_charging = false
 mp_cost = 0
+mp_sub_cost = false
+warn_type = 0
+with_stop = false
+is_lock_x = true
 refresh_animation = false
 sprite_frames = ExtResource("5_dxfya")
 animation_name = "short_attack02"

config/skill_player_weapon/hero01_short_attack03.tres

@@ -1,6 +1,7 @@
-[gd_resource type="Resource" script_class="SkillWeaponCfg" load_steps=6 format=3 uid="uid://dxj5ekoi7cd7m"]
+[gd_resource type="Resource" script_class="SkillWeaponCfg" load_steps=7 format=3 uid="uid://dxj5ekoi7cd7m"]
 
 [ext_resource type="Resource" uid="uid://c87w2x5qfqdns" path="res://config/attack/blunt_normal_hit_back.tres" id="1_afi2j"]
+[ext_resource type="Resource" uid="uid://bqejjllfy03h3" path="res://config/attack_box/box_normal.tres" id="2_jmcul"]
 [ext_resource type="Script" 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"]
@@ -16,12 +17,18 @@ range = 0.0
 free_lock = false
 ignore_push = false
 attack1 = ExtResource("1_afi2j")
+attack1_box = ExtResource("2_jmcul")
 attack2 = ExtResource("1_afi2j")
+attack2_box = ExtResource("2_jmcul")
 stance_from = 2
 stance_to = 3
 break_level = 3
 is_charging = false
 mp_cost = 0
+mp_sub_cost = false
+warn_type = 0
+with_stop = false
+is_lock_x = true
 refresh_animation = false
 sprite_frames = ExtResource("5_40215")
 animation_name = "short_attack03"

config/skill_player_weapon/hero01_short_attack04.tres

@@ -1,6 +1,7 @@
-[gd_resource type="Resource" script_class="SkillWeaponCfg" load_steps=6 format=3 uid="uid://bh0tfn8mi3u3r"]
+[gd_resource type="Resource" script_class="SkillWeaponCfg" load_steps=7 format=3 uid="uid://bh0tfn8mi3u3r"]
 
-[ext_resource type="Resource" uid="uid://bv4uoey1liqoq" path="res://config/attack/sharp_heavy_hit_blow.tres" id="1_d23lh"]
+[ext_resource type="Resource" uid="uid://cw7rb4rlfw33q" path="res://config/attack/sharp_heavy_hit_up_flash.tres" id="1_slgv6"]
+[ext_resource type="Resource" uid="uid://diedb7vw7eyxp" path="res://config/attack_box/box_mid.tres" id="2_mvyr3"]
 [ext_resource type="Script" path="res://script/config/skill_weapon_cfg.gd" id="3_44lu2"]
 [ext_resource type="Animation" uid="uid://c8qll8wcn633m" path="res://resource/skill_animation/hero01_short_attack04.tres" id="4_rcj2c"]
 [ext_resource type="SpriteFrames" uid="uid://cndpnxtdh37ii" path="res://resource/animation/character/hero01_short_attack.aseprite" id="5_owk7o"]
@@ -14,13 +15,18 @@ name = ""
 skill_animation = ExtResource("4_rcj2c")
 range = 0.0
 free_lock = false
-ignore_push = false
-attack1 = ExtResource("1_d23lh")
+ignore_push = true
+attack1 = ExtResource("1_slgv6")
+attack1_box = ExtResource("2_mvyr3")
 stance_from = 3
 stance_to = 4
 break_level = 3
 is_charging = false
 mp_cost = 0
+mp_sub_cost = false
+warn_type = 0
+with_stop = false
+is_lock_x = true
 refresh_animation = false
 sprite_frames = ExtResource("5_owk7o")
 animation_name = "short_attack04"

render/material/fragment.tres

@@ -6,4 +6,5 @@
 [resource]
 render_priority = 0
 shader = ExtResource("1_hr2a5")
+shader_parameter/is_shine = null
 shader_parameter/tex_main = ExtResource("2_r0lv7")

render/shader/trail.gdshader

@@ -1,5 +1,5 @@
 shader_type spatial;
-render_mode unshaded,particle_trails,cull_disabled;
+render_mode unshaded,particle_trails;
 
 uniform sampler2D tex_gradient : source_color;
 

render/trail_mesh/flare_blunt.tres

@@ -1,17 +1,14 @@
-[gd_resource type="RibbonTrailMesh" load_steps=5 format=3 uid="uid://cv0787wcswb6d"]
+[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="Texture2D" uid="uid://dg6i5l05y3vww" path="res://render/texture/particle/gradient/gradient2.png" id="2_kxo7s"]
-[ext_resource type="Texture2D" uid="uid://b0bmvub81xvmf" path="res://render/texture/particle/shape/glow1.png" id="3_g5a4h"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_od7xi"]
 render_priority = 0
 shader = ExtResource("1_lp8r8")
-shader_parameter/tex_main = ExtResource("3_g5a4h")
-shader_parameter/tex_gradient = ExtResource("2_kxo7s")
 
 [resource]
 material = SubResource("ShaderMaterial_od7xi")
 size = 0.03
+sections = 2
 section_length = 0.15
-section_segments = 4
+section_segments = 2

render/trail_mesh/hit_dust.tres

@@ -0,0 +1,15 @@
+[gd_resource type="RibbonTrailMesh" load_steps=4 format=3 uid="uid://bn70s68ohnw7b"]
+
+[ext_resource type="Shader" path="res://render/shader/trail.gdshader" id="1_wwyo3"]
+[ext_resource type="Texture2D" uid="uid://d2tcm2g7sh1ne" path="res://render/texture/particle/gradient/gradient3.png" id="2_b77qu"]
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_cvevy"]
+render_priority = 0
+shader = ExtResource("1_wwyo3")
+shader_parameter/tex_gradient = ExtResource("2_b77qu")
+
+[resource]
+material = SubResource("ShaderMaterial_cvevy")
+size = 0.02
+sections = 3
+section_segments = 2

resource/skill_animation/hero01_short_attack01.tres

@@ -4,7 +4,8 @@
 
 [resource]
 resource_name = "hero01_short_attack01"
-length = 0.5
+length = 0.9
+step = 0.1
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
@@ -32,12 +33,76 @@ tracks/1/keys = {
 tracks/2/type = "value"
 tracks/2/imported = false
 tracks/2/enabled = true
-tracks/2/path = NodePath("View:frame")
+tracks/2/path = NodePath("Status:break_level")
 tracks/2/interp = 1
 tracks/2/loop_wrap = true
 tracks/2/keys = {
-"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4),
-"transitions": PackedFloat32Array(1, 1, 1, 1, 1),
+"times": PackedFloat32Array(0, 0.2, 0.6),
+"transitions": PackedFloat32Array(1, 1, 1),
 "update": 1,
-"values": [0, 1, 2, 3, 4]
+"values": [0, 3, 4]
+}
+tracks/3/type = "value"
+tracks/3/imported = false
+tracks/3/enabled = true
+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),
+"transitions": PackedFloat32Array(1, 1),
+"update": 1,
+"values": [-0.5, -1.0]
+}
+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(-7.45058e-09, 0.2),
+"transitions": PackedFloat32Array(1, 1),
+"update": 1,
+"values": [2.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.1),
+"transitions": PackedFloat32Array(1),
+"values": [{
+"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.1),
+"transitions": PackedFloat32Array(1),
+"values": [{
+"args": [],
+"method": &"cast_attack_particle1"
+}]
+}
+tracks/7/type = "value"
+tracks/7/imported = false
+tracks/7/enabled = true
+tracks/7/path = NodePath("View:frame")
+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),
+"update": 1,
+"values": [0, 1, 2, 3, 4, 5, 6, 7, 8]
 }

resource/skill_animation/hero01_short_attack02.tres

@@ -4,7 +4,8 @@
 
 [resource]
 resource_name = "hero01_short_attack02"
-length = 0.5
+length = 0.9
+step = 0.1
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
@@ -32,12 +33,76 @@ tracks/1/keys = {
 tracks/2/type = "value"
 tracks/2/imported = false
 tracks/2/enabled = true
-tracks/2/path = NodePath("View:frame")
+tracks/2/path = NodePath("Status:break_level")
 tracks/2/interp = 1
 tracks/2/loop_wrap = true
 tracks/2/keys = {
-"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4),
-"transitions": PackedFloat32Array(1, 1, 1, 1, 1),
+"times": PackedFloat32Array(0, 0.2, 0.6),
+"transitions": PackedFloat32Array(1, 1, 1),
 "update": 1,
-"values": [0, 1, 2, 3, 4]
+"values": [0, 3, 4]
+}
+tracks/3/type = "value"
+tracks/3/imported = false
+tracks/3/enabled = true
+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),
+"transitions": PackedFloat32Array(1, 1),
+"update": 1,
+"values": [-0.5, -1.0]
+}
+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(-7.45058e-09, 0.2),
+"transitions": PackedFloat32Array(1, 1),
+"update": 1,
+"values": [2.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.1),
+"transitions": PackedFloat32Array(1),
+"values": [{
+"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.1),
+"transitions": PackedFloat32Array(1),
+"values": [{
+"args": [],
+"method": &"cast_attack_particle1"
+}]
+}
+tracks/7/type = "value"
+tracks/7/imported = false
+tracks/7/enabled = true
+tracks/7/path = NodePath("View:frame")
+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),
+"update": 1,
+"values": [0, 1, 2, 3, 4, 5, 6, 7, 8]
 }

resource/skill_animation/hero01_short_attack03.tres

@@ -4,7 +4,8 @@
 
 [resource]
 resource_name = "hero01_short_attack03"
-length = 0.8
+length = 1.4
+step = 0.1
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
@@ -36,8 +37,78 @@ 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),
-"transitions": PackedFloat32Array(1, 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, 0.9, 1, 1.1, 1.2, 1.3),
+"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1),
 "update": 1,
-"values": [0, 1, 2, 3, 4, 5, 6, 7]
+"values": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
+}
+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.8, 1),
+"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:speed_up_rate")
+tracks/4/interp = 1
+tracks/4/loop_wrap = true
+tracks/4/keys = {
+"times": PackedFloat32Array(0, 0.6),
+"transitions": PackedFloat32Array(1, 1),
+"update": 1,
+"values": [-0.5, -1.0]
+}
+tracks/5/type = "value"
+tracks/5/imported = false
+tracks/5/enabled = true
+tracks/5/path = NodePath("Status:skill_move_speed")
+tracks/5/interp = 1
+tracks/5/loop_wrap = true
+tracks/5/keys = {
+"times": PackedFloat32Array(0.1, 0.3, 0.4, 0.5),
+"transitions": PackedFloat32Array(1, 1, 1, 1),
+"update": 1,
+"values": [2.0, 0.0, 2.0, 0.0]
+}
+tracks/6/type = "method"
+tracks/6/imported = false
+tracks/6/enabled = true
+tracks/6/path = NodePath("Battle")
+tracks/6/interp = 1
+tracks/6/loop_wrap = true
+tracks/6/keys = {
+"times": PackedFloat32Array(0.2, 0.6),
+"transitions": PackedFloat32Array(1, 1),
+"values": [{
+"args": [],
+"method": &"attack1"
+}, {
+"args": [],
+"method": &"attack2"
+}]
+}
+tracks/7/type = "method"
+tracks/7/imported = false
+tracks/7/enabled = true
+tracks/7/path = NodePath("Effect")
+tracks/7/interp = 1
+tracks/7/loop_wrap = true
+tracks/7/keys = {
+"times": PackedFloat32Array(0.2, 0.6),
+"transitions": PackedFloat32Array(1, 1),
+"values": [{
+"args": [],
+"method": &"cast_attack_particle1"
+}, {
+"args": [],
+"method": &"cast_attack_particle2"
+}]
 }

resource/skill_animation/hero01_short_attack04.tres

@@ -5,6 +5,7 @@
 [resource]
 resource_name = "hero01_short_attack04"
 length = 0.8
+step = 0.1
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
@@ -41,3 +42,81 @@ tracks/2/keys = {
 "update": 1,
 "values": [0, 1, 2, 3, 4, 5, 6, 7]
 }
+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.6, 0.7),
+"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:speed_up_rate")
+tracks/4/interp = 1
+tracks/4/loop_wrap = true
+tracks/4/keys = {
+"times": PackedFloat32Array(0.1, 0.4),
+"transitions": PackedFloat32Array(1, 1),
+"update": 1,
+"values": [-0.5, -1.0]
+}
+tracks/5/type = "value"
+tracks/5/imported = false
+tracks/5/enabled = true
+tracks/5/path = NodePath("Status:skill_move_speed")
+tracks/5/interp = 1
+tracks/5/loop_wrap = true
+tracks/5/keys = {
+"times": PackedFloat32Array(0, 0.2, 0.4, 0.5),
+"transitions": PackedFloat32Array(1, 1, 1, 1),
+"update": 1,
+"values": [-1.0, 0.0, 20.0, 0.0]
+}
+tracks/6/type = "method"
+tracks/6/imported = false
+tracks/6/enabled = true
+tracks/6/path = NodePath("Battle")
+tracks/6/interp = 1
+tracks/6/loop_wrap = true
+tracks/6/keys = {
+"times": PackedFloat32Array(0.4),
+"transitions": PackedFloat32Array(1),
+"values": [{
+"args": [],
+"method": &"attack1"
+}]
+}
+tracks/7/type = "method"
+tracks/7/imported = false
+tracks/7/enabled = true
+tracks/7/path = NodePath("Effect")
+tracks/7/interp = 1
+tracks/7/loop_wrap = true
+tracks/7/keys = {
+"times": PackedFloat32Array(0.4),
+"transitions": PackedFloat32Array(1),
+"values": [{
+"args": [],
+"method": &"cast_attack_particle1"
+}]
+}
+tracks/8/type = "method"
+tracks/8/imported = false
+tracks/8/enabled = true
+tracks/8/path = NodePath("Battle")
+tracks/8/interp = 1
+tracks/8/loop_wrap = true
+tracks/8/keys = {
+"times": PackedFloat32Array(0.5),
+"transitions": PackedFloat32Array(1),
+"values": [{
+"args": [],
+"method": &"stop"
+}]
+}

scene/ai/bullet02.tscn

@@ -8,7 +8,7 @@
 
 [node name="BeehaveTree" type="Node" node_paths=PackedStringArray("blackboard")]
 script = ExtResource("1_go1b5")
-blackboard = NodePath("@Node@37355")
+blackboard = NodePath("@Node@19760")
 
 [node name="SequenceComposite" type="Node" parent="."]
 script = ExtResource("2_k8nph")

scene/effect/particle/_particle_slash1.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=35 format=3 uid="uid://b2h4pcmlii7dg"]
+[gd_scene load_steps=36 format=3 uid="uid://b2h4pcmlii7dg"]
 
 [ext_resource type="Script" path="res://script/effect/particle.gd" id="1_fx8ev"]
 [ext_resource type="Shader" path="res://render/shader/effect_slash.gdshader" id="2_a0jwb"]
@@ -8,7 +8,6 @@
 [ext_resource type="Texture2D" uid="uid://hcpxvwtjhvag" path="res://render/texture/particle/mask/mask11.png" id="5_22kwb"]
 [ext_resource type="Texture2D" uid="uid://dd3e7ol8qa5eq" path="res://render/texture/particle/noise/noise2.png" id="5_ymh7m"]
 [ext_resource type="Shader" path="res://render/shader/effect_slash_dark.gdshader" id="8_kx83u"]
-[ext_resource type="Texture2D" uid="uid://bt32dgn3mag0w" path="res://render/texture/particle/gradient/gradient5.png" id="8_nsb82"]
 [ext_resource type="RibbonTrailMesh" uid="uid://bs5hlmt5xvqfd" path="res://render/trail_mesh/flare_sharp.tres" id="9_0e33x"]
 [ext_resource type="Texture2D" uid="uid://ciusodtprwghg" path="res://render/texture/particle/gradient/gradient4.png" id="9_b0p13"]
 [ext_resource type="Texture2D" uid="uid://b5nr3mq3u5tjn" path="res://render/texture/particle/mask/mask13.png" id="9_gj8ht"]
@@ -23,7 +22,7 @@ shader_parameter/tex_mask = ExtResource("9_gj8ht")
 shader_parameter/tex_gradient = ExtResource("3_16hna")
 
 [sub_resource type="Curve" id="Curve_0f46c"]
-_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(0.8, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
+_data = [Vector2(0, 0.8), 0.0, 0.0, 0, 0, Vector2(0.7, 0.8), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
 point_count = 3
 metadata/_snap_enabled = true
 
@@ -38,6 +37,14 @@ metadata/_snap_enabled = true
 [sub_resource type="CurveTexture" id="CurveTexture_eepmy"]
 curve = SubResource("Curve_injip")
 
+[sub_resource type="Curve" id="Curve_j8t2t"]
+max_value = 1.1
+_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(1, 1.1), 0.0, 0.0, 0, 0]
+point_count = 2
+
+[sub_resource type="CurveTexture" id="CurveTexture_hecb6"]
+curve = SubResource("Curve_j8t2t")
+
 [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_eppsm"]
 particle_flag_rotate_y = true
 angle_min = 180.0
@@ -45,6 +52,7 @@ angle_max = 180.0
 angular_velocity_min = -720.0
 angular_velocity_max = -720.0
 gravity = Vector3(0, 0, 0)
+scale_curve = SubResource("CurveTexture_hecb6")
 alpha_curve = SubResource("CurveTexture_n6ite")
 emission_curve = SubResource("CurveTexture_eepmy")
 
@@ -54,7 +62,7 @@ shader = ExtResource("2_a0jwb")
 shader_parameter/tex_main = ExtResource("3_fvsr3")
 shader_parameter/tex_noise = ExtResource("5_ymh7m")
 shader_parameter/tex_mask = ExtResource("5_22kwb")
-shader_parameter/tex_gradient = ExtResource("8_nsb82")
+shader_parameter/tex_gradient = ExtResource("3_16hna")
 
 [sub_resource type="Curve" id="Curve_avkhe"]
 _data = [Vector2(0, 0.1), 0.0, 0.0, 0, 0, Vector2(0.8, 0.1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
@@ -111,7 +119,7 @@ alpha_curve = SubResource("CurveTexture_nob8g")
 _data = [Vector2(0, 0.538462), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
 point_count = 2
 
-[sub_resource type="CurveTexture" id="CurveTexture_h11yj"]
+[sub_resource type="CurveTexture" id="CurveTexture_gjefp"]
 curve = SubResource("Curve_oytdv")
 
 [sub_resource type="Curve" id="Curve_uuda5"]
@@ -119,7 +127,7 @@ _data = [Vector2(0, 1), 0.0, -7.39098e-07, 0, 0, Vector2(0.1, 0.1), 0.0, 0.0, 0,
 point_count = 3
 metadata/_snap_enabled = true
 
-[sub_resource type="CurveTexture" id="CurveTexture_eqt5p"]
+[sub_resource type="CurveTexture" id="CurveTexture_stugk"]
 curve = SubResource("Curve_uuda5")
 
 [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_228c5"]
@@ -130,9 +138,9 @@ emission_ring_radius = 1.25
 emission_ring_inner_radius = 1.0
 radial_velocity_min = 2.99998
 radial_velocity_max = 3.99998
-radial_velocity_curve = SubResource("CurveTexture_eqt5p")
+radial_velocity_curve = SubResource("CurveTexture_stugk")
 gravity = Vector3(0, 0, 0)
-alpha_curve = SubResource("CurveTexture_h11yj")
+alpha_curve = SubResource("CurveTexture_gjefp")
 turbulence_enabled = true
 turbulence_influence_max = 0.5
 

scene/effect/particle/_particle_slash3.tscn

@@ -1,11 +1,10 @@
-[gd_scene load_steps=18 format=3 uid="uid://cp5eaiqn5u2tu"]
+[gd_scene load_steps=17 format=3 uid="uid://cp5eaiqn5u2tu"]
 
 [ext_resource type="Script" path="res://script/effect/particle.gd" id="1_xld4w"]
 [ext_resource type="Shader" path="res://render/shader/effect_slash.gdshader" id="2_x0g1q"]
 [ext_resource type="Texture2D" uid="uid://4cxxxxdbbugc" path="res://render/texture/particle/gradient/gradient1.png" id="3_poysl"]
 [ext_resource type="Texture2D" uid="uid://c4byf37he3mjt" path="res://render/texture/particle/noise/noise1.png" id="4_do65m"]
 [ext_resource type="Texture2D" uid="uid://csjm7d1tg6b50" path="res://render/texture/particle/mask/mask6.png" id="5_k70ui"]
-[ext_resource type="Texture2D" uid="uid://c1e2fcr0nucku" path="res://render/texture/particle/mask/mask9.png" id="6_s00va"]
 [ext_resource type="Texture2D" uid="uid://dd3e7ol8qa5eq" path="res://render/texture/particle/noise/noise2.png" id="7_fcone"]
 [ext_resource type="Texture2D" uid="uid://ddrm1reu30eux" path="res://render/texture/common/common_emission.tres" id="8_nyomb"]
 [ext_resource type="ArrayMesh" uid="uid://dq207a0waxk0j" path="res://render/mesh/slash1.obj" id="9_p4cf0"]
@@ -17,7 +16,6 @@ shader = ExtResource("2_x0g1q")
 shader_parameter/tex_main = ExtResource("4_do65m")
 shader_parameter/tex_noise = ExtResource("7_fcone")
 shader_parameter/tex_mask = ExtResource("5_k70ui")
-shader_parameter/tex_mask2 = ExtResource("6_s00va")
 shader_parameter/tex_gradient = ExtResource("3_poysl")
 
 [sub_resource type="Curve" id="Curve_7oqkb"]

scene/effect/particle/particle_hit_blunt_block.tscn

@@ -1,12 +1,15 @@
-[gd_scene load_steps=33 format=3 uid="uid://b245llgradjqo"]
+[gd_scene load_steps=45 format=3 uid="uid://b245llgradjqo"]
 
 [ext_resource type="Script" path="res://script/effect/particle.gd" id="1_5j1nk"]
 [ext_resource type="Shader" path="res://render/shader/particle.gdshader" id="2_q8k2s"]
-[ext_resource type="Texture2D" uid="uid://bqqa04cq6brul" path="res://render/texture/particle/shape/flare6.png" id="3_a0k01"]
+[ext_resource type="Texture2D" uid="uid://4lejpbicrnqv" path="res://render/texture/particle/shape/flare6.png" id="3_a0k01"]
 [ext_resource type="Texture2D" uid="uid://bslhqlcg8cw2l" path="res://render/texture/particle/shape/flare3.png" id="4_0du3d"]
 [ext_resource type="Texture2D" uid="uid://ddrm1reu30eux" path="res://render/texture/common/common_emission.tres" id="4_bgwjy"]
 [ext_resource type="Texture2D" uid="uid://colhtjt8jon3v" path="res://render/texture/particle/shape/smoke.png" id="5_qn2qa"]
 [ext_resource type="RibbonTrailMesh" uid="uid://cv0787wcswb6d" path="res://render/trail_mesh/flare_blunt.tres" id="6_bdl6g"]
+[ext_resource type="Shader" path="res://render/shader/particle_shockwave.gdshader" id="8_adypg"]
+[ext_resource type="Texture2D" uid="uid://6c1yt0vihays" path="res://render/texture/common/common_noise.tres" id="9_cjl78"]
+[ext_resource type="Texture2D" uid="uid://cq58273k05p4f" path="res://render/texture/particle/shape/circle1.png" id="10_su18x"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_dkmkb"]
 render_priority = 0
@@ -122,6 +125,45 @@ initial_velocity_min = 5.0
 initial_velocity_max = 6.0
 alpha_curve = SubResource("CurveTexture_wpjie")
 
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_jnag5"]
+render_priority = 0
+shader = ExtResource("8_adypg")
+shader_parameter/distortionView = 0.03
+shader_parameter/speedView = 0.5
+shader_parameter/noise = ExtResource("9_cjl78")
+shader_parameter/tex_mask = ExtResource("10_su18x")
+
+[sub_resource type="Curve" id="Curve_drpre"]
+_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(0.166154, 0.865408), -1.20613, -1.20613, 0, 0, Vector2(1, 0), 0.0806379, 0.0, 0, 0]
+point_count = 3
+
+[sub_resource type="CurveTexture" id="CurveTexture_3x8hj"]
+curve = SubResource("Curve_drpre")
+
+[sub_resource type="Gradient" id="Gradient_e7erb"]
+offsets = PackedFloat32Array(0, 0.20202, 1)
+colors = PackedColorArray(1, 1, 1, 1, 0.937017, 0.527629, 0.107744, 1, 0.929412, 0.470588, 0, 1)
+
+[sub_resource type="GradientTexture1D" id="GradientTexture1D_fjlbr"]
+gradient = SubResource("Gradient_e7erb")
+
+[sub_resource type="Curve" id="Curve_umr8j"]
+max_value = 4.0
+_data = [Vector2(0, 0.758242), 0.0, 2.00769, 0, 0, Vector2(0.04, 1.50365), 0.0, 0.0, 0, 0, Vector2(1, 4), 0.0, 0.0, 0, 0]
+point_count = 3
+
+[sub_resource type="CurveTexture" id="CurveTexture_08ifa"]
+curve = SubResource("Curve_umr8j")
+
+[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_ragws"]
+particle_flag_disable_z = true
+gravity = Vector3(0, 0, 0)
+scale_curve = SubResource("CurveTexture_08ifa")
+color_ramp = SubResource("GradientTexture1D_fjlbr")
+alpha_curve = SubResource("CurveTexture_3x8hj")
+
+[sub_resource type="QuadMesh" id="QuadMesh_g3tsh"]
+
 [node name="Particle" type="Node3D"]
 script = ExtResource("1_5j1nk")
 
@@ -173,3 +215,16 @@ trail_enabled = true
 trail_lifetime = 0.1
 process_material = SubResource("ParticleProcessMaterial_5lomq")
 draw_pass_1 = ExtResource("6_bdl6g")
+
+[node name="Slash3" type="GPUParticles3D" parent="."]
+layers = 512
+material_override = SubResource("ShaderMaterial_jnag5")
+cast_shadow = 0
+emitting = false
+amount = 1
+lifetime = 0.3
+one_shot = true
+fixed_fps = 60
+local_coords = true
+process_material = SubResource("ParticleProcessMaterial_ragws")
+draw_pass_1 = SubResource("QuadMesh_g3tsh")

scene/effect/particle/particle_hit_blunt_heavy.tscn

@@ -137,14 +137,14 @@ shader_parameter/tex_mask = ExtResource("9_mcr0a")
 _data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(0.166154, 0.865408), -1.20613, -1.20613, 0, 0, Vector2(1, 0), 0.0806379, 0.0, 0, 0]
 point_count = 3
 
-[sub_resource type="CurveTexture" id="CurveTexture_3x8hj"]
+[sub_resource type="CurveTexture" id="CurveTexture_cb64s"]
 curve = SubResource("Curve_3gyvw")
 
 [sub_resource type="Gradient" id="Gradient_h5q87"]
 offsets = PackedFloat32Array(0, 0.20202, 1)
 colors = PackedColorArray(1, 1, 1, 1, 0.937017, 0.527629, 0.107744, 1, 0.929412, 0.470588, 0, 1)
 
-[sub_resource type="GradientTexture1D" id="GradientTexture1D_fjlbr"]
+[sub_resource type="GradientTexture1D" id="GradientTexture1D_ivagg"]
 gradient = SubResource("Gradient_h5q87")
 
 [sub_resource type="Curve" id="Curve_fp0wv"]
@@ -152,15 +152,15 @@ max_value = 4.0
 _data = [Vector2(0, 0.758242), 0.0, 2.00769, 0, 0, Vector2(0.04, 1.50365), 0.0, 0.0, 0, 0, Vector2(1, 4), 0.0, 0.0, 0, 0]
 point_count = 3
 
-[sub_resource type="CurveTexture" id="CurveTexture_08ifa"]
+[sub_resource type="CurveTexture" id="CurveTexture_khjmi"]
 curve = SubResource("Curve_fp0wv")
 
 [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_kns0r"]
 particle_flag_disable_z = true
 gravity = Vector3(0, 0, 0)
-scale_curve = SubResource("CurveTexture_08ifa")
-color_ramp = SubResource("GradientTexture1D_fjlbr")
-alpha_curve = SubResource("CurveTexture_3x8hj")
+scale_curve = SubResource("CurveTexture_khjmi")
+color_ramp = SubResource("GradientTexture1D_ivagg")
+alpha_curve = SubResource("CurveTexture_cb64s")
 
 [node name="Particle" type="Node3D"]
 script = ExtResource("1_oydbn")

scene/effect/particle/particle_hit_common.tscn

@@ -1,8 +1,34 @@
-[gd_scene load_steps=4 format=3 uid="uid://c586yw1w3w5ja"]
+[gd_scene load_steps=10 format=3 uid="uid://c586yw1w3w5ja"]
 
 [ext_resource type="Script" path="res://script/effect/particle.gd" id="1_mj544"]
 [ext_resource type="Script" path="res://script/effect/particle_sub_emitter.gd" id="2_k8mlr"]
 [ext_resource type="PackedScene" uid="uid://bfnwt1jr830pa" path="res://scene/effect/particle/particle_common_fragment.tscn" id="3_lryd5"]
+[ext_resource type="RibbonTrailMesh" uid="uid://bn70s68ohnw7b" path="res://render/trail_mesh/hit_dust.tres" id="4_bqnl1"]
+
+[sub_resource type="Curve" id="Curve_4d7nn"]
+_data = [Vector2(0, 0.538462), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
+point_count = 2
+
+[sub_resource type="CurveTexture" id="CurveTexture_5lgc0"]
+curve = SubResource("Curve_4d7nn")
+
+[sub_resource type="Curve" id="Curve_dr7r5"]
+_data = [Vector2(0, 1), 0.0, -0.454215, 0, 1, Vector2(0.112903, 0.230769), -1.19231, -1.19231, 0, 0, Vector2(1, 0), -0.26014, 0.0, 1, 0]
+point_count = 3
+
+[sub_resource type="CurveTexture" id="CurveTexture_ysdsr"]
+curve = SubResource("Curve_dr7r5")
+
+[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_0by57"]
+emission_shape = 1
+emission_sphere_radius = 0.05
+radial_velocity_min = 3.99998
+radial_velocity_max = 4.99998
+radial_velocity_curve = SubResource("CurveTexture_ysdsr")
+gravity = Vector3(0, -1, 0)
+alpha_curve = SubResource("CurveTexture_5lgc0")
+turbulence_enabled = true
+turbulence_influence_max = 0.5
 
 [node name="Particle" type="Node3D"]
 script = ExtResource("1_mj544")
@@ -12,3 +38,14 @@ script = ExtResource("2_k8mlr")
 sub = ExtResource("3_lryd5")
 count_max = 3
 lifetime = 0.1
+
+[node name="Flare" type="GPUParticles3D" parent="."]
+emitting = false
+amount = 10
+lifetime = 2.0
+one_shot = true
+explosiveness = 1.0
+trail_enabled = true
+trail_lifetime = 0.1
+process_material = SubResource("ParticleProcessMaterial_0by57")
+draw_pass_1 = ExtResource("4_bqnl1")

scene/launcher.tscn

@@ -21,7 +21,7 @@
 [ext_resource type="Script" path="res://script/manager/item_manager.gd" id="12_xwufn"]
 [ext_resource type="Script" path="res://script/character/status.gd" id="18_nr8sb"]
 [ext_resource type="SpriteFrames" uid="uid://2cb8lknel0ih" path="res://resource/animation/character/basic_move.aseprite" id="20_4ni1a"]
-[ext_resource type="SpriteFrames" uid="uid://jpxh0jr8wp8g" path="res://resource/animation/character/hero01_basic.aseprite" id="21_mlmn1"]
+[ext_resource type="SpriteFrames" uid="uid://cndpnxtdh37ii" path="res://resource/animation/character/hero01_short_attack.aseprite" id="21_exsja"]
 [ext_resource type="AnimationLibrary" uid="uid://croik07a1qko5" path="res://resource/skill_animation_library/animation_library.tres" id="22_qyapv"]
 [ext_resource type="Script" path="res://script/character/skill.gd" id="23_783eu"]
 [ext_resource type="Script" path="res://script/character/move.gd" id="25_d520l"]
@@ -273,8 +273,9 @@ pixel_size = 0.02
 double_sided = false
 alpha_cut = 2
 texture_filter = 0
-sprite_frames = ExtResource("21_mlmn1")
-animation = &"basic_flash"
+sprite_frames = ExtResource("21_exsja")
+animation = &"short_attack04"
+frame = 7
 
 [node name="Throw" type="AnimatedSprite3D" parent="EditorTool/Character"]
 unique_name_in_owner = true

script/character/battle.gd

@@ -138,7 +138,7 @@ func settle(from: int, to: int, dir: Vector2, attack: AttackCfg) -> HitResult:
 
     #硬直等级
     var break_level_def: int = character_to.get_break_level_def()
-    var break_level_sub: int = clampi(attack.break_level - break_level_def, -1, 3)
+    var break_level_sub: int = clampi(attack.break_level - break_level_def, -1, 4)
     is_break_skill_real = break_level_sub > 0
     is_break_skill = is_break_skill_real or not is_on_floor
     #硬直等级伤害修正
@@ -173,22 +173,22 @@ func settle(from: int, to: int, dir: Vector2, attack: AttackCfg) -> HitResult:
     var pause_time: float
     if is_break_skill:
         var break_level_sum_rate: float
-        if is_stagger:
-            break_level_sum_rate = attack.break_level / 4.0
-        else:
-            break_level_sum_rate = (attack.break_level + break_level_def) / 4.0
+        break_level_sum_rate = attack.break_level / 4.0
         pause_time = pause_time_limit_curve.sample(break_level_sum_rate)
 
-    #格挡 破盾以及击杀具有固定值
+    #格挡 带盾破防 破盾以及击杀具有固定值
     if is_block:
         pause_time = 0.05
         break_level_sub = 0
+    elif has_shield and is_break_skill and not is_stagger:
+        pause_time = 0.1
+        break_level_sub = 2
     elif is_break_shield:
         pause_time = 0.2
-        break_level_sub = 2
+        break_level_sub = 3
     elif is_kill:
         pause_time = 0.3
-        break_level_sub = 3
+        break_level_sub = 4
 
     #眩晕值累加
     if not is_stun:
@@ -250,7 +250,8 @@ func settle(from: int, to: int, dir: Vector2, attack: AttackCfg) -> HitResult:
         if is_rebound: trigger_hit="rebound"
         elif is_floating: trigger_hit = "air_hit_down" if attack.hit_up_speed<0 else "air_hit_up"
         elif is_stun: trigger_hit="stun_hit"
-        elif break_level_sub == 3: trigger_hit="lhit"
+        elif break_level_sub == 4: trigger_hit="lhit"
+        elif break_level_sub == 3: trigger_hit="mhit"
         elif break_level_sub == 2: trigger_hit="mhit"
         elif break_level_sub == 1: trigger_hit="hit"
         character_to.set_view_trigger(trigger_hit)
@@ -268,7 +269,8 @@ func settle(from: int, to: int, dir: Vector2, attack: AttackCfg) -> HitResult:
             match break_level_sub:
                 1: character_to.add_buff("stagger", 0.3)
                 2: character_to.add_buff("stagger", 0.6)
-                3: character_to.add_buff("stagger", 0.9)
+                3: character_to.add_buff("stagger", 0.6)
+                4: character_to.add_buff("stagger", 0.9)
             hit_up_speed = 0
             if hit_back_limit_curve:
                 hit_back_speed = max(hit_back_limit_curve.sample(dist_rate), hit_back_speed)
@@ -308,17 +310,19 @@ func settle(from: int, to: int, dir: Vector2, attack: AttackCfg) -> HitResult:
             Enum.EDamageType.Sharp:
                 match break_level_sub:
                     -1: particle_hit = ResourceManager.particle_hit_sharp_block
-                    0: particle_hit = ResourceManager.particle_hit_sharp_normal
+                    0: particle_hit = ResourceManager.particle_hit_sharp_block
                     1: particle_hit = ResourceManager.particle_hit_sharp_normal
                     2: particle_hit = ResourceManager.particle_hit_sharp_mid
                     3: particle_hit = ResourceManager.particle_hit_sharp_heavy
+                    4: particle_hit = ResourceManager.particle_hit_sharp_heavy
             Enum.EDamageType.Blunt:
                 match break_level_sub:
                     -1: particle_hit = ResourceManager.particle_hit_blunt_block
-                    0: particle_hit = ResourceManager.particle_hit_blunt_normal
+                    0: particle_hit = ResourceManager.particle_hit_blunt_block
                     1: particle_hit = ResourceManager.particle_hit_blunt_normal
                     2: particle_hit = ResourceManager.particle_hit_blunt_mid
                     3: particle_hit = ResourceManager.particle_hit_blunt_heavy
+                    4: particle_hit = ResourceManager.particle_hit_blunt_heavy
             _: pass
         if particle_hit:
             character_to.cast_particle(particle_hit, false)

script/character/buff.gd

@@ -120,10 +120,14 @@ func on_end_die2(rate)->void:
     Global.character_mgr.destroy_character(status.id)
 
 
-func on_start_stagger(rate)->void: status.is_stagger = true
+func on_start_stagger(rate)->void:
+    status.is_stagger = true
+    status.set_skill_break_level_add(-1)
 
 
-func on_end_stagger(rate)->void: status.is_stagger = false
+func on_end_stagger(rate)->void:
+    status.is_stagger = false
+    status.set_skill_break_level_add(0)
 
 
 func on_end_shield_recover_cd(rate)->void: add_buff("shield_recover", -1)

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_remote01.tres") as CoreCfg)