diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index 3ec07704d0..2505aeb855 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -462,6 +462,7 @@ MonoBehaviour: - Assets/ManagedResources/~Lua/Base - Assets/ManagedResources/~Lua/cjson - Assets/ManagedResources/~Lua/Common + - Assets/ManagedResources/~Lua/Config/Data - Assets/ManagedResources/~Lua/Data - Assets/ManagedResources/~Lua/Extends - Assets/ManagedResources/~Lua/Framework @@ -5162,6 +5163,14 @@ MonoBehaviour: extension: .png resPathIndex: 28 resAbNameIndex: 14 + - resName: "\u9996\u5145\u9001\u4E94\u661F\u5B59\u609F\u7A7A1" + extension: .jpg + resPathIndex: 28 + resAbNameIndex: 14 + - resName: "\u9996\u5145\u9001\u4E94\u661F\u5B59\u609F\u7A7A2" + extension: .jpg + resPathIndex: 28 + resAbNameIndex: 14 - resName: r_shouchong_lingqu_01 extension: .png resPathIndex: 29 @@ -14866,6 +14875,22 @@ MonoBehaviour: extension: .jpg resPathIndex: 92 resAbNameIndex: 635 + - resName: r_hero_bg_dao + extension: .jpg + resPathIndex: 92 + resAbNameIndex: 635 + - resName: r_hero_bg_fo + extension: .jpg + resPathIndex: 92 + resAbNameIndex: 635 + - resName: r_hero_bg_ren + extension: .jpg + resPathIndex: 92 + resAbNameIndex: 635 + - resName: r_hero_bg_yao + extension: .jpg + resPathIndex: 92 + resAbNameIndex: 635 - resName: r_hero_jinjiechenggongmenghei extension: .png resPathIndex: 92 @@ -28422,6 +28447,10 @@ MonoBehaviour: extension: .prefab resPathIndex: 158 resAbNameIndex: 1546 + - resName: "\u7ADE\u6280\u573A-3-7-18" + extension: .jpg + resPathIndex: 158 + resAbNameIndex: 1546 - resName: ArenaTopMatchPanel extension: .prefab resPathIndex: 159 @@ -28434,6 +28463,10 @@ MonoBehaviour: extension: .prefab resPathIndex: 159 resAbNameIndex: 1547 + - resName: "QQ\u56FE\u724720200723144602" + extension: .png + resPathIndex: 159 + resAbNameIndex: 1547 - resName: TopMatchPlayBattleAinSelectPopup extension: .prefab resPathIndex: 159 @@ -28442,6 +28475,14 @@ MonoBehaviour: extension: .prefab resPathIndex: 159 resAbNameIndex: 1547 + - resName: "\u5DC5\u5CF0\u8D5B-\u6539\u72482" + extension: .jpg + resPathIndex: 159 + resAbNameIndex: 1547 + - resName: "\u5DC5\u5CF0\u8D5B-\u7ADE\u731C2" + extension: .jpg + resPathIndex: 159 + resAbNameIndex: 1547 - resName: BagPanel extension: .prefab resPathIndex: 160 @@ -29310,6 +29351,14 @@ MonoBehaviour: extension: .prefab resPathIndex: 208 resAbNameIndex: 1590 + - resName: "\u5B9D\u7269\u5206\u89E31" + extension: .jpg + resPathIndex: 208 + resAbNameIndex: 1590 + - resName: "\u5B9D\u7269\u5206\u89E32" + extension: .jpg + resPathIndex: 208 + resAbNameIndex: 1590 - resName: RewardBoxPanel extension: .prefab resPathIndex: 209 diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua index c9b63ee2a0..5f3920b980 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua @@ -21,6 +21,7 @@ local _rightStar=0 function HandBookHeroInfoPanel:InitComponent() self.btnBack = Util.GetGameObject(self.transform, "btnBack") + self.bgImage = Util.GetGameObject(self.transform, "bg/bg"):GetComponent("Image") self.curObj= Util.GetGameObject(self.transform, "curObj") self.leftObj= Util.GetGameObject(self.transform, "leftObj") self.rightObj= Util.GetGameObject(self.transform, "rightObj") @@ -181,10 +182,14 @@ function HandBookHeroInfoPanel:OnShow() self:SetSelectBtn(self.btnStart, Language[11097]) --self.curLiveObj = self:LoadHerolive(heroConFigData,self.curObj) self.dragView:SetDragGO(this.curLiveObj) + + self.bgImage.sprite = Util.LoadSprite(HeroPanelBgByPropertyName[heroConFigData.PropertyName]) end --展示英雄信息 第一个参数1 属性面板 2 故事面板 第二个参数 1初始 2 6星和10星 第三个参数 显示星级 function HandBookHeroInfoPanel:OnShowHeroData(_type,_starType,_star) + + self.bgImage.sprite = Util.LoadSprite(HeroPanelBgByPropertyName[heroConFigData.PropertyName]) self.dragView:SetDragGO(this.curLiveObj) type = _type diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index c176c43779..882095b7bb 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -44,6 +44,7 @@ local pinjieImage={"r_hero_pinjiebiao_01","r_hero_pinjiebiao_02"} --该死的品 function RoleInfoPanel:InitComponent() self.BtnBack = Util.GetGameObject(self.transform, "btnBack") + self.bgImage = Util.GetGameObject(self.transform, "bg/di2"):GetComponent("Image") this.optionUp=Util.GetGameObject(self.gameObject,"optionUp")--上部按钮组 this.helpBtn = Util.GetGameObject(this.optionUp, "helpBtn") this.helpPosition=this.helpBtn:GetComponent("RectTransform").localPosition @@ -424,7 +425,8 @@ function this:UpdatePanelData() this.roleInfoLayout:SetActive(true) RoleInfoPanel:SetSelectBtn(self.btnInfo, Language[11836]) return - end + end + self.bgImage.sprite = Util.LoadSprite(HeroPanelBgByPropertyName[curHeroData.heroConfig.PropertyName]) end --更新英雄情报数据 function this:UpdateHeroInfoData()