23d89d13
zhouahaihai
冒险 结构
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
|
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 table_unpack = table.unpack
|
8da953a7
zhouhaihai
无尽模式
|
17
18
|
local AdvCommon = require "adv.AdvCommon"
|
23d89d13
zhouahaihai
冒险 结构
|
19
20
|
local _M = {}
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
-- 无尽模式是否开放
local function isOpenEndless(role)
if role.advOverTime ~= 0 and skynet.timex() >= role.advOverTime then
return false
end
return true
end
-- 冒险内的操作是否可以继续
local function isCanContinue(role)
local adv = role:getAdvData()
if not adv:isRunning() then return false end
if adv:isEndless() then
if not isOpenEndless(role) then return false end
end
return true
end
|
09be9059
zhouhaihai
冒险接口
|
38
|
|
c3d5fe54
zhouhaihai
无战斗状态挂机清掉战斗队伍
|
39
|
local function checkFormat(role, format, checkAdvTeam)
|
09be9059
zhouhaihai
冒险接口
|
40
41
42
43
44
45
46
47
48
49
|
local advHang = role:getProperty("advHang")
local hadHero = {}
for chapterId, info in pairs(advHang) do
if info.format then
for _, heroId in pairs(info.format.heros) do
hadHero[heroId] = true
end
end
end
|
c3d5fe54
zhouhaihai
无战斗状态挂机清掉战斗队伍
|
50
|
if checkAdvTeam then
|
09be9059
zhouhaihai
冒险接口
|
51
52
53
54
55
56
|
for _, heroId in pairs(role:getProperty("advTeam").heros or {}) do
hadHero[heroId] = true
end
end
if not format.leader then return end
|
bfd33de5
zhouhaihai
队长技
|
57
|
if format.leader2 == format.leader then return end
|
09be9059
zhouhaihai
冒险接口
|
58
|
local hadLeader = false
|
bfd33de5
zhouhaihai
队长技
|
59
60
|
local hadLeader2 = false
local heroCount = 0
|
09be9059
zhouhaihai
冒险接口
|
61
62
63
64
65
66
67
|
for slot, heroId in pairs(format.heros) do
if not role.heros[heroId] or hadHero[heroId] then
return
end
if heroId == format.leader then
hadLeader = true
end
|
bfd33de5
zhouhaihai
队长技
|
68
69
70
71
72
73
74
|
if heroId == format.leader2 then
hadLeader2 = true
end
heroCount = heroCount + 1
end
if not hadLeader2 and heroCount >= 2 then
return
|
09be9059
zhouhaihai
冒险接口
|
75
76
77
78
79
|
end
if not hadLeader then return end
return true
end
|
46fac6f1
zhouahaihai
酱料
|
80
|
--开始一个新的关卡
|
23d89d13
zhouahaihai
冒险 结构
|
81
82
83
|
function _M.startAdvRpc( agent, data )
local role = agent.role
local msg = MsgPack.unpack(data)
|
09be9059
zhouhaihai
冒险接口
|
84
85
86
|
local chapterId = msg.chapterId --关卡id
local layer = msg.layer or 1 --选择层数
local format = msg.format --编队
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
87
|
local supportIdx = msg.supportIdx --选择的支援效果
|
d232676a
zhouhaihai
功能解锁 冒险返回
|
88
89
|
if not role:isFuncUnlock(FuncUnlock.Adv) then return end
|
8da953a7
zhouhaihai
无尽模式
|
90
|
--上一个关卡结束才可以开始新的关卡
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
91
|
if role:getAdvData():isRunning() then return 8 end
|
a7c0f779
zhouhaihai
挂机加成
|
92
93
94
|
local advHang = role:getProperty("advHang")
if advHang[chapterId] then return 9 end --正在挂机
|
8da953a7
zhouhaihai
无尽模式
|
95
|
|
09be9059
zhouhaihai
冒险接口
|
96
|
local chapterData = csvdb["adv_chapterCsv"][chapterId]
|
8da953a7
zhouhaihai
无尽模式
|
97
|
if not chapterData or layer < 1 then return 1 end
|
09be9059
zhouhaihai
冒险接口
|
98
|
|
47d5d769
zhouhaihai
中继判断 随机任务
|
99
|
local advPass = role:getProperty("advPass")
|
0e3ab88d
zhouhaihai
中继层
|
100
101
102
|
if AdvCommon.isEndless(chapterId) then -- 无尽模式判断
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
103
104
|
if chapterId ~= role.advElChapter then return end -- 不是当前进行的章节
if not isOpenEndless(role) then return end
|
0e3ab88d
zhouhaihai
中继层
|
105
|
|
e38b9c49
zhouhaihai
无尽次数
|
106
|
if role.dailyData:getProperty("advElC") >= role:getAdvElLimit() then return 2 end -- 是否有体力
|
0e3ab88d
zhouhaihai
中继层
|
107
108
109
|
if not role:isFuncOpen(FuncOpenType.AdvEndless) then return 11 end -- 无尽模式 才可以玩儿无尽模式
local advElM = role:getProperty("advElM") --最高通关的层数
|
e51ff6d2
zhouhaihai
冒险~
|
110
|
if not role:advChapterIsOpen(chapterId) then return 13 end
|
e38b9c49
zhouhaihai
无尽次数
|
111
|
|
e51ff6d2
zhouhaihai
冒险~
|
112
|
if layer ~= 1 then
|
0e3ab88d
zhouhaihai
中继层
|
113
|
local relayData = role:getAdvData():isHaveRelay(layer, chapterId)
|
e51ff6d2
zhouhaihai
冒险~
|
114
115
|
if not relayData then return 14 end -- 不是中继层
if advElM < relayData.unlockfloor then return 15 end --未解锁
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
116
|
end
|
0e3ab88d
zhouhaihai
中继层
|
117
|
else -- 普通模式判断
|
e38b9c49
zhouhaihai
无尽次数
|
118
|
if role.dailyData:getProperty("advC") >= role:getAdvHangLimit() then return 2 end -- 是否有体力
|
e51ff6d2
zhouhaihai
冒险~
|
119
|
if layer >= chapterData.limitlevel then return 4 end
|
8da953a7
zhouhaihai
无尽模式
|
120
|
-- 关卡开放判断
|
e51ff6d2
zhouhaihai
冒险~
|
121
122
123
124
125
126
127
|
if not role:advChapterIsOpen(chapterId) then return 5 end
if layer ~= 1 then
local relayData = role:getAdvData():isHaveRelay(layer, chapterId)
if not relayData then return 6 end -- 不是中继层
if (advPass[chapterId] or 0) < relayData.floor then return 21 end
end
|
8da953a7
zhouhaihai
无尽模式
|
128
|
end
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
129
130
|
if not checkFormat(role, format) then return 7 end
|
46fac6f1
zhouahaihai
酱料
|
131
|
|
09be9059
zhouhaihai
冒险接口
|
132
133
134
135
|
local advTeam = role:getProperty("advTeam")
table.clear(advTeam)
advTeam.heros = {}
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
136
|
for slot, heroId in pairs(format.heros) do
|
09be9059
zhouhaihai
冒险接口
|
137
138
|
advTeam.heros[slot] = heroId
end
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
139
|
advTeam.leader = format.leader
|
bfd33de5
zhouhaihai
队长技
|
140
|
advTeam.leader2 = format.leader2
|
09be9059
zhouhaihai
冒险接口
|
141
|
role:updateProperty({field = "advTeam", value = advTeam})
|
e38b9c49
zhouhaihai
无尽次数
|
142
143
144
145
146
|
if AdvCommon.isEndless(chapterId) then
role.dailyData:updateProperty({field = "advElC", delta = 1})
else
role.dailyData:updateProperty({field = "advC", delta = 1})
end
|
09be9059
zhouhaihai
冒险接口
|
147
|
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
|
local support = {} -- 支援效果
if AdvCommon.isEndless(chapterId) then
-- 选择的支援效果
local advSup = role:getProperty("advSup")
if supportIdx then
if advSup[supportIdx] then
table.insert(support, advSup[supportIdx])
end
role:advRandomSupportEffect() -- 选完就重新随机
end
-- 增加 默认增加的支援效果
local active = role:getAdvActiveSupportEffect()
for aId, _ in pairs(active) do
local curData = csvdb["adv_supportCsv"][aId]
if curData.type == 2 then
table.insert(support, aId)
end
end
end
|
35e2e3c4
zhouhaihai
优化 gm advt 增加感知b...
|
167
168
169
170
171
172
173
|
role:getAdvData():initByChapter({
chapterId = chapterId,
level = layer,
isRelay = layer ~= 1,
isEnter = true,
support = support,
})
|
53e8037e
zhouhaihai
任务
|
174
|
role:checkTaskEnter("AdvStart", {id = chapterId})
|
f60b89b1
zhouhaihai
奖励副本
|
175
|
role:checkTaskEnter("AdvStartSelf", {id = chapterId})
|
ecf464a3
zhouhaihai
冒险开始bug
|
176
|
role:getAdvData():popBackEvents() -- 清一下事件
|
3133cb76
zhouhaihai
日志
|
177
178
|
role:getAdvData():log({desc = "start", int1 = supportIdx})
|
23d89d13
zhouahaihai
冒险 结构
|
179
180
181
|
SendPacket(actionCodes.Adv_startAdvRpc, '')
return true
end
|
a7c0f779
zhouhaihai
挂机加成
|
182
183
|
function Role:getAdvTeamAttrs(team)
local activeRelation = self:getHeroActiveRelation(team.heros)
|
23d89d13
zhouahaihai
冒险 结构
|
184
|
|
a7c0f779
zhouhaihai
挂机加成
|
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
|
local player = {hp = 0, atk = 0, def = 0, hit = 0, miss = 0,
growth = {hp = 0, atk = 0, def = 0, hit = 0, miss = 0}}
for slot, id in pairs(team.heros or {}) do
local info = {}
local hero = self.heros[id]
if not hero then
Logger.log("error heroid " .. id)
end
local attrs = hero:getTotalAttrs({activeRelation = activeRelation})
for attrName, _ in pairs(AdvAttsEnum) do
player[attrName] = (player[attrName] or 0) + (attrs[attrName] or 0)
end
end
for attrName, _ in pairs(AdvAttsEnum) do
player[attrName] = player[attrName] * (globalCsv.adv_battle_attr_ratio[attrName] or 1)
player.growth[attrName] = player[attrName] * (globalCsv.adv_battle_attr_growth_ratio[attrName] or 1)
end
return player
end
---战斗力=1*生命+2*攻击+1.25*防御+0.226*命中+0.26*闪避
function Role:getAdvTeamBattleV(attrs)
local attrs = role:getTeamBattleInfo(advTeam).heros
for attrName, _ in pairs(AdvAttsEnum) do
for _, hero in pairs(attrs) do
player[attrName] = (player[attrName] or 0) + hero[attrName]
end
player[attrName] = getAdvLvAttrUp(advAddAttrs, attrName, player[attrName]) * (globalCsv.adv_battle_attr_ratio[attrName] or 1)
player.growth[attrName] = player[attrName] * (globalCsv.adv_battle_attr_growth_ratio[attrName] or 1)
player[attrName] = player[attrName] + player.growth[attrName] * (player.level - 1)
end
return 1 * attrs[AttsEnum.hp]
+ 2 * attrs[AttsEnum.atk]
+ 1.25 * attrs[AttsEnum.def]
+ 0.226 * attrs[AttsEnum.hit]
+ 0.26 * attrs[AttsEnum.miss]
end
|
09be9059
zhouhaihai
冒险接口
|
227
228
|
function _M.startHangRpc(agent, data)
|
46fac6f1
zhouahaihai
酱料
|
229
230
|
local role = agent.role
local msg = MsgPack.unpack(data)
|
09be9059
zhouhaihai
冒险接口
|
231
232
233
234
235
|
local chapterId = msg.chapterId --关卡id
local format = msg.format --编队
local chapterData = csvdb["adv_chapterCsv"][chapterId]
if not chapterData then return end
|
a7c0f779
zhouhaihai
挂机加成
|
236
|
if chapterData.idleReward == "" then return end --没有奖励 没有挂机
|
09be9059
zhouhaihai
冒险接口
|
237
238
239
240
|
local advHang = role:getProperty("advHang")
if advHang[chapterId] then return end --正在挂机
|
73da9b9d
zhouhaihai
冒险队伍优化
|
241
242
|
if role:getAdvData():isRunning() and role:getAdvData().chapterId == chapterId then return end
|
a7c0f779
zhouhaihai
挂机加成
|
243
244
245
246
247
|
if AdvCommon.isEndless(chapterId) then return end -- 无尽没有代理
local advRelay = self.owner:getProperty("advRelay")
if not next(advRelay[chapterId] or {}) then return end -- 没有开放
|
09be9059
zhouhaihai
冒险接口
|
248
249
250
|
if role.dailyData:getProperty("advC") >= role:getAdvHangLimit() then return end -- 是否有体力
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
251
|
if not checkFormat(role, format, role:getAdvData():isRunning()) then return end --编队是否正确
|
09be9059
zhouhaihai
冒险接口
|
252
|
|
a7c0f779
zhouhaihai
挂机加成
|
253
254
255
256
257
258
259
260
|
local player = {}
local attrs = role:getTeamBattleInfo(format).heros
for attrName, _ in pairs(AdvAttsEnum) do
for _, hero in pairs(attrs) do
player[attrName] = (player[attrName] or 0) + hero[attrName]
end
player[attrName] = player[attrName] * (globalCsv.adv_battle_attr_ratio[attrName] or 1)
player.growth[attrName] = player[attrName] * (globalCsv.adv_battle_attr_growth_ratio[attrName] or 1)
|
09be9059
zhouhaihai
冒险接口
|
261
|
end
|
a7c0f779
zhouhaihai
挂机加成
|
262
263
264
265
266
267
268
|
local battleV = 1 * player["hp"]
+ 2 * player["atk"]
+ 1.25 * player["def"]
+ 0.226 * player["hit"]
+ 0.26 * player["miss"]
|
09be9059
zhouhaihai
冒险接口
|
269
270
271
272
273
|
if battleV < chapterData.idleValue then return end -- 战斗力是否满足
local info = {}
info.format = {}
info.format.leader = format.leader
|
bfd33de5
zhouhaihai
队长技
|
274
|
info.format.leader2 = format.leader2
|
09be9059
zhouhaihai
冒险接口
|
275
276
277
278
279
280
|
info.format.heros = {}
for slot, heroId in pairs(format.heros) do
info.format.heros[slot] = heroId
end
info.time = skynet.timex() + chapterData.idleTime --挂机时间
|
c3d5fe54
zhouhaihai
无战斗状态挂机清掉战斗队伍
|
281
|
-- 没有在战斗 用team来挂机了 把team清掉
|
cd498e53
zhouhaihai
被动技生效bug
|
282
283
284
|
if not role:getAdvData():isRunning() then
role:updateProperty({field = "advTeam", value = {}})
end
|
c3d5fe54
zhouhaihai
无战斗状态挂机清掉战斗队伍
|
285
|
|
09be9059
zhouhaihai
冒险接口
|
286
287
288
|
role:changeUpdates({{type = "advHang", field = chapterId, value = info}})
role.dailyData:updateProperty({field = "advC", delta = 1})
|
53e8037e
zhouhaihai
任务
|
289
|
role:checkTaskEnter("AdvStart", {id = chapterId})
|
3133cb76
zhouhaihai
日志
|
290
291
|
role:log("adv_action", {desc = "startHang", int1 = chapterId})
|
09be9059
zhouhaihai
冒险接口
|
292
293
294
295
|
SendPacket(actionCodes.Adv_startHangRpc, '')
return true
end
|
5404ee7d
zhouhaihai
冒险挂机加速
|
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
|
function _M.quickHangRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local chapterId = msg.chapterId --关卡id
local advHang = role:getProperty("advHang")
local info = advHang[chapterId]
if not info then return end
local chapterData = csvdb["adv_chapterCsv"][chapterId]
if not chapterData then return end
local reward, isFull
if skynet.timex() >= info.time then return end -- 已经完成了
local cost = math.ceil((info.time - skynet.timex()) / chapterData.idleTime * chapterData.accelerate)
if not role:checkItemEnough({[ItemId.Diamond] = cost}) then return end
|
33be3111
zhouhaihai
修改hangPass 结构
|
315
|
role:costItems({[ItemId.Diamond] = cost}, {log = {desc = "advQuickHang", int1 = chapterId}})
|
5404ee7d
zhouhaihai
冒险挂机加速
|
316
317
318
|
info.time = 0
role:changeUpdates({{type = "advHang", field = chapterId, value = info}})
|
33be3111
zhouhaihai
修改hangPass 结构
|
319
|
role:log("adv_action", {desc = "advQuickHang", int1 = chapterId})
|
3133cb76
zhouhaihai
日志
|
320
|
|
5404ee7d
zhouhaihai
冒险挂机加速
|
321
322
323
324
|
SendPacket(actionCodes.Adv_quickHangRpc, '')
return true
end
|
09be9059
zhouhaihai
冒险接口
|
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
|
function _M.endHangRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local chapterId = msg.chapterId --关卡id
local cancel = msg.cancel --是否是取消
local advHang = role:getProperty("advHang")
local info = advHang[chapterId]
if not info then return end
local chapterData = csvdb["adv_chapterCsv"][chapterId]
if not chapterData then return end
local reward, isFull
if skynet.timex() >= info.time then
|
a7c0f779
zhouhaihai
挂机加成
|
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
|
-- 英雄加成
local idleUnit = chapterData.idleUnit:toNumMap()
local upUnit = 0
for slot, heroId in pairs(info.format or {}) do
if idleUnit[heroId] then
upUnit = upUnit + idleUnit[heroId]
end
end
-- 中继加成
local advPass = role:getProperty("advPass")
local maxCampsite = nil
local campsiteCsv = csvdb["adv_chapter_campsiteCsv"][chapterId]
for _, campsite in ipairs(campsiteCsv) do
if campsite.floor <= advPass[chapterId] then
maxCampsite = campsite
end
end
if not maxCampsite then return end
local idleReward = chapterData.idleReward:toNumMap()
for itemId, count in pairs(idleReward) do
idleReward[itemId] = count * (maxCampsite.idleValue + upUnit) / 100
end
reward = role:award(idleReward, {log = {desc = "advHang", int1 = chapterId}})
|
09be9059
zhouhaihai
冒险接口
|
366
367
368
369
370
371
372
373
|
else
if cancel then
if role.dailyData:getProperty("advC") <= 0 then
isFull = true
else
role.dailyData:updateProperty({field = "advC", delta = -1})
end
else
|
46fac6f1
zhouahaihai
酱料
|
374
375
376
|
return
end
end
|
09be9059
zhouhaihai
冒险接口
|
377
378
379
|
role:changeUpdates({{type = "advHang", field = chapterId, value = nil}})
|
3133cb76
zhouhaihai
日志
|
380
381
|
role:log("adv_action", {desc = "endHang", int1 = chapterId, short1 = cancel and 1 or 0})
|
09be9059
zhouhaihai
冒险接口
|
382
383
384
385
386
387
388
389
390
|
SendPacket(actionCodes.Adv_endHangRpc, MsgPack.pack({reward = reward, isFull = isFull}))
return true
end
function _M.buyAdvCountRpc(agent , data)
local role = agent.role
local msg = MsgPack.unpack(data)
local count = msg.count --购买次数
|
e38b9c49
zhouhaihai
无尽次数
|
391
392
393
|
local isEl = msg.isEl -- 是否是无尽模式
local cost
if isEl then
|
0e3ab88d
zhouhaihai
中继层
|
394
|
if math.illegalNum(count, 1, globalCsv.adv_endless_daily_buy_count - role.dailyData:getProperty("advElBC")) then return end
|
e38b9c49
zhouhaihai
无尽次数
|
395
396
|
cost = {[ItemId.Diamond] = count * globalCsv.adv_endless_daily_buy_cost}
else
|
0e3ab88d
zhouhaihai
中继层
|
397
|
if math.illegalNum(count, 1, globalCsv.adv_daily_buy_count - role.dailyData:getProperty("advBC")) then return end
|
e38b9c49
zhouhaihai
无尽次数
|
398
399
400
401
|
cost = {[ItemId.Diamond] = count * globalCsv.adv_daily_buy_cost}
end
|
09be9059
zhouhaihai
冒险接口
|
402
|
if not role:checkItemEnough(cost) then return end
|
3133cb76
zhouhaihai
日志
|
403
|
role:costItems(cost, {log = {desc = "buyAdvCount", short1 = isEl and 1 or 0, int1 = count}})
|
e38b9c49
zhouhaihai
无尽次数
|
404
405
406
407
408
409
410
|
if isEl then
role.dailyData:updateProperty({field = "advElC", delta = -count})
role.dailyData:updateProperty({field = "advElBC", delta = count})
else
role.dailyData:updateProperty({field = "advC", delta = -count})
role.dailyData:updateProperty({field = "advBC", delta = count})
end
|
3133cb76
zhouhaihai
日志
|
411
|
role:log("adv_action", {desc = "buyAdvCount", short1 = isEl and 1 or 0, int1 = count})
|
09be9059
zhouhaihai
冒险接口
|
412
413
|
SendPacket(actionCodes.Adv_buyAdvCountRpc, '')
|
46fac6f1
zhouahaihai
酱料
|
414
415
416
|
return true
end
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
417
418
419
420
|
function _M.finishTaskRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
421
|
if not isCanContinue(role) then return end
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
422
423
424
425
426
427
428
|
local adv = role:getAdvData()
local taskId = msg.taskId -- -1 则是主线任务
local status, reward
if taskId == -1 then
status, reward = adv:finishMTask()
else
status, reward = adv:finishTask(taskId)
|
b176d7d3
zhouhaihai
冒险成就
|
429
430
|
adv:checkAchievement(adv.AchievType.TaskLayer, 1, taskId)
adv:updateAchievement()
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
431
|
end
|
f99f48df
zhouhaihai
冒险任务
|
432
|
adv:updateTask()
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
433
|
if not status then return end
|
53e8037e
zhouhaihai
任务
|
434
|
role:checkTaskEnter("AdvOverTask", {id = taskId})
|
3133cb76
zhouhaihai
日志
|
435
436
437
|
adv:log({desc = "finishTask", int1 = taskId})
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
438
439
440
441
|
SendPacket(actionCodes.Adv_finishTaskRpc, MsgPack.pack({reward = reward}))
return true
end
|
46fac6f1
zhouahaihai
酱料
|
442
443
444
445
446
|
-- 点击地块(解锁)(触发事件)
function _M.clickBlockRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
6fc397d6
zhouhaihai
角色新突破 冒险优化点击地块
|
447
448
449
450
451
452
453
454
|
local function returnFail(status)
SendPacket(actionCodes.Adv_clickBlockRpc, MsgPack.pack({events = {}}))
return true or status -- 调试使用 status
end
if not isCanContinue(role) then
return returnFail()
end
|
46fac6f1
zhouahaihai
酱料
|
455
|
local adv = role:getAdvData()
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
456
|
|
6fc397d6
zhouhaihai
角色新突破 冒险优化点击地块
|
457
|
if adv:isWaitChooseArtifact() then return returnFail() end
|
3133cb76
zhouhaihai
日志
|
458
459
460
|
adv:log({desc = "clickBlock", int1 = msg.roomId, int2 = msg.blockId})
|
8c4a6f4c
zhouhaihai
冒险增加错误返回
|
461
|
local status, errorCode = adv:clickBlock(msg.roomId, msg.blockId, msg)
|
6fc397d6
zhouhaihai
角色新突破 冒险优化点击地块
|
462
|
if not status then return returnFail(errorCode) end
|
3133cb76
zhouhaihai
日志
|
463
|
|
46fac6f1
zhouahaihai
酱料
|
464
465
466
467
468
469
470
471
472
|
SendPacket(actionCodes.Adv_clickBlockRpc, MsgPack.pack({events = adv:popBackEvents()}))
return true
end
--use item 使用背包道具
function _M.useItemRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
25a376de
zhouhaihai
冒险使用道具
|
473
474
475
476
477
478
479
|
local itemId = msg.itemId -- 道具Id
local count = msg.count or 1 --数量
local target = msg.target -- {roomId = 1, blockId = 1} 选择的目标
local itemData = csvdb["adv_itemCsv"][itemId]
if not itemData then return end
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
480
|
if not isCanContinue(role) then return end
|
46fac6f1
zhouahaihai
酱料
|
481
|
local adv = role:getAdvData()
|
ccbafe67
zhouhaihai
冒险神器和buff
|
482
|
if adv:isWaitChooseArtifact() then return end
|
25a376de
zhouhaihai
冒险使用道具
|
483
484
485
486
|
--重置数量
if itemData["function"] == 0 or itemData["function"] == 2 then count = 1 end
if not adv:cost({[itemId] = count}, {}, true) then return true end
|
25a376de
zhouhaihai
冒险使用道具
|
487
488
|
--消耗
if itemData["function"] == 0 or itemData["function"] == 1 then
|
498f0eb2
zhouhaihai
冒险 action
|
489
|
adv:cost({[itemId] = count}, {log = {desc = "useItem", int1 = itemId, int2 = count}})
|
85ded242
zhouhaihai
丰富返回事件
|
490
|
adv:backUse({[itemId] = count})
|
25a376de
zhouhaihai
冒险使用道具
|
491
492
|
end
|
db3c56ad
zhouhaihai
冒险相关
|
493
|
adv:checkAchievement(adv.AchievType.UseItem, count, itemId)
|
3133cb76
zhouhaihai
日志
|
494
|
adv:log({desc = "useItem", int1 = itemId, int2 = count})
|
6dc482bb
zhouhaihai
中继层完成, 新增两个冒险物品使用效果
|
495
496
497
498
499
|
for i = 1, count do
adv:doActive(itemData.effect, target) -- target
end
|
25a376de
zhouhaihai
冒险使用道具
|
500
501
502
|
adv:afterRound()
adv:saveDB()
|
46fac6f1
zhouahaihai
酱料
|
503
504
505
506
|
SendPacket(actionCodes.Adv_useItemRpc, MsgPack.pack({events = adv:popBackEvents()}))
return true
end
|
42f2d1d3
suhongyang
战斗内技能序列逻辑
|
507
|
--使用营养技能
|
d27ad5e0
suhongyang
使用营养技
|
508
|
function _M.usePotionRpc(agent, data)
|
46fac6f1
zhouahaihai
酱料
|
509
510
|
local role = agent.role
local msg = MsgPack.unpack(data)
|
4f0a5fae
zhouhaihai
营养剂
|
511
512
513
514
515
516
517
518
519
520
521
522
523
524
|
local potionId = msg.potionId -- 营养剂Id
local target = msg.target -- {roomId = 1, blockId = 1} 选择的目标
local potionLv = role.dinerData:getProperty("dishTree"):getv(potionId, 0)
if potionLv == 0 then return 1 end
local potionSet = csvdb["adv_potionCsv"][potionId]
if not potionSet then return 2 end
local potionData = potionSet[potionLv]
if not potionData then return 3 end
local potionBag = role:getProperty("potionBag")
local own = potionBag[potionId] or 0
if own <= 0 then return 4 end
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
525
526
|
if not isCanContinue(role) then return end
|
46fac6f1
zhouahaihai
酱料
|
527
|
local adv = role:getAdvData()
|
ccbafe67
zhouhaihai
冒险神器和buff
|
528
529
|
if adv:isWaitChooseArtifact() then return end
|
3133cb76
zhouhaihai
日志
|
530
531
|
adv:log({desc = "usePotion", int1 = potionId})
|
4f0a5fae
zhouhaihai
营养剂
|
532
|
local status = adv:doActive(potionData.effect, target) -- target
|
46fac6f1
zhouahaihai
酱料
|
533
|
if not status then return end
|
4f0a5fae
zhouhaihai
营养剂
|
534
535
536
|
potionBag[potionId] = own - 1
role:updateProperty({field = "potionBag", value = potionBag})
|
85ded242
zhouhaihai
丰富返回事件
|
537
|
adv:pushBackEvent(AdvBackEventType.Potion, {id = potionId})
|
4f0a5fae
zhouhaihai
营养剂
|
538
539
540
541
|
adv:afterRound()
adv:saveDB()
role:checkTaskEnter("AdvUsePotion")
|
d27ad5e0
suhongyang
使用营养技
|
542
|
SendPacket(actionCodes.Adv_usePotionRpc, MsgPack.pack({events = adv:popBackEvents()}))
|
46fac6f1
zhouahaihai
酱料
|
543
544
|
return true
end
|
23d89d13
zhouahaihai
冒险 结构
|
545
|
|
ccbafe67
zhouhaihai
冒险神器和buff
|
546
547
548
549
|
-- 选择神器
function _M.chooseArtifactRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
ccbafe67
zhouhaihai
冒险神器和buff
|
550
|
|
41e118a5
zhouhaihai
增加输出
|
551
|
if not isCanContinue(role) then return 1 end
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
552
553
|
local adv = role:getAdvData()
|
41e118a5
zhouhaihai
增加输出
|
554
555
|
if not msg.idx then return 2 end
if not adv:isWaitChooseArtifact() then return 3 end
|
ccbafe67
zhouhaihai
冒险神器和buff
|
556
|
local status = adv:chooseArtifact(msg.idx)
|
41e118a5
zhouhaihai
增加输出
|
557
|
if not status then return 4 end
|
ccbafe67
zhouhaihai
冒险神器和buff
|
558
|
adv:saveDB()
|
3133cb76
zhouhaihai
日志
|
559
|
|
ccbafe67
zhouhaihai
冒险神器和buff
|
560
561
562
563
564
565
566
567
568
569
570
|
SendPacket(actionCodes.Adv_chooseArtifactRpc, '')
return true
end
-- 穿戴神器
function _M.wearArtifactRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local slot = msg.slot
local id = msg.id
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
571
572
|
if not isCanContinue(role) then return end
|
ccbafe67
zhouhaihai
冒险神器和buff
|
573
574
|
local adv = role:getAdvData()
|
d3da3368
zhouhaihai
冒险地图被动技, buff 神器
|
575
|
if math.illegalNum(slot, 1, 5) then return 1 end
|
c992c911
zhouhaihai
中继
|
576
|
if adv:isWaitChooseArtifact() then return 2 end
|
ccbafe67
zhouhaihai
冒险神器和buff
|
577
578
|
local status = adv:wearArtifact(slot, id)
|
c992c911
zhouhaihai
中继
|
579
|
if not status then return 3 end
|
ccbafe67
zhouhaihai
冒险神器和buff
|
580
581
582
583
584
585
586
587
588
589
590
591
|
adv:saveDB()
SendPacket(actionCodes.Adv_wearArtifactRpc, '')
return true
end
-- 升级神器
function _M.upArtifactRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
592
593
|
if not isCanContinue(role) then return end
|
ccbafe67
zhouhaihai
冒险神器和buff
|
594
|
local adv = role:getAdvData()
|
d3da3368
zhouhaihai
冒险地图被动技, buff 神器
|
595
|
if adv:isWaitChooseArtifact() then return 1 end
|
ccbafe67
zhouhaihai
冒险神器和buff
|
596
|
local curLevel = adv:isHaveArtifact(id)
|
d3da3368
zhouhaihai
冒险地图被动技, buff 神器
|
597
598
599
600
|
if not curLevel then return 2 end
if not role:isArtifactOpen(id, adv:isEndless(), curLevel + 1) then return 3 end
local cost = csvdb["adv_artifactCsv"][id][curLevel].exp:toNumMap()
if not adv:cost(cost, {}, true) then return 4 end
|
ccbafe67
zhouhaihai
冒险神器和buff
|
601
602
|
local status = adv:artifactLevelUp(id)
|
d3da3368
zhouhaihai
冒险地图被动技, buff 神器
|
603
|
if not status then return 5 end
|
498f0eb2
zhouhaihai
冒险 action
|
604
|
adv:cost(cost, {log = {desc = "upArtifact", int1 = id}})
|
85ded242
zhouhaihai
丰富返回事件
|
605
|
adv:backCost(cost)
|
ccbafe67
zhouhaihai
冒险神器和buff
|
606
607
|
if status == 1 then -- 现在穿着呢。更新下
adv:saveDB()
|
284482c6
zhouhaihai
冒险成就
|
608
609
|
else
adv:updateAchievement()
|
ccbafe67
zhouhaihai
冒险神器和buff
|
610
611
612
613
614
|
end
SendPacket(actionCodes.Adv_upArtifactRpc, '')
return true
end
|
ec87b4a5
zhouahaihai
冒险 完善
|
615
616
617
618
|
--退出
function _M.exitAdvRpc(agent, data)
local role = agent.role
-- local msg = MsgPack.unpack(data)
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
619
620
|
if not isCanContinue(role) then return end
|
ec87b4a5
zhouahaihai
冒险 完善
|
621
|
local adv = role:getAdvData()
|
3133cb76
zhouhaihai
日志
|
622
|
adv:log({desc = "exit"})
|
ec87b4a5
zhouahaihai
冒险 完善
|
623
624
625
626
627
|
local status = adv:exit() -- target {roomId = 1, blockId = 1} 选择的目标
SendPacket(actionCodes.Adv_exitAdvRpc, MsgPack.pack({events = adv:popBackEvents()}))
return true
end
|
12f7b52c
zhouhaihai
冒险战斗
|
628
629
630
631
632
633
634
635
636
637
638
|
--开始战斗
function _M.startBattleRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
-- 校验一下信息
local roomId = msg.roomId
local blockId = msg.blockId
local monsterId = msg.monsterId
local enemyId = msg.enemyId
if not enemyId then return end
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
639
|
if not isCanContinue(role) then return end
|
12f7b52c
zhouhaihai
冒险战斗
|
640
641
|
local adv = role:getAdvData()
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
642
|
|
ccbafe67
zhouhaihai
冒险神器和buff
|
643
|
if adv:isWaitChooseArtifact() then return end
|
12f7b52c
zhouhaihai
冒险战斗
|
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
|
local enemy = adv.battle:getEnemyById(enemyId)
if enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId or enemy.lock or enemy.isDead then return end
local key = tostring(math.random())
adv.__battleCache = {
enemyId = enemyId,
key = key
}
SendPacket(actionCodes.Adv_startBattleRpc, MsgPack.pack({key = key}))
return true
end
-- 结束战斗
function _M.endBattleRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local roomId = msg.roomId
local blockId = msg.blockId
local monsterId = msg.monsterId
local enemyId = msg.enemyId
local key = msg.key
local player = msg.player
|
d3da3368
zhouhaihai
冒险地图被动技, buff 神器
|
667
|
local bySkill = msg.bySkill --死于 技能
|
12f7b52c
zhouhaihai
冒险战斗
|
668
669
|
if not player or not player.hp or not player.sp or not enemyId or not key then return end
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
670
671
|
if not isCanContinue(role) then return end
|
12f7b52c
zhouhaihai
冒险战斗
|
672
|
local adv = role:getAdvData()
|
ccbafe67
zhouhaihai
冒险神器和buff
|
673
|
if adv:isWaitChooseArtifact() then return end
|
12f7b52c
zhouhaihai
冒险战斗
|
674
675
676
677
678
679
680
|
-- 校验
if not adv.__battleCache then return end
if adv.__battleCache.enemyId ~= enemyId then return end
local enemy = adv.battle:getEnemyById(enemyId)
if enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId then return end
adv.__battleCache = nil
|
3133cb76
zhouhaihai
日志
|
681
|
adv:log({desc = "endBattle"})
|
d3da3368
zhouhaihai
冒险地图被动技, buff 神器
|
682
|
local status = adv:clickBlock(roomId, blockId, {player = player, bySkill = bySkill})
|
3133cb76
zhouhaihai
日志
|
683
|
|
12f7b52c
zhouhaihai
冒险战斗
|
684
685
686
687
688
|
if not status then return end
SendPacket(actionCodes.Adv_endBattleRpc, MsgPack.pack({events = adv:popBackEvents()}))
return true
end
|
007af97e
zhouhaihai
item_random 结构更改
|
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
|
-- function _M.workshopRpc(agent, data)
-- local role = agent.role
-- local msg = MsgPack.unpack(data)
-- local id = msg.id
-- local count = msg.count or 1
-- local mergeData = csvdb["adv_mergeCsv"][id]
-- if not mergeData then return 1 end
-- if not role:isFuncOpen(FuncOpenType.AdvWS) or role:getFuncLv(FuncOpenType.AdvWS) < mergeData.unlock then return 2 end
-- local advWs = role.dailyData:getProperty("advWs")
-- if math.illegalNum(count, 1, mergeData.limit - (advWs[id] or 0)) then return 3 end
-- local cost = mergeData.formula:toNumMap()
-- for k, v in pairs(cost) do
-- cost[k] = v * count
-- end
-- if not role:checkItemEnough(cost) then return 4 end
-- role:costItems(cost)
-- advWs[id] = (advWs[id] or 0) + count
-- role.dailyData:updateProperty({field = "advWs", value = advWs})
-- local reward = role:award({[id] = count})
-- SendPacket(actionCodes.Adv_workshopRpc, MsgPack.pack({reward = reward}))
-- return true
-- end
|
12f7b52c
zhouhaihai
冒险战斗
|
716
|
|
f4c65591
zhouhaihai
抽奖
|
717
718
|
function _M.wheelSurfRpc(agent, data)
local role = agent.role
|
81032a9c
zhouhaihai
抽奖
|
719
|
-- if not role:isFuncOpen(FuncOpenType.AdvWheelSurf) then return end -- 默认解锁
|
b176d7d3
zhouhaihai
冒险成就
|
720
|
|
81032a9c
zhouhaihai
抽奖
|
721
|
local msg = MsgPack.unpack(data)
|
f4c65591
zhouhaihai
抽奖
|
722
|
|
81032a9c
zhouhaihai
抽奖
|
723
724
|
local ptype = msg.ptype -- 池子类型 1, 2
local ctype = msg.ctype -- 抽取次数 1 1次,2 10次
|
f4c65591
zhouhaihai
抽奖
|
725
|
|
81032a9c
zhouhaihai
抽奖
|
726
727
728
729
730
|
local countPool = {
[1] = 1,
[2] = 10
}
local count = countPool[ctype]
|
8f5218e6
zhouhaihai
犯回错误区分
|
731
|
if not count then return 1 end
|
f4c65591
zhouhaihai
抽奖
|
732
|
|
6b5c9206
zhouhaihai
冒险资助升级属性奖励
|
733
|
if ptype == 2 and not role:isFuncOpen(FuncOpenType.AdvEndless) then
|
8f5218e6
zhouhaihai
犯回错误区分
|
734
|
return 2
|
6b5c9206
zhouhaihai
冒险资助升级属性奖励
|
735
|
end
|
f4c65591
zhouhaihai
抽奖
|
736
|
|
81032a9c
zhouhaihai
抽奖
|
737
|
local drawTypeData = csvdb["adv_wheelsurfCsv"][ptype]
|
8f5218e6
zhouhaihai
犯回错误区分
|
738
|
if not drawTypeData then return 3 end
|
6b5c9206
zhouhaihai
冒险资助升级属性奖励
|
739
|
local drawData = drawTypeData[role:getAdvWheelSurfLv(ptype)]
|
8f5218e6
zhouhaihai
犯回错误区分
|
740
|
if not drawData then return 4 end
|
f4c65591
zhouhaihai
抽奖
|
741
|
|
7474dd12
zhouhaihai
资助抽奖bug
|
742
743
744
745
|
local cost = drawData.cost:toArray(true, "=")
local costs = {[ItemId.OldCoin] = cost[ctype]}
if not next(costs) then return 6 end
|
f4c65591
zhouhaihai
抽奖
|
746
|
|
8f5218e6
zhouhaihai
犯回错误区分
|
747
|
if not role:checkItemEnough(costs) then return 5 end
|
3133cb76
zhouhaihai
日志
|
748
|
role:costItems(costs, {log = {desc = "advWheelSurf", int1 = ptype}})
|
6b5c9206
zhouhaihai
冒险资助升级属性奖励
|
749
|
role:addAdvLvExp(costs[ItemId.OldCoin] or 0)
|
764e5296
zhouhaihai
冒险抽奖保底
|
750
751
752
|
local advDrawB = role:getProperty("advDrawB")
advDrawB[ptype] = (advDrawB[ptype] or 0) + count
role:updateProperty({field = "advDrawB", value = advDrawB})
|
81032a9c
zhouhaihai
抽奖
|
753
|
-- 随机池子
|
81032a9c
zhouhaihai
抽奖
|
754
755
756
|
local reward = {}
local backReward = {}
for i = 1, count do
|
7474dd12
zhouhaihai
资助抽奖bug
|
757
|
local pool = drawData.weight:randWeight()
|
81032a9c
zhouhaihai
抽奖
|
758
759
760
761
|
local gift = drawData["pool" .. pool]:randWeight(true)
reward[gift[1]] = (reward[gift[1]] or 0) + gift[2]
table.insert(backReward, gift)
end
|
3133cb76
zhouhaihai
日志
|
762
763
|
role:award(reward, {log = {desc = "advWheelSurf", int1 = ptype}})
|
9912e064
zhouhaihai
新增3个每日任务类型
|
764
|
role:checkTaskEnter("AdvDraw", {count = count, ptype = ptype})
|
3133cb76
zhouhaihai
日志
|
765
766
|
role:log("adv_action", {desc = "advWheelSurf", int1 = ptype, int2 = count})
|
81032a9c
zhouhaihai
抽奖
|
767
|
SendPacket(actionCodes.Adv_wheelSurfRpc, MsgPack.pack({reward = backReward}))
|
f4c65591
zhouhaihai
抽奖
|
768
769
|
return true
end
|
764e5296
zhouhaihai
冒险抽奖保底
|
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
|
function _M.repayWheelSurfRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local ptype = msg.ptype
if ptype == 2 and not role:isFuncOpen(FuncOpenType.AdvEndless) then
return
end
local drawTypeData = csvdb["adv_wheelsurfCsv"][ptype]
if not drawTypeData then return end
local drawData = drawTypeData[role:getAdvWheelSurfLv(ptype)]
if not drawData then return end
local advDrawB = role:getProperty("advDrawB")
if (advDrawB[ptype] or 0) < globalCsv.adv_draw_back_cond then
return
end
advDrawB[ptype] = advDrawB[ptype] - globalCsv.adv_draw_back_cond
role:updateProperty({field = "advDrawB", value = advDrawB})
local gift = drawData["pool3"]:randWeight(true)
local reward = {[gift[1]] = gift[2]}
|
3133cb76
zhouhaihai
日志
|
793
794
|
reward = role:award(reward, {log = {desc = "advRepayWheelSurf", int1 = ptype}})
role:log("adv_action", {desc = "advRepayWheelSurf", int1 = ptype})
|
764e5296
zhouhaihai
冒险抽奖保底
|
795
796
797
798
|
SendPacket(actionCodes.Adv_repayWheelSurfRpc, MsgPack.pack({reward = reward}))
return true
end
|
f4c65591
zhouhaihai
抽奖
|
799
|
|
b176d7d3
zhouhaihai
冒险成就
|
800
801
802
|
function _M.finishAchievRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
803
|
local ctype = msg.ctype or 2 -- 领取类型 1 成就 2 pt累计奖励
|
b176d7d3
zhouhaihai
冒险成就
|
804
805
806
807
|
local chapterId = msg.chapterId --章节id
local taskId = msg.taskId -- 领取id
local adv = role:getAdvData()
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
808
|
|
b176d7d3
zhouhaihai
冒险成就
|
809
|
local status, reward
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
810
811
812
|
if ctype == 1 then
status, reward = adv:finishAchievement(chapterId, taskId)
elseif ctype == 2 then
|
b176d7d3
zhouhaihai
冒险成就
|
813
|
status, reward = adv:getAchievementReward(chapterId, taskId)
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
814
|
end
|
b176d7d3
zhouhaihai
冒险成就
|
815
816
|
if not status then return end
adv:updateAchievement()
|
3133cb76
zhouhaihai
日志
|
817
818
|
role:log("adv_action", {desc = "finishAchiev", short1 = ctype, int1 = chapterId, int2 = taskId})
|
b176d7d3
zhouhaihai
冒险成就
|
819
820
821
822
|
SendPacket(actionCodes.Adv_finishAchievRpc, MsgPack.pack({reward = reward}))
return true
end
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
823
824
825
826
|
function _M.rankRpc(agent, data)
local role = agent.role
local list = {}
|
b2e41074
zhouhaihai
冒险 排行榜拆分
|
827
|
local ids = redisproxy:zrevrange(role:getAdvRankKey(), 0 , 99, "WITHSCORES")
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
828
829
830
|
local redret = {}
if ids and next(ids) then
redret = redisproxy:pipelining(function (red)
|
1313eac0
zhouhaihai
冒险的一些bug
|
831
|
for i = 1, #ids, 2 do
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
832
|
local roleId = ids[i]
|
1313eac0
zhouhaihai
冒险的一些bug
|
833
834
|
local score = tonum(ids[i + 1])
table.insert(list, {roleId = tonumber(roleId), score = score})
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
835
836
837
838
839
840
841
842
843
844
|
red:hget(RANK_ADV_INFO, roleId)
end
end)
end
for i = 1, #redret do
local player = MsgPack.unpack(redret[i])
player.format = nil
list[i].player = player
end
local redret = redisproxy:pipelining(function(red)
|
b2e41074
zhouhaihai
冒险 排行榜拆分
|
845
846
|
red:ZREVRANK(role:getAdvRankKey(), role:getProperty("id"))
red:zscore(role:getAdvRankKey(), role:getProperty("id"))
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
847
848
849
850
851
852
853
854
855
856
857
858
|
end)
local rank = redret[1]
if not rank then
rank = -1
else
rank = redret[1] + 1
end
local score = tonum(redret[2], 0)
SendPacket(actionCodes.Adv_rankRpc, MsgPack.pack({list = list, rank = rank, score = score}))
return true
end
|
ae20365b
suhongyang
Revert "修改冒险战斗逻辑"
|
859
|
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
860
861
862
863
864
865
866
|
function _M.refreshSupportRpc(agent, data)
local role = agent.role
local cr = role.dailyData:getProperty("advSupRe")
local al = role:getAdvSupportFreeCount()
if cr < al then --免费
|
1a04c06c
zhouhaihai
冒险 被动调整
|
867
|
role.dailyData:updateProperty({field = "advSupRe", delta = 1})
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
868
869
|
else -- 付费
if not role:checkItemEnough({[ItemId.Diamond] = globalCsv.adv_support_refresh_cost}) then return end
|
3133cb76
zhouhaihai
日志
|
870
|
role:costItems({[ItemId.Diamond] = globalCsv.adv_support_refresh_cost}, {log = {desc = "advReSupport"}})
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
871
872
873
|
end
role:advRandomSupportEffect()
|
3133cb76
zhouhaihai
日志
|
874
|
role:log("adv_action", {desc = "advSupRe", short1 = cr < al and 0 or 1})
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
875
876
877
878
879
|
SendPacket(actionCodes.Adv_refreshSupportRpc, '')
return true
end
|
23d89d13
zhouahaihai
冒险 结构
|
880
|
return _M
|