Merge branch 'china/dev' into china/local

dev_chengFeng
JieLing 2021-05-17 17:01:37 +08:00
commit 3352000d95
4 changed files with 21 additions and 20 deletions

View File

@ -34,7 +34,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0.000030517578, y: 0}
m_AnchoredPosition: {x: 0.0000000046529207, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &455843809901100221
@ -612,7 +612,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: d9eb47e7e33ca8a4aa13a0de17b927ab, type: 3}
m_Sprite: {fileID: 21300000, guid: a2405fced91d3d443befb9c81440a05b, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -77,9 +77,9 @@ RectTransform:
m_Father: {fileID: 2384432804281337260}
m_RootOrder: 2
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: 0, y: 412.5}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -547.5}
m_SizeDelta: {x: 584, y: 84}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6415175731582749822
@ -310,9 +310,9 @@ RectTransform:
m_Father: {fileID: 8478406734519293774}
m_RootOrder: 0
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: 0, y: 645}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -315}
m_SizeDelta: {x: 1080, y: 471}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4265271028047851161

View File

@ -4776,7 +4776,7 @@ ParticleSystem:
--- !u!199 &4010243669292641170
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -9479,7 +9479,7 @@ ParticleSystem:
--- !u!199 &2550128951490885228
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -14096,7 +14096,7 @@ ParticleSystem:
--- !u!199 &1131291321758900697
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -14303,9 +14303,9 @@ RectTransform:
m_Father: {fileID: 2542118471955123022}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -232}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 728}
m_SizeDelta: {x: 1080, y: 464}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7798801616929473648
@ -19029,7 +19029,7 @@ ParticleSystem:
--- !u!199 &7463275731368259045
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -24211,7 +24211,7 @@ ParticleSystem:
--- !u!199 &1536422324374035914
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -29057,7 +29057,7 @@ ParticleSystem:
--- !u!199 &3638165982301261779
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -33755,7 +33755,7 @@ ParticleSystem:
--- !u!199 &1979518599288404074
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -38716,7 +38716,7 @@ ParticleSystem:
--- !u!199 &4969675192407024493
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -43546,7 +43546,7 @@ ParticleSystem:
--- !u!199 &3302761565201920090
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -13,6 +13,7 @@ function this:BindEvent()
Util.AddClick(this.btnCancel,function()
parent:ClosePanel()
--UIManager.OpenPanel(UIName.DynamicActivityPanel)
DynamicActivityManager.RemoveUIList()
JumpManager.GoJump(40007)
end)