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

- 移除未使用的 SocketHandler_Tomee.go、ai.go、effect_1.go 文件
- 更新 player 包名引用,替换原 service 包
- 调整 TomeeHeader 和相关处理逻辑至 player 包
- 更新各控制器中的 Player 引用为 player 包中的类型
- 移除冗余的 GetPlayer 方法,使用新逻辑
This commit is contained in:
2025-09-14 01:35:16 +08:00
parent 910e866456
commit 5e01837f78
66 changed files with 604 additions and 518 deletions

View File

@@ -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)