From 3d7baa815e2d5d725aaf518092f85ff46d5beed3 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 14 Jul 2021 20:00:44 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B1=B1=E6=B2=B3=E8=AF=95=E7=82=BC?= =?UTF-8?q?=E3=80=91=E7=BA=A2=E7=82=B9=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/ActivityGift/ActivityGiftManager.lua | 8 ++++---- .../~Lua/Modules/FightLevel/FightLevelManager.lua | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 456fe772ba..3297840125 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -141,9 +141,9 @@ function this.InitActivityServerData(msg, isUpdate) this.CheckMoneyProgress(v) this.mission[v.activityId] = v - LogYellow("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value) + -- LogYellow("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value) for n, m in ipairs(v.mission) do - LogGreen(" 刷新活动数据missionId:" .. m.missionId .. " state:" .. m.state .. " progress:" .. m.progress) + -- LogGreen(" 刷新活动数据missionId:" .. m.missionId .. " state:" .. m.state .. " progress:" .. m.progress) if (v.activityId == ActivityTypeDef.OnlineGift) then this.onlineOpen = true this.onlineGetRewardState[m.missionId] = m.state @@ -524,7 +524,7 @@ end function this.RefreshActivityProgressData(msg) -- 检测 this.CheckMoneyProgress(msg.activityInfo) - LogYellow("刷新活动数据activityId:" .. msg.activityInfo.activityId .. "value:" .. msg.activityInfo.value) + -- LogYellow("刷新活动数据activityId:" .. msg.activityInfo.activityId .. "value:" .. msg.activityInfo.value) if this.mission[msg.activityInfo.activityId] then this.mission[msg.activityInfo.activityId].value = msg.activityInfo.value @@ -533,7 +533,7 @@ function this.RefreshActivityProgressData(msg) if missionInfo.missionId == msg.activityInfo.mission[i].missionId then missionInfo.state = msg.activityInfo.mission[i].state missionInfo.progress = msg.activityInfo.mission[i].progress - LogYellow(msg.activityInfo.activityId.." 刷新活动数据missionId:" .. missionInfo.missionId .. "state:" .. missionInfo.state .. "progress:" .. missionInfo.progress) + -- LogYellow(msg.activityInfo.activityId.." 刷新活动数据missionId:" .. missionInfo.missionId .. "state:" .. missionInfo.state .. "progress:" .. missionInfo.progress) end end end diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua index 2de7ab6951..0ce09b7ba3 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua @@ -335,6 +335,9 @@ function this.GetNextMissionStar() end function this.CheckTrialRedPoint() + if not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.ShanHeShiLian) then + return false + end local data = CommonActPageManager.GetData(ActivityTypeDef.ShanHeShiLian) for i = 1, #data.rewards do if data.rewards[i].state == 0 and data.rewards[i].otherData.Values[1][1] <= FightLevelManager.GetAllChapterStars() then