diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua index e504a172..476e5ce9 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua @@ -36,30 +36,9 @@ function M:init(name) self._eventmap[TX_Protocol.GAME_EVT_GANGZI] = self.OnEventGangCards self._eventmap[TX_Protocol.GAME_EVT_BUGANG] = self.OnEventBuGang - - self._eventmap[TX_Protocol.GAME_EVT_RESIDUE_CARD] = self.OnEventResidueCard end local __pre_delete_card = false --- 发送出牌指令到服务器 - - --------------------------展示牌--------------------------- -function M:SendNextCard(card) - local _data = {} - _data["card"] = tonumber(card) - local _client = ControllerManager.GameNetClinet - _client:send(TX_Protocol.GAME_NEXT_CARD, _data) -end - -function M:ReqResidueCard() - local _data = {} - _data["card"] = 0 - local _client = ControllerManager.GameNetClinet - _client:send(TX_Protocol.GAME_RESIDUE_CARD, _data) -end - ------------------------------------------------------------- function M:SendOutCard(data, callback) local _data = {} @@ -104,15 +83,6 @@ function M:OnEventBuGang(evt_data) DispatchEvent(self._dispatcher, TX_GameEvent.EventBuGang, evt_data["info"], true) end -function M:OnEventResidueCard(evt_data) - printlog("OnEventResidueCard") - pt(evt_data) - if evt_data.seat ~= DataManager.CurrenRoom.self_player.seat then - return - end - DispatchEvent(self._dispatcher, TX_GameEvent.EventResidueCard, evt_data["residueCard"]) -end - -- 发送放子选择到服务器 function M:SendAction(id) local _data = {} diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua index 8cedc495..c0ef59cc 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua @@ -66,35 +66,6 @@ function M:InitView(url) self:UpdatePlayerInfoView() end) - self.showNextCtr = self._view:GetController('showNext') - self.showNextList = self._view:GetChild('list_showNext') - self._view:GetChild('btn_showNext').onClick:Set(function() - if self._flag_getRemindCard then - self.showNextCtr.selectedIndex = 1 - self.showNextList:SetVirtual() - self.showNextList.itemRenderer = function(index, obj) - local card = self.cardSet[index + 1] - self:FillShowCards(obj, card, self.cardMap[card]) - obj.data = { card = card } - end - self.showNextList.numItems = #self.cardSet - else - self:reqResidueCard() - end - end) - self._view:GetChild('btn_closeShow').onClick:Set(function() - self.showNextCtr.selectedIndex = 0 - self.showNextList.selectedIndex = -1 - self._showNextName = nil - end) - self.showNextList.onClickItem:Set(function(context) - local _gamectr = ControllerManager.GetController(GameController) - _gamectr:SendNextCard(context.data.data.card) - self.showNextCtr.selectedIndex = 0 - self.showNextList.selectedIndex = -1 - self._showNextName = nil - end) - -------- self:PlayerChangeLineState() @@ -227,7 +198,6 @@ function M:EventInit() --self._viewText_testName.text = 0 self:UpdateRound() self:RemoveCursor() - self:reqResidueCard() self._state.selectedIndex = 1 self:ShowJing() if self._niao_View then @@ -292,7 +262,6 @@ function M:EventInit() end) _gamectr:AddEventListener(TX_GameEvent.GetCard, function(...) self:__CloseTip() - self:reqResidueCard() local arg = { ... } local seat = arg[1] local card = arg[2] @@ -579,24 +548,6 @@ function M:EventInit() end end) - _gamectr:AddEventListener(TX_GameEvent.EventResidueCard, function(...) - local arg = { ... } - local residueCard = arg[1] - self.cardMap = {} - self.cardSet = {} - for i = 1, #residueCard do - local cardNum = residueCard[i] - if not self.cardMap[cardNum] then - self.cardMap[cardNum] = 1 - table.insert(self.cardSet, cardNum) - else - self.cardMap[cardNum] = self.cardMap[cardNum] + 1 - end - end - table.sort(self.cardSet) - self._flag_getRemindCard = true - end) - --替换mianview的事件 _gamectr:AddEventListener( GameEvent.PlayerState, @@ -917,7 +868,6 @@ function M:ReloadRoom(bskip) self._room._reload_flag = true end end - self:reqResidueCard() self:ShowJing() for i = 1, #room.player_list do local p = room.player_list[i] @@ -1001,14 +951,6 @@ function M:UpdateCardBox(seat) self._ctr_cardbox.selectedIndex = index end ------------------------展示牌---------------------------- - -function M:reqResidueCard() - self._flag_getRemindCard = false - local _gamectr = ControllerManager.GetController(GameController) - _gamectr:ReqResidueCard() -end - function M:SendShowNext(ShowNextConfrimCtr) if not self._showNextName then ViewUtil.ErrorTip(nil, "请先选择一个麻将牌") diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua index 069683ad..8655f32a 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua @@ -388,10 +388,6 @@ function M:EventInit() print("lingmeng witness EvnetPiao") end) - _gamectr:AddEventListener(TX_GameEvent.EventResidueCard, function(...) - print("lingmeng witness EventResidueCard") - end) - --替换mianview的事件 _gamectr:AddEventListener( GameEvent.PlayerState, diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/GameEvent.lua b/lua_probject/extend_project/extend/majiang/fuzhou/GameEvent.lua index 58df4802..0351f85a 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/GameEvent.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/GameEvent.lua @@ -32,7 +32,5 @@ local TX_GameEvent = { SendGangZi = "SendGangZi", EventBuGang = "EventBuGang", - --- - EventResidueCard = "EventResidueCard" } return TX_GameEvent diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/Protocol.lua b/lua_probject/extend_project/extend/majiang/fuzhou/Protocol.lua index 38ab97d4..136d7b9f 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/Protocol.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/Protocol.lua @@ -47,11 +47,6 @@ local Protocol = { GAME_EVT_GANGZI = "837", GAME_EVT_BUGANG = "838", GAME_EVT_DOGANG = "839", - - --送牌 - GAME_NEXT_CARD = "888", - GAME_RESIDUE_CARD = "613", - GAME_EVT_RESIDUE_CARD = "889" } return Protocol diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua index 8cfebe72..1a1417b8 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua @@ -36,30 +36,9 @@ function M:init(name) self._eventmap[TX_Protocol.GAME_EVT_GANGZI] = self.OnEventGangCards self._eventmap[TX_Protocol.GAME_EVT_BUGANG] = self.OnEventBuGang - - self._eventmap[TX_Protocol.GAME_EVT_RESIDUE_CARD] = self.OnEventResidueCard end local __pre_delete_card = false --- 发送出牌指令到服务器 - - --------------------------展示牌--------------------------- -function M:SendNextCard(card) - local _data = {} - _data["card"] = tonumber(card) - local _client = ControllerManager.GameNetClinet - _client:send(TX_Protocol.GAME_NEXT_CARD, _data) -end - -function M:ReqResidueCard() - local _data = {} - _data["card"] = 0 - local _client = ControllerManager.GameNetClinet - _client:send(TX_Protocol.GAME_RESIDUE_CARD, _data) -end - ------------------------------------------------------------- function M:SendOutCard(data, callback) local _data = {} @@ -105,15 +84,6 @@ function M:OnEventBuGang(evt_data) DispatchEvent(self._dispatcher, TX_GameEvent.EventBuGang, evt_data["info"], true) end -function M:OnEventResidueCard(evt_data) - printlog("OnEventResidueCard") - pt(evt_data) - if evt_data.seat ~= DataManager.CurrenRoom.self_player.seat then - return - end - DispatchEvent(self._dispatcher, TX_GameEvent.EventResidueCard, evt_data["residueCard"]) -end - -- 发送放子选择到服务器 function M:SendAction(id) local _data = {} diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua index d87bbf9f..349b35a8 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua @@ -63,35 +63,6 @@ function M:InitView(url) self:UpdatePlayerInfoView() end) - self.showNextCtr = self._view:GetController('showNext') - self.showNextList = self._view:GetChild('list_showNext') - self._view:GetChild('btn_showNext').onClick:Set(function() - if self._flag_getRemindCard then - self.showNextCtr.selectedIndex = 1 - self.showNextList:SetVirtual() - self.showNextList.itemRenderer = function(index, obj) - local card = self.cardSet[index + 1] - self:FillShowCards(obj, card, self.cardMap[card]) - obj.data = { card = card } - end - self.showNextList.numItems = #self.cardSet - else - self:reqResidueCard() - end - end) - self._view:GetChild('btn_closeShow').onClick:Set(function() - self.showNextCtr.selectedIndex = 0 - self.showNextList.selectedIndex = -1 - self._showNextName = nil - end) - self.showNextList.onClickItem:Set(function(context) - local _gamectr = ControllerManager.GetController(GameController) - _gamectr:SendNextCard(context.data.data.card) - self.showNextCtr.selectedIndex = 0 - self.showNextList.selectedIndex = -1 - self._showNextName = nil - end) - -------- self:PlayerChangeLineState() @@ -225,7 +196,6 @@ function M:EventInit() --self._viewText_testName.text = 0 self:UpdateRound() self:RemoveCursor() - self:reqResidueCard() self._state.selectedIndex = 1 self:ShowJing() if self._niao_View then @@ -290,7 +260,6 @@ function M:EventInit() end) _gamectr:AddEventListener(TX_GameEvent.GetCard, function(...) self:__CloseTip() - self:reqResidueCard() local arg = { ... } local seat = arg[1] local card = arg[2] @@ -579,24 +548,6 @@ function M:EventInit() end end) - _gamectr:AddEventListener(TX_GameEvent.EventResidueCard, function(...) - local arg = { ... } - local residueCard = arg[1] - self.cardMap = {} - self.cardSet = {} - for i = 1, #residueCard do - local cardNum = residueCard[i] - if not self.cardMap[cardNum] then - self.cardMap[cardNum] = 1 - table.insert(self.cardSet, cardNum) - else - self.cardMap[cardNum] = self.cardMap[cardNum] + 1 - end - end - table.sort(self.cardSet) - self._flag_getRemindCard = true - end) - --替换mianview的事件 _gamectr:AddEventListener( GameEvent.PlayerState, @@ -918,7 +869,6 @@ function M:ReloadRoom(bskip) self._room._reload_flag = true end end - self:reqResidueCard() self:ShowJing() for i = 1, #room.player_list do local p = room.player_list[i] @@ -1002,14 +952,6 @@ function M:UpdateCardBox(seat) self._ctr_cardbox.selectedIndex = index end ------------------------展示牌---------------------------- - -function M:reqResidueCard() - self._flag_getRemindCard = false - local _gamectr = ControllerManager.GetController(GameController) - _gamectr:ReqResidueCard() -end - function M:SendShowNext(ShowNextConfrimCtr) if not self._showNextName then ViewUtil.ErrorTip(nil, "请先选择一个麻将牌") diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua index d5250149..b3a49728 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua @@ -388,10 +388,6 @@ function M:EventInit() print("lingmeng witness EvnetPiao") end) - _gamectr:AddEventListener(TX_GameEvent.EventResidueCard, function(...) - print("lingmeng witness EventResidueCard") - end) - --替换mianview的事件 _gamectr:AddEventListener( GameEvent.PlayerState, diff --git a/lua_probject/extend_project/extend/majiang/jinxi/GameEvent.lua b/lua_probject/extend_project/extend/majiang/jinxi/GameEvent.lua index 58df4802..0351f85a 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/GameEvent.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/GameEvent.lua @@ -32,7 +32,5 @@ local TX_GameEvent = { SendGangZi = "SendGangZi", EventBuGang = "EventBuGang", - --- - EventResidueCard = "EventResidueCard" } return TX_GameEvent diff --git a/lua_probject/extend_project/extend/majiang/jinxi/Protocol.lua b/lua_probject/extend_project/extend/majiang/jinxi/Protocol.lua index 38ab97d4..136d7b9f 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/Protocol.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/Protocol.lua @@ -47,11 +47,6 @@ local Protocol = { GAME_EVT_GANGZI = "837", GAME_EVT_BUGANG = "838", GAME_EVT_DOGANG = "839", - - --送牌 - GAME_NEXT_CARD = "888", - GAME_RESIDUE_CARD = "613", - GAME_EVT_RESIDUE_CARD = "889" } return Protocol diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua index 2fe4584d..e482c168 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua @@ -36,32 +36,11 @@ function M:init(name) self._eventmap[TX_Protocol.GAME_EVT_GANGZI] = self.OnEventGangCards self._eventmap[TX_Protocol.GAME_EVT_BUGANG] = self.OnEventBuGang - - self._eventmap[TX_Protocol.GAME_EVT_RESIDUE_CARD] = self.OnEventResidueCard end local __pre_delete_card = false --- 发送出牌指令到服务器 --------------------------展示牌--------------------------- -function M:SendNextCard(card) - local _data = {} - _data["card"] = tonumber(card) - local _client = ControllerManager.GameNetClinet - - _client:send(TX_Protocol.GAME_NEXT_CARD, _data) -end - -function M:ReqResidueCard() - local _data = {} - _data["card"] = 0 - local _client = ControllerManager.GameNetClinet - _client:send(TX_Protocol.GAME_RESIDUE_CARD, _data) -end - ------------------------------------------------------------- - function M:SendOutCard(data, callback) local _data = {} _data["card"] = data.card @@ -106,15 +85,6 @@ function M:OnEventBuGang(evt_data) DispatchEvent(self._dispatcher, TX_GameEvent.EventBuGang, evt_data["info"], true) end -function M:OnEventResidueCard(evt_data) - printlog("OnEventResidueCard") - pt(evt_data) - if evt_data.seat ~= DataManager.CurrenRoom.self_player.seat then - return - end - DispatchEvent(self._dispatcher, TX_GameEvent.EventResidueCard, evt_data["residueCard"]) -end - -- 发送放子选择到服务器 function M:SendAction(id) local _data = {} diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index 5c0066be..4ee28318 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -64,35 +64,6 @@ function M:InitView(url) self:UpdatePlayerInfoView() end) - self.showNextCtr = self._view:GetController('showNext') - self.showNextList = self._view:GetChild('list_showNext') - self._view:GetChild('btn_showNext').onClick:Set(function() - if self._flag_getRemindCard then - self.showNextCtr.selectedIndex = 1 - self.showNextList:SetVirtual() - self.showNextList.itemRenderer = function(index, obj) - local card = self.cardSet[index + 1] - self:FillShowCards(obj, card, self.cardMap[card]) - obj.data = { card = card } - end - self.showNextList.numItems = #self.cardSet - else - self:reqResidueCard() - end - end) - self._view:GetChild('btn_closeShow').onClick:Set(function() - self.showNextCtr.selectedIndex = 0 - self.showNextList.selectedIndex = -1 - self._showNextName = nil - end) - self.showNextList.onClickItem:Set(function(context) - local _gamectr = ControllerManager.GetController(GameController) - _gamectr:SendNextCard(context.data.data.card) - self.showNextCtr.selectedIndex = 0 - self.showNextList.selectedIndex = -1 - self._showNextName = nil - end) - -------- self:PlayerChangeLineState() @@ -224,7 +195,6 @@ function M:EventInit() --self._viewText_testName.text = 0 self:UpdateRound() self:RemoveCursor() - self:reqResidueCard() self._state.selectedIndex = 1 self:ShowJing() if self._niao_View then @@ -291,7 +261,6 @@ function M:EventInit() end) _gamectr:AddEventListener(TX_GameEvent.GetCard, function(...) self:__CloseTip() - self:reqResidueCard() local arg = { ... } local seat = arg[1] local card = arg[2] @@ -577,36 +546,6 @@ function M:EventInit() end end end) - - _gamectr:AddEventListener(TX_GameEvent.EventResidueCard, function(...) - local arg = { ... } - local residueCard = arg[1] - self.cardMap = {} - self.cardSet = {} - for i = 1, #residueCard do - local cardNum = residueCard[i] - if not self.cardMap[cardNum] then - self.cardMap[cardNum] = 1 - table.insert(self.cardSet, cardNum) - else - self.cardMap[cardNum] = self.cardMap[cardNum] + 1 - end - end - table.sort(self.cardSet) - self._flag_getRemindCard = true - end) - - --替换mianview的事件 - _gamectr:AddEventListener( - GameEvent.PlayerState, - function(...) - printlog("lingmeng OnEventOnlineState") - local arg = { ... } - local p = arg[1] - local info = self._player_info[self:GetPos(p.seat)] - info._ctr_offline.selectedIndex = p.line_state == 0 and 1 or 0 - end - ) end function M:OutCard(card) @@ -917,7 +856,6 @@ function M:ReloadRoom(bskip) self._room._reload_flag = true end end - self:reqResidueCard() self:ShowJing() for i = 1, #room.player_list do local p = room.player_list[i] @@ -1001,14 +939,6 @@ function M:UpdateCardBox(seat) self._ctr_cardbox.selectedIndex = index end ------------------------展示牌---------------------------- - -function M:reqResidueCard() - self._flag_getRemindCard = false - local _gamectr = ControllerManager.GetController(GameController) - _gamectr:ReqResidueCard() -end - function M:SendShowNext(ShowNextConfrimCtr) if not self._showNextName then ViewUtil.ErrorTip(nil, "请先选择一个麻将牌") diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua index 1c6f9244..aa735eee 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua @@ -392,9 +392,6 @@ function M:EventInit() print("lingmeng witness EvnetPiao") end) - _gamectr:AddEventListener(TX_GameEvent.EventResidueCard, function(...) - print("lingmeng witness EventResidueCard") - end) --替换mianview的事件 _gamectr:AddEventListener( diff --git a/lua_probject/extend_project/extend/majiang/lichuan/GameEvent.lua b/lua_probject/extend_project/extend/majiang/lichuan/GameEvent.lua index 58df4802..0351f85a 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/GameEvent.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/GameEvent.lua @@ -32,7 +32,5 @@ local TX_GameEvent = { SendGangZi = "SendGangZi", EventBuGang = "EventBuGang", - --- - EventResidueCard = "EventResidueCard" } return TX_GameEvent diff --git a/lua_probject/extend_project/extend/majiang/lichuan/Protocol.lua b/lua_probject/extend_project/extend/majiang/lichuan/Protocol.lua index 38ab97d4..136d7b9f 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/Protocol.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/Protocol.lua @@ -47,11 +47,6 @@ local Protocol = { GAME_EVT_GANGZI = "837", GAME_EVT_BUGANG = "838", GAME_EVT_DOGANG = "839", - - --送牌 - GAME_NEXT_CARD = "888", - GAME_RESIDUE_CARD = "613", - GAME_EVT_RESIDUE_CARD = "889" } return Protocol diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXGameController.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXGameController.lua index 6e4c3fd9..b5037f96 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXGameController.lua @@ -36,30 +36,9 @@ function M:init(name) self._eventmap[TX_Protocol.GAME_EVT_GANGZI] = self.OnEventGangCards self._eventmap[TX_Protocol.GAME_EVT_BUGANG] = self.OnEventBuGang - - self._eventmap[TX_Protocol.GAME_EVT_RESIDUE_CARD] = self.OnEventResidueCard end local __pre_delete_card = false --- 发送出牌指令到服务器 - - --------------------------展示牌--------------------------- -function M:SendNextCard(card) - local _data = {} - _data["card"] = tonumber(card) - local _client = ControllerManager.GameNetClinet - _client:send(TX_Protocol.GAME_NEXT_CARD, _data) -end - -function M:ReqResidueCard() - local _data = {} - _data["card"] = 0 - local _client = ControllerManager.GameNetClinet - _client:send(TX_Protocol.GAME_RESIDUE_CARD, _data) -end - ------------------------------------------------------------- function M:SendOutCard(data, callback) local _data = {} @@ -105,15 +84,6 @@ function M:OnEventBuGang(evt_data) DispatchEvent(self._dispatcher, TX_GameEvent.EventBuGang, evt_data["info"], true) end -function M:OnEventResidueCard(evt_data) - printlog("OnEventResidueCard") - pt(evt_data) - if evt_data.seat ~= DataManager.CurrenRoom.self_player.seat then - return - end - DispatchEvent(self._dispatcher, TX_GameEvent.EventResidueCard, evt_data["residueCard"]) -end - -- 发送放子选择到服务器 function M:SendAction(id) local _data = {} diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua index 46cf9bee..1ce54991 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua @@ -62,35 +62,6 @@ function M:InitView(url) self:UpdatePlayerInfoView() end) - self.showNextCtr = self._view:GetController('showNext') - self.showNextList = self._view:GetChild('list_showNext') - self._view:GetChild('btn_showNext').onClick:Set(function() - if self._flag_getRemindCard then - self.showNextCtr.selectedIndex = 1 - self.showNextList:SetVirtual() - self.showNextList.itemRenderer = function(index, obj) - local card = self.cardSet[index + 1] - self:FillShowCards(obj, card, self.cardMap[card]) - obj.data = { card = card } - end - self.showNextList.numItems = #self.cardSet - else - self:reqResidueCard() - end - end) - self._view:GetChild('btn_closeShow').onClick:Set(function() - self.showNextCtr.selectedIndex = 0 - self.showNextList.selectedIndex = -1 - self._showNextName = nil - end) - self.showNextList.onClickItem:Set(function(context) - local _gamectr = ControllerManager.GetController(GameController) - _gamectr:SendNextCard(context.data.data.card) - self.showNextCtr.selectedIndex = 0 - self.showNextList.selectedIndex = -1 - self._showNextName = nil - end) - -------- self:PlayerChangeLineState() @@ -223,7 +194,6 @@ function M:EventInit() --self._viewText_testName.text = 0 self:UpdateRound() self:RemoveCursor() - self:reqResidueCard() self._state.selectedIndex = 1 self:ShowJing() if self._niao_View then @@ -288,7 +258,6 @@ function M:EventInit() end) _gamectr:AddEventListener(TX_GameEvent.GetCard, function(...) self:__CloseTip() - self:reqResidueCard() local arg = { ... } local seat = arg[1] local card = arg[2] @@ -579,24 +548,6 @@ function M:EventInit() end end) - _gamectr:AddEventListener(TX_GameEvent.EventResidueCard, function(...) - local arg = { ... } - local residueCard = arg[1] - self.cardMap = {} - self.cardSet = {} - for i = 1, #residueCard do - local cardNum = residueCard[i] - if not self.cardMap[cardNum] then - self.cardMap[cardNum] = 1 - table.insert(self.cardSet, cardNum) - else - self.cardMap[cardNum] = self.cardMap[cardNum] + 1 - end - end - table.sort(self.cardSet) - self._flag_getRemindCard = true - end) - --替换mianview的事件 _gamectr:AddEventListener( GameEvent.PlayerState, @@ -918,7 +869,6 @@ function M:ReloadRoom(bskip) self._room._reload_flag = true end end - self:reqResidueCard() self:ShowJing() for i = 1, #room.player_list do local p = room.player_list[i] @@ -1002,14 +952,6 @@ function M:UpdateCardBox(seat) self._ctr_cardbox.selectedIndex = index end ------------------------展示牌---------------------------- - -function M:reqResidueCard() - self._flag_getRemindCard = false - local _gamectr = ControllerManager.GetController(GameController) - _gamectr:ReqResidueCard() -end - function M:SendShowNext(ShowNextConfrimCtr) if not self._showNextName then ViewUtil.ErrorTip(nil, "请先选择一个麻将牌") diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua index 5e540f31..90926fe3 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua @@ -388,10 +388,6 @@ function M:EventInit() print("lingmeng witness EvnetPiao") end) - _gamectr:AddEventListener(TX_GameEvent.EventResidueCard, function(...) - print("lingmeng witness EventResidueCard") - end) - --替换mianview的事件 _gamectr:AddEventListener( GameEvent.PlayerState, diff --git a/lua_probject/extend_project/extend/majiang/nancheng/GameEvent.lua b/lua_probject/extend_project/extend/majiang/nancheng/GameEvent.lua index 8d04bfee..0351f85a 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/GameEvent.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/GameEvent.lua @@ -1,6 +1,5 @@ - local TX_GameEvent = { - -- 发牌 + -- 发牌 SendCards = "SendCards", EventTurn = "EventTurn", @@ -22,18 +21,16 @@ local TX_GameEvent = { ZPResult2 = "ZPResult2", EventNiao = "EventNiao", - + EvnetPiaoTip = "EvnetPiaoTip", EvnetPiao = "EvnetPiao", - - - --- - SendLaiZi="SendLaiZi", + + + --- + SendLaiZi = "SendLaiZi", SendGangZi = "SendGangZi", EventBuGang = "EventBuGang", - --- - EventResidueCard = "EventResidueCard" } -return TX_GameEvent \ No newline at end of file +return TX_GameEvent diff --git a/lua_probject/extend_project/extend/majiang/nancheng/Protocol.lua b/lua_probject/extend_project/extend/majiang/nancheng/Protocol.lua index 72a45bcf..136d7b9f 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/Protocol.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/Protocol.lua @@ -1,7 +1,7 @@ local Protocol = { - -- 发牌协议 - GAME_EVT_PLAYER_DEAL = "811", - + -- 发牌协议 + GAME_EVT_PLAYER_DEAL = "811", + -- 出牌 GAME_DIS_CARD = "611", @@ -28,16 +28,16 @@ local Protocol = { -- 大结算 GAME_EVT_RESULT2 = "818", - - -- 抓牌 + + -- 抓牌 GAME_EVT_DRAW = "819", - -- 转盘指向事件 + -- 转盘指向事件 GAME_EVT_CHANGE_ACTIVE_PLAYER = "820", -- 抓鸟事件 GAME_EVT_NIAO = "821", - + -- 飘鸟提示 GAME_EVT_PIAOTIP = "833", @@ -47,11 +47,6 @@ local Protocol = { GAME_EVT_GANGZI = "837", GAME_EVT_BUGANG = "838", GAME_EVT_DOGANG = "839", - - --送牌 - GAME_NEXT_CARD = "888", - GAME_RESIDUE_CARD = "613", - GAME_EVT_RESIDUE_CARD = "889" } -return Protocol \ No newline at end of file +return Protocol diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua index a5f831e1..4852f214 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua @@ -53,7 +53,6 @@ function M:RegisterEvt() self._eventmap[RunFast_Protocol.GAME_EVT_CARDINHAND] = self.OnPlaySuccCheckHandCard self._eventmap[RunFast_Protocol.RunFast_Bomb_Score_New] = self.OnBompScoreNew - self._eventmap[RunFast_Protocol.RunFast_CheckCard_Succ] = self.OnCheckCard end -- function M:Oener(evt_data) @@ -134,19 +133,6 @@ function M:SendCard(cards, currentCard) _client:send(RunFast_Protocol.RunFast_Send_Card, _data) end -function M:SendCheckCard() - local _data = {} - local _client = ControllerManager.GameNetClinet - _client:send(RunFast_Protocol.RunFast_CheckCard, _data) -end - -function M:SendCheckCardSend(data) - local _data = {} - _data = data - local _client = ControllerManager.GameNetClinet - _client:send(RunFast_Protocol.RunFast_CheckCard_Send, _data) -end - function M:SendPiao(piao) local _data = {} _data["id"] = piao @@ -739,12 +725,4 @@ function M:OnBompScoreNew(evt_data) ) end -function M:OnCheckCard(evt_data) - self._cacheEvent:Enqueue( - function() - DispatchEvent(self._dispatcher, RunFast_GameEvent.OnCheckCard, evt_data) - end - ) -end - return M diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_GameEvent.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_GameEvent.lua index 1023076b..64adbd6c 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_GameEvent.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_GameEvent.lua @@ -20,6 +20,5 @@ local RunFast_GameEvent = { EventXiPai = "EventXiPai", OnPassSuccCheckCard = "OnPassSuccCheckCard", OnBompScoreNew = "OnBompScoreNew", - OnCheckCard = "OnCheckCard" } return RunFast_GameEvent diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua index cce9afd9..c6152243 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua @@ -113,13 +113,6 @@ function M:InitView(url) self._view:GetChild("roominfo_panel1"):GetChild("tex_beishu").text = "" end - self._view_click = self._view:GetChild('click') - if self._view_click then - self._view_click.onClick:Set(function() - self._gamectr:SendCheckCard() - end) - end - self.ctr_state = self._view:GetController("state") self._ctr_action = self._view:GetController("action") -- self._tex_leftTime = self._view:GetChild("time"):GetChild("title") @@ -714,45 +707,6 @@ function M:EventInit() end) end end) - _gamectr:AddEventListener(RunFast_GameEvent.OnCheckCard, function(...) - local arg = { ... } - local evt_data = arg[1] - local list = self._view:GetChild('comp_checkCard'):GetChild('list') - list:RemoveChildrenToPool() - for k, v in pairs(evt_data) do - local obj = list:AddItemFromPool() - table.sort(v, function(a, b) - if a % 100 == b % 100 then - return math.floor(a / 100) > math.floor(b / 100) - else - return a % 100 > b % 100 - end - end) - local titleText = "" - if k == "first" then - titleText = "手牌1：" - elseif k == "second" then - titleText = "手牌2：" - elseif k == "three" then - titleText = "手牌3：" - end - obj.text = titleText - obj:GetChild('click').onClick:Set(function() - evt_data.choic = k - self._gamectr:SendCheckCardSend(evt_data) - self._view:GetController('check').selectedIndex = 0 - end) - obj:GetChild('List_Out').itemRenderer = function(index, obj) - local code = v[index + 1] - if code % 100 == 15 then - code = math.floor(code / 100) * 100 + 2 - end - obj:GetChild('icon').url = string.format("ui://Main_Poker/%s", code) - end - obj:GetChild('List_Out').numItems = #v - end - self._view:GetController('check').selectedIndex = 1 - end) _gamectr:AddEventListener(RunFast_GameEvent.OnPassSuccCheckCard, function(...) self._popEvent = false diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_Protocol.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_Protocol.lua index 6a92dbad..a53a681a 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_Protocol.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_Protocol.lua @@ -39,10 +39,6 @@ local RunFast_Protocol = { GAME_EVENT_XIPAI = "20837", GAME_EVENT_NOTIFY_XIPAI = "20838", GAME_EVT_CARDINHAND = "202022", - - RunFast_CheckCard = "8881", - RunFast_CheckCard_Succ = "8882", - RunFast_CheckCard_Send = "888" } return RunFast_Protocol diff --git a/lua_probject/main_project/main/majiang/TX_GameEvent.lua b/lua_probject/main_project/main/majiang/TX_GameEvent.lua index 58df4802..0351f85a 100644 --- a/lua_probject/main_project/main/majiang/TX_GameEvent.lua +++ b/lua_probject/main_project/main/majiang/TX_GameEvent.lua @@ -32,7 +32,5 @@ local TX_GameEvent = { SendGangZi = "SendGangZi", EventBuGang = "EventBuGang", - --- - EventResidueCard = "EventResidueCard" } return TX_GameEvent