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

This commit is contained in:
puxuan 2025-10-20 20:37:18 +08:00
commit 7a4e927513
17 changed files with 19782 additions and 151 deletions

View File

@ -9,8 +9,7 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: sfx_c1_p35002_16
m_Shader: {fileID: 4800000, guid: af7fa585a2fc03b4ca0f1e83f6d949fa, type: 3}
m_ValidKeywords:
- _USE_UV_NOSIZE
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
@ -62,7 +61,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _tex:
m_Texture: {fileID: 2800000, guid: 0609dbddaafcc8742b8c30271f14476b, type: 3}
m_Texture: {fileID: 2800000, guid: e5b88e0fe3538b14f864f8cc32735230, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _tex_mask:
@ -70,7 +69,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _uv_nosize_tex:
m_Texture: {fileID: 2800000, guid: 06c28bb1d049d0443be1fab1dd86b2f1, type: 3}
m_Texture: {fileID: 0}
m_Scale: {x: 0.5, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
@ -105,7 +104,7 @@ Material:
- _tex_mask_rotate: 0
- _tex_rotate: 0
- _use_fnl: 0
- _use_uv_nosize: 1
- _use_uv_nosize: 0
- _uv_nosize_strength: 0.2
- _ztest_on: 4
m_Colors:

View File

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

View File

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

View File

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

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

@ -61,7 +61,7 @@ ParticleSystem:
startDelay:
serializedVersion: 2
minMaxState: 0
scalar: 2.51
scalar: 2.7
minScalar: 0
maxCurve:
serializedVersion: 2
@ -4936,7 +4936,7 @@ ParticleSystem:
startDelay:
serializedVersion: 2
minMaxState: 0
scalar: 2.51
scalar: 2.7
minScalar: 0
maxCurve:
serializedVersion: 2
@ -9811,7 +9811,7 @@ ParticleSystem:
startDelay:
serializedVersion: 2
minMaxState: 0
scalar: 2.63
scalar: 2.82
minScalar: 0
maxCurve:
serializedVersion: 2
@ -14803,7 +14803,7 @@ ParticleSystem:
startDelay:
serializedVersion: 2
minMaxState: 0
scalar: 3
scalar: 3.19
minScalar: 0
maxCurve:
serializedVersion: 2
@ -19696,7 +19696,7 @@ ParticleSystem:
startDelay:
serializedVersion: 2
minMaxState: 0
scalar: 3
scalar: 3.19
minScalar: 0
maxCurve:
serializedVersion: 2
@ -24589,7 +24589,7 @@ ParticleSystem:
startDelay:
serializedVersion: 2
minMaxState: 0
scalar: 2.63
scalar: 2.82
minScalar: 0
maxCurve:
serializedVersion: 2
@ -29473,7 +29473,7 @@ ParticleSystem:
startDelay:
serializedVersion: 2
minMaxState: 0
scalar: 3
scalar: 3.19
minScalar: 0
maxCurve:
serializedVersion: 2
@ -34358,7 +34358,7 @@ ParticleSystem:
startDelay:
serializedVersion: 2
minMaxState: 0
scalar: 3
scalar: 3.19
minScalar: 0
maxCurve:
serializedVersion: 2
@ -39242,7 +39242,7 @@ ParticleSystem:
startDelay:
serializedVersion: 2
minMaxState: 0
scalar: 2.63
scalar: 2.84
minScalar: 0
maxCurve:
serializedVersion: 2
@ -44126,7 +44126,7 @@ ParticleSystem:
startDelay:
serializedVersion: 2
minMaxState: 0
scalar: 2.51
scalar: 2.7
minScalar: 0
maxCurve:
serializedVersion: 2
@ -49010,7 +49010,7 @@ ParticleSystem:
startDelay:
serializedVersion: 2
minMaxState: 0
scalar: 3
scalar: 3.19
minScalar: 0
maxCurve:
serializedVersion: 2
@ -58723,7 +58723,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
GroupOrder: 0
RootParticle: {fileID: 9092136472664627766}
EffectDuration: 4
EffectDuration: 4.19
AnimatorCount: 0
TrailRendererCount: 0
EulerAnglesFlip: 1
@ -58788,7 +58788,7 @@ ParticleSystem:
startDelay:
serializedVersion: 2
minMaxState: 0
scalar: 2.51
scalar: 2.7
minScalar: 0
maxCurve:
serializedVersion: 2
@ -60357,7 +60357,7 @@ ParticleSystem:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.1832567
time: 0.19737871
value: -1
inSlope: 0
outSlope: 0

View File

@ -57,7 +57,7 @@ ParticleSystem:
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 0
autoRandomSeed: 1
startDelay:
serializedVersion: 2
minMaxState: 0
@ -114,7 +114,7 @@ ParticleSystem:
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 0
randomSeed: 4620
randomSeed: 0
InitialModule:
serializedVersion: 3
enabled: 1
@ -9809,7 +9809,7 @@ ParticleSystem:
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 0
autoRandomSeed: 1
startDelay:
serializedVersion: 2
minMaxState: 0
@ -9866,7 +9866,7 @@ ParticleSystem:
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 0
randomSeed: 3850
randomSeed: 0
InitialModule:
serializedVersion: 3
enabled: 1
@ -10042,8 +10042,8 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 3
scalar: 5
minScalar: 4
scalar: 7
minScalar: 8
maxCurve:
serializedVersion: 2
m_Curve:
@ -14720,7 +14720,7 @@ ParticleSystem:
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 0
autoRandomSeed: 1
startDelay:
serializedVersion: 2
minMaxState: 0
@ -14777,7 +14777,7 @@ ParticleSystem:
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 0
randomSeed: 3850
randomSeed: 0
InitialModule:
serializedVersion: 3
enabled: 1
@ -14953,8 +14953,8 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 3
scalar: 5
minScalar: 4
scalar: 7
minScalar: 6
maxCurve:
serializedVersion: 2
m_Curve:
@ -19604,7 +19604,7 @@ ParticleSystem:
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 0
autoRandomSeed: 1
startDelay:
serializedVersion: 2
minMaxState: 0
@ -19661,7 +19661,7 @@ ParticleSystem:
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 0
randomSeed: 3850
randomSeed: 0
InitialModule:
serializedVersion: 3
enabled: 1
@ -19837,7 +19837,7 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 0
scalar: 6
scalar: 8
minScalar: 1
maxCurve:
serializedVersion: 2

View File

@ -4878,11 +4878,11 @@ ParticleSystem:
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 0
autoRandomSeed: 1
startDelay:
serializedVersion: 2
minMaxState: 0
scalar: 0.24
scalar: 0.28
minScalar: 0
maxCurve:
serializedVersion: 2
@ -4935,14 +4935,14 @@ ParticleSystem:
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 0
randomSeed: 711
randomSeed: 0
InitialModule:
serializedVersion: 3
enabled: 1
startLifetime:
serializedVersion: 2
minMaxState: 0
scalar: 0.15
scalar: 0.2
minScalar: 5
maxCurve:
serializedVersion: 2
@ -9753,7 +9753,7 @@ ParticleSystem:
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 0
autoRandomSeed: 1
startDelay:
serializedVersion: 2
minMaxState: 0
@ -9810,7 +9810,7 @@ ParticleSystem:
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 0
randomSeed: 3850
randomSeed: 0
InitialModule:
serializedVersion: 3
enabled: 1
@ -9986,8 +9986,8 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 3
scalar: 5
minScalar: 4
scalar: 7
minScalar: 8
maxCurve:
serializedVersion: 2
m_Curve:
@ -14664,7 +14664,7 @@ ParticleSystem:
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 0
autoRandomSeed: 1
startDelay:
serializedVersion: 2
minMaxState: 0
@ -14721,7 +14721,7 @@ ParticleSystem:
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 0
randomSeed: 3850
randomSeed: 0
InitialModule:
serializedVersion: 3
enabled: 1
@ -14897,8 +14897,8 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 3
scalar: 5
minScalar: 4
scalar: 7
minScalar: 6
maxCurve:
serializedVersion: 2
m_Curve:
@ -19604,7 +19604,7 @@ ParticleSystem:
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 0
autoRandomSeed: 1
startDelay:
serializedVersion: 2
minMaxState: 0
@ -19661,7 +19661,7 @@ ParticleSystem:
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 0
randomSeed: 3850
randomSeed: 0
InitialModule:
serializedVersion: 3
enabled: 1
@ -19837,7 +19837,7 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 0
scalar: 6
scalar: 8
minScalar: 1
maxCurve:
serializedVersion: 2

View File

@ -57,7 +57,7 @@ ParticleSystem:
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 0
autoRandomSeed: 1
startDelay:
serializedVersion: 2
minMaxState: 0
@ -114,7 +114,7 @@ ParticleSystem:
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 0
randomSeed: 8953
randomSeed: 0
InitialModule:
serializedVersion: 3
enabled: 1
@ -4919,7 +4919,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -1.09, y: 0.73}
m_AnchoredPosition: {x: -2.12, y: 0.73}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!198 &5396838126351608554
@ -4941,7 +4941,7 @@ ParticleSystem:
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 0
autoRandomSeed: 1
startDelay:
serializedVersion: 2
minMaxState: 0
@ -4998,7 +4998,7 @@ ParticleSystem:
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 0
randomSeed: 8953
randomSeed: 0
InitialModule:
serializedVersion: 3
enabled: 1
@ -5174,7 +5174,7 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 0
scalar: 4
scalar: 5
minScalar: 1
maxCurve:
serializedVersion: 2
@ -5227,7 +5227,7 @@ ParticleSystem:
startSizeY:
serializedVersion: 2
minMaxState: 0
scalar: 4
scalar: 5
minScalar: 1
maxCurve:
serializedVersion: 2
@ -9737,7 +9737,7 @@ ParticleSystemRenderer:
m_CameraVelocityScale: 0
m_VelocityScale: 0
m_LengthScale: 2
m_SortingFudge: 0
m_SortingFudge: 0.18
m_NormalDirection: 1
m_ShadowBias: 0
m_RenderAlignment: 2
@ -9816,7 +9816,7 @@ ParticleSystem:
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 0
autoRandomSeed: 1
startDelay:
serializedVersion: 2
minMaxState: 0
@ -9873,7 +9873,7 @@ ParticleSystem:
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 0
randomSeed: 3850
randomSeed: 0
InitialModule:
serializedVersion: 3
enabled: 1
@ -10049,7 +10049,7 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 0
scalar: 6
scalar: 8
minScalar: 1
maxCurve:
serializedVersion: 2
@ -19522,7 +19522,7 @@ ParticleSystem:
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 0
autoRandomSeed: 1
startDelay:
serializedVersion: 2
minMaxState: 0
@ -19579,7 +19579,7 @@ ParticleSystem:
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 0
randomSeed: 3850
randomSeed: 0
InitialModule:
serializedVersion: 3
enabled: 1
@ -19755,8 +19755,8 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 3
scalar: 5
minScalar: 4
scalar: 7
minScalar: 8
maxCurve:
serializedVersion: 2
m_Curve:
@ -24433,7 +24433,7 @@ ParticleSystem:
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 0
autoRandomSeed: 1
startDelay:
serializedVersion: 2
minMaxState: 0
@ -24490,7 +24490,7 @@ ParticleSystem:
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 0
randomSeed: 3850
randomSeed: 0
InitialModule:
serializedVersion: 3
enabled: 1
@ -24666,8 +24666,8 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 3
scalar: 5
minScalar: 4
scalar: 7
minScalar: 6
maxCurve:
serializedVersion: 2
m_Curve:

View File

@ -57,7 +57,7 @@ ParticleSystem:
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 0
autoRandomSeed: 1
startDelay:
serializedVersion: 2
minMaxState: 0
@ -114,7 +114,7 @@ ParticleSystem:
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 0
randomSeed: 3850
randomSeed: 0
InitialModule:
serializedVersion: 3
enabled: 1
@ -290,7 +290,7 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 0
scalar: 6
scalar: 8
minScalar: 1
maxCurve:
serializedVersion: 2
@ -4941,11 +4941,11 @@ ParticleSystem:
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 0
autoRandomSeed: 1
startDelay:
serializedVersion: 2
minMaxState: 0
scalar: 0.22
scalar: 0.25
minScalar: 0
maxCurve:
serializedVersion: 2
@ -4998,14 +4998,14 @@ ParticleSystem:
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 0
randomSeed: 6955
randomSeed: 0
InitialModule:
serializedVersion: 3
enabled: 1
startLifetime:
serializedVersion: 2
minMaxState: 0
scalar: 0.12
scalar: 0.16
minScalar: 5
maxCurve:
serializedVersion: 2
@ -9737,7 +9737,7 @@ ParticleSystemRenderer:
m_CameraVelocityScale: 0
m_VelocityScale: 0
m_LengthScale: 2
m_SortingFudge: 0
m_SortingFudge: 0.45
m_NormalDirection: 1
m_ShadowBias: 0
m_RenderAlignment: 2
@ -14693,7 +14693,7 @@ ParticleSystem:
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 0
autoRandomSeed: 1
startDelay:
serializedVersion: 2
minMaxState: 0
@ -14750,7 +14750,7 @@ ParticleSystem:
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 0
randomSeed: 3850
randomSeed: 0
InitialModule:
serializedVersion: 3
enabled: 1
@ -14926,8 +14926,8 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 3
scalar: 5
minScalar: 4
scalar: 7
minScalar: 6
maxCurve:
serializedVersion: 2
m_Curve:
@ -19577,7 +19577,7 @@ ParticleSystem:
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 0
autoRandomSeed: 1
startDelay:
serializedVersion: 2
minMaxState: 0
@ -19634,7 +19634,7 @@ ParticleSystem:
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 0
randomSeed: 3850
randomSeed: 0
InitialModule:
serializedVersion: 3
enabled: 1
@ -19810,8 +19810,8 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 3
scalar: 5
minScalar: 4
scalar: 7
minScalar: 8
maxCurve:
serializedVersion: 2
m_Curve:

View File

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

View File

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

View File

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

View File

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

View File

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