lingmeng
/
jx_client_neibu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

连队验证同步

master
罗家炜 2025-05-13 11:23:29 +08:00
parent 7edfac1243
commit 19e06bb695
4 changed files with 62 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lua_probject/base_project/Game/Controller/LoginController.lua
View File

@ -14,7 +14,7 @@ end
local _LocalConfigAllGame = { local _LocalConfigAllGame = {
10, 33, 10, 33,
-- 90, 90,
66, 86, 87, 88, 89 66, 86, 87, 88, 89
} }

9
lua_probject/extend_project/extend/poker/runfast/CardCheck.lua
View File

@ -162,7 +162,6 @@ function M:CheckCards()
if self.cardNum ~= 4 and self.cardNum ~= self.lastCardNum and not self._flag_fristCard then if self.cardNum ~= 4 and self.cardNum ~= self.lastCardNum and not self._flag_fristCard then
return return
end 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 if self.cardNum == 1 and self._flag_mustMax and self.maxCard ~= self.cardListSord[1] then
return return
end end
@ -177,7 +176,7 @@ function M:CheckCards()
print("lingmengCheckDuiZi") print("lingmengCheckDuiZi")
if self:CheckDuiZi() then if self:CheckDuiZi() then
return true and not flag_mustZha return true
end end
print("lingmengCheckSanDai") print("lingmengCheckSanDai")
@ -614,7 +613,11 @@ function M:CheckZha()
end end
function M:CheckType(type) 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 end
function M:GetTipsList() function M:GetTipsList()

0
lua_probject/extend_project/extend/poker2/suoha/RightPanelView.lua → lua_probject/extend_project/extend/poker2/suoha/ExRightPanelView.lua
View File

110
lua_probject/main_project/main/poker/PKMainView.lua
View File

@ -21,62 +21,62 @@ function M:InitView(url, isHideIpAdds, settingViewType, ex_defaultbg, ex_bgconfi
UIPackage.AddPackage('base/main_poker/ui/Main_Poker') UIPackage.AddPackage('base/main_poker/ui/Main_Poker')
MainView.InitView(self, url, isHideIpAdds) MainView.InitView(self, url, isHideIpAdds)
local default_bg = ex_defaultbg or pk_default_bg -- local default_bg = ex_defaultbg or pk_default_bg
local bg_config = ex_bgconfig or pk_bg_config -- local bg_config = ex_bgconfig or pk_bg_config
-- 设置界面初始化方法 -- -- 设置界面初始化方法
self.NewSettingView = function(self) -- self.NewSettingView = function(self)
-- -- 根据settingViewType和self._state判断界面按钮功能显示 -- -- -- 根据settingViewType和self._state判断界面按钮功能显示
-- local stype = 0 -- -- local stype = 0
-- local room = DataManager.CurrenRoom -- -- local room = DataManager.CurrenRoom
-- local ispanguangzhe = room.self_player.seat == 0 -- -- local ispanguangzhe = room.self_player.seat == 0
-- if self._state.selectedIndex == 3 then -- -- if self._state.selectedIndex == 3 then
-- stype = 0 -- -- stype = 0
-- elseif settingViewType < 2 then -- -- elseif settingViewType < 2 then
-- stype = settingViewType -- -- stype = settingViewType
-- elseif settingViewType == 2 then -- -- elseif settingViewType == 2 then
-- if (ispanguangzhe or self._state.selectedIndex == 0) then -- -- if (ispanguangzhe or self._state.selectedIndex == 0) then
-- stype = 2 -- -- stype = 2
-- else -- -- else
-- stype = 3 -- -- stype = 3
-- end -- -- end
-- elseif settingViewType == 3 then -- -- elseif settingViewType == 3 then
-- if not ispanguangzhe and self._state.selectedIndex > 0 then -- -- if not ispanguangzhe and self._state.selectedIndex > 0 then
-- stype = 3 -- -- stype = 3
-- else -- -- else
-- stype = 2 -- -- stype = 2
-- end -- -- end
-- end--self._root_view -- -- end--self._root_view
print("lingmengmainview2", self.dismiss_room_cd_time) -- print("lingmengmainview2", self.dismiss_room_cd_time)
local settingView = PKSettingView.new(self, 0, isHideJiesan, settingUrl, -- local settingView = PKSettingView.new(self, 0, isHideJiesan, settingUrl,
handler(self, self.UpdateCardSize)) -- handler(self, self.UpdateCardSize))
-- 获取MainView界面state控制器选项 -- -- 获取MainView界面state控制器选项
-- settingView.__checkMainViewState = function() -- -- settingView.__checkMainViewState = function()
-- return self._state.selectedIndex -- -- return self._state.selectedIndex
-- end -- -- end
-- -- 设置界面换牌功能回调 -- -- -- 设置界面换牌功能回调
-- if settingViewType == 1 then -- -- if settingViewType == 1 then
-- settingView.__changePokerCallBack = handler(self, self.UpdateCard) -- -- settingView.__changePokerCallBack = handler(self, self.UpdateCard)
-- settingView.__changePokerSizeCallBack = handler(self, self.UpdateCardSize) -- -- settingView.__changePokerSizeCallBack = handler(self, self.UpdateCardSize)
-- end -- -- end
-- settingView:FillBgSection( -- -- settingView:FillBgSection(
-- function(url) -- -- function(url)
-- LoadGameBg(url, self._root_view) -- -- LoadGameBg(url, self._root_view)
-- end, -- -- end,
-- self._room.game_id, -- -- self._room.game_id,
-- default_bg, -- -- default_bg,
-- bg_config -- -- bg_config
-- ) -- -- )
return settingView -- return settingView
end -- end
local _view = self._view -- local _view = self._view
TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config) -- TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config)
local rightpanel = self._view:GetChild('right_panel') -- local rightpanel = self._view:GetChild('right_panel')
if rightpanel then -- if rightpanel then
self._rightPanelView = MainRightPanelView.new(self, rightpanel) -- self._rightPanelView = MainRightPanelView.new(self, rightpanel)
end -- end
self:InitXiPai() -- self:InitXiPai()
self:InitXiPai1() -- self:InitXiPai1()
end end
function M:InitXiPai() function M:InitXiPai()