From 0a610313a6a4acaee03a3af3da43fcecf5437671 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 29 Oct 2020 10:12:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A2=98=E6=B4=BB=E5=8A=A8=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E8=B5=84=E6=BA=90=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=EF=BC=8C=E7=B4=AF=E8=AE=A1=E9=87=8D=E7=BD=AE=E7=BA=A2=E7=82=B9?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...bu_01_png.png => r_guanka_sheji_bu_01.png} | Bin ...png.meta => r_guanka_sheji_bu_01.png.meta} | 0 ...bu_02_png.png => r_guanka_sheji_bu_02.png} | Bin ...png.meta => r_guanka_sheji_bu_02.png.meta} | 0 ...bu_03_png.png => r_guanka_sheji_bu_03.png} | Bin ...png.meta => r_guanka_sheji_bu_03.png.meta} | 0 .../DynamicActivityManager.lua | 55 +++++++++--------- .../Modules/Operating/OperatingManager.lua | 22 +++++-- 8 files changed, 45 insertions(+), 32 deletions(-) rename Assets/ManagedResources/Icons/{r_guanka_sheji_bu_01_png.png => r_guanka_sheji_bu_01.png} (100%) rename Assets/ManagedResources/Icons/{r_guanka_sheji_bu_01_png.png.meta => r_guanka_sheji_bu_01.png.meta} (100%) rename Assets/ManagedResources/Icons/{r_guanka_sheji_bu_02_png.png => r_guanka_sheji_bu_02.png} (100%) rename Assets/ManagedResources/Icons/{r_guanka_sheji_bu_02_png.png.meta => r_guanka_sheji_bu_02.png.meta} (100%) rename Assets/ManagedResources/Icons/{r_guanka_sheji_bu_03_png.png => r_guanka_sheji_bu_03.png} (100%) rename Assets/ManagedResources/Icons/{r_guanka_sheji_bu_03_png.png.meta => r_guanka_sheji_bu_03.png.meta} (100%) diff --git a/Assets/ManagedResources/Icons/r_guanka_sheji_bu_01_png.png b/Assets/ManagedResources/Icons/r_guanka_sheji_bu_01.png similarity index 100% rename from Assets/ManagedResources/Icons/r_guanka_sheji_bu_01_png.png rename to Assets/ManagedResources/Icons/r_guanka_sheji_bu_01.png diff --git a/Assets/ManagedResources/Icons/r_guanka_sheji_bu_01_png.png.meta b/Assets/ManagedResources/Icons/r_guanka_sheji_bu_01.png.meta similarity index 100% rename from Assets/ManagedResources/Icons/r_guanka_sheji_bu_01_png.png.meta rename to Assets/ManagedResources/Icons/r_guanka_sheji_bu_01.png.meta diff --git a/Assets/ManagedResources/Icons/r_guanka_sheji_bu_02_png.png b/Assets/ManagedResources/Icons/r_guanka_sheji_bu_02.png similarity index 100% rename from Assets/ManagedResources/Icons/r_guanka_sheji_bu_02_png.png rename to Assets/ManagedResources/Icons/r_guanka_sheji_bu_02.png diff --git a/Assets/ManagedResources/Icons/r_guanka_sheji_bu_02_png.png.meta b/Assets/ManagedResources/Icons/r_guanka_sheji_bu_02.png.meta similarity index 100% rename from Assets/ManagedResources/Icons/r_guanka_sheji_bu_02_png.png.meta rename to Assets/ManagedResources/Icons/r_guanka_sheji_bu_02.png.meta diff --git a/Assets/ManagedResources/Icons/r_guanka_sheji_bu_03_png.png b/Assets/ManagedResources/Icons/r_guanka_sheji_bu_03.png similarity index 100% rename from Assets/ManagedResources/Icons/r_guanka_sheji_bu_03_png.png rename to Assets/ManagedResources/Icons/r_guanka_sheji_bu_03.png diff --git a/Assets/ManagedResources/Icons/r_guanka_sheji_bu_03_png.png.meta b/Assets/ManagedResources/Icons/r_guanka_sheji_bu_03.png.meta similarity index 100% rename from Assets/ManagedResources/Icons/r_guanka_sheji_bu_03_png.png.meta rename to Assets/ManagedResources/Icons/r_guanka_sheji_bu_03.png.meta diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 7a364aa363..0eb58cc47f 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -23,34 +23,35 @@ end function this.SheJiCheckRedPoint() local ActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.Celebration)--活动数据 local canGetRewardList={} - local curScore = ActInfo.mission[1].progress - local actReward = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",ActInfo.activityId) - local setting = ConfigManager.GetConfigDataByKey(ConfigName.GodSacrificeSetting,"ActivityId",ActInfo.activityId) - --检测宝箱是否有可领取 - for i = 1, #ActInfo.mission do - local curLevel = curScore/actReward[1].Values[2][1] - if ActInfo.mission[i].state == 0 and curLevel >= i then - table.insert(canGetRewardList,ActInfo.mission[i]) + if ActInfo then + local curScore = ActInfo.mission[1].progress + local actReward = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",ActInfo.activityId) + local setting = ConfigManager.GetConfigDataByKey(ConfigName.GodSacrificeSetting,"ActivityId",ActInfo.activityId) + --检测宝箱是否有可领取 + for i = 1, #ActInfo.mission do + local curLevel = curScore/actReward[1].Values[2][1] + if ActInfo.mission[i].state == 0 and curLevel >= i then + table.insert(canGetRewardList,ActInfo.mission[i]) + end + end + + local canGet = false + --检测中央大锅是否可领取 + if GetTimeStamp() > ActInfo.value and GetTimeStamp() < (ActInfo.value + setting.LastTime * 60) then + --领过--进入倒计时 + canGet = false + elseif GetTimeStamp() > ActInfo.value and GetTimeStamp() > (ActInfo.value + setting.LastTime * 60) then + --没到时间--进入倒计时 + canGet = false + else + --可领取 + canGet = true + end + if #canGetRewardList > 0 or canGet then + return true + else + return false end - end - - local canGet = false - --检测中央大锅是否可领取 - if GetTimeStamp() > ActInfo.value and GetTimeStamp() < (ActInfo.value + setting.LastTime * 60) then - --领过--进入倒计时 - canGet = false - elseif GetTimeStamp() > ActInfo.value and GetTimeStamp() > (ActInfo.value + setting.LastTime * 60) then - --没到时间--进入倒计时 - canGet = false - else - --可领取 - canGet = true - end - - if #canGetRewardList > 0 or canGet then - return true - else - return false end end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index b03abcf27f..00b0031c7d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -815,17 +815,29 @@ end function this.InitLeiJiChongZhiData(_type) local id = 0 local type = _type - if type == ActivityTypeDef.AccumulativeRechargeExper then - id = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.AccumulativeRechargeExper) + if type then + id = ActivityGiftManager.IsActivityTypeOpen(type) if (not id) or id == 0 then return nil end - elseif type == ActivityTypeDef.DynamicAct_recharge then - id = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.DynamicAct_recharge) + else + id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.AccumulativeRechargeExper) if (not id) or id == 0 then - return nil + id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct_recharge) + if (not id) or id == 0 then + return nil + else + type = ActivityTypeDef.DynamicAct_recharge + end + else + type = ActivityTypeDef.AccumulativeRechargeExper + local tempConfig = ConfigManager.GetConfigData(ConfigName.GlobalActivity,id) + if tempConfig and tempConfig.ShowArt == 1 then + return nil + end end end + LogGreen("id:"..id) this.LeiJiChongZhiData = {} local allListData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig, "ActivityId", id) local allMissionData = ActivityGiftManager.GetActivityTypeInfo(type)