Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
3d3d04fd77
|
@ -199,7 +199,7 @@ function CarbonsPanel:TipShow(_go,_value)
|
||||||
if _value.id == FUNCTION_OPEN_TYPE.MONSTER_COMING then
|
if _value.id == FUNCTION_OPEN_TYPE.MONSTER_COMING then
|
||||||
freetimes:SetActive(true)
|
freetimes:SetActive(true)
|
||||||
buytimes:SetActive(true)
|
buytimes:SetActive(true)
|
||||||
freetimesText.text = string.format("免费挑战次数:%s",MonsterCampManager.GetCanBattleCount())
|
freetimesText.text = string.format("免费扫荡次数:%s",MonsterCampManager.GetCanBattleCount())
|
||||||
buytimesText.text = string.format("剩余购买次数:%s",MonsterCampManager.GetCanBuyBattleCount())
|
buytimesText.text = string.format("剩余购买次数:%s",MonsterCampManager.GetCanBuyBattleCount())
|
||||||
elseif _value.id == FUNCTION_OPEN_TYPE.PEOPLE_MIRROR then
|
elseif _value.id == FUNCTION_OPEN_TYPE.PEOPLE_MIRROR then
|
||||||
freetimes:SetActive(true)
|
freetimes:SetActive(true)
|
||||||
|
@ -210,8 +210,6 @@ function CarbonsPanel:TipShow(_go,_value)
|
||||||
elseif _value.id == FUNCTION_OPEN_TYPE.EXPEDITION then
|
elseif _value.id == FUNCTION_OPEN_TYPE.EXPEDITION then
|
||||||
freetimes:SetActive(true)
|
freetimes:SetActive(true)
|
||||||
buytimes:SetActive(false)
|
buytimes:SetActive(false)
|
||||||
LogGreen("ExpeditionManager.GetCurNodeInfo().lay:"..tostring(ExpeditionManager.GetCurNodeInfo().lay))
|
|
||||||
LogGreen("ExpeditionManager.expeditionLeve:"..tostring(ExpeditionManager.expeditionLeve))
|
|
||||||
local free = ExpeditionManager.GetCurNodeInfo().lay-1+(expeditionLevel[ExpeditionManager.expeditionLeve]-1)*10
|
local free = ExpeditionManager.GetCurNodeInfo().lay-1+(expeditionLevel[ExpeditionManager.expeditionLeve]-1)*10
|
||||||
local num = free <= 30 and free or 30
|
local num = free <= 30 and free or 30
|
||||||
freetimesText.text = string.format("进度:%s/%s",num,30)
|
freetimesText.text = string.format("进度:%s/%s",num,30)
|
||||||
|
@ -230,12 +228,6 @@ function CarbonsPanel:TipShow(_go,_value)
|
||||||
self.timeList[_value.id].TextObj = timeText
|
self.timeList[_value.id].TextObj = timeText
|
||||||
self.timeList[_value.id].Text = "剩余时间:"
|
self.timeList[_value.id].Text = "剩余时间:"
|
||||||
self.timeList[_value.id].time = ActTimeCtrlManager.GetSerDataByTypeId(_value.id).endTime - GetTimeStamp()
|
self.timeList[_value.id].time = ActTimeCtrlManager.GetSerDataByTypeId(_value.id).endTime - GetTimeStamp()
|
||||||
-- elseif _value.id == FUNCTION_OPEN_TYPE.TRIAL then--森罗幻境
|
|
||||||
-- time:SetActive(true)
|
|
||||||
-- self.timeList[_value.id] = {}
|
|
||||||
-- self.timeList[_value.id].TextObj = timeText
|
|
||||||
-- self.timeList[_value.id].Text = "剩余时间:"
|
|
||||||
-- self.timeList[_value.id].time = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.TRIAL).endTime - GetTimeStamp()
|
|
||||||
end
|
end
|
||||||
if self.timeList[_value.id] then
|
if self.timeList[_value.id] then
|
||||||
timeText.text = string.format("%s%s",self.timeList[_value.id].Text,TimeToFelaxible(self.timeList[_value.id].time))
|
timeText.text = string.format("%s%s",self.timeList[_value.id].Text,TimeToFelaxible(self.timeList[_value.id].time))
|
||||||
|
|
|
@ -164,10 +164,9 @@ function this.QuickStartMonsterFightRequest()
|
||||||
}
|
}
|
||||||
BattleManager.SetLastBattleResult(this.lastBattleResult,BATTLE_TYPE.MONSTER_CAMP)
|
BattleManager.SetLastBattleResult(this.lastBattleResult,BATTLE_TYPE.MONSTER_CAMP)
|
||||||
if msg.result == 0 then
|
if msg.result == 0 then
|
||||||
UIManager.OpenPanel(UIName.BattleFailPopup, nil, true, UIName.MonsterCampNewPanel)
|
UIManager.OpenPanel(UIName.BattleFailPopup, nil, true, UIName.MonsterCampNewPanel,BATTLE_TYPE.MONSTER_CAMP)
|
||||||
isClick = false
|
isClick = false
|
||||||
else
|
else
|
||||||
|
|
||||||
Timer.New(function ()
|
Timer.New(function ()
|
||||||
isClick = false
|
isClick = false
|
||||||
end,1):Start()
|
end,1):Start()
|
||||||
|
|
|
@ -123,6 +123,7 @@ function this:LoseJump(id)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
function this.ClosePanelRefreshData()
|
function this.ClosePanelRefreshData()
|
||||||
|
LogRed("fightType:"..tostring(fightType))
|
||||||
if fightType then
|
if fightType then
|
||||||
if fightType == BATTLE_TYPE.EXECUTE_FIGHT then--远征
|
if fightType == BATTLE_TYPE.EXECUTE_FIGHT then--远征
|
||||||
this.ShowBattleResultByExpedition()
|
this.ShowBattleResultByExpedition()
|
||||||
|
|
Loading…
Reference in New Issue