Merge branch 'master_develop' into master_test
commit
9b216f6625
|
|
@ -828,15 +828,13 @@ function this.CarbonRedCheck(redType)
|
||||||
-- else
|
-- else
|
||||||
-- return false
|
-- return false
|
||||||
-- end
|
-- end
|
||||||
-- --车迟斗法
|
--车迟斗法
|
||||||
-- elseif redType == RedPointType.LegendExplore then
|
-- elseif redType == RedPointType.LegendExplore then
|
||||||
-- if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.CARDELAY) and PlayerManager.familyId ~= 0
|
-- if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.CARDELAY) and PlayerManager.familyId ~= 0
|
||||||
-- and (GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Challenge)
|
-- and (GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Challenge)
|
||||||
-- or GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Loot)) then
|
-- or GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Loot)) then
|
||||||
-- LogGreen("1111111111")
|
|
||||||
-- return true
|
-- return true
|
||||||
-- else
|
-- else
|
||||||
-- LogGreen("22222222222")
|
|
||||||
-- return false
|
-- return false
|
||||||
-- end
|
-- end
|
||||||
end
|
end
|
||||||
|
|
@ -865,6 +863,7 @@ function this.GetCarBonState(index)
|
||||||
this.dailyCarbons[index] = {}
|
this.dailyCarbons[index] = {}
|
||||||
this.dailyCarbons[index].id = index + 66
|
this.dailyCarbons[index].id = index + 66
|
||||||
end
|
end
|
||||||
|
LogPink(index)
|
||||||
local curData=ConfigManager.GetAllConfigsDataByKey(ConfigName.DailyChallengeConfig,"Type",index)
|
local curData=ConfigManager.GetAllConfigsDataByKey(ConfigName.DailyChallengeConfig,"Type",index)
|
||||||
--local buyTimeId= curData[1].PrivilegeId[1]
|
--local buyTimeId= curData[1].PrivilegeId[1]
|
||||||
local freeTimeId=curData[1].PrivilegeId[2]
|
local freeTimeId=curData[1].PrivilegeId[2]
|
||||||
|
|
|
||||||
|
|
@ -128,6 +128,7 @@ function DailyCarbonPanel:RefreshRedPotShow()
|
||||||
for i = 1,tabs.childCount do
|
for i = 1,tabs.childCount do
|
||||||
Util.GetGameObject(tabs:GetChild(i-1),"Redpot").gameObject:SetActive(CarbonManager.GetDailyCarbons(i).state)
|
Util.GetGameObject(tabs:GetChild(i-1),"Redpot").gameObject:SetActive(CarbonManager.GetDailyCarbons(i).state)
|
||||||
end
|
end
|
||||||
|
CheckRedPointStatus(RedPointType.HeroExplore)
|
||||||
end
|
end
|
||||||
|
|
||||||
function DailyCarbonPanel:OnClose()
|
function DailyCarbonPanel:OnClose()
|
||||||
|
|
@ -284,9 +285,6 @@ function this.SetData(root, data, ldata)
|
||||||
end
|
end
|
||||||
NetManager.DailyChallengeRequest(data.Id,type,function(msg)
|
NetManager.DailyChallengeRequest(data.Id,type,function(msg)
|
||||||
local fightData = BattleManager.GetBattleServerData(msg)
|
local fightData = BattleManager.GetBattleServerData(msg)
|
||||||
CheckRedPointStatus(RedPointType.HeroExplore)
|
|
||||||
CheckRedPointStatus(RedPointType.EpicExplore)
|
|
||||||
CheckRedPointStatus(RedPointType.OrdinaryExplore)
|
|
||||||
if type==1 then --挑战
|
if type==1 then --挑战
|
||||||
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.DAILY_CHALLENGE , function(result)
|
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.DAILY_CHALLENGE , function(result)
|
||||||
if result.result ==0 then
|
if result.result ==0 then
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue