| 46fac6f1  zhouahaihai
 
酱料 | 1
2 |   -- 角色
  local Buff = require "adv.AdvBuff"
 | 
| 1b8336a6  suhongyang
 
skill逻辑与player分开 | 3 |   local Skill = require "adv.AdvSkill"
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 4
5
6
7
8
9
10
11 |   local Passive = require "adv.AdvPassive"
  
  local BaseObject = class("BaseObject")
  function BaseObject:ctor(battle)
  	self.battle = battle
  	self.hpMax = 0
  	self.hp = 0
  	self.atk = 0
 | 
| e996b82a  zhouahaihai
 
冒险增加防御属性 | 12 |   	self.def = 0
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 13
14
15
16 |   	self.aType = 0 --攻击类型
  	self.lock = nil
  	self.passives = {} --固有技能
  	self.buffs = {} --buff
 | 
| 42f2d1d3  suhongyang
 
战斗内技能序列逻辑 | 17 |   	self.skillOrder = {} --战斗内技能序列
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 18 |   	self.isDead = false
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 19
20
21
22
23 |   end
  --初始化角色
  function BaseObject:initData(data)
  	self.hpMax = data.hpMax or data.hp
  	self.hp = data.hp
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 24
25
26
27 |   	--可变化的值
  	self.atk = data.atk
  	self.miss = data.miss
  	self.hit = data.hit
 | 
| e996b82a  zhouahaihai
 
冒险增加防御属性 | 28 |   	self.def = data.def
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 29
30
31
32 |   	--基础值记录
  	self._atk = data._atk or self.atk
  	self._miss = data._miss or self.miss
  	self._hit = data._hit or self.hit
 | 
| e996b82a  zhouahaihai
 
冒险增加防御属性 | 33 |   	self._def = data._def or self.def
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 34 |   	self._hpMax = data._hpMax or self.hpMax
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 35
36
37
38 |   end
  -- 角色初始化完以后才是 技能和被动技能  方便初始化 buff 的 释放对象
  function BaseObject:initAfter(data)
  	for _, passive in ipairs(data.passives or {}) do
 | 
| 36c30c5c  zhouahaihai
 
冒险 | 39 |   		table.insert(self.passives, Passive.new(self, passive))
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 40
41
42
43
44
45 |   	end
  	for _, buff in ipairs(data.buffs or {}) do
  		table.insert(self.buffs, Buff.load(self, buff))
  	end
  end
  
 | 
| a734980c  suhongyang
 
冒险战斗数据打完以前不存储 | 46
47
48
49
50
51
52 |   function BaseObject:reset(data)
  	self.passives = {}
  	self.buffs = {}
  	self:initData(data)
  	self:initAfter(data)
  end
  
 | 
| 35e2e3c4  zhouhaihai
 
优化 gm advt  增加感知b... | 53
54
55
56
57 |   function BaseObject:afterRound(roundType)
  	if roundType == "passive" then
  		for _, passive in ipairs(self.passives) do
  			passive:afterRound(self)
  		end
 | 
| 8fc7d1bc  zhouhaihai
 
buff 回合问题 | 58 |   	elseif roundType == "buffBefore" then
 | 
| 35e2e3c4  zhouhaihai
 
优化 gm advt  增加感知b... | 59 |   		for _, buff in ipairs(self.buffs) do
 | 
| 8fc7d1bc  zhouhaihai
 
buff 回合问题 | 60
61
62
63
64
65
66
67
68 |   			if buff.buffData.intoEffect == 1 then
  				buff:afterRound()
  			end
  		end
  	elseif roundType == "buffAfter" then
  		for _, buff in ipairs(self.buffs) do
  			if buff.buffData.intoEffect == 0 then
  				buff:afterRound()
  			end
 | 
| 35e2e3c4  zhouhaihai
 
优化 gm advt  增加感知b... | 69 |   		end
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 70
71
72 |   	end
  end
  
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 73
74
75 |   function BaseObject:clearRound()
  	for i = #self.passives, 1, -1 do
  		if self.passives[i].isDel then
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 76
77
78
79
80 |   			table.remove(self.passives, i)
  		end
  	end
  	for i = #self.buffs, 1, -1 do
  		if self.buffs[i].isDel then
 | 
| b71a8190  zhouhaihai
 
动态改变 一些buff | 81 |   			local buff = self.buffs[i]
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 82 |   			table.remove(self.buffs, i)
 | 
| b71a8190  zhouhaihai
 
动态改变 一些buff | 83
84
85
86 |   			buff:endBuff()
  			if self.attrChangeCondBuffCheck then
  				self:attrChangeCondBuffCheck(2, buff.id)
  			end
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 87
88
89
90
91
92
93
94 |   		end
  	end
  end
  function BaseObject:clear()
  	self.buffs = {}
  	self.passives = {}
  end
  
 | 
| 23a38f47  suhongyang
 
new passives  effect | 95
96 |   function BaseObject:addPassive(params)
  	local skillId = params.id
 | 
| 3b0526d2  zhouhaihai
 
冒险demo | 97 |   	local skillData = csvdb["adv_map_passiveCsv"][skillId]
 | 
| 23a38f47  suhongyang
 
new passives  effect | 98
99
100 |   	if not skillData then return end
  	local level = params.level or 1
  	if not skillData[level] then return end
 | 
| 7b2dc17c  zhouhaihai
 
地图 层 buff passive | 101
102
103 |   
  	if self:getPassiveById(skillId) then return end -- 被动技不能重复
  
 | 
| 23a38f47  suhongyang
 
new passives  effect | 104 |   	table.insert(self.passives, Passive.new(self, { id = skillId, level = level }))
 | 
| 23a38f47  suhongyang
 
new passives  effect | 105
106 |   end
  
 | 
| 7b2dc17c  zhouhaihai
 
