From b3eb6862223e0d449fdd484c2bee7bfdfe763d20 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 13 Sep 2021 14:11:48 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorldArenaRankRewardPanel.prefab | 2 +- .../Modules/Formation/FormationPanelV2.lua | 5 ++++- .../WorldArena/WorldArenaBattleInfoPanel.lua | 18 ++++++++++++------ .../Modules/WorldArena/WorldArenaMainPanel.lua | 7 +++++++ .../WorldArena/WorldArenaMyTeamPanel.lua | 8 ++++---- .../WorldArena/WorldArenaRankRewardPanel.lua | 2 +- 6 files changed, 29 insertions(+), 13 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaRankRewardPanel.prefab b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaRankRewardPanel.prefab index 78a1396dac..2a451536dc 100644 --- a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaRankRewardPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaRankRewardPanel.prefab @@ -2710,7 +2710,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 8f4b65f2b54c9594f9504390d9036b32, type: 3} + m_Sprite: {fileID: 21300000, guid: b0e7fed510112a849854cf4ddad98122, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 45f0a41cdd..bda26c1f2a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -331,7 +331,10 @@ function this.RefreshShow(isTop,isAni) --显示英雄列表 this.OnClickTabBtn(proId, isTop, isAni) --战力 - this.RefreshPower() + if this.curFormationIndex~=2001 and this.curFormationIndex~=2002 and this.curFormationIndex~=2003 then + this.RefreshPower() + end + end diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua index c3da2ca944..bfed392960 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua @@ -14,7 +14,7 @@ local enInfoData=nil local targetIndex=0 local currIndex=0 - +local myHeroNum=0 local isAnim = false local _CloseFunc = nil local leftAllTeam={} @@ -233,6 +233,10 @@ function WorldArenaBattleInfoPanel:BindEvent() if isAnim then return end + if myHeroNum==0 then + PopupTipPanel.ShowTip("编队为空,无法挑战") + return + end if type~=1 then self:ClosePanel() return @@ -295,10 +299,10 @@ 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() @@ -521,7 +525,7 @@ function this.SetTeamInfo(_go,teamData,type) -- UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,true) -- end) -- end) - if type and type==1 then + if type then table.insert(heroList,{heroId=heroTid,position=hero.position}) end end @@ -529,6 +533,7 @@ function this.SetTeamInfo(_go,teamData,type) if type==1 then allTeams[index]=heroList leftAllTeam[index]=heroList + myHeroNum=myHeroNum+#heroList elseif type==2 then rightAllTeam[index]=heroList end @@ -574,6 +579,7 @@ function WorldArenaBattleInfoPanel:OnDestroy() this.TimeCounter:Stop() this.TimeCounter = nil end + myHeroNum=0 end diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua index e9cef8a986..ab1b27cc3b 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua @@ -399,6 +399,13 @@ end -- 打开,重新打开时回调 function WorldArenaMainPanel:OnShow() SoundManager.PlayMusic(SoundConfig.BGM_Arena) + local allDamage=0 + for i = 2001, 2003 do + allDamage=allDamage+FormationManager.GetFormationPower(i) + end + this.power.text=allDamage + + end function WorldArenaMainPanel:OnSortingOrderChange() diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMyTeamPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMyTeamPanel.lua index c71e6437d7..89be1fdcb3 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMyTeamPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMyTeamPanel.lua @@ -171,14 +171,14 @@ function WorldArenaMyTeamPanel:SetSingleFormation(go,data,index) if not hero.heroid then return end - heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects,msg.guildSkill) - GoodFriendManager.InitEquipData(msg.equip,heroData) - UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,true) + --heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects,msg.guildSkill) + -- GoodFriendManager.InitEquipData(msg.equip,heroData) + UIManager.OpenPanel(UIName.RoleInfoPopup,hero,true) end) end) end end - warPower.text = allPower + warPower.text = FormationManager.GetFormationPower(2000+index) end function WorldArenaMyTeamPanel:OnClose() diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRankRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRankRewardPanel.lua index 4392a87387..00cf0f8c00 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRankRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRankRewardPanel.lua @@ -253,7 +253,7 @@ function this.ActivityRewardSingleShow(activityRewardGo,rewardData,index) local star=0 if tabNum==1 then rankImg.gameObject:SetActive(true) - rankImg.sprite=this.spLoader:LoadSprite("y_yuxulundao_duanweibiao_0"..rewardData.RankGrade+1) + rankImg.sprite=this.spLoader:LoadSprite("y_yuxulundao_xiaobiao_0"..rewardData.RankGrade+1) star=rewardData.RankLevel local scoreLow=rewardData.ScoreLow if scoreLow<0 then