From 19e06bb695b052b57c76fb3b2836dab8a8f01e3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Tue, 13 May 2025 11:23:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E9=98=9F=E9=AA=8C=E8=AF=81=E5=90=8C?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/Controller/LoginController.lua | 2 +- .../extend/poker/runfast/CardCheck.lua | 9 +- ...ightPanelView.lua => ExRightPanelView.lua} | 0 .../main_project/main/poker/PKMainView.lua | 110 +++++++++--------- 4 files changed, 62 insertions(+), 59 deletions(-) rename lua_probject/extend_project/extend/poker2/suoha/{RightPanelView.lua => ExRightPanelView.lua} (100%) diff --git a/lua_probject/base_project/Game/Controller/LoginController.lua b/lua_probject/base_project/Game/Controller/LoginController.lua index fe7877f3..397fcc44 100644 --- a/lua_probject/base_project/Game/Controller/LoginController.lua +++ b/lua_probject/base_project/Game/Controller/LoginController.lua @@ -14,7 +14,7 @@ end local _LocalConfigAllGame = { 10, 33, - -- 90, + 90, 66, 86, 87, 88, 89 } diff --git a/lua_probject/extend_project/extend/poker/runfast/CardCheck.lua b/lua_probject/extend_project/extend/poker/runfast/CardCheck.lua index 63d10835..ca9710c9 100644 --- a/lua_probject/extend_project/extend/poker/runfast/CardCheck.lua +++ b/lua_probject/extend_project/extend/poker/runfast/CardCheck.lua @@ -162,7 +162,6 @@ function M:CheckCards() if self.cardNum ~= 4 and self.cardNum ~= self.lastCardNum and not self._flag_fristCard then return end - local flag_mustZha = self.cardNum == 4 and self.lastCardNum ~= 4 if self.cardNum == 1 and self._flag_mustMax and self.maxCard ~= self.cardListSord[1] then return end @@ -177,7 +176,7 @@ function M:CheckCards() print("lingmengCheckDuiZi") if self:CheckDuiZi() then - return true and not flag_mustZha + return true end print("lingmengCheckSanDai") @@ -614,7 +613,11 @@ function M:CheckZha() end function M:CheckType(type) - return self._flag_checkLst or self._flag_fristCard or type == self.type + if type == CardType.duiLong then + return self._flag_checkLst or self._flag_fristCard or (type == self.type and self.cardNum == self.lastCardNum) + else + return self._flag_checkLst or self._flag_fristCard or type == self.type + end end function M:GetTipsList() diff --git a/lua_probject/extend_project/extend/poker2/suoha/RightPanelView.lua b/lua_probject/extend_project/extend/poker2/suoha/ExRightPanelView.lua similarity index 100% rename from lua_probject/extend_project/extend/poker2/suoha/RightPanelView.lua rename to lua_probject/extend_project/extend/poker2/suoha/ExRightPanelView.lua diff --git a/lua_probject/main_project/main/poker/PKMainView.lua b/lua_probject/main_project/main/poker/PKMainView.lua index 9bddec8b..195c2994 100644 --- a/lua_probject/main_project/main/poker/PKMainView.lua +++ b/lua_probject/main_project/main/poker/PKMainView.lua @@ -21,62 +21,62 @@ function M:InitView(url, isHideIpAdds, settingViewType, ex_defaultbg, ex_bgconfi UIPackage.AddPackage('base/main_poker/ui/Main_Poker') MainView.InitView(self, url, isHideIpAdds) - local default_bg = ex_defaultbg or pk_default_bg - local bg_config = ex_bgconfig or pk_bg_config - -- 设置界面初始化方法 - self.NewSettingView = function(self) - -- -- 根据settingViewType和self._state判断界面按钮功能显示 - -- local stype = 0 - -- local room = DataManager.CurrenRoom - -- local ispanguangzhe = room.self_player.seat == 0 - -- if self._state.selectedIndex == 3 then - -- stype = 0 - -- elseif settingViewType < 2 then - -- stype = settingViewType - -- elseif settingViewType == 2 then - -- if (ispanguangzhe or self._state.selectedIndex == 0) then - -- stype = 2 - -- else - -- stype = 3 - -- end - -- elseif settingViewType == 3 then - -- if not ispanguangzhe and self._state.selectedIndex > 0 then - -- stype = 3 - -- else - -- stype = 2 - -- end - -- end--self._root_view - print("lingmengmainview2", self.dismiss_room_cd_time) - local settingView = PKSettingView.new(self, 0, isHideJiesan, settingUrl, - handler(self, self.UpdateCardSize)) - -- 获取MainView界面state控制器选项 - -- settingView.__checkMainViewState = function() - -- return self._state.selectedIndex - -- end - -- -- 设置界面换牌功能回调 - -- if settingViewType == 1 then - -- settingView.__changePokerCallBack = handler(self, self.UpdateCard) - -- settingView.__changePokerSizeCallBack = handler(self, self.UpdateCardSize) - -- end - -- settingView:FillBgSection( - -- function(url) - -- LoadGameBg(url, self._root_view) - -- end, - -- self._room.game_id, - -- default_bg, - -- bg_config - -- ) - return settingView - end + -- local default_bg = ex_defaultbg or pk_default_bg + -- local bg_config = ex_bgconfig or pk_bg_config + -- -- 设置界面初始化方法 + -- self.NewSettingView = function(self) + -- -- -- 根据settingViewType和self._state判断界面按钮功能显示 + -- -- local stype = 0 + -- -- local room = DataManager.CurrenRoom + -- -- local ispanguangzhe = room.self_player.seat == 0 + -- -- if self._state.selectedIndex == 3 then + -- -- stype = 0 + -- -- elseif settingViewType < 2 then + -- -- stype = settingViewType + -- -- elseif settingViewType == 2 then + -- -- if (ispanguangzhe or self._state.selectedIndex == 0) then + -- -- stype = 2 + -- -- else + -- -- stype = 3 + -- -- end + -- -- elseif settingViewType == 3 then + -- -- if not ispanguangzhe and self._state.selectedIndex > 0 then + -- -- stype = 3 + -- -- else + -- -- stype = 2 + -- -- end + -- -- end--self._root_view + -- print("lingmengmainview2", self.dismiss_room_cd_time) + -- local settingView = PKSettingView.new(self, 0, isHideJiesan, settingUrl, + -- handler(self, self.UpdateCardSize)) + -- -- 获取MainView界面state控制器选项 + -- -- settingView.__checkMainViewState = function() + -- -- return self._state.selectedIndex + -- -- end + -- -- -- 设置界面换牌功能回调 + -- -- if settingViewType == 1 then + -- -- settingView.__changePokerCallBack = handler(self, self.UpdateCard) + -- -- settingView.__changePokerSizeCallBack = handler(self, self.UpdateCardSize) + -- -- end + -- -- settingView:FillBgSection( + -- -- function(url) + -- -- LoadGameBg(url, self._root_view) + -- -- end, + -- -- self._room.game_id, + -- -- default_bg, + -- -- bg_config + -- -- ) + -- return settingView + -- end - local _view = self._view - TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config) - local rightpanel = self._view:GetChild('right_panel') - if rightpanel then - self._rightPanelView = MainRightPanelView.new(self, rightpanel) - end - self:InitXiPai() - self:InitXiPai1() + -- local _view = self._view + -- TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config) + -- local rightpanel = self._view:GetChild('right_panel') + -- if rightpanel then + -- self._rightPanelView = MainRightPanelView.new(self, rightpanel) + -- end + -- self:InitXiPai() + -- self:InitXiPai1() end function M:InitXiPai()