From 87145579e6add0256c6ff5cb644c0761cb0142eb Mon Sep 17 00:00:00 2001
From: xinian <eBCmZThyqEBRX6cZZseEVK+xinian@noreply.cnb.cool>
Date: Sun, 5 Apr 2026 07:41:50 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E5=AE=A0?=
 =?UTF-8?q?=E7=89=A9=E6=98=BE=E7=A4=BA=E6=8F=90=E4=BE=9B=E8=80=85=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logic/service/common/playeri.go |  2 ++
 logic/service/player/base.go    |  2 ++
 logic/service/space/in_out.go   | 17 ++++-------------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/logic/service/common/playeri.go b/logic/service/common/playeri.go
index 917584f3..d6741627 100644
--- a/logic/service/common/playeri.go
+++ b/logic/service/common/playeri.go
@@ -3,10 +3,12 @@ package common
 import (
 	"blazing/common/socket/errorcode"
 	"blazing/logic/service/fight/info"
+	space "blazing/logic/service/space/info"
 	"blazing/modules/player/model"
 )
 
 type PlayerI interface {
+	ApplyPetDisplayInfo(*space.SimpleInfo)
 	GetPlayerCaptureContext() *info.PlayerCaptureContext
 	Roll(int, int) (bool, float64, float64)
 	//SendPack(b []byte) error
diff --git a/logic/service/player/base.go b/logic/service/player/base.go
index d9107e51..08ca7db1 100644
--- a/logic/service/player/base.go
+++ b/logic/service/player/base.go
@@ -5,6 +5,7 @@ import (
 	"blazing/common/utils"
 	"blazing/logic/service/common"
 	"blazing/logic/service/fight/info"
+	spaceinfo "blazing/logic/service/space/info"
 	"blazing/modules/player/model"
 )
 
@@ -100,3 +101,4 @@ func (p *baseplayer) ItemAdd(ItemId, ItemCnt int64) (result bool) {
 func (lw *baseplayer) SendLoadPercent(info.LoadPercentOutboundInfo) {
 
 }
+func (p *baseplayer) ApplyPetDisplayInfo(out *spaceinfo.SimpleInfo) {}
diff --git a/logic/service/space/in_out.go b/logic/service/space/in_out.go
index ee268698..ad195011 100644
--- a/logic/service/space/in_out.go
+++ b/logic/service/space/in_out.go
@@ -10,10 +10,6 @@ import (
 	"github.com/jinzhu/copier"
 )
 
-type petDisplayInfoProvider interface {
-	ApplyPetDisplayInfo(*info.SimpleInfo)
-}
-
 // 向其他人广播，不含自己
 // 广播是c 为空就不特判，发给全体成员广播
 func (s *Space) Broadcast(c common.PlayerI, cmd uint32, data any) {
@@ -57,9 +53,7 @@ func (s *Space) EnterMap(c common.PlayerI) {
 
 	out := info.NewOutInfo()
 	copier.CopyWithOption(out, c.GetInfo(), copier.Option{DeepCopy: true})
-	if provider, ok := c.(petDisplayInfoProvider); ok {
-		provider.ApplyPetDisplayInfo(out)
-	}
+	c.ApplyPetDisplayInfo(out)
 	c.SendPackCmd(2001, out)
 
 	s.Broadcast(c, 2001, out)
@@ -68,7 +62,7 @@ func (s *Space) EnterMap(c common.PlayerI) {
 	curmaps, ok := maphot[s.Super]
 	if ok {
 		curmaps.ChangeCount(1)
-		//atomic.AddInt32(maphot[s.Super], 1)
+
 	}
 
 }
@@ -78,11 +72,8 @@ func (s *Space) RefreshUserInfo(c common.PlayerI) {
 	if !ok {
 		return
 	}
-
-	if provider, ok := c.(petDisplayInfoProvider); ok {
-		provider.ApplyPetDisplayInfo(&current)
-		s.UserInfo.Store(c.GetInfo().UserID, current)
-	}
+	c.ApplyPetDisplayInfo(&current)
+	s.UserInfo.Store(c.GetInfo().UserID, current)
 }
 
 func (s *Space) GetInfo(c common.PlayerI) []info.SimpleInfo {