08ebf849eb
feat(pet): 添加宠物收集功能和称号系统 - 实现了宠物收集任务状态查询功能 - 新增Collect方法处理宠物收集逻辑，包括类型验证和ID合法性检查 - 创建validTypeIDMap映射表统一管理合法的类型ID集合 - 重构任务状态判断逻辑，基于model.Completion状态进行判断 refactor(map): 统一玩家信息结构体 - 将OutInfo重命名为SimpleInfo并添加Title字段 - 更新EnterMap方法的返回类型为SimpleInfo - 修改space包中的UserInfo映射类型为SimpleInfo feat(task): 集成称号奖励到任务系统 - 在PlayerInfo结构体中添加Title字段 - 扩展TaskConfig模型支持称号奖励配置 - 更新用户信息服务处理用户名大小写转换 refactor(space): 优化空间服务数据结构 - 更新GetInfo方法返回SimpleInfo切片 - 调整UserInfo CsMap泛型类型参数 - 修改ListMapPlayerOutboundInfo中Player数组类型 style(login): 规范化用户名输入处理 - 登录时将用户名转换为小写进行比较 - 使用strings.EqualFold进行大小
71 lines
2.1 KiB
Go
71 lines
2.1 KiB
Go
package controller
|
|
|
|
import (
|
|
"blazing/common/socket/errorcode"
|
|
"sync/atomic"
|
|
"time"
|
|
|
|
"blazing/logic/service/fight"
|
|
"blazing/logic/service/maphot"
|
|
"blazing/logic/service/space/info"
|
|
|
|
"blazing/logic/service/player"
|
|
"blazing/logic/service/space"
|
|
|
|
"github.com/jinzhu/copier"
|
|
)
|
|
|
|
func (h Controller) EnterMap(data *space.InInfo, c *player.Player) (result *info.SimpleInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
|
|
|
|
c.Info.MapID = data.MapId //登录地图
|
|
c.GetSpace().User.Store(c.Info.UserID, c) //添加玩家
|
|
println("进入地图", c.Info.UserID, c.Info.MapID)
|
|
result = info.NewOutInfo()
|
|
c.Info.Pos = data.Point
|
|
copier.CopyWithOption(result, c.Info, copier.Option{DeepCopy: true})
|
|
|
|
defer c.GetSpace().EnterMap(c)
|
|
|
|
return result, 0
|
|
}
|
|
func (h Controller) GetMapHot(data *maphot.InInfo, c *player.Player) (result *maphot.OutInfo, err errorcode.ErrorCode) {
|
|
|
|
result = &maphot.OutInfo{
|
|
|
|
HotInfos: space.GetMapHot(),
|
|
}
|
|
|
|
return
|
|
}
|
|
func (h Controller) LeaveMap(data *space.LeaveMapInboundInfo, c *player.Player) (result *info.LeaveMapOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
|
|
atomic.StoreUint32(&c.Canmon, 0)
|
|
|
|
//data.Broadcast(c.Info.MapID, info.LeaveMapOutboundInfo{UserID: c.Info.UserID}) //同步广播
|
|
result = &info.LeaveMapOutboundInfo{
|
|
UserID: c.Info.UserID,
|
|
}
|
|
defer c.GetSpace().LeaveMap(c) //玩家离开地图
|
|
|
|
// 如果有正在运行的刷怪协程，发送停止信号
|
|
|
|
//c.Info.MapID = 0 // 重置当前地图
|
|
return
|
|
}
|
|
func (h Controller) GetMapPlayerList(data *space.ListMapPlayerInboundInfo, c *player.Player) (result *info.ListMapPlayerOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
|
|
atomic.StoreUint32(&c.Canmon, 2)
|
|
c.MapNPC.Reset(5 * time.Second)
|
|
result = &info.ListMapPlayerOutboundInfo{
|
|
Player: c.GetSpace().GetInfo(c),
|
|
}
|
|
|
|
return
|
|
}
|
|
func (h Controller) AttackBoss(data *space.AttackBossInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
|
|
|
|
if atomic.LoadInt32(&c.GetSpace().MapBossInfo.Hp) > 0 {
|
|
atomic.AddInt32(&c.GetSpace().MapBossInfo.Hp, -1)
|
|
}
|
|
|
|
return
|
|
}
|