From ddfca80c4582e118a2485166233a35ef26ef89fe Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 19 Oct 2020 21:59:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=8D=E9=81=A5=20commit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/XiaoYao/XiaoYaoLuckyBossPopup.prefab | 22 +++++++++---------- .../GeneralPopup_XiaoYaoYouItemExchange.lua | 7 ++++-- .../~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua | 1 + 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoLuckyBossPopup.prefab b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoLuckyBossPopup.prefab index f9d4f53364..9843acf939 100644 --- a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoLuckyBossPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoLuckyBossPopup.prefab @@ -126,11 +126,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2354410091790794285} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: -0.000027821912, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 131.7} m_Pivot: {x: 0, y: 0.5} --- !u!222 &6009056775654828864 @@ -154,7 +154,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 122 + m_Left: 0 m_Right: 0 m_Top: 40 m_Bottom: 0 @@ -211,6 +211,7 @@ RectTransform: - {fileID: 4107591401879039839} - {fileID: 2650705437399728588} - {fileID: 8819556549349584560} + - {fileID: 2413547048822279976} - {fileID: 2354410091790794285} m_Father: {fileID: 7920936004859207622} m_RootOrder: 1 @@ -1312,15 +1313,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2413547048822279976} - {fileID: 7657352103914167475} m_Father: {fileID: 7555683376229264185} - m_RootOrder: 6 + m_RootOrder: 7 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: -149.46, y: -539.94995} - m_SizeDelta: {x: 617.09, y: 131.7} + m_AnchoredPosition: {x: -89.163, y: -539.94995} + m_SizeDelta: {x: 496.5, y: 131.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2289098928544743846 CanvasRenderer: @@ -2810,16 +2810,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9136319240660898480} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 2354410091790794285} - m_RootOrder: 0 + m_Father: {fileID: 7555683376229264185} + m_RootOrder: 6 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: -235, y: 0} + m_AnchoredPosition: {x: -384.46002, y: -539.94995} m_SizeDelta: {x: 94.1, y: 131.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8507476027570995583 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_XiaoYaoYouItemExchange.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_XiaoYaoYouItemExchange.lua index 66f0bf755f..0a7a02681f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_XiaoYaoYouItemExchange.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_XiaoYaoYouItemExchange.lua @@ -30,8 +30,11 @@ function this:BindEvent() if BagManager.GetItemCountById(itemId) > 0 then ShopManager.RequestBuyShopItem(7, 10033, count, function() PopupTipPanel.ShowTip("恢复50点云游值!") - Game.GlobalEvent:DispatchEvent(GameEvent.XiaoYao.RefreshEventShow) - parent:ClosePanel() + Timer.New(function() + LogGreen("BagManager.GetItemCountById(UpViewRechargeType.YunYouVle)--------------:"..BagManager.GetItemCountById(UpViewRechargeType.YunYouVle)) + Game.GlobalEvent:DispatchEvent(GameEvent.XiaoYao.RefreshEventShow) + parent:ClosePanel() + end,1):Start() end) else PopupTipPanel.ShowTip("云游宝玉不足") diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua index c1685dd666..967a1885e9 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua @@ -494,6 +494,7 @@ end --刷新云游值显示栏信息 function this.UpdateYunYouVleShow() + LogGreen("BagManager.GetItemCountById(UpViewRechargeType.YunYouVle):"..BagManager.GetItemCountById(UpViewRechargeType.YunYouVle)) this.costInfo.text=string.format("%d/%d",BagManager.GetItemCountById(UpViewRechargeType.YunYouVle),PrivilegeManager.GetPrivilegeNumber(39)) end