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

gaoxin 2020-12-21 19:30:39 +08:00
commit 88ba4edad9
3 changed files with 12 additions and 9 deletions

View File

@ -336,6 +336,7 @@ function this.BuyVipFun(type,warOrSd,fun)
MsgPanel.ShowTwo(string.format( tipStr,finalNum,itemName), nil, function() MsgPanel.ShowTwo(string.format( tipStr,finalNum,itemName), nil, function()
--买东西 --买东西
ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,JumpServerManager.shopGoodId,1,function() ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,JumpServerManager.shopGoodId,1,function()
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.JUMPSERVER_GIGHTLADDER_BUYNUM, 1)--更新特权
local tipStr2 = warOrSd == 1 and Language[12328] or "扫荡成功!" local tipStr2 = warOrSd == 1 and Language[12328] or "扫荡成功!"
PopupTipPanel.ShowTip(tipStr2) PopupTipPanel.ShowTip(tipStr2)
if fun then if fun then

View File

@ -87,14 +87,16 @@ function this.GetCanBuyBattleCount()
return PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.JUMPSERVER_GIGHTLADDER_BUYNUM) return PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.JUMPSERVER_GIGHTLADDER_BUYNUM)
end end
--天梯开始战斗 --天梯开始战斗
this.curBattleDrop = {}
function this.StarFightHightLadder(personInfo,skipFight,callBack) function this.StarFightHightLadder(personInfo,skipFight,callBack)
NetManager.GetWorldArenaChallengeRequest(FormationTypeDef.FORMATION_NORMAL,personInfo,skipFight,function (msg) NetManager.GetWorldArenaChallengeRequest(FormationTypeDef.FORMATION_NORMAL,personInfo,skipFight,function (msg)
oldMyRank = myRank oldMyRank = myRank
if msg and msg.drop and msg.drop.itemlist and #msg.drop.itemlist > 0 then -- if msg and msg.drop and msg.drop.itemlist and #msg.drop.itemlist > 0 then
LogPink(" #msg.drop.itemlist ".. #msg.drop.itemlist) -- LogPink(" #msg.drop.itemlist ".. #msg.drop.itemlist)
else -- else
LogPink(" #msg.drop.itemlist nil ") -- LogPink(" #msg.drop.itemlist nil ")
end -- end
this.curBattleDrop = msg.drop
if skipFight == 0 then--挑战 if skipFight == 0 then--挑战
if msg.err== -1 then if msg.err== -1 then
this.BattleHightLadderData(msg) this.BattleHightLadderData(msg)
@ -104,11 +106,11 @@ function this.StarFightHightLadder(personInfo,skipFight,callBack)
this.BattleHightLadderData(msg) this.BattleHightLadderData(msg)
local fightData = BattleManager.GetBattleServerData(msg,1) local fightData = BattleManager.GetBattleServerData(msg,1)
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.JumpServerhightLadder, function() UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.JumpServerhightLadder, function()
UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1,function() -- UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1,function()
if callBack then if callBack then
callBack(msg) callBack(msg)
end end
end) -- end)
end end
) )
else else

View File

@ -199,7 +199,7 @@ function BattleWinPopup:NextStep()
-- 胜利显示本场比赛的表现最好的英雄 -- 胜利显示本场比赛的表现最好的英雄
UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId,bestData.skinId, bestData.damage, allDamage, function(_BattleBestPopup) UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId,bestData.skinId, bestData.damage, allDamage, function(_BattleBestPopup)
-- 打开关卡奖励界面 -- 打开关卡奖励界面
-- UIManager.OpenPanel(UIName.RewardItemPopup, m_battleResult.drop, 1,function() UIManager.OpenPanel(UIName.RewardItemPopup, JumpServerManager.curBattleDrop, 1,function()
if _BattleBestPopup then if _BattleBestPopup then
_BattleBestPopup:ClosePanel() _BattleBestPopup:ClosePanel()
end end
@ -207,7 +207,7 @@ function BattleWinPopup:NextStep()
m_battlePanel:ClosePanel() m_battlePanel:ClosePanel()
end end
self:ClosePanel() self:ClosePanel()
-- end) end, 0,true,true)
local MyRank = JumpServerManager.GetHightLadderDataMyRank() local MyRank = JumpServerManager.GetHightLadderDataMyRank()
local OldMyRank = JumpServerManager.GetHightLadderDataOldMyRank() local OldMyRank = JumpServerManager.GetHightLadderDataOldMyRank()
if MyRank ~= OldMyRank then if MyRank ~= OldMyRank then