diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua index d7c8b880c6..7e839da315 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua @@ -299,6 +299,10 @@ function this.SingleHeroDataShow(_go, _heroData) this.SetHeroBlood(hpExp, heroHp, go) -- Click On Util.AddOnceClick(go, function() + if heroData.changeProId==5 then + PopupTipPanel.ShowTip("神系必须转换其他阵营才能上阵") + return + end for k, v in ipairs(choosedList) do if v.did == heroData.dynamicId then --选择的条目已存在,移除选择的item diff --git a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua index 326bfddbdb..60d26cd412 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua @@ -190,7 +190,7 @@ function this.SetSelectHero() -- icon.sprite= this.spLoader:LoadSprite(GetResourcePath(heroSkinData.Icon)) -- end SetHeroIcon(this.spLoader, value,icon,heroConfig[value.tmpId]) - pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig[value.tmpId].PropertyName)) + pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(value.propertyId)) lv.text=value.level local star,starType = GetStarOrGodSoulLv(1,value) SetHeroStars(this.spLoader, starGrid, star,starType) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua index 3b914f1a09..48a6718c75 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua @@ -511,7 +511,7 @@ function this.SetSelectHero(isFirstIn,isFirstData,isMainIn) local hpExp=Util.GetGameObject(o,"hpExp"):GetComponent("Slider") frame.sprite=this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroConfig[v.tmpId].Quality, v.star)) SetHeroIcon(this.spLoader, v,icon,heroConfig[v.tmpId]) - pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig[v.tmpId].PropertyName)) + pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(v.propertyId)) lv.text=v.level local star,starType = GetStarOrGodSoulLv(1,v) if not this.starGridList then