From 06021546df3917a36f440e8740e4b13fe8355f31 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Mon, 7 Nov 2022 18:14:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E9=95=BF=E4=BB=BB=E5=8A=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/growtask/api_tasklist.go | 15 +++++++-- modules/growtask/model_growtask.go | 25 +++++++------- pb/growtask_msg.pb.go | 52 +++++++++++++++++++++--------- 3 files changed, 63 insertions(+), 29 deletions(-) diff --git a/modules/growtask/api_tasklist.go b/modules/growtask/api_tasklist.go index f1a0c806d..ad304f51e 100644 --- a/modules/growtask/api_tasklist.go +++ b/modules/growtask/api_tasklist.go @@ -19,9 +19,20 @@ func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.GrowtaskListRe func (this *apiComp) List(session comm.IUserSession, req *pb.GrowtaskListReq) (code pb.ErrorCode, data proto.Message) { uid := session.GetUserId() - g := this.module.modelGrowtask.list(uid, req.TaskType) + gt, err := this.module.modelGrowtask.getUserGrowtask(uid) + if err != nil { + code = pb.ErrorCode_DBError + return + } + if gt.Uid == "" { + return + } + + g := this.module.modelGrowtask.list(uid, req.TaskType, gt) rsp := &pb.GrowtaskListResp{ - TaskList: g, + TaskList: g, + CurTaskType: gt.CurTaskType, + AdvReceive: gt.AdvReceive, } session.SendMsg(string(this.module.GetType()), GrowtaskSubTypeList, rsp) diff --git a/modules/growtask/model_growtask.go b/modules/growtask/model_growtask.go index ebe550880..6f50ba010 100644 --- a/modules/growtask/model_growtask.go +++ b/modules/growtask/model_growtask.go @@ -25,12 +25,12 @@ func (this *ModelGrowtask) Init(service core.IService, module core.IModule, comp // 初始化成长任务 func (this *ModelGrowtask) initGrowtask(uid string, taskType int32) (*pb.DBGrowtask, error) { - ggt, err := this.moduleGrowtask.configure.getGrowtaskCfg() + gtConf, err := this.moduleGrowtask.configure.getGrowtaskCfg() if err != nil { return nil, err } - if ggt == nil { + if gtConf == nil { return nil, errors.New("growtask config is nil") } data := &pb.DBGrowtask{ @@ -38,7 +38,7 @@ func (this *ModelGrowtask) initGrowtask(uid string, taskType int32) (*pb.DBGrowt } update := map[string]interface{}{} - for _, v := range ggt.GetDataList() { + for _, v := range gtConf.GetDataList() { if taskType == v.Type { task := &pb.Growtask{ Id: v.Id, @@ -55,11 +55,17 @@ func (this *ModelGrowtask) initGrowtask(uid string, taskType int32) (*pb.DBGrowt } } } + update["uid"] = data.Uid update["curTaskType"] = taskType - update["initTaskList"] = data.InitTaskList - update["midTaskList"] = data.MidTaskList - update["highTaskList"] = data.HighTaskList + if taskType == 1 { + update["initTaskList"] = data.InitTaskList + } else if taskType == 2 { + update["midTaskList"] = data.MidTaskList + } else if taskType == 3 { + update["highTaskList"] = data.HighTaskList + } + if err = this.Change(uid, update); err != nil { return nil, err } @@ -79,11 +85,8 @@ func (this *ModelGrowtask) getUserGrowtask(uid string) (*pb.DBGrowtask, error) { } // 任务列表 -func (this *ModelGrowtask) list(uid string, taskType int32) []*pb.Growtask { - gt, err := this.getUserGrowtask(uid) - if err != nil { - return nil - } +func (this *ModelGrowtask) list(uid string, taskType int32, gt *pb.DBGrowtask) []*pb.Growtask { + var curList []*pb.Growtask getList := func(list []*pb.Growtask) []*pb.Growtask { diff --git a/pb/growtask_msg.pb.go b/pb/growtask_msg.pb.go index a99b7cc42..1802875e9 100644 --- a/pb/growtask_msg.pb.go +++ b/pb/growtask_msg.pb.go @@ -73,7 +73,9 @@ type GrowtaskListResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - TaskList []*Growtask `protobuf:"bytes,1,rep,name=taskList,proto3" json:"taskList"` + TaskList []*Growtask `protobuf:"bytes,1,rep,name=taskList,proto3" json:"taskList"` + CurTaskType int32 `protobuf:"varint,2,opt,name=curTaskType,proto3" json:"curTaskType"` // 进行中的任务类型 + AdvReceive int32 `protobuf:"varint,3,opt,name=advReceive,proto3" json:"advReceive"` //已领取的进阶奖励ID } func (x *GrowtaskListResp) Reset() { @@ -115,6 +117,20 @@ func (x *GrowtaskListResp) GetTaskList() []*Growtask { return nil } +func (x *GrowtaskListResp) GetCurTaskType() int32 { + if x != nil { + return x.CurTaskType + } + return 0 +} + +func (x *GrowtaskListResp) GetAdvReceive() int32 { + if x != nil { + return x.AdvReceive + } + return 0 +} + //子任务奖励领取 type GrowtaskReceiveReq struct { state protoimpl.MessageState @@ -314,24 +330,28 @@ var file_growtask_growtask_msg_proto_rawDesc = []byte{ 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2d, 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, - 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x22, 0x39, 0x0a, 0x10, 0x47, 0x72, 0x6f, 0x77, + 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x22, 0x7b, 0x0a, 0x10, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, - 0x69, 0x73, 0x74, 0x22, 0x2c, 0x0a, 0x12, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x52, - 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, - 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, - 0x64, 0x22, 0x2d, 0x0a, 0x13, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, - 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, - 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, - 0x22, 0x33, 0x0a, 0x15, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x64, 0x76, 0x52, - 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, - 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, - 0x6b, 0x54, 0x79, 0x70, 0x65, 0x22, 0x34, 0x0a, 0x16, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, - 0x6b, 0x41, 0x64, 0x76, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, - 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, - 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x73, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x75, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x79, + 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x75, 0x72, 0x54, 0x61, 0x73, + 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x64, 0x76, 0x52, 0x65, 0x63, 0x65, + 0x69, 0x76, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x61, 0x64, 0x76, 0x52, 0x65, + 0x63, 0x65, 0x69, 0x76, 0x65, 0x22, 0x2c, 0x0a, 0x12, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, + 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, + 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, + 0x6b, 0x49, 0x64, 0x22, 0x2d, 0x0a, 0x13, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x52, + 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, + 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, + 0x49, 0x64, 0x22, 0x33, 0x0a, 0x15, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x64, + 0x76, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x74, + 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, + 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x22, 0x34, 0x0a, 0x16, 0x47, 0x72, 0x6f, 0x77, 0x74, + 0x61, 0x73, 0x6b, 0x41, 0x64, 0x76, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x42, 0x06, 0x5a, + 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var (