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-31 16:40:54 +08:00
parent d67a67839e
commit ef7606acc6
10 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lua/app/config/localization/localization_global_const.lua
View File

@ -971,6 +971,7 @@ local LocalizationGlobalConst =
FUND_CHAPTER_TAG_DESC_21 = "FUND_CHAPTER_TAG_DESC_21", FUND_CHAPTER_TAG_DESC_21 = "FUND_CHAPTER_TAG_DESC_21",
FUND_CHAPTER_TAG_DESC_22 = "FUND_CHAPTER_TAG_DESC_22", FUND_CHAPTER_TAG_DESC_22 = "FUND_CHAPTER_TAG_DESC_22",
TALENT_HELP = "TALENT_HELP", TALENT_HELP = "TALENT_HELP",
RECOMMENDED_POWER = "RECOMMENDED_POWER",
} }
return LocalizationGlobalConst return LocalizationGlobalConst

1
lua/app/config/strings/cn/global.lua
View File

@ -971,6 +971,7 @@ local localization_global =
["FUND_CHAPTER_TAG_DESC_21"] = "关卡基金21", ["FUND_CHAPTER_TAG_DESC_21"] = "关卡基金21",
["FUND_CHAPTER_TAG_DESC_22"] = "关卡基金22", ["FUND_CHAPTER_TAG_DESC_22"] = "关卡基金22",
["TALENT_HELP"] = "天赋帮助", ["TALENT_HELP"] = "天赋帮助",
["RECOMMENDED_POWER"] = "推荐战斗力：{0}",
} }
return localization_global return localization_global

1
lua/app/module/task/task_manager.lua
View File

