From b5ac787e16eb72702cf1cdffb3c16c737220a5b8 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 31 Aug 2020 15:45:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E7=8B=AC=E5=B0=8F=E6=B8=B8=E6=88=8F15?= =?UTF-8?q?=201=EF=BC=9A2=E5=B1=8F=E5=B9=95=E9=80=82=E9=85=8D=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E5=A4=8D=20=E8=B4=AD=E4=B9=B0=E5=9B=9E?= =?UTF-8?q?=E6=98=A5=E6=95=A3=E6=95=B0=E9=87=8F=E4=B8=8D=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Map/TrialMiniGamePanel.prefab | 4 ++-- .../~Lua/Modules/Map/TrialMapPanel.lua | 16 ++++++++-------- .../QuickPurchase/QuickCommonPurchasePart.lua | 1 + 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Map/TrialMiniGamePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Map/TrialMiniGamePanel.prefab index 863887b350..044ad5ce46 100644 --- a/Assets/ManagedResources/Prefabs/UI/Map/TrialMiniGamePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Map/TrialMiniGamePanel.prefab @@ -454,8 +454,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -6.0999756, y: -509.8} - m_SizeDelta: {x: -428.2, y: 684.5} + m_AnchoredPosition: {x: 0, y: -509.8} + m_SizeDelta: {x: -300, y: 684.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1066462919 MonoBehaviour: diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua index cf258141af..2acc134727 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua @@ -120,7 +120,7 @@ end --添加事件监听(用于子类重写) function TrialMapPanel:AddListener() Game.GlobalEvent:AddEvent(GameEvent.TrialMap.OnPowerValueChanged, this.OnPowerValueChange) - Game.GlobalEvent:AddEvent(GameEvent.Bag.OnTempBagChanged, this.OnTempBagChanged) + -- Game.GlobalEvent:AddEvent(GameEvent.Bag.OnTempBagChanged, this.OnTempBagChanged) Game.GlobalEvent:AddEvent(GameEvent.FoodBuff.OnFoodBuffStateChanged, this.InitBuffInfo) Game.GlobalEvent:AddEvent(GameEvent.Map.ShowEnemyInfo, this.ShowEnemyInfo) Game.GlobalEvent:AddEvent(GameEvent.Map.RefreshHeroHp, this.SetSelectHero) @@ -131,7 +131,7 @@ end --移除事件监听(用于子类重写) function TrialMapPanel:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.TrialMap.OnPowerValueChanged, this.OnPowerValueChange) - Game.GlobalEvent:RemoveEvent(GameEvent.Bag.OnTempBagChanged, this.OnTempBagChanged) + -- Game.GlobalEvent:RemoveEvent(GameEvent.Bag.OnTempBagChanged, this.OnTempBagChanged) Game.GlobalEvent:RemoveEvent(GameEvent.FoodBuff.OnFoodBuffStateChanged, this.InitBuffInfo) Game.GlobalEvent:RemoveEvent(GameEvent.Map.ShowEnemyInfo, this.ShowEnemyInfo) Game.GlobalEvent:RemoveEvent(GameEvent.Map.RefreshHeroHp, this.SetSelectHero) @@ -339,12 +339,12 @@ function this.InitTrialMission() end --- 刷新临时背包数据 -function this.OnTempBagChanged() - if CarbonManager.difficulty == 2 then - this.RefreshBombNum() - end -end +-- -- 刷新临时背包数据 +-- function this.OnTempBagChanged() +-- if CarbonManager.difficulty == 2 then +-- this.RefreshBombNum() +-- end +-- end -- 刷新砸炸弹、回春散数量 function this.RefreshBombNum() diff --git a/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCommonPurchasePart.lua b/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCommonPurchasePart.lua index a7593a8b1b..86bd7057b9 100644 --- a/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCommonPurchasePart.lua +++ b/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCommonPurchasePart.lua @@ -223,6 +223,7 @@ function QuickCommonPurchasePart:OnConfirmBtnClicked() end ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP, purChaseTypeIdDef[self.context.type], self.buyCountValue, function() self.mainPanel:ClosePanel() + Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged) end) end