昔念
a6c11e0837
fix(service): 修复玩家离开地图时的逻辑判断 移除重复的 MapID 检查逻辑，避免在 controller 和 service 中 同时进行相同判断。原 controller 中的 MapID 重置逻辑已被注释， 确保 leave map 流程的一致性和正确性。 ```
64 lines
1.9 KiB
Go
64 lines
1.9 KiB
Go
package controller
|
|
|
|
import (
|
|
"blazing/common/socket/errorcode"
|
|
|
|
"blazing/logic/service/maphot"
|
|
"blazing/logic/service/maps"
|
|
"blazing/logic/service/maps/info"
|
|
"blazing/logic/service/player"
|
|
"blazing/logic/service/space"
|
|
|
|
"github.com/jinzhu/copier"
|
|
"github.com/panjf2000/ants/v2"
|
|
)
|
|
|
|
var mappool, _ = ants.NewPool(-1)
|
|
|
|
func (h *Controller) MapEnter(data *maps.InInfo, c *player.Player) (result *info.OutInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
|
|
|
|
c.Info.MapID = data.MapId //登录地图
|
|
c.GetSpace().User.Store(c.Info.UserID, c) //添加玩家
|
|
|
|
result = info.NewOutInfo()
|
|
c.Info.Pos = data.Point
|
|
copier.Copy(result, c.Info)
|
|
mappool.Submit(func() {
|
|
c.GetSpace().EnterMap(c)
|
|
})
|
|
|
|
return result, 0
|
|
}
|
|
func (h Controller) MapHot(data *maphot.InInfo, c *player.Player) (result *maphot.OutInfo, err errorcode.ErrorCode) {
|
|
|
|
result = &maphot.OutInfo{
|
|
|
|
HotInfos: space.GetMapHot(),
|
|
}
|
|
|
|
return
|
|
}
|
|
func (h *Controller) MapLeave(data *maps.LeaveMapInboundInfo, c *player.Player) (result *info.LeaveMapOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
|
|
//result = &maps.LeaveMapOutboundInfo{UserID: c.GetUserID()}
|
|
c.Canmon = false
|
|
c.Changemap = true //可以刷怪
|
|
//data.Broadcast(c.Info.MapID, info.LeaveMapOutboundInfo{UserID: c.Info.UserID}) //同步广播
|
|
mappool.Submit(func() {
|
|
c.GetSpace().LeaveMap(c) //玩家离开地图
|
|
})
|
|
|
|
// 如果有正在运行的刷怪协程，发送停止信号
|
|
|
|
//c.Info.MapID = 0 // 重置当前地图
|
|
return &info.LeaveMapOutboundInfo{UserID: c.Info.UserID}, 0
|
|
}
|
|
func (h *Controller) MapList(data *maps.ListMapPlayerInboundInfo, c *player.Player) (result *info.ListMapPlayerOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
|
|
|
|
result = &info.ListMapPlayerOutboundInfo{
|
|
Player: c.GetSpace().GetInfo(),
|
|
}
|
|
|
|
c.Canmon = true //可以刷怪
|
|
return
|
|
}
|