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

bug修复

Browse Source
This commit is contained in:
xiekaidong 2023-04-21 20:37:07 +08:00
parent ee1b719517
commit 24a775cfe8
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lua/app/module/battle/controller/battle_controller.lua
View File

@ -569,9 +569,6 @@ function BattleController:onLinkEnter(entity, posId, isVirtual)
if self.battleData:alreadyInsertSequence(posId) then
local info = sequence[#sequence - 1]
local beforePosId = info and info.posId
if not beforePosId then
return
end
if beforePosId == posId then -- 进入的是倒数第二个，则移除倒数第一个
local snapshot = self.battleData:removeGridSequence(lastPosId)
if snapshot then -- 如果有快照，则恢复一次
@ -590,8 +587,8 @@ function BattleController:onLinkEnter(entity, posId, isVirtual)
self:findSkillInfluenceGrids()
self:onLinkChange()
return
end
return
end
local skillId = entity:getSkillId()

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

@ -111,7 +111,7 @@ function MainCityUI:_bind()
self:bind(DataManager.HeroData, "isDirty", function(binder, value)
if self.selectedIndex == GConst.MainCityConst.BOTTOM_PAGE.HERO then
self.subComps[self.selectedIndex]:refresh()
elseif self.selectedIndex == GConst.MainCityConst.MAIN then
elseif self.selectedIndex == GConst.MainCityConst.BOTTOM_PAGE.MAIN then
self.subComps[self.selectedIndex]:refreshStageFormaion()
end
end)
@ -319,24 +319,24 @@ function MainCityUI:checkTutorial()
-- end
-- end
Logger.logHighlight(DataManager.ChapterData:getMaxChapterId())
if DataManager.ChapterData:getMaxChapterId() == 1 then
if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.PASS_ONE_CHAPTER) then
return
end
end
if DataManager.ChapterData:getMaxChapterId() == 3 then
if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.PASS_THREE_CHAPTER) then
return
end
end
if DataManager.ChapterData:boxCanGet(2, 1) then
if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.TWO_CHAPTER_BOX_CAN_GOT) then
return
end
end
if DataManager.ChapterData:getMaxChapterId() == 3 then
if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.PASS_THREE_CHAPTER) then
return
end
end
end
return MainCityUI