From f56be71560e3322dacfe899627ef2b41603bf9d5 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 8 Sep 2020 17:16:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A2=98=E6=B4=BB=E5=8A=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Common/GlobalDefine.lua | 29 ++++++------ .../ActivityGift/ActivityGiftManager.lua | 4 +- .../DynamicActivity/DynamicActivityPanel.lua | 43 ++++++++++++------ ...henZhuXianPage.lua => DynamicTaskPage.lua} | 44 +++++++++---------- ...Page.lua.meta => DynamicTaskPage.lua.meta} | 2 +- .../DynamicActivity/LeiJiChongZhiPage.lua | 4 +- .../DynamicActivity/XianShiShangShi.lua | 2 +- .../DynamicActivity/ZhenQiYiBaoPage.lua | 2 +- .../~Lua/Modules/Main/MainPanel.lua | 6 +-- .../Modules/Operating/OperatingManager.lua | 18 ++++---- .../~Lua/Modules/Player/RedpotManager.lua | 8 ++-- .../~Lua/Modules/Task/TaskManager.lua | 2 +- 12 files changed, 86 insertions(+), 78 deletions(-) rename Assets/ManagedResources/~Lua/Modules/DynamicActivity/{PoZhenZhuXianPage.lua => DynamicTaskPage.lua} (87%) rename Assets/ManagedResources/~Lua/Modules/DynamicActivity/{PoZhenZhuXianPage.lua.meta => DynamicTaskPage.lua.meta} (74%) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index a144fd3482..cedac64bd5 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -614,9 +614,9 @@ RedPointType = { MonthCard = 2014, --月卡 GrowthPackage = 2015,--成长礼包!礼包!!礼包!!(重要的说三遍 和礼金区分) QianKunBox = 2016,--乾坤包囊 - PoZhenZhuXian = 2017,--破阵诛仙 - PoZhenZhuXianTask = 20171,--破阵诛仙任务 - PoZhenZhuXianRecharge = 20172,--破阵诛仙累充 + DynamicAct = 2017,--破阵诛仙 + DynamicActTask = 20171,--破阵诛仙任务 + DynamicActRecharge = 20172,--破阵诛仙累充 ---聊天相关----- Chat = 207, @@ -1019,8 +1019,6 @@ ActivityTypeDef = { Talisman=37,--法宝达人 SoulPrint=38,--魂印达人 SupremeHero = 42, -- 什么乱七八糟的奖励 - FindFairy=43,--东海寻仙 - QianKunBox = 44,--乾坤宝囊 FindTreasureExper=46,--寻宝达人 LuckyTurnExper=47,--探宝达人 RecruitExper=48,--征募达人 @@ -1033,10 +1031,15 @@ ActivityTypeDef = { OpenSeverWelfare=55,--开服福利 EightDayGift = 56,--八日登陆 SignInfo = 57,--三日七日签到 - pozhenzhuxian_task = 20000,--破阵诛仙任务 - pozhenzhuxian_recharge = 58,--破阵诛仙累充 - pozhenzhuxian_TimeLimitShop = 20001,--破阵诛仙限时商市 - pozhenzhuxian_Treasure = 20002,--破阵诛仙珍奇宝阁 + + --主题活动 + FindFairy=43,--限时招募 + QianKunBox = 44,--乾坤宝囊 + DynamicAct_recharge = 58,--主题活动累充 + DynamicAct = 20000,--主题活动任务 + DynamicAct_TimeLimitShop = 20001,--主题活动限时商市 + DynamicAct_Treasure = 20002,--主题活动珍奇宝阁 + } --活动结束需要处理面板关闭类型 ActivityTypePanel = { @@ -1058,7 +1061,7 @@ TaskTypeDef = { BloodyTask = 7, -- 血战任务 FindTreasure = 8, -- 迷宫寻宝任务 Achievement = 9, -- 所有成就任务 - PoZhenZhuXianTask = 10, -- 所有成就任务 + DynamicActTask = 10, --主题活动任务 } --商品类型 @@ -1573,12 +1576,6 @@ ExperType = { GiftBuy=25,--限时抢购 } -DynamicType = {--轮转活动类型 - TimeLimiteCall = 43, - QianKunBox = 44, - -- PoZhenZhuXian = 57,--待定 -} - -- 枚举 CHAT_CHANNEL = { SYSTEM = 0, -- 系统 diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 4cc88bdb4a..5b61189cd1 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -489,7 +489,7 @@ function this.CheckMoneyProgress(v) or v.activityId == ActivityTypeDef.DailyRecharge -- or v.activityId == ActivityTypeDef.ContinuityRecharge or v.activityId == ActivityTypeDef.AccumulativeRechargeExper - or v.activityId == ActivityTypeDef.pozhenzhuxian_recharge + or v.activityId == ActivityTypeDef.DynamicAct_recharge or v.activityId == ActivityTypeDef.FindFairyCeremony then for n, m in ipairs(v.mission) do @@ -552,7 +552,7 @@ function this.RefreshActivityRedPoint() CheckRedPointStatus(RedPointType.FindFairy_OneView) CheckRedPointStatus(RedPointType.FindFairy_ThreeView) CheckRedPointStatus(RedPointType.FindFairy_FourView) - CheckRedPointStatus(RedPointType.pozhenzhuxianTask) + CheckRedPointStatus(RedPointType.DynamicActTask) CheckRedPointStatus(RedPointType.QinglongSerectTreasure) end diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index 0d57914816..473fa5cb12 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -3,30 +3,39 @@ local DynamicActivityPanel = Inherit(BasePanel) local this = DynamicActivityPanel -- Tab管理器 local TabBox = require("Modules/Common/TabBox") +local GlobalActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity) this._CurPageIndex =1 local orginLayer local _PageInfo = {--后期可以做成tableInsert,icon名字都去读表 [1] = { --破阵诛仙 default = "p_pozhengzhuxian_anniu_02", lock = "p_pozhengzhuxian_anniu_02", select = "p_pozhengzhuxian_anniu_01", - rpType = RedPointType.PoZhenZhuXianTask,panelType = PanelType.Main, + rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct,Sort = 1 }, - [2] = { --限时召唤 + [2] = { --勇冠三军 + default = "p_pozhengzhuxian_anniu_02", lock = "p_pozhengzhuxian_anniu_02", select = "p_pozhengzhuxian_anniu_01", + rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct,Sort = 2 + }, + [3] = { --叱咤风云 + default = "p_pozhengzhuxian_anniu_02", lock = "p_pozhengzhuxian_anniu_02", select = "p_pozhengzhuxian_anniu_01", + rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct,Sort = 3 + }, + [4] = { --限时召唤 default = "x_xianshizaohuan_02", lock = "x_xianshizaohuan_02", select = "x_xianshizaohuan_01", rpType = RedPointType.TimeLimited,panelType = PanelType.TimelimitCall, }, - [3] = { --乾坤宝盒 + [5] = { --乾坤宝盒 default = "q_qiankun_baoheanniu_02", lock = "q_qiankun_baoheanniu_02", select = "q_qiankun_baoheanniu_01", rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox, }, - [4] = { --珍奇礼包 + [6] = { --珍奇礼包 default = "z_zhenqibaoge_anniu_02", lock = "z_zhenqibaoge_anniu_02", select = "z_zhenqibaoge_anniu_01", rpType = "",panelType = PanelType.Main, }, - [5] = { --累计充值 + [7] = { --累计充值 default = "r_huodong_leijichengzhianniu_01", lock = "r_huodong_leijichengzhianniu_01", select = "r_huodong_leijichengzhianniu", - rpType = RedPointType.PoZhenZhuXianRecharge,panelType = PanelType.Main, + rpType = RedPointType.DynamicActRecharge,panelType = PanelType.Main, }, - [6] = { --限时商市 + [8] = { --限时商市 default = "x_xianshishangshi_anniu_02", lock = "x_xianshishangshi_anniu_02", select = "x_xianshishangshi_anniu_01", rpType = "",panelType = PanelType.Main, }, @@ -34,7 +43,7 @@ local _PageInfo = {--后期可以做成tableInsert,icon名字都去读表 local TimeLimitedCall = require("Modules/DynamicActivity/TimeLimitedCall") local QianKunBox = require("Modules/DynamicActivity/QianKunBox") -local PoZhenZhuXianPage=require("Modules/DynamicActivity/PoZhenZhuXianPage") +local DynamicActPage=require("Modules/DynamicActivity/DynamicTaskPage") local ZhenQiYiBaoPage=require("Modules/DynamicActivity/ZhenQiYiBaoPage") local LeiJiChongZhiPage=require("Modules/DynamicActivity/LeiJiChongZhiPage") local XianShiShangShi=require("Modules/DynamicActivity/XianShiShangShi") @@ -47,12 +56,14 @@ function DynamicActivityPanel:InitComponent() this.content = Util.GetGameObject(self.gameObject, "bg/pageContent") this.PageList = { - [1] = PoZhenZhuXianPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_3")), - [2] = TimeLimitedCall.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_1")), - [3] = QianKunBox.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2")), - [4] = ZhenQiYiBaoPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_4")), - [5] = LeiJiChongZhiPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_5")), - [6] = XianShiShangShi.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_6")), + [1] = DynamicActPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_3")), + [2] = DynamicActPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_3")), + [3] = DynamicActPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_3")), + [4] = TimeLimitedCall.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_1")), + [5] = QianKunBox.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2")), + [6] = ZhenQiYiBaoPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_4")), + [7] = LeiJiChongZhiPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_5")), + [8] = XianShiShangShi.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_6")), } -- 上部货币显示 @@ -114,6 +125,10 @@ function this.PageTabAdapter(tab, index, status) this.ClearPageRedpot(index) this.BindPageRedpot(index, redpot) end + if _PageInfo[index].ActType then + local id = ActivityGiftManager.IsActivityTypeOpen(_PageInfo[index].ActType) + tab:SetActive(GlobalActConfig[id].ShowArt == index) + end end -- tab可用性检测 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua similarity index 87% rename from Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua rename to Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua index 14599e08a6..bca30b96c0 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua @@ -1,18 +1,18 @@ -local PoZhenZhuXianPage = quick_class("PoZhenZhuXianPage") +local DynamicTaskPage = quick_class("DynamicTaskPage") local allData={} local itemsGrid = {}--item重复利用 local singleTaskPre = {} -local this=PoZhenZhuXianPage +local this=DynamicTaskPage local parent local endtime = 0 -function PoZhenZhuXianPage:ctor(mainPanel, gameObject) +function DynamicTaskPage:ctor(mainPanel, gameObject) self.mainPanel = mainPanel self.gameObject = gameObject self:InitComponent(gameObject) self:BindEvent() end -function PoZhenZhuXianPage:InitComponent(gameObject) +function DynamicTaskPage:InitComponent(gameObject) itemsGrid = {}--item重复利用 singleTaskPre = {} this.time = Util.GetGameObject(gameObject, "content/tiao/time"):GetComponent("Text") @@ -27,36 +27,36 @@ function PoZhenZhuXianPage:InitComponent(gameObject) end --绑定事件(用于子类重写) -function PoZhenZhuXianPage:BindEvent() +function DynamicTaskPage:BindEvent() end --添加事件监听(用于子类重写) -function PoZhenZhuXianPage:AddListener() +function DynamicTaskPage:AddListener() end --移除事件监听(用于子类重写) -function PoZhenZhuXianPage:RemoveListener() +function DynamicTaskPage:RemoveListener() end local sortingOrder = 0 --界面打开时调用(用于子类重写) -function PoZhenZhuXianPage:OnOpen() +function DynamicTaskPage:OnOpen() end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) -function PoZhenZhuXianPage:OnShow(_sortingOrder,_parent) +function DynamicTaskPage:OnShow(_sortingOrder,_parent) sortingOrder = _sortingOrder parent = _parent this.Refresh() end function this.Refresh() - allData = OperatingManager:InitPoZhenZhuXianData() + allData = OperatingManager:InitDynamicActData() this:OnShowData() this:SetTime() end -function PoZhenZhuXianPage:SetTime() +function DynamicTaskPage:SetTime() if self.timer then self.timer:Stop() self.timer = nil @@ -98,9 +98,9 @@ function PoZhenZhuXianPage:SetTime() self.timer:Start() end -function PoZhenZhuXianPage:OnShowData() +function DynamicTaskPage:OnShowData() if allData then - endtime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.pozhenzhuxian_task) + endtime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.DynamicAct) this.SortData(allData) this.ScrollView:SetData(allData, function (index, go) this.SingleDataShow(go, allData[index]) @@ -122,7 +122,7 @@ local typeIndex = { [1] = 0, [2] = 2, } -function PoZhenZhuXianPage:SortData() +function DynamicTaskPage:SortData() if allData==nil then return end @@ -184,10 +184,10 @@ function this.SingleDataShow(pre,value) Util.AddOnceClick(Util.GetGameObject(lingquButton.gameObject, "Button"), function() if state == 1 then - NetManager.TakeMissionRewardRequest(TaskTypeDef.PoZhenZhuXianTask,sConFigData.id, function(respond) + NetManager.TakeMissionRewardRequest(TaskTypeDef.DynamicActTask,sConFigData.id, function(respond) UIManager.OpenPanel(UIName.RewardItemPopup, respond.drop, 1,function () this.Refresh() - CheckRedPointStatus(RedPointType.PoZhenZhuXianTask) + CheckRedPointStatus(RedPointType.DynamicActTask) end) end) elseif state == 0 then @@ -199,7 +199,7 @@ function this.SingleDataShow(pre,value) end --界面打开时调用(用于子类重写) -function PoZhenZhuXianPage:OnOpen() +function DynamicTaskPage:OnOpen() end @@ -209,12 +209,12 @@ function this.RechargeSuccessFunc(id) this.Refresh() end -function PoZhenZhuXianPage:OnClose() +function DynamicTaskPage:OnClose() end --界面销毁时调用(用于子类重写) -function PoZhenZhuXianPage:OnDestroy() +function DynamicTaskPage:OnDestroy() if self.timer then self.timer:Stop() self.timer = nil @@ -224,14 +224,14 @@ function PoZhenZhuXianPage:OnDestroy() itemsGrid = {} end -function PoZhenZhuXianPage:OnHide() +function DynamicTaskPage:OnHide() if self.timer then self.timer:Stop() self.timer = nil end end --- 将一段时间转换为天时分秒 -function PoZhenZhuXianPage:TimeToDHMS(second) +function DynamicTaskPage:TimeToDHMS(second) local day = math.floor(second / (24 * 3600)) local minute = math.floor(second / 60) % 60 local sec = second % 60 @@ -243,4 +243,4 @@ function PoZhenZhuXianPage:TimeToDHMS(second) end end -return PoZhenZhuXianPage \ No newline at end of file +return DynamicTaskPage \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua.meta b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua.meta similarity index 74% rename from Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua.meta rename to Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua.meta index fc573fcd6a..1ba072f3be 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua.meta +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f7558d53f2271bf4093977fc259fdeff +guid: f9ec68d01af2c6449a01c538256f1671 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua index e12eb71e5e..2906496875 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua @@ -76,7 +76,7 @@ end function LeiJiChongZhiPage:OnShowData() allData =OperatingManager.InitLeiJiChongZhiData() if allData then - endtime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.pozhenzhuxian_recharge) + endtime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.DynamicAct_recharge) this.SortData(allData) this.ScrollView:SetData(allData, function (index, go) this.SingleDataShow(go, allData[index]) @@ -156,7 +156,7 @@ function this.SingleDataShow(pre,value) Util.AddOnceClick(lingquButton, function() if state == 2 then - local curActivityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.pozhenzhuxian_recharge) + local curActivityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.DynamicAct_recharge) NetManager.GetActivityRewardRequest(sConFigData.id, curActivityId,function(drop) UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1) this.Refresh() diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua index fed89d9e1d..ff03a97b94 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua @@ -65,7 +65,7 @@ function XianShiShangShi:SetTime() self.timer:Stop() self.timer = nil end - local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.pozhenzhuxian_TimeLimitShop) + local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.DynamicAct_TimeLimitShop) local timeDown = endTime - GetTimeStamp() this.time.text = Language[12321]..TimeToDHMS(timeDown) self.timer = Timer.New(function() diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua index 9aadf68279..b4fb01e9e2 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua @@ -64,7 +64,7 @@ function ZhenQiYiBaoPage:SetTime() self.timer:Stop() self.timer = nil end - local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.pozhenzhuxian_Treasure) + local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.DynamicAct_Treasure) local timeDown = endTime - GetTimeStamp() this.time.text = Language[12321]..TimeToDHMS(timeDown) self.timer = Timer.New(function() diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 629933bd32..cc24f37498 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -808,11 +808,7 @@ function this:BindEvent() end) --破阵诛仙、限时召唤、乾坤宝盒 Util.AddClick(this.btnDynamicActivity, function () - if ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.FindFairy) then - UIManager.OpenPanel(UIName.DynamicActivityPanel) - else - this.btnDynamicActivity.gameObject:SetActive(false) - end + UIManager.OpenPanel(UIName.DynamicActivityPanel) end) --神将合成、神将置换 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index cf3fed272f..59b93939c8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -749,17 +749,17 @@ end this.TimeLimitedTimes = 0 this.allData = {} -function this.InitPoZhenZhuXianData() - local id = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.pozhenzhuxian_task) +function this.InitDynamicActData() + local id = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.DynamicAct) if (not id) or id == 0 then return nil end - if not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.pozhenzhuxian_task) then + if not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct) then return nil end this.allData = {} local allListData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ThemeActivityTaskConfig, "ActivityId", id) - local allMissionData = TaskManager.GetTypeTaskList(TaskTypeDef.PoZhenZhuXianTask) + local allMissionData = TaskManager.GetTypeTaskList(TaskTypeDef.DynamicActTask) for i=1,#allListData do for j=1,#allMissionData do if allListData[i].Id == allMissionData[j].missionId then @@ -780,8 +780,8 @@ function this.InitPoZhenZhuXianData() end return this.allData end -function this.CheckPoZhenZhuXianTaskRed() - this.InitPoZhenZhuXianData() +function this.CheckDynamicActTaskRed() + this.InitDynamicActData() if not this.allData then return false end @@ -793,16 +793,16 @@ function this.CheckPoZhenZhuXianTaskRed() return false end function this.InitLeiJiChongZhiData() - local id = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.pozhenzhuxian_recharge) + local id = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.DynamicAct_recharge) if (not id) or id == 0 then return nil end - if not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.pozhenzhuxian_recharge) then + if not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct_recharge) then return nil end this.LeiJiChongZhiData = {} local allListData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig, "ActivityId", id) - local allMissionData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.pozhenzhuxian_recharge) + local allMissionData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.DynamicAct_recharge) for i=1,#allListData do for j=1,#allMissionData.mission do if allListData[i].Id == allMissionData.mission[j].missionId then diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 31c7beecaa..4f2f1fbf68 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -189,8 +189,8 @@ function this.InitRedPointAllRelate() --(24暂时关闭)放开这里就行 RPData:SetParent(RedPointType.TimeLimited, RedPointType.DynamicActivity) RPData:SetParent(RedPointType.QianKunBox, RedPointType.DynamicActivity) - RPData:SetParent(RedPointType.PoZhenZhuXianTask, RedPointType.DynamicActivity) - RPData:SetParent(RedPointType.PoZhenZhuXianRecharge, RedPointType.DynamicActivity) + RPData:SetParent(RedPointType.DynamicActTask, RedPointType.DynamicActivity) + RPData:SetParent(RedPointType.DynamicActRecharge, RedPointType.DynamicActivity) -- 好友红点 RPData:SetParent(RedPointType.Friend_GetAllReward, RedPointType.Friend_Reward) @@ -399,8 +399,8 @@ function this.RegisterRedCheckFunc() --限时招募 RPData:AddCheckFunc(RedPointType.TimeLimited,OperatingManager.GetTimeLimitRedPointStatus) RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetQiankunBoxRedPointStatus) - RPData:AddCheckFunc(RedPointType.PoZhenZhuXianTask, OperatingManager.CheckPoZhenZhuXianTaskRed) - RPData:AddCheckFunc(RedPointType.PoZhenZhuXianRecharge, OperatingManager.CheckLeiJiChongZhiRedData) + RPData:AddCheckFunc(RedPointType.DynamicActTask, OperatingManager.CheckDynamicActTaskRed) + RPData:AddCheckFunc(RedPointType.DynamicActRecharge, OperatingManager.CheckLeiJiChongZhiRedData) RPData:AddCheckFunc(RedPointType.OrdinaryExplore, CarbonManager.CarbonRedCheck) RPData:AddCheckFunc(RedPointType.HeroExplore, CarbonManager.CarbonRedCheck) diff --git a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua index dfc75ce024..afa556a745 100644 --- a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua @@ -242,7 +242,7 @@ function this.ChangeVipRedPointState() CheckRedPointStatus(RedPointType.SevenDayCarnival) CheckRedPointStatus(RedPointType.Achievement_Main) CheckRedPointStatus(RedPointType.QinglongSerectTreasureTrail) - CheckRedPointStatus(RedPointType.pozhenzhuxianTask) + CheckRedPointStatus(RedPointType.DynamicActTask) --CheckRedPointStatus(RedPointType.Achievement_One) --CheckRedPointStatus(RedPointType.Achievement_Two) --CheckRedPointStatus(RedPointType.Achievement_Three)