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:
changyuxiang 2025-11-18 21:35:13 +08:00
commit 7da8cfde40
9 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/arts/effects/material/battle/sfx_c1_m30012/sfx_c1_m30012_01.mat
View File

@ -102,7 +102,7 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _diss_edge_color: {r: 1, g: 1, b: 1, a: 1} - _diss_edge_color: {r: 1, g: 1, b: 1, a: 1}
- _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0} - _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0}
- _tex_color: {r: 2, g: 2, b: 2, a: 1} - _tex_color: {r: 1.0592737, g: 1.0592737, b: 1.0592737, a: 1}
- _tex_mask_uv_speed: {r: 0, g: 0, b: 0, a: 0} - _tex_mask_uv_speed: {r: 0, g: 0, b: 0, a: 0}
- _tex_uv_speed: {r: 0, g: 0, b: 0, a: 0} - _tex_uv_speed: {r: 0, g: 0, b: 0, a: 0}
m_BuildTextureStacks: [] m_BuildTextureStacks: []

2
Assets/arts/effects/material/battle/sfx_c1_m30012/sfx_c1_m30012_06.mat
View File

@ -102,7 +102,7 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _diss_edge_color: {r: 1, g: 1, b: 1, a: 1} - _diss_edge_color: {r: 1, g: 1, b: 1, a: 1}
- _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0} - _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0}
- _tex_color: {r: 2, g: 2, b: 2, a: 1} - _tex_color: {r: 1.0592737, g: 1.0592737, b: 1.0592737, a: 1}
- _tex_mask_uv_speed: {r: 0, g: 0, b: 0, a: 0} - _tex_mask_uv_speed: {r: 0, g: 0, b: 0, a: 0}
- _tex_uv_speed: {r: 0, g: 0, b: 0, a: 0} - _tex_uv_speed: {r: 0, g: 0, b: 0, a: 0}
m_BuildTextureStacks: [] m_BuildTextureStacks: []

2
Assets/arts/effects/material/battle/sfx_c1_m30012/sfx_c1_m30012_07.mat
View File

@ -102,7 +102,7 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _diss_edge_color: {r: 1, g: 1, b: 1, a: 1} - _diss_edge_color: {r: 1, g: 1, b: 1, a: 1}
- _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0} - _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0}
- _tex_color: {r: 2, g: 2, b: 2, a: 1} - _tex_color: {r: 1.0592737, g: 1.0592737, b: 1.0592737, a: 1}
- _tex_mask_uv_speed: {r: 0, g: 0, b: 0, a: 0} - _tex_mask_uv_speed: {r: 0, g: 0, b: 0, a: 0}
- _tex_uv_speed: {r: 0, g: 0, b: 0, a: 0} - _tex_uv_speed: {r: 0, g: 0, b: 0, a: 0}
m_BuildTextureStacks: [] m_BuildTextureStacks: []

BIN
Assets/arts/effects/texture/fx_c1_179.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 MiB

After

Width:  |  Height:  |  Size: 11 MiB

BIN
Assets/arts/effects/texture/fx_c1_180.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 MiB

After

Width:  |  Height:  |  Size: 11 MiB

BIN
Assets/arts/effects/texture/fx_c1_181.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 MiB

After

Width:  |  Height:  |  Size: 11 MiB

18
Assets/prefabs/effects/battle/sfx_c1_m30012_b01.prefab
View File

@ -52,7 +52,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
GroupOrder: 0 GroupOrder: 0
RootParticle: {fileID: 2806621891731670516} RootParticle: {fileID: 2806621891731670516}
EffectDuration: 1.15 EffectDuration: 1.05
AnimatorCount: 0 AnimatorCount: 0
TrailRendererCount: 0 TrailRendererCount: 0
EulerAnglesFlip: 0 EulerAnglesFlip: 0
@ -4939,7 +4939,7 @@ ParticleSystem:
startDelay: startDelay:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 0.45 scalar: 0.35
minScalar: 0 minScalar: 0
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
@ -9806,7 +9806,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: -1.44, y: 1.37} m_AnchoredPosition: {x: -1.99, y: 1.37}
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 &6046384421521140205 --- !u!198 &6046384421521140205
@ -9892,7 +9892,7 @@ ParticleSystem:
startLifetime: startLifetime:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 0.2 scalar: 0.12
minScalar: 5 minScalar: 5
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
@ -10061,7 +10061,7 @@ ParticleSystem:
startSize: startSize:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 1 scalar: 0.8
minScalar: 1 minScalar: 1
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
@ -11324,7 +11324,7 @@ ParticleSystem:
x: x:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: -5 scalar: -10
minScalar: 0 minScalar: 0
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
@ -14707,7 +14707,7 @@ ParticleSystem:
startDelay: startDelay:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 0.45 scalar: 0.35
minScalar: 0 minScalar: 0
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
@ -19600,7 +19600,7 @@ ParticleSystem:
startDelay: startDelay:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 0.45 scalar: 0.35
minScalar: 0 minScalar: 0
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
@ -24475,7 +24475,7 @@ ParticleSystem:
startDelay: startDelay:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 0.45 scalar: 0.35
minScalar: 0 minScalar: 0
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2

