昔念
53d6db7e17
- 调整能力提升计算时机，确保命中后再恢复原始属性 - 暴击判断前置，仅在命中时计算暴击翻倍及破防逻辑 - 优化回合结束效果清除逻辑，增加状态存活判断 refactor(controller): 重构擂台相关接口返回结构体类型 - 将 ARENA_SET_OWENR、ARENA_FIGHT_OWENR 等函数的返回值统一改为 NullOutboundInfo，并移除冗余字段返回 - 广播逻辑调整，统一使用 Broadcast
60 lines
1.7 KiB
Go
60 lines
1.7 KiB
Go
package controller
|
|
|
|
import (
|
|
"blazing/common/socket/errorcode"
|
|
"sync/atomic"
|
|
|
|
"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"
|
|
)
|
|
|
|
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)
|
|
|
|
defer 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应该是空的
|
|
|
|
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) MapList(data *maps.ListMapPlayerInboundInfo, c *player.Player) (result *info.ListMapPlayerOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
|
|
|
|
result = &info.ListMapPlayerOutboundInfo{
|
|
Player: c.GetSpace().GetInfo(),
|
|
}
|
|
atomic.StoreUint32(&c.Canmon, 2)
|
|
|
|
return
|
|
}
|