剧情提交

(cherry picked from commit 6c673de50a)
dev_chengFeng
jiaoyangna 2021-04-30 09:50:35 +08:00
parent dbbf02f48d
commit b3ca5ee026
1 changed files with 24 additions and 9 deletions

View File

@ -277,8 +277,12 @@ function this:CheckTrigger(data,go)
Util.AddParticleSortLayer(this.UI_Effect_ChuFaEffect_05,newSortingOrder - sortingOrder)
this.UI_Effect_ChuFaEffect_02.gameObject:SetActive(true)
Timer.New(function()
this.UI_Effect_ChuFaEffect_02.gameObject:SetActive(false)
this.UI_Effect_ChuFaEffect_05.gameObject:SetActive(true)
if this.UI_Effect_ChuFaEffect_02 then
this.UI_Effect_ChuFaEffect_02.gameObject:SetActive(false)
end
if this.UI_Effect_ChuFaEffect_05 then
this.UI_Effect_ChuFaEffect_05.gameObject:SetActive(true)
end
end,data.groups[1],1,false):Start()
Timer.New(function()
@ -288,7 +292,9 @@ function this:CheckTrigger(data,go)
end,(data.groups[1] + 0.5),1,false):Start()
Timer.New(function()
this.UI_Effect_ChuFaEffect_05.gameObject:SetActive(false)
if this.UI_Effect_ChuFaEffect_05 then
this.UI_Effect_ChuFaEffect_05.gameObject:SetActive(false)
end
this.btnSkipBtnComp.enabled = true
this:StackPop()
end,(data.groups[1] + 0.5 + 1),1,false):Start()
@ -312,11 +318,15 @@ function this:CheckTrigger(data,go)
this.effectBrowList[v].gameObject:SetActive(false)
end
end
for k,v in pairs(this.effectBrowList) do
Util.AddParticleSortLayer(v,newSortingOrder - sortingOrder)
end
local indexTemp = 0
Timer.New(function()
indexTemp = indexTemp + 1
Util.AddParticleSortLayer(this.effectBrowList[tempList[indexTemp]],newSortingOrder - sortingOrder)
this.effectBrowList[tempList[indexTemp]].gameObject:SetActive(true)
if this.effectBrowList[tempList[indexTemp]] then
this.effectBrowList[tempList[indexTemp]].gameObject:SetActive(true)
end
local index = 0
if tempList[indexTemp] < 5 then
index = tempList[indexTemp]
@ -341,7 +351,6 @@ function this:CheckTrigger(data,go)
for k,v in pairs(this.effectBrowList) do
v.gameObject:SetActive(false)
end
if not this.UI_Effect_ChuFaEffect_03 then
this.UI_Effect_ChuFaEffect_03 = poolManager:LoadAsset("UI_Effect_ChuFaEffect_03", PoolManager.AssetType.GameObject)
this.UI_Effect_ChuFaEffect_03.name = "UI_Effect_ChuFaEffect_03"
@ -390,7 +399,9 @@ function this:CheckTrigger(data,go)
this.UI_Effect_ChuFaEffect_04.gameObject:SetActive(true)
elseif data.eventType == 12 then --光芒四射的特效
--设置上一个特效为false
this.UI_Effect_ChuFaEffect_06.gameObject:SetActive(false)
if this.UI_Effect_ChuFaEffect_06 then
this.UI_Effect_ChuFaEffect_06.gameObject:SetActive(false)
end
--加载光芒四射的特效
if not this.UI_Effect_ChuFaEffect_07 then
this.UI_Effect_ChuFaEffect_07 = poolManager:LoadAsset("UI_Effect_ChuFaEffect_07", PoolManager.AssetType.GameObject)
@ -404,8 +415,12 @@ function this:CheckTrigger(data,go)
this.eventIndex = 0
this.btnSkipBtnComp.enabled = false
Timer.New(function()
this.UI_Effect_ChuFaEffect_04.gameObject:SetActive(false)
this.UI_Effect_ChuFaEffect_07.gameObject:SetActive(false)
if this.UI_Effect_ChuFaEffect_04 then
this.UI_Effect_ChuFaEffect_04.gameObject:SetActive(false)
end
if this.UI_Effect_ChuFaEffect_07 then
this.UI_Effect_ChuFaEffect_07.gameObject:SetActive(false)
end
this.btnSkipBtnComp.enabled = true
this:StackPop()
end,data.groups[1],1,false):Start()