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

dev_chengFeng
ZhangBiao 2021-08-04 14:55:33 +08:00
commit f254d3f34d
2 changed files with 17 additions and 2 deletions

View File

@ -28491,14 +28491,14 @@ ParticleSystemRenderer:
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
m_MaxParticleSize: 5
m_MaxParticleSize: 0.9
m_CameraVelocityScale: 0
m_VelocityScale: 0
m_LengthScale: 2
m_SortingFudge: 0
m_NormalDirection: 1
m_ShadowBias: 0
m_RenderAlignment: 0
m_RenderAlignment: 2
m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 0

View File

@ -1632,6 +1632,7 @@ GameObject:
- component: {fileID: 9189572770639309796}
- component: {fileID: 8791237679244096463}
- component: {fileID: 8390285505411449262}
- component: {fileID: 8162941587447570710}
m_Layer: 5
m_Name: TalismanInfoPopup
m_TagString: Untagged
@ -1706,6 +1707,20 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6470012890751238510}
m_CullTransparentMesh: 0
--- !u!114 &8162941587447570710
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6470012890751238510}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7fdc50ec1a2f1534f93155e67c3708ab, type: 3}
m_Name:
m_EditorClassIdentifier:
bgList:
- {fileID: 1170967358714303946}
--- !u!1 &6759431002971055396
GameObject:
m_ObjectHideFlags: 0