```
refactor(logic): 优化任务完成逻辑并提高可读性 - 将 `QuitSelf` 中的硬编码延时改为 `5 * time.Second`,提高可读性 - 使用 `switch` 语句重构任务奖励逻辑,替代多个 `if` 判断 - 统一处理任务 85、86、87、88 的奖励发放逻辑 - 添加默认分支处理未定义的任务 ID 和状态 - 修复函数签名中的空格格式问题 - 在任务服务中补充玩家 ID 和任务 ID 的赋值逻辑 ```
This commit is contained in:
@@ -56,7 +56,7 @@ func (h *LogicClient) QuitSelf(a int) error {
|
||||
//执行退出逻辑
|
||||
os.Exit(1)
|
||||
}
|
||||
<-time.After((50000))
|
||||
<-time.After(5 * time.Second)
|
||||
}
|
||||
}()
|
||||
//service.KickPlayer(uint32(a))
|
||||
|
||||
@@ -58,43 +58,58 @@ func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *player.
|
||||
result = &task.CompleteTaskOutboundInfo{}
|
||||
result.ItemList = make([]task.ItemInfo, 0)
|
||||
result.TaskId = data.TaskId
|
||||
if data.TaskId == 85 { //新手注册任务
|
||||
// 处理新手注册相关任务
|
||||
switch data.TaskId {
|
||||
case 85:
|
||||
// 新手注册任务-奖励物品
|
||||
result.ItemList = append(result.ItemList,
|
||||
task.ItemInfo{ItemId: 100027, ItemCount: 1},
|
||||
task.ItemInfo{ItemId: 100028, ItemCount: 1},
|
||||
task.ItemInfo{ItemId: 500001, ItemCount: 1},
|
||||
task.ItemInfo{ItemId: 500502, ItemCount: 1},
|
||||
task.ItemInfo{ItemId: 500503, ItemCount: 1},
|
||||
)
|
||||
|
||||
result.ItemList = append(result.ItemList, task.ItemInfo{ItemId: 100027, ItemCount: 1})
|
||||
result.ItemList = append(result.ItemList, task.ItemInfo{ItemId: 100028, ItemCount: 1})
|
||||
result.ItemList = append(result.ItemList, task.ItemInfo{ItemId: 500001, ItemCount: 1})
|
||||
result.ItemList = append(result.ItemList, task.ItemInfo{ItemId: 500502, ItemCount: 1})
|
||||
result.ItemList = append(result.ItemList, task.ItemInfo{ItemId: 500503, ItemCount: 1})
|
||||
|
||||
}
|
||||
if data.TaskId == 86 { //新手注册任务
|
||||
case 86:
|
||||
// 新手注册任务-宠物奖励
|
||||
var petid int
|
||||
switch data.OutState {
|
||||
|
||||
case 1:
|
||||
petid = 1
|
||||
|
||||
case 2:
|
||||
petid = 7
|
||||
|
||||
case 3:
|
||||
petid = 4
|
||||
default:
|
||||
// 处理未定义的OutState,可根据业务需求调整
|
||||
// 例如: log.Printf("未知的OutState: %d", data.OutState)
|
||||
// return result // 或其他错误处理
|
||||
}
|
||||
r := model.GenPetInfo(petid, 31, -1, 0, 0, 5)
|
||||
result.CaptureTime = r.CatchTime
|
||||
result.PetTypeId = r.ID
|
||||
c.Service.PetAdd(*r)
|
||||
}
|
||||
if data.TaskId == 87 { //新手注册任务
|
||||
|
||||
result.ItemList = append(result.ItemList, task.ItemInfo{ItemId: 300001, ItemCount: 5})
|
||||
result.ItemList = append(result.ItemList, task.ItemInfo{ItemId: 300011, ItemCount: 5})
|
||||
case 87:
|
||||
// 新手注册任务-奖励物品
|
||||
result.ItemList = append(result.ItemList,
|
||||
task.ItemInfo{ItemId: 300001, ItemCount: 5},
|
||||
task.ItemInfo{ItemId: 300011, ItemCount: 5},
|
||||
)
|
||||
|
||||
}
|
||||
if data.TaskId == 88 { //新手注册任务
|
||||
case 88:
|
||||
// 新手注册任务-奖励物品
|
||||
result.ItemList = append(result.ItemList,
|
||||
task.ItemInfo{ItemId: 1, ItemCount: 5000},
|
||||
)
|
||||
|
||||
result.ItemList = append(result.ItemList, task.ItemInfo{ItemId: 1, ItemCount: 5000})
|
||||
// 可以根据需要添加其他任务ID的处理
|
||||
// case xxx:
|
||||
// ...
|
||||
|
||||
default:
|
||||
// 处理未定义的任务ID,可选
|
||||
// log.Printf("未处理的任务ID: %d", data.TaskId)
|
||||
}
|
||||
var ttt []model.SingleItemInfo
|
||||
for _, v := range result.ItemList {
|
||||
@@ -109,7 +124,7 @@ 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{}
|
||||
c.Service.Task(data.TaskId, func(te *model.TaskEX)bool {
|
||||
c.Service.Task(data.TaskId, func(te *model.TaskEX) bool {
|
||||
result.TaskId = te.TaskID
|
||||
result.TaskList = te.Data
|
||||
return false
|
||||
|
||||
BIN
logic/logic1
Normal file
BIN
logic/logic1
Normal file
Binary file not shown.
@@ -46,6 +46,8 @@ func (s *UserService) Task(id uint32, t func(*model.TaskEX) bool) {
|
||||
if !tre { //不需要更新
|
||||
return
|
||||
}
|
||||
gg.PlayerID = uint64(s.userid)
|
||||
gg.TaskID = id
|
||||
if err != nil {
|
||||
m1.Insert(gg)
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user