diff --git a/cmd/v2/ui/protocol.go b/cmd/v2/ui/protocol.go index 952eae2ca..5e776d070 100644 --- a/cmd/v2/ui/protocol.go +++ b/cmd/v2/ui/protocol.go @@ -110,8 +110,7 @@ var ( ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleFinish): &formview.RtaskBattleFinishView{}, ff(comm.ModuleRtask, rtask.RtaskSubTypeGetrecord): &formview.RtaskRecordView{}, // linestory - ff(comm.ModuleLinestory, linestory.LinestorySubTypeDostart): &formview.LinestoryStartView{}, - ff(comm.ModuleLinestory, linestory.LinestorySubTypeDotask): &formview.LinestoryTaskView{}, + ff(comm.ModuleLinestory, linestory.LinestorySubTypeChapter): &formview.LinestoryMineView{}, // gourmet ff(comm.ModuleGourmet, "getranduser"): &formview.GourmentGetRandView{}, // sociaty @@ -235,8 +234,7 @@ var ( ff(comm.ModuleRtask, "rtest"), }, "linestory": { - ff(comm.ModuleLinestory, linestory.LinestorySubTypeDostart), - ff(comm.ModuleLinestory, linestory.LinestorySubTypeDotask), + ff(comm.ModuleLinestory, linestory.LinestorySubTypeChapter), }, "gourmet": { ff(comm.ModuleGourmet, "getranduser"), @@ -822,18 +820,11 @@ var ( MainType: string(comm.ModuleLinestory), Enabled: true, }, - ff(comm.ModuleLinestory, linestory.LinestorySubTypeDostart): { - NavLabel: "启动", - Desc: "启动剧情任务", + ff(comm.ModuleLinestory, linestory.LinestorySubTypeChapter): { + NavLabel: "我的任务", + Desc: "我的剧情任务", MainType: string(comm.ModuleLinestory), - SubType: linestory.LinestorySubTypeDostart, - Enabled: true, - }, - ff(comm.ModuleLinestory, linestory.LinestorySubTypeDotask): { - NavLabel: "做任务", - Desc: "做任务", - MainType: string(comm.ModuleLinestory), - SubType: linestory.LinestorySubTypeDotask, + SubType: linestory.LinestorySubTypeChapter, Enabled: true, }, // gourmet diff --git a/comm/error.go b/comm/error.go index ad258db9f..ba0740fd9 100644 --- a/comm/error.go +++ b/comm/error.go @@ -8,7 +8,7 @@ import ( type CustomError struct { Code pb.ErrorCode `json:"code"` // 业务码 - Message string `json:"message"` // 业务码 + Message string `json:"message"` // 业务注释 } func (e *CustomError) Error() string { diff --git a/comm/imodule.go b/comm/imodule.go index ee9343475..8e50291ec 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -260,5 +260,12 @@ type ( TaskcondNotify(session IUserSession, condId int32) error // bingo任务 BingoJumpTask(session IUserSession, groupId, rtaskId int32) error + // 查询我的世界任务 + GetMyWorldtask(uid string) *pb.DBWorldtask + } + // 支线剧情任务 + ILinestory interface { + // 任务完成通知 + TaskFinishNotify(uid string, taskId, groupId int32) error } )