diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua index fcd5b532..549298ce 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua @@ -778,18 +778,18 @@ function M:HidePiao() self.ctr_piao.selectedIndex = 0 end -function M:ShowOutCardOption2(lastCardList,ctr_select,mustPutMaxCard) - self._cardCheck:InitLastCard(lastCardList,mustPutMaxCard) +function M:ShowOutCardOption2(lastCardList, ctr_select, mustPutMaxCard) + self._cardCheck:InitLastCard(lastCardList, mustPutMaxCard) self._cardCheck:CheckOutCard(self.card_list) self.tips_card_list = self._cardCheck:GetTipsList() self.touchCardSet = self._cardCheck:GetTouchSet() self.touchCardMap = self._cardCheck:GetTouchCardMap() - print("lingmengShowOutCardOption2",#self.touchCardSet ) - pt( self.touchCardSet ) + print("lingmengShowOutCardOption2", #self.touchCardSet) + pt(self.touchCardSet) pt(self.touchCardMap) - -- body --在这个方法里添加判断抬起牌是否符合出牌类型(少跑一次手牌循环) - self:UpdateHandCardsColor() + -- body --在这个方法里添加判断抬起牌是否符合出牌类型(少跑一次手牌循环) + self:UpdateHandCardsColor() if #self.tips_card_list == 1 then self:ShowTipsCard(1) diff --git a/lua_probject/main_project/main/poker/PKMainView.lua b/lua_probject/main_project/main/poker/PKMainView.lua index 195c2994..9bddec8b 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()