Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
zhangqiang 2021-05-29 22:50:07 +08:00
commit cfc4e57482
1 changed files with 5 additions and 5 deletions

View File

@ -4653,7 +4653,7 @@ ParticleSystem:
--- !u!199 &7161790114800665152
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -10043,7 +10043,7 @@ ParticleSystem:
--- !u!199 &5590763315395979240
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -15612,7 +15612,7 @@ ParticleSystem:
--- !u!199 &5835294107039667155
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -20709,7 +20709,7 @@ ParticleSystem:
--- !u!199 &5835345885398115607
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -21764,7 +21764,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: 220, y: 192}
m_AnchoredPosition: {x: 220, y: 150}
m_SizeDelta: {x: 763, y: 1000}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1589219876351663004