From 386ca58e098683bd4d025a1aff5ce29d0dde7e44 Mon Sep 17 00:00:00 2001
From: zhouhaihai <zhhyf521@163.com>
Date: Sat, 27 Jul 2019 11:22:44 +0800
Subject: [PATCH] 优化log

---
 src/GlobalVar.lua     | 1 +
 src/adv/Adv.lua       | 4 ++++
 src/adv/AdvBattle.lua | 2 +-
 src/adv/AdvPlayer.lua | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/GlobalVar.lua b/src/GlobalVar.lua
index 30ca276..44dc569 100644
--- a/src/GlobalVar.lua
+++ b/src/GlobalVar.lua
@@ -106,6 +106,7 @@ AdvBackEventType = {
 	TurnEnd = 14, -- 回合结束
 	Miss = 15, -- miss
 	BattleBegin = 16, -- 战斗开始
+	Trap = 17,
 }
 
 AdvScoreType = {
diff --git a/src/adv/Adv.lua b/src/adv/Adv.lua
index e410fbb..d4039fe 100644
--- a/src/adv/Adv.lua
+++ b/src/adv/Adv.lua
@@ -354,6 +354,7 @@ function Block:open(adv, room)
 		for _, buffId in ipairs(data.effect:toArray(true, "=")) do
 			adv.battle.player:addBuff(buffId)
 		end
+		adv:backTrap()
 		room:clearBEvent(self)
 	end
 	if self.event then -- 随机出具体的事件
@@ -1149,6 +1150,9 @@ function Adv:backBattleBegin()
 	self:pushBackEvent(AdvBackEventType.BattleBegin, {})
 end
 
+function Adv:backTrap()
+	self:pushBackEvent(AdvBackEventType.Trap, {})
+end
 
 function Adv:scoreChange(scoreType, pms)
 	local cutTypes = {}
diff --git a/src/adv/AdvBattle.lua b/src/adv/AdvBattle.lua
index 1c4e497..41ab0a8 100644
--- a/src/adv/AdvBattle.lua
+++ b/src/adv/AdvBattle.lua
@@ -54,7 +54,7 @@ function Battle:initPlayer()
 			end
 		end
 		player.growth = (self.adv.owner:getRealBattleValue(self.adv.advTeam.heros) / 80) ^ 0.52 + math.floor(heroLevel / 50) / 50
-		player.level = 0
+		player.level = 1
 		player.exp = 0
 		local activeRelation = self.adv.owner:getHeroActiveRelation()
 		local baseAttr = csvdb["adv_unitCsv"][math.floor(self.adv.advInfo.chapter / 100)]
diff --git a/src/adv/AdvPlayer.lua b/src/adv/AdvPlayer.lua
index ff2a633..02140be 100644
--- a/src/adv/AdvPlayer.lua
+++ b/src/adv/AdvPlayer.lua
@@ -449,7 +449,7 @@ end
 
 function Player:initData(data)
 	Player.super.initData(self, data)
-	self.level = data.level or 0  --level 每增加1级  属性增长 growth * baseAttr
+	self.level = data.level or 1  --level 每增加1级  属性增长 growth * baseAttr
 	self.growth = data.growth or 0
 	self.exp = data.exp or 0
 end
--
libgit2 0.21.2