Merge branch 'main' of https://github.com/72wo/blazing

logic/controller/task.go

@@ -109,11 +109,16 @@ func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *player.
  */
 func (h Controller) Get_Task_Buf(data *task.GetTaskBufInboundInfo, c *player.Player) (result *task.GetTaskBufOutboundInfo, err errorcode.ErrorCode) {
 	result = &task.GetTaskBufOutboundInfo{}
+<<<<<<< HEAD
 	c.Service.Task(data.TaskId, func(te *model.TaskEX)bool {
 		result.TaskId = te.TaskID
 		result.TaskList = te.Data
 		return false
 	})
+=======
+	result.TaskId = data.TaskId
+	result.TaskList = info.Data
+>>>>>>> ea1148039e70e6b1dadf6c892b49e547d0f10ac7
 
 	return result, 0
 }