Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
637defb9e2
|
@ -74,15 +74,16 @@ function PlayerView:onCreate(go, role, position, root)
|
||||||
self.elementImg.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(role.roleData.element))
|
self.elementImg.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(role.roleData.element))
|
||||||
self.bg1.sprite = self.spLoader:LoadSprite(GetBattleHeroCardStarBg[role.roleData.star])
|
self.bg1.sprite = self.spLoader:LoadSprite(GetBattleHeroCardStarBg[role.roleData.star])
|
||||||
self.bg2.sprite = self.spLoader:LoadSprite(GetHeroCardStarFg[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 star = role.roleData.star or 5
|
||||||
local starType = 1
|
local starType = 1
|
||||||
if role.roleData.godSoulLv and role.roleData.godSoulLv > 0 then
|
if role.roleData.godSoulLv and role.roleData.godSoulLv > 0 then
|
||||||
star = role.roleData.godSoulLv
|
star = role.roleData.godSoulLv
|
||||||
starType = 3
|
starType = 3
|
||||||
self.bg2.sprite = self.spLoader:LoadSprite("t_zhandoukuang_zhuangshi006")
|
self.bg2.sprite = self.spLoader:LoadSprite("t_zhandoukuang_zhuangshi006")
|
||||||
|
-- self.starGrid:GetComponent("Image").enabled = false
|
||||||
end
|
end
|
||||||
SetCardStars(starGrid, star,starType)
|
SetCardStars(self.starGrid, star, starType)
|
||||||
local zs = Util.GetGameObject(go, "zs")
|
local zs = Util.GetGameObject(go, "zs")
|
||||||
local zsName = GetHeroCardStarZs[role.roleData.star]
|
local zsName = GetHeroCardStarZs[role.roleData.star]
|
||||||
if zsName == "" then
|
if zsName == "" then
|
||||||
|
@ -210,6 +211,7 @@ function PlayerView:ChangeCardSorting(sortingOrder)
|
||||||
self.effect_dead:GetComponent("Canvas").sortingOrder = sortingOrder
|
self.effect_dead:GetComponent("Canvas").sortingOrder = sortingOrder
|
||||||
Util.AddParticleSortLayer(self.effect_rage, sortingOrder - self.oSortingOrder)
|
Util.AddParticleSortLayer(self.effect_rage, sortingOrder - self.oSortingOrder)
|
||||||
Util.AddParticleSortLayer(self.effect_dead, sortingOrder - self.oSortingOrder)
|
Util.AddParticleSortLayer(self.effect_dead, sortingOrder - self.oSortingOrder)
|
||||||
|
Util.SetParticleSortLayer(self.starGrid, sortingOrder + 1)
|
||||||
self.oSortingOrder = sortingOrder
|
self.oSortingOrder = sortingOrder
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue