同步梭哈协议修改

lua_probject/extend_project/extend/poker2/suoha/ExGameController.lua

@@ -33,7 +33,6 @@ end
 -- 事件注册
 function M:RegisterEvt()
     self._eventmap[EXProtocol.GAME_EVT_PLAYER_DEAL] = self.OnSendCard
-    self._eventmap[EXProtocol.GAME_EVT_ACTION] = self.OnTipAction
     self._eventmap[EXProtocol.GAME_EVT_RESULT1] = self.OnResult1
     self._eventmap[EXProtocol.GAME_EVT_RESULT2] = self.OnResult2
     self._eventmap[EXProtocol.GAME_EVT_CHANGE_ACTIVE_PLAYER] = self.OnTurnAction
@@ -79,17 +78,9 @@ end
 -- end
 
 --我发出的协议
-function M:SendTipQi()
+function M:SendTip(_data)
-    local _data = {}
     local _client = ControllerManager.GameNetClinet
-    _client:send(EXProtocol.GAME_EVT_FOLD, _data)
+    _client:send(EXProtocol.GAME_ACTION, _data)
-end
-
-function M:SendTipXia(score)
-    local _data = {}
-    _data["betScore"] = score
-    local _client = ControllerManager.GameNetClinet
-    _client:send(EXProtocol.GAME_EVT_BET, _data)
 end
 
 --绑定协议为事件

lua_probject/extend_project/extend/poker2/suoha/ExPlayerSelfPokerInfoView.lua

@@ -64,21 +64,21 @@ end
 function M:OnClickTips(context)
     local button = context.data.data
     local type = button.type
+    local _data = {}
     if type == TipType.guo then
     elseif type == TipType.qi then
-        self:ClickTipQi()
+        _data["id"] = 1016
+        self:ClickTip(_data)
     elseif type == TipType.xia then
         local score = button.data
-        self:ClickTipXia(score)
+        _data["id"] = 1012
+        _data["betScore"] = tonumber(score)
+        self:ClickTip(_data)
     end
 end
 
-function M:ClickTipQi()
+function M:ClickTip(_data)
-    self._gameCtr:SendTipQi()
+    self._gameCtr:SendTip(_data)
-end
-
-function M:ClickTipXia(score)
-    self._gameCtr:SendTipXia(score)
 end
 
 function M.SetTipData(obj, type, ...)

lua_probject/extend_project/extend/poker2/suoha/ExProtocol.lua

@@ -10,36 +10,12 @@ local EXProtocol = {
     -- 发牌协议
     GAME_EVT_PLAYER_DEAL = "2010",
 
-    -- 下注提示协议
-    GAME_EVT_ACTION = "2011",
-
-    -- 下注事件
-    GAME_EVT_BET = "2012",
-
-    -- 跟注事件
-    GAME_EVT_CALL = "2013",
-
-    -- 加注事件
-    GAME_EVT_RAISE = "2014",
-
-    -- 梭哈事件
-    GAME_EVT_ALL_IN = "2015",
-
-    -- 弃牌事件
-    GAME_EVT_FOLD = "2016",
-
-    -- 过牌事件
-    GAME_EVT_CHECK = "2017",
-
-
     -- 小结算
     GAME_EVT_RESULT1 = "2007",
 
     -- 大结算
     GAME_EVT_RESULT2 = "2008",
 
-
-
     -- 转盘指向事件
     GAME_EVT_CHANGE_ACTIVE_PLAYER = "2099",
 }