地图 层 buff passive | 107
108
109
110
111
112
113
114 |   function BaseObject:getPassiveById(bId)
  	for idx, passive in ipairs(self.passives) do
  		if passive.id == bId then
  			return passive
  		end
  	end
  end
  
 | 
| 4f0a5fae  zhouhaihai
 
营养剂 | 115
116
117
118
119
120 |   function BaseObject:getPassiveIdx(passive)
  	for idx, passive_ in ipairs(self.passives) do
  		if passive_ == passive then
  			return idx
  		end
  	end
 | 
| c2e42a2d  zhouhaihai
 
避免删除 | 121 |   	return 999
 | 
| 4f0a5fae  zhouhaihai
 
营养剂 | 122
123
124 |   end
  
  function BaseObject:getDisablePassiveCount()
 | 
| aa74d6ef  zhouhaihai
 
掉落反馈 | 125 |   	local count
 | 
| 4f0a5fae  zhouhaihai
 
营养剂 | 126 |   	for _, buff in ipairs(self.buffs) do
 | 
| 9c8e9482  zhouhaihai
 
buff  被动 限定地图 | 127 |   		if not buff:isHide() and buff:getType() == Buff.DISABLE_BUFF then
 | 
| aa74d6ef  zhouhaihai
 
掉落反馈 | 128
129
130
131 |   			if buff:effect() == 0 then
  				return 0
  			end
  			count = (count or 0) + buff:effect()
 | 
| 4f0a5fae  zhouhaihai
 
营养剂 | 132
133 |   		end
  	end
 | 
| aa74d6ef  zhouhaihai
 
掉落反馈 | 134 |   	return count
 | 
| 4f0a5fae  zhouhaihai
 
营养剂 | 135
136 |   end
  
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 137 |   function BaseObject:addBuff(buffId, releaser)
 | 
| 3b0526d2  zhouhaihai
 
冒险demo | 138 |   	local buffData = csvdb["adv_map_buffCsv"][buffId]
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 139
140 |   	if not buffData then return end
  	for _, buff in ipairs(self.buffs) do
 | 
| 9c8e9482  zhouhaihai
 
buff  被动 限定地图 | 141 |   		if not buff:isHide() and (buff:getType() == Buff.CLEAR_BUFF or buff:getType() == Buff.IMMNUE_BUFF) then
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 142 |   			if buff:canEffect(buffId) then
 | 
| 7c55db1f  suhongyang
 
Buff逻辑完善,buff生效次数... | 143 |   				buff:effect()
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 144
145
146
147 |   				return
  			end
  		end
  	end
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 148
149
150
151
152
153
154
155
156 |   	local oldBuff = self:getBuffById(buffId)
  	if oldBuff then
  		if not oldBuff:checkKeep() then return end
  		oldBuff:overlay(releaser, {}) -- 叠加
  	else
  		-- 不能保持的buff 也加不上去
  		if not Buff.checkKeep({
  			owner = self,
  			buffData = buffData,
 | 
| 8781e103  zhouhaihai
 
冒险 bug | 157 |   			releaseId = releaser and releaser.monsterId or nil
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 158 |   		}) then return end
 | 
| b71a8190  zhouhaihai
 
动态改变 一些buff | 159
160
161 |   		local buff = Buff.create(self, releaser, {id = buffId})
  		table.insert(self.buffs, buff)
  		buff:createAfter()
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 162 |   	end
 | 
| d3da3368  zhouhaihai
 
冒险地图被动技, buff  神器 | 163 |   	self:triggerPassive(Passive.GET_BUFF, {buffId = buffId})
 | 
| c5d9338f  zhouhaihai
 
通用方法 异常 | 164 |   	return true
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 165
166 |   end
  
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 167
168 |   function BaseObject:getBuffById(bId)
  	for idx, buff in ipairs(self.buffs) do
 | 
| 9c8e9482  zhouhaihai
 
buff  被动 限定地图 | 169 |   		if buff.id == bId and not buff:isHide() then
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 170
171
172
173
174 |   			return buff
  		end
  	end
  end
  
 | 
| 916096ed  zhouhaihai
 
神器效果 | 175 |   function BaseObject:delBuffById(bId)
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 176
177 |   	for idx, buff in ipairs(self.buffs) do
  		if buff.id == bId then
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 178 |   			table.remove(self.buffs, idx)
 | 
| b71a8190  zhouhaihai
 
动态改变 一些buff | 179
180
181
182 |   			buff:endBuff()
  			if self.attrChangeCondBuffCheck then
  				self:attrChangeCondBuffCheck(2, bId)
  			end
 | 
| 916096ed  zhouhaihai
 
神器效果 | 183
184
185
186
187
188 |   			return buff
  		end
  	end
  end
  
  function BaseObject:delPassiveById(pId)
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 189
190 |   	for idx, passive in ipairs(self.passives) do
  		if passive.id == pId then
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 191 |   			table.remove(self.passives, idx)
 | 
| 916096ed  zhouhaihai
 
神器效果 | 192
193
194
195
196 |   			return passive
  		end
  	end
  end
  
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 197
198 |   function BaseObject:hadBuff(bType)
  	for _, buff in ipairs(self.buffs) do
 | 
| 9c8e9482  zhouhaihai
 
buff  被动 限定地图 | 199 |   		if not buff:isHide() and buff:getType() == bType then
 | 
| 7828ffd0  zhouhaihai
 
冒险 连续选择点 和 地图因子 | 200 |   			return buff
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 201
202
203
204 |   		end
  	end
  end
  
 | 
| 1cb78a24  suhongyang
 
passive的筛选 | 205
206 |   function BaseObject:hadBuffById(bId)
  	for _, buff in ipairs(self.buffs) do
 | 
| 9c8e9482  zhouhaihai
 
buff  被动 限定地图 | 207 |   		if not buff:isHide() and buff.id == bId then
 | 
| 7828ffd0  zhouhaihai
 
冒险 连续选择点 和 地图因子 | 208 |   			return buff
 | 
| 1cb78a24  suhongyang
 
