```
refactor(controller): 重构控制器函数命名和代码注释 - 重命名 EGG 函数为 EggGamePlay,更新宠物生成逻辑 - 重命名 Leiyi 函数为 GetLeiyiTrainStatus - 重命名 Cacthpet 函数为 CatchPet,添加详细函数注释 - 为 ArenaSetOwner、ArenaFightOwner、ArenaGetInfo、ArenaUpfight、ArenaOwnerAcce 等擂台相关函数添加注释前缀 - 重命名 PETKing 函数为 PetKing - 重命名 FRESH_CHOICE_FIGHT_LEVEL 函数为 FreshChoiceFightLevel,添加详细参数说明 - 重命名 BuyMItem 函数为 BuyMultipleItems - 重命名 ITEM_S
This commit is contained in:
@@ -31,25 +31,24 @@ func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *player.Playe
|
||||
}
|
||||
|
||||
// AddTaskBuf 更新任务步骤
|
||||
// data: 包含任务ID和任务步骤列表的输入信息
|
||||
// c: 当前玩家对象
|
||||
// 返回: 空输出结果和错误码
|
||||
func (h Controller) AddTaskBuf(data *task.AddTaskBufInboundInfo, c *player.Player) (result *task.AddTaskBufOutboundInfo, err errorcode.ErrorCode) {
|
||||
// isdaliy := false
|
||||
// if data.Head.CMD != 2204 { //判断是每日任务
|
||||
// isdaliy = true
|
||||
// }
|
||||
|
||||
c.Service.Task.Exec(data.TaskId, func(te *model.TaskEX) bool {
|
||||
te.Data = data.TaskList
|
||||
c.Service.Task.Exec(data.TaskId, func(taskEx *model.TaskEX) bool {
|
||||
taskEx.Data = data.TaskList
|
||||
return true
|
||||
})
|
||||
|
||||
return result, 0
|
||||
}
|
||||
|
||||
// Complete_Task 完成任务
|
||||
func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *player.Player) (result *task.CompleteTaskOutboundInfo, err errorcode.ErrorCode) {
|
||||
if c.Info.GetTask(int(data.TaskId)) != model.Accepted { //如果任务没有接受或者已经完成Complete_Task
|
||||
// CompleteTask 完成任务
|
||||
// data: 包含任务ID的输入信息
|
||||
// c: 当前玩家对象
|
||||
// 返回: 任务完成结果和错误码
|
||||
func (h Controller) CompleteTask(data *task.CompleteTaskInboundInfo, c *player.Player) (result *task.CompleteTaskOutboundInfo, err errorcode.ErrorCode) {
|
||||
if c.Info.GetTask(int(data.TaskId)) != model.Accepted {
|
||||
return result, 0
|
||||
|
||||
}
|
||||
|
||||
c.Info.SetTask(int(data.TaskId), model.Completed)
|
||||
@@ -59,26 +58,22 @@ func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *player.
|
||||
ItemList: make([]model.ItemInfo, 0),
|
||||
}
|
||||
|
||||
//提交任务
|
||||
//task.Tasktopic.Pub(*data)
|
||||
|
||||
tt := task.Get_Task_Info(*data)
|
||||
if tt == nil {
|
||||
return result, 0 //通过PUB/SUB回包
|
||||
taskInfo := task.Get_Task_Info(*data)
|
||||
if taskInfo == nil {
|
||||
return result, 0
|
||||
}
|
||||
|
||||
if tt.PetTypeId != 0 {
|
||||
r := model.GenPetInfo(int(tt.PetTypeId), 31, -1, 0, 50, nil)
|
||||
|
||||
result.PetTypeId = r.ID
|
||||
c.Service.Pet.PetAdd(r)
|
||||
result.CaptureTime = r.CatchTime //这个写到后面,方便捕捉时间被修改后造成的时间不对问题
|
||||
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 _, v := range tt.ItemList {
|
||||
ret := c.ItemAdd(v.ItemId, v.ItemCnt) //获取成功的条目
|
||||
if ret {
|
||||
result.ItemList = append(result.ItemList, v)
|
||||
for _, item := range taskInfo.ItemList {
|
||||
success := c.ItemAdd(item.ItemId, item.ItemCnt)
|
||||
if success {
|
||||
result.ItemList = append(result.ItemList, item)
|
||||
}
|
||||
|
||||
}
|
||||
@@ -86,8 +81,8 @@ func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *player.
|
||||
return result, 0 //通过PUB/SUB回包
|
||||
}
|
||||
|
||||
// Get_Task_Buf 获取任务状态
|
||||
func (h Controller) Get_Task_Buf(data *task.GetTaskBufInboundInfo, c *player.Player) (result *task.GetTaskBufOutboundInfo, err errorcode.ErrorCode) {
|
||||
// GetTaskBuf 获取任务状态
|
||||
func (h Controller) GetTaskBuf(data *task.GetTaskBufInboundInfo, c *player.Player) (result *task.GetTaskBufOutboundInfo, err errorcode.ErrorCode) {
|
||||
result = &task.GetTaskBufOutboundInfo{
|
||||
TaskId: data.TaskId,
|
||||
}
|
||||
@@ -100,8 +95,8 @@ func (h Controller) Get_Task_Buf(data *task.GetTaskBufInboundInfo, c *player.Pla
|
||||
return result, 0
|
||||
}
|
||||
|
||||
// Delete_Task 删除任务
|
||||
func (h Controller) Delete_Task(data *task.DeleteTaskInboundInfo, c *player.Player) (result *task.DeleteTaskOutboundInfo, err errorcode.ErrorCode) {
|
||||
// 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)
|
||||
|
||||
Reference in New Issue
Block a user