From d779da7417e0ef1511576dba6175ef2c2909dc0b Mon Sep 17 00:00:00 2001 From: czbdw <2195297233@qq.com> Date: Sun, 27 Oct 2024 20:12:00 +0800 Subject: [PATCH] SE V2 --- Assets/GameRes/AutoSource/Part/Part3.prefab | 28 +++++------ Assets/GameRes/Config/Audio/AudioCode.asset | 50 +++++++++---------- .../GamePool/effectSource/blue_effect.prefab | 4 +- .../effectSource/complete_effect.prefab | 2 +- .../GamePool/effectSource/deadEffect.prefab | 4 +- .../GamePool/effectSource/green_effect.prefab | 4 +- .../effectSource/normal_effect.prefab | 2 +- .../GamePool/effectSource/red_effect.prefab | 4 +- Assets/GameRes/GamePool/enemy_A.prefab | 2 +- Assets/GameRes/GamePool/enemy_B.prefab | 2 +- Assets/GameRes/GamePool/enemy_Witch.prefab | 2 +- .../Art/GaussBlur/Global_GaussBlurEffect.mat | 2 +- 12 files changed, 53 insertions(+), 53 deletions(-) diff --git a/Assets/GameRes/AutoSource/Part/Part3.prefab b/Assets/GameRes/AutoSource/Part/Part3.prefab index 106472a..be2ab16 100644 --- a/Assets/GameRes/AutoSource/Part/Part3.prefab +++ b/Assets/GameRes/AutoSource/Part/Part3.prefab @@ -831,7 +831,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098658875607414918, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: AttackStateDuration - value: 2.5 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3729940868248003621, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: m_LocalPosition.x @@ -999,7 +999,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098658875607414918, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: AttackStateDuration - value: 2 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 3729940868248003621, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: m_LocalPosition.x @@ -1497,7 +1497,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098658875607414918, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: AttackStateDuration - value: 2 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 3729940868248003621, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: m_LocalPosition.x @@ -1797,7 +1797,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098658875607414918, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: AttackStateDuration - value: 2.5 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3729940868248003621, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: m_LocalPosition.x @@ -1863,7 +1863,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 376261684568792720, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: AttackRealTime - value: 2.5 + value: 2 objectReference: {fileID: 0} - target: {fileID: 376261684568792720, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: AttackBeforeTime @@ -1903,7 +1903,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098658875607414918, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: AttackStateDuration - value: 2.5 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3729940868248003621, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: m_LocalPosition.x @@ -2243,7 +2243,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 376261684568792720, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: AttackRealTime - value: 2.5 + value: 2 objectReference: {fileID: 0} - target: {fileID: 376261684568792720, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: AttackBeforeTime @@ -2283,7 +2283,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098658875607414918, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: AttackStateDuration - value: 2.5 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3729940868248003621, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: m_LocalPosition.x @@ -2451,7 +2451,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098658875607414918, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: AttackStateDuration - value: 1.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3729940868248003621, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: m_LocalPosition.x @@ -2557,7 +2557,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098658875607414918, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: AttackStateDuration - value: 2.5 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3729940868248003621, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: m_LocalPosition.x @@ -2788,7 +2788,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098658875607414918, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: AttackStateDuration - value: 2.5 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3729940868248003621, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: m_LocalPosition.x @@ -3080,7 +3080,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098658875607414918, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: AttackStateDuration - value: 2 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 3729940868248003621, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: m_LocalPosition.x @@ -3963,7 +3963,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 376261684568792720, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: AttackRealTime - value: 2.5 + value: 2 objectReference: {fileID: 0} - target: {fileID: 376261684568792720, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: AttackBeforeTime @@ -4003,7 +4003,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098658875607414918, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: AttackStateDuration - value: 2.5 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3729940868248003621, guid: bc18e5c178ad0e642b49f8cb01e181b0, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/GameRes/Config/Audio/AudioCode.asset b/Assets/GameRes/Config/Audio/AudioCode.asset index b6a736c..9e9e81d 100644 --- a/Assets/GameRes/Config/Audio/AudioCode.asset +++ b/Assets/GameRes/Config/Audio/AudioCode.asset @@ -12,35 +12,35 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 47b44627e5f34323bc394721daf7d29f, type: 3} m_Name: AudioCode m_EditorClassIdentifier: - LobbyBgm: At the beginning - FightBgm: bgmBattle - NormalBgm: bgmNormal + LobbyBgm: + FightBgm: + NormalBgm: SE_Btn_Click: UI/Button/Water_Bow_Buff_01 SE_Btn_Click2: UI/Button/Water_Bow_Buff_01 SE_Btn_Click3: UI/Button/Water_Bow_Buff_01 - SE_Btn_Back: UI/Button/Btn_Back - SE_Btn_Close: UI/Button/Btn_Close - SE_Btn_Confirm: UI/Button/Btn_Confirm - SE_Btn_Warning: UI/Button/Btn_Warning - SE_Complete: Prop/Dark_Sword_Recharge - SE_Complete2: UI/CompleteLevel/Complete_Level_02 - SE_CompleteTip: UI/CompleteLevel/Complete_Level_Tip - SE_CompletePrefect: UI/CompleteLevel/Complete_Level_Prefect + SE_Btn_Back: + SE_Btn_Close: + SE_Btn_Confirm: + SE_Btn_Warning: + SE_Complete: + SE_Complete2: + SE_CompleteTip: + SE_CompletePrefect: SE_Gaming_GetCoin: SE_Loading_Whoosh01: UI/Loading/Water_Sword_Whoosh_02 SE_Loading_Whoosh02: UI/Loading/Water_Sword_Whoosh_02 - SE_OverGame_History: UI/OverGame/HistoryEffect - SE_OverGame_Prefect: UI/OverGame/PerfectEffect + SE_OverGame_History: + SE_OverGame_Prefect: SE_PanelPop_Pop01: - SE_PanelPop_Pop02: UI/PanelPop/Pop02 - SE_PanelPop_Pop03: UI/PanelPop/Pop03 - SE_Play_OverGameSuccess: Success - SE_PropTip: UI/PropTip - SE_Play_OverGameFail: Defeated - SE_AD_Complete: UI/AD_Complete - SE_Fight_Attack: Attack - SE_Fight_EchoTrigger1: EchoCard1 - SE_Fight_EchoTrigger2: EchoCard2 - SE_Fight_BossEchoTrigger: EnemySkill - SE_Fight_RealCard: DealCard - SE_Fight_DiscardCard: Discard + SE_PanelPop_Pop02: + SE_PanelPop_Pop03: + SE_Play_OverGameSuccess: + SE_PropTip: + SE_Play_OverGameFail: + SE_AD_Complete: + SE_Fight_Attack: + SE_Fight_EchoTrigger1: + SE_Fight_EchoTrigger2: + SE_Fight_BossEchoTrigger: + SE_Fight_RealCard: + SE_Fight_DiscardCard: diff --git a/Assets/GameRes/GamePool/effectSource/blue_effect.prefab b/Assets/GameRes/GamePool/effectSource/blue_effect.prefab index 4bde86c..f53cd86 100644 --- a/Assets/GameRes/GamePool/effectSource/blue_effect.prefab +++ b/Assets/GameRes/GamePool/effectSource/blue_effect.prefab @@ -9792,8 +9792,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSetting: - audioPath: SE/Prop/BLUE - volume: 1 + audioPath: Prop/BLUE + volume: 0.7 duration: 2 --- !u!1 &7177098446060882970 GameObject: diff --git a/Assets/GameRes/GamePool/effectSource/complete_effect.prefab b/Assets/GameRes/GamePool/effectSource/complete_effect.prefab index afcead2..e05942e 100644 --- a/Assets/GameRes/GamePool/effectSource/complete_effect.prefab +++ b/Assets/GameRes/GamePool/effectSource/complete_effect.prefab @@ -9801,7 +9801,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSetting: - audioPath: SE/Prop/COMP + audioPath: Prop/COMP volume: 1 duration: 2 --- !u!1 &8752485645889606713 diff --git a/Assets/GameRes/GamePool/effectSource/deadEffect.prefab b/Assets/GameRes/GamePool/effectSource/deadEffect.prefab index 194d9eb..bc6204b 100644 --- a/Assets/GameRes/GamePool/effectSource/deadEffect.prefab +++ b/Assets/GameRes/GamePool/effectSource/deadEffect.prefab @@ -9793,8 +9793,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSetting: - audioPath: SE/DEAD - volume: 1 + audioPath: DEAD + volume: 0.8 duration: 2 --- !u!1 &7177098446060882970 GameObject: diff --git a/Assets/GameRes/GamePool/effectSource/green_effect.prefab b/Assets/GameRes/GamePool/effectSource/green_effect.prefab index e7691ae..aa48162 100644 --- a/Assets/GameRes/GamePool/effectSource/green_effect.prefab +++ b/Assets/GameRes/GamePool/effectSource/green_effect.prefab @@ -9792,8 +9792,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSetting: - audioPath: SE/Prop/GREEN - volume: 1 + audioPath: Prop/GREEN + volume: 0.7 duration: 2 --- !u!1 &7177098446060882970 GameObject: diff --git a/Assets/GameRes/GamePool/effectSource/normal_effect.prefab b/Assets/GameRes/GamePool/effectSource/normal_effect.prefab index 7a50735..0f50ef4 100644 --- a/Assets/GameRes/GamePool/effectSource/normal_effect.prefab +++ b/Assets/GameRes/GamePool/effectSource/normal_effect.prefab @@ -4903,7 +4903,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSetting: - audioPath: SE/Prop/NORMAL + audioPath: Prop/NORMAL volume: 1 duration: 2 --- !u!1 &7177098446060882970 diff --git a/Assets/GameRes/GamePool/effectSource/red_effect.prefab b/Assets/GameRes/GamePool/effectSource/red_effect.prefab index 761033a..c8dc7a9 100644 --- a/Assets/GameRes/GamePool/effectSource/red_effect.prefab +++ b/Assets/GameRes/GamePool/effectSource/red_effect.prefab @@ -9792,8 +9792,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSetting: - audioPath: SE/Prop/RED - volume: 1 + audioPath: Prop/RED + volume: 0.7 duration: 2 --- !u!1 &7177098446060882970 GameObject: diff --git a/Assets/GameRes/GamePool/enemy_A.prefab b/Assets/GameRes/GamePool/enemy_A.prefab index 2aa1be5..2a1864a 100644 --- a/Assets/GameRes/GamePool/enemy_A.prefab +++ b/Assets/GameRes/GamePool/enemy_A.prefab @@ -257,7 +257,7 @@ MonoBehaviour: _fsmController: {fileID: 1037146257405600272} _aiLerp: {fileID: 3875234762672507673} AnimState: {fileID: 1892528414967833642} - AttackTriggerAudioSound: SE/Enemy/ENEMY_A + AttackTriggerAudioSound: Enemy/ENEMY_A ActiveArea: {x: 20, y: -1} WalkArea: {x: 5, y: 5} TriggerDistance: 1.5 diff --git a/Assets/GameRes/GamePool/enemy_B.prefab b/Assets/GameRes/GamePool/enemy_B.prefab index c69bcd4..3f61226 100644 --- a/Assets/GameRes/GamePool/enemy_B.prefab +++ b/Assets/GameRes/GamePool/enemy_B.prefab @@ -172,7 +172,7 @@ MonoBehaviour: _fsmController: {fileID: 1872038844140615494} _aiLerp: {fileID: 647503972076172283} AnimState: {fileID: 2721736918044598135} - AttackTriggerAudioSound: SE/Enemy/ENEMY_B + AttackTriggerAudioSound: Enemy/ENEMY_B ActiveArea: {x: 20, y: -1} WalkArea: {x: 5, y: 5} TriggerDistance: 1.5 diff --git a/Assets/GameRes/GamePool/enemy_Witch.prefab b/Assets/GameRes/GamePool/enemy_Witch.prefab index 843e41a..8569f52 100644 --- a/Assets/GameRes/GamePool/enemy_Witch.prefab +++ b/Assets/GameRes/GamePool/enemy_Witch.prefab @@ -256,7 +256,7 @@ MonoBehaviour: _fsmController: {fileID: 6589322813601687733} _aiLerp: {fileID: 1014648402855698419} AnimState: {fileID: 5860468675817691985} - AttackTriggerAudioSound: SE/Enemy/ENEMY_W + AttackTriggerAudioSound: Enemy/ENEMY_W ActiveArea: {x: -1, y: -1} WalkArea: {x: 0, y: 0} TriggerDistance: 1 diff --git a/Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat b/Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat index 697738e..d592338 100644 --- a/Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat +++ b/Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat @@ -46,7 +46,7 @@ Material: m_Ints: [] m_Floats: - Vector1_c9f2135c9d254951b22c018d295f8558: 0.003 - - _blurOffset: 0.007336116 + - _blurOffset: 0.015018618 m_Colors: [] m_BuildTextureStacks: [] --- !u!114 &268278646524644520