Merge branch 'bugfix' of 120.26.43.151:wasteland/server into bugfix

liuzujun
2 parents 56d191ec 294408d9
Showing 3 changed files with 8 additions and 8 deletions Show diff stats
src/adv/AdvBuff.lua
src/adv/AdvPassive.lua
src/adv/AdvPlayer.lua
@@ -584,12 +584,12 @@ end
 -- 在当前阶段不可用 小透明 < 不会回合遍历  不会查找遍历  可以删除遍历  可以下层遍历 >
 function Buff:isHide()
 	if self.isDel then
-		return false
+		return true
 	end
 	if self.buffData.mapLock == 1 and self.mapId and self.owner.battle.adv:getCurMap().mapId ~= self.mapId  then
-		return false
+		return true
 	end
-	return true
+	return false
 end
 --删除buff 时调用
@@ -334,7 +334,7 @@ function Passive:effect(triggerPms)
 end
 function Passive:afterRound()
-	if self.isDel or self.owner.isDead or self.owner.lock or not self:isHide() then return end
+	if self.isDel or self.owner.isDead or self.owner.lock or self:isHide() then return end
 	if self.round > 0 then  --回合触发的
 		self.round = self.round - 1
 	end
@@ -355,12 +355,12 @@ end
 -- 在当前阶段不可用 小透明 < 不会回合遍历  不会查找遍历  可以删除遍历  可以下层遍历 >
 function Passive:isHide()
 	if self.isDel then
-		return false
+		return true
 	end
 	if self.passiveData.mapLock == 1 and self.mapId and self.owner.battle.adv:getCurMap().mapId ~= self.mapId  then
-		return false
+		return true
 	end
-	return true
+	return false
 end
 -- 可以触发
@@ -349,7 +349,7 @@ function BaseObject:hurt(value, releaser, params)
 	end
 	if params.hurtType ~= 5 then
-		if params.hurtType ~= 6 or params.hurtType ~= 4 then
+		if params.hurtType ~= 6 and params.hurtType ~= 4 then
 			value = math.max(0, value - self.def)
 		end
 		value = self:getInjuredValue(value) --减伤计算