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-10-30 16:15:39 +08:00
parent 63e00b46bb
commit 0db96eb021
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua/app/module/dungeon/dungeon_manager.lua
View File

@ -166,14 +166,14 @@ function DungeonManager:sweepDungeonDaily(id)
local dungeonDailyType = DataManager.DungeonDailyData:getDungeonDailyTypeByChapterId(id) local dungeonDailyType = DataManager.DungeonDailyData:getDungeonDailyTypeByChapterId(id)
if dungeonDailyType == GConst.DungeonConst.DUNGEON_DAILY_TYPE.GOLD then if dungeonDailyType == GConst.DungeonConst.DUNGEON_DAILY_TYPE.GOLD then
local remainTimes = DataManager.DungeonDailyData.GoldData:getTodayRemainTimes() local remainTimes = DataManager.DungeonDailyData.GoldData:getTodayRemainTimes()
local ticketCount = DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.DUNGEON_TICKET_1) local ticketCount = DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_DUNGEON_TICKET_1)
if remainTimes <= 0 and ticketCount <= 0 then if remainTimes <= 0 and ticketCount <= 0 then
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1)) GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1))
return return
end end
elseif dungeonDailyType == GConst.DungeonConst.DUNGEON_DAILY_TYPE.MATERIAL then elseif dungeonDailyType == GConst.DungeonConst.DUNGEON_DAILY_TYPE.MATERIAL then
local remainTimes = DataManager.DungeonDailyData.MaterialData:getTodayRemainTimes() local remainTimes = DataManager.DungeonDailyData.MaterialData:getTodayRemainTimes()
local ticketCount = DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.DUNGEON_TICKET_2) local ticketCount = DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_DUNGEON_TICKET_2)
if remainTimes <= 0 and ticketCount <= 0 then if remainTimes <= 0 and ticketCount <= 0 then
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1)) GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1))
return return

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

@ -437,14 +437,16 @@ function BattleResultUI:refreshUnitInfo()
local iconName = "common_dec_3" local iconName = "common_dec_3"
if self.battleType == GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD then if self.battleType == GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD then
iconName = "common_dec_15" iconName = "common_dec_3"
local round = self.remainRound or 0 local round = self.remainRound or 0
self.unitTxDesc2:setText(round) self.unitTxDesc2:setText(round)
self.unitTxDesc1:setText(I18N:getGlobalText(I18N.GlobalConst.ROUND_LEFT)) self.unitTxDesc1:setText(I18N:getGlobalText(I18N.GlobalConst.ROUND_LEFT))
else else
self.unitTxDesc1:setText(GConst.EMPTY_STRING) self.unitTxDesc1:setText(GConst.EMPTY_STRING)
end end
self.unitImgBattleIcon:setSprite(GConst.ATLAS_PATH.COMMON, iconName) self.unitImgBattleIcon:setSprite(GConst.ATLAS_PATH.COMMON, iconName, function()
self.unitImgBattleIcon:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE):SetNativeSize()
end)
GFunc.centerImgAndTx(self.unitImgBattleIcon, self.unitTxDesc2, 7) GFunc.centerImgAndTx(self.unitImgBattleIcon, self.unitTxDesc2, 7)
end end

12
lua/app/ui/dungeon/cell/dungeon_gold_cell.lua
View File

@ -6,12 +6,12 @@ function DungeonGoldCell:init()
self.challengeBtn = uiMap["gold_cell.challenge_btn"] self.challengeBtn = uiMap["gold_cell.challenge_btn"]
self.challengeBtn:addClickListener(function() self.challengeBtn:addClickListener(function()
if self.chapterId then if self.chapterId then
local remainTimes = DataManager.DungeonDailyData.GoldData:getTodayRemainTimes() -- local remainTimes = DataManager.DungeonDailyData.GoldData:getTodayRemainTimes()
local ticketCount = DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_DUNGEON_TICKET_1) -- local ticketCount = DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_DUNGEON_TICKET_1)
if remainTimes <= 0 and ticketCount <= 0 then -- if remainTimes <= 0 and ticketCount <= 0 then
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1)) -- GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1))
return -- return
end -- end
-- ModuleManager.ChapterManager:showMainBattleEntryUI(ModuleManager.BattleManager.BATTLE_TYPE.DUNGEON,function() -- ModuleManager.ChapterManager:showMainBattleEntryUI(ModuleManager.BattleManager.BATTLE_TYPE.DUNGEON,function()
-- self:OnClickStrtGame() -- self:OnClickStrtGame()
-- end, self.chapterId, false, GConst.DungeonConst.DUNGEON_DAILY_TYPE.GOLD) -- end, self.chapterId, false, GConst.DungeonConst.DUNGEON_DAILY_TYPE.GOLD)

12
lua/app/ui/dungeon/cell/dungeon_material_cell.lua
View File

@ -6,12 +6,12 @@ function DungeonMaterialCell:init()
self.challengeBtn = uiMap["material_cell.challenge_btn"] self.challengeBtn = uiMap["material_cell.challenge_btn"]
self.challengeBtn:addClickListener(function() self.challengeBtn:addClickListener(function()
if self.chapterId then if self.chapterId then
local remainTimes = DataManager.DungeonDailyData.MaterialData:getTodayRemainTimes() -- local remainTimes = DataManager.DungeonDailyData.MaterialData:getTodayRemainTimes()
local ticketCount = DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_DUNGEON_TICKET_2) -- local ticketCount = DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_DUNGEON_TICKET_2)
if remainTimes <= 0 and ticketCount <= 0 then -- if remainTimes <= 0 and ticketCount <= 0 then
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1)) -- GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1))
return -- return
end -- end
-- ModuleManager.ChapterManager:showMainBattleEntryUI(ModuleManager.BattleManager.BATTLE_TYPE.DUNGEON,function() -- ModuleManager.ChapterManager:showMainBattleEntryUI(ModuleManager.BattleManager.BATTLE_TYPE.DUNGEON,function()
-- self:OnClickStrtGame() -- self:OnClickStrtGame()
-- end, self.chapterId, false, GConst.DungeonConst.DUNGEON_DAILY_TYPE.MATERIAL) -- end, self.chapterId, false, GConst.DungeonConst.DUNGEON_DAILY_TYPE.MATERIAL)