From 69a9d5c98101af50b17ee6e62daf8c7474fc69d1 Mon Sep 17 00:00:00 2001
From: chendian <->
Date: Wed, 7 Feb 2024 01:56:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E7=89=B9=E6=95=88=E8=B7=9F?=
 =?UTF-8?q?=E9=9A=8F=E5=8D=A1=E5=B8=A7=E6=97=B6=E9=97=B4=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/attack/mid_hit_down.tres               | 22 +++++++++++++++++++
 config/attack/normal_hit.tres                 |  2 +-
 config/attack/normal_hit_back.tres            | 10 ++++-----
 config/attack/normal_hit_blow.tres            |  2 +-
 config/attack/normal_hit_down.tres            |  6 ++---
 .../hero01_long_air_attack03.tres             |  4 ++--
 .../skill_animation/hero01_long_skill01.tres  | 10 ++++-----
 scene/character/player.tscn                   |  6 ++---
 .../particle/hero01_common_skill02.tscn       |  2 +-
 .../particle/hero01_fist_air_skill01_0.tscn   |  2 +-
 .../particle/hero01_fist_air_skill01_1.tscn   |  2 +-
 .../effect/particle/hero01_long_attack01.tscn |  2 +-
 .../effect/particle/hero01_long_attack02.tscn |  2 +-
 .../particle/hero01_long_attack03_0.tscn      |  2 +-
 .../particle/hero01_long_attack03_1.tscn      |  2 +-
 .../effect/particle/hero01_long_attack04.tscn |  2 +-
 ...le_dash_normal.tscn => particle_dash.tscn} |  0
 ...icle_hit_normal.tscn => particle_hit.tscn} |  0
 ...l_normal.tscn => particle_hit_ground.tscn} |  0
 ..._slash_normal.tscn => particle_slash.tscn} |  0
 script/character/battle.gd                    | 12 ++--------
 script/manager/camera_manager.gd              | 12 ++++++++++
 script/manager/resource_manager.gd            |  2 +-
 23 files changed, 65 insertions(+), 39 deletions(-)
 create mode 100644 config/attack/mid_hit_down.tres
 rename scene/effect/particle/{particle_dash_normal.tscn => particle_dash.tscn} (100%)
 rename scene/effect/particle/{particle_hit_normal.tscn => particle_hit.tscn} (100%)
 rename scene/effect/particle/{particle_decal_normal.tscn => particle_hit_ground.tscn} (100%)
 rename scene/effect/particle/{particle_slash_normal.tscn => particle_slash.tscn} (100%)

