Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2021-10-22 18:16:05 +08:00
commit 929de39da9
1 changed files with 8 additions and 8 deletions

View File

@ -40,7 +40,6 @@ function this.Initialize()
-- 每次登录显示兑换红点
this.SetExchangeRedStatus(true)
this.InitJourneyWithWindConFigData()
Game.GlobalEvent:AddEvent(GameEvent.Player.OnLevelChange, function()
CheckRedPointStatus(RedPointType.Expert_UpLv)
end)
@ -177,11 +176,11 @@ function this.InitActivityServerData(msg, isUpdate)
LuckyCatManager.GetRewardProgress(v.mission, v.activityId, v.value)
end
end
-- if (v.activityId == ActivityTypeDef.SupremeHero) then
-- for n, m in ipairs(v.mission) do
-- LogGreen("v.activityId:"..v.activityId.." m.missionId:"..m.missionId.." m.state:"..m.state)
-- end
-- end
if (v.activityId == ActivityTypeDef.SupremeHero) then
for n, m in ipairs(v.mission) do
LogGreen("v.activityId:"..v.activityId.." m.missionId:"..m.missionId.." m.state:"..m.state)
end
end
this.CheckActiveIsOpen(v)
else
LogError("服务器发送了前端不存在的活动ID"..v.activityId)
@ -190,6 +189,7 @@ function this.InitActivityServerData(msg, isUpdate)
TreasureOfSomebodyManagerV2.SetTreasureLocalData()
this.OnlineStartCountDown()
FindFairyManager.SetActivityData()
this.InitJourneyWithWindConFigData()
end
--倒计时逻辑处理
@ -1219,12 +1219,12 @@ end
--缥缈之旅开始
--初始化数据
function this.InitJourneyWithWindConFigData()
local acitvityConFig = ConfigManager.TryGetConfigDataByKey(ConfigName.GlobalActivity, "Type", ActivityTypeDef.JourneyWithWind)
local acitvityConFig = this.GetActivityIdByType(ActivityTypeDef.JourneyWithWind)
if not acitvityConFig then return false end
JourneyWithWindAllDayConFigData = {}
JourneyWithWindDayAmount = {}
for key, configInfo in ConfigPairs(ConfigManager.GetConfig(ConfigName.ActivityRewardConfig)) do
if configInfo.ActivityId == acitvityConFig.Id then
if configInfo.ActivityId == acitvityConFig then
table.insert(JourneyWithWindAllDayConFigData,configInfo)
end
end