From 82974abfb1a53b9fac5bac364d003c043c0296a8 Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Fri, 31 Mar 2023 10:57:33 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=AB=A0=E8=8A=82=E9=A2=86=E5=A5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_global.json              |  3 +-
 cmd/v2/ui/views/worldtask_mine.go      | 32 ++++++++++--
 modules/worldtask/api_accept.go        |  2 +-
 modules/worldtask/api_chapterreward.go | 58 ++++++++++++++++++++++
 modules/worldtask/api_completetask.go  |  2 +-
 modules/worldtask/api_finish.go        | 15 +++---
 modules/worldtask/configure.go         | 18 +++++++
 modules/worldtask/model_worldtask.go   | 19 ++++---
 pb/errorcode.pb.go                     | 28 +++++++----
 pb/worldtask_db.pb.go                  | 69 ++++++++++++++------------
 10 files changed, 186 insertions(+), 60 deletions(-)
 create mode 100644 modules/worldtask/api_chapterreward.go

diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index 2603442a8..4c6022a25 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -663,6 +663,7 @@
     ],
     "game_make_TunkNum": 5,
     "pandamas_tiguandiaoxiang_cd": 10,
-    "Max_breakingbad_recipe": 15
+    "Max_breakingbad_recipe": 15,
+    "puzzlePromptNum": 5
   }
 ]
\ No newline at end of file
diff --git a/cmd/v2/ui/views/worldtask_mine.go b/cmd/v2/ui/views/worldtask_mine.go
index 2605444a3..86d7774ad 100644
--- a/cmd/v2/ui/views/worldtask_mine.go
+++ b/cmd/v2/ui/views/worldtask_mine.go
@@ -125,7 +125,7 @@ func (this *WorldtaskMineView) CreateView(t *model.TestCase) fyne.CanvasObject {
 			widget.NewFormItem("任务ID", taskIdEntry),
 		)
 
-		dconf := dialog.NewCustom("接取任务", "关闭", form, this.w)
+		dconf := dialog.NewCustom("交付任务", "关闭", form, this.w)
 
 		form.OnSubmit = func() {
 			if err := service.GetPttService().SendToClient(
@@ -156,7 +156,7 @@ func (this *WorldtaskMineView) CreateView(t *model.TestCase) fyne.CanvasObject {
 			widget.NewFormItem("任务ID", taskIdEntry),
 		)
 
-		dconf := dialog.NewCustom("接取任务", "关闭", form, this.w)
+		dconf := dialog.NewCustom("战斗完成", "关闭", form, this.w)
 
 		form.OnSubmit = func() {
 			if err := service.GetPttService().SendToClient(
@@ -176,7 +176,33 @@ func (this *WorldtaskMineView) CreateView(t *model.TestCase) fyne.CanvasObject {
 		dconf.Resize(fyne.NewSize(400, 200))
 		dconf.Show()
 	})
-	barBtn := container.NewHBox(refreshBtn, acceptBtn, completeBtn, this.juqingBtn, battleBtn)
+
+	// 章节奖励
+	chapterBtn := widget.NewButton("章节奖励", func() {
+		groupId := widget.NewEntry()
+		groupId.PlaceHolder = "章节ID"
+		form := widget.NewForm(
+			widget.NewFormItem("章节ID", groupId),
+		)
+		dconf := dialog.NewCustom("章节奖励", "关闭", form, this.w)
+		form.OnSubmit = func() {
+			if err := service.GetPttService().SendToClient(
+				t.MainType,
+				"chapterreward",
+				&pb.WorldtaskChapterawardReq{
+					GroupId: cast.ToInt32(groupId.Text),
+				}); err != nil {
+				logrus.Error(err)
+			}
+			dconf.Hide()
+		}
+		form.SubmitText = "确定"
+
+		dconf.Resize(fyne.NewSize(400, 200))
+		dconf.Show()
+	})
+
+	barBtn := container.NewHBox(refreshBtn, acceptBtn, completeBtn, this.juqingBtn, battleBtn, chapterBtn)
 
 	c := container.NewBorder(barBtn, nil, nil, nil, this.itemList.ItemList)
 	this.mineData()
diff --git a/modules/worldtask/api_accept.go b/modules/worldtask/api_accept.go
index 5832605df..0eec060b2 100644
--- a/modules/worldtask/api_accept.go
+++ b/modules/worldtask/api_accept.go
@@ -63,7 +63,7 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
 		len(curTaskConf.Completetask) == 0) && curTaskConf.DeliverNpc == 0 {
 		//结束任务
 		a.module.modelWorldtask.taskFinish(session, req.GroupId, req.TaskId, myWorldtask, curTaskConf)
-		a.module.modelWorldtask.taskFinishPush(session, myWorldtask, curTaskConf)
+		a.module.modelWorldtask.taskFinishPush(session, req.GroupId, myWorldtask, curTaskConf)
 	}
 	return
 }
diff --git a/modules/worldtask/api_chapterreward.go b/modules/worldtask/api_chapterreward.go
new file mode 100644
index 000000000..4f38fbfac
--- /dev/null
+++ b/modules/worldtask/api_chapterreward.go
@@ -0,0 +1,58 @@
+package worldtask
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/sys/log"
+	"go_dreamfactory/pb"
+
+	"google.golang.org/protobuf/proto"
+)
+
+func (this *apiComp) ChapterrewardCheck(session comm.IUserSession, req *pb.WorldtaskChapterawardReq) (code pb.ErrorCode) {
+	if req.GroupId <= 0 {
+		code = pb.ErrorCode_ReqParameterError
+	}
+	return
+}
+
+func (this *apiComp) Chapterreward(session comm.IUserSession, req *pb.WorldtaskChapterawardReq) (code pb.ErrorCode, data proto.Message) {
+	if code = this.ChapterrewardCheck(session, req); code != pb.ErrorCode_Success {
+		return
+	}
+
+	uid := session.GetUserId()
+	rsp := &pb.WorldtaskChapterawardResp{}
+	myWorldtask, err := this.module.modelWorldtask.getWorldtask(uid)
+	if err != nil {
+		this.module.Error("获取玩家世界任务失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()})
+		code = pb.ErrorCode_DBError
+		return
+	}
+
+	if stats, ok := myWorldtask.Chapters[req.GroupId]; !ok {
+		code = pb.ErrorCode_WorldtaskChapterUnFinished
+		return
+	} else {
+		if stats == 2 {
+			code = pb.ErrorCode_WorldtaskChapterReceived
+			return
+		}
+	}
+
+	gwa, err := this.module.configure.getWorldAllCfg()
+	if err != nil || gwa == nil {
+		code = pb.ErrorCode_ConfigNoFound
+		return
+	}
+
+	rewardCnf := gwa.GetDataMap()[req.GroupId]
+	if rewardCnf == nil {
+		code = pb.ErrorCode_ConfigNoFound
+		return
+	}
+
+	this.module.DispenseRes(session, rewardCnf.Reword, true)
+
+	session.SendMsg(this.service.GetType(), "chapterreward", rsp)
+	return
+}
diff --git a/modules/worldtask/api_completetask.go b/modules/worldtask/api_completetask.go
index af2265b22..a4886cf80 100644
--- a/modules/worldtask/api_completetask.go
+++ b/modules/worldtask/api_completetask.go
@@ -78,7 +78,7 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC
 	if curTaskConf.DeliverNpc == 0 {
 		//结束任务
 		this.module.modelWorldtask.taskFinish(session, req.GroupId, req.TaskId, myWorldtask, curTaskConf)
-		this.module.modelWorldtask.taskFinishPush(session, myWorldtask, curTaskConf)
+		this.module.modelWorldtask.taskFinishPush(session, req.GroupId, myWorldtask, curTaskConf)
 	}
 	return
 }
