From ceefbf5c42278ce984905eb233e7e50553799516 Mon Sep 17 00:00:00 2001
From: wangzhenxing <wangzhenxing@jmfy.com>
Date: Wed, 17 Aug 2022 17:25:45 +0800
Subject: [PATCH] =?UTF-8?q?[=E8=83=8C=E5=8C=85]=3D=3D=3D=3D=3D=E7=A2=8E?=
 =?UTF-8?q?=E7=89=87=E5=90=88=E6=88=90=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua         | 4 +++-
 .../ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua   | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

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]