Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
This commit is contained in:
commit
0edf4d4b74
@ -8,7 +8,7 @@ Material:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: sfx_c1_ui_qizi_07
|
m_Name: sfx_c1_ui_qizi_07
|
||||||
m_Shader: {fileID: 4800000, guid: 407dcf89d6aad74448e19b296db80487, type: 3}
|
m_Shader: {fileID: 4800000, guid: af7fa585a2fc03b4ca0f1e83f6d949fa, type: 3}
|
||||||
m_ValidKeywords:
|
m_ValidKeywords:
|
||||||
- _USE_UV_NOSIZE
|
- _USE_UV_NOSIZE
|
||||||
m_InvalidKeywords: []
|
m_InvalidKeywords: []
|
||||||
|
|||||||
@ -8,7 +8,7 @@ Material:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: sfx_c1_ui_qizi_09
|
m_Name: sfx_c1_ui_qizi_09
|
||||||
m_Shader: {fileID: 4800000, guid: 407dcf89d6aad74448e19b296db80487, type: 3}
|
m_Shader: {fileID: 4800000, guid: af7fa585a2fc03b4ca0f1e83f6d949fa, type: 3}
|
||||||
m_ValidKeywords:
|
m_ValidKeywords:
|
||||||
- _USE_UV_NOSIZE
|
- _USE_UV_NOSIZE
|
||||||
m_InvalidKeywords: []
|
m_InvalidKeywords: []
|
||||||
|
|||||||
@ -8,7 +8,7 @@ Material:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: sfx_c1_ui_qizi_13
|
m_Name: sfx_c1_ui_qizi_13
|
||||||
m_Shader: {fileID: 4800000, guid: 407dcf89d6aad74448e19b296db80487, type: 3}
|
m_Shader: {fileID: 4800000, guid: af7fa585a2fc03b4ca0f1e83f6d949fa, type: 3}
|
||||||
m_ValidKeywords:
|
m_ValidKeywords:
|
||||||
- _USE_UV_NOSIZE
|
- _USE_UV_NOSIZE
|
||||||
m_InvalidKeywords: []
|
m_InvalidKeywords: []
|
||||||
|
|||||||
@ -8,7 +8,7 @@ Material:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: sfx_c1_ui_qizi_15
|
m_Name: sfx_c1_ui_qizi_15
|
||||||
m_Shader: {fileID: 4800000, guid: 407dcf89d6aad74448e19b296db80487, type: 3}
|
m_Shader: {fileID: 4800000, guid: af7fa585a2fc03b4ca0f1e83f6d949fa, type: 3}
|
||||||
m_ValidKeywords:
|
m_ValidKeywords:
|
||||||
- _USE_UV_NOSIZE
|
- _USE_UV_NOSIZE
|
||||||
m_InvalidKeywords: []
|
m_InvalidKeywords: []
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 12 KiB |
@ -52,7 +52,7 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
GroupOrder: 0
|
GroupOrder: 0
|
||||||
RootParticle: {fileID: 2143905513515718154}
|
RootParticle: {fileID: 2143905513515718154}
|
||||||
EffectDuration: 0.37
|
EffectDuration: 0.62
|
||||||
AnimatorCount: 0
|
AnimatorCount: 0
|
||||||
TrailRendererCount: 0
|
TrailRendererCount: 0
|
||||||
EulerAnglesFlip: 1
|
EulerAnglesFlip: 1
|
||||||
|
|||||||
@ -5088,7 +5088,7 @@ ParticleSystem:
|
|||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
minMaxState: 0
|
minMaxState: 0
|
||||||
minColor: {r: 1, g: 1, b: 1, a: 1}
|
minColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
maxColor: {r: 1, g: 1, b: 1, a: 1}
|
maxColor: {r: 1, g: 0.5339291, b: 0.43867922, a: 1}
|
||||||
maxGradient:
|
maxGradient:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
key0: {r: 1, g: 1, b: 1, a: 1}
|
key0: {r: 1, g: 1, b: 1, a: 1}
|
||||||
@ -5203,7 +5203,7 @@ ParticleSystem:
|
|||||||
startSizeY:
|
startSizeY:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
minMaxState: 0
|
minMaxState: 0
|
||||||
scalar: 0.2
|
scalar: 0.3
|
||||||
minScalar: 1
|
minScalar: 1
|
||||||
maxCurve:
|
maxCurve:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
@ -9958,7 +9958,7 @@ ParticleSystem:
|
|||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
minMaxState: 0
|
minMaxState: 0
|
||||||
minColor: {r: 1, g: 1, b: 1, a: 1}
|
minColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
maxColor: {r: 1, g: 1, b: 1, a: 1}
|
maxColor: {r: 0.5566038, g: 0, b: 0, a: 1}
|
||||||
maxGradient:
|
maxGradient:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
key0: {r: 1, g: 1, b: 1, a: 1}
|
key0: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
|||||||
@ -5093,7 +5093,7 @@ ParticleSystem:
|
|||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
minMaxState: 0
|
minMaxState: 0
|
||||||
minColor: {r: 1, g: 1, b: 1, a: 1}
|
minColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
maxColor: {r: 1, g: 1, b: 1, a: 1}
|
maxColor: {r: 1, g: 0.8484502, b: 0.6462264, a: 1}
|
||||||
maxGradient:
|
maxGradient:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
key0: {r: 1, g: 1, b: 1, a: 1}
|
key0: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
|||||||
@ -5144,7 +5144,7 @@ ParticleSystem:
|
|||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
minMaxState: 0
|
minMaxState: 0
|
||||||
minColor: {r: 1, g: 1, b: 1, a: 1}
|
minColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
maxColor: {r: 1, g: 1, b: 1, a: 1}
|
maxColor: {r: 0.8995203, g: 0.4575472, b: 1, a: 1}
|
||||||
maxGradient:
|
maxGradient:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
key0: {r: 1, g: 1, b: 1, a: 1}
|
key0: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user