passive的筛选 | 209
210
211
212 |   		end
  	end
  end
  
 | 
| 84c2734c  zhouhaihai
 
怪物增加 spset | 213
214
215 |   function BaseObject:reSetSpMax()
  end
  
 | 
| 916096ed  zhouhaihai
 
神器效果 | 216 |   
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 217 |   -- 通用的buff 效果汇总  -- 0 固定 1百分比  两种分类
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 218 |   function BaseObject:getCommonBuffEffect(bType, otherCond)
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 219
220 |   	local effect, count = {[0] = 0, [1] = 0}, 0
  	for _, buff in ipairs(self.buffs) do
 | 
| 9c8e9482  zhouhaihai
 
buff  被动 限定地图 | 221 |   		if not buff:isHide() and buff:getType() == bType then
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 222
223 |   			local cType, value, cond = buff:effect()
  			if cType and (not otherCond or otherCond == cond) then
 | 
| 4ae223df  zhouahaihai
 
Buff bug | 224 |   				effect[cType] = effect[cType] + value
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 225
226
227
228 |   				count = count + 1
  			end
  		end
  	end
 | 
| 4ae223df  zhouahaihai
 
Buff bug | 229 |   	effect[1] = effect[1] / 100
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 230
231
232 |   	return effect, count --效果 和生效的buff 个数
  end
  --伤害反弹
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 233 |   function BaseObject:getBackHurtBuff()
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 234
235 |   	local effect = {[0] = 0, [1] = 0}
  	for _, buff in ipairs(self.buffs) do
 | 
| 9c8e9482  zhouhaihai
 
buff  被动 限定地图 | 236 |   		if not buff:isHide() and buff:getType() == Buff.BACK_HURT then
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 237 |   			local cType, value = buff:effect()  --  aType 0 全部  1 普通攻击
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 238 |   			if cType then
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 239 |   				effect[cType] = effect[cType] + value
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255 |   			end
  		end
  	end
  	return effect
  end
  
  --释放者伤害变化
  function BaseObject:getHurtChange()
  	local change = self:getCommonBuffEffect(Buff.HURT_CHANGE)
  	return change
  end
  --受伤者受伤变化
  function BaseObject:getInjuredChange()
  	local change = self:getCommonBuffEffect(Buff.INJURED_CHANGE)
  	return change
  end
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 256
257
258
259
260
261
262
263 |   -- 奖励道具变化
  function BaseObject:getRewardChange(itemId)
  	local change = self:getCommonBuffEffect(Buff.ITEM_GET_UP, itemId)
  	return change
  end
  
  -- buff 增益 检疫
  function BaseObject:getBuffEffectChange(classify)
 | 
| d3da3368  zhouhaihai
 
冒险地图被动技, buff  神器 | 264
265
266
267
268 |   	local classifys = classify:toArray(true, " ")
  	local had = {}
  	for _, one in pairs(classifys) do
  		had[one] = 1
  	end
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 269
270 |   	local effect = 0
  	for _, buff in ipairs(self.buffs) do
 | 
| 9c8e9482  zhouhaihai
 
buff  被动 限定地图 | 271 |   		if not buff:isHide() and buff:getType() == Buff.Buff_EFFECT_CHANGE then
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 272 |   			local cType, value = buff:effect()
 | 
| d3da3368  zhouhaihai
 
冒险地图被动技, buff  神器 | 273 |   			if cType and had[cType] then
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 274
275
276
277
278
279
280
281
282
283
284
285
286
287
288 |   				effect = effect + value
  			end
  		end
  	end
  	effect = effect / 100
  	return effect
  end
  
  function BaseObject:getAttrBuffChange(attr)
  	local AttrBuff = {
  		[Buff.ATTR_CHANGE] = 1,
  		[Buff.ATTR_CHANGE_COND] = 1,
  	}
  	local effect, count = {[0] = 0, [1] = 0}, 0
  	for _, buff in ipairs(self.buffs) do
 | 
| 9c8e9482  zhouhaihai
 
buff  被动 限定地图 | 289 |   		if not buff:isHide() and AttrBuff[buff:getType()] then
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 290
291
292
293
294
295
296
297
298
299 |   			local cType, value, attrName = buff:effect()
  			if cType and attr == attrName then
  				effect[cType] = effect[cType] + value
  				count = count + 1
  			end
  		end
  	end
  	effect[1] = effect[1] / 100
  	return effect, count
  end
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 300
301 |   --重新计算属性
  function BaseObject:reSetAttr(field)
 | 
| 36c30c5c  zhouahaihai
 
冒险 | 302 |   	local old = self[field]
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 303 |   	self[field] = self["_" .. field] --重置一下
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 304 |   	local effect = self:getAttrBuffChange(field)
 | 
| e10edb5f  zhouahaihai
 
冒险事件新 | 305 |   	self[field] = math.ceil((self[field] + effect[0]) * (1 + effect[1]))
 | 
| 36c30c5c  zhouahaihai
 
冒险 | 306 |   	local delta = self[field] - old
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 307
308 |   end
  
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 309
310
311
312 |   -- 重新计算 血量上限
  function BaseObject:reSetHpMax()
  	self.hpMax = self._hpMax
  	for _, buff in ipairs(self.buffs) do
 | 
| 9c8e9482  zhouhaihai
 
buff  被动 限定地图 | 313 |   		if not buff:isHide() and buff:getType() == Buff.HP_MAX_CHANGE then
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 314
315
316
317
318
319 |   			local cv = buff:effect()
  			if cv then
  				self.hpMax = self.hpMax + cv
  			end
  		end
  	end
 | 
| 98761edc  zhouhaihai
 
buff 补充 | 320 |   	local effect = self:getAttrBuffChange("hp")
 | 
| d3da3368  zhouhaihai
 
冒险地图被动技, buff  神器 | 321 |   	self.hpMax = (self.hpMax + effect[0]) * (1 + effect[1])
 | 
