diff --git a/logic/controller/fight.go b/logic/controller/fight.go
index c83c7f33..8d470953 100644
--- a/logic/controller/fight.go
+++ b/logic/controller/fight.go
@@ -15,7 +15,6 @@ import (
 )
 
 func (h Controller) OnPlayerFightNpcMonster(data *info.FightNpcMonsterInboundInfo, c *socket.Player) (result *info.NullOutboundInfo, err errorcode.ErrorCode) {
-	//	c.IsFighting = true
 
 	ttt := info.NoteReadyToFightInfo{
 		OwnerID: data.Head.UserID,
@@ -79,7 +78,7 @@ func (h Controller) Escape(data *info.EscapeFightInboundInfo, c *socket.Player)
 		c.SendPack(ttt.Pack(&info.FightOverInfo{
 			Reason: 0,
 		}))
-		c.IsFighting = false
+		c.FightID = ""
 	}()
 
 	return nil, 0
diff --git a/logic/controller/map.go b/logic/controller/map.go
index 8e263eac..dc88626a 100644
--- a/logic/controller/map.go
+++ b/logic/controller/map.go
@@ -33,7 +33,7 @@ func (h *Controller) MapEnter(data *maps.InInfo, c *socket.Player) (result *maps
 
 		<-time.After(5 * time.Second)
 		// 首次刷新
-		if !c.IsFighting && c.Info.MapID != 0 {
+		if c.FightID == "" && c.Info.MapID != 0 {
 			data.SpawnMonsters(c, true)
 		}
 		//循环刷新怪物
@@ -48,7 +48,7 @@ func (h *Controller) MapEnter(data *maps.InInfo, c *socket.Player) (result *maps
 				return
 			case <-ticker.C:
 				// 刷新当前地图的怪物
-				if !c.IsFighting && c.Info.MapID != 0 {
+				if c.FightID == "" && c.Info.MapID != 0 {
 					data.SpawnMonsters(c, false)
 				}
 
diff --git a/logic/service/fight/info/BattleInputSourceEntity.go b/logic/service/fight/info/BattleInputSourceEntity.go
index 291e52c3..abc93ba3 100644
--- a/logic/service/fight/info/BattleInputSourceEntity.go
+++ b/logic/service/fight/info/BattleInputSourceEntity.go
@@ -18,7 +18,7 @@ func (u *BattleInputSourceEntity) NewBattlePetEntity(ctx context.Context) {
 
 	ret := BattlePetEntity{}
 
-	ret.UnitAttributes = make(map[EnumAttrType]*Attribute)
+	//ret.UnitAttributes = make(map[EnumAttrType]*Attribute)
 	//todo 待实现精灵特性+加成的封装
 	ctx = context.WithValue(ctx, Input_ctx, &ret) //添加用户到上下文
 	ret.ctx = ctx