皮肤提交

dev_chengFeng
jiaoyangna 2020-11-06 09:37:27 +08:00
parent ccf02fb171
commit e2fae0cc52
9 changed files with 56 additions and 16 deletions

View File

@ -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

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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()

View File

@ -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)

View File

@ -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()

View File

@ -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()