修复投票退出新结算界面导致异常情况，调整正常退出按钮退出后界面为亲友圈

lua_probject/base_project/Game/View/MainView.lua

@@ -593,7 +593,7 @@ function M:EventInit()
                 self.dismissWin:FillData(arg[2])
                 self.dismissWin:Show()
             elseif code == 1 then
-                ViewManager.ChangeView(ViewManager.View_Lobby)
+                ViewManager.ChangeView(ViewManager.View_Family)
                 ViewUtil.ShowTips('房间已解散！')
             elseif code == 2 then
                 -- self:DismissRoomAgree(p,result)

lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua

@@ -62,10 +62,10 @@ function M:InitData(over, room, result, total_result, callback)
         ViewManager.ChangeView(ViewManager.View_Family)
     end)
 
-    self:fillResult0(room, peopleNum, result)
     if over == 0 then
         showBtnTypeCtr.selectedIndex = 0
         _overCtr.selectedIndex = 0
+        self:fillResult0(room, peopleNum, result)
         nextRoundBtn2.onClick:Set(function()
             local _gamectr = ControllerManager.GetController(GameController)
             _gamectr:PlayerReady()
@@ -74,9 +74,14 @@ function M:InitData(over, room, result, total_result, callback)
     else
         showBtnTypeCtr.selectedIndex = 1
         self:fillResult1(room, peopleNum, total_result)
+        if result then
+            self:fillResult0(room, peopleNum, result)
             nextRoundBtn2.onClick:Set(function()
                 _overCtr.selectedIndex = 1
             end)
+        else
+            _overCtr.selectedIndex = 1
+        end
     end
 end
 

lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua

@@ -109,7 +109,7 @@ function M:InitView(url)
                             function(res)
                                 ViewUtil.CloseModalWait()
                                 if res.ReturnCode == 0 then
-                                    ViewManager.ChangeView(ViewManager.View_Lobby)
+                                    ViewManager.ChangeView(ViewManager.View_Family)
                                 else
                                     ViewUtil.ErrorTip(res.ReturnCode)
                                 end

lua_probject/extend_project/extend/poker/runfast/EXGameInfo_jiangxi.lua

@@ -225,13 +225,12 @@ function M:SelectedConfigData()
 
     _data["leaf"] = handcard == 0 and 2 or handcard --手牌 1是15张，2是16张
     _data["opt"] = round + 1                        --局数 1是10局 2是15局 3是20局 ("未知")
-    _data["maxRound"] = roundTable[round + 1]
     _data["maxPlayers"] = peopleNum == 1 and 2 or 3 --人数 2是2人 3是三人
     _data["rule"] = wanfa1_5 == 0 and 2 or 1        --黑桃3必出 2是选择了该玩法 1是没有该玩法
     _data["showlength"] = (showCardNum + 1) % 2     --显示手牌数量 0是不显示 1是显示
-    _data["planelack"] = wanfa1_2 --[[三张、飞机可少带接完 0是没有该玩法 1是有该玩法,
+    _data["planelack"] = wanfa1_2 or wanfa1_1 --[[三张、飞机可少带接完 0是没有该玩法 1是有该玩法,
                                     吴哥说这个玩法可能包含了三张、飞机可不带，没有告诉我添加字段,这个字段是飞机，下个字段是三带]]
-    _data["threelack"] = wanfa1_2
+    _data["threelack"] = wanfa1_2 or wanfa1_1
     _data["fourDaiThree"] = false --四带三 false没有该玩法 true有该玩法
     if wanfa1_3 then
         _data["fourDaiThree"] = true