移动特效优化

config/attack/blunt_mid_hit_down.tres

@@ -9,7 +9,6 @@ break_level = 2
 stun_attack = 10.0
 damage_type = 1
 is_floating = false
-is_hit_down = true
 is_rebound = false
 is_stop_self = true
 is_throw_check = false

config/attack/blunt_throw_end_hit_down.tres

@@ -9,7 +9,6 @@ break_level = 2
 stun_attack = 10.0
 damage_type = 1
 is_floating = false
-is_hit_down = true
 is_rebound = false
 is_stop_self = true
 is_throw_check = false

config/attack/rebound.tres

@@ -9,7 +9,6 @@ break_level = 1
 stun_attack = 10.0
 damage_type = 1
 is_floating = true
-is_hit_down = false
 is_rebound = true
 is_stop_self = true
 is_throw_check = false
@@ -18,5 +17,5 @@ hit_back_speed = 3.0
 hit_up_speed = 4.0
 hit_back_duration = 0.05
 hit_up_duration = 0.05
-pause_time = 0.0
+pause_time = 0.05
 is_force_pause = false

render/shader/trail.gdshader

@@ -8,5 +8,5 @@ void fragment() {
 	vec3 col_main = texture(tex_main, UV).rgb;
 	vec3 col = texture(tex_gradient, vec2(COLOR.a,0.5)).rgb;
 	ALBEDO = col;
-	ALPHA = COLOR.a * col_main.r;
+	ALPHA = COLOR.a;
 }

render/texture/particle/shape/glow1.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://b0bmvub81xvmf"
-path="res://.godot/imported/glow.png-c1c3cae4dab2d016ddc051279ee33301.ctex"
+path="res://.godot/imported/glow1.png-e288c169a4c72241960595ba6297c3fd.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://render/texture/particle/shape/glow.png"
+source_file="res://render/texture/particle/shape/glow1.png"
-dest_files=["res://.godot/imported/glow.png-c1c3cae4dab2d016ddc051279ee33301.ctex"]
+dest_files=["res://.godot/imported/glow1.png-e288c169a4c72241960595ba6297c3fd.ctex"]
 
 [params]
 

