Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

comm/imodule.go

@@ -584,4 +584,9 @@ type (
 		GetHdInfoByHdId(hid int32) (result *pb.DBHuodong, err error) // 通过活动id 获取活动信息
 		GetAllHdInfo() (result []*pb.DBHuodong, err error)           // 获取所有活动信息
 	}
+	//每日任务
+	IDailytask interface {
+		//任务组完成
+		TaskGroupComplete(session IUserSession, group int32)
+	}
 )

modules/dailytask/api_receive.go

@@ -0,0 +1,68 @@
+package dailytask
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
+)
+
+// 参数校验
+func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.DailytaskReceiveReq) (errdata *pb.ErrorData) {
+
+	return
+}
+
+// /获取自己的排行榜信息
+func (this *apiComp) Receive(session comm.IUserSession, req *pb.DailytaskReceiveReq) (errdata *pb.ErrorData) {
+	var (
+		dtask *pb.DBDailytask
+		conf  *cfg.GameAnnulartaskAllData
+		award []*pb.UserAssets
+		err   error
+	)
+	if errdata = this.ReceiveCheck(session, req); errdata != nil {
+		return
+	}
+
+	if dtask, err = this.module.modelDailytask.getUserDTasks(session.GetUserId()); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Title:   pb.ErrorCode_DBError.ToString(),
+			Message: err.Error(),
+		}
+		return
+	}
+
+	if conf, err = this.module.configure.getAnnulartaskAllById(dtask.Key); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_ConfigNoFound,
+			Title:   pb.ErrorCode_ConfigNoFound.ToString(),
+			Message: err.Error(),
+		}
+		return
+	}
+
+	for _, v := range dtask.Groups {
+		if !v.Complete {
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_ReqParameterError,
+				Title:   pb.ErrorCode_ReqParameterError.ToString(),
+				Message: "task no complete!",
+			}
+			return
+		}
+	}
+	award = make([]*pb.UserAssets, 0)
+	for _, v := range conf.Reward {
+		award = append(award, &pb.UserAssets{
+			A: v.A,
+			T: v.T,
+			N: v.N,
+		})
+	}
+	if errdata = this.module.DispenseRes(session, conf.Reward, true); errdata != nil {
+		return
+	}
+	session.SendMsg(string(this.module.GetType()), "receive", &pb.DailytaskReceiveResp{Award: award})
+	return
+}

modules/dailytask/configure.go

@@ -89,6 +89,24 @@ func (this *configureComp) getAnnulartaskAll() (results *cfg.GameAnnulartaskAllD
 	}
 }
 