| 98761edc  zhouhaihai
 
buff 补充 | 322 |   	self.hpMax = math.ceil(math.max(1, self.hpMax))
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 323
324
325 |   	self.hp = math.min(self.hpMax, self.hp)
  end
  
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 326
327
328
329
330
331
332
333
334 |   --计算打出伤害加成后的值 
  function BaseObject:getHurtValue(value)
  	value = value or self.atk
  	local hurtChange = self:getHurtChange()
  	return math.max(0, (value + hurtChange[0]) * (1 + hurtChange[1]))
  end
  --计算自己伤害减免后的值
  function BaseObject:getInjuredValue(value)
  	local injuredChange = self:getInjuredChange()
 | 
| 6df85179  zhouhaihai
 
伤害计算 | 335 |   	return math.max(0, (value + injuredChange[0]) * (1 + injuredChange[1]))
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 336
337 |   end
  
 | 
| ae9a74b5  suhongyang
 
返回miss,快速战斗逻辑 | 338 |   --最终伤害 = [ (敌方攻击 - 己方防御) * (1+伤害增加百分比-伤害减少百分比)*(1+受伤增加百分比-受伤减少百分比)+(伤害增加固定值-伤害增加固定值+受伤增加固定值-受伤增加固定值)]*(1+侍宠百分比)-侍宠固定值
 | 
| 53e8037e  zhouhaihai
 
任务 | 339 |   -- params   -- hurtType  1 普攻伤害  2 buff伤害  3 反弹伤害  4 真实伤害  5 客户端发回来的伤害  --直接作用 6 buff伤害(真实)
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 340
341
342 |   --进入这个方法之前计算好释放者加成的伤害
  function BaseObject:hurt(value, releaser, params)
  	params = params or {}
 | 
| d3da3368  zhouhaihai
 
冒险地图被动技, buff  神器 | 343
344
345 |   
  	if params.hurtType and (params.hurtType == 2 or params.hurtType == 6) then
  		self:triggerPassive(Passive.SELF_HURT, {trigger = releaser, buffId = params.buffId})
 | 
| 02c4de8d  zhouahaihai
 
增加 固有技 | 346 |   		for _, team in ipairs(self:getTeam(1, true)) do
 | 
| d3da3368  zhouhaihai
 
冒险地图被动技, buff  神器 | 347 |   			team:triggerPassive(Passive.TEAM_HURT, {trigger = releaser, buffId = params.buffId})
 | 
| 02c4de8d  zhouahaihai
 
增加 固有技 | 348 |   		end
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 349 |   	end
 | 
| d3da3368  zhouhaihai
 
冒险地图被动技, buff  神器 | 350 |   
 | 
| 6df85179  zhouhaihai
 
伤害计算 | 351
352
353 |   	if params.hurtType ~= 5 then
  		if params.hurtType ~= 6 or params.hurtType ~= 4 then
  			value = math.max(0, value - self.def)
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 354 |   		end
 | 
| 6df85179  zhouhaihai
 
伤害计算 | 355 |   		value = self:getInjuredValue(value) --减伤计算
 | 
| 12f7b52c  zhouhaihai
 
冒险战斗 | 356
357
358
359
360
361
362
363
364
365
366
367
368
369
370 |   		if value == 0 then return end
  
  		-- 舍身和恃宠
  		local team = self:getTeam(1)
  		local transfer = {}
  		local absorb = {}
  		for _, one in ipairs(team) do
  			local change1, count1 = one:getCommonBuffEffect(Buff.INJURED_CHANGE)
  			local change2, count2 = one:getCommonBuffEffect(Buff.HURT_ABSORB)
  			if count1 > 0 then
  				table.insert(transfer, {one, change1, count1})
  			end
  			if count2 > 0 then
  				table.insert(absorb, {one, change2, count2})
  			end
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 371 |   		end
 | 
| 12f7b52c  zhouhaihai
 
