refactor(logic): 重构逻辑层代码

- 移除未使用的 SocketHandler_Tomee.go、ai.go、effect_1.go 文件 - 更新 player 包名引用，替换原 service 包 - 调整 TomeeHeader 和相关处理逻辑至 player 包 - 更新各控制器中的 Player 引用为 player 包中的类型 - 移除冗余的 GetPlayer 方法，使用新逻辑
2025-09-14 01:35:16 +08:00
parent 910e866456
commit 5e01837f78
66 changed files with 604 additions and 518 deletions
--- a/logic/controller/CreatePlayer.go
+++ b/logic/controller/CreatePlayer.go
@@ -3,21 +3,23 @@ package controller
 import (
 	"blazing/common/socket/errorcode"
 	"blazing/cool"
-	"blazing/logic/service"
+
+	"blazing/logic/service/common"
 	"blazing/logic/service/login"
+	"blazing/logic/service/player"
 	"blazing/logic/service/space"
 	blservice "blazing/modules/blazing/service"
 	"strings"
 )

 // 处理命令: 1001
-func (h *Controller) CreatePlayer(data *login.CreatePlayerInboundInfo, c *service.Conn) (result *login.CreatePlayerOutInfo, err errorcode.ErrorCode) {
+func (h *Controller) CreatePlayer(data *login.CreatePlayerInboundInfo, c *player.Conn) (result *login.CreatePlayerOutInfo, err errorcode.ErrorCode) {

 	blservice.NewUserService(data.Head.UserID).Reg(cool.Filter.Replace(data.Nickname, '*'), data.Color)
 	return result, 0
 }

-func (h *Controller) ChangePlayerName(data *login.ChangePlayerNameInboundInfo, c *service.Player) (result *login.ChangePlayerNameOutboundInfo, err errorcode.ErrorCode) {
+func (h *Controller) ChangePlayerName(data *login.ChangePlayerNameInboundInfo, c *player.Player) (result *login.ChangePlayerNameOutboundInfo, err errorcode.ErrorCode) {
 	newnice := cool.Filter.Replace(strings.Trim(data.Nickname, "\x00"), '*')

 	c.Info.Nick = newnice
@@ -25,7 +27,7 @@ func (h *Controller) ChangePlayerName(data *login.ChangePlayerNameInboundInfo, c
 		Nickname: newnice,
 		UserID:   c.ID(),
 	}
-	space.GetSpace(c.MapID()).Range(func(playerID uint32, player service.PlayerI) bool {
+	space.GetSpace(c.MapID()).Range(func(playerID uint32, player common.PlayerI) bool {

 		player.SendPack(data.Head.Pack(&result))
 		return true
--- a/logic/controller/Friend.go
+++ b/logic/controller/Friend.go
@@ -2,11 +2,11 @@ package controller

 import (
 	"blazing/common/socket/errorcode"
-	"blazing/logic/service"
 	"blazing/logic/service/friend"
+	"blazing/logic/service/player"
 )

-func (h Controller) OnSeeOnline(data *friend.SeeOnlineInboundInfo, c *service.Player) (result *friend.SeeOnlineOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) OnSeeOnline(data *friend.SeeOnlineInboundInfo, c *player.Player) (result *friend.SeeOnlineOutboundInfo, err errorcode.ErrorCode) {
 	result = &friend.SeeOnlineOutboundInfo{}
 	result.Friends = make([]friend.OnlineInfo, 0)
 	return
--- a/logic/controller/controller.go
+++ b/logic/controller/controller.go
@@ -1,11 +1,11 @@
 package controller

 import (
-	"blazing/common/socket"
 	"blazing/common/socket/errorcode"

 	"blazing/cool"
-	"blazing/logic/service"
+
+	"blazing/logic/service/player"
 	"os"
 	"strings"
 	"time"
@@ -38,7 +38,7 @@ type LogicClient struct {
 func (h *LogicClient) KickPerson(a int) error {

 	fmt.Println("检测到踢人请求", a)
-	socket.KickPlayer(uint32(a))
+	player.KickPlayer(uint32(a))
 	return nil
 }
 func (h *LogicClient) QuitSelf(a int) error {
@@ -50,9 +50,9 @@ func (h *LogicClient) QuitSelf(a int) error {
 		for {

 			//entity.ConutPlayer()
-			fmt.Println("当前在线人数", service.ConutPlayer())
+			fmt.Println("当前在线人数", player.ConutPlayer())

-			if service.ConutPlayer() <= 0 {
+			if player.ConutPlayer() <= 0 {
 				//执行退出逻辑
 				os.Exit(1)
 			}
@@ -107,7 +107,7 @@ func init() { //默认初始化扫描

 			}
 			glog.Debug(context.Background(), "注册方法", func_cmd, method.Name)
-			//	fmt.Println(methodValue.Interface().(func(gnet.Conn, service.TomeeHeader)))
+			//	fmt.Println(methodValue.Interface().(func(gnet.Conn, player.TomeeHeader)))
 			_, ok := cool.CmdCache.LoadOrStore(func_cmd, methodValue) //TODO 待实现对不同用户初始化方法以取消全局cmdcache

 			if ok { //方法已存在init
@@ -136,7 +136,7 @@ func getcmd(t reflect.Type) []uint32 {
 		field := t.Field(i)
 		//fmt.Printf("- 字段名: %s\n", field.Name)
 		//fmt.Printf("  类型: %v\n", field.Type)
-		if field.Type == reflect.TypeOf(service.TomeeHeader{}) {
+		if field.Type == reflect.TypeOf(player.TomeeHeader{}) {
 			//	fmt.Println(reflect.ValueOf(field))

 			return gconv.SliceUint32(strings.Split(field.Tag.Get("cmd"), "|"))
@@ -158,7 +158,7 @@ func getcmd(t reflect.Type) []uint32 {
 }

 // 遍历结构体方法并执行RECV_cmd
-func Recv(c *service.Conn, data service.TomeeHeader) {
+func Recv(c *player.Conn, data player.TomeeHeader) {

 	cmdlister, ok := cool.CmdCache.Load(data.CMD)
 	if !ok {
@@ -189,8 +189,8 @@ func Recv(c *service.Conn, data service.TomeeHeader) {
 	if nameField.IsValid() && nameField.CanSet() {
 		nameField.Set(reflect.ValueOf(data))
 	}
-	if cmdlister.Type().In(1) == reflect.TypeOf(&service.Player{}) {
-		t := socket.GetPlayer(c, data.UserID)
+	if cmdlister.Type().In(1) == reflect.TypeOf(&player.Player{}) {
+		t := player.GetPlayer(c, data.UserID)
 		//	fmt.Println(data.CMD, "接收 变量的地址 ", &t.Info, t.Info.UserID)
 		err := t.WaitForLoginWithCtx(context.Background())
 		if err != nil {
--- a/logic/controller/fight.go
+++ b/logic/controller/fight.go
@@ -3,33 +3,14 @@ package controller
 import (
 	"blazing/common/socket/errorcode"

-	"blazing/logic/service"
 	"blazing/logic/service/fight"
 	"blazing/logic/service/fight/info"
+	"blazing/logic/service/player"
 	"blazing/modules/blazing/model"
-
-	"github.com/jinzhu/copier"
 )

-func (h Controller) OnPlayerFightNpcMonster(data *fight.FightNpcMonsterInboundInfo, c *service.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) OnPlayerFightNpcMonster(data *fight.FightNpcMonsterInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {

-	ttt := info.NoteReadyToFightInfo{
-
-		FightId: 3,
-	}
-
-	copier.Copy(&ttt.OurInfo, &c.Info)
-	len := len(c.Info.PetList)
-	ttt.OurPetList = make([]info.ReadyFightPetInfo, len)
-	for i := 0; i < len; i++ {
-
-		err := copier.CopyWithOption(&ttt.OurPetList[i], &c.Info.PetList[i], copier.Option{IgnoreEmpty: true, DeepCopy: true})
-		if err != nil {
-			panic(err)
-		}
-	}
-
-	ttt.OpponentInfo = info.FightUserInfo{UserID: 0}
 	refpet := c.OgreInfo.Data[data.Number]
 	if refpet.Id == 0 {

@@ -41,59 +22,51 @@ func (h Controller) OnPlayerFightNpcMonster(data *fight.FightNpcMonsterInboundIn
 		[]int{0}, //野怪没特性
 		[]int{int(refpet.Shiny)},
 		[]int{int(refpet.Lv)})
-	ttt.OpponentPetList = make([]info.ReadyFightPetInfo, 1)
-
-	err1 := copier.CopyWithOption(&ttt.OpponentPetList[0], &mo, copier.Option{IgnoreEmpty: true, DeepCopy: true})
-	if err1 != nil {
-		panic(err)
-	}

 	if c.FightC != nil {
 		return nil, errorcode.ErrorCodes.ErrOnlineOver6HoursCannotFight
 	}
-	ai := service.NewAI_player(*mo)
-	service.NewFight(ttt, c, ai)
-
-	c.FightC.OwnerID = c.Info.UserID
+	ai := player.NewAI_player(model.PlayerInfo{}, *mo)
+	fight.NewFight(info.BattleMode.PVE, c, ai)

 	return nil, -1
 }

 // 准备战斗
-func (h Controller) OnReadyToFight(data *fight.ReadyToFightInboundInfo, c *service.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) OnReadyToFight(data *fight.ReadyToFightInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {

 	c.FightC.ReadyFight(c)
 	return nil, -1
 }

 // 接收战斗或者取消战斗的包
-func (h Controller) OnPlayerHandleFightInvite(data *fight.HandleFightInviteInboundInfo, c *service.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) OnPlayerHandleFightInvite(data *fight.HandleFightInviteInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {

 	return nil, -1
 }

 // 使用技能包
-func (h Controller) UseSkill(data *fight.UseSkillInboundInfo, c *service.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) UseSkill(data *fight.UseSkillInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	c.FightC.UseSkill(c, int32(data.SkillId))
 	return nil, 0
 }

 // 战斗逃跑
-func (h Controller) Escape(data *fight.EscapeFightInboundInfo, c *service.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) Escape(data *fight.EscapeFightInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {

 	c.FightC.Escape(c)
 	return nil, 0
 }

 // 切换精灵
-func (h Controller) ChangePet(data *fight.ChangePetInboundInfo, c *service.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) ChangePet(data *fight.ChangePetInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {

-	c.FightC.ChangePet(c, int32(data.CatchTime))
+	c.FightC.ChangePet(c, data.CatchTime)
 	return nil, -1
 }

 // 切换精灵
-func (h Controller) Capture(data *fight.CatchMonsterInboundInfo, c *service.Player) (result *info.CatchMonsterOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) Capture(data *fight.CatchMonsterInboundInfo, c *player.Player) (result *info.CatchMonsterOutboundInfo, err errorcode.ErrorCode) {

 	c.FightC.Capture(c, (data.CapsuleId))
 	return nil, -1
--- a/logic/controller/getserver.go
+++ b/logic/controller/getserver.go
@@ -2,12 +2,13 @@ package controller

 import (
 	"blazing/common/socket/errorcode"
-	"blazing/logic/service"
+
 	"blazing/logic/service/commendsvr"
+	"blazing/logic/service/player"
 )

 // 处理命令: 105
-func (h *Controller) GetServer(data *commendsvr.SidInfo, c *service.Conn) (result *commendsvr.CommendSvrInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
+func (h *Controller) GetServer(data *commendsvr.SidInfo, c *player.Conn) (result *commendsvr.CommendSvrInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
 	result = commendsvr.NewInInfo()
 	result.ServerList = commendsvr.GetServerInfoList()
 	return
--- a/logic/controller/item.go
+++ b/logic/controller/item.go
@@ -2,12 +2,13 @@ package controller

 import (
 	"blazing/common/socket/errorcode"
-	"blazing/logic/service"
+
 	"blazing/logic/service/item"
+	"blazing/logic/service/player"
 	"blazing/modules/blazing/model"
 )

-func (h Controller) UserItemList(data *item.ItemListInboundInfo, c *service.Player) (result *item.ItemListOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) UserItemList(data *item.ItemListInboundInfo, c *player.Player) (result *item.ItemListOutboundInfo, err errorcode.ErrorCode) {
 	result = &item.ItemListOutboundInfo{}
 	result.ItemList = make([]model.SingleItemInfo, 0)

@@ -22,7 +23,7 @@ func (h Controller) UserItemList(data *item.ItemListInboundInfo, c *service.Play

 	return result, 0
 }
-func (h Controller) PlayerGoldCount(data *item.GoldOnlineRemainInboundInfo, c *service.Player) (result *item.GoldOnlineRemainOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) PlayerGoldCount(data *item.GoldOnlineRemainInboundInfo, c *player.Player) (result *item.GoldOnlineRemainOutboundInfo, err errorcode.ErrorCode) {

 	return &item.GoldOnlineRemainOutboundInfo{

--- a/logic/controller/login.go
+++ b/logic/controller/login.go
@@ -2,13 +2,13 @@ package controller

 import (
 	"blazing/common/data/share"
-	"blazing/common/socket"

 	"blazing/common/socket/errorcode"

-	"blazing/logic/service"
+	"blazing/logic/service/common"
 	"blazing/logic/service/login"
 	"blazing/logic/service/maps"
+	"blazing/logic/service/player"
 	"blazing/logic/service/space"
 	"blazing/modules/blazing/model"
 	blservice "blazing/modules/blazing/service"
@@ -29,12 +29,12 @@ func IsToday(t time.Time) bool {
 }

 // 处理命令: 1001
-func (h *Controller) Login(data *login.InInfo, c *service.Conn) (result *login.OutInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
+func (h *Controller) Login(data *login.InInfo, c *player.Conn) (result *login.OutInfo, err errorcode.ErrorCode) { //这个时候player应该是空的

 	if tt := data.CheakSession(); tt { //说明sid正确
 		h.RPCClient.Kick(data.Head.UserID) //先踢人

-		t := socket.GetPlayer(c, data.Head.UserID)
+		t := player.GetPlayer(c, data.Head.UserID)
 		t.Service = blservice.NewUserService(data.Head.UserID)
 		t.Info = t.Service.Person()
 		t.Info.UserID = data.Head.UserID
@@ -74,8 +74,8 @@ func (h *Controller) Login(data *login.InInfo, c *service.Conn) (result *login.O

 		tt := maps.NewOutInfo()
 		//copier.Copy(t.Info, tt)
-		t1 := service.NewTomeeHeader(2001, t.Info.UserID)
-		defer space.GetSpace(t.Info.MapID).Set(t.Info.UserID, t).Range(func(playerID uint32, player service.PlayerI) bool {
+		t1 := player.NewTomeeHeader(2001, t.Info.UserID)
+		defer space.GetSpace(t.Info.MapID).Set(t.Info.UserID, t).Range(func(playerID uint32, player common.PlayerI) bool {

 			player.SendPack(t1.Pack(&tt))
 			return true
--- a/logic/controller/map.go
+++ b/logic/controller/map.go
@@ -2,16 +2,18 @@ package controller

 import (
 	"blazing/common/socket/errorcode"
-	"blazing/logic/service"
+
+	"blazing/logic/service/common"
 	"blazing/logic/service/maphot"
 	"blazing/logic/service/maps"
+	"blazing/logic/service/player"
 	"blazing/logic/service/space"
 	"time"

 	"github.com/jinzhu/copier"
 )

-func (h *Controller) MapEnter(data *maps.InInfo, c *service.Player) (result *maps.OutInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
+func (h *Controller) MapEnter(data *maps.InInfo, c *player.Player) (result *maps.OutInfo, err errorcode.ErrorCode) { //这个时候player应该是空的

 	c.Info.MapID = data.MapId                          //登录地图
 	space.GetSpace(c.Info.MapID).Set(c.Info.UserID, c) //添加玩家
@@ -57,7 +59,7 @@ func (h *Controller) MapEnter(data *maps.InInfo, c *service.Player) (result *map
 	}(c.StopChan, int(c.Info.MapID))
 	return nil, -1
 }
-func (h Controller) MapHot(data *maphot.InInfo, c *service.Player) (result *maphot.OutInfo, err errorcode.ErrorCode) {
+func (h Controller) MapHot(data *maphot.InInfo, c *player.Player) (result *maphot.OutInfo, err errorcode.ErrorCode) {

 	result = &maphot.OutInfo{

@@ -66,10 +68,10 @@ func (h Controller) MapHot(data *maphot.InInfo, c *service.Player) (result *maph

 	return
 }
-func (h *Controller) MapLeave(data *maps.LeaveMapInboundInfo, c *service.Player) (result *maps.LeaveMapOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
+func (h *Controller) MapLeave(data *maps.LeaveMapInboundInfo, c *player.Player) (result *space.LeaveMapOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
 	//result = &maps.LeaveMapOutboundInfo{UserID: c.GetUserID()}

-	data.Broadcast(c.Info.MapID, maps.LeaveMapOutboundInfo{UserID: c.Info.UserID}) //同步广播
+	data.Broadcast(c.Info.MapID, space.LeaveMapOutboundInfo{UserID: c.Info.UserID}) //同步广播
 	space.GetSpace(c.Info.MapID).Delete(c.Info.UserID)
 	// 如果有正在运行的刷怪协程，发送停止信号
 	if c.StopChan != nil {
@@ -79,12 +81,12 @@ func (h *Controller) MapLeave(data *maps.LeaveMapInboundInfo, c *service.Player)
 	c.Info.MapID = 0 // 重置当前地图
 	return nil, -1
 }
-func (h *Controller) MapList(data *maps.ListMapPlayerInboundInfo, c *service.Player) (result *maps.ListMapPlayerOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
+func (h *Controller) MapList(data *maps.ListMapPlayerInboundInfo, c *player.Player) (result *maps.ListMapPlayerOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的

 	result = &maps.ListMapPlayerOutboundInfo{}
 	result.Player = make([]maps.OutInfo, 0)

-	space.GetSpace(c.Info.MapID).Range(func(userID uint32, player service.PlayerI) bool {
+	space.GetSpace(c.Info.MapID).Range(func(userID uint32, player common.PlayerI) bool {
 		result1 := maps.NewOutInfo()
 		copier.Copy(result1, player)
 		result.Player = append(result.Player, *result1)
--- a/logic/controller/pet.go
+++ b/logic/controller/pet.go
@@ -3,8 +3,9 @@ package controller
 import (
 	"blazing/common/data/xmlres"
 	"blazing/common/socket/errorcode"
-	"blazing/logic/service"
+
 	"blazing/logic/service/pet"
+	"blazing/logic/service/player"

 	"blazing/modules/blazing/model"

@@ -14,7 +15,7 @@ import (
 // 获取精灵信息
 func (h *Controller) GetPetInfo(
 	data *pet.InInfo,
-	c *service.Player) (result *pet.OutInfo,
+	c *player.Player) (result *pet.OutInfo,
 	err errorcode.ErrorCode) { //这个时候player应该是空的

 	for _, pi := range c.Info.PetList {
@@ -39,7 +40,7 @@ func (h *Controller) GetPetInfo(
 // 获取仓库列表
 func (h *Controller) GetPetList(
 	data *pet.GetPetListInboundEmpty,
-	c *service.Player) (result *pet.GetPetListOutboundInfo,
+	c *player.Player) (result *pet.GetPetListOutboundInfo,
 	err errorcode.ErrorCode) { //这个时候player应该是空的
 	result = &pet.GetPetListOutboundInfo{}

@@ -57,7 +58,7 @@ func (h *Controller) GetPetList(
 // 精灵背包仓库切换
 func (h *Controller) PetRelease(
 	data *pet.PetReleaseInboundInfo,
-	c *service.Player) (
+	c *player.Player) (
 	result *pet.PetReleaseOutboundInfo,
 	err errorcode.ErrorCode) { //这个时候player应该是空的
 	//放入背包=数据库置1+添加到背包+pet release发包    仓库=数据库置0+移除背包   设置首发等于取到首发精灵后重新排序
@@ -96,7 +97,7 @@ func (h *Controller) PetRelease(

 // 精灵展示
 func (h *Controller) PlayerShowPet(
-	data *pet.PetShowInboundInfo, c *service.Player) (result *pet.PetShowOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
+	data *pet.PetShowInboundInfo, c *player.Player) (result *pet.PetShowOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
 	results := pet.PetShowOutboundInfo{}

 	for _, pi := range c.Info.PetList {
@@ -112,7 +113,7 @@ func (h *Controller) PlayerShowPet(

 }
 func (h *Controller) PetOneCure(
-	data *pet.PetOneCureInboundInfo, c *service.Player) (result *pet.PetOneCureOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
+	data *pet.PetOneCureInboundInfo, c *player.Player) (result *pet.PetOneCureOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
 	result = &pet.PetOneCureOutboundInfo{
 		data.CatchTime,
 	}
@@ -146,7 +147,7 @@ func (h *Controller) PetOneCure(

 // 精灵首发
 func (h *Controller) PetFirst(
-	data *pet.PetDefaultInboundInfo, c *service.Player) (result *pet.PetDefaultOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
+	data *pet.PetDefaultInboundInfo, c *player.Player) (result *pet.PetDefaultOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
 	result = &pet.PetDefaultOutboundInfo{}
 	var ttt []model.PetInfo

--- a/logic/controller/room.go
+++ b/logic/controller/room.go
@@ -2,12 +2,13 @@ package controller

 import (
 	"blazing/common/socket/errorcode"
-	"blazing/logic/service"
+
+	"blazing/logic/service/player"
 	"blazing/logic/service/room"
 )

 // 获取基地物品
-func (h Controller) OnFitmentUsering(data *room.FitmentUseringInboundInfo, c *service.Player) (result *room.FitmentUseringOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) OnFitmentUsering(data *room.FitmentUseringInboundInfo, c *player.Player) (result *room.FitmentUseringOutboundInfo, err errorcode.ErrorCode) {

 	result = &room.FitmentUseringOutboundInfo{UserId: c.Info.UserID, RoomId: data.TargetUserID}
 	result.Fitments = make([]room.FitmentShowInfo, 0)
@@ -17,14 +18,14 @@ func (h Controller) OnFitmentUsering(data *room.FitmentUseringInboundInfo, c *se
 }

 // 获取基地展示精灵
-func (h Controller) OnGetRoomPetShowInfo(data *room.PetRoomListInboundInfo, c *service.Player) (result *room.PetRoomListOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) OnGetRoomPetShowInfo(data *room.PetRoomListInboundInfo, c *player.Player) (result *room.PetRoomListOutboundInfo, err errorcode.ErrorCode) {
 	result = &room.PetRoomListOutboundInfo{}
 	result.Pets = make([]room.PetShowInfo, 0)
 	return
 }

 // 获取自己房间的家具
-func (h Controller) OnGetFitmentAll(data *room.FitmentAllInboundEmpty, c *service.Player) (result *room.FitmentAllOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) OnGetFitmentAll(data *room.FitmentAllInboundEmpty, c *player.Player) (result *room.FitmentAllOutboundInfo, err errorcode.ErrorCode) {
 	result = &room.FitmentAllOutboundInfo{}
 	result.Fitments = make([]room.FitmentItemInfo, 0)

--- a/logic/controller/systemtime.go
+++ b/logic/controller/systemtime.go
@@ -2,11 +2,12 @@ package controller

 import (
 	"blazing/common/socket/errorcode"
-	"blazing/logic/service"
+
+	"blazing/logic/service/player"
 	"blazing/logic/service/systemtime"
 )

-func (h Controller) SystemTimeInfo(data *systemtime.InInfo, c *service.Player) (result *systemtime.OutInfo, err errorcode.ErrorCode) {
+func (h Controller) SystemTimeInfo(data *systemtime.InInfo, c *player.Player) (result *systemtime.OutInfo, err errorcode.ErrorCode) {

 	return systemtime.NewOutInfo(), 0
 }
--- a/logic/controller/task.go
+++ b/logic/controller/task.go
@@ -2,7 +2,8 @@ package controller

 import (
 	"blazing/common/socket/errorcode"
-	"blazing/logic/service"
+
+	"blazing/logic/service/player"
 	"blazing/logic/service/task"
 	"blazing/modules/blazing/model"
 	"math/rand"
@@ -12,7 +13,7 @@ import (
 /**
 * 接受任务
 */
-func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *service.Player) (result *task.AcceptTaskOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *player.Player) (result *task.AcceptTaskOutboundInfo, err errorcode.ErrorCode) {
 	//isdaliy := false
 	// if data.Head.CMD != 2201 { //判断是每日任务
 	// 	//isdaliy = true
@@ -30,7 +31,7 @@ func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *service.Play
 /**
 * 更新任务步骤
 */
-func (h Controller) AddTaskBuf(data *task.AddTaskBufInboundInfo, c *service.Player) (result *task.AddTaskBufOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) AddTaskBuf(data *task.AddTaskBufInboundInfo, c *player.Player) (result *task.AddTaskBufOutboundInfo, err errorcode.ErrorCode) {
 	// isdaliy := false
 	// if data.Head.CMD != 2204 { //判断是每日任务
 	// 	isdaliy = true
@@ -64,7 +65,7 @@ func randInt0To24() int {
 /**
 * 完成任务
 */
-func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *service.Player) (result *task.CompleteTaskOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *player.Player) (result *task.CompleteTaskOutboundInfo, err errorcode.ErrorCode) {

 	if c.Info.TaskList[data.TaskId-1] != 1 { //如果任务没有接受或者已经完成Complete_Task

@@ -117,7 +118,7 @@ func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *service
 /**
 * 获取任务状态
 */
-func (h Controller) Get_Task_Buf(data *task.GetTaskBufInboundInfo, c *service.Player) (result *task.GetTaskBufOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) Get_Task_Buf(data *task.GetTaskBufInboundInfo, c *player.Player) (result *task.GetTaskBufOutboundInfo, err errorcode.ErrorCode) {
 	info, _ := c.Service.TaskInfo(data.TaskId)
 	result = &task.GetTaskBufOutboundInfo{}
 	result.TaskId = data.TaskId
@@ -129,7 +130,7 @@ func (h Controller) Get_Task_Buf(data *task.GetTaskBufInboundInfo, c *service.Pl
 /**
 * 删除任务
 */
-func (h Controller) Delete_Task(data *task.DeleteTaskInboundInfo, c *service.Player) (result *task.DeleteTaskOutboundInfo, err errorcode.ErrorCode) {
+func (h Controller) Delete_Task(data *task.DeleteTaskInboundInfo, c *player.Player) (result *task.DeleteTaskOutboundInfo, err errorcode.ErrorCode) {

 	// if data.Head.CMD == 2205 { //判断不是每日任务

--- a/logic/controller/walk.go
+++ b/logic/controller/walk.go
@@ -2,16 +2,16 @@ package controller

 import (
 	"blazing/common/socket/errorcode"
-	"blazing/logic/service"
-	"blazing/logic/service/space"
+	"blazing/logic/service/maps"
+	"blazing/logic/service/player"
 	"context"

 	"github.com/gogf/gf/v2/os/glog"
 	"github.com/jinzhu/copier"
 )

-func (h Controller) Walk(data *space.InInfo, c *service.Player) (result *space.OutInfo, err errorcode.ErrorCode) {
-	result = &space.OutInfo{}
+func (h Controller) Walk(data *maps.WalkInInfo, c *player.Player) (result *maps.WalkOutInfo, err errorcode.ErrorCode) {
+	result = &maps.WalkOutInfo{}
 	err1 := copier.Copy(result, data)
 	result.UserID = data.Head.UserID
 	glog.Debug(context.Background(), err1)