Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
1a3970c1dc
|
|
@ -134,7 +134,7 @@ function this.InitActivityServerData(msg, isUpdate)
|
|||
|
||||
this.CheckMoneyProgress(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
|
||||
--LogGreen(" 刷新活动数据missionId:" .. m.missionId .. " state:" .. m.state .. " progress:" .. m.progress)
|
||||
if (v.activityId == ActivityTypeDef.OnlineGift) then
|
||||
|
|
@ -486,13 +486,14 @@ end
|
|||
|
||||
-- 检测进度
|
||||
function this.CheckMoneyProgress(v)
|
||||
if v.activityId == ActivityTypeDef.FirstRecharge
|
||||
or v.activityId == ActivityTypeDef.LuckyCat
|
||||
or v.activityId == ActivityTypeDef.DailyRecharge
|
||||
local type = ConfigManager.GetConfigData(ConfigName.GlobalActivity,v.activityId).Type
|
||||
if type == ActivityTypeDef.FirstRecharge
|
||||
or type == ActivityTypeDef.LuckyCat
|
||||
or type == ActivityTypeDef.DailyRecharge
|
||||
-- or v.activityId == ActivityTypeDef.ContinuityRecharge
|
||||
or v.activityId == ActivityTypeDef.AccumulativeRechargeExper
|
||||
or v.activityId == ActivityTypeDef.DynamicAct_recharge
|
||||
or v.activityId == ActivityTypeDef.FindFairyCeremony then
|
||||
or type == ActivityTypeDef.AccumulativeRechargeExper
|
||||
or type == ActivityTypeDef.DynamicAct_recharge
|
||||
or type == ActivityTypeDef.FindFairyCeremony then
|
||||
|
||||
for n, m in ipairs(v.mission) do
|
||||
m.progress = m.progress / 1000
|
||||
|
|
|
|||
|
|
@ -106,7 +106,10 @@ namespace ResMgr {
|
|||
#if UNITY_EDITOR
|
||||
private void Update()
|
||||
{
|
||||
resLoader.Update();
|
||||
if(resLoader != null)
|
||||
{
|
||||
resLoader.Update();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue