重构
This commit is contained in:
@@ -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 { //判断不是每日任务
|
||||
|
||||
|
||||
Reference in New Issue
Block a user