diff --git a/config/attack/mid_hit_down.tres b/config/attack/mid_hit_down.tres
new file mode 100644
index 0000000..04d8697
--- /dev/null
+++ b/config/attack/mid_hit_down.tres
@@ -0,0 +1,22 @@
+[gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://rqjggte0qh84"]
+
+[ext_resource type="Script" path="res://script/config/attack_cfg.gd" id="1_077t2"]
+
+[resource]
+script = ExtResource("1_077t2")
+damage_rate = 1.0
+break_level = 2
+stun_attack = 10.0
+hit_back_speed = 6.0
+hit_back_duration = 0.05
+hit_up_speed = -6.0
+hit_up_duration = 0.05
+pause_time = 0.1
+is_floating = true
+is_hit_down = true
+is_rebound = false
+is_force_pause = false
+height = 2.0
+radius = 0.0
+size = Vector2(2, 1)
+offset = Vector2(1, 0)
diff --git a/config/attack/normal_hit.tres b/config/attack/normal_hit.tres
index 389bcf7..98c375d 100644
--- a/config/attack/normal_hit.tres
+++ b/config/attack/normal_hit.tres
@@ -11,7 +11,7 @@ hit_back_speed = 2.0
 hit_back_duration = 0.05
 hit_up_speed = 1.0
 hit_up_duration = 0.05
-pause_time = 0.05
+pause_time = 0.02
 is_floating = false
 is_hit_down = false
 is_rebound = false
diff --git a/config/attack/normal_hit_back.tres b/config/attack/normal_hit_back.tres
index 169f2b9..71187dc 100644
--- a/config/attack/normal_hit_back.tres
+++ b/config/attack/normal_hit_back.tres
@@ -7,11 +7,11 @@ script = ExtResource("1_7f5fg")
 damage_rate = 1.0
 break_level = 2
 stun_attack = 10.0
-hit_back_speed = 3.0
-hit_back_duration = 0.1
-hit_up_speed = 0.0
-hit_up_duration = 0.0
-pause_time = 0.0
+hit_back_speed = 4.0
+hit_back_duration = 0.05
+hit_up_speed = 2.0
+hit_up_duration = 0.05
+pause_time = 0.02
 is_floating = false
 is_hit_down = false
 is_rebound = false
diff --git a/config/attack/normal_hit_blow.tres b/config/attack/normal_hit_blow.tres
index d28b863..09f10c3 100644
--- a/config/attack/normal_hit_blow.tres
+++ b/config/attack/normal_hit_blow.tres
@@ -11,7 +11,7 @@ hit_back_speed = 2.0
 hit_back_duration = 0.05
 hit_up_speed = 2.0
 hit_up_duration = 0.05
-pause_time = 0.05
+pause_time = 0.02
 is_floating = true
 is_hit_down = false
 is_rebound = false
diff --git a/config/attack/normal_hit_down.tres b/config/attack/normal_hit_down.tres
index 56774e6..35d45f6 100644
--- a/config/attack/normal_hit_down.tres
+++ b/config/attack/normal_hit_down.tres
@@ -7,11 +7,11 @@ script = ExtResource("1_fl1sp")
 damage_rate = 1.0
 break_level = 1
 stun_attack = 10.0
-hit_back_speed = 4.0
+hit_back_speed = 6.0
 hit_back_duration = 0.05
-hit_up_speed = -4.0
+hit_up_speed = -6.0
 hit_up_duration = 0.05
-pause_time = 0.1
+pause_time = 0.02
 is_floating = true
 is_hit_down = true
 is_rebound = false
diff --git a/config/skill_player_weapon/hero01_long_air_attack03.tres b/config/skill_player_weapon/hero01_long_air_attack03.tres
index c82e899..a9023d8 100644
--- a/config/skill_player_weapon/hero01_long_air_attack03.tres
+++ b/config/skill_player_weapon/hero01_long_air_attack03.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://c8l7h74abqlhb"]
 
-[ext_resource type="Resource" uid="uid://bnqnw10v7kude" path="res://config/attack/normal_hit_down.tres" id="1_x3v4o"]
+[ext_resource type="Resource" uid="uid://rqjggte0qh84" path="res://config/attack/mid_hit_down.tres" id="1_gddcp"]
 [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="2_0x7hh"]
 [ext_resource type="Animation" uid="uid://bh5s2t3cbobpp" path="res://resource/skill_animation/hero01_long_air_attack03.tres" id="3_1erk8"]
 [ext_resource type="SpriteFrames" uid="uid://ce83cuqwgwwi4" path="res://resource/animation/character/hero01_long_attack.aseprite" id="4_wrd60"]
@@ -15,7 +15,7 @@ break_level = 3
 action = "attack_light"
 name = ""
 skill_animation = ExtResource("3_1erk8")
-attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_x3v4o")])
+attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_gddcp")])
 sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([])
 free_lock = false
 refresh_animation = false
diff --git a/resource/skill_animation/hero01_long_skill01.tres b/resource/skill_animation/hero01_long_skill01.tres
index d586d05..35d5330 100644
--- a/resource/skill_animation/hero01_long_skill01.tres
+++ b/resource/skill_animation/hero01_long_skill01.tres
@@ -35,7 +35,7 @@ tracks/2/path = NodePath("Status:break_level")
 tracks/2/interp = 1
 tracks/2/loop_wrap = true
 tracks/2/keys = {
-"times": PackedFloat32Array(0, 0.3, 0.5),
+"times": PackedFloat32Array(0, 0.4, 0.7),
 "transitions": PackedFloat32Array(1, 1, 1),
 "update": 1,
 "values": [0, 3, 4]
@@ -47,7 +47,7 @@ tracks/3/path = NodePath("Status:speed_up_rate")
 tracks/3/interp = 1
 tracks/3/loop_wrap = true
 tracks/3/keys = {
-"times": PackedFloat32Array(0.1, 0.5),
+"times": PackedFloat32Array(0.3, 0.4),
 "transitions": PackedFloat32Array(1, 1),
 "update": 1,
 "values": [-0.5, -1.0]
@@ -59,10 +59,10 @@ tracks/4/path = NodePath("Status:skill_move_speed")
 tracks/4/interp = 1
 tracks/4/loop_wrap = true
 tracks/4/keys = {
-"times": PackedFloat32Array(0.1, 0.4),
+"times": PackedFloat32Array(0.2, 0.4),
 "transitions": PackedFloat32Array(1, 1),
 "update": 1,
-"values": [6.0, 0.0]
+"values": [8.0, 0.0]
 }
 tracks/5/type = "method"
 tracks/5/imported = false
@@ -71,7 +71,7 @@ tracks/5/path = NodePath("Battle")
 tracks/5/interp = 1
 tracks/5/loop_wrap = true
 tracks/5/keys = {
-"times": PackedFloat32Array(0.4),
+"times": PackedFloat32Array(0.3),
 "transitions": PackedFloat32Array(1),
 "values": [{
 "args": [],
diff --git a/scene/character/player.tscn b/scene/character/player.tscn
index a16dbee..3e60053 100644
--- a/scene/character/player.tscn
+++ b/scene/character/player.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource type="PackedScene" uid="uid://8rcvw1vnjcf7" path="res://scene/character/character.tscn" id="1_pot50"]
 [ext_resource type="Script" path="res://script/character/player/combo.gd" id="2_i44w8"]
-[ext_resource type="SpriteFrames" uid="uid://ce83cuqwgwwi4" path="res://resource/animation/character/hero01_long_attack.aseprite" id="2_q1a6q"]
+[ext_resource type="SpriteFrames" uid="uid://dhfqj1dxldqao" path="res://resource/animation/character/hero01_long_skill01.aseprite" id="2_ln80n"]
 [ext_resource type="Script" path="res://script/character/player/player_input.gd" id="3_n07go"]
 [ext_resource type="Script" path="res://script/character/player/core.gd" id="3_rxdse"]
 [ext_resource type="Script" path="res://script/character/player/player_info.gd" id="4_mi1lk"]
@@ -12,8 +12,8 @@
 
 [node name="View" parent="." index="2"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.693056, 0)
-sprite_frames = ExtResource("2_q1a6q")
-animation = &"long_attack01"
+sprite_frames = ExtResource("2_ln80n")
+animation = &"long_skill01"
 
 [node name="Combo" type="Node3D" parent="." index="8"]
 unique_name_in_owner = true
diff --git a/scene/effect/particle/hero01_common_skill02.tscn b/scene/effect/particle/hero01_common_skill02.tscn
index 1863126..b6befc2 100644
--- a/scene/effect/particle/hero01_common_skill02.tscn
+++ b/scene/effect/particle/hero01_common_skill02.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://cswp0rj0gep6c"]
 
-[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/particle_slash_normal.tscn" id="1_qyqjx"]
+[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/particle_slash.tscn" id="1_qyqjx"]
 
 [node name="Particle" instance=ExtResource("1_qyqjx")]
 transform = Transform3D(1.5, 0, 0, 0, 1, 0, 0, 0, 1.2, 0, 0, 0)
diff --git a/scene/effect/particle/hero01_fist_air_skill01_0.tscn b/scene/effect/particle/hero01_fist_air_skill01_0.tscn
index a81738b..991c78f 100644
--- a/scene/effect/particle/hero01_fist_air_skill01_0.tscn
+++ b/scene/effect/particle/hero01_fist_air_skill01_0.tscn
@@ -1,5 +1,5 @@
 [gd_scene load_steps=2 format=3 uid="uid://dfdt6u2dbig3e"]
 
-[ext_resource type="PackedScene" uid="uid://me2heq5v1c5q" path="res://scene/effect/particle/particle_dash_normal.tscn" id="1_1r02f"]
+[ext_resource type="PackedScene" uid="uid://me2heq5v1c5q" path="res://scene/effect/particle/particle_dash.tscn" id="1_1r02f"]
 
 [node name="Particle" instance=ExtResource("1_1r02f")]
diff --git a/scene/effect/particle/hero01_fist_air_skill01_1.tscn b/scene/effect/particle/hero01_fist_air_skill01_1.tscn
index d2656b6..ee00c38 100644
--- a/scene/effect/particle/hero01_fist_air_skill01_1.tscn
+++ b/scene/effect/particle/hero01_fist_air_skill01_1.tscn
@@ -1,5 +1,5 @@
 [gd_scene load_steps=2 format=3 uid="uid://ds7mp5l20ypb6"]
 
-[ext_resource type="PackedScene" uid="uid://5d1a3s6x77wd" path="res://scene/effect/particle/particle_decal_normal.tscn" id="1_tw6qm"]
+[ext_resource type="PackedScene" uid="uid://5d1a3s6x77wd" path="res://scene/effect/particle/particle_hit_ground.tscn" id="1_tw6qm"]
 
 [node name="Particle" instance=ExtResource("1_tw6qm")]
diff --git a/scene/effect/particle/hero01_long_attack01.tscn b/scene/effect/particle/hero01_long_attack01.tscn
index b74f4a7..3384e42 100644
--- a/scene/effect/particle/hero01_long_attack01.tscn
+++ b/scene/effect/particle/hero01_long_attack01.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://c101pt8hqvmbk"]
 
-[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/particle_slash_normal.tscn" id="1_glj7d"]
+[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/particle_slash.tscn" id="1_glj7d"]
 
 [node name="Particle" instance=ExtResource("1_glj7d")]
 transform = Transform3D(1, 0, 0, 0, 0.707107, -0.353553, 0, 0.707107, 0.353553, 0, 0, 0)
diff --git a/scene/effect/particle/hero01_long_attack02.tscn b/scene/effect/particle/hero01_long_attack02.tscn
index afeb36c..1c87ed8 100644
--- a/scene/effect/particle/hero01_long_attack02.tscn
+++ b/scene/effect/particle/hero01_long_attack02.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://ns84g1jmmm56"]
 
-[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/particle_slash_normal.tscn" id="1_hciuf"]
+[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/particle_slash.tscn" id="1_hciuf"]
 
 [node name="Particle" instance=ExtResource("1_hciuf")]
 transform = Transform3D(1, 0, 0, 0, -0.707107, 0.353553, 0, -0.707107, -0.353553, 0, 0, 0)
diff --git a/scene/effect/particle/hero01_long_attack03_0.tscn b/scene/effect/particle/hero01_long_attack03_0.tscn
index 01c1b11..0135d06 100644
--- a/scene/effect/particle/hero01_long_attack03_0.tscn
+++ b/scene/effect/particle/hero01_long_attack03_0.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://bn2ktr7iynt5"]
 
-[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/particle_slash_normal.tscn" id="1_p44mg"]
+[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/particle_slash.tscn" id="1_p44mg"]
 
 [node name="Particle" instance=ExtResource("1_p44mg")]
 transform = Transform3D(1, 0, 0, 0, -0.707107, 0.353553, 0, -0.707107, -0.353553, 0, 0, 0)
diff --git a/scene/effect/particle/hero01_long_attack03_1.tscn b/scene/effect/particle/hero01_long_attack03_1.tscn
index 316a205..5bde22e 100644
--- a/scene/effect/particle/hero01_long_attack03_1.tscn
+++ b/scene/effect/particle/hero01_long_attack03_1.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://dj04l4oge27f0"]
 
-[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/particle_slash_normal.tscn" id="1_078jk"]
+[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/particle_slash.tscn" id="1_078jk"]
 
 [node name="Particle" instance=ExtResource("1_078jk")]
 transform = Transform3D(1, 0, 0, 0, 0.5, 0.433012, 0, -0.866026, 0.25, 0, 0, 0)
diff --git a/scene/effect/particle/hero01_long_attack04.tscn b/scene/effect/particle/hero01_long_attack04.tscn
index 64dcf6c..12fc0ce 100644
--- a/scene/effect/particle/hero01_long_attack04.tscn
+++ b/scene/effect/particle/hero01_long_attack04.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://c5srkd0js0bwc"]
 
-[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/particle_slash_normal.tscn" id="1_5b0hk"]
+[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/particle_slash.tscn" id="1_5b0hk"]
 
 [node name="Particle" instance=ExtResource("1_5b0hk")]
 transform = Transform3D(1.2, 0, 0, 0, 0.707107, -0.353553, 0, 0.707107, 0.353553, 0, 0, 0)
diff --git a/scene/effect/particle/particle_dash_normal.tscn b/scene/effect/particle/particle_dash.tscn
similarity index 100%
rename from scene/effect/particle/particle_dash_normal.tscn
rename to scene/effect/particle/particle_dash.tscn
diff --git a/scene/effect/particle/particle_hit_normal.tscn b/scene/effect/particle/particle_hit.tscn
similarity index 100%
rename from scene/effect/particle/particle_hit_normal.tscn
rename to scene/effect/particle/particle_hit.tscn
diff --git a/scene/effect/particle/particle_decal_normal.tscn b/scene/effect/particle/particle_hit_ground.tscn
similarity index 100%
rename from scene/effect/particle/particle_decal_normal.tscn
rename to scene/effect/particle/particle_hit_ground.tscn
diff --git a/scene/effect/particle/particle_slash_normal.tscn b/scene/effect/particle/particle_slash.tscn
similarity index 100%
rename from scene/effect/particle/particle_slash_normal.tscn
rename to scene/effect/particle/particle_slash.tscn
diff --git a/script/character/battle.gd b/script/character/battle.gd
index dbf29e0..2911b81 100644
--- a/script/character/battle.gd
+++ b/script/character/battle.gd
@@ -160,7 +160,7 @@ func settle(hit_info:HitInfo) -> bool:
 		character_to.add_buff("hit_up",attack.hit_up_duration)
 	
 	#受击特效
-	character_to.cast_particle(ResourceManager.particle_hit_normal)
+	character_to.cast_particle(ResourceManager.particle_hit)
 	
 	#抖动
 	character_to.add_buff("shake_x",0.2,true)
@@ -173,15 +173,7 @@ func settle(hit_info:HitInfo) -> bool:
 	character_to.add_buff("pause",attack.pause_time)
 	
 	#全局特效
-	if is_kill:
-		Global.camera_mgr.effect_strong()
-	elif is_break_stun || is_break_stun:
-		Global.camera_mgr.effect_strong()
-	elif is_break_skill:
-		match break_level_sub:
-			1:Global.camera_mgr.effect_normal()
-			2:Global.camera_mgr.effect_mid()
-			3:Global.camera_mgr.effect_strong()
+	Global.camera_mgr.effect(attack.pause_time)
 	
 	#伤害跳字
 	character_to.show_hit_damage(damage)
diff --git a/script/manager/camera_manager.gd b/script/manager/camera_manager.gd
index 6b04a84..3b74799 100644
--- a/script/manager/camera_manager.gd
+++ b/script/manager/camera_manager.gd
@@ -134,6 +134,18 @@ func add_global_effect(effect_type:Enum.EGlobalEffect ,life_time:float ,value:fl
 	global_effect.value = value
 	global_effect_list.append(global_effect)
 
+func effect(pause_time):
+	if not pause_time:
+		return
+	var basic_pause_time = 0.3
+	var effect_time = pause_time * 2
+	var rate = pause_time/basic_pause_time
+	add_global_effect(Enum.EGlobalEffect.CameraShake,effect_time,0.8 * rate)
+	add_global_effect(Enum.EGlobalEffect.CameraSize,effect_time,0.4 * rate)
+	add_global_effect(Enum.EGlobalEffect.ColorShift,effect_time,0.8 * rate)
+	add_global_effect(Enum.EGlobalEffect.Blur,effect_time,0.8 * rate)
+
+
 func effect_normal():
 	add_global_effect(Enum.EGlobalEffect.CameraShake,0.2,0.2)
 	add_global_effect(Enum.EGlobalEffect.CameraSize,0.2,0.02)
diff --git a/script/manager/resource_manager.gd b/script/manager/resource_manager.gd
index 2f355c5..f5b6e96 100644
--- a/script/manager/resource_manager.gd
+++ b/script/manager/resource_manager.gd
@@ -10,7 +10,7 @@ var material_character = load("res://render/material/character.tres")
 var material_character_sub = load("res://render/material/character_sub.tres")
 
 #==effect==
-var particle_hit_normal = load("res://scene/effect/particle/particle_hit_normal.tscn")
+var particle_hit = load("res://scene/effect/particle/particle_hit.tscn")
 
 #==config==
 #character