314bc5df
zhengshouren
提交服务器初始代码
|
1
2
3
4
5
6
7
|
require "ProtocolCode"
require "shared.init"
require "utils.init"
require "GlobalVar"
require "RedisKeys"
require "skynet.manager"
|
314bc5df
zhengshouren
提交服务器初始代码
|
8
9
10
11
12
13
14
15
16
17
|
local queue = require "skynet.queue"
local netpack = require "skynet.netpack"
local socket = require "skynet.socket"
local sharedata = require "skynet.sharedata"
local xxtea = require "xxtea"
skynet = require "skynet"
redisproxy = require "shared.redisproxy"
datacenter = require "skynet.datacenter"
mcast_util = require "services/mcast_util"
|
5e5d7680
zhouhaihai
热更新 优化
|
18
|
globalCsv = require "csvdata/GlobalDefine"
|
314bc5df
zhengshouren
提交服务器初始代码
|
19
20
21
22
23
24
|
local CMD = {}
local agentInfo = {} -- { client_fd, role, gate_serv, open_timer}
local agent_util, cs
|
5e5d7680
zhouhaihai
热更新 优化
|
25
|
_hotfixActions = _hotfixActions or {}
|
2d392ede
zhouhaihai
热更新 最终版
|
26
|
_hotfixClass = _hotfixClass or {}
|
5e5d7680
zhouhaihai
热更新 优化
|
27
|
|
314bc5df
zhengshouren
提交服务器初始代码
|
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
--- {{{ 定时器相关
local function handle_timeout()
if not agentInfo.open_timer then return end
if not agentInfo.role then
skynet.timeout(100, handle_timeout)
return
end
agent_util:update(agentInfo)
skynet.timeout(100, handle_timeout)
end
function start_agent_timer()
|
44c6e479
zhouhaihai
增加部分日志
|
42
|
if agentInfo.open_timer then return end
|
314bc5df
zhengshouren
提交服务器初始代码
|
43
44
45
46
47
48
49
50
51
|
agentInfo.open_timer = true
skynet.timeout(150, handle_timeout)
end
function cancel_agent_timer()
agentInfo.open_timer = false
end
---- 定时器相关 }}}
|
23d89d13
zhouahaihai
冒险 结构
|
52
|
local _pipelinings = {} --可同时多个序列 栈的形式保证嵌套不出错
|
314bc5df
zhengshouren
提交服务器初始代码
|
53
|
function SendPacket(actionCode, bin, client_fd)
|
23d89d13
zhouahaihai
冒险 结构
|
54
55
|
client_fd = client_fd or agentInfo.client_fd
|
314bc5df
zhengshouren
提交服务器初始代码
|
56
57
58
59
|
local handlerName = actionHandlers[actionCode]
if string.sub(handlerName, -3, -1) == "Rpc" then
actionCode = actionCode + rpcResponseBegin
end
|
23d89d13
zhouahaihai
冒险 结构
|
60
61
62
63
64
65
66
67
68
69
70
|
-- 查看是否是在 流水线操作中
if #_pipelinings > 0 then
local _curPipelining = _pipelinings[#_pipelinings]
_curPipelining[client_fd] = _curPipelining[client_fd] or {} --区分不同客户端
table.insert(_curPipelining[client_fd], {actionCode, bin})
else
if #bin > 0 then bin = xxtea.encrypt(bin, XXTEA_KEY) end
local head = string.pack("H", actionCode)
return socket.write(client_fd, netpack.pack(head .. bin))
end
end
|
314bc5df
zhengshouren
提交服务器初始代码
|
71
|
|
23d89d13
zhouahaihai
冒险 结构
|
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
function SendPipelining(callback)
if type(callback) ~= "function" then return end
--push 当前队列
table.insert(_pipelinings, {})
-- 执行代码块 输出错误信息
local ok, err = pcall(callback)
--弹出当前队列
local curPipelining = table.remove(_pipelinings)
-- 查看是否有消息
if next(curPipelining) then
for client_fd, msg in pairs(curPipelining) do
SendPacket(actionCodes.Role_pipelining, MsgPack.pack(msg), client_fd)
end
end
if not ok then error(err) end
|
314bc5df
zhengshouren
提交服务器初始代码
|
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
|
end
function rpcAgent(roleId, funcName, ...)
local agent = datacenter.get("agent", roleId)
if agent then
return skynet.call(agent.serv, "lua", funcName, ...)
end
end
function rpcParter(serv, func, ...)
if serv then
local ok, result = pcall(skynet.call, serv, "role", func, ...)
if ok then
return result
end
end
end
local string_format = string.format
local table_unpack = table.unpack
function rpcRole(roleId, funcName, ...)
local fields = ...
local agent = datacenter.get("agent", roleId)
if agent and agent.serv then
if funcName == "getProperties" then
return true, skynet.call(agent.serv, "role", funcName, fields)
else
return true, skynet.call(agent.serv, "role", funcName, ...)
end
else
|
fa565e0c
zhouhaihai
优化结构
|
117
|
local roleCross = require("models.RoleCross")
|
da898074
zhouhaihai
pvp 高级领奖
|
118
119
120
121
122
|
if funcName == "getProperties" then
return false, roleCross.handle(funcName, roleId, fields)
else
return false, roleCross.handle(funcName, roleId, ...)
end
|
314bc5df
zhengshouren
提交服务器初始代码
|
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
|
end
end
function rpcUnion(funcName, ...)
local serv = agentInfo.userv
if not serv then
local consortiaId = agentInfo.role:getProperty("consortiaId")
if consortiaId == 0 then return true,1000 end
local union = datacenter.get("union", consortiaId)
if not union or not union.serv then
skynet.error("rpcUnion error: union serv addr not exist", funcName, consortiaId)
return
end
serv = union.serv
end
return skynet.call(serv, "lua", funcName, ...)
end
function rpcOtherUnion(id, funcName, ...)
local union = datacenter.get("union", id)
if union and union.serv then
return skynet.call(union.serv, "lua", funcName, ...)
end
end
skynet.register_protocol {
name = "client",
id = skynet.PTYPE_CLIENT,
unpack = function (msg, sz)
local data = skynet.tostring(msg, sz)
local cmd = string.unpack("H", string.sub(data, 1, 2))
return cmd, string.sub(data, 3)
end,
dispatch = function(session, address, cmd, data)
|
188558e8
zhouahaihai
skynet 1.2.0 use...
|
157
|
skynet.ignoreret()
|
9ad697c8
zhouahaihai
删除 fields ,增加数据库...
|
158
|
-- skynet.trace() --执行序的跟踪统计
|
314bc5df
zhengshouren
提交服务器初始代码
|
159
160
161
162
163
164
165
166
167
168
|
cs(function()
if cmd == actionCodes.Sys_heartBeat then
agent_util:heart_beat(agentInfo)
return
end
local actionName = actionHandlers[cmd]
if not actionName then
print("actionName not exist", actionName)
return
end
|
314bc5df
zhengshouren
提交服务器初始代码
|
169
|
|
5e5d7680
zhouhaihai
热更新 优化
|
170
171
172
173
174
175
176
177
178
179
180
181
|
local method
if _hotfixActions[actionName] then
method = _hotfixActions[actionName]
else
local modName, funcName = actionName:match("(%w+)%.(%w+)")
local ok, action = pcall(require, "actions." .. modName .. "Action")
if not ok then
print("require module name error", action, modName)
return
end
method = action[funcName]
|
314bc5df
zhengshouren
提交服务器初始代码
|
182
|
end
|
5e5d7680
zhouhaihai
热更新 优化
|
183
|
|
314bc5df
zhengshouren
提交服务器初始代码
|
184
185
186
187
188
189
|
if type(method) ~= "function" then
print("ERROR_SERVER_INVALID_ACTION", modName, funcName)
return
end
if #data > 0 then data = xxtea.decrypt(data, XXTEA_KEY) end
|
44c6e479
zhouhaihai
增加部分日志
|
190
191
192
193
194
195
|
-- 一次操作是一个关联操作 记录 ucode 是一样的
if agentInfo.role then
agentInfo.role:startActionUcode()
end
|
314bc5df
zhengshouren
提交服务器初始代码
|
196
|
local result = method(agentInfo, data)
|
44c6e479
zhouhaihai
增加部分日志
|
197
198
199
200
201
|
if agentInfo.role then
agentInfo.role:endActionUcode()
end
|
214061fa
zhengshouren
错误情况,返回错误码
|
202
203
|
if not result or type(result) == "number" then
SendPacket(actionCodes.Sys_innerErrorMsg, MsgPack.pack({id = cmd * 100 + (result or 0)}))
|
314bc5df
zhengshouren
提交服务器初始代码
|
204
205
206
207
208
209
210
|
end
end)
end
}
skynet.register_protocol {
name = "role",
|
3c8a6b8a
zhouhaihai
get equip
|
211
|
id = 13,
|
314bc5df
zhengshouren
提交服务器初始代码
|
212
213
214
|
pack = skynet.pack,
unpack = skynet.unpack,
dispatch = function(session, address, submethod, ...)
|
9ad697c8
zhouahaihai
删除 fields ,增加数据库...
|
215
|
-- skynet.trace() --执行序的跟踪统计
|
314bc5df
zhengshouren
提交服务器初始代码
|
216
217
218
219
220
221
222
223
224
225
226
227
|
local result
if not agentInfo.role then
result = "__OFFLINE__"
else
result = agentInfo.role[submethod](agentInfo.role, ...)
end
skynet.ret(skynet.pack(result))
end,
}
-- function CMD.start(gate, fd, ip)
|
5e5d7680
zhouhaihai
热更新 优化
|
228
|
function CMD.start(session, source, gate, fd, ip, hotfixs)
|
314bc5df
zhengshouren
提交服务器初始代码
|
229
230
231
232
233
234
235
236
237
|
ignoreHeartbeat = false
agentInfo.client_fd = fd
agentInfo.gate_serv = gate
agentInfo.ip = ip
agent_util:reset()
math.randomInit()
|
a5b025b0
zhouhaihai
已存在agent 玩家重新登录不进行更新
|
238
239
240
241
|
if hotfixs then
for _, hotfix in ipairs(hotfixs) do
CMD.hotfix(hotfix)
end
|
5e5d7680
zhouhaihai
热更新 优化
|
242
|
end
|
3fe4471e
zhouhaihai
热更新 demo
|
243
|
|
314bc5df
zhengshouren
提交服务器初始代码
|
244
245
246
247
248
249
250
251
|
-- 这里将消息伪装成 watchdog 发出,这样就由 A->B->C->B->A 变成 A->B->C->A
skynet.redirect(gate, source, "lua", session, skynet.pack("forward", fd, 0, skynet.self()))
end
function CMD.close()
cancel_agent_timer()
mcast_util.usub_world()
mcast_util.usub_union()
|
314bc5df
zhengshouren
提交服务器初始代码
|
252
253
|
local role = agentInfo.role
if not role then return end
|
da898074
zhouhaihai
pvp 高级领奖
|
254
|
role:log("logout", {int1 = skynet.timex()-role:getProperty("ltime")})
|
314bc5df
zhengshouren
提交服务器初始代码
|
255
256
257
258
259
|
role:onOfflineEvent()
end
function CMD.exit()
if agentInfo.role then
|
314bc5df
zhengshouren
提交服务器初始代码
|
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
|
datacenter.set("agent", agentInfo.role:getProperty("id"), nil)
end
skynet.exit()
end
function CMD.subUnion(consortiaId, union)
mcast_util.sub_union(consortiaId, union.chan)
agentInfo.userv = union.serv
end
function CMD:usubUnion()
mcast_util.usub_union()
agentInfo.userv = nil
end
|
3fe4471e
zhouhaihai
热更新 demo
|
275
276
277
|
function CMD.hotfix(code)
local ok, func = pcall(load, code)
if ok then
|
2d392ede
zhouhaihai
热更新 最终版
|
278
|
ok = pcall(func, agentInfo.role)
|
3fe4471e
zhouhaihai
热更新 demo
|
279
280
|
end
if not ok then
|
2d392ede
zhouhaihai
热更新 最终版
|
281
|
skynet.error("hotfix_code error by code " .. code)
|
3fe4471e
zhouhaihai
热更新 demo
|
282
283
284
|
end
end
|
314bc5df
zhengshouren
提交服务器初始代码
|
285
286
287
288
289
|
local function routeGM(cmd, params)
if type(params) ~= "table" or not agentInfo.role then
return "指令失败"
end
local _M = require "actions.GmAction"
|
3133cb76
zhouhaihai
日志
|
290
291
292
293
294
295
|
agentInfo.role:startActionUcode()
local status = _M[cmd](agentInfo.role, params)
agentInfo.role:endActionUcode()
return status
|
314bc5df
zhengshouren
提交服务器初始代码
|
296
297
298
299
|
end
skynet.start(function()
skynet.dispatch("lua", function(session, source, command, ...)
|
9ad697c8
zhouahaihai
删除 fields ,增加数据库...
|
300
|
-- skynet.trace() --执行序的跟踪统计
|
314bc5df
zhengshouren
提交服务器初始代码
|
301
302
303
|
local f = CMD[command]
if f then
if command == "exit" then
|
188558e8
zhouahaihai
skynet 1.2.0 use...
|
304
|
skynet.ignoreret()
|
314bc5df
zhengshouren
提交服务器初始代码
|
305
306
|
f(...)
elseif command == "start" then
|
188558e8
zhouahaihai
skynet 1.2.0 use...
|
307
|
skynet.ignoreret()
|
314bc5df
zhengshouren
提交服务器初始代码
|
308
|
f(session, source, ...)
|
836228c9
zhouhaihai
热更新 bug
|
309
310
311
|
elseif command == "hotfix" then
skynet.ignoreret()
f(...)
|
314bc5df
zhengshouren
提交服务器初始代码
|
312
313
314
315
316
317
318
319
|
else
skynet.ret(skynet.pack(f(...)))
end
else
skynet.ret(skynet.pack(routeGM(command, ...)))
end
end)
|
da898074
zhouhaihai
pvp 高级领奖
|
320
|
redisd = skynet.localname(".REDIS")
|
314bc5df
zhengshouren
提交服务器初始代码
|
321
|
if tonumber(skynet.getenv "logd") == 1 then
|
da898074
zhouhaihai
pvp 高级领奖
|
322
|
logd = skynet.localname(".LOGD")
|
314bc5df
zhengshouren
提交服务器初始代码
|
323
324
325
326
|
end
cs = queue()
|
5e5d7680
zhouhaihai
热更新 优化
|
327
|
csvdb = sharedata.query("csvdata")
|
e3c5cc5e
zhouhaihai
跨服竞技场over
|
328
|
pvpd = skynet.localname(".PVPCROSS")
|
314bc5df
zhengshouren
提交服务器初始代码
|
329
330
331
332
333
334
335
336
|
-- 错误码特殊处理
-- todo
-- for key, value in pairs(csvdb["sys_codesCsv"]) do
-- _G[string.upper(value.varname)] = key
-- end
agent_util = require "services/agent_util"
end)
|