From 8ea317462581ce9649841172f54fc2e16d72de53 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 24 Oct 2023 10:23:44 +0800
Subject: [PATCH 1/3] update

---
 modules/entertainment/xxlPlat.go | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/modules/entertainment/xxlPlat.go b/modules/entertainment/xxlPlat.go
index e69d5bc1a..a8d7ea681 100644
--- a/modules/entertainment/xxlPlat.go
+++ b/modules/entertainment/xxlPlat.go
@@ -86,8 +86,8 @@ func (this *MapData) SwapGirde(oldId, newId int32) (bSwap bool) {
 func (this *MapData) SetMap() {
 	sz2 := []int32{
 		5, 1, 2, 5, 1, 5, 2,
-		3, 1, 5, 4, 2, 4, 4,
-		4, 4, 2, 1, 6, 4, 1,
+		5, 1, 5, 4, 2, 4, 4,
+		4, 5, 5, 1, 6, 4, 1,
 		6, 3, 1, 4, 3, 6, 3,
 		6, 1, 3, 5, 1, 6, 1,
 		5, 6, 5, 5, 1, 3, 1,
@@ -468,10 +468,12 @@ func (this *MapData) CheckMap(color int32) (score int32, szMap []*pb.MapData, co
 
 		score += curScore // 总分
 		this.DropGirde()
-		szMap = append(szMap, &pb.MapData{
-			Data:     this.Plat,
-			CurSocre: curScore,
-		})
+		if curScore > 0 {
+			szMap = append(szMap, &pb.MapData{
+				Data:     this.Plat,
+				CurSocre: curScore,
+			})
+		}
 		// 检查掉落
 		this.operElem = []int32{} // 初始化操作元素
 		if curScore == 0 {
@@ -523,8 +525,9 @@ func (this *MapData) AiSwapGirde() (bSwap bool, szMap []*pb.MapData, oid1 int32,
 				if s, m, _ := this.CheckMap(2); s == 0 {
 					this.SwapGirde(int32(pos+1), int32(pos))
 					this.operElem = []int32{}
+					oid1 = 0
+					oid2 = 0
 				} else {
-
 					szMap = append(szMap, m...)
 					bSwap = true
 					break
@@ -538,6 +541,8 @@ func (this *MapData) AiSwapGirde() (bSwap bool, szMap []*pb.MapData, oid1 int32,
 				if s, m, _ := this.CheckMap(2); s == 0 {
 					this.SwapGirde(int32(pos+Width), int32(pos))
 					this.operElem = []int32{}
+					oid1 = 0
+					oid2 = 0
 				} else {
 					szMap = append(szMap, m...)
 					bSwap = true

From 6cfbac78eba7e2e969c1ddd8d1d490c13e487101 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 24 Oct 2023 10:28:39 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/entertainment/xxlPlat.go |  52 +--
 pb/parkour_msg.pb.go             | 729 ++++++++++++++++++-------------
 pb/user_db.pb.go                 | 109 +++--
 pb/user_msg.pb.go                | 401 +++++++++--------
 4 files changed, 725 insertions(+), 566 deletions(-)

diff --git a/modules/entertainment/xxlPlat.go b/modules/entertainment/xxlPlat.go
index a8d7ea681..9f1af29bc 100644
--- a/modules/entertainment/xxlPlat.go
+++ b/modules/entertainment/xxlPlat.go
@@ -256,20 +256,17 @@ func (this *MapData) Check4X(color int32) (bEliminate bool, score int32, count i
 				}
 				this.oid++
 				// 生成一个新的类型元素
-				if this.module != nil {
-					if conf, err := this.module.configure.GetGameBlock(k1, FourUType); err != nil { // 上下类型
-						this.Plat[newElem] = &pb.GirdeData{
-							Oid:     this.oid,
-							Color:   k1,
-							Cid:     conf.Key,
-							Score:   conf.Score,
-							Special: conf.Type,
-						}
-						if k1 == color {
-							count++
-						}
-					} else {
-						xiaochu = append(xiaochu, newElem)
+
+				if conf, err := this.module.configure.GetGameBlock(k1, FourUType); err != nil { // 上下类型
+					this.Plat[newElem] = &pb.GirdeData{
+						Oid:     this.oid,
+						Color:   k1,
+						Cid:     conf.Key,
+						Score:   conf.Score,
+						Special: conf.Type,
+					}
+					if k1 == color {
+						count++
 					}
 				} else {
 					xiaochu = append(xiaochu, newElem)
@@ -305,21 +302,18 @@ func (this *MapData) Check4X(color int32) (bEliminate bool, score int32, count i
 				}
 
 				this.oid++
-				if this.module != nil {
-					// 生成一个新的类型元素
-					if conf, err := this.module.configure.GetGameBlock(k1, FourLType); err != nil { // 左右类型
-						this.Plat[newElem] = &pb.GirdeData{
-							Oid:     this.oid,
-							Color:   k1,
-							Cid:     conf.Key,
-							Score:   conf.Score,
-							Special: conf.Type,
-						}
-						if k1 == color {
-							count++
-						}
-					} else {
-						xiaochu = append(xiaochu, k+Width)
+
+				// 生成一个新的类型元素
+				if conf, err := this.module.configure.GetGameBlock(k1, FourLType); err != nil { // 左右类型
+					this.Plat[newElem] = &pb.GirdeData{
+						Oid:     this.oid,
+						Color:   k1,
+						Cid:     conf.Key,
+						Score:   conf.Score,
+						Special: conf.Type,
+					}
+					if k1 == color {
+						count++
 					}
 				} else {
 					xiaochu = append(xiaochu, k+Width)
diff --git a/pb/parkour_msg.pb.go b/pb/parkour_msg.pb.go
index bb3186eac..b7380c1ac 100644
--- a/pb/parkour_msg.pb.go
+++ b/pb/parkour_msg.pb.go
@@ -393,14 +393,102 @@ func (*ParkourRaceMatchCancelResp) Descriptor() ([]byte, []int) {
 	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{7}
 }
 
-//匹配开始推送
-// message ParkourRaceMatchStartPush {
-//     DBParkour team = 1;
-// }
-//匹配取消推送
-// message ParkourRaceMatchCancelPush {
-//     DBParkour team = 1;
-// }
+//匹配成功
+type ParkourRaceMatchStartPush struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Team *DBParkour `protobuf:"bytes,1,opt,name=team,proto3" json:"team"`
+}
+
+func (x *ParkourRaceMatchStartPush) Reset() {
+	*x = ParkourRaceMatchStartPush{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_parkour_parkour_msg_proto_msgTypes[8]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ParkourRaceMatchStartPush) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ParkourRaceMatchStartPush) ProtoMessage() {}
+
+func (x *ParkourRaceMatchStartPush) ProtoReflect() protoreflect.Message {
+	mi := &file_parkour_parkour_msg_proto_msgTypes[8]
+	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 ParkourRaceMatchStartPush.ProtoReflect.Descriptor instead.
+func (*ParkourRaceMatchStartPush) Descriptor() ([]byte, []int) {
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{8}
+}
+
+func (x *ParkourRaceMatchStartPush) GetTeam() *DBParkour {
+	if x != nil {
+		return x.Team
+	}
+	return nil
+}
+
+//匹配取消通知
+type ParkourRaceMatchCancelPush struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Team *DBParkour `protobuf:"bytes,1,opt,name=team,proto3" json:"team"`
+}
+
+func (x *ParkourRaceMatchCancelPush) Reset() {
+	*x = ParkourRaceMatchCancelPush{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_parkour_parkour_msg_proto_msgTypes[9]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ParkourRaceMatchCancelPush) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ParkourRaceMatchCancelPush) ProtoMessage() {}
+
+func (x *ParkourRaceMatchCancelPush) ProtoReflect() protoreflect.Message {
+	mi := &file_parkour_parkour_msg_proto_msgTypes[9]
+	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 ParkourRaceMatchCancelPush.ProtoReflect.Descriptor instead.
+func (*ParkourRaceMatchCancelPush) Descriptor() ([]byte, []int) {
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{9}
+}
+
+func (x *ParkourRaceMatchCancelPush) GetTeam() *DBParkour {
+	if x != nil {
+		return x.Team
+	}
+	return nil
+}
+
 //匹配成功
 type ParkourRaceMatchSuccPush struct {
 	state         protoimpl.MessageState
@@ -413,7 +501,7 @@ type ParkourRaceMatchSuccPush struct {
 func (x *ParkourRaceMatchSuccPush) Reset() {
 	*x = ParkourRaceMatchSuccPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[8]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -426,7 +514,7 @@ func (x *ParkourRaceMatchSuccPush) String() string {
 func (*ParkourRaceMatchSuccPush) ProtoMessage() {}
 
 func (x *ParkourRaceMatchSuccPush) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[8]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -439,7 +527,7 @@ func (x *ParkourRaceMatchSuccPush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ParkourRaceMatchSuccPush.ProtoReflect.Descriptor instead.
 func (*ParkourRaceMatchSuccPush) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{8}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *ParkourRaceMatchSuccPush) GetRace() *DBRace {
@@ -461,7 +549,7 @@ type ParkourReadyReq struct {
 func (x *ParkourReadyReq) Reset() {
 	*x = ParkourReadyReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[9]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -474,7 +562,7 @@ func (x *ParkourReadyReq) String() string {
 func (*ParkourReadyReq) ProtoMessage() {}
 
 func (x *ParkourReadyReq) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[9]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -487,7 +575,7 @@ func (x *ParkourReadyReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ParkourReadyReq.ProtoReflect.Descriptor instead.
 func (*ParkourReadyReq) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{9}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *ParkourReadyReq) GetBattleid() string {
@@ -507,7 +595,7 @@ type ParkourReadyResp struct {
 func (x *ParkourReadyResp) Reset() {
 	*x = ParkourReadyResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[10]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -520,7 +608,7 @@ func (x *ParkourReadyResp) String() string {
 func (*ParkourReadyResp) ProtoMessage() {}
 
 func (x *ParkourReadyResp) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[10]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -533,7 +621,7 @@ func (x *ParkourReadyResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ParkourReadyResp.ProtoReflect.Descriptor instead.
 func (*ParkourReadyResp) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{10}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{12}
 }
 
 //竞速开始推送
@@ -548,7 +636,7 @@ type ParkourRaceStartPush struct {
 func (x *ParkourRaceStartPush) Reset() {
 	*x = ParkourRaceStartPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[11]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -561,7 +649,7 @@ func (x *ParkourRaceStartPush) String() string {
 func (*ParkourRaceStartPush) ProtoMessage() {}
 
 func (x *ParkourRaceStartPush) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[11]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -574,7 +662,7 @@ func (x *ParkourRaceStartPush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ParkourRaceStartPush.ProtoReflect.Descriptor instead.
 func (*ParkourRaceStartPush) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{11}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *ParkourRaceStartPush) GetCountdown() int32 {
@@ -597,7 +685,7 @@ type ParkourQTEReq struct {
 func (x *ParkourQTEReq) Reset() {
 	*x = ParkourQTEReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[12]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -610,7 +698,7 @@ func (x *ParkourQTEReq) String() string {
 func (*ParkourQTEReq) ProtoMessage() {}
 
 func (x *ParkourQTEReq) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[12]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -623,7 +711,7 @@ func (x *ParkourQTEReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ParkourQTEReq.ProtoReflect.Descriptor instead.
 func (*ParkourQTEReq) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{12}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{14}
 }
 
 func (x *ParkourQTEReq) GetBattleid() string {
@@ -650,7 +738,7 @@ type ParkourQTEResp struct {
 func (x *ParkourQTEResp) Reset() {
 	*x = ParkourQTEResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[13]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -663,7 +751,7 @@ func (x *ParkourQTEResp) String() string {
 func (*ParkourQTEResp) ProtoMessage() {}
 
 func (x *ParkourQTEResp) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[13]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -676,7 +764,7 @@ func (x *ParkourQTEResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ParkourQTEResp.ProtoReflect.Descriptor instead.
 func (*ParkourQTEResp) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{13}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{15}
 }
 
 //qte 操作推送
@@ -694,7 +782,7 @@ type ParkourQTEOperatePush struct {
 func (x *ParkourQTEOperatePush) Reset() {
 	*x = ParkourQTEOperatePush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[14]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[16]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -707,7 +795,7 @@ func (x *ParkourQTEOperatePush) String() string {
 func (*ParkourQTEOperatePush) ProtoMessage() {}
 
 func (x *ParkourQTEOperatePush) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[14]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[16]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -720,7 +808,7 @@ func (x *ParkourQTEOperatePush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ParkourQTEOperatePush.ProtoReflect.Descriptor instead.
 func (*ParkourQTEOperatePush) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{14}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{16}
 }
 
 func (x *ParkourQTEOperatePush) GetUid() string {
@@ -764,7 +852,7 @@ type ParkourShotReq struct {
 func (x *ParkourShotReq) Reset() {
 	*x = ParkourShotReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[15]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[17]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -777,7 +865,7 @@ func (x *ParkourShotReq) String() string {
 func (*ParkourShotReq) ProtoMessage() {}
 
 func (x *ParkourShotReq) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[15]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[17]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -790,7 +878,7 @@ func (x *ParkourShotReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ParkourShotReq.ProtoReflect.Descriptor instead.
 func (*ParkourShotReq) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{15}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{17}
 }
 
 func (x *ParkourShotReq) GetBattleid() string {
@@ -817,7 +905,7 @@ type ParkourShotResp struct {
 func (x *ParkourShotResp) Reset() {
 	*x = ParkourShotResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[16]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[18]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -830,7 +918,7 @@ func (x *ParkourShotResp) String() string {
 func (*ParkourShotResp) ProtoMessage() {}
 
 func (x *ParkourShotResp) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[16]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[18]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -843,7 +931,7 @@ func (x *ParkourShotResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ParkourShotResp.ProtoReflect.Descriptor instead.
 func (*ParkourShotResp) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{16}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{18}
 }
 
 //射门 操作推送
@@ -861,7 +949,7 @@ type ParkourShotOperatePush struct {
 func (x *ParkourShotOperatePush) Reset() {
 	*x = ParkourShotOperatePush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[17]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[19]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -874,7 +962,7 @@ func (x *ParkourShotOperatePush) String() string {
 func (*ParkourShotOperatePush) ProtoMessage() {}
 
 func (x *ParkourShotOperatePush) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[17]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[19]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -887,7 +975,7 @@ func (x *ParkourShotOperatePush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ParkourShotOperatePush.ProtoReflect.Descriptor instead.
 func (*ParkourShotOperatePush) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{17}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{19}
 }
 
 func (x *ParkourShotOperatePush) GetUid() string {
@@ -931,7 +1019,7 @@ type ParkourAvoidReq struct {
 func (x *ParkourAvoidReq) Reset() {
 	*x = ParkourAvoidReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[18]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[20]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -944,7 +1032,7 @@ func (x *ParkourAvoidReq) String() string {
 func (*ParkourAvoidReq) ProtoMessage() {}
 
 func (x *ParkourAvoidReq) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[18]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[20]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -957,7 +1045,7 @@ func (x *ParkourAvoidReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ParkourAvoidReq.ProtoReflect.Descriptor instead.
 func (*ParkourAvoidReq) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{18}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{20}
 }
 
 func (x *ParkourAvoidReq) GetBattleid() string {
@@ -984,7 +1072,7 @@ type ParkourAvoidResp struct {
 func (x *ParkourAvoidResp) Reset() {
 	*x = ParkourAvoidResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[19]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[21]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -997,7 +1085,7 @@ func (x *ParkourAvoidResp) String() string {
 func (*ParkourAvoidResp) ProtoMessage() {}
 
 func (x *ParkourAvoidResp) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[19]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[21]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1010,7 +1098,7 @@ func (x *ParkourAvoidResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ParkourAvoidResp.ProtoReflect.Descriptor instead.
 func (*ParkourAvoidResp) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{19}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{21}
 }
 
 //躲避障碍物 操作推送
@@ -1029,7 +1117,7 @@ type ParkourAvoidOperatePush struct {
 func (x *ParkourAvoidOperatePush) Reset() {
 	*x = ParkourAvoidOperatePush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[20]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[22]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1042,7 +1130,7 @@ func (x *ParkourAvoidOperatePush) String() string {
 func (*ParkourAvoidOperatePush) ProtoMessage() {}
 
 func (x *ParkourAvoidOperatePush) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[20]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[22]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1055,7 +1143,7 @@ func (x *ParkourAvoidOperatePush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ParkourAvoidOperatePush.ProtoReflect.Descriptor instead.
 func (*ParkourAvoidOperatePush) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{20}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{22}
 }
 
 func (x *ParkourAvoidOperatePush) GetUid() string {
@@ -1106,7 +1194,7 @@ type ParkourRecoverHpReq struct {
 func (x *ParkourRecoverHpReq) Reset() {
 	*x = ParkourRecoverHpReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[21]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[23]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1119,7 +1207,7 @@ func (x *ParkourRecoverHpReq) String() string {
 func (*ParkourRecoverHpReq) ProtoMessage() {}
 
 func (x *ParkourRecoverHpReq) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[21]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[23]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1132,7 +1220,7 @@ func (x *ParkourRecoverHpReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ParkourRecoverHpReq.ProtoReflect.Descriptor instead.
 func (*ParkourRecoverHpReq) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{21}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{23}
 }
 
 func (x *ParkourRecoverHpReq) GetBattleid() string {
@@ -1161,7 +1249,7 @@ type ParkourRecoverHpResp struct {
 func (x *ParkourRecoverHpResp) Reset() {
 	*x = ParkourRecoverHpResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[22]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[24]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1174,7 +1262,7 @@ func (x *ParkourRecoverHpResp) String() string {
 func (*ParkourRecoverHpResp) ProtoMessage() {}
 
 func (x *ParkourRecoverHpResp) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[22]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[24]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1187,7 +1275,7 @@ func (x *ParkourRecoverHpResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ParkourRecoverHpResp.ProtoReflect.Descriptor instead.
 func (*ParkourRecoverHpResp) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{22}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{24}
 }
 
 func (x *ParkourRecoverHpResp) GetIssucc() bool {
@@ -1212,7 +1300,7 @@ type ParkourRecoverHpOperatePush struct {
 func (x *ParkourRecoverHpOperatePush) Reset() {
 	*x = ParkourRecoverHpOperatePush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[23]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[25]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1225,7 +1313,7 @@ func (x *ParkourRecoverHpOperatePush) String() string {
 func (*ParkourRecoverHpOperatePush) ProtoMessage() {}
 
 func (x *ParkourRecoverHpOperatePush) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[23]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[25]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1238,7 +1326,7 @@ func (x *ParkourRecoverHpOperatePush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ParkourRecoverHpOperatePush.ProtoReflect.Descriptor instead.
 func (*ParkourRecoverHpOperatePush) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{23}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{25}
 }
 
 func (x *ParkourRecoverHpOperatePush) GetUid() string {
@@ -1281,7 +1369,7 @@ type ParkourAllSprintsPush struct {
 func (x *ParkourAllSprintsPush) Reset() {
 	*x = ParkourAllSprintsPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[24]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[26]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1294,7 +1382,7 @@ func (x *ParkourAllSprintsPush) String() string {
 func (*ParkourAllSprintsPush) ProtoMessage() {}
 
 func (x *ParkourAllSprintsPush) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[24]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[26]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1307,7 +1395,7 @@ func (x *ParkourAllSprintsPush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ParkourAllSprintsPush.ProtoReflect.Descriptor instead.
 func (*ParkourAllSprintsPush) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{24}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{26}
 }
 
 func (x *ParkourAllSprintsPush) GetLeft() int32 {
@@ -1328,7 +1416,7 @@ type ParkourInfoChangePush struct {
 func (x *ParkourInfoChangePush) Reset() {
 	*x = ParkourInfoChangePush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[25]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[27]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1341,7 +1429,7 @@ func (x *ParkourInfoChangePush) String() string {
 func (*ParkourInfoChangePush) ProtoMessage() {}
 
 func (x *ParkourInfoChangePush) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[25]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[27]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1354,7 +1442,7 @@ func (x *ParkourInfoChangePush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ParkourInfoChangePush.ProtoReflect.Descriptor instead.
 func (*ParkourInfoChangePush) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{25}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{27}
 }
 
 func (x *ParkourInfoChangePush) GetInfo() *DBParkour {
@@ -1377,7 +1465,7 @@ type ParkourRevivalPlayerPush struct {
 func (x *ParkourRevivalPlayerPush) Reset() {
 	*x = ParkourRevivalPlayerPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[26]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[28]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1390,7 +1478,7 @@ func (x *ParkourRevivalPlayerPush) String() string {
 func (*ParkourRevivalPlayerPush) ProtoMessage() {}
 
 func (x *ParkourRevivalPlayerPush) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[26]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[28]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1403,7 +1491,7 @@ func (x *ParkourRevivalPlayerPush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ParkourRevivalPlayerPush.ProtoReflect.Descriptor instead.
 func (*ParkourRevivalPlayerPush) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{26}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{28}
 }
 
 func (x *ParkourRevivalPlayerPush) GetUid() string {
@@ -1435,7 +1523,7 @@ type ParkourRaceOverPush struct {
 func (x *ParkourRaceOverPush) Reset() {
 	*x = ParkourRaceOverPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[27]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[29]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1448,7 +1536,7 @@ func (x *ParkourRaceOverPush) String() string {
 func (*ParkourRaceOverPush) ProtoMessage() {}
 
 func (x *ParkourRaceOverPush) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[27]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[29]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1461,7 +1549,7 @@ func (x *ParkourRaceOverPush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ParkourRaceOverPush.ProtoReflect.Descriptor instead.
 func (*ParkourRaceOverPush) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{27}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{29}
 }
 
 func (x *ParkourRaceOverPush) GetWinside() int32 {
@@ -1504,7 +1592,7 @@ type ParkourGetRewardReq struct {
 func (x *ParkourGetRewardReq) Reset() {
 	*x = ParkourGetRewardReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[28]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[30]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1517,7 +1605,7 @@ func (x *ParkourGetRewardReq) String() string {
 func (*ParkourGetRewardReq) ProtoMessage() {}
 
 func (x *ParkourGetRewardReq) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[28]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[30]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1530,7 +1618,7 @@ func (x *ParkourGetRewardReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ParkourGetRewardReq.ProtoReflect.Descriptor instead.
 func (*ParkourGetRewardReq) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{28}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{30}
 }
 
 func (x *ParkourGetRewardReq) GetRid() int32 {
@@ -1551,7 +1639,7 @@ type ParkourGetRewardResp struct {
 func (x *ParkourGetRewardResp) Reset() {
 	*x = ParkourGetRewardResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[29]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[31]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1564,7 +1652,7 @@ func (x *ParkourGetRewardResp) String() string {
 func (*ParkourGetRewardResp) ProtoMessage() {}
 
 func (x *ParkourGetRewardResp) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[29]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[31]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1577,7 +1665,7 @@ func (x *ParkourGetRewardResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ParkourGetRewardResp.ProtoReflect.Descriptor instead.
 func (*ParkourGetRewardResp) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{29}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{31}
 }
 
 func (x *ParkourGetRewardResp) GetInfo() *DBParkour {
@@ -1602,7 +1690,7 @@ type RPCParkourJoinMatchReq struct {
 func (x *RPCParkourJoinMatchReq) Reset() {
 	*x = RPCParkourJoinMatchReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[30]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[32]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1615,7 +1703,7 @@ func (x *RPCParkourJoinMatchReq) String() string {
 func (*RPCParkourJoinMatchReq) ProtoMessage() {}
 
 func (x *RPCParkourJoinMatchReq) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[30]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[32]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1628,7 +1716,7 @@ func (x *RPCParkourJoinMatchReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RPCParkourJoinMatchReq.ProtoReflect.Descriptor instead.
 func (*RPCParkourJoinMatchReq) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{30}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{32}
 }
 
 func (x *RPCParkourJoinMatchReq) GetCaptainid() string {
@@ -1662,7 +1750,7 @@ type RPCParkourJoinMatchResp struct {
 func (x *RPCParkourJoinMatchResp) Reset() {
 	*x = RPCParkourJoinMatchResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[31]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[33]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1675,7 +1763,7 @@ func (x *RPCParkourJoinMatchResp) String() string {
 func (*RPCParkourJoinMatchResp) ProtoMessage() {}
 
 func (x *RPCParkourJoinMatchResp) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[31]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[33]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1688,7 +1776,7 @@ func (x *RPCParkourJoinMatchResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RPCParkourJoinMatchResp.ProtoReflect.Descriptor instead.
 func (*RPCParkourJoinMatchResp) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{31}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{33}
 }
 
 //取消匹配
@@ -1703,7 +1791,7 @@ type RPCParkourCancelMatchReq struct {
 func (x *RPCParkourCancelMatchReq) Reset() {
 	*x = RPCParkourCancelMatchReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[32]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[34]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1716,7 +1804,7 @@ func (x *RPCParkourCancelMatchReq) String() string {
 func (*RPCParkourCancelMatchReq) ProtoMessage() {}
 
 func (x *RPCParkourCancelMatchReq) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[32]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[34]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1729,7 +1817,7 @@ func (x *RPCParkourCancelMatchReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RPCParkourCancelMatchReq.ProtoReflect.Descriptor instead.
 func (*RPCParkourCancelMatchReq) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{32}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{34}
 }
 
 func (x *RPCParkourCancelMatchReq) GetCaptainid() string {
@@ -1748,7 +1836,7 @@ type RPCParkourCancelMatchResp struct {
 func (x *RPCParkourCancelMatchResp) Reset() {
 	*x = RPCParkourCancelMatchResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[33]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[35]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1761,7 +1849,7 @@ func (x *RPCParkourCancelMatchResp) String() string {
 func (*RPCParkourCancelMatchResp) ProtoMessage() {}
 
 func (x *RPCParkourCancelMatchResp) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[33]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[35]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1774,7 +1862,7 @@ func (x *RPCParkourCancelMatchResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RPCParkourCancelMatchResp.ProtoReflect.Descriptor instead.
 func (*RPCParkourCancelMatchResp) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{33}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{35}
 }
 
 ///匹配成功通知请求
@@ -1790,7 +1878,7 @@ type RPCParkourMatchSuccReq struct {
 func (x *RPCParkourMatchSuccReq) Reset() {
 	*x = RPCParkourMatchSuccReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[34]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[36]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1803,7 +1891,7 @@ func (x *RPCParkourMatchSuccReq) String() string {
 func (*RPCParkourMatchSuccReq) ProtoMessage() {}
 
 func (x *RPCParkourMatchSuccReq) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[34]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[36]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1816,7 +1904,7 @@ func (x *RPCParkourMatchSuccReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RPCParkourMatchSuccReq.ProtoReflect.Descriptor instead.
 func (*RPCParkourMatchSuccReq) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{34}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{36}
 }
 
 func (x *RPCParkourMatchSuccReq) GetRed() []*DBRaceMember {
@@ -1843,7 +1931,7 @@ type RPCParkourMatchSuccResp struct {
 func (x *RPCParkourMatchSuccResp) Reset() {
 	*x = RPCParkourMatchSuccResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[35]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[37]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1856,7 +1944,7 @@ func (x *RPCParkourMatchSuccResp) String() string {
 func (*RPCParkourMatchSuccResp) ProtoMessage() {}
 
 func (x *RPCParkourMatchSuccResp) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[35]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[37]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1869,7 +1957,7 @@ func (x *RPCParkourMatchSuccResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RPCParkourMatchSuccResp.ProtoReflect.Descriptor instead.
 func (*RPCParkourMatchSuccResp) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{35}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{37}
 }
 
 //托管求情
@@ -1885,7 +1973,7 @@ type RPC_ParkourTrusteeshipReq struct {
 func (x *RPC_ParkourTrusteeshipReq) Reset() {
 	*x = RPC_ParkourTrusteeshipReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[36]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[38]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1898,7 +1986,7 @@ func (x *RPC_ParkourTrusteeshipReq) String() string {
 func (*RPC_ParkourTrusteeshipReq) ProtoMessage() {}
 
 func (x *RPC_ParkourTrusteeshipReq) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[36]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[38]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1911,7 +1999,7 @@ func (x *RPC_ParkourTrusteeshipReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RPC_ParkourTrusteeshipReq.ProtoReflect.Descriptor instead.
 func (*RPC_ParkourTrusteeshipReq) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{36}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{38}
 }
 
 func (x *RPC_ParkourTrusteeshipReq) GetBattleid() string {
@@ -1937,7 +2025,7 @@ type RPC_ParkourTrusteeshipResp struct {
 func (x *RPC_ParkourTrusteeshipResp) Reset() {
 	*x = RPC_ParkourTrusteeshipResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_parkour_parkour_msg_proto_msgTypes[37]
+		mi := &file_parkour_parkour_msg_proto_msgTypes[39]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1950,7 +2038,7 @@ func (x *RPC_ParkourTrusteeshipResp) String() string {
 func (*RPC_ParkourTrusteeshipResp) ProtoMessage() {}
 
 func (x *RPC_ParkourTrusteeshipResp) ProtoReflect() protoreflect.Message {
-	mi := &file_parkour_parkour_msg_proto_msgTypes[37]
+	mi := &file_parkour_parkour_msg_proto_msgTypes[39]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1963,7 +2051,7 @@ func (x *RPC_ParkourTrusteeshipResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RPC_ParkourTrusteeshipResp.ProtoReflect.Descriptor instead.
 func (*RPC_ParkourTrusteeshipResp) Descriptor() ([]byte, []int) {
-	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{37}
+	return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{39}
 }
 
 var File_parkour_parkour_msg_proto protoreflect.FileDescriptor
@@ -1996,132 +2084,139 @@ var file_parkour_parkour_msg_proto_rawDesc = []byte{
 	0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
 	0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x64, 0x22, 0x1c, 0x0a, 0x1a, 0x50, 0x61, 0x72,
 	0x6b, 0x6f, 0x75, 0x72, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x43, 0x61, 0x6e,
-	0x63, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x22, 0x37, 0x0a, 0x18, 0x50, 0x61, 0x72, 0x6b, 0x6f,
-	0x75, 0x72, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x75, 0x63, 0x63, 0x50,
-	0x75, 0x73, 0x68, 0x12, 0x1b, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65,
-	0x22, 0x2d, 0x0a, 0x0f, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x65, 0x61, 0x64, 0x79,
-	0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x22,
-	0x12, 0x0a, 0x10, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52,
-	0x65, 0x73, 0x70, 0x22, 0x34, 0x0a, 0x14, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x61,
-	0x63, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x63,
-	0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09,
-	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x22, 0x3f, 0x0a, 0x0d, 0x50, 0x61, 0x72,
-	0x6b, 0x6f, 0x75, 0x72, 0x51, 0x54, 0x45, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61,
-	0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61,
-	0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x02, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x10, 0x0a, 0x0e, 0x50, 0x61,
-	0x72, 0x6b, 0x6f, 0x75, 0x72, 0x51, 0x54, 0x45, 0x52, 0x65, 0x73, 0x70, 0x22, 0x7d, 0x0a, 0x15,
-	0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x51, 0x54, 0x45, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74,
-	0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74,
-	0x65, 0x61, 0x6d, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09,
-	0x74, 0x65, 0x61, 0x6d, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x6c, 0x61,
-	0x79, 0x65, 0x72, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b,
-	0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x3e, 0x0a, 0x0e, 0x50,
-	0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x53, 0x68, 0x6f, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a,
-	0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x50,
-	0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x53, 0x68, 0x6f, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x84,
-	0x01, 0x0a, 0x16, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x53, 0x68, 0x6f, 0x74, 0x4f, 0x70,
-	0x65, 0x72, 0x61, 0x74, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73,
-	0x68, 0x6f, 0x74, 0x6e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x68,
-	0x6f, 0x74, 0x6e, 0x75, 0x6d, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x63, 0x6f,
-	0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x63,
-	0x6f, 0x72, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x63, 0x6f,
-	0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72,
-	0x73, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x49, 0x0a, 0x0f, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72,
-	0x41, 0x76, 0x6f, 0x69, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74,
-	0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74,
-	0x6c, 0x65, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x08, 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
-	0x22, 0x12, 0x0a, 0x10, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x41, 0x76, 0x6f, 0x69, 0x64,
-	0x52, 0x65, 0x73, 0x70, 0x22, 0x97, 0x01, 0x0a, 0x17, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72,
-	0x41, 0x76, 0x6f, 0x69, 0x64, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x50, 0x75, 0x73, 0x68,
+	0x63, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x22, 0x3b, 0x0a, 0x19, 0x50, 0x61, 0x72, 0x6b, 0x6f,
+	0x75, 0x72, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x74, 0x61, 0x72, 0x74,
+	0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x04,
+	0x74, 0x65, 0x61, 0x6d, 0x22, 0x3c, 0x0a, 0x1a, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52,
+	0x61, 0x63, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x50, 0x75,
+	0x73, 0x68, 0x12, 0x1e, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x0a, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x04, 0x74, 0x65,
+	0x61, 0x6d, 0x22, 0x37, 0x0a, 0x18, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x61, 0x63,
+	0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x75, 0x63, 0x63, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1b,
+	0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44,
+	0x42, 0x52, 0x61, 0x63, 0x65, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x22, 0x2d, 0x0a, 0x0f, 0x50,
+	0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52, 0x65, 0x71, 0x12, 0x1a,
+	0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x22, 0x12, 0x0a, 0x10, 0x50, 0x61,
+	0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52, 0x65, 0x73, 0x70, 0x22, 0x34,
+	0x0a, 0x14, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x61, 0x63, 0x65, 0x53, 0x74, 0x61,
+	0x72, 0x74, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64,
+	0x6f, 0x77, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x64, 0x6f, 0x77, 0x6e, 0x22, 0x3f, 0x0a, 0x0d, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x51,
+	0x54, 0x45, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69,
+	0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x02, 0x52,
+	0x04, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x10, 0x0a, 0x0e, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72,
+	0x51, 0x54, 0x45, 0x52, 0x65, 0x73, 0x70, 0x22, 0x7d, 0x0a, 0x15, 0x50, 0x61, 0x72, 0x6b, 0x6f,
+	0x75, 0x72, 0x51, 0x54, 0x45, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x50, 0x75, 0x73, 0x68,
 	0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
-	0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
-	0x68, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x02, 0x52, 0x08, 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x1c,
-	0x0a, 0x09, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x09, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x20, 0x0a, 0x0b,
-	0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x0b, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x43,
-	0x0a, 0x13, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72,
-	0x48, 0x70, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69,
-	0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x75, 0x69, 0x64, 0x22, 0x2e, 0x0a, 0x14, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x65,
-	0x63, 0x6f, 0x76, 0x65, 0x72, 0x48, 0x70, 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, 0x7f, 0x0a, 0x1b, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x65,
-	0x63, 0x6f, 0x76, 0x65, 0x72, 0x48, 0x70, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x50, 0x75,
-	0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x75, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x02, 0x68, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x63, 0x6f, 0x72,
-	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x63, 0x6f,
-	0x72, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x63, 0x6f, 0x72,
-	0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73,
-	0x63, 0x6f, 0x72, 0x65, 0x22, 0x2b, 0x0a, 0x15, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x41,
-	0x6c, 0x6c, 0x53, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x12, 0x0a,
-	0x04, 0x6c, 0x65, 0x66, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6c, 0x65, 0x66,
-	0x74, 0x22, 0x37, 0x0a, 0x15, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x66, 0x6f,
-	0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x04, 0x49, 0x6e,
-	0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x72,
-	0x6b, 0x6f, 0x75, 0x72, 0x52, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x3c, 0x0a, 0x18, 0x50, 0x61,
-	0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x65, 0x76, 0x69, 0x76, 0x61, 0x6c, 0x50, 0x6c, 0x61, 0x79,
-	0x65, 0x72, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x70, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x70, 0x22, 0x91, 0x01, 0x0a, 0x13, 0x50, 0x61, 0x72,
-	0x6b, 0x6f, 0x75, 0x72, 0x52, 0x61, 0x63, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x50, 0x75, 0x73, 0x68,
-	0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x12, 0x1b, 0x0a, 0x04, 0x72, 0x61,
-	0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63,
-	0x65, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x69,
-	0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x77,
-	0x65, 0x65, 0x6b, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x1f, 0x0a, 0x05, 0x61,
-	0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65,
-	0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x27, 0x0a, 0x13,
-	0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64,
-	0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x03, 0x72, 0x69, 0x64, 0x22, 0x36, 0x0a, 0x14, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72,
-	0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a,
-	0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42,
-	0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x7e, 0x0a,
-	0x16, 0x52, 0x50, 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4a, 0x6f, 0x69, 0x6e, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61,
-	0x69, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x61, 0x70, 0x74,
-	0x61, 0x69, 0x6e, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65,
-	0x6d, 0x62, 0x65, 0x72, 0x52, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x1f, 0x0a, 0x03,
-	0x61, 0x69, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61,
-	0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x03, 0x61, 0x69, 0x73, 0x22, 0x19, 0x0a,
-	0x17, 0x52, 0x50, 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4a, 0x6f, 0x69, 0x6e, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x22, 0x38, 0x0a, 0x18, 0x52, 0x50, 0x43, 0x50,
-	0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x69,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e,
-	0x69, 0x64, 0x22, 0x1b, 0x0a, 0x19, 0x52, 0x50, 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72,
-	0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x22,
-	0x5c, 0x0a, 0x16, 0x52, 0x50, 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x53, 0x75, 0x63, 0x63, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x03, 0x72, 0x65, 0x64,
-	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d,
-	0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x21, 0x0a, 0x04, 0x62, 0x75,
-	0x6c, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63,
-	0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x22, 0x19, 0x0a,
-	0x17, 0x52, 0x50, 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x53, 0x75, 0x63, 0x63, 0x52, 0x65, 0x73, 0x70, 0x22, 0x49, 0x0a, 0x19, 0x52, 0x50, 0x43, 0x5f,
-	0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x54, 0x72, 0x75, 0x73, 0x74, 0x65, 0x65, 0x73, 0x68,
-	0x69, 0x70, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69,
-	0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x75, 0x69, 0x64, 0x22, 0x1c, 0x0a, 0x1a, 0x52, 0x50, 0x43, 0x5f, 0x50, 0x61, 0x72, 0x6b, 0x6f,
-	0x75, 0x72, 0x54, 0x72, 0x75, 0x73, 0x74, 0x65, 0x65, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x73,
-	0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x02,
+	0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x63,
+	0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x74, 0x65, 0x61, 0x6d, 0x73,
+	0x63, 0x6f, 0x72, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x63,
+	0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x70, 0x6c, 0x61, 0x79, 0x65,
+	0x72, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x3e, 0x0a, 0x0e, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75,
+	0x72, 0x53, 0x68, 0x6f, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74,
+	0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74,
+	0x6c, 0x65, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75,
+	0x72, 0x53, 0x68, 0x6f, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x84, 0x01, 0x0a, 0x16, 0x50, 0x61,
+	0x72, 0x6b, 0x6f, 0x75, 0x72, 0x53, 0x68, 0x6f, 0x74, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65,
+	0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x68, 0x6f, 0x74, 0x6e, 0x75,
+	0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x68, 0x6f, 0x74, 0x6e, 0x75, 0x6d,
+	0x12, 0x1c, 0x0a, 0x09, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x09, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x20,
+	0x0a, 0x0b, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x0b, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x63, 0x6f, 0x72, 0x65,
+	0x22, 0x49, 0x0a, 0x0f, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x41, 0x76, 0x6f, 0x69, 0x64,
+	0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12,
+	0x1a, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x02, 0x52, 0x08, 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x22, 0x12, 0x0a, 0x10, 0x50,
+	0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x41, 0x76, 0x6f, 0x69, 0x64, 0x52, 0x65, 0x73, 0x70, 0x22,
+	0x97, 0x01, 0x0a, 0x17, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x41, 0x76, 0x6f, 0x69, 0x64,
+	0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x0e, 0x0a,
+	0x02, 0x68, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x70, 0x12, 0x1a, 0x0a,
+	0x08, 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x02, 0x52,
+	0x08, 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x65, 0x61,
+	0x6d, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x74, 0x65,
+	0x61, 0x6d, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x6c, 0x61, 0x79, 0x65,
+	0x72, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x70, 0x6c,
+	0x61, 0x79, 0x65, 0x72, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x43, 0x0a, 0x13, 0x50, 0x61, 0x72,
+	0x6b, 0x6f, 0x75, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x48, 0x70, 0x52, 0x65, 0x71,
+	0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03,
+	0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x2e,
+	0x0a, 0x14, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72,
+	0x48, 0x70, 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, 0x7f,
+	0x0a, 0x1b, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72,
+	0x48, 0x70, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a,
+	0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12,
+	0x0e, 0x0a, 0x02, 0x68, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x70, 0x12,
+	0x1c, 0x0a, 0x09, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x09, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x20, 0x0a,
+	0x0b, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x0b, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x22,
+	0x2b, 0x0a, 0x15, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x41, 0x6c, 0x6c, 0x53, 0x70, 0x72,
+	0x69, 0x6e, 0x74, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x65, 0x66, 0x74,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6c, 0x65, 0x66, 0x74, 0x22, 0x37, 0x0a, 0x15,
+	0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x43, 0x68, 0x61, 0x6e, 0x67,
+	0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52,
+	0x04, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x3c, 0x0a, 0x18, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72,
+	0x52, 0x65, 0x76, 0x69, 0x76, 0x61, 0x6c, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x50, 0x75, 0x73,
+	0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
+	0x75, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x02, 0x68, 0x70, 0x22, 0x91, 0x01, 0x0a, 0x13, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52,
+	0x61, 0x63, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x77,
+	0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, 0x69,
+	0x6e, 0x73, 0x69, 0x64, 0x65, 0x12, 0x1b, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x52, 0x04, 0x72, 0x61,
+	0x63, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72,
+	0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x69, 0x6e,
+	0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18,
+	0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f,
+	0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x27, 0x0a, 0x13, 0x50, 0x61, 0x72, 0x6b, 0x6f,
+	0x75, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10,
+	0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64,
+	0x22, 0x36, 0x0a, 0x14, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65,
+	0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x72, 0x6b, 0x6f,
+	0x75, 0x72, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x7e, 0x0a, 0x16, 0x52, 0x50, 0x43, 0x50,
+	0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4a, 0x6f, 0x69, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52,
+	0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x64,
+	0x12, 0x25, 0x0a, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52,
+	0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x1f, 0x0a, 0x03, 0x61, 0x69, 0x73, 0x18, 0x03,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d,
+	0x62, 0x65, 0x72, 0x52, 0x03, 0x61, 0x69, 0x73, 0x22, 0x19, 0x0a, 0x17, 0x52, 0x50, 0x43, 0x50,
+	0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4a, 0x6f, 0x69, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52,
+	0x65, 0x73, 0x70, 0x22, 0x38, 0x0a, 0x18, 0x52, 0x50, 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75,
+	0x72, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12,
+	0x1c, 0x0a, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x64, 0x22, 0x1b, 0x0a,
+	0x19, 0x52, 0x50, 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x43, 0x61, 0x6e, 0x63, 0x65,
+	0x6c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x22, 0x5c, 0x0a, 0x16, 0x52, 0x50,
+	0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x75, 0x63,
+	0x63, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72,
+	0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x21, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x18, 0x03, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62,
+	0x65, 0x72, 0x52, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x22, 0x19, 0x0a, 0x17, 0x52, 0x50, 0x43, 0x50,
+	0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x75, 0x63, 0x63, 0x52,
+	0x65, 0x73, 0x70, 0x22, 0x49, 0x0a, 0x19, 0x52, 0x50, 0x43, 0x5f, 0x50, 0x61, 0x72, 0x6b, 0x6f,
+	0x75, 0x72, 0x54, 0x72, 0x75, 0x73, 0x74, 0x65, 0x65, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x71,
+	0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03,
+	0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x1c,
+	0x0a, 0x1a, 0x52, 0x50, 0x43, 0x5f, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x54, 0x72, 0x75,
+	0x73, 0x74, 0x65, 0x65, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04,
+	0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2136,7 +2231,7 @@ func file_parkour_parkour_msg_proto_rawDescGZIP() []byte {
 	return file_parkour_parkour_msg_proto_rawDescData
 }
 
-var file_parkour_parkour_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 38)
+var file_parkour_parkour_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 40)
 var file_parkour_parkour_msg_proto_goTypes = []interface{}{
 	(*ParkourInfoReq)(nil),              // 0: ParkourInfoReq
 	(*ParkourInfoResp)(nil),             // 1: ParkourInfoResp
@@ -2146,57 +2241,61 @@ var file_parkour_parkour_msg_proto_goTypes = []interface{}{
 	(*ParkourRaceMatchResp)(nil),        // 5: ParkourRaceMatchResp
 	(*ParkourRaceMatchCancelReq)(nil),   // 6: ParkourRaceMatchCancelReq
 	(*ParkourRaceMatchCancelResp)(nil),  // 7: ParkourRaceMatchCancelResp
-	(*ParkourRaceMatchSuccPush)(nil),    // 8: ParkourRaceMatchSuccPush
-	(*ParkourReadyReq)(nil),             // 9: ParkourReadyReq
-	(*ParkourReadyResp)(nil),            // 10: ParkourReadyResp
-	(*ParkourRaceStartPush)(nil),        // 11: ParkourRaceStartPush
-	(*ParkourQTEReq)(nil),               // 12: ParkourQTEReq
-	(*ParkourQTEResp)(nil),              // 13: ParkourQTEResp
-	(*ParkourQTEOperatePush)(nil),       // 14: ParkourQTEOperatePush
-	(*ParkourShotReq)(nil),              // 15: ParkourShotReq
-	(*ParkourShotResp)(nil),             // 16: ParkourShotResp
-	(*ParkourShotOperatePush)(nil),      // 17: ParkourShotOperatePush
-	(*ParkourAvoidReq)(nil),             // 18: ParkourAvoidReq
-	(*ParkourAvoidResp)(nil),            // 19: ParkourAvoidResp
-	(*ParkourAvoidOperatePush)(nil),     // 20: ParkourAvoidOperatePush
-	(*ParkourRecoverHpReq)(nil),         // 21: ParkourRecoverHpReq
-	(*ParkourRecoverHpResp)(nil),        // 22: ParkourRecoverHpResp
-	(*ParkourRecoverHpOperatePush)(nil), // 23: ParkourRecoverHpOperatePush
-	(*ParkourAllSprintsPush)(nil),       // 24: ParkourAllSprintsPush
-	(*ParkourInfoChangePush)(nil),       // 25: ParkourInfoChangePush
-	(*ParkourRevivalPlayerPush)(nil),    // 26: ParkourRevivalPlayerPush
-	(*ParkourRaceOverPush)(nil),         // 27: ParkourRaceOverPush
-	(*ParkourGetRewardReq)(nil),         // 28: ParkourGetRewardReq
-	(*ParkourGetRewardResp)(nil),        // 29: ParkourGetRewardResp
-	(*RPCParkourJoinMatchReq)(nil),      // 30: RPCParkourJoinMatchReq
-	(*RPCParkourJoinMatchResp)(nil),     // 31: RPCParkourJoinMatchResp
-	(*RPCParkourCancelMatchReq)(nil),    // 32: RPCParkourCancelMatchReq
-	(*RPCParkourCancelMatchResp)(nil),   // 33: RPCParkourCancelMatchResp
-	(*RPCParkourMatchSuccReq)(nil),      // 34: RPCParkourMatchSuccReq
-	(*RPCParkourMatchSuccResp)(nil),     // 35: RPCParkourMatchSuccResp
-	(*RPC_ParkourTrusteeshipReq)(nil),   // 36: RPC_ParkourTrusteeshipReq
-	(*RPC_ParkourTrusteeshipResp)(nil),  // 37: RPC_ParkourTrusteeshipResp
-	(*DBParkour)(nil),                   // 38: DBParkour
-	(*DBRace)(nil),                      // 39: DBRace
-	(*UserAtno)(nil),                    // 40: UserAtno
-	(*DBRaceMember)(nil),                // 41: DBRaceMember
+	(*ParkourRaceMatchStartPush)(nil),   // 8: ParkourRaceMatchStartPush
+	(*ParkourRaceMatchCancelPush)(nil),  // 9: ParkourRaceMatchCancelPush
+	(*ParkourRaceMatchSuccPush)(nil),    // 10: ParkourRaceMatchSuccPush
+	(*ParkourReadyReq)(nil),             // 11: ParkourReadyReq
+	(*ParkourReadyResp)(nil),            // 12: ParkourReadyResp
+	(*ParkourRaceStartPush)(nil),        // 13: ParkourRaceStartPush
+	(*ParkourQTEReq)(nil),               // 14: ParkourQTEReq
+	(*ParkourQTEResp)(nil),              // 15: ParkourQTEResp
+	(*ParkourQTEOperatePush)(nil),       // 16: ParkourQTEOperatePush
+	(*ParkourShotReq)(nil),              // 17: ParkourShotReq
+	(*ParkourShotResp)(nil),             // 18: ParkourShotResp
+	(*ParkourShotOperatePush)(nil),      // 19: ParkourShotOperatePush
+	(*ParkourAvoidReq)(nil),             // 20: ParkourAvoidReq
+	(*ParkourAvoidResp)(nil),            // 21: ParkourAvoidResp
+	(*ParkourAvoidOperatePush)(nil),     // 22: ParkourAvoidOperatePush
+	(*ParkourRecoverHpReq)(nil),         // 23: ParkourRecoverHpReq
+	(*ParkourRecoverHpResp)(nil),        // 24: ParkourRecoverHpResp
+	(*ParkourRecoverHpOperatePush)(nil), // 25: ParkourRecoverHpOperatePush
+	(*ParkourAllSprintsPush)(nil),       // 26: ParkourAllSprintsPush
+	(*ParkourInfoChangePush)(nil),       // 27: ParkourInfoChangePush
+	(*ParkourRevivalPlayerPush)(nil),    // 28: ParkourRevivalPlayerPush
+	(*ParkourRaceOverPush)(nil),         // 29: ParkourRaceOverPush
+	(*ParkourGetRewardReq)(nil),         // 30: ParkourGetRewardReq
+	(*ParkourGetRewardResp)(nil),        // 31: ParkourGetRewardResp
+	(*RPCParkourJoinMatchReq)(nil),      // 32: RPCParkourJoinMatchReq
+	(*RPCParkourJoinMatchResp)(nil),     // 33: RPCParkourJoinMatchResp
+	(*RPCParkourCancelMatchReq)(nil),    // 34: RPCParkourCancelMatchReq
+	(*RPCParkourCancelMatchResp)(nil),   // 35: RPCParkourCancelMatchResp
+	(*RPCParkourMatchSuccReq)(nil),      // 36: RPCParkourMatchSuccReq
+	(*RPCParkourMatchSuccResp)(nil),     // 37: RPCParkourMatchSuccResp
+	(*RPC_ParkourTrusteeshipReq)(nil),   // 38: RPC_ParkourTrusteeshipReq
+	(*RPC_ParkourTrusteeshipResp)(nil),  // 39: RPC_ParkourTrusteeshipResp
+	(*DBParkour)(nil),                   // 40: DBParkour
+	(*DBRace)(nil),                      // 41: DBRace
+	(*UserAtno)(nil),                    // 42: UserAtno
+	(*DBRaceMember)(nil),                // 43: DBRaceMember
 }
 var file_parkour_parkour_msg_proto_depIdxs = []int32{
-	38, // 0: ParkourInfoResp.info:type_name -> DBParkour
-	39, // 1: ParkourRaceMatchSuccPush.race:type_name -> DBRace
-	38, // 2: ParkourInfoChangePush.Info:type_name -> DBParkour
-	39, // 3: ParkourRaceOverPush.race:type_name -> DBRace
-	40, // 4: ParkourRaceOverPush.award:type_name -> UserAtno
-	38, // 5: ParkourGetRewardResp.info:type_name -> DBParkour
-	41, // 6: RPCParkourJoinMatchReq.member:type_name -> DBRaceMember
-	41, // 7: RPCParkourJoinMatchReq.ais:type_name -> DBRaceMember
-	41, // 8: RPCParkourMatchSuccReq.red:type_name -> DBRaceMember
-	41, // 9: RPCParkourMatchSuccReq.bule:type_name -> DBRaceMember
-	10, // [10:10] is the sub-list for method output_type
-	10, // [10:10] is the sub-list for method input_type
-	10, // [10:10] is the sub-list for extension type_name
-	10, // [10:10] is the sub-list for extension extendee
-	0,  // [0:10] is the sub-list for field type_name
+	40, // 0: ParkourInfoResp.info:type_name -> DBParkour
+	40, // 1: ParkourRaceMatchStartPush.team:type_name -> DBParkour
+	40, // 2: ParkourRaceMatchCancelPush.team:type_name -> DBParkour
+	41, // 3: ParkourRaceMatchSuccPush.race:type_name -> DBRace
+	40, // 4: ParkourInfoChangePush.Info:type_name -> DBParkour
+	41, // 5: ParkourRaceOverPush.race:type_name -> DBRace
+	42, // 6: ParkourRaceOverPush.award:type_name -> UserAtno
+	40, // 7: ParkourGetRewardResp.info:type_name -> DBParkour
+	43, // 8: RPCParkourJoinMatchReq.member:type_name -> DBRaceMember
+	43, // 9: RPCParkourJoinMatchReq.ais:type_name -> DBRaceMember
+	43, // 10: RPCParkourMatchSuccReq.red:type_name -> DBRaceMember
+	43, // 11: RPCParkourMatchSuccReq.bule:type_name -> DBRaceMember
+	12, // [12:12] is the sub-list for method output_type
+	12, // [12:12] is the sub-list for method input_type
+	12, // [12:12] is the sub-list for extension type_name
+	12, // [12:12] is the sub-list for extension extendee
+	0,  // [0:12] is the sub-list for field type_name
 }
 
 func init() { file_parkour_parkour_msg_proto_init() }
@@ -2304,7 +2403,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParkourRaceMatchSuccPush); i {
+			switch v := v.(*ParkourRaceMatchStartPush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2316,7 +2415,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParkourReadyReq); i {
+			switch v := v.(*ParkourRaceMatchCancelPush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2328,7 +2427,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParkourReadyResp); i {
+			switch v := v.(*ParkourRaceMatchSuccPush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2340,7 +2439,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParkourRaceStartPush); i {
+			switch v := v.(*ParkourReadyReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2352,7 +2451,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParkourQTEReq); i {
+			switch v := v.(*ParkourReadyResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2364,7 +2463,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParkourQTEResp); i {
+			switch v := v.(*ParkourRaceStartPush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2376,7 +2475,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParkourQTEOperatePush); i {
+			switch v := v.(*ParkourQTEReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2388,7 +2487,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParkourShotReq); i {
+			switch v := v.(*ParkourQTEResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2400,7 +2499,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParkourShotResp); i {
+			switch v := v.(*ParkourQTEOperatePush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2412,7 +2511,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParkourShotOperatePush); i {
+			switch v := v.(*ParkourShotReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2424,7 +2523,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParkourAvoidReq); i {
+			switch v := v.(*ParkourShotResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2436,7 +2535,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParkourAvoidResp); i {
+			switch v := v.(*ParkourShotOperatePush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2448,7 +2547,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParkourAvoidOperatePush); i {
+			switch v := v.(*ParkourAvoidReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2460,7 +2559,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParkourRecoverHpReq); i {
+			switch v := v.(*ParkourAvoidResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2472,7 +2571,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParkourRecoverHpResp); i {
+			switch v := v.(*ParkourAvoidOperatePush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2484,7 +2583,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParkourRecoverHpOperatePush); i {
+			switch v := v.(*ParkourRecoverHpReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2496,7 +2595,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParkourAllSprintsPush); i {
+			switch v := v.(*ParkourRecoverHpResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2508,7 +2607,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParkourInfoChangePush); i {
+			switch v := v.(*ParkourRecoverHpOperatePush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2520,7 +2619,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParkourRevivalPlayerPush); i {
+			switch v := v.(*ParkourAllSprintsPush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2532,7 +2631,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParkourRaceOverPush); i {
+			switch v := v.(*ParkourInfoChangePush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2544,7 +2643,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParkourGetRewardReq); i {
+			switch v := v.(*ParkourRevivalPlayerPush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2556,7 +2655,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParkourGetRewardResp); i {
+			switch v := v.(*ParkourRaceOverPush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2568,7 +2667,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RPCParkourJoinMatchReq); i {
+			switch v := v.(*ParkourGetRewardReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2580,7 +2679,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RPCParkourJoinMatchResp); i {
+			switch v := v.(*ParkourGetRewardResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2592,7 +2691,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RPCParkourCancelMatchReq); i {
+			switch v := v.(*RPCParkourJoinMatchReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2604,7 +2703,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RPCParkourCancelMatchResp); i {
+			switch v := v.(*RPCParkourJoinMatchResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2616,7 +2715,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RPCParkourMatchSuccReq); i {
+			switch v := v.(*RPCParkourCancelMatchReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2628,7 +2727,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RPCParkourMatchSuccResp); i {
+			switch v := v.(*RPCParkourCancelMatchResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2640,7 +2739,7 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RPC_ParkourTrusteeshipReq); i {
+			switch v := v.(*RPCParkourMatchSuccReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2652,6 +2751,30 @@ func file_parkour_parkour_msg_proto_init() {
 			}
 		}
 		file_parkour_parkour_msg_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*RPCParkourMatchSuccResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_parkour_parkour_msg_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*RPC_ParkourTrusteeshipReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_parkour_parkour_msg_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RPC_ParkourTrusteeshipResp); i {
 			case 0:
 				return &v.state
@@ -2670,7 +2793,7 @@ func file_parkour_parkour_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_parkour_parkour_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   38,
+			NumMessages:   40,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/user_db.pb.go b/pb/user_db.pb.go
index fe9ad5123..09dbba509 100644
--- a/pb/user_db.pb.go
+++ b/pb/user_db.pb.go
@@ -157,9 +157,11 @@ type DBUser struct {
 	Integral         int64    `protobuf:"varint,44,opt,name=integral,proto3" json:"integral" bson:"integral"`                         //充值积分
 	Nologindays      int32    `protobuf:"varint,45,opt,name=nologindays,proto3" json:"nologindays" bson:"nologindays"`                //连续多少天未登录
 	Caravanlv        int32    `protobuf:"varint,46,opt,name=caravanlv,proto3" json:"caravanlv"`
-	Titles           []string `protobuf:"bytes,47,rep,name=titles,proto3" json:"titles"`       // 称号
-	Curtitle         string   `protobuf:"bytes,48,opt,name=curtitle,proto3" json:"curtitle"`   // 默认称号
-	Curaframe        string   `protobuf:"bytes,49,opt,name=curaframe,proto3" json:"curaframe"` //默认头像框
+	Titles           []string `protobuf:"bytes,47,rep,name=titles,proto3" json:"titles"`              // 称号
+	Curtitle         string   `protobuf:"bytes,48,opt,name=curtitle,proto3" json:"curtitle"`          // 默认称号
+	Curaframe        string   `protobuf:"bytes,49,opt,name=curaframe,proto3" json:"curaframe"`        //默认头像框
+	Consumeexp       int32    `protobuf:"varint,50,opt,name=consumeexp,proto3" json:"consumeexp"`     //消消乐赛季进度积分
+	Consumemoney     int32    `protobuf:"varint,51,opt,name=consumemoney,proto3" json:"consumemoney"` //三消专属货币
 }
 
 func (x *DBUser) Reset() {
@@ -523,6 +525,20 @@ func (x *DBUser) GetCuraframe() string {
 	return ""
 }
 
+func (x *DBUser) GetConsumeexp() int32 {
+	if x != nil {
+		return x.Consumeexp
+	}
+	return 0
+}
+
+func (x *DBUser) GetConsumemoney() int32 {
+	if x != nil {
+		return x.Consumemoney
+	}
+	return 0
+}
+
 type DBUserSetting struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -848,7 +864,7 @@ var file_user_user_db_proto_rawDesc = []byte{
 	0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x0e,
 	0x0a, 0x02, 0x69, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x12, 0x1c,
 	0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0xa0, 0x09, 0x0a,
+	0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0xe4, 0x09, 0x0a,
 	0x06, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 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, 0x75, 0x75, 0x69,
@@ -922,46 +938,51 @@ var file_user_user_db_proto_rawDesc = []byte{
 	0x69, 0x74, 0x6c, 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x74, 0x69, 0x74, 0x6c,
 	0x65, 0x18, 0x30, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x75, 0x72, 0x74, 0x69, 0x74, 0x6c,
 	0x65, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x75, 0x72, 0x61, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x18, 0x31,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x75, 0x72, 0x61, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x22,
-	0xc7, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e,
-	0x67, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x0d, 0x52, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x12, 0x1c, 0x0a, 0x09, 0x6b,
-	0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09,
-	0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x12, 0x1a, 0x0a, 0x08, 0x67, 0x61, 0x6f,
-	0x67, 0x75, 0x61, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x67, 0x61, 0x6f,
-	0x67, 0x75, 0x61, 0x6e, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x77, 0x75, 0x6c, 0x69, 0x18, 0x06, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x04, 0x77, 0x75, 0x6c, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x75, 0x73,
-	0x69, 0x63, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x12,
-	0x16, 0x0a, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x75, 0x61, 0x6a, 0x69,
-	0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x67, 0x75, 0x61, 0x6a, 0x69, 0x12, 0x14, 0x0a,
-	0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x66, 0x75,
-	0x62, 0x65, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x18, 0x0b, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x68,
-	0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x68, 0x75,
-	0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x78, 0x75, 0x61, 0x6e, 0x73, 0x68, 0x61,
-	0x6e, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x78, 0x75, 0x61, 0x6e, 0x73, 0x68,
-	0x61, 0x6e, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, 0x18, 0x0e, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, 0x22, 0xb8, 0x01, 0x0a, 0x06, 0x44, 0x42,
-	0x53, 0x69, 0x67, 0x6e, 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, 0x1a, 0x0a, 0x08, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x69,
-	0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x69,
-	0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74,
-	0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x79, 0x18, 0x06, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x75, 0x7a, 0x7a,
-	0x6c, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65,
-	0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x70, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
-	0x74, 0x69, 0x70, 0x73, 0x22, 0x57, 0x0a, 0x0c, 0x44, 0x42, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d,
-	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x63, 0x6e, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x61, 0x6d, 0x65, 0x43, 0x6e, 0x12, 0x16, 0x0a,
-	0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x67,
-	0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x06, 0x5a,
-	0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x75, 0x72, 0x61, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x12,
+	0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, 0x18, 0x32, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, 0x12,
+	0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x18,
+	0x33, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x6d, 0x6f,
+	0x6e, 0x65, 0x79, 0x22, 0xc7, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65,
+	0x74, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68,
+	0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x12,
+	0x1c, 0x0a, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x0d, 0x52, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x12, 0x1a, 0x0a,
+	0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x77, 0x75, 0x6c,
+	0x69, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x77, 0x75, 0x6c, 0x69, 0x12, 0x14, 0x0a,
+	0x05, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x75,
+	0x73, 0x69, 0x63, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x18, 0x08, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67,
+	0x75, 0x61, 0x6a, 0x69, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x67, 0x75, 0x61, 0x6a,
+	0x69, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75,
+	0x6f, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x12,
+	0x18, 0x0a, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x78, 0x75, 0x61,
+	0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x78, 0x75,
+	0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69,
+	0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, 0x22, 0xb8, 0x01,
+	0x0a, 0x06, 0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 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, 0x1a, 0x0a, 0x08, 0x73, 0x69,
+	0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x69,
+	0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x43, 0x6f,
+	0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x43,
+	0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61,
+	0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x79, 0x12, 0x16, 0x0a, 0x06,
+	0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x70, 0x75,
+	0x7a, 0x7a, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x70, 0x73, 0x18, 0x08, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x04, 0x74, 0x69, 0x70, 0x73, 0x22, 0x57, 0x0a, 0x0c, 0x44, 0x42, 0x52, 0x61,
+	0x6e, 0x64, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x6e, 0x61, 0x6d, 0x65,
+	0x5f, 0x63, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x61, 0x6d, 0x65, 0x43,
+	0x6e, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,
+	0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
diff --git a/pb/user_msg.pb.go b/pb/user_msg.pb.go
index 8274f266e..9a81c2b1b 100644
--- a/pb/user_msg.pb.go
+++ b/pb/user_msg.pb.go
@@ -786,6 +786,8 @@ type UserResChangedPush struct {
 	Lv            int32 `protobuf:"varint,18,opt,name=lv,proto3" json:"lv"`
 	Vip           int32 `protobuf:"varint,19,opt,name=vip,proto3" json:"vip"`
 	Deposit       int64 `protobuf:"varint,20,opt,name=deposit,proto3" json:"deposit"`
+	Consumeexp    int32 `protobuf:"varint,21,opt,name=consumeexp,proto3" json:"consumeexp"`
+	Consumemoney  int32 `protobuf:"varint,22,opt,name=consumemoney,proto3" json:"consumemoney"`
 }
 
 func (x *UserResChangedPush) Reset() {
@@ -960,6 +962,20 @@ func (x *UserResChangedPush) GetDeposit() int64 {
 	return 0
 }
 
+func (x *UserResChangedPush) GetConsumeexp() int32 {
+	if x != nil {
+		return x.Consumeexp
+	}
+	return 0
+}
+
+func (x *UserResChangedPush) GetConsumemoney() int32 {
+	if x != nil {
+		return x.Consumemoney
+	}
+	return 0
+}
+
 // 玩家在其它终端登录的通知
 type UserOtherTermLoginPush struct {
 	state         protoimpl.MessageState
@@ -3740,7 +3756,7 @@ var file_user_user_msg_proto_rawDesc = []byte{
 	0x64, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65,
 	0x72, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b,
 	0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61,
-	0x72, 0x64, 0x22, 0x86, 0x04, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x43, 0x68,
+	0x72, 0x64, 0x22, 0xca, 0x04, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x43, 0x68,
 	0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x6f, 0x6c,
 	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x12, 0x10, 0x0a,
 	0x03, 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12,
@@ -3772,198 +3788,203 @@ var file_user_user_msg_proto_rawDesc = []byte{
 	0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x12, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12,
 	0x10, 0x0a, 0x03, 0x76, 0x69, 0x70, 0x18, 0x13, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x69,
 	0x70, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x18, 0x14, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x07, 0x64, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x22, 0x2a, 0x0a, 0x16, 0x55,
-	0x73, 0x65, 0x72, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x54, 0x65, 0x72, 0x6d, 0x4c, 0x6f, 0x67, 0x69,
-	0x6e, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x23, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x50,
-	0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x0e, 0x0a, 0x02,
-	0x70, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x70, 0x73, 0x22, 0x13, 0x0a, 0x11,
-	0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65,
-	0x71, 0x22, 0x3e, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x74, 0x74,
-	0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x28, 0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69,
-	0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65,
-	0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e,
-	0x67, 0x22, 0x40, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53,
-	0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x12, 0x28, 0x0a, 0x07, 0x73, 0x65, 0x74,
-	0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x55,
-	0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x73, 0x65, 0x74, 0x74,
-	0x69, 0x6e, 0x67, 0x22, 0x29, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03,
+	0x28, 0x03, 0x52, 0x07, 0x64, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x63,
+	0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, 0x12, 0x22, 0x0a, 0x0c, 0x63,
+	0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x18, 0x16, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x22,
+	0x2a, 0x0a, 0x16, 0x55, 0x73, 0x65, 0x72, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x54, 0x65, 0x72, 0x6d,
+	0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x23, 0x0a, 0x11, 0x55,
+	0x73, 0x65, 0x72, 0x50, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68,
+	0x12, 0x0e, 0x0a, 0x02, 0x70, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x70, 0x73,
+	0x22, 0x13, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69,
+	0x6e, 0x67, 0x52, 0x65, 0x71, 0x22, 0x3e, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74,
+	0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x28, 0x0a, 0x07, 0x73,
+	0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44,
+	0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x73, 0x65,
+	0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x40, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x55, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x12, 0x28, 0x0a,
+	0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e,
+	0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07,
+	0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x29, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x55,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
+	0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f,
+	0x64, 0x65, 0x52, 0x65, 0x71, 0x22, 0x26, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72,
+	0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x25, 0x0a,
+	0x0f, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71,
+	0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
+	0x63, 0x6f, 0x64, 0x65, 0x22, 0x24, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74,
+	0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73,
+	0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12,
+	0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x22, 0x70, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66,
+	0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52,
+	0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x31, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64,
+	0x69, 0x66, 0x79, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08,
+	0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72,
+	0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
+	0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x22, 0x28,
+	0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x62, 0x67, 0x70, 0x52,
+	0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x22, 0x3b, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72,
+	0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x62, 0x67, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a,
+	0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12,
+	0x14, 0x0a, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x62, 0x67, 0x70, 0x49, 0x64, 0x22, 0x31, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64,
+	0x69, 0x66, 0x79, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08,
+	0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
+	0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72,
+	0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
+	0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x22, 0x12,
+	0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52,
+	0x65, 0x71, 0x22, 0x2d, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a,
+	0x69, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69,
+	0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64,
+	0x73, 0x22, 0x47, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x76, 0x43, 0x68, 0x61, 0x6e, 0x67,
+	0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x54, 0x0a, 0x12, 0x55, 0x73,
+	0x65, 0x72, 0x56, 0x69, 0x70, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68,
+	0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
+	0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x76, 0x69, 0x70, 0x45, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x06, 0x76, 0x69, 0x70, 0x45, 0x78, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x69,
+	0x70, 0x4c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76,
+	0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x73, 0x69,
+	0x67, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x22, 0x28, 0x0a, 0x12, 0x55, 0x73, 0x65,
+	0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x12, 0x0a, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73,
+	0x69, 0x67, 0x6e, 0x22, 0x27, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c,
+	0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0xf0, 0x01, 0x0a,
+	0x14, 0x55, 0x73, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72,
+	0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61,
+	0x74, 0x61, 0x12, 0x1d, 0x0a, 0x02, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
+	0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x52, 0x02, 0x65,
+	0x78, 0x12, 0x33, 0x0a, 0x0c, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72,
+	0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f,
+	0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x0c, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61,
+	0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x34, 0x0a, 0x0d, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e,
+	0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e,
+	0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x0d, 0x68,
+	0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x31, 0x0a, 0x0c,
+	0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x05, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e,
+	0x6b, 0x52, 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22,
+	0x34, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x74, 0x65,
+	0x61, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a,
+	0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f,
+	0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x27, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74,
+	0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03,
 	0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x11,
-	0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65,
-	0x71, 0x22, 0x26, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64,
-	0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x25, 0x0a, 0x0f, 0x55, 0x73, 0x65,
-	0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04,
-	0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65,
-	0x22, 0x24, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61,
-	0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f,
-	0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22,
-	0x70, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d,
-	0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a,
-	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64,
-	0x65, 0x22, 0x31, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x61,
-	0x76, 0x61, 0x74, 0x61, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x76, 0x61, 0x74,
-	0x61, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x76, 0x61, 0x74,
-	0x61, 0x72, 0x49, 0x64, 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69,
-	0x66, 0x79, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03,
-	0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a,
-	0x0a, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x22, 0x28, 0x0a, 0x10, 0x55, 0x73,
-	0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x62, 0x67, 0x70, 0x52, 0x65, 0x71, 0x12, 0x14,
-	0x0a, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62,
-	0x67, 0x70, 0x49, 0x64, 0x22, 0x3b, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69,
-	0x66, 0x79, 0x62, 0x67, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62,
-	0x67, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x67, 0x70, 0x49,
-	0x64, 0x22, 0x31, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x66,
-	0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x67, 0x75,
-	0x72, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x69, 0x67, 0x75,
-	0x72, 0x65, 0x49, 0x64, 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69,
-	0x66, 0x79, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03,
-	0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a,
-	0x0a, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x22, 0x12, 0x0a, 0x10, 0x55, 0x73,
-	0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x2d,
-	0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x73, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x73, 0x22, 0x47, 0x0a,
-	0x11, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x76, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75,
-	0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x54, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x56, 0x69,
-	0x70, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03,
-	0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16,
-	0x0a, 0x06, 0x76, 0x69, 0x70, 0x45, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06,
-	0x76, 0x69, 0x70, 0x45, 0x78, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, 0x22, 0x27, 0x0a, 0x11,
-	0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65,
-	0x71, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x73, 0x69, 0x67, 0x6e, 0x22, 0x28, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64,
-	0x69, 0x66, 0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x73,
-	0x69, 0x67, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x22,
-	0x27, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x65, 0x63,
-	0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0xf0, 0x01, 0x0a, 0x14, 0x55, 0x73, 0x65,
-	0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d,
-	0x0a, 0x02, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x55,
-	0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x52, 0x02, 0x65, 0x78, 0x12, 0x33, 0x0a,
-	0x0c, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65,
-	0x63, 0x6f, 0x72, 0x64, 0x52, 0x0c, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f,
-	0x72, 0x64, 0x12, 0x34, 0x0a, 0x0d, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63,
-	0x6f, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x48, 0x75,
-	0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x0d, 0x68, 0x75, 0x6e, 0x74, 0x69,
-	0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x31, 0x0a, 0x0c, 0x76, 0x69, 0x6b, 0x69,
-	0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d,
-	0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x0c, 0x76,
-	0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x34, 0x0a, 0x12, 0x55,
-	0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65,
-	0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64,
-	0x73, 0x22, 0x27, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67,
-	0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x55, 0x73,
-	0x65, 0x72, 0x53, 0x68, 0x6f, 0x77, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a,
-	0x10, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x77, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64,
-	0x73, 0x22, 0x32, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x43, 0x61, 0x63, 0x68, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05,
-	0x75, 0x73, 0x65, 0x72, 0x73, 0x22, 0x31, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x74,
-	0x61, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x05, 0x75, 0x73, 0x65,
-	0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65,
-	0x72, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22, 0x16, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72,
-	0x47, 0x65, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71,
-	0x22, 0x3a, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65,
-	0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74,
-	0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x53, 0x65, 0x72, 0x76,
-	0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x0d, 0x0a, 0x0b,
-	0x55, 0x73, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x2b, 0x0a, 0x0c, 0x55,
-	0x73, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64,
-	0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x53, 0x69,
-	0x67, 0x6e, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2a, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72,
-	0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 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, 0x2b, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x50, 0x75, 0x7a, 0x7a,
-	0x6c, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69,
-	0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65,
-	0x78, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54,
-	0x69, 0x70, 0x73, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x70, 0x73, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x69, 0x70, 0x73, 0x22, 0x31, 0x0a, 0x12, 0x55, 0x73,
-	0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x69, 0x70, 0x73, 0x52, 0x65, 0x73, 0x70,
-	0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07,
-	0x2e, 0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2f, 0x0a,
-	0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x52, 0x65, 0x71, 0x12,
-	0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e,
-	0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, 0x48,
-	0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x1d, 0x0a, 0x03, 0x61, 0x74, 0x6e, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b,
-	0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x61, 0x74, 0x6e,
-	0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0x81, 0x01, 0x0a, 0x13, 0x55, 0x73, 0x65,
-	0x72, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x44, 0x65, 0x66, 0x50, 0x65, 0x72, 0x52, 0x65, 0x71,
-	0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x77, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65,
+	0x71, 0x22, 0x32, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x77, 0x74, 0x65, 0x61,
+	0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a,
+	0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f,
+	0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x32, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x4f, 0x6e, 0x6c,
+	0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x43, 0x61, 0x63, 0x68, 0x65, 0x55, 0x73,
+	0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22, 0x31, 0x0a, 0x10, 0x55, 0x73, 0x65,
+	0x72, 0x44, 0x61, 0x74, 0x61, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a,
+	0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44,
+	0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22, 0x16, 0x0a, 0x14,
+	0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74,
+	0x61, 0x52, 0x65, 0x71, 0x22, 0x3a, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53,
+	0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a,
+	0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42,
+	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
+	0x22, 0x0d, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x22,
+	0x2b, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e,
+	0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2a, 0x0a, 0x12,
+	0x55, 0x73, 0x65, 0x72, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 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, 0x2b, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72,
+	0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
+	0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x43, 0x68, 0x61,
+	0x6e, 0x67, 0x65, 0x54, 0x69, 0x70, 0x73, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69,
+	0x70, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x69, 0x70, 0x73, 0x22, 0x31,
+	0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x69, 0x70, 0x73,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x04, 0x64, 0x61, 0x74,
+	0x61, 0x22, 0x2f, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x73,
+	0x52, 0x65, 0x71, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74,
+	0x6e, 0x6f, 0x22, 0x48, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65,
+	0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x03, 0x61, 0x74, 0x6e, 0x18, 0x01, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52,
+	0x03, 0x61, 0x74, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0x81, 0x01, 0x0a,
+	0x13, 0x55, 0x73, 0x65, 0x72, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x44, 0x65, 0x66, 0x50, 0x65,
+	0x72, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x12, 0x1c,
+	0x0a, 0x09, 0x63, 0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x09, 0x63, 0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05,
+	0x63, 0x75, 0x72, 0x42, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x75, 0x72,
+	0x42, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x75, 0x72, 0x41, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x75, 0x72, 0x41, 0x66, 0x72, 0x61, 0x6d, 0x65,
+	0x22, 0x7c, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x44, 0x65,
+	0x66, 0x50, 0x65, 0x72, 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,
+	0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x75,
-	0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63,
+	0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63,
 	0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x75, 0x72, 0x42,
-	0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x12, 0x1c,
-	0x0a, 0x09, 0x63, 0x75, 0x72, 0x41, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x09, 0x63, 0x75, 0x72, 0x41, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x22, 0x7c, 0x0a, 0x14,
-	0x55, 0x73, 0x65, 0x72, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x44, 0x65, 0x66, 0x50, 0x65, 0x72,
-	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, 0x12, 0x18, 0x0a, 0x07,
-	0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63,
-	0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x75, 0x72, 0x41, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x75, 0x72, 0x41, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x22, 0x8e, 0x01, 0x0a, 0x10, 0x55,
-	0x73, 0x65, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x6c, 0x69, 0x73, 0x74, 0x50, 0x75, 0x73, 0x68, 0x12,
-	0x14, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05,
-	0x73, 0x6b, 0x69, 0x6e, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x12,
-	0x1c, 0x0a, 0x09, 0x63, 0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x09, 0x63, 0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a,
-	0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x75,
-	0x72, 0x42, 0x67, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x22, 0x13, 0x0a, 0x11, 0x55,
-	0x73, 0x65, 0x72, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71,
-	0x22, 0x40, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x4e, 0x61,
-	0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x65,
-	0x6e, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64,
-	0x65, 0x72, 0x22, 0x10, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x44, 0x65, 0x70, 0x6f, 0x73, 0x69,
-	0x74, 0x52, 0x65, 0x71, 0x22, 0x30, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x44, 0x65, 0x70, 0x6f,
-	0x73, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x03, 0x61, 0x74, 0x6e, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74,
-	0x73, 0x52, 0x03, 0x61, 0x74, 0x6e, 0x22, 0x13, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65,
-	0x74, 0x64, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x52, 0x65, 0x71, 0x22, 0x33, 0x0a, 0x12, 0x55,
-	0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x64, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x1d, 0x0a, 0x03, 0x61, 0x74, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b,
-	0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x61, 0x74, 0x6e,
-	0x22, 0x2a, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x54, 0x69,
-	0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x49, 0x0a, 0x13,
-	0x55, 0x73, 0x65, 0x72, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x54, 0x69, 0x74, 0x6c, 0x65, 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, 0x12, 0x1a, 0x0a, 0x08, 0x63,
-	0x75, 0x72, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63,
-	0x75, 0x72, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x47, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x54,
-	0x69, 0x74, 0x6c, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06,
-	0x74, 0x69, 0x74, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x74, 0x69,
-	0x74, 0x6c, 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x74, 0x69, 0x74, 0x6c, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x75, 0x72, 0x74, 0x69, 0x74, 0x6c, 0x65,
-	0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x22, 0x8e,
+	0x01, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x6c, 0x69, 0x73, 0x74, 0x50,
+	0x75, 0x73, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6e, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72,
+	0x53, 0x6b, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x75, 0x72, 0x53,
+	0x6b, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61,
+	0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x22,
+	0x13, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x4e, 0x61, 0x6d,
+	0x65, 0x52, 0x65, 0x71, 0x22, 0x40, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x52, 0x61, 0x6e, 0x64,
+	0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16,
+	0x0a, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
+	0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x22, 0x10, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x44, 0x65,
+	0x70, 0x6f, 0x73, 0x69, 0x74, 0x52, 0x65, 0x71, 0x22, 0x30, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72,
+	0x44, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x03, 0x61,
+	0x74, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41,
+	0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x61, 0x74, 0x6e, 0x22, 0x13, 0x0a, 0x11, 0x55, 0x73,
+	0x65, 0x72, 0x47, 0x65, 0x74, 0x64, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x52, 0x65, 0x71, 0x22,
+	0x33, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x64, 0x65, 0x70, 0x6f, 0x73, 0x69,
+	0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x03, 0x61, 0x74, 0x6e, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52,
+	0x03, 0x61, 0x74, 0x6e, 0x22, 0x2a, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x53, 0x77, 0x69, 0x74,
+	0x63, 0x68, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69,
+	0x74, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65,
+	0x22, 0x49, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x54, 0x69,
+	0x74, 0x6c, 0x65, 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, 0x12,
+	0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x08, 0x63, 0x75, 0x72, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x47, 0x0a, 0x11, 0x55,
+	0x73, 0x65, 0x72, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x75, 0x73, 0x68,
+	0x12, 0x16, 0x0a, 0x06, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x06, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x74,
+	0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x75, 0x72, 0x74,
+	0x69, 0x74, 0x6c, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

From eb83dd957adbd0d7dfd6e5b5bd60aedb999fee80 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 24 Oct 2023 10:30:21 +0800
Subject: [PATCH 3/3] =?UTF-8?q?4=E6=B6=88=E6=88=965=E6=B6=88=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=96=B0=E7=9A=84=E5=85=83=E7=B4=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/entertainment/xxlPlat.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/entertainment/xxlPlat.go b/modules/entertainment/xxlPlat.go
index 9f1af29bc..120687f82 100644
--- a/modules/entertainment/xxlPlat.go
+++ b/modules/entertainment/xxlPlat.go
@@ -133,7 +133,7 @@ func (this *MapData) Check5X(color int32) (bEliminate bool, score int32, count i
 				}
 				this.oid++
 				// 生成一个新的类型元素
-				if conf, err := this.module.configure.GetGameBlock(k1, FiveType); err != nil {
+				if conf, err := this.module.configure.GetGameBlock(k1, FiveType); err == nil {
 					this.Plat[k+2] = &pb.GirdeData{
 						Oid:     this.oid,
 						Color:   k1,
@@ -161,7 +161,7 @@ func (this *MapData) Check5X(color int32) (bEliminate bool, score int32, count i
 				}
 				this.oid++
 				// 生成一个新的类型元素
-				if conf, err := this.module.configure.GetGameBlock(k1, FiveType); err != nil {
+				if conf, err := this.module.configure.GetGameBlock(k1, FiveType); err == nil {
 					this.Plat[k+2*Width] = &pb.GirdeData{
 						Oid:     this.oid,
 						Color:   k1,
@@ -257,7 +257,7 @@ func (this *MapData) Check4X(color int32) (bEliminate bool, score int32, count i
 				this.oid++
 				// 生成一个新的类型元素
 
-				if conf, err := this.module.configure.GetGameBlock(k1, FourUType); err != nil { // 上下类型
+				if conf, err := this.module.configure.GetGameBlock(k1, FourUType); err == nil { // 上下类型
 					this.Plat[newElem] = &pb.GirdeData{
 						Oid:     this.oid,
 						Color:   k1,
@@ -304,7 +304,7 @@ func (this *MapData) Check4X(color int32) (bEliminate bool, score int32, count i
 				this.oid++
 
 				// 生成一个新的类型元素
-				if conf, err := this.module.configure.GetGameBlock(k1, FourLType); err != nil { // 左右类型
+				if conf, err := this.module.configure.GetGameBlock(k1, FourLType); err == nil { // 左右类型
 					this.Plat[newElem] = &pb.GirdeData{
 						Oid:     this.oid,
 						Color:   k1,