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

fix bug

Browse Source
This commit is contained in:
puxuan 2025-08-22 10:55:23 +08:00
parent 2feb1b76e2
commit 25b80d6f67
6 changed files with 48 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lua/app/global/global_const.lua
View File

@ -235,7 +235,7 @@ GConst.ATLAS_PATH = {
UI_MAIL = "assets/arts/atlas/ui/mail.asset", UI_MAIL = "assets/arts/atlas/ui/mail.asset",
UI_DUGEON_ARMOR = "assets/arts/atlas/ui/dungeon_armor.asset", UI_DUGEON_ARMOR = "assets/arts/atlas/ui/dungeon_armor.asset",
ACT_SUMMER = "assets/arts/atlas/ui/act_summer.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_HEROFUND = "assets/arts/atlas/ui/act_herofund.asset",
ACT_BOSS_RUSH = "assets/arts/atlas/ui/act_bossrush.asset", ACT_BOSS_RUSH = "assets/arts/atlas/ui/act_bossrush.asset",
UI_CHAPTER = "assets/arts/atlas/ui/chapter.asset", UI_CHAPTER = "assets/arts/atlas/ui/chapter.asset",

4
lua/app/ui/activity/cell/activity_task_cell.lua
View File

@ -1,10 +1,10 @@
local ActivityTaskCell = class("ActivityTaskCell", BaseCell) local ActivityTaskCell = class("ActivityTaskCell", BaseCell)
local TASK_BG = { 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"}, {GConst.ATLAS_PATH.ACT_SUMMER, "act_summer_bg_2"},
} }
local TASK_ICON_BG = { 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"}, {GConst.ATLAS_PATH.ACT_SUMMER, "act_summer_board_1"},
} }

10
lua/app/ui/arena/arena_ui.lua
View File

@ -242,11 +242,11 @@ function ArenaUI:refreshInfo()
end end
self.spineRoot:removeAllChildren() self.spineRoot:removeAllChildren()
-- SpineManager:loadUISpineWidgetAsync(gradingIconName.."_spine", self.spineRoot, function(spineObject) SpineManager:loadUISpineWidgetAsync(gradingIconName.."_spine", self.spineRoot, function(spineObject)
-- self.spineGrading = spineObject self.spineGrading = spineObject
-- self.spineGrading:setSkin(gradingNumName) self.spineGrading:setSkin(gradingNumName)
-- self.spineGrading:playAnim("idle", true) self.spineGrading:playAnim("idle", true)
-- end) end)
end end
function ArenaUI:refreshRightBtns() function ArenaUI:refreshRightBtns()

10
lua/app/ui/arena/cell/arena_grading_reward_cell.lua
View File

@ -52,12 +52,12 @@ function ArenaGradingRewardCell:refresh(id)
-- Logger.logHighlight(id.."当前进度:"..cfg.score.."/" .. curProg .."/"..maxProg) -- Logger.logHighlight(id.."当前进度:"..cfg.score.."/" .. curProg .."/"..maxProg)
-- self.spineGradingRoot:removeAllChildren() self.spineGradingRoot:removeAllChildren()
local gradingId = DataManager.ArenaData:getGradingIdFromScore(cfg.score) local gradingId = DataManager.ArenaData:getGradingIdFromScore(cfg.score)
-- SpineManager:loadUISpineWidgetAsync(DataManager.ArenaData:getGradingIconName(gradingId).."_spine", self.spineGradingRoot, function(spineObject) SpineManager:loadUISpineWidgetAsync(DataManager.ArenaData:getGradingIconName(gradingId).."_spine", self.spineGradingRoot, function(spineObject)
-- spineObject:setSkin(DataManager.ArenaData:getGradingNumName(gradingId)) spineObject:setSkin(DataManager.ArenaData:getGradingNumName(gradingId))
-- spineObject:playAnim("idle", true) spineObject:playAnim("idle", true)
-- end) end)
self.txGrading:setText(DataManager.ArenaData:getGradingName(gradingId)) self.txGrading:setText(DataManager.ArenaData:getGradingName(gradingId))
self.baseObject:setSizeDeltaY(DataManager.ArenaData:getGradingRewardItemHeight(self.id)) self.baseObject:setSizeDeltaY(DataManager.ArenaData:getGradingRewardItemHeight(self.id))

66
lua/app/ui/battle/battle_result_ui.lua
View File

