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
|
a5486ede
zhouhaihai
csvdata 修改为 share...
|
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
|
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()
|
44c6e479
zhouhaihai
增加部分日志
|
97
|
role:startActionUcode()
|
314bc5df
zhengshouren
提交服务器初始代码
|
98
99
100
|
else
role:reloadWhenLogin()
end
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
101
|
|
39bcd7ca
zhouhaihai
LOG
|
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
|
role.sysVersion = msg.sysVersion
role.ip = agent.ip:toArray(false, ":")[1]
role.clientVersion = msg.clientVersion
role.network = msg.network
if msg.subId then
role:setProperty("sid", msg.subId)
end
if msg.deviceMode then
local deviceMode = tostring(msg.deviceMode)
if role:getProperty("dmode") ~= deviceMode then
role:setProperty("dmode", deviceMode)
end
end
if msg.device then
local device = tostring(msg.device)
if role:getProperty("device") ~= device then
role:setProperty("device", device)
end
end
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
|
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
|
39bcd7ca
zhouhaihai
LOG
|
140
|
|
aa74d6ef
zhouhaihai
掉落反馈
|
141
142
|
if msg.deviceMode then
local deviceMode = tostring(msg.deviceMode)
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
143
144
|
if role:getProperty("dmode") ~= deviceMode then
role:setProperty("dmode", deviceMode)
|
aa74d6ef
zhouhaihai
掉落反馈
|
145
146
147
148
|
end
end
if msg.device then
local device = tostring(msg.device)
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
149
150
|
if role:getProperty("device") ~= device then
role:setProperty("device", device)
|
aa74d6ef
zhouhaihai
掉落反馈
|
151
152
153
|
end
end
|
314bc5df
zhengshouren
提交服务器初始代码
|
154
|
SERV_OPEN = redisproxy:hget("autoincrement_set", "server_start")
|
314bc5df
zhengshouren
提交服务器初始代码
|
155
|
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
156
|
role:changeStructVersion() -- 数据结构 版本更新
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
157
|
role:advEndlessSeasonCheck(true) -- 冒险赛季更新检查
|
314bc5df
zhengshouren
提交服务器初始代码
|
158
|
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
159
|
-- 跨天登陆事件
|
ea40710f
zhouhaihai
活动
|
160
|
local resetMode = role:updateTimeReset(now)
|
be4e8031
zhouhaihai
活动 拾荒
|
161
162
|
if not resetMode or not resetMode["CrossDay"] then -- 没有跨天
role.activity:checkActivityStatus(now, false, false)
|
ea40710f
zhouhaihai
活动
|
163
164
|
end
|
c384626d
zhouhaihai
好友
|
165
|
redisproxy:zadd(FRIEND_RECOMMEND, now, roleId)
|
be9c9ca6
zhouahaihai
角色评论
|
166
|
|
3e20f499
saicom
完善商城相关协议
|
167
|
for _, name in ipairs({"dailyData", "dinerData", "activity", "storeData"}) do
|
be9c9ca6
zhouahaihai
角色评论
|
168
|
response[name] = role[name]:data()
|
7f9f002d
liuzujun
循环周活动
|
169
170
|
--print("["..name.."]")
--dump(response[name])
|
be9c9ca6
zhouahaihai
角色评论
|
171
172
|
end
|
314bc5df
zhengshouren
提交服务器初始代码
|
173
174
175
|
response.role = role:data()
response.result = "SUCCESS"
response.serverTime = now
|
53b4b8bd
liuzujun
自动挂机下一关
|
176
|
--response.openTime = getServerOpenTs()
|
314bc5df
zhengshouren
提交服务器初始代码
|
177
|
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
178
179
180
181
182
183
184
|
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
好感度, 皮肤
|
185
|
if #heroIds <= 50 then
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
186
187
188
189
|
heroWave = 0
table_insert(modules, "heros")
end
|
a0013f0b
zhouhaihai
零件分批推送
|
190
191
192
193
194
195
196
197
198
199
|
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
|
200
201
202
203
204
205
206
|
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
好友
|
207
|
response.wave = 1 + heroWave + runeWave + 1
|
314bc5df
zhengshouren
提交服务器初始代码
|
208
209
210
|
SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(response))
|
a0013f0b
zhouhaihai
零件分批推送
|
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
|
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 数据结构
|
227
|
end
|
a0013f0b
zhouhaihai
零件分批推送
|
228
|
curWave = curWave + runeWave
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
229
|
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
230
|
local heroIndex = 1
|
a0013f0b
zhouhaihai
零件分批推送
|
231
|
for index = curWave + 1, curWave + heroWave do
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
232
233
234
235
236
237
238
239
240
241
242
243
244
|
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
零件分批推送
|
245
|
curWave = curWave + heroWave
|
314bc5df
zhengshouren
提交服务器初始代码
|
246
|
|
fa565e0c
zhouhaihai
优化结构
|
247
|
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
248
|
|
314bc5df
zhengshouren
提交服务器初始代码
|
249
|
-- 注册全服广播
|
fa565e0c
zhouhaihai
优化结构
|
250
251
252
253
254
255
256
257
258
|
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
提交服务器初始代码
|
259
|
end
|
c384626d
zhouhaihai
好友
|
260
261
262
|
-- 发下缓存的世界消息
local worldChatResponse = {worldChats = {}}
|
a5486ede
zhouhaihai
csvdata 修改为 share...
|
263
|
local ok, msgs = pcall(skynet.call, '.globald', "lua", "getWorldMsg", role._channelIdx)
|
c384626d
zhouhaihai
好友
|
264
265
266
267
|
if not ok then
msgs = {}
end
worldChatResponse.worldChats = msgs
|
4cf74232
zhouhaihai
pvp
|
268
269
270
271
272
|
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
好友
|
273
274
275
276
277
|
worldChatResponse.chatWave = curWave + 1
curWave = curWave + 1
SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(worldChatResponse))
|
fa565e0c
zhouhaihai
优化结构
|
278
279
280
281
282
283
284
285
|
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
|
286
287
288
289
290
|
-- 玩家登陆做的一些操作
role:saveHangTeam()
role:savePvpCTeam()
|
33be3111
zhouhaihai
修改hangPass 结构
|
291
|
role:savePvpHTeam()
|
fa565e0c
zhouhaihai
优化结构
|
292
|
|
33be3111
zhouhaihai
修改hangPass 结构
|
293
|
local hangPass = role:getProperty("hangPass")
|
39bcd7ca
zhouhaihai
LOG
|
294
|
role:log("onLogin")
|
d02f7904
zhouhaihai
遗失的log
|
295
|
role:mylog("login", {key1 = agent.ip:toArray(false, ":")[1], int1 = hangPass[1] or 0})
|
4c5d72ab
zhouhaihai
高级pvp
|
296
|
|
314bc5df
zhengshouren
提交服务器初始代码
|
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
|
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
|
f58b315e
zhouhaihai
停止注册
|
313
314
315
316
317
318
319
|
local stopcreate = tonumber(redisproxy:hget("autoincrement_set", "stopcreate"))
if stopcreate and stopcreate > 0 then
response.result = "STOP_CREATE"
SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
return true
end
|
314bc5df
zhengshouren
提交服务器初始代码
|
320
321
322
323
324
325
326
327
|
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
提交服务器初始代码
|
328
329
330
331
|
local newRole = require("models.Role").new({
key = string_format("role:%d", roleId),
id = roleId,
uid = tostring(msg.uid),
|
dc9d814f
zhouhaihai
邮件
|
332
|
sid = msg.subId or 0,
|
314bc5df
zhengshouren
提交服务器初始代码
|
333
334
|
name = roleName,
uname = msg.uname or "",
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
335
|
device = tostring(msg.device),
|
aa74d6ef
zhouhaihai
掉落反馈
|
336
|
dmode = msg.deviceMode and tostring(msg.deviceMode) or nil
|
314bc5df
zhengshouren
提交服务器初始代码
|
337
338
339
340
341
342
343
344
345
346
347
348
|
})
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
|
44c6e479
zhouhaihai
增加部分日志
|
349
|
newRole:startActionUcode()
|
39bcd7ca
zhouhaihai
LOG
|
350
351
352
353
354
|
newRole.sysVersion = msg.sysVersion
newRole.ip = agent.ip:toArray(false, ":")[1]
newRole.clientVersion = msg.clientVersion
newRole.network = msg.network
|
8b65a363
zhouhaihai
优化
|
355
|
newRole:award(globalCsv.birthItem, {log = {desc = "birth"}, notNotify = true})
|
314bc5df
zhengshouren
提交服务器初始代码
|
356
|
-- 欢迎邮件
|
147ef2ce
zhouhaihai
邮件 Gm
|
357
|
redisproxy:insertEmail({roleId = roleId, emailId = 1})
|
314bc5df
zhengshouren
提交服务器初始代码
|
358
|
|
39bcd7ca
zhouhaihai
LOG
|
359
360
361
362
|
if msg.newuser then
newRole:log("onCreateAccount")
end
newRole:log("onCreateRole")
|
d02f7904
zhouhaihai
遗失的log
|
363
|
newRole:mylog("create", {key1 = agent.ip:toArray(false, ":")[1]})
|
39bcd7ca
zhouhaihai
LOG
|
364
|
|
314bc5df
zhengshouren
提交服务器初始代码
|
365
366
367
368
369
|
SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
return true
end
|
dc9d814f
zhouhaihai
邮件
|
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
|
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
|
af7863ef
zhouhaihai
x小写名字异常
|
399
400
|
local dbName = string.upper(newName)
local result = redisproxy:setnx(string_format("user:%s", dbName), roleId)
|
dc9d814f
zhouhaihai
邮件
|
401
402
403
404
405
|
if result == 0 then
SendPacket(actionCodes.Role_changeNameRpc, MsgPack.pack({result = 1}))
return true
end
redisproxy:pipelining(function (red)
|
af7863ef
zhouhaihai
x小写名字异常
|
406
407
|
red:del(string_format("user:%s", string.upper(oldName)))
red:set(string_format("uid:%s", role:getProperty("uid")), dbName)
|
dc9d814f
zhouhaihai
邮件
|
408
409
410
411
412
|
end)
role:updateProperties({
["name"] = newName,
})
|
e3c5cc5e
zhouhaihai
跨服竞技场over
|
413
414
|
role:changeCrossServerPvpSelfInfo("name")
|
dc9d814f
zhouhaihai
邮件
|
415
416
417
418
|
SendPacket(actionCodes.Role_changeNameRpc, MsgPack.pack({result = 0}))
return true
end
|
c1849aa6
chenyueqi
roleaction增加一个获取随...
|
419
420
421
422
423
424
|
function _M.getRandomNameRpc()
local name = randomRoleName()
SendPacket(actionCodes.Role_getRandomNameRpc, MsgPack.pack({name = name}))
return true
end
|
dc9d814f
zhouhaihai
邮件
|
425
426
427
428
429
430
431
|
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
|
a5486ede
zhouhaihai
csvdata 修改为 share...
|
432
|
local SERV = string_format(".chated%d", math.random(1, 5))
|
dc9d814f
zhouhaihai
邮件
|
433
434
435
436
437
|
local legal, mod = skynet.call(SERV, "lua", "check", content)
if not legal then
content = mod or ""
end
|
14f1591b
zhouhaihai
删除好感度相关
|
438
|
role:updateProperty({field = "intro", value = content})
|
dc9d814f
zhouhaihai
邮件
|
439
440
441
442
443
|
SendPacket(actionCodes.Role_changeIntroRpc, '')
return true
end
|
314bc5df
zhengshouren
提交服务器初始代码
|
444
445
446
447
448
|
function _M.syncTimeRpc(agent, data)
SendPacket(actionCodes.Role_syncTimeRpc, MsgPack.pack({nowTime = skynet.timex()}))
return true
end
|
312b9db5
zhouahaihai
背包
|
449
450
451
|
function _M.saleItemRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
84e7c06e
zhouhaihai
回收
|
452
453
454
455
|
local backs = msg.backs
if not backs then return end
local reward = {}
|
53e8037e
zhouhaihai
任务
|
456
|
local fragCount = 0
|
84e7c06e
zhouhaihai
回收
|
457
458
459
460
|
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
任务
|
461
462
463
|
if itemData.type == ItemType.HeroFragment or itemData.type == ItemType.HeroFCommon then
fragCount = fragCount + count
end
|
84e7c06e
zhouhaihai
回收
|
464
465
|
local sellEffect = itemData.sell_effect:toArray(true, "=")
reward[sellEffect[1]] = (reward[sellEffect[1]] or 0) + sellEffect[2] * count
|
c59e058b
zhouhaihai
新一批日志记录
|
466
467
468
469
470
471
472
473
474
|
role:log("carriage_decals", {
item_id = itemId, --道具id
item_type = itemData.type, --道具类型,具体见枚举表中道具类型枚举表
item_level = 0, --道具等级
item_number = count, --道具变化数量的绝对值
carriage_decals_rwdid = sellEffect[1], --拆解获得物资ID
carriage_decals_rwdnum = sellEffect[2] * count, --拆解获得物资数量
})
|
84e7c06e
zhouhaihai
回收
|
475
476
|
end
|
44c6e479
zhouhaihai
增加部分日志
|
477
|
role:costItems(backs, {log = {desc = "saleItem"}})
|
7bb30dca
zhouhaihai
修改发奖
|
478
|
local reward, change = role:award(reward, {log = {desc = "saleItem"}})
|
53e8037e
zhouhaihai
任务
|
479
|
role:checkTaskEnter("DecoFrag", {count = fragCount})
|
c59e058b
zhouhaihai
新一批日志记录
|
480
|
|
7bb30dca
zhouhaihai
修改发奖
|
481
|
SendPacket(actionCodes.Role_saleItemRpc, MsgPack.pack(role:packReward(reward, change)))
|
312b9db5
zhouahaihai
背包
|
482
483
484
485
486
487
488
489
490
491
492
493
|
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
开启时间箱
|
494
|
if not randomData or randomData.openTime > 0 then return end
|
312b9db5
zhouahaihai
背包
|
495
|
|
007af97e
zhouhaihai
item_random 结构更改
|
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
|
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
背包
|
512
513
514
|
end
end
end
|
007af97e
zhouhaihai
item_random 结构更改
|
515
516
|
reward[0] = nil
|
44c6e479
zhouhaihai
增加部分日志
|
517
|
role:costItems({[itemId] = count}, {log = {desc = "openItem"}})
|
7bb30dca
zhouhaihai
修改发奖
|
518
519
|
local change
reward, change = role:award(reward, {log = {desc = "openItem", int1 = itemId, int2 = count}})
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
520
|
|
7bb30dca
zhouhaihai
修改发奖
|
521
|
SendPacket(actionCodes.Role_openItemRpc, MsgPack.pack(role:packReward(reward, change)))
|
312b9db5
zhouahaihai
背包
|
522
523
524
|
return true
end
|
9b35bf6e
zhouhaihai
开启时间箱
|
525
526
527
|
function _M.openTimeBoxRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
4d8bd32c
chenyueqi
倒计时开箱子
|
528
|
local oper = msg.oper -- 操作 1 - 2
|
9b35bf6e
zhouhaihai
开启时间箱
|
529
|
local slot = msg.slot -- 位置 1 - 6
|
317a46a9
liuzujun
添加特权卡
|
530
531
532
533
534
535
|
-- 特权卡时间箱额外栏位
local privExtraCnt = role.storeData:getTimeBoxSlotExtraCount()
if oper == 1 then
if math.illegalNum(slot, 1, role:getFuncLv(FuncOpenType.TimeBoxSlot) + privExtraCnt) then return end
end
|
9b35bf6e
zhouhaihai
开启时间箱
|
536
537
|
local boxL = role:getProperty("boxL")
|
7bb30dca
zhouhaihai
修改发奖
|
538
|
local reward, change = {}
|
9b35bf6e
zhouhaihai
开启时间箱
|
539
540
541
542
|
if oper == 1 then -- 打开
local itemId = msg.itemId
if role:getItemCount(itemId) < 1 then return end
local itemData = csvdb["itemCsv"][itemId]
|
c384626d
zhouhaihai
好友
|
543
|
local randomData = csvdb["item_randomCsv"][itemId]
|
4d8bd32c
chenyueqi
倒计时开箱子
|
544
|
if not itemData or not randomData or randomData.openTime <= 0 then return end
|
9b35bf6e
zhouhaihai
开启时间箱
|
545
546
|
if boxL[slot] then return end
|
44c6e479
zhouhaihai
增加部分日志
|
547
|
role:costItems({[itemId] = 1}, {log = {desc = "openTimeBox"}})
|
9b35bf6e
zhouhaihai
开启时间箱
|
548
|
boxL[slot] = {id = itemId, time = skynet.timex() + randomData.openTime}
|
538e9773
zhouhaihai
上宝石
|
549
|
|
4d8bd32c
chenyueqi
倒计时开箱子
|
550
|
elseif oper == 2 then -- 领取
|
9b35bf6e
zhouhaihai
开启时间箱
|
551
552
|
local quick = msg.quick
if not boxL[slot] then return end
|
c59e058b
zhouhaihai
新一批日志记录
|
553
|
local costKey = 0
|
9b35bf6e
zhouhaihai
开启时间箱
|
554
555
|
if boxL[slot].time > skynet.timex() then -- 没开完
if not quick then return end
|
f8ba82b3
zhouhaihai
大小写
|
556
|
local cost_pre = globalCsv.box_timeOpen_diamond:toArray(true, "=")
|
c59e058b
zhouhaihai
新一批日志记录
|
557
558
559
|
local costKey = math.ceil((boxL[slot].time - skynet.timex()) / (cost_pre[1] * 60)) * cost_pre[2]
if not role:checkItemEnough({[ItemId.BoxKey] = costKey}) then return end
role:costItems({[ItemId.BoxKey] = costKey}, {log = {desc = "openTimeBox"}})
|
9b35bf6e
zhouhaihai
开启时间箱
|
560
|
end
|
9912e064
zhouhaihai
新增3个每日任务类型
|
561
562
|
local boxId = boxL[slot].id
local itemData = csvdb["itemCsv"][boxId]
|
4d8bd32c
chenyueqi
倒计时开箱子
|
563
|
local randomData = csvdb["item_randomCsv"][itemData.id]
|
43293781
zhouhaihai
日志bug
|
564
|
local costTime = skynet.timex() - (boxL[slot].time - randomData.openTime)
|
9b35bf6e
zhouhaihai
开启时间箱
|
565
|
-- 随机奖励
|
da898074
zhouhaihai
pvp 高级领奖
|
566
|
reward = {}
|
007af97e
zhouhaihai
item_random 结构更改
|
567
568
569
570
571
|
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 结构更改
|
572
573
|
for _, temp in ipairs(gift:toArray()) do
local set = temp:toArray(true, "=")
|
538e9773
zhouhaihai
上宝石
|
574
|
table.insert(pool, set)
|
007af97e
zhouhaihai
item_random 结构更改
|
575
|
end
|
5d620aef
chenyueqi
拆解室指定某一项为必得奖励
|
576
|
|
007af97e
zhouhaihai
item_random 结构更改
|
577
578
579
580
581
582
|
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
开启时间箱
|
583
584
|
end
end
|
007af97e
zhouhaihai
item_random 结构更改
|
585
|
reward[0] = nil
|
9b35bf6e
zhouhaihai
开启时间箱
|
586
|
|
9b35bf6e
zhouhaihai
开启时间箱
|
587
|
boxL[slot] = nil
|
7bb30dca
zhouhaihai
修改发奖
|
588
|
reward, change = role:award(reward, {log = {desc = "openTimeBox", int1 = boxId}})
|
7f9f002d
liuzujun
循环周活动
|
589
|
role:checkTaskEnter("OpenBox", {id = boxId, count=1})
|
c59e058b
zhouhaihai
新一批日志记录
|
590
591
592
593
594
595
596
597
598
|
role:log("carriage_dismantle", {
item_id = boxId, -- 道具id
item_type = itemData.type, -- 道具类型,具体见枚举表中道具类型枚举表
item_level = 0, -- 道具等级
item_number = 1, -- 道具变化数量的绝对值
carriage_dismantle_type = quick and 1 or 0, -- 拆解方式,时间到期:0,钥匙开启:1
carriage_dismantle_time = costTime, -- 拆解耗时,填写实际耗时
carriage_dismantle_cost = costKey, -- 拆解花费钥匙数量,未使用填写0
|
887c1843
zhouhaihai
日志新一批
|
599
|
carriage_dismantle_rwd = reward, -- 拆解获得物资,json格式记录,{'itemid1':2,'itemid2':3,…………..}
|
c59e058b
zhouhaihai
新一批日志记录
|
600
|
})
|
9b35bf6e
zhouhaihai
开启时间箱
|
601
602
603
604
|
else
return
end
|
bd535b08
zhouhaihai
bug
|
605
606
|
role:setProperty("boxL") --刷新
role:changeUpdates({{type = "boxL", field = slot, value = boxL[slot], isOnlyToC = true}}) -- 通知客户端
|
7bb30dca
zhouhaihai
修改发奖
|
607
|
SendPacket(actionCodes.Role_openTimeBoxRpc, MsgPack.pack(role:packReward(reward, change)))
|
c8872722
zhouhaihai
返回
|
608
|
return true
|
9b35bf6e
zhouhaihai
开启时间箱
|
609
610
|
end
|
d1c2290f
zhouhaihai
加速
|
611
612
613
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
644
645
646
647
648
649
650
651
652
653
654
655
656
|
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
|
44c6e479
zhouhaihai
增加部分日志
|
657
|
role:costItems({[id] = count}, {log = {desc = "speedUpBox"}})
|
7bb30dca
zhouhaihai
修改发奖
|
658
659
|
local change
reward, change = role:award(reward, {log = {desc = "speedUpBox"}, int1 = id, int2 = count})
|
d1c2290f
zhouhaihai
加速
|
660
|
|
7bb30dca
zhouhaihai
修改发奖
|
661
|
SendPacket(actionCodes.Role_openSpeedUpBoxRpc, MsgPack.pack(role:packReward(reward, change)))
|
d1c2290f
zhouhaihai
加速
|
662
663
664
|
return true
end
|
00e663bd
zhouhaihai
剧情相关
|
665
666
667
668
669
670
|
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
|
671
|
local storyStatus = role:getProperty("storyB")
|
053978b4
zhouhaihai
剧情领奖
|
672
|
|
17ba67dd
zhouhaihai
错误的判断
|
673
|
local status = (storyStatus[storyId] or {}).s
|
053978b4
zhouhaihai
剧情领奖
|
674
|
|
17ba67dd
zhouhaihai
错误的判断
|
675
676
677
|
if status == -1 then return end
if not status or status ~= 1 then
|
053978b4
zhouhaihai
剧情领奖
|
678
679
680
681
|
if storyBookData.unlockType == 1 and role:getProperty("hangInfo").carbonId == tonumber(storyBookData.unlockData) then -- 挂机剧情正在挂机也可以领奖
else
return
end
|
a1d09d22
zhouhaihai
bug
|
682
|
end
|
00e663bd
zhouhaihai
剧情相关
|
683
|
-- 获取奖励
|
5f18f4e5
zhouhaihai
story
|
684
|
storyStatus[storyId] = storyStatus[storyId] or {}
|
8a01a3ae
zhouhaihai
bug
|
685
|
storyStatus[storyId].s = -1
|
8a01a3ae
zhouhaihai
bug
|
686
|
role:changeUpdates({{ type = "storyB", field = storyId, value = storyStatus[storyId] }})
|
7bb30dca
zhouhaihai
修改发奖
|
687
|
local reward, change = role:award(storyBookData.gift, {log = {desc = "storybookReward", int1 = storyId}})
|
c59e058b
zhouhaihai
新一批日志记录
|
688
|
|
43293781
zhouhaihai
日志bug
|
689
|
role:log("carriage_video", {
|
c59e058b
zhouhaihai
新一批日志记录
|
690
691
692
693
|
carriage_video_type = storyBookData.type, --放映室类型,剧情CG:0, 角色CG:1, 主线剧情:2, 角色剧情:3, 活动剧情:4, 图鉴:5
carriage_video_id = storyId, --放映室片段ID
carriage_video_coinid = reward[ItemId.Gold] and ItemId.Gold or 0, --放映奖励货币类型,无奖励则填写0
carriage_video_coinnum = reward[ItemId.Gold] or 0, --放映奖励货币数量,无奖励则填写0
|
887c1843
zhouhaihai
日志新一批
|
694
|
carriage_video_item = reward, --放映奖励其他物品数量,json格式记录,{'itemid1':10,'itemid2':5,…………..},无奖励则填写0
|
c59e058b
zhouhaihai
新一批日志记录
|
695
696
|
})
|
7bb30dca
zhouhaihai
修改发奖
|
697
|
SendPacket(actionCodes.Role_storyBookRewardRpc, MsgPack.pack(role:packReward(reward, change)))
|
00e663bd
zhouhaihai
剧情相关
|
698
699
700
|
return true
end
|
8a01a3ae
zhouhaihai
bug
|
701
|
function _M.unLockStoryBookRpc(agent, data)
|
bd15e9bc
zhouhaihai
购买剧情
|
702
703
704
705
706
707
708
709
710
711
712
713
714
715
|
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 -- 消耗品不足
|
44c6e479
zhouhaihai
增加部分日志
|
716
|
role:costItems(cost, {log = {desc = "unlockStory", int1 = storyId}})
|
bd15e9bc
zhouhaihai
购买剧情
|
717
718
719
720
721
722
723
724
|
-- 解锁
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
|
725
726
|
end
|
53e8037e
zhouhaihai
任务
|
727
728
729
|
function _M.taskRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
d232676a
zhouhaihai
功能解锁 冒险返回
|
730
731
732
|
if not role:isFuncUnlock(FuncUnlock.TaskAchiv) then return end
|
317a46a9
liuzujun
添加特权卡
|
733
|
local taskType = msg.type -- 1 日常 2 周常
|
53e8037e
zhouhaihai
任务
|
734
735
736
737
738
739
740
741
742
743
744
745
746
747
|
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
|
7bb30dca
zhouhaihai
修改发奖
|
748
|
local reward, change = role:award(taskData.reward, {log = {desc = "finishTask", int1 = taskType, int2 = taskId}})
|
53e8037e
zhouhaihai
任务
|
749
750
751
752
|
local active = (taskStatus["a"] or 0) + taskData.active
role:changeUpdates({
{ type = roleField[taskType], field = {"t", taskId}, value = -1 },
|
317a46a9
liuzujun
添加特权卡
|
753
|
{ type = roleField[taskType], field = "a", value = active},
|
53e8037e
zhouhaihai
任务
|
754
755
|
})
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
756
757
|
local oldVal = role:getProperty("battlePoint") or 0
role:updateProperty({field = "battlePoint", value = oldVal + taskData.active})
|
317a46a9
liuzujun
添加特权卡
|
758
|
|
c59e058b
zhouhaihai
新一批日志记录
|
759
760
761
|
role:log("task_reward", {
task_reward_id = taskId, --任务奖励ID
task_reward_type = taskType, --任务奖励类型,见 任务奖励类型枚举表
|
887c1843
zhouhaihai
日志新一批
|
762
|
task_reward_detail = reward, --任务奖励,json格式记录,{'itemid1':123,'itemid2':456,………...}
|
c59e058b
zhouhaihai
新一批日志记录
|
763
764
|
})
|
7bb30dca
zhouhaihai
修改发奖
|
765
|
SendPacket(actionCodes.Role_taskRpc, MsgPack.pack(role:packReward(reward, change)))
|
53e8037e
zhouhaihai
任务
|
766
767
768
769
770
771
|
return true
end
function _M.taskActiveRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
d232676a
zhouhaihai
功能解锁 冒险返回
|
772
773
774
|
if not role:isFuncUnlock(FuncUnlock.TaskAchiv) then return end
|
53e8037e
zhouhaihai
任务
|
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
|
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
|
7bb30dca
zhouhaihai
修改发奖
|
790
|
local reward, change = role:award(taskData.reward, {log = {desc = "taskActive", int1 = taskType, int2 = taskId}})
|
53e8037e
zhouhaihai
任务
|
791
792
793
794
|
role:changeUpdates({
{ type = roleField[taskType], field = {"at", taskId}, value = -1 }
})
|
7bb30dca
zhouhaihai
修改发奖
|
795
|
SendPacket(actionCodes.Role_taskActiveRpc, MsgPack.pack(role:packReward(reward, change)))
|
53e8037e
zhouhaihai
任务
|
796
797
798
799
800
801
802
803
|
return true
end
function _M.achiveRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local taskId = msg.id --任务id
|
d232676a
zhouhaihai
功能解锁 冒险返回
|
804
805
|
if not role:isFuncUnlock(FuncUnlock.TaskAchiv) then return end
|
53e8037e
zhouhaihai
任务
|
806
|
local achiveTask = csvdb["achievementCsv"][taskId]
|
4c5d72ab
zhouhaihai
高级pvp
|
807
|
if not achiveTask then return 1 end
|
53e8037e
zhouhaihai
任务
|
808
809
810
811
|
local achiveT = role:getProperty("achiveT")
local achiveV = role:getProperty("achiveV")
|
4c5d72ab
zhouhaihai
高级pvp
|
812
|
if achiveV[taskId] then return 2 end
|
53e8037e
zhouhaihai
任务
|
813
814
815
816
817
|
local curStatus = achiveT[achiveTask.type] or 0
local maxc = achiveTask.condition1
if maxc > curStatus then
|
4c5d72ab
zhouhaihai
高级pvp
|
818
|
return 3
|
53e8037e
zhouhaihai
任务
|
819
820
|
end
|
7bb30dca
zhouhaihai
修改发奖
|
821
|
local reward, change = role:award(achiveTask.reward, {log = {desc = "finishAchive", int1 = taskId}})
|
53e8037e
zhouhaihai
任务
|
822
|
role:changeUpdates({
|
f60b89b1
zhouhaihai
奖励副本
|
823
|
{ type = "achiveV", field = taskId, value = skynet.timex() }
|
53e8037e
zhouhaihai
任务
|
824
|
})
|
3df73a9e
zhouhaihai
复兴奖励
|
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
|
-- 复兴奖励
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
|
848
|
elseif pData.request > overCount then
|
3df73a9e
zhouhaihai
复兴奖励
|
849
850
851
852
|
break
end
end
end
|
53e8037e
zhouhaihai
任务
|
853
|
|
c59e058b
zhouhaihai
新一批日志记录
|
854
855
856
|
role:log("achievement", {
achievement_id = taskId, -- 成就id
achievement_type = achiveTask.type, -- 成就类型,具体枚举表中成就类型枚举表
|
887c1843
zhouhaihai
日志新一批
|
857
|
achievement_reward = reward, -- 达成成就奖励,json格式记录,{"itemid1":123,"itemid2":12,……….}
|
c59e058b
zhouhaihai
新一批日志记录
|
858
859
|
})
|
7bb30dca
zhouhaihai
修改发奖
|
860
|
SendPacket(actionCodes.Role_achiveRpc, MsgPack.pack(role:packReward(reward, change)))
|
53e8037e
zhouhaihai
任务
|
861
862
863
|
return true
end
|
3df73a9e
zhouhaihai
复兴奖励
|
864
865
|
|
c384626d
zhouhaihai
好友
|
866
867
868
869
870
871
872
873
874
875
876
877
878
879
|
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
|
a5486ede
zhouhaihai
csvdata 修改为 share...
|
880
|
local SERV = string_format(".chated%d", math.random(1, 5))
|
c384626d
zhouhaihai
好友
|
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
|
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
聊天
|
902
903
904
905
906
|
local waitTime = nil
local check = {
-- 世界聊天
[1] = function ()
|
c384626d
zhouhaihai
好友
|
907
908
909
910
|
if role:getProperty("silent") > now then --禁言
result = 1
return
end
|
8474ca36
zhouhaihai
聊天
|
911
912
913
914
915
|
role._worldChatLimit = role._worldChatLimit or {start = 0, count = 0, canSayt = 0} --第一次开始说话时间 从第一次说话次数 能说话的时间
if now < role._worldChatLimit.canSayt then
result = 2
|
fa565e0c
zhouhaihai
优化结构
|
916
|
waitTime = role._worldChatLimit.canSayt - now
|
8474ca36
zhouhaihai
聊天
|
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
|
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
好友
|
934
|
mcast_util.pub_world(actionCodes.Role_chat, MsgPack.pack(response))
|
a5486ede
zhouhaihai
csvdata 修改为 share...
|
935
|
pcall(skynet.send, '.globald', "lua", "sendWorldMsg", role._channelIdx, response)
|
c384626d
zhouhaihai
好友
|
936
|
end,
|
8474ca36
zhouhaihai
聊天
|
937
938
939
|
-- 私聊
[2] = function ()
local objectId = msg.roleId
|
fa565e0c
zhouhaihai
优化结构
|
940
|
response.objId = objectId
|
4cf74232
zhouhaihai
pvp
|
941
942
943
944
945
946
947
948
949
950
951
952
|
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
聊天
|
953
954
|
return
end
|
4cf74232
zhouhaihai
pvp
|
955
956
|
-- 对方把你拉黑
local isBlock = redret[3] == 1
|
8474ca36
zhouhaihai
聊天
|
957
|
|
8474ca36
zhouhaihai
聊天
|
958
|
local bin = MsgPack.pack(response)
|
4cf74232
zhouhaihai
pvp
|
959
|
if not isBlock then
|
440aa055
zhouhaihai
聊天
|
960
961
|
redisproxy:pipelining(function(red)
red:rpush(CHAT_OFFLINE:format(objectId), bin)
|
4cf74232
zhouhaihai
pvp
|
962
|
red:ltrim(CHAT_OFFLINE:format(objectId), -200, -1)
|
440aa055
zhouhaihai
聊天
|
963
|
end)
|
4cf74232
zhouhaihai
pvp
|
964
965
966
967
968
|
-- 若在线,实时发送聊天信息
local agent = datacenter.get("agent", objectId)
if agent then
SendPacket(actionCodes.Role_chat, bin, agent.fd)
end
|
440aa055
zhouhaihai
聊天
|
969
|
end
|
4cf74232
zhouhaihai
pvp
|
970
|
SendPacket(actionCodes.Role_chat, bin)
|
c384626d
zhouhaihai
好友
|
971
972
973
974
975
976
977
|
end,
}
if not check[cmd] then return end
if not result then
check[cmd]()
end
|
c59e058b
zhouhaihai
新一批日志记录
|
978
979
980
981
|
role:log("communication", {
publish_type = cmd, --发言类型,1,世界 2私聊
publish_status = 0, --发送状态,发送成功:0,发送失败:1,被屏蔽:2,其他:3
|
7d31daa8
zhouhaihai
调整压测
|
982
|
publish_receive_roleid = msg.roleId or 0, --接收者角色ID
|
c59e058b
zhouhaihai
新一批日志记录
|
983
984
|
publish_text = content, --发言内容
})
|
8474ca36
zhouhaihai
聊天
|
985
|
SendPacket(actionCodes.Role_chatRpc, MsgPack.pack({result = result, waitTime = waitTime}))
|
c384626d
zhouhaihai
好友
|
986
987
988
|
return true
end
|
4cf74232
zhouhaihai
pvp
|
989
990
991
992
993
994
|
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
背包
|
995
|
|
dc9d814f
zhouhaihai
邮件
|
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
|
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})
|
d02f7904
zhouhaihai
遗失的log
|
1012
|
role:mylog("role_action", {desc = "changeSetting", int1 = id, int2 = status})
|
dc9d814f
zhouhaihai
邮件
|
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
|
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))
|
c59e058b
zhouhaihai
新一批日志记录
|
1041
|
local reward, change = role:award(result.gift, {log = {desc = "drawCode", int1 = giftId}})
|
dc9d814f
zhouhaihai
邮件
|
1042
|
|
c59e058b
zhouhaihai
新一批日志记录
|
1043
1044
1045
|
role:log("get_gift", {
gift_id = giftId, -- 礼包ID
gift_key = code, -- 礼包key
|
887c1843
zhouhaihai
日志新一批
|
1046
|
gift_reward = reward, -- 礼包奖励,json格式记录,{"itemid1":123,"itemid2":12,……….}
|
c59e058b
zhouhaihai
新一批日志记录
|
1047
1048
1049
|
gift_name = "", -- 礼包名称
gift_reason = 0, -- 礼包发放原因,见发放原因枚举表
})
|
d02f7904
zhouhaihai
遗失的log
|
1050
|
role:mylog("role_action", {desc = "drawCode", int1 = giftId, key1 = code})
|
dc9d814f
zhouhaihai
邮件
|
1051
1052
1053
|
SendPacket(actionCodes.Role_drawCodeRpc, MsgPack.pack({
result = ret,
reward = reward,
|
7bb30dca
zhouhaihai
修改发奖
|
1054
|
change = change,
|
dc9d814f
zhouhaihai
邮件
|
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
|
}))
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
头像
|
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
|
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
邮件
|
1090
1091
|
return
end
|
bd4fb541
zhouhaihai
增加物品过期系统
|
1092
|
role:changeHead(id)
|
44c6e479
zhouhaihai
增加部分日志
|
1093
|
|
dc9d814f
zhouhaihai
邮件
|
1094
1095
1096
1097
|
SendPacket(actionCodes.Role_changeHeadRpc, "")
return true
end
|
71f716c4
chenyueqi
引导用到的字段
|
1098
1099
1100
1101
1102
1103
1104
|
function _M.guideRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local cmdType = msg.cmdType
local funcGuide = role:getProperty("funcGuide")
|
aeb5da9a
chenyueqi
强制引导的步数记录
|
1105
|
if cmdType == 1 then
|
71f716c4
chenyueqi
引导用到的字段
|
1106
|
-- 新手引导
|
aeb5da9a
chenyueqi
强制引导的步数记录
|
1107
1108
1109
|
local master = msg.master or -1
local slave = msg.slave or -1
if master < 0 or slave < 0 then return end
|
a608cccb
chenyueqi
引导服务端记录
|
1110
1111
|
role:saveGuide(master, slave)
|
71f716c4
chenyueqi
引导用到的字段
|
1112
|
elseif cmdType == 2 then
|
a608cccb
chenyueqi
引导服务端记录
|
1113
|
-- 系统引导(玩家可选择是否进行)
|
71f716c4
chenyueqi
引导用到的字段
|
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
|
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)
|
39bcd7ca
zhouhaihai
LOG
|
1124
|
role:log("onGuidePoint", {guild_type = 2, guild_id = msg.funcType, guild_point = 0, guild_pass = 0})
|
d02f7904
zhouhaihai
遗失的log
|
1125
|
role:mylog("guide", {desc = "guide_weak", int1 = msg.funcType})
|
71f716c4
chenyueqi
引导用到的字段
|
1126
1127
|
end
role:updateProperty({field = "funcGuide", value = funcGuide})
|
e26989ce
chenyueqi
增加其他的引导记录
|
1128
|
elseif cmdType == 3 then
|
a608cccb
chenyueqi
引导服务端记录
|
1129
1130
1131
1132
1133
|
-- 系统引导(强制进行)
if msg.funcType and csvdb["guide_unlockCsv"][msg.funcType] then
role:saveGuide(csvdb["guide_unlockCsv"][msg.funcType].guideId,1)
funcGuide = funcGuide:setv(msg.funcType, 1)
role:updateProperty({field = "funcGuide", value = funcGuide})
|
39bcd7ca
zhouhaihai
LOG
|
1134
|
role:log("onGuidePoint", {guild_type = 1, guild_id = msg.funcType, guild_point = 0, guild_pass = 0})
|
d02f7904
zhouhaihai
遗失的log
|
1135
|
role:mylog("guide", {desc = "guide_sys", int1 = msg.funcType})
|
a608cccb
chenyueqi
引导服务端记录
|
1136
1137
1138
|
end
elseif cmdType == 4 then
-- 弹出一个tips(进入功能界面也许要自动弹说明,value要区分1、2)
|
e26989ce
chenyueqi
增加其他的引导记录
|
1139
1140
1141
|
if msg.funcType then
local value = msg.value or 1
for _, funcIdx in pairs(msg.funcType:toArray(true,"=")) do
|
39bcd7ca
zhouhaihai
LOG
|
1142
|
role:log("onGuidePoint", {guild_type = 3, guild_id = funcIdx, guild_point = 0, guild_pass = 0})
|
d02f7904
zhouhaihai
遗失的log
|
1143
|
role:mylog("guide", {desc = "guide_tips", int1 = funcIdx})
|
e26989ce
chenyueqi
增加其他的引导记录
|
1144
1145
1146
1147
|
funcGuide = funcGuide:setv(funcIdx, value)
end
role:updateProperty({field = "funcGuide", value = funcGuide})
end
|
71f716c4
chenyueqi
引导用到的字段
|
1148
1149
1150
1151
1152
1153
1154
|
else
return
end
SendPacket(actionCodes.Role_guideRpc, "")
return true
end
|
dc9d814f
zhouhaihai
邮件
|
1155
|
|
d51114bd
wangyujie
完成需求:每日金币购买
|
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
|
function _M.goldBuyRpc(agent, data)
local role = agent.role
local curT = role.dailyData:getProperty("goldBuyT")
local costD = globalCsv.idle_quickMoney_cost[curT]
if not costD then
return 1
end
if costD ~= 0 and not role:checkItemEnough({[ItemId.Diamond] = costD}) then
return 2
end
local goldC = 0
local hangPass = role:getProperty("hangPass")
for i = 1, 3 do
if hangPass[i] then
local carbonData = csvdb["idle_battleCsv"][hangPass[i]]
goldC = math.max(goldC, carbonData.money * globalCsv.idle_quickMoney_effect)
end
end
|
c873abb5
wangyujie
完善金币购买
|
1174
1175
1176
1177
1178
|
local carbonId = role:getProperty("hangInfo").carbonId
if carbonId then
local carbonData = csvdb["idle_battleCsv"][carbonId]
goldC = math.max(goldC, carbonData.money * globalCsv.idle_quickMoney_effect)
end
|
d51114bd
wangyujie
完成需求:每日金币购买
|
1179
1180
1181
|
if goldC == 0 then
return 3
end
|
317a46a9
liuzujun
添加特权卡
|
1182
1183
|
local coef = role.storeData:getGearExchangeCoef()
goldC = goldC * coef
|
d51114bd
wangyujie
完成需求:每日金币购买
|
1184
1185
|
role.dailyData:updateProperty({field = "goldBuyT", value = curT + 1})
role:costItems({[ItemId.Diamond] = costD}, {log = {desc = "goldBuy"}})
|
7f9f002d
liuzujun
循环周活动
|
1186
|
local reward, change = role:award({[ItemId.Gold] = math.floor(goldC)}, {log = {desc = "goldBuy"}})
|
7bb30dca
zhouhaihai
修改发奖
|
1187
|
SendPacket(actionCodes.Role_goldBuyRpc, MsgPack.pack(role:packReward(reward, change)))
|
d51114bd
wangyujie
完成需求:每日金币购买
|
1188
1189
1190
|
return true
end
|
9ea0c502
liuzujun
限时礼包
|
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
|
function _M.getDownloadCvRewardRpc(agent, data)
local role = agent.role
local flag = role:getProperty("downCvR") or 0
if flag ~= 0 then
return 1
end
local r = globalCsv.role_download_cv_reward
local reward, change = role:award(r, {log = {desc = "downloadCv"}})
role:updateProperty({field="downCvR", value=1})
SendPacket(actionCodes.Role_getDownloadCvRewardRpc, MsgPack.pack(role:packReward(reward, change)))
return true
end
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
|
function _M.updateFeedbackInfoRpc(agent, data)
local role = agent.role
local info = role:getProperty("feedback") or {}
local msg = MsgPack.unpack(data)
info["flag"] = msg.flag
info["count"] = msg.count
info["ts"] = skynet.timex()
role:updateProperty({field="feedback", value=info})
SendPacket(actionCodes.Role_updateFeedbackInfoRpc, MsgPack.pack({}))
return true
end
|
a6dc627f
liuzujun
自选箱子协议
|
1216
1217
1218
1219
|
function _M.useSelectItemRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local itemId = msg.itemId
|
e52c384f
liuzujun
探索指令bug, 充值返利活动
|
1220
|
local subId = msg.subId
|
a6dc627f
liuzujun
自选箱子协议
|
1221
1222
1223
1224
1225
|
local count = msg.count
if math.illegalNum(count, 1, role:getItemCount(itemId)) then return end
local itemData = csvdb["itemCsv"][itemId]
if itemData.type ~= ItemType.SelectItemBox then return end
local itemMap = itemData.use_effect:toNumMap()
|
a6dc627f
liuzujun
自选箱子协议
|
1226
1227
|
local reward, change = {}
for k, v in pairs(itemMap) do
|
e52c384f
liuzujun
探索指令bug, 充值返利活动
|
1228
|
if k == subId then
|
a6dc627f
liuzujun
自选箱子协议
|
1229
1230
1231
|
reward[k] = v * count
break
end
|
a6dc627f
liuzujun
自选箱子协议
|
1232
1233
1234
1235
1236
1237
1238
|
end
if next(reward) then
reward, change = role:award(reward, {log = {desc = "openItem", int1 = itemId, int2 = count}})
role:costItems({[itemId] = count}, {log = {desc = "openItem"}})
end
SendPacket(actionCodes.Role_useSelectItemRpc, MsgPack.pack(role:packReward(reward, change)))
|
e52c384f
liuzujun
探索指令bug, 充值返利活动
|
1239
|
return true
|
a6dc627f
liuzujun
自选箱子协议
|
1240
1241
|
end
|
314bc5df
zhengshouren
提交服务器初始代码
|
1242
|
return _M
|