Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

gaoxin 2020-09-11 10:44:26 +08:00
commit 1a3970c1dc
2 changed files with 12 additions and 8 deletions

View File

@ -134,7 +134,7 @@ function this.InitActivityServerData(msg, isUpdate)
this.CheckMoneyProgress(v) this.CheckMoneyProgress(v)
this.mission[v.activityId] = v this.mission[v.activityId] = v
-- LogGreen("刷新活动数据activityId" .. v.activityId .. " value" .. v.value) LogGreen("刷新活动数据activityId" .. v.activityId .. " value" .. v.value)
for n, m in ipairs(v.mission) do 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 if (v.activityId == ActivityTypeDef.OnlineGift) then
@ -486,13 +486,14 @@ end
-- 检测进度 -- 检测进度
function this.CheckMoneyProgress(v) function this.CheckMoneyProgress(v)
if v.activityId == ActivityTypeDef.FirstRecharge local type = ConfigManager.GetConfigData(ConfigName.GlobalActivity,v.activityId).Type
or v.activityId == ActivityTypeDef.LuckyCat if type == ActivityTypeDef.FirstRecharge
or v.activityId == ActivityTypeDef.DailyRecharge or type == ActivityTypeDef.LuckyCat
or type == ActivityTypeDef.DailyRecharge
-- or v.activityId == ActivityTypeDef.ContinuityRecharge -- or v.activityId == ActivityTypeDef.ContinuityRecharge
or v.activityId == ActivityTypeDef.AccumulativeRechargeExper or type == ActivityTypeDef.AccumulativeRechargeExper
or v.activityId == ActivityTypeDef.DynamicAct_recharge or type == ActivityTypeDef.DynamicAct_recharge
or v.activityId == ActivityTypeDef.FindFairyCeremony then or type == ActivityTypeDef.FindFairyCeremony then
for n, m in ipairs(v.mission) do for n, m in ipairs(v.mission) do
m.progress = m.progress / 1000 m.progress = m.progress / 1000

View File

@ -106,7 +106,10 @@ namespace ResMgr {
#if UNITY_EDITOR #if UNITY_EDITOR
private void Update() private void Update()
{ {
resLoader.Update(); if(resLoader != null)
{
resLoader.Update();
}
} }
#endif #endif
} }