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

refactor(socket): 重构 socket 模块

Browse Source 
- 移除 common/data/socket 目录下的大部分文件
- 新增 service 目录，将 Player 和 Conn 结构体移至该目录
- 更新 LogicClient 中的方法签名，使用 service 包的类型
- 重构 Controller 中的方法，适应新的 service 包结构
This commit is contained in:
昔念
2025-09-04 02:00:57 +08:00
parent afdf015d62
commit 621a9d3858
50 changed files with 886 additions and 849 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
logic/controller/task.go
View File

@@ -1,11 +1,11 @@
package controller
import (
"blazing/common/data/socket"
"blazing/common/socket/errorcode"
"blazing/logic/service"
"blazing/logic/service/task"
"blazing/modules/blazing/model"
"blazing/modules/blazing/service"
blservice "blazing/modules/blazing/service"
"math/rand"
"time"
)
@@ -13,7 +13,7 @@ import (
/**
* 接受任务
*/
func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *socket.Player) (result *task.AcceptTaskOutboundInfo, err errorcode.ErrorCode) {
func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *service.Player) (result *task.AcceptTaskOutboundInfo, err errorcode.ErrorCode) {
//isdaliy := false
// if data.Head.CMD != 2201 { //判断是每日任务
// //isdaliy = true
@@ -31,20 +31,20 @@ func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *socket.Playe
/**
* 更新任务步骤
*/
func (h Controller) AddTaskBuf(data *task.AddTaskBufInboundInfo, c *socket.Player) (result *task.AddTaskBufOutboundInfo, err errorcode.ErrorCode) {
func (h Controller) AddTaskBuf(data *task.AddTaskBufInboundInfo, c *service.Player) (result *task.AddTaskBufOutboundInfo, err errorcode.ErrorCode) {
// isdaliy := false
// if data.Head.CMD != 2204 { //判断是每日任务
// isdaliy = true
// }
result = &task.AddTaskBufOutboundInfo{}
_, ok := service.NewUserService(c.Info.UserID).TaskInfo(data.TaskId)
_, ok := blservice.NewUserService(c.Info.UserID).TaskInfo(data.TaskId)
if ok {
service.NewUserService(c.Info.UserID).TaskSet(data.TaskId, model.TaskInfo{
blservice.NewUserService(c.Info.UserID).TaskSet(data.TaskId, model.TaskInfo{
Info: data.TaskList,
})
} else {
service.NewUserService(c.Info.UserID).TaskADD(data.TaskId, model.TaskInfo{
blservice.NewUserService(c.Info.UserID).TaskADD(data.TaskId, model.TaskInfo{
Info: data.TaskList,
})
@@ -65,7 +65,7 @@ func randInt0To24() int {
/**
* 完成任务
*/
func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *socket.Player) (result *task.CompleteTaskOutboundInfo, err errorcode.ErrorCode) {
func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *service.Player) (result *task.CompleteTaskOutboundInfo, err errorcode.ErrorCode) {
if c.Info.TaskList[data.TaskId] != 1 { //如果任务没有接受或者已经完成Complete_Task
@@ -94,7 +94,7 @@ func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *socket.
r := model.GenPetInfo(1, 1, 1, 1006, 1, 5)
result.CaptureTime = r.CatchTime
result.PetTypeId = r.ID
service.NewUserService(c.Info.UserID).PetAdd(*r)
blservice.NewUserService(c.Info.UserID).PetAdd(*r)
}
if data.TaskId == 87 { //新手注册任务
@@ -113,8 +113,8 @@ func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *socket.
/**
* 获取任务状态
*/
func (h Controller) Get_Task_Buf(data *task.GetTaskBufInboundInfo, c *socket.Player) (result *task.GetTaskBufOutboundInfo, err errorcode.ErrorCode) {
info, _ := service.NewUserService(c.Info.UserID).TaskInfo(data.TaskId)
func (h Controller) Get_Task_Buf(data *task.GetTaskBufInboundInfo, c *service.Player) (result *task.GetTaskBufOutboundInfo, err errorcode.ErrorCode) {
info, _ := blservice.NewUserService(c.Info.UserID).TaskInfo(data.TaskId)
result = &task.GetTaskBufOutboundInfo{}
result.TaskId = data.TaskId
result.TaskList = info.Info
@@ -125,7 +125,7 @@ func (h Controller) Get_Task_Buf(data *task.GetTaskBufInboundInfo, c *socket.Pla
/**
* 删除任务
*/
func (h Controller) Delete_Task(data *task.DeleteTaskInboundInfo, c *socket.Player) (result *task.DeleteTaskOutboundInfo, err errorcode.ErrorCode) {
func (h Controller) Delete_Task(data *task.DeleteTaskInboundInfo, c *service.Player) (result *task.DeleteTaskOutboundInfo, err errorcode.ErrorCode) {
// if data.Head.CMD == 2205 { //判断不是每日任务