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-28 20:57:39 +08:00
parent 3961798e5b
commit cd58359de1
6 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lua/app/ui/battle/battle_base_ui.lua
View File

@ -317,6 +317,9 @@ end
function BattleBaseUI:initSpeedBtn() function BattleBaseUI:initSpeedBtn()
local spdBtn = self.uiMap["battle_ui.top_node.speed_btn"] local spdBtn = self.uiMap["battle_ui.top_node.speed_btn"]
if not spdBtn then
return
end
local spdBtnImg = self.uiMap["battle_ui.top_node.speed_btn.img"] local spdBtnImg = self.uiMap["battle_ui.top_node.speed_btn.img"]
spdBtn:addClickListener(function() spdBtn:addClickListener(function()
if not DataManager.PrivilegeCardData:getIsMonthlyCardActive() then if not DataManager.PrivilegeCardData:getIsMonthlyCardActive() then

1
lua/app/ui/common/cell/equip_cell.lua
View File

@ -84,6 +84,7 @@ function EquipCell:_refresh(entity, showMask, showCheck, showLock)
v:setActive(false) v:setActive(false)
end end
end end
self.starNode:setActive(true)
self.starNode:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT):RefreshLayout() self.starNode:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT):RefreshLayout()
self:showMask(showMask) self:showMask(showMask)

15
lua/app/ui/main_city/main_city_ui.lua
View File

@ -111,7 +111,6 @@ function MainCityUI:onClose()
end end
function MainCityUI:onReshow() function MainCityUI:onReshow()
self:checkMainPop()
-- 检查目前没开的侧边栏功能是否有可以开启的 -- 检查目前没开的侧边栏功能是否有可以开启的
if self.sideBarComp then if self.sideBarComp then
self.sideBarComp:onReshow() self.sideBarComp:onReshow()
@ -686,7 +685,7 @@ function MainCityUI:checkTutorial(onlyCheck)
end end
end end
if DataManager.TalentData:getIsOpen() then if not DataManager.TutorialData:getIsFuncTutorialFinished2(GConst.TutorialConst.TALENT_OPEN) and DataManager.TalentData:getIsOpen() then
if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.TALENT_OPEN, onlyCheck) then if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.TALENT_OPEN, onlyCheck) then
return true return true
end end
@ -698,8 +697,8 @@ function MainCityUI:checkTutorial(onlyCheck)
end end
end end
if DataManager.DailyChallengeData:isOpen() then if not DataManager.TutorialData:getIsFuncTutorialFinished2(GConst.TutorialConst.DAILY_CHALLENGE_OPEN) and DataManager.DailyChallengeData:isOpen() then
if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.UNLOCK_DAILY_CHALLENGE, onlyCheck) then if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.DAILY_CHALLENGE_OPEN, onlyCheck) then
return true return true
end end
end end
@ -710,13 +709,7 @@ function MainCityUI:checkTutorial(onlyCheck)
-- end -- end
-- end -- end
if DataManager.DailyChallengeData:isOpen() then if not DataManager.TutorialData:getIsFuncTutorialFinished2(GConst.TutorialConst.UNLOCK_ARENA) and DataManager.ArenaData:isOpen() then
if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.DAILY_CHALLENGE_OPEN, onlyCheck) then
return true
end
end
if DataManager.ArenaData:isOpen() then
if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.UNLOCK_ARENA, onlyCheck) then if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.UNLOCK_ARENA, onlyCheck) then
return true return true
end end

2
lua/app/userdata/equip/equip_data.lua
View File

@ -918,7 +918,7 @@ function EquipData:hasEquipRefineRedPoint(slotId, part)
end end
local refine = self:getPartRefine(slotId, part) local refine = self:getPartRefine(slotId, part)
local needLevel = self:getRefineNeedLevel(refine + 1) local needLevel = self:getRefineNeedLevel(refine + 1)
if needLevel == nil or needLevel > self:getPartLevel(slotId, part) then if needLevel == nil or needLevel > self:getPartLv(slotId, part) then
return false return false
end end
local itemCost = self:getRefineCost(refine + 1) local itemCost = self:getRefineCost(refine + 1)

2
lua/app/userdata/talent/talent_data.lua
View File

@ -31,7 +31,7 @@ function TalentData:clear()
end end
function TalentData:getIsOpen() function TalentData:getIsOpen()
if ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.TALENT_OPEN) then if ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.TALENT_OPEN, true) then
return true return true
end end
return false return false

6
lua/app/userdata/tutorial/tutorial_data.lua
View File

@ -223,6 +223,12 @@ function TutorialData:getIsFuncTutorialFinished(id)
return self.funcTutorialMap[id] == true return self.funcTutorialMap[id] == true
end end
--@TODO 2025-10-28 20:33:16
function TutorialData:getIsFuncTutorialFinished2(id)
local cfg = ConfigManager:getConfig("tutorial_start")[id]
return self:getIsFuncTutorialFinished(cfg.start_id)
end
function TutorialData:getTutorialIdList() function TutorialData:getTutorialIdList()
if not self.tutorialIdlist then if not self.tutorialIdlist then
self.tutorialIdlist = {} self.tutorialIdlist = {}