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-11-04 15:31:16 +08:00
parent 5a853ec58e
commit 3f41c3b20d
8 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lua/app/common/module_manager.lua
View File

@ -137,6 +137,7 @@ ModuleManager.MODULE_KEY = {
DUNGEON_GOLD = "dungeon_gold", -- 金币副本
DUNGEON_RES = "dungeon_res", -- 材料副本
CARD_MONTHLY = "card_monthly",
AD = "ad", --局内广告
}
local _moduleMgrs = {}

9
lua/app/module/equip/equip_manager.lua
View File

@ -53,13 +53,14 @@ end
function EquipManager:onEquipWearRsp(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then
local lvOld, nextLv, attrs, attrNexts = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.QLT, result.reqData.slot)
local lvOld, nextLv, attrs = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.QLT, result.reqData.slot)
DataManager.EquipData:onWearSuccess(result.reqData.slot, result.reqData.ids)
DataManager.HeroData:setAllHeroesDitry()
DataManager.HeroData:setDirty()
DataManager.HeroData:calcPower()
local lvNew = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.QLT, result.reqData.slot)
if lvOld < lvNew then
local _, _, attrNexts = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.QLT, result.reqData.slot)
self:showEquipGetResonateUI(GConst.EquipConst.RESONATE_PAGE.QLT, lvNew, attrs, attrNexts)
-- DataManager.GiftPopData:activeEquipResonancePopGift(GConst.EquipConst.RESONATE_PAGE.QLT, lvNew)
end
@ -81,13 +82,14 @@ end
function EquipManager:onEquipUpgradeRsp(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then
local lvOld, nextLv, attrs, attrNexts = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.LV_UP, result.reqData.slot)
local lvOld, nextLv, attrs = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.LV_UP, result.reqData.slot)
DataManager.EquipData:onUpgradeSuccess(result.reqData.slot, result.upgraded)
DataManager.HeroData:setAllHeroesDitry()
DataManager.HeroData:setDirty()
DataManager.HeroData:calcPower()
local lvNew = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.LV_UP, result.reqData.slot)
if lvOld < lvNew then
local _, _, attrNexts = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.LV_UP, result.reqData.slot)
self:showEquipGetResonateUI(GConst.EquipConst.RESONATE_PAGE.LV_UP, lvNew, attrs, attrNexts)
-- DataManager.GiftPopData:activeEquipResonancePopGift(GConst.EquipConst.RESONATE_PAGE.LV_UP, lvNew)
end
@ -109,13 +111,14 @@ end
function EquipManager:onEquipRefineRsp(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then
local lvOld, nextLv, attrs, attrNexts = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.REFINE, result.reqData.slot)
local lvOld, nextLv, attrs = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.REFINE, result.reqData.slot)
DataManager.EquipData:onRefineSuccess(result.reqData.slot, result.reqData.part, result.part)
DataManager.HeroData:setAllHeroesDitry()
DataManager.HeroData:setDirty()
DataManager.HeroData:calcPower()
local lvNew = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.REFINE, result.reqData.slot)
if lvOld < lvNew then
local _, _, attrNexts = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.REFINE, result.reqData.slot)
self:showEquipGetResonateUI(GConst.EquipConst.RESONATE_PAGE.REFINE, lvNew, attrs, attrNexts)
-- DataManager.GiftPopData:activeEquipResonancePopGift(GConst.EquipConst.RESONATE_PAGE.REFINE, lvNew)
end

12
lua/app/ui/battle/battle_box_open_ui.lua
View File

@ -73,13 +73,19 @@ function BattleBoxOpenUI:onLoadRootComplete()
end
function BattleBoxOpenUI:onRefresh()
if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.AD, true) then
self.adBtn:setActive(false)
self.okBtn:setAnchoredPositionX(0)
return
end
local battleController = ModuleManager.BattleManager.battleController
if battleController and battleController.battleData then
local count = battleController.battleData:getDoubleBoxCount()
local cfgAdCount = GFunc.getConstIntValue("ads_mystery_box_limit")
if cfgAdCount > count then
self.adBtn:setActive(true)
self.okBtn:setActive(false)
self.adBtn:setAnchoredPositionX(-100)
self.okBtn:setAnchoredPositionX(100)
GFunc.setAdsSprite(self.adBtnImg)
self.adBtn:addClickListener(function()
SDKManager:showFullScreenAds(BIReport.ADS_CLICK_TYPE.BATTLE_DOUBLE_BOX, function()
@ -87,12 +93,12 @@ function BattleBoxOpenUI:onRefresh()
end)
end)
else
self.okBtn:setActive(true)
self.adBtn:setActive(false)
self.okBtn:setAnchoredPositionX(0)
end
else
self.okBtn:setActive(true)
self.adBtn:setActive(false)
self.okBtn:setAnchoredPositionX(0)
end
end

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

