diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua index 7d14c734dc..31093b436b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua @@ -1,4 +1,5 @@ ------ 回溯 ----- + +----- 回溯 ----- local this = {} local sortType=0 local sortingOrder=0 @@ -122,12 +123,7 @@ function this.SingleHeroDataShow(go,_heroData) Util.GetGameObject(_go.transform, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star)) Util.GetGameObject(_go.transform, "lv/Text"):GetComponent("Text").text = "+"..heroData.talismanList--heroData.lv -<<<<<<< HEAD Util.GetGameObject(_go.transform, "Text"):GetComponent("Text").text =SubString2(GetLanguageStrById(heroData.heroConfig.ReadingName),8) -======= - - Util.GetGameObject(_go.transform, "Text"):GetComponent("Text").text = heroData.heroConfig.ReadingName ->>>>>>> local_to_xmadev Util.GetGameObject(_go.transform, "icon"):GetComponent("Image").sprite = Util.LoadSprite(heroData.icon) Util.GetGameObject(_go.transform, "posIcon"):SetActive(false) Util.GetGameObject(_go.transform, "proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))