puxuan/c1_unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
puxuan 2025-11-08 17:18:09 +08:00
commit a2ea591c82
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Assets/prefabs/effects/battle/sfx_c1_p34001_01.prefab
View File

@ -4892,7 +4892,7 @@ ParticleSystemRenderer:
m_SortingFudge: 0 m_SortingFudge: 0
m_NormalDirection: 1 m_NormalDirection: 1
m_ShadowBias: 0 m_ShadowBias: 0
m_RenderAlignment: 0 m_RenderAlignment: 2
m_Pivot: {x: 0, y: 0, z: 0} m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 1 m_UseCustomVertexStreams: 1
@ -9767,7 +9767,7 @@ ParticleSystemRenderer:
m_SortingFudge: -100 m_SortingFudge: -100
m_NormalDirection: 1 m_NormalDirection: 1
m_ShadowBias: 0 m_ShadowBias: 0
m_RenderAlignment: 0 m_RenderAlignment: 2
m_Pivot: {x: -0.5, y: 0, z: 0} m_Pivot: {x: -0.5, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 0 m_UseCustomVertexStreams: 0
@ -14732,7 +14732,7 @@ ParticleSystemRenderer:
m_SortingFudge: -228.8 m_SortingFudge: -228.8
m_NormalDirection: 1 m_NormalDirection: 1
m_ShadowBias: 0 m_ShadowBias: 0
m_RenderAlignment: 0 m_RenderAlignment: 2
m_Pivot: {x: 0, y: 0, z: 0} m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 0 m_UseCustomVertexStreams: 0
@ -19607,7 +19607,7 @@ ParticleSystemRenderer:
m_SortingFudge: -190 m_SortingFudge: -190
m_NormalDirection: 1 m_NormalDirection: 1
m_ShadowBias: 0 m_ShadowBias: 0
m_RenderAlignment: 0 m_RenderAlignment: 2
m_Pivot: {x: 0, y: 0, z: 0} m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 0 m_UseCustomVertexStreams: 0
@ -24500,7 +24500,7 @@ ParticleSystemRenderer:
m_SortingFudge: -2 m_SortingFudge: -2
m_NormalDirection: 1 m_NormalDirection: 1
m_ShadowBias: 0 m_ShadowBias: 0
m_RenderAlignment: 0 m_RenderAlignment: 2
m_Pivot: {x: 0, y: 0, z: 0} m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 1 m_UseCustomVertexStreams: 1
@ -29384,7 +29384,7 @@ ParticleSystemRenderer:
m_SortingFudge: -190.9 m_SortingFudge: -190.9
m_NormalDirection: 1 m_NormalDirection: 1
m_ShadowBias: 0 m_ShadowBias: 0
m_RenderAlignment: 0 m_RenderAlignment: 2
m_Pivot: {x: 0, y: 0, z: 0} m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 0 m_UseCustomVertexStreams: 0
@ -34268,7 +34268,7 @@ ParticleSystemRenderer:
m_SortingFudge: -2 m_SortingFudge: -2
m_NormalDirection: 1 m_NormalDirection: 1
m_ShadowBias: 0 m_ShadowBias: 0
m_RenderAlignment: 0 m_RenderAlignment: 2
m_Pivot: {x: 0, y: 0, z: 0} m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 1 m_UseCustomVertexStreams: 1
@ -39152,7 +39152,7 @@ ParticleSystemRenderer:
m_SortingFudge: -3.91 m_SortingFudge: -3.91
m_NormalDirection: 1 m_NormalDirection: 1
m_ShadowBias: 0 m_ShadowBias: 0
m_RenderAlignment: 0 m_RenderAlignment: 2
m_Pivot: {x: 0, y: 0, z: 0} m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 1 m_UseCustomVertexStreams: 1
@ -44036,7 +44036,7 @@ ParticleSystemRenderer:
m_SortingFudge: -78.55 m_SortingFudge: -78.55
m_NormalDirection: 1 m_NormalDirection: 1
m_ShadowBias: 0 m_ShadowBias: 0
m_RenderAlignment: 0 m_RenderAlignment: 2
m_Pivot: {x: 0, y: 0, z: 0} m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 1 m_UseCustomVertexStreams: 1
@ -48965,7 +48965,7 @@ ParticleSystemRenderer:
m_SortingFudge: -300 m_SortingFudge: -300
m_NormalDirection: 1 m_NormalDirection: 1
m_ShadowBias: 0 m_ShadowBias: 0
m_RenderAlignment: 0 m_RenderAlignment: 2
m_Pivot: {x: 0, y: 0, z: 0} m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 0 m_UseCustomVertexStreams: 0
@ -53849,7 +53849,7 @@ ParticleSystemRenderer:
m_SortingFudge: -13.13 m_SortingFudge: -13.13
m_NormalDirection: 1 m_NormalDirection: 1
m_ShadowBias: 0 m_ShadowBias: 0
m_RenderAlignment: 0 m_RenderAlignment: 2
m_Pivot: {x: 0, y: 0, z: 0} m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 1 m_UseCustomVertexStreams: 1
@ -58827,7 +58827,7 @@ ParticleSystemRenderer:
m_SortingFudge: -200 m_SortingFudge: -200
m_NormalDirection: 1 m_NormalDirection: 1
m_ShadowBias: 0 m_ShadowBias: 0
m_RenderAlignment: 0 m_RenderAlignment: 2
m_Pivot: {x: 0, y: 0, z: 0} m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 0 m_UseCustomVertexStreams: 0
@ -63711,7 +63711,7 @@ ParticleSystemRenderer:
m_SortingFudge: -2 m_SortingFudge: -2
m_NormalDirection: 1 m_NormalDirection: 1
m_ShadowBias: 0 m_ShadowBias: 0
m_RenderAlignment: 0 m_RenderAlignment: 2
m_Pivot: {x: 0, y: 0, z: 0} m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 1 m_UseCustomVertexStreams: 1
@ -68662,7 +68662,7 @@ ParticleSystemRenderer:
m_SortingFudge: -2 m_SortingFudge: -2
m_NormalDirection: 1 m_NormalDirection: 1
m_ShadowBias: 0 m_ShadowBias: 0
m_RenderAlignment: 0 m_RenderAlignment: 2
m_Pivot: {x: 0, y: 0, z: 0} m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 1 m_UseCustomVertexStreams: 1
@ -73546,7 +73546,7 @@ ParticleSystemRenderer:
m_SortingFudge: -2 m_SortingFudge: -2
m_NormalDirection: 1 m_NormalDirection: 1
m_ShadowBias: 0 m_ShadowBias: 0
m_RenderAlignment: 0 m_RenderAlignment: 2
m_Pivot: {x: 0, y: 0, z: 0} m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 1 m_UseCustomVertexStreams: 1
@ -78475,7 +78475,7 @@ ParticleSystemRenderer:
m_SortingFudge: -190 m_SortingFudge: -190
m_NormalDirection: 1 m_NormalDirection: 1
m_ShadowBias: 0 m_ShadowBias: 0
m_RenderAlignment: 0 m_RenderAlignment: 2
m_Pivot: {x: 0, y: 0, z: 0} m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 0 m_UseCustomVertexStreams: 0
@ -83359,7 +83359,7 @@ ParticleSystemRenderer:
m_SortingFudge: -2 m_SortingFudge: -2
m_NormalDirection: 1 m_NormalDirection: 1
m_ShadowBias: 0 m_ShadowBias: 0
m_RenderAlignment: 0 m_RenderAlignment: 2
m_Pivot: {x: 0, y: 0, z: 0} m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 1 m_UseCustomVertexStreams: 1
@ -88243,7 +88243,7 @@ ParticleSystemRenderer:
m_SortingFudge: -400 m_SortingFudge: -400
m_NormalDirection: 1 m_NormalDirection: 1
m_ShadowBias: 0 m_ShadowBias: 0
m_RenderAlignment: 0 m_RenderAlignment: 2
m_Pivot: {x: 0, y: 0, z: 0} m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 0 m_UseCustomVertexStreams: 0

2
Assets/prefabs/effects/ui/vfx_c1_ui_vs_01.prefab
View File

@ -51,7 +51,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 7, y: -7}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!198 &1977185866748341240 --- !u!198 &1977185866748341240