16
Assets/prefabs/effects/battle/sfx_c1_m30012_b02.prefab
View File

@ -61,7 +61,7 @@ ParticleSystem:
startDelay: startDelay:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 0.45 scalar: 0.35
minScalar: 0 minScalar: 0
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
@ -4954,7 +4954,7 @@ ParticleSystem:
startDelay: startDelay:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 0.45 scalar: 0.35
minScalar: 0 minScalar: 0
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
@ -9829,7 +9829,7 @@ ParticleSystem:
startDelay: startDelay:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 0.45 scalar: 0.35
minScalar: 0 minScalar: 0
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
@ -19574,7 +19574,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: -1.44, y: 1.37} m_AnchoredPosition: {x: -1.99, y: 1.37}
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 &4085588354000256879 --- !u!198 &4085588354000256879
@ -19660,7 +19660,7 @@ ParticleSystem:
startLifetime: startLifetime:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 0.2 scalar: 0.12
minScalar: 5 minScalar: 5
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
@ -19829,7 +19829,7 @@ ParticleSystem:
startSize: startSize:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 1 scalar: 0.8
minScalar: 1 minScalar: 1
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
@ -21092,7 +21092,7 @@ ParticleSystem:
x: x:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: -5 scalar: -10
minScalar: 0 minScalar: 0
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
@ -24475,7 +24475,7 @@ ParticleSystem:
startDelay: startDelay:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 0.45 scalar: 0.35
minScalar: 0 minScalar: 0
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2

20
Assets/prefabs/effects/battle/sfx_c1_m30012_b03.prefab
View File

@ -61,7 +61,7 @@ ParticleSystem:
startDelay: startDelay:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 0.45 scalar: 0.35
minScalar: 0 minScalar: 0
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
@ -4936,7 +4936,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
GroupOrder: 0 GroupOrder: 0
RootParticle: {fileID: 2815287446830317805} RootParticle: {fileID: 2815287446830317805}
EffectDuration: 1.15 EffectDuration: 1.05
AnimatorCount: 0 AnimatorCount: 0
TrailRendererCount: 0 TrailRendererCount: 0
EulerAnglesFlip: 0 EulerAnglesFlip: 0
@ -9824,7 +9824,7 @@ ParticleSystem:
startDelay: startDelay:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 0.45 scalar: 0.35
minScalar: 0 minScalar: 0
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
@ -14691,7 +14691,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.43, y: 1.37} m_AnchoredPosition: {x: -0.98, y: 1.37}
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 &5912069768374480116 --- !u!198 &5912069768374480116
@ -14777,7 +14777,7 @@ ParticleSystem:
startLifetime: startLifetime:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 0.2 scalar: 0.1
minScalar: 5 minScalar: 5
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
@ -14946,7 +14946,7 @@ ParticleSystem:
startSize: startSize:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 1 scalar: 0.8
minScalar: 1 minScalar: 1
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
@ -16209,7 +16209,7 @@ ParticleSystem:
x: x:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: -9 scalar: -18
minScalar: 0 minScalar: 0
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
@ -19592,7 +19592,7 @@ ParticleSystem:
startDelay: startDelay:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 0.45 scalar: 0.35
minScalar: 0 minScalar: 0
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
@ -24485,7 +24485,7 @@ ParticleSystem:
startDelay: startDelay:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 0.45 scalar: 0.35
minScalar: 0 minScalar: 0
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
@ -29378,7 +29378,7 @@ ParticleSystem:
startDelay: startDelay:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 0.45 scalar: 0.35
minScalar: 0 minScalar: 0
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2