admin/bl
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

refactor(socket): 重构 socket 模块

Browse Source 
- 移除 common/data/socket 目录下的大部分文件
- 新增 service 目录，将 Player 和 Conn 结构体移至该目录
- 更新 LogicClient 中的方法签名，使用 service 包的类型
- 重构 Controller 中的方法，适应新的 service 包结构
This commit is contained in:
昔念
2025-09-04 02:00:57 +08:00
parent afdf015d62
commit 621a9d3858
50 changed files with 886 additions and 849 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
logic/controller/map.go
View File

@@ -1,8 +1,8 @@
package controller
import (
"blazing/common/data/socket"
"blazing/common/socket/errorcode"
"blazing/logic/service"
"blazing/logic/service/maphot"
"blazing/logic/service/maps"
"blazing/logic/service/space"
@@ -11,7 +11,7 @@ import (
"github.com/jinzhu/copier"
)
func (h *Controller) MapEnter(data *maps.InInfo, c *socket.Player) (result *maps.OutInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
func (h *Controller) MapEnter(data *maps.InInfo, c *service.Player) (result *maps.OutInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
c.Info.MapID = data.MapId //登录地图
space.GetSpace(c.Info.MapID).Set(c.Info.UserID, c) //添加玩家
@@ -33,7 +33,7 @@ func (h *Controller) MapEnter(data *maps.InInfo, c *socket.Player) (result *maps
<-time.After(5 * time.Second)
// 首次刷新
if c.FightID == "" && c.Info.MapID != 0 {
if c.FightC == nil && c.Info.MapID != 0 {
data.SpawnMonsters(c, true)
}
//循环刷新怪物
@@ -48,7 +48,7 @@ func (h *Controller) MapEnter(data *maps.InInfo, c *socket.Player) (result *maps
return
case <-ticker.C:
// 刷新当前地图的怪物
if c.FightID == "" && c.Info.MapID != 0 {
if c.FightC == nil && c.Info.MapID != 0 {
data.SpawnMonsters(c, false)
}
@@ -57,7 +57,7 @@ func (h *Controller) MapEnter(data *maps.InInfo, c *socket.Player) (result *maps
}(c.StopChan, int(c.Info.MapID))
return nil, -1
}
func (h Controller) MapHot(data *maphot.InInfo, c *socket.Player) (result *maphot.OutInfo, err errorcode.ErrorCode) {
func (h Controller) MapHot(data *maphot.InInfo, c *service.Player) (result *maphot.OutInfo, err errorcode.ErrorCode) {
result = &maphot.OutInfo{
@@ -66,7 +66,7 @@ func (h Controller) MapHot(data *maphot.InInfo, c *socket.Player) (result *mapho
return
}
func (h *Controller) MapLeave(data *maps.LeaveMapInboundInfo, c *socket.Player) (result *maps.LeaveMapOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
func (h *Controller) MapLeave(data *maps.LeaveMapInboundInfo, c *service.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}) //同步广播
@@ -79,14 +79,14 @@ func (h *Controller) MapLeave(data *maps.LeaveMapInboundInfo, c *socket.Player)
c.Info.MapID = 0 // 重置当前地图
return nil, -1
}
func (h *Controller) MapList(data *maps.ListMapPlayerInboundInfo, c *socket.Player) (result *maps.ListMapPlayerOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
func (h *Controller) MapList(data *maps.ListMapPlayerInboundInfo, c *service.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 *socket.Player) bool {
space.GetSpace(c.Info.MapID).Range(func(userID uint32, player service.PlayerI) bool {
result1 := maps.NewOutInfo()
copier.Copy(result1, player.Info)
copier.Copy(result1, player)
result.Player = append(result.Player, *result1)
return true
})