render/texture/particle/shape/glow2.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://usaih3es2tch"
+path="res://.godot/imported/glow2.png-48956f565be0479a3bc7e8181fc2cbfd.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://render/texture/particle/shape/glow2.png"
+dest_files=["res://.godot/imported/glow2.png-48956f565be0479a3bc7e8181fc2cbfd.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=0
+compress/normal_map=2
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=false
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0

render/trail_mesh/air_dust.tres

@@ -0,0 +1,15 @@
+[gd_resource type="RibbonTrailMesh" load_steps=5 format=3 uid="uid://drx1hgf5acgv7"]
+
+[ext_resource type="Shader" path="res://render/shader/trail.gdshader" id="1_qg5p2"]
+[ext_resource type="Texture2D" uid="uid://d2tcm2g7sh1ne" path="res://render/texture/particle/gradient/gradient3.png" id="2_2vqgl"]
+[ext_resource type="Texture2D" uid="uid://b0bmvub81xvmf" path="res://render/texture/particle/shape/glow1.png" id="3_armrx"]
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_cvevy"]
+render_priority = 0
+shader = ExtResource("1_qg5p2")
+shader_parameter/tex_main = ExtResource("3_armrx")
+shader_parameter/tex_gradient = ExtResource("2_2vqgl")
+
+[resource]
+material = SubResource("ShaderMaterial_cvevy")
+size = 0.1

render/trail_mesh/flare_blunt.tres

@@ -0,0 +1,16 @@
+[gd_resource type="RibbonTrailMesh" load_steps=5 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.04
+section_length = 0.15

render/trail_mesh/flare_sharp.tres

@@ -0,0 +1,15 @@
+[gd_resource type="RibbonTrailMesh" load_steps=5 format=3 uid="uid://bs5hlmt5xvqfd"]
+
+[ext_resource type="Shader" path="res://render/shader/trail.gdshader" id="1_mjqg8"]
+[ext_resource type="Texture2D" uid="uid://4cxxxxdbbugc" path="res://render/texture/particle/gradient/gradient1.png" id="2_juhic"]
+[ext_resource type="Texture2D" uid="uid://b0bmvub81xvmf" path="res://render/texture/particle/shape/glow1.png" id="3_jw1ov"]
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_bnn4j"]
+render_priority = 0
+shader = ExtResource("1_mjqg8")
+shader_parameter/tex_main = ExtResource("3_jw1ov")
+shader_parameter/tex_gradient = ExtResource("2_juhic")
+
+[resource]
+material = SubResource("ShaderMaterial_bnn4j")
+size = 0.04

render/trail_mesh/speed_line.tres

@@ -0,0 +1,15 @@
+[gd_resource type="RibbonTrailMesh" load_steps=5 format=3 uid="uid://sl2yk58443mf"]
+
+[ext_resource type="Shader" path="res://render/shader/trail.gdshader" id="1_0iagh"]
+[ext_resource type="Texture2D" uid="uid://d2tcm2g7sh1ne" path="res://render/texture/particle/gradient/gradient3.png" id="2_5auki"]
+[ext_resource type="Texture2D" uid="uid://b0bmvub81xvmf" path="res://render/texture/particle/shape/glow1.png" id="3_nhp6p"]
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_k4bt0"]
+render_priority = 0
+shader = ExtResource("1_0iagh")
+shader_parameter/tex_main = ExtResource("3_nhp6p")
+shader_parameter/tex_gradient = ExtResource("2_5auki")
+
+[resource]
+material = SubResource("ShaderMaterial_k4bt0")
+size = 0.1

scene/character/character.tscn

@@ -37,7 +37,7 @@ shader_parameter/deformation_rate = 0.0
 shader_parameter/tex = ExtResource("4_fcd8a")
 
 [sub_resource type="Curve" id="Curve_1lu0a"]
-_data = [Vector2(0, 0), 0.0, 0.0, 0, 1, Vector2(0.503856, 0), 0.0, 0.0, 0, 0, Vector2(1, 1), 2.01554, 0.0, 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="Animation" id="Animation_dbjx6"]

scene/effect/particle/_particle_hit_ground_heavy.tscn

@@ -17,8 +17,8 @@ shader = ExtResource("4_ppovm")
 shader_parameter/tex_main = ExtResource("5_ckrbk")
 
 [sub_resource type="Curve" id="Curve_yx8ux"]
-_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(0.252308, 0.398295), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
+_data = [Vector2(0, 0.517052), 0.0, -0.517052, 0, 1, Vector2(1, 0), -0.517052, 0.0, 1, 0]
-point_count = 3
+point_count = 2
 
 [sub_resource type="CurveTexture" id="CurveTexture_vgydt"]
 curve = SubResource("Curve_yx8ux")

scene/effect/particle/_particle_hit_ground_normal.tscn

@@ -10,27 +10,27 @@ shader = ExtResource("4_riq1c")
 shader_parameter/tex_main = ExtResource("5_feq6c")
 
 [sub_resource type="Curve" id="Curve_ll1if"]
-_data = [Vector2(0, 0.52497), 0.0, -0.52497, 0, 1, Vector2(1, 0), -0.52497, 0.0, 1, 0]
+_data = [Vector2(0, 0.501218), 0.0, -0.501218, 0, 1, Vector2(1, 0), -0.501218, 0.0, 1, 0]
 point_count = 2
 
-[sub_resource type="CurveTexture" id="CurveTexture_m6i4p"]
+[sub_resource type="CurveTexture" id="CurveTexture_rq071"]
 curve = SubResource("Curve_ll1if")
 
 [sub_resource type="Curve" id="Curve_63se2"]
 max_value = 1.5
-_data = [Vector2(0, 0.870585), 0.0, 0.629415, 0, 1, Vector2(1, 1.5), 0.629415, 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
 
-[sub_resource type="CurveTexture" id="CurveTexture_dlf32"]
+[sub_resource type="CurveTexture" id="CurveTexture_jbxxs"]
 curve = SubResource("Curve_63se2")
 
-[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_t7n3k"]
+[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_egb3n"]
 particle_flag_disable_z = true
 angle_min = 1.07288e-05
 angle_max = 720.0
 gravity = Vector3(0, 0, 0)
-scale_curve = SubResource("CurveTexture_dlf32")
+scale_curve = SubResource("CurveTexture_jbxxs")
-alpha_curve = SubResource("CurveTexture_m6i4p")
+alpha_curve = SubResource("CurveTexture_rq071")
 
 [sub_resource type="QuadMesh" id="QuadMesh_36ni8"]
 
@@ -44,9 +44,9 @@ material_override = SubResource("ShaderMaterial_0b0aa")
 cast_shadow = 0
 emitting = false
 amount = 1
-lifetime = 0.3
+lifetime = 0.2
 one_shot = true
 fixed_fps = 60
 local_coords = true
-process_material = SubResource("ParticleProcessMaterial_t7n3k")
+process_material = SubResource("ParticleProcessMaterial_egb3n")
 draw_pass_1 = SubResource("QuadMesh_36ni8")

scene/effect/particle/_particle_slash1.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=20 format=3 uid="uid://b2h4pcmlii7dg"]
+[gd_scene load_steps=17 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,8 +8,7 @@
 [ext_resource type="Texture2D" uid="uid://csjm7d1tg6b50" path="res://render/texture/particle/mask/mask6.png" id="4_wvohg"]
 [ext_resource type="Texture2D" uid="uid://c1e2fcr0nucku" path="res://render/texture/particle/mask/mask9.png" id="5_n15k1"]
 [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/trail.gdshader" id="9_fhgek"]
+[ext_resource type="RibbonTrailMesh" uid="uid://bs5hlmt5xvqfd" path="res://render/trail_mesh/flare_sharp.tres" id="9_0e33x"]
-[ext_resource type="Texture2D" uid="uid://b0bmvub81xvmf" path="res://render/texture/particle/shape/glow.png" id="10_c06si"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_hupcc"]
 render_priority = 0
@@ -43,7 +42,7 @@ point_count = 2
 [sub_resource type="CurveTexture" id="CurveTexture_wpjie"]
 curve = SubResource("Curve_a8a1y")
 
-[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_emv2p"]
+[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_rewyi"]
 emission_shape = 6
 emission_ring_axis = Vector3(0, 1, 0)
 emission_ring_height = 0.0
@@ -55,16 +54,6 @@ radial_velocity_max = 3.99998
 gravity = Vector3(0, 0, 0)
 alpha_curve = SubResource("CurveTexture_wpjie")
 
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_hrjt4"]
-render_priority = 0
-shader = ExtResource("9_fhgek")
-shader_parameter/tex_main = ExtResource("10_c06si")
-shader_parameter/tex_gradient = ExtResource("3_16hna")
-
-[sub_resource type="RibbonTrailMesh" id="RibbonTrailMesh_owxke"]
-material = SubResource("ShaderMaterial_hrjt4")
-size = 0.1
-
 [node name="Particle" type="Node3D"]
 script = ExtResource("1_fx8ev")
 
@@ -93,5 +82,5 @@ explosiveness = 1.0
 local_coords = true
 trail_enabled = true
 trail_lifetime = 0.1
-process_material = SubResource("ParticleProcessMaterial_emv2p")
+process_material = SubResource("ParticleProcessMaterial_rewyi")
-draw_pass_1 = SubResource("RibbonTrailMesh_owxke")
+draw_pass_1 = ExtResource("9_0e33x")

scene/effect/particle/particle_blood_decal.tscn

@@ -18,7 +18,7 @@ script = ExtResource("1_6r6qw")
 
 [node name="DecalBlood" type="Decal" parent="."]
 transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0)
-size = Vector3(1, 1, 1)
+size = Vector3(1.5, 1.5, 1.5)
 texture_albedo = ExtResource("2_op8c3")
 modulate = Color(0, 0, 0, 1)
 normal_fade = 0.999
@@ -28,4 +28,4 @@ script = ExtResource("3_yeg2u")
 lifetime = 3.0
 gradient = SubResource("Gradient_lwltf")
 scale_curve = SubResource("Curve_w5jkx")
-size_random = 0.5
+size_random = 0.8

scene/effect/particle/particle_hit_blunt_block.tscn

@@ -1,13 +1,11 @@
-[gd_scene load_steps=36 format=3 uid="uid://b245llgradjqo"]
+[gd_scene load_steps=32 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://bslhqlcg8cw2l" path="res://render/texture/particle/shape/flare3.png" id="4_0du3d"]
 [ext_resource type="Texture2D" uid="uid://colhtjt8jon3v" path="res://render/texture/particle/shape/smoke.png" id="5_qn2qa"]
-[ext_resource type="Shader" path="res://render/shader/trail.gdshader" id="6_hjawx"]
+[ext_resource type="RibbonTrailMesh" uid="uid://cv0787wcswb6d" path="res://render/trail_mesh/flare_blunt.tres" id="6_bdl6g"]
-[ext_resource type="Texture2D" uid="uid://dg6i5l05y3vww" path="res://render/texture/particle/gradient/gradient2.png" id="7_thsmi"]
-[ext_resource type="Texture2D" uid="uid://b0bmvub81xvmf" path="res://render/texture/particle/shape/glow.png" id="8_egr4r"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_dkmkb"]
 render_priority = 0
@@ -118,20 +116,10 @@ curve = SubResource("Curve_axcwu")
 
 [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_5lomq"]
 spread = 180.0
-initial_velocity_min = 4.0
+initial_velocity_min = 5.0
-initial_velocity_max = 5.0
+initial_velocity_max = 6.0
 alpha_curve = SubResource("CurveTexture_wpjie")
 
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_hrjt4"]
-render_priority = 0
-shader = ExtResource("6_hjawx")
-shader_parameter/tex_main = ExtResource("8_egr4r")
-shader_parameter/tex_gradient = ExtResource("7_thsmi")
-
-[sub_resource type="RibbonTrailMesh" id="RibbonTrailMesh_urftu"]
-material = SubResource("ShaderMaterial_hrjt4")
-size = 0.1
-
 [node name="Particle" type="Node3D"]
 script = ExtResource("1_5j1nk")
 
@@ -177,8 +165,9 @@ draw_pass_1 = SubResource("QuadMesh_0kefl")
 emitting = false
 lifetime = 0.3
 one_shot = true
+preprocess = 0.05
 explosiveness = 1.0
 trail_enabled = true
 trail_lifetime = 0.1
 process_material = SubResource("ParticleProcessMaterial_5lomq")
-draw_pass_1 = SubResource("RibbonTrailMesh_urftu")
+draw_pass_1 = ExtResource("6_bdl6g")

scene/effect/particle/particle_hit_blunt_heavy.tscn

@@ -1,13 +1,11 @@
-[gd_scene load_steps=36 format=3 uid="uid://cdq8t46i51ur5"]
+[gd_scene load_steps=32 format=3 uid="uid://cdq8t46i51ur5"]
 
 [ext_resource type="Script" path="res://script/effect/particle.gd" id="1_oydbn"]
 [ext_resource type="Shader" path="res://render/shader/particle.gdshader" id="2_j4418"]
 [ext_resource type="Texture2D" uid="uid://bqqa04cq6brul" path="res://render/texture/particle/shape/flare6.png" id="3_46a2r"]
 [ext_resource type="Texture2D" uid="uid://bslhqlcg8cw2l" path="res://render/texture/particle/shape/flare3.png" id="4_xpm5f"]
 [ext_resource type="Texture2D" uid="uid://colhtjt8jon3v" path="res://render/texture/particle/shape/smoke.png" id="5_rp3hs"]
-[ext_resource type="Shader" path="res://render/shader/trail.gdshader" id="6_uy36j"]
+[ext_resource type="RibbonTrailMesh" uid="uid://cv0787wcswb6d" path="res://render/trail_mesh/flare_blunt.tres" id="6_j4o4n"]
-[ext_resource type="Texture2D" uid="uid://dg6i5l05y3vww" path="res://render/texture/particle/gradient/gradient2.png" id="7_gafmx"]
-[ext_resource type="Texture2D" uid="uid://b0bmvub81xvmf" path="res://render/texture/particle/shape/glow.png" id="7_qnuli"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_dkmkb"]
 render_priority = 0
@@ -122,16 +120,6 @@ initial_velocity_min = 4.0
 initial_velocity_max = 5.0
 alpha_curve = SubResource("CurveTexture_wpjie")
 
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_hrjt4"]
-render_priority = 0
-shader = ExtResource("6_uy36j")
-shader_parameter/tex_main = ExtResource("7_qnuli")
-shader_parameter/tex_gradient = ExtResource("7_gafmx")
-
-[sub_resource type="RibbonTrailMesh" id="RibbonTrailMesh_urftu"]
-material = SubResource("ShaderMaterial_hrjt4")
-size = 0.1
-
 [node name="Particle" type="Node3D"]
 script = ExtResource("1_oydbn")
 
@@ -177,8 +165,9 @@ draw_pass_1 = SubResource("QuadMesh_0kefl")
 emitting = false
 lifetime = 0.3
 one_shot = true
+preprocess = 0.05
 explosiveness = 1.0
 trail_enabled = true
 trail_lifetime = 0.1
 process_material = SubResource("ParticleProcessMaterial_5lomq")
-draw_pass_1 = SubResource("RibbonTrailMesh_urftu")
+draw_pass_1 = ExtResource("6_j4o4n")

scene/effect/particle/particle_hit_blunt_mid.tscn

@@ -1,13 +1,10 @@
-[gd_scene load_steps=36 format=3 uid="uid://bvut7t1l1v305"]
+[gd_scene load_steps=24 format=3 uid="uid://bvut7t1l1v305"]
 
 [ext_resource type="Script" path="res://script/effect/particle.gd" id="1_a6aoh"]
 [ext_resource type="Shader" path="res://render/shader/particle.gdshader" id="2_huo8i"]
 [ext_resource type="Texture2D" uid="uid://bqqa04cq6brul" path="res://render/texture/particle/shape/flare6.png" id="3_is87m"]
 [ext_resource type="Texture2D" uid="uid://bslhqlcg8cw2l" path="res://render/texture/particle/shape/flare3.png" id="4_3vqto"]
-[ext_resource type="Texture2D" uid="uid://colhtjt8jon3v" path="res://render/texture/particle/shape/smoke.png" id="5_eshx2"]
+[ext_resource type="RibbonTrailMesh" uid="uid://cv0787wcswb6d" path="res://render/trail_mesh/flare_blunt.tres" id="6_48ph4"]
-[ext_resource type="Shader" path="res://render/shader/trail.gdshader" id="6_geujg"]
-[ext_resource type="Texture2D" uid="uid://dg6i5l05y3vww" path="res://render/texture/particle/gradient/gradient2.png" id="7_6xivr"]
-[ext_resource type="Texture2D" uid="uid://b0bmvub81xvmf" path="res://render/texture/particle/shape/glow.png" id="7_lwyks"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_dkmkb"]
 render_priority = 0
@@ -75,62 +72,18 @@ gravity = Vector3(0, 0, 0)
 scale_curve = SubResource("CurveTexture_k3cwo")
 alpha_curve = SubResource("CurveTexture_1og0n")
 
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_vkw8i"]
-render_priority = 0
-shader = ExtResource("2_huo8i")
-shader_parameter/tex_main = ExtResource("5_eshx2")
-
-[sub_resource type="Curve" id="Curve_didyq"]
-_data = [Vector2(0, 0.32967), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
-point_count = 2
-
-[sub_resource type="CurveTexture" id="CurveTexture_3pi6l"]
-curve = SubResource("Curve_didyq")
-
-[sub_resource type="Curve" id="Curve_6dnuy"]
-max_value = 4.0
-_data = [Vector2(0, 1.75824), 0.0, 0.0, 0, 0, Vector2(1, 2.76923), 0.0, 0.0, 0, 0]
-point_count = 2
-
-[sub_resource type="CurveTexture" id="CurveTexture_skg43"]
-curve = SubResource("Curve_6dnuy")
-
-[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_gjwvd"]
-particle_flag_disable_z = true
-angle_min = 1.07288e-05
-angle_max = 720.0
-velocity_pivot = Vector3(0, 0, 1)
-spread = 180.0
-initial_velocity_max = 0.2
-gravity = Vector3(0, 0, 0)
-scale_curve = SubResource("CurveTexture_skg43")
-color = Color(0.521569, 0.509804, 0.501961, 1)
-alpha_curve = SubResource("CurveTexture_3pi6l")
-
-[sub_resource type="QuadMesh" id="QuadMesh_0kefl"]
-
 [sub_resource type="Curve" id="Curve_axcwu"]
 _data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
 point_count = 2
 
-[sub_resource type="CurveTexture" id="CurveTexture_wpjie"]
+[sub_resource type="CurveTexture" id="CurveTexture_mgmqm"]
 curve = SubResource("Curve_axcwu")
 
 [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_5lomq"]
 spread = 180.0
 initial_velocity_min = 4.0
 initial_velocity_max = 5.0
-alpha_curve = SubResource("CurveTexture_wpjie")
+alpha_curve = SubResource("CurveTexture_mgmqm")
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_hrjt4"]
-render_priority = 0
-shader = ExtResource("6_geujg")
-shader_parameter/tex_main = ExtResource("7_lwyks")
-shader_parameter/tex_gradient = ExtResource("7_6xivr")
-
-[sub_resource type="RibbonTrailMesh" id="RibbonTrailMesh_urftu"]
-material = SubResource("ShaderMaterial_hrjt4")
-size = 0.1
 
 [node name="Particle" type="Node3D"]
 script = ExtResource("1_a6aoh")
@@ -161,25 +114,13 @@ local_coords = true
 process_material = SubResource("ParticleProcessMaterial_3w28u")
 draw_pass_1 = SubResource("QuadMesh_0j7av")
 
-[node name="Smoke" type="GPUParticles3D" parent="."]
-visible = false
-layers = 512
-material_override = SubResource("ShaderMaterial_vkw8i")
-cast_shadow = 0
-emitting = false
-amount = 2
-one_shot = true
-explosiveness = 1.0
-local_coords = true
-process_material = SubResource("ParticleProcessMaterial_gjwvd")
-draw_pass_1 = SubResource("QuadMesh_0kefl")
-
 [node name="Flare" type="GPUParticles3D" parent="."]
 emitting = false
 lifetime = 0.3
 one_shot = true
+preprocess = 0.05
 explosiveness = 1.0
 trail_enabled = true
 trail_lifetime = 0.1
 process_material = SubResource("ParticleProcessMaterial_5lomq")
-draw_pass_1 = SubResource("RibbonTrailMesh_urftu")
+draw_pass_1 = ExtResource("6_48ph4")

scene/effect/particle/particle_hit_blunt_normal.tscn

@@ -1,13 +1,9 @@
-[gd_scene load_steps=36 format=3 uid="uid://bep28rw64nd7q"]
+[gd_scene load_steps=20 format=3 uid="uid://bep28rw64nd7q"]
 
 [ext_resource type="Script" path="res://script/effect/particle.gd" id="1_vgayn"]
 [ext_resource type="Shader" path="res://render/shader/particle.gdshader" id="2_g5eyu"]
 [ext_resource type="Texture2D" uid="uid://bqqa04cq6brul" path="res://render/texture/particle/shape/flare6.png" id="3_da2in"]
 [ext_resource type="Texture2D" uid="uid://bslhqlcg8cw2l" path="res://render/texture/particle/shape/flare3.png" id="4_pgf8e"]
-[ext_resource type="Texture2D" uid="uid://colhtjt8jon3v" path="res://render/texture/particle/shape/smoke.png" id="5_ckbu8"]
-[ext_resource type="Shader" path="res://render/shader/trail.gdshader" id="6_r5wlh"]
-[ext_resource type="Texture2D" uid="uid://dg6i5l05y3vww" path="res://render/texture/particle/gradient/gradient2.png" id="7_de557"]
-[ext_resource type="Texture2D" uid="uid://b0bmvub81xvmf" path="res://render/texture/particle/shape/glow.png" id="7_ej28x"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_dkmkb"]
 render_priority = 0
@@ -75,63 +71,6 @@ gravity = Vector3(0, 0, 0)
 scale_curve = SubResource("CurveTexture_p7m8e")
 alpha_curve = SubResource("CurveTexture_y5usl")
 
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_vkw8i"]
-render_priority = 0
-shader = ExtResource("2_g5eyu")
-shader_parameter/tex_main = ExtResource("5_ckbu8")
-
-[sub_resource type="Curve" id="Curve_didyq"]
-_data = [Vector2(0, 0.32967), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
-point_count = 2
-
-[sub_resource type="CurveTexture" id="CurveTexture_3pi6l"]
-curve = SubResource("Curve_didyq")
-
-[sub_resource type="Curve" id="Curve_6dnuy"]
-max_value = 4.0
-_data = [Vector2(0, 1.75824), 0.0, 0.0, 0, 0, Vector2(1, 2.76923), 0.0, 0.0, 0, 0]
-point_count = 2
-
-[sub_resource type="CurveTexture" id="CurveTexture_skg43"]
-curve = SubResource("Curve_6dnuy")
-
-[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_gjwvd"]
-particle_flag_disable_z = true
-angle_min = 1.07288e-05
-angle_max = 720.0
-velocity_pivot = Vector3(0, 0, 1)
-spread = 180.0
-initial_velocity_max = 0.2
-gravity = Vector3(0, 0, 0)
-scale_curve = SubResource("CurveTexture_skg43")
-color = Color(0.521569, 0.509804, 0.501961, 1)
-alpha_curve = SubResource("CurveTexture_3pi6l")
-
-[sub_resource type="QuadMesh" id="QuadMesh_0kefl"]
-
-[sub_resource type="Curve" id="Curve_axcwu"]
-_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
-point_count = 2
-
-[sub_resource type="CurveTexture" id="CurveTexture_wpjie"]
-curve = SubResource("Curve_axcwu")
-
-[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_5lomq"]
-spread = 180.0
-initial_velocity_min = 4.0
-initial_velocity_max = 5.0
-alpha_curve = SubResource("CurveTexture_wpjie")
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_hrjt4"]
-render_priority = 0
-shader = ExtResource("6_r5wlh")
-shader_parameter/tex_main = ExtResource("7_ej28x")
-shader_parameter/tex_gradient = ExtResource("7_de557")
-
-[sub_resource type="RibbonTrailMesh" id="RibbonTrailMesh_urftu"]
-material = SubResource("ShaderMaterial_hrjt4")
-size = 0.1
-
 [node name="Particle" type="Node3D"]
 script = ExtResource("1_vgayn")
 
@@ -160,27 +99,3 @@ fixed_fps = 60
 local_coords = true
 process_material = SubResource("ParticleProcessMaterial_vnhmx")
 draw_pass_1 = SubResource("QuadMesh_0j7av")
-
-[node name="Smoke" type="GPUParticles3D" parent="."]
-visible = false
-layers = 512
-material_override = SubResource("ShaderMaterial_vkw8i")
-cast_shadow = 0
-emitting = false
-amount = 2
-one_shot = true
-explosiveness = 1.0
-local_coords = true
-process_material = SubResource("ParticleProcessMaterial_gjwvd")
-draw_pass_1 = SubResource("QuadMesh_0kefl")
-
-[node name="Flare" type="GPUParticles3D" parent="."]
-visible = false
-emitting = false
-lifetime = 0.3
-one_shot = true
-explosiveness = 1.0
-trail_enabled = true
-trail_lifetime = 0.1
-process_material = SubResource("ParticleProcessMaterial_5lomq")
-draw_pass_1 = SubResource("RibbonTrailMesh_urftu")

scene/effect/particle/particle_hit_ground_heavy.tscn

@@ -1,12 +1,11 @@
-[gd_scene load_steps=40 format=3 uid="uid://c4dkjflnmub2i"]
+[gd_scene load_steps=37 format=3 uid="uid://c4dkjflnmub2i"]
 
 [ext_resource type="Script" path="res://script/effect/particle.gd" id="1_0hdix"]
 [ext_resource type="Shader" path="res://render/shader/particle.gdshader" id="2_2wrtm"]
 [ext_resource type="Texture2D" uid="uid://ccl81e2qroccb" path="res://render/texture/particle/shape/flare2.png" id="3_wumfi"]
 [ext_resource type="Texture2D" uid="uid://bslhqlcg8cw2l" path="res://render/texture/particle/shape/flare3.png" id="4_rdon4"]
 [ext_resource type="Texture2D" uid="uid://colhtjt8jon3v" path="res://render/texture/particle/shape/smoke.png" id="5_sadxh"]
-[ext_resource type="Shader" path="res://render/shader/trail.gdshader" id="6_hwy8t"]
+[ext_resource type="RibbonTrailMesh" uid="uid://cv0787wcswb6d" path="res://render/trail_mesh/flare_blunt.tres" id="6_xgr5a"]
-[ext_resource type="Texture2D" uid="uid://b0bmvub81xvmf" path="res://render/texture/particle/shape/glow.png" id="7_1ufmd"]
 [ext_resource type="PackedScene" uid="uid://5d1a3s6x77wd" path="res://scene/effect/particle/_particle_hit_ground_heavy.tscn" id="8_t740e"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_dkmkb"]
@@ -138,15 +137,6 @@ initial_velocity_max = 5.0
 color_ramp = SubResource("GradientTexture1D_f6oto")
 alpha_curve = SubResource("CurveTexture_bb4kj")
 
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_rvlet"]
-render_priority = 0
-shader = ExtResource("6_hwy8t")
-shader_parameter/tex_main = ExtResource("7_1ufmd")
-
-[sub_resource type="RibbonTrailMesh" id="RibbonTrailMesh_urftu"]
-material = SubResource("ShaderMaterial_rvlet")
-size = 0.1
-
 [node name="Particle" type="Node3D"]
 script = ExtResource("1_0hdix")
 
@@ -197,7 +187,7 @@ explosiveness = 1.0
 trail_enabled = true
 trail_lifetime = 0.1
 process_material = SubResource("ParticleProcessMaterial_5lomq")
-draw_pass_1 = SubResource("RibbonTrailMesh_urftu")
+draw_pass_1 = ExtResource("6_xgr5a")
 
 [node name="Particle" parent="." instance=ExtResource("8_t740e")]
 transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0)

scene/effect/particle/particle_hit_sharp_block.tscn

@@ -1,11 +1,10 @@
-[gd_scene load_steps=28 format=3 uid="uid://dvkfbt8pr02kc"]
+[gd_scene load_steps=25 format=3 uid="uid://dvkfbt8pr02kc"]
 
 [ext_resource type="Script" path="res://script/effect/particle.gd" id="1_s10io"]
 [ext_resource type="Shader" path="res://render/shader/particle.gdshader" id="2_0i1uu"]
 [ext_resource type="Texture2D" uid="uid://bb0yfk0u4lqqn" path="res://render/texture/particle/shape/flare1.png" id="3_knvot"]
 [ext_resource type="Texture2D" uid="uid://colhtjt8jon3v" path="res://render/texture/particle/shape/smoke.png" id="4_e2q44"]
-[ext_resource type="Shader" path="res://render/shader/trail.gdshader" id="5_2pulc"]
+[ext_resource type="RibbonTrailMesh" uid="uid://bs5hlmt5xvqfd" path="res://render/trail_mesh/flare_sharp.tres" id="5_h0mjw"]
-[ext_resource type="Texture2D" uid="uid://b0bmvub81xvmf" path="res://render/texture/particle/shape/glow.png" id="6_1vtca"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_dkmkb"]
 render_priority = 0
@@ -93,15 +92,6 @@ initial_velocity_max = 6.0
 color_ramp = SubResource("GradientTexture1D_xgy3m")
 alpha_curve = SubResource("CurveTexture_4i24b")
 
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_lf1fq"]
-render_priority = 0
-shader = ExtResource("5_2pulc")
-shader_parameter/tex_main = ExtResource("6_1vtca")
-
-[sub_resource type="RibbonTrailMesh" id="RibbonTrailMesh_urftu"]
-material = SubResource("ShaderMaterial_lf1fq")
-size = 0.1
-
 [node name="Particle" type="Node3D"]
 script = ExtResource("1_s10io")
 
@@ -139,4 +129,4 @@ explosiveness = 1.0
 trail_enabled = true
 trail_lifetime = 0.1
 process_material = SubResource("ParticleProcessMaterial_5lomq")
-draw_pass_1 = SubResource("RibbonTrailMesh_urftu")
+draw_pass_1 = ExtResource("5_h0mjw")

scene/effect/particle/particle_hit_sharp_heavy.tscn

@@ -1,11 +1,10 @@
-[gd_scene load_steps=28 format=3 uid="uid://b2v07gnut0gax"]
+[gd_scene load_steps=25 format=3 uid="uid://b2v07gnut0gax"]
 
 [ext_resource type="Script" path="res://script/effect/particle.gd" id="1_fm5t7"]
 [ext_resource type="Shader" path="res://render/shader/particle.gdshader" id="2_olx82"]
 [ext_resource type="Texture2D" uid="uid://bb0yfk0u4lqqn" path="res://render/texture/particle/shape/flare1.png" id="3_8lcfm"]
 [ext_resource type="Texture2D" uid="uid://colhtjt8jon3v" path="res://render/texture/particle/shape/smoke.png" id="4_bhi5c"]
-[ext_resource type="Shader" path="res://render/shader/trail.gdshader" id="5_aikbl"]
+[ext_resource type="RibbonTrailMesh" uid="uid://bs5hlmt5xvqfd" path="res://render/trail_mesh/flare_sharp.tres" id="5_yhppt"]
-[ext_resource type="Texture2D" uid="uid://b0bmvub81xvmf" path="res://render/texture/particle/shape/glow.png" id="6_06rdx"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_dkmkb"]
 render_priority = 0
@@ -93,15 +92,6 @@ initial_velocity_max = 6.0
 color_ramp = SubResource("GradientTexture1D_xgy3m")
 alpha_curve = SubResource("CurveTexture_4i24b")
 
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_lf1fq"]
-render_priority = 0
-shader = ExtResource("5_aikbl")
-shader_parameter/tex_main = ExtResource("6_06rdx")
-
-[sub_resource type="RibbonTrailMesh" id="RibbonTrailMesh_urftu"]
-material = SubResource("ShaderMaterial_lf1fq")
-size = 0.1
-
 [node name="Particle" type="Node3D"]
 script = ExtResource("1_fm5t7")
 
@@ -139,4 +129,4 @@ explosiveness = 1.0
 trail_enabled = true
 trail_lifetime = 0.1
 process_material = SubResource("ParticleProcessMaterial_5lomq")
-draw_pass_1 = SubResource("RibbonTrailMesh_urftu")
+draw_pass_1 = ExtResource("5_yhppt")

scene/effect/particle/particle_hit_sharp_mid.tscn

@@ -1,11 +1,10 @@
-[gd_scene load_steps=28 format=3 uid="uid://c7l4pddr4ifx8"]
+[gd_scene load_steps=25 format=3 uid="uid://c7l4pddr4ifx8"]
 
 [ext_resource type="Script" path="res://script/effect/particle.gd" id="1_ujq6t"]
 [ext_resource type="Shader" path="res://render/shader/particle.gdshader" id="2_fcn8h"]
 [ext_resource type="Texture2D" uid="uid://bb0yfk0u4lqqn" path="res://render/texture/particle/shape/flare1.png" id="3_3pqvn"]
 [ext_resource type="Texture2D" uid="uid://colhtjt8jon3v" path="res://render/texture/particle/shape/smoke.png" id="4_88sle"]
-[ext_resource type="Shader" path="res://render/shader/trail.gdshader" id="5_8gb75"]
+[ext_resource type="RibbonTrailMesh" uid="uid://bs5hlmt5xvqfd" path="res://render/trail_mesh/flare_sharp.tres" id="5_co1tb"]
-[ext_resource type="Texture2D" uid="uid://b0bmvub81xvmf" path="res://render/texture/particle/shape/glow.png" id="6_r0eh2"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_dkmkb"]
 render_priority = 0
@@ -93,15 +92,6 @@ initial_velocity_max = 6.0
 color_ramp = SubResource("GradientTexture1D_xgy3m")
 alpha_curve = SubResource("CurveTexture_4i24b")
 
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_lf1fq"]
-render_priority = 0
-shader = ExtResource("5_8gb75")
-shader_parameter/tex_main = ExtResource("6_r0eh2")
-
-[sub_resource type="RibbonTrailMesh" id="RibbonTrailMesh_urftu"]
-material = SubResource("ShaderMaterial_lf1fq")
-size = 0.1
-
 [node name="Particle" type="Node3D"]
 script = ExtResource("1_ujq6t")
 
@@ -139,4 +129,4 @@ explosiveness = 1.0
 trail_enabled = true
 trail_lifetime = 0.1
 process_material = SubResource("ParticleProcessMaterial_5lomq")
-draw_pass_1 = SubResource("RibbonTrailMesh_urftu")
+draw_pass_1 = ExtResource("5_co1tb")

scene/effect/particle/particle_hit_sharp_normal.tscn

@@ -1,16 +1,14 @@
-[gd_scene load_steps=28 format=3 uid="uid://io1yfgjm480t"]
+[gd_scene load_steps=25 format=3 uid="uid://io1yfgjm480t"]
 
 [ext_resource type="Script" path="res://script/effect/particle.gd" id="1_qxvm2"]
 [ext_resource type="Shader" path="res://render/shader/particle.gdshader" id="2_hr443"]
 [ext_resource type="Texture2D" uid="uid://bb0yfk0u4lqqn" path="res://render/texture/particle/shape/flare1.png" id="3_c5vjp"]
-[ext_resource type="Texture2D" uid="uid://b0bmvub81xvmf" path="res://render/texture/particle/shape/glow.png" id="5_8l08i"]
 [ext_resource type="Texture2D" uid="uid://colhtjt8jon3v" path="res://render/texture/particle/shape/smoke.png" id="5_loelc"]
-[ext_resource type="Shader" path="res://render/shader/trail.gdshader" id="5_rglhw"]
+[ext_resource type="RibbonTrailMesh" uid="uid://bs5hlmt5xvqfd" path="res://render/trail_mesh/flare_sharp.tres" id="5_mb60g"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_dkmkb"]
 render_priority = 0
 shader = ExtResource("2_hr443")
-shader_parameter/is_billboard = null
 shader_parameter/tex_main = ExtResource("3_c5vjp")
 
 [sub_resource type="Curve" id="Curve_n5hkj"]
@@ -42,7 +40,6 @@ alpha_curve = SubResource("CurveTexture_hdmmt")
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_vkw8i"]
 render_priority = 0
 shader = ExtResource("2_hr443")
-shader_parameter/is_billboard = false
 shader_parameter/tex_main = ExtResource("5_loelc")
 
 [sub_resource type="Curve" id="Curve_didyq"]
@@ -95,15 +92,6 @@ initial_velocity_max = 6.0
 color_ramp = SubResource("GradientTexture1D_xgy3m")
 alpha_curve = SubResource("CurveTexture_4i24b")
 
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_lf1fq"]
-render_priority = 0
-shader = ExtResource("5_rglhw")
-shader_parameter/tex_main = ExtResource("5_8l08i")
-
-[sub_resource type="RibbonTrailMesh" id="RibbonTrailMesh_urftu"]
-material = SubResource("ShaderMaterial_lf1fq")
-size = 0.1
-
 [node name="Particle" type="Node3D"]
 script = ExtResource("1_qxvm2")
 
@@ -141,4 +129,4 @@ explosiveness = 1.0
 trail_enabled = true
 trail_lifetime = 0.1
 process_material = SubResource("ParticleProcessMaterial_5lomq")
-draw_pass_1 = SubResource("RibbonTrailMesh_urftu")
+draw_pass_1 = ExtResource("5_mb60g")

scene/effect/particle/particle_material_cloth.tscn

@@ -10,5 +10,5 @@ script = ExtResource("1_kd50q")
 [node name="ParticleSubEmitter" type="Node3D" parent="."]
 script = ExtResource("2_osya7")
 sub = ExtResource("3_o8j15")
-count_min = 2
+count_min = 5
-count_max = 5
+count_max = 8

scene/effect/particle/particle_move_dash.tscn

@@ -0,0 +1,80 @@
+[gd_scene load_steps=15 format=3 uid="uid://bu0vk6abce0fj"]
+
+[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_h2hit"]
+[ext_resource type="Shader" path="res://render/shader/particle_ground.gdshader" id="2_v1l0o"]
+[ext_resource type="Texture2D" uid="uid://usaih3es2tch" path="res://render/texture/particle/shape/glow2.png" id="3_281h4"]
+[ext_resource type="ArrayMesh" uid="uid://dq207a0waxk0j" path="res://render/mesh/slash1.obj" id="4_d7ox8"]
+[ext_resource type="RibbonTrailMesh" uid="uid://drx1hgf5acgv7" path="res://render/trail_mesh/air_dust.tres" id="5_8nem7"]
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_nb7oe"]
+render_priority = 0
+shader = ExtResource("2_v1l0o")
+shader_parameter/tex_main = ExtResource("3_281h4")
+
+[sub_resource type="Curve" id="Curve_sxidt"]
+_data = [Vector2(0, 0.200365), 0.0, -0.200365, 0, 1, Vector2(1, 0), -0.200365, 0.0, 1, 0]
+point_count = 2
+
+[sub_resource type="CurveTexture" id="CurveTexture_thdgw"]
+curve = SubResource("Curve_sxidt")
+
+[sub_resource type="Curve" id="Curve_g150d"]
+max_value = 2.0
+_data = [Vector2(0, 0), 0.0, 2.0, 0, 1, Vector2(1, 2), 2.0, 0.0, 1, 0]
+point_count = 2
+
+[sub_resource type="CurveTexture" id="CurveTexture_lsn3k"]
+curve = SubResource("Curve_g150d")
+
+[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_djoua"]
+particle_flag_disable_z = true
+gravity = Vector3(0, 0, 0)
+scale_curve = SubResource("CurveTexture_lsn3k")
+alpha_curve = SubResource("CurveTexture_thdgw")
+
+[sub_resource type="Curve" id="Curve_bu5y6"]
+_data = [Vector2(0, 0.509135), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
+point_count = 2
+
+[sub_resource type="CurveTexture" id="CurveTexture_mm1go"]
+curve = SubResource("Curve_bu5y6")
+
+[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_ok5d1"]
+emission_shape = 1
+emission_sphere_radius = 0.4
+spread = 180.0
+initial_velocity_min = 0.1
+initial_velocity_max = 1.0
+gravity = Vector3(0, 0, 0)
+scale_min = 0.2
+scale_max = 0.2
+alpha_curve = SubResource("CurveTexture_mm1go")
+turbulence_noise_strength = 0.1
+
+[node name="Particle" type="Node3D"]
+script = ExtResource("1_h2hit")
+is_ground = true
+
+[node name="Shockwave" type="GPUParticles3D" parent="."]
+transform = Transform3D(0.15, 0, 0, 0, -6.55671e-09, 0.15, 0, -0.15, -6.55671e-09, 0, 0, 0)
+layers = 512
+material_override = SubResource("ShaderMaterial_nb7oe")
+cast_shadow = 0
+emitting = false
+amount = 1
+lifetime = 0.15
+one_shot = true
+fixed_fps = 60
+local_coords = true
+process_material = SubResource("ParticleProcessMaterial_djoua")
+draw_pass_1 = ExtResource("4_d7ox8")
+
+[node name="Flare2" type="GPUParticles3D" parent="."]
+emitting = false
+amount = 10
+one_shot = true
+explosiveness = 1.0
+trail_enabled = true
+trail_lifetime = 0.1
+process_material = SubResource("ParticleProcessMaterial_ok5d1")
+draw_pass_1 = ExtResource("5_8nem7")

scene/effect/particle/particle_move_hit_ground.tscn

@@ -0,0 +1,11 @@
+[gd_scene load_steps=3 format=3 uid="uid://dgajioqybpj2r"]
+
+[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_011uh"]
+[ext_resource type="PackedScene" uid="uid://b1eg05rgvdjk" path="res://scene/effect/particle/_particle_hit_ground_normal.tscn" id="2_jp5ol"]
+
+[node name="Particle" type="Node3D"]
+script = ExtResource("1_011uh")
+is_ground = true
+
+[node name="Particle" parent="." instance=ExtResource("2_jp5ol")]
+transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0)

scene/effect/particle/particle_move_jump_air.tscn

@@ -0,0 +1,111 @@
+[gd_scene load_steps=19 format=3 uid="uid://7q26pg52mkrj"]
+
+[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_lhvam"]
+[ext_resource type="Shader" path="res://render/shader/particle_ground.gdshader" id="2_wmi3i"]
+[ext_resource type="Texture2D" uid="uid://usaih3es2tch" path="res://render/texture/particle/shape/glow2.png" id="3_oaef1"]
+[ext_resource type="ArrayMesh" uid="uid://dq207a0waxk0j" path="res://render/mesh/slash1.obj" id="4_e6wto"]
+[ext_resource type="RibbonTrailMesh" uid="uid://sl2yk58443mf" path="res://render/trail_mesh/speed_line.tres" id="5_0s01c"]
+[ext_resource type="RibbonTrailMesh" uid="uid://drx1hgf5acgv7" path="res://render/trail_mesh/air_dust.tres" id="6_21o0u"]
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_nb7oe"]
+render_priority = 0
+shader = ExtResource("2_wmi3i")
+shader_parameter/tex_main = ExtResource("3_oaef1")
+
+[sub_resource type="Curve" id="Curve_ge5x7"]
+_data = [Vector2(0, 0.152862), 0.0, -0.152862, 0, 1, Vector2(1, 0), -0.152862, 0.0, 1, 0]
+point_count = 2
+
+[sub_resource type="CurveTexture" id="CurveTexture_axd3v"]
+curve = SubResource("Curve_ge5x7")
+
+[sub_resource type="Curve" id="Curve_4lv3a"]
+max_value = 2.0
+_data = [Vector2(0, 0.870585), 0.0, 1.12942, 0, 1, Vector2(1, 2), 1.12942, 0.0, 1, 0]
+point_count = 2
+
+[sub_resource type="CurveTexture" id="CurveTexture_pygw8"]
+curve = SubResource("Curve_4lv3a")
+
+[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_ya1e1"]
+particle_flag_disable_z = true
+gravity = Vector3(0, 0, 0)
+scale_curve = SubResource("CurveTexture_pygw8")
+alpha_curve = SubResource("CurveTexture_axd3v")
+
+[sub_resource type="Curve" id="Curve_w0374"]
+_data = [Vector2(0, 0.509135), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
+point_count = 2
+
+[sub_resource type="CurveTexture" id="CurveTexture_v4xfl"]
+curve = SubResource("Curve_w0374")
+
+[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_6nmy8"]
+emission_shape = 1
+emission_sphere_radius = 0.3
+spread = 0.0
+initial_velocity_min = 4.0
+initial_velocity_max = 4.0
+gravity = Vector3(0, 0, 0)
+scale_min = 0.1
+scale_max = 0.1
+alpha_curve = SubResource("CurveTexture_v4xfl")
+
+[sub_resource type="Curve" id="Curve_enhnw"]
+_data = [Vector2(0, 0.509135), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
+point_count = 2
+
+[sub_resource type="CurveTexture" id="CurveTexture_scyyt"]
+curve = SubResource("Curve_enhnw")
+
+[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_506uu"]
+emission_shape = 1
+emission_sphere_radius = 0.4
+spread = 180.0
+initial_velocity_min = 0.1
+initial_velocity_max = 1.0
+gravity = Vector3(0, 0, 0)
+scale_min = 0.2
+scale_max = 0.2
+alpha_curve = SubResource("CurveTexture_scyyt")
+turbulence_noise_strength = 0.1
+
+[node name="Particle" type="Node3D"]
+script = ExtResource("1_lhvam")
+is_ground = true
+
+[node name="Shockwave" type="GPUParticles3D" parent="."]
+transform = Transform3D(0.1, 0, 0, 0, -4.37114e-09, 0.1, 0, -0.1, -4.37114e-09, 0, 0, 0)
+layers = 512
+material_override = SubResource("ShaderMaterial_nb7oe")
+cast_shadow = 0
+emitting = false
+amount = 1
+lifetime = 0.15
+one_shot = true
+fixed_fps = 60
+local_coords = true
+process_material = SubResource("ParticleProcessMaterial_ya1e1")
+draw_pass_1 = ExtResource("4_e6wto")
+
+[node name="Flare" type="GPUParticles3D" parent="."]
+transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, 0)
+emitting = false
+amount = 5
+lifetime = 0.3
+one_shot = true
+explosiveness = 1.0
+trail_enabled = true
+trail_lifetime = 0.1
+process_material = SubResource("ParticleProcessMaterial_6nmy8")
+draw_pass_1 = ExtResource("5_0s01c")
+
+[node name="Flare2" type="GPUParticles3D" parent="."]
+emitting = false
+amount = 5
+one_shot = true
+explosiveness = 1.0
+trail_enabled = true
+trail_lifetime = 0.1
+process_material = SubResource("ParticleProcessMaterial_506uu")
+draw_pass_1 = ExtResource("6_21o0u")

scene/effect/particle/particle_move_jump_ground.tscn

@@ -0,0 +1,68 @@
+[gd_scene load_steps=10 format=3 uid="uid://b231j0exigect"]
+
+[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_avxdd"]
+[ext_resource type="RibbonTrailMesh" uid="uid://sl2yk58443mf" path="res://render/trail_mesh/speed_line.tres" id="5_4o4dj"]
+[ext_resource type="RibbonTrailMesh" uid="uid://drx1hgf5acgv7" path="res://render/trail_mesh/air_dust.tres" id="6_c6hwt"]
+
+[sub_resource type="Curve" id="Curve_bg5y1"]
+_data = [Vector2(0, 0.509135), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
+point_count = 2
+
+[sub_resource type="CurveTexture" id="CurveTexture_sutvi"]
+curve = SubResource("Curve_bg5y1")
+
+[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_ykutu"]
+emission_shape = 1
+emission_sphere_radius = 0.3
+spread = 0.0
+initial_velocity_min = 4.0
+initial_velocity_max = 4.0
+gravity = Vector3(0, 0, 0)
+scale_min = 0.1
+scale_max = 0.1
+alpha_curve = SubResource("CurveTexture_sutvi")
+
+[sub_resource type="Curve" id="Curve_k3r43"]
+_data = [Vector2(0, 0.509135), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
+point_count = 2
+
+[sub_resource type="CurveTexture" id="CurveTexture_1suip"]
+curve = SubResource("Curve_k3r43")
+
+[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_e6pin"]
+emission_shape = 1
+emission_sphere_radius = 0.4
+spread = 180.0
+initial_velocity_min = 0.1
+initial_velocity_max = 1.0
+gravity = Vector3(0, 0, 0)
+scale_min = 0.2
+scale_max = 0.2
+alpha_curve = SubResource("CurveTexture_1suip")
+turbulence_noise_strength = 0.1
+
+[node name="Particle" type="Node3D"]
+script = ExtResource("1_avxdd")
+is_ground = true
+
+[node name="Flare" type="GPUParticles3D" parent="."]
+transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, 0)
+emitting = false
+amount = 5
+lifetime = 0.3
+one_shot = true
+explosiveness = 1.0
+trail_enabled = true
+trail_lifetime = 0.1
+process_material = SubResource("ParticleProcessMaterial_ykutu")
+draw_pass_1 = ExtResource("5_4o4dj")
+
+[node name="Flare2" type="GPUParticles3D" parent="."]
+emitting = false
+amount = 5
+one_shot = true
+explosiveness = 1.0
+trail_enabled = true
+trail_lifetime = 0.1
+process_material = SubResource("ParticleProcessMaterial_e6pin")
+draw_pass_1 = ExtResource("6_c6hwt")

scene/effect/particle/particle_move_speed.tscn

@@ -0,0 +1,112 @@
+[gd_scene load_steps=19 format=3 uid="uid://cqvyo552uq3mr"]
+
+[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_1sn0c"]
+[ext_resource type="Shader" path="res://render/shader/particle_ground.gdshader" id="2_jophi"]
+[ext_resource type="Texture2D" uid="uid://usaih3es2tch" path="res://render/texture/particle/shape/glow2.png" id="3_dnku6"]
+[ext_resource type="ArrayMesh" uid="uid://dq207a0waxk0j" path="res://render/mesh/slash1.obj" id="4_8uihl"]
+[ext_resource type="RibbonTrailMesh" uid="uid://sl2yk58443mf" path="res://render/trail_mesh/speed_line.tres" id="5_0j5ld"]
+[ext_resource type="RibbonTrailMesh" uid="uid://drx1hgf5acgv7" path="res://render/trail_mesh/air_dust.tres" id="6_cchu8"]
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_nb7oe"]
+render_priority = 0
+shader = ExtResource("2_jophi")
+shader_parameter/tex_main = ExtResource("3_dnku6")
+
+[sub_resource type="Curve" id="Curve_pvmd5"]
+_data = [Vector2(0, 0.152862), 0.0, -0.152862, 0, 1, Vector2(1, 0), -0.152862, 0.0, 1, 0]
+point_count = 2
+
+[sub_resource type="CurveTexture" id="CurveTexture_t061u"]
+curve = SubResource("Curve_pvmd5")
+
+[sub_resource type="Curve" id="Curve_nmhum"]
+max_value = 1.5
+_data = [Vector2(0, 0.870585), 0.0, 0.629415, 0, 1, Vector2(1, 1.5), 0.629415, 0.0, 1, 0]
+point_count = 2
+
+[sub_resource type="CurveTexture" id="CurveTexture_qgloy"]
+curve = SubResource("Curve_nmhum")
+
+[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_nmv6q"]
+particle_flag_disable_z = true
+gravity = Vector3(0, 0, 0)
+scale_curve = SubResource("CurveTexture_qgloy")
+alpha_curve = SubResource("CurveTexture_t061u")
+
+[sub_resource type="Curve" id="Curve_hkabt"]
+_data = [Vector2(0, 0.509135), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
+point_count = 2
+
+[sub_resource type="CurveTexture" id="CurveTexture_f3037"]
+curve = SubResource("Curve_hkabt")
+
+[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_cybcg"]
+emission_shape = 1
+emission_sphere_radius = 0.3
+spread = 0.0
+initial_velocity_min = 6.0
+initial_velocity_max = 6.0
+gravity = Vector3(0, 0, 0)
+scale_min = 0.1
+scale_max = 0.1
+alpha_curve = SubResource("CurveTexture_f3037")
+
+[sub_resource type="Curve" id="Curve_k3r43"]
+_data = [Vector2(0, 0.509135), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
+point_count = 2
+
+[sub_resource type="CurveTexture" id="CurveTexture_scyyt"]
+curve = SubResource("Curve_k3r43")
+
+[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_e6pin"]
+emission_shape = 1
+emission_sphere_radius = 0.4
+spread = 180.0
+initial_velocity_min = 0.1
+initial_velocity_max = 0.3
+gravity = Vector3(0, 0, 0)
+scale_min = 0.2
+scale_max = 0.2
+alpha_curve = SubResource("CurveTexture_scyyt")
+turbulence_noise_strength = 0.1
+
+[node name="Particle" type="Node3D"]
+script = ExtResource("1_1sn0c")
+is_ground = true
+
+[node name="Shockwave" type="GPUParticles3D" parent="."]
+transform = Transform3D(0.1, 0, 0, 0, -4.37114e-09, 0.1, 0, -0.1, -4.37114e-09, 0, 0, 0)
+visible = false
+layers = 512
+material_override = SubResource("ShaderMaterial_nb7oe")
+cast_shadow = 0
+emitting = false
+amount = 1
+lifetime = 0.15
+one_shot = true
+fixed_fps = 60
+local_coords = true
+process_material = SubResource("ParticleProcessMaterial_nmv6q")
+draw_pass_1 = ExtResource("4_8uihl")
+
+[node name="Flare" type="GPUParticles3D" parent="."]
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 0)
+emitting = false
+amount = 1
+lifetime = 0.1
+one_shot = true
+explosiveness = 1.0
+trail_enabled = true
+trail_lifetime = 0.1
+process_material = SubResource("ParticleProcessMaterial_cybcg")
+draw_pass_1 = ExtResource("5_0j5ld")
+
+[node name="Flare2" type="GPUParticles3D" parent="."]
+emitting = false
+amount = 1
+one_shot = true
+explosiveness = 1.0
+trail_enabled = true
+trail_lifetime = 0.1
+process_material = SubResource("ParticleProcessMaterial_e6pin")
+draw_pass_1 = ExtResource("6_cchu8")

scene/effect/particle/particle_pt_collect.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" path="res://script/effect/particle.gd" id="1_jbaqi"]
 [ext_resource type="Shader" path="res://render/shader/particle.gdshader" id="2_pfsoq"]
-[ext_resource type="Texture2D" uid="uid://b0bmvub81xvmf" path="res://render/texture/particle/shape/glow.png" id="7_envuu"]
+[ext_resource type="Texture2D" uid="uid://b0bmvub81xvmf" path="res://render/texture/particle/shape/glow1.png" id="7_envuu"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_cr7ha"]
 render_priority = 0

script/character/battle.gd

@@ -105,7 +105,7 @@ func settle(from: int, to: int, dir: Vector2, attack: AttackCfg) -> HitResult:
     var has_shield = shield > 0
 
     var is_floating: bool = attack.is_floating or not character_to.get_status("is_on_floor")
-    var is_rebound: bool  = attack.is_rebound
+    var is_rebound: bool  = attack.is_rebound and (character_from == character_to)
 
     var is_break_shield: bool     = false
     var is_break_stun: bool       = false
@@ -295,7 +295,8 @@ func settle(from: int, to: int, dir: Vector2, attack: AttackCfg) -> HitResult:
     character_to.set_pause_time(pause_time)
 
     #全局特效
-    if character_from.is_player() or character_to.is_player():
+    var has_global_effect: bool = character_from.is_player() or character_to.is_player()
+    if has_global_effect:
         Global.camera_mgr.effect(pause_time)
 
     #伤害跳字

script/character/move.gd

@@ -42,6 +42,9 @@ func update_on_floor(delta) -> bool:
     status.is_on_floor = is_on_floor
     if status.is_on_floor and not status.is_jumping:
         status.is_jumped = false
+    var is_skill_running: bool = status.is_skill_running and status.break_level == 0
+    if is_hit and not status.is_stagger and not is_skill_running:
+        Global.effect_mgr.cast_particle(ResourceManager.particle_move_hit_ground, character.pos())
     return is_hit
 
 
@@ -98,6 +101,12 @@ func update_move_effect(delta):
     var after_image_alpha: float = clamp(after_image_speed_curve.sample(speed_rate), 0, 1)
     if after_image_alpha > 0:
         effect.cast_after_image(after_image_alpha)
+        pass
+    if speed > 6:
+        Global.effect_mgr.cast_particle(ResourceManager.particle_move_speed, character.view_pos(), character.velocity.normalized())
+    var velocity_change_sum: float = status.velocity_change.x + status.velocity_change.y + status.velocity_change.z
+    if velocity_change_sum > 6:
+        Global.effect_mgr.cast_particle(ResourceManager.particle_move_dash, character.view_pos(), character.velocity.normalized())
 
 
 func update_move_check(delta):
@@ -115,8 +124,8 @@ func update_move_check(delta):
             if normal_speed < -6 and normal.y >= 0:
                 #墙体互动
                 Global.effect_mgr.cast_particle(ResourceManager.particle_hit_ground_heavy, character.pos(), normal)
-                var velocity_new = velocity - normal * normal_speed * 2
+                var velocity_new: Vector3 = velocity - normal * normal_speed * 2
-                var attack_dir   = Vector2(velocity_new.x, velocity_new.z).normalized()
+                var attack_dir: Vector2   = Vector2(velocity_new.x, velocity_new.z).normalized()
                 character.velocity = Vector3.ZERO
                 battle.add_attack(ResourceManager.cfg_attack_rebound, ResourceManager.cfg_attack_box_rebound, true, attack_dir)
             elif normal_speed <-3:
@@ -131,6 +140,10 @@ func jump():
     status.is_jumped = true
     status.trigger_jump = true
     buff.add_buff("jumping", 0.1)
+    if status.is_on_floor:
+        Global.effect_mgr.cast_particle(ResourceManager.particle_move_jump_ground, character.pos(), character.velocity.normalized())
+    else:
+        Global.effect_mgr.cast_particle(ResourceManager.particle_move_jump_air, character.pos(), character.velocity.normalized())
 
 
 func stop():

script/character/skill.gd

@@ -8,7 +8,7 @@ class_name Skill
 @onready var buff: Buff = (%Buff as Buff)
 
 var skill_dict: Dictionary = {} #name -> skill
-var skill_map: Dictionary  = {} #input -> skillCfg[] 
+var skill_map: Dictionary  = {} #input -> skillCfg[]
 
 
 func init():
@@ -162,7 +162,7 @@ func on_check_ground(frame_offset: int) -> void:
         # 落地检测成功时跳帧
         _frame_forward()
     else:
-        _frame_back(frame_offset)
+        _frame_back(frame_offset + 1)
 
 
 func on_check_charging(charging_level: int) -> void:

script/effect/particle_decal.gd

@@ -9,6 +9,7 @@ class_name ParticleDecal
 
 var lifetime_now: float
 var size_scale: float
+var random_rotate: float
 
 
 func on_ready() -> void:
@@ -16,6 +17,7 @@ func on_ready() -> void:
     size_random = clamp(size_random, 0, 1)
     size_scale = randf_range(1-size_random, 1+size_random)
     scale = Vector3(scale_sample, 1, scale_sample) * size_scale
+    random_rotate = randf_range(0, 360)
 
 
 func on_process(delta: float) -> void:
@@ -36,5 +38,6 @@ func on_process(delta: float) -> void:
         scale = Vector3(scale_sample, 1, scale_sample) * size_scale
 
     #旋转
+#    rotation_degrees.y = particle_rotate * rate + random_rotate
     rotation_degrees.y = particle_rotate * rate
     return

script/manager/camera_manager.gd

@@ -169,4 +169,12 @@ func effect(pause_time) -> void:
     add_global_effect(Enum.EGlobalEffect.Blur, effect_time, 0.8 * rate)
     #add_global_effect(Enum.EGlobalEffect.SpeedLine,effect_time,0.2* rate)
     return
-    
+
+func effect_shake(pause_time) -> void:
+    if not pause_time:
+        return
+    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)
+    return

script/manager/effect_manager.gd

@@ -14,7 +14,9 @@ func cast_particle(resource: Resource, pos: Vector3, direction = Vector3.UP) ->
     var new_particle: Particle = resource.instantiate() as Particle
     add_child(new_particle)
     new_particle.position = pos
-    if direction.angle_to(Vector3.UP) > 0.01:
+    if direction.abs().angle_to(Vector3.RIGHT) < 0.01:
+        direction.z = 0.1
+    if direction.angle_to(Vector3.UP) > 0.01 and (-direction).angle_to(Vector3.UP) > 0.01:
         new_particle.look_at(pos - direction)
     else:
         new_particle.rotation.x = deg_to_rad(-90)

script/manager/resource_manager.gd

@@ -26,6 +26,12 @@ var particle_hit_sharp_block: PackedScene  = load("res://scene/effect/particle/p
 #hit_ground
 var particle_hit_ground_normal: PackedScene = load("res://scene/effect/particle/particle_hit_ground_normal.tscn")
 var particle_hit_ground_heavy: PackedScene  = load("res://scene/effect/particle/particle_hit_ground_heavy.tscn")
+#move
+var particle_move_hit_ground: PackedScene = load("res://scene/effect/particle/particle_move_hit_ground.tscn")
+var particle_move_dash: PackedScene = load("res://scene/effect/particle/particle_move_dash.tscn")
+var particle_move_speed: PackedScene = load("res://scene/effect/particle/particle_move_speed.tscn")
+var particle_move_jump_ground: PackedScene = load("res://scene/effect/particle/particle_move_jump_ground.tscn")
+var particle_move_jump_air: PackedScene = load("res://scene/effect/particle/particle_move_jump_air.tscn")
 #hit_material
 var particle_material_cloth: PackedScene = load("res://scene/effect/particle/particle_material_cloth.tscn")
 #collect