diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua index 055ecaca5d..a4de2f9688 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua @@ -784,7 +784,9 @@ function this.DelePokemonItemData(_itemDatas) end return curItemDatas end - +function BagPanel:OnFocus() + BagManager.isBagPanel=true +end function this.ItemsSortDataV2(_itemDatas) table.sort(_itemDatas, function(a, b) if a.itemConfig.Sort == b.itemConfig.Sort then diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 38e1f35f50..61547775c6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -125,6 +125,7 @@ function RewardItemPopup:OnOpen(...) itemDataList = {} isBackBattle = false isPlayerAniEnd = true + BagManager.isBagPanel=false isOpenGeiSSRAvtivity = 0 local args = {...} local drop = args[1]