puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev

Browse Source
This commit is contained in:
chenxi 2023-05-31 20:54:00 +08:00
commit dfd19f71f4
3 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua/app/bf/unity/ui_spine_object.lua
View File

@ -95,8 +95,8 @@ function UISpineObject:rePlayAnim(animName, loop, forceRefresh)
end end
end end
function UISpineObject:playAnimComplete(animName, loop, forceRefresh, complete) function UISpineObject:playAnimComplete(animName, loop, forceRefresh, complete, forceGetSG)
local spineAnim = self:getAnimation(self:playAnim(animName, loop, forceRefresh)) local spineAnim = self:getAnimation(self:playAnim(animName, loop, forceRefresh, forceGetSG))
local duration = spineAnim.Duration local duration = spineAnim.Duration
local sequence = self:createBindTweenSequence() local sequence = self:createBindTweenSequence()
sequence:AppendInterval(duration) sequence:AppendInterval(duration)

22
lua/app/ui/battle/cell/grid_cell.lua
View File

@ -29,8 +29,25 @@ function GridCell:refresh(gridEntity, curElement, skillPosId)
if self.lastGridType ~= gridEntity:getGridType() then if self.lastGridType ~= gridEntity:getGridType() then
self.lastGridType = gridEntity:getGridType() self.lastGridType = gridEntity:getGridType()
local atlas, icon = gridEntity:getIcon() local spineObj = uiMap["grid_cell.touch_node.ani_node.up_bg.ui_spine_obj"]
uiMap["grid_cell.touch_node.ani_node.up_bg"]:setSprite(atlas, icon) local upBg = uiMap["grid_cell.touch_node.ani_node.up_bg"]
if gridEntity:getSpineAsset() then
spineObj:setActive(true)
spineObj:loadAssetAsync(gridEntity:getSpineAsset(), function()
if gridEntity:getSpineChangeName() then
spineObj:playAnimComplete(gridEntity:getSpineChangeName(), false, true, function()
spineObj:playAnim(gridEntity:getSpineIdleName(), true, false, true)
end, true)
else
spineObj:playAnim(gridEntity:getSpineIdleName(), true, false, true)
end
end)
upBg:setSprite(GConst.ATLAS_PATH.COMMON, "common_alpha")
else
spineObj:setActive(false)
local atlas, icon = gridEntity:getIcon()
upBg:setSprite(atlas, icon)
end
end end
local skillIcon = uiMap["grid_cell.touch_node.ani_node.skill_icon"] local skillIcon = uiMap["grid_cell.touch_node.ani_node.skill_icon"]
@ -219,6 +236,7 @@ end
function GridCell:setGridTypeIcon(icon) function GridCell:setGridTypeIcon(icon)
local uiMap = self:getUIMap() local uiMap = self:getUIMap()
uiMap["grid_cell.touch_node.ani_node.up_bg"]:setSprite(GConst.ATLAS_PATH.BATTLE, icon) uiMap["grid_cell.touch_node.ani_node.up_bg"]:setSprite(GConst.ATLAS_PATH.BATTLE, icon)
uiMap["grid_cell.touch_node.ani_node.up_bg.ui_spine_obj"]:setActive(false)
end end
return GridCell return GridCell

12
lua/app/userdata/battle/battle_grid_entity.lua
View File

@ -394,4 +394,16 @@ function BattleGridEntity:getBreakFlyToCharacterIcon()
return self:getGridTypeConfig().bftc_icon return self:getGridTypeConfig().bftc_icon
end end
function BattleGridEntity:getSpineAsset()
return self:getGridTypeConfig().spine_name
end
function BattleGridEntity:getSpineIdleName()
return self:getGridTypeConfig().spine_idle
end
function BattleGridEntity:getSpineChangeName()
return self:getGridTypeConfig().spine_change
end
return BattleGridEntity return BattleGridEntity