Merge branch 'master' into feng/equip

gaofengduan
2 parents 91170e1a a88a35fd
Showing 8 changed files with 142 additions and 27 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/AdvAction.lua
src/adv/Adv.lua
src/adv/AdvBattle.lua
src/adv/AdvBuff.lua
src/adv/AdvPassive.lua
src/adv/AdvPlayer.lua
@@ -101,6 +101,7 @@ AdvBackEventType = {
 	Dead = 11, --怪死亡
 	DefChange = 12, -- 防御变化
 	Passive = 13, -- 獲得被動
+	TurnEnd = 14, -- 回合结束
 }
 AdvScoreType = {
@@ -32,6 +32,7 @@ actionCodes = {
 	Adv_useItemRpc = 154,
 	Adv_useSkillRpc = 155,
 	Adv_exitAdvRpc = 156,
+	Adv_nextTurnRpc = 157,
 	Hero_loadInfos = 201,
 	Hero_updateProperty = 202,
@@ -97,6 +97,18 @@ function _M.exitAdvRpc(agent, data)
 	return true
 end 
-
+--继续战斗
+function _M.nextTurnRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local adv = role:getAdvData()
+	local status = adv:nextBattleTurn(msg.turn)
+	if not status then -- 数据不同步则发送缓存数据
+		SendPacket(actionCodes.Adv_nextTurnRpc, MsgPack.pack({events = adv.tempBackEvents}))
+		return true
+	end
+	SendPacket(actionCodes.Adv_nextTurnRpc, MsgPack.pack({events = adv:popBackEvents()}))
+	return true
+end
 return _M
 \ No newline at end of file
@@ -442,6 +442,7 @@ function Adv:ctor(owner)
 	self.advTeam = self.owner:getProperty("advTeam")	--这个变量置空使用 table.clear  
 	self:clear()
 	self.backEvents = {} --发给客户端的事件组
+	self.tempBackEvents = {} --发给客户端的事件组(缓存)
 end
 -- 清空自己组织的数据
@@ -699,7 +700,7 @@ end
 --战斗 普通攻击
 local function clickMonster(self, room, block, params)
-	self.battle:playerAtk(room.roomId, block.blockId)
+	self.battle:battleBegin(room.roomId, block.blockId)
 	return true
 end
@@ -881,7 +882,16 @@ function Adv:clickBlock(roomId, blockId, params)
 			end
 		end
 	end
-	if status and (not clickEvent or (not block.event or block.event.etype ~= AdvEventType.Out)) then  --出去了就不计算回合了
+	local needChange = true
+	if clickEvent and block.event then
+		if block.event.etype == AdvEventType.Out then
+			needChange = false
+		end
+		if (block.event.etype == AdvEventType.Monster or block.event.etype == AdvEventType.BOSS) and not self.battle:isBattleEnd() then
+			needChange = false
+		end
+	end
+	if status and needChange then  --出去了就不计算回合了
 		self:backBlockChange(roomId, blockId)
 		self:afterRound()
 	end
@@ -889,6 +899,22 @@ function Adv:clickBlock(roomId, blockId, params)
 	return status
 end
+--继续战斗
+function Adv:nextBattleTurn(turn)
+	local enemy = self.battle.enemy
+	if not enemy or self.battle:checkTurn(turn) then
+		return 
+	end
+	local roomId, blockId = self.battle:getRBByEnemyId(enemy.id)
+	self.battle:doBattleTurn()
+	if self.battle:isBattleEnd() then
+		self:backBlockChange(roomId, blockId)
+		self:afterRound()
+	end
+	self:saveDB()
+	return true
+end
+
 --使用道具产生效果
 function Adv:useItem(itemId, count, target)
 	count = count or 1
@@ -1049,6 +1075,10 @@ function Adv:backDead(enemyId)
 	self:pushBackEvent(AdvBackEventType.Dead, {enemyId = enemyId})
 end
+function Adv:backTurnEnd()
+	self:pushBackEvent(AdvBackEventType.TurnEnd, {})
+end
+
 function Adv:scoreChange(scoreType, pms)
 	local cutTypes = {}
@@ -1091,6 +1121,8 @@ end
 function Adv:popBackEvents()
 	local events = self.backEvents
+	-- TODO 缓存数据需要分类，防止发错，暂时只有战斗，可以不分
+	self.tempBackEvents = events
 	self.backEvents = {}
 	return events
 end
@@ -1100,6 +1132,7 @@ function Adv:afterRound()
 	if self.battle then
 		self.battle:afterRound()
 	end
+	-- TODO 房间回合事件
 end
 function Adv:saveDB()
@@ -6,7 +6,9 @@ function Battle:ctor(adv)
 	self.adv = adv
 	self.player = nil --玩家
 	self.isNewPlayer = false
+	self.enemy = nil
 	self.enemys = {} --怪
+	self.tempData = {} -- 临时回合数据
 	self:initPlayer()
 	self:initEnemys()
 	self:initAfter()
@@ -20,6 +22,10 @@ function Battle:initAfter()
 	for _, enemy in pairs(self.enemys) do
 		enemy:initAfter(self.adv.rooms[enemy.roomId].blocks[enemy.blockId].event.enemy)
 	end
+	if self.adv.advTeam.enemyId then
+		local enemy = self:getEnemyById(self.adv.advTeam.enemyId)
+		self.enemy = enemy
+	end
 end
 function Battle:initPlayer()
@@ -93,36 +99,71 @@ function Battle:getEnemyById(id)
 		end
 	end
 end
---普通攻击
-function Battle:playerAtk(roomId, blockId)
+
+function Battle:getRBByEnemyId(enemyId)
+	local enemy = self:getEnemyById(enemyId)
+	return enemy.roomId, enemy.blockId
+end
+
+function Battle:isBattleEnd()
+	if not self.enemy then
+		return true
+	end
+end
+
+--战斗开始
+function Battle:battleBegin(roomId, blockId)
+	self.tempData = {} -- 清理上次战斗数据
+	if self.enemy then
+		self.player:reset(self.adv.advTeam.player)
+		self.enemy:reset(self.adv.rooms[self.enemy.roomId].blocks[self.enemy.blockId].event.enemy)
+	end
 	local enemy = self:getEnemy(roomId, blockId)
 	if enemy then
+		self.enemy = enemy
 		self.player:battleBegin()
-		enemy:battleBegin()
-		while not enemy.isDead and not self.player.isDead do
-			-- 玩家先出手
-			self.adv:backAtk(nil, enemy.id)
-			self:doBattleTurn(self.player, enemy)
-			--是否无法反击
-			if not enemy.isDead and not enemy:hadBuff(Buff.CANT_BACK_ATK) then
-				self.adv:backAtk(enemy.id, nil)
-				self:doBattleTurn(enemy, self.player)
-			end
-		end
-		if not self.player.isDead then
-			self.player:battleEnd()
-		elseif not enemy.isDead then
-			enemy:battleEnd()
-		end
+		self.enemy:battleBegin()
+		self:doBattleTurn()
+	end
+end
+
+-- 检查回合数同步
+function Battle:checkTurn(turn)
+	if self.tempData[turn] then
+		return true
 	end
 end
---战斗内回合逻辑
-function Battle:doBattleTurn(atkPlayer, hurtPlayer)
+
+-- 战斗内一回合
+function Battle:doBattleTurn()
+	local enemy = self.enemy
+	-- 玩家先出手
+	self.adv:backAtk(nil, enemy.id)
+	self:doPlayerTurn(self.player, enemy)
+	--是否无法攻击
+	if not enemy.isDead and not enemy:hadBuff(Buff.CANT_BACK_ATK) then
+		self.adv:backAtk(enemy.id, nil)
+		self:doPlayerTurn(enemy, self.player)
+	end
+	-- 判定死亡
+	if enemy.isDead or self.player.isDead then
+		local deadPlayer = enemy.isDead and enemy or self.player
+		deadPlayer:battleEnd()
+		self.enemy = nil
+	else
+		self.adv:backTurnEnd()
+	end
+	self:getTempDB()
+end
+
+--战斗内角色回合逻辑
+function Battle:doPlayerTurn(atkPlayer, hurtPlayer)
 	atkPlayer:beforeTurn()
 	hurtPlayer:hurt(atkPlayer:getHurtValue(), atkPlayer, {hurtType = 1})
 	atkPlayer:afterTurn()
 	atkPlayer:clearTurn()
 end
+
 --触发全员被动技能
 function Battle:triggerPassive(condType, params)
 	self.player:triggerPassive(condType, params)
@@ -157,15 +198,29 @@ function Battle:afterRound()
 	else
 		self.player:hurt(self.player.hpMax / 10, nil, {hurtType = 4})
 	end
-
-
 	if self.player.isDead then
 		self.adv:over(false)
 	end
 end
+-- 写入临时数据
+function Battle:getTempDB()
+	local turnDB = {}
+	if self.enemy then
+		turnDB.enemy = self.enemy:getDB()
+	end
+	turnDB.player = self.player:getDB()
+	table.insert(self.tempData, turnDB)
+end
+
 --写入数据
 function Battle:getDB()
+	if not self.enemy then
+		self.adv.advTeam.enemyId = nil
+	else
+		self.adv.advTeam.enemyId = self.enemy.id
+		return
+	end
 	self.adv.advTeam.player = self.player:getDB()
 	for _, enemy in ipairs(self.enemys) do
 		local block = self.adv.rooms[enemy.roomId].blocks[enemy.blockId]
@@ -106,7 +106,7 @@ local BuffFactory = {
 		end
 	end,
 	[Buff.ATTR_CHANGE] = function(_Buff)
-		local attrName = AttsEnumEx[self.buffData.effectValue3]
+		local attrName = AttsEnumEx[_Buff.buffData.effectValue3]
 		commonAttr(_Buff, attrName)
 	end,
 	[Buff.BACK_HURT] = function(_Buff)
@@ -202,7 +202,7 @@ function Passive:ctor(owner, data)
 	self.count = data.count or self.passiveData.count	--触发剩余次数
 	self.delay = data.delay or self.passiveData.delayRound    --触发延迟回合数
 	self.turn = 0  --战斗内回合数
-	self.delayturn = self.passiveData.delayTurn --战斗内延迟回合数
+	self.delayTurn = self.passiveData.delayTurn --战斗内延迟回合数
 	self.effects = self.passiveData.effect:toTableArray(true)
 	self.filters = {}
@@ -15,11 +15,15 @@ function BaseObject:ctor(battle)
 	self.passives = {} --固有技能
 	self.buffs = {} --buff
 	self.isDead = false
+	self.mpMax = 0
+	self.mp = 0
 end
 --初始化角色
 function BaseObject:initData(data)
 	self.hpMax = data.hpMax or data.hp
 	self.hp = data.hp
+	self.mpMax = data.mpMax or data.mp
+	self.mp = data.mp
 	--可变化的值
 	self.atk = data.atk
 	self.miss = data.miss
@@ -41,6 +45,13 @@ function BaseObject:initAfter(data)
 	end
 end
+function BaseObject:reset(data)
+	self.passives = {}
+	self.buffs = {}
+	self:initData(data)
+	self:initAfter(data)
+end
+
 function BaseObject:beforeTurn()
 	for _, buff in ipairs(self.buffs) do
 		buff:beforeTurn()
@@ -377,6 +388,8 @@ function BaseObject:getDB()
 	local db = {}
 	db.hpMax = self.hpMax
 	db.hp = self.hp
+	db.mpMax = self.mpMax
+	db.mp = self.mp
 	local baseAttr = {"atk", "miss", "hit", "def"}
 	for _, field in pairs(baseAttr) do
 		db[field] = self[field]