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

bin/json/game_msgdistrib.json

@@ -316,5 +316,11 @@
     "open": true,
     "routrules": "~/worker",
     "describe": "弹劾"
+  },
+  {
+    "msgid": "sociaty.activitylist",
+    "open": true,
+    "routrules": "~/worker",
+    "describe": "公会活跃度列表"
   }
 ]

cmd/v2/ui/protocol.go

@@ -117,6 +117,8 @@ var (
 		ff(comm.ModuleSociaty, sociaty.SociatySubTypeRank):     &formview.SociatyRankView{},
 		// troll
 		ff(comm.ModuleTroll, "getlist"): &formview.TrollGetlistView{},
+		// alliance
+		// ff(comm.ModuleAlliance,"")
 	}
 )
 
@@ -141,6 +143,7 @@ var (
 			string(comm.ModuleGourmet),
 			string(comm.ModuleSociaty),
 			string(comm.ModuleTroll),
+			string(comm.ModuleAlliance),
 		},
 		"gm": {ff(comm.ModuleGM, "cmd")},
 		"sys": {
@@ -875,6 +878,12 @@ var (
 			SubType:  "getlist",
 			Enabled:  true,
 		},
+		// alliance
+		string(comm.ModuleAlliance): {
+			NavLabel: "联盟学院",
+			MainType: string(comm.ModuleAlliance),
+			Enabled:  true,
+		},
 	}
 )
 

comm/const.go

@@ -70,6 +70,7 @@ const (
 	//ModuleFetter      core.M_Modules = "herofetter"  //好友模块
 	ModuleSociaty  core.M_Modules = "sociaty"  //公会
 	ModulePay      core.M_Modules = "pay"      //支付
+	ModuleAlliance core.M_Modules = "alliance" //联盟学院
 )
 
 //数据表名定义处
@@ -178,6 +179,9 @@ const (
 
 	///充值数据表
 	TablePay = "pay"
+
+	// 巨怪列车收益记录
+	TableTrollRecord = "trollrecord"
 )
 
 //RPC服务接口定义处

modules/sociaty/api.go

@@ -28,6 +28,7 @@ const (
 	SociatySubTypeSign            = "sign"
 	SociatySubTypeReceive         = "receive"
 	SociatySubTypeActivityReceive = "activityreceive"
+	SociatySubTypeActivityList    = "activitylist"
 	SociatySubTypeRank            = "rank"
 	SociatySubTypeTasklist        = "tasklist"
 	SociatySubTypeLog             = "log"

modules/sociaty/api_cross_accuse.go

@@ -35,7 +35,7 @@ func (this *apiComp) Accuse(session comm.IUserSession, req *pb.SociatyAccuseReq)
 
 	if err := this.module.modelSociaty.accuse(sociaty); err != nil {
 		code = pb.ErrorCode_SociatyAccuse
-		this.module.Errorf("弹劾失败:%v", err)
+		this.module.Errorf("弹劾失败 sociatyId:%s uid:%s err:%v", sociaty.Id, uid, err)
 		return
 	}
 

modules/sociaty/api_cross_activitylist.go

@@ -0,0 +1,47 @@
+package sociaty
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+
+	"google.golang.org/protobuf/proto"
+)
+
+// 活跃度列表
+
+func (this *apiComp) ActivitylistCheck(session comm.IUserSession, req *pb.SociatyActivityListReq) (code pb.ErrorCode) {
+	return
+}
+
+func (this *apiComp) Activitylist(session comm.IUserSession, req *pb.SociatyActivityListReq) (code pb.ErrorCode, data proto.Message) {
+	uid := session.GetUserId()
+	sociaty := this.module.modelSociaty.getUserSociaty(uid)
+	if sociaty.Id == "" {
+		code = pb.ErrorCode_SociatyNoFound
+		this.module.Errorf("uid:%s not in sociaty", uid)
+		return
+	}
+	
+	rsp := &pb.SociatyActivityListResp{}
+
+	defer func() {
+		if err := session.SendMsg(string(this.module.GetType()), SociatySubTypeActivityList, rsp); err != nil {
+			code = pb.ErrorCode_SystemError
+		}
+	}()
+
+	sociatyTask := this.module.modelSociatyTask.taskList(uid, sociaty.Id)
+	if sociatyTask.SociatyId != "" {
+		var activityList []*pb.SociatyActivity
+
+		for _, v := range sociatyTask.ActivityList {
+			activityList = append(activityList, &pb.SociatyActivity{
+				Id:     v.Id,
+				Status: v.Status,
+			})
+		}
+		rsp.List = activityList
+	}
+
+	return
+}

modules/sociaty/api_cross_activityreceive.go

@@ -27,6 +27,18 @@ func (this *apiComp) Activityreceive(session comm.IUserSession, req *pb.SociatyA
 		return
 	}
 
+	// 判断奖励是否已领
+	sociatyTask := this.module.modelSociaty.getUserTaskList(uid, sociaty.Id)
+	for _, v := range sociatyTask.ActivityList {
+		if v.Id == req.Id {
+			if v.Status == 1 {
+				code = pb.ErrorCode_SociatyRewardReceived
+				return
+			}
+			break
+		}
+	}
+
 	ggt, err := this.module.configure.getSociatyActivityCfg()
 	if err != nil || ggt == nil {
 		code = pb.ErrorCode_ConfigNoFound
@@ -45,6 +57,12 @@ func (this *apiComp) Activityreceive(session comm.IUserSession, req *pb.SociatyA
 		return
 	}
 
+	// 活跃度领取
+	if err := this.module.modelSociatyTask.activityReceive(req.Id, sociaty.Id, uid); err != nil {
+		this.module.Errorf("活跃度领取失败:%v", err)
+		return
+	}
+
 	rsp := &pb.SociatyActivityReceiveResp{
 		Id:        req.Id,
 		SociatyId: sociaty.Id,

modules/sociaty/api_cross_apply.go

@@ -36,6 +36,19 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.SociatyApplyReq) (
 		return
 	}
 
+	// userex
+	// userEx, err := this.module.ModuleUser.GetRemoteUserExpand(uid)
+	// if err != nil {
+	// 	this.module.Errorf("GetRemoteUserExpand uid: err:%v", uid, err)
+	// 	code = pb.ErrorCode_UserSessionNobeing
+	// 	return
+	// }
+
+	// if utils.IsInCDHour(userEx.SociatyCd) {
+	// 	code = pb.ErrorCode_SociatyCDLimit
+	// 	return
+	// }
+
 	// 是否达到入会等级
 	user, err := this.module.ModuleUser.GetRemoteUser(uid)
 	if err != nil {

modules/sociaty/api_cross_create.go

@@ -3,6 +3,7 @@ package sociaty
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
+	"go_dreamfactory/utils"
 	"time"
 
 	cfg "go_dreamfactory/sys/configure/structs"
@@ -45,15 +46,15 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.SociatyCreateReq)
 		return
 	}
 
