From 4f115efb05ed4376d9f07bba0f8044633e725183 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 17 Jun 2021 17:18:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 1 + Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua | 3 +++ .../~Lua/Modules/NewActivity/CommonActPageManager.lua | 3 +++ 3 files changed, 7 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index bb8d5b4d32..41d97b0005 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1210,6 +1210,7 @@ ActivityTypeDef = { YiJingBaoKu = 8000,--易经宝库 MeiRiLiBao = 10004, + ChaoFanRuSheng = 72, --超凡入圣 } --活动结束需要处理面板关闭类型 ActivityTypePanel = { diff --git a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua index 495558205d..621a74763c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua @@ -926,6 +926,9 @@ function this.GetAllRewardData() end --------------------------------------------------------------红点----------------------------------------------- function this.CheckoutRedPointTreasure() + if not this.treasureDataReward then + return false + end for i = 1,#this.treasureDataReward do if this.treasureDataReward[i].state == 2 or this.treasureDataReward[i].state == 3 then return true diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index e590be7580..ace58ba03f 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -124,6 +124,9 @@ local TypeUpdateFunc = { local curData = dataList[ActivityTypeDef.DynamicAct] this.InitTaskData(curData,TaskTypeDef.DynamicActTask,ConfigName.ThemeActivityTaskConfig) end, + [ActivityTypeDef.ChaoFanRuSheng] = function ()--主题活动任务 + local curData = dataList[ActivityTypeDef.ChaoFanRuSheng] + end, } function this.InitTaskData(curData,taskType,configName)