From c78cebde623c2895a9ea7a4cd6062026bfa375e5 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 29 Jul 2020 18:16:11 +0800 Subject: [PATCH 1/2] hongdianjiance tijao --- .../~Lua/Modules/Carbon/CarbonManager.lua | 23 ++++++++++--------- .../~Lua/Modules/Carbon/DailyCarbonPanel.lua | 4 +--- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua index 4c51367f7a..dbf1698da7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua @@ -828,17 +828,17 @@ function this.CarbonRedCheck(redType) -- else -- return false -- end - -- --车迟斗法 - -- elseif redType == RedPointType.LegendExplore then - -- if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.CARDELAY) and PlayerManager.familyId ~= 0 - -- and (GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Challenge) - -- or GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Loot)) then - -- LogGreen("1111111111") - -- return true - -- else - -- LogGreen("22222222222") - -- return false - -- end + --车迟斗法 + elseif redType == RedPointType.LegendExplore then + if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.CARDELAY) and PlayerManager.familyId ~= 0 + and (GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Challenge) + or GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Loot)) then + LogGreen("1111111111") + return true + else + LogGreen("22222222222") + return false + end end end @@ -865,6 +865,7 @@ function this.GetCarBonState(index) this.dailyCarbons[index] = {} this.dailyCarbons[index].id = index + 66 end + LogPink(index) local curData=ConfigManager.GetAllConfigsDataByKey(ConfigName.DailyChallengeConfig,"Type",index) --local buyTimeId= curData[1].PrivilegeId[1] local freeTimeId=curData[1].PrivilegeId[2] diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua index 5465ce5512..fc49f858d9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua @@ -128,6 +128,7 @@ function DailyCarbonPanel:RefreshRedPotShow() for i = 1,tabs.childCount do Util.GetGameObject(tabs:GetChild(i-1),"Redpot").gameObject:SetActive(CarbonManager.GetDailyCarbons(i).state) end + CheckRedPointStatus(RedPointType.HeroExplore) end function DailyCarbonPanel:OnClose() @@ -284,9 +285,6 @@ function this.SetData(root, data, ldata) end NetManager.DailyChallengeRequest(data.Id,type,function(msg) local fightData = BattleManager.GetBattleServerData(msg) - CheckRedPointStatus(RedPointType.HeroExplore) - CheckRedPointStatus(RedPointType.EpicExplore) - CheckRedPointStatus(RedPointType.OrdinaryExplore) if type==1 then --挑战 UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.DAILY_CHALLENGE , function(result) if result.result ==0 then From b54534db2f4440e66673308851171479d2d8f351 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 29 Jul 2020 18:27:07 +0800 Subject: [PATCH 2/2] chechihongdian update --- .../~Lua/Modules/Carbon/CarbonManager.lua | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua index dbf1698da7..9a4ef2bc8d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua @@ -829,16 +829,14 @@ function this.CarbonRedCheck(redType) -- return false -- end --车迟斗法 - elseif redType == RedPointType.LegendExplore then - if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.CARDELAY) and PlayerManager.familyId ~= 0 - and (GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Challenge) - or GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Loot)) then - LogGreen("1111111111") - return true - else - LogGreen("22222222222") - return false - end + -- elseif redType == RedPointType.LegendExplore then + -- if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.CARDELAY) and PlayerManager.familyId ~= 0 + -- and (GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Challenge) + -- or GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Loot)) then + -- return true + -- else + -- return false + -- end end end