feat(item): 添加物品相关功能并优化任务和宠物逻辑

- 新增物品检查和添加功能
- 优化任务重置和完成逻辑
- 改进宠物信息获取和展示
- 调整玩家登录和保存机制
This commit is contained in:
2025-09-11 01:07:00 +08:00
parent e0ec9ee1ec
commit 53df18c1e1
12 changed files with 240 additions and 78 deletions

View File

@@ -5,7 +5,6 @@ import (
"blazing/logic/service"
"blazing/logic/service/task"
"blazing/modules/blazing/model"
blservice "blazing/modules/blazing/service"
"math/rand"
"time"
)
@@ -37,14 +36,14 @@ func (h Controller) AddTaskBuf(data *task.AddTaskBufInboundInfo, c *service.Play
// isdaliy = true
// }
result = &task.AddTaskBufOutboundInfo{}
taskservice := blservice.NewUserService(c.Info.UserID)
_, ok := taskservice.TaskInfo(data.TaskId)
_, ok := c.Service.TaskInfo(data.TaskId)
if ok {
taskservice.TaskSet(data.TaskId, model.TaskInfo{
c.Service.TaskSet(data.TaskId, model.TaskInfo{
Info: data.TaskList,
})
} else {
taskservice.TaskADD(data.TaskId, model.TaskInfo{
c.Service.TaskADD(data.TaskId, model.TaskInfo{
Info: data.TaskList,
})
@@ -94,7 +93,7 @@ func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *service
r := model.GenPetInfo(1, []int{0, 31}, []int{0, 24}, []int{0}, []int{0}, []int{5})
result.CaptureTime = r.CatchTime
result.PetTypeId = r.ID
blservice.NewUserService(c.Info.UserID).PetAdd(*r)
c.Service.PetAdd(*r)
}
if data.TaskId == 87 { //新手注册任务
@@ -107,6 +106,11 @@ func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *service
result.ItemList = append(result.ItemList, task.ItemInfo{ItemId: 1, ItemCount: 5000})
}
var ttt []model.SingleItemInfo
for _, v := range result.ItemList {
ttt = append(ttt, model.SingleItemInfo{ItemId: v.ItemId, ItemCnt: v.ItemCount})
}
c.ItemAdd(ttt)
return result, 0
}
@@ -114,7 +118,7 @@ func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *service
* 获取任务状态
*/
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)
info, _ := c.Service.TaskInfo(data.TaskId)
result = &task.GetTaskBufOutboundInfo{}
result.TaskId = data.TaskId
result.TaskList = info.Info