From 89d70855a4289fbc123adc8b03dd8bf0684f0ee2 Mon Sep 17 00:00:00 2001
From: zhangqiang <657634622@qq.com>
Date: Sat, 10 Oct 2020 19:37:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E6=B4=BB=E5=8A=A8=20=20?=
 =?UTF-8?q?=E6=A3=AE=E7=BD=97=E5=B9=BB=E5=A2=83=E8=BE=BE=E4=BA=BA=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E4=BF=AE=E6=94=B9=20=E5=80=92=E8=AE=A1=E6=97=B6?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=20=E5=8D=87=E7=BA=A7=E5=A5=BD=E7=A4=BC?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9=203?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/ManagedResources/~Lua/Modules/Expert/Expert_UpLv.lua | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/Expert_UpLv.lua b/Assets/ManagedResources/~Lua/Modules/Expert/Expert_UpLv.lua
index 0c58710d6e..e76377f0f2 100644
--- a/Assets/ManagedResources/~Lua/Modules/Expert/Expert_UpLv.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Expert/Expert_UpLv.lua
@@ -59,7 +59,11 @@ function Expert_UpLv:OnSortingOrderChange(cursortingOrder)
 end
 
 function Expert_UpLv:OnShowData()
-    local globalActive = ConfigManager.GetConfigData(ConfigName.GlobalActivity,ActivityGiftManager.GetOpenExpertIdByActivityType(ActivityTypeDef.UpLvAct))
+    local activityId = ActivityGiftManager.GetOpenExpertIdByActivityType(ActivityTypeDef.UpLvAct)
+    if activityId <= 0 then
+        return
+    end
+    local globalActive = ConfigManager.GetConfigData(ConfigName.GlobalActivity,activityId)
     activeData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.UpLvAct)
     PatFaceManager.RemainTimeDown(this.timeTextExpertgo,this.timeTextExpert,activeData.endTime - GetTimeStamp())
     table.sort(activeData.mission, function(a,b)