Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
commit
14986fb3f5
|
@ -392,6 +392,11 @@ end
|
||||||
function this.SoulPrintInfo()
|
function this.SoulPrintInfo()
|
||||||
local curHeroSoulPrintDatas = {}
|
local curHeroSoulPrintDatas = {}
|
||||||
this.soulPrintInfo.gameObject:SetActive(#curHeroData.soulPrintList~=0)
|
this.soulPrintInfo.gameObject:SetActive(#curHeroData.soulPrintList~=0)
|
||||||
|
for key, value in pairs(soulPrintPreList) do
|
||||||
|
if value then
|
||||||
|
value:SetActive(false)
|
||||||
|
end
|
||||||
|
end
|
||||||
if #curHeroData.soulPrintList==0 then return end
|
if #curHeroData.soulPrintList==0 then return end
|
||||||
|
|
||||||
for i,v in pairs(curHeroData.soulPrintList) do --生成预设
|
for i,v in pairs(curHeroData.soulPrintList) do --生成预设
|
||||||
|
@ -399,13 +404,13 @@ function this.SoulPrintInfo()
|
||||||
soulPrintPreList[i]=newObjToParent(this.soulPrintPre,this.soulPrintGrid)
|
soulPrintPreList[i]=newObjToParent(this.soulPrintPre,this.soulPrintGrid)
|
||||||
end
|
end
|
||||||
soulPrintPreList[i].name="Pre"..i
|
soulPrintPreList[i].name="Pre"..i
|
||||||
|
soulPrintPreList[i]:SetActive(true)
|
||||||
--特效层级重设
|
--特效层级重设
|
||||||
for i=1,#soulPrintPreList do
|
for i=1,#soulPrintPreList do
|
||||||
Util.AddParticleSortLayer(soulPrintPreList[i], this.sortingOrder- orginLayer2)
|
Util.AddParticleSortLayer(soulPrintPreList[i], this.sortingOrder- orginLayer2)
|
||||||
end
|
end
|
||||||
orginLayer2 = this.sortingOrder
|
orginLayer2 = this.sortingOrder
|
||||||
orginLayer=this.sortingOrder
|
orginLayer=this.sortingOrder
|
||||||
|
|
||||||
local frame=Util.GetGameObject(soulPrintPreList[i],"Frame"):GetComponent("Image")
|
local frame=Util.GetGameObject(soulPrintPreList[i],"Frame"):GetComponent("Image")
|
||||||
local icon=Util.GetGameObject(soulPrintPreList[i],"circleFrameBg/Icon"):GetComponent("Image")
|
local icon=Util.GetGameObject(soulPrintPreList[i],"circleFrameBg/Icon"):GetComponent("Image")
|
||||||
|
|
Loading…
Reference in New Issue