昔念
c9bc4be244
feat: 添加ItemInfo结构体并重构抽蛋和任务系统 - 在common/data/color.go中添加ItemInfo结构体用于表示发放物品的信息 - 在common/utils/tomap.go中添加RandomSlice泛型函数用于从切片中随机选取元素 - 重构action_egg.go中的EggGamePlay功能，实现抽蛋逻辑和物品发放 - 更新fight_boss.go中使用新的ItemInfo结构体替换旧的model.ItemInfo - 修改user_talk.go中获取物品数量的逻辑 - 更新user_task.go中任务完成逻辑使用新的ItemInfo结构体 - 在egg.go中更新抽蛋结果结构体使用ItemInfo - 更新战斗奖励结构体使用ItemInfo - 在player.go中添加学习力道具处理逻辑 - 重构任务系统使用新的ItemInfo结构体 - 移除旧的model.ItemInfo定义 - 更新宠物奖励配置模型添加成长值等字段 - 实现GetEgg方法用于获取扭蛋奖励 - 修复宠物融合材料服务中的道具验证逻辑 ```
109 lines
3.0 KiB
Go
109 lines
3.0 KiB
Go
package controller
|
|
|
|
import (
|
|
"blazing/common/data"
|
|
"blazing/common/socket/errorcode"
|
|
|
|
"blazing/logic/service/player"
|
|
"blazing/logic/service/task"
|
|
"blazing/modules/blazing/model"
|
|
)
|
|
|
|
// AcceptTask 接受任务
|
|
func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *player.Player) (result *task.AcceptTaskOutboundInfo, err errorcode.ErrorCode) {
|
|
//isdaliy := false
|
|
// if data.Head.CMD != 2201 { //判断是每日任务
|
|
// //isdaliy = true
|
|
// }
|
|
|
|
if c.Info.GetTask(int(data.TaskId)) == model.Unaccepted {
|
|
c.Info.SetTask(int(data.TaskId), model.Accepted)
|
|
|
|
}
|
|
c.Service.Task.Exec(uint32(data.TaskId), func(t *model.TaskEX) bool {
|
|
t.Data = []uint32{}
|
|
|
|
return true
|
|
|
|
})
|
|
result = &task.AcceptTaskOutboundInfo{}
|
|
result.TaskId = data.TaskId
|
|
return result, 0
|
|
}
|
|
|
|
// AddTaskBuf 更新任务步骤
|
|
// data: 包含任务ID和任务步骤列表的输入信息
|
|
// c: 当前玩家对象
|
|
// 返回: 空输出结果和错误码
|
|
func (h Controller) AddTaskBuf(data *task.AddTaskBufInboundInfo, c *player.Player) (result *task.AddTaskBufOutboundInfo, err errorcode.ErrorCode) {
|
|
c.Service.Task.Exec(data.TaskId, func(taskEx *model.TaskEX) bool {
|
|
taskEx.Data = data.TaskList
|
|
return true
|
|
})
|
|
return result, 0
|
|
}
|
|
|
|
// CompleteTask 完成任务
|
|
// data: 包含任务ID的输入信息
|
|
// c: 当前玩家对象
|
|
// 返回: 任务完成结果和错误码
|
|
func (h Controller) CompleteTask(data1 *task.CompleteTaskInboundInfo, c *player.Player) (result *task.CompleteTaskOutboundInfo, err errorcode.ErrorCode) {
|
|
if c.Info.GetTask(int(data1.TaskId)) != model.Accepted {
|
|
return result, 0
|
|
}
|
|
|
|
c.Info.SetTask(int(data1.TaskId), model.Completed)
|
|
|
|
result = &task.CompleteTaskOutboundInfo{
|
|
TaskId: data1.TaskId,
|
|
ItemList: make([]data.ItemInfo, 0),
|
|
}
|
|
|
|
taskInfo := task.Get_Task_Info(*data1)
|
|
if taskInfo == nil {
|
|
return result, 0
|
|
}
|
|
|
|
if taskInfo.PetTypeId != 0 {
|
|
newPet := model.GenPetInfo(int(taskInfo.PetTypeId), 31, -1, 0, 50, nil)
|
|
result.PetTypeId = newPet.ID
|
|
c.Service.Pet.PetAdd(newPet)
|
|
result.CaptureTime = newPet.CatchTime
|
|
}
|
|
|
|
for _, item := range taskInfo.ItemList {
|
|
success := c.ItemAdd(item.ItemId, item.ItemCnt)
|
|
if success {
|
|
result.ItemList = append(result.ItemList, item)
|
|
}
|
|
|
|
}
|
|
|
|
return result, 0 //通过PUB/SUB回包
|
|
}
|
|
|
|
// GetTaskBuf 获取任务状态
|
|
func (h Controller) GetTaskBuf(data *task.GetTaskBufInboundInfo, c *player.Player) (result *task.GetTaskBufOutboundInfo, err errorcode.ErrorCode) {
|
|
result = &task.GetTaskBufOutboundInfo{
|
|
TaskId: data.TaskId,
|
|
}
|
|
c.Service.Task.Exec(data.TaskId, func(te *model.TaskEX) bool {
|
|
|
|
result.TaskList = te.Data
|
|
return false
|
|
})
|
|
|
|
return result, 0
|
|
}
|
|
|
|
// DeleteTask 删除任务
|
|
func (h Controller) DeleteTask(data *task.DeleteTaskInboundInfo, c *player.Player) (result *task.DeleteTaskOutboundInfo, err errorcode.ErrorCode) {
|
|
|
|
if c.Info.GetTask(int(data.TaskId)) == model.Accepted {
|
|
c.Info.SetTask(int(data.TaskId), model.Unaccepted)
|
|
return &task.DeleteTaskOutboundInfo{TaskId: data.TaskId}, 0
|
|
}
|
|
|
|
return &task.DeleteTaskOutboundInfo{}, 0
|
|
}
|