昔念
79213c67d6
fix(socket): 修复TCP连接处理中逻辑取反错误 修复了`handleTcp`函数中对`s.discorse`的判断条件错误，导致CORS配置未正确应用的问题。 feat(player): 增加地图切换标记支持 在`Player`结构体中新增`Changemap`字段，用于标识玩家是否切换过地图，并在相关业务逻辑中进行设置和判断。 feat(pet): 重构精灵生成与经验处理逻辑 将`GenPetInfo`方法从model包迁移至player包，增加个体值、性格、特性等随机生成逻辑，优化技能学习处理方式。 refactor(service): 优化定时任务与连接管理 使用`cool.Cron`替代原生ticker实现刷怪定时任务，优化连接获取方式，确保并发安全。 refactor(model): 移除冗余代码并优化结构 从`pet.go`中移除已迁移至`player`包的函数定义，精简模型结构，提升模块清晰度。 refactor(config): 更新部门及字典名称配置 将`base_sys_department.json`和
61 lines
2.0 KiB
Go
61 lines
2.0 KiB
Go
package controller
|
|
|
|
import (
|
|
"blazing/common/socket/errorcode"
|
|
|
|
"blazing/logic/service/common"
|
|
"blazing/logic/service/maphot"
|
|
"blazing/logic/service/maps"
|
|
"blazing/logic/service/player"
|
|
"blazing/logic/service/space"
|
|
|
|
"github.com/jinzhu/copier"
|
|
)
|
|
|
|
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).User.Set(c.Info.UserID, c) //添加玩家
|
|
|
|
result = maps.NewOutInfo()
|
|
c.Info.Pos = data.Point
|
|
copier.Copy(result, c.Info)
|
|
|
|
data.Broadcast(c.Info.MapID, *result) //同步广播
|
|
|
|
return nil, -1
|
|
}
|
|
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 *space.LeaveMapOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
|
|
//result = &maps.LeaveMapOutboundInfo{UserID: c.GetUserID()}
|
|
c.Canmon = false
|
|
c.Changemap = true //可以刷怪
|
|
data.Broadcast(c.Info.MapID, space.LeaveMapOutboundInfo{UserID: c.Info.UserID}) //同步广播
|
|
space.GetSpace(c.Info.MapID).User.Remove(c.Info.UserID)
|
|
// 如果有正在运行的刷怪协程，发送停止信号
|
|
|
|
c.Info.MapID = 0 // 重置当前地图
|
|
return nil, -1
|
|
}
|
|
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).User.IterCb(func(playerID uint32, player common.PlayerI) {
|
|
result1 := maps.NewOutInfo()
|
|
copier.Copy(result1, player.GetInfo())
|
|
result.Player = append(result.Player, *result1)
|
|
})
|
|
|
|
c.Canmon = true //可以刷怪
|
|
return
|
|
}
|