Merge branch 'dev_hero' into dev_act
This commit is contained in:
commit
4c02e2980a
@ -70,6 +70,8 @@ function SummonMainUI:onLoadRootComplete()
|
|||||||
self.btnWishAddImg = uiMap["summon_main_ui.node.btn_wish.add_img"]
|
self.btnWishAddImg = uiMap["summon_main_ui.node.btn_wish.add_img"]
|
||||||
self.heroNode = uiMap["summon_main_ui.summon_node.hero_node"]
|
self.heroNode = uiMap["summon_main_ui.summon_node.hero_node"]
|
||||||
self.uiNode = uiMap["summon_main_ui.node"]
|
self.uiNode = uiMap["summon_main_ui.node"]
|
||||||
|
self.uiSpineObj = uiMap["summon_main_ui.summon_node.ui_spine_obj"]
|
||||||
|
self.uiSpineObj:playAnim("idle", true, true)
|
||||||
|
|
||||||
self.touchNode = uiMap["summon_main_ui.touch_node"]
|
self.touchNode = uiMap["summon_main_ui.touch_node"]
|
||||||
self.touchNode:setActive(false)
|
self.touchNode:setActive(false)
|
||||||
@ -93,7 +95,7 @@ function SummonMainUI:onLoadRootComplete()
|
|||||||
self.vfx01s = {}
|
self.vfx01s = {}
|
||||||
self.vfx02s = {}
|
self.vfx02s = {}
|
||||||
for i = 1, 4 do
|
for i = 1, 4 do
|
||||||
self.vfxs[i] = uiMap["summon_main_ui.summon_node.vfx_c1_chouka_0" .. i]
|
self.vfxs[i] = uiMap["summon_main_ui.summon_node.node_" .. i .. ".vfx_c1_chouka_0" .. i]
|
||||||
self.vfx01s[i] = uiMap["summon_main_ui.summon_node.vfx_c1_chouka_0" .. i .. "_1"]
|
self.vfx01s[i] = uiMap["summon_main_ui.summon_node.vfx_c1_chouka_0" .. i .. "_1"]
|
||||||
self.vfx02s[i] = uiMap["summon_main_ui.summon_node.vfx_c1_chouka_0" .. i .. "_2"]
|
self.vfx02s[i] = uiMap["summon_main_ui.summon_node.vfx_c1_chouka_0" .. i .. "_2"]
|
||||||
self.vfxs[i]:setActive(false)
|
self.vfxs[i]:setActive(false)
|
||||||
@ -137,7 +139,7 @@ function SummonMainUI:onLoadRootComplete()
|
|||||||
-------------抽奖相关---------
|
-------------抽奖相关---------
|
||||||
self:addEventListener(EventManager.CUSTOM_EVENT.FORCE_SUMMON, function(result, newHero)
|
self:addEventListener(EventManager.CUSTOM_EVENT.FORCE_SUMMON, function(result, newHero)
|
||||||
self:refreshWishBtn()
|
self:refreshWishBtn()
|
||||||
self:onSummonRsp(result, newHero)
|
self:playSummonAni(result, newHero)
|
||||||
end)
|
end)
|
||||||
self:addEventListener(EventManager.CUSTOM_EVENT.FORCE_SUMMON_WISH_CLAIM, function(result, newHero)
|
self:addEventListener(EventManager.CUSTOM_EVENT.FORCE_SUMMON_WISH_CLAIM, function(result, newHero)
|
||||||
self:refreshWishBtn()
|
self:refreshWishBtn()
|
||||||
@ -183,7 +185,6 @@ function SummonMainUI:onLoadRootComplete()
|
|||||||
self:updateTime()
|
self:updateTime()
|
||||||
end, 1)
|
end, 1)
|
||||||
self:updateTime()
|
self:updateTime()
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
--每秒刷新单抽红点
|
--每秒刷新单抽红点
|
||||||
@ -371,6 +372,14 @@ function SummonMainUI:onSummon(count, isAd)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function SummonMainUI:playSummonAni(result, newHero)
|
||||||
|
self.uiSpineObj:setActive(true)
|
||||||
|
self.uiSpineObj:playAnimComplete("open", false, true, function()
|
||||||
|
self.uiSpineObj:setActive(false)
|
||||||
|
self:onSummonRsp(result, newHero)
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
|
||||||
function SummonMainUI:onSummonRsp(result, newHero)
|
function SummonMainUI:onSummonRsp(result, newHero)
|
||||||
self:refreshSummonBtn()
|
self:refreshSummonBtn()
|
||||||
if not result.rewards or not result.rewards[1] then
|
if not result.rewards or not result.rewards[1] then
|
||||||
@ -415,6 +424,9 @@ function SummonMainUI:showHero(idx, newHero)
|
|||||||
self.vfx01s[i]:setActive(false)
|
self.vfx01s[i]:setActive(false)
|
||||||
self.vfx02s[i]:setActive(false)
|
self.vfx02s[i]:setActive(false)
|
||||||
end
|
end
|
||||||
|
self.heroNode:removeAllChildren()
|
||||||
|
self.uiSpineObj:setActive(true)
|
||||||
|
self.uiSpineObj:playAnim("idle", true, true)
|
||||||
ModuleManager.SummonManager:showSummonRewardUI({
|
ModuleManager.SummonManager:showSummonRewardUI({
|
||||||
rewards = self.summonResult,
|
rewards = self.summonResult,
|
||||||
callback = function(count, isAd)
|
callback = function(count, isAd)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user