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
98
|
role:startActionUcode()
role:setProperty("ltime", now)
|
314bc5df
zhengshouren
提交服务器初始代码
|
99
100
101
|
else
role:reloadWhenLogin()
end
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
102
|
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
|
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
提交服务器初始代码
|
118
|
SERV_OPEN = redisproxy:hget("autoincrement_set", "server_start")
|
314bc5df
zhengshouren
提交服务器初始代码
|
119
|
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
120
|
role:changeStructVersion() -- 数据结构 版本更新
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
121
|
role:advEndlessSeasonCheck(true) -- 冒险赛季更新检查
|
314bc5df
zhengshouren
提交服务器初始代码
|
122
|
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
123
|
-- 跨天登陆事件
|
ea40710f
zhouhaihai
活动
|
124
|
local resetMode = role:updateTimeReset(now)
|
be4e8031
zhouhaihai
活动 拾荒
|
125
126
|
if not resetMode or not resetMode["CrossDay"] then -- 没有跨天
role.activity:checkActivityStatus(now, false, false)
|
ea40710f
zhouhaihai
活动
|
127
128
|
end
|
c384626d
zhouhaihai
好友
|
129
|
redisproxy:zadd(FRIEND_RECOMMEND, now, roleId)
|
be9c9ca6
zhouahaihai
角色评论
|
130
|
|
3e20f499
saicom
完善商城相关协议
|
131
|
for _, name in ipairs({"dailyData", "dinerData", "activity", "storeData"}) do
|
be9c9ca6
zhouahaihai
角色评论
|
132
133
134
|
response[name] = role[name]:data()
end
|
314bc5df
zhengshouren
提交服务器初始代码
|
135
136
137
138
|
response.role = role:data()
response.result = "SUCCESS"
response.serverTime = now
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
139
140
141
142
143
144
145
|
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
好感度, 皮肤
|
146
|
if #heroIds <= 50 then
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
147
148
149
150
|
heroWave = 0
table_insert(modules, "heros")
end
|
a0013f0b
zhouhaihai
零件分批推送
|
151
152
153
154
155
156
157
158
159
160
|
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
|
161
162
163
164
165
166
167
|
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
好友
|
168
|
response.wave = 1 + heroWave + runeWave + 1
|
314bc5df
zhengshouren
提交服务器初始代码
|
169
170
171
|
SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(response))
|
a0013f0b
zhouhaihai
零件分批推送
|
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
|
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 数据结构
|
188
|
end
|
a0013f0b
zhouhaihai
零件分批推送
|
189
|
curWave = curWave + runeWave
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
190
|
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
191
|
local heroIndex = 1
|
a0013f0b
zhouhaihai
零件分批推送
|
192
|
for index = curWave + 1, curWave + heroWave do
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
193
194
195
196
197
198
199
200
201
202
203
204
205
|
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
零件分批推送
|
206
|
curWave = curWave + heroWave
|
314bc5df
zhengshouren
提交服务器初始代码
|
207
|
|
fa565e0c
zhouhaihai
优化结构
|
208
|
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
209
|
|
314bc5df
zhengshouren
提交服务器初始代码
|
210
|
-- 注册全服广播
|
fa565e0c
zhouhaihai
优化结构
|
211
212
213
214
215
216
217
218
219
|
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
提交服务器初始代码
|
220
|
end
|
c384626d
zhouhaihai
好友
|
221
222
223
|
-- 发下缓存的世界消息
local worldChatResponse = {worldChats = {}}
|
a5486ede
zhouhaihai
csvdata 修改为 share...
|
224
|
local ok, msgs = pcall(skynet.call, '.globald', "lua", "getWorldMsg", role._channelIdx)
|
c384626d
zhouhaihai
好友
|
225
226
227
228
|
if not ok then
msgs = {}
end
worldChatResponse.worldChats = msgs
|
4cf74232
zhouhaihai
pvp
|
229
230
231
232
233
|
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
好友
|
234
235
236
237
238
|
worldChatResponse.chatWave = curWave + 1
curWave = curWave + 1
SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(worldChatResponse))
|
fa565e0c
zhouhaihai
优化结构
|
239
240
241
242
243
244
245
246
|
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
|
247
248
249
250
251
|
-- 玩家登陆做的一些操作
role:saveHangTeam()
role:savePvpCTeam()
|
33be3111
zhouhaihai
修改hangPass 结构
|
252
|
role:savePvpHTeam()
|
fa565e0c
zhouhaihai
优化结构
|
253
|
|
33be3111
zhouhaihai
修改hangPass 结构
|
254
255
|
local hangPass = role:getProperty("hangPass")
role:log("login", {key1 = agent.ip:toArray(false, ":")[1], int1 = hangPass[1] or 0})
|
4c5d72ab
zhouhaihai
高级pvp
|
256
|
|
314bc5df
zhengshouren
提交服务器初始代码
|
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
|
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
提交服务器初始代码
|
281
282
283
284
|
local newRole = require("models.Role").new({
key = string_format("role:%d", roleId),
id = roleId,
uid = tostring(msg.uid),
|
dc9d814f
zhouhaihai
邮件
|
285
|
sid = msg.subId or 0,
|
314bc5df
zhengshouren
提交服务器初始代码
|
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
|
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
|
44c6e479
zhouhaihai
增加部分日志
|
301
|
newRole:startActionUcode()
|
8b65a363
zhouhaihai
优化
|
302
|
newRole:award(globalCsv.birthItem, {log = {desc = "birth"}, notNotify = true})
|
314bc5df
zhengshouren
提交服务器初始代码
|
303
|
-- 欢迎邮件
|
147ef2ce
zhouhaihai
邮件 Gm
|
304
|
redisproxy:insertEmail({roleId = roleId, emailId = 1})
|
314bc5df
zhengshouren
提交服务器初始代码
|
305
|
|
da898074
zhouhaihai
pvp 高级领奖
|
306
|
newRole:log("create", {key1 = agent.ip:toArray(false, ":")[1]})
|
314bc5df
zhengshouren
提交服务器初始代码
|
307
308
309
310
311
|
SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
return true
end
|
dc9d814f
zhouhaihai
邮件
|
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
|
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小写名字异常
|
341
342
|
local dbName = string.upper(newName)
local result = redisproxy:setnx(string_format("user:%s", dbName), roleId)
|
dc9d814f
zhouhaihai
邮件
|
343
344
345
346
347
|
if result == 0 then
SendPacket(actionCodes.Role_changeNameRpc, MsgPack.pack({result = 1}))
return true
end
redisproxy:pipelining(function (red)
|
af7863ef
zhouhaihai
x小写名字异常
|
348
349
|
red:del(string_format("user:%s", string.upper(oldName)))
red:set(string_format("uid:%s", role:getProperty("uid")), dbName)
|
dc9d814f
zhouhaihai
邮件
|
350
351
352
353
354
|
end)
role:updateProperties({
["name"] = newName,
})
|
e3c5cc5e
zhouhaihai
跨服竞技场over
|
355
356
|
role:changeCrossServerPvpSelfInfo("name")
|
dc9d814f
zhouhaihai
邮件
|
357
358
359
360
|
SendPacket(actionCodes.Role_changeNameRpc, MsgPack.pack({result = 0}))
return true
end
|
c1849aa6
chenyueqi
roleaction增加一个获取随...
|
361
362
363
364
365
366
|
function _M.getRandomNameRpc()
local name = randomRoleName()
SendPacket(actionCodes.Role_getRandomNameRpc, MsgPack.pack({name = name}))
return true
end
|
dc9d814f
zhouhaihai
邮件
|
367
368
369
370
371
372
373
|
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...
|
374
|
local SERV = string_format(".chated%d", math.random(1, 5))
|
dc9d814f
zhouhaihai
邮件
|
375
376
377
378
379
|
local legal, mod = skynet.call(SERV, "lua", "check", content)
if not legal then
content = mod or ""
end
|
14f1591b
zhouhaihai
删除好感度相关
|
380
|
role:updateProperty({field = "intro", value = content})
|
dc9d814f
zhouhaihai
邮件
|
381
382
383
384
385
|
SendPacket(actionCodes.Role_changeIntroRpc, '')
return true
end
|
314bc5df
zhengshouren
提交服务器初始代码
|
386
387
388
389
390
|
function _M.syncTimeRpc(agent, data)
SendPacket(actionCodes.Role_syncTimeRpc, MsgPack.pack({nowTime = skynet.timex()}))
return true
end
|
312b9db5
zhouahaihai
背包
|
391
392
393
|
function _M.saleItemRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
84e7c06e
zhouhaihai
回收
|
394
395
396
397
|
local backs = msg.backs
if not backs then return end
local reward = {}
|
53e8037e
zhouhaihai
任务
|
398
|
local fragCount = 0
|
84e7c06e
zhouhaihai
回收
|
399
400
401
402
|
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
任务
|
403
404
405
|
if itemData.type == ItemType.HeroFragment or itemData.type == ItemType.HeroFCommon then
fragCount = fragCount + count
end
|
84e7c06e
zhouhaihai
回收
|
406
407
408
409
|
local sellEffect = itemData.sell_effect:toArray(true, "=")
reward[sellEffect[1]] = (reward[sellEffect[1]] or 0) + sellEffect[2] * count
end
|
44c6e479
zhouhaihai
增加部分日志
|
410
|
role:costItems(backs, {log = {desc = "saleItem"}})
|
7bb30dca
zhouhaihai
修改发奖
|
411
|
local reward, change = role:award(reward, {log = {desc = "saleItem"}})
|
53e8037e
zhouhaihai
任务
|
412
|
role:checkTaskEnter("DecoFrag", {count = fragCount})
|
7bb30dca
zhouhaihai
修改发奖
|
413
|
SendPacket(actionCodes.Role_saleItemRpc, MsgPack.pack(role:packReward(reward, change)))
|
312b9db5
zhouahaihai
背包
|
414
415
416
417
418
419
420
421
422
423
424
425
|
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
开启时间箱
|
426
|
if not randomData or randomData.openTime > 0 then return end
|
312b9db5
zhouahaihai
背包
|
427
|
|
007af97e
zhouhaihai
item_random 结构更改
|
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
|
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
背包
|
444
445
446
|
end
end
end
|
007af97e
zhouhaihai
item_random 结构更改
|
447
448
|
reward[0] = nil
|
44c6e479
zhouhaihai
增加部分日志
|
449
|
role:costItems({[itemId] = count}, {log = {desc = "openItem"}})
|
7bb30dca
zhouhaihai
修改发奖
|
450
451
|
local change
reward, change = role:award(reward, {log = {desc = "openItem", int1 = itemId, int2 = count}})
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
452
|
|
7bb30dca
zhouhaihai
修改发奖
|
453
|
SendPacket(actionCodes.Role_openItemRpc, MsgPack.pack(role:packReward(reward, change)))
|
312b9db5
zhouahaihai
背包
|
454
455
456
|
return true
end
|
9b35bf6e
zhouhaihai
开启时间箱
|
457
458
459
|
function _M.openTimeBoxRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
4d8bd32c
chenyueqi
倒计时开箱子
|
460
|
local oper = msg.oper -- 操作 1 - 2
|
9b35bf6e
zhouhaihai
开启时间箱
|
461
|
local slot = msg.slot -- 位置 1 - 6
|
40632058
chenyueqi
拆解时钟箱,功能修改后明显的错误
|
462
|
if math.illegalNum(slot, 1, role:getFuncLv(FuncOpenType.TimeBoxSlot)) then return end
|
9b35bf6e
zhouhaihai
开启时间箱
|
463
464
|
local boxL = role:getProperty("boxL")
|
7bb30dca
zhouhaihai
修改发奖
|
465
|
local reward, change = {}
|
9b35bf6e
zhouhaihai
开启时间箱
|
466
467
468
469
|
if oper == 1 then -- 打开
local itemId = msg.itemId
if role:getItemCount(itemId) < 1 then return end
local itemData = csvdb["itemCsv"][itemId]
|
c384626d
zhouhaihai
好友
|
470
|
local randomData = csvdb["item_randomCsv"][itemId]
|
4d8bd32c
chenyueqi
倒计时开箱子
|
471
|
if not itemData or not randomData or randomData.openTime <= 0 then return end
|
9b35bf6e
zhouhaihai
开启时间箱
|
472
473
|
if boxL[slot] then return end
|
44c6e479
zhouhaihai
增加部分日志
|
474
|
role:costItems({[itemId] = 1}, {log = {desc = "openTimeBox"}})
|
9b35bf6e
zhouhaihai
开启时间箱
|
475
|
boxL[slot] = {id = itemId, time = skynet.timex() + randomData.openTime}
|
538e9773
zhouhaihai
上宝石
|
476
|
|
4d8bd32c
chenyueqi
倒计时开箱子
|
477
|
elseif oper == 2 then -- 领取
|
9b35bf6e
zhouhaihai
开启时间箱
|
478
479
480
481
|
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
大小写
|
482
|
local cost_pre = globalCsv.box_timeOpen_diamond:toArray(true, "=")
|
9b35bf6e
zhouhaihai
开启时间箱
|
483
|
local costD = math.ceil((boxL[slot].time - skynet.timex()) / (cost_pre[1] * 60)) * cost_pre[2]
|
6a89ff20
chenyueqi
拆解时钟箱消耗的加速道具更改
|
484
|
if not role:checkItemEnough({[ItemId.BoxKey] = costD}) then return end
|
44c6e479
zhouhaihai
增加部分日志
|
485
|
role:costItems({[ItemId.BoxKey] = costD}, {log = {desc = "openTimeBox"}})
|
9b35bf6e
zhouhaihai
开启时间箱
|
486
|
end
|
9912e064
zhouhaihai
新增3个每日任务类型
|
487
488
|
local boxId = boxL[slot].id
local itemData = csvdb["itemCsv"][boxId]
|
4d8bd32c
chenyueqi
倒计时开箱子
|
489
|
local randomData = csvdb["item_randomCsv"][itemData.id]
|
9b35bf6e
zhouhaihai
开启时间箱
|
490
|
-- 随机奖励
|
da898074
zhouhaihai
pvp 高级领奖
|
491
|
reward = {}
|
007af97e
zhouhaihai
item_random 结构更改
|
492
493
494
495
496
|
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 结构更改
|
497
498
|
for _, temp in ipairs(gift:toArray()) do
local set = temp:toArray(true, "=")
|
538e9773
zhouhaihai
上宝石
|
499
|
table.insert(pool, set)
|
007af97e
zhouhaihai
item_random 结构更改
|
500
|
end
|
5d620aef
chenyueqi
拆解室指定某一项为必得奖励
|
501
|
|
007af97e
zhouhaihai
item_random 结构更改
|
502
503
504
505
506
507
|
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
开启时间箱
|
508
509
|
end
end
|
007af97e
zhouhaihai
item_random 结构更改
|
510
|
reward[0] = nil
|
9b35bf6e
zhouhaihai
开启时间箱
|
511
|
|
9b35bf6e
zhouhaihai
开启时间箱
|
512
|
boxL[slot] = nil
|
7bb30dca
zhouhaihai
修改发奖
|
513
|
reward, change = role:award(reward, {log = {desc = "openTimeBox", int1 = boxId}})
|
9912e064
zhouhaihai
新增3个每日任务类型
|
514
|
role:checkTaskEnter("OpenBox", {id = boxId})
|
9b35bf6e
zhouhaihai
开启时间箱
|
515
516
517
518
|
else
return
end
|
bd535b08
zhouhaihai
bug
|
519
520
|
role:setProperty("boxL") --刷新
role:changeUpdates({{type = "boxL", field = slot, value = boxL[slot], isOnlyToC = true}}) -- 通知客户端
|
7bb30dca
zhouhaihai
修改发奖
|
521
|
SendPacket(actionCodes.Role_openTimeBoxRpc, MsgPack.pack(role:packReward(reward, change)))
|
c8872722
zhouhaihai
返回
|
522
|
return true
|
9b35bf6e
zhouhaihai
开启时间箱
|
523
524
|
end
|
d1c2290f
zhouhaihai
加速
|
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
564
565
566
567
568
569
570
|
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
增加部分日志
|
571
|
role:costItems({[id] = count}, {log = {desc = "speedUpBox"}})
|
7bb30dca
zhouhaihai
修改发奖
|
572
573
|
local change
reward, change = role:award(reward, {log = {desc = "speedUpBox"}, int1 = id, int2 = count})
|
d1c2290f
zhouhaihai
加速
|
574
|
|
7bb30dca
zhouhaihai
修改发奖
|
575
|
SendPacket(actionCodes.Role_openSpeedUpBoxRpc, MsgPack.pack(role:packReward(reward, change)))
|
d1c2290f
zhouhaihai
加速
|
576
577
578
|
return true
end
|
00e663bd
zhouhaihai
剧情相关
|
579
580
581
582
583
584
|
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
|
585
|
local storyStatus = role:getProperty("storyB")
|
053978b4
zhouhaihai
剧情领奖
|
586
|
|
17ba67dd
zhouhaihai
错误的判断
|
587
|
local status = (storyStatus[storyId] or {}).s
|
053978b4
zhouhaihai
剧情领奖
|
588
|
|
17ba67dd
zhouhaihai
错误的判断
|
589
590
591
|
if status == -1 then return end
if not status or status ~= 1 then
|
053978b4
zhouhaihai
剧情领奖
|
592
593
594
595
|
if storyBookData.unlockType == 1 and role:getProperty("hangInfo").carbonId == tonumber(storyBookData.unlockData) then -- 挂机剧情正在挂机也可以领奖
else
return
end
|
a1d09d22
zhouhaihai
bug
|
596
|
end
|
00e663bd
zhouhaihai
剧情相关
|
597
|
-- 获取奖励
|
5f18f4e5
zhouhaihai
story
|
598
|
storyStatus[storyId] = storyStatus[storyId] or {}
|
8a01a3ae
zhouhaihai
bug
|
599
|
storyStatus[storyId].s = -1
|
8a01a3ae
zhouhaihai
bug
|
600
|
role:changeUpdates({{ type = "storyB", field = storyId, value = storyStatus[storyId] }})
|
7bb30dca
zhouhaihai
修改发奖
|
601
602
|
local reward, change = role:award(storyBookData.gift, {log = {desc = "storybookReward", int1 = storyId}})
SendPacket(actionCodes.Role_storyBookRewardRpc, MsgPack.pack(role:packReward(reward, change)))
|
00e663bd
zhouhaihai
剧情相关
|
603
604
605
|
return true
end
|
8a01a3ae
zhouhaihai
bug
|
606
|
function _M.unLockStoryBookRpc(agent, data)
|
bd15e9bc
zhouhaihai
购买剧情
|
607
608
609
610
611
612
613
614
615
616
617
618
619
620
|
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
增加部分日志
|
621
|
role:costItems(cost, {log = {desc = "unlockStory", int1 = storyId}})
|
bd15e9bc
zhouhaihai
购买剧情
|
622
623
624
625
626
627
628
629
|
-- 解锁
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
|
630
631
|
end
|
53e8037e
zhouhaihai
任务
|
632
633
634
|
function _M.taskRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
d232676a
zhouhaihai
功能解锁 冒险返回
|
635
636
637
|
if not role:isFuncUnlock(FuncUnlock.TaskAchiv) then return end
|
53e8037e
zhouhaihai
任务
|
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
|
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
|
7bb30dca
zhouhaihai
修改发奖
|
653
|
local reward, change = role:award(taskData.reward, {log = {desc = "finishTask", int1 = taskType, int2 = taskId}})
|
53e8037e
zhouhaihai
任务
|
654
655
656
657
658
659
660
|
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}
})
|
7bb30dca
zhouhaihai
修改发奖
|
661
|
SendPacket(actionCodes.Role_taskRpc, MsgPack.pack(role:packReward(reward, change)))
|
53e8037e
zhouhaihai
任务
|
662
663
664
665
666
667
|
return true
end
function _M.taskActiveRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
d232676a
zhouhaihai
功能解锁 冒险返回
|
668
669
670
|
if not role:isFuncUnlock(FuncUnlock.TaskAchiv) then return end
|
53e8037e
zhouhaihai
任务
|
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
|
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
修改发奖
|
686
|
local reward, change = role:award(taskData.reward, {log = {desc = "taskActive", int1 = taskType, int2 = taskId}})
|
53e8037e
zhouhaihai
任务
|
687
688
689
690
|
role:changeUpdates({
{ type = roleField[taskType], field = {"at", taskId}, value = -1 }
})
|
7bb30dca
zhouhaihai
修改发奖
|
691
|
SendPacket(actionCodes.Role_taskActiveRpc, MsgPack.pack(role:packReward(reward, change)))
|
53e8037e
zhouhaihai
任务
|
692
693
694
695
696
697
698
699
|
return true
end
function _M.achiveRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local taskId = msg.id --任务id
|
d232676a
zhouhaihai
功能解锁 冒险返回
|
700
701
|
if not role:isFuncUnlock(FuncUnlock.TaskAchiv) then return end
|
53e8037e
zhouhaihai
任务
|
702
|
local achiveTask = csvdb["achievementCsv"][taskId]
|
4c5d72ab
zhouhaihai
高级pvp
|
703
|
if not achiveTask then return 1 end
|
53e8037e
zhouhaihai
任务
|
704
705
706
707
|
local achiveT = role:getProperty("achiveT")
local achiveV = role:getProperty("achiveV")
|
4c5d72ab
zhouhaihai
高级pvp
|
708
|
if achiveV[taskId] then return 2 end
|
53e8037e
zhouhaihai
任务
|
709
710
711
712
713
|
local curStatus = achiveT[achiveTask.type] or 0
local maxc = achiveTask.condition1
if maxc > curStatus then
|
4c5d72ab
zhouhaihai
高级pvp
|
714
|
return 3
|
53e8037e
zhouhaihai
任务
|
715
716
|
end
|
7bb30dca
zhouhaihai
修改发奖
|
717
|
local reward, change = role:award(achiveTask.reward, {log = {desc = "finishAchive", int1 = taskId}})
|
53e8037e
zhouhaihai
任务
|
718
|
role:changeUpdates({
|
f60b89b1
zhouhaihai
奖励副本
|
719
|
{ type = "achiveV", field = taskId, value = skynet.timex() }
|
53e8037e
zhouhaihai
任务
|
720
|
})
|
3df73a9e
zhouhaihai
复兴奖励
|
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
|
-- 复兴奖励
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
|
744
|
elseif pData.request > overCount then
|
3df73a9e
zhouhaihai
复兴奖励
|
745
746
747
748
|
break
end
end
end
|
53e8037e
zhouhaihai
任务
|
749
|
|
7bb30dca
zhouhaihai
修改发奖
|
750
|
SendPacket(actionCodes.Role_achiveRpc, MsgPack.pack(role:packReward(reward, change)))
|
53e8037e
zhouhaihai
任务
|
751
752
753
|
return true
end
|
3df73a9e
zhouhaihai
复兴奖励
|
754
755
|
|
c384626d
zhouhaihai
好友
|
756
757
758
759
760
761
762
763
764
765
766
767
768
769
|
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...
|
770
|
local SERV = string_format(".chated%d", math.random(1, 5))
|
c384626d
zhouhaihai
好友
|
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
|
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
聊天
|
792
793
794
795
796
|
local waitTime = nil
local check = {
-- 世界聊天
[1] = function ()
|
c384626d
zhouhaihai
好友
|
797
798
799
800
|
if role:getProperty("silent") > now then --禁言
result = 1
return
end
|
8474ca36
zhouhaihai
聊天
|
801
802
803
804
805
|
role._worldChatLimit = role._worldChatLimit or {start = 0, count = 0, canSayt = 0} --第一次开始说话时间 从第一次说话次数 能说话的时间
if now < role._worldChatLimit.canSayt then
result = 2
|
fa565e0c
zhouhaihai
优化结构
|
806
|
waitTime = role._worldChatLimit.canSayt - now
|
8474ca36
zhouhaihai
聊天
|
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
|
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
好友
|
824
|
mcast_util.pub_world(actionCodes.Role_chat, MsgPack.pack(response))
|
a5486ede
zhouhaihai
csvdata 修改为 share...
|
825
|
pcall(skynet.send, '.globald', "lua", "sendWorldMsg", role._channelIdx, response)
|
c384626d
zhouhaihai
好友
|
826
|
end,
|
8474ca36
zhouhaihai
聊天
|
827
828
829
|
-- 私聊
[2] = function ()
local objectId = msg.roleId
|
fa565e0c
zhouhaihai
优化结构
|
830
|
response.objId = objectId
|
4cf74232
zhouhaihai
pvp
|
831
832
833
834
835
836
837
838
839
840
841
842
|
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
聊天
|
843
844
|
return
end
|
4cf74232
zhouhaihai
pvp
|
845
846
|
-- 对方把你拉黑
local isBlock = redret[3] == 1
|
8474ca36
zhouhaihai
聊天
|
847
|
|
8474ca36
zhouhaihai
聊天
|
848
|
local bin = MsgPack.pack(response)
|
4cf74232
zhouhaihai
pvp
|
849
|
if not isBlock then
|
440aa055
zhouhaihai
聊天
|
850
851
|
redisproxy:pipelining(function(red)
red:rpush(CHAT_OFFLINE:format(objectId), bin)
|
4cf74232
zhouhaihai
pvp
|
852
|
red:ltrim(CHAT_OFFLINE:format(objectId), -200, -1)
|
440aa055
zhouhaihai
聊天
|
853
|
end)
|
4cf74232
zhouhaihai
pvp
|
854
855
856
857
858
|
-- 若在线,实时发送聊天信息
local agent = datacenter.get("agent", objectId)
if agent then
SendPacket(actionCodes.Role_chat, bin, agent.fd)
end
|
440aa055
zhouhaihai
聊天
|
859
|
end
|
4cf74232
zhouhaihai
pvp
|
860
|
SendPacket(actionCodes.Role_chat, bin)
|
c384626d
zhouhaihai
好友
|
861
862
863
864
865
866
867
|
end,
}
if not check[cmd] then return end
if not result then
check[cmd]()
end
|
8474ca36
zhouhaihai
聊天
|
868
|
SendPacket(actionCodes.Role_chatRpc, MsgPack.pack({result = result, waitTime = waitTime}))
|
c384626d
zhouhaihai
好友
|
869
870
871
|
return true
end
|
4cf74232
zhouhaihai
pvp
|
872
873
874
875
876
877
|
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
背包
|
878
|
|
dc9d814f
zhouhaihai
邮件
|
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
|
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})
|
44c6e479
zhouhaihai
增加部分日志
|
896
897
|
role:log("role_action", {desc = "changeSetting", int1 = id, int2 = status})
|
dc9d814f
zhouhaihai
邮件
|
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
|
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))
|
7bb30dca
zhouhaihai
修改发奖
|
926
|
local reward, change = role:award(result.gift, {log = {desc = "drawCode", key1 = code, int1 = giftId}})
|
dc9d814f
zhouhaihai
邮件
|
927
928
929
930
|
SendPacket(actionCodes.Role_drawCodeRpc, MsgPack.pack({
result = ret,
reward = reward,
|
7bb30dca
zhouhaihai
修改发奖
|
931
|
change = change,
|
dc9d814f
zhouhaihai
邮件
|
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
|
}))
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
头像
|
955
956
957
958
959
960
961
962
963
964
965
966
|
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
邮件
|
967
968
|
return
end
|
bd4fb541
zhouhaihai
增加物品过期系统
|
969
|
role:changeHead(id)
|
44c6e479
zhouhaihai
增加部分日志
|
970
|
|
dc9d814f
zhouhaihai
邮件
|
971
972
973
974
|
SendPacket(actionCodes.Role_changeHeadRpc, "")
return true
end
|
71f716c4
chenyueqi
引导用到的字段
|
975
976
977
978
979
980
981
982
|
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
强制引导的步数记录
|
983
|
if cmdType == 1 then
|
71f716c4
chenyueqi
引导用到的字段
|
984
|
-- 新手引导
|
aeb5da9a
chenyueqi
强制引导的步数记录
|
985
986
987
988
|
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
引导用到的字段
|
989
|
role:updateProperty({field = "newerGuide", value = newerGuide})
|
3133cb76
zhouhaihai
日志
|
990
|
role:log("guide", {desc = "guide_new",int1 = master*1000+slave})
|
71f716c4
chenyueqi
引导用到的字段
|
991
992
993
994
995
996
997
998
999
1000
1001
1002
|
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)
|
3133cb76
zhouhaihai
日志
|
1003
|
role:log("guide", {desc = "guide_sys", int1 = msg.funcType})
|
71f716c4
chenyueqi
引导用到的字段
|
1004
1005
|
end
role:updateProperty({field = "funcGuide", value = funcGuide})
|
e26989ce
chenyueqi
增加其他的引导记录
|
1006
1007
1008
1009
1010
|
elseif cmdType == 3 then
-- 弱引导
if msg.funcType then
local value = msg.value or 1
for _, funcIdx in pairs(msg.funcType:toArray(true,"=")) do
|
3133cb76
zhouhaihai
日志
|
1011
|
role:log("guide", {desc = "guide_weak", int1 = funcIdx})
|
e26989ce
chenyueqi
增加其他的引导记录
|
1012
1013
1014
1015
|
funcGuide = funcGuide:setv(funcIdx, value)
end
role:updateProperty({field = "funcGuide", value = funcGuide})
end
|
71f716c4
chenyueqi
引导用到的字段
|
1016
1017
1018
1019
1020
1021
1022
|
else
return
end
SendPacket(actionCodes.Role_guideRpc, "")
return true
end
|
dc9d814f
zhouhaihai
邮件
|
1023
|
|
d51114bd
wangyujie
完成需求:每日金币购买
|
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
|
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
完善金币购买
|
1042
1043
1044
1045
1046
|
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
完成需求:每日金币购买
|
1047
1048
1049
1050
1051
|
if goldC == 0 then
return 3
end
role.dailyData:updateProperty({field = "goldBuyT", value = curT + 1})
role:costItems({[ItemId.Diamond] = costD}, {log = {desc = "goldBuy"}})
|
7bb30dca
zhouhaihai
修改发奖
|
1052
1053
|
local reward, change = role:award({[ItemId.Gold] = goldC}, {log = {desc = "goldBuy"}})
SendPacket(actionCodes.Role_goldBuyRpc, MsgPack.pack(role:packReward(reward, change)))
|
d51114bd
wangyujie
完成需求:每日金币购买
|
1054
1055
1056
|
return true
end
|
314bc5df
zhengshouren
提交服务器初始代码
|
1057
|
return _M
|