admin/bl
1
0
Fork 0
Code Issues Pull Requests Projects 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

4
logic/controller/CreatePlayer.go
View File

@@ -1,14 +1,14 @@
package controller
import (
"blazing/common/data/entity"
"blazing/common/data/socket"
"blazing/common/socket/errorcode"
"blazing/logic/service/login"
"blazing/modules/blazing/service"
)
// 处理命令: 1001
func (h *Controller) CreatePlayer(data *login.CreatePlayerInboundInfo, c *entity.Conn) (result *login.CreatePlayerOutInfo, err errorcode.ErrorCode) {
func (h *Controller) CreatePlayer(data *login.CreatePlayerInboundInfo, c *socket.Conn) (result *login.CreatePlayerOutInfo, err errorcode.ErrorCode) {
service.NewUserService(data.Head.UserID).Reg(data.Nickname, data.Color)
return result, 0

4
logic/controller/Friend.go
View File

@@ -1,12 +1,12 @@
package controller
import (
"blazing/common/data/entity"
"blazing/common/data/socket"
"blazing/common/socket/errorcode"
"blazing/logic/service/friend"
)
func (h Controller) OnSeeOnline(data *friend.SeeOnlineInboundInfo, c *entity.Player) (result *friend.SeeOnlineOutboundInfo, err errorcode.ErrorCode) {
func (h Controller) OnSeeOnline(data *friend.SeeOnlineInboundInfo, c *socket.Player) (result *friend.SeeOnlineOutboundInfo, err errorcode.ErrorCode) {
result = &friend.SeeOnlineOutboundInfo{}
result.Friends = make([]friend.OnlineInfo, 0)
return

10
logic/controller/controller.go
View File

@@ -1,7 +1,7 @@
package controller
import (
"blazing/common/data/entity"
"blazing/common/data/socket"
"blazing/common/socket/errorcode"
"blazing/common/socket/handler"
"blazing/cool"
@@ -50,9 +50,9 @@ func (h *LogicClient) QuitSelf(a int) error {
for {
//entity.ConutPlayer()
fmt.Println("当前在线人数", cool.ConutPlayer())
fmt.Println("当前在线人数", socket.ConutPlayer())
if cool.ConutPlayer() <= 0 {
if socket.ConutPlayer() <= 0 {
//执行退出逻辑
os.Exit(1)
}
@@ -158,7 +158,7 @@ func getcmd(t reflect.Type) []uint32 {
}
// 遍历结构体方法并执行RECV_cmd
func Recv(c *entity.Conn, data handler.TomeeHeader) {
func Recv(c *socket.Conn, data handler.TomeeHeader) {
cmdlister, ok := cool.CmdCache.Load(data.CMD)
if !ok {
@@ -189,7 +189,7 @@ func Recv(c *entity.Conn, data handler.TomeeHeader) {
if nameField.IsValid() && nameField.CanSet() {
nameField.Set(reflect.ValueOf(data))
}
if cmdlister.Type().In(1) == reflect.TypeOf(&entity.Player{}) {
if cmdlister.Type().In(1) == reflect.TypeOf(&socket.Player{}) {
c1 := service.GetPlayer(c, data.UserID)
err := c1.WaitForLoginWithCtx(context.Background())
if err != nil {

16
logic/controller/fight.go
View File

@@ -1,7 +1,7 @@
package controller
import (
"blazing/common/data/entity"
"blazing/common/data/socket"
"blazing/common/socket/errorcode"
"blazing/common/socket/handler"
"blazing/logic/service/fight"
@@ -9,14 +9,14 @@ import (
"blazing/modules/blazing/model"
)
func (h Controller) OnPlayerFightNpcMonster(data *fight.FightNpcMonsterInboundInfo, c *entity.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
func (h Controller) OnPlayerFightNpcMonster(data *fight.FightNpcMonsterInboundInfo, c *socket.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
c.IsFighting = true
t1 := handler.NewTomeeHeader(2503, c.UserID)
t1 := handler.NewTomeeHeader(2503, c.Info.UserID)
ttt := info.NoteReadyToFightInfo{
OwnerID: data.Head.UserID,
FightId: 3,
}
ttt.OurInfo = info.FightUserInfo{UserID: c.UserID}
ttt.OurInfo = info.FightUserInfo{UserID: c.Info.UserID}
ttt.OurPetList = []info.ReadyFightPetInfo{{ID: 300,
Level: 100,
@@ -41,13 +41,13 @@ func (h Controller) OnPlayerFightNpcMonster(data *fight.FightNpcMonsterInboundIn
c.SendPack(t1.Pack(&ttt))
return nil, -1
}
func (h Controller) OnReadyToFight(data *fight.ReadyToFightInboundInfo, c *entity.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
func (h Controller) OnReadyToFight(data *fight.ReadyToFightInboundInfo, c *socket.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
t1 := handler.NewTomeeHeader(2504, c.UserID)
t1 := handler.NewTomeeHeader(2504, c.Info.UserID)
rett := fight.FightStartOutboundInfo{
IsCanAuto: 0,
Info1: fight.FightPetInfo{PetID: 300,
UserID: c.UserID,
UserID: c.Info.UserID,
Hp: 1000,
MaxHp: 1000,
Level: 1,
@@ -72,7 +72,7 @@ func (h Controller) OnReadyToFight(data *fight.ReadyToFightInboundInfo, c *entit
/**
* 接收战斗或者取消战斗的包
*/
func (h Controller) OnPlayerHandleFightInvite(data *fight.HandleFightInviteInboundInfo, c *entity.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
func (h Controller) OnPlayerHandleFightInvite(data *fight.HandleFightInviteInboundInfo, c *socket.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
return nil, -1
}

4
logic/controller/getserver.go
View File

@@ -1,13 +1,13 @@
package controller
import (
"blazing/common/data/entity"
"blazing/common/data/socket"
"blazing/common/socket/errorcode"
"blazing/logic/service/commendsvr"
)
// 处理命令: 105
func (h *Controller) GetServer(data *commendsvr.SidInfo, c *entity.Conn) (result *commendsvr.CommendSvrInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
func (h *Controller) GetServer(data *commendsvr.SidInfo, c *socket.Conn) (result *commendsvr.CommendSvrInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
result = commendsvr.NewInInfo()
result.ServerList = commendsvr.GetServerInfoList()
return

53
logic/controller/login.go
View File

@@ -1,8 +1,8 @@
package controller
import (
"blazing/common/data/entity"
"blazing/common/data/share"
"blazing/common/data/socket"
"blazing/common/socket/errorcode"
"blazing/common/socket/handler"
"blazing/logic/service"
@@ -11,59 +11,34 @@ import (
"blazing/logic/service/space"
blservice "blazing/modules/blazing/service"
"context"
"time"
"github.com/gogf/gf/v2/os/glog"
"github.com/jinzhu/copier"
)
// 处理命令: 1001
func (h *Controller) Login(data *login.InInfo, c *entity.Conn) (result *login.OutInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
func (h *Controller) Login(data *login.InInfo, c *socket.Conn) (result *login.OutInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
if tt := data.CheakSession(); tt { //说明sid正确
h.RPCClient.Kick(data.Head.UserID) //先踢人
// h.RPCClient.UserLogin(int32(h.Port), int32(data.Head.UserID)) //初始化用户登录
t := service.SetPlayer(c, data.Head.UserID)
playerinfo := blservice.NewUserService(data.Head.UserID).Person()
t := service.SetPlayer(c, playerinfo)
copier.Copy(playerinfo, t) //先复制给内存信息
share.ShareManager.SetUserOnline(data.Head.UserID, h.Port) //设置用户登录服务器
t.CompleteLogin() //通知客户端登录成功
t.MapId = 1
space.GetSpace(t.MapId).Set(t.UserID, t) //添加玩家
glog.Debug(context.Background(), "登录成功,初始地图 人数:", space.GetSpace(1).Len())
playerinfo := blservice.NewUserService(t.UserID).Person()
t.Nick = playerinfo.Nick
// blservice.NewPlayerService().ProcessAndSave(t.UserID, func(t *model.PlayerInfo) error {
// t.Nick = t.Nick + " (在线)"
// return nil
// })
result = login.NewOutInfo() //设置登录消息
result.UserID = t.UserID
result.RegisterTime = uint32(time.Now().Unix())
result.Nick = t.Nick
result.Color = playerinfo.Color
result.Pos = playerinfo.Pos
result.Clothes = playerinfo.Clothes ///append(result.Clothes, model.PeopleItemInfo{ID: 100717, Level: 1})
result.MapID = t.MapId
result.TimeLimit = playerinfo.TimeLimit //todo 待修复电池不正确问题
result.TimeToday = playerinfo.TimeToday
//result.PetList = playerinfo.PetList
copier.Copy(playerinfo, result)
defer func() {
space.GetSpace(t.MapId).Set(t.UserID, t) //添加玩家
defer space.GetSpace(t.Info.MapID).Set(t.Info.UserID, t).Range(func(playerID uint32, player *socket.Player) bool {
tt := maps.NewOutInfo()
tt.UserID = t.UserID
tt.Nick = t.Nick
tt.Pos = result.Pos
t1 := handler.NewTomeeHeader(2001, t.UserID)
space.GetSpace(t.MapId).Range(func(playerID uint32, player *entity.Player) bool {
player.SendPack(t1.Pack(&tt))
return true
})
}()
copier.Copy(playerinfo, tt)
t1 := handler.NewTomeeHeader(2001, t.Info.UserID)
player.SendPack(t1.Pack(&tt))
return true
})
return result, 0

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
}

4
logic/controller/pet.go
View File

@@ -1,14 +1,14 @@
package controller
import (
"blazing/common/data/entity"
"blazing/common/data/socket"
"blazing/common/socket/errorcode"
"blazing/logic/service/pet"
"blazing/modules/blazing/model"
"time"
)
func (h *Controller) GetPetInfo(data *pet.InInfo, c *entity.Player) (result *pet.OutInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
func (h *Controller) GetPetInfo(data *pet.InInfo, c *socket.Player) (result *pet.OutInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
t := model.PetInfo{
ID: 300,

10
logic/controller/room.go
View File

@@ -1,15 +1,15 @@
package controller
import (
"blazing/common/data/entity"
"blazing/common/data/socket"
"blazing/common/socket/errorcode"
"blazing/logic/service/room"
)
// 获取基地物品
func (h Controller) OnFitmentUsering(data *room.FitmentUseringInboundInfo, c *entity.Player) (result *room.FitmentUseringOutboundInfo, err errorcode.ErrorCode) {
func (h Controller) OnFitmentUsering(data *room.FitmentUseringInboundInfo, c *socket.Player) (result *room.FitmentUseringOutboundInfo, err errorcode.ErrorCode) {
result = &room.FitmentUseringOutboundInfo{UserId: c.GetUserID(), RoomId: data.TargetUserID}
result = &room.FitmentUseringOutboundInfo{UserId: c.Info.UserID, RoomId: data.TargetUserID}
result.Fitments = make([]room.FitmentShowInfo, 0)
result.Fitments = append(result.Fitments, room.FitmentShowInfo{Id: 500001, Status: 1, X: 1, Y: 1, Dir: 1})
@@ -17,14 +17,14 @@ func (h Controller) OnFitmentUsering(data *room.FitmentUseringInboundInfo, c *en
}
// 获取基地展示精灵
func (h Controller) OnGetRoomPetShowInfo(data *room.PetRoomListInboundInfo, c *entity.Player) (result *room.PetRoomListOutboundInfo, err errorcode.ErrorCode) {
func (h Controller) OnGetRoomPetShowInfo(data *room.PetRoomListInboundInfo, c *socket.Player) (result *room.PetRoomListOutboundInfo, err errorcode.ErrorCode) {
result = &room.PetRoomListOutboundInfo{}
result.Pets = make([]room.PetShowInfo, 0)
return
}
// 获取自己房间的家具
func (h Controller) OnGetFitmentAll(data *room.FitmentAllInboundEmpty, c *entity.Player) (result *room.FitmentAllOutboundInfo, err errorcode.ErrorCode) {
func (h Controller) OnGetFitmentAll(data *room.FitmentAllInboundEmpty, c *socket.Player) (result *room.FitmentAllOutboundInfo, err errorcode.ErrorCode) {
result = &room.FitmentAllOutboundInfo{}
result.Fitments = make([]room.FitmentShowInfo, 0)
result.Fitments = append(result.Fitments, room.FitmentShowInfo{Id: 500001, Status: 1, X: 1, Y: 1, Dir: 1})

4
logic/controller/systemtime.go
View File

@@ -1,12 +1,12 @@
package controller
import (
"blazing/common/data/entity"
"blazing/common/data/socket"
"blazing/common/socket/errorcode"
"blazing/logic/service/systemtime"
)
func (h Controller) SystemTimeInfo(data *systemtime.InInfo, c *entity.Player) (result *systemtime.OutInfo, err errorcode.ErrorCode) {
func (h Controller) SystemTimeInfo(data *systemtime.InInfo, c *socket.Player) (result *systemtime.OutInfo, err errorcode.ErrorCode) {
return systemtime.NewOutInfo(), 0
}

20
logic/controller/task.go
View File

@@ -1,7 +1,7 @@
package controller
import (
"blazing/common/data/entity"
"blazing/common/data/socket"
"blazing/common/socket/errorcode"
"blazing/logic/service/task"
"blazing/modules/blazing/model"
@@ -11,10 +11,10 @@ import (
/**
* 接受任务
*/
func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *entity.Player) (result *task.AcceptTaskOutboundInfo, err errorcode.ErrorCode) {
func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *socket.Player) (result *task.AcceptTaskOutboundInfo, err errorcode.ErrorCode) {
if data.Head.CMD == 2201 { //判断不是每日任务
service.NewUserService(c.UserID).TaskExec(func(ttt map[uint32]model.TaskInfo) bool {
service.NewUserService(c.Info.UserID).TaskExec(func(ttt map[uint32]model.TaskInfo) bool {
ft, ok := ttt[data.TaskId]
if ok { //如果找到任务
if ft.Status == 0 { //可以接受
@@ -33,7 +33,7 @@ func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *entity.Playe
return false
})
} else {
service.NewUserService(c.UserID).DailyTaskExec(func(ttt map[uint32]model.DailyTaskInfo) bool {
service.NewUserService(c.Info.UserID).DailyTaskExec(func(ttt map[uint32]model.DailyTaskInfo) bool {
ft, ok := ttt[data.TaskId]
if ok { //如果找到任务
if ft.Status == 0 { //可以接受
@@ -61,10 +61,10 @@ func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *entity.Playe
/**
* 更新任务步骤
*/
func (h Controller) AddTaskBuf(data *task.AddTaskBufInboundInfo, c *entity.Player) (result *task.AddTaskBufOutboundInfo, err errorcode.ErrorCode) {
func (h Controller) AddTaskBuf(data *task.AddTaskBufInboundInfo, c *socket.Player) (result *task.AddTaskBufOutboundInfo, err errorcode.ErrorCode) {
if data.Head.CMD == 2204 { //判断不是每日任务
service.NewUserService(c.UserID).TaskExec(func(ttt map[uint32]model.TaskInfo) bool {
service.NewUserService(c.Info.UserID).TaskExec(func(ttt map[uint32]model.TaskInfo) bool {
if conditions, ok := ttt[data.TaskId]; ok {
conditions.TaskInfo = data.TaskList
ttt[data.TaskId] = conditions
@@ -74,7 +74,7 @@ func (h Controller) AddTaskBuf(data *task.AddTaskBufInboundInfo, c *entity.Playe
return false
})
} else {
service.NewUserService(c.UserID).DailyTaskExec(func(ttt map[uint32]model.DailyTaskInfo) bool {
service.NewUserService(c.Info.UserID).DailyTaskExec(func(ttt map[uint32]model.DailyTaskInfo) bool {
if conditions, ok := ttt[data.TaskId]; ok {
conditions.DailyTaskInfo = data.TaskList
ttt[data.TaskId] = conditions
@@ -92,7 +92,7 @@ func (h Controller) AddTaskBuf(data *task.AddTaskBufInboundInfo, c *entity.Playe
/**
* 完成任务
*/
func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *entity.Player) (result *task.CompleteTaskOutboundInfo, err errorcode.ErrorCode) {
func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *socket.Player) (result *task.CompleteTaskOutboundInfo, err errorcode.ErrorCode) {
if data.Head.CMD == 2202 { //判断不是每日任务
@@ -106,7 +106,7 @@ func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *entity.
/**
* 获取任务状态
*/
func (h Controller) Get_Task_Buf(data *task.GetTaskBufInboundInfo, c *entity.Player) (result *task.GetTaskBufOutboundInfo, err errorcode.ErrorCode) {
func (h Controller) Get_Task_Buf(data *task.GetTaskBufInboundInfo, c *socket.Player) (result *task.GetTaskBufOutboundInfo, err errorcode.ErrorCode) {
if data.Head.CMD == 2203 { //判断不是每日任务
@@ -120,7 +120,7 @@ func (h Controller) Get_Task_Buf(data *task.GetTaskBufInboundInfo, c *entity.Pla
/**
* 删除任务
*/
func (h Controller) Delete_Task(data *task.DeleteTaskInboundInfo, c *entity.Player) (result *task.DeleteTaskOutboundInfo, err errorcode.ErrorCode) {
func (h Controller) Delete_Task(data *task.DeleteTaskInboundInfo, c *socket.Player) (result *task.DeleteTaskOutboundInfo, err errorcode.ErrorCode) {
if data.Head.CMD == 2205 { //判断不是每日任务

8
logic/controller/walk.go
View File

@@ -1,15 +1,15 @@
package controller
import (
"blazing/common/data/entity"
"blazing/common/data/socket"
"blazing/common/socket/errorcode"
"blazing/logic/service/space"
)
func (h Controller) Walk(data *space.InInfo, c *entity.Player) (result *space.OutInfo, err errorcode.ErrorCode) {
func (h Controller) Walk(data *space.InInfo, c *socket.Player) (result *space.OutInfo, err errorcode.ErrorCode) {
data.Broadcast(c.MapId, space.OutInfo{Flag: data.Flag,
UserID: c.GetUserID(),
data.Broadcast(c.Info.UserID, space.OutInfo{Flag: data.Flag,
UserID: c.Info.UserID,
Reserve2: data.Reverse2,
Point: data.Point}) //走路的广播