Merge branch 'tr/develop' of 120.26.43.151:wasteland/server into tr/develop

liuzujun
2 parents 7b570ef2 9ee46da4
Showing 3 changed files with 21 additions and 4 deletions Show diff stats
src/GlobalVar.lua
src/adv/Adv.lua
src/adv/AdvPlayer.lua
@@ -242,6 +242,7 @@ AdvBackEventType = {
 	BuffEffect = 27, -- buff 效果
 	PassiveEffect = 28, -- 被动 效果
 	ChooseDice = 29, -- 选择点随机效果
+	NoEffect = 30, -- 没有效果
 }
  
 AdvScoreType = {
@@ -160,8 +160,11 @@ function Adv:initByChapter(params)
 	self:checkAdvUnlock(1, self.level)
  
 	-- 中继进入奖励
-	if relayData and isEnter then
-		self:awardRelay(relayData, notNotify)
+	if isEnter then
+		relayData = relayData or self:isHaveRelay(level, chapterId)
+		if relayData then
+			self:awardRelay(relayData, notNotify)
+		end
 	end
  
 	if not notNotify then
@@ -2033,9 +2036,18 @@ function Adv:doActive(activeId, target)
 	-- 5：放逐目标
 	doActiveEffect[5] = function(_)
 		for _,  target in ipairs(targers) do
+			local had = false
 			if not target.lock and not target.isDead then
-				target:kill()
-				self:backBlockChange(target.roomId, target.blockId)
+				if target:getMonsterCsv().type == 5 then
+					-- 假boss 不能用
+					had = true
+				else
+					target:kill()
+					self:backBlockChange(target.roomId, target.blockId)
+				end
+			end
+			if had then
+				self:pushBackEvent(AdvBackEventType.NoEffect)
 			end
 		end
 		return true
@@ -677,6 +677,10 @@ function Enemy:getClassify()
 	return csvdb["event_monsterCsv"][self.monsterId].classify
 end
  
+function Enemy:getMonsterCsv()
+	return csvdb["event_monsterCsv"][self.monsterId]
+end
+
 -- 0=所有  1=怪物  2=玩家
 function Enemy:checkAuraBuff(buffs)
 	local needBuffs = {}