314bc5df
zhengshouren
提交服务器初始代码
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
|
local ipairs = ipairs
local table = table
local math = math
local next = next
local string = string
local redisproxy = redisproxy
local MsgPack = MsgPack
local getRandomName = getRandomName
local mcast_util = mcast_util
local string_format = string.format
local tonumber = tonumber
local require = require
local table_insert = table.insert
local tconcat = table.concat
local httpc = require("http.httpc")
local WAVE_HERO_NUMS = 150
|
a0013f0b
zhouhaihai
零件分批推送
|
18
|
local WAVE_RUNE_NUMS = 150
|
314bc5df
zhengshouren
提交服务器初始代码
|
19
20
21
22
23
24
|
local function validName(name)
name = string.upper(name)
local exist = redisproxy:exists(string_format("user:%s", name))
if exist then return "existed" end
|
da898074
zhouhaihai
pvp 高级领奖
|
25
|
local SERV = string_format(".NAMED%d", math.random(1, 5))
|
314bc5df
zhengshouren
提交服务器初始代码
|
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
local legal = skynet.call(SERV, "lua", "check", name)
return legal and "ok" or "illegal"
end
-- 随机玩家名
local function randomRoleName()
-- 过滤已经存在的名字
local name
repeat
name = getRandomName()
until validName(name) == "ok"
return name
end
local function setRoleName(uid, roleId)
local result
local name
local dbName
repeat
name = randomRoleName()
dbName = string.upper(name)
result = redisproxy:setnx(string_format("user:%s", dbName), roleId)
until result == 1
redisproxy:set(string_format("uid:%s", uid), dbName)
return name
end
local _M = {}
function _M.loginRpc( agent, data )
local msg = MsgPack.unpack(data)
local response = {}
|
e3c5cc5e
zhouhaihai
跨服竞技场over
|
57
58
59
60
61
|
if msg.codeVersion ~= globalCsv.codeVersion then
response.result = "UPDATE_TIP"
SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(response))
return true
end
|
314bc5df
zhengshouren
提交服务器初始代码
|
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
-- 1.
local roleId = redisproxy:get(string_format("user:%s", string.upper(msg.name)))
if not roleId then
response.result = "NOT_EXIST"
SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(response))
return true
end
roleId = tonumber(roleId)
--维护不能登录
local maintain = tonumber(redisproxy:hget("autoincrement_set", "maintain"))
if maintain and maintain > 0 then
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
76
|
if tonumber(redisproxy:hget(string_format("role:%d", roleId), "ignoreMt")) ~= 1 then
|
314bc5df
zhengshouren
提交服务器初始代码
|
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
|
response.result = "MAINTAIN_TIP"
SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(response))
return true
end
end
local now = skynet.timex()
local role = agent.role
-- 2
if not role then
local roleKey = string_format("role:%d", roleId)
if not redisproxy:exists(roleKey) then
response.result = "DB_ERROR"
SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(response))
return true
end
-- 2a
role = require("models.Role").new({key = roleKey})
role:load()
role:loadAll()
else
role:reloadWhenLogin()
end
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
100
|
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
if not msg.isGMlogin then
local banTime = role:getProperty("banTime")
if banTime > now then
response.result = "BAN_TIP"
response.banTime = banTime
response.banType = role:getProperty("banType")
response.roleId = roleId
SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(response))
return true
end
if banTime ~= 0 then
-- 清除封号状态
role:setBan(0)
end
end
|
314bc5df
zhengshouren
提交服务器初始代码
|
116
|
SERV_OPEN = redisproxy:hget("autoincrement_set", "server_start")
|
314bc5df
zhengshouren
提交服务器初始代码
|
117
|
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
118
|
role:changeStructVersion() -- 数据结构 版本更新
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
119
|
role:advEndlessSeasonCheck(true) -- 冒险赛季更新检查
|
314bc5df
zhengshouren
提交服务器初始代码
|
120
|
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
121
|
-- 跨天登陆事件
|
da898074
zhouhaihai
pvp 高级领奖
|
122
|
role:updateTimeReset(now)
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
123
|
role:setProperty("ltime", now)
|
c384626d
zhouhaihai
好友
|
124
|
redisproxy:zadd(FRIEND_RECOMMEND, now, roleId)
|
be9c9ca6
zhouahaihai
角色评论
|
125
|
|
fa565e0c
zhouhaihai
优化结构
|
126
|
for _, name in ipairs({"dailyData", "dinerData"}) do
|
be9c9ca6
zhouahaihai
角色评论
|
127
128
129
|
response[name] = role[name]:data()
end
|
314bc5df
zhengshouren
提交服务器初始代码
|
130
131
132
133
|
response.role = role:data()
response.result = "SUCCESS"
response.serverTime = now
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
134
135
136
137
138
139
140
|
local modules = {}
local heroIds = {}
for heroId, _ in pairs(role.heros) do
table.insert(heroIds, heroId)
end
local heroWave = math.ceil(#heroIds / WAVE_HERO_NUMS)
|
6947e382
zhouahaihai
好感度, 皮肤
|
141
|
if #heroIds <= 50 then
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
142
143
144
145
|
heroWave = 0
table_insert(modules, "heros")
end
|
a0013f0b
zhouhaihai
零件分批推送
|
146
147
148
149
150
151
152
153
154
155
|
local runeIds = {}
for id ,_ in pairs(role.runeBag) do
table.insert(runeIds, id)
end
local runeWave = math.ceil(#runeIds / WAVE_RUNE_NUMS)
if #runeIds <= 50 then
runeWave = 0
table_insert(modules, "runeBag")
end
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
156
157
158
159
160
161
162
|
for _, name in ipairs(modules) do
response[name] = {}
for id, unit in pairs(role[name]) do
response[name][id] = unit:data()
end
end
|
c384626d
zhouhaihai
好友
|
163
|
response.wave = 1 + heroWave + runeWave + 1
|
314bc5df
zhengshouren
提交服务器初始代码
|
164
165
166
|
SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(response))
|
a0013f0b
zhouhaihai
零件分批推送
|
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
|
local curWave = 1
local runeIndex = 1
for index = curWave + 1, curWave + runeWave do
local runeResponse = {runeBag = {}}
for i = runeIndex, runeIndex + WAVE_RUNE_NUMS do
local runeId = runeIds[i]
if not runeId then
break
end
local rune = role.runeBag[runeId]
table.insert(runeResponse.runeBag, rune:data())
runeIndex = runeIndex + 1
end
runeResponse.runeWave = index
SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(runeResponse))
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
183
|
end
|
a0013f0b
zhouhaihai
零件分批推送
|
184
|
curWave = curWave + runeWave
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
185
|
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
186
|
local heroIndex = 1
|
a0013f0b
zhouhaihai
零件分批推送
|
187
|
for index = curWave + 1, curWave + heroWave do
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
188
189
190
191
192
193
194
195
196
197
198
199
200
|
local heroResponse = {heros = {}}
for i = heroIndex, heroIndex + WAVE_HERO_NUMS do
local heroId = heroIds[i]
if not heroId then
break
end
local hero = role.heros[heroId]
table_insert(heroResponse.heros, hero:data())
heroIndex = heroIndex + 1
end
heroResponse.heroWave = index
SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(heroResponse))
end
|
a0013f0b
zhouhaihai
零件分批推送
|
201
|
curWave = curWave + heroWave
|
314bc5df
zhengshouren
提交服务器初始代码
|
202
|
|
fa565e0c
zhouhaihai
优化结构
|
203
|
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
204
|
|
314bc5df
zhengshouren
提交服务器初始代码
|
205
|
-- 注册全服广播
|
fa565e0c
zhouhaihai
优化结构
|
206
207
208
209
210
211
212
213
214
|
if not role._channelIdx then
local channel = math.randomInt(1, 1)
role._channelIdx = channel
end
if not mcast_util.channel_world() then
local w_channel = datacenter.get( ("MC_W_CHANNEL" .. role._channelIdx) )
if w_channel then
mcast_util.sub_world(w_channel)
end
|
314bc5df
zhengshouren
提交服务器初始代码
|
215
|
end
|
c384626d
zhouhaihai
好友
|
216
217
218
|
-- 发下缓存的世界消息
local worldChatResponse = {worldChats = {}}
|
da898074
zhouhaihai
pvp 高级领奖
|
219
|
local ok, msgs = pcall(skynet.call, '.GLOBALD', "lua", "getWorldMsg", role._channelIdx)
|
c384626d
zhouhaihai
好友
|
220
221
222
223
|
if not ok then
msgs = {}
end
worldChatResponse.worldChats = msgs
|
4cf74232
zhouhaihai
pvp
|
224
225
226
227
228
|
local redret = redisproxy:pipelining(function(red)
red:lrange(CHAT_OFFLINE:format(roleId), 0, -1)
red:del(CHAT_OFFLINE:format(roleId))
end)
worldChatResponse.p2pChats = redret[1]
|
c384626d
zhouhaihai
好友
|
229
230
231
232
233
|
worldChatResponse.chatWave = curWave + 1
curWave = curWave + 1
SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(worldChatResponse))
|
fa565e0c
zhouhaihai
优化结构
|
234
235
236
237
238
239
240
241
|
datacenter.set("agent", roleId, {
serv = skynet.self(),
fd = agent.client_fd,
gate_serv = agent.gate_serv,
})
agent.role = role
start_agent_timer()
|
4cf74232
zhouhaihai
pvp
|
242
243
244
245
246
|
-- 玩家登陆做的一些操作
role:saveHangTeam()
role:savePvpCTeam()
|
fa565e0c
zhouhaihai
优化结构
|
247
|
|
da898074
zhouhaihai
pvp 高级领奖
|
248
|
role:log("login", {key1 = agent.ip:toArray(false, ":")[1]})
|
4c5d72ab
zhouhaihai
高级pvp
|
249
|
|
314bc5df
zhengshouren
提交服务器初始代码
|
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
|
return true
end
function _M.createRpc(agent, data)
local msg = MsgPack.unpack(data)
local response = {}
-- 再次检查uid
local uid = tostring(msg.uid)
local user = redisproxy:get(string_format("uid:%s", uid))
if user then
response.result = "SUCCESS"
response.roleName = user
SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
return true
end
local roleId = getNextRoleId()
if not roleId then
response.result = "DB_FULL"
SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
return true
end
local roleName = setRoleName(msg.uid, roleId)
|
314bc5df
zhengshouren
提交服务器初始代码
|
274
275
276
277
|
local newRole = require("models.Role").new({
key = string_format("role:%d", roleId),
id = roleId,
uid = tostring(msg.uid),
|
dc9d814f
zhouhaihai
邮件
|
278
|
sid = msg.subId or 0,
|
314bc5df
zhengshouren
提交服务器初始代码
|
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
|
name = roleName,
uname = msg.uname or "",
device = tostring(msg.device)
})
if newRole:create() then
--更新USER表
response.result = "SUCCESS"
response.roleId = roleId
response.roleName = string.upper(roleName)
else
response.result = "DB_ERROR"
SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
return true
end
|
dc9d814f
zhouhaihai
邮件
|
295
|
newRole:award(globalCsv.birthItem)
|
314bc5df
zhengshouren
提交服务器初始代码
|
296
|
-- 欢迎邮件
|
147ef2ce
zhouhaihai
邮件 Gm
|
297
|
redisproxy:insertEmail({roleId = roleId, emailId = 1})
|
314bc5df
zhengshouren
提交服务器初始代码
|
298
|
|
da898074
zhouhaihai
pvp 高级领奖
|
299
|
newRole:log("create", {key1 = agent.ip:toArray(false, ":")[1]})
|
314bc5df
zhengshouren
提交服务器初始代码
|
300
301
302
303
304
|
SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
return true
end
|
dc9d814f
zhouhaihai
邮件
|
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
|
function _M.changeNameRpc(agent, data)
local role = agent.role
local roleId = role:getProperty("id")
local msg = MsgPack.unpack(data)
local newName = msg.name
local oldName = role:getProperty("name")
if not newName or type(newName) ~= "string" then return end
if newName == oldName then return end
-- 检查name是否合法
local checked = validName(newName)
if checked ~= "ok" then
--[[
"existed" 已经存在
"illegal" 包含非法字符
]]
local errCodes = {
["existed"] = 1,
["illegal"] = 2
}
SendPacket(actionCodes.Role_changeNameRpc, MsgPack.pack({result = errCodes[checked]}))
return true
end
if not roleId then
SendPacket(actionCodes.Role_changeNameRpc, MsgPack.pack({result = 3}))
return true
end
local result = redisproxy:setnx(string_format("user:%s", newName), roleId)
if result == 0 then
SendPacket(actionCodes.Role_changeNameRpc, MsgPack.pack({result = 1}))
return true
end
redisproxy:pipelining(function (red)
red:del(string_format("user:%s", oldName))
red:set(string_format("uid:%s", role:getProperty("uid")), newName)
end)
role:updateProperties({
["name"] = newName,
})
|
e3c5cc5e
zhouhaihai
跨服竞技场over
|
348
349
|
role:changeCrossServerPvpSelfInfo("name")
|
dc9d814f
zhouhaihai
邮件
|
350
351
352
353
354
355
356
357
358
359
360
|
SendPacket(actionCodes.Role_changeNameRpc, MsgPack.pack({result = 0}))
return true
end
function _M.changeIntroRpc(agent, data)
local role = agent.role
local roleId = role:getProperty("id")
local msg = MsgPack.unpack(data)
local content = msg.content
if not content or type(content) ~= "string" then return end
|
da898074
zhouhaihai
pvp 高级领奖
|
361
|
local SERV = string_format(".CHATED%d", math.random(1, 5))
|
dc9d814f
zhouhaihai
邮件
|
362
363
364
365
366
|
local legal, mod = skynet.call(SERV, "lua", "check", content)
if not legal then
content = mod or ""
end
|
14f1591b
zhouhaihai
删除好感度相关
|
367
|
role:updateProperty({field = "intro", value = content})
|
dc9d814f
zhouhaihai
邮件
|
368
369
370
371
372
|
SendPacket(actionCodes.Role_changeIntroRpc, '')
return true
end
|
314bc5df
zhengshouren
提交服务器初始代码
|
373
374
375
376
377
|
function _M.syncTimeRpc(agent, data)
SendPacket(actionCodes.Role_syncTimeRpc, MsgPack.pack({nowTime = skynet.timex()}))
return true
end
|
312b9db5
zhouahaihai
背包
|
378
379
380
|
function _M.saleItemRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
84e7c06e
zhouhaihai
回收
|
381
382
383
384
|
local backs = msg.backs
if not backs then return end
local reward = {}
|
53e8037e
zhouhaihai
任务
|
385
|
local fragCount = 0
|
84e7c06e
zhouhaihai
回收
|
386
387
388
389
|
for itemId, count in pairs(backs) do
if math.illegalNum(count, 1, role:getItemCount(itemId)) then return end
local itemData = csvdb["itemCsv"][itemId]
if itemData.sell_effect == "" then return end
|
53e8037e
zhouhaihai
任务
|
390
391
392
|
if itemData.type == ItemType.HeroFragment or itemData.type == ItemType.HeroFCommon then
fragCount = fragCount + count
end
|
84e7c06e
zhouhaihai
回收
|
393
394
395
396
397
398
|
local sellEffect = itemData.sell_effect:toArray(true, "=")
reward[sellEffect[1]] = (reward[sellEffect[1]] or 0) + sellEffect[2] * count
end
role:costItems(backs)
local reward = role:award(reward)
|
53e8037e
zhouhaihai
任务
|
399
|
role:checkTaskEnter("DecoFrag", {count = fragCount})
|
312b9db5
zhouahaihai
背包
|
400
401
402
403
404
405
406
407
408
409
410
411
412
|
SendPacket(actionCodes.Role_saleItemRpc, MsgPack.pack({reward = reward}))
return true
end
function _M.openItemRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local itemId = msg.itemId
local count = msg.count
if math.illegalNum(count, 1, role:getItemCount(itemId)) then return end
local itemData = csvdb["itemCsv"][itemId]
if itemData.use_type ~= 2 then return end
local randomData = csvdb["item_randomCsv"][tonumber(itemData.use_effect)]
|
9b35bf6e
zhouhaihai
开启时间箱
|
413
|
if not randomData or randomData.openTime > 0 then return end
|
312b9db5
zhouahaihai
背包
|
414
|
|
007af97e
zhouhaihai
item_random 结构更改
|
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
|
local reward = {}
for _i = 1, count do
for i = 1, 10 do
local num = randomData["num" .. i]
local gift = randomData["gift" .. i]
if num and gift and num > 0 and gift ~= "" then
local pool = {}
for _, temp in ipairs(gift:toArray()) do
table.insert(pool, temp:toArray(true, "="))
end
local needCount = math.min(#pool, num)
for j = 1, needCount do
local idx = math.randWeight(pool, 3)
reward[pool[idx][1]] = (reward[pool[idx][1]] or 0) + pool[idx][2]
table.remove(pool, idx)
end
|
312b9db5
zhouahaihai
背包
|
431
432
433
|
end
end
end
|
007af97e
zhouhaihai
item_random 结构更改
|
434
435
|
reward[0] = nil
|
36204e3c
zhengshouren
贩卖逻辑
|
436
|
role:costItems({[itemId] = count})
|
8c199cec
zhengshouren
简化物品奖励接口,设置默认参数
|
437
|
reward = role:award(reward)
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
438
|
|
312b9db5
zhouahaihai
背包
|
439
440
441
442
|
SendPacket(actionCodes.Role_openItemRpc, MsgPack.pack({reward = reward}))
return true
end
|
9b35bf6e
zhouhaihai
开启时间箱
|
443
444
445
|
function _M.openTimeBoxRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
4d8bd32c
chenyueqi
倒计时开箱子
|
446
|
local oper = msg.oper -- 操作 1 - 2
|
9b35bf6e
zhouhaihai
开启时间箱
|
447
|
local slot = msg.slot -- 位置 1 - 6
|
40632058
chenyueqi
拆解时钟箱,功能修改后明显的错误
|
448
|
if math.illegalNum(slot, 1, role:getFuncLv(FuncOpenType.TimeBoxSlot)) then return end
|
9b35bf6e
zhouhaihai
开启时间箱
|
449
450
|
local boxL = role:getProperty("boxL")
|
cc87434b
chenyueqi
时钟箱拆解
|
451
|
local reward = {}
|
9b35bf6e
zhouhaihai
开启时间箱
|
452
453
454
455
|
if oper == 1 then -- 打开
local itemId = msg.itemId
if role:getItemCount(itemId) < 1 then return end
local itemData = csvdb["itemCsv"][itemId]
|
c384626d
zhouhaihai
好友
|
456
|
local randomData = csvdb["item_randomCsv"][itemId]
|
4d8bd32c
chenyueqi
倒计时开箱子
|
457
|
if not itemData or not randomData or randomData.openTime <= 0 then return end
|
9b35bf6e
zhouhaihai
开启时间箱
|
458
459
460
461
|
if boxL[slot] then return end
role:costItems({[itemId] = 1})
boxL[slot] = {id = itemId, time = skynet.timex() + randomData.openTime}
|
538e9773
zhouhaihai
上宝石
|
462
|
|
4d8bd32c
chenyueqi
倒计时开箱子
|
463
|
elseif oper == 2 then -- 领取
|
9b35bf6e
zhouhaihai
开启时间箱
|
464
465
466
467
|
local quick = msg.quick
if not boxL[slot] then return end
if boxL[slot].time > skynet.timex() then -- 没开完
if not quick then return end
|
f8ba82b3
zhouhaihai
大小写
|
468
|
local cost_pre = globalCsv.box_timeOpen_diamond:toArray(true, "=")
|
9b35bf6e
zhouhaihai
开启时间箱
|
469
|
local costD = math.ceil((boxL[slot].time - skynet.timex()) / (cost_pre[1] * 60)) * cost_pre[2]
|
6a89ff20
chenyueqi
拆解时钟箱消耗的加速道具更改
|
470
471
|
if not role:checkItemEnough({[ItemId.BoxKey] = costD}) then return end
role:costItems({[ItemId.BoxKey] = costD})
|
9b35bf6e
zhouhaihai
开启时间箱
|
472
|
end
|
9912e064
zhouhaihai
新增3个每日任务类型
|
473
474
|
local boxId = boxL[slot].id
local itemData = csvdb["itemCsv"][boxId]
|
4d8bd32c
chenyueqi
倒计时开箱子
|
475
|
local randomData = csvdb["item_randomCsv"][itemData.id]
|
9b35bf6e
zhouhaihai
开启时间箱
|
476
|
-- 随机奖励
|
da898074
zhouhaihai
pvp 高级领奖
|
477
|
reward = {}
|
007af97e
zhouhaihai
item_random 结构更改
|
478
479
480
481
482
|
for i = 1, 10 do
local num = randomData["num" .. i]
local gift = randomData["gift" .. i]
if num and gift and num > 0 and gift ~= "" then
local pool = {}
|
007af97e
zhouhaihai
item_random 结构更改
|
483
484
|
for _, temp in ipairs(gift:toArray()) do
local set = temp:toArray(true, "=")
|
538e9773
zhouhaihai
上宝石
|
485
|
table.insert(pool, set)
|
007af97e
zhouhaihai
item_random 结构更改
|
486
|
end
|
5d620aef
chenyueqi
拆解室指定某一项为必得奖励
|
487
|
|
007af97e
zhouhaihai
item_random 结构更改
|
488
489
490
491
492
493
|
local needCount = math.min(#pool, num)
for j = 1, needCount do
local idx = math.randWeight(pool, 3)
reward[pool[idx][1]] = (reward[pool[idx][1]] or 0) + pool[idx][2]
table.remove(pool, idx)
end
|
9b35bf6e
zhouhaihai
开启时间箱
|
494
495
|
end
end
|
007af97e
zhouhaihai
item_random 结构更改
|
496
|
reward[0] = nil
|
9b35bf6e
zhouhaihai
开启时间箱
|
497
|
|
9b35bf6e
zhouhaihai
开启时间箱
|
498
499
|
boxL[slot] = nil
reward = role:award(reward)
|
9912e064
zhouhaihai
新增3个每日任务类型
|
500
|
role:checkTaskEnter("OpenBox", {id = boxId})
|
9b35bf6e
zhouhaihai
开启时间箱
|
501
502
503
504
|
else
return
end
|
bd535b08
zhouhaihai
bug
|
505
506
|
role:setProperty("boxL") --刷新
role:changeUpdates({{type = "boxL", field = slot, value = boxL[slot], isOnlyToC = true}}) -- 通知客户端
|
9b35bf6e
zhouhaihai
开启时间箱
|
507
|
SendPacket(actionCodes.Role_openTimeBoxRpc, MsgPack.pack({reward = reward}))
|
c8872722
zhouhaihai
返回
|
508
|
return true
|
9b35bf6e
zhouhaihai
开启时间箱
|
509
510
|
end
|
d1c2290f
zhouhaihai
加速
|
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
|
function _M.openSpeedUpBoxRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local count = msg.count
local itemData = csvdb["itemCsv"][id]
if not itemData or itemData.type ~= ItemType.SpeedBox then return end
if math.illegalNum(count, 1, role:getItemCount(id)) then return end
local useType, hour = table.unpack(itemData.use_effect:toArray(true, "="))
local time = hour * 60 * 60
local reward = {}
if useType == 1 then -- 挂机齿轮
local hangInfo = role:getProperty("hangInfo")
if not hangInfo.carbonId then
return
end
local carbonData = csvdb["idle_battleCsv"][hangInfo.carbonId]
reward[ItemId.Gold] = math.floor(time / globalCsv.idle_money_produce_cd) * carbonData.money * count
elseif useType == 2 then -- 挂机经验
local hangInfo = role:getProperty("hangInfo")
if not hangInfo.carbonId then
return
end
local carbonData = csvdb["idle_battleCsv"][hangInfo.carbonId]
reward[ItemId.Exp] = math.floor(time / globalCsv.idle_money_produce_cd) * carbonData.exp * count
elseif useType == 3 then -- 食材商人收入
local buildType = 6
local level = role.dinerData:getProperty("buildL"):getv(buildType, 1)
local buildingData = csvdb["diner_buildingCsv"][buildType][level]
if not buildingData then
return 1
end
local gfood = role.dinerData:getProperty("gfood")
if not next(gfood) then return end
for k , v in pairs(gfood) do
local itemId = v.id
local speed = globalCsv.diner_get_food_speed[csvdb["itemCsv"][itemId].quality] * buildingData.speed / 100
reward[itemId] = math.floor(time / speed) * count
end
else
return
end
role:costItems({[id] = count})
reward = role:award(reward)
SendPacket(actionCodes.Role_openSpeedUpBoxRpc, MsgPack.pack({reward = reward}))
return true
end
|
00e663bd
zhouhaihai
剧情相关
|
564
565
566
567
568
569
|
function _M.storyBookRewardRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local storyId = msg.id
local storyBookData = csvdb["story_bookCsv"][storyId]
if not storyBookData then return end
|
a1d09d22
zhouhaihai
bug
|
570
|
local storyStatus = role:getProperty("storyB")
|
8a01a3ae
zhouhaihai
bug
|
571
|
if not storyStatus[storyId] or not storyStatus[storyId].s or storyStatus[storyId].s ~= 1 then
|
a1d09d22
zhouhaihai
bug
|
572
573
|
return
end
|
00e663bd
zhouhaihai
剧情相关
|
574
|
-- 获取奖励
|
8a01a3ae
zhouhaihai
bug
|
575
|
storyStatus[storyId].s = -1
|
8a01a3ae
zhouhaihai
bug
|
576
|
role:changeUpdates({{ type = "storyB", field = storyId, value = storyStatus[storyId] }})
|
00e663bd
zhouhaihai
剧情相关
|
577
578
579
580
581
|
local reward = role:award(storyBookData.gift)
SendPacket(actionCodes.Role_storyBookRewardRpc, MsgPack.pack({reward = reward}))
return true
end
|
8a01a3ae
zhouhaihai
bug
|
582
|
function _M.unLockStoryBookRpc(agent, data)
|
bd15e9bc
zhouhaihai
购买剧情
|
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
|
local role = agent.role
local msg = MsgPack.unpack(data)
local storyId = msg.id
local storyBookData = csvdb["story_bookCsv"][storyId]
if not storyBookData or storyBookData.lockItem == "" then return end -- 不能解锁
local storyStatus = role:getProperty("storyB")
if storyStatus[storyId] and storyStatus[storyId].s then return end --不需要解锁
local cost = storyBookData.lockItem:toNumMap()
if not cost or not next(cost) then return end
if not role:checkItemEnough(cost) then return end -- 消耗品不足
role:costItems(cost)
-- 解锁
storyStatus[storyId] = storyStatus[storyId] or {}
table.clear(storyStatus[storyId])
storyStatus[storyId].s = 1
role:changeUpdates({{ type = "storyB", field = storyId, value = storyStatus[storyId] }})
SendPacket(actionCodes.Role_unLockStoryBookRpc, '')
return true
|
8a01a3ae
zhouhaihai
bug
|
606
607
|
end
|
53e8037e
zhouhaihai
任务
|
608
609
610
|
function _M.taskRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
d232676a
zhouhaihai
功能解锁 冒险返回
|
611
612
613
|
if not role:isFuncUnlock(FuncUnlock.TaskAchiv) then return end
|
53e8037e
zhouhaihai
任务
|
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
|
local taskType = msg.type -- 1 日常 2 周长
local taskId = msg.id --任务id
local roleField = {"dTask", "wTask"}
if not roleField[taskType] then return 1 end
local taskData = csvdb["task_loopCsv"][taskType][taskId]
if not taskData then return 2 end
local taskStatus = role:getProperty(roleField[taskType])
local tStatus = taskStatus["t"] or {}
if (tStatus[taskId] or 0) < taskData.condition1 then
return 3
end
local reward = role:award(taskData.reward)
local active = (taskStatus["a"] or 0) + taskData.active
role:changeUpdates({
{ type = roleField[taskType], field = {"t", taskId}, value = -1 },
{ type = roleField[taskType], field = "a", value = active}
})
SendPacket(actionCodes.Role_taskRpc, MsgPack.pack({reward = reward}))
return true
end
function _M.taskActiveRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
d232676a
zhouhaihai
功能解锁 冒险返回
|
644
645
646
|
if not role:isFuncUnlock(FuncUnlock.TaskAchiv) then return end
|
53e8037e
zhouhaihai
任务
|
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
|
local taskType = msg.type -- 1 日常 2 周长
local taskId = msg.id --任务id
local roleField = {"dTask", "wTask"}
if not roleField[taskType] then return end
local taskData = csvdb["task_activeCsv"][taskType][taskId]
if not taskData then return end
local taskStatus = role:getProperty(roleField[taskType])
local tStatus = taskStatus["at"] or {}
if tStatus[taskId] == -1 or (taskStatus["a"] or 0) < taskData.active then
return
end
local reward = role:award(taskData.reward)
role:changeUpdates({
{ type = roleField[taskType], field = {"at", taskId}, value = -1 }
})
SendPacket(actionCodes.Role_taskActiveRpc, MsgPack.pack({reward = reward}))
return true
end
function _M.achiveRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local taskId = msg.id --任务id
|
d232676a
zhouhaihai
功能解锁 冒险返回
|
676
677
|
if not role:isFuncUnlock(FuncUnlock.TaskAchiv) then return end
|
53e8037e
zhouhaihai
任务
|
678
|
local achiveTask = csvdb["achievementCsv"][taskId]
|
4c5d72ab
zhouhaihai
高级pvp
|
679
|
if not achiveTask then return 1 end
|
53e8037e
zhouhaihai
任务
|
680
681
682
683
|
local achiveT = role:getProperty("achiveT")
local achiveV = role:getProperty("achiveV")
|
4c5d72ab
zhouhaihai
高级pvp
|
684
|
if achiveV[taskId] then return 2 end
|
53e8037e
zhouhaihai
任务
|
685
686
687
688
689
|
local curStatus = achiveT[achiveTask.type] or 0
local maxc = achiveTask.condition1
if maxc > curStatus then
|
4c5d72ab
zhouhaihai
高级pvp
|
690
|
return 3
|
53e8037e
zhouhaihai
任务
|
691
692
693
|
end
local reward = role:award(achiveTask.reward)
|
53e8037e
zhouhaihai
任务
|
694
|
role:changeUpdates({
|
f60b89b1
zhouhaihai
奖励副本
|
695
|
{ type = "achiveV", field = taskId, value = skynet.timex() }
|
53e8037e
zhouhaihai
任务
|
696
|
})
|
3df73a9e
zhouhaihai
复兴奖励
|
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
|
-- 复兴奖励
if csvdb["achievement_groupCsv"][achiveTask.group].bookmark == 3 then
local overCount = 0
for tId, status in pairs(achiveV) do
local tData = csvdb["achievementCsv"][tId]
if tData then
local groupData = csvdb["achievement_groupCsv"][tData.group]
if groupData.bookmark == 3 then
overCount = overCount + 1
end
end
end
for level, pData in pairs(csvdb["achievement_rewardCsv"]) do
if pData.request == overCount then
-- 发放奖励
redisproxy:insertEmail({
roleId = role:getProperty("id"),
emailId = 101,
attachments = pData.reward,
contentPms = {pData.level},
})
|
4c5d72ab
zhouhaihai
高级pvp
|
720
|
elseif pData.request > overCount then
|
3df73a9e
zhouhaihai
复兴奖励
|
721
722
723
724
|
break
end
end
end
|
53e8037e
zhouhaihai
任务
|
725
726
727
728
729
|
SendPacket(actionCodes.Role_achiveRpc, MsgPack.pack({reward = reward}))
return true
end
|
3df73a9e
zhouhaihai
复兴奖励
|
730
731
|
|
c384626d
zhouhaihai
好友
|
732
733
734
735
736
737
738
739
740
741
742
743
744
745
|
function _M.chatRpc(agent, data)
local role = agent.role
local roleId = role:getProperty("id")
local msg = MsgPack.unpack(data)
local cmd = msg.cmd
local content = msg.content
if not content then return end
local now = skynet.timex()
-- 判断禁言
local result = nil
|
da898074
zhouhaihai
pvp 高级领奖
|
746
|
local SERV = string_format(".CHATED%d", math.random(1, 5))
|
c384626d
zhouhaihai
好友
|
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
|
local legal, mod = skynet.call(SERV, "lua", "check", content)
if not legal then
content = mod or ""
end
if content == "" then
result = -1
end
local response = {
chatType = cmd,
player = {
roleId = role:getProperty("id"),
name = role:getProperty("name"),
level = role:getProperty("level"),
headId = role:getProperty("headId"),
},
content = content,
time = now,
}
|
8474ca36
zhouhaihai
聊天
|
768
769
770
771
772
|
local waitTime = nil
local check = {
-- 世界聊天
[1] = function ()
|
c384626d
zhouhaihai
好友
|
773
774
775
776
|
if role:getProperty("silent") > now then --禁言
result = 1
return
end
|
8474ca36
zhouhaihai
聊天
|
777
778
779
780
781
|
role._worldChatLimit = role._worldChatLimit or {start = 0, count = 0, canSayt = 0} --第一次开始说话时间 从第一次说话次数 能说话的时间
if now < role._worldChatLimit.canSayt then
result = 2
|
fa565e0c
zhouhaihai
优化结构
|
782
|
waitTime = role._worldChatLimit.canSayt - now
|
8474ca36
zhouhaihai
聊天
|
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
|
return
end
if now - role._worldChatLimit.start >= globalCsv.chat_world_limit.time then
role._worldChatLimit.start = now
role._worldChatLimit.count = 1
else
role._worldChatLimit.count = role._worldChatLimit.count + 1
if role._worldChatLimit.count > globalCsv.chat_world_limit.count then
role._worldChatLimit.count = 0
role._worldChatLimit.start = 0
role._worldChatLimit.canSayt = now + globalCsv.chat_world_limit.wait
result = 2
waitTime = globalCsv.chat_world_limit.wait
return
end
end
|
c384626d
zhouhaihai
好友
|
800
|
mcast_util.pub_world(actionCodes.Role_chat, MsgPack.pack(response))
|
da898074
zhouhaihai
pvp 高级领奖
|
801
|
pcall(skynet.send, '.GLOBALD', "lua", "sendWorldMsg", role._channelIdx, response)
|
c384626d
zhouhaihai
好友
|
802
|
end,
|
8474ca36
zhouhaihai
聊天
|
803
804
805
|
-- 私聊
[2] = function ()
local objectId = msg.roleId
|
fa565e0c
zhouhaihai
优化结构
|
806
|
response.objId = objectId
|
4cf74232
zhouhaihai
pvp
|
807
808
809
810
811
812
813
814
815
816
817
818
|
local redret = redisproxy:pipelining(function(red)
red:exists(string.format("role:%d", objectId))
red:sismember(FRIEND_BLACK_KEY:format(roleId), objectId)
red:sismember(FRIEND_BLACK_KEY:format(objectId), roleId)
end)
if redret[1] ~= 1 then
result = 1
return
end
-- 你把对方拉黑拉黑
if redret[2] == 1 then
result = 2
|
8474ca36
zhouhaihai
聊天
|
819
820
|
return
end
|
4cf74232
zhouhaihai
pvp
|
821
822
|
-- 对方把你拉黑
local isBlock = redret[3] == 1
|
8474ca36
zhouhaihai
聊天
|
823
|
|
8474ca36
zhouhaihai
聊天
|
824
|
local bin = MsgPack.pack(response)
|
4cf74232
zhouhaihai
pvp
|
825
|
if not isBlock then
|
440aa055
zhouhaihai
聊天
|
826
827
|
redisproxy:pipelining(function(red)
red:rpush(CHAT_OFFLINE:format(objectId), bin)
|
4cf74232
zhouhaihai
pvp
|
828
|
red:ltrim(CHAT_OFFLINE:format(objectId), -200, -1)
|
440aa055
zhouhaihai
聊天
|
829
|
end)
|
4cf74232
zhouhaihai
pvp
|
830
831
832
833
834
|
-- 若在线,实时发送聊天信息
local agent = datacenter.get("agent", objectId)
if agent then
SendPacket(actionCodes.Role_chat, bin, agent.fd)
end
|
440aa055
zhouhaihai
聊天
|
835
|
end
|
4cf74232
zhouhaihai
pvp
|
836
|
SendPacket(actionCodes.Role_chat, bin)
|
c384626d
zhouhaihai
好友
|
837
838
839
840
841
842
843
|
end,
}
if not check[cmd] then return end
if not result then
check[cmd]()
end
|
8474ca36
zhouhaihai
聊天
|
844
|
SendPacket(actionCodes.Role_chatRpc, MsgPack.pack({result = result, waitTime = waitTime}))
|
c384626d
zhouhaihai
好友
|
845
846
847
|
return true
end
|
4cf74232
zhouhaihai
pvp
|
848
849
850
851
852
853
|
function _M.chatGet(agent, data)
local role = agent.role
local roleId = role:getProperty("id")
redisproxy:del(CHAT_OFFLINE:format(roleId))
return true
end
|
312b9db5
zhouahaihai
背包
|
854
|
|
dc9d814f
zhouhaihai
邮件
|
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
|
function _M.changeSettingRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local status = msg.status
local statusEnum = SettingStatus[id]
if not statusEnum then return 1 end
if not statusEnum[status] then return 2 end
local setting = role:getProperty("setting")
setting[id] = status
role:updateProperty({field = "setting", value = setting})
SendPacket(actionCodes.Role_changeSettingRpc, '')
return true
end
function _M.drawCodeRpc(agent, data)
local msg = MsgPack.unpack(data)
local codeurl = skynet.getenv("codeurl")
local role = agent.role
local msg = MsgPack.unpack(data)
local code = msg.code
if type(code) ~= "string" then return end
if code:find("[^0-9a-zA-Z]") then return end
local codestr = role:getProperty("codeStr")
local content = {
["platformId"] = role:getProperty("sid"),
["code"] = code,
["itemIds"] = codestr,
["key"] = "zhaolugame20170831",
}
local status, body = httpc.get(codeurl, "/libaoma?" .. httpGetFormatData(content), {})
if status == 200 then
local result = json.decode(body)
local ret = tonum(result.ret)
if ret == 0 then
local giftId = tonumber(result.giftId)
role:setProperty("codeStr", codestr:setv(giftId, 1))
local reward = role:award(result.gift)
SendPacket(actionCodes.Role_drawCodeRpc, MsgPack.pack({
result = ret,
reward = reward,
}))
return true
end
-- 1 不存在的礼包码
-- 2 已经领取过相同类型物品
-- 3 领取数量达到上限
-- 4 过期了
SendPacket(actionCodes.Role_drawCodeRpc, MsgPack.pack({result = ret}))
return true
end
SendPacket(actionCodes.Role_drawCodeRpc, MsgPack.pack({result = -1}))
return true
end
function _M.changeHeadRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local icon = csvdb["player_iconCsv"][id]
if not icon then
return
end
|
15f06456
zhouhaihai
头像
|
928
929
930
931
932
933
934
935
936
937
938
939
|
local unlock = false
if role:getItemCount(id) >= 1 then
unlock = true
else
if icon.path == 1 then -- 获得对应英雄
if role:isHaveHero(icon.condition) then
unlock = true
end
end
end
if not unlock then
|
dc9d814f
zhouhaihai
邮件
|
940
941
942
|
return
end
role:updateProperty({field = "headId" ,value = id})
|
e3c5cc5e
zhouhaihai
跨服竞技场over
|
943
|
role:changeCrossServerPvpSelfInfo("headId")
|
dc9d814f
zhouhaihai
邮件
|
944
945
946
947
|
SendPacket(actionCodes.Role_changeHeadRpc, "")
return true
end
|
71f716c4
chenyueqi
引导用到的字段
|
948
949
950
951
952
953
954
955
|
function _M.guideRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local cmdType = msg.cmdType
local funcGuide = role:getProperty("funcGuide")
local newerGuide = role:getProperty("newerGuide")
|
aeb5da9a
chenyueqi
强制引导的步数记录
|
956
|
if cmdType == 1 then
|
71f716c4
chenyueqi
引导用到的字段
|
957
|
-- 新手引导
|
aeb5da9a
chenyueqi
强制引导的步数记录
|
958
959
960
961
|
local master = msg.master or -1
local slave = msg.slave or -1
if master < 0 or slave < 0 then return end
newerGuide = string.format("%d=%d",master,slave)
|
71f716c4
chenyueqi
引导用到的字段
|
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
|
role:updateProperty({field = "newerGuide", value = newerGuide})
elseif cmdType == 2 then
-- 系统引导
if not msg.skip then return end
local new = math.min(funcGuide:getv(0, 0), msg.skip)
if new < 0 then
funcGuide = funcGuide:setv(0, new)
else
funcGuide = funcGuide:setv(0, funcGuide:getv(0, 0) + msg.skip)
end
if msg.funcType then
funcGuide = funcGuide:setv(msg.funcType, 1)
end
role:updateProperty({field = "funcGuide", value = funcGuide})
|
e26989ce
chenyueqi
增加其他的引导记录
|
977
978
979
980
981
982
983
984
985
|
elseif cmdType == 3 then
-- 弱引导
if msg.funcType then
local value = msg.value or 1
for _, funcIdx in pairs(msg.funcType:toArray(true,"=")) do
funcGuide = funcGuide:setv(funcIdx, value)
end
role:updateProperty({field = "funcGuide", value = funcGuide})
end
|
71f716c4
chenyueqi
引导用到的字段
|
986
987
988
989
990
991
992
|
else
return
end
SendPacket(actionCodes.Role_guideRpc, "")
return true
end
|
dc9d814f
zhouhaihai
邮件
|
993
|
|
314bc5df
zhengshouren
提交服务器初始代码
|
994
|
return _M
|