From 2b4403f0b63353c2986214ea8e25ab19016696e6 Mon Sep 17 00:00:00 2001 From: 1076390229 <1076390229@qq.com> Date: Wed, 6 Aug 2025 15:26:47 +0800 Subject: [PATCH] =?UTF-8?q?1006=E5=8A=A0gid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/Controller/GameController.lua | 7 +-- .../Game/Controller/GroupMgrController.lua | 6 ++ lua_probject/base_project/Game/Protocol.lua | 7 +-- .../Assets/StreamingAssets/init2_1.json | 60 +++++++++---------- 4 files changed, 38 insertions(+), 42 deletions(-) diff --git a/lua_probject/base_project/Game/Controller/GameController.lua b/lua_probject/base_project/Game/Controller/GameController.lua index 5f1d31d2..b079bfa4 100644 --- a/lua_probject/base_project/Game/Controller/GameController.lua +++ b/lua_probject/base_project/Game/Controller/GameController.lua @@ -90,7 +90,6 @@ function M:init(name) self._eventmap[Protocol.GAME_EVT_Exit_WITNESS_ROOM] = self.OnEvtExieWitness self._eventmap[Protocol.GAME_GANGFEN] = self.OnEvtGANGFEN - self._eventmap[Protocol.GAME_MISSILE] = self.OnEvtMISSILE self._eventmap[Protocol.GAME_HOME_STATE] = self.OnEvtHomeState @@ -182,6 +181,7 @@ function M:SendInteraction(playid, type, parm, callback) _data['playerid'] = playid _data['type'] = type _data['parm'] = parm + _data['gid'] = 1 _client:send(Protocol.GAME_INTERACTION, _data, function(res) callback(res) end) @@ -659,11 +659,6 @@ function M:OnEvtGANGFEN(msg) DispatchEvent(self._dispatcher, GameEvent.AddScore, nil, msg) end -function M:OnEvtMISSILE(msg) - print("有人扔番茄了") - DispatchEvent(self._dispatcher, GameEvent.MISSILE, nil, msg) -end - function M:DispatchEventTuoGuan(p, isShow, t) DispatchEvent(self._dispatcher, GameEvent.TupGuanOpen, p, isShow, t) end diff --git a/lua_probject/base_project/Game/Controller/GroupMgrController.lua b/lua_probject/base_project/Game/Controller/GroupMgrController.lua index 2117f6b1..f070ccb6 100644 --- a/lua_probject/base_project/Game/Controller/GroupMgrController.lua +++ b/lua_probject/base_project/Game/Controller/GroupMgrController.lua @@ -533,6 +533,7 @@ function M:FG_Data_NewChat(evt_data) end function M:FG_Data_Member_State(evt_data) + --[[ print("收到成员状态推送") pt(evt_data) local offlineUserId = evt_data.offlineUserId @@ -566,6 +567,7 @@ function M:FG_Data_Member_State(evt_data) end DispatchEvent(self._dispatcher, GroupMgrEvent.OnMemberState, evt_data) + ]] end function M:FG_Data_Family_Reflash(evt_data) @@ -575,6 +577,7 @@ function M:FG_Data_Family_Reflash(evt_data) end function M:OnMemberOut(evt_data) + --[[ print("收到成员退出推送") pt(evt_data) local uid = evt_data.uid @@ -583,9 +586,11 @@ function M:OnMemberOut(evt_data) group:delMember(uid) DispatchEvent(self._dispatcher, GroupMgrEvent.OnFamilyMemberOut, evt_data) Broadcast.Send(BroadcastEvent.OnMemberChange) + ]] end function M:OnMemberOnline(evt_data) + print("收到在线成员推送") pt(evt_data) @@ -604,6 +609,7 @@ function M:OnMemberOnline(evt_data) end DispatchEvent(self._dispatcher, GroupMgrEvent.OnMemberState, evt_data) + Broadcast.Send(BroadcastEvent.OnMemberChange) end function M:OnRefNumberBan(evt_data) diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua index 2ca65f07..d9f26b1f 100644 --- a/lua_probject/base_project/Game/Protocol.lua +++ b/lua_probject/base_project/Game/Protocol.lua @@ -426,6 +426,7 @@ Protocol = { FGMGR_EVT_Push_Assistant = "push_assistant", -- 刷新成员列表 FGMGR_EVT_Ref_NumberBan = "13010", + --end::::::::::::::牌友圈协议:::::::::::::::::::: -------------------Game ---------------------------- @@ -528,12 +529,6 @@ Protocol = { --加分显示 GAME_GANGFEN = "999", - --推送道具互动 - GAME_MISSILE = "?", - - --发送道具互动 - GAME_SENDMISSILE = "?", - -- 按home建 在游戏里1 不在游戏里0 GAME_SET_HOME = "3009", diff --git a/wb_unity_pro/Assets/StreamingAssets/init2_1.json b/wb_unity_pro/Assets/StreamingAssets/init2_1.json index ab54858e..dbe4feae 100644 --- a/wb_unity_pro/Assets/StreamingAssets/init2_1.json +++ b/wb_unity_pro/Assets/StreamingAssets/init2_1.json @@ -1,109 +1,109 @@ [ { "lua_path": "/tolua_project,/base_project,/main_project", - "ver": "1.0.9", + "ver": "1.0.6", "name": "base_script", "check": true, "bundle": "base/base_script", - "version": "1.0.9" + "version": "1.0.6" }, { - "ver": "1.0.9", + "ver": "1.0.6", "name": "common", "check": true, "bundle": "base/common", - "version": "1.0.9" + "version": "1.0.6" }, { - "ver": "1.0.9", + "ver": "1.0.6", "name": "login", "check": true, "bundle": "base/login", - "version": "1.0.9" + "version": "1.0.6" }, { - "ver": "1.0.9", + "ver": "1.0.6", "name": "lobby", "check": true, "bundle": "base/lobby", - "version": "1.0.9" + "version": "1.0.6" }, { - "ver": "1.0.9", + "ver": "1.0.6", "name": "Family", "check": true, "bundle": "base/Family", - "version": "1.0.9" + "version": "1.0.6" }, { - "ver": "1.0.9", + "ver": "1.0.6", "name": "chat", "check": true, "bundle": "base/chat", - "version": "1.0.9" + "version": "1.0.6" }, { - "ver": "1.0.9", + "ver": "1.0.6", "name": "newgroup", "check": true, "bundle": "base/newgroup", - "version": "1.0.9" + "version": "1.0.6" }, { - "ver": "1.0.9", + "ver": "1.0.6", "name": "rank", "check": true, - "version": "1.0.9", + "version": "1.0.6", "bundle": "base/rank" }, { - "ver": "1.0.9", + "ver": "1.0.6", "name": "main_majiang", "check": true, - "version": "1.0.9", + "version": "1.0.6", "bundle": "base/main_majiang" }, { - "ver": "1.0.9", + "ver": "1.0.6", "name": "main_poker", "check": true, - "version": "1.0.9", + "version": "1.0.6", "bundle": "base/main_poker" }, { - "ver": "1.0.9", + "ver": "1.0.6", "name": "main_zipai", "check": true, - "version": "1.0.9", + "version": "1.0.6", "bundle": "base/main_zipai" }, { - "ver": "1.0.9", + "ver": "1.0.6", "name": "static", "check": true, "bundle": "base/static", - "version": "1.0.9" + "version": "1.0.6" }, { - "ver": "1.0.9", + "ver": "1.0.6", "is_res": true, "name": "embed", "check": true, "bundle": "base/embed", - "version": "1.0.9" + "version": "1.0.6" }, { - "ver": "1.0.9", + "ver": "1.0.6", "name": "main_pokemajiang", "check": true, - "version": "1.0.9", + "version": "1.0.6", "bundle": "base/main_pokemajiang" }, { - "ver": "1.0.9", + "ver": "1.0.6", "name": "main_zipaimajiang", "check": true, - "version": "1.0.9", + "version": "1.0.6", "bundle": "base/main_zipaimajiang" } ]