refactor(blazing): 重构任务系统并优化相关功能
- 重构了任务系统的数据结构和执行逻辑 - 优化了地图加载和怪物刷新机制 - 改进了宠物系统的基础架构 - 调整了玩家信息和背包的处理方式 - 统一了数据访问层的接口和实现
This commit is contained in:
@@ -6,34 +6,22 @@ import (
|
||||
"blazing/logic/service/task"
|
||||
"blazing/modules/blazing/model"
|
||||
"blazing/modules/blazing/service"
|
||||
"time"
|
||||
)
|
||||
|
||||
/**
|
||||
* 接受任务
|
||||
*/
|
||||
func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *socket.Player) (result *task.AcceptTaskOutboundInfo, err errorcode.ErrorCode) {
|
||||
isdaliy := false
|
||||
//isdaliy := false
|
||||
if data.Head.CMD != 2201 { //判断是每日任务
|
||||
isdaliy = true
|
||||
//isdaliy = true
|
||||
}
|
||||
service.NewUserService(c.Info.UserID).TaskExec(func(ttt map[uint32]model.TaskInfo) bool {
|
||||
ft, ok := ttt[data.TaskId]
|
||||
if ok { //如果找到任务
|
||||
if ft.Status == 0 { //可以接受
|
||||
ft.Status = 1 //接受
|
||||
return true
|
||||
} else {
|
||||
return false
|
||||
}
|
||||
} else {
|
||||
ttt[data.TaskId] = model.TaskInfo{
|
||||
Status: 1,
|
||||
}
|
||||
|
||||
}
|
||||
if c.Info.TaskList[data.TaskId] == 0 {
|
||||
c.Info.TaskList[data.TaskId] = 1
|
||||
}
|
||||
|
||||
return false
|
||||
}, isdaliy)
|
||||
result = &task.AcceptTaskOutboundInfo{}
|
||||
result.TaskId = data.TaskId
|
||||
return result, 0
|
||||
@@ -47,14 +35,17 @@ func (h Controller) AddTaskBuf(data *task.AddTaskBufInboundInfo, c *socket.Playe
|
||||
if data.Head.CMD != 2204 { //判断是每日任务
|
||||
isdaliy = true
|
||||
}
|
||||
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
|
||||
return true
|
||||
service.NewUserService(c.Info.UserID).TaskExec(func(ttt []model.TaskInfo) []model.TaskInfo {
|
||||
var ttt2 []model.TaskInfo
|
||||
for _, v := range ttt {
|
||||
|
||||
v.TaskInfo = data.TaskList
|
||||
|
||||
ttt2 = append(ttt2, v)
|
||||
|
||||
}
|
||||
|
||||
return false
|
||||
return ttt2
|
||||
}, isdaliy)
|
||||
|
||||
return &task.AddTaskBufOutboundInfo{}, 0
|
||||
@@ -65,25 +56,68 @@ func (h Controller) AddTaskBuf(data *task.AddTaskBufInboundInfo, c *socket.Playe
|
||||
*/
|
||||
func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *socket.Player) (result *task.CompleteTaskOutboundInfo, err errorcode.ErrorCode) {
|
||||
|
||||
if data.Head.CMD == 2202 { //判断不是每日任务
|
||||
if c.Info.TaskList[data.TaskId] != 1 { //如果任务没有接受或者已经完成Complete_Task
|
||||
|
||||
} else {
|
||||
return result, 0
|
||||
|
||||
}
|
||||
c.Info.TaskList[data.TaskId] = 3
|
||||
result = &task.CompleteTaskOutboundInfo{}
|
||||
result.ItemList = make([]task.ItemInfo, 0)
|
||||
result.TaskId = data.TaskId
|
||||
if data.TaskId == 85 { //新手注册任务
|
||||
|
||||
return &task.CompleteTaskOutboundInfo{}, 0
|
||||
result.ItemList = append(result.ItemList, task.ItemInfo{ItemId: 100027, ItemCount: 1})
|
||||
result.ItemList = append(result.ItemList, task.ItemInfo{ItemId: 100028, ItemCount: 1})
|
||||
result.ItemList = append(result.ItemList, task.ItemInfo{ItemId: 500001, ItemCount: 1})
|
||||
result.ItemList = append(result.ItemList, task.ItemInfo{ItemId: 500502, ItemCount: 1})
|
||||
result.ItemList = append(result.ItemList, task.ItemInfo{ItemId: 500503, ItemCount: 1})
|
||||
|
||||
}
|
||||
if data.TaskId == 86 { //新手注册任务
|
||||
|
||||
result.CaptureTime = uint32(time.Now().Unix())
|
||||
result.PetTypeId = 1
|
||||
|
||||
}
|
||||
if data.TaskId == 87 { //新手注册任务
|
||||
|
||||
result.ItemList = append(result.ItemList, task.ItemInfo{ItemId: 300001, ItemCount: 10})
|
||||
result.ItemList = append(result.ItemList, task.ItemInfo{ItemId: 300011, ItemCount: 5})
|
||||
|
||||
}
|
||||
if data.TaskId == 88 { //新手注册任务
|
||||
|
||||
result.ItemList = append(result.ItemList, task.ItemInfo{ItemId: 1, ItemCount: 1000})
|
||||
|
||||
}
|
||||
return result, 0
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取任务状态
|
||||
*/
|
||||
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
|
||||
}
|
||||
|
||||
return &task.GetTaskBufOutboundInfo{}, 0
|
||||
service.NewUserService(c.Info.UserID).TaskExec(func(ttt []model.TaskInfo) []model.TaskInfo {
|
||||
var ttt2 = make([]model.TaskInfo, 500)
|
||||
for _, v := range ttt {
|
||||
if data.TaskId == v.TaskID {
|
||||
result = &task.GetTaskBufOutboundInfo{TaskId: data.TaskId, TaskList: v.TaskInfo}
|
||||
}
|
||||
|
||||
return ttt2
|
||||
|
||||
}
|
||||
|
||||
return ttt2
|
||||
}, isdaliy)
|
||||
|
||||
return result, 0
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user