冒险被动调整

zhouhaihai
1 parent aeb5da9a
Showing 3 changed files with 17 additions and 25 deletions Show diff stats
src/actions/AdvAction.lua
src/adv/AdvPassive.lua
src/adv/AdvPlayer.lua
@@ -734,7 +734,7 @@ function _M.refreshSupportRpc(agent, data)
 	local al = role:getAdvSupportFreeCount()
 	if cr < al then  --免费
-		role.dailyData:updateProperty({field = advSupRe, delta = 1})
+		role.dailyData:updateProperty({field = "advSupRe", delta = 1})
 	else -- 付费
 		if not role:checkItemEnough({[ItemId.Diamond] = globalCsv.adv_support_refresh_cost}) then return end
 		role:costItems({[ItemId.Diamond] = globalCsv.adv_support_refresh_cost})
@@ -394,19 +394,17 @@ function Passive:effect2(value, triggerPms)
 		aim:addBuff(value, self.owner)
 	end
 end
---3=翻开自己所在格子
--- 胡博文 : 目前还不会配一定范围 先不处理把。我想不出来自己开一定范围的应用环境
---  如果打开注释 需要注意 自动开放不能点击的处理
+--3=翻开自己所在格子
 function Passive:effect3(value)
 	if value == 0 then
 		self.owner.battle.adv:getCurMap():openBlock(self.owner.roomId, self.owner.blockId)
-	-- elseif value > 0 then
-	-- 	self.owner.battle.adv:getCurMap():openBlocksBySize(self.owner.roomId, self.owner.blockId, value)
-	-- elseif value == -1 then -- 当前房间
-	-- 	self.owner.battle.adv:getCurMap():openBlocksByRoom(self.owner.roomId)
-	-- elseif value == -2 then  -- 当前层
-	-- 	self.owner.battle.adv:getCurMap():openAllBlocks(not self.owner.monsterId)
+	elseif value > 0 then
+		self.owner.battle.adv:getCurMap():openBlocksBySize(self.owner.roomId, self.owner.blockId, value)
+	elseif value == -1 then -- 当前房间
+		self.owner.battle.adv:getCurMap():openBlocksByRoom(self.owner.roomId)
+	elseif value == -2 then  -- 当前层
+		self.owner.battle.adv:getCurMap():openAllBlocks(not self.owner.monsterId)
 	end
 end
 --4=逃跑
@@ -427,25 +425,19 @@ function Passive:effect5(monsterId)
 	self.owner.battle.adv:getCurMap():addNewMonsterRand(monsterId)
 end
---6=给所有敌方增加一个buff
+--6=给所有场上怪物增加buff
 function Passive:effect6(value)
-	local monsters = self.owner.battle.player:getTeam(2)
-	for _, enemy in ipairs(monsters) do
-		enemy:addBuff(value, self.owner)
-	end
-end
---6=给自己加一個被動技能
-function Passive:effect6(value)
-	self.owner:addPassive({id = value})
-end
---7=给场上队友增加buff 
-function Passive:effect7(value)
-	local firends = self.owner:getTeam(1, true)
+	local firends = self.owner.battle.player:getTeam(2)
 	for k , v in pairs(firends) do
 		self.owner:addBuff(value, self.owner)
 	end
 end
+--7=给自己加一個被動技能  --废弃
+-- function Passive:effect7(value)
+-- 	self.owner:addPassive({id = value})
+-- end
+
 --8=获得drop,直接进入背包
 function Passive:effect8(dropId)
 	local item = csvdb["event_dropCsv"][dropId]["range"]:randWeight(true)
@@ -392,6 +392,8 @@ function BaseObject:hurt(value, releaser, params)
 	end
 	if self.hp == 0 then
+		self.isDead = true
+
 		self:triggerPassive(Passive.SELF_DEAD)
 		for _, team in ipairs(self:getTeam(1, true)) do
 			team:triggerPassive(Passive.TEAM_DEAD)
@@ -400,8 +402,6 @@ function BaseObject:hurt(value, releaser, params)
 		if (params.hurtType == 6 or params.hurtType == 2) and self ~= self.battle.player then
 			self.battle.adv:checkAchievement(self.battle.adv.AchievType.KillByBuff, 1, params.buffId)
 		end
-
-		self.isDead = true
 	end
 	self:triggerPassive(Passive.HURT_PERCENT_SELF, {value = value / self.hpMax})
 	for _, team in ipairs(self:getTeam(1, true)) do