+// 随机获取任务组
+func (this *configureComp) getAnnulartaskAllById(id int32) (results *cfg.GameAnnulartaskAllData, err error) {
+	var (
+		v  interface{}
+		ok bool
+	)
+	if v, err = this.GetConfigure(game_annulartaskall); err != nil {
+		return
+	} else {
+		if results, ok = v.(*cfg.GameAnnulartaskAll).GetDataMap()[id]; !ok {
+			err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_annulartaskall, id)
+			this.module.Errorln(err)
+			return
+		}
+		return
+	}
+}
+
 // 随机任务
 func (this *configureComp) getAnnulartaskLibrary(ulv, group int32) (results *cfg.GameAnnulartask_LibraryData, err error) {
 	var (

modules/dailytask/modelDailytask.go

@@ -48,7 +48,7 @@ func (this *ModelDailytask) getUserDTasks(uid string) (results *pb.DBDailytask,
 }
 
 // 重置任务
-func (this *ModelDailytask) resetUserDTasks(ulv int32) (group []int32, err error) {
+func (this *ModelDailytask) resetUserDTasks(ulv int32) (key int32, group []int32, err error) {
 	var (
 		conf *cfg.GameAnnulartaskAllData
 		task *cfg.GameAnnulartask_LibraryData
@@ -56,6 +56,7 @@ func (this *ModelDailytask) resetUserDTasks(ulv int32) (group []int32, err error
 	if conf, err = this.module.configure.getAnnulartaskAll(); err != nil {
 		return
 	}
+	key = conf.Taskgroup
 	group = make([]int32, 0)
 	for _, v := range conf.Taskdetail {
 		if task, err = this.module.configure.getAnnulartaskLibrary(ulv, v); err != nil {

modules/dailytask/module.go

@@ -60,6 +60,7 @@ func (this *Dailytask) EventUserLogin(session comm.IUserSession) {
 		dtask   *pb.DBDailytask
 		user    *pb.DBUser
 		errdata *pb.ErrorData
+		key     int32
 		group   []int32
 		tasks   map[int32][]int32
 		err     error
@@ -79,7 +80,7 @@ func (this *Dailytask) EventUserLogin(session comm.IUserSession) {
 			this.Error("no found user", log.Field{Key: "uid", Value: session.GetUserId()})
 			return
 		}
-		if group, err = this.modelDailytask.resetUserDTasks(user.Lv); err != nil {
+		if key, group, err = this.modelDailytask.resetUserDTasks(user.Lv); err != nil {
 			this.Errorln(err)
 			return
 		}
@@ -87,6 +88,7 @@ func (this *Dailytask) EventUserLogin(session comm.IUserSession) {
 			this.Errorln(errdata)
 			return
 		}
+		dtask.Key = key
 		dtask.Groups = make([]*pb.DBDailytaskGroup, 0)
 		for k, v := range tasks {
 			dtask.Groups = append(dtask.Groups, &pb.DBDailytaskGroup{
@@ -96,6 +98,7 @@ func (this *Dailytask) EventUserLogin(session comm.IUserSession) {
 		}
 		dtask.Rtime = configure.Now().Unix()
 		if err = this.modelDailytask.Change(session.GetUserId(), map[string]interface{}{
+			"key":    dtask.Key,
 			"groups": dtask.Groups,
 			"rtime":  dtask.Rtime,
 		}); err != nil {
@@ -105,3 +108,27 @@ func (this *Dailytask) EventUserLogin(session comm.IUserSession) {
 	}
 
 }
+
+// 任务组完成
+func (this *Dailytask) TaskGroupComplete(session comm.IUserSession, group int32) {
+	var (
+		dtask *pb.DBDailytask
+		err   error
+	)
+	if dtask, err = this.modelDailytask.getUserDTasks(session.GetUserId()); err != nil {
+		this.Errorln(err)
+		return
+	}
+	for _, v := range dtask.Groups {
+		if v.Group == group {
+			v.Complete = true
+			if err = this.modelDailytask.Change(session.GetUserId(), map[string]interface{}{
+				"groups": dtask.Groups,
+			}); err != nil {
+				this.Errorln(err)
+				return
+			}
+			break
+		}
+	}
+}

modules/questionnaire/api_answer.go

@@ -25,6 +25,7 @@ func (this *apiComp) Answer(session comm.IUserSession, req *pb.QuestionnaireAnsw
 		totalsocre  int32
 		err         error
 		award       []*pb.UserAssets
+		tasks       []*pb.BuriedParam = make([]*pb.BuriedParam, 0)
 	)
 	if errdata = this.AnswerCheck(session, req); errdata != nil {
 		return
@@ -91,6 +92,9 @@ func (this *apiComp) Answer(session comm.IUserSession, req *pb.QuestionnaireAnsw
 			}
 			this.module.DispenseRes(session, groupconfig.Reward, true)
 		}
+		tasks = append(tasks, comm.GetBuriedParam(comm.Rtype203, 1, req.Group))
+		tasks = append(tasks, comm.GetBuriedParam(comm.Rtype204, 1))
+		go this.module.ModuleBuried.TriggerBuried(session.Clone(), tasks...)
 	}
 
 	session.SendMsg(string(this.module.GetType()), "answer", &pb.QuestionnaireAnswerResp{Info: info.Group[req.Group], Group: req.Group, Award: award})

modules/task/api_receive.go

@@ -56,7 +56,6 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq)
 		taskDataList = userTask.AchieveList
 	}
 
-	resp := &pb.TaskReceiveResp{}
 	var taskData *pb.TaskData
 	for _, v := range taskDataList {
 		if v.TaskId == req.Id {
@@ -217,9 +216,8 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq)
 		}
 		return
 	}
-	resp.TaskId = taskData.TaskId
 
-	session.SendMsg(string(this.module.GetType()), TaskSubTypeReceive, resp)
+	session.SendMsg(string(this.module.GetType()), TaskSubTypeReceive, &pb.TaskReceiveResp{TaskId: taskData.TaskId})
 
 	return
 }

modules/wtask/module.go

@@ -16,6 +16,7 @@ type WTask struct {
 	modules.ModuleBase
 	service    core.IService
 	caravan    comm.ICaravan
+	dailytask  comm.IDailytask
 	battle     comm.IBattle
 	sys        comm.ISys
 	api        *apiComp
@@ -596,6 +597,7 @@ func (this *WTask) checkgroupState(session comm.IUserSession, wtask *pb.DBWTask,
 	wtask.Groups[group] = 1
 	if des == 5 { //商队任务
 		this.caravan.TaskGroupComplete(session, group)
+		this.dailytask.TaskGroupComplete(session, group)
 	}
 }
 

pb/dailytask_db.pb.go

@@ -28,8 +28,9 @@ type DBDailytask struct {
 
 	Id     string              `protobuf:"bytes,1,opt,name=id,proto3" json:"id"`
 	Uid    string              `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`
-	Groups []*DBDailytaskGroup `protobuf:"bytes,3,rep,name=groups,proto3" json:"groups"`
+	Key    int32               `protobuf:"varint,3,opt,name=key,proto3" json:"key"`
-	Rtime  int64               `protobuf:"varint,4,opt,name=rtime,proto3" json:"rtime"`
+	Groups []*DBDailytaskGroup `protobuf:"bytes,4,rep,name=groups,proto3" json:"groups"`
+	Rtime  int64               `protobuf:"varint,5,opt,name=rtime,proto3" json:"rtime"`
 }
 
 func (x *DBDailytask) Reset() {
@@ -78,6 +79,13 @@ func (x *DBDailytask) GetUid() string {
 	return ""
 }
 
+func (x *DBDailytask) GetKey() int32 {
+	if x != nil {
+		return x.Key
+	}
+	return 0
+}
+
 func (x *DBDailytask) GetGroups() []*DBDailytaskGroup {
 	if x != nil {
 		return x.Groups
@@ -97,8 +105,9 @@ type DBDailytaskGroup struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Group int32   `protobuf:"varint,3,opt,name=group,proto3" json:"group"`
+	Group    int32   `protobuf:"varint,1,opt,name=group,proto3" json:"group"`
-	Tasks []int32 `protobuf:"varint,2,rep,packed,name=tasks,proto3" json:"tasks"`
+	Tasks    []int32 `protobuf:"varint,2,rep,packed,name=tasks,proto3" json:"tasks"`
+	Complete bool    `protobuf:"varint,3,opt,name=complete,proto3" json:"complete"`
 }
 
 func (x *DBDailytaskGroup) Reset() {
@@ -147,6 +156,13 @@ func (x *DBDailytaskGroup) GetTasks() []int32 {
 	return nil
 }
 
+func (x *DBDailytaskGroup) GetComplete() bool {
+	if x != nil {
+		return x.Complete
+	}
+	return false
+}
+
 type DBDailytaskGroupProgress struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -208,24 +224,27 @@ var file_dailytask_dailytask_db_proto_rawDesc = []byte{
 	0x0a, 0x1c, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x64, 0x61, 0x69, 0x6c,
 	0x79, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14,
 	0x77, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x22, 0x70, 0x0a, 0x0b, 0x44, 0x42, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x74,
+	0x72, 0x6f, 0x74, 0x6f, 0x22, 0x82, 0x01, 0x0a, 0x0b, 0x44, 0x42, 0x44, 0x61, 0x69, 0x6c, 0x79,
-	0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x74, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x29, 0x0a, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18,
+	0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20,
-	0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x74,
+	0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x29, 0x0a, 0x06, 0x67, 0x72, 0x6f, 0x75,
-	0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73,
+	0x70, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x44, 0x61, 0x69,
-	0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x06, 0x67, 0x72, 0x6f,
-	0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x3e, 0x0a, 0x10, 0x44, 0x42, 0x44, 0x61, 0x69, 0x6c,
+	0x75, 0x70, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01,
-	0x79, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72,
+	0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x5a, 0x0a, 0x10, 0x44, 0x42, 0x44,
-	0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70,
+	0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x14, 0x0a,
-	0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52,
+	0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72,
-	0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x54, 0x0a, 0x18, 0x44, 0x42, 0x44, 0x61, 0x69, 0x6c,
+	0x6f, 0x75, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x02, 0x20, 0x03,
-	0x79, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65,
+	0x28, 0x05, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6d,
-	0x73, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x70, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x63, 0x6f, 0x6d,
-	0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x22, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b,
+	0x70, 0x6c, 0x65, 0x74, 0x65, 0x22, 0x54, 0x0a, 0x18, 0x44, 0x42, 0x44, 0x61, 0x69, 0x6c, 0x79,
-	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73,
+	0x74, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73,
-	0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04,
+	0x73, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
-	0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x22, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73,
+	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b,
+	0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pb/dailytask_msg.pb.go

@@ -151,6 +151,8 @@ type DailytaskReceiveResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
+	Award []*UserAssets `protobuf:"bytes,1,rep,name=award,proto3" json:"award"` //奖励
 }
 
 func (x *DailytaskReceiveResp) Reset() {
@@ -185,23 +187,33 @@ func (*DailytaskReceiveResp) Descriptor() ([]byte, []int) {
 	return file_dailytask_dailytask_msg_proto_rawDescGZIP(), []int{3}
 }
 
+func (x *DailytaskReceiveResp) GetAward() []*UserAssets {
+	if x != nil {
+		return x.Award
+	}
+	return nil
+}
+
 var File_dailytask_dailytask_msg_proto protoreflect.FileDescriptor
 
 var file_dailytask_dailytask_msg_proto_rawDesc = []byte{
 	0x0a, 0x1d, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x64, 0x61, 0x69, 0x6c,
 	0x79, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
 	0x1c, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x64, 0x61, 0x69, 0x6c, 0x79,
-	0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x12, 0x0a,
+	0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63,
-	0x10, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
+	0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x12, 0x0a, 0x10, 0x44, 0x61, 0x69,
-	0x71, 0x22, 0x42, 0x0a, 0x11, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x6e,
+	0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x42, 0x0a,
-	0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2d, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01,
+	0x11, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61,
+	0x73, 0x70, 0x12, 0x2d, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
-	0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52,
+	0x32, 0x19, 0x2e, 0x44, 0x42, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x72,
-	0x04, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x15, 0x0a, 0x13, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61,
+	0x6f, 0x75, 0x70, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x04, 0x74, 0x61, 0x73,
-	0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x22, 0x16, 0x0a, 0x14,
+	0x6b, 0x22, 0x15, 0x0a, 0x13, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65,
-	0x44, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65,
+	0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x22, 0x39, 0x0a, 0x14, 0x44, 0x61, 0x69, 0x6c,
-	0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x79, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77,
+	0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (
@@ -223,14 +235,16 @@ var file_dailytask_dailytask_msg_proto_goTypes = []interface{}{
 	(*DailytaskReceiveReq)(nil),      // 2: DailytaskReceiveReq
 	(*DailytaskReceiveResp)(nil),     // 3: DailytaskReceiveResp
 	(*DBDailytaskGroupProgress)(nil), // 4: DBDailytaskGroupProgress
+	(*UserAssets)(nil),               // 5: UserAssets
 }
 var file_dailytask_dailytask_msg_proto_depIdxs = []int32{
 	4, // 0: DailytaskInfoResp.task:type_name -> DBDailytaskGroupProgress
-	1, // [1:1] is the sub-list for method output_type
+	5, // 1: DailytaskReceiveResp.award:type_name -> UserAssets
-	1, // [1:1] is the sub-list for method input_type
+	2, // [2:2] is the sub-list for method output_type
-	1, // [1:1] is the sub-list for extension type_name
+	2, // [2:2] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension extendee
+	2, // [2:2] is the sub-list for extension type_name
-	0, // [0:1] is the sub-list for field type_name
+	2, // [2:2] is the sub-list for extension extendee
+	0, // [0:2] is the sub-list for field type_name
 }
 
 func init() { file_dailytask_dailytask_msg_proto_init() }
@@ -239,6 +253,7 @@ func file_dailytask_dailytask_msg_proto_init() {
 		return
 	}
 	file_dailytask_dailytask_db_proto_init()
+	file_comm_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_dailytask_dailytask_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DailytaskInfoReq); i {