refactor(socket): 重构 ClientData 结构体并优化相关逻辑

- 简化 ClientData 结构体，移除不必要的方法
- 优化 Player 结构体，调整 Conn 类型
- 更新 wscodec.go 中的 Conn 结构体
- 删除未使用的 XML 相关文件和代码
- 调整 ServerEvent 和 controller 中的相关逻辑

logic/controller/controller.go

@@ -88,7 +88,7 @@ func init() { //默认初始化扫描
 		method := typ.Method(i)
 
 		methodValue := value.MethodByName(method.Name)
-		fmt.Println("找到注册方法", method.Name)
+		//fmt.Println("找到注册方法", method.Name)
 		methodValue.Type().NumIn()
 
 		for _, func_cmd := range getcmd(methodValue.Type().In(0)) {
@@ -190,13 +190,14 @@ func Recv(c *socket.Conn, data handler.TomeeHeader) {
 		nameField.Set(reflect.ValueOf(data))
 	}
 	if cmdlister.Type().In(1) == reflect.TypeOf(&socket.Player{}) {
-		c1 := service.GetPlayer(c, data.UserID)
-		err := c1.WaitForLoginWithCtx(context.Background())
+		t := service.GetPlayer(c, data.UserID)
+		//	fmt.Println(data.CMD, "接收 变量的地址 ", &t.Info, t.Info.UserID)
+		err := t.WaitForLoginWithCtx(context.Background())
 		if err != nil {
 			fmt.Println("登录失败")
 		}
 
-		params = append(params, ptrValue1, reflect.ValueOf(c1))
+		params = append(params, ptrValue1, reflect.ValueOf(t))
 	} else {
 
 		params = append(params, ptrValue1, reflect.ValueOf(c))
@@ -225,7 +226,7 @@ func Recv(c *socket.Conn, data handler.TomeeHeader) {
 	}
 
 	data.Version = "7"
-	glog.Debug(context.Background(), data.CMD, "回复数据")
+	//glog.Debug(context.Background(), data.CMD, "回复数据")
 	c.SendPack(data.Pack(ret[0].Interface()))
 
 }

logic/controller/login.go

@@ -14,7 +14,6 @@ import (
 	"time"
 
 	"github.com/gogf/gf/v2/os/glog"
-	"github.com/jinzhu/copier"
 )
 
 // 处理命令: 1001
@@ -22,22 +21,23 @@ func (h *Controller) Login(data *login.InInfo, c *socket.Conn) (result *login.Ou
 
 	if tt := data.CheakSession(); tt { //说明sid正确
 		h.RPCClient.Kick(data.Head.UserID) //先踢人
-		playerinfo := blservice.NewUserService(data.Head.UserID).Person()
-		t := service.SetPlayer(c, playerinfo)
+
+		t := service.GetPlayer(c, data.Head.UserID)
+		t.Info = blservice.NewUserService(data.Head.UserID).Person()
+		t.Info.UserID = data.Head.UserID
 		t.Onlinetime = uint32(time.Now().Unix())                   //保存时间戳
-		copier.Copy(playerinfo, t)                                 //先复制给内存信息
 		share.ShareManager.SetUserOnline(data.Head.UserID, h.Port) //设置用户登录服务器
 		t.CompleteLogin()                                          //通知客户端登录成功
 
 		glog.Debug(context.Background(), "登录成功,初始地图 人数:", space.GetSpace(t.Info.MapID).Len())
 
 		result = login.NewOutInfo() //设置登录消息
-		copier.Copy(playerinfo, result)
-
+		result.PlayerInfo = *t.Info
+		tt := maps.NewOutInfo()
+		//copier.Copy(t.Info, tt)
+		t1 := handler.NewTomeeHeader(2001, t.Info.UserID)
 		defer space.GetSpace(t.Info.MapID).Set(t.Info.UserID, t).Range(func(playerID uint32, player *socket.Player) bool {
-			tt := maps.NewOutInfo()
-			copier.Copy(playerinfo, tt)
-			t1 := handler.NewTomeeHeader(2001, t.Info.UserID)
+
 			player.SendPack(t1.Pack(&tt))
 			return true
 		})

logic/controller/map.go

@@ -6,7 +6,6 @@ import (
 	"blazing/logic/service/maphot"
 	"blazing/logic/service/maps"
 	"blazing/logic/service/space"
-	mservice "blazing/modules/blazing/service"
 	"time"
 
 	"github.com/jinzhu/copier"
@@ -18,15 +17,11 @@ func (h *Controller) MapEnter(data *maps.InInfo, c *socket.Player) (result *maps
 	space.GetSpace(c.Info.MapID).Set(c.Info.UserID, c) //添加玩家
 	result = maps.NewOutInfo()
 	c.Info.Pos = data.Point
-	copier.Copy(c.Info, result)
+	copier.Copy(result, c.Info)
 
 	data.Broadcast(c.Info.MapID, *result) //同步广播
 	// 如果是无怪地图，直接返回
 
-	if mservice.NewMonsterService().GetId(c.Info.MapID) == nil {
-		return nil, -1
-	}
-
 	// 创建新的停止通道
 	c.StopChan = make(chan struct{})
 
@@ -70,6 +65,7 @@ func (h Controller) MapHot(data *maphot.InInfo, c *socket.Player) (result *mapho
 }
 func (h *Controller) MapLeave(data *maps.LeaveMapInboundInfo, c *socket.Player) (result *maps.LeaveMapOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
 	//result = &maps.LeaveMapOutboundInfo{UserID: c.GetUserID()}
+
 	data.Broadcast(c.Info.MapID, maps.LeaveMapOutboundInfo{UserID: c.Info.UserID}) //同步广播
 	space.GetSpace(c.Info.MapID).Delete(c.Info.UserID)
 	// 如果有正在运行的刷怪协程，发送停止信号
@@ -87,7 +83,7 @@ func (h *Controller) MapList(data *maps.ListMapPlayerInboundInfo, c *socket.Play
 
 	space.GetSpace(c.Info.MapID).Range(func(userID uint32, player *socket.Player) bool {
 		result1 := maps.NewOutInfo()
-		copier.Copy(player.Info, result1)
+		copier.Copy(result1, player.Info)
 		result.Player = append(result.Player, *result1)
 		return true
 	})

logic/controller/task.go

@@ -12,47 +12,28 @@ import (
  * 接受任务
  */
 func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *socket.Player) (result *task.AcceptTaskOutboundInfo, err errorcode.ErrorCode) {
-
-	if data.Head.CMD == 2201 { //判断不是每日任务
-		service.NewUserService(c.Info.UserID).TaskExec(func(ttt map[uint32]model.TaskInfo) bool {
-			ft, ok := ttt[data.TaskId]
-			if ok { //如果找到任务
-				if ft.Status == 0 { //可以接受
-					ft.Status = 1 //接受
-					return true
-				} else {
-					return false
-				}
-			} else {
-				ttt[data.TaskId] = model.TaskInfo{
-					Status: 1,
-				}
-
-			}
-
-			return false
-		})
-	} else {
-		service.NewUserService(c.Info.UserID).DailyTaskExec(func(ttt map[uint32]model.DailyTaskInfo) bool {
-			ft, ok := ttt[data.TaskId]
-			if ok { //如果找到任务
-				if ft.Status == 0 { //可以接受
-					ft.Status = 1 //接受
-					return true
-				} else {
-					return false
-				}
-			} else {
-				ttt[data.TaskId] = model.DailyTaskInfo{
-					Status: 1,
-				}
-
-			}
-
-			return false
-		})
+	isdaliy := false
+	if data.Head.CMD != 2201 { //判断是每日任务
+		isdaliy = true
 	}
+	service.NewUserService(c.Info.UserID).TaskExec(func(ttt map[uint32]model.TaskInfo) bool {
+		ft, ok := ttt[data.TaskId]
+		if ok { //如果找到任务
+			if ft.Status == 0 { //可以接受
+				ft.Status = 1 //接受
+				return true
+			} else {
+				return false
+			}
+		} else {
+			ttt[data.TaskId] = model.TaskInfo{
+				Status: 1,
+			}
 
+		}
+
+		return false
+	}, isdaliy)
 	result = &task.AcceptTaskOutboundInfo{}
 	result.TaskId = data.TaskId
 	return result, 0
@@ -62,29 +43,19 @@ func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *socket.Playe
  * 更新任务步骤
  */
 func (h Controller) AddTaskBuf(data *task.AddTaskBufInboundInfo, c *socket.Player) (result *task.AddTaskBufOutboundInfo, err errorcode.ErrorCode) {
-
-	if data.Head.CMD == 2204 { //判断不是每日任务
-		service.NewUserService(c.Info.UserID).TaskExec(func(ttt map[uint32]model.TaskInfo) bool {
-			if conditions, ok := ttt[data.TaskId]; ok {
-				conditions.TaskInfo = data.TaskList
-				ttt[data.TaskId] = conditions
-				return true
-			}
-
-			return false
-		})
-	} else {
-		service.NewUserService(c.Info.UserID).DailyTaskExec(func(ttt map[uint32]model.DailyTaskInfo) bool {
-			if conditions, ok := ttt[data.TaskId]; ok {
-				conditions.DailyTaskInfo = data.TaskList
-				ttt[data.TaskId] = conditions
-				return true
-			}
-
-			return false
-		})
-
+	isdaliy := false
+	if data.Head.CMD != 2204 { //判断是每日任务
+		isdaliy = true
 	}
+	service.NewUserService(c.Info.UserID).TaskExec(func(ttt map[uint32]model.TaskInfo) bool {
+		if conditions, ok := ttt[data.TaskId]; ok {
+			conditions.TaskInfo = data.TaskList
+			ttt[data.TaskId] = conditions
+			return true
+		}
+
+		return false
+	}, isdaliy)
 
 	return &task.AddTaskBufOutboundInfo{}, 0
 }
@@ -107,12 +78,10 @@ func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *socket.
  * 获取任务状态
  */
 func (h Controller) Get_Task_Buf(data *task.GetTaskBufInboundInfo, c *socket.Player) (result *task.GetTaskBufOutboundInfo, err errorcode.ErrorCode) {
-
-	if data.Head.CMD == 2203 { //判断不是每日任务
-
-	} else {
-
-	}
+	// isdaliy := false
+	// if data.Head.CMD != 2203 { //判断是每日任务
+	// 	isdaliy = true
+	// }
 
 	return &task.GetTaskBufOutboundInfo{}, 0
 }

logic/controller/walk.go

@@ -4,14 +4,18 @@ import (
 	"blazing/common/data/socket"
 	"blazing/common/socket/errorcode"
 	"blazing/logic/service/space"
+	"context"
+
+	"github.com/gogf/gf/v2/os/glog"
+	"github.com/jinzhu/copier"
 )
 
 func (h Controller) Walk(data *space.InInfo, c *socket.Player) (result *space.OutInfo, err errorcode.ErrorCode) {
-
-	data.Broadcast(c.Info.UserID, space.OutInfo{Flag: data.Flag,
-		UserID:   c.Info.UserID,
-		Reserve2: data.Reverse2,
-		Point:    data.Point}) //走路的广播
+	result = &space.OutInfo{}
+	err1 := copier.Copy(result, data)
+	result.UserID = data.Head.UserID
+	glog.Debug(context.Background(), err1)
+	data.Broadcast(c.Info.MapID, *result) //走路的广播
 
 	return nil, -1
 }