diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua index e617cd71..40fb9a78 100644 --- a/lua/app/global/global_const.lua +++ b/lua/app/global/global_const.lua @@ -235,7 +235,7 @@ GConst.ATLAS_PATH = { UI_MAIL = "assets/arts/atlas/ui/mail.asset", UI_DUGEON_ARMOR = "assets/arts/atlas/ui/dungeon_armor.asset", ACT_SUMMER = "assets/arts/atlas/ui/act_summer.asset", - TASK = "assets/arts/atlas/ui/task.asset", + UI_TASK = "assets/arts/atlas/ui/task.asset", ACT_HEROFUND = "assets/arts/atlas/ui/act_herofund.asset", ACT_BOSS_RUSH = "assets/arts/atlas/ui/act_bossrush.asset", UI_CHAPTER = "assets/arts/atlas/ui/chapter.asset", diff --git a/lua/app/ui/activity/cell/activity_task_cell.lua b/lua/app/ui/activity/cell/activity_task_cell.lua index 271fdf6d..1b43879a 100644 --- a/lua/app/ui/activity/cell/activity_task_cell.lua +++ b/lua/app/ui/activity/cell/activity_task_cell.lua @@ -1,10 +1,10 @@ local ActivityTaskCell = class("ActivityTaskCell", BaseCell) local TASK_BG = { - {GConst.ATLAS_PATH.TASK, "task_bg_2"}, + {GConst.ATLAS_PATH.UI_TASK, "task_bg_2"}, {GConst.ATLAS_PATH.ACT_SUMMER, "act_summer_bg_2"}, } local TASK_ICON_BG = { - {GConst.ATLAS_PATH.TASK, "task_bg_4"}, + {GConst.ATLAS_PATH.UI_TASK, "task_bg_4"}, {GConst.ATLAS_PATH.ACT_SUMMER, "act_summer_board_1"}, } diff --git a/lua/app/ui/arena/arena_ui.lua b/lua/app/ui/arena/arena_ui.lua index 78f3a8cd..e7dba236 100644 --- a/lua/app/ui/arena/arena_ui.lua +++ b/lua/app/ui/arena/arena_ui.lua @@ -242,11 +242,11 @@ function ArenaUI:refreshInfo() end self.spineRoot:removeAllChildren() - -- SpineManager:loadUISpineWidgetAsync(gradingIconName.."_spine", self.spineRoot, function(spineObject) - -- self.spineGrading = spineObject - -- self.spineGrading:setSkin(gradingNumName) - -- self.spineGrading:playAnim("idle", true) - -- end) + SpineManager:loadUISpineWidgetAsync(gradingIconName.."_spine", self.spineRoot, function(spineObject) + self.spineGrading = spineObject + self.spineGrading:setSkin(gradingNumName) + self.spineGrading:playAnim("idle", true) + end) end function ArenaUI:refreshRightBtns() diff --git a/lua/app/ui/arena/cell/arena_grading_reward_cell.lua b/lua/app/ui/arena/cell/arena_grading_reward_cell.lua index 897c5717..bef54e0f 100644 --- a/lua/app/ui/arena/cell/arena_grading_reward_cell.lua +++ b/lua/app/ui/arena/cell/arena_grading_reward_cell.lua @@ -52,12 +52,12 @@ function ArenaGradingRewardCell:refresh(id) -- Logger.logHighlight(id.."当前进度:"..cfg.score.."/" .. curProg .."/"..maxProg) - -- self.spineGradingRoot:removeAllChildren() + self.spineGradingRoot:removeAllChildren() local gradingId = DataManager.ArenaData:getGradingIdFromScore(cfg.score) - -- SpineManager:loadUISpineWidgetAsync(DataManager.ArenaData:getGradingIconName(gradingId).."_spine", self.spineGradingRoot, function(spineObject) - -- spineObject:setSkin(DataManager.ArenaData:getGradingNumName(gradingId)) - -- spineObject:playAnim("idle", true) - -- end) + SpineManager:loadUISpineWidgetAsync(DataManager.ArenaData:getGradingIconName(gradingId).."_spine", self.spineGradingRoot, function(spineObject) + spineObject:setSkin(DataManager.ArenaData:getGradingNumName(gradingId)) + spineObject:playAnim("idle", true) + end) self.txGrading:setText(DataManager.ArenaData:getGradingName(gradingId)) self.baseObject:setSizeDeltaY(DataManager.ArenaData:getGradingRewardItemHeight(self.id)) diff --git a/lua/app/ui/battle/battle_result_ui.lua b/lua/app/ui/battle/battle_result_ui.lua index 031ef77d..0e24e641 100644 --- a/lua/app/ui/battle/battle_result_ui.lua +++ b/lua/app/ui/battle/battle_result_ui.lua @@ -76,13 +76,13 @@ function BattleResultUI:onLoadRootComplete() self.victoryNode = uiMap["battle_result_ui.victory_node"] self.victoryMask = uiMap["battle_result_ui.mask_v"] self.victoryTxTitle = uiMap["battle_result_ui.victory_node.title_bg.desc"] - -- self.victorySpine = uiMap["battle_result_ui.victory_node.ui_spine_obj"] + self.victorySpine = uiMap["battle_result_ui.victory_node.ui_spine_obj"] self.victoryUnitNode = uiMap["battle_result_ui.victory_node.unit_node"] -- 失败节点 self.defeatNode = uiMap["battle_result_ui.defeat_node"] self.defeatMask = uiMap["battle_result_ui.mask_d"] self.defeatTxTitle = uiMap["battle_result_ui.defeat_node.title_bg.desc"] - -- self.defeatSpine = uiMap["battle_result_ui.defeat_node.ui_spine_obj"] + self.defeatSpine = uiMap["battle_result_ui.defeat_node.ui_spine_obj"] self.defeatUnitNode = uiMap["battle_result_ui.defeat_node.unit_node"] -- 战斗信息 self.unitNode = uiMap["battle_result_ui.unit_node"] @@ -158,9 +158,9 @@ function BattleResultUI:refreshVictoryNode() -- self.unitImgReportD:setVisible(false) self.victoryTxTitle:setText(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_5)) - -- self.victorySpine:playAnimComplete("born", false, true, function() - -- self.victorySpine:playAnim("idle", true, true) - -- end) + self.victorySpine:playAnimComplete("open", false, true, function() + self.victorySpine:playAnim("idle", true, true) + end) if self.battleType == GConst.BattleConst.BATTLE_TYPE.ARENA then self:showNodeAnim(self.victoryUnitNode, self.arenaNode) @@ -176,9 +176,9 @@ function BattleResultUI:refreshDefeatNode() -- self.unitImgReportD:setVisible(true) self.defeatTxTitle:setText(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_6)) - -- self.defeatSpine:playAnimComplete("born", false, true, function() - -- self.defeatSpine:playAnim("idle", true, true) - -- end) + self.defeatSpine:playAnimComplete("open", false, true, function() + self.defeatSpine:playAnim("idle", true, true) + end) if self.battleType == GConst.BattleConst.BATTLE_TYPE.ARENA then self:showNodeAnim(self.defeatUnitNode, self.arenaNode) @@ -310,31 +310,31 @@ function BattleResultUI:refreshArenaGradingSpine(gradingId, isUp) return end - -- if self.arenaSpine then - -- self.arenaSpine:playAnimComplete("vanish", false, false, function() - -- if self.arenaSpine then - -- self.arenaSpine:destroy() - -- self.arenaSpine = nil - -- self:refreshArenaGradingSpine(gradingId, isUp) - -- end - -- end) - -- else - -- SpineManager:loadUISpineWidgetAsync(DataManager.ArenaData:getGradingIconName(gradingId).."_spine", self.arenaSpineRoot, function(spineObject) - -- self.arenaSpine = spineObject - -- self.arenaSpine:setLocalScale(0.8, 0.8, 1) - -- self.arenaSpine:setSkin(DataManager.ArenaData:getGradingNumName(gradingId)) - -- self.arenaSpine:playAnimComplete("born", false, false, function() - -- if self.arenaSpine then - -- self.arenaSpine:playAnim("idle", true, false) - -- end - -- end) - -- end) - -- if isUp then - -- EffectManager:loadUIEffectAsync("assets/prefabs/effects/ui/vfx_ui_".. DataManager.ArenaData:getGradingIconName(gradingId) ..".prefab", self, self.arenaSpineRoot, GConst.UI_EFFECT_ORDER.LEVEL5, function(obj) - -- obj:play() - -- end) - -- end - -- end + if self.arenaSpine then + self.arenaSpine:playAnimComplete("vanish", false, false, function() + if self.arenaSpine then + self.arenaSpine:destroy() + self.arenaSpine = nil + self:refreshArenaGradingSpine(gradingId, isUp) + end + end) + else + SpineManager:loadUISpineWidgetAsync(DataManager.ArenaData:getGradingIconName(gradingId).."_spine", self.arenaSpineRoot, function(spineObject) + self.arenaSpine = spineObject + self.arenaSpine:setLocalScale(0.8, 0.8, 1) + self.arenaSpine:setSkin(DataManager.ArenaData:getGradingNumName(gradingId)) + self.arenaSpine:playAnimComplete("born", false, false, function() + if self.arenaSpine then + self.arenaSpine:playAnim("idle", true, false) + end + end) + end) + if isUp then + EffectManager:loadUIEffectAsync("assets/prefabs/effects/ui/vfx_ui_".. DataManager.ArenaData:getGradingIconName(gradingId) ..".prefab", self, self.arenaSpineRoot, GConst.UI_EFFECT_ORDER.LEVEL5, function(obj) + obj:play() + end) + end + end end function BattleResultUI:refreshRewards() diff --git a/lua/app/ui/task/cell/daily_task_cell.lua b/lua/app/ui/task/cell/daily_task_cell.lua index 6e90e306..6afed56c 100644 --- a/lua/app/ui/task/cell/daily_task_cell.lua +++ b/lua/app/ui/task/cell/daily_task_cell.lua @@ -41,6 +41,7 @@ function DailyTaskCell:refresh(taskId) self.getBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_1") -- self.nameTx:setText("" .. GFunc.getTaskDesc(self.taskType, taskTarget) .. "") self.nameTx:setText(GFunc.getTaskDesc(self.taskType, taskTarget)) + self.baseObject:setSprite(GConst.ATLAS_PATH.UI_TASK, "task_bg_3") else -- 未完成 or 可领取 -- self.mask:setActive(false) @@ -55,6 +56,7 @@ function DailyTaskCell:refresh(taskId) self.getBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_21)) self.getBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_yellow_1") end + self.baseObject:setSprite(GConst.ATLAS_PATH.UI_TASK, "task_bg_2") end end