-	//检查是否已加入公会
+	// CD校验
-	if userExpand.SociatyId != "" {
+	if utils.IsInCDHour(userExpand.SociatyCd) {
-		code = pb.ErrorCode_SociatyAdded
+		code = pb.ErrorCode_SociatyCDLimit
 		return
 	}
 
-	// CD校验
+	//检查是否已加入公会
-	if this.module.modelSociaty.isInCDHour(userExpand.SociatyCd){
+	if userExpand.SociatyId != "" {
-		code = pb.ErrorCode_SociatyCDLimit
+		code = pb.ErrorCode_SociatyAdded
 		return
 	}
 

modules/sociaty/api_cross_dismiss.go

@@ -3,6 +3,7 @@ package sociaty
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
+	"go_dreamfactory/utils"
 
 	"google.golang.org/protobuf/proto"
 )
@@ -22,53 +23,41 @@ func (this *apiComp) Dismiss(session comm.IUserSession, req *pb.SociatyDismissRe
 		return
 	}
 
+	rsp := &pb.SociatyDismissResp{
+		Uid:       uid,
+		SociatyId: sociaty.Id,
+	}
+
 	if !this.module.modelSociaty.isRight(uid, sociaty,
 		pb.SociatyJob_PRESIDENT) {
 		code = pb.ErrorCode_SociatyNoRight
 		return
 	}
+	update := map[string]interface{}{}
 	
-	// 邮件接收人
+	if sociaty.DismissTime == 0 {
-	var receiver []string
+		//更新解散倒计时
-	for _, m := range sociaty.Members {
+		update["dismissTime"] = utils.AddHour(24).Unix()
-		receiver = append(receiver, m.Uid)
+	} else {
-		//清除成员任务
+		if req.Dismiss == 1 { //取消解散
-		if err := this.module.modelSociatyTask.deleTask(sociaty.Id, m.Uid); err != nil {
+			update := map[string]interface{}{}
-			this.module.Errorf("删除玩家 uid:%s 公会 sociatyId:%s err:%v", m.Uid, sociaty.Id, err)
+			if utils.IsInCDHour(int64(sociaty.DismissCD)) {
+				code = pb.ErrorCode_SociatyCDLimit
+				return
+			} else {
+				// 设置冷区时间
+				update["dismissCD"] = utils.AddHour(72).Unix()
+			}
+			//取消倒计时
+			update["dismissTime"] = 0
+		}
 	}
 
-		//清除玩家sociatyId
+	if err := this.module.modelSociaty.updateSociaty(sociaty.Id, update); err != nil {
-		update := map[string]interface{}{
-			"sociatyId": "", //公会ID置空
-		}
-		if err := this.module.ModuleUser.ChangeRemoteUserExpand(m.Uid, update); err != nil {
 		code = pb.ErrorCode_DBError
-			this.module.Errorf("更新玩家公会ID err:%v", err)
 		return
 	}
 
-		//清除公会日志
-		if err := this.module.modelSociatyLog.logDelete(sociaty.Id); err != nil {
-			this.module.Errorf("删除公会日志 sociatyId:%s err:%v", sociaty.Id, err)
-		}
-	}
-
-	// 删除公会
-	if err := this.module.modelSociaty.dismiss(sociaty); err != nil {
-		code = pb.ErrorCode_SociatyDismiss
-		this.module.Errorf("sociatyId: %s dismiss err:%v", sociaty.Id, err)
-		return
-	}
-
-	//发送邮件
-	if err := this.module.modelSociaty.sendMail(receiver); err != nil {
-		this.module.Errorf("邮件发送失败 sociatyId: %s err:%v", sociaty.Id, err)
-	}
-
-	rsp := &pb.SociatyDismissResp{
-		Uid:       session.GetUserId(),
-		SociatyId: sociaty.Id,
-	}
 	if err := session.SendMsg(string(this.module.GetType()), SociatySubTypeDismiss, rsp); err != nil {
 		code = pb.ErrorCode_SystemError
 	}

modules/sociaty/api_cross_mine.go

@@ -24,13 +24,19 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.SociatyMineReq) (co
 
 	// 已加入公会
 	if userEx.SociatyId != "" {
-		sociaty := this.module.modelSociaty.getSociaty(userEx.SociatyId)
+		sociaty := this.module.modelSociaty.getUserSociaty(uid)
 		if sociaty.Id == "" {
 			code = pb.ErrorCode_SociatyNoFound
 			this.module.Errorf("sociatyId: %s no found", userEx.SociatyId)
 			return
 		}
 
+		//验证是否解散
+		if this.module.modelSociaty.isDismiss(sociaty) {
+			code = pb.ErrorCode_SociatyDismissed
+			return
+		}
+
 		// 获取会长
 		master := this.module.modelSociaty.getMasterInfo(sociaty)
 		if master != nil {

modules/sociaty/api_cross_quit.go

@@ -3,6 +3,7 @@ package sociaty
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
+	"go_dreamfactory/utils"
 
 	"google.golang.org/protobuf/proto"
 )
@@ -31,6 +32,7 @@ func (this *apiComp) Quit(session comm.IUserSession, req *pb.SociatyQuitReq) (co
 	//更新玩家sociatyId
 	update := map[string]interface{}{
 		"sociatyId": "", //玩家公会ID置空
+		"sociatyCd": utils.AddHour(24).Unix(),
 	}
 
 	if err := this.module.ModuleUser.ChangeRemoteUserExpand(uid, update); err != nil {

modules/sociaty/api_cross_receive.go

@@ -30,7 +30,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.SociatyReceiveRe
 
 	// 判断奖励是否已领
 	sociatyTask := this.module.modelSociaty.getUserTaskList(uid, sociaty.Id)
-	for _, v := range sociatyTask.List {
+	for _, v := range sociatyTask.TaskList {
 		if v.TaskId == req.TaskId {
 			if v.Status == 1 {
 				code = pb.ErrorCode_SociatyRewardReceived

modules/sociaty/api_cross_setting.go

@@ -10,9 +10,6 @@ import (
 // 公会设置
 
 func (this *apiComp) SettingCheck(session comm.IUserSession, req *pb.SociatySettingReq) (code pb.ErrorCode) {
-	if req.SociatyId == "" {
-		code = pb.ErrorCode_ReqParameterError
-	}
 	return
 }
 
@@ -22,10 +19,10 @@ func (this *apiComp) Setting(session comm.IUserSession, req *pb.SociatySettingRe
 	}
 
 	uid := session.GetUserId()
-	sociaty := this.module.modelSociaty.getSociaty(req.SociatyId)
+	sociaty := this.module.modelSociaty.getUserSociaty(uid)
 	if sociaty.Id == "" {
 		code = pb.ErrorCode_SociatyNoFound
-		this.module.Errorf("sociatyId: %s no found", req.SociatyId)
+		this.module.Errorf("uid:%s not in sociaty", uid)
 		return
 	}
 

modules/sociaty/api_cross_tasklist.go

@@ -33,7 +33,7 @@ func (this *apiComp) TaskList(session comm.IUserSession, req *pb.SociatyTaskList
 	if sociatyTask.SociatyId != "" {
 		var taskList []*pb.SociatyTask
 
-		for _, v := range sociatyTask.List {
+		for _, v := range sociatyTask.TaskList {
 			taskList = append(taskList, &pb.SociatyTask{
 				TaskId: v.TaskId,
 				Status: v.Status,

modules/sociaty/model_sociaty.go

@@ -155,15 +155,35 @@ func (this *ModelSociaty) getSociaty(sociatyId string) (sociaty *pb.DBSociaty) {
 	return
 }
 
+// 公会是否解散
+func (this *ModelSociaty) isDismiss(sociaty *pb.DBSociaty) bool {
+	if sociaty.DismissTime == 0 {
+		return false
+	}
+	if utils.IsInCDHour(sociaty.DismissTime) { //
+		return false
+	} else {
+		if err := this.dismiss(sociaty); err != nil {
+			return false
+		}
+		return true
+	}
+}
+
 // 获取玩家所在的公会
 func (this *ModelSociaty) getUserSociaty(uid string) (sociaty *pb.DBSociaty) {
-	sociaty = &pb.DBSociaty{}
 	userEx, err := this.moduleSociaty.ModuleUser.GetRemoteUserExpand(uid)
 	if err != nil {
 		return
 	}
 	if userEx.SociatyId != "" {
-		return this.getSociaty(userEx.SociatyId)
+		sociaty = this.getSociaty(userEx.SociatyId)
+		if sociaty.Id != "" {
+			//验证是否解散
+			if this.isDismiss(sociaty) {
+				sociaty.Id = ""
+			}
+		}
 	}
 	return
 }
@@ -288,6 +308,9 @@ func (this *ModelSociaty) quit(uid string, sociaty *pb.DBSociaty) error {
 
 // 解散公会
 func (this *ModelSociaty) dismiss(sociaty *pb.DBSociaty) error {
+	if err := this.memberClear(sociaty); err != nil {
+		return err
+	}
 	err := this.DelListlds("", sociaty.Id)
 	return err
 }
@@ -758,14 +781,6 @@ func (this *ModelSociaty) rank() (rank []*pb.DBSociatyRank) {
 	return
 }
 
-// CD
-func (this *ModelSociaty) isInCDHour(userCdTime int64) bool {
-	if userCdTime == 0 {
-		return false
-	}
-	return time.Now().Unix() < userCdTime
-}
-
 // 等级更新
 func (this *ModelSociaty) changeLv(sociaty *pb.DBSociaty) error {
 	ggl, err := this.moduleSociaty.configure.getSociatyLvCfg()
@@ -844,3 +859,34 @@ func (this *ModelSociaty) validTask(uid string, taskId int32) (err error, ok boo
 	}
 	return
 }
+
+// 成员退出清理
+func (this *ModelSociaty) memberClear(sociaty *pb.DBSociaty) error {
+	// 邮件接收人
+	var receiver []string
+	for _, m := range sociaty.Members {
+		receiver = append(receiver, m.Uid)
+		//清除成员任务
+		if err := this.moduleSociaty.modelSociatyTask.deleTask(sociaty.Id, m.Uid); err != nil {
+			log.Errorf("删除玩家 uid:%s 公会 sociatyId:%s err:%v", m.Uid, sociaty.Id, err)
+		}
+
+		//清除玩家sociatyId
+		update := map[string]interface{}{
+			"sociatyId": "", //公会ID置空
+		}
+		if err := this.moduleSociaty.ModuleUser.ChangeRemoteUserExpand(m.Uid, update); err != nil {
+			log.Errorf("更新玩家公会ID err:%v", err)
+		}
+
+		//清除公会日志
+		if err := this.moduleSociaty.modelSociatyLog.logDelete(sociaty.Id); err != nil {
+			log.Errorf("删除公会日志 sociatyId:%s err:%v", sociaty.Id, err)
+		}
+	}
+	//发送邮件
+	if err := this.moduleSociaty.modelSociaty.sendMail(receiver); err != nil {
+		log.Errorf("邮件发送失败 sociatyId: %s err:%v", sociaty.Id, err)
+	}
+	return nil
+}

modules/sociaty/model_sociatytask.go

@@ -52,7 +52,7 @@ func (this *ModelSociatyTask) initSociatyTask(uid, sociatyId string) error {
 			})
 		}
 	}
-	sociatyTask.List = taskList
+	sociatyTask.TaskList = taskList
 	return this.moduleSociaty.modelSociatyTask.AddList(sociatyId, uid, sociatyTask)
 }
 
@@ -68,23 +68,34 @@ func (this *ModelSociatyTask) deleTask(sociatyId, uid string) error {
 	return this.DelListlds(sociatyId, uid)
 }
 
-// 奖励领取
+// 任务奖励领取
 func (this *ModelSociatyTask) receive(taskId int32, sociatyId, uid string) error {
 	sociatyTask := &pb.DBSociatyTask{}
 	this.GetListObj(sociatyId, uid, sociatyTask)
-	for _, t := range sociatyTask.List {
+	for _, t := range sociatyTask.TaskList {
 		if t.TaskId == taskId {
 			t.Status = 1 //领取
 			break
 		}
 	}
 	update := map[string]interface{}{
-		"list": sociatyTask.List,
+		"taskList": sociatyTask.TaskList,
 	}
 	return this.ChangeList(sociatyId, uid, update)
 }
 
-// 活跃度领取
+// 活跃度奖励领取
-func (this *ModelSociatyTask) activityReceive() error {
+func (this *ModelSociatyTask) activityReceive(id int32, sociatyId, uid string) error {
-	return nil
+	sociatyTask := &pb.DBSociatyTask{}
+	this.GetListObj(sociatyId, uid, sociatyTask)
+	for _, t := range sociatyTask.ActivityList {
+		if t.Id == id {
+			t.Status = 1 //领取
+			break
+		}
+	}
+	update := map[string]interface{}{
+		"activityList": sociatyTask.ActivityList,
+	}
+	return this.ChangeList(sociatyId, uid, update)
 }

modules/troll/api.go

@@ -13,6 +13,7 @@ const (
 	TrollNpcRewardResp     = "npcreward"
 	GourmetGetRandUserResp = "getranduser"
 	TrollRankListResp      = "ranklist"
+	TrollRecordListResp    = "recordlist"
 )
 
 type apiComp struct {

modules/troll/api_recordlist.go

@@ -0,0 +1,22 @@
+package troll
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+
+	"google.golang.org/protobuf/proto"
+)
+
+func (this *apiComp) RecordListCheck(session comm.IUserSession, req *pb.TrollRecordListReq) (code pb.ErrorCode) {
+	return
+}
+
+func (this *apiComp) RecordList(session comm.IUserSession, req *pb.TrollRecordListReq) (code pb.ErrorCode, data proto.Message) {
+
+	if list, err := this.module.record.GetTrollRecord(session.GetUserId()); err == nil {
+		session.SendMsg(string(this.module.GetType()), TrollRecordListResp, &pb.TrollRecordListResp{
+			Data: list,
+		})
+	}
+	return
+}

modules/troll/model_record.go

@@ -0,0 +1,48 @@
+package troll
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/core"
+	"go_dreamfactory/modules"
+	"go_dreamfactory/pb"
+	"time"
+
+	"go.mongodb.org/mongo-driver/bson/primitive"
+)
+
+type ModelRecord struct {
+	modules.MCompModel
+	module *Troll
+}
+
+func (this *ModelRecord) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+	this.TableName = comm.TableTrollRecord
+	err = this.MCompModel.Init(service, module, comp, options)
+	this.module = module.(*Troll)
+	return
+}
+
+// 获取列表信息
+func (this *ModelRecord) GetTrollRecord(uid string) (result []*pb.DBTrollRecord, err error) {
+	result = make([]*pb.DBTrollRecord, 0)
+	if err = this.GetList(uid, &result); err != nil {
+		return
+	}
+	err = nil
+	return result, err
+}
+
+// 添加收益列表
+func (this *ModelRecord) AddTrollRecord(uid string, gold int32) (err error) {
+	troll := &pb.DBTrollRecord{
+		Id:   primitive.NewObjectID().Hex(),
+		Uid:  uid,
+		Gold: gold,
+		Time: time.Now().Unix(),
+	}
+	if err = this.AddList(uid, troll.Id, troll); err != nil {
+		this.module.Errorf("%v", err)
+		return
+	}
+	return
+}

modules/troll/module.go

@@ -23,6 +23,7 @@ type Troll struct {
 	modelTroll *modelTroll
 	api        *apiComp
 	configure  *configureComp
+	record     *ModelRecord
 }
 
 func NewModule() core.IModule {
@@ -44,6 +45,7 @@ func (this *Troll) OnInstallComp() {
 	this.api = this.RegisterComp(new(apiComp)).(*apiComp)
 	this.modelTroll = this.RegisterComp(new(modelTroll)).(*modelTroll)
 	this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
+	this.record = this.RegisterComp(new(ModelRecord)).(*ModelRecord)
 }
 
 // 接口信息
@@ -89,10 +91,9 @@ func (this *Troll) TrollAI(session comm.IUserSession, troll *pb.DBTrollTrain, ai
 		index := int32(index) % trainNum
 		troll.RefreshTime += int64(sz[index])
 		if now >= troll.RefreshTime {
-			troll.TarinPos++
-			troll.RangeId++
 			troll.RangeId = (troll.RangeId % maxCoefficient) + 1
 			troll.TarinPos = (troll.TarinPos % trainNum) + 1
+
 			coefficient := this.configure.GetTrollCoefficient(troll.RangeId) // 获取当前级别的涨幅数据
 			if coefficient == nil {
 				return
@@ -105,13 +106,19 @@ func (this *Troll) TrollAI(session comm.IUserSession, troll *pb.DBTrollTrain, ai
 				}
 				// 出售之前算成本
 				if len(troll.Items) > 0 {
-					sellGold := this.SellAllItem(troll, sellPrice)
+					sellGold := this.SellAllItem(session.GetUserId(), troll, sellPrice)
+					if sellGold != 0 {
+						if code = this.ModuleUser.AddAttributeValue(session, comm.ResGold, sellGold, true); code != pb.ErrorCode_Success {
+							this.Errorf("玩家 uid:%s 金币不足,获得金币%d", session.GetUserId(), sellGold)
+						} // 一次交易完成做一次结算
+					}
 					totalGold += sellGold
 					// 计算本次出售赚的金币
 					if sellGold-preGold > 0 {
 						troll.TotalEarn += int64(sellGold - preGold)
 					}
 					this.SeTrollRankList(troll.TotalEarn, session.GetUserId()) // 设置排行数据
+
 					troll.AiCount++
 					if troll.AiCount > aiCount { //达到最大交易次数
 						break
@@ -122,7 +129,15 @@ func (this *Troll) TrollAI(session comm.IUserSession, troll *pb.DBTrollTrain, ai
 					sellPrice[v.Id] = v.Goodsprice * coefficient.Coefficient / 1000
 				}
 				troll.Shop = make(map[int32]int32) // 买之前清除购买上限
-				totalGold += this.BuyAllItem(session.GetUserId(), troll, sellPrice)
+				buyGold := this.BuyAllItem(session.GetUserId(), troll, sellPrice)
+				if buyGold != 0 {
+					if code = this.ModuleUser.AddAttributeValue(session, comm.ResGold, buyGold, true); code != pb.ErrorCode_Success {
+						this.Errorf("玩家 uid:%s 金币不足,获得金币%d", session.GetUserId(), buyGold)
+					}
+				}
+
+				totalGold += buyGold
+
 			}
 		} else { // 超过当前时间
 			troll.RefreshTime -= int64(sz[index])
@@ -133,7 +148,7 @@ func (this *Troll) TrollAI(session comm.IUserSession, troll *pb.DBTrollTrain, ai
 			break
 		}
 	}
-	this.ModuleUser.AddAttributeValue(session, comm.ResGold, totalGold, true)
+
 	update["refreshTime"] = troll.RefreshTime
 	update["tarinPos"] = troll.TarinPos
 	update["rangeId"] = troll.RangeId
@@ -149,7 +164,7 @@ func (this *Troll) TrollAI(session comm.IUserSession, troll *pb.DBTrollTrain, ai
 }
 
 // 出售所有货物
-func (this *Troll) SellAllItem(troll *pb.DBTrollTrain, price map[int32]int32) (gold int32) {
+func (this *Troll) SellAllItem(uid string, troll *pb.DBTrollTrain, price map[int32]int32) (gold int32) {
 	for k, v := range troll.Items {
 		if _, ok := price[k]; ok {
 			gold += price[k] * v
@@ -158,6 +173,11 @@ func (this *Troll) SellAllItem(troll *pb.DBTrollTrain, price map[int32]int32) (g
 	}
 	troll.Price = make(map[int32]int32, 0) // 原来的价格也清除
 	troll.GridNum = 0                      // 清空格子
+	// 写统计
+	if gold > 0 {
+		this.record.AddTrollRecord(uid, gold)
+	}
+
 	return
 }
 
@@ -167,6 +187,7 @@ func (this *Troll) BuyAllItem(uid string, troll *pb.DBTrollTrain, price map[int3
 		box         map[int32]int32 // 盒子 存放可购买的物品
 		leftGirdNum int32           // 剩余可购买格子数量
 		costGold    int32
+		buyBox      map[int32]int32 // 盒子 存放可购买的物品
 	)
 
 	maxGirdNum := this.configure.GetTrollRule(comm.TrollGridCount) // 获取背包最大格子数量
@@ -174,6 +195,7 @@ func (this *Troll) BuyAllItem(uid string, troll *pb.DBTrollTrain, price map[int3
 
 	leftGirdNum = maxGirdNum - troll.GridNum
 	box = make(map[int32]int32, 0)
+	buyBox = make(map[int32]int32, 0)
 	goods := this.configure.GetTrollAllGoods()
 	for _, v := range goods {
 		for {
@@ -209,9 +231,15 @@ func (this *Troll) BuyAllItem(uid string, troll *pb.DBTrollTrain, price map[int3
 				costGold += price[k] // 返还之前扣的
 				break
 			}
+			buyBox[k]++
 		}
 	}
-	troll.Items = box
+	if len(buyBox) == 0 {
+		return // 没有可购买的直接返回
+	}
+	for _, v := range goods {
+		troll.Items[v.Id] += buyBox[v.Id]
+	}
 	gold = costGold
 	// 统计格子
 	troll.GridNum = 0
@@ -220,7 +248,10 @@ func (this *Troll) BuyAllItem(uid string, troll *pb.DBTrollTrain, price map[int3
 			troll.GridNum += int32(math.Ceil(float64(v) / float64(maxgoods)))
 		}
 	}
-
+	// 写统计
+	if gold != 0 {
+		this.record.AddTrollRecord(uid, gold)
+	}
 	return
 }
 
@@ -244,7 +275,6 @@ func (this *Troll) SeTrollRankList(gold int64, uid string) {
 		this.Errorln(err)
 		return
 	}
-
 }
 func (this *Troll) QueryRankList() (ranks []string, gold []int64, err error) {
 	var (

pb/sociaty_db.pb.go

@@ -97,6 +97,8 @@ type DBSociaty struct {
 	AccuseTime    int64            `protobuf:"varint,14,opt,name=accuseTime,proto3" json:"accuseTime" bson:"accuseTime"`          //会长弹劾时间
 	LastSignCount int32            `protobuf:"varint,15,opt,name=lastSignCount,proto3" json:"lastSignCount" bson:"lastSignCount"` //昨日签到的人数
 	SignIds       []string         `protobuf:"bytes,16,rep,name=signIds,proto3" json:"signIds" bson:"signIds"`                    // 今日签到的玩家IDs
+	DismissTime   int64            `protobuf:"varint,17,opt,name=dismissTime,proto3" json:"dismissTime" bson:"dismissTime"`       //公会解散时间
+	DismissCD     int64            `protobuf:"varint,18,opt,name=dismissCD,proto3" json:"dismissCD" bson:"dismissCD"`             //解散CD
 }
 
 func (x *DBSociaty) Reset() {
@@ -243,6 +245,20 @@ func (x *DBSociaty) GetSignIds() []string {
 	return nil
 }
 
+func (x *DBSociaty) GetDismissTime() int64 {
+	if x != nil {
+		return x.DismissTime
+	}
+	return 0
+}
+
+func (x *DBSociaty) GetDismissCD() int64 {
+	if x != nil {
+		return x.DismissCD
+	}
+	return 0
+}
+
 //申请记录
 type ApplyRecord struct {
 	state         protoimpl.MessageState
@@ -490,7 +506,8 @@ type DBSociatyTask struct {
 
 	SociatyId    string             `protobuf:"bytes,1,opt,name=sociatyId,proto3" json:"sociatyId"`                           //@go_tags(`bson:"sociatyId") 公会ID
 	Uid          string             `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"`                            //用户ID
-	List      []*SociatyTask `protobuf:"bytes,3,rep,name=list,proto3" json:"list" bson:"list"` //任务列表
+	TaskList     []*SociatyTask     `protobuf:"bytes,3,rep,name=taskList,proto3" json:"taskList" bson:"taskList"`             //任务列表
+	ActivityList []*SociatyActivity `protobuf:"bytes,4,rep,name=activityList,proto3" json:"activityList" bson:"activityList"` //活跃度列表
 }
 
 func (x *DBSociatyTask) Reset() {
@@ -539,13 +556,21 @@ func (x *DBSociatyTask) GetUid() string {
 	return ""
 }
 
-func (x *DBSociatyTask) GetList() []*SociatyTask {
+func (x *DBSociatyTask) GetTaskList() []*SociatyTask {
 	if x != nil {
-		return x.List
+		return x.TaskList
 	}
 	return nil
 }
 
+func (x *DBSociatyTask) GetActivityList() []*SociatyActivity {
+	if x != nil {
+		return x.ActivityList
+	}
+	return nil
+}
+
+// 任务
 type SociatyTask struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -601,6 +626,62 @@ func (x *SociatyTask) GetStatus() int32 {
 	return 0
 }
 
+// 活跃度
+type SociatyActivity struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id     int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id" bson:"id"`             //活跃度ID
+	Status int32 `protobuf:"varint,2,opt,name=status,proto3" json:"status" bson:"status"` //领取状态:0未领取 1已领取
+}
+
+func (x *SociatyActivity) Reset() {
+	*x = SociatyActivity{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_sociaty_sociaty_db_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SociatyActivity) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SociatyActivity) ProtoMessage() {}
+
+func (x *SociatyActivity) ProtoReflect() protoreflect.Message {
+	mi := &file_sociaty_sociaty_db_proto_msgTypes[7]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SociatyActivity.ProtoReflect.Descriptor instead.
+func (*SociatyActivity) Descriptor() ([]byte, []int) {
+	return file_sociaty_sociaty_db_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *SociatyActivity) GetId() int32 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *SociatyActivity) GetStatus() int32 {
+	if x != nil {
+		return x.Status
+	}
+	return 0
+}
+
 //排行榜
 type DBSociatyRank struct {
 	state         protoimpl.MessageState
@@ -617,7 +698,7 @@ type DBSociatyRank struct {
 func (x *DBSociatyRank) Reset() {
 	*x = DBSociatyRank{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_sociaty_sociaty_db_proto_msgTypes[7]
+		mi := &file_sociaty_sociaty_db_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -630,7 +711,7 @@ func (x *DBSociatyRank) String() string {
 func (*DBSociatyRank) ProtoMessage() {}
 
 func (x *DBSociatyRank) ProtoReflect() protoreflect.Message {
-	mi := &file_sociaty_sociaty_db_proto_msgTypes[7]
+	mi := &file_sociaty_sociaty_db_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -643,7 +724,7 @@ func (x *DBSociatyRank) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DBSociatyRank.ProtoReflect.Descriptor instead.
 func (*DBSociatyRank) Descriptor() ([]byte, []int) {
-	return file_sociaty_sociaty_db_proto_rawDescGZIP(), []int{7}
+	return file_sociaty_sociaty_db_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *DBSociatyRank) GetSociatyId() string {
@@ -685,7 +766,7 @@ var File_sociaty_sociaty_db_proto protoreflect.FileDescriptor
 
 var file_sociaty_sociaty_db_proto_rawDesc = []byte{
 	0x0a, 0x18, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x2f, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74,
-	0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc1, 0x03, 0x0a, 0x09, 0x44,
+	0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x81, 0x04, 0x0a, 0x09, 0x44,
 	0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x72, 0x65, 0x61,
 	0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x72, 0x65, 0x61, 0x74,
@@ -713,7 +794,11 @@ var file_sociaty_sociaty_db_proto_rawDesc = []byte{
 	0x0a, 0x0d, 0x6c, 0x61, 0x73, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18,
 	0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6c, 0x61, 0x73, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x43,
 	0x6f, 0x75, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x69, 0x67, 0x6e, 0x49, 0x64, 0x73, 0x18,
-	0x10, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x73, 0x69, 0x67, 0x6e, 0x49, 0x64, 0x73, 0x22, 0x35,
+	0x10, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x73, 0x69, 0x67, 0x6e, 0x49, 0x64, 0x73, 0x12, 0x20,
+	0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x11, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x54, 0x69, 0x6d, 0x65,
+	0x12, 0x1c, 0x0a, 0x09, 0x64, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x43, 0x44, 0x18, 0x12, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x09, 0x64, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x43, 0x44, 0x22, 0x35,
 	0x0a, 0x0b, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a,
 	0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12,
 	0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
@@ -733,32 +818,40 @@ var file_sociaty_sociaty_db_proto_rawDesc = []byte{
 	0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x1f, 0x0a,
 	0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x53, 0x6f,
-	0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x61,
+	0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x9f,
-	0x0a, 0x0d, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x12,
+	0x01, 0x0a, 0x0d, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b,
-	0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20,
-	0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x10, 0x0a,
+	0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x10,
-	0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12,
+	0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
-	0x20, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e,
+	0x12, 0x28, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20, 0x03,
-	0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x6c, 0x69, 0x73,
+	0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b,
-	0x74, 0x22, 0x3d, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b,
+	0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x34, 0x0a, 0x0c, 0x61, 0x63,
-	0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b,
-	0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74,
+	0x32, 0x10, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69,
-	0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73,
+	0x74, 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74,
-	0x22, 0x83, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61,
+	0x22, 0x3d, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x12,
-	0x6e, 0x6b, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18,
+	0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64,
+	0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,
-	0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22,
-	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
+	0x39, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69,
-	0x52, 0x02, 0x6c, 0x76, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79,
+	0x74, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79,
+	0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01,
-	0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x83, 0x01, 0x0a, 0x0d, 0x44,
-	0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x2a, 0x50, 0x0a, 0x0a, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
+	0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x12, 0x1c, 0x0a, 0x09,
-	0x79, 0x4a, 0x6f, 0x62, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x4f, 0x4a, 0x4f, 0x42, 0x10, 0x00, 0x12,
+	0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0a, 0x0a, 0x06, 0x4d, 0x45, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x41,
+	0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
-	0x44, 0x4d, 0x49, 0x4e, 0x10, 0x02, 0x12, 0x11, 0x0a, 0x0d, 0x56, 0x49, 0x43, 0x45, 0x50, 0x52,
+	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e,
-	0x45, 0x53, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x50, 0x52, 0x45,
+	0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x1a,
-	0x53, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
+	0x0a, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x52, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74,
+	0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65,
+	0x2a, 0x50, 0x0a, 0x0a, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4a, 0x6f, 0x62, 0x12, 0x09,
+	0x0a, 0x05, 0x4e, 0x4f, 0x4a, 0x4f, 0x42, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x4d, 0x45, 0x4d,
+	0x42, 0x45, 0x52, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x41, 0x44, 0x4d, 0x49, 0x4e, 0x10, 0x02,
+	0x12, 0x11, 0x0a, 0x0d, 0x56, 0x49, 0x43, 0x45, 0x50, 0x52, 0x45, 0x53, 0x49, 0x44, 0x45, 0x4e,
+	0x54, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x50, 0x52, 0x45, 0x53, 0x49, 0x44, 0x45, 0x4e, 0x54,
+	0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
@@ -774,7 +867,7 @@ func file_sociaty_sociaty_db_proto_rawDescGZIP() []byte {
 }
 
 var file_sociaty_sociaty_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_sociaty_sociaty_db_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
+var file_sociaty_sociaty_db_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
 var file_sociaty_sociaty_db_proto_goTypes = []interface{}{
 	(SociatyJob)(0),         // 0: SociatyJob
 	(*DBSociaty)(nil),       // 1: DBSociaty
@@ -784,19 +877,21 @@ var file_sociaty_sociaty_db_proto_goTypes = []interface{}{
 	(*DBSociatyLog)(nil),    // 5: DBSociatyLog
 	(*DBSociatyTask)(nil),   // 6: DBSociatyTask
 	(*SociatyTask)(nil),     // 7: SociatyTask
-	(*DBSociatyRank)(nil), // 8: DBSociatyRank
+	(*SociatyActivity)(nil), // 8: SociatyActivity
+	(*DBSociatyRank)(nil),   // 9: DBSociatyRank
 }
 var file_sociaty_sociaty_db_proto_depIdxs = []int32{
 	2, // 0: DBSociaty.applyRecord:type_name -> ApplyRecord
 	3, // 1: DBSociaty.members:type_name -> SociatyMember
 	0, // 2: SociatyMember.job:type_name -> SociatyJob
 	4, // 3: DBSociatyLog.list:type_name -> SociatyLog
-	7, // 4: DBSociatyTask.list:type_name -> SociatyTask
+	7, // 4: DBSociatyTask.taskList:type_name -> SociatyTask
-	5, // [5:5] is the sub-list for method output_type
+	8, // 5: DBSociatyTask.activityList:type_name -> SociatyActivity
-	5, // [5:5] is the sub-list for method input_type
+	6, // [6:6] is the sub-list for method output_type
-	5, // [5:5] is the sub-list for extension type_name
+	6, // [6:6] is the sub-list for method input_type
-	5, // [5:5] is the sub-list for extension extendee
+	6, // [6:6] is the sub-list for extension type_name
-	0, // [0:5] is the sub-list for field type_name
+	6, // [6:6] is the sub-list for extension extendee
+	0, // [0:6] is the sub-list for field type_name
 }
 
 func init() { file_sociaty_sociaty_db_proto_init() }
@@ -890,6 +985,18 @@ func file_sociaty_sociaty_db_proto_init() {
 			}
 		}
 		file_sociaty_sociaty_db_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SociatyActivity); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_sociaty_sociaty_db_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DBSociatyRank); i {
 			case 0:
 				return &v.state
@@ -908,7 +1015,7 @@ func file_sociaty_sociaty_db_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_sociaty_sociaty_db_proto_rawDesc,
 			NumEnums:      1,
-			NumMessages:   8,
+			NumMessages:   9,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

pb/sociaty_msg.pb.go

@@ -404,11 +404,10 @@ type SociatySettingReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	SociatyId    string `protobuf:"bytes,1,opt,name=sociatyId,proto3" json:"sociatyId"`        //公会ID
+	Icon         string `protobuf:"bytes,1,opt,name=icon,proto3" json:"icon"`                  //公会图标
-	Icon         string `protobuf:"bytes,2,opt,name=icon,proto3" json:"icon"`                  //公会图标
+	Notice       string `protobuf:"bytes,2,opt,name=notice,proto3" json:"notice"`              //公告
-	Notice       string `protobuf:"bytes,3,opt,name=notice,proto3" json:"notice"`              //公告
+	IsApplyCheck bool   `protobuf:"varint,3,opt,name=isApplyCheck,proto3" json:"isApplyCheck"` //审批
-	IsApplyCheck bool   `protobuf:"varint,4,opt,name=isApplyCheck,proto3" json:"isApplyCheck"` //审批
+	ApplyLv      int32  `protobuf:"varint,4,opt,name=applyLv,proto3" json:"applyLv"`           //限制等级
-	ApplyLv      int32  `protobuf:"varint,5,opt,name=applyLv,proto3" json:"applyLv"`           //限制等级
 }
 
 func (x *SociatySettingReq) Reset() {
@@ -443,13 +442,6 @@ func (*SociatySettingReq) Descriptor() ([]byte, []int) {
 	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{6}
 }
 
-func (x *SociatySettingReq) GetSociatyId() string {
-	if x != nil {
-		return x.SociatyId
-	}
-	return ""
-}
-
 func (x *SociatySettingReq) GetIcon() string {
 	if x != nil {
 		return x.Icon
@@ -1390,6 +1382,8 @@ type SociatyDismissReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
+	Dismiss int32 `protobuf:"varint,1,opt,name=dismiss,proto3" json:"dismiss"` // 1取消解散
 }
 
 func (x *SociatyDismissReq) Reset() {
@@ -1424,6 +1418,13 @@ func (*SociatyDismissReq) Descriptor() ([]byte, []int) {
 	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{25}
 }
 
+func (x *SociatyDismissReq) GetDismiss() int32 {
+	if x != nil {
+		return x.Dismiss
+	}
+	return 0
+}
+
 type SociatyDismissResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2345,6 +2346,92 @@ func (x *SociatyReceiveResp) GetSociatyId() string {
 	return ""
 }
 
+// 活跃度列表
+type SociatyActivityListReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *SociatyActivityListReq) Reset() {
+	*x = SociatyActivityListReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_sociaty_sociaty_msg_proto_msgTypes[45]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SociatyActivityListReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SociatyActivityListReq) ProtoMessage() {}
+
+func (x *SociatyActivityListReq) ProtoReflect() protoreflect.Message {
+	mi := &file_sociaty_sociaty_msg_proto_msgTypes[45]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SociatyActivityListReq.ProtoReflect.Descriptor instead.
+func (*SociatyActivityListReq) Descriptor() ([]byte, []int) {
+	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{45}
+}
+
+type SociatyActivityListResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	List []*SociatyActivity `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
+}
+
+func (x *SociatyActivityListResp) Reset() {
+	*x = SociatyActivityListResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_sociaty_sociaty_msg_proto_msgTypes[46]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SociatyActivityListResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SociatyActivityListResp) ProtoMessage() {}
+
+func (x *SociatyActivityListResp) ProtoReflect() protoreflect.Message {
+	mi := &file_sociaty_sociaty_msg_proto_msgTypes[46]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SociatyActivityListResp.ProtoReflect.Descriptor instead.
+func (*SociatyActivityListResp) Descriptor() ([]byte, []int) {
+	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{46}
+}
+
+func (x *SociatyActivityListResp) GetList() []*SociatyActivity {
+	if x != nil {
+		return x.List
+	}
+	return nil
+}
+
 //活跃度奖励领取
 type SociatyActivityReceiveReq struct {
 	state         protoimpl.MessageState
@@ -2357,7 +2444,7 @@ type SociatyActivityReceiveReq struct {
 func (x *SociatyActivityReceiveReq) Reset() {
 	*x = SociatyActivityReceiveReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_sociaty_sociaty_msg_proto_msgTypes[45]
+		mi := &file_sociaty_sociaty_msg_proto_msgTypes[47]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2370,7 +2457,7 @@ func (x *SociatyActivityReceiveReq) String() string {
 func (*SociatyActivityReceiveReq) ProtoMessage() {}
 
 func (x *SociatyActivityReceiveReq) ProtoReflect() protoreflect.Message {
-	mi := &file_sociaty_sociaty_msg_proto_msgTypes[45]
+	mi := &file_sociaty_sociaty_msg_proto_msgTypes[47]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2383,7 +2470,7 @@ func (x *SociatyActivityReceiveReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SociatyActivityReceiveReq.ProtoReflect.Descriptor instead.
 func (*SociatyActivityReceiveReq) Descriptor() ([]byte, []int) {
-	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{45}
+	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{47}
 }
 
 func (x *SociatyActivityReceiveReq) GetId() int32 {
@@ -2405,7 +2492,7 @@ type SociatyActivityReceiveResp struct {
 func (x *SociatyActivityReceiveResp) Reset() {
 	*x = SociatyActivityReceiveResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_sociaty_sociaty_msg_proto_msgTypes[46]
+		mi := &file_sociaty_sociaty_msg_proto_msgTypes[48]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2418,7 +2505,7 @@ func (x *SociatyActivityReceiveResp) String() string {
 func (*SociatyActivityReceiveResp) ProtoMessage() {}
 
 func (x *SociatyActivityReceiveResp) ProtoReflect() protoreflect.Message {
-	mi := &file_sociaty_sociaty_msg_proto_msgTypes[46]
+	mi := &file_sociaty_sociaty_msg_proto_msgTypes[48]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2431,7 +2518,7 @@ func (x *SociatyActivityReceiveResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SociatyActivityReceiveResp.ProtoReflect.Descriptor instead.
 func (*SociatyActivityReceiveResp) Descriptor() ([]byte, []int) {
-	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{46}
+	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{48}
 }
 
 func (x *SociatyActivityReceiveResp) GetId() int32 {
@@ -2458,7 +2545,7 @@ type SociatyRankReq struct {
 func (x *SociatyRankReq) Reset() {
 	*x = SociatyRankReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_sociaty_sociaty_msg_proto_msgTypes[47]
+		mi := &file_sociaty_sociaty_msg_proto_msgTypes[49]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2471,7 +2558,7 @@ func (x *SociatyRankReq) String() string {
 func (*SociatyRankReq) ProtoMessage() {}
 
 func (x *SociatyRankReq) ProtoReflect() protoreflect.Message {
-	mi := &file_sociaty_sociaty_msg_proto_msgTypes[47]
+	mi := &file_sociaty_sociaty_msg_proto_msgTypes[49]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2484,7 +2571,7 @@ func (x *SociatyRankReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SociatyRankReq.ProtoReflect.Descriptor instead.
 func (*SociatyRankReq) Descriptor() ([]byte, []int) {
-	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{47}
+	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{49}
 }
 
 type SociatyRankResp struct {
@@ -2498,7 +2585,7 @@ type SociatyRankResp struct {
 func (x *SociatyRankResp) Reset() {
 	*x = SociatyRankResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_sociaty_sociaty_msg_proto_msgTypes[48]
+		mi := &file_sociaty_sociaty_msg_proto_msgTypes[50]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2511,7 +2598,7 @@ func (x *SociatyRankResp) String() string {
 func (*SociatyRankResp) ProtoMessage() {}
 
 func (x *SociatyRankResp) ProtoReflect() protoreflect.Message {
-	mi := &file_sociaty_sociaty_msg_proto_msgTypes[48]
+	mi := &file_sociaty_sociaty_msg_proto_msgTypes[50]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2524,7 +2611,7 @@ func (x *SociatyRankResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SociatyRankResp.ProtoReflect.Descriptor instead.
 func (*SociatyRankResp) Descriptor() ([]byte, []int) {
-	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{48}
+	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{50}
 }
 
 func (x *SociatyRankResp) GetRank() []*DBSociatyRank {
@@ -2565,165 +2652,171 @@ var file_sociaty_sociaty_msg_proto_rawDesc = []byte{
 	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x33, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69,
 	0x61, 0x74, 0x79, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a,
 	0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42,
-	0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x9b, 0x01,
+	0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x7d, 0x0a,
-	0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67,
+	0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52,
-	0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64,
+	0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49,
+	0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65,
-	0x64, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x12, 0x22,
-	0x04, 0x69, 0x63, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x18,
+	0x0a, 0x0c, 0x69, 0x73, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x03,
-	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x12, 0x22, 0x0a,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69, 0x73, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x43, 0x68, 0x65,
-	0x0c, 0x69, 0x73, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x04, 0x20,
+	0x63, 0x6b, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x76, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x0c, 0x69, 0x73, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x43, 0x68, 0x65, 0x63,
+	0x01, 0x28, 0x05, 0x52, 0x07, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x76, 0x22, 0x32, 0x0a, 0x12,
-	0x6b, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x76, 0x18, 0x05, 0x20, 0x01,
+	0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65,
-	0x28, 0x05, 0x52, 0x07, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x76, 0x22, 0x32, 0x0a, 0x12, 0x53,
+	0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18,
-	0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22,
-	0x10, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x69, 0x6e, 0x65, 0x52, 0x65,
-	0x71, 0x22, 0x63, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x69, 0x6e, 0x65,
-	0x52, 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, 0x07, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
-	0x79, 0x52, 0x07, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x12, 0x2a, 0x0a, 0x06, 0x6d, 0x61,
-	0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x53, 0x6f, 0x63,
-	0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06,
-	0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x22, 0xa2, 0x01, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61,
-	0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03,
-	0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12,
-	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x1d, 0x0a, 0x03, 0x6a, 0x6f,
-	0x62, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
-	0x79, 0x4a, 0x6f, 0x62, 0x52, 0x03, 0x6a, 0x6f, 0x62, 0x12, 0x20, 0x0a, 0x0b, 0x6f, 0x66, 0x66,
-	0x6c, 0x69, 0x6e, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b,
-	0x6f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x33, 0x0a, 0x13, 0x53,
-	0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52,
-	0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64,
-	0x22, 0x3e, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79,
+	0x22, 0x10, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x69, 0x6e, 0x65, 0x52,
-	0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74,
+	0x65, 0x71, 0x22, 0x63, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x69, 0x6e,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+	0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, 0x07, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
-	0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61,
-	0x22, 0x2f, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79,
+	0x74, 0x79, 0x52, 0x07, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x12, 0x2a, 0x0a, 0x06, 0x6d,
+	0x61, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x53, 0x6f,
+	0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+	0x06, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x22, 0xa2, 0x01, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69,
+	0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a,
+	0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12,
+	0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c,
+	0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x1d, 0x0a, 0x03, 0x6a,
+	0x6f, 0x62, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61,
+	0x74, 0x79, 0x4a, 0x6f, 0x62, 0x52, 0x03, 0x6a, 0x6f, 0x62, 0x12, 0x20, 0x0a, 0x0b, 0x6f, 0x66,
+	0x66, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x0b, 0x6f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x33, 0x0a, 0x13,
+	0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74,
 	0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49,
-	0x64, 0x22, 0x42, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c,
+	0x64, 0x22, 0x3e, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c,
-	0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x04, 0x6c, 0x69, 0x73,
-	0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x63, 0x6f, 0x69, 0x61,
+	0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
-	0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x63, 0x6f, 0x69,
+	0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73,
-	0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x35, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+	0x74, 0x22, 0x2f, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c,
-	0x41, 0x70, 0x70, 0x6c, 0x79, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1c,
+	0x79, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49,
-	0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
-	0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x48, 0x0a, 0x16,
+	0x49, 0x64, 0x22, 0x42, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70,
-	0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x43, 0x61, 0x6e, 0x63,
+	0x6c, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x63, 0x6f, 0x69,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69,
+	0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x63, 0x6f,
-	0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63,
+	0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x35, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
-	0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x23, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
+	0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12,
-	0x79, 0x41, 0x67, 0x72, 0x65, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
+	0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x42, 0x0a, 0x10, 0x53,
+	0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x48, 0x0a,
-	0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x67, 0x72, 0x65, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x43, 0x61, 0x6e,
-	0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
+	0x63, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01,
-	0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22,
+	0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f,
-	0x24, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65,
+	0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x23, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61,
-	0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x74, 0x79, 0x41, 0x67, 0x72, 0x65, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
-	0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x43, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x42, 0x0a, 0x10,
-	0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
+	0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x67, 0x72, 0x65, 0x65, 0x52, 0x65, 0x73, 0x70,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09,
+	0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
-	0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18,
-	0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6f,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64,
-	0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x22, 0x13,
+	0x22, 0x24, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x66, 0x75, 0x73,
-	0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52,
+	0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x65, 0x73, 0x70, 0x22, 0x10, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75,
+	0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x43, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
-	0x69, 0x74, 0x52, 0x65, 0x71, 0x22, 0x41, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+	0x79, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75,
-	0x51, 0x75, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f,
+	0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73,
+	0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x12, 0x0a, 0x10, 0x53,
-	0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x13, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69,
+	0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x22,
-	0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x52, 0x65, 0x71, 0x22, 0x44, 0x0a,
+	0x13, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c,
-	0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x52,
+	0x52, 0x65, 0x73, 0x70, 0x22, 0x10, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51,
-	0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x75, 0x69, 0x74, 0x52, 0x65, 0x71, 0x22, 0x41, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
-	0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+	0x79, 0x51, 0x75, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
-	0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73,
-	0x79, 0x49, 0x64, 0x22, 0x13, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65,
+	0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
-	0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x22, 0x3c, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69,
+	0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x2d, 0x0a, 0x11, 0x53, 0x6f, 0x63,
-	0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26,
+	0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x52, 0x65, 0x71, 0x12, 0x18,
-	0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x53,
+	0x0a, 0x07, 0x64, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f,
+	0x07, 0x64, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x22, 0x44, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69,
-	0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2e, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
+	0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10,
-	0x79, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61,
+	0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
-	0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x61,
+	0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20,
-	0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x22, 0x4d, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
+	0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x13,
-	0x79, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73,
+	0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73,
-	0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+	0x52, 0x65, 0x71, 0x22, 0x3c, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65,
-	0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72,
+	0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x04, 0x6c, 0x69, 0x73,
-	0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x61, 0x72,
+	0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
-	0x67, 0x65, 0x74, 0x49, 0x64, 0x22, 0x31, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+	0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73,
-	0x44, 0x69, 0x73, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08,
+	0x74, 0x22, 0x2e, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x73, 0x73, 0x69,
-	0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x67, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49,
-	0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x22, 0x50, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49,
-	0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70,
+	0x64, 0x22, 0x4d, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x73, 0x73, 0x69,
-	0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20,
+	0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74,
-	0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x1a,
-	0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x22, 0x51, 0x0a, 0x14, 0x53, 0x6f,
-	0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x4a, 0x6f, 0x62, 0x52,
-	0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x12, 0x1d,
-	0x0a, 0x03, 0x6a, 0x6f, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x53, 0x6f,
-	0x63, 0x69, 0x61, 0x74, 0x79, 0x4a, 0x6f, 0x62, 0x52, 0x03, 0x6a, 0x6f, 0x62, 0x22, 0x70, 0x0a,
-	0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x4a,
-	0x6f, 0x62, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74,
 	0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61,
 	0x74, 0x79, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64,
 	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64,
-	0x12, 0x1d, 0x0a, 0x03, 0x6a, 0x6f, 0x62, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e,
+	0x22, 0x31, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x63, 0x68,
-	0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4a, 0x6f, 0x62, 0x52, 0x03, 0x6a, 0x6f, 0x62, 0x22,
+	0x61, 0x72, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65,
-	0x12, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x63, 0x75, 0x73, 0x65,
+	0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65,
-	0x52, 0x65, 0x71, 0x22, 0x31, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63,
+	0x74, 0x49, 0x64, 0x22, 0x50, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69,
-	0x63, 0x75, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69,
+	0x73, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73,
-	0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63,
+	0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+	0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72,
+	0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x61, 0x72,
+	0x67, 0x65, 0x74, 0x49, 0x64, 0x22, 0x51, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+	0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a,
+	0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x03, 0x6a, 0x6f, 0x62,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+	0x4a, 0x6f, 0x62, 0x52, 0x03, 0x6a, 0x6f, 0x62, 0x22, 0x70, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69,
+	0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x73,
+	0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12,
+	0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x03, 0x6a,
+	0x6f, 0x62, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61,
+	0x74, 0x79, 0x4a, 0x6f, 0x62, 0x52, 0x03, 0x6a, 0x6f, 0x62, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6f,
+	0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x63, 0x75, 0x73, 0x65, 0x52, 0x65, 0x71, 0x22, 0x31,
+	0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x63, 0x75, 0x73, 0x65, 0x52,
+	0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49,
+	0x64, 0x22, 0x10, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e,
+	0x52, 0x65, 0x71, 0x22, 0x41, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69,
+	0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69,
+	0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63,
+	0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x0f, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
+	0x79, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x71, 0x22, 0x31, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61,
+	0x74, 0x79, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x03, 0x6c, 0x6f, 0x67,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61,
+	0x74, 0x79, 0x4c, 0x6f, 0x67, 0x52, 0x03, 0x6c, 0x6f, 0x67, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6f,
+	0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71,
+	0x22, 0x37, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4c,
+	0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54,
+	0x61, 0x73, 0x6b, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2b, 0x0a, 0x11, 0x53, 0x6f, 0x63,
+	0x69, 0x61, 0x74, 0x79, 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, 0x4a, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
+	0x79, 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, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49,
+	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+	0x49, 0x64, 0x22, 0x18, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74,
+	0x69, 0x76, 0x69, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x3f, 0x0a, 0x17,
+	0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4c,
+	0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41,
+	0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2b, 0x0a,
+	0x19, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79,
+	0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4a, 0x0a, 0x1a, 0x53, 0x6f,
+	0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63,
+	0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69,
+	0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63,
 	0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x10, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
-	0x79, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x41, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69,
+	0x79, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x22, 0x35, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69,
-	0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75,
+	0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x72,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a,
+	0x61, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x53, 0x6f,
-	0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x2a,
-	0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x0f, 0x0a, 0x0d, 0x53,
+	0x42, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69,
-	0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x71, 0x22, 0x31, 0x0a, 0x0e,
+	0x6c, 0x74, 0x65, 0x72, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x4c, 0x4c, 0x10, 0x00, 0x12, 0x09, 0x0a,
-	0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f,
+	0x05, 0x43, 0x4f, 0x4e, 0x44, 0x49, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x4e, 0x4f, 0x41, 0x50,
-	0x0a, 0x03, 0x6c, 0x6f, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42,
+	0x50, 0x4c, 0x59, 0x10, 0x02, 0x12, 0x0c, 0x0a, 0x08, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x49, 0x4e,
-	0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x52, 0x03, 0x6c, 0x6f, 0x67, 0x22,
+	0x47, 0x10, 0x03, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x14, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69,
+	0x74, 0x6f, 0x33,
-	0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
-	0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04,
-	0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x53, 0x6f, 0x63,
-	0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2b,
-	0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 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, 0x4a, 0x0a, 0x12, 0x53,
-	0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 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, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63,
-	0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f,
-	0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x2b, 0x0a, 0x19, 0x53, 0x6f, 0x63, 0x69, 0x61,
-	0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76,
-	0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x02, 0x69, 0x64, 0x22, 0x4a, 0x0a, 0x1a, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41,
-	0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
-	0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64,
-	0x22, 0x10, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x52,
-	0x65, 0x71, 0x22, 0x35, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e,
-	0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52,
-	0x61, 0x6e, 0x6b, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x2a, 0x42, 0x0a, 0x11, 0x53, 0x6f, 0x63,
-	0x69, 0x61, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x07,
-	0x0a, 0x03, 0x41, 0x4c, 0x4c, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x43, 0x4f, 0x4e, 0x44, 0x49,
-	0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x4e, 0x4f, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x10, 0x02, 0x12,
-	0x0c, 0x0a, 0x08, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x49, 0x4e, 0x47, 0x10, 0x03, 0x42, 0x06, 0x5a,
-	0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2739,7 +2832,7 @@ func file_sociaty_sociaty_msg_proto_rawDescGZIP() []byte {
 }
 
 var file_sociaty_sociaty_msg_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_sociaty_sociaty_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 49)
+var file_sociaty_sociaty_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 51)
 var file_sociaty_sociaty_msg_proto_goTypes = []interface{}{
 	(SociatyListFilter)(0),             // 0: SociatyListFilter
 	(*SociatyCreateReq)(nil),           // 1: SociatyCreateReq
@@ -2787,35 +2880,39 @@ var file_sociaty_sociaty_msg_proto_goTypes = []interface{}{
 	(*SociatyTaskListResp)(nil),        // 43: SociatyTaskListResp
 	(*SociatyReceiveReq)(nil),          // 44: SociatyReceiveReq
 	(*SociatyReceiveResp)(nil),         // 45: SociatyReceiveResp
-	(*SociatyActivityReceiveReq)(nil),  // 46: SociatyActivityReceiveReq
+	(*SociatyActivityListReq)(nil),     // 46: SociatyActivityListReq
-	(*SociatyActivityReceiveResp)(nil), // 47: SociatyActivityReceiveResp
+	(*SociatyActivityListResp)(nil),    // 47: SociatyActivityListResp
-	(*SociatyRankReq)(nil),             // 48: SociatyRankReq
+	(*SociatyActivityReceiveReq)(nil),  // 48: SociatyActivityReceiveReq
-	(*SociatyRankResp)(nil),            // 49: SociatyRankResp
+	(*SociatyActivityReceiveResp)(nil), // 49: SociatyActivityReceiveResp
-	(*DBSociaty)(nil),                  // 50: DBSociaty
+	(*SociatyRankReq)(nil),             // 50: SociatyRankReq
-	(SociatyJob)(0),                    // 51: SociatyJob
+	(*SociatyRankResp)(nil),            // 51: SociatyRankResp
-	(*DBSociatyLog)(nil),               // 52: DBSociatyLog
+	(*DBSociaty)(nil),                  // 52: DBSociaty
-	(*SociatyTask)(nil),                // 53: SociatyTask
+	(SociatyJob)(0),                    // 53: SociatyJob
-	(*DBSociatyRank)(nil),              // 54: DBSociatyRank
+	(*DBSociatyLog)(nil),               // 54: DBSociatyLog
+	(*SociatyTask)(nil),                // 55: SociatyTask
+	(*SociatyActivity)(nil),            // 56: SociatyActivity
+	(*DBSociatyRank)(nil),              // 57: DBSociatyRank
 }
 var file_sociaty_sociaty_msg_proto_depIdxs = []int32{
 	0,  // 0: SociatyListReq.filter:type_name -> SociatyListFilter
-	50, // 1: SociatyListResp.list:type_name -> DBSociaty
+	52, // 1: SociatyListResp.list:type_name -> DBSociaty
-	50, // 2: SociatySearchResp.list:type_name -> DBSociaty
+	52, // 2: SociatySearchResp.list:type_name -> DBSociaty
-	50, // 3: SociatyMineResp.sociaty:type_name -> DBSociaty
+	52, // 3: SociatyMineResp.sociaty:type_name -> DBSociaty
 	11, // 4: SociatyMineResp.master:type_name -> SociatyMemberInfo
-	51, // 5: SociatyMemberInfo.job:type_name -> SociatyJob
+	53, // 5: SociatyMemberInfo.job:type_name -> SociatyJob
 	11, // 6: SociatyApplyListResp.list:type_name -> SociatyMemberInfo
 	11, // 7: SociatyMembersResp.list:type_name -> SociatyMemberInfo
-	51, // 8: SociatySettingJobReq.job:type_name -> SociatyJob
+	53, // 8: SociatySettingJobReq.job:type_name -> SociatyJob
-	51, // 9: SociatySettingJobResp.job:type_name -> SociatyJob
+	53, // 9: SociatySettingJobResp.job:type_name -> SociatyJob
-	52, // 10: SociatyLogResp.log:type_name -> DBSociatyLog
+	54, // 10: SociatyLogResp.log:type_name -> DBSociatyLog
-	53, // 11: SociatyTaskListResp.list:type_name -> SociatyTask
+	55, // 11: SociatyTaskListResp.list:type_name -> SociatyTask
-	54, // 12: SociatyRankResp.rank:type_name -> DBSociatyRank
+	56, // 12: SociatyActivityListResp.list:type_name -> SociatyActivity
-	13, // [13:13] is the sub-list for method output_type
+	57, // 13: SociatyRankResp.rank:type_name -> DBSociatyRank
-	13, // [13:13] is the sub-list for method input_type
+	14, // [14:14] is the sub-list for method output_type
-	13, // [13:13] is the sub-list for extension type_name
+	14, // [14:14] is the sub-list for method input_type
-	13, // [13:13] is the sub-list for extension extendee
+	14, // [14:14] is the sub-list for extension type_name
-	0,  // [0:13] is the sub-list for field type_name
+	14, // [14:14] is the sub-list for extension extendee
+	0,  // [0:14] is the sub-list for field type_name
 }
 
 func init() { file_sociaty_sociaty_msg_proto_init() }
@@ -3366,7 +3463,7 @@ func file_sociaty_sociaty_msg_proto_init() {
 			}
 		}
 		file_sociaty_sociaty_msg_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SociatyActivityReceiveReq); i {
+			switch v := v.(*SociatyActivityListReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3378,7 +3475,7 @@ func file_sociaty_sociaty_msg_proto_init() {
 			}
 		}
 		file_sociaty_sociaty_msg_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SociatyActivityReceiveResp); i {
+			switch v := v.(*SociatyActivityListResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3390,7 +3487,7 @@ func file_sociaty_sociaty_msg_proto_init() {
 			}
 		}
 		file_sociaty_sociaty_msg_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SociatyRankReq); i {
+			switch v := v.(*SociatyActivityReceiveReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3402,6 +3499,30 @@ func file_sociaty_sociaty_msg_proto_init() {
 			}
 		}
 		file_sociaty_sociaty_msg_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SociatyActivityReceiveResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_sociaty_sociaty_msg_proto_msgTypes[49].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SociatyRankReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_sociaty_sociaty_msg_proto_msgTypes[50].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SociatyRankResp); i {
 			case 0:
 				return &v.state
@@ -3420,7 +3541,7 @@ func file_sociaty_sociaty_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_sociaty_sociaty_msg_proto_rawDesc,
 			NumEnums:      1,
-			NumMessages:   49,
+			NumMessages:   51,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

pb/troll_db.pb.go

@@ -220,6 +220,78 @@ func (x *DBTrollTrain) GetResetTime() int64 {
 	return 0
 }
 
+// 收益记录
+type DBTrollRecord struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id   string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`   //ID
+	Uid  string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID
+	Gold int32  `protobuf:"varint,3,opt,name=gold,proto3" json:"gold"`         // 收益
+	Time int64  `protobuf:"varint,4,opt,name=time,proto3" json:"time"`         // 交易时间
+}
+
+func (x *DBTrollRecord) Reset() {
+	*x = DBTrollRecord{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_troll_troll_db_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *DBTrollRecord) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBTrollRecord) ProtoMessage() {}
+
+func (x *DBTrollRecord) ProtoReflect() protoreflect.Message {
+	mi := &file_troll_troll_db_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use DBTrollRecord.ProtoReflect.Descriptor instead.
+func (*DBTrollRecord) Descriptor() ([]byte, []int) {
+	return file_troll_troll_db_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *DBTrollRecord) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+func (x *DBTrollRecord) GetUid() string {
+	if x != nil {
+		return x.Uid
+	}
+	return ""
+}
+
+func (x *DBTrollRecord) GetGold() int32 {
+	if x != nil {
+		return x.Gold
+	}
+	return 0
+}
+
+func (x *DBTrollRecord) GetTime() int64 {
+	if x != nil {
+		return x.Time
+	}
+	return 0
+}
+
 var File_troll_troll_db_proto protoreflect.FileDescriptor
 
 var file_troll_troll_db_proto_rawDesc = []byte{
@@ -283,8 +355,14 @@ var file_troll_troll_db_proto_rawDesc = []byte{
 	0x53, 0x75, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x49, 0x44, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
 	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65,
 	0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x59, 0x0a, 0x0d, 0x44,
-	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x42, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03,
+	0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12,
+	0x0a, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x67, 0x6f,
+	0x6c, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -299,21 +377,22 @@ func file_troll_troll_db_proto_rawDescGZIP() []byte {
 	return file_troll_troll_db_proto_rawDescData
 }
 
-var file_troll_troll_db_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_troll_troll_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
 var file_troll_troll_db_proto_goTypes = []interface{}{
 	(*DBTrollTrain)(nil),  // 0: DBTrollTrain
-	nil,                  // 1: DBTrollTrain.ItemsEntry
+	(*DBTrollRecord)(nil), // 1: DBTrollRecord
-	nil,                  // 2: DBTrollTrain.PriceEntry
+	nil,                   // 2: DBTrollTrain.ItemsEntry
-	nil,                  // 3: DBTrollTrain.NpcRewardEntry
+	nil,                   // 3: DBTrollTrain.PriceEntry
-	nil,                  // 4: DBTrollTrain.ShopEntry
+	nil,                   // 4: DBTrollTrain.NpcRewardEntry
-	nil,                  // 5: DBTrollTrain.SurpriseIDEntry
+	nil,                   // 5: DBTrollTrain.ShopEntry
+	nil,                   // 6: DBTrollTrain.SurpriseIDEntry
 }
 var file_troll_troll_db_proto_depIdxs = []int32{
-	1, // 0: DBTrollTrain.items:type_name -> DBTrollTrain.ItemsEntry
+	2, // 0: DBTrollTrain.items:type_name -> DBTrollTrain.ItemsEntry
-	2, // 1: DBTrollTrain.price:type_name -> DBTrollTrain.PriceEntry
+	3, // 1: DBTrollTrain.price:type_name -> DBTrollTrain.PriceEntry
-	3, // 2: DBTrollTrain.npcReward:type_name -> DBTrollTrain.NpcRewardEntry
+	4, // 2: DBTrollTrain.npcReward:type_name -> DBTrollTrain.NpcRewardEntry
-	4, // 3: DBTrollTrain.shop:type_name -> DBTrollTrain.ShopEntry
+	5, // 3: DBTrollTrain.shop:type_name -> DBTrollTrain.ShopEntry
-	5, // 4: DBTrollTrain.surpriseID:type_name -> DBTrollTrain.SurpriseIDEntry
+	6, // 4: DBTrollTrain.surpriseID:type_name -> DBTrollTrain.SurpriseIDEntry
 	5, // [5:5] is the sub-list for method output_type
 	5, // [5:5] is the sub-list for method input_type
 	5, // [5:5] is the sub-list for extension type_name
@@ -339,6 +418,18 @@ func file_troll_troll_db_proto_init() {
 				return nil
 			}
 		}
+		file_troll_troll_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*DBTrollRecord); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -346,7 +437,7 @@ func file_troll_troll_db_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_troll_troll_db_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   6,
+			NumMessages:   7,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

pb/troll_msg.pb.go

@@ -581,6 +581,92 @@ func (x *TrollRankListResp) GetData() []*RankData {
 	return nil
 }
 
+// 获取收益明细
+type TrollRecordListReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *TrollRecordListReq) Reset() {
+	*x = TrollRecordListReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_troll_troll_msg_proto_msgTypes[11]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TrollRecordListReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TrollRecordListReq) ProtoMessage() {}
+
+func (x *TrollRecordListReq) ProtoReflect() protoreflect.Message {
+	mi := &file_troll_troll_msg_proto_msgTypes[11]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TrollRecordListReq.ProtoReflect.Descriptor instead.
+func (*TrollRecordListReq) Descriptor() ([]byte, []int) {
+	return file_troll_troll_msg_proto_rawDescGZIP(), []int{11}
+}
+
+type TrollRecordListResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Data []*DBTrollRecord `protobuf:"bytes,1,rep,name=data,proto3" json:"data"`
+}
+
+func (x *TrollRecordListResp) Reset() {
+	*x = TrollRecordListResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_troll_troll_msg_proto_msgTypes[12]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TrollRecordListResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TrollRecordListResp) ProtoMessage() {}
+
+func (x *TrollRecordListResp) ProtoReflect() protoreflect.Message {
+	mi := &file_troll_troll_msg_proto_msgTypes[12]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TrollRecordListResp.ProtoReflect.Descriptor instead.
+func (*TrollRecordListResp) Descriptor() ([]byte, []int) {
+	return file_troll_troll_msg_proto_rawDescGZIP(), []int{12}
+}
+
+func (x *TrollRecordListResp) GetData() []*DBTrollRecord {
+	if x != nil {
+		return x.Data
+	}
+	return nil
+}
+
 var File_troll_troll_msg_proto protoreflect.FileDescriptor
 
 var file_troll_troll_msg_proto_rawDesc = []byte{
@@ -631,8 +717,13 @@ var file_troll_troll_msg_proto_rawDesc = []byte{
 	0x69, 0x74, 0x6c, 0x65, 0x22, 0x32, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x52, 0x61, 0x6e,
 	0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74,
 	0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x61, 0x6e, 0x6b, 0x44, 0x61,
-	0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
+	0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x14, 0x0a, 0x12, 0x54, 0x72, 0x6f, 0x6c,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6c, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x39,
+	0x0a, 0x13, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4c, 0x69, 0x73,
+	0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x52, 0x65, 0x63,
+	0x6f, 0x72, 0x64, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
+	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -647,7 +738,7 @@ func file_troll_troll_msg_proto_rawDescGZIP() []byte {
 	return file_troll_troll_msg_proto_rawDescData
 }
 
-var file_troll_troll_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
+var file_troll_troll_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
 var file_troll_troll_msg_proto_goTypes = []interface{}{
 	(*TrollGetListReq)(nil),     // 0: TrollGetListReq
 	(*TrollGetListResp)(nil),    // 1: TrollGetListResp
@@ -660,21 +751,25 @@ var file_troll_troll_msg_proto_goTypes = []interface{}{
 	(*TrollRankListReq)(nil),    // 8: TrollRankListReq
 	(*RankData)(nil),            // 9: RankData
 	(*TrollRankListResp)(nil),   // 10: TrollRankListResp
-	nil,                        // 11: TrollBuyOrSellReq.ItemsEntry
+	(*TrollRecordListReq)(nil),  // 11: TrollRecordListReq
-	(*DBTrollTrain)(nil),       // 12: DBTrollTrain
+	(*TrollRecordListResp)(nil), // 12: TrollRecordListResp
+	nil,                         // 13: TrollBuyOrSellReq.ItemsEntry
+	(*DBTrollTrain)(nil),        // 14: DBTrollTrain
+	(*DBTrollRecord)(nil),       // 15: DBTrollRecord
 }
 var file_troll_troll_msg_proto_depIdxs = []int32{
-	12, // 0: TrollGetListResp.data:type_name -> DBTrollTrain
+	14, // 0: TrollGetListResp.data:type_name -> DBTrollTrain
-	11, // 1: TrollBuyOrSellReq.items:type_name -> TrollBuyOrSellReq.ItemsEntry
+	13, // 1: TrollBuyOrSellReq.items:type_name -> TrollBuyOrSellReq.ItemsEntry
-	12, // 2: TrollBuyOrSellResp.data:type_name -> DBTrollTrain
+	14, // 2: TrollBuyOrSellResp.data:type_name -> DBTrollTrain
-	12, // 3: TrollAfkSetResp.data:type_name -> DBTrollTrain
+	14, // 3: TrollAfkSetResp.data:type_name -> DBTrollTrain
-	12, // 4: TrollNpcRewardResp.data:type_name -> DBTrollTrain
+	14, // 4: TrollNpcRewardResp.data:type_name -> DBTrollTrain
 	9,  // 5: TrollRankListResp.data:type_name -> RankData
-	6,  // [6:6] is the sub-list for method output_type
+	15, // 6: TrollRecordListResp.data:type_name -> DBTrollRecord
-	6,  // [6:6] is the sub-list for method input_type
+	7,  // [7:7] is the sub-list for method output_type
-	6,  // [6:6] is the sub-list for extension type_name
+	7,  // [7:7] is the sub-list for method input_type
-	6,  // [6:6] is the sub-list for extension extendee
+	7,  // [7:7] is the sub-list for extension type_name
-	0,  // [0:6] is the sub-list for field type_name
+	7,  // [7:7] is the sub-list for extension extendee
+	0,  // [0:7] is the sub-list for field type_name
 }
 
 func init() { file_troll_troll_msg_proto_init() }
@@ -816,6 +911,30 @@ func file_troll_troll_msg_proto_init() {
 				return nil
 			}
 		}
+		file_troll_troll_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TrollRecordListReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_troll_troll_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TrollRecordListResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -823,7 +942,7 @@ func file_troll_troll_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_troll_troll_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   12,
+			NumMessages:   14,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

utils/time.go

@@ -67,3 +67,15 @@ func MatrixingHour(beginTime string) (t time.Time) {
 
 	return
 }
+
+func AddHour(hour int) time.Time {
+	return time.Now().Add(time.Duration(hour) * time.Hour)
+}
+
+// CD
+func IsInCDHour(cdTime int64) bool {
+	if cdTime == 0 {
+		return false
+	}
+	return time.Now().Unix() < cdTime
+}