From c55a1fd5fb6a630fa998e6d50508b8de56458a3b Mon Sep 17 00:00:00 2001
From: 1 <1@72wo.cn>
Date: Sun, 30 Nov 2025 02:31:08 +0000
Subject: [PATCH] =?UTF-8?q?fix(fight):=20=E4=BF=AE=E6=AD=A3=E7=A9=BA?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=AF=BC=E8=87=B4=E7=9A=84=E6=BD=9C=E5=9C=A8?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logic/controller/login.go    | 2 +-
 logic/service/player/save.go | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/logic/controller/login.go b/logic/controller/login.go
index 653c99c27..2e71ad761 100644
--- a/logic/controller/login.go
+++ b/logic/controller/login.go
@@ -96,7 +96,7 @@ func (h *Controller) Login(data *user.MAIN_LOGIN_IN, c gnet.Conn) (result *user.
 	result = user.NewOutInfo() //设置登录消息
 
 	result.PlayerInfo = *t.Info
-	space.GetSpace(t.Info.MapID).EnterMap(t)
+	defer space.GetSpace(t.Info.MapID).EnterMap(t)
 
 	return result, 0
 
diff --git a/logic/service/player/save.go b/logic/service/player/save.go
index d46d75b7f..4b9172eb4 100644
--- a/logic/service/player/save.go
+++ b/logic/service/player/save.go
@@ -72,6 +72,13 @@ func (lw *Player) CompleteLogin() {
 	}
 	if lw.IsNewPlayer() { //重置新手地图，放到机械仓
 		lw.Info.MapID = 8
+		if len(lw.Info.PetList) == 0 {
+			rr := lw.Service.Pet.PetInfo(0)
+			if len(rr) > 0 {
+				lw.Info.PetList = append(lw.Info.PetList, rr[0].Data)
+			}
+
+		}
 	}
 	lw.IsLogin = true
 }