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

111111111
2025-11-11 15:15:45 +08:00 · 2025-11-11 15:15:37 +08:00
10 changed files with 10 additions and 10 deletions
--- a/Assets/arts/effects/texture/fx_c1_ui_001.png
+++ b/Assets/arts/effects/texture/fx_c1_ui_001.png
--- a/Assets/arts/effects/texture/fx_c1_ui_002.png
+++ b/Assets/arts/effects/texture/fx_c1_ui_002.png
--- a/Assets/arts/effects/texture/fx_c1_ui_003.png
+++ b/Assets/arts/effects/texture/fx_c1_ui_003.png
--- a/Assets/arts/effects/texture/fx_c1_ui_004.png
+++ b/Assets/arts/effects/texture/fx_c1_ui_004.png
--- a/Assets/arts/effects/texture/fx_c1_ui_005.png
+++ b/Assets/arts/effects/texture/fx_c1_ui_005.png
--- a/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b01.prefab
+++ b/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b01.prefab
@ -223,7 +223,7 @@ ParticleSystem:
      serializedVersion: 2
      minMaxState: 0
      minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 1, g: 0.71382755, b: 0.6666667, a: 1}
+      maxColor: {r: 0.6666667, g: 0.972549, b: 1, a: 1}
      maxGradient:
        serializedVersion: 2
        key0: {r: 1, g: 1, b: 1, a: 1}
@ -9604,7 +9604,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1481
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
--- a/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b02.prefab
+++ b/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b02.prefab
@ -4783,7 +4783,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1481
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -9907,7 +9907,7 @@ ParticleSystem:
      serializedVersion: 2
      minMaxState: 0
      minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 1, g: 0.98756176, b: 0.6666667, a: 1}
+      maxColor: {r: 0.90588236, g: 0.6666667, b: 1, a: 1}
      maxGradient:
        serializedVersion: 2
        key0: {r: 1, g: 1, b: 1, a: 1}
--- a/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b03.prefab
+++ b/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b03.prefab
@ -5093,7 +5093,7 @@ ParticleSystem:
      serializedVersion: 2
      minMaxState: 0
      minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.71194285, g: 1, b: 0.6666667, a: 1}
+      maxColor: {r: 1, g: 0.68146116, b: 0.6666667, a: 1}
      maxGradient:
        serializedVersion: 2
        key0: {r: 1, g: 1, b: 1, a: 1}
@ -14525,7 +14525,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1481
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
--- a/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b04.prefab
+++ b/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b04.prefab
@ -5144,7 +5144,7 @@ ParticleSystem:
      serializedVersion: 2
      minMaxState: 0
      minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.6666667, g: 0.9709962, b: 1, a: 1}
+      maxColor: {r: 1, g: 0.8894495, b: 0.6666667, a: 1}
      maxGradient:
        serializedVersion: 2
        key0: {r: 1, g: 1, b: 1, a: 1}
@ -14525,7 +14525,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1481
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
--- a/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b05.prefab
+++ b/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b05.prefab
@ -5093,7 +5093,7 @@ ParticleSystem:
      serializedVersion: 2
      minMaxState: 0
      minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.90640926, g: 0.6666667, b: 1, a: 1}
+      maxColor: {r: 0.6698835, g: 1, b: 0.6666667, a: 1}
      maxGradient:
        serializedVersion: 2
        key0: {r: 1, g: 1, b: 1, a: 1}
@ -14525,7 +14525,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1481
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
Author	SHA1	Message	Date
tuxinyu	dab89f6728	Merge branch 'dev_hero_2' of https://git.wdd817.link/puxuan/c1_unity into dev_hero_2	2025-11-11 15:15:45 +08:00
tuxinyu	932eaf1f96	111111111	2025-11-11 15:15:37 +08:00