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

dev_chengFeng
gaoxin 2021-05-27 20:45:26 +08:00
commit 38e4008d81
1 changed files with 0 additions and 5 deletions

View File

@ -228,8 +228,6 @@ end
function this.InitGrid()
this.dropGrid:SetActive(#itemDataList <= 25 )
this.dropGridArena:SetActive(#itemDataList > 25 )
-- LogYellow("itemListPrefab "..#itemListPrefab)
-- LogYellow("itemDataList "..#itemDataList)
for i = 1, #itemListPrefab do
itemListPrefab[i].gameObject:SetActive(false)
end
@ -326,9 +324,6 @@ function this.FightLevelShow()
Util.AddParticleSortLayer(starListEffect[i], this.sortingOrder - (sortingOrder - 1))
end
end
for j = 1, 3 do
Util.AddParticleSortLayer(Util.GetGameObject(this.isFirstEffect, "Fx_star_looping ("..j..")"),this.sortingOrder - (sortingOrder - 1))
end
for i = 1, math.max(#condition, #conditionGo) do
local go = conditionGo[i]
if not go then