From bdc2cd7ef9529ba6c7ad41c84df245c4d3a8ba8c Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 1 Sep 2022 18:15:08 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=8E=89=E8=99=9A=E8=AE=BA=E9=81=93]=3D=3D=3D?= =?UTF-8?q?=3D=3D=E7=8E=89=E8=99=9A=E8=AE=BA=E9=81=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Formation/FormationPanelV2.lua | 29 ++++++++++--------- .../WorldArena/WorldArenaOtherTeamPanel.lua | 2 +- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 8a3bc2c630..90d1a5510f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -513,14 +513,20 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData) local liveName = heroData.live local roleConfig = {} local toward=0 + local star,starType = heroData.GetStar() + local level=heroData.lv + if panelType == FORMATION_TYPE.WORLDARENA then + star=endLess[heroData.heroConfig.Id].Star + level=endLess[heroData.heroConfig.Id].Level + end if panelType == FORMATION_TYPE.EXPEDITION or panelType == FORMATION_TYPE.CARBON then - bg.sprite = this.spLoader:LoadSprite(GetFormationHeroCardStarBg[_heroData.star]) + bg.sprite = this.spLoader:LoadSprite(GetFormationHeroCardStarBg[star]) Util.GetGameObject(o,"hpProgress").gameObject:SetActive(true) Util.GetGameObject(o,"rageProgress").gameObject:SetActive(false) kaPaiEffect.transform.localScale=Vector3.New(1,1.1,1) kaPaiEffect.transform.localPosition=Vector3.New(-8,-16,0) else - bg.sprite = this.spLoader:LoadSprite(GetHeroCardStarBg[_heroData.star]) + bg.sprite = this.spLoader:LoadSprite(GetHeroCardStarBg[star]) Util.GetGameObject(o,"hpProgress").gameObject:SetActive(false) Util.GetGameObject(o,"rageProgress").gameObject:SetActive(false) kaPaiEffect.transform.localScale=Vector3.New(1,1,1) @@ -540,9 +546,9 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData) SetHEeroLiveToward(live,toward,heroData.heroConfig.Position) live.transform.localScale = Vector3.one live.transform.localPosition = Vector3.zero - + local zs = Util.GetGameObject(o, "zs") - local zsName = GetHeroCardStarZs[heroData.star] + local zsName = GetHeroCardStarZs[star] if zsName == "" then zs:SetActive(false) else @@ -551,9 +557,9 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData) end yuanImage:SetActive(heroData.createtype == 1) - fg.sprite = this.spLoader:LoadSprite(GetHeroCardStarFg[heroData.star]) + fg.sprite = this.spLoader:LoadSprite(GetHeroCardStarFg[star]) pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.property)) - local star,starType = heroData.GetStar() + if starType == 3 then if heroData.star>11 then fg.sprite = this.spLoader:LoadSprite("t_zhandoukuang_lanjin02") @@ -561,11 +567,7 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData) fg.sprite = this.spLoader:LoadSprite("t_zhandoukuang_zhuangshi006") end end - local level=heroData.lv - if panelType == FORMATION_TYPE.WORLDARENA then - star=endLess[heroData.heroConfig.Id].Star - level=endLess[heroData.heroConfig.Id].Level - end + if HarmonyManager.IsChangeColor(heroData.dynamicId) then lv.text=""..level.."" elseif HarmonyManager:IsEnvoy(heroData.dynamicId) and HarmonyManager:HongMengTowerUpLimit() >= HarmonyManager.TowerStartLimit then @@ -574,7 +576,7 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData) lv.text=level end SetCardStars(starGrid,star,starType) - if heroData.star > 9 then + if star > 9 then kaPaiEffect:SetActive(true) else kaPaiEffect:SetActive(false) @@ -827,10 +829,8 @@ function this.SingleHeroDataShow(_go, _heroData) pro.sprite= this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.property)) else changeProBtn:SetActive(false) - LogError("+++++++") pro.sprite= this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName)) end - frame.sprite=this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star)) icon.sprite=this.spLoader:LoadSprite(heroData.icon) local level=heroData.lv pos.sprite = this.spLoader:LoadSprite(heroData.professionIcon) @@ -857,6 +857,7 @@ function this.SingleHeroDataShow(_go, _heroData) star=endLess[heroData.heroConfig.Id].Star level=endLess[heroData.heroConfig.Id].Level end + frame.sprite=this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,star)) if HarmonyManager.IsChangeColor(heroData.dynamicId) then -- body lv.text=""..level.."" diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaOtherTeamPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaOtherTeamPanel.lua index db3cbab4a9..b885e87392 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaOtherTeamPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaOtherTeamPanel.lua @@ -234,7 +234,7 @@ function WorldArenaOtherTeamPanel:SetTeamInfo(_go,teamData) Util.SetParticleSortLayer(self.teamList[index].heroList[hero.position].starGrid,self.sortingOrder + 1) local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroTid) self.teamList[index].heroList[hero.position].proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(hero.propertyId)) - self.teamList[index].heroList[hero.position].levelText.text =endLess[heroTid].Star or hero.level + self.teamList[index].heroList[hero.position].levelText.text =endLess[heroTid].Level or hero.level self.teamList[index].heroList[hero.position].frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality, hero.star)) SetHeroIcon(self.spLoader,hero, self.teamList[index].heroList[hero.position].icon,heroConfig) SetHeroFlyEffect(self.teamList[index].heroList[hero.position].hero,self.spLoader,star,self.sortingOrder+1,0.8,2)