feat(player): 重构任务状态管理逻辑
将任务状态相关的 GetTask 和 SetTask 方法从 player 包迁移至 model.PlayerInfo 结构体中, 统一通过 c.Info 调
This commit is contained in:
@@ -19,8 +19,8 @@ func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *player.Playe
|
||||
// //isdaliy = true
|
||||
// }
|
||||
|
||||
if c.GetTask(int(data.TaskId)) == player.Unaccepted {
|
||||
c.SetTask(int(data.TaskId), player.Accepted)
|
||||
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 {
|
||||
@@ -55,12 +55,12 @@ func (h Controller) AddTaskBuf(data *task.AddTaskBufInboundInfo, c *player.Playe
|
||||
* 完成任务
|
||||
*/
|
||||
func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *player.Player) (result *task.CompleteTaskOutboundInfo, err errorcode.ErrorCode) {
|
||||
if c.GetTask(int(data.TaskId)) != player.Accepted { //如果任务没有接受或者已经完成Complete_Task
|
||||
if c.Info.GetTask(int(data.TaskId)) != model.Accepted { //如果任务没有接受或者已经完成Complete_Task
|
||||
return result, 0
|
||||
|
||||
}
|
||||
|
||||
c.SetTask(int(data.TaskId), player.Completed)
|
||||
c.Info.SetTask(int(data.TaskId), model.Completed)
|
||||
|
||||
result = &task.CompleteTaskOutboundInfo{
|
||||
TaskId: data.TaskId,
|
||||
@@ -112,8 +112,8 @@ func (h Controller) Get_Task_Buf(data *task.GetTaskBufInboundInfo, c *player.Pla
|
||||
*/
|
||||
func (h Controller) Delete_Task(data *task.DeleteTaskInboundInfo, c *player.Player) (result *task.DeleteTaskOutboundInfo, err errorcode.ErrorCode) {
|
||||
|
||||
if c.GetTask(int(data.TaskId)) == player.Accepted {
|
||||
c.SetTask(int(data.TaskId), player.Unaccepted)
|
||||
if c.Info.GetTask(int(data.TaskId)) == model.Accepted {
|
||||
c.Info.SetTask(int(data.TaskId), model.Unaccepted)
|
||||
return &task.DeleteTaskOutboundInfo{TaskId: data.TaskId}, 0
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user