diff --git a/modules/worldtask/api_finish.go b/modules/worldtask/api_finish.go
index 80388c325..7dd8143c1 100644
--- a/modules/worldtask/api_finish.go
+++ b/modules/worldtask/api_finish.go
@@ -5,7 +5,6 @@ import (
 	"go_dreamfactory/lego/core"
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
-	"go_dreamfactory/utils"
 
 	"google.golang.org/protobuf/proto"
 )
@@ -178,13 +177,17 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
 			}
 		} else {
 			// 章节完成
-			if _, ok := utils.Findx(userTask.Chapters, req.GroupId); !ok {
-				userTask.Chapters = append(userTask.Chapters, req.GroupId)
-				update := map[string]interface{}{
-					"chapters": userTask.Chapters,
+			if _, ok := userTask.Chapters[req.GroupId]; !ok {
+				if userTask.Chapters == nil {
+					userTask.Chapters = make(map[int32]int32)
+					userTask.Chapters[req.GroupId] = 1 //已解锁待领取
+					update := map[string]interface{}{
+						"chapters": userTask.Chapters,
+					}
+					this.module.modelWorldtask.Change(uid, update)
 				}
-				this.module.modelWorldtask.Change(uid, update)
 			}
+
 		}
 	}
 
diff --git a/modules/worldtask/configure.go b/modules/worldtask/configure.go
index 0a2f7dc5c..dd9233fe4 100644
--- a/modules/worldtask/configure.go
+++ b/modules/worldtask/configure.go
@@ -10,6 +10,7 @@ import (
 const (
 	gameWorldTask       = "game_worldtask.json"
 	gameWorldtaskBattle = "game_worldbattle.json"
+	gameWorldAll        = "game_worldall.json"
 )
 
 type configureComp struct {
@@ -21,6 +22,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
 	err = this.LoadMultiConfigure(map[string]interface{}{
 		gameWorldTask:       cfg.NewGameWorldTask,
 		gameWorldtaskBattle: cfg.NewGameWorldBattle,
+		gameWorldAll:        cfg.NewGameWorldAll,
 	})
 	return
 }
@@ -41,6 +43,22 @@ func (this *configureComp) getWorldtaskCfg() (data *cfg.GameWorldTask, err error
 	return
 }
 
+func (this *configureComp) getWorldAllCfg() (data *cfg.GameWorldAll, err error) {
+	var (
+		v  interface{}
+		ok bool
+	)
+	if v, err = this.GetConfigure(gameWorldAll); err != nil {
+		return
+	} else {
+		if data, ok = v.(*cfg.GameWorldAll); !ok {
+			err = fmt.Errorf("%T  is *cfg.GameWorldAll", v)
+			return
+		}
+	}
+	return
+}
+
 func (this *configureComp) getWorldtaskById(taskId int32) (*cfg.GameWorldTaskData, error) {
 	gwt, err := this.getWorldtaskCfg()
 	if err != nil {
diff --git a/modules/worldtask/model_worldtask.go b/modules/worldtask/model_worldtask.go
index 6e2975645..5a33ee321 100644
--- a/modules/worldtask/model_worldtask.go
+++ b/modules/worldtask/model_worldtask.go
@@ -222,7 +222,7 @@ func (this *ModelWorldtask) updateCheckCond(uid string, userTask *pb.DBWorldtask
 	return userTask
 }
 
-func (this *ModelWorldtask) taskFinishPush(session comm.IUserSession, userTask *pb.DBWorldtask, curTaskConf *cfg.GameWorldTaskData) {
+func (this *ModelWorldtask) taskFinishPush(session comm.IUserSession, groupId int32, userTask *pb.DBWorldtask, curTaskConf *cfg.GameWorldTaskData) {
 	nextTaskIds := this.findNextTasks(curTaskConf.Key)
 	this.moduleWorldtask.Debug("nextTaskIds", log.Field{Key: "nextTaskIds", Value: nextTaskIds})
 
@@ -245,13 +245,16 @@ func (this *ModelWorldtask) taskFinishPush(session comm.IUserSession, userTask *
 		})
 	} else {
 		// 章节完成
-		// if _, ok := utils.Findx(userTask.Chapters, req.GroupId); !ok {
-		// 	userTask.Chapters = append(userTask.Chapters, req.GroupId)
-		// 	update := map[string]interface{}{
-		// 		"chapters": userTask.Chapters,
-		// 	}
-		// 	this.module.modelWorldtask.Change(uid, update)
-		// }
+		if _, ok := userTask.Chapters[groupId]; !ok {
+			if userTask.Chapters == nil {
+				userTask.Chapters = make(map[int32]int32)
+				userTask.Chapters[groupId] = 1 //已解锁待领取
+				update := map[string]interface{}{
+					"chapters": userTask.Chapters,
+				}
+				this.Change(session.GetUserId(), update)
+			}
+		}
 	}
 }
 
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index b752f263e..cab15dbb9 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -312,13 +312,15 @@ const (
 	ErrorCode_PayRenewTimeErr    ErrorCode = 3702 // 续费时间没达到要求
 	ErrorCode_PayOrderCompleted  ErrorCode = 3703 // 订单已完成
 	// worldtask
-	ErrorCode_WorldtaskFinish         ErrorCode = 3801 //任务完成失败
-	ErrorCode_WorldtaskLvNotEnough    ErrorCode = 3802 //等级不满足
-	ErrorCode_WorldtaskNoAccept       ErrorCode = 3803 //不能接取
-	ErrorCode_WorldtaskNoComplete     ErrorCode = 3804 //任务条件未完成
-	ErrorCode_WorldtaskFinihed        ErrorCode = 3805 //任务已完成
-	ErrorCode_WorldtaskLastUnFinished ErrorCode = 3806 //上个任务未完成
-	ErrorCode_WorldtaskGroupIdNosame  ErrorCode = 3807 //组ID不一致
+	ErrorCode_WorldtaskFinish            ErrorCode = 3801 //任务完成失败
+	ErrorCode_WorldtaskLvNotEnough       ErrorCode = 3802 //等级不满足
+	ErrorCode_WorldtaskNoAccept          ErrorCode = 3803 //不能接取
+	ErrorCode_WorldtaskNoComplete        ErrorCode = 3804 //任务条件未完成
+	ErrorCode_WorldtaskFinihed           ErrorCode = 3805 //任务已完成
+	ErrorCode_WorldtaskLastUnFinished    ErrorCode = 3806 //上个任务未完成
+	ErrorCode_WorldtaskGroupIdNosame     ErrorCode = 3807 //组ID不一致
+	ErrorCode_WorldtaskChapterUnFinished ErrorCode = 3808 //章节任务未完成
+	ErrorCode_WorldtaskChapterReceived   ErrorCode = 3809 //章节奖励已领取
 	// academy
 	ErrorCode_AcademyTaskNoCompleteTask ErrorCode = 3901 //未完成任务
 	// AutoBattle
@@ -627,6 +629,8 @@ var (
 		3805: "WorldtaskFinihed",
 		3806: "WorldtaskLastUnFinished",
 		3807: "WorldtaskGroupIdNosame",
+		3808: "WorldtaskChapterUnFinished",
+		3809: "WorldtaskChapterReceived",
 		3901: "AcademyTaskNoCompleteTask",
 		4001: "AutoBattleNoData",
 		4002: "AutoBattleStatesErr",
@@ -927,6 +931,8 @@ var (
 		"WorldtaskFinihed":            3805,
 		"WorldtaskLastUnFinished":     3806,
 		"WorldtaskGroupIdNosame":      3807,
+		"WorldtaskChapterUnFinished":  3808,
+		"WorldtaskChapterReceived":    3809,
 		"AcademyTaskNoCompleteTask":   3901,
 		"AutoBattleNoData":            4001,
 		"AutoBattleStatesErr":         4002,
@@ -992,7 +998,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
 
 var file_errorcode_proto_rawDesc = []byte{
 	0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2a, 0x98, 0x36, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+	0x6f, 0x2a, 0xd8, 0x36, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
 	0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10,
 	0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e,
 	0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76,
@@ -1376,7 +1382,11 @@ var file_errorcode_proto_rawDesc = []byte{
 	0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x61, 0x73, 0x74, 0x55, 0x6e,
 	0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xde, 0x1d, 0x12, 0x1b, 0x0a, 0x16, 0x57,
 	0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x4e,
-	0x6f, 0x73, 0x61, 0x6d, 0x65, 0x10, 0xdf, 0x1d, 0x12, 0x1e, 0x0a, 0x19, 0x41, 0x63, 0x61, 0x64,
+	0x6f, 0x73, 0x61, 0x6d, 0x65, 0x10, 0xdf, 0x1d, 0x12, 0x1f, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c,
+	0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x55, 0x6e, 0x46, 0x69,
+	0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xe0, 0x1d, 0x12, 0x1d, 0x0a, 0x18, 0x57, 0x6f, 0x72,
+	0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52, 0x65, 0x63,
+	0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xe1, 0x1d, 0x12, 0x1e, 0x0a, 0x19, 0x41, 0x63, 0x61, 0x64,
 	0x65, 0x6d, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74,
 	0x65, 0x54, 0x61, 0x73, 0x6b, 0x10, 0xbd, 0x1e, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x75, 0x74, 0x6f,
 	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xa1, 0x1f, 0x12,
diff --git a/pb/worldtask_db.pb.go b/pb/worldtask_db.pb.go
index 862b3690c..6971d71ea 100644
--- a/pb/worldtask_db.pb.go
+++ b/pb/worldtask_db.pb.go
@@ -28,7 +28,7 @@ type DBWorldtask struct {
 	Uid         string               `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"`                                                                                                                  //玩家ID
 	TaskList    []int32              `protobuf:"varint,3,rep,packed,name=taskList,proto3" json:"taskList" bson:"taskList"`                                                                                           // 任务列表
 	CurrentTask map[int32]*Worldtask `protobuf:"bytes,4,rep,name=currentTask,proto3" json:"currentTask" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"currentTask"` //正在进行的任务
-	Chapters    []int32              `protobuf:"varint,5,rep,packed,name=chapters,proto3" json:"chapters" bson:"chapters"`                                                                                           //章节ID
+	Chapters    map[int32]int32      `protobuf:"bytes,5,rep,name=chapters,proto3" json:"chapters" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"chapters"`         //key章节ID v状态 1已解锁2已领取
 }
 
 func (x *DBWorldtask) Reset() {
@@ -84,7 +84,7 @@ func (x *DBWorldtask) GetCurrentTask() map[int32]*Worldtask {
 	return nil
 }
 
-func (x *DBWorldtask) GetChapters() []int32 {
+func (x *DBWorldtask) GetChapters() map[int32]int32 {
 	if x != nil {
 		return x.Chapters
 	}
@@ -174,33 +174,38 @@ var File_worldtask_worldtask_db_proto protoreflect.FileDescriptor
 
 var file_worldtask_worldtask_db_proto_rawDesc = []byte{
 	0x0a, 0x1c, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x77, 0x6f, 0x72, 0x6c,
-	0x64, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe4,
-	0x01, 0x0a, 0x0b, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x10,
+	0x64, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xbd,
+	0x02, 0x0a, 0x0b, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x10,
 	0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
 	0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20, 0x03,
 	0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0b,
 	0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x18, 0x04, 0x20, 0x03, 0x28,
 	0x0b, 0x32, 0x1d, 0x2e, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2e,
 	0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x52, 0x0b, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x1a, 0x0a,
-	0x08, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52,
-	0x08, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x1a, 0x4a, 0x0a, 0x10, 0x43, 0x75, 0x72,
-	0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
-	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
-	0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a,
-	0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x99, 0x01, 0x0a, 0x09, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74,
-	0x61, 0x73, 0x6b, 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, 0x1a, 0x0a, 0x08, 0x74,
-	0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74,
-	0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x70, 0x63, 0x53, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6e, 0x70, 0x63, 0x53,
-	0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64,
-	0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64,
-	0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x4e, 0x70, 0x63, 0x18,
-	0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x4e, 0x70,
-	0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x52, 0x0b, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x36, 0x0a,
+	0x08, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x1a, 0x2e, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x43, 0x68,
+	0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x63, 0x68, 0x61,
+	0x70, 0x74, 0x65, 0x72, 0x73, 0x1a, 0x4a, 0x0a, 0x10, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74,
+	0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72,
+	0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
+	0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 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, 0x22, 0x99,
+	0x01, 0x0a, 0x09, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 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, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65,
+	0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x70, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x09, 0x6e, 0x70, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1a,
+	0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05,
+	0x52, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65,
+	0x6c, 0x69, 0x76, 0x65, 0x72, 0x4e, 0x70, 0x63, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
+	0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x4e, 0x70, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
+	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -215,20 +220,22 @@ func file_worldtask_worldtask_db_proto_rawDescGZIP() []byte {
 	return file_worldtask_worldtask_db_proto_rawDescData
 }
 
-var file_worldtask_worldtask_db_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_worldtask_worldtask_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
 var file_worldtask_worldtask_db_proto_goTypes = []interface{}{
 	(*DBWorldtask)(nil), // 0: DBWorldtask
 	(*Worldtask)(nil),   // 1: Worldtask
 	nil,                 // 2: DBWorldtask.CurrentTaskEntry
+	nil,                 // 3: DBWorldtask.ChaptersEntry
 }
 var file_worldtask_worldtask_db_proto_depIdxs = []int32{
 	2, // 0: DBWorldtask.currentTask:type_name -> DBWorldtask.CurrentTaskEntry
-	1, // 1: DBWorldtask.CurrentTaskEntry.value:type_name -> Worldtask
-	2, // [2:2] is the sub-list for method output_type
-	2, // [2:2] is the sub-list for method input_type
-	2, // [2:2] is the sub-list for extension type_name
-	2, // [2:2] is the sub-list for extension extendee
-	0, // [0:2] is the sub-list for field type_name
+	3, // 1: DBWorldtask.chapters:type_name -> DBWorldtask.ChaptersEntry
+	1, // 2: DBWorldtask.CurrentTaskEntry.value:type_name -> Worldtask
+	3, // [3:3] is the sub-list for method output_type
+	3, // [3:3] is the sub-list for method input_type
+	3, // [3:3] is the sub-list for extension type_name
+	3, // [3:3] is the sub-list for extension extendee
+	0, // [0:3] is the sub-list for field type_name
 }
 
 func init() { file_worldtask_worldtask_db_proto_init() }
@@ -268,7 +275,7 @@ func file_worldtask_worldtask_db_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_worldtask_worldtask_db_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   3,
+			NumMessages:   4,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

From dc948f51454c9f9921c2871e05d18648f37eb18c Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Fri, 31 Mar 2023 11:11:25 +0800
Subject: [PATCH 2/4] update

---
 cmd/v2/ui/views/dispatch.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/cmd/v2/ui/views/dispatch.go b/cmd/v2/ui/views/dispatch.go
index b7ec9c3e1..a7860b0df 100644
--- a/cmd/v2/ui/views/dispatch.go
+++ b/cmd/v2/ui/views/dispatch.go
@@ -41,7 +41,7 @@ func (d *DispatchView) CreateView(t *model.TestCase) fyne.CanvasObject {
 
 	//玩家公告
 	d.noticeLabl = new(widget.Label)
-	noticeBtn := widget.NewButton("玩家公告", func() {
+	noticeFun := func() {
 		d.itemList.Reset()
 		if err := service.GetPttService().SendToClient(
 			t.MainType,
@@ -51,7 +51,9 @@ func (d *DispatchView) CreateView(t *model.TestCase) fyne.CanvasObject {
 			logrus.Error(err)
 			return
 		}
-
+	}
+	noticeBtn := widget.NewButton("玩家公告", func() {
+		noticeFun()
 	})
 	//刷新公告
 	refreshBtn := widget.NewButton("刷新公告", func() {
@@ -63,6 +65,7 @@ func (d *DispatchView) CreateView(t *model.TestCase) fyne.CanvasObject {
 			logrus.Error(err)
 			return
 		}
+		noticeFun()
 	})
 
 	//领取奖励

From 0d141e7f0b5db38f822d8903875084072c2beaa5 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Fri, 31 Mar 2023 11:26:55 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=AD=A6=E9=A6=86?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/arena/modelarena.go        |   2 +-
 modules/comp_model.go              |   7 +-
 modules/practice/api_friendromm.go |  27 +--
 modules/practice/modelPandata.go   |  40 +++
 modules/practice/module.go         |   4 +
 pb/practice_msg.pb.go              | 374 +++++++++++++++--------------
 sys/db/dbmodel.go                  |  58 ++++-
 7 files changed, 304 insertions(+), 208 deletions(-)

diff --git a/modules/arena/modelarena.go b/modules/arena/modelarena.go
index 6a0327c0f..0d7da5fbf 100644
--- a/modules/arena/modelarena.go
+++ b/modules/arena/modelarena.go
@@ -60,7 +60,7 @@ func (this *modelArena) queryPlayerInfo(uId string) (result *pb.DBArenaUser, err
 //查询用户装备数据
 func (this *modelArena) queryPlayers(uIds []string) (result []*pb.DBArenaUser, err error) {
 	result = make([]*pb.DBArenaUser, 0)
-	if err = this.Gets(uIds, &result); err != nil && err != mgo.MongodbNil {
+	if _, err = this.Gets(uIds, &result); err != nil && err != mgo.MongodbNil {
 		this.module.Errorln(err)
 		return
 	}
diff --git a/modules/comp_model.go b/modules/comp_model.go
index ef50507b0..8affeb03d 100644
--- a/modules/comp_model.go
+++ b/modules/comp_model.go
@@ -73,6 +73,11 @@ func (this *MCompModel) Add(uid string, data interface{}, opt ...db.DBOption) (e
 	return this.DBModel.Add(uid, data)
 }
 
+//添加新的数据
+func (this *MCompModel) Adds(datas map[string]interface{}, opt ...db.DBOption) (err error) {
+	return this.DBModel.Adds(datas)
+}
+
 //添加新的数据到列表
 func (this *MCompModel) AddList(uid string, id string, data interface{}, opt ...db.DBOption) (err error) {
 	return this.DBModel.AddList(uid, id, data, opt...)
@@ -104,7 +109,7 @@ func (this *MCompModel) Get(id string, data interface{}, opt ...db.DBOption) (er
 }
 
 //读取多个数据对象
-func (this *MCompModel) Gets(ids []string, data interface{}, opt ...db.DBOption) (err error) {
+func (this *MCompModel) Gets(ids []string, data interface{}, opt ...db.DBOption) (onfound []string, err error) {
 	return this.DBModel.Gets(ids, data, opt...)
 }
 
diff --git a/modules/practice/api_friendromm.go b/modules/practice/api_friendromm.go
index daad32967..61f9452f3 100644
--- a/modules/practice/api_friendromm.go
+++ b/modules/practice/api_friendromm.go
@@ -17,30 +17,17 @@ func (this *apiComp) FriendRommCheck(session comm.IUserSession, req *pb.Practice
 func (this *apiComp) FriendRomm(session comm.IUserSession, req *pb.PracticeFriendRommReq) (code pb.ErrorCode, data proto.Message) {
 	var (
 		err   error
-		room  *pb.DBPracticeRoom
-		maxlv int32
+		rooms []*pb.DBPracticeRoom
+		Infos map[string]*pb.DBPracticeRoom
 	)
-	if room, err = this.module.modelPandata.queryUserMartialhall(req.Fuid); err != nil {
+	if rooms, err = this.module.modelPandata.queryrooms(req.Fuid); err != nil {
 		code = pb.ErrorCode_DBError
 		return
 	}
-	if room.Pillar1.Isunlock == 2 {
-		maxlv = room.Pillar1.Lv
+	Infos = make(map[string]*pb.DBPracticeRoom)
+	for _, v := range rooms {
+		Infos[v.Uid] = v
 	}
-	if room.Pillar2.Isunlock == 2 && maxlv < room.Pillar2.Lv {
-		maxlv = room.Pillar2.Lv
-	}
-	if room.Pillar3.Isunlock == 2 && maxlv < room.Pillar3.Lv {
-		maxlv = room.Pillar3.Lv
-	}
-
-	if maxlv > 0 && (room.Pillarf.Isunlock != 2 || room.Pillarf.Lv < maxlv) {
-		room.Pillarf.Isunlock = 2
-		room.Pillarf.Lv = maxlv
-		this.module.modelPandata.Change(req.Fuid, map[string]interface{}{
-			"pillarf": room.Pillarf,
-		})
-	}
-	session.SendMsg(string(this.module.GetType()), "friendromm", &pb.PracticeFriendRommResp{Info: room})
+	session.SendMsg(string(this.module.GetType()), "friendromm", &pb.PracticeFriendRommResp{Infos: Infos})
 	return
 }
diff --git a/modules/practice/modelPandata.go b/modules/practice/modelPandata.go
index 71166eff6..6f8259a7c 100644
--- a/modules/practice/modelPandata.go
+++ b/modules/practice/modelPandata.go
@@ -65,6 +65,46 @@ func (this *modelPandata) queryUserMartialhall(uid string) (result *pb.DBPractic
 	return
 }
 
+func (this *modelPandata) queryrooms(uids []string) (results []*pb.DBPracticeRoom, err error) {
+	results = make([]*pb.DBPracticeRoom, 0)
+	var (
+		onfound []string
+		newdata map[string]interface{} = make(map[string]interface{})
+	)
+	if onfound, err = this.Gets(uids, &results); err != nil {
+		this.module.Errorln(err)
+		return
+	}
+	if len(onfound) > 0 {
+		for _, v := range onfound {
+			temp := &pb.DBPracticeRoom{
+				Id:         primitive.NewObjectID().Hex(),
+				Uid:        v,
+				Full:       make(map[int32]int32),
+				Knapsack:   make(map[string]int32),
+				Gymaction:  0,
+				Gymrefresh: 0,
+				Pillar1:    &pb.DBPracticePillar{Index: 1, Isunlock: 2, Lv: 1},
+				Pillar2:    &pb.DBPracticePillar{Index: 2, Lv: 1},
+				Pillar3:    &pb.DBPracticePillar{Index: 3, Lv: 1},
+				Pillarf:    &pb.DBPracticePillar{Index: 4, Isunlock: 2, Lv: 1},
+				Statuers:   make([]*pb.DBPracticeStatuer, 0),
+			}
+			if err = this.refreshnpc(temp); err != nil {
+				this.module.Errorln(err)
+				continue
+			}
+			go this.module.atlas.CheckActivatePandaAtlasCollect(v, "100001")
+			newdata[v] = temp
+		}
+		if err = this.Adds(newdata); err != nil {
+			this.module.Errorln(err)
+			return
+		}
+	}
+	return
+}
+
 //刷新npc
 func (this *modelPandata) refreshnpc(room *pb.DBPracticeRoom) (err error) {
 	var (
diff --git a/modules/practice/module.go b/modules/practice/module.go
index 1d0dc5fb7..f02f316c4 100644
--- a/modules/practice/module.go
+++ b/modules/practice/module.go
@@ -138,6 +138,10 @@ func (this *Practice) AddItems(session comm.IUserSession, items map[string]int32
 				id = append(id, k)
 				this.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), k)
 			}
+			if err = this.modelPandata.refreshnpc(room); err != nil {
+				this.Errorln(err)
+				return
+			}
 			if err = model.Add(session.GetUserId(), room); err != nil {
 				this.Errorln(err)
 				return
diff --git a/pb/practice_msg.pb.go b/pb/practice_msg.pb.go
index 67668de4e..009c9a1ee 100644
--- a/pb/practice_msg.pb.go
+++ b/pb/practice_msg.pb.go
@@ -113,7 +113,7 @@ type PracticeFriendRommReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Fuid string `protobuf:"bytes,1,opt,name=fuid,proto3" json:"fuid"`
+	Fuid []string `protobuf:"bytes,1,rep,name=fuid,proto3" json:"fuid"`
 }
 
 func (x *PracticeFriendRommReq) Reset() {
@@ -148,11 +148,11 @@ func (*PracticeFriendRommReq) Descriptor() ([]byte, []int) {
 	return file_practice_practice_msg_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *PracticeFriendRommReq) GetFuid() string {
+func (x *PracticeFriendRommReq) GetFuid() []string {
 	if x != nil {
 		return x.Fuid
 	}
-	return ""
+	return nil
 }
 
 ///请求好友武馆房间信息 回应
@@ -161,7 +161,7 @@ type PracticeFriendRommResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Info *DBPracticeRoom `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
+	Infos map[string]*DBPracticeRoom `protobuf:"bytes,1,rep,name=infos,proto3" json:"infos" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
 func (x *PracticeFriendRommResp) Reset() {
@@ -196,9 +196,9 @@ func (*PracticeFriendRommResp) Descriptor() ([]byte, []int) {
 	return file_practice_practice_msg_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *PracticeFriendRommResp) GetInfo() *DBPracticeRoom {
+func (x *PracticeFriendRommResp) GetInfos() map[string]*DBPracticeRoom {
 	if x != nil {
-		return x.Info
+		return x.Infos
 	}
 	return nil
 }
@@ -2036,159 +2036,165 @@ var file_practice_practice_msg_proto_rawDesc = []byte{
 	0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22,
 	0x2b, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e,
 	0x64, 0x52, 0x6f, 0x6d, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x75, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, 0x75, 0x69, 0x64, 0x22, 0x3d, 0x0a, 0x16,
-	0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x6f,
-	0x6d, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63,
-	0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x29, 0x0a, 0x11, 0x50,
-	0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71,
-	0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x39, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69,
-	0x63, 0x65, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04,
-	0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x50,
-	0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x04, 0x69, 0x6e, 0x66,
-	0x6f, 0x22, 0x2a, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x55, 0x70, 0x67,
-	0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x3b, 0x0a,
-	0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65,
-	0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x6d, 0x0a, 0x13, 0x50, 0x72,
-	0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x66, 0x75, 0x69, 0x64, 0x22, 0x9d, 0x01, 0x0a,
+	0x16, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52,
+	0x6f, 0x6d, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x38, 0x0a, 0x05, 0x69, 0x6e, 0x66, 0x6f, 0x73,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63,
+	0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x6f, 0x6d, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x2e,
+	0x49, 0x6e, 0x66, 0x6f, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x6e, 0x66, 0x6f,
+	0x73, 0x1a, 0x49, 0x0a, 0x0a, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
+	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
+	0x79, 0x12, 0x25, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x0f, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f,
+	0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x29, 0x0a, 0x11,
+	0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65,
 	0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x74,
-	0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x65,
-	0x61, 0x63, 0x68, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x22, 0x41, 0x0a, 0x14, 0x50, 0x72, 0x61,
-	0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x29, 0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69,
-	0x6c, 0x6c, 0x61, 0x72, 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x22, 0x6b, 0x0a, 0x0f,
-	0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4c, 0x6f, 0x6f, 0x74, 0x52, 0x65, 0x71, 0x12,
-	0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x74,
-	0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x65,
-	0x61, 0x63, 0x68, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x22, 0x55, 0x0a, 0x10, 0x50, 0x72, 0x61,
-	0x63, 0x74, 0x69, 0x63, 0x65, 0x4c, 0x6f, 0x6f, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a,
-	0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66,
-	0x72, 0x69, 0x65, 0x6e, 0x64, 0x12, 0x29, 0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69,
-	0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72,
-	0x22, 0x16, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x78, 0x70, 0x75,
-	0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x22, 0xc1, 0x01, 0x0a, 0x15, 0x50, 0x72, 0x61,
-	0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x78, 0x70, 0x75, 0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65,
+	0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x39, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74,
+	0x69, 0x63, 0x65, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a,
+	0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42,
+	0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x04, 0x69, 0x6e,
+	0x66, 0x6f, 0x22, 0x2a, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x55, 0x70,
+	0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65,
+	0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x3b,
+	0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64,
+	0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x0e, 0x0a, 0x02, 0x6c,
+	0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x6d, 0x0a, 0x13, 0x50,
+	0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52,
+	0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x18, 0x0a, 0x07,
+	0x74, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74,
+	0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x22, 0x41, 0x0a, 0x14, 0x50, 0x72,
+	0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65,
 	0x73, 0x70, 0x12, 0x29, 0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50,
-	0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x12, 0x40, 0x0a,
-	0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x24, 0x2e, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x78, 0x70, 0x75, 0x6c, 0x73,
-	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x1a,
-	0x3b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 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, 0x22, 0x42, 0x0a, 0x12,
-	0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52,
-	0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65,
-	0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
-	0x22, 0xbd, 0x01, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x63,
-	0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x29, 0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c,
-	0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61,
-	0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x06, 0x70, 0x69, 0x6c,
-	0x6c, 0x61, 0x72, 0x12, 0x3e, 0x0a, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65,
-	0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x4b, 0x6e, 0x61, 0x70,
-	0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73,
-	0x61, 0x63, 0x6b, 0x1a, 0x3b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 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,
-	0x22, 0x3f, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x72, 0x6f,
-	0x6c, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x12, 0x0a,
-	0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x72,
-	0x6f, 0x22, 0x40, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x72,
-	0x6f, 0x6c, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f,
-	0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12,
-	0x12, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x68,
-	0x65, 0x72, 0x6f, 0x22, 0x24, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4a,
-	0x58, 0x49, 0x74, 0x65, 0x6d, 0x50, 0x75, 0x73, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x50, 0x72, 0x61,
-	0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22,
-	0x55, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x49, 0x6e,
-	0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x61, 0x73, 0x74, 0x61, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6c, 0x61, 0x73, 0x74,
-	0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73,
-	0x68, 0x6e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x65, 0x66, 0x72,
-	0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x22, 0x17, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69,
-	0x63, 0x65, 0x47, 0x79, 0x6d, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x52, 0x65, 0x71, 0x22,
-	0x58, 0x0a, 0x16, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x52, 0x65,
-	0x66, 0x72, 0x65, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x61, 0x73,
-	0x74, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6c,
-	0x61, 0x73, 0x74, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x66,
-	0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72,
-	0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x22, 0x31, 0x0a, 0x15, 0x50, 0x72, 0x61,
-	0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x65, 0x74, 0x47, 0x79, 0x6d, 0x42, 0x75, 0x66, 0x66, 0x52,
-	0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x6f, 0x73, 0x74, 0x75, 0x72, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x07, 0x70, 0x6f, 0x73, 0x74, 0x75, 0x72, 0x65, 0x22, 0x30, 0x0a, 0x16,
-	0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x65, 0x74, 0x47, 0x79, 0x6d, 0x42, 0x75,
-	0x66, 0x66, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69, 0x64, 0x22, 0x2f,
-	0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x72, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69,
+	0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x22, 0x6b, 0x0a,
+	0x0f, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4c, 0x6f, 0x6f, 0x74, 0x52, 0x65, 0x71,
+	0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x18, 0x0a, 0x07,
+	0x74, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74,
+	0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x22, 0x55, 0x0a, 0x10, 0x50, 0x72,
+	0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4c, 0x6f, 0x6f, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16,
+	0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+	0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x12, 0x29, 0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74,
+	0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61,
+	0x72, 0x22, 0x16, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x78, 0x70,
+	0x75, 0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x22, 0xc1, 0x01, 0x0a, 0x15, 0x50, 0x72,
+	0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x78, 0x70, 0x75, 0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x52,
+	0x65, 0x73, 0x70, 0x12, 0x29, 0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65,
+	0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x12, 0x40,
+	0x0a, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x24, 0x2e, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x78, 0x70, 0x75, 0x6c,
+	0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63,
+	0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b,
+	0x1a, 0x3b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72,
+	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 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, 0x22, 0x42, 0x0a,
+	0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65,
+	0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69,
+	0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e,
+	0x64, 0x22, 0xbd, 0x01, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65,
+	0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x29, 0x0a, 0x06, 0x70, 0x69, 0x6c,
+	0x6c, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72,
+	0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x06, 0x70, 0x69,
+	0x6c, 0x6c, 0x61, 0x72, 0x12, 0x3e, 0x0a, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b,
+	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63,
+	0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x4b, 0x6e, 0x61,
+	0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61, 0x70,
+	0x73, 0x61, 0x63, 0x6b, 0x1a, 0x3b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 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, 0x22, 0x3f, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x72,
+	0x6f, 0x6c, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75,
+	0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x12,
+	0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65,
+	0x72, 0x6f, 0x22, 0x40, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x6e,
+	0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72,
+	0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70,
+	0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04,
+	0x68, 0x65, 0x72, 0x6f, 0x22, 0x24, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65,
+	0x4a, 0x58, 0x49, 0x74, 0x65, 0x6d, 0x50, 0x75, 0x73, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x50, 0x72,
+	0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71,
+	0x22, 0x55, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x49,
+	0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x61, 0x73, 0x74, 0x61,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6c, 0x61, 0x73,
+	0x74, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x66, 0x72, 0x65,
+	0x73, 0x68, 0x6e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x65, 0x66,
+	0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x22, 0x17, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74,
+	0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x52, 0x65, 0x71,
+	0x22, 0x58, 0x0a, 0x16, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x52,
+	0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x61,
+	0x73, 0x74, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
+	0x6c, 0x61, 0x73, 0x74, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65,
+	0x66, 0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
+	0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x22, 0x31, 0x0a, 0x15, 0x50, 0x72,
+	0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x65, 0x74, 0x47, 0x79, 0x6d, 0x42, 0x75, 0x66, 0x66,
+	0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x6f, 0x73, 0x74, 0x75, 0x72, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x70, 0x6f, 0x73, 0x74, 0x75, 0x72, 0x65, 0x22, 0x30, 0x0a,
+	0x16, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x65, 0x74, 0x47, 0x79, 0x6d, 0x42,
+	0x75, 0x66, 0x66, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69,
 	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69, 0x64, 0x22,
-	0x30, 0x0a, 0x16, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x72, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66,
-	0x66, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69,
-	0x64, 0x22, 0x25, 0x0a, 0x11, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65,
-	0x63, 0x75, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x66, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x66, 0x69, 0x64, 0x22, 0x26, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63,
-	0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10,
-	0x0a, 0x03, 0x66, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x66, 0x69, 0x64,
-	0x22, 0x25, 0x0a, 0x11, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x41, 0x63, 0x63, 0x65,
-	0x70, 0x74, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x2c, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74,
-	0x69, 0x63, 0x65, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a,
-	0x06, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69,
-	0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0x25, 0x0a, 0x11, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63,
-	0x65, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x2c, 0x0a, 0x12,
-	0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0x4c, 0x0a, 0x18, 0x50, 0x72,
-	0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x6e, 0x6f, 0x74, 0x69,
-	0x66, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x6e, 0x6f, 0x74, 0x69,
-	0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6e, 0x6f,
-	0x74, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x22, 0x47, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63,
-	0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x52, 0x65,
-	0x71, 0x12, 0x2e, 0x0a, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72,
-	0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x22, 0x59, 0x0a, 0x16, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43,
-	0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63,
-	0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f,
-	0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1f, 0x0a, 0x04, 0x69,
-	0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74,
-	0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x44, 0x0a, 0x1b,
-	0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74, 0x6b,
-	0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x25, 0x0a, 0x06, 0x72,
-	0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61,
-	0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f,
-	0x72, 0x74, 0x22, 0x36, 0x0a, 0x1c, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50,
-	0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x16, 0x0a, 0x14, 0x50, 0x72,
-	0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x52,
-	0x65, 0x71, 0x22, 0x2f, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50,
-	0x43, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69,
-	0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73,
-	0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x2f, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x72, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69, 0x64,
+	0x22, 0x30, 0x0a, 0x16, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75,
+	0x66, 0x66, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66,
+	0x69, 0x64, 0x22, 0x25, 0x0a, 0x11, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69,
+	0x65, 0x63, 0x75, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x66, 0x69, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x66, 0x69, 0x64, 0x22, 0x26, 0x0a, 0x12, 0x50, 0x72, 0x61,
+	0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x10, 0x0a, 0x03, 0x66, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x66, 0x69,
+	0x64, 0x22, 0x25, 0x0a, 0x11, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x41, 0x63, 0x63,
+	0x65, 0x70, 0x74, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x2c, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63,
+	0x74, 0x69, 0x63, 0x65, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16,
+	0x0a, 0x06, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
+	0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0x25, 0x0a, 0x11, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69,
+	0x63, 0x65, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x2c, 0x0a,
+	0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52,
+	0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0x4c, 0x0a, 0x18, 0x50,
+	0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x6e, 0x6f, 0x74,
+	0x69, 0x66, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x6e, 0x6f, 0x74,
+	0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6e,
+	0x6f, 0x74, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x22, 0x47, 0x0a, 0x15, 0x50, 0x72, 0x61,
+	0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x52,
+	0x65, 0x71, 0x12, 0x2e, 0x0a, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f,
+	0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x22, 0x59, 0x0a, 0x16, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50,
+	0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04,
+	0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72,
+	0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1f, 0x0a, 0x04,
+	0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74,
+	0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x44, 0x0a,
+	0x1b, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74,
+	0x6b, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x25, 0x0a, 0x06,
+	0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42,
+	0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70,
+	0x6f, 0x72, 0x74, 0x22, 0x36, 0x0a, 0x1c, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e,
+	0x50, 0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52,
+	0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x16, 0x0a, 0x14, 0x50,
+	0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67,
+	0x52, 0x65, 0x71, 0x22, 0x2f, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e,
+	0x50, 0x43, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06,
+	0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73,
+	0x73, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2203,7 +2209,7 @@ func file_practice_practice_msg_proto_rawDescGZIP() []byte {
 	return file_practice_practice_msg_proto_rawDescData
 }
 
-var file_practice_practice_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 42)
+var file_practice_practice_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 43)
 var file_practice_practice_msg_proto_goTypes = []interface{}{
 	(*PracticeInfoReq)(nil),              // 0: PracticeInfoReq
 	(*PracticeInfoResp)(nil),             // 1: PracticeInfoResp
@@ -2245,34 +2251,36 @@ var file_practice_practice_msg_proto_goTypes = []interface{}{
 	(*PracticeNPCBattkleFinishResp)(nil), // 37: PracticeNPCBattkleFinishResp
 	(*PracticeNPCDialogReq)(nil),         // 38: PracticeNPCDialogReq
 	(*PracticeNPCDialogResp)(nil),        // 39: PracticeNPCDialogResp
-	nil,                                  // 40: PracticeExpulsionResp.KnapsackEntry
-	nil,                                  // 41: PracticeReceiveResp.KnapsackEntry
-	(*DBPracticeRoom)(nil),               // 42: DBPracticeRoom
-	(*DBPracticePillar)(nil),             // 43: DBPracticePillar
-	(*BattleFormation)(nil),              // 44: BattleFormation
-	(ErrorCode)(0),                       // 45: ErrorCode
-	(*BattleInfo)(nil),                   // 46: BattleInfo
-	(*BattleReport)(nil),                 // 47: BattleReport
+	nil,                                  // 40: PracticeFriendRommResp.InfosEntry
+	nil,                                  // 41: PracticeExpulsionResp.KnapsackEntry
+	nil,                                  // 42: PracticeReceiveResp.KnapsackEntry
+	(*DBPracticeRoom)(nil),               // 43: DBPracticeRoom
+	(*DBPracticePillar)(nil),             // 44: DBPracticePillar
+	(*BattleFormation)(nil),              // 45: BattleFormation
+	(ErrorCode)(0),                       // 46: ErrorCode
+	(*BattleInfo)(nil),                   // 47: BattleInfo
+	(*BattleReport)(nil),                 // 48: BattleReport
 }
 var file_practice_practice_msg_proto_depIdxs = []int32{
-	42, // 0: PracticeInfoResp.info:type_name -> DBPracticeRoom
-	42, // 1: PracticeFriendRommResp.info:type_name -> DBPracticeRoom
-	42, // 2: PracticeUnLockResp.info:type_name -> DBPracticeRoom
-	43, // 3: PracticePracticeResp.pillar:type_name -> DBPracticePillar
-	43, // 4: PracticeLootResp.pillar:type_name -> DBPracticePillar
-	43, // 5: PracticeExpulsionResp.pillar:type_name -> DBPracticePillar
-	40, // 6: PracticeExpulsionResp.knapsack:type_name -> PracticeExpulsionResp.KnapsackEntry
-	43, // 7: PracticeReceiveResp.pillar:type_name -> DBPracticePillar
-	41, // 8: PracticeReceiveResp.knapsack:type_name -> PracticeReceiveResp.KnapsackEntry
-	44, // 9: PracticeNPCBattkleReq.formation:type_name -> BattleFormation
-	45, // 10: PracticeNPCBattkleResp.code:type_name -> ErrorCode
-	46, // 11: PracticeNPCBattkleResp.info:type_name -> BattleInfo
-	47, // 12: PracticeNPCBattkleFinishReq.report:type_name -> BattleReport
-	13, // [13:13] is the sub-list for method output_type
-	13, // [13:13] is the sub-list for method input_type
-	13, // [13:13] is the sub-list for extension type_name
-	13, // [13:13] is the sub-list for extension extendee
-	0,  // [0:13] is the sub-list for field type_name
+	43, // 0: PracticeInfoResp.info:type_name -> DBPracticeRoom
+	40, // 1: PracticeFriendRommResp.infos:type_name -> PracticeFriendRommResp.InfosEntry
+	43, // 2: PracticeUnLockResp.info:type_name -> DBPracticeRoom
+	44, // 3: PracticePracticeResp.pillar:type_name -> DBPracticePillar
+	44, // 4: PracticeLootResp.pillar:type_name -> DBPracticePillar
+	44, // 5: PracticeExpulsionResp.pillar:type_name -> DBPracticePillar
+	41, // 6: PracticeExpulsionResp.knapsack:type_name -> PracticeExpulsionResp.KnapsackEntry
+	44, // 7: PracticeReceiveResp.pillar:type_name -> DBPracticePillar
+	42, // 8: PracticeReceiveResp.knapsack:type_name -> PracticeReceiveResp.KnapsackEntry
+	45, // 9: PracticeNPCBattkleReq.formation:type_name -> BattleFormation
+	46, // 10: PracticeNPCBattkleResp.code:type_name -> ErrorCode
+	47, // 11: PracticeNPCBattkleResp.info:type_name -> BattleInfo
+	48, // 12: PracticeNPCBattkleFinishReq.report:type_name -> BattleReport
+	43, // 13: PracticeFriendRommResp.InfosEntry.value:type_name -> DBPracticeRoom
+	14, // [14:14] is the sub-list for method output_type
+	14, // [14:14] is the sub-list for method input_type
+	14, // [14:14] is the sub-list for extension 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_practice_practice_msg_proto_init() }
@@ -2771,7 +2779,7 @@ func file_practice_practice_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_practice_practice_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   42,
+			NumMessages:   43,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/sys/db/dbmodel.go b/sys/db/dbmodel.go
index 8d76c449c..12ee46779 100644
--- a/sys/db/dbmodel.go
+++ b/sys/db/dbmodel.go
@@ -86,6 +86,29 @@ func (this *DBModel) InsertModelLogs(table string, uID string, target interface{
 
 	return err
 }
+
+func (this *DBModel) InsertManyModelLogs(table string, datas map[string]interface{}) (err error) {
+	var (
+		data []interface{}
+	)
+	for k, v := range datas {
+		temp := &comm.Autogenerated{
+			ID:  primitive.NewObjectID().Hex(),
+			UID: k,
+			Act: string(comm.LogHandleType_Insert),
+		}
+		temp.D = append(temp.D, table)            // D[0]
+		temp.D = append(temp.D, []interface{}{v}) // D[1]
+		data = append(data, temp)
+	}
+
+	_, err = this.DB.InsertMany(DB_ModelTable, data)
+	if err != nil {
+		log.Errorf("insert model db err %v", err)
+	}
+	return err
+}
+
 func (this *DBModel) DeleteModelLogs(table string, uID string, where interface{}) (err error) {
 
 	data := &comm.Autogenerated{
@@ -147,6 +170,28 @@ func (this *DBModel) Add(uid string, data interface{}, opt ...DBOption) (err err
 	return
 }
 
+//添加新的数据
+func (this *DBModel) Adds(data map[string]interface{}, opt ...DBOption) (err error) {
+	//defer log.Debug("DBModel Add", log.Field{Key: "TableName", Value: this.TableName}, log.Field{Key: "uid", Value: uid}, log.Field{Key: "data", Value: data})
+	pipe := this.Redis.RedisPipe(context.TODO())
+	for k, v := range data {
+		pipe.HMSet(this.ukey(k), v)
+	}
+	if _, err = pipe.Exec(); err != nil {
+		return
+	}
+	option := newDBOption(opt...)
+	if option.IsMgoLog {
+		err = this.InsertManyModelLogs(this.TableName, data)
+	}
+	if this.Expired > 0 {
+		for k, _ := range data {
+			this.conn.UpDateModelExpired(this.ukey(k), nil, this.Expired)
+		}
+	}
+	return
+}
+
 //添加新的数据到列表
 func (this *DBModel) AddList(uid string, id string, data interface{}, opt ...DBOption) (err error) {
 	//defer log.Debug("DBModel AddList", log.Field{Key: "TableName", Value: this.TableName}, log.Field{Key: "uid", Value: uid}, log.Field{Key: "_id", Value: id}, log.Field{Key: "data", Value: data})
@@ -312,7 +357,7 @@ func (this *DBModel) Get(uid string, data interface{}, opt ...DBOption) (err err
 }
 
 //读取多个数据对象
-func (this *DBModel) Gets(ids []string, data interface{}, opt ...DBOption) (err error) {
+func (this *DBModel) Gets(ids []string, data interface{}, opt ...DBOption) (onfound []string, err error) {
 	//defer log.Debug("DBModel GetListObjs", log.Field{Key: "TableName", Value: this.TableName}, log.Field{Key: "uid", Value: uid}, log.Field{Key: "ids", Value: ids}, log.Field{Key: "data", Value: data})
 	defer func() { //程序异常 收集异常信息传递给前端显示
 		if r := recover(); r != nil {
@@ -336,11 +381,11 @@ func (this *DBModel) Gets(ids []string, data interface{}, opt ...DBOption) (err
 		ok            bool
 		keys          map[string]string = make(map[string]string)
 		tempdata      map[string]string
-		onfound       []string                    = make([]string, 0, len(ids))
 		pipe          *pipe.RedisPipe             = this.Redis.RedisPipe(context.TODO())
 		result        []*redis.StringStringMapCmd = make([]*redis.StringStringMapCmd, len(ids))
 		c             *mongo.Cursor
 	)
+	onfound = make([]string, 0, len(ids))
 	dptr = reflect2.PtrOf(data)
 	dtype = reflect2.TypeOf(data)
 	dkind = dtype.Kind()
@@ -393,7 +438,7 @@ func (this *DBModel) Gets(ids []string, data interface{}, opt ...DBOption) (err
 
 	if len(onfound) > 0 {
 		if c, err = this.DB.Find(core.SqlTable(this.TableName), bson.M{"_id": bson.M{"$in": onfound}}); err != nil {
-			return err
+			return
 		} else {
 			if encoder, ok = codec.EncoderOf(sliceelemType, defconf).(codecore.IEncoderMapJson); !ok {
 				err = fmt.Errorf("MCompModel: GetList(data not support UnMarshalMapJson %T)", data)
@@ -419,6 +464,13 @@ func (this *DBModel) Gets(ids []string, data interface{}, opt ...DBOption) (err
 				pipe.HMSetForMap(key, tempdata)
 				keys[_id] = key
 				n++
+				for i, v := range onfound {
+					if v == _id {
+						onfound = append(onfound[:i], onfound[i+1:]...)
+						break
+					}
+				}
+
 			}
 			if len(keys) > 0 {
 				_, err = pipe.Exec()

From b0b71005de5f6292ec924ea1ad7bc64afc0dd5c5 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Fri, 31 Mar 2023 11:27:13 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_global.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index 2603442a8..4c6022a25 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -663,6 +663,7 @@
     ],
     "game_make_TunkNum": 5,
     "pandamas_tiguandiaoxiang_cd": 10,
-    "Max_breakingbad_recipe": 15
+    "Max_breakingbad_recipe": 15,
+    "puzzlePromptNum": 5
   }
 ]
\ No newline at end of file