From d9214666c29ef025c29c453a691c96cb5586dc0f Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Sat, 11 Sep 2021 16:00:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=89=E8=99=9A=E8=AE=BA=E9=81=93=E5=9B=9E?= =?UTF-8?q?=E6=94=BE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorldArena/WorldArenaBattleInfoPanel.lua | 10 +++++----- .../Modules/WorldArena/WorldArenaMainPanel.lua | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua index 6f80d72603..d9aaba9b40 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua @@ -286,15 +286,15 @@ function WorldArenaBattleInfoPanel:BindEvent() for i = 1, #this.playBacks do Util.AddClick(this.playBacks[i],function() - if not leftAllTeam[i] or not rightAllTeam[i] or #leftAllTeam[i]==0 or #rightAllTeam[i]==0 then - PopupTipPanel.ShowTip("本场战斗无法回放!") - return - end + -- if not leftAllTeam[i] or not rightAllTeam[i] or #leftAllTeam[i]==0 or #rightAllTeam[i]==0 then + -- PopupTipPanel.ShowTip("本场战斗无法回放!") + -- return + -- end local nameStr = myInfoData.name.."|"..enInfoData.name local realResult = resultList[i] --(resultList[i] + 1) % 2 -- 服务器返回的是我的结果,转换为真实结果 this.RequestReplayRecord(realResult,fightDataList[i], nameStr,function() - this:ClosePanel() + --this:ClosePanel() --构建显示结果数据(我永远在蓝方) local arg = {} arg.result = realResult diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua index 7310db4705..008a733fc0 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua @@ -320,7 +320,6 @@ function this:RefreshEnemyData(team) power:GetComponent("Text").text = Language[12179]..EnemyList[i].totalForce btnText.gameObject:SetActive(freeTimes > 0) btnText.text = Language[10099] - btnItem.gameObject:SetActive(freeTimes <= 0) if freeTimes <= 0 then local itemId, needNum = WorldArenaManager.GetArenaChallengeCost() @@ -362,6 +361,21 @@ function WorldArenaMainPanel:OnFocus() this.freeTimes.text = string.format("%s次", math.max(freeTimes, 0)) this.CheckIsRankChange() this.ShowRewardBoxProgressData() + for key, value in ipairs(this.Enemys) do + local btnText = Util.GetGameObject(value, "challenge/Text"):GetComponent("Text") + local btnItem = Util.GetGameObject(value, "challenge/item"):GetComponent("Image") + local btnItemNum = Util.GetGameObject(value, "challenge/item/num"):GetComponent("Text") + btnText.gameObject:SetActive(freeTimes > 0) + btnText.text = Language[10099] + btnItem.gameObject:SetActive(freeTimes <= 0) + if freeTimes <= 0 then + local itemId, needNum = WorldArenaManager.GetArenaChallengeCost() + local haveNum = BagManager.GetItemCountById(itemId) + btnItem.sprite = SetIcon(this.spLoader, itemId) + btnItemNum.text = "×"..needNum + btnItemNum.color = haveNum < needNum and UIColor.NOT_ENOUGH_RED or UIColor.BTN_TEXT + end + end end