From 46f091f09c85f6fdf27f25ad539b093a56de3665 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 25 Jul 2020 20:28:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E6=A1=86=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua | 6 +++--- .../~Lua/Modules/Expedition/ExpeditionHeroListInfoPopup.lua | 2 +- .../~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua | 2 +- .../~Lua/Modules/Formation/FormationEditPopup.lua | 2 +- .../~Lua/Modules/Formation/FormationExamplePopup.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Map/MapAwardPanel.lua | 2 +- .../~Lua/Modules/Map/ShowEnemyInfoPanel.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua | 2 +- .../ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua | 2 +- .../~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua | 2 +- .../~Lua/Modules/Power/GiveMePowerPanel.lua | 2 +- .../~Lua/Modules/Resolve/View/Resolve_Dismantle.lua | 2 +- .../~Lua/Modules/Resolve/View/Resolve_Recall.lua | 2 +- .../~Lua/Modules/RoleInfo/RoleInfoPanel.lua | 4 ++-- .../~Lua/Modules/RoleInfo/RolePosInfoPopup.lua | 2 +- .../~Lua/Modules/RoleInfo/RoleReturnListPanel.lua | 2 +- .../~Lua/Modules/RoleInfo/RoleReturnPanel.lua | 2 +- .../~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua index b512bb1418..b3bad03d89 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua @@ -636,7 +636,7 @@ function this.GetTableByBackDropData(drop) itemdata.backData = drop.Hero[i] itemdata.configData = ConfigManager.GetConfigData(ConfigName.HeroConfig, drop.Hero[i].heroId) itemdata.name = itemdata.configData.ReadingName - itemdata.frame = GetHeroQuantityImageByquality(itemdata.configData.Quality) + itemdata.frame = GetHeroQuantityImageByquality(itemdata.configData.Quality,itemdata.configData.Star) itemdata.icon = GetResourcePath(itemdata.configData.Icon) itemdata.num = 1 table.insert(itemDataList, itemdata) @@ -747,7 +747,7 @@ function this.GetItemListFromTempBag(drop, isSave) itemdata.backData = drop.Hero[i] itemdata.configData = ConfigManager.GetConfigData(ConfigName.HeroConfig, drop.Hero[i].heroId) itemdata.name = itemdata.configData.ReadingName - itemdata.frame = GetHeroQuantityImageByquality(itemdata.configData.Quality) + itemdata.frame = GetHeroQuantityImageByquality(itemdata.configData.Quality,itemdata.configData.Star) itemdata.icon = GetResourcePath(itemdata.configData.Icon) itemdata.num = 1 table.insert(itemDataList, itemdata) @@ -835,7 +835,7 @@ function this.GetAllTempBagData() itemdata.backData = v itemdata.configData = ConfigManager.GetConfigData(ConfigName.HeroConfig, v.heroId) itemdata.name = itemdata.configData.Name - itemdata.frame = GetHeroQuantityImageByquality(itemdata.configData.Quality) + itemdata.frame = GetHeroQuantityImageByquality(itemdata.configData.Quality,itemdata.configData.Star) itemdata.Quantity = itemdata.configData.Star itemdata.icon = GetResourcePath(itemdata.configData.Icon) itemdata.num = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListInfoPopup.lua index c025c81e00..670551df34 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListInfoPopup.lua @@ -101,7 +101,7 @@ function this.SingleHeroDataShow(_go, _heroData) Util.GetGameObject(go, "choosed"):SetActive(false) local orderImage= Util.GetGameObject(go, "orderImage") orderImage:SetActive(false) - Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality)) + Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality, heroData.star)) Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = Util.LoadSprite(heroData.icon) Util.GetGameObject(go, "lv/Text"):GetComponent("Text").text = heroData.lv Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroData.heroConfig.Icon)) diff --git a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua index 6d434c8eb4..cc250aec54 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua @@ -228,7 +228,7 @@ function FindTreasureDispatchPanel:ShowSelectHeroData() end function FindTreasureDispatchPanel:OnShowCardData(go,heroData,type) - Util.GetGameObject(go.transform, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality)) + 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.lv Util.GetGameObject(go.transform, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroData.heroConfig.Icon)) -- Util.GetGameObject(go.transform, "posIcon"):GetComponent("Image").sprite = Util.LoadSprite(heroData.professionIcon) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua index 33385cbb77..50485fdcb9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua @@ -234,7 +234,7 @@ function this.SingleHeroDataShow(_go, _heroData) end end - Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality)) + Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star)) Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = Util.LoadSprite(heroData.icon) Util.GetGameObject(go, "lv/Text"):GetComponent("Text").text = heroData.lv Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroData.heroConfig.Icon)) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationExamplePopup.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationExamplePopup.lua index c853900db4..8c0772a5b0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationExamplePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationExamplePopup.lua @@ -98,7 +98,7 @@ function this.SetShow(root,data,index) local heroId=data.HeroList[i] Util.GetGameObject(o,"Mask"):SetActive(not HeroManager.GetCurHeroIsHaveBySid(heroId)) if HeroManager.GetCurHeroIsHaveBySid(heroId)==false then table.insert(nh,i) end --未拥有Hero的位置 存储位置信息 - Util.GetGameObject(o,"Frame"):GetComponent("Image").sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[heroId].Quality)) + Util.GetGameObject(o,"Frame"):GetComponent("Image").sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[heroId].Quality,heroConfig[heroId].Star)) Util.GetGameObject(o,"Icon"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(heroConfig[heroId].Icon)) Util.GetGameObject(o,"ProIcon"):GetComponent("Image").sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig[heroId].PropertyName)) Util.GetGameObject(o,"Lv/Text"):GetComponent("Text").text=1 diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapAwardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapAwardPanel.lua index 97716f8f9e..91b7eedbba 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapAwardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapAwardPanel.lua @@ -84,7 +84,7 @@ function MapAwardPanel:OnOpen(...) go.transform.localPosition = Vector3.zero go:SetActive(true) - Util.GetGameObject(go,"frame"):GetComponent("Image").sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality)) + Util.GetGameObject(go,"frame"):GetComponent("Image").sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star)) Util.GetGameObject(go,"icon"):GetComponent("Image").sprite=Util.LoadSprite(heroData.icon) Util.GetGameObject(go, "lv/Text"):GetComponent("Text").text = heroData.lv Util.GetGameObject(go,"icon"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(heroData.heroConfig.Icon)) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua index 2abacde77c..baf3d73802 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua @@ -139,7 +139,7 @@ function this.SetSelectHero() local star=Util.GetGameObject(item,"star") local choosed=Util.GetGameObject(item,"choosed") local hpExp=Util.GetGameObject(item,"hpExp"):GetComponent("Slider") - frame.sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[value.tmpId].Quality)) + frame.sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[value.tmpId].Quality,value.star)) icon.sprite= Util.LoadSprite(GetResourcePath(heroConfig[value.tmpId].Icon)) pro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig[value.tmpId].PropertyName)) lv.text=value.level diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua index b3381d266a..1b86a00a1e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua @@ -487,7 +487,7 @@ function this.SetSelectHero(isFirstIn,isFirstData,isMainIn) local star=Util.GetGameObject(o,"star") local choosed=Util.GetGameObject(o,"choosed") local hpExp=Util.GetGameObject(o,"hpExp"):GetComponent("Slider") - frame.sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[v.tmpId].Quality)) + frame.sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[v.tmpId].Quality, v.star)) icon.sprite= Util.LoadSprite(GetResourcePath(heroConfig[v.tmpId].Icon)) pro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig[v.tmpId].PropertyName)) lv.text=v.level diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index 0cfda105dd..6036e1848f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -197,7 +197,7 @@ end --RoleInfo0 function this.RoleInfo0() LogBlue(curHeroData.id.." "..curHeroData.dynamicId) - this.head_Frame.sprite = Util.LoadSprite(GetHeroQuantityImageByquality(curHeroData.heroConfig.Quality)) + this.head_Frame.sprite = Util.LoadSprite(GetHeroQuantityImageByquality(curHeroData.heroConfig.Quality, curHeroData.star)) this.head_Icon.sprite = Util.LoadSprite(curHeroData.icon) this.head_Pro.sprite = Util.LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName)) this.head_Lv.text = curHeroData.lv diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua index b3ac0d13ba..fa75bd25bd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua @@ -133,7 +133,7 @@ function this.RefreshPanel() local star=Util.GetGameObject(o,"star") local choosed=Util.GetGameObject(o,"choosed") local hpExp=Util.GetGameObject(o,"hpExp"):GetComponent("Slider") - frame.sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[v.tmpId].Quality)) + frame.sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[v.tmpId].Quality,v.star)) icon.sprite= Util.LoadSprite(GetResourcePath(heroConfig[v.tmpId].Icon)) pro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig[v.tmpId].PropertyName)) lv.text=v.level diff --git a/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua b/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua index 7a7098c39e..063d17c3c1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua @@ -266,7 +266,7 @@ end -- 节点数据匹配 function this.SingleHeroDataShow(go, heroData, index) - Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality)) + Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality, heroData.star)) Util.GetGameObject(go, "lv/Text"):GetComponent("Text").text = heroData.lv Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroData.heroConfig.Icon)) Util.GetGameObject(go, "posIcon"):GetComponent("Image").sprite = Util.LoadSprite(heroData.professionIcon) diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua index 11899323d4..eb6930e362 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua @@ -89,7 +89,7 @@ end function this.SingleHeroDataShow(go,_heroData) local heroData = _heroData local _go = go - Util.GetGameObject(_go.transform, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality)) + 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.lv Util.GetGameObject(_go.transform, "Text"):GetComponent("Text").text = heroData.heroConfig.ReadingName Util.GetGameObject(_go.transform, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroData.heroConfig.Icon)) diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua index 756493dc1c..7bf625d8ad 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua @@ -126,7 +126,7 @@ end function this.SingleHeroDataShow(go,_heroData) local heroData = _heroData local _go = go - Util.GetGameObject(_go.transform, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality)) + 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.lv Util.GetGameObject(_go.transform, "Text"):GetComponent("Text").text = heroData.heroConfig.ReadingName Util.GetGameObject(_go.transform, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroData.heroConfig.Icon)) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 568477c3bd..39764e37ad 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -698,12 +698,12 @@ function this:UpdateHeroUpStarData() Util.GetGameObject(go.transform, "iconbg/proImage"):GetComponent("Image").sprite=Util.LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName)) if curUpStarData[i].upStarMaterialsData.Issame==1 then Util.GetGameObject(go.transform,"icon"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(curHeroData.heroConfig.Icon)) - Util.GetGameObject(go.transform,"frame"):GetComponent("Image").sprite=Util.LoadSprite(GetHeroQuantityImageByquality(curHeroData.heroConfig.Quality)) + Util.GetGameObject(go.transform,"frame"):GetComponent("Image").sprite=Util.LoadSprite(GetHeroQuantityImageByquality(curHeroData.heroConfig.Quality, curUpStarData[i].upStarMaterialsData.StarLimit)) Util.GetGameObject(go.transform, "iconbg/proImage"):GetComponent("Image").sprite=Util.LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName)) elseif curUpStarData[i].upStarMaterialsData.IsId>0 then local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, curUpStarData[i].upStarMaterialsData.IsId) Util.GetGameObject(go.transform,"icon"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(heroConfig.Icon)) - Util.GetGameObject(go.transform,"frame"):GetComponent("Image").sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig.Quality)) + Util.GetGameObject(go.transform,"frame"):GetComponent("Image").sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig.Quality, curUpStarData[i].upStarMaterialsData.StarLimit)) Util.GetGameObject(go.transform, "iconbg/proImage"):GetComponent("Image").sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) end else diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RolePosInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RolePosInfoPopup.lua index d5354d558e..59df4996c2 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RolePosInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RolePosInfoPopup.lua @@ -97,7 +97,7 @@ function this.RefreshPanel() local heroId=_curData[i].HeroList[j] Util.GetGameObject(o,"Mask"):SetActive(not HeroManager.GetCurHeroIsHaveBySid(heroId)) if HeroManager.GetCurHeroIsHaveBySid(heroId)==false then table.insert(nh,j) end --未拥有Hero的位置 存储位置信息 - Util.GetGameObject(o,"Frame"):GetComponent("Image").sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[heroId].Quality)) + Util.GetGameObject(o,"Frame"):GetComponent("Image").sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[heroId].Quality,heroConfig[heroId].Star)) Util.GetGameObject(o,"Icon"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(heroConfig[heroId].Icon)) Util.GetGameObject(o,"ProIcon"):GetComponent("Image").sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig[heroId].PropertyName)) Util.GetGameObject(o,"Lv/Text"):GetComponent("Text").text=1 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleReturnListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleReturnListPanel.lua index 602a25a4eb..da617862a9 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleReturnListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleReturnListPanel.lua @@ -71,7 +71,7 @@ function this.OnShowSingleCardData(go,heroData) celectCardGo = go choosed:SetActive(true) end - Util.GetGameObject(go.transform, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality)) + 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.lv Util.GetGameObject(go.transform, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroData.heroConfig.Icon)) Util.GetGameObject(go.transform, "posIcon"):GetComponent("Image").sprite = Util.LoadSprite(heroData.professionIcon) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleReturnPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleReturnPanel.lua index 2b08d628c1..e38168c64d 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleReturnPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleReturnPanel.lua @@ -131,7 +131,7 @@ end function RoleReturnPanel:OnShowHeroData() --curHeroData --self.heroGo - Util.GetGameObject(self.heroGo, "hero/frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(curHeroData.heroConfig.Quality)) + Util.GetGameObject(self.heroGo, "hero/frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(curHeroData.heroConfig.Quality,curHeroData.star)) Util.GetGameObject(self.heroGo, "hero/icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(curHeroData.heroConfig.Icon)) Util.GetGameObject(self.heroGo, "hero/proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName)) Util.GetGameObject(self.heroGo, "hero/lv/Text"):GetComponent("Text").text = curHeroData.lv diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua index bf81e9c306..bd117b8e6e 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua @@ -128,7 +128,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 curSelectHeroList[heroData.dynamicId]=heroData choosed:SetActive(true) end - Util.GetGameObject(go.transform, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality)) + 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.lv Util.GetGameObject(go.transform, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroData.heroConfig.Icon)) Util.GetGameObject(go.transform, "posIcon"):SetActive(false)--:GetComponent("Image").sprite = Util.LoadSprite(heroData.professionIcon)