修改部分代码
This commit is contained in:
@@ -3,6 +3,8 @@ package controller
|
||||
import (
|
||||
"blazing/common/data/socket"
|
||||
"blazing/common/socket/errorcode"
|
||||
"blazing/common/socket/handler"
|
||||
"blazing/logic/service/pet"
|
||||
"blazing/logic/service/task"
|
||||
"blazing/modules/blazing/model"
|
||||
"blazing/modules/blazing/service"
|
||||
@@ -15,9 +17,9 @@ import (
|
||||
*/
|
||||
func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *socket.Player) (result *task.AcceptTaskOutboundInfo, err errorcode.ErrorCode) {
|
||||
//isdaliy := false
|
||||
if data.Head.CMD != 2201 { //判断是每日任务
|
||||
//isdaliy = true
|
||||
}
|
||||
// if data.Head.CMD != 2201 { //判断是每日任务
|
||||
// //isdaliy = true
|
||||
// }
|
||||
|
||||
if c.Info.TaskList[data.TaskId] == 0 {
|
||||
c.Info.TaskList[data.TaskId] = 1
|
||||
@@ -32,10 +34,10 @@ 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) {
|
||||
isdaliy := false
|
||||
if data.Head.CMD != 2204 { //判断是每日任务
|
||||
isdaliy = true
|
||||
}
|
||||
// isdaliy := false
|
||||
// if data.Head.CMD != 2204 { //判断是每日任务
|
||||
// isdaliy = true
|
||||
// }
|
||||
service.NewUserService(c.Info.UserID).TaskExec(func(ttt []model.TaskInfo) []model.TaskInfo {
|
||||
var ttt2 []model.TaskInfo
|
||||
for _, v := range ttt {
|
||||
@@ -47,7 +49,7 @@ func (h Controller) AddTaskBuf(data *task.AddTaskBufInboundInfo, c *socket.Playe
|
||||
}
|
||||
|
||||
return ttt2
|
||||
}, isdaliy)
|
||||
})
|
||||
|
||||
return &task.AddTaskBufOutboundInfo{}, 0
|
||||
}
|
||||
@@ -93,7 +95,7 @@ func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *socket.
|
||||
r := model.GenPetInfo(1, 1, 1, 1, 1, 5)
|
||||
result.CaptureTime = r.CatchTime
|
||||
result.PetTypeId = r.ID
|
||||
service.NewUserService(c.Info.UserID).PetAdd(r.CatchTime, 1, *r)
|
||||
PetAdd(c, *r)
|
||||
}
|
||||
if data.TaskId == 87 { //新手注册任务
|
||||
|
||||
@@ -113,10 +115,10 @@ 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) {
|
||||
isdaliy := false
|
||||
if data.Head.CMD == 2203 { //判断不是每日任务
|
||||
isdaliy = true
|
||||
}
|
||||
// isdaliy := false
|
||||
// if data.Head.CMD == 2203 { //判断不是每日任务
|
||||
// isdaliy = true
|
||||
// }
|
||||
|
||||
service.NewUserService(c.Info.UserID).TaskExec(func(ttt []model.TaskInfo) []model.TaskInfo {
|
||||
var ttt2 = make([]model.TaskInfo, 500)
|
||||
@@ -130,7 +132,7 @@ func (h Controller) Get_Task_Buf(data *task.GetTaskBufInboundInfo, c *socket.Pla
|
||||
}
|
||||
|
||||
return ttt2
|
||||
}, isdaliy)
|
||||
})
|
||||
|
||||
return result, 0
|
||||
}
|
||||
@@ -140,11 +142,22 @@ 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) {
|
||||
|
||||
if data.Head.CMD == 2205 { //判断不是每日任务
|
||||
// if data.Head.CMD == 2205 { //判断不是每日任务
|
||||
|
||||
} else {
|
||||
// } else {
|
||||
|
||||
}
|
||||
// }
|
||||
|
||||
return &task.DeleteTaskOutboundInfo{}, 0
|
||||
}
|
||||
|
||||
// 添加精灵
|
||||
func PetAdd(c *socket.Player, y model.PetInfo) {
|
||||
c.Info.PetList = append(c.Info.PetList, y)
|
||||
|
||||
service.NewUserService(c.Info.UserID).PetAdd(y)
|
||||
t := handler.NewTomeeHeader(2304, c.Info.UserID)
|
||||
c.SendPack(t.Pack(&pet.PetReleaseOutboundInfo{PetInfo: []model.PetInfo{y}}))
|
||||
|
||||
//return lw.IsLogin
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user