@ -479,27 +479,35 @@ function BattleResultUI:refreshDoubleNode()
self.continue:setActive(true)
return
end
self.continue:setActive(false)
if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.AD, true) or #self.rewards <= 0 then
self.doubleNode:setActive(false)
self.continue:setActive(true)
return
end
if self.battleType == GConst.BattleConst.BATTLE_TYPE.STAGE then
if not DataManager.ChapterData:canAdDouble() then
self.doubleNode:setActive(false)
self.continue:setActive(true)
else
self.doubleNode:setActive(true)
GFunc.setAdsSprite(self.doubleBtnAdImg)
self.doubleBtnLimitTx:setText(DataManager.ChapterData:getReDoubleCount() .. "/" .. GFunc.getConstIntValue("ads_double_rewards_limit"))
self.doubleOkBtn:setAnchoredPositionX(125)
self.doubleBtn:setActive(true)
self.continue:setActive(false)
end
end
if self.battleType == GConst.BattleConst.BATTLE_TYPE.DAILY_CHALLENGE then
if not DataManager.DailyChallengeData:canAdDouble() then
self.doubleNode:setActive(false)
self.continue:setActive(true)
else
self.doubleNode:setActive(true)
GFunc.setAdsSprite(self.doubleBtnAdImg)
self.doubleBtnLimitTx:setText(DataManager.DailyChallengeData:getReDoubleCount() .. "/" .. GFunc.getConstIntValue("daily_challenge_ads_double_rewards_limit"))
self.doubleOkBtn:setAnchoredPositionX(125)
self.doubleBtn:setActive(true)
self.continue:setActive(false)
end
end
end

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

@ -91,6 +91,12 @@ function BattleSkillSelectComp:refreshBtns()
return
end
if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.AD, true) then
adBtn:setActive(false)
allBtn:setActive(false)
return
end
local battleController = ModuleManager.BattleManager.battleController
local getAllAdCount = 0
if ModuleManager.BattleManager.battleController.battleType == GConst.BattleConst.BATTLE_TYPE.STAGE then

4
lua/app/ui/idle/idle_drop_ui.lua
View File

@ -272,7 +272,7 @@ function IdleDropUI:refreshBtns()
-- self:removeQuickBtnRedPoint()
else
local quickTimes = DataManager.IdleData:getQuickIdleVitRemainTimes()
self.quickTimesTx:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, "<color=#60FF4B>" .. quickTimes .."</color>"))
self.quickTimesTx:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, "<color=#049500>" .. quickTimes .."</color>"))
if quickTimes > 0 then
self.quickBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_blue_1")
self.quickBtn:setTouchEnable(true)
@ -285,7 +285,7 @@ function IdleDropUI:refreshBtns()
end
local adRemainTimes = DataManager.IdleData:getQuickIdleAdRemainTimes()
self.adTimesTx:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, "<color=#60FF4B>" .. adRemainTimes .."</color>"))
self.adTimesTx:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, "<color=#049500>" .. adRemainTimes .."</color>"))
if adRemainTimes <= 0 then
adRemainTimes = 0
self.adBtn:setTouchEnable(false)

2
lua/app/ui/summon/summon_main_ui.lua
View File

@ -448,6 +448,8 @@ function SummonMainUI:onSummonRsp(result, newHero)
if DataManager.SummonData:getSkipAniFlag() then
self:enableTouch()
self.uiNode:setActive(true)
self.uiSpineObj:setActive(true)
self.uiSpineObj:playAnim("idle", true, true)
ModuleManager.SummonManager:showSummonRewardUI({
rewards = rewards,
callback = function(count, isAd)

4
lua/app/userdata/battle/battle_base_data.lua
View File

@ -84,6 +84,10 @@ function BattleBaseData:init(params, snapInfo)
self.defFormation = params.defFormation or {}
self:setMaxBattleLv(nil)
if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.AD, true) then
self.isRevive = true
end
if snapInfo then
if snapInfo.cacheSkillList then
self.cacheSkillList = snapInfo.cacheSkillList