46fac6f1
zhouahaihai
酱料
|
1
2
|
local Passive = require "adv.AdvPassive"
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
3
4
|
local AdvCommon = require "adv.AdvCommon"
local AdvMap = require "adv.AdvMap"
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
5
|
local Buff = require "adv.AdvBuff"
|
46fac6f1
zhouahaihai
酱料
|
6
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
7
|
local Adv = class("Adv")
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
8
9
10
|
local AdvTask = import(".AdvTask") --任务相关数据搞出去
AdvTask.bind(Adv)
|
9104a922
zhouhaihai
多重掉落
|
11
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
12
13
14
15
|
function Adv:ctor(owner)
assert(owner, "Adv instance must have owner(role)")
self.owner = owner
self.maps = {}
|
f8408529
zhouhaihai
冒险商店
|
16
|
self.shopStatus = {}
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
17
18
|
self.battle = nil
self.backEvents = {} --发给客户端的事件组
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
19
20
21
22
23
|
self.advTask = self.owner:getProperty("advTask")
self.advMTask = self.owner:getProperty("advMTask")
self.advTaskChange = false -- 任务改变才更新
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
24
|
self:initByInfo(self.owner:getProperty("advInfo"))
|
46fac6f1
zhouahaihai
酱料
|
25
26
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
27
28
29
30
31
32
|
--初始化adv 信息
function Adv:initByInfo(advInfo)
if not next(advInfo) then return end --还没有 开始新地图
self.chapterId = advInfo.chapterId
self.level = advInfo.level or 1
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
33
|
self.round = advInfo.round or 0
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
34
|
self.score = advInfo.score or {}
|
0e3ab88d
zhouhaihai
中继层
|
35
|
self.isRelay = advInfo.isRelay
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
36
37
|
self.lastEnemyId = advInfo.lastEId or 1
self.mapStack = advInfo.mstack or {}
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
38
|
self.lchoose = advInfo.lch or {}
|
ccbafe67
zhouhaihai
冒险神器和buff
|
39
|
self.waitArtifact = advInfo.waitAF
|
f45d3a7b
zhouhaihai
adv_unlock
|
40
|
self.cacheUnlock = advInfo.cacheUnlock or {}
|
f8408529
zhouhaihai
冒险商店
|
41
|
self.shopStatus = advInfo.shopStatus or {}
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
42
|
self.support = advInfo.support or {}
|
f8408529
zhouhaihai
冒险商店
|
43
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
44
45
46
|
self.maps = {}
for id, map in ipairs(advInfo.maps or {}) do
self.maps[id] = AdvMap.new(self, id, map)
|
46fac6f1
zhouahaihai
酱料
|
47
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
48
49
|
self:initBattle()
|
46fac6f1
zhouahaihai
酱料
|
50
|
end
|
0e3ab88d
zhouhaihai
中继层
|
51
52
|
-- 找出level 是否存在中继层
function Adv:isHaveRelay(level, chapterId)
|
b5185d3b
zhouhaihai
bug
|
53
|
level = level or self.level
|
0e3ab88d
zhouhaihai
中继层
|
54
55
56
57
58
59
60
61
62
63
64
|
chapterId = chapterId or self.chapterId
if level == 1 then return end
local campsiteCsv = csvdb["adv_chapter_campsiteCsv"][chapterId]
for _, campsite in ipairs(campsiteCsv) do
if campsite.floor == level then
return campsite
end
end
return nil
end
|
46fac6f1
zhouahaihai
酱料
|
65
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
66
|
-- 随机新的地图
|
35e2e3c4
zhouhaihai
优化 gm advt 增加感知b...
|
67
68
69
70
71
72
73
74
75
76
|
function Adv:initByChapter(params)
local chapterId = params.chapterId
local level = params.level
local isToNext = params.isToNext
local notNotify = params.notNotify
local isRelay = params.isRelay
local isEnter = params.isEnter
local support = params.support
local debugMapId = params.debugMapId
|
b176d7d3
zhouhaihai
冒险成就
|
77
78
79
80
81
82
83
|
if not self.chapterId then -- 开始新的章节
self.chapterId = chapterId
self:checkAchievement(Adv.AchievType.StartBattle, 1)
elseif chapterId ~= self.chapterId then -- 正常不会出现
return
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
84
|
self.level = level or 1
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
85
|
self.round = 0
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
86
87
88
|
self.score = self.score or {}
self.lastEnemyId = 1
self.mapStack = {1} -- 最后一个为当前的地图
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
89
|
self.lchoose = self.lchoose or {}
|
f45d3a7b
zhouhaihai
adv_unlock
|
90
|
self.cacheUnlock = self.cacheUnlock or {}
|
f8408529
zhouhaihai
冒险商店
|
91
|
self.shopStatus = self.shopStatus or {}
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
92
|
self.support = self.support or {}
|
cd498e53
zhouhaihai
被动技生效bug
|
93
|
self.battle = nil -- 清掉 老的 battle
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
94
95
96
|
if isEnter then -- 把 支援效果初始化为易用用的形式
self:initSupport(support or {})
|
17d8d855
zhouhaihai
冒险 时间 limit 改为全局
|
97
|
self.owner:setProperty("advLimit", {}) -- 清掉 Limit
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
98
|
end
|
f4c65591
zhouhaihai
抽奖
|
99
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
100
|
-- 随机出地图
|
e51ff6d2
zhouhaihai
冒险~
|
101
|
local mapId, relayData
|
35e2e3c4
zhouhaihai
优化 gm advt 增加感知b...
|
102
103
104
105
106
107
108
109
110
111
112
113
114
|
if debugMapId and csvdb["mapCsv"][debugMapId] then
mapId = debugMapId
end
if not mapId then
if isRelay then
relayData = self:isHaveRelay(level, chapterId)
if relayData then
mapId = relayData.map
else
isRelay = false
mapId = self:randomMapId(chapterId, level)
end
|
0e3ab88d
zhouhaihai
中继层
|
115
|
else
|
0e3ab88d
zhouhaihai
中继层
|
116
117
|
mapId = self:randomMapId(chapterId, level)
end
|
0e3ab88d
zhouhaihai
中继层
|
118
|
end
|
1d4eec98
zhouhaihai
冒险引导 锁定地图101
|
119
|
|
0e3ab88d
zhouhaihai
中继层
|
120
121
122
123
124
125
126
127
128
|
self.isRelay = isRelay
local isNewRelay = false
if self.isRelay then -- 中继层
local advRelay = self.owner:getProperty("advRelay")
local chapter = self:isEndless() and -1 or self.chapterId
if not (advRelay[chapter] or {})[self.level] then
isNewRelay = true
advRelay[chapter] = advRelay[chapter] or {}
advRelay[chapter][self.level] = 1
|
7b64b6cd
zhouhaihai
中继层优化
|
129
|
self.owner:updateProperty({field = "advRelay", value = advRelay})
|
0e3ab88d
zhouhaihai
中继层
|
130
131
132
|
end
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
133
|
self.maps = {}
|
0e3ab88d
zhouhaihai
中继层
|
134
|
self.maps[1] = AdvMap.new(self, 1, mapId, isEnter, isNewRelay)
|
46fac6f1
zhouahaihai
酱料
|
135
|
|
b71a8190
zhouhaihai
动态改变 一些buff
|
136
|
self:initBattle(true)
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
137
|
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
138
139
|
self:initLayerTask()
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
140
141
142
|
-- 支援效果生效一些
self:activeSomeSupport()
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
143
|
self:checkTask(Adv.TaskType.Arrive)
|
f45d3a7b
zhouhaihai
adv_unlock
|
144
|
self:checkAdvUnlock(1, self.level)
|
e51ff6d2
zhouhaihai
冒险~
|
145
|
|
596ac19f
zhouhaihai
buff
|
146
147
|
if isToNext then
self.battle.player:afterLayer() -- 玩家的buff 清理一下
|
596ac19f
zhouhaihai
buff
|
148
|
end
|
e51ff6d2
zhouhaihai
冒险~
|
149
|
|
7b2dc17c
zhouhaihai
地图 层 buff passive
|
150
151
152
153
154
|
-- 不是中继层 加上 层 和 地图的buff和被动
if not self.isRelay then
self.battle:initMapEffect()
end
|
e51ff6d2
zhouhaihai
冒险~
|
155
|
-- 中继进入奖励
|
f0b81492
zhouhaihai
营地进入 bug
|
156
|
if relayData and isEnter then
|
e51ff6d2
zhouhaihai
冒险~
|
157
158
159
|
self:awardRelay(relayData, notNotify)
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
160
161
|
if not notNotify then
self:saveDB(notNotify)
|
1607a7f0
zhouahaihai
冒险事件 new
|
162
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
163
|
end
|
b0fe1817
zhouahaihai
冒险分数
|
164
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
165
166
167
168
|
function Adv:clear()
self.chapterId = nil
self.level = nil
self.score = {}
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
169
|
self.round = 0
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
170
171
|
self.lastEnemyId = 1
self.mapStack = {}
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
172
|
self.lchoose = {}
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
173
174
|
self.maps = {}
self.battle = nil
|
ccbafe67
zhouhaihai
冒险神器和buff
|
175
|
self.waitArtifact = nil
|
0e3ab88d
zhouhaihai
中继层
|
176
|
self.isRelay = nil
|
f45d3a7b
zhouhaihai
adv_unlock
|
177
|
self.cacheUnlock = {}
|
f8408529
zhouhaihai
冒险商店
|
178
|
self.shopStatus = {}
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
179
|
self.support = {}
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
180
181
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
182
183
|
function Adv:saveDB(notNotify)
local advInfo, advTeam = {}, self.owner:getProperty("advTeam")
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
184
|
if self:isRunning() then
|
46fac6f1
zhouahaihai
酱料
|
185
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
186
187
|
advInfo.chapterId = self.chapterId
advInfo.level = self.level
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
188
|
advInfo.round = self.round
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
189
|
advInfo.score = self.score
|
0e3ab88d
zhouhaihai
中继层
|
190
|
advInfo.isRelay = self.isRelay
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
191
192
|
advInfo.lastEId = self.lastEnemyId
advInfo.mstack = self.mapStack
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
193
|
advInfo.lch = self.lchoose
|
ccbafe67
zhouhaihai
冒险神器和buff
|
194
|
advInfo.waitAF = self.waitArtifact
|
f45d3a7b
zhouhaihai
adv_unlock
|
195
|
advInfo.cacheUnlock = self.cacheUnlock
|
f8408529
zhouhaihai
冒险商店
|
196
|
advInfo.shopStatus = self.shopStatus
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
197
|
advInfo.support = self.support
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
198
|
advInfo.maps = {}
|
1607a7f0
zhouahaihai
冒险事件 new
|
199
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
200
|
self.battle:saveDB()
|
1607a7f0
zhouahaihai
冒险事件 new
|
201
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
202
203
|
for id , map in ipairs(self.maps) do
advInfo.maps[id] = map:getDB()
|
46fac6f1
zhouahaihai
酱料
|
204
|
end
|
46fac6f1
zhouahaihai
酱料
|
205
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
206
|
advTeam.player = self.battle.player:getDB()
|
46fac6f1
zhouahaihai
酱料
|
207
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
208
209
|
else
advTeam.player = nil
|
46fac6f1
zhouahaihai
酱料
|
210
|
end
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
211
212
|
self:updateTask(notNotify)
|
b176d7d3
zhouhaihai
冒险成就
|
213
|
self:updateAchievement(notNotify)
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
214
|
self.owner:updateProperties({advInfo = advInfo, advTeam = advTeam}, notNotify)
|
46fac6f1
zhouahaihai
酱料
|
215
216
|
end
|
e51ff6d2
zhouhaihai
冒险~
|
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
|
function Adv:awardRelay(relayData, notNotify)
local gift = {}
if relayData.artifact > 0 then
local pool = {}
for id, temp in pairs(csvdb["adv_artifactCsv"]) do
if not self:isHaveArtifact(id) and self.owner:isArtifactOpen(id, self:isEndless()) then
table.insert(pool, id)
end
end
for i = 1, math.min(relayData.artifact, #pool) do
local idx = math.randomInt(1, #pool)
gift[pool[idx]] = 1
table.remove(pool, idx)
end
end
if relayData.point > 0 then
gift[ItemId.AdvPoint] = relayData.point
end
if relayData.otherAward ~= "" then
for dropId, count in pairs(relayData.otherAward:toNumMap()) do
for i = 1, count do
local dropData = csvdb["event_dropCsv"][dropId]
if dropData then
local item = dropData["range"]:randWeight(true)
gift[item[1]] = (gift[item[1]] or 0) + item[2]
else
skynet.error(string.format("[ERROR]: event_dropCsv no id %s, adv_chapter_campsite", dropId))
end
end
end
end
self:award(gift, {notNotify = notNotify, log = {desc = "relayEnter", int1 = self.chapterId, int2 = self.level}})
end
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
|
function Adv:initSupport(supports)
self.support = {}
local supportEffect = {}
-- 获得道具 1=道具id=道具数量
supportEffect[1] = function(_, itemId, num)
self.support[1] = self.support[1] or {}
self.support[1][itemId] = (self.support[1][itemId] or 0) + num
end
-- 获得mapbuff 2=mapbuffid
supportEffect[2] = function(_, buffId)
self.support[2] = self.support[2] or {}
table.insert(self.support[2], buffId)
end
-- 获得mappassive 3=mappassive
supportEffect[3] = function(_, passiveId)
self.support[3] = self.support[3] or {}
table.insert(self.support[3], passiveId)
end
-- 首层额外刷新 4=类型=id=数量(类型1=choose/2=building/3=click/4=drop/5=shop)
supportEffect[4] = function(_, etype, id, num)
self.support[4] = self.support[4] or {}
self.support[4][etype] = self.support[4][etype] or {}
self.support[4][etype][id] = (self.support[4][etype][id] or 0) + num
end
-- 每层额外刷新 5=类型=id=数量(类型1=choose/2=building/3=click/4=drop/5=shop)
supportEffect[5] = function(_, etype, id, num)
self.support[5] = self.support[5] or {}
self.support[5][etype] = self.support[5][etype] or {}
self.support[5][etype][id] = (self.support[5][etype][id] or 0) + num
end
-- 获得随机神器 6=数量
|
9250904b
zhouhaihai
参数错误
|
292
|
supportEffect[6] = function(_, num)
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
293
294
295
296
|
self.support[6] = (self.support[6] or 0) + num
end
-- 获得3选1神器 7=选择次数(连续选择,每次选择重新随机)
|
9250904b
zhouhaihai
参数错误
|
297
|
supportEffect[7] = function(_, num)
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
|
self.support[7] = (self.support[7] or 0) + num
end
for _, supportId in ipairs(supports) do
local supportData = csvdb["adv_supportCsv"][supportId]
for _, effect in ipairs(supportData.effect:toArray()) do
local cur = effect:toArray(true, "=")
if supportEffect[cur[1]] then
supportEffect[cur[1]](table.unpack(cur))
end
end
end
end
function Adv:activeSomeSupport()
-- 奖励物品
if self.support[1] then
|
3133cb76
zhouhaihai
日志
|
315
|
self:award(self.support[1], {log = {desc = "support"}})
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
|
self.support[1] = nil
end
-- 加buff
if self.support[2] then
for _, buffId in ipairs(self.support[2]) do
self.battle.player:addBuff(buffId)
end
self.support[2] = nil
end
--加被动技
if self.support[3] then
for _, passiveId in ipairs(self.support[3]) do
self.battle.player:addPassive({id = passiveId})
end
self.support[3] = nil
end
-- 加随机神器
if self.support[6] then
local pool = {}
for id, temp in pairs(csvdb["adv_artifactCsv"]) do
if not self:isHaveArtifact(id) and self.owner:isArtifactOpen(id, self:isEndless()) then
table.insert(pool, id)
end
end
for i = 1, math.min(self.support[6], #pool) do
local idx = math.randomInt(1, #pool)
|
3133cb76
zhouhaihai
日志
|
345
|
self:award({[pool[idx]] = 1}, {log = {desc = "support"}})
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
|
table.remove(pool, idx)
end
self.support[6] = nil
end
self:supportChooseArtifact()
end
function Adv:supportChooseArtifact()
-- 加 三选一 神器
if self.support[7] then
if self.support[7] > 0 then
self:waitChooseArtifact()
end
self.support[7] = self.support[7] - 1
if self.support[7] <= 0 then
self.support[7] = nil
end
end
end
function Adv:supportFirstLayerAddEvent()
if self.support[4] then
local temp = self.support[4]
self.support[4] = nil
return temp
end
end
function Adv:supportEveryLayerAddEvent()
return self.support[5]
end
function Adv:isRunning()
if self.chapterId then return true end
return false
end
-- 强制结束
function Adv:forceOver(notNotify)
if self:isRunning() then
|
3133cb76
zhouhaihai
日志
|
388
|
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
389
390
391
392
393
394
395
|
local advTeam = self.owner:getProperty("advTeam")
advTeam.player = nil
local reward = self.owner:getProperty("advItems"):toNumMap()
for itemId, count in pairs(reward) do
reward[itemId] = math.ceil(count * globalCsv.adv_fail_reward_ratio / 100) -- 奖励相当于失败
end
|
3133cb76
zhouhaihai
日志
|
396
|
self.owner:award(reward, {log = {desc = "advOver", int1 = self.chapterId}})
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
397
|
|
3133cb76
zhouhaihai
日志
|
398
|
self:clear()
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
399
400
401
402
403
404
405
406
407
408
409
410
|
self.owner:updateProperties({
advInfo = {},
advTeam = advTeam,
advItems = "",
advAFGet = {},
advAFWear = {},
}, notNotify)
end
end
|
f45d3a7b
zhouhaihai
adv_unlock
|
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
|
-- 1=抵达x层;2=通关x层;3=完成指定事件;4=完成指定连锁事件
function Adv:checkAdvUnlock(utype, value)
if not self.chapterId then return end
local chapter = self.chapterId % 100
local reward = {}
for id, data in pairs(csvdb["adv_unlockCsv"]) do
if data.chapterid == chapter and data.type == utype and value == data.value then
--0=立即获得;1=结算时获得
if data.time == 0 then
reward[data.itemid] = 1
elseif data.time == 1 then
table.insert(self.cacheUnlock, data.itemid)
end
end
end
if next(reward) then
|
3133cb76
zhouhaihai
日志
|
427
|
self.owner:award(reward, {log = {desc = "advUnlock", int1 = self.chapterId}})
|
f45d3a7b
zhouhaihai
adv_unlock
|
428
429
430
431
432
433
434
435
436
|
end
end
function Adv:clearAdvUnlockCache()
local reward = {}
for _, itemId in ipairs(self.cacheUnlock) do
reward[itemId] = 1
end
if next(reward) then
|
3133cb76
zhouhaihai
日志
|
437
|
self.owner:award(reward, {log = {desc = "advUnlock", int1 = self.chapterId}})
|
f45d3a7b
zhouhaihai
adv_unlock
|
438
439
440
441
|
end
self.cacheUnlock = {}
end
|
b71a8190
zhouhaihai
动态改变 一些buff
|
442
|
function Adv:initBattle(notDb)
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
443
444
445
|
self.battle = require("adv.AdvBattle").new(self)
for _, passiveC in ipairs(self.cachePassiveEvent or {}) do
self.battle:triggerPassive(passiveC[1], passiveC[2])
|
46fac6f1
zhouahaihai
酱料
|
446
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
447
|
self.cachePassiveEvent = {}
|
1313eac0
zhouhaihai
冒险的一些bug
|
448
449
450
451
452
|
-- after init battle
for idx, map in pairs(self.maps) do
map:initBattleAfter()
end
|
b71a8190
zhouhaihai
动态改变 一些buff
|
453
454
455
456
|
--下层
if notDb and self.level ~= 1 then
self.battle.player:attrChangeCondBuffCheck(1)
end
|
46fac6f1
zhouahaihai
酱料
|
457
458
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
459
460
461
462
463
464
465
|
function Adv:triggerPassive(condType, params)
self.cachePassiveEvent = self.cachePassiveEvent or {}
if not self.battle then
table.insert(self.cachePassiveEvent, {condType, params})
else
self.battle:triggerPassive(condType, params)
end
|
46fac6f1
zhouahaihai
酱料
|
466
467
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
468
469
|
function Adv:getCurMap()
return self.maps[self.mapStack[#self.mapStack]]
|
46fac6f1
zhouahaihai
酱料
|
470
471
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
472
473
|
function Adv:getCurMapIdx()
return self.mapStack[#self.mapStack]
|
46fac6f1
zhouahaihai
酱料
|
474
475
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
476
477
478
479
480
|
function Adv:getRoom(roomId, mapIdx)
mapIdx = mapIdx or self:getCurMapIdx()
local map = self.maps[mapIdx]
if map then
return map.rooms[roomId]
|
36c30c5c
zhouahaihai
冒险
|
481
|
end
|
46fac6f1
zhouahaihai
酱料
|
482
483
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
484
485
486
487
|
function Adv:getBlock(roomId, blockId, mapIdx)
local room = self:getRoom(roomId, mapIdx)
if room then
return room.blocks[blockId]
|
c0b7797f
zhouhaihai
陷阱、点击生效点
|
488
|
end
|
46fac6f1
zhouahaihai
酱料
|
489
490
|
end
|
ccbafe67
zhouhaihai
冒险神器和buff
|
491
492
493
494
495
496
497
|
function Adv:isHaveArtifact(id)
return self.owner:getProperty("advAFGet")[id]
end
function Adv:awardArtifact(id, params)
if self:isHaveArtifact(id) then return end
self.owner:changeUpdates({{type = "advAFGet", field = id, value = 1}}, params.notNotify)
|
e852b350
zhouhaihai
冒险成就类型增加
|
498
|
self:checkAchievement(Adv.AchievType.GetMWeapon, 1, id)
|
3133cb76
zhouhaihai
日志
|
499
500
|
|
887c1843
zhouhaihai
日志新一批
|
501
502
503
504
505
506
507
508
509
510
511
512
|
-- if params.log then
-- local log = clone(params.log)
-- if log["cint1"] or log["cint2"] or log["cint3"] then
-- print("awardArtifact error log have cint1 or cint2 or cint3 ", debug.traceback())
-- end
-- log["cint1"] = self.chapterId
-- log["cint2"] = self.level
-- log["cint3"] = id
-- self.owner:log("in_artifact", log)
-- else
-- print("awardArtifact no log ", debug.traceback())
-- end
|
bbb5f29a
zhouhaihai
冒险奖励神器
|
513
514
515
|
if not params.isChoose then
self:pushBackEvent(AdvBackEventType.Artifact, {id = id})
end
|
ccbafe67
zhouhaihai
冒险神器和buff
|
516
517
518
|
end
|
56e2b75f
zhouhaihai
方法名错误
|
519
|
function Adv:addArtifactEffect(effect)
|
ccbafe67
zhouhaihai
冒险神器和buff
|
520
521
522
523
524
525
526
527
528
529
|
for _, eff in ipairs(effect:toArray()) do
local etype, id = table.unpack(eff:toArray(true, "="))
if etype == 1 then
self.battle.player:addPassive({id = id})
elseif etype == 2 then
self.battle.player:addBuff(id)
end
end
end
|
56e2b75f
zhouhaihai
方法名错误
|
530
|
function Adv:delArtifactEffect(effect)
|
ccbafe67
zhouhaihai
冒险神器和buff
|
531
532
533
534
535
536
537
538
539
540
541
542
543
544
|
for _, eff in ipairs(effect:toArray()) do
local etype, id = table.unpack(eff:toArray(true, "="))
if etype == 1 then
self.battle.player:delPassiveById(id)
elseif etype == 2 then
self.battle.player:delBuffById(id)
end
end
end
function Adv:wearArtifact(slot, id)
local advAFGet = self.owner:getProperty("advAFGet")
local advAFWear = self.owner:getProperty("advAFWear")
|
c992c911
zhouhaihai
中继
|
545
546
547
548
549
550
|
if id == -1 then
if not advAFWear[slot] then return end
else
if not advAFGet[id] then return end
end
|
ccbafe67
zhouhaihai
冒险神器和buff
|
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
|
local curWear = {}
for _, _id in pairs(advAFWear) do
curWear[_id] = 1
end
if curWear[id] then return end
if advAFWear[slot] then
local oldData = csvdb["adv_artifactCsv"][advAFWear[slot]][advAFGet[advAFWear[slot]]]
self:delArtifactEffect(oldData.effect)
if oldData.comboId ~= 0 then
local comboData = csvdb["adv_artifact_comboCsv"][oldData.comboId]
if comboData then
local isHaveCombo = true
for _, _id in ipairs(comboData.artifactid:toArray(true)) do
if not curWear[_id] then
isHaveCombo = false
break
end
end
if isHaveCombo then
self:delArtifactEffect(comboData.effect)
end
end
end
curWear[advAFWear[slot]] = nil
end
|
c992c911
zhouhaihai
中继
|
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
|
if id ~= -1 then
curWear[id] = 1
local newData = csvdb["adv_artifactCsv"][id][advAFGet[id]]
self:addArtifactEffect(newData.effect)
if newData.comboId ~= 0 then
local comboData = csvdb["adv_artifact_comboCsv"][newData.comboId]
if comboData then
local isHaveCombo = true
for _, _id in ipairs(comboData.artifactid:toArray(true)) do
if not curWear[_id] then
isHaveCombo = false
break
end
end
if isHaveCombo then
self:addArtifactEffect(comboData.effect)
|
ccbafe67
zhouhaihai
冒险神器和buff
|
595
|
end
|
ccbafe67
zhouhaihai
冒险神器和buff
|
596
597
|
end
end
|
c992c911
zhouhaihai
中继
|
598
599
|
else
id = nil
|
ccbafe67
zhouhaihai
冒险神器和buff
|
600
|
end
|
46fac6f1
zhouahaihai
酱料
|
601
|
|
ccbafe67
zhouhaihai
冒险神器和buff
|
602
603
604
605
|
self.owner:changeUpdates({{type = "advAFWear", field = slot, value = id}})
return true
end
|
e852b350
zhouhaihai
冒险成就类型增加
|
606
607
608
609
610
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
|
-- 是否穿着指定神器
function Adv:isWearAF(id)
local advAFWear = self.owner:getProperty("advAFWear")
for _, _id in pairs(advAFWear) do
if _id == id then
return true
end
end
return false
end
--是否激活指定神器套装
function Adv:haveComboAF(id)
local advAFGet = self.owner:getProperty("advAFGet")
local advAFWear = self.owner:getProperty("advAFWear")
local curWear = {}
for _, _id in pairs(advAFWear) do
curWear[_id] = 1
end
for _, _id in pairs(advAFWear) do
local afData = csvdb["adv_artifactCsv"][_id][advAFGet[_id]]
if afData.comboId == id then
local comboData = csvdb["adv_artifact_comboCsv"][afData.comboId]
if comboData then
for _, _id2 in ipairs(comboData.artifactid:toArray(true)) do
if not curWear[_id2] then
return false
end
end
return true
end
return false
end
end
return false
end
|
6dc482bb
zhouhaihai
中继层完成, 新增两个冒险物品使用效果
|
642
643
|
function Adv:artifactLevelUp(id, level)
level = level or 1
|
ccbafe67
zhouhaihai
冒险神器和buff
|
644
|
local advAFGet = self.owner:getProperty("advAFGet")
|
6dc482bb
zhouhaihai
中继层完成, 新增两个冒险物品使用效果
|
645
|
if not advAFGet[id] then return end
|
ccbafe67
zhouhaihai
冒险神器和buff
|
646
|
local advAFWear = self.owner:getProperty("advAFWear")
|
e1355da3
zhouhaihai
神器 被动
|
647
648
649
650
|
local curWear = {}
for _, _id in pairs(advAFWear) do
curWear[_id] = 1
end
|
6dc482bb
zhouhaihai
中继层完成, 新增两个冒险物品使用效果
|
651
652
653
654
655
656
657
658
|
local newLv = advAFGet[id]
for i = 1, level do
if not self.owner:isArtifactOpen(id, self:isEndless(), newLv + 1) then break end
newLv = newLv + 1
end
if newLv == advAFGet[id] then return end
|
ccbafe67
zhouhaihai
冒险神器和buff
|
659
|
local status = 0
|
e1355da3
zhouhaihai
神器 被动
|
660
|
if curWear[id] then -- 穿着呢
|
ccbafe67
zhouhaihai
冒险神器和buff
|
661
|
local oldData = csvdb["adv_artifactCsv"][id][advAFGet[id]]
|
e852b350
zhouhaihai
冒险成就类型增加
|
662
|
local newData = csvdb["adv_artifactCsv"][id][newLv]
|
ccbafe67
zhouhaihai
冒险神器和buff
|
663
664
665
666
|
self:delArtifactEffect(oldData.effect)
self:addArtifactEffect(newData.effect)
status = 1
end
|
e852b350
zhouhaihai
冒险成就类型增加
|
667
668
|
self.owner:changeUpdates({{type = "advAFGet", field = id, value = newLv}})
self:checkAchievement(Adv.AchievType.MWeaponLv, 1, id, newLv)
|
ccbafe67
zhouhaihai
冒险神器和buff
|
669
670
671
672
673
674
675
676
677
678
679
680
681
|
return status
end
function Adv:waitChooseArtifact()
local chooses = {}
local pool = {}
local count = 3 --需要多少个
for id, temp in pairs(csvdb["adv_artifactCsv"]) do
if not self:isHaveArtifact(id) and self.owner:isArtifactOpen(id, self:isEndless()) then
table.insert(pool, id)
end
end
|
d3da3368
zhouhaihai
冒险地图被动技, buff 神器
|
682
|
if #pool == 0 then
|
3133cb76
zhouhaihai
日志
|
683
|
self:award({[ItemId.AdvPoint] = 48}, {log = {desc = "chooseArtifact"}})
|
d3da3368
zhouhaihai
冒险地图被动技, buff 神器
|
684
685
|
else
for i = 1, math.min(count, #pool) do
|
ccbafe67
zhouhaihai
冒险神器和buff
|
686
687
688
689
|
local idx = math.randomInt(1, #pool)
table.insert(chooses, pool[idx])
table.remove(pool, idx)
end
|
d3da3368
zhouhaihai
冒险地图被动技, buff 神器
|
690
691
|
self.waitArtifact = chooses
self:backChooseArtifact()
|
ccbafe67
zhouhaihai
冒险神器和buff
|
692
|
end
|
ccbafe67
zhouhaihai
冒险神器和buff
|
693
694
695
696
697
698
699
700
|
end
function Adv:isWaitChooseArtifact()
return self.waitArtifact
end
function Adv:chooseArtifact(index)
if not self.waitArtifact or not self.waitArtifact[index] then return end
|
bbb5f29a
zhouhaihai
冒险奖励神器
|
701
|
self:award({[self.waitArtifact[index]] = 1}, {log = {desc = "chooseArtifact"}, isChoose = true})
|
3133cb76
zhouhaihai
日志
|
702
|
|
d3da3368
zhouhaihai
冒险地图被动技, buff 神器
|
703
|
self.waitArtifact = nil
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
704
705
706
707
|
-- 支援效果继续选择
self:supportChooseArtifact()
|
ccbafe67
zhouhaihai
冒险神器和buff
|
708
709
710
711
712
713
|
return true
end
function Adv:isEndless()
return AdvCommon.isEndless(self.chapterId)
end
|
46fac6f1
zhouahaihai
酱料
|
714
|
|
eee37c88
zhouhaihai
楼层数据
|
715
|
function Adv:getCurFloorData()
|
eee37c88
zhouhaihai
楼层数据
|
716
|
local chapter = self.chapterId % 100
|
bbf64622
zhouhaihai
冒险
|
717
|
return (csvdb["adv_chapter_floorCsv"][self.chapterId] or {})[self.level]
|
eee37c88
zhouhaihai
楼层数据
|
718
719
|
end
|
6dc482bb
zhouhaihai
中继层完成, 新增两个冒险物品使用效果
|
720
|
--关卡结束
|
bbf64622
zhouhaihai
冒险
|
721
|
function Adv:over(success, rewardRatio, overType)
|
6dc482bb
zhouhaihai
中继层完成, 新增两个冒险物品使用效果
|
722
723
|
if success then
rewardRatio = rewardRatio or 100
|
bbf64622
zhouhaihai
冒险
|
724
|
overType = overType or 0
|
6dc482bb
zhouhaihai
中继层完成, 新增两个冒险物品使用效果
|
725
726
|
else
rewardRatio = rewardRatio or globalCsv.adv_fail_reward_ratio
|
bbf64622
zhouhaihai
冒险
|
727
|
overType = overType or -1
|
6dc482bb
zhouhaihai
中继层完成, 新增两个冒险物品使用效果
|
728
|
end
|
bbf64622
zhouhaihai
冒险
|
729
730
|
local chapterData = csvdb["adv_chapterCsv"][self.chapterId]
-- 扣除的东西给积分
|
bbf64622
zhouhaihai
冒险
|
731
|
local addScore = 0
|
e22ded1b
zhouhaihai
被动技奖励
|
732
|
for itemId, count in pairs(self.owner:getProperty("advItems"):toNumMap()) do
|
bbf64622
zhouhaihai
冒险
|
733
|
local itemCsv = csvdb["itemCsv"][itemId]
|
3df73a9e
zhouhaihai
复兴奖励
|
734
735
736
|
if not itemCsv then
print("ERROR: no itemId in ItemCsv : ", itemId)
elseif itemCsv.type == ItemType.AdvItem then
|
bbf64622
zhouhaihai
冒险
|
737
|
addScore = addScore + count * itemCsv.advScore
|
bbf64622
zhouhaihai
冒险
|
738
|
end
|
6dc482bb
zhouhaihai
中继层完成, 新增两个冒险物品使用效果
|
739
|
end
|
bbf64622
zhouhaihai
冒险
|
740
741
742
743
744
745
|
self:scoreChange(AdvScoreType.ItemBack, addScore)
local score = self.owner:fixAdvScoreChange(self:getScore())
local scoreInfo = self.score
local scoreReward = math.floor(score / chapterData.scoreAward)
|
3133cb76
zhouhaihai
日志
|
746
|
self.owner:award({[ItemId.OldCoin] = scoreReward}, {log = {desc = "advOver", int1 = self.chapterId}})
|
bbf64622
zhouhaihai
冒险
|
747
|
|
e22ded1b
zhouhaihai
被动技奖励
|
748
|
-- 被动技会影响奖励
|
bbf64622
zhouhaihai
冒险
|
749
750
|
self.battle.player:triggerPassive(Passive.ADV_OVER, {score = score, level = self.level})
|
e22ded1b
zhouhaihai
被动技奖励
|
751
752
753
754
755
756
757
758
759
|
local reward = {}
for itemId, count in pairs(self.owner:getProperty("advItems"):toNumMap()) do
local itemCsv = csvdb["itemCsv"][itemId]
if not itemCsv then
print("ERROR: no itemId in ItemCsv : ", itemId)
elseif itemCsv.type ~= ItemType.AdvItem then
reward[itemId] = math.ceil(count * rewardRatio / 100)
end
end
|
3133cb76
zhouhaihai
日志
|
760
|
reward = self.owner:award(reward, {log = {desc = "advOver", int1 = self.chapterId}})
|
e22ded1b
zhouhaihai
被动技奖励
|
761
|
|
ea40710f
zhouhaihai
活动
|
762
|
local backAdvCount
|
60fff866
zhouhaihai
微调 结算返还
|
763
|
if not self:isEndless() then
|
1fd96b9f
zhouhaihai
冒险次数返还
|
764
|
backAdvCount = math.floor((chapterData.limitlevel - self.level) / globalCsv.adv_daily_count_back_radio) * globalCsv.adv_daily_count_back_radio
|
ea40710f
zhouhaihai
活动
|
765
|
self.owner:changeAdvCount(-backAdvCount)
|
60fff866
zhouhaihai
微调 结算返还
|
766
767
|
end
|
46fac6f1
zhouahaihai
酱料
|
768
|
if success then
|
53e8037e
zhouhaihai
任务
|
769
|
self.owner:checkTaskEnter("AdvPass", {id = self.chapterId, level = self.level, score = score})
|
bbf64622
zhouhaihai
冒险
|
770
771
|
if not self:isEndless() and self.level >= chapterData.limitlevel then
|
53e8037e
zhouhaihai
任务
|
772
773
|
self.owner:checkTaskEnter("AdvAllPass", {id = self.chapterId})
end
|
b176d7d3
zhouhaihai
冒险成就
|
774
|
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
775
|
local roleId = self.owner:getProperty("id")
|
2471ce93
zhouhaihai
bug
|
776
|
local oldMaxScore = tonum(redisproxy:zscore(self.owner:getAdvRankKey(), roleId))
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
777
778
779
780
781
782
|
if score > oldMaxScore then
local team = self.owner:getProperty("advTeam")
local curInfo = {
name = self.owner:getProperty("name"),
headId = self.owner:getProperty("headId"),
lv = self.owner:getProperty("level"),
|
f7f25b04
zhouhaihai
冒险bug
|
783
|
batteV = self.owner:getTeamBattleValue(team.heros),
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
784
785
786
787
|
chapter = self.chapterId,
format = self.owner:getTeamHerosInfo(team.heros),
}
redisproxy:pipelining(function (red)
|
2471ce93
zhouhaihai
bug
|
788
|
red:zadd(self.owner:getAdvRankKey(), score, roleId) --更新分数
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
789
790
791
|
red:hset(RANK_ADV_INFO, roleId, MsgPack.pack(curInfo))
end)
end
|
0c90a4f4
chenyueqi
拾荒引导结束要设定引导步骤为成就引导
|
792
|
-- 通关的时候要把引导步骤设定到成就引导
|
b8c1be12
zhouhaihai
一些 bug
|
793
794
|
if not self.owner:checkOverGuide(57) then
self.owner:saveGuide(57,1,true)
|
0c90a4f4
chenyueqi
拾荒引导结束要设定引导步骤为成就引导
|
795
|
end
|
46fac6f1
zhouahaihai
酱料
|
796
|
end
|
f45d3a7b
zhouhaihai
adv_unlock
|
797
|
self:clearAdvUnlockCache()
|
3133cb76
zhouhaihai
日志
|
798
|
|
33be3111
zhouhaihai
修改hangPass 结构
|
799
|
local chapterId = self.chapterId
|
46fac6f1
zhouahaihai
酱料
|
800
|
self:clear()
|
89338c47
zhouhaihai
技能目标
|
801
|
self.owner:checkTaskEnter("AdvScore", {score = score})
|
00115a7a
zhouahaihai
奖励发放
|
802
|
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
803
804
805
806
807
|
self.owner:updateProperties({
advItems = "",
advAFGet = {},
advAFWear = {},
})
|
ea40710f
zhouhaihai
活动
|
808
809
810
811
812
813
|
self:pushBackEvent(AdvBackEventType.End, {
success = success,
score = score,
scoreInfo = scoreInfo,
reward = reward,
type = overType,
|
be4e8031
zhouhaihai
活动 拾荒
|
814
|
scoreAward = scoreReward,
|
ea40710f
zhouhaihai
活动
|
815
816
817
|
chapterId = chapterId,
backAdvCount = backAdvCount,
})
|
46fac6f1
zhouahaihai
酱料
|
818
819
|
end
|
ec87b4a5
zhouahaihai
冒险 完善
|
820
|
function Adv:exit()
|
4b7c7c96
zhouahaihai
增加 清空 挂机 冒险gm 角色经验
|
821
|
self:over(false)
|
ec87b4a5
zhouahaihai
冒险 完善
|
822
823
824
|
self:saveDB()
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
825
826
827
828
829
|
function Adv:randomMapId(chapterId, level)
local chapterData = csvdb["adv_chapterCsv"][chapterId]
if not chapterData then
error("chapterId " .. chapterId .. " dont exist!")
return
|
46fac6f1
zhouahaihai
酱料
|
830
|
end
|
8da953a7
zhouhaihai
无尽模式
|
831
|
if AdvCommon.isEndless(chapterId) then
|
916096ed
zhouhaihai
神器效果
|
832
|
level = AdvCommon.getEndlessDataLv(chapterId, level)
|
8da953a7
zhouhaihai
无尽模式
|
833
834
835
836
837
|
else
if level > chapterData.limitlevel then
error("level overflow!")
return
end
|
46fac6f1
zhouahaihai
酱料
|
838
|
end
|
8da953a7
zhouhaihai
无尽模式
|
839
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
840
841
|
--随出地图Id
local raw_pool = chapterData.mapid:toArray(true, "=")
|
46fac6f1
zhouahaihai
酱料
|
842
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
843
844
845
|
local lastMapIds = {}
for id, map in ipairs(self.maps or {}) do
lastMapIds[map.mapId] = 1
|
46fac6f1
zhouahaihai
酱料
|
846
|
end
|
02c4de8d
zhouahaihai
增加 固有技
|
847
|
|
46fac6f1
zhouahaihai
酱料
|
848
|
local pool = {}
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
849
850
851
852
|
for _, mapId in ipairs(raw_pool) do
local temp = csvdb["mapCsv"][mapId]
if temp and not lastMapIds[mapId] then
if AdvCommon.checkIsIn(level, temp.leveltype, temp.levellimit) then
|
cfc7a04a
zhouhaihai
map id 提供随机概率调整
|
853
|
pool[mapId] = {showup = temp.showup}
|
46fac6f1
zhouahaihai
酱料
|
854
855
856
|
end
end
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
857
858
859
|
if not next(pool) then
error("mapIds is empty!")
return
|
46fac6f1
zhouahaihai
酱料
|
860
|
end
|
cfc7a04a
zhouhaihai
map id 提供随机概率调整
|
861
|
return math.randWeight(pool, "showup")
|
46fac6f1
zhouahaihai
酱料
|
862
863
|
end
|
3f00afcf
zhouhaihai
增加日志
|
864
|
-- log long1 字段被征用!!!
|
46fac6f1
zhouahaihai
酱料
|
865
866
|
-- 在冒险中获得的物品都发放在冒险背包内
function Adv:award(gift, params)
|
8c199cec
zhengshouren
简化物品奖励接口,设置默认参数
|
867
|
params = params or {}
|
46fac6f1
zhouahaihai
酱料
|
868
869
870
871
872
873
874
875
876
|
local tgift = {}
if type(gift) == "string" then
for _, one in pairs(gift:toTableArray(true)) do
tgift[one[1]] = (tgift[one[1]] or 0) + one[2]
end
else
tgift = gift
end
local items = self.owner:getProperty("advItems")
|
ccbafe67
zhouhaihai
冒险神器和buff
|
877
|
local oldItems = items
|
46fac6f1
zhouahaihai
酱料
|
878
|
for itemId, count in pairs(tgift) do
|
b0fe1817
zhouahaihai
冒险分数
|
879
|
if count > 0 then
|
ccbafe67
zhouhaihai
冒险神器和buff
|
880
|
local buffAdd = self.battle.player:getRewardChange(itemId)
|
d3da3368
zhouhaihai
冒险地图被动技, buff 神器
|
881
|
count = math.floor(math.max(0, (count + buffAdd[0]) * (1 + buffAdd[1]))) --附加 buff 的影响
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
882
|
self:checkTask(Adv.TaskType.Item, count, itemId)
|
b176d7d3
zhouhaihai
冒险成就
|
883
|
self:checkAchievement(Adv.AchievType.GetItem, count, itemId)
|
b0fe1817
zhouahaihai
冒险分数
|
884
|
end
|
ccbafe67
zhouhaihai
冒险神器和buff
|
885
|
tgift[itemId] = count
|
46fac6f1
zhouahaihai
酱料
|
886
887
|
local origin = items:getv(itemId, 0)
local nums = origin + count
|
916096ed
zhouhaihai
神器效果
|
888
|
|
ccbafe67
zhouhaihai
冒险神器和buff
|
889
890
|
if csvdb["adv_artifactCsv"][itemId] then -- 获得神器
self:awardArtifact(itemId, params)
|
4b903052
chenyueqi
触发神器引导的代码移到发奖励的方法里
|
891
892
893
|
if not self.owner:checkOverGuide(55) then
self.owner:saveGuide(55,1,true)
end
|
ccbafe67
zhouhaihai
冒险神器和buff
|
894
895
896
897
898
899
|
else
if nums <= 0 then
items = items:delk(itemId)
nums = 0
else
items = items:setv(itemId, nums)
|
916096ed
zhouhaihai
神器效果
|
900
|
end
|
3133cb76
zhouhaihai
日志
|
901
|
|
fd2b5e51
chenyueqi
拾荒引导拾取探险点后服务器设置当前...
|
902
903
904
905
|
if itemId == 16 and not self.owner:checkOverGuide(51,4) then
self.owner:saveGuide(51,4)
end
|
887c1843
zhouhaihai
日志新一批
|
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
|
-- if params.log then
-- local log = clone(params.log)
-- if log["cint1"] or log["cint2"] or log["cint3"] or log["long1"] then
-- print("addAdvItem error log have cint1 or cint2 or cint3 ", debug.traceback())
-- end
-- log["cint1"] = itemId
-- log["cint2"] = math.abs(count)
-- log["cint3"] = self.chapterId
-- log["long1"] = self.level
-- if count >= 0 then
-- self.owner:log("in_adv", log)
-- else
-- self.owner:log("out_adv", log)
-- end
-- else
-- print("addAdvItem no log ", debug.traceback())
-- end
|
916096ed
zhouhaihai
神器效果
|
923
924
|
end
end
|
ccbafe67
zhouhaihai
冒险神器和buff
|
925
926
927
|
if items ~= oldItems then
self.owner:updateProperty({field = "advItems", value = items, notNotify = params.notNotify})
end
|
b71a8190
zhouhaihai
动态改变 一些buff
|
928
929
930
931
|
if tgift[ItemId.OldCoin] then
self.battle.player:attrChangeCondBuffCheck(0)
end
|
ccbafe67
zhouhaihai
冒险神器和buff
|
932
|
return tgift
|
916096ed
zhouhaihai
神器效果
|
933
934
935
|
end
|
46fac6f1
zhouahaihai
酱料
|
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
|
-- 消耗物品 优先冒险背包 --check 只是检查够不够
function Adv:cost(item, params, check)
local items = self.owner:getProperty("advItems")
local less = {}
local advCost = {}
for itemId, count in pairs(item) do
advCost[itemId] = - math.min(items:getv(itemId, 0), count)
if advCost[itemId] == 0 then
advCost[itemId] = nil
end
local last = items:getv(itemId, 0) - count
if last < 0 then
less[itemId] = -last
end
end
if next(less) and not self.owner:checkItemEnough(less) then return end --不够
if check then return true end
self:award(advCost, params)
|
ccbafe67
zhouhaihai
冒险神器和buff
|
956
957
958
|
if next(less) then
self.owner:costItems(less, params)
end
|
46fac6f1
zhouahaihai
酱料
|
959
960
961
962
|
return true
end
--事件点击处理
|
74a8fdc9
zhouhaihai
奖励副本 胜利扣除次数
|
963
|
local function clickOut(self, room, block, params, isExit)
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
964
|
if self:getCurMap():checkOver() then --检查是否可以出去了
|
74a8fdc9
zhouhaihai
奖励副本 胜利扣除次数
|
965
966
967
968
969
|
if isExit then
self:over(true)
return true
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
970
971
|
if #self.mapStack > 1 then -- 处于夹层中
table.remove(self.mapStack) --退出夹层
|
85ded242
zhouhaihai
丰富返回事件
|
972
|
self:backLayer(-1)
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
973
|
else --处于底层
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
974
975
|
local advPass = self.owner:getProperty("advPass")
|
4d943586
zhouhaihai
直通 advt gm
|
976
|
|
ccbafe67
zhouhaihai
冒险神器和buff
|
977
|
if self:isEndless() then
|
8da953a7
zhouhaihai
无尽模式
|
978
979
980
981
982
983
984
985
|
-- 刷新最高层
if self.owner:getProperty("advElM") < self.level then
self.owner:updateProperty({field = "advElM", value = self.level})
end
else
if self.level > (advPass[self.chapterId] or 0) then
self.owner:changeUpdates({{type = "advPass", field = self.chapterId, value = self.level}})
end
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
986
|
end
|
0e3ab88d
zhouhaihai
中继层
|
987
|
|
b176d7d3
zhouhaihai
冒险成就
|
988
|
self:checkAchievement(Adv.AchievType.OverWin, 1, self.level)
|
f45d3a7b
zhouhaihai
adv_unlock
|
989
|
self:checkAdvUnlock(2, self.level)
|
0e3ab88d
zhouhaihai
中继层
|
990
|
|
bbf64622
zhouhaihai
冒险
|
991
992
993
994
995
|
local curFloorData = self:getCurFloorData()
if not self.isRelay then
self:scoreChange(AdvScoreType.Level, curFloorData.advScore) --增加层级加分
end
|
e51ff6d2
zhouhaihai
冒险~
|
996
|
if not self:isEndless() and (self.level >= csvdb["adv_chapterCsv"][self.chapterId].limitlevel) then --关卡结束
|
6dc482bb
zhouhaihai
中继层完成, 新增两个冒险物品使用效果
|
997
|
self:over(true)
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
998
|
else
|
d3da3368
zhouhaihai
冒险地图被动技, buff 神器
|
999
|
self.battle.player:triggerPassive(Passive.DOWN_LAYER)
|
bbf64622
zhouhaihai
冒险
|
1000
|
|
eee37c88
zhouhaihai
楼层数据
|
1001
|
if curFloorData then
|
3133cb76
zhouhaihai
日志
|
1002
|
self:backReward(self:award({[ItemId.AdvPoint] = curFloorData.exp}, {log = {desc = "passReward", int1 = self.chapterId, int2 = self.level}}))
|
eee37c88
zhouhaihai
楼层数据
|
1003
|
end
|
0e3ab88d
zhouhaihai
中继层
|
1004
|
local isHaveRelay = self:isHaveRelay(self.level)
|
e1355da3
zhouhaihai
神器 被动
|
1005
1006
|
self.owner:getProperty("advTeam").player = self.battle.player:getDB() -- 临时缓存住 battle 的player
|
0e3ab88d
zhouhaihai
中继层
|
1007
|
if isHaveRelay and not self.isRelay then
|
35e2e3c4
zhouhaihai
优化 gm advt 增加感知b...
|
1008
1009
1010
1011
1012
1013
1014
|
self:initByChapter({
chapterId = self.chapterId,
level = self.level,
isToNext = true,
notNotify = true,
isRelay = true,
})
|
0e3ab88d
zhouhaihai
中继层
|
1015
|
else
|
35e2e3c4
zhouhaihai
优化 gm advt 增加感知b...
|
1016
1017
1018
1019
1020
1021
|
self:initByChapter({
chapterId = self.chapterId,
level = self.level + 1,
isToNext = true,
notNotify = true,
})
|
0e3ab88d
zhouhaihai
中继层
|
1022
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
1023
1024
|
self:backNext() --下一关
end
|
b176d7d3
zhouhaihai
冒险成就
|
1025
|
|
46fac6f1
zhouahaihai
酱料
|
1026
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
1027
|
|
46fac6f1
zhouahaihai
酱料
|
1028
1029
1030
1031
|
return true
end
end
|
0e3ab88d
zhouhaihai
中继层
|
1032
|
local function clickExit(self, room, block, params)
|
74a8fdc9
zhouhaihai
奖励副本 胜利扣除次数
|
1033
|
return clickOut(self, room, block, params, true)
|
0e3ab88d
zhouhaihai
中继层
|
1034
1035
|
end
|
46fac6f1
zhouahaihai
酱料
|
1036
1037
|
--战斗 普通攻击
local function clickMonster(self, room, block, params)
|
12f7b52c
zhouhaihai
冒险战斗
|
1038
|
self.battle:battleBegin(room.roomId, block.blockId, params)
|
46fac6f1
zhouahaihai
酱料
|
1039
1040
1041
|
return true
end
|
1ffc16b9
zhouhaihai
冒险 选择点和 建筑
|
1042
|
local function chooseCommon(self, room, block, chooseData, choose, tag)
|
f5e38251
zhouhaihai
数据保护
|
1043
|
if not choose then return end
|
46fac6f1
zhouahaihai
酱料
|
1044
1045
|
if not chooseData or not chooseData["button".. choose .."cond"] then return end
|
cb071e8d
zhouhaihai
多条件选项
|
1046
|
local conds = chooseData["button".. choose .."cond"]:toTableArray(true)
|
46fac6f1
zhouahaihai
酱料
|
1047
|
local checkCond = {
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
1048
1049
1050
1051
|
-- 没有条件
[0] = function()
return true
end,
|
46fac6f1
zhouahaihai
酱料
|
1052
|
-- 拥有道具
|
1229c24d
zhouhaihai
新加选择条件
|
1053
|
[1] = function(_, itemId, count)
|
498f0eb2
zhouhaihai
冒险 action
|
1054
|
if self:cost({[itemId] = count}, {log = {desc = "chooseEvent", key1 = tag, int1 = chooseData.id}}, true) then
|
46fac6f1
zhouahaihai
酱料
|
1055
1056
1057
1058
|
return true
end
end,
-- xx角色(todo 队长)
|
9d66362c
zhouhaihai
修改冒险选择条件
|
1059
1060
1061
1062
1063
1064
|
[2] = function(_, heroType)
for slot, heroId in pairs(self.owner:getProperty("advTeam").heros) do
local hero = self.owner.heros[heroId]
if hero and hero:getProperty("type") == heroType then
return true
end
|
46fac6f1
zhouahaihai
酱料
|
1065
1066
1067
1068
|
end
end,
--消灭所有怪
[3] = function()
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
1069
|
for _, room in pairs(self:getCurMap().rooms) do
|
4ae223df
zhouahaihai
Buff bug
|
1070
|
for _, block in pairs(room.blocks) do
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
1071
|
if block:isMonster() then
|
46fac6f1
zhouahaihai
酱料
|
1072
1073
1074
1075
1076
1077
|
return
end
end
end
return true
end,
|
53e8037e
zhouhaihai
任务
|
1078
|
--制定属性
|
1229c24d
zhouhaihai
新加选择条件
|
1079
1080
|
[4] = function(_, attrType, value)
if (self.battle.player[AttsEnumEx[attrType]] or 0) >= value then
|
46fac6f1
zhouahaihai
酱料
|
1081
1082
1083
|
return true
end
end,
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
1084
|
-- 提交一个物品
|
1229c24d
zhouhaihai
新加选择条件
|
1085
|
[5] = function (_, itemId, count)
|
498f0eb2
zhouhaihai
冒险 action
|
1086
|
if self:cost({[itemId] = count}, {log = {desc = "chooseEvent", key1 = tag, int1 = chooseData.id}}) then
|
1229c24d
zhouhaihai
新加选择条件
|
1087
|
self:backCost({[itemId] = count})
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
1088
1089
1090
|
return true
end
end,
|
53e8037e
zhouhaihai
任务
|
1091
|
-- sp 到达指定值
|
1229c24d
zhouhaihai
新加选择条件
|
1092
1093
|
[6] = function(_, value)
if self.battle.player.sp >= value then
|
b8eb016b
zhouhaihai
冒险条件扣血扣蓝直接作用
|
1094
|
self.battle.player:changeSp(-value)
|
53e8037e
zhouhaihai
任务
|
1095
1096
1097
|
return true
end
end,
|
1229c24d
zhouhaihai
新加选择条件
|
1098
1099
1100
1101
|
--7=拥有指定buff指定层数
[7] = function(_, buffId, layer)
local buff = self.battle.player:getBuffById(buffId)
if buff and buff:getLayer() >= layer then
|
1ffc16b9
zhouhaihai
冒险 选择点和 建筑
|
1102
1103
1104
|
return true
end
end,
|
1229c24d
zhouhaihai
新加选择条件
|
1105
1106
1107
1108
1109
1110
|
--8=拥有x神器
[8] = function(_, artifactId)
return self:isHaveArtifact(artifactId)
end,
-- 9 = 生命值大于x%
[9] = function (_, value)
|
b8eb016b
zhouhaihai
冒险条件扣血扣蓝直接作用
|
1111
1112
1113
1114
1115
|
local cost = value / 100 * self.battle.player.hpMax
if self.battle.player.hp > cost then
self.battle.player:hurt(cost, nil, {hurtType = 6, buffId = -1})
return true
end
|
1229c24d
zhouhaihai
新加选择条件
|
1116
|
end,
|
f02ffa27
zhouhaihai
未获得神器
|
1117
1118
1119
1120
|
-- 10 = 未获得x神器
[10] = function(_, artifactId)
return not self:isHaveArtifact(artifactId)
end,
|
cb071e8d
zhouhaihai
多条件选项
|
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
|
-- 11 = 地图上没有指定id 的怪
[11] = function(_, monsterId)
for _, room in pairs(self:getCurMap().rooms) do
for _, block in pairs(room.blocks) do
if block:isMonster() then
if not monsterId then return false end
if block.event.id == monsterId then
return false
end
end
end
end
return true
end,
-- 12 = 地图上没有指定id 的建筑
[12] = function(_, buildId)
for _, room in pairs(self:getCurMap().rooms) do
for _, block in pairs(room.blocks) do
if block:isBuild() then
if not buildId then return false end
if block.event.id == buildId then
return false
end
end
end
end
return true
end,
-- 13 = 地图上没有指定的 选择点
[13] = function(_, chooseId)
for _, room in pairs(self:getCurMap().rooms) do
for _, block in pairs(room.blocks) do
if block:isChoose() then
if not chooseId then return false end
if block.event.id == chooseId then
return false
end
end
end
end
return true
end,
|
1ffc16b9
zhouhaihai
冒险 选择点和 建筑
|
1163
|
}
|
cb071e8d
zhouhaihai
多条件选项
|
1164
1165
1166
1167
1168
|
for _, cond in ipairs(conds) do
assert(not cond[1] or checkCond[cond[1]], "error cond, event_" .. (tag or "choose") .. "Csv id :" .. block.event.id)
if cond[1] and not checkCond[cond[1]](table.unpack(cond)) then return end
end
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
1169
|
local clearBlock = chooseData.keep ~= 1
|
e10edb5f
zhouahaihai
冒险事件新
|
1170
1171
|
local effects = chooseData["button".. choose .."effect"]:toTableArray(true)
for _, effect in ipairs(effects) do
|
e10edb5f
zhouahaihai
冒险事件新
|
1172
1173
|
local doEffect = {
[1] = function() -- 获得某道具N个
|
1ffc16b9
zhouhaihai
冒险 选择点和 建筑
|
1174
1175
1176
|
local count = effect[3] or 1
local reward = {}
for i = 1, count do
|
92d7d6ac
zhouhaihai
加一些数据保护
|
1177
1178
1179
1180
1181
1182
1183
|
local dropData = csvdb["event_dropCsv"][effect[2]]
if dropData then
local item = dropData["range"]:randWeight(true)
reward[item[1]] = (reward[item[1]] or 0) + item[2]
else
skynet.error(string.format("[ERROR]: event_dropCsv no id %s in %s id: %s", effect[2], tag, chooseData.id))
end
|
1ffc16b9
zhouhaihai
冒险 选择点和 建筑
|
1184
|
end
|
3133cb76
zhouhaihai
日志
|
1185
|
self:backReward(self:award(reward, {log = {desc = "chooseEvent", key1 = tag, int1 = chooseData.id}}), {roomId = room.roomId, blockId = block.blockId})
|
e10edb5f
zhouahaihai
冒险事件新
|
1186
1187
|
end,
[2] = function() --获得冒险buff
|
1ffc16b9
zhouhaihai
冒险 选择点和 建筑
|
1188
1189
1190
1191
|
local layer = effect[3] or 1
for i = 1, layer do
self.battle.player:addBuff(effect[2])
end
|
e10edb5f
zhouahaihai
冒险事件新
|
1192
1193
|
end,
[3] = function() --发现怪物
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
1194
|
self:getCurMap():addNewMonsterRand(effect[2], {room, block})
|
d232676a
zhouhaihai
功能解锁 冒险返回
|
1195
|
self:pushBackEvent(AdvBackEventType.Monster, {id = effect[2]})
|
e10edb5f
zhouahaihai
冒险事件新
|
1196
1197
1198
|
clearBlock = false
end,
[4] = function() --无事发生
|
ccbafe67
zhouhaihai
冒险神器和buff
|
1199
|
end,
|
1ffc16b9
zhouhaihai
冒险 选择点和 建筑
|
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
|
[5] = function() --5=属性枚举=数值;直接增加玩家属性
local attr
if effect[3] == 0 then
attr = "sp"
else
attr = AttsEnumEx[effect[3]]
if not AdvAttsEnum[attr] then return end
end
self.battle.player:addBaseAttr(attr, effect[4], effect[2])
end,
[6] = function() -- 商店
block:updateEvent({
etype = AdvEventType.Trader,
id = effect[2]
})
|
d232676a
zhouhaihai
功能解锁 冒险返回
|
1215
|
self:pushBackEvent(AdvBackEventType.Trader, {id = effect[2]})
|
1ffc16b9
zhouhaihai
冒险 选择点和 建筑
|
1216
1217
1218
|
clearBlock = false
end,
[7] = function() -- 建筑
|
1ffc16b9
zhouhaihai
冒险 选择点和 建筑
|
1219
1220
1221
1222
|
block:updateEvent({
etype = AdvEventType.Build,
id = effect[2]
})
|
1ffc16b9
zhouhaihai
冒险 选择点和 建筑
|
1223
1224
1225
|
clearBlock = false
end,
[8] = function() -- 选择
|
1ffc16b9
zhouhaihai
冒险 选择点和 建筑
|
1226
1227
1228
1229
|
block:updateEvent({
etype = AdvEventType.Choose,
id = effect[2]
})
|
1ffc16b9
zhouhaihai
冒险 选择点和 建筑
|
1230
1231
1232
|
clearBlock = false
end,
[9] = function() -- click
|
1ffc16b9
zhouhaihai
冒险 选择点和 建筑
|
1233
1234
1235
1236
|
block:updateEvent({
etype = AdvEventType.Click,
id = effect[2]
})
|
1ffc16b9
zhouhaihai
冒险 选择点和 建筑
|
1237
1238
1239
|
clearBlock = false
end,
[10] = function() -- 陷阱
|
1ffc16b9
zhouhaihai
冒险 选择点和 建筑
|
1240
1241
1242
1243
|
block:updateEvent({
etype = AdvEventType.Trap,
id = effect[2]
})
|
1ffc16b9
zhouhaihai
冒险 选择点和 建筑
|
1244
1245
|
clearBlock = false
end,
|
ccbafe67
zhouhaihai
冒险神器和buff
|
1246
1247
|
[11] = function() -- 获得神器
self:waitChooseArtifact() --等待获取神器
|
031dcf99
zhouhaihai
修改战斗属性计算 冒险增加效果类型
|
1248
1249
1250
|
end,
[12] = function()
-- buffId
|
16ca64ab
zhouhaihai
全部敌人
|
1251
|
local targers = self.battle.player:getTeam(2, nil, nil, true)
|
031dcf99
zhouhaihai
修改战斗属性计算 冒险增加效果类型
|
1252
1253
1254
1255
|
for _, target in pairs(targers) do
target:addBuff(effect[2])
end
end,
|
c85f5bd6
zhouhaihai
新中继的屏蔽删掉
|
1256
|
[13] = function() -- 显示地图
|
7ca46333
zhouhaihai
map 传参错误
|
1257
1258
1259
|
self:getCurMap():showMap()
self:backMapShow()
end,
|
2d87caee
zhouhaihai
地块替换优化 新的效果类型
|
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
|
[14] = function() -- 指定地块召唤 指定类型的id
local change = self:getCurMap():layEventToStage(effect[2], effect[3], effect[4], effect[5])
for _, one in ipairs(change) do
self:backBlockChange(one[1].roomId, one[2].blockId)
end
end,
[15] = function() -- 移除指定事件
local change = self:getCurMap():clearEventById(effect[2], effect[3], effect[4])
for _, one in ipairs(change) do
self:backBlockChange(one[1].roomId, one[2].blockId)
end
end,
|
e085da41
zhouhaihai
指定事件转移
|
1272
1273
1274
1275
1276
1277
|
[16] = function() -- 指定事件转移
local change = self:getCurMap():eventChangeToOther(effect[2], effect[3], effect[4], effect[5], effect[6])
for _, one in ipairs(change) do
self:backBlockChange(one[1].roomId, one[2].blockId)
end
end,
|
e10edb5f
zhouahaihai
冒险事件新
|
1278
|
}
|
4163e40a
zhouhaihai
找错误
|
1279
|
assert(doEffect[effect[1]], "error effect, event_" .. (tag or "choose") .. "Csv id :" .. (block.event and block.event.id or 0) .. "effect " .. effect[1])
|
e10edb5f
zhouahaihai
冒险事件新
|
1280
1281
|
doEffect[effect[1]]()
end
|
bbf64622
zhouhaihai
冒险
|
1282
1283
|
self:scoreChange(AdvScoreType.Event, chooseData.advScore) --增加加分
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
1284
1285
1286
1287
1288
1289
|
return true, clearBlock
end
local function clickChoose(self, room, block, params)
local choose = params.choose
local chooseData = csvdb["event_chooseCsv"][block.event.id]
|
6ce6fac7
zhouhaihai
冒险任务bug
|
1290
|
local oldId = block.event.id
|
1ffc16b9
zhouhaihai
冒险 选择点和 建筑
|
1291
|
local status, clearBlock = chooseCommon(self, room, block, chooseData, choose, "choose")
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
1292
|
if not status then return end
|
6ce6fac7
zhouhaihai
冒险任务bug
|
1293
1294
1295
1296
|
self:checkAdvUnlock(3, oldId)
self:checkTask(Adv.TaskType.Choose, 1, oldId)
self:checkAchievement(Adv.AchievType.Choose, 1, oldId)
self:checkAchievement(Adv.AchievType.ChooseBySelect, 1, oldId, choose)
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
1297
1298
1299
1300
1301
1302
1303
1304
1305
|
if clearBlock then
block:clear()
end
return true
end
local function clickLinkChoose(self, room, block, params)
local choose = params.choose
local chooseData = csvdb["event_linkchooseCsv"][block.event.id]
|
abe0d7e9
zhouhaihai
连续选择点bug
|
1306
|
local lcId = block.event.id
|
1ffc16b9
zhouhaihai
冒险 选择点和 建筑
|
1307
|
local status, clearBlock = chooseCommon(self, room, block, chooseData, choose, "link")
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
1308
1309
1310
|
if not status then return end
-- 完成统计次数
|
abe0d7e9
zhouhaihai
连续选择点bug
|
1311
1312
1313
|
local idx = lcId % 10
if idx == 9 or not csvdb["event_linkchooseCsv"][lcId + 1] then --全部完成
local startId = math.floor(lcId / 10) * 10 + 1
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
1314
|
self.lchoose[startId] = (self.lchoose[startId] or 0) + 1
|
b176d7d3
zhouhaihai
冒险成就
|
1315
|
self:checkAchievement(Adv.AchievType.LinkChoose, 1, startId)
|
e852b350
zhouhaihai
冒险成就类型增加
|
1316
|
self:checkAchievement(Adv.AchievType.FinishStoryId, 1, chooseData.storyid)
|
6133e29f
zhouhaihai
新加任务
|
1317
|
self:checkTask(Adv.TaskType.FinishStoryId, 1, chooseData.storyid)
|
e852b350
zhouhaihai
冒险成就类型增加
|
1318
1319
1320
1321
1322
|
local advStoryB = self.owner:getProperty("advStoryB")
advStoryB[chooseData.storyid] = (advStoryB[chooseData.storyid] or 0) + 1
self.owner:setProperty("advStoryB", advStoryB)
local storyData = csvdb["event_linkchoose_storyCsv"][chooseData.storyid]
self:checkAchievement(Adv.AchievType.StorryDone, 1, storyData[1].chapter) -- 检查故事对应章节
|
68964730
zhouhaihai
增加积分 bug
|
1323
|
self:scoreChange(AdvScoreType.Story, storyData[1].advScore) --增加加分
|
e852b350
zhouhaihai
冒险成就类型增加
|
1324
|
|
f45d3a7b
zhouhaihai
adv_unlock
|
1325
|
self:checkAdvUnlock(4, startId)
|
e6439157
zhouhaihai
故事事件
|
1326
|
self.lchoose.cur = self.lchoose.cur or {}
|
abe0d7e9
zhouhaihai
连续选择点bug
|
1327
|
table.insert(self.lchoose.cur, {lcId, choose})
|
e6439157
zhouhaihai
故事事件
|
1328
1329
|
self:pushBackEvent(AdvBackEventType.LinkChooseOver, self.lchoose.cur)
self.lchoose.cur = nil
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
1330
|
else
|
abe0d7e9
zhouhaihai
连续选择点bug
|
1331
|
self.lchoose.ing = lcId + 1 --后面会出现后继事件
|
e6439157
zhouhaihai
故事事件
|
1332
|
self.lchoose.cur = self.lchoose.cur or {}
|
abe0d7e9
zhouhaihai
连续选择点bug
|
1333
|
table.insert(self.lchoose.cur, {lcId, choose})
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
1334
|
end
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
1335
|
|
02c4de8d
zhouahaihai
增加 固有技
|
1336
|
if clearBlock then
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
1337
|
block:clear()
|
02c4de8d
zhouahaihai
增加 固有技
|
1338
|
end
|
b176d7d3
zhouhaihai
冒险成就
|
1339
|
|
46fac6f1
zhouahaihai
酱料
|
1340
1341
1342
1343
1344
1345
|
return true
end
local function clickDrop(self, room, block, params)
local reward = {}
if not block.event.item then return end
|
f0b81492
zhouhaihai
营地进入 bug
|
1346
|
if not self.battle or not self.battle.player then return end
|
d3da3368
zhouhaihai
冒险地图被动技, buff 神器
|
1347
|
self.battle.player:triggerPassive(Passive.CLICK_DROP)
|
f0b81492
zhouhaihai
营地进入 bug
|
1348
|
|
3133cb76
zhouhaihai
日志
|
1349
|
local reward = self:award({[block.event.item[1]] = block.event.item[2]}, {log = {desc = "clickDrop"}})
|
916096ed
zhouhaihai
神器效果
|
1350
|
-- local reward = self:award({[5801] = 1})
|
1e9cb217
chenyueqi
服务器记录控制引导过程
|
1351
1352
1353
1354
|
-- 获取绷带的引导
if block.event.item[1] == 5020 and not self.owner:checkOverGuide(53,2) then
self.owner:saveGuide(53,2)
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
1355
|
block:clear()
|
3df1e9ea
zhouhaihai
掉落增加 地块信息,。click ...
|
1356
|
self:backReward(reward, {roomId = room.roomId, blockId = block.blockId})
|
46fac6f1
zhouahaihai
酱料
|
1357
1358
1359
1360
1361
1362
|
return true
end
local function clickTrader(self, room, block, params)
local buyId = params.id
local traderData = csvdb["event_traderCsv"][block.event.id]
|
8c4a6f4c
zhouhaihai
冒险增加错误返回
|
1363
|
if not traderData then return false, 1 end -- 偷偷改表了
|
46fac6f1
zhouahaihai
酱料
|
1364
|
|
8c4a6f4c
zhouhaihai
冒险增加错误返回
|
1365
1366
|
if not block.event.shop or not block.event.shop[buyId] then return false, 2 end
if (block.event.status or ""):getv(buyId, 0) == 1 then return false, 3 end -- 买过了
|
46fac6f1
zhouahaihai
酱料
|
1367
|
|
127a5787
zhouhaihai
商人卖完走人
|
1368
|
local buyCount = #((block.event.status or ""):toArray())
|
27cc6f23
zhouhaihai
商店bug
|
1369
|
if traderData.purchasetime ~= 0 and traderData.purchasetime <= buyCount then return false, 4 end
|
f8408529
zhouhaihai
冒险商店
|
1370
1371
|
local goodsData = csvdb["event_trader_goodsCsv"][block.event.shop[buyId][1]]
|
8c4a6f4c
zhouhaihai
冒险增加错误返回
|
1372
|
if not goodsData then return false, 5 end
|
f8408529
zhouhaihai
冒险商店
|
1373
1374
|
local costCount = math.ceil(goodsData.price * (block.event.shop[buyId][2] or 100) / 100)
|
498f0eb2
zhouhaihai
冒险 action
|
1375
|
if not self:cost({[goodsData.currency] = costCount}, {log = {desc = "clickTrader", int1 = block.event.id}}) then return false, 6 end --不够
|
f8408529
zhouhaihai
冒险商店
|
1376
|
self:backCost({[goodsData.currency] = costCount})
|
3133cb76
zhouhaihai
日志
|
1377
|
local reward = self:award({[goodsData.item] = goodsData.num}, {log = {desc = "clickTrader", int1 = block.event.id}})
|
f8408529
zhouhaihai
冒险商店
|
1378
1379
1380
1381
1382
1383
1384
|
if goodsData.restrict == 1 then
self.shopStatus[goodsData.goods] = (self.shopStatus[goodsData.goods] or 0) + 1
elseif goodsData.restrict == 2 then
local advShop = self.owner:getProperty("advShop")
advShop[goodsData.goods] = (advShop[goodsData.goods] or 0) + 1
self.owner:updateProperty({field = "advShop", value = advShop})
end
|
46fac6f1
zhouahaihai
酱料
|
1385
|
block.event.status = block.event.status:setv(buyId, 1)
|
127a5787
zhouhaihai
商人卖完走人
|
1386
|
buyCount = buyCount + 1
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
1387
|
self:checkTask(Adv.TaskType.Shop, 1, block.event.id)
|
b176d7d3
zhouhaihai
冒险成就
|
1388
|
self:checkAchievement(Adv.AchievType.Shop, 1, block.event.id)
|
46fac6f1
zhouahaihai
酱料
|
1389
|
self:backReward(reward)
|
127a5787
zhouhaihai
商人卖完走人
|
1390
|
|
27cc6f23
zhouhaihai
商店bug
|
1391
|
if (traderData.purchasetime ~= 0 and traderData.purchasetime <= buyCount) or #block.event.shop <= buyCount then
|
127a5787
zhouhaihai
商人卖完走人
|
1392
1393
|
block:clear()
end
|
46fac6f1
zhouahaihai
酱料
|
1394
1395
1396
1397
|
return true
end
local function clickBuild(self, room, block, params)
|
1ffc16b9
zhouhaihai
冒险 选择点和 建筑
|
1398
1399
|
local choose = params.choose
local chooseData = csvdb["event_buildingCsv"][block.event.id]
|
6ce6fac7
zhouhaihai
冒险任务bug
|
1400
|
local oldId = block.event.id
|
1ffc16b9
zhouhaihai
冒险 选择点和 建筑
|
1401
1402
|
local status, clearBlock = chooseCommon(self, room, block, chooseData, choose, "build")
if not status then return end
|
85ded242
zhouhaihai
丰富返回事件
|
1403
|
|
6ce6fac7
zhouhaihai
冒险任务bug
|
1404
1405
1406
|
self:checkTask(Adv.TaskType.Build, 1, oldId)
self:checkAchievement(Adv.AchievType.Build, 1, oldId)
self:checkAchievement(Adv.AchievType.BuildBySelect, 1, oldId, choose)
|
1ffc16b9
zhouhaihai
冒险 选择点和 建筑
|
1407
|
|
02c4de8d
zhouahaihai
增加 固有技
|
1408
|
if clearBlock then
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
1409
|
block:clear()
|
02c4de8d
zhouahaihai
增加 固有技
|
1410
|
end
|
46fac6f1
zhouahaihai
酱料
|
1411
1412
1413
|
return true
end
|
c0b7797f
zhouhaihai
陷阱、点击生效点
|
1414
1415
|
local function clickClick(self, room, block, params)
local clickData = csvdb["event_clickCsv"][block.event.id]
|
6133e29f
zhouhaihai
新加任务
|
1416
|
local oldId = block.event.id
|
c0b7797f
zhouhaihai
陷阱、点击生效点
|
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
|
if not clickData then return end
local clearBlock = true
local doEffect = {
[1] = function() -- 技能
for _, skillId in ipairs(clickData.effect:toArray(true, "=")) do
self.battle.player:releaseSkill(skillId)
end
end,
[2] = function() -- dropId
local reward = {}
for _, dropId in ipairs(clickData.effect:toArray(true, "=")) do
local item = csvdb["event_dropCsv"][dropId]["range"]:randWeight(true)
|
68e60f7a
zhouhaihai
掉落
|
1429
|
reward[item[1]] = (reward[item[1]] or 0) + item[2]
|
c0b7797f
zhouhaihai
陷阱、点击生效点
|
1430
|
end
|
3133cb76
zhouhaihai
日志
|
1431
|
self:backReward(self:award(reward, {log = {desc = "clickClick", int1 = block.event.id}}), {roomId = room.roomId, blockId = block.blockId})
|
3df1e9ea
zhouhaihai
掉落增加 地块信息,。click ...
|
1432
1433
1434
1435
1436
|
end,
[3] = function()
for _, buffId in ipairs(clickData.effect:toArray(true, "=")) do
self.battle.player:addBuff(buffId)
end
|
c0b7797f
zhouhaihai
陷阱、点击生效点
|
1437
1438
|
end,
}
|
6133e29f
zhouhaihai
新加任务
|
1439
|
|
a1e9e891
zhouhaihai
点击事件未生效
|
1440
1441
|
assert(doEffect[clickData.type], "error effect, event_clickCsv id :" .. block.event.id)
doEffect[clickData.type]()
|
6133e29f
zhouhaihai
新加任务
|
1442
1443
|
self:checkTask(Adv.TaskType.Click, 1, oldId)
|
c0b7797f
zhouhaihai
陷阱、点击生效点
|
1444
|
if clearBlock then
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
1445
|
block:clear()
|
c0b7797f
zhouhaihai
陷阱、点击生效点
|
1446
|
end
|
f20cc9ca
zhouhaihai
点击点返回清空信息
|
1447
|
return true
|
c0b7797f
zhouhaihai
陷阱、点击生效点
|
1448
1449
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
|
local function clickLayer(self, room, block, params)
if block.event.mapIdx then
table.insert(self.mapStack, block.event.mapIdx) --进入夹层
else
--生成夹层
local mapId = csvdb["event_layerCsv"][block.event.id].effect
local mapIdx = #self.maps + 1
block.event.mapIdx = mapIdx
table.insert(self.mapStack, mapIdx)
self.maps[mapIdx] = AdvMap.new(self, mapIdx, mapId)
|
78dcacb6
zhouhaihai
夹层 后处理 没做
|
1461
|
self.battle:initMapEnemys(mapIdx, true)
|
7b2dc17c
zhouhaihai
地图 层 buff passive
|
1462
|
self.battle:initMapEffect(true)
|
1313eac0
zhouhaihai
冒险的一些bug
|
1463
|
self.maps[mapIdx]:initBattleAfter()
|
b176d7d3
zhouhaihai
冒险成就
|
1464
|
self:checkAchievement(Adv.AchievType.EnterILayer, 1, mapId)
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
1465
|
end
|
85ded242
zhouhaihai
丰富返回事件
|
1466
|
self:backLayer(1)
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
1467
1468
1469
|
return true
end
|
46fac6f1
zhouahaihai
酱料
|
1470
1471
|
local eventCallFunc = {
[AdvEventType.Out] = clickOut,
|
0e3ab88d
zhouhaihai
中继层
|
1472
1473
|
[AdvEventType.InOut] = clickOut,
[AdvEventType.Exit] = clickExit,
|
46fac6f1
zhouahaihai
酱料
|
1474
1475
1476
|
[AdvEventType.BOSS] = clickMonster,
[AdvEventType.Monster] = clickMonster,
[AdvEventType.Choose] = clickChoose,
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
1477
|
[AdvEventType.LinkChoose] = clickLinkChoose,
|
46fac6f1
zhouahaihai
酱料
|
1478
1479
1480
|
[AdvEventType.Drop] = clickDrop,
[AdvEventType.Trader] = clickTrader,
[AdvEventType.Build] = clickBuild,
|
c0b7797f
zhouhaihai
陷阱、点击生效点
|
1481
|
[AdvEventType.Click] = clickClick,
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
1482
|
[AdvEventType.Layer] = clickLayer,
|
46fac6f1
zhouahaihai
酱料
|
1483
1484
1485
1486
1487
|
}
--点击处理 roomId, blockId
--params 某些事件需要的客户端传递的参数
function Adv:clickBlock(roomId, blockId, params)
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
1488
1489
1490
|
local map = self:getCurMap()
local room = self:getRoom(roomId)
local block = self:getBlock(roomId, blockId)
|
46fac6f1
zhouahaihai
酱料
|
1491
1492
|
if not block then return end
|
8c4a6f4c
zhouhaihai
冒险增加错误返回
|
1493
|
local status, errorCode = false, nil
|
36c30c5c
zhouahaihai
冒险
|
1494
|
local clickEvent = false
|
48962a74
zhouhaihai
路障系统提交
|
1495
1496
|
local function checkAroundBlocks(ignoreGuard)
|
36c30c5c
zhouahaihai
冒险
|
1497
|
local canOpen = false --如果未开放是否可以开放
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
1498
|
for _, one in ipairs(map:getAroundBlocks(room, block)) do
|
36c30c5c
zhouahaihai
冒险
|
1499
|
local _room, _block = one[1], one[2]
|
48962a74
zhouhaihai
路障系统提交
|
1500
1501
1502
|
if not ignoreGuard and _block:isGuard() then
if _block:isMonster() then
local enemy = self.battle:getEnemy(_room.roomId, _block.blockId)
|
a0834e49
zhouhaihai
增加潜行 功能
|
1503
|
if not enemy:hadBuff(Buff.DONT_DEFEND) and not self.battle.player:hadBuff(Buff.SNEAK) then
|
48962a74
zhouhaihai
路障系统提交
|
1504
1505
1506
1507
|
return false
end
else
return false
|
4f0a5fae
zhouhaihai
营养剂
|
1508
|
end
|
48962a74
zhouhaihai
路障系统提交
|
1509
1510
|
elseif _block:isWalk() then
canOpen = true
|
36c30c5c
zhouahaihai
冒险
|
1511
1512
|
end
end
|
48962a74
zhouhaihai
路障系统提交
|
1513
1514
1515
1516
|
return canOpen
end
if not block.isOpen then
|
7b64b6cd
zhouhaihai
中继层优化
|
1517
|
if self.isRelay or checkAroundBlocks() then --开放
|
8781e103
zhouhaihai
冒险 bug
|
1518
|
self:getCurMap():openBlock(roomId, blockId, true, true)
|
7b64b6cd
zhouhaihai
中继层优化
|
1519
1520
1521
1522
1523
1524
|
if self.isRelay and self:getCurMap():isAllOpen() then -- 发放翻开的奖励
local relayData = self:isHaveRelay()
if relayData and relayData.award ~= "" then
self:pushBackEvent(AdvBackEventType.RelayReward, {items = self:award(relayData.award:toNumMap(), {log = {desc = "relayReward"}})})
end
end
|
46fac6f1
zhouahaihai
酱料
|
1525
1526
1527
|
status = true
end
else
|
36c30c5c
zhouahaihai
冒险
|
1528
|
clickEvent = true
|
46fac6f1
zhouahaihai
酱料
|
1529
1530
1531
1532
|
--点了空地
if not block.event then
return
end
|
48962a74
zhouhaihai
路障系统提交
|
1533
1534
1535
1536
|
if block:isHinder() then
if not checkAroundBlocks(true) then return end
end
|
46fac6f1
zhouahaihai
酱料
|
1537
|
--可点击的事件
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
1538
|
if not room.isBossRoom or block:isBoss() then
|
46fac6f1
zhouahaihai
酱料
|
1539
|
if eventCallFunc[block.event.etype] then
|
8c4a6f4c
zhouhaihai
冒险增加错误返回
|
1540
|
status, errorCode = eventCallFunc[block:getEventType()](self, room, block, params)
|
46fac6f1
zhouahaihai
酱料
|
1541
1542
1543
|
end
end
end
|
39a6e08b
suhongyang
冒险战斗内逻辑调整
|
1544
|
local needChange = true
|
ae20365b
suhongyang
Revert "修改冒险战斗逻辑"
|
1545
|
if clickEvent and block.event then
|
8b25d183
zhouhaihai
切换层不更新回合
|
1546
1547
1548
1549
|
if block:getEventType() == AdvEventType.Out
or block:getEventType() == AdvEventType.InOut
or block:getEventType() == AdvEventType.Layer
or block:getEventType() == AdvEventType.Exit then
|
ae20365b
suhongyang
Revert "修改冒险战斗逻辑"
|
1550
1551
|
needChange = false
end
|
39a6e08b
suhongyang
冒险战斗内逻辑调整
|
1552
1553
|
end
if status and needChange then --出去了就不计算回合了
|
46fac6f1
zhouahaihai
酱料
|
1554
1555
1556
|
self:backBlockChange(roomId, blockId)
self:afterRound()
end
|
36c30c5c
zhouahaihai
冒险
|
1557
|
self:saveDB()
|
8c4a6f4c
zhouhaihai
冒险增加错误返回
|
1558
|
return status, errorCode
|
46fac6f1
zhouahaihai
酱料
|
1559
1560
|
end
|
46fac6f1
zhouahaihai
酱料
|
1561
|
|
4f0a5fae
zhouhaihai
营养剂
|
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
|
function Adv:doActive(activeId, target)
local activeData = csvdb["adv_activeCsv"][activeId]
if not activeData then return end
local targers = {}
-- 筛选对象
if activeData.usetype == 1 then -- 自己
elseif activeData.usetype == 2 then -- 敌人
if not target or not target.roomId or not target.blockId then return end
local block = self:getBlock(target.roomId, target.blockId)
if block:isBoss() then return end
local enemy = self.battle:getEnemy(target.roomId, target.blockId)
if not enemy then return end
local blocks = self:getCurMap():getBlocksBySize(target.roomId, target.blockId, activeData.scope)
for _, block in pairs(blocks) do
if block:isMonster() and not block:isBoss() then
local e = self.battle:getEnemy(block.room.roomId, block.blockId)
if e then
table.insert(targers, e)
end
end
end
elseif activeData.usetype == 3 then -- 地板
if not target or not target.roomId or not target.blockId then return end
local block = self:getBlock(target.roomId, target.blockId)
if block:isBoss() then return end
local blocks = self:getCurMap():getBlocksBySize(target.roomId, target.blockId, activeData.scope)
for _, block in pairs(blocks) do
if not block:isBoss() then
table.insert(targers, block)
end
end
|
318c573a
zhouhaihai
冒险bug
|
1595
|
elseif activeData.usetype == 4 then -- 没有目标 全体成员
|
4f0a5fae
zhouhaihai
营养剂
|
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
|
elseif activeData.usetype == 5 then -- 空地板
if not target or not target.roomId or not target.blockId then return end
local block = self:getBlock(target.roomId, target.blockId)
if not block.isOpen or block:getEventType() then return end
local blocks = self:getCurMap():getBlocksBySize(target.roomId, target.blockId, activeData.scope)
for _, block in pairs(blocks) do
if not block:isBoss() then
table.insert(targers, block)
end
end
end
local doActiveEffect = {}
-- 1=map_buff_id:为范围内所有目标附加mapbuff
doActiveEffect[1] = function(_, buffId)
|
318c573a
zhouhaihai
冒险bug
|
1612
1613
1614
1615
1616
1617
1618
1619
|
if not next(targers) then
if activeData.usetype == 1 then
table.insert(targers, self.battle.player)
elseif activeData.usetype == 4 then
targers = self.battle.player:getTeam(2)
else
return
end
|
4f0a5fae
zhouhaihai
营养剂
|
1620
1621
1622
|
end
for _, target in ipairs(targers) do
|
318c573a
zhouhaihai
冒险bug
|
1623
1624
1625
1626
1627
1628
|
if target.class.__cname == "AdvBlock" then
target = self.battle:getEnemy(target.room.roomId, target.blockId)
end
if target then
target:addBuff(buffId, self.battle.player)
end
|
4f0a5fae
zhouhaihai
营养剂
|
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
|
end
return true
end
-- 2=trader_id:召唤商人
doActiveEffect[2] = function(_, traderId)
for _, target in ipairs(targers) do
if target.isOpen and not target:getEventType() then
target:updateEvent({
etype = AdvEventType.Trader,
id = traderId,
})
|
4f0a5fae
zhouhaihai
营养剂
|
1641
|
self:backBlockChange(target.room.roomId, target.blockId)
|
d232676a
zhouhaihai
功能解锁 冒险返回
|
1642
|
self:pushBackEvent(AdvBackEventType.Trader, {id = traderId})
|
4f0a5fae
zhouhaihai
营养剂
|
1643
1644
1645
1646
1647
1648
1649
1650
1651
|
end
end
return true
end
-- 3=monster_id:替换怪物,仅使用方式为2时生效
doActiveEffect[3] = function(_, monsterId)
for _, target in ipairs(targers) do
if not target.lock and not target.isDead then
|
318c573a
zhouhaihai
冒险bug
|
1652
|
self:getCurMap():addNewMonsterRand(monsterId, {self:getRoom(target.roomId), self:getBlock(target.roomId, target.blockId)})
|
4f0a5fae
zhouhaihai
营养剂
|
1653
|
self:backBlockChange(target.roomId, target.blockId)
|
d232676a
zhouhaihai
功能解锁 冒险返回
|
1654
|
self:pushBackEvent(AdvBackEventType.Monster, {id = monsterId})
|
4f0a5fae
zhouhaihai
营养剂
|
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
|
end
end
return true
end
-- 4:显示本层
doActiveEffect[4] = function(_)
self:getCurMap():showMap()
self:backMapShow()
return true
end
-- 5:放逐目标
doActiveEffect[5] = function(_)
for _, target in ipairs(targers) do
if not target.lock and not target.isDead then
|
7b2dc17c
zhouhaihai
地图 层 buff passive
|
1669
|
target:kill()
|
4f0a5fae
zhouhaihai
营养剂
|
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
|
self:backBlockChange(target.roomId, target.blockId)
end
end
return true
end
-- 6=陷阱id:移除陷阱,不填写id则移除所有陷阱
doActiveEffect[6] = function(_, trapId)
if not next(targers) and activeData.usetype == 4 then
-- 全屏
for _, room in pairs(self:getCurMap().rooms) do
for _, block in pairs(room.blocks) do
if block:getEventType() == AdvEventType.Trap then
block:updateEvent(nil)
self:backBlockChange(block.room.roomId, block.blockId)
end
end
end
else
for _ , target in ipairs(targers) do
if target:getEventType() == AdvEventType.Trap then
target:updateEvent(nil)
self:backBlockChange(target.room.roomId, target.blockId)
end
end
end
return true
end
-- 7=道具燃烧效果
doActiveEffect[7] = function(_)
for _ , target in ipairs(targers) do
if target:getEventType() == AdvEventType.Drop then
target:updateEvent(nil)
self:backBlockChange(target.room.roomId, target.blockId)
end
end
return true
end
-- 8:翻开范围内的方格
doActiveEffect[8] = function(_)
for _ , target in ipairs(targers) do
|
c8210d56
zhouhaihai
boss 房有入口
|
1712
|
self:getCurMap():openBlock(target.room.roomId, target.blockId, true)
|
4f0a5fae
zhouhaihai
营养剂
|
1713
1714
1715
1716
|
end
return true
end
|
db3c56ad
zhouhaihai
冒险相关
|
1717
1718
1719
1720
1721
1722
|
-- 9: 给玩家增加buff
doActiveEffect[9] = function(_, buffId)
self.battle.player:addBuff(buffId, self.battle.player)
return true
end
|
6dc482bb
zhouhaihai
中继层完成, 新增两个冒险物品使用效果
|
1723
1724
|
--10: 立刻结算 按比例返还
doActiveEffect[10] = function(_, rewardRatio)
|
bbf64622
zhouhaihai
冒险
|
1725
|
self:over(true, rewardRatio, 1)
|
6dc482bb
zhouhaihai
中继层完成, 新增两个冒险物品使用效果
|
1726
1727
|
return true
end
|
1bb3abca
zhouhaihai
冒险 退出 bug
|
1728
|
|
6dc482bb
zhouhaihai
中继层完成, 新增两个冒险物品使用效果
|
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
|
--11: 随机提升一个未满级神器等级,配置提升等级
doActiveEffect[11] = function(_, level)
local advAFGet = self.owner:getProperty("advAFGet")
local pool = {}
for id_, lv in pairs(advAFGet) do
if self.owner:isArtifactOpen(id_, self:isEndless(), lv + 1) then
table.insert(pool, id_)
end
end
if #pool > 0 then
local idx = math.randomInt(1, #pool)
self:artifactLevelUp(pool[idx], level)
end
return true
end
|
1bb3abca
zhouhaihai
冒险 退出 bug
|
1744
|
|
d232676a
zhouhaihai
功能解锁 冒险返回
|
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
|
doActiveEffect[12] = function(_, vtype, attrType, value)
local attr
if attrType == 0 then
attr = "sp"
else
attr = AttsEnumEx[attrType]
if not AdvAttsEnum[attr] then return end
end
self.battle.player:addBaseAttr(attr, value, vtype)
return true
end
|
4f0a5fae
zhouhaihai
营养剂
|
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
|
for _, effect in ipairs(activeData.effect:toArray()) do
local cur = effect:toArray(true, "=")
if doActiveEffect[cur[1]] then
if not doActiveEffect[cur[1]](table.unpack(cur)) then
return
end
end
end
return true
end
|
46fac6f1
zhouahaihai
酱料
|
1769
|
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
1770
1771
1772
1773
1774
1775
1776
1777
|
-- 地图上物品变化
function Adv:mapItemChange(ctype)
local clist = csvdb["transform_itemCsv"][ctype]
if clist then
for roomId, room in pairs(self:getCurMap().rooms) do
for blockId, block in pairs(room.blocks) do
if block:getEventType() == AdvEventType.Drop and block.event.item then
local id = block.event.item[1]
|
e3c5cc5e
zhouhaihai
跨服竞技场over
|
1778
|
local count = block.event.item[2]
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
1779
1780
|
local changeTo = nil
if clist[id] then
|
e3c5cc5e
zhouhaihai
跨服竞技场over
|
1781
|
changeTo = {clist[id].toId, math.ceil(count * clist[id].num)}
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
1782
|
elseif clist[-1] then
|
e3c5cc5e
zhouhaihai
跨服竞技场over
|
1783
|
changeTo = {clist[-1].toId, math.ceil(count * clist[-1].num)}
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
1784
1785
1786
|
end
if changeTo and changeTo[1] ~= 0 and changeTo[2] ~= 0 then
block.event.item = changeTo
|
b2e41074
zhouhaihai
冒险 排行榜拆分
|
1787
|
self:backBlockChange(roomId, blockId, ctype)
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
1788
1789
1790
1791
1792
1793
1794
|
end
end
end
end
end
end
|
46fac6f1
zhouahaihai
酱料
|
1795
|
--敌人死亡
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
1796
1797
|
function Adv:enemyDead(enemy, escape)
local roomId, blockId = enemy.roomId, enemy.blockId
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
1798
1799
1800
1801
|
local map = self:getCurMap()
local room = self:getRoom(roomId)
local block = self:getBlock(roomId, blockId)
if not block then return end
|
46fac6f1
zhouahaihai
酱料
|
1802
|
--死了以后掉东西
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
1803
1804
|
if block:isMonster() then --处理死亡
if block:isBoss() then
|
36c30c5c
zhouahaihai
冒险
|
1805
1806
|
room.isBossRoom = false
end
|
02c4de8d
zhouahaihai
增加 固有技
|
1807
|
if escape then
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
1808
|
block:clear()
|
02c4de8d
zhouahaihai
增加 固有技
|
1809
|
else
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
1810
1811
|
local enemyId = block.event.id
local monsterData = csvdb["event_monsterCsv"][enemyId]
|
bbf64622
zhouhaihai
冒险
|
1812
1813
1814
1815
1816
|
if block:isBoss() then
self:scoreChange(AdvScoreType.KillBoss, monsterData.advScore)
else
self:scoreChange(AdvScoreType.Kill, monsterData.advScore)
end
|
85ded242
zhouhaihai
丰富返回事件
|
1817
1818
|
local changeV = self.battle.player:addExp(monsterData.exp)
self:backDead(enemyId, changeV)
|
9104a922
zhouhaihai
多重掉落
|
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
|
local toClick = enemy:hadBuff(Buff.CHANGE_DROP_TO_CLICK)
if toClick then
toClick = toClick:effect()
end
local changItem = enemy:hadBuff(Buff.CHANGE_DROP)
if changItem then
changItem = table.pack(changItem:effect())
end
local addMult = 0
local dropBuff = enemy:hadBuff(Buff.DROP_BUFF_BY_ENEMY) -- 根据敌人数量变化个数
if dropBuff then
local team = enemy:getTeam(1, true)
addMult = addMult + 0.2 * #team
end
local dropIds = monsterData.dropid:toArray(true, "=")
local drops = {}
local cCcount = 0 -- 需要改变为click 的个数
for _, dropId in ipairs(dropIds) do
local dropData = csvdb["event_dropCsv"][dropId]
if dropData then
local cur = dropData["range"]:randWeight(true)
if cur and cur[1] ~= 0 then
if toClick then
cCcount = cCcount + 1
|
e7b51763
zhouhaihai
无掉落怪
|
1847
|
else
|
9104a922
zhouhaihai
多重掉落
|
1848
1849
1850
|
local item = changItem and changItem or cur
item[2] = math.floor(item[2] * (1 + addMult))
drops[#drops + 1] = item
|
e7b51763
zhouhaihai
无掉落怪
|
1851
|
end
|
db3c56ad
zhouhaihai
冒险相关
|
1852
|
end
|
db3c56ad
zhouhaihai
冒险相关
|
1853
|
end
|
9104a922
zhouhaihai
多重掉落
|
1854
1855
1856
1857
1858
1859
|
end
-- 这些奖励可能会有被动加成
self.battle.player:triggerPassive(Passive.BATTLE_WIN, {drops = drops})
-- 自身带的掉落是不会被改变的 也不会被加成
if block.event.item and block.event.item[1] ~= 0 then
|
397608b3
zhouhaihai
冒险错了
|
1860
|
table.insert(drops, 1, block.event.item)
|
9104a922
zhouhaihai
多重掉落
|
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
|
end
-- 清空当前的格子
block:clear()
-- 掉落走一波
local blocks = self:getCurMap():getEmptyBlocks(roomId, blockId, #drops)
for _i, cblock in ipairs(blocks) do
cblock:updateEvent({
etype = AdvEventType.Drop,
item = drops[_i]
})
if cblock ~= block then
self:backBlockChange(cblock.room.roomId, cblock.blockId)
end
end
-- 转换的click走一波
local blocks = self:getCurMap():getEmptyBlocks(roomId, blockId, cCcount)
for _i, cblock in ipairs(blocks) do
cblock:updateEvent({
etype = AdvEventType.Click,
id = clickId
})
if cblock ~= block then
self:backBlockChange(cblock.room.roomId, cblock.blockId)
|
db3c56ad
zhouhaihai
冒险相关
|
1887
|
end
|
4b7c7c96
zhouahaihai
增加 清空 挂机 冒险gm 角色经验
|
1888
|
end
|
9104a922
zhouhaihai
多重掉落
|
1889
|
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
1890
1891
|
self:checkTask(Adv.TaskType.Kill, 1, enemyId)
self:checkTask(Adv.TaskType.KillAll)
|
b176d7d3
zhouhaihai
冒险成就
|
1892
|
self:checkAchievement(Adv.AchievType.Kill, 1, enemyId)
|
e852b350
zhouhaihai
冒险成就类型增加
|
1893
1894
|
self:checkAchievement(Adv.AchievType.KillHadBuff, 1, enemy)
|
71a18948
zhouhaihai
成就未生效
|
1895
1896
|
self:checkAchievement(Adv.AchievType.KillWithBuff, 1)
self:checkAchievement(Adv.AchievType.KillNoBuff, 1)
|
e852b350
zhouhaihai
冒险成就类型增加
|
1897
1898
1899
1900
|
self:checkAchievement(Adv.AchievType.KillWithMWeapon, 1)
self:checkAchievement(Adv.AchievType.KillWithAMWeapon, 1)
if monsterData.type == 2 then
|
6133e29f
zhouhaihai
新加任务
|
1901
|
self:checkTask(Adv.TaskType.KillBoss, 1, enemyId)
|
71a18948
zhouhaihai
成就未生效
|
1902
1903
1904
|
self:checkAchievement(Adv.AchievType.KillBoss, 1, enemyId)
self:checkAchievement(Adv.AchievType.KillBossWithBuff, 1)
self:checkAchievement(Adv.AchievType.KillBossNoBuff, 1)
|
e852b350
zhouhaihai
冒险成就类型增加
|
1905
1906
|
self:checkAchievement(Adv.AchievType.KillBossWithMWeapon, 1)
self:checkAchievement(Adv.AchievType.KillBossWithAMWeapon, 1)
|
6133e29f
zhouhaihai
新加任务
|
1907
1908
|
elseif monsterData.type == 3 then
self:checkTask(Adv.TaskType.KillElite, 1, enemyId)
|
e852b350
zhouhaihai
冒险成就类型增加
|
1909
|
end
|
46fac6f1
zhouahaihai
酱料
|
1910
|
end
|
46fac6f1
zhouahaihai
酱料
|
1911
1912
1913
1914
|
end
self:backBlockChange(roomId, blockId)
end
|
46fac6f1
zhouahaihai
酱料
|
1915
1916
1917
1918
1919
|
function Adv:pushBackEvent(btype, params)
table.insert(self.backEvents, {btype = btype, params = params})
end
|
3df1e9ea
zhouhaihai
掉落增加 地块信息,。click ...
|
1920
1921
1922
|
function Adv:backReward(items, params)
params = params or {}
self:pushBackEvent(AdvBackEventType.Reward, {items = items, roomId = params.roomId, blockId = params.blockId})
|
46fac6f1
zhouahaihai
酱料
|
1923
|
end
|
e996b82a
zhouahaihai
冒险增加防御属性
|
1924
1925
|
-- if is player enemyId is nil
|
46fac6f1
zhouahaihai
酱料
|
1926
|
function Adv:backSkill(enemyId, skillId, receiver)
|
36c30c5c
zhouahaihai
冒险
|
1927
|
self:pushBackEvent(AdvBackEventType.Skill, {enemyId = enemyId, skillId = skillId, receiver = receiver})
|
46fac6f1
zhouahaihai
酱料
|
1928
1929
|
end
|
46fac6f1
zhouahaihai
酱料
|
1930
1931
1932
1933
|
function Adv:backNext()
self:pushBackEvent(AdvBackEventType.Next, {})
end
|
46fac6f1
zhouahaihai
酱料
|
1934
|
|
b2e41074
zhouhaihai
冒险 排行榜拆分
|
1935
1936
|
function Adv:backBlockChange(roomId, blockId, itemChangeType)
self:pushBackEvent(AdvBackEventType.BlockChange, {roomId = roomId, blockId = blockId, itemChangeType = itemChangeType})
|
46fac6f1
zhouahaihai
酱料
|
1937
1938
|
end
|
85ded242
zhouhaihai
丰富返回事件
|
1939
1940
|
function Adv:backDead(enemyId, exp)
self:pushBackEvent(AdvBackEventType.Dead, {enemyId = enemyId, exp = exp})
|
bedca62d
zhouahaihai
冒险
|
1941
1942
|
end
|
386ca58e
zhouhaihai
优化log
|
1943
1944
1945
|
function Adv:backTrap()
self:pushBackEvent(AdvBackEventType.Trap, {})
end
|
ec87b4a5
zhouahaihai
冒险 完善
|
1946
|
|
85ded242
zhouhaihai
丰富返回事件
|
1947
1948
|
function Adv:backLayer(status)
self:pushBackEvent(AdvBackEventType.Layer, {status = status})
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
1949
1950
|
end
|
4f0a5fae
zhouhaihai
营养剂
|
1951
1952
1953
1954
|
function Adv:backMapShow()
self:pushBackEvent(AdvBackEventType.MapShow, {})
end
|
ccbafe67
zhouhaihai
冒险神器和buff
|
1955
1956
1957
1958
|
function Adv:backChooseArtifact()
self:pushBackEvent(AdvBackEventType.ChooseArtifact, {})
end
|
85ded242
zhouhaihai
丰富返回事件
|
1959
1960
1961
1962
1963
1964
1965
1966
1967
|
function Adv:backCost(items)
self:pushBackEvent(AdvBackEventType.Cost, {items = items})
end
function Adv:backUse(items)
self:pushBackEvent(AdvBackEventType.Use, {items = items})
end
|
bbf64622
zhouhaihai
冒险
|
1968
|
function Adv:scoreChange(scoreType, score)
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
1969
|
self.score[scoreType] = self.score[scoreType] or 0
|
bbf64622
zhouhaihai
冒险
|
1970
|
self.score[scoreType] = self.score[scoreType] + score
|
b0fe1817
zhouahaihai
冒险分数
|
1971
1972
1973
|
end
function Adv:getScore()
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
1974
|
self.score[AdvScoreType.Level] = math.floor(self.score[AdvScoreType.Level] or 0)
|
bbf64622
zhouhaihai
冒险
|
1975
|
self.score[AdvScoreType.Task] = math.floor(self.score[AdvScoreType.Task] or 0)
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
1976
|
self.score[AdvScoreType.Kill] = math.floor(self.score[AdvScoreType.Kill] or 0)
|
bbf64622
zhouhaihai
冒险
|
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
|
self.score[AdvScoreType.KillBoss] = math.floor(self.score[AdvScoreType.KillBoss] or 0)
self.score[AdvScoreType.ItemBack] = math.floor(self.score[AdvScoreType.ItemBack] or 0)
self.score[AdvScoreType.Event] = math.floor(self.score[AdvScoreType.Event] or 0)
self.score[AdvScoreType.Story] = math.floor(self.score[AdvScoreType.Story] or 0)
return self.score[AdvScoreType.Level]
+ self.score[AdvScoreType.Task]
+ self.score[AdvScoreType.Kill]
+ self.score[AdvScoreType.KillBoss]
+ self.score[AdvScoreType.ItemBack]
+ self.score[AdvScoreType.Event]
+ self.score[AdvScoreType.Story]
|
b0fe1817
zhouahaihai
冒险分数
|
1989
1990
|
end
|
46fac6f1
zhouahaihai
酱料
|
1991
1992
|
function Adv:popBackEvents()
local events = self.backEvents
|
46fac6f1
zhouahaihai
酱料
|
1993
1994
1995
1996
1997
1998
|
self.backEvents = {}
return events
end
--回合事件处理
function Adv:afterRound()
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
1999
|
self.round = self.round + 1
|
46fac6f1
zhouahaihai
酱料
|
2000
2001
2002
|
if self.battle then
self.battle:afterRound()
end
|
36c30c5c
zhouahaihai
冒险
|
2003
2004
|
end
|
46fac6f1
zhouahaihai
酱料
|
2005
|
return Adv
|