Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2021-11-05 18:14:57 +08:00
commit 637defb9e2
1 changed files with 4 additions and 2 deletions

View File

@ -74,15 +74,16 @@ function PlayerView:onCreate(go, role, position, root)
self.elementImg.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(role.roleData.element))
self.bg1.sprite = self.spLoader:LoadSprite(GetBattleHeroCardStarBg[role.roleData.star])
self.bg2.sprite = self.spLoader:LoadSprite(GetHeroCardStarFg[role.roleData.star])
local starGrid = Util.GetGameObject(go, "StarGrid")
self.starGrid = Util.GetGameObject(go, "StarGrid")
local star = role.roleData.star or 5
local starType = 1
if role.roleData.godSoulLv and role.roleData.godSoulLv > 0 then
star = role.roleData.godSoulLv
starType = 3
self.bg2.sprite = self.spLoader:LoadSprite("t_zhandoukuang_zhuangshi006")
-- self.starGrid:GetComponent("Image").enabled = false
end
SetCardStars(starGrid, star,starType)
SetCardStars(self.starGrid, star, starType)
local zs = Util.GetGameObject(go, "zs")
local zsName = GetHeroCardStarZs[role.roleData.star]
if zsName == "" then
@ -210,6 +211,7 @@ function PlayerView:ChangeCardSorting(sortingOrder)
self.effect_dead:GetComponent("Canvas").sortingOrder = sortingOrder
Util.AddParticleSortLayer(self.effect_rage, sortingOrder - self.oSortingOrder)
Util.AddParticleSortLayer(self.effect_dead, sortingOrder - self.oSortingOrder)
Util.SetParticleSortLayer(self.starGrid, sortingOrder + 1)
self.oSortingOrder = sortingOrder
end