@ -508,6 +508,7 @@ TaskManager.gotoFunc = {
[GConst.TaskConst.TASK_TYPE.X_USE_SKILL] = TaskManager.gotoMainUI, [GConst.TaskConst.TASK_TYPE.X_USE_SKILL] = TaskManager.gotoMainUI,
[GConst.TaskConst.TASK_TYPE.DAILY_TASK_WATCH_AD_SPECIAL] = TaskManager.gotoMainShopUI, [GConst.TaskConst.TASK_TYPE.DAILY_TASK_WATCH_AD_SPECIAL] = TaskManager.gotoMainShopUI,
[GConst.TaskConst.TASK_TYPE.X_HERO_MAX_LV_REACH] = TaskManager.gotoMainHeroUI, [GConst.TaskConst.TASK_TYPE.X_HERO_MAX_LV_REACH] = TaskManager.gotoMainHeroUI,
[GConst.TaskConst.TASK_TYPE.X_PASS_CHAPTER] = TaskManager.gotoMainUI,
[GConst.TaskConst.TASK_TYPE.X_VIT_COST] = TaskManager.gotoMainUI, [GConst.TaskConst.TASK_TYPE.X_VIT_COST] = TaskManager.gotoMainUI,
[GConst.TaskConst.TASK_TYPE.X_NEW_HERO_GOT] = TaskManager.gotoSummonUI, [GConst.TaskConst.TASK_TYPE.X_NEW_HERO_GOT] = TaskManager.gotoSummonUI,
[GConst.TaskConst.TASK_TYPE.X_ARENA_CHALLENGE] = TaskManager.gotoArenaUI, [GConst.TaskConst.TASK_TYPE.X_ARENA_CHALLENGE] = TaskManager.gotoArenaUI,

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

@ -476,8 +476,10 @@ end
function BattleResultUI:refreshDoubleNode() function BattleResultUI:refreshDoubleNode()
if self.battleType ~= GConst.BattleConst.BATTLE_TYPE.STAGE and self.battleType ~= GConst.BattleConst.BATTLE_TYPE.DAILY_CHALLENGE then if self.battleType ~= GConst.BattleConst.BATTLE_TYPE.STAGE and self.battleType ~= GConst.BattleConst.BATTLE_TYPE.DAILY_CHALLENGE then
self.doubleNode:setActive(false) self.doubleNode:setActive(false)
self.continue:setActive(true)
return return
end end
self.continue:setActive(false)
if self.battleType == GConst.BattleConst.BATTLE_TYPE.STAGE then if self.battleType == GConst.BattleConst.BATTLE_TYPE.STAGE then
if not DataManager.ChapterData:canAdDouble() then if not DataManager.ChapterData:canAdDouble() then
self.doubleNode:setActive(false) self.doubleNode:setActive(false)

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

@ -71,14 +71,13 @@ function DungeonGoldCell:refresh(index)
local challengeId = DataManager.DungeonDailyData.GoldData:getChallengeId() local challengeId = DataManager.DungeonDailyData.GoldData:getChallengeId()
local chapterName = DataManager.DungeonDailyData.GoldData:getChapterName(chapterInfo.id) local chapterName = DataManager.DungeonDailyData.GoldData:getChapterName(chapterInfo.id)
self.stageTx:setText(chapterName) self.stageTx:setText(chapterName)
-- local curPower = DataManager.PlayerData:getSelfEntity():getShowPower(ModuleManager.BattleManager.BATTLE_TYPE.DUNGEON) local curPower = DataManager.HeroData:getShowPower()
-- local curPower = DataManager.HeroData:getShowPower() local chapterPower = chapterInfo.cfg.power
-- local chapterPower = chapterInfo.cfg.power if curPower >= chapterPower then
-- if curPower >= chapterPower then self.powerTx:setText("<color=#049500>" .. I18N:getGlobalText(I18N.GlobalConst.RECOMMENDED_POWER, GFunc.num2Str(chapterPower, 2)) .. "</color>")
-- self.powerTx:setText("<color=#0F7411>" .. I18N:getGlobalText(I18N.GlobalConst.RECOMMENDED_POWER, GFunc.getPowerShow(chapterPower)) .. "</color>") else
-- else self.powerTx:setText("<color=#E10000>" .. I18N:getGlobalText(I18N.GlobalConst.RECOMMENDED_POWER, GFunc.num2Str(chapterPower, 2)) .. "</color>")
-- self.powerTx:setText("<color=#C90D0D>" .. I18N:getGlobalText(I18N.GlobalConst.RECOMMENDED_POWER, GFunc.getPowerShow(chapterPower)) .. "</color>") end
-- end
local rewardsCount = #self.rewardList local rewardsCount = #self.rewardList
for i = 1, rewardsCount do for i = 1, rewardsCount do
table.remove(self.rewardList) table.remove(self.rewardList)

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

@ -72,14 +72,13 @@ function DungeonMaterialCell:refresh(index)
local challengeId = DataManager.DungeonDailyData.MaterialData:getChallengeId() local challengeId = DataManager.DungeonDailyData.MaterialData:getChallengeId()
local chapterName = DataManager.DungeonDailyData.MaterialData:getChapterName(chapterInfo.id) local chapterName = DataManager.DungeonDailyData.MaterialData:getChapterName(chapterInfo.id)
self.stageTx:setText(chapterName) self.stageTx:setText(chapterName)
-- local curPower = DataManager.PlayerData:getSelfEntity():getShowPower(ModuleManager.BattleManager.BATTLE_TYPE.DUNGEON) local curPower = DataManager.HeroData:getShowPower()
-- local curPower = DataManager.HeroData:getShowPower() local chapterPower = chapterInfo.cfg.power
-- local chapterPower = chapterInfo.cfg.power if curPower >= chapterPower then
-- if curPower >= chapterPower then self.powerTx:setText("<color=#049500>" .. I18N:getGlobalText(I18N.GlobalConst.RECOMMENDED_POWER, GFunc.num2Str(chapterPower, 2)) .. "</color>")
-- self.powerTx:setText("<color=#0F7411>" .. I18N:getGlobalText(I18N.GlobalConst.RECOMMENDED_POWER, GFunc.getPowerShow(chapterPower)) .. "</color>") else
-- else self.powerTx:setText("<color=#E10000>" .. I18N:getGlobalText(I18N.GlobalConst.RECOMMENDED_POWER, GFunc.num2Str(chapterPower, 2)) .. "</color>")
-- self.powerTx:setText("<color=#C90D0D>" .. I18N:getGlobalText(I18N.GlobalConst.RECOMMENDED_POWER, GFunc.getPowerShow(chapterPower)) .. "</color>") end
-- end
local rewardsCount = #self.rewardList local rewardsCount = #self.rewardList
for i = 1, rewardsCount do for i = 1, rewardsCount do
table.remove(self.rewardList) table.remove(self.rewardList)

2
lua/app/ui/gm/gm_tool_ui.lua
View File

@ -95,7 +95,7 @@ function GMToolUI:onRefresh()
skipTutorialCheck:setActive(LocalData:getTutorialSkip() > 0) skipTutorialCheck:setActive(LocalData:getTutorialSkip() > 0)
end) end)
skipPopCheck:setActive(LocalData:getTutorialSkip() > 0) skipPopCheck:setActive(LocalData:getFuncOpenPopSkip() > 0)
skipPopBtn:addClickListener(function() skipPopBtn:addClickListener(function()
if LocalData:getFuncOpenPopSkip() == 0 then if LocalData:getFuncOpenPopSkip() == 0 then
LocalData:setFuncOpenPopSkip(1) LocalData:setFuncOpenPopSkip(1)

10
lua/app/userdata/activity/act_sprint/act_sprint_data.lua
View File

@ -158,11 +158,11 @@ function ActSprintData:hasRedPoint(ignoreExchange)
end end
-- 兑换商店 -- 兑换商店
if not ignoreExchange then -- if not ignoreExchange then
if self:hasExchangeRp() then -- if self:hasExchangeRp() then
return true -- return true
end -- end
end -- end
if self:hasStandardRp() then if self:hasStandardRp() then
return true return true

2
lua/app/userdata/bag/item_entity.lua
View File

@ -55,7 +55,7 @@ function ItemEntity:checkForceLockAndAddNum()
-- local qlt = DataManager.HeroData:getHeroQlt(self:getId()) -- local qlt = DataManager.HeroData:getHeroQlt(self:getId())
-- local fragmentId = DataManager.ForceData:getForceItemIdByQlt(self:getId()) -- local fragmentId = DataManager.ForceData:getForceItemIdByQlt(self:getId())
if heroEntity:getLv() <= 0 then if heroEntity:getLv() <= 0 then
heroEntity:setLv(1 ,true) DataManager.HeroData:setHeroLv(self:getId(), 1)
self.data.num = self.data.num - 1 self.data.num = self.data.num - 1
-- BIReport:postForceUnlock(self:getId()) -- BIReport:postForceUnlock(self:getId())
end end

3
lua/app/userdata/hero/hero_data.lua
View File

@ -147,9 +147,6 @@ function HeroData:setHeroLv(id, lv)
if activeBefore then if activeBefore then
BIReport:postHeroOpt(id, BIReport.HERO_OPT_TYPE.LEVEL_UP) BIReport:postHeroOpt(id, BIReport.HERO_OPT_TYPE.LEVEL_UP)
else else
if not entity:getUnlcokChapter() then
BIReport:postHeroOpt(id, BIReport.HERO_OPT_TYPE.UNLOCK)
end
BIReport:postHeroOpt(id, BIReport.HERO_OPT_TYPE.ACTIVE) BIReport:postHeroOpt(id, BIReport.HERO_OPT_TYPE.ACTIVE)
end end