Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

zhangqiang 2020-09-14 14:50:25 +08:00
commit 1933a9b7ae
6 changed files with 14 additions and 12 deletions

View File

@ -507,7 +507,9 @@ function CarbonTypePanelV2:OnDestroy()
SubUIManager.Close(this.BtView)
end
carbons = {}
SubUIManager.Close(this.playerHead)
if this.playerHead then
SubUIManager.Close(this.playerHead)
end
SubUIManager.Close(this.UpView)
this.playerHead = nil
this.UpView = nil

View File

@ -187,7 +187,7 @@ function ExpeditionMainPanel:OnShow()
local endTime = 0
endTime = ExpeditionManager.startTime + tonumber(ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,JumpType.Expedition).SeasonEnd) - GetTimeStamp() +
ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,JumpType.Expedition).SeasonInterval * 60
self:RemainTimeDown(self.timeTextGo,self.timeText,endTime)
self:RemainTimeDown(self.timeTextGo,self.timeText,endTime-300)
self:IsTreasureOpen()
end

View File

@ -476,7 +476,7 @@ function this.RemainTimeDown()
end
end
function this.RefreshPanelShowByState()
if ExpeditionManager.ExpeditionPanelIsOpen == 1 and (UIManager.IsOpen(UIName.ExpeditionMainPanel) or UIManager.IsOpen(UIName.TreasureOfHeavenPanel)) then --not UIManager.IsOpen(UIName.BattlePanel) then
if(ExpeditionManager.ExpeditionPanelIsOpen == 1 and UIManager.IsOpen(UIName.ExpeditionMainPanel)) or UIManager.IsOpen(UIName.TreasureOfHeavenPanel) then --not UIManager.IsOpen(UIName.BattlePanel) then
PlayerManager.carbonType = 1
if ExpeditionManager.ExpeditionState == 2 then
UIManager.OpenPanel(UIName.CarbonTypePanelV2)

View File

@ -82,13 +82,10 @@ function this:showRewardTianGong()
local indirect ={}
local curScore = TreasureOfHeavenManger.curScore--当前分数
LogPink("sssss"..#rewardData)
LogBlue("aaaaaa"..#rewardStateData)
for i = 1, #rewardData do
if curScore >= rewardData[i].Integral then
if rewardStateData[i].state == 1 or rewardStateData[i].state == 0 then--已达成但不能领取的
-- body
LogRed("执行这里了么")
local reward = rewardData[i]
local k1 = reward.TreasureReward[1][1]
local v1 = reward.TreasureReward[1][2]

View File

@ -15,7 +15,7 @@ function this.UpdateData(msg)
if msg.resetTime then
this.resetTime = msg.resetTime
end
if msg.treasureRewardState then
if msg.treasureRewardState and #msg.treasureRewardState == 1 then
if #this.rewardStateData>0 then
for i = 1, #this.rewardStateData do
if this.rewardStateData[i].id == msg.treasureRewardState.id then
@ -25,8 +25,10 @@ function this.UpdateData(msg)
else
this.rewardStateData = msg.treasureRewardState
end
elseif msg.treasureRewardState and #msg.treasureRewardState > 1 then
this.rewardStateData = msg.treasureRewardState
end
this.TreasrueState = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.TreasureOfHeaven,106) == 0 and msg.isBuy or OperatingManager.GetGoodsBuyTime(GoodsTypeDef.TreasureOfHeaven,106)
this.TreasrueState = msg.isBuy
end
function this.SetTreasureState()

View File

@ -76,7 +76,7 @@ end
function TreasureOfHeavenPanel:refresh()
treasureState = TreasureOfHeavenManger.TreasrueState
rewardData = TreasureOfHeavenManger.rewardStateData
LogGreen("#rewardData长度"..#rewardData)
-- LogGreen("#rewardData长度"..#rewardData)
if #TreasureOfHeavenManger.rewardStateData <= 0 then
TreasureOfHeavenPanel:topBar()
TreasureOfHeavenPanel:showTaskList()
@ -237,7 +237,7 @@ function TreasureOfHeavenPanel:ShowTime()
self.localTimer:Stop()
self.localTimer = nil
end
local t = TreasureOfHeavenManger.resetTime-300
local t = TreasureOfHeavenManger.resetTime
local time
self.localTimer = Timer.New(function()
time = t - GetTimeStamp()
@ -245,8 +245,9 @@ function TreasureOfHeavenPanel:ShowTime()
time = 0
t = TreasureOfHeavenManger.resetTime
treasureState = nil
-- TreasureOfHeavenPanel:refresh()-不刷新了,直接踢出去
ExpeditionManager.RefreshPanelShowByState()
this.ScrollView:SetIndex(1)
TreasureOfHeavenPanel:refresh()--不刷新了,直接踢出去
-- ExpeditionManager.RefreshPanelShowByState()
end
this.time.text=TimeToDHMS(time)
end,1,-1,true)