Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
commit
43707d5d7a
|
|
@ -54875,9 +54875,9 @@ RectTransform:
|
|||
m_Father: {fileID: 224688690836167678}
|
||||
m_RootOrder: 1
|
||||
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.000014404, y: -895.4}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: -0.000014404, y: 64.599976}
|
||||
m_SizeDelta: {x: 1080, y: 136}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222839184784845028
|
||||
|
|
@ -140619,9 +140619,9 @@ RectTransform:
|
|||
m_Father: {fileID: 224444569024407278}
|
||||
m_RootOrder: 23
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -124, y: 751}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -124, y: -209}
|
||||
m_SizeDelta: {x: 113, y: 109}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4968549715844229575
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ this.CloseFunction = function()
|
|||
Timer.New(function()
|
||||
if not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.TreasureOfSomeBody) then
|
||||
LogBlue("22222222222")
|
||||
PopupTipPanel.ShowTip(Language[10471])
|
||||
--PopupTipPanel.ShowTip(Language[10471])
|
||||
if parent then
|
||||
parent:ClosePanel()
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue