1006加gid
parent
1ea145fa6c
commit
2b4403f0b6
|
|
@ -90,7 +90,6 @@ function M:init(name)
|
||||||
self._eventmap[Protocol.GAME_EVT_Exit_WITNESS_ROOM] = self.OnEvtExieWitness
|
self._eventmap[Protocol.GAME_EVT_Exit_WITNESS_ROOM] = self.OnEvtExieWitness
|
||||||
|
|
||||||
self._eventmap[Protocol.GAME_GANGFEN] = self.OnEvtGANGFEN
|
self._eventmap[Protocol.GAME_GANGFEN] = self.OnEvtGANGFEN
|
||||||
self._eventmap[Protocol.GAME_MISSILE] = self.OnEvtMISSILE
|
|
||||||
|
|
||||||
self._eventmap[Protocol.GAME_HOME_STATE] = self.OnEvtHomeState
|
self._eventmap[Protocol.GAME_HOME_STATE] = self.OnEvtHomeState
|
||||||
|
|
||||||
|
|
@ -182,6 +181,7 @@ function M:SendInteraction(playid, type, parm, callback)
|
||||||
_data['playerid'] = playid
|
_data['playerid'] = playid
|
||||||
_data['type'] = type
|
_data['type'] = type
|
||||||
_data['parm'] = parm
|
_data['parm'] = parm
|
||||||
|
_data['gid'] = 1
|
||||||
_client:send(Protocol.GAME_INTERACTION, _data, function(res)
|
_client:send(Protocol.GAME_INTERACTION, _data, function(res)
|
||||||
callback(res)
|
callback(res)
|
||||||
end)
|
end)
|
||||||
|
|
@ -659,11 +659,6 @@ function M:OnEvtGANGFEN(msg)
|
||||||
DispatchEvent(self._dispatcher, GameEvent.AddScore, nil, msg)
|
DispatchEvent(self._dispatcher, GameEvent.AddScore, nil, msg)
|
||||||
end
|
end
|
||||||
|
|
||||||
function M:OnEvtMISSILE(msg)
|
|
||||||
print("有人扔番茄了")
|
|
||||||
DispatchEvent(self._dispatcher, GameEvent.MISSILE, nil, msg)
|
|
||||||
end
|
|
||||||
|
|
||||||
function M:DispatchEventTuoGuan(p, isShow, t)
|
function M:DispatchEventTuoGuan(p, isShow, t)
|
||||||
DispatchEvent(self._dispatcher, GameEvent.TupGuanOpen, p, isShow, t)
|
DispatchEvent(self._dispatcher, GameEvent.TupGuanOpen, p, isShow, t)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -533,6 +533,7 @@ function M:FG_Data_NewChat(evt_data)
|
||||||
end
|
end
|
||||||
|
|
||||||
function M:FG_Data_Member_State(evt_data)
|
function M:FG_Data_Member_State(evt_data)
|
||||||
|
--[[
|
||||||
print("收到成员状态推送")
|
print("收到成员状态推送")
|
||||||
pt(evt_data)
|
pt(evt_data)
|
||||||
local offlineUserId = evt_data.offlineUserId
|
local offlineUserId = evt_data.offlineUserId
|
||||||
|
|
@ -566,6 +567,7 @@ function M:FG_Data_Member_State(evt_data)
|
||||||
end
|
end
|
||||||
|
|
||||||
DispatchEvent(self._dispatcher, GroupMgrEvent.OnMemberState, evt_data)
|
DispatchEvent(self._dispatcher, GroupMgrEvent.OnMemberState, evt_data)
|
||||||
|
]]
|
||||||
end
|
end
|
||||||
|
|
||||||
function M:FG_Data_Family_Reflash(evt_data)
|
function M:FG_Data_Family_Reflash(evt_data)
|
||||||
|
|
@ -575,6 +577,7 @@ function M:FG_Data_Family_Reflash(evt_data)
|
||||||
end
|
end
|
||||||
|
|
||||||
function M:OnMemberOut(evt_data)
|
function M:OnMemberOut(evt_data)
|
||||||
|
--[[
|
||||||
print("收到成员退出推送")
|
print("收到成员退出推送")
|
||||||
pt(evt_data)
|
pt(evt_data)
|
||||||
local uid = evt_data.uid
|
local uid = evt_data.uid
|
||||||
|
|
@ -583,9 +586,11 @@ function M:OnMemberOut(evt_data)
|
||||||
group:delMember(uid)
|
group:delMember(uid)
|
||||||
DispatchEvent(self._dispatcher, GroupMgrEvent.OnFamilyMemberOut, evt_data)
|
DispatchEvent(self._dispatcher, GroupMgrEvent.OnFamilyMemberOut, evt_data)
|
||||||
Broadcast.Send(BroadcastEvent.OnMemberChange)
|
Broadcast.Send(BroadcastEvent.OnMemberChange)
|
||||||
|
]]
|
||||||
end
|
end
|
||||||
|
|
||||||
function M:OnMemberOnline(evt_data)
|
function M:OnMemberOnline(evt_data)
|
||||||
|
|
||||||
print("收到在线成员推送")
|
print("收到在线成员推送")
|
||||||
pt(evt_data)
|
pt(evt_data)
|
||||||
|
|
||||||
|
|
@ -604,6 +609,7 @@ function M:OnMemberOnline(evt_data)
|
||||||
end
|
end
|
||||||
|
|
||||||
DispatchEvent(self._dispatcher, GroupMgrEvent.OnMemberState, evt_data)
|
DispatchEvent(self._dispatcher, GroupMgrEvent.OnMemberState, evt_data)
|
||||||
|
Broadcast.Send(BroadcastEvent.OnMemberChange)
|
||||||
end
|
end
|
||||||
|
|
||||||
function M:OnRefNumberBan(evt_data)
|
function M:OnRefNumberBan(evt_data)
|
||||||
|
|
|
||||||
|
|
@ -426,6 +426,7 @@ Protocol = {
|
||||||
FGMGR_EVT_Push_Assistant = "push_assistant",
|
FGMGR_EVT_Push_Assistant = "push_assistant",
|
||||||
-- 刷新成员列表
|
-- 刷新成员列表
|
||||||
FGMGR_EVT_Ref_NumberBan = "13010",
|
FGMGR_EVT_Ref_NumberBan = "13010",
|
||||||
|
|
||||||
--end::::::::::::::牌友圈协议::::::::::::::::::::
|
--end::::::::::::::牌友圈协议::::::::::::::::::::
|
||||||
|
|
||||||
-------------------Game ----------------------------
|
-------------------Game ----------------------------
|
||||||
|
|
@ -528,12 +529,6 @@ Protocol = {
|
||||||
--加分显示
|
--加分显示
|
||||||
GAME_GANGFEN = "999",
|
GAME_GANGFEN = "999",
|
||||||
|
|
||||||
--推送道具互动
|
|
||||||
GAME_MISSILE = "?",
|
|
||||||
|
|
||||||
--发送道具互动
|
|
||||||
GAME_SENDMISSILE = "?",
|
|
||||||
|
|
||||||
-- 按home建 在游戏里1 不在游戏里0
|
-- 按home建 在游戏里1 不在游戏里0
|
||||||
GAME_SET_HOME = "3009",
|
GAME_SET_HOME = "3009",
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,109 +1,109 @@
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
"lua_path": "/tolua_project,/base_project,/main_project",
|
"lua_path": "/tolua_project,/base_project,/main_project",
|
||||||
"ver": "1.0.9",
|
"ver": "1.0.6",
|
||||||
"name": "base_script",
|
"name": "base_script",
|
||||||
"check": true,
|
"check": true,
|
||||||
"bundle": "base/base_script",
|
"bundle": "base/base_script",
|
||||||
"version": "1.0.9"
|
"version": "1.0.6"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ver": "1.0.9",
|
"ver": "1.0.6",
|
||||||
"name": "common",
|
"name": "common",
|
||||||
"check": true,
|
"check": true,
|
||||||
"bundle": "base/common",
|
"bundle": "base/common",
|
||||||
"version": "1.0.9"
|
"version": "1.0.6"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ver": "1.0.9",
|
"ver": "1.0.6",
|
||||||
"name": "login",
|
"name": "login",
|
||||||
"check": true,
|
"check": true,
|
||||||
"bundle": "base/login",
|
"bundle": "base/login",
|
||||||
"version": "1.0.9"
|
"version": "1.0.6"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ver": "1.0.9",
|
"ver": "1.0.6",
|
||||||
"name": "lobby",
|
"name": "lobby",
|
||||||
"check": true,
|
"check": true,
|
||||||
"bundle": "base/lobby",
|
"bundle": "base/lobby",
|
||||||
"version": "1.0.9"
|
"version": "1.0.6"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ver": "1.0.9",
|
"ver": "1.0.6",
|
||||||
"name": "Family",
|
"name": "Family",
|
||||||
"check": true,
|
"check": true,
|
||||||
"bundle": "base/Family",
|
"bundle": "base/Family",
|
||||||
"version": "1.0.9"
|
"version": "1.0.6"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ver": "1.0.9",
|
"ver": "1.0.6",
|
||||||
"name": "chat",
|
"name": "chat",
|
||||||
"check": true,
|
"check": true,
|
||||||
"bundle": "base/chat",
|
"bundle": "base/chat",
|
||||||
"version": "1.0.9"
|
"version": "1.0.6"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ver": "1.0.9",
|
"ver": "1.0.6",
|
||||||
"name": "newgroup",
|
"name": "newgroup",
|
||||||
"check": true,
|
"check": true,
|
||||||
"bundle": "base/newgroup",
|
"bundle": "base/newgroup",
|
||||||
"version": "1.0.9"
|
"version": "1.0.6"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ver": "1.0.9",
|
"ver": "1.0.6",
|
||||||
"name": "rank",
|
"name": "rank",
|
||||||
"check": true,
|
"check": true,
|
||||||
"version": "1.0.9",
|
"version": "1.0.6",
|
||||||
"bundle": "base/rank"
|
"bundle": "base/rank"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ver": "1.0.9",
|
"ver": "1.0.6",
|
||||||
"name": "main_majiang",
|
"name": "main_majiang",
|
||||||
"check": true,
|
"check": true,
|
||||||
"version": "1.0.9",
|
"version": "1.0.6",
|
||||||
"bundle": "base/main_majiang"
|
"bundle": "base/main_majiang"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ver": "1.0.9",
|
"ver": "1.0.6",
|
||||||
"name": "main_poker",
|
"name": "main_poker",
|
||||||
"check": true,
|
"check": true,
|
||||||
"version": "1.0.9",
|
"version": "1.0.6",
|
||||||
"bundle": "base/main_poker"
|
"bundle": "base/main_poker"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ver": "1.0.9",
|
"ver": "1.0.6",
|
||||||
"name": "main_zipai",
|
"name": "main_zipai",
|
||||||
"check": true,
|
"check": true,
|
||||||
"version": "1.0.9",
|
"version": "1.0.6",
|
||||||
"bundle": "base/main_zipai"
|
"bundle": "base/main_zipai"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ver": "1.0.9",
|
"ver": "1.0.6",
|
||||||
"name": "static",
|
"name": "static",
|
||||||
"check": true,
|
"check": true,
|
||||||
"bundle": "base/static",
|
"bundle": "base/static",
|
||||||
"version": "1.0.9"
|
"version": "1.0.6"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ver": "1.0.9",
|
"ver": "1.0.6",
|
||||||
"is_res": true,
|
"is_res": true,
|
||||||
"name": "embed",
|
"name": "embed",
|
||||||
"check": true,
|
"check": true,
|
||||||
"bundle": "base/embed",
|
"bundle": "base/embed",
|
||||||
"version": "1.0.9"
|
"version": "1.0.6"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ver": "1.0.9",
|
"ver": "1.0.6",
|
||||||
"name": "main_pokemajiang",
|
"name": "main_pokemajiang",
|
||||||
"check": true,
|
"check": true,
|
||||||
"version": "1.0.9",
|
"version": "1.0.6",
|
||||||
"bundle": "base/main_pokemajiang"
|
"bundle": "base/main_pokemajiang"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ver": "1.0.9",
|
"ver": "1.0.6",
|
||||||
"name": "main_zipaimajiang",
|
"name": "main_zipaimajiang",
|
||||||
"check": true,
|
"check": true,
|
||||||
"version": "1.0.9",
|
"version": "1.0.6",
|
||||||
"bundle": "base/main_zipaimajiang"
|
"bundle": "base/main_zipaimajiang"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue