传递敌人信息

zhouhaihai
1 parent 36875ec5
Showing 2 changed files with 2 additions and 4 deletions Show diff stats
src/actions/AdvAction.lua
src/adv/AdvBattle.lua
@@ -746,7 +746,7 @@ function _M.endBattleRpc(agent, data)
 		end
 	end
 	adv:mylog({desc = "endBattle"})
-	local status = adv:clickBlock(roomId, blockId, {player = player, bySkill = bySkill})
+	local status = adv:clickBlock(roomId, blockId, {player = player, enemy = msg.enemy, bySkill = bySkill})
 	if not status then return end
 	SendPacket(actionCodes.Adv_endBattleRpc, MsgPack.pack({events = adv:popBackEvents()}))
@@ -366,9 +366,7 @@ function Battle:battleBegin(roomId, blockId, params)
 	if not enemy then return end
 	local player = params.player
 	if not player then return end
-	local penemy = params.enemy 
-	if not penemy then return end
-
+	local penemy = params.enemy or {hp = 0}
 	if player.hp ~= 0 then
 		if penemy.hp <= 0 then
 			enemy:kill()