Skip to content

Commit 699feea

Browse files
committed
update proto
update proto
1 parent 0857ca0 commit 699feea

File tree

6 files changed

+23
-2
lines changed

6 files changed

+23
-2
lines changed

xjgame/game/agent.lua

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ local netpack = require "netpack"
44
local socket = require "socket"
55
local sproto = require "sproto"
66
local conf = require "conf"
7-
local proto = require "proto"
7+
local netpack = require "netpack"
8+
local proto = require "xjproto"
89
local sprotoloader = require "sprotoloader"
910
local eventlistener = require "eventlistener"
1011

@@ -156,6 +157,12 @@ skynet.start(function()
156157
host = sprotoloader.load(1):host "package"
157158
send_request = host:attach(sprotoloader.load(2))
158159

160+
-- local req = send_request("scene_aoi_exit", { objid = 1 }, 1)
161+
-- print("request foobar size =", #req)
162+
-- local host = sprotoloader.load(2):host "package"
163+
-- local type, name, request, response = host:dispatch(req,0)
164+
-- print("************=======name:", type, name, request, response)
165+
159166
-- 初始化玩家代理数据
160167
player.__init__()
161168

xjgame/game/main.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ skynet.start(function()
1414
skynet.uniqueservice("luaconf")
1515

1616
--
17-
skynet.uniqueservice("protoloader")
17+
skynet.uniqueservice("xjprotoloader")
1818

1919
if harborname == "login" then
2020
-- 启动全局消息派发

xjgame/lualib/msgserverd.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ function server.start(conf)
243243
local u = assert(connection[fd], "invalid fd")
244244
local msg_sz = sz - 4
245245
local session = netpack.tostring(msg, sz, msg_sz)
246+
print("****************** do_request:", tonumber(session))
246247
local p = u.response[session]
247248
if p then
248249
-- session can be reuse in the same connection

xjgame/proto/c2s.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,7 @@ scene_enter 7 {
9090
}
9191
}
9292
93+
heartbeat 8 {}
94+
9395
9496
]]

xjgame/proto/xjprotoloader.lua

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
2+
local skynet = require "skynet"
3+
local sprotoparser = require "sprotoparser"
4+
local sprotoloader = require "sprotoloader"
5+
local proto = require "xjproto"
6+
7+
skynet.start(function()
8+
sprotoloader.save(proto.c2s, 1)
9+
sprotoloader.save(proto.s2c, 2)
10+
-- don't call skynet.exit() , because sproto.core may unload and the global slot become invalid
11+
end)

0 commit comments

Comments
 (0)