46fac6f1
zhouahaihai
酱料
|
1
2
|
local Passive = require "adv.AdvPassive"
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
3
4
|
local AdvCommon = require "adv.AdvCommon"
local AdvMap = require "adv.AdvMap"
|
46fac6f1
zhouahaihai
酱料
|
5
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
6
|
local Adv = class("Adv")
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
7
8
9
|
local AdvTask = import(".AdvTask") --任务相关数据搞出去
AdvTask.bind(Adv)
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
10
11
12
13
14
15
|
function Adv:ctor(owner)
assert(owner, "Adv instance must have owner(role)")
self.owner = owner
self.maps = {}
self.battle = nil
self.backEvents = {} --发给客户端的事件组
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
16
17
18
19
20
|
self.advTask = self.owner:getProperty("advTask")
self.advMTask = self.owner:getProperty("advMTask")
self.advTaskChange = false -- 任务改变才更新
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
21
|
self:initByInfo(self.owner:getProperty("advInfo"))
|
46fac6f1
zhouahaihai
酱料
|
22
23
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
24
25
26
27
28
29
|
--初始化adv 信息
function Adv:initByInfo(advInfo)
if not next(advInfo) then return end --还没有 开始新地图
self.chapterId = advInfo.chapterId
self.level = advInfo.level or 1
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
30
|
self.round = advInfo.round or 0
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
31
32
33
34
35
36
|
self.score = advInfo.score or {}
self.lastEnemyId = advInfo.lastEId or 1
self.mapStack = advInfo.mstack or {}
self.maps = {}
for id, map in ipairs(advInfo.maps or {}) do
self.maps[id] = AdvMap.new(self, id, map)
|
46fac6f1
zhouahaihai
酱料
|
37
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
38
39
|
self:initBattle()
|
46fac6f1
zhouahaihai
酱料
|
40
41
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
42
43
44
45
46
|
-- 随机新的地图
function Adv:initByChapter(chapterId, level, isToNext, notNotify)
if self.chapterId and chapterId ~= self.chapterId then return end --新的关卡 或者 去到下一层
self.chapterId = chapterId
self.level = level or 1
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
47
|
self.round = 0
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
48
49
50
|
self.score = self.score or {}
self.lastEnemyId = 1
self.mapStack = {1} -- 最后一个为当前的地图
|
46fac6f1
zhouahaihai
酱料
|
51
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
52
53
54
55
|
-- 随机出地图
local mapId = self:randomMapId(chapterId, level)
self.maps = {}
self.maps[1] = AdvMap.new(self, 1, mapId)
|
46fac6f1
zhouahaihai
酱料
|
56
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
57
58
|
if isToNext then
self:scoreChange(AdvScoreType.Level) --增加层级加分
|
46fac6f1
zhouahaihai
酱料
|
59
|
end
|
46fac6f1
zhouahaihai
酱料
|
60
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
61
62
|
self:initBattle()
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
63
64
65
|
self:initLayerTask()
self:checkTask(Adv.TaskType.Arrive)
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
66
67
|
if not notNotify then
self:saveDB(notNotify)
|
1607a7f0
zhouahaihai
冒险事件 new
|
68
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
69
|
end
|
b0fe1817
zhouahaihai
冒险分数
|
70
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
71
72
73
74
|
function Adv:clear()
self.chapterId = nil
self.level = nil
self.score = {}
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
75
|
self.round = 0
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
76
77
78
79
80
|
self.lastEnemyId = 1
self.mapStack = {}
self.maps = {}
self.battle = nil
end
|
b0fe1817
zhouahaihai
冒险分数
|
81
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
82
83
84
|
function Adv:saveDB(notNotify)
local advInfo, advTeam = {}, self.owner:getProperty("advTeam")
if self.chapterId then
|
46fac6f1
zhouahaihai
酱料
|
85
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
86
87
|
advInfo.chapterId = self.chapterId
advInfo.level = self.level
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
88
|
advInfo.round = self.round
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
89
90
91
92
|
advInfo.score = self.score
advInfo.lastEId = self.lastEnemyId
advInfo.mstack = self.mapStack
advInfo.maps = {}
|
1607a7f0
zhouahaihai
冒险事件 new
|
93
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
94
|
self.battle:saveDB()
|
1607a7f0
zhouahaihai
冒险事件 new
|
95
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
96
97
|
for id , map in ipairs(self.maps) do
advInfo.maps[id] = map:getDB()
|
46fac6f1
zhouahaihai
酱料
|
98
|
end
|
46fac6f1
zhouahaihai
酱料
|
99
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
100
|
advTeam.player = self.battle.player:getDB()
|
46fac6f1
zhouahaihai
酱料
|
101
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
102
103
|
else
advTeam.player = nil
|
46fac6f1
zhouahaihai
酱料
|
104
|
end
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
105
106
|
self:updateTask(notNotify)
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
107
|
self.owner:updateProperties({advInfo = advInfo, advTeam = advTeam}, notNotify)
|
46fac6f1
zhouahaihai
酱料
|
108
109
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
110
111
112
113
|
function Adv:initBattle()
self.battle = require("adv.AdvBattle").new(self)
for _, passiveC in ipairs(self.cachePassiveEvent or {}) do
self.battle:triggerPassive(passiveC[1], passiveC[2])
|
46fac6f1
zhouahaihai
酱料
|
114
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
115
|
self.cachePassiveEvent = {}
|
46fac6f1
zhouahaihai
酱料
|
116
117
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
118
119
120
121
122
123
124
|
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
酱料
|
125
126
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
127
128
|
function Adv:getCurMap()
return self.maps[self.mapStack[#self.mapStack]]
|
46fac6f1
zhouahaihai
酱料
|
129
130
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
131
132
|
function Adv:getCurMapIdx()
return self.mapStack[#self.mapStack]
|
46fac6f1
zhouahaihai
酱料
|
133
134
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
135
136
137
138
139
|
function Adv:getRoom(roomId, mapIdx)
mapIdx = mapIdx or self:getCurMapIdx()
local map = self.maps[mapIdx]
if map then
return map.rooms[roomId]
|
36c30c5c
zhouahaihai
冒险
|
140
|
end
|
46fac6f1
zhouahaihai
酱料
|
141
142
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
143
144
145
146
|
function Adv:getBlock(roomId, blockId, mapIdx)
local room = self:getRoom(roomId, mapIdx)
if room then
return room.blocks[blockId]
|
c0b7797f
zhouhaihai
陷阱、点击生效点
|
147
|
end
|
46fac6f1
zhouahaihai
酱料
|
148
149
150
151
|
end
|
46fac6f1
zhouahaihai
酱料
|
152
153
|
--关卡通关,非层 score < 0 失败
function Adv:over(success)
|
b0fe1817
zhouahaihai
冒险分数
|
154
|
local score = self:getScore()
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
155
|
local scoreInfo = self.score
|
00115a7a
zhouahaihai
奖励发放
|
156
|
local reward
|
46fac6f1
zhouahaihai
酱料
|
157
|
if success then
|
09be9059
zhouhaihai
冒险接口
|
158
|
reward = self.owner:award(self.owner:getProperty("advItems"):toNumMap())
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
159
|
self.owner:checkTaskEnter(self.owner.TaskType.AdvPass, {id = self.chapterId})
|
46fac6f1
zhouahaihai
酱料
|
160
|
end
|
46fac6f1
zhouahaihai
酱料
|
161
|
self:clear()
|
00115a7a
zhouahaihai
奖励发放
|
162
|
|
bedca62d
zhouahaihai
冒险
|
163
|
self.owner:updateProperty({field = "advItems", value = ""})
|
00115a7a
zhouahaihai
奖励发放
|
164
|
|
b0fe1817
zhouahaihai
冒险分数
|
165
|
self:backEnd(success, score, scoreInfo, reward)
|
46fac6f1
zhouahaihai
酱料
|
166
167
|
end
|
ec87b4a5
zhouahaihai
冒险 完善
|
168
|
function Adv:exit()
|
4b7c7c96
zhouahaihai
增加 清空 挂机 冒险gm 角色经验
|
169
|
self:over(false)
|
ec87b4a5
zhouahaihai
冒险 完善
|
170
171
172
|
self:saveDB()
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
173
174
175
176
177
|
function Adv:randomMapId(chapterId, level)
local chapterData = csvdb["adv_chapterCsv"][chapterId]
if not chapterData then
error("chapterId " .. chapterId .. " dont exist!")
return
|
46fac6f1
zhouahaihai
酱料
|
178
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
179
180
181
|
if level > chapterData.limitlevel then
error("level overflow!")
return
|
46fac6f1
zhouahaihai
酱料
|
182
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
183
184
|
--随出地图Id
local raw_pool = chapterData.mapid:toArray(true, "=")
|
46fac6f1
zhouahaihai
酱料
|
185
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
186
187
188
|
local lastMapIds = {}
for id, map in ipairs(self.maps or {}) do
lastMapIds[map.mapId] = 1
|
46fac6f1
zhouahaihai
酱料
|
189
|
end
|
02c4de8d
zhouahaihai
增加 固有技
|
190
|
|
46fac6f1
zhouahaihai
酱料
|
191
|
local pool = {}
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
192
193
194
195
196
|
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
table.insert(pool, mapId)
|
46fac6f1
zhouahaihai
酱料
|
197
198
199
|
end
end
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
200
201
202
|
if not next(pool) then
error("mapIds is empty!")
return
|
46fac6f1
zhouahaihai
酱料
|
203
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
204
|
return pool[math.randomInt(1, #pool)]
|
46fac6f1
zhouahaihai
酱料
|
205
206
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
207
|
|
46fac6f1
zhouahaihai
酱料
|
208
209
|
-- 在冒险中获得的物品都发放在冒险背包内
function Adv:award(gift, params)
|
8c199cec
zhengshouren
简化物品奖励接口,设置默认参数
|
210
|
params = params or {}
|
46fac6f1
zhouahaihai
酱料
|
211
212
213
214
215
216
217
218
219
220
|
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")
for itemId, count in pairs(tgift) do
|
b0fe1817
zhouahaihai
冒险分数
|
221
222
|
if count > 0 then
self:scoreChange(AdvScoreType.Item, {itemId, count})
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
223
|
self:checkTask(Adv.TaskType.Item, count, itemId)
|
b0fe1817
zhouahaihai
冒险分数
|
224
|
end
|
46fac6f1
zhouahaihai
酱料
|
225
226
227
228
229
230
231
232
233
|
local origin = items:getv(itemId, 0)
local nums = origin + count
if nums <= 0 then
items = items:delk(itemId)
nums = 0
else
items = items:incrv(itemId, count)
end
end
|
9cffb42b
zhouahaihai
抉择点 建筑
|
234
|
|
46fac6f1
zhouahaihai
酱料
|
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
|
self.owner:updateProperty({field = "advItems", value = items, notNotify = params.notNotify})
return tgift
end
-- 消耗物品 优先冒险背包 --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)
self.owner:costItems(less, params)
return true
end
--事件点击处理
local function clickOut(self, room, block, params)
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
265
266
267
268
269
|
if self:getCurMap():checkOver() then --检查是否可以出去了
if #self.mapStack > 1 then -- 处于夹层中
table.remove(self.mapStack) --退出夹层
self:backLayer()
else --处于底层
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
270
271
|
local advPass = self.owner:getProperty("advPass")
|
4d943586
zhouhaihai
直通 advt gm
|
272
|
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
273
274
275
276
|
if self.level > (advPass[self.chapterId] or 0) then
self.owner:changeUpdates({{type = "advPass", field = self.chapterId, value = self.level}})
end
if params.relay then
|
4d943586
zhouhaihai
直通 advt gm
|
277
|
if self.level % globalCsv.adv_can_out_layer_pre ~= 0 or not self.owner:isFuncOpen(FuncOpenType.AdvRelay) then return end
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
278
279
|
end
if params.relay or self.level >= csvdb["adv_chapterCsv"][self.chapterId].limitlevel or not self.owner:advChapterIsOpen(self.chapterId, self.level + 1) then --关卡结束
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
280
281
282
283
284
|
self:over(true)
else
self:initByChapter(self.chapterId, self.level + 1, true, true)
self:backNext() --下一关
end
|
46fac6f1
zhouahaihai
酱料
|
285
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
286
|
|
46fac6f1
zhouahaihai
酱料
|
287
288
289
290
291
292
|
return true
end
end
--战斗 普通攻击
local function clickMonster(self, room, block, params)
|
12f7b52c
zhouhaihai
冒险战斗
|
293
|
self.battle:battleBegin(room.roomId, block.blockId, params)
|
46fac6f1
zhouahaihai
酱料
|
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
|
return true
end
local function clickChoose(self, room, block, params)
local choose = params.choose
local chooseData = csvdb["event_chooseCsv"][block.event.id]
if not chooseData or not chooseData["button".. choose .."cond"] then return end
local cond = chooseData["button".. choose .."cond"]:toArray(true, "=")
local checkCond = {
-- 拥有道具
[1] = function()
if self:cost({[cond[2]] = cond[3]}, {}, true) then
return true
end
end,
-- xx角色(todo 队长)
[2] = function()
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
312
313
314
|
local hero = self.owner.heros[self.owner:getProperty("advTeam").leader]
if hero and hero:getProperty("type") == cond[2] then
return true
|
46fac6f1
zhouahaihai
酱料
|
315
316
317
318
|
end
end,
--消灭所有怪
[3] = function()
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
319
|
for _, room in pairs(self:getCurMap().rooms) do
|
4ae223df
zhouahaihai
Buff bug
|
320
|
for _, block in pairs(room.blocks) do
|
46fac6f1
zhouahaihai
酱料
|
321
322
323
324
325
326
327
328
329
330
331
332
333
334
|
if block.event and (block.event.etype == AdvEventType.BOSS or block.event.etype == AdvEventType.Monster) then
return
end
end
end
return true
end,
--制定属性 >
[4] = function()
if (self.battle.player[AttsEnumEx[cond[2]]] or 0) > cond[3] then
return true
end
end,
}
|
9cffb42b
zhouahaihai
抉择点 建筑
|
335
336
|
assert(not cond[1] or checkCond[cond[1]], "error cond, event_chooseCsv id :" .. block.event.id)
if cond[1] and not checkCond[cond[1]]() then return end
|
02c4de8d
zhouahaihai
增加 固有技
|
337
|
local clearBlock = true
|
e10edb5f
zhouahaihai
冒险事件新
|
338
339
340
341
342
343
|
local effects = chooseData["button".. choose .."effect"]:toTableArray(true)
for _, effect in ipairs(effects) do
if effect[1] == 1 then
local reward = csvdb["event_dropCsv"][effect[2]]["range"]:randWeight(true)
effect[2] = reward[1]
effect[3] = reward[2]
|
46fac6f1
zhouahaihai
酱料
|
344
|
end
|
e10edb5f
zhouahaihai
冒险事件新
|
345
346
347
348
349
350
351
352
353
|
local doEffect = {
[1] = function() -- 获得某道具N个
self:backReward(self:award({[effect[2]] = effect[3]}, {}))
end,
[2] = function() --获得冒险buff
self.battle.player:addBuff(effect[2])
end,
[3] = function() --发现怪物
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
354
|
self:getCurMap():addNewMonsterRand(effect[2], {room, block})
|
e10edb5f
zhouahaihai
冒险事件新
|
355
356
357
358
359
360
361
362
363
|
clearBlock = false
end,
[4] = function() --无事发生
end
}
assert(doEffect[effect[1]], "error effect, event_chooseCsv id :" .. block.event.id)
doEffect[effect[1]]()
end
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
364
365
|
self:checkTask(Adv.TaskType.Choose, 1, block.event.id)
|
02c4de8d
zhouahaihai
增加 固有技
|
366
|
if clearBlock then
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
367
|
block:clear()
|
02c4de8d
zhouahaihai
增加 固有技
|
368
|
end
|
46fac6f1
zhouahaihai
酱料
|
369
370
371
372
373
374
|
return true
end
local function clickDrop(self, room, block, params)
local reward = {}
if not block.event.item then return end
|
8c199cec
zhengshouren
简化物品奖励接口,设置默认参数
|
375
|
local reward = self:award({[block.event.item[1]] = block.event.item[2]})
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
376
|
block:clear()
|
46fac6f1
zhouahaihai
酱料
|
377
378
379
380
381
382
383
384
385
386
387
388
|
self:backReward(reward)
return true
end
local function clickTrader(self, room, block, params)
local buyId = params.id
local traderData = csvdb["event_traderCsv"][block.event.id]
if not traderData then return end -- 偷偷改表了
if not block.event.shop or not block.event.shop[buyId] then return end
if (block.event.status or ""):getv(buyId, 0) == 1 then return end -- 买过了
|
e10edb5f
zhouahaihai
冒险事件新
|
389
|
if not self:cost({[traderData.type] = block.event.shop[buyId][3]}, {}) then return end --不够
|
46fac6f1
zhouahaihai
酱料
|
390
|
|
8c199cec
zhengshouren
简化物品奖励接口,设置默认参数
|
391
|
local reward = self:award({[block.event.shop[buyId][1]] = block.event.shop[buyId][2]})
|
46fac6f1
zhouahaihai
酱料
|
392
|
block.event.status = block.event.status:setv(buyId, 1)
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
393
|
self:checkTask(Adv.TaskType.Shop, 1, block.event.id)
|
46fac6f1
zhouahaihai
酱料
|
394
395
396
397
398
399
400
401
|
self:backReward(reward)
return true
end
local function clickBuild(self, room, block, params)
local buildData = csvdb["event_buildingCsv"][block.event.id]
if not buildData then return end-- 偷偷改表了
if not block.event.effect then return end -- 没有效果 气人不
|
02c4de8d
zhouahaihai
增加 固有技
|
402
|
local clearBlock = true
|
46fac6f1
zhouahaihai
酱料
|
403
404
405
406
407
408
409
410
411
412
|
local effect = block.event.effect
--todo 效果生效
local doEffect = {
[1] = function() -- 获得某道具N个
self:backReward(self:award({[effect[2]] = effect[3]}, {}))
end,
[2] = function() --获得冒险buff
self.battle.player:addBuff(effect[2])
end,
[3] = function() --发现怪物
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
413
|
self:getCurMap():addNewMonsterRand(effect[2], {room, block})
|
02c4de8d
zhouahaihai
增加 固有技
|
414
|
clearBlock = false
|
46fac6f1
zhouahaihai
酱料
|
415
416
417
418
419
|
end,
[4] = function() --无事发生
end
}
assert(doEffect[effect[1]], "error effect, event_buildingCsv id :" .. block.event.id)
|
e10edb5f
zhouahaihai
冒险事件新
|
420
|
if not self:cost(buildData.required:toNumMap(), {}) then return end
|
46fac6f1
zhouahaihai
酱料
|
421
|
doEffect[effect[1]]()
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
422
|
self:checkTask(Adv.TaskType.Build, 1, block.event.id)
|
02c4de8d
zhouahaihai
增加 固有技
|
423
|
if clearBlock then
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
424
|
block:clear()
|
02c4de8d
zhouahaihai
增加 固有技
|
425
|
end
|
46fac6f1
zhouahaihai
酱料
|
426
427
428
|
return true
end
|
c0b7797f
zhouhaihai
陷阱、点击生效点
|
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
|
local function clickClick(self, room, block, params)
local clickData = csvdb["event_clickCsv"][block.event.id]
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)
reward[item[1]] = (reward[item[1]] or 0) + reward[item[2]]
end
self:backReward(self:award(reward, {}))
end,
}
if clearBlock then
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
449
|
block:clear()
|
c0b7797f
zhouhaihai
陷阱、点击生效点
|
450
|
end
|
f20cc9ca
zhouhaihai
点击点返回清空信息
|
451
|
return true
|
c0b7797f
zhouhaihai
陷阱、点击生效点
|
452
453
|
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
|
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)
self.battle:initMapEnemys(mapIdx)
end
self:backLayer()
return true
end
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
471
472
473
474
475
476
477
|
local function clickTask(self, room, block, params)
if self:addTask(block.event.id) then --增加任务
block:clear()
return true
end
end
|
46fac6f1
zhouahaihai
酱料
|
478
479
480
481
482
483
484
485
|
local eventCallFunc = {
[AdvEventType.Out] = clickOut,
[AdvEventType.BOSS] = clickMonster,
[AdvEventType.Monster] = clickMonster,
[AdvEventType.Choose] = clickChoose,
[AdvEventType.Drop] = clickDrop,
[AdvEventType.Trader] = clickTrader,
[AdvEventType.Build] = clickBuild,
|
c0b7797f
zhouhaihai
陷阱、点击生效点
|
486
|
[AdvEventType.Click] = clickClick,
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
487
|
[AdvEventType.Layer] = clickLayer,
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
488
|
[AdvEventType.Task] = clickTask,
|
46fac6f1
zhouahaihai
酱料
|
489
490
491
492
493
|
}
--点击处理 roomId, blockId
--params 某些事件需要的客户端传递的参数
function Adv:clickBlock(roomId, blockId, params)
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
494
495
496
|
local map = self:getCurMap()
local room = self:getRoom(roomId)
local block = self:getBlock(roomId, blockId)
|
46fac6f1
zhouahaihai
酱料
|
497
498
|
if not block then return end
|
46fac6f1
zhouahaihai
酱料
|
499
|
local status = false
|
36c30c5c
zhouahaihai
冒险
|
500
|
local clickEvent = false
|
46fac6f1
zhouahaihai
酱料
|
501
|
if not block.isOpen then
|
36c30c5c
zhouahaihai
冒险
|
502
503
|
local canOpen = false --如果未开放是否可以开放
local hadMonster = false -- 周围是否有解锁的怪未击败
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
504
|
for _, one in ipairs(map:getAroundBlocks(room, block)) do
|
36c30c5c
zhouahaihai
冒险
|
505
506
|
local _room, _block = one[1], one[2]
if _block.isOpen then canOpen = true end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
507
|
if _block.isOpen and _block:isMonster() then
|
36c30c5c
zhouahaihai
冒险
|
508
509
510
|
hadMonster = true
end
end
|
46fac6f1
zhouahaihai
酱料
|
511
|
if canOpen and not hadMonster then --开放
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
512
|
room:openBlock(block)
|
46fac6f1
zhouahaihai
酱料
|
513
514
515
|
status = true
end
else
|
36c30c5c
zhouahaihai
冒险
|
516
|
clickEvent = true
|
46fac6f1
zhouahaihai
酱料
|
517
518
519
520
521
|
--点了空地
if not block.event then
return
end
--可点击的事件
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
522
|
if not room.isBossRoom or block:isBoss() then
|
46fac6f1
zhouahaihai
酱料
|
523
|
if eventCallFunc[block.event.etype] then
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
524
|
status = eventCallFunc[block:getEventType()](self, room, block, params)
|
46fac6f1
zhouahaihai
酱料
|
525
526
527
|
end
end
end
|
39a6e08b
suhongyang
冒险战斗内逻辑调整
|
528
|
local needChange = true
|
ae20365b
suhongyang
Revert "修改冒险战斗逻辑"
|
529
|
if clickEvent and block.event then
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
530
|
if block:getEventType() == AdvEventType.Out then
|
ae20365b
suhongyang
Revert "修改冒险战斗逻辑"
|
531
532
|
needChange = false
end
|
39a6e08b
suhongyang
冒险战斗内逻辑调整
|
533
534
|
end
if status and needChange then --出去了就不计算回合了
|
46fac6f1
zhouahaihai
酱料
|
535
536
537
|
self:backBlockChange(roomId, blockId)
self:afterRound()
end
|
36c30c5c
zhouahaihai
冒险
|
538
|
self:saveDB()
|
46fac6f1
zhouahaihai
酱料
|
539
540
541
|
return status
end
|
46fac6f1
zhouahaihai
酱料
|
542
543
544
545
546
547
548
549
550
551
552
553
554
555
|
--使用道具产生效果
function Adv:useItem(itemId, count, target)
count = count or 1
local itemData = csvdb["adv_itemCsv"][itemId]
if not itemData then return end
--重置数量
if itemData["function"] == 0 or itemData["function"] == 2 then count = 1 end
if not self:cost({[itemId] = count}, {}, true) then return true end
--消耗
if itemData["function"] == 0 or itemData["function"] == 1 then
self:cost({[itemId] = count}, {})
end
--生效
if itemData.type == 1 or itemData.type == 0 then --技能
|
d27ad5e0
suhongyang
使用营养技
|
556
|
self.battle.player:releaseSkill(itemData.effect, target)
|
46fac6f1
zhouahaihai
酱料
|
557
558
559
560
561
562
563
564
|
elseif itemData.type == 2 then --掉落
local item = csvdb["event_dropCsv"][itemData.effect]["range"]:randWeight(true)
self:backReward(self:award({[item[1]] = item[2]}, {}))
else
return
end
self:afterRound()
|
36c30c5c
zhouahaihai
冒险
|
565
|
self:saveDB()
|
46fac6f1
zhouahaihai
酱料
|
566
567
568
|
return true
end
|
d27ad5e0
suhongyang
使用营养技
|
569
570
571
572
|
--使用技能
function Adv:usePotion(potionId, potionLevel, target)
-- cost
local potionData = csvdb["adv_potionCsv"][potionId][potionLevel]
|
d27ad5e0
suhongyang
使用营养技
|
573
574
575
576
577
578
579
580
|
local enemy = self.battle:getEnemy(target.roomId, target.blockId)
if not enemy then return end
--生效
if potionData.type == 1 or potionData.type == 0 then --技能
self.battle.player:releaseSkill(potionData.effect, enemy)
elseif potionData.type == 2 then --掉落
local item = csvdb["event_dropCsv"][potionData.effect]["range"]:randWeight(true)
self:backReward(self:award({[item[1]] = item[2]}, {}))
|
46fac6f1
zhouahaihai
酱料
|
581
|
else
|
d27ad5e0
suhongyang
使用营养技
|
582
|
return
|
46fac6f1
zhouahaihai
酱料
|
583
|
end
|
46fac6f1
zhouahaihai
酱料
|
584
|
self:afterRound()
|
36c30c5c
zhouahaihai
冒险
|
585
|
self:saveDB()
|
46fac6f1
zhouahaihai
酱料
|
586
587
588
|
return true
end
|
46fac6f1
zhouahaihai
酱料
|
589
|
--敌人死亡
|
02c4de8d
zhouahaihai
增加 固有技
|
590
|
function Adv:enemyDead(roomId, blockId, escape)
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
591
592
593
594
|
local map = self:getCurMap()
local room = self:getRoom(roomId)
local block = self:getBlock(roomId, blockId)
if not block then return end
|
46fac6f1
zhouahaihai
酱料
|
595
|
--死了以后掉东西
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
596
597
|
if block:isMonster() then --处理死亡
if block:isBoss() then
|
36c30c5c
zhouahaihai
冒险
|
598
599
|
room.isBossRoom = false
end
|
02c4de8d
zhouahaihai
增加 固有技
|
600
|
if escape then
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
601
|
block:clear()
|
02c4de8d
zhouahaihai
增加 固有技
|
602
|
else
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
603
604
605
|
local enemyId = block.event.id
local monsterData = csvdb["event_monsterCsv"][enemyId]
|
b0fe1817
zhouahaihai
冒险分数
|
606
607
|
self:scoreChange(AdvScoreType.Kill, monsterData.type)
|
02c4de8d
zhouahaihai
增加 固有技
|
608
609
|
local item = block.event.item
if not item then
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
610
611
|
local dropData = csvdb["event_dropCsv"][monsterData.dropid]
item = dropData["range"]:randWeight(true)
|
46fac6f1
zhouahaihai
酱料
|
612
|
end
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
613
|
|
4b7c7c96
zhouahaihai
增加 清空 挂机 冒险gm 角色经验
|
614
|
if item[1] == 0 then
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
615
|
block:clear()
|
4b7c7c96
zhouahaihai
增加 清空 挂机 冒险gm 角色经验
|
616
|
else
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
617
618
619
620
|
block:updateEvent({
etype = AdvEventType.Drop,
item = item
})
|
4b7c7c96
zhouahaihai
增加 清空 挂机 冒险gm 角色经验
|
621
|
end
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
622
623
|
self:checkTask(Adv.TaskType.Kill, 1, enemyId)
self:checkTask(Adv.TaskType.KillAll)
|
46fac6f1
zhouahaihai
酱料
|
624
|
end
|
46fac6f1
zhouahaihai
酱料
|
625
626
627
628
|
end
self:backBlockChange(roomId, blockId)
end
|
46fac6f1
zhouahaihai
酱料
|
629
630
631
632
633
634
635
636
637
638
639
640
641
|
function Adv:pushBackEvent(btype, params)
table.insert(self.backEvents, {btype = btype, params = params})
end
function Adv:backReward(items)
self:pushBackEvent(AdvBackEventType.Reward, {items = items})
end
-- if is player enemyId is nil
--isMax 是否是改变血量上限
function Adv:backHpChange(enemyId, change, isMax)
self:pushBackEvent(AdvBackEventType.HpChange, {enemyId = enemyId, change = change, isMax = isMax})
end
|
ae9a74b5
suhongyang
返回miss,快速战斗逻辑
|
642
643
644
645
|
function Adv:backMiss(enemyId)
self:pushBackEvent(AdvBackEventType.Miss, {enemyId = enemyId})
end
|
46fac6f1
zhouahaihai
酱料
|
646
647
648
649
|
-- if is player enemyId is nil
function Adv:backAtkChange(enemyId, change)
self:pushBackEvent(AdvBackEventType.AtkChange, {enemyId = enemyId, change = change})
end
|
e996b82a
zhouahaihai
冒险增加防御属性
|
650
651
652
653
654
655
|
-- if is player enemyId is nil
function Adv:backDefChange(enemyId, change)
self:pushBackEvent(AdvBackEventType.DefChange, {enemyId = enemyId, change = change})
end
|
46fac6f1
zhouahaihai
酱料
|
656
657
658
659
660
661
|
-- if is player enemyId is nil
function Adv:backBuff(enemyId, buffId, isDel)
self:pushBackEvent(AdvBackEventType.Buff, {enemyId = enemyId, buffId = buffId, isDel = isDel})
end
-- if is player enemyId is nil
function Adv:backSkill(enemyId, skillId, receiver)
|
36c30c5c
zhouahaihai
冒险
|
662
|
self:pushBackEvent(AdvBackEventType.Skill, {enemyId = enemyId, skillId = skillId, receiver = receiver})
|
46fac6f1
zhouahaihai
酱料
|
663
664
|
end
|
4eadc2ab
suhongyang
獲得被動暫時增加log,後面可以去掉
|
665
666
667
668
669
|
-- if is player enemyId is nil
function Adv:backPassive(enemyId, passiveId)
self:pushBackEvent(AdvBackEventType.Passive, {enemyId = enemyId, passiveId = passiveId})
end
|
46fac6f1
zhouahaihai
酱料
|
670
671
672
673
|
function Adv:backNext()
self:pushBackEvent(AdvBackEventType.Next, {})
end
|
b0fe1817
zhouahaihai
冒险分数
|
674
675
|
function Adv:backEnd(success, score, scoreInfo, reward)
self:pushBackEvent(AdvBackEventType.End, {success = success, score = score, scoreInfo = scoreInfo, reward = reward})
|
46fac6f1
zhouahaihai
酱料
|
676
677
678
679
680
681
682
683
684
685
|
end
function Adv:backBlockChange(roomId, blockId)
self:pushBackEvent(AdvBackEventType.BlockChange, {roomId = roomId, blockId = blockId})
end
function Adv:backAtk(enemyId, receiver)
self:pushBackEvent(AdvBackEventType.Atk, {enemyId = enemyId, receiver = receiver})
end
|
bedca62d
zhouahaihai
冒险
|
686
687
688
689
|
function Adv:backDead(enemyId)
self:pushBackEvent(AdvBackEventType.Dead, {enemyId = enemyId})
end
|
386ca58e
zhouhaihai
优化log
|
690
691
692
|
function Adv:backTrap()
self:pushBackEvent(AdvBackEventType.Trap, {})
end
|
ec87b4a5
zhouahaihai
冒险 完善
|
693
|
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
694
695
696
697
|
function Adv:backLayer()
self:pushBackEvent(AdvBackEventType.Layer, {})
end
|
b0fe1817
zhouahaihai
冒险分数
|
698
699
700
701
702
703
704
|
function Adv:scoreChange(scoreType, pms)
local cutTypes = {}
local score = 0
cutTypes[AdvScoreType.Level] = function()
score = globalCsv.adv_score_floor
end
cutTypes[AdvScoreType.Kill] = function()
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
705
|
local chapterData = csvdb["adv_chapterCsv"][self.chapterId]
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
706
|
score = globalCsv.adv_score_monster[pms] * chapterData["reward"]
|
b0fe1817
zhouahaihai
冒险分数
|
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
|
end
cutTypes[AdvScoreType.Item] = function()
score = csvdb["itemCsv"][pms[1]].adv_score_item * pms[2]
end
cutTypes[AdvScoreType.Hurt] = function()
score = globalCsv.adv_score_hurt * pms
end
cutTypes[AdvScoreType.Block] = function()
score = globalCsv.adv_score_block
end
if cutTypes[scoreType] then
cutTypes[scoreType]()
else
return
end
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
722
723
|
self.score[scoreType] = self.score[scoreType] or 0
self.score[scoreType] = self.score[scoreType] + score
|
b0fe1817
zhouahaihai
冒险分数
|
724
725
726
|
end
function Adv:getScore()
|
43babcff
zhouhaihai
优化冒险结构 增加夹层功能
|
727
728
729
730
731
732
733
734
|
self.score[AdvScoreType.Level] = math.floor(self.score[AdvScoreType.Level] or 0)
self.score[AdvScoreType.Block] = math.floor(self.score[AdvScoreType.Block] or 0)
self.score[AdvScoreType.Hurt] = math.max(math.floor(self.score[AdvScoreType.Hurt] or 0), - (self.score[AdvScoreType.Level] + self.score[AdvScoreType.Block]))
self.score[AdvScoreType.Kill] = math.floor(self.score[AdvScoreType.Kill] or 0)
self.score[AdvScoreType.Item] = math.floor(self.score[AdvScoreType.Item] or 0)
return self.score[AdvScoreType.Level] + self.score[AdvScoreType.Block] + self.score[AdvScoreType.Hurt]
+ self.score[AdvScoreType.Kill] + self.score[AdvScoreType.Item]
|
b0fe1817
zhouahaihai
冒险分数
|
735
736
|
end
|
46fac6f1
zhouahaihai
酱料
|
737
738
|
function Adv:popBackEvents()
local events = self.backEvents
|
46fac6f1
zhouahaihai
酱料
|
739
740
741
742
743
744
|
self.backEvents = {}
return events
end
--回合事件处理
function Adv:afterRound()
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
745
|
self.round = self.round + 1
|
46fac6f1
zhouahaihai
酱料
|
746
747
748
|
if self.battle then
self.battle:afterRound()
end
|
36c30c5c
zhouahaihai
冒险
|
749
750
|
end
|
46fac6f1
zhouahaihai
酱料
|
751
|
return Adv
|