From e2fae0cc523cba7e97cdac451d198da269bb03fb Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 6 Nov 2020 09:37:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9A=AE=E8=82=A4=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/functions.lua | 10 ++++++++++ .../~Lua/Message/MapInfoProto_pb.lua | 13 ++++++++++++- .../~Lua/Modules/Arena/View/ArenaView.lua | 2 +- .../Modules/ArenaTopMatch/View/ATM_CommonInfo.lua | 10 ++++++++-- .../ArenaTopMatch/View/ATM_MainMatchView.lua | 2 +- .../~Lua/Modules/Map/ShowEnemyInfoPanel.lua | 9 +++++++-- .../~Lua/Modules/Map/TrialMapPanel.lua | 8 +++++++- .../~Lua/Modules/Popup/PlayerInfoPopup.lua | 13 +++++++------ .../~Lua/Modules/SoulPrint/SoulPrintPanel.lua | 5 +++-- 9 files changed, 56 insertions(+), 16 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index f82b0da42d..c393617a28 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -1644,4 +1644,14 @@ function SubString(inputstr,num) end end return str +end + +function SetHeroIcon(heroData,icon,heroConfig) + LogGreen("heroData.skinId:"..tostring(heroData.skinId)) + if not heroData.skinId or heroData.skinId == 0 then + icon.sprite = Util.LoadSprite(GetResourcePath(heroConfig.Icon)) + else + local heroSkinconfig = ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",heroData.skinId) + icon.sprite = Util.LoadSprite(GetResourcePath(heroSkinconfig.Icon)) + end end \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua index d9e1474cd6..0d296a8591 100644 --- a/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua @@ -14,6 +14,7 @@ TRIALHEROINFO_TMPID_FIELD = protobuf.FieldDescriptor(); TRIALHEROINFO_STAR_FIELD = protobuf.FieldDescriptor(); TRIALHEROINFO_HEROHP_FIELD = protobuf.FieldDescriptor(); TRIALHEROINFO_LEVEL_FIELD = protobuf.FieldDescriptor(); +TRIALHEROINFO_SKINID_FIELD = protobuf.FieldDescriptor(); DIFFICULTMAPOPTION = protobuf.Descriptor(); DIFFICULTMAPOPTION_ID_FIELD = protobuf.FieldDescriptor(); DIFFICULTMAPOPTION_MAPDIFFICULTY_FIELD = protobuf.FieldDescriptor(); @@ -318,11 +319,21 @@ TRIALHEROINFO_LEVEL_FIELD.default_value = 0 TRIALHEROINFO_LEVEL_FIELD.type = 5 TRIALHEROINFO_LEVEL_FIELD.cpp_type = 1 +TRIALHEROINFO_SKINID_FIELD.name = "skinId" +TRIALHEROINFO_SKINID_FIELD.full_name = ".com.ljsd.jieling.protocols.TrialHeroInfo.skinId" +TRIALHEROINFO_SKINID_FIELD.number = 6 +TRIALHEROINFO_SKINID_FIELD.index = 5 +TRIALHEROINFO_SKINID_FIELD.label = 1 +TRIALHEROINFO_SKINID_FIELD.has_default_value = false +TRIALHEROINFO_SKINID_FIELD.default_value = 0 +TRIALHEROINFO_SKINID_FIELD.type = 5 +TRIALHEROINFO_SKINID_FIELD.cpp_type = 1 + TRIALHEROINFO.name = "TrialHeroInfo" TRIALHEROINFO.full_name = ".com.ljsd.jieling.protocols.TrialHeroInfo" TRIALHEROINFO.nested_types = {} TRIALHEROINFO.enum_types = {} -TRIALHEROINFO.fields = {TRIALHEROINFO_HEROID_FIELD, TRIALHEROINFO_TMPID_FIELD, TRIALHEROINFO_STAR_FIELD, TRIALHEROINFO_HEROHP_FIELD, TRIALHEROINFO_LEVEL_FIELD} +TRIALHEROINFO.fields = {TRIALHEROINFO_HEROID_FIELD, TRIALHEROINFO_TMPID_FIELD, TRIALHEROINFO_STAR_FIELD, TRIALHEROINFO_HEROHP_FIELD, TRIALHEROINFO_LEVEL_FIELD, TRIALHEROINFO_SKINID_FIELD} TRIALHEROINFO.is_extendable = false TRIALHEROINFO.extensions = {} DIFFICULTMAPOPTION_ID_FIELD.name = "Id" diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua index ad04808bf3..b4e52bd8b0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua @@ -246,7 +246,7 @@ function this.RefreshDefendFormation() SetHeroStars(Util.GetGameObject(heroGo, "starGrid"), heroData.star,1) local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroData.id) Util.GetGameObject(this.Demons[hero.position], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(heroConfig.Quality, heroData.star)) - Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroConfig.Icon)) + Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(heroData.icon) Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) end diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua index dfe410f48a..a0921565dd 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua @@ -265,7 +265,13 @@ function this.FreshTeam(formation, isBlue) local demonId = heroData.heroTid local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId) Util.GetGameObject(teamRoot[heroData.position], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star)) - Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroConfig.Icon)) + -- if not heroData.skinId or heroData.skinId == 0 then + -- Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroConfig.Icon)) + -- else + -- local heroSkinconfig = ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",heroData.skinId) + -- Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroSkinconfig.Icon)) + -- end + SetHeroIcon(heroData,Util.GetGameObject(heroGo, "icon"):GetComponent("Image"),heroConfig) Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) end end @@ -284,7 +290,7 @@ function this.FreshTeam2(formation, isBlue) SetHeroStars(Util.GetGameObject(heroGo, "starGrid"), heroData.star,1) local heroConfig = heroData.heroConfig Util.GetGameObject(teamRoot[formation.teamHeroInfos[i].position], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star)) - Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroConfig.Icon)) + Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(heroData.icon) Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) end end diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua index bfde7bb0ad..4484402a73 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua @@ -242,7 +242,7 @@ function this.FreshTeam() local demonId = heroData.id local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId) Util.GetGameObject(this.myBaby[hero.position], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star)) - Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroConfig.Icon)) + Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(heroData.icon) Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua index 1c816d54d8..b086c6b85c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua @@ -177,14 +177,19 @@ function this.SetSelectHero() local choosed=Util.GetGameObject(item,"choosed") local hpExp=Util.GetGameObject(item,"hpExp"):GetComponent("Slider") frame.sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[value.tmpId].Quality,value.star)) - icon.sprite= Util.LoadSprite(GetResourcePath(heroConfig[value.tmpId].Icon)) + -- if not value.skinId or value.skinId == 0 then + -- icon.sprite= Util.LoadSprite(GetResourcePath(heroConfig[value.tmpId].Icon)) + -- else + -- local heroSkinData = ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",value.skinId) + -- icon.sprite= Util.LoadSprite(GetResourcePath(heroSkinData.Icon)) + -- end + SetHeroIcon(value,icon,heroConfig[value.tmpId]) pro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig[value.tmpId].PropertyName)) lv.text=value.level SetHeroStars(star, value.star) --选择 choosed:SetActive(MapTrialManager.selectHeroDid==value.heroId) - Util.AddOnceClick(item,function() if value.heroHp>0 then closeChoosed() diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua index 8fca712a02..e7db1664aa 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua @@ -519,7 +519,13 @@ function this.SetSelectHero(isFirstIn,isFirstData,isMainIn) local choosed=Util.GetGameObject(o,"choosed") local hpExp=Util.GetGameObject(o,"hpExp"):GetComponent("Slider") frame.sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[v.tmpId].Quality, v.star)) - icon.sprite= Util.LoadSprite(GetResourcePath(heroConfig[v.tmpId].Icon)) + -- if not v.skinId or v.skinId == 0 then + -- icon.sprite= Util.LoadSprite(GetResourcePath(heroConfig[v.tmpId].Icon)) + -- else + -- local heroSkinData = ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",v.skinId) + -- icon.sprite= Util.LoadSprite(GetResourcePath(heroSkinData.Icon)) + -- end + SetHeroIcon(v,icon,heroConfig[v.tmpId]) pro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig[v.tmpId].PropertyName)) lv.text=v.level SetHeroStars(star, v.star) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua index aa7dd4bb12..99a9711057 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua @@ -232,12 +232,13 @@ function this.FormationAdapter(teamInfo) Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = hero.level Util.GetGameObject(this.Demons[hero.position], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(heroConfig.Quality, hero.star)) - if hero.skinId == 0 then - Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroConfig.Icon)) - else - local config = ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",hero.skinId) - Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(config.Icon)) - end + -- if hero.skinId == 0 then + -- Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroConfig.Icon)) + -- else + -- local config = ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",hero.skinId) + -- Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(config.Icon)) + -- end + SetHeroIcon(hero,Util.GetGameObject(heroGo, "icon"):GetComponent("Image"),heroConfig) local frameBtn = Util.GetGameObject(this.Demons[hero.position], "frame") local heroData = {} Util.AddOnceClick(frameBtn, function() diff --git a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua index 63efe347a3..6bf861c274 100644 --- a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua @@ -370,9 +370,10 @@ function this.SetScrollPre(root,data) Util.GetGameObject(root,"redPoint"):SetActive(data.isShowRedPot == 1) equipped.gameObject:SetActive(this.GetCurHeroSoulPrintState(data.id)) if data.upHero~="" then - local heroId= HeroManager.GetSingleHeroData(data.upHero).id + local heroData = HeroManager.GetSingleHeroData(data.upHero) + local heroId= heroData.id LogGreen(heroId) - heroIcon.sprite=Util.LoadSprite(GetResourcePath(heroConfig[heroId].Icon)) + heroIcon.sprite=Util.LoadSprite(heroData.icon) end --点击事件(穿戴或替换魂印) Util.AddOnceClick(root,function()