【山河社稷图】提交

Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua

@@ -50,13 +50,14 @@ end
 --后端更新章节信息
 function this.UpdataChapterData(msg,_isShowChapterOpenPopup)
     LogYellow("msg.chapter         "..#msg.chapter)
+    local oldChapterId = this.GetCurChapterId()
     if msg then
         for i = 1, #msg.chapter do
             local singleHardStageChapter = allChapterData[msg.chapter[i].chapterId]
             LogYellow("msg.chapter[i].chapterId          "..msg.chapter[i].chapterId.."          "..msg.chapter[i].stars.."  node num  "..#msg.chapter[i].node.."  reward  num  "..#msg.chapter[i].reward)
             LogYellow("singleHardStageChapter.stars         "..singleHardStageChapter.stars)
             singleHardStageChapter.chapterId = msg.chapter[i].chapterId
-            if singleHardStageChapter.chapterId > this.GetCurChapterId() and _isShowChapterOpenPopup then
+            if singleHardStageChapter.chapterId > oldChapterId and _isShowChapterOpenPopup then
                 this.SetisShowChapterOpenPopup(true)
             end
             this.SetCurChapterId(singleHardStageChapter.chapterId)

Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelOpenChapterPopup.lua

@@ -41,6 +41,14 @@ end
 --界面关闭时调用（用于子类重写）
 function FightLevelOpenChapterPopup:OnClose()
     FightLevelManager.SetisShowChapterOpenPopup(false)
+    LogYellow("UIManager.IsOpen(UIName.FightLevelSingleChapterPanel)        "..tostring(UIManager.IsOpen(UIName.FightLevelSingleChapterPanel)))
+    -- if UIManager.IsOpen(UIName.FightLevelSingleChapterPanel) then
+        local curFightLevelSingleChapterPanel = UIManager.GetOpenPanel(UIName.FightLevelSingleChapterPanel)
+        if curFightLevelSingleChapterPanel then
+            LogYellow("sssssssssssssssssss")
+            curFightLevelSingleChapterPanel.LeftOrRightBtnClickEvent(2)
+        end
+    -- end
 end
 
 --界面销毁时调用（用于子类重写）

Assets/ManagedResources/~Lua/Modules/Formation/View/FightLevelFormation.lua

@@ -20,7 +20,7 @@ end
 --- btn1点击回调事件
 
 function this.On_Btn1_Click()
-    this.root.SetOneKeyGoExpedition()
+    this.root.SetOneKeyGo()
 end
 
 function this.On_Btn2_Click()