From cf897e81f4901dba5565573bb991dd3d5511d786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Thu, 15 May 2025 18:46:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=A2=AD=E5=93=88=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extend/poker2/suoha/ExGameController.lua | 13 ++-------- .../suoha/ExPlayerSelfPokerInfoView.lua | 16 ++++++------ .../extend/poker2/suoha/ExProtocol.lua | 24 ------------------ .../ui/Extend_Poker_RunFastNew_fui.bytes | Bin 160468 -> 160468 bytes 4 files changed, 10 insertions(+), 43 deletions(-) diff --git a/lua_probject/extend_project/extend/poker2/suoha/ExGameController.lua b/lua_probject/extend_project/extend/poker2/suoha/ExGameController.lua index 5c873c68..b97778ac 100644 --- a/lua_probject/extend_project/extend/poker2/suoha/ExGameController.lua +++ b/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() - local _data = {} +function M:SendTip(_data) local _client = ControllerManager.GameNetClinet - _client:send(EXProtocol.GAME_EVT_FOLD, _data) -end - -function M:SendTipXia(score) - local _data = {} - _data["betScore"] = score - local _client = ControllerManager.GameNetClinet - _client:send(EXProtocol.GAME_EVT_BET, _data) + _client:send(EXProtocol.GAME_ACTION, _data) end --绑定协议为事件 diff --git a/lua_probject/extend_project/extend/poker2/suoha/ExPlayerSelfPokerInfoView.lua b/lua_probject/extend_project/extend/poker2/suoha/ExPlayerSelfPokerInfoView.lua index 96d2bc6a..b8c984a8 100644 --- a/lua_probject/extend_project/extend/poker2/suoha/ExPlayerSelfPokerInfoView.lua +++ b/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() - self._gameCtr:SendTipQi() -end - -function M:ClickTipXia(score) - self._gameCtr:SendTipXia(score) +function M:ClickTip(_data) + self._gameCtr:SendTip(_data) end function M.SetTipData(obj, type, ...) diff --git a/lua_probject/extend_project/extend/poker2/suoha/ExProtocol.lua b/lua_probject/extend_project/extend/poker2/suoha/ExProtocol.lua index f82be2e9..a6664a92 100644 --- a/lua_probject/extend_project/extend/poker2/suoha/ExProtocol.lua +++ b/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", } diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes index caac25403c8930149a12cd3b311087a312b1edb2..c2de870041beeca26d164bed9c2db2ec9478d84c 100644 GIT binary patch delta 7325 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
    0cy$&70mjYks8S`^JM#ni@_`Ax` z6AR&_?+RA{tL((_@3Fkx;k14s__&{01fS|W=#xtzUzBwPxlb+S;EC=Eb~i?dmY(oG z)mRQ~X&=E0o__+E@_h1H4#PO`A4Qi4A}DnQyazu}{tE8dm+pj>FbiOsd(SF}bU}6Z z#Wg^NcLUa6mG#%4z_pO*&iWXZ0qk@S`V>aFyg%cK9KaRA&44|{{RgD`-bVPs$L!0- zZ()$n{k|;P&Aw?bK@_#y4N>$03eUuLr@yyHHV4FdpHxmz58^}x}e8%LoH z530#A_LUIfK7SI@b(luI&hXfGx<5PvGrhgd$nSn0>vDvV<#2s_e=`I}?_Gf)gM$S| zUAdD+Ug7!??ys*veZ_drbrYvXHy}|(Fda+luJeF)-GJrXzuq^Y%3~bWngjZ?kV{)Z z4~OP-lz$rL>4yzIIm{4Z6n`}|D9GnuO$*gzlF|7=Sv=lBs?I+Rql{h; z8jW-`Dq9<=56aAlR(v6avLj73TbWEN&7Y~XMd;6pU1~F3Gvz?HpVSxmz%KVHfBhxk zc@Y76LRfR-MGm(6^2h%~(-Qeh;IF)zOalV+agapE_$REjSxeu{an>qa>e0-#WJmXq zK(n!_^h;Si0dn2pL3$KG9z7SV*Qyg`Qmz}kq~)0MjKyp_!pv8-S?4^?Hz$tMoUdqA zu)Yn#+&#+C%A)0|&{KTkVe zX1;Nj2i3nwzHYU%s4N$lkwY7hP2D|1_5JnT_1f#r%lmluA3eO!s6qV(PH>MOr1yI4 F{{VG>W|;s0