diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index d879e975a6..7a82950896 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -558,8 +558,8 @@ SHOP_PAGE = { COIN = 3, -- 代币 YUANSHEN = 4, -- 元神 PLAY = 5, -- 玩法 - EXCHANGE = 6, -- 兑换 - JUMPSERVER = 7, -- 跨服 + JUMPSERVER = 6, -- 跨服 + EXCHANGE = 7, -- 兑换 } SHOP_TYPE = { SOUL_CONTRACT_SHOP = 1, -- 契魂商店 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua index 3eb6e681a9..cf96cdceeb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua @@ -7,6 +7,7 @@ local m_backPanel local orginLayer local fightType local isBackBattle = false +local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) --初始化组件(用于子类重写) function BattleFailPopup:InitComponent() this.spLoader = SpriteLoader.New() @@ -129,7 +130,7 @@ function this.ClosePanelRefreshData() elseif fightType == BATTLE_TYPE.XIAOYAOYOU then--逍遥游 this.ShowBattleResultByXYY() elseif fightType == BATTLE_TYPE.JumpServerhightLadder then--跨服天梯 - PopupTipPanel.ShowTip("挑战失败,罗浮争锋排行无变化!") + this.ShowBattleResultByJumpServerHightLadder() --新回放功能 elseif fightType == BATTLE_TYPE.BACK_BATTLE then if BattleManager.GetLastBattleType() == BATTLE_TYPE.EXECUTE_FIGHT then-- 猎妖之路 @@ -149,6 +150,23 @@ function this.ShowBattleResultByXYY() end) end end + +-- 罗浮争锋结算界面特殊显示 +function this.ShowBattleResultByJumpServerHightLadder() + PopupTipPanel.ShowTip("挑战失败,罗浮争锋排行无变化!") + if not isBackBattle and JumpServerManager.curBattleDrop.itemlist ~= nil and #JumpServerManager.curBattleDrop.itemlist > 0 then + local content = {} + for i = 1, #JumpServerManager.curBattleDrop.itemlist do + local itemdata = {} + itemdata.configData = itemConfig[JumpServerManager.curBattleDrop.itemlist[i].itemId] + itemdata.name = GetLanguageStrById(itemdata.configData.Name) + itemdata.icon = this.spLoader:LoadSprite(GetResourcePath(itemdata.configData.ResourceID)) + itemdata.num = JumpServerManager.curBattleDrop.itemlist[i].itemNum + table.insert(content, itemdata) + end + PopupText(content, 0.5, 2) + end +end -- 猎妖之路结算界面特殊显示 function this.ShowBattleResultByExpedition() if not isBackBattle then