提交战斗系统

logic/controller/task.go

@@ -16,7 +16,24 @@ func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *entity.Playe
 	result = &task.AcceptTaskOutboundInfo{}
 	result.TaskId = data.TaskId
 
-	service.NewTaskService(c.UserID).AcceptTask(data.TaskId)
+	service.NewTaskService(c.UserID).Exec(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,
+			}
+
+		}
+
+		return false
+	})
 
 	return result, 0
 }
@@ -25,8 +42,15 @@ func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *entity.Playe
  * 更新任务步骤
  */
 func (h Controller) AddTaskBuf(data *task.AddTaskBufInboundInfo, c *entity.Player) (result *task.AddTaskBufOutboundInfo, err errorcode.ErrorCode) {
+	service.NewTaskService(c.UserID).Exec(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.NewTaskService(c.UserID).AddTaskBuf(data.TaskId, model.TaskInfo{TaskInfo: data.TaskList, Status: 0})
+		return false
+	})
 
 	return &task.AddTaskBufOutboundInfo{}, 0
 }