Merge branch 'dev_hero_2' of https://git.wdd817.link/puxuan/c1_unity into dev_hero_2

11111
2025-10-18 15:49:17 +08:00 · 2025-10-18 15:48:03 +08:00
5 changed files with 33 additions and 33 deletions
--- a/Assets/prefabs/effects/battle/sfx_c1_p45002_01.prefab
+++ b/Assets/prefabs/effects/battle/sfx_c1_p45002_01.prefab
@ -4844,7 +4844,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -14632,7 +14632,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -19516,7 +19516,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -24400,7 +24400,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
--- a/Assets/prefabs/effects/battle/sfx_c1_p45002_02.prefab
+++ b/Assets/prefabs/effects/battle/sfx_c1_p45002_02.prefab
@ -9665,7 +9665,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -14576,7 +14576,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -19460,7 +19460,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -19543,7 +19543,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  GroupOrder: 0
  RootParticle: {fileID: 9191837849842765909}
-  EffectDuration: 1
+  EffectDuration: 1.24
  AnimatorCount: 0
  TrailRendererCount: 0
  EulerAnglesFlip: 1
@ -24400,7 +24400,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
--- a/Assets/prefabs/effects/battle/sfx_c1_p45002_03.prefab
+++ b/Assets/prefabs/effects/battle/sfx_c1_p45002_03.prefab
@ -4853,7 +4853,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -9728,7 +9728,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -14612,7 +14612,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -24345,7 +24345,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -29229,7 +29229,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
--- a/Assets/prefabs/effects/battle/sfx_c1_p45002_04.prefab
+++ b/Assets/prefabs/effects/battle/sfx_c1_p45002_04.prefab
@ -4853,7 +4853,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -9728,7 +9728,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -19489,7 +19489,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -24400,7 +24400,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
--- a/Assets/prefabs/effects/battle/sfx_c1_p45002_05.prefab
+++ b/Assets/prefabs/effects/battle/sfx_c1_p45002_05.prefab
@ -4844,7 +4844,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -9737,7 +9737,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -14621,7 +14621,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -19514,7 +19514,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 4
  m_MeshDistribution: 0
  m_SortMode: 0
@ -29239,7 +29239,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -34123,7 +34123,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -39016,7 +39016,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 1
  m_MeshDistribution: 0
  m_SortMode: 0
@ -43900,7 +43900,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -48784,7 +48784,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -53668,7 +53668,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -58561,7 +58561,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -63445,7 +63445,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -68338,7 +68338,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -73222,7 +73222,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -78106,7 +78106,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 9999
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
Author	SHA1	Message	Date
tuxinyu	d5c3de2bcb	Merge branch 'dev_hero_2' of https://git.wdd817.link/puxuan/c1_unity into dev_hero_2	2025-10-18 15:49:17 +08:00
tuxinyu	a3a918ec95	11111	2025-10-18 15:48:03 +08:00