bug修改提交

dev_chengFeng
wangzhenxing 2021-09-13 14:11:48 +08:00
parent 441e5ba1cc
commit b3eb686222
6 changed files with 29 additions and 13 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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()

View File

@ -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()

View File

@ -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