冒险战斗 | 372
373
374
375
376
377
378
379
380
381
382
383
384
385
386 |   		if #absorb == 1 then --舍身优先级高  --舍身生效
  			if absorb[1][1] ~= self then --舍身的人不是自己才有效
  				local absorbV = (value - absorb[1][2][0]) * absorb[1][2][1] + absorb[1][2][0]  --固定值先生效
  				value = value - absorbV
  				absorb[1][1]:hurt(absorbV, releaser, params)
  			end
  		else
  			if #transfer == 1 and transfer[1][1] == self and #team > 1 then --侍宠 生效  
  				local transferValue = (value - transfer[1][2][0])* transfer[1][2][1] + transfer[1][2][0] --固定值先生效
  				value = value - transferValue
  				local oneValue = transferValue / (#team - 1)
  				for _, one in ipairs(team) do
  					if one ~= self then
  						one:hurt(oneValue, releaser, params)
  					end
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 387
388
389
390
391 |   				end
  			end
  		end
  	end
  
 | 
| e10edb5f  zhouahaihai
 
冒险事件新 | 392 |   	value = math.max(0, math.ceil(value))
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 393
394 |   	if value == 0 then return end
  	-- 反弹伤害
 | 
| 12f7b52c  zhouhaihai
 
冒险战斗 | 395 |   	if params.hurtType ~= 3 and params.hurtType ~= 5 and releaser and not releaser.isDead then
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 396 |   		local backEffect = self:getBackHurtBuff()
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 397
398
399
400
401 |   		local backValue = math.max(0, value * backEffect[1] + backEffect[0])
  		releaser:hurt(backValue, releaser, {hurtType = 3})
  	end
  
  	--受伤了~
 | 
| d232676a  zhouhaihai
 
功能解锁  冒险返回 | 402
403
404
405 |   	if self:is("Player") and params.hurtType ~= 5 then
  		self.battle.adv:pushBackEvent(AdvBackEventType.HpChange, {change = -value})
  	end
  
 | 
| d27a2b20  zhouhaihai
 
怪受伤 更新地块 | 406
407
408
409
410 |   	if params.hurtType ~= 5 then -- 非客户端发回的伤害  返回更新地块
  		if self.roomId and self.blockId then
  			self.battle.adv:backBlockChange(self.roomId, self.blockId)
  		end
  	end
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 411 |   	self.hp = math.max(0, self.hp - value)
 | 
| b0fe1817  zhouahaihai
 
冒险分数 | 412 |   
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 413 |   	if self.hp == 0 then
 | 
| 02c4de8d  zhouahaihai
 
增加 固有技 | 414
415
416
417
418 |   		self:triggerPassive(Passive.SELF_DEAD)
  		for _, team in ipairs(self:getTeam(1, true)) do
  			team:triggerPassive(Passive.TEAM_DEAD)
  		end
  
 | 
| 53e8037e  zhouhaihai
 
任务 | 419 |   		if (params.hurtType == 6 or params.hurtType == 2) and self ~= self.battle.player then
 | 
| b176d7d3  zhouhaihai
 
冒险成就 | 420
421 |   			self.battle.adv:checkAchievement(self.battle.adv.AchievType.KillByBuff, 1, params.buffId)
  		end
 | 
| d95bc647  zhouhaihai
 
冒险被动技 | 422 |   		self.isDead = true
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 423 |   	end
 | 
| 02c4de8d  zhouahaihai
 
增加 固有技 | 424
425
426
427 |   	self:triggerPassive(Passive.HURT_PERCENT_SELF, {value = value / self.hpMax})
  	for _, team in ipairs(self:getTeam(1, true)) do
  		team:triggerPassive(Passive.HURT_PERCENT_TEAM, {value = value / self.hpMax})
  	end
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 428
429
430
431 |   end
  --恢复
  function BaseObject:recover(value, releaser, params)
  	params = params or {}
 | 
| e10edb5f  zhouahaihai
 
冒险事件新 | 432 |   	value = math.max(0, math.ceil(value))
 | 
| 4500c9b8  zhouhaihai
 
满了不飘字 | 433 |   	local old = self.hp
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 434 |   	self.hp = math.min(self.hpMax, self.hp + value)
 | 
| 4500c9b8  zhouhaihai
 
满了不飘字 | 435 |   	local change = self.hp - old
 | 
| 59acc11e  zhouhaihai
 
赛季更新 | 436 |   	if self:is("Player") then
 | 
| 4500c9b8  zhouhaihai
 
满了不飘字 | 437
438
439 |   		if change > 0 then
  			self.battle.adv:pushBackEvent(AdvBackEventType.HpChange, {change = value})
  		end
 | 
| 59acc11e  zhouhaihai
 
赛季更新 | 440 |   	end
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 441
442 |   end
  
 | 
| 42f2d1d3  suhongyang
 
战斗内技能序列逻辑 | 443
444
445
446
447 |   function BaseObject:addSpecialSkill(skillId, skillLevel, target)
  	local skillData = {id = skillId, level = skillLevel, target = target}
  	table.insert(self.skillOrder, skillData)
  end
  
 | 
| d27ad5e0  suhongyang
 
使用营养技 | 448 |   function BaseObject:releaseSkill(skillId, target)
 | 
| 36c30c5c  zhouahaihai
 
冒险 | 449 |   	if self:hadBuff(Buff.CANT_SKILL) then return end -- 针对 怪物
 | 
| d27ad5e0  suhongyang
 
使用营养技 | 450 |   	local skill = Skill.new(self, {id = skillId, target = target})
 | 
| 36c30c5c  zhouahaihai
 
冒险 | 451 |   	--返回客户端
 | 
| 1b8336a6  suhongyang
 
skill逻辑与player分开 | 452 |   	for _, target in ipairs(skill:getTargets()) do
 | 
| 81032a9c  zhouhaihai
 
抽奖 | 453 |   		self.battle.adv:backSkill(self.monsterId, skillId, target.id)
 | 
| 36c30c5c  zhouahaihai
 
冒险 | 454 |   	end
 | 
| 1b8336a6  suhongyang
 
skill逻辑与player分开 | 455 |   	skill:doEffect()
 | 
| 02c4de8d  zhouahaihai
 
增加 固有技 | 456
457
458
459
460
461 |   	for _, team in ipairs(self:getTeam(2)) do
  		team:triggerPassive(Passive.TARGET_SKILL)
  	end
  	for _, team in ipairs(self:getTeam(1, true)) do
  		team:triggerPassive(Passive.TEAM_SKILL)
  	end
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 462
463
464 |   end
  
  --0 全部  1 我方  2 敌方
 | 
| 53e8037e  zhouhaihai
 
任务 | 465 |   function BaseObject:getTeam(nType, noSelf, mapIdx, includeLock)
 | 
| 43babcff  zhouhaihai
 
优化冒险结构  增加夹层功能 | 466 |   	mapIdx = mapIdx or self.battle.adv:getCurMapIdx()
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 467
468
469
470
471
472
473
474
475
476 |   	nType = nType or 0
  	local team = {}
  	local function addPlayer()
  		if not noSelf or self.battle.player ~= self then
  			if not self.battle.player.isDead then
  				table.insert(team, self.battle.player)
  			end
  		end
  	end
  	local function addEnemy()
 | 
| 43babcff  zhouhaihai
 
优化冒险结构  增加夹层功能 | 477 |   		for _, enemy in pairs(self.battle.enemys[mapIdx]) do
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 478 |   			if not noSelf or enemy ~= self then 
 | 
| 53e8037e  zhouhaihai
 
任务 | 479 |   				if not enemy.isDead and (includeLock or not enemy.lock) then -- 已经翻开的
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 480
481
482
483
484
485
486
487
488 |   					table.insert(team, enemy)
  				end
  			end
  		end
  	end
  	if nType == 0 then
  		addPlayer()
  		addEnemy()
  	elseif nType == 1 then
 | 
| b594a026  suhongyang
 
Fix bug | 489 |   		if not self.monsterId then --玩家
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 490
491
492
493
494 |   			addPlayer()
  		else
  			addEnemy()
  		end
  	elseif nType == 2 then
 | 
| b594a026  suhongyang
 
Fix bug | 495 |   		if not self.monsterId then --玩家
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 496
497
498
499
500
501
502
503
504
505 |   			addEnemy()
  		else
  			addPlayer()
  		end
  	end
  	return team
  end
  
  function BaseObject:getDB()
  	local db = {}
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 506 |   	db.hp = self.hp
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 507 |   	local baseAttr = {"atk", "miss", "hit", "def", "hpMax"}
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 508
509
510
511
512
513
514
515 |   	for _, field in pairs(baseAttr) do
  		db[field] = self[field]
  		db["_"..field] = self["_" .. field]
  	end
  	db.passives = {}
  	for _, passive in ipairs(self.passives) do
  		table.insert(db.passives, passive:getDB())
  	end
 | 
| 4ae223df  zhouahaihai
 
Buff bug | 516 |   	db.buffs = {}
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 517
518
519
520
521
522
523 |   	for _, buff in ipairs(self.buffs) do
  		table.insert(db.buffs, buff:getDB())
  	end
  	return db
  end
  
  function BaseObject:triggerPassive(condType, params)
 | 
| 02c4de8d  zhouahaihai
 
增加 固有技 | 524
525
526
527 |   	if self.isDead then return end
  	for _, passive in ipairs(self.passives) do
  		passive:trigger(condType, params) --检查触发
  	end
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 528
529 |   end
  
 | 
| 3b0526d2  zhouhaihai
 
冒险demo | 530
531
532 |   function BaseObject:changeSp()
  end
  
 | 
| d232676a  zhouhaihai
 
功能解锁  冒险返回 | 533
534
535
536 |   function BaseObject:is(what)
  	return self["is" .. what] and self["is" .. what](self)
  end
  
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 537 |   local Enemy = class("Enemy", BaseObject)
 | 
| 43babcff  zhouhaihai
 
优化冒险结构  增加夹层功能 | 538 |   function Enemy:ctor(battle, mId, monsterId, roomId, blockId, lock, enemy, mapIdx)
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 539 |   	Enemy.super.ctor(self, battle)
 | 
| 36c30c5c  zhouahaihai
 
冒险 | 540
541 |   	self.id = mId
  	self.monsterId = monsterId  --数据id
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 542
543
544 |   	self.roomId = roomId
  	self.blockId = blockId
  	self.lock = lock
 | 
| 43babcff  zhouhaihai
 
优化冒险结构  增加夹层功能 | 545 |   	self.mapIdx = mapIdx
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 546
547 |   	self:initData(enemy)
  end
 | 
| a0834e49  zhouhaihai
 
增加潜行 功能 | 548 |   function Enemy:unlock()
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 549
550
551 |   	self.lock = nil
  end
  
 | 
| d232676a  zhouhaihai
 
功能解锁  冒险返回 | 552
553
554
555 |   function Enemy:isEnemy()
  	return true
  end
  
 | 
| 7b2dc17c  zhouhaihai
 
地图 层 buff passive | 556
557
558
559 |   function Enemy:kill()
  	self:hurt(self.hp, self.battle.player, {hurtType = 5})
  end
  
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 560
561
562
563
564
565 |   local Player = class("Player", BaseObject)
  function Player:ctor(battle, data)
  	Player.super.ctor(self, battle)
  	self:initData(data)
  end
  
 | 
| b53593b5  zhouhaihai
 
羁绊加成 | 566
567 |   function Player:initData(data)
  	Player.super.initData(self, data)
 | 
| 386ca58e  zhouhaihai
 
优化log | 568 |   	self.level = data.level or 1  --level 每增加1级  属性增长 growth * baseAttr
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 569 |   	self.growth = data.growth
 | 
| b53593b5  zhouhaihai
 
羁绊加成 | 570 |   	self.exp = data.exp or 0
 | 
| 3b0526d2  zhouhaihai
 
冒险demo | 571 |   	self.sp = data.sp or 100
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 572
573 |   	self.spMax = data.spMax or 100
  	self._spMax = data._spMax or 100
 | 
| b53593b5  zhouhaihai
 
羁绊加成 | 574
575
576 |   end
  
  function Player:addExp(value)
 | 
| 4f0a5fae  zhouhaihai
 
营养剂 | 577
578
579
580 |   	-- buff 经验加成
  	local up = self:getCommonBuffEffect(Buff.EXP_UP)
  	value = math.ceil((value + up[0]) * (1 + up[1]))
  
 | 
| 51718558  zhouhaihai
 
中继层初始经验 | 581 |   	if value <= 0 then return end
 | 
| 6732f756  zhouhaihai
 
玩家升级 | 582
583
584
585
586
587
588
589
590
591
592 |   	local newExp = self.exp + value
  	local level = self.level
  	if level >= #csvdb["adv_levelCsv"] then return end
  	while true do
  		local curData = csvdb["adv_levelCsv"][level]
  		if newExp < curData.exp then break end
  		level = level + 1
  		newExp = newExp - curData.exp
  		if level >= #csvdb["adv_levelCsv"] then break end
  	end
  	local delta = level - self.level
 | 
| 56484297  zhouhaihai
 
冒险消息 | 593
594
595 |   
  	self.battle.adv:pushBackEvent(AdvBackEventType.Exp, {delta = value})
  
 | 
| 6732f756  zhouhaihai
 
玩家升级 | 596 |   	if delta > 0 then
 | 
| 8781e103  zhouhaihai
 
冒险 bug | 597 |   		for attr, _ in pairs(AdvAttsEnum) do
 | 
| d232676a  zhouhaihai
 
功能解锁  冒险返回 | 598 |   			self:addBaseAttr(attr, self.growth[attr] * delta, 0, true)
 | 
| 6732f756  zhouhaihai
 
玩家升级 | 599 |   		end
 | 
| 81032a9c  zhouhaihai
 
抽奖 | 600 |   		self.battle.adv:pushBackEvent(AdvBackEventType.Level, {level = level, delta = delta})
 | 
| 6732f756  zhouhaihai
 
玩家升级 | 601
602
603 |   	end
  	self.level = level
  	self.exp = newExp
 | 
| 85ded242  zhouhaihai
 
丰富返回事件 | 604 |   	return value
 | 
| b53593b5  zhouhaihai
 
羁绊加成 | 605 |   end
 | 
| 1ffc16b9  zhouhaihai
 
冒险 选择点和 建筑 | 606 |   --vtype 0/1 值/%
 | 
| d232676a  zhouhaihai
 
功能解锁  冒险返回 | 607 |   function Player:addBaseAttr(attr, value, vtype, ignoreBack)
 | 
| 1ffc16b9  zhouhaihai
 
冒险 选择点和 建筑 | 608
609
610 |   	local attrName = attr
  	if attr == "hp" then
  		attrName = "hpMax"
 | 
| e1679483  zhouhaihai
 
bug | 611 |   	elseif attr == "sp" then
 | 
| 1ffc16b9  zhouhaihai
 
冒险 选择点和 建筑 | 612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631 |   		attrName = "spMax"
  	end
  	local baseName = "_" .. attrName
  	if not self[baseName] then return end
  	local oldV = self[baseName]
  
  	local change = value
  	if vtype == 1 then
  		change = oldV * value / 100
  	end
  	self[baseName] = self[baseName] + change
  	if attr == "hp" then
  		self.hp = self.hp + change
  		self:reSetHpMax()
  	elseif attr == "sp" then
  		self.sp = self.sp + change
  		self:reSetSpMax()
  	else
  		self:reSetAttr(attr)
  	end
 | 
| d232676a  zhouhaihai
 
功能解锁  冒险返回 | 632
633
634
635 |   
  	if not ignoreBack then
  		self.battle.adv:pushBackEvent(AdvBackEventType.BaseAttrChange, {type = AdvAttsEnum[attr] or 0, change = change})
  	end
 | 
| 1ffc16b9  zhouhaihai
 
冒险 选择点和 建筑 | 636 |   end
 | 
| b53593b5  zhouhaihai
 
羁绊加成 | 637 |   
 | 
| 3b0526d2  zhouhaihai
 
冒险demo | 638
639 |   --cType 0 or nil  值  1 百分比
  function Player:changeSp(value, cType)
 | 
| 85ded242  zhouhaihai
 
丰富返回事件 | 640 |   	local oldSp = self.sp
 | 
| 3b0526d2  zhouhaihai
 
冒险demo | 641 |   	cType = cType or 0
 | 
| cac28f5f  zhouhaihai
 
魔力改变 | 642 |   	local change = 0
 | 
| 3b0526d2  zhouhaihai
 
冒险demo | 643 |   	if cType == 0 then
 | 
| cac28f5f  zhouhaihai
 
魔力改变 | 644 |   		change = value
 | 
| 3b0526d2  zhouhaihai
 
冒险demo | 645 |   	elseif cType == 1 then
 | 
| cac28f5f  zhouhaihai
 
魔力改变 | 646 |   		change = self.sp * value / 100
 | 
| 3b0526d2  zhouhaihai
 
冒险demo | 647 |   	end
 | 
| 6c012309  zhouhaihai
 
sp 满了不加 | 648 |   	local old = self.sp
 | 
| cac28f5f  zhouhaihai
 
魔力改变 | 649 |   	self.sp = math.floor(math.min(self.spMax, math.max(0, self.sp + change)))
 | 
| 6c012309  zhouhaihai
 
sp 满了不加 | 650 |   	change = self.sp - old
 | 
| cac28f5f  zhouhaihai
 
魔力改变 | 651
652 |   	if change ~= 0 then
  		self.battle.adv:pushBackEvent(AdvBackEventType.SpChange, {change = math.floor(change)})
 | 
| 81032a9c  zhouhaihai
 
抽奖 | 653 |   	end
 | 
| 3b0526d2  zhouhaihai
 
冒险demo | 654
655 |   end
  
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 656 |   -- 重新计算 魔法上限
 | 
| 3df73a9e  zhouhaihai
 
复兴奖励 | 657 |   function Player:reSetSpMax()
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 658
659
660
661
662
663
664 |   	self.spMax = self._spMax
  	local change = self:getCommonBuffEffect(Buff.SP_MAX_CHANGE)
  	self.spMax = math.ceil((self.spMax + change[0]) * (1 + change[1]))
  	self.spMax = math.max(1, self.spMax)
  	self.sp = math.min(self.spMax, self.sp)
  end
  
 | 
| e90b4d20  zhouhaihai
 
战斗buff | 665
666
667 |   --战斗结束了扣战斗buff次数
  function Player:effectBattleBuff()
  	for _, buff in ipairs(self.buffs) do
 | 
| 9c8e9482  zhouhaihai
 
buff  被动 限定地图 | 668 |   		if not buff:isHide() and (buff:getType() == Buff.BATTLE_BUFF or buff:getType() == Buff.BATTLE_PASSIVE) then
 | 
| e90b4d20  zhouhaihai
 
战斗buff | 669
670
671
672 |   			buff:effect()
  		end
  	end
  end
 | 
| 3b0526d2  zhouhaihai
 
冒险demo | 673 |   
 | 
| 596ac19f  zhouhaihai
 
buff | 674 |   function Player:afterLayer()
 | 
| 7b2dc17c  zhouhaihai
 
地图 层 buff passive | 675
676
677
678
679 |   	for _, passive in ipairs(self.passives) do
  		if not passive.isDel then
  			passive:afterLayer()
  		end
  	end
 | 
| 596ac19f  zhouhaihai
 
buff | 680
681
682
683
684 |   	for _, buff in ipairs(self.buffs) do
  		if not buff.isDel then
  			buff:afterLayer()
  		end
  	end	
 | 
| 7b2dc17c  zhouhaihai
 
地图 层 buff passive | 685
686 |   
  	self:clearRound()
 | 
| 596ac19f  zhouhaihai
 
buff | 687
688 |   end
  
 | 
| e852b350  zhouhaihai
 
冒险成就类型增加 | 689 |   function Player:addBuff(buffId, releaser)
 | 
| c5d9338f  zhouhaihai
 
通用方法 异常 | 690
691
692
693 |   	local status = Player.super.addBuff(self, buffId, releaser)
  	if  status then
  		self.battle.player:attrChangeCondBuffCheck(2, buffId)
  		self.battle.adv:checkAchievement(self.battle.adv.AchievType.GetBuff, 1, buffId)
 | 
| d232676a  zhouhaihai
 
功能解锁  冒险返回 | 694 |   		self.battle.adv:pushBackEvent(AdvBackEventType.Buff, {buffId = buffId})
 | 
| c5d9338f  zhouhaihai
 
通用方法 异常 | 695
696 |   	end
  	return status
 | 
| e852b350  zhouhaihai
 
冒险成就类型增加 | 697
698 |   end
  
 | 
| b71a8190  zhouhaihai
 
动态改变 一些buff | 699
700
701 |   function Player:attrChangeCondBuffCheck(etype, cond)
  	local effect = {}
  	for _, buff in ipairs(self.buffs) do
 | 
| 9c8e9482  zhouhaihai
 
buff  被动 限定地图 | 702 |   		if not buff:isHide() and (buff:getType() == Buff.ATTR_CHANGE_COND) then
 | 
| b71a8190  zhouhaihai
 
动态改变 一些buff | 703
704
705
706
707
708
709 |   			local _et, _attr, _co = buff:getEffectBy()
  			if etype == _et and (not _co or _co == cond) then
  				effect[_attr] = 1
  			end
  			
  		end
  	end
 | 
| b71a8190  zhouhaihai
 
动态改变 一些buff | 710
711
712
713
714
715
716
717
718 |   	for attrName, _ in pairs(effect) do
  		if attrName == "hp" then
  			self:reSetHpMax()
  		else
  			self:reSetAttr(attrName)
  		end
  	end
  end
  
 | 
| d232676a  zhouhaihai
 
功能解锁  冒险返回 | 719
720
721
722 |   function Player:isPlayer()
  	return true
  end
  
 | 
| b53593b5  zhouhaihai
 
羁绊加成 | 723
724 |   function Player:getDB()
  	local db = Player.super.getDB(self)
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 725 |   	for _ , field in pairs({"level", "exp", "growth", "sp", "spMax"}) do
 | 
| b53593b5  zhouhaihai
 
羁绊加成 | 726
727 |   		db[field] = self[field]
  	end
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 728 |   	db["_spMax"] = self._spMax
 | 
| b53593b5  zhouhaihai
 
羁绊加成 | 729
730
731 |   	return db
  end
  
 | 
| 9687f887  zhouhaihai
 
建筑被动 | 732
733
734
735
736
737 |   -- 建筑 拥有被动技  
  local Build = class("Build", BaseObject)
  
  function Build:ctor(battle, id, roomId, blockId, lock, build, mapIdx)
  	Enemy.super.ctor(self, battle)
  	self.id = id
 | 
| 9687f887  zhouhaihai
 
建筑被动 | 738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753 |   	self.roomId = roomId
  	self.blockId = blockId
  	self.lock = lock
  	self.mapIdx = mapIdx
  	self:initData(build)
  end
  
  function Build:initData(data)
  end
  
  function Build:addBuff(buffId, releaser)
  end
  
  function Build:hurt()
  end
  
 | 
| d232676a  zhouhaihai
 
功能解锁  冒险返回 | 754
755
756 |   function Build:isBuild()
  	return true
  end
 | 
| 9687f887  zhouhaihai
 
建筑被动 | 757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788 |   --0 全部  1 怪物  2 玩家  
  function Build:getTeam(nType, noSelf, mapIdx, includeLock)
  	noSelf = false  -- 不管怎么都取不到自己
  	mapIdx = mapIdx or self.battle.adv:getCurMapIdx()
  	nType = nType or 0
  	local team = {}
  	local function addPlayer()
  		if not noSelf or self.battle.player ~= self then
  			if not self.battle.player.isDead then
  				table.insert(team, self.battle.player)
  			end
  		end
  	end
  	local function addEnemy()
  		for _, enemy in pairs(self.battle.enemys[mapIdx]) do
  			if not noSelf or enemy ~= self then 
  				if not enemy.isDead and (includeLock or not enemy.lock) then -- 已经翻开的
  					table.insert(team, enemy)
  				end
  			end
  		end
  	end
  	if nType == 0 then
  		addPlayer()
  		addEnemy()
  	elseif nType == 1 then
  		addEnemy()
  	elseif nType == 2 then
  		addPlayer()
  	end
  	return team
  end
 | 
| 26aeaf48  zhouhaihai
 
bug | 789 |   function Build:unlock()
 | 
| 9687f887  zhouhaihai
 
建筑被动 | 790
791
792 |   	self.lock = nil
  end
  
 | 
| 26aeaf48  zhouhaihai
 
bug | 793 |   function Build:getDB()
 | 
| 9687f887  zhouhaihai
 
建筑被动 | 794
795
796
797
798
799
800 |   	local db = {}
  	db.passives = {}
  	for _, passive in ipairs(self.passives) do
  		table.insert(db.passives, passive:getDB())
  	end
  	return db
  end
 | 
| 3b0526d2  zhouhaihai
 
冒险demo | 801
802 |   
  
 | 
| 26aeaf48  zhouhaihai
 
bug | 803 |   return table.pack(Player, Enemy, Build)
 |