@ -76,13 +76,13 @@ function BattleResultUI:onLoadRootComplete()
self.victoryNode = uiMap["battle_result_ui.victory_node"] self.victoryNode = uiMap["battle_result_ui.victory_node"]
self.victoryMask = uiMap["battle_result_ui.mask_v"] self.victoryMask = uiMap["battle_result_ui.mask_v"]
self.victoryTxTitle = uiMap["battle_result_ui.victory_node.title_bg.desc"] 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.victoryUnitNode = uiMap["battle_result_ui.victory_node.unit_node"]
-- 失败节点 -- 失败节点
self.defeatNode = uiMap["battle_result_ui.defeat_node"] self.defeatNode = uiMap["battle_result_ui.defeat_node"]
self.defeatMask = uiMap["battle_result_ui.mask_d"] self.defeatMask = uiMap["battle_result_ui.mask_d"]
self.defeatTxTitle = uiMap["battle_result_ui.defeat_node.title_bg.desc"] 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.defeatUnitNode = uiMap["battle_result_ui.defeat_node.unit_node"]
-- 战斗信息 -- 战斗信息
self.unitNode = uiMap["battle_result_ui.unit_node"] self.unitNode = uiMap["battle_result_ui.unit_node"]
@ -158,9 +158,9 @@ function BattleResultUI:refreshVictoryNode()
-- self.unitImgReportD:setVisible(false) -- self.unitImgReportD:setVisible(false)
self.victoryTxTitle:setText(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_5)) self.victoryTxTitle:setText(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_5))
-- self.victorySpine:playAnimComplete("born", false, true, function() self.victorySpine:playAnimComplete("open", false, true, function()
-- self.victorySpine:playAnim("idle", true, true) self.victorySpine:playAnim("idle", true, true)
-- end) end)
if self.battleType == GConst.BattleConst.BATTLE_TYPE.ARENA then if self.battleType == GConst.BattleConst.BATTLE_TYPE.ARENA then
self:showNodeAnim(self.victoryUnitNode, self.arenaNode) self:showNodeAnim(self.victoryUnitNode, self.arenaNode)
@ -176,9 +176,9 @@ function BattleResultUI:refreshDefeatNode()
-- self.unitImgReportD:setVisible(true) -- self.unitImgReportD:setVisible(true)
self.defeatTxTitle:setText(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_6)) self.defeatTxTitle:setText(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_6))
-- self.defeatSpine:playAnimComplete("born", false, true, function() self.defeatSpine:playAnimComplete("open", false, true, function()
-- self.defeatSpine:playAnim("idle", true, true) self.defeatSpine:playAnim("idle", true, true)
-- end) end)
if self.battleType == GConst.BattleConst.BATTLE_TYPE.ARENA then if self.battleType == GConst.BattleConst.BATTLE_TYPE.ARENA then
self:showNodeAnim(self.defeatUnitNode, self.arenaNode) self:showNodeAnim(self.defeatUnitNode, self.arenaNode)
@ -310,31 +310,31 @@ function BattleResultUI:refreshArenaGradingSpine(gradingId, isUp)
return return
end end
-- if self.arenaSpine then if self.arenaSpine then
-- self.arenaSpine:playAnimComplete("vanish", false, false, function() self.arenaSpine:playAnimComplete("vanish", false, false, function()
-- if self.arenaSpine then if self.arenaSpine then
-- self.arenaSpine:destroy() self.arenaSpine:destroy()
-- self.arenaSpine = nil self.arenaSpine = nil
-- self:refreshArenaGradingSpine(gradingId, isUp) self:refreshArenaGradingSpine(gradingId, isUp)
-- end end
-- end) end)
-- else else
-- SpineManager:loadUISpineWidgetAsync(DataManager.ArenaData:getGradingIconName(gradingId).."_spine", self.arenaSpineRoot, function(spineObject) SpineManager:loadUISpineWidgetAsync(DataManager.ArenaData:getGradingIconName(gradingId).."_spine", self.arenaSpineRoot, function(spineObject)
-- self.arenaSpine = spineObject self.arenaSpine = spineObject
-- self.arenaSpine:setLocalScale(0.8, 0.8, 1) self.arenaSpine:setLocalScale(0.8, 0.8, 1)
-- self.arenaSpine:setSkin(DataManager.ArenaData:getGradingNumName(gradingId)) self.arenaSpine:setSkin(DataManager.ArenaData:getGradingNumName(gradingId))
-- self.arenaSpine:playAnimComplete("born", false, false, function() self.arenaSpine:playAnimComplete("born", false, false, function()
-- if self.arenaSpine then if self.arenaSpine then
-- self.arenaSpine:playAnim("idle", true, false) self.arenaSpine:playAnim("idle", true, false)
-- end end
-- end) end)
-- end) end)
-- if isUp then 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) 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() obj:play()
-- end) end)
-- end end
-- end end
end end
function BattleResultUI:refreshRewards() function BattleResultUI:refreshRewards()

2
lua/app/ui/task/cell/daily_task_cell.lua
View File

@ -41,6 +41,7 @@ function DailyTaskCell:refresh(taskId)
self.getBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_1") self.getBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_1")
-- self.nameTx:setText("<color=#574A40>" .. GFunc.getTaskDesc(self.taskType, taskTarget) .. "</color>") -- self.nameTx:setText("<color=#574A40>" .. GFunc.getTaskDesc(self.taskType, taskTarget) .. "</color>")
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 else
-- 未完成 or 可领取 -- 未完成 or 可领取
-- self.mask:setActive(false) -- self.mask:setActive(false)
@ -55,6 +56,7 @@ function DailyTaskCell:refresh(taskId)
self.getBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_21)) self.getBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_21))
self.getBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_yellow_1") self.getBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_yellow_1")
end end
self.baseObject:setSprite(GConst.ATLAS_PATH.UI_TASK, "task_bg_2")
end end
end end