From dc7fe39497ec3c838b014b7c52ce1b8ad002a886 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 11 Sep 2020 10:21:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/ActivityGift/ActivityGiftManager.lua | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index c3ab19b9a9..7db60c0ca6 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -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 From f8527290abfda417967f9872b55dc028405c9eb3 Mon Sep 17 00:00:00 2001 From: wangxiaolong Date: Fri, 11 Sep 2020 10:23:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A4=E7=A9=BA?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Core/ResMgr/ResourcesMgr/Manager/ResourcesManager.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Assets/Scripts/Core/ResMgr/ResourcesMgr/Manager/ResourcesManager.cs b/Assets/Scripts/Core/ResMgr/ResourcesMgr/Manager/ResourcesManager.cs index 49570f19be..2f7a37bfd9 100644 --- a/Assets/Scripts/Core/ResMgr/ResourcesMgr/Manager/ResourcesManager.cs +++ b/Assets/Scripts/Core/ResMgr/ResourcesMgr/Manager/ResourcesManager.cs @@ -106,7 +106,10 @@ namespace ResMgr { #if UNITY_EDITOR private void Update() { - resLoader.Update(); + if(resLoader != null) + { + resLoader.Update(); + } } #endif }