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

liuzujun
2 parents 847f9a7b 6838209b
Showing 4 changed files with 32 additions and 17 deletions Show diff stats
config/nodenames.lua
src/adv/Adv.lua
src/adv/AdvBattle.lua
src/adv/AdvPlayer.lua
-center = "192.168.8.198:9000"
+center = "192.168.0.198:9000"
 server1 = "127.0.0.1:8101"
 server2 = "127.0.0.1:8102"
 \ No newline at end of file
@@ -58,7 +58,7 @@ function Adv:initByInfo(advInfo)
 		self.maps[id] = AdvMap.new(self, id, map)
 	end
-	self:initBattle()
+	self:initBattle(advInfo)
 end
 -- 找出level 是否存在中继层
 function Adv:isHaveRelay(level, chapterId)
@@ -149,7 +149,7 @@ function Adv:initByChapter(params)
 	self.maps = {}
 	self.maps[1] = AdvMap.new(self, 1, mapId, isEnter, isNewRelay)
-	self:initBattle(true)
+	self:initBattle(nil)
 	self:initLayerTask()
@@ -456,7 +456,7 @@ function Adv:clearAdvUnlockCache()
 	self.cacheUnlock = {}
 end
-function Adv:initBattle(notDb)
+function Adv:initBattle(info)
 	self.battle = require("adv.AdvBattle").new(self)
 	for _, passiveC in ipairs(self.cachePassiveEvent or {}) do
 		self.battle:triggerPassive(passiveC[1], passiveC[2])
@@ -468,13 +468,15 @@ function Adv:initBattle(notDb)
 		map:initBattleAfter()
 	end
 	--下层
-	if notDb and self.level ~= 1 then
+	if not info and self.level ~= 1 then
 		self.battle.player:attrChangeCondBuffCheck(1)
 	end
 	-- 初始化
-	if notDb then
+	if not info then
 		self.battle:newBattle()
+	else
+		self.battle:loadBattle(info)
 	end
 end
@@ -316,8 +316,19 @@ function Battle:afterRound()
 		build:afterRound("buffAfter")
 	end
+	self.player:triggerPassive(Passive.AFTER_ROUND)
+
+	self:checkAura()
+	self:clearRound()
+
+	if self.player.isDead then
+		self.adv:over(false, nil, -2)
+	end
+end
+function Battle:clearRound()
+	local mapIdx = self.adv:getCurMapIdx()
 	self.player:clearRound()
 	for _, enemy in ipairs(self.enemys[mapIdx]) do
 		enemy:clearRound()
@@ -347,14 +358,6 @@ function Battle:afterRound()
 			build:clear()
 		end
 	end
-
-	self.player:triggerPassive(Passive.AFTER_ROUND)
-
-	self:checkAura()
-
-	if self.player.isDead then
-		self.adv:over(false, nil, -2)
-	end
 end
@@ -429,7 +432,7 @@ function Battle:initMapEffect(ilayer)
 	end
 	for _, buff in ipairs(buffs[1] or {}) do
-		self.palyer:addBuff(buff)
+		self.player:addBuff(buff)
 	end
 	for _, buff in ipairs(buffs[2] or {}) do
@@ -450,12 +453,14 @@ function Battle:iLayerChange(oldMapIdx)
 		enemy:checkAuraBuff(enemyBuffs)
 	end
 	self:setMapAuras(auras)
+	self:clearRound()
 end
 -- 新的 关卡 关闭旧的战斗模块 清理 玩家身上的光环效果
 function Battle:overBattle()
 	local buffs = self:checkDiffAuraBuff(self:getAurasByMap(), {})
 	self.player:checkAuraBuff(buffs)
+	self:clearRound()
 	self.adv.owner:getProperty("advTeam").player = self.player:getDB()  -- 临时缓存住 battle 的player
 end
@@ -463,9 +468,17 @@ end
 function Battle:newBattle()
 	local auras = self:getActiveAuras()
 	local buffs = self:checkDiffAuraBuff({}, auras)
+	self.player:checkAuraBuff(buffs)
+	for _, enemy in pairs(self.player:getTeam(2)) do
+		enemy:checkAuraBuff(buffs)
+	end
 	self:setMapAuras(auras)
 end
+function Battle:loadBattle(info)
+	self.auras = info.auras or {}
+end
+
 -- 过了回合 检查光环
 function Battle:checkAura()
 	local auras = self:getActiveAuras()
@@ -144,7 +144,7 @@ function BaseObject:getDisablePassiveCount()
 end
 function BaseObject:getDisableAuraCount()
-	local count
+	local count = 0
 	for _, buff in ipairs(self.buffs) do
 		if not buff:isHide() and buff:getType() == Buff.DISABLE_AURA then
 			if buff:effect() == 0 then
@@ -699,7 +699,7 @@ function Enemy:checkAuraBuff(buffs)
 			if buff then
 				buff:uncover(info.exist and -info.count or -1, true)
 			end
-		elseif count > 0 then
+		elseif info.count > 0 then
 			self:addBuff(buffId, nil, info.count)
 		end
 	end