diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 90d1a5510f..70df8c7910 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -1064,6 +1064,17 @@ function this.SingleHeroDataShow(_go, _heroData) end end end + if panelType == FORMATION_TYPE.WORLDARENA then + + LogError("curindex==="..this.opView.curIndex) + NetManager.ViewHeroInfoRequest(PlayerManager.uid,heroData.dynamicId,PlayerManager.serverInfo.name,2000+this.opView.curIndex,function(msg) + + local showData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects,msg.guildSkill) + GoodFriendManager.InitEquipData(msg.equip,showData)--HeroManager.GetSingleHeroData(heroData.dynamicId) + UIManager.OpenPanel(UIName.RoleInfoPopup, showData,true) + end) + return + end if isChoosed then UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,nil,this.choosedList,#this.choosedList) else diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMyTeamPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMyTeamPanel.lua index 06b33d5a3e..5fdac8a92f 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMyTeamPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMyTeamPanel.lua @@ -184,13 +184,20 @@ function WorldArenaMyTeamPanel:SetSingleFormation(go,data,index) allPower=allPower+heroData.warPower self.Heros[index][hero.position].proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId)) self.Heros[index][hero.position].levelText.text = endLessConfig[heroData.id].Level or heroData.lv - self.Heros[index][hero.position].frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star)) + self.Heros[index][hero.position].frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,star)) SetHeroIcon(self.spLoader,heroData,self.Heros[index][hero.position].icon,heroConfig) local heroData = {} Util.AddOnceClick(self.Heros[index][hero.position].icon.gameObject, function() - local heroData = HeroManager.GetSingleHeroData(hero.heroId) - UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,false) + --local heroData = HeroManager.GetSingleHeroData(hero.heroId) + --UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,false) + NetManager.ViewHeroInfoRequest(PlayerManager.uid,heroTid,PlayerManager.serverInfo.name,2000+index,function(msg) + + heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects,msg.guildSkill) + GoodFriendManager.InitEquipData(msg.equip,heroData)--HeroManager.GetSingleHeroData(heroData.dynamicId) + UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,true) + end) end) + end end warPower.text = FormationManager.GetFormationPower(2000+index)