Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
b02b315f78
|
|
@ -143,7 +143,12 @@ function MonsterCampNewPanel:BindEvent()
|
|||
end
|
||||
|
||||
--快速战斗
|
||||
local isClick = false
|
||||
function this.QuickStartMonsterFightRequest()
|
||||
if isClick then
|
||||
return
|
||||
end
|
||||
isClick = true
|
||||
-- 请求战斗结果
|
||||
NetManager.GetMonsterFightResult(MonsterCampManager.monsterWave, FormationTypeDef.MONSTER_CAMP_ATTACK, function (msg)
|
||||
local result = {}
|
||||
|
|
@ -160,12 +165,16 @@ function this.QuickStartMonsterFightRequest()
|
|||
BattleManager.SetLastBattleResult(this.lastBattleResult,BATTLE_TYPE.MONSTER_CAMP)
|
||||
if msg.result == 0 then
|
||||
UIManager.OpenPanel(UIName.BattleFailPopup, nil, true, UIName.MonsterCampNewPanel)
|
||||
isClick = false
|
||||
else
|
||||
|
||||
MonsterCampManager.monsterWave = MonsterCampManager.monsterWave + 1
|
||||
UIManager.OpenPanel(UIName.BattleWinPopup, nil, false, BATTLE_TYPE.MONSTER_CAMP, result, true, true,function()
|
||||
-- UIManager.OpenPanel(UIName.RewardItemPopup,msg.enventDrop,1,function()
|
||||
this.OnShowPanel()--刷新界面
|
||||
Timer.New(function ()
|
||||
isClick = false
|
||||
end,0.5):Start()
|
||||
-- end)
|
||||
end)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -362,6 +362,8 @@ function RewardItemSingleShowPopup:OnShow()
|
|||
else
|
||||
isShow = false
|
||||
end
|
||||
else
|
||||
isShow = false
|
||||
end
|
||||
elseif JumpConfig[jumpDataList[i]].Type == JumpType.recharge then
|
||||
local actConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ActivityGroups,"PageType",JumpType.recharge,"Sort",JumpConfig[jumpDataList[i]].Skipfactor[1])
|
||||
|
|
|
|||
Loading…
Reference in New Issue