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

重构

Browse Source
This commit is contained in:
1
2025-08-28 21:35:56 +00:00
parent 00f38b8c53
commit 79361e68cd
29 changed files with 253 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
logic/controller/map.go
View File

@@ -1,27 +1,29 @@
package controller
import (
"blazing/common/data/entity"
"blazing/common/data/socket"
"blazing/common/socket/errorcode"
"blazing/logic/service/maphot"
"blazing/logic/service/maps"
"blazing/logic/service/space"
mservice "blazing/modules/blazing/service"
"time"
"github.com/jinzhu/copier"
)
func (h *Controller) MapEnter(data *maps.InInfo, c *entity.Player) (result *maps.OutInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
func (h *Controller) MapEnter(data *maps.InInfo, c *socket.Player) (result *maps.OutInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
c.MapId = data.MapId //登录地图
space.GetSpace(c.MapId).Set(c.UserID, c) //添加玩家
tt := maps.NewOutInfo()
tt.UserID = c.UserID
tt.Nick = c.Nick
tt.Pos = data.Point
data.Broadcast(c.MapId, *tt) //同步广播
c.Info.MapID = data.MapId //登录地图
space.GetSpace(c.Info.MapID).Set(c.Info.UserID, c) //添加玩家
result = maps.NewOutInfo()
c.Info.Pos = data.Point
copier.Copy(c.Info, result)
data.Broadcast(c.Info.MapID, *result) //同步广播
// 如果是无怪地图，直接返回
if mservice.NewMonsterService().GetId(c.MapId) == nil {
if mservice.NewMonsterService().GetId(c.Info.MapID) == nil {
return nil, -1
}
@@ -33,7 +35,7 @@ func (h *Controller) MapEnter(data *maps.InInfo, c *entity.Player) (result *maps
time.After(5 * time.Second)
// 首次刷新
if !c.IsFighting && c.MapId != 0 {
if !c.IsFighting && c.Info.MapID != 0 {
data.SpawnMonsters(c, true)
}
//循环刷新怪物
@@ -48,16 +50,16 @@ func (h *Controller) MapEnter(data *maps.InInfo, c *entity.Player) (result *maps
return
case <-ticker.C:
// 刷新当前地图的怪物
if !c.IsFighting && c.MapId != 0 {
if !c.IsFighting && c.Info.MapID != 0 {
data.SpawnMonsters(c, false)
}
}
}
}(c.StopChan, int(c.MapId))
}(c.StopChan, int(c.Info.MapID))
return nil, -1
}
func (h Controller) MapHot(data *maphot.InInfo, c *entity.Player) (result *maphot.OutInfo, err errorcode.ErrorCode) {
func (h Controller) MapHot(data *maphot.InInfo, c *socket.Player) (result *maphot.OutInfo, err errorcode.ErrorCode) {
result = &maphot.OutInfo{
@@ -66,27 +68,29 @@ func (h Controller) MapHot(data *maphot.InInfo, c *entity.Player) (result *mapho
return
}
func (h *Controller) MapLeave(data *maps.LeaveMapInboundInfo, c *entity.Player) (result *maps.LeaveMapOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
func (h *Controller) MapLeave(data *maps.LeaveMapInboundInfo, c *socket.Player) (result *maps.LeaveMapOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
//result = &maps.LeaveMapOutboundInfo{UserID: c.GetUserID()}
data.Broadcast(c.MapId, maps.LeaveMapOutboundInfo{UserID: c.GetUserID()}) //同步广播
space.GetSpace(c.MapId).Delete(c.UserID)
data.Broadcast(c.Info.MapID, maps.LeaveMapOutboundInfo{UserID: c.Info.UserID}) //同步广播
space.GetSpace(c.Info.MapID).Delete(c.Info.UserID)
// 如果有正在运行的刷怪协程，发送停止信号
if c.StopChan != nil {
close(c.StopChan)
c.StopChan = nil
}
c.MapId = 0 // 重置当前地图
//c.MapID = 0 // 重置当前地图
return nil, -1
}
func (h *Controller) MapList(data *maps.ListMapPlayerInboundInfo, c *entity.Player) (result *maps.ListMapPlayerOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
func (h *Controller) MapList(data *maps.ListMapPlayerInboundInfo, c *socket.Player) (result *maps.ListMapPlayerOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
result = &maps.ListMapPlayerOutboundInfo{}
result.Player = make([]maps.OutInfo, 0)
result1 := maps.NewOutInfo()
result1.UserID = c.UserID
//result.Pos = model.Pos{X: 500, Y: 400}
result1.Nick = c.Nick
result.Player = append(result.Player, *result1)
space.GetSpace(c.Info.MapID).Range(func(userID uint32, player *socket.Player) bool {
result1 := maps.NewOutInfo()
copier.Copy(player.Info, result1)
result.Player = append(result.Player, *result1)
return true
})
return
}