``feat(item): 新增物品出售价格属性(SellPrice)并实现物品出售功能，优化宠物面板计算和时区判断逻辑``

logic/controller/user_task.go

@@ -0,0 +1,122 @@
+package controller
+
+import (
+	"blazing/common/socket/errorcode"
+
+	"blazing/logic/service/player"
+	"blazing/logic/service/task"
+	"blazing/modules/blazing/model"
+)
+
+/**
+ * 接受任务
+ */
+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
+}
+
+/**
+ * 更新任务步骤
+ */
+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
+		return true
+	})
+
+	return result, 0
+}
+
+/**
+ * 完成任务
+ */
+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
+		return result, 0
+
+	}
+
+	c.Info.SetTask(int(data.TaskId), model.Completed)
+
+	result = &task.CompleteTaskOutboundInfo{
+		TaskId:   data.TaskId,
+		ItemList: make([]model.ItemInfo, 0),
+	}
+
+	//提交任务
+	//task.Tasktopic.Pub(*data)
+
+	tt := task.Get_Task_Info(*data)
+	if tt == nil {
+		return result, 0 //通过PUB/SUB回包
+	}
+
+	if tt.PetTypeId != 0 {
+		r := model.GenPetInfo(int(tt.PetTypeId), 31, -1, 0, 0, 50)
+
+		result.PetTypeId = r.ID
+		c.Service.Pet.PetAdd(r)
+		result.CaptureTime = r.CatchTime //这个写到后面,方便捕捉时间被修改后造成的时间不对问题
+	}
+
+	for _, v := range tt.ItemList {
+		ret := c.ItemAdd(v.ItemId, v.ItemCnt) //获取成功的条目
+		if ret {
+			result.ItemList = append(result.ItemList, v)
+		}
+
+	}
+
+	return result, 0 //通过PUB/SUB回包
+}
+
+/**
+ * 获取任务状态
+ */
+func (h Controller) Get_Task_Buf(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
+}
+
+/**
+ * 删除任务
+ */
+func (h Controller) Delete_Task(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
+}