From b45fae5a2a924f909ceff638b032c6f12a7e37a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Thu, 17 Apr 2025 13:07:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8A=95=E7=A5=A8=E9=80=80?= =?UTF-8?q?=E5=87=BA=E6=96=B0=E7=BB=93=E7=AE=97=E7=95=8C=E9=9D=A2=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E5=BC=82=E5=B8=B8=E6=83=85=E5=86=B5=EF=BC=8C=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E6=AD=A3=E5=B8=B8=E9=80=80=E5=87=BA=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E9=80=80=E5=87=BA=E5=90=8E=E7=95=8C=E9=9D=A2=E4=B8=BA=E4=BA=B2?= =?UTF-8?q?=E5=8F=8B=E5=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base_project/Game/View/MainView.lua | 2 +- .../extend/majiang/lichuan/EXClearingView.lua | 11 ++++++++--- .../extend/majiang/lichuan/EXMainView.lua | 2 +- .../poker/runfast/EXGameInfo_jiangxi.lua | 5 ++--- .../main_majiang/ui/main_majiang_fui.bytes | Bin 293053 -> 293053 bytes 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua index 0c5de42a..5aae63ec 100644 --- a/lua_probject/base_project/Game/View/MainView.lua +++ b/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) diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua index 825aa07e..770ebade 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua +++ b/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) - nextRoundBtn2.onClick:Set(function() + if result then + self:fillResult0(room, peopleNum, result) + nextRoundBtn2.onClick:Set(function() + _overCtr.selectedIndex = 1 + end) + else _overCtr.selectedIndex = 1 - end) + end end end diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index 17300fcc..f0bd471f 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/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 diff --git a/lua_probject/extend_project/extend/poker/runfast/EXGameInfo_jiangxi.lua b/lua_probject/extend_project/extend/poker/runfast/EXGameInfo_jiangxi.lua index fd4e3223..5901eb6b 100644 --- a/lua_probject/extend_project/extend/poker/runfast/EXGameInfo_jiangxi.lua +++ b/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 diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes index af1786b0769cd45d8202439aa6f830199e80193a..2639e1073d8fdc0353ce6cc60dc56bc827b0a4e5 100644 GIT binary patch delta 165 zcmdn{QE=}^!G;#bElk_qb4_DlV3@`TB*Lbz-^e66UGF0k`}7Cznb=q~e(!dh?)Z^O zZaT*YCOK{n79vzueqfU4D#KLB&!Q2#R|R6)8<3j!Sky3TwA+1T+HUuexxO6$V^=qv delta 163 zcmdn{QE=}^!G;#bElk_qb9FE*ZauCKK;RaCN>tc-@DzWJAP!6 zo6hlpNsgQS8xbliKQPI2Wne1gpMJ=TS!wzkkn}@r(&paGO6~C