From b9c9b4d0cee3e27749e428538a3f11eb3f81e847 Mon Sep 17 00:00:00 2001
From: xiekaidong <kd_xie@juzugame.com>
Date: Fri, 7 Jul 2023 14:13:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=A8=A1=E5=BC=8F=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=AB=9E=E6=8A=80=E5=9C=BA=E7=A4=BC=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/ui/main_city/component/main_comp.lua | 2 +-
 lua/app/userdata/arena/arena_data.lua        | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lua/app/ui/main_city/component/main_comp.lua b/lua/app/ui/main_city/component/main_comp.lua
index ffa9ce55..9c167abc 100644
--- a/lua/app/ui/main_city/component/main_comp.lua
+++ b/lua/app/ui/main_city/component/main_comp.lua
@@ -84,7 +84,7 @@ function MainComp:refreshModule(selectModule)
 	end
 
 	if self.curModuleType == GConst.MainCityConst.MAIN_MODULE.ARENA then
-		if DataManager.ArenaData:needShowPopGift() then
+		if DataManager.ArenaData:needShowPopGift() and DataManager.ArenaData:getGiftId() then
 			ModuleManager.ArenaManager:showGiftPopUI()
 		end
 	end
diff --git a/lua/app/userdata/arena/arena_data.lua b/lua/app/userdata/arena/arena_data.lua
index 7000d820..f1cfbf1b 100644
--- a/lua/app/userdata/arena/arena_data.lua
+++ b/lua/app/userdata/arena/arena_data.lua
@@ -71,6 +71,9 @@ function ArenaData:cleaShowPopGift()
 end
 
 function ArenaData:getGiftId()
+    if GFunc.isShenhe() then -- 审核状态不显示
+        return
+    end
     if not self.curArenaGiftId or self.curArenaGiftId <= 0 then
         return
     end