Blame view

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