同步表

data/DB_PetSkill.dat

@@ -0,0 +1,3 @@
+
+V鮮ﾁ<>=驥鷹ｸ｡螳亥梱"0蝨ｨ陲ｫ轤ｸ蠑ｹ譏守｡ｮ謾ｻ蜃ｻ譌ｶ{0}讎ら紫螳悟<E89EB3>蜈咲稔(
+0
:	100013,20

data/DB_PetSkill.json

@@ -0,0 +1,13 @@
+{
+	"Arr": [
+		{
+			"Id": 10001,
+			"PetId": 1000001,
+			"SkillName": "金鸡守卫",
+			"SKillDes": "在被炸弹明确攻击时{0}概率完全免疫",
+			"SKillLevel": 10,
+			"SKillUnlockType": 1,
+			"SKillUnlockTakes": "100013,20"
+		}
+	]
+}

data/DB_PetSkillDes.dat

@@ -0,0 +1,13 @@
+
+
慛
"
5(瓖0
+慛"
6(瓖0
+慛"
7(瓖0
+慛"
8(瓖02
+慛"
9(瓖02
+慛"10(瓖02
+慛"11(瓖02
+慛"12(瓖02
+	慛	"13(瓖02
+
+慛
+"14

data/DB_PetSkillDes.json

@@ -0,0 +1,82 @@
+{
+	"Arr": [
+		{
+			"Id": 1,
+			"SkillId": 10001,
+			"SkillLevel": 1,
+			"SKillValue": "5",
+			"Fragment": 100013,
+			"Amount": 20
+		},
+		{
+			"Id": 2,
+			"SkillId": 10001,
+			"SkillLevel": 2,
+			"SKillValue": "6",
+			"Fragment": 100013,
+			"Amount": 20
+		},
+		{
+			"Id": 3,
+			"SkillId": 10001,
+			"SkillLevel": 3,
+			"SKillValue": "7",
+			"Fragment": 100013,
+			"Amount": 20
+		},
+		{
+			"Id": 4,
+			"SkillId": 10001,
+			"SkillLevel": 4,
+			"SKillValue": "8",
+			"Fragment": 100013,
+			"Amount": 50
+		},
+		{
+			"Id": 5,
+			"SkillId": 10001,
+			"SkillLevel": 5,
+			"SKillValue": "9",
+			"Fragment": 100013,
+			"Amount": 50
+		},
+		{
+			"Id": 6,
+			"SkillId": 10001,
+			"SkillLevel": 6,
+			"SKillValue": "10",
+			"Fragment": 100013,
+			"Amount": 50
+		},
+		{
+			"Id": 7,
+			"SkillId": 10001,
+			"SkillLevel": 7,
+			"SKillValue": "11",
+			"Fragment": 100013,
+			"Amount": 50
+		},
+		{
+			"Id": 8,
+			"SkillId": 10001,
+			"SkillLevel": 8,
+			"SKillValue": "12",
+			"Fragment": 100013,
+			"Amount": 50
+		},
+		{
+			"Id": 9,
+			"SkillId": 10001,
+			"SkillLevel": 9,
+			"SKillValue": "13",
+			"Fragment": 100013,
+			"Amount": 50
+		},
+		{
+			"Id": 10,
+			"SkillId": 10001,
+			"SkillLevel": 10,
+			"SKillValue": "14"
+		}
+	]
+}

model/player.go

@@ -514,6 +514,7 @@ func NewWelfareData() *WelfareData {
 		Task:             make(map[int32]*TaskData),
 		PhoneLotteryTask: make(map[int32]*TaskData),
 		PigBank:          &PigBankData{},
+		DiamondBank:      &DiamondBankData{},
 	}
 }
 

protocol/server/pbdata.pb.go

@@ -7548,7 +7548,7 @@ type DB_PetSkill struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	ID               int32  `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"`
+	Id               int32  `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"`
 	PetId            int32  `protobuf:"varint,2,opt,name=PetId,proto3" json:"PetId,omitempty"`
 	SkillName        string `protobuf:"bytes,3,opt,name=SkillName,proto3" json:"SkillName,omitempty"`
 	SKillDes         string `protobuf:"bytes,4,opt,name=SKillDes,proto3" json:"SKillDes,omitempty"`
@@ -7589,9 +7589,9 @@ func (*DB_PetSkill) Descriptor() ([]byte, []int) {
 	return file_pbdata_proto_rawDescGZIP(), []int{96}
 }
 
-func (x *DB_PetSkill) GetID() int32 {
+func (x *DB_PetSkill) GetId() int32 {
 	if x != nil {
-		return x.ID
+		return x.Id
 	}
 	return 0
 }
@@ -7690,7 +7690,7 @@ type DB_PetSkillDes struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	ID         int32  `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"`
+	Id         int32  `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"`
 	SkillId    int32  `protobuf:"varint,2,opt,name=SkillId,proto3" json:"SkillId,omitempty"`
 	SkillLevel int32  `protobuf:"varint,3,opt,name=SkillLevel,proto3" json:"SkillLevel,omitempty"`
 	SKillValue string `protobuf:"bytes,4,opt,name=SKillValue,proto3" json:"SKillValue,omitempty"`
@@ -7730,9 +7730,9 @@ func (*DB_PetSkillDes) Descriptor() ([]byte, []int) {
 	return file_pbdata_proto_rawDescGZIP(), []int{98}
 }
 
-func (x *DB_PetSkillDes) GetID() int32 {
+func (x *DB_PetSkillDes) GetId() int32 {
 	if x != nil {
-		return x.ID
+		return x.Id
 	}
 	return 0
 }
@@ -11438,8 +11438,8 @@ var file_pbdata_proto_rawDesc = []byte{
 	0x26, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x73,
 	0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x4e, 0x65, 0x77, 0x50, 0x6c, 0x61, 0x79,
 	0x65, 0x72, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0xe3, 0x01, 0x0a, 0x0b, 0x44, 0x42, 0x5f, 0x50,
-	0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20,
+	0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x44, 0x12, 0x14, 0x0a, 0x05, 0x50, 0x65, 0x74, 0x49, 0x64,
+	0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x50, 0x65, 0x74, 0x49, 0x64,
 	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x50, 0x65, 0x74, 0x49, 0x64, 0x12, 0x1c, 0x0a,
 	0x09, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
 	0x52, 0x09, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x53,
@@ -11457,7 +11457,7 @@ var file_pbdata_proto_rawDesc = []byte{
 	0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x50, 0x65, 0x74, 0x53, 0x6b,
 	0x69, 0x6c, 0x6c, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0xae, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x5f,
 	0x50, 0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x65, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x49,
-	0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x53,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x53,
 	0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x53, 0x6b,
 	0x69, 0x6c, 0x6c, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x65,
 	0x76, 0x65, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c,

protocol/server/pbdata.proto

@@ -1239,7 +1239,7 @@ message DB_NewPlayerArray {
 
 message DB_PetSkill {
 
-	int32 ID = 1;
+	int32 Id = 1;
 
 	int32 PetId = 2;
 
@@ -1261,7 +1261,7 @@ message DB_PetSkillArray {
 
 message DB_PetSkillDes {
 
-	int32 ID = 1;
+	int32 Id = 1;
 
 	int32 SkillId = 2;
 

protocol/welfare/welfare.pb.go

@@ -138,8 +138,7 @@ const (
 	SPacketID_PACKET_SCPigbankTakeCoin        SPacketID = 2913 // 存钱罐领取金币
 	SPacketID_PACKET_CSDiamondBankGetInfo     SPacketID = 2914 //钻石存钱罐信息获取
 	SPacketID_PACKET_SCDiamondBankGetInfo     SPacketID = 2915 //钻石存钱罐信息返回
-	SPacketID_PACKET_CSDiamondBankTakeDiamond SPacketID = 2916 //钻石存钱罐领取
+	SPacketID_PACKET_SCDiamondBankTakeDiamond SPacketID = 2916 //钻石存钱罐领取返回
-	SPacketID_PACKET_SCDiamondBankTakeDiamond SPacketID = 2917 //钻石存钱罐领取返回
 )
 
 // Enum value maps for SPacketID.
@@ -180,8 +179,7 @@ var (
 		2913: "PACKET_SCPigbankTakeCoin",
 		2914: "PACKET_CSDiamondBankGetInfo",
 		2915: "PACKET_SCDiamondBankGetInfo",
-		2916: "PACKET_CSDiamondBankTakeDiamond",
+		2916: "PACKET_SCDiamondBankTakeDiamond",
-		2917: "PACKET_SCDiamondBankTakeDiamond",
 	}
 	SPacketID_value = map[string]int32{
 		"PACKET_SHOP_ZERO":                0,
@@ -219,8 +217,7 @@ var (
 		"PACKET_SCPigbankTakeCoin":        2913,
 		"PACKET_CSDiamondBankGetInfo":     2914,
 		"PACKET_SCDiamondBankGetInfo":     2915,
-		"PACKET_CSDiamondBankTakeDiamond": 2916,
+		"PACKET_SCDiamondBankTakeDiamond": 2916,
-		"PACKET_SCDiamondBankTakeDiamond": 2917,
 	}
 )
 
@@ -2841,6 +2838,111 @@ func (x *SCDiamondBankGetInfo) GetShopId() int32 {
 	return 0
 }
 
+// 钻石存钱罐领取金币
+//PACKET_SCDiamondBankTakeDiamond
+type SCDiamondBankTakeDiamond struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	OpRetCode      OpResultCode `protobuf:"varint,1,opt,name=OpRetCode,proto3,enum=welfare.OpResultCode" json:"OpRetCode,omitempty"` // 结果
+	TakeDiamondNum float64      `protobuf:"fixed64,2,opt,name=TakeDiamondNum,proto3" json:"TakeDiamondNum,omitempty"`                // 领取钻石数量
+	TakeTimes      int32        `protobuf:"varint,3,opt,name=TakeTimes,proto3" json:"TakeTimes,omitempty"`                           // 领取次数
+	BankMaxDiamond int64        `protobuf:"varint,4,opt,name=BankMaxDiamond,proto3" json:"BankMaxDiamond,omitempty"`                 // 存钱罐最大储存值
+	DayBuyMaxCnt   int32        `protobuf:"varint,5,opt,name=DayBuyMaxCnt,proto3" json:"DayBuyMaxCnt,omitempty"`                     // 今日最大可购买次数
+	Price          int64        `protobuf:"varint,6,opt,name=Price,proto3" json:"Price,omitempty"`                                   //原价
+	NowPrice       int64        `protobuf:"varint,7,opt,name=NowPrice,proto3" json:"NowPrice,omitempty"`                             //现价
+	ShopId         int32        `protobuf:"varint,8,opt,name=ShopId,proto3" json:"ShopId,omitempty"`                                 //商城ID
+}
+
+func (x *SCDiamondBankTakeDiamond) Reset() {
+	*x = SCDiamondBankTakeDiamond{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_welfare_proto_msgTypes[42]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SCDiamondBankTakeDiamond) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SCDiamondBankTakeDiamond) ProtoMessage() {}
+
+func (x *SCDiamondBankTakeDiamond) ProtoReflect() protoreflect.Message {
+	mi := &file_welfare_proto_msgTypes[42]
+	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 SCDiamondBankTakeDiamond.ProtoReflect.Descriptor instead.
+func (*SCDiamondBankTakeDiamond) Descriptor() ([]byte, []int) {
+	return file_welfare_proto_rawDescGZIP(), []int{42}
+}
+
+func (x *SCDiamondBankTakeDiamond) GetOpRetCode() OpResultCode {
+	if x != nil {
+		return x.OpRetCode
+	}
+	return OpResultCode_OPRC_Sucess
+}
+
+func (x *SCDiamondBankTakeDiamond) GetTakeDiamondNum() float64 {
+	if x != nil {
+		return x.TakeDiamondNum
+	}
+	return 0
+}
+
+func (x *SCDiamondBankTakeDiamond) GetTakeTimes() int32 {
+	if x != nil {
+		return x.TakeTimes
+	}
+	return 0
+}
+
+func (x *SCDiamondBankTakeDiamond) GetBankMaxDiamond() int64 {
+	if x != nil {
+		return x.BankMaxDiamond
+	}
+	return 0
+}
+
+func (x *SCDiamondBankTakeDiamond) GetDayBuyMaxCnt() int32 {
+	if x != nil {
+		return x.DayBuyMaxCnt
+	}
+	return 0
+}
+
+func (x *SCDiamondBankTakeDiamond) GetPrice() int64 {
+	if x != nil {
+		return x.Price
+	}
+	return 0
+}
+
+func (x *SCDiamondBankTakeDiamond) GetNowPrice() int64 {
+	if x != nil {
+		return x.NowPrice
+	}
+	return 0
+}
+
+func (x *SCDiamondBankTakeDiamond) GetShopId() int32 {
+	if x != nil {
+		return x.ShopId
+	}
+	return 0
+}
+
 var File_welfare_proto protoreflect.FileDescriptor
 
 var file_welfare_proto_rawDesc = []byte{
@@ -3118,101 +3220,118 @@ var file_welfare_proto_rawDesc = []byte{
 	0x52, 0x05, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x6f, 0x77, 0x50, 0x72,
 	0x69, 0x63, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x4e, 0x6f, 0x77, 0x50, 0x72,
 	0x69, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x18, 0x08, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x06, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x2a, 0x86, 0x02, 0x0a, 0x0c,
+	0x01, 0x28, 0x05, 0x52, 0x06, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x22, 0xab, 0x02, 0x0a, 0x18,
-	0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0f, 0x0a, 0x0b,
+	0x53, 0x43, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x42, 0x61, 0x6e, 0x6b, 0x54, 0x61, 0x6b,
-	0x4f, 0x50, 0x52, 0x43, 0x5f, 0x53, 0x75, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0e, 0x0a,
+	0x65, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x12, 0x33, 0x0a, 0x09, 0x4f, 0x70, 0x52, 0x65,
-	0x0a, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x01, 0x12, 0x10, 0x0a,
+	0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x15, 0x2e, 0x77, 0x65,
-	0x0c, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x4e, 0x6f, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x10, 0x02, 0x12,
+	0x6c, 0x66, 0x61, 0x72, 0x65, 0x2e, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f,
-	0x14, 0x0a, 0x10, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x43, 0x6f, 0x69, 0x6e, 0x54, 0x6f, 0x6f, 0x4d,
+	0x64, 0x65, 0x52, 0x09, 0x4f, 0x70, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x26, 0x0a,
-	0x6f, 0x72, 0x65, 0x10, 0x03, 0x12, 0x10, 0x0a, 0x0c, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x45, 0x72,
+	0x0e, 0x54, 0x61, 0x6b, 0x65, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4e, 0x75, 0x6d, 0x18,
-	0x72, 0x43, 0x6f, 0x69, 0x6e, 0x10, 0x04, 0x12, 0x14, 0x0a, 0x10, 0x4f, 0x50, 0x52, 0x43, 0x5f,
+	0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0e, 0x54, 0x61, 0x6b, 0x65, 0x44, 0x69, 0x61, 0x6d, 0x6f,
-	0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x42, 0x69, 0x6e, 0x64, 0x10, 0x05, 0x12, 0x11, 0x0a,
+	0x6e, 0x64, 0x4e, 0x75, 0x6d, 0x12, 0x1c, 0x0a, 0x09, 0x54, 0x61, 0x6b, 0x65, 0x54, 0x69, 0x6d,
-	0x0d, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x42, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x6c, 0x66, 0x10, 0x06,
+	0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x54, 0x61, 0x6b, 0x65, 0x54, 0x69,
-	0x12, 0x11, 0x0a, 0x0d, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x4d, 0x79, 0x49, 0x6e, 0x76, 0x69, 0x74,
+	0x6d, 0x65, 0x73, 0x12, 0x26, 0x0a, 0x0e, 0x42, 0x61, 0x6e, 0x6b, 0x4d, 0x61, 0x78, 0x44, 0x69,
-	0x65, 0x10, 0x07, 0x12, 0x11, 0x0a, 0x0d, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x4e, 0x6f, 0x74, 0x45,
+	0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x42, 0x61, 0x6e,
-	0x78, 0x69, 0x73, 0x74, 0x10, 0x08, 0x12, 0x14, 0x0a, 0x10, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x44,
+	0x6b, 0x4d, 0x61, 0x78, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x44,
-	0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4c, 0x65, 0x73, 0x73, 0x10, 0x09, 0x12, 0x17, 0x0a, 0x13,
+	0x61, 0x79, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x4f, 0x50, 0x52, 0x43, 0x5f, 0x50, 0x69, 0x67, 0x62, 0x61, 0x6e, 0x6b, 0x4e, 0x6f, 0x74, 0x46,
+	0x05, 0x52, 0x0c, 0x44, 0x61, 0x79, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6e, 0x74, 0x12,
-	0x75, 0x6c, 0x6c, 0x10, 0x0a, 0x12, 0x1d, 0x0a, 0x19, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x50, 0x69,
+	0x14, 0x0a, 0x05, 0x50, 0x72, 0x69, 0x63, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
-	0x67, 0x62, 0x61, 0x6e, 0x6b, 0x4f, 0x76, 0x65, 0x72, 0x54, 0x61, 0x6b, 0x65, 0x54, 0x69, 0x6d,
+	0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x6f, 0x77, 0x50, 0x72, 0x69, 0x63,
-	0x65, 0x73, 0x10, 0x0b, 0x2a, 0xa5, 0x09, 0x0a, 0x09, 0x53, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74,
+	0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x4e, 0x6f, 0x77, 0x50, 0x72, 0x69, 0x63,
-	0x49, 0x44, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x48, 0x4f,
+	0x65, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28,
-	0x50, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x21, 0x0a, 0x1c, 0x50, 0x41, 0x43, 0x4b,
+	0x05, 0x52, 0x06, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x2a, 0x86, 0x02, 0x0a, 0x0c, 0x4f, 0x70,
-	0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x47, 0x45, 0x54, 0x52, 0x45,
+	0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x4f, 0x50,
-	0x4c, 0x49, 0x45, 0x46, 0x46, 0x55, 0x4e, 0x44, 0x10, 0x94, 0x14, 0x12, 0x21, 0x0a, 0x1c, 0x50,
+	0x52, 0x43, 0x5f, 0x53, 0x75, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x4f,
-	0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x47, 0x45,
+	0x50, 0x52, 0x43, 0x5f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x4f,
-	0x54, 0x52, 0x45, 0x4c, 0x49, 0x45, 0x46, 0x46, 0x55, 0x4e, 0x44, 0x10, 0x95, 0x14, 0x12, 0x20,
+	0x50, 0x52, 0x43, 0x5f, 0x4e, 0x6f, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x10, 0x02, 0x12, 0x14, 0x0a,
-	0x0a, 0x1b, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x57, 0x45, 0x4c, 0x46,
+	0x10, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x43, 0x6f, 0x69, 0x6e, 0x54, 0x6f, 0x6f, 0x4d, 0x6f, 0x72,
-	0x5f, 0x47, 0x45, 0x54, 0x54, 0x55, 0x52, 0x4e, 0x50, 0x4c, 0x41, 0x54, 0x45, 0x10, 0x96, 0x14,
+	0x65, 0x10, 0x03, 0x12, 0x10, 0x0a, 0x0c, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x45, 0x72, 0x72, 0x43,
-	0x12, 0x20, 0x0a, 0x1b, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x57, 0x45,
+	0x6f, 0x69, 0x6e, 0x10, 0x04, 0x12, 0x14, 0x0a, 0x10, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x41, 0x6c,
-	0x4c, 0x46, 0x5f, 0x47, 0x45, 0x54, 0x54, 0x55, 0x52, 0x4e, 0x50, 0x4c, 0x41, 0x54, 0x45, 0x10,
+	0x72, 0x65, 0x61, 0x64, 0x79, 0x42, 0x69, 0x6e, 0x64, 0x10, 0x05, 0x12, 0x11, 0x0a, 0x0d, 0x4f,
-	0x97, 0x14, 0x12, 0x20, 0x0a, 0x1b, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f,
+	0x50, 0x52, 0x43, 0x5f, 0x42, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x6c, 0x66, 0x10, 0x06, 0x12, 0x11,
+	0x0a, 0x0d, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x4d, 0x79, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x10,
+	0x07, 0x12, 0x11, 0x0a, 0x0d, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x4e, 0x6f, 0x74, 0x45, 0x78, 0x69,
+	0x73, 0x74, 0x10, 0x08, 0x12, 0x14, 0x0a, 0x10, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x44, 0x69, 0x61,
+	0x6d, 0x6f, 0x6e, 0x64, 0x4c, 0x65, 0x73, 0x73, 0x10, 0x09, 0x12, 0x17, 0x0a, 0x13, 0x4f, 0x50,
+	0x52, 0x43, 0x5f, 0x50, 0x69, 0x67, 0x62, 0x61, 0x6e, 0x6b, 0x4e, 0x6f, 0x74, 0x46, 0x75, 0x6c,
+	0x6c, 0x10, 0x0a, 0x12, 0x1d, 0x0a, 0x19, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x50, 0x69, 0x67, 0x62,
+	0x61, 0x6e, 0x6b, 0x4f, 0x76, 0x65, 0x72, 0x54, 0x61, 0x6b, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73,
+	0x10, 0x0b, 0x2a, 0xff, 0x08, 0x0a, 0x09, 0x53, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x44,
+	0x12, 0x14, 0x0a, 0x10, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x48, 0x4f, 0x50, 0x5f,
+	0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x21, 0x0a, 0x1c, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
+	0x5f, 0x43, 0x53, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x47, 0x45, 0x54, 0x52, 0x45, 0x4c, 0x49,
+	0x45, 0x46, 0x46, 0x55, 0x4e, 0x44, 0x10, 0x94, 0x14, 0x12, 0x21, 0x0a, 0x1c, 0x50, 0x41, 0x43,
+	0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x47, 0x45, 0x54, 0x52,
+	0x45, 0x4c, 0x49, 0x45, 0x46, 0x46, 0x55, 0x4e, 0x44, 0x10, 0x95, 0x14, 0x12, 0x20, 0x0a, 0x1b,
+	0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x47,
+	0x45, 0x54, 0x54, 0x55, 0x52, 0x4e, 0x50, 0x4c, 0x41, 0x54, 0x45, 0x10, 0x96, 0x14, 0x12, 0x20,
+	0x0a, 0x1b, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x57, 0x45, 0x4c, 0x46,
+	0x5f, 0x47, 0x45, 0x54, 0x54, 0x55, 0x52, 0x4e, 0x50, 0x4c, 0x41, 0x54, 0x45, 0x10, 0x97, 0x14,
+	0x12, 0x20, 0x0a, 0x1b, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x57, 0x45,
+	0x4c, 0x46, 0x5f, 0x47, 0x45, 0x54, 0x41, 0x44, 0x44, 0x55, 0x50, 0x53, 0x49, 0x47, 0x4e, 0x10,
+	0x98, 0x14, 0x12, 0x20, 0x0a, 0x1b, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f,
 	0x57, 0x45, 0x4c, 0x46, 0x5f, 0x47, 0x45, 0x54, 0x41, 0x44, 0x44, 0x55, 0x50, 0x53, 0x49, 0x47,
-	0x4e, 0x10, 0x98, 0x14, 0x12, 0x20, 0x0a, 0x1b, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53,
+	0x4e, 0x10, 0x99, 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43,
-	0x43, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x47, 0x45, 0x54, 0x41, 0x44, 0x44, 0x55, 0x50, 0x53,
+	0x53, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x41, 0x52, 0x45, 0x49, 0x4e,
-	0x49, 0x47, 0x4e, 0x10, 0x99, 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
+	0x46, 0x4f, 0x10, 0x9a, 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f,
-	0x5f, 0x43, 0x53, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x41, 0x52, 0x45,
+	0x53, 0x43, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x41, 0x52, 0x45, 0x49,
-	0x49, 0x4e, 0x46, 0x4f, 0x10, 0x9a, 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x50, 0x41, 0x43, 0x4b, 0x45,
+	0x4e, 0x46, 0x4f, 0x10, 0x9b, 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
-	0x54, 0x5f, 0x53, 0x43, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x41, 0x52,
+	0x5f, 0x43, 0x53, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x42, 0x4c, 0x49, 0x4e, 0x42, 0x4f, 0x58,
-	0x45, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0x9b, 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x50, 0x41, 0x43, 0x4b,
+	0x49, 0x4e, 0x46, 0x4f, 0x10, 0x9c, 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x50, 0x41, 0x43, 0x4b, 0x45,
-	0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x42, 0x4c, 0x49, 0x4e, 0x42,
+	0x54, 0x5f, 0x53, 0x43, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x42, 0x4c, 0x49, 0x4e, 0x42, 0x4f,
-	0x4f, 0x58, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0x9c, 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x50, 0x41, 0x43,
+	0x58, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0x9d, 0x14, 0x12, 0x1e, 0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b,
-	0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x42, 0x4c, 0x49, 0x4e,
+	0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x47, 0x45, 0x54, 0x42, 0x4c,
-	0x42, 0x4f, 0x58, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0x9d, 0x14, 0x12, 0x1e, 0x0a, 0x19, 0x50, 0x41,
+	0x49, 0x4e, 0x42, 0x4f, 0x58, 0x10, 0x9e, 0x14, 0x12, 0x1e, 0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b,
-	0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x47, 0x45, 0x54,
+	0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x47, 0x45, 0x54, 0x42, 0x4c,
-	0x42, 0x4c, 0x49, 0x4e, 0x42, 0x4f, 0x58, 0x10, 0x9e, 0x14, 0x12, 0x1e, 0x0a, 0x19, 0x50, 0x41,
+	0x49, 0x4e, 0x42, 0x4f, 0x58, 0x10, 0x9f, 0x14, 0x12, 0x20, 0x0a, 0x1b, 0x50, 0x41, 0x43, 0x4b,
-	0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x47, 0x45, 0x54,
+	0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x46, 0x49, 0x52, 0x53, 0x54,
-	0x42, 0x4c, 0x49, 0x4e, 0x42, 0x4f, 0x58, 0x10, 0x9f, 0x14, 0x12, 0x20, 0x0a, 0x1b, 0x50, 0x41,
+	0x50, 0x41, 0x59, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0xa0, 0x14, 0x12, 0x20, 0x0a, 0x1b, 0x50, 0x41,
-	0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x46, 0x49, 0x52,
+	0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x46, 0x49, 0x52,
-	0x53, 0x54, 0x50, 0x41, 0x59, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0xa0, 0x14, 0x12, 0x20, 0x0a, 0x1b,
+	0x53, 0x54, 0x50, 0x41, 0x59, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0xa1, 0x14, 0x12, 0x1c, 0x0a, 0x17,
-	0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x46,
+	0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x46,
-	0x49, 0x52, 0x53, 0x54, 0x50, 0x41, 0x59, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0xa1, 0x14, 0x12, 0x1c,
+	0x49, 0x52, 0x53, 0x54, 0x50, 0x41, 0x59, 0x10, 0xa2, 0x14, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41,
-	0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x57, 0x45, 0x4c, 0x46,
+	0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x46, 0x49, 0x52,
-	0x5f, 0x46, 0x49, 0x52, 0x53, 0x54, 0x50, 0x41, 0x59, 0x10, 0xa2, 0x14, 0x12, 0x1c, 0x0a, 0x17,
+	0x53, 0x54, 0x50, 0x41, 0x59, 0x10, 0xa3, 0x14, 0x12, 0x21, 0x0a, 0x1c, 0x50, 0x41, 0x43, 0x4b,
-	0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x46,
+	0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x49,
-	0x49, 0x52, 0x53, 0x54, 0x50, 0x41, 0x59, 0x10, 0xa3, 0x14, 0x12, 0x21, 0x0a, 0x1c, 0x50, 0x41,
+	0x4e, 0x50, 0x41, 0x59, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0xa4, 0x14, 0x12, 0x21, 0x0a, 0x1c, 0x50,
-	0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x43, 0x4f, 0x4e,
+	0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f, 0x43, 0x4f,
-	0x54, 0x49, 0x4e, 0x50, 0x41, 0x59, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0xa4, 0x14, 0x12, 0x21, 0x0a,
+	0x4e, 0x54, 0x49, 0x4e, 0x50, 0x41, 0x59, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0xa5, 0x14, 0x12, 0x1d,
-	0x1c, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f,
+	0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x57, 0x45, 0x4c, 0x46,
-	0x43, 0x4f, 0x4e, 0x54, 0x49, 0x4e, 0x50, 0x41, 0x59, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0xa5, 0x14,
+	0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x49, 0x4e, 0x50, 0x41, 0x59, 0x10, 0xa6, 0x14, 0x12, 0x1d, 0x0a,
-	0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x57, 0x45,
+	0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x57, 0x45, 0x4c, 0x46, 0x5f,
-	0x4c, 0x46, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x49, 0x4e, 0x50, 0x41, 0x59, 0x10, 0xa6, 0x14, 0x12,
+	0x43, 0x4f, 0x4e, 0x54, 0x49, 0x4e, 0x50, 0x41, 0x59, 0x10, 0xa7, 0x14, 0x12, 0x22, 0x0a, 0x1d,
-	0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x57, 0x45, 0x4c,
+	0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x53, 0x69, 0x67, 0x6e, 0x44, 0x61,
-	0x46, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x49, 0x4e, 0x50, 0x41, 0x59, 0x10, 0xa7, 0x14, 0x12, 0x22,
+	0x79, 0x5f, 0x41, 0x64, 0x64, 0x75, 0x70, 0x32, 0x41, 0x77, 0x61, 0x72, 0x64, 0x10, 0xa8, 0x14,
-	0x0a, 0x1d, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x53, 0x69, 0x67, 0x6e,
+	0x12, 0x22, 0x0a, 0x1d, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x53, 0x69,
-	0x44, 0x61, 0x79, 0x5f, 0x41, 0x64, 0x64, 0x75, 0x70, 0x32, 0x41, 0x77, 0x61, 0x72, 0x64, 0x10,
+	0x67, 0x6e, 0x44, 0x61, 0x79, 0x5f, 0x41, 0x64, 0x64, 0x75, 0x70, 0x32, 0x41, 0x77, 0x61, 0x72,
-	0xa8, 0x14, 0x12, 0x22, 0x0a, 0x1d, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f,
+	0x64, 0x10, 0xa9, 0x14, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43,
-	0x53, 0x69, 0x67, 0x6e, 0x44, 0x61, 0x79, 0x5f, 0x41, 0x64, 0x64, 0x75, 0x70, 0x32, 0x41, 0x77,
+	0x53, 0x57, 0x65, 0x6c, 0x66, 0x52, 0x65, 0x6c, 0x69, 0x65, 0x66, 0x10, 0xd4, 0x16, 0x12, 0x18,
-	0x61, 0x72, 0x64, 0x10, 0xa9, 0x14, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
+	0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x57, 0x65, 0x6c, 0x66, 0x52,
-	0x5f, 0x43, 0x53, 0x57, 0x65, 0x6c, 0x66, 0x52, 0x65, 0x6c, 0x69, 0x65, 0x66, 0x10, 0xd4, 0x16,
+	0x65, 0x6c, 0x69, 0x65, 0x66, 0x10, 0xd5, 0x16, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b,
-	0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x57, 0x65, 0x6c,
+	0x45, 0x54, 0x5f, 0x43, 0x53, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x10,
-	0x66, 0x52, 0x65, 0x6c, 0x69, 0x65, 0x66, 0x10, 0xd5, 0x16, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41,
+	0xd6, 0x16, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x49,
-	0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x49, 0x6e, 0x66,
+	0x6e, 0x76, 0x69, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0xd7, 0x16, 0x12, 0x18, 0x0a, 0x13,
-	0x6f, 0x10, 0xd6, 0x16, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53,
+	0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x42, 0x69, 0x6e, 0x64, 0x49, 0x6e, 0x76,
-	0x43, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0xd7, 0x16, 0x12, 0x18,
+	0x69, 0x74, 0x65, 0x10, 0xd8, 0x16, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
-	0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x42, 0x69, 0x6e, 0x64, 0x49,
+	0x5f, 0x53, 0x43, 0x42, 0x69, 0x6e, 0x64, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x10, 0xd9, 0x16,
-	0x6e, 0x76, 0x69, 0x74, 0x65, 0x10, 0xd8, 0x16, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b,
+	0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x50, 0x69, 0x67,
-	0x45, 0x54, 0x5f, 0x53, 0x43, 0x42, 0x69, 0x6e, 0x64, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x10,
+	0x62, 0x61, 0x6e, 0x6b, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0xde, 0x16, 0x12, 0x1c,
-	0xd9, 0x16, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x50,
+	0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x50, 0x69, 0x67, 0x62, 0x61,
-	0x69, 0x67, 0x62, 0x61, 0x6e, 0x6b, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0xde, 0x16,
+	0x6e, 0x6b, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0xdf, 0x16, 0x12, 0x1d, 0x0a, 0x18,
-	0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x50, 0x69, 0x67,
+	0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x50, 0x69, 0x67, 0x62, 0x61, 0x6e, 0x6b,
-	0x62, 0x61, 0x6e, 0x6b, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0xdf, 0x16, 0x12, 0x1d,
+	0x54, 0x61, 0x6b, 0x65, 0x43, 0x6f, 0x69, 0x6e, 0x10, 0xe0, 0x16, 0x12, 0x1d, 0x0a, 0x18, 0x50,
-	0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x50, 0x69, 0x67, 0x62, 0x61,
+	0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x50, 0x69, 0x67, 0x62, 0x61, 0x6e, 0x6b, 0x54,
-	0x6e, 0x6b, 0x54, 0x61, 0x6b, 0x65, 0x43, 0x6f, 0x69, 0x6e, 0x10, 0xe0, 0x16, 0x12, 0x1d, 0x0a,
+	0x61, 0x6b, 0x65, 0x43, 0x6f, 0x69, 0x6e, 0x10, 0xe1, 0x16, 0x12, 0x20, 0x0a, 0x1b, 0x50, 0x41,
-	0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x50, 0x69, 0x67, 0x62, 0x61, 0x6e,
+	0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x42, 0x61,
-	0x6b, 0x54, 0x61, 0x6b, 0x65, 0x43, 0x6f, 0x69, 0x6e, 0x10, 0xe1, 0x16, 0x12, 0x20, 0x0a, 0x1b,
+	0x6e, 0x6b, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0xe2, 0x16, 0x12, 0x20, 0x0a, 0x1b,
-	0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64,
+	0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64,
-	0x42, 0x61, 0x6e, 0x6b, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0xe2, 0x16, 0x12, 0x20,
+	0x42, 0x61, 0x6e, 0x6b, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0xe3, 0x16, 0x12, 0x24,
-	0x0a, 0x1b, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x44, 0x69, 0x61, 0x6d, 0x6f,
+	0x0a, 0x1f, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x44, 0x69, 0x61, 0x6d, 0x6f,
-	0x6e, 0x64, 0x42, 0x61, 0x6e, 0x6b, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0xe3, 0x16,
+	0x6e, 0x64, 0x42, 0x61, 0x6e, 0x6b, 0x54, 0x61, 0x6b, 0x65, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e,
-	0x12, 0x24, 0x0a, 0x1f, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x44, 0x69, 0x61,
+	0x64, 0x10, 0xe4, 0x16, 0x42, 0x27, 0x5a, 0x25, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61,
-	0x6d, 0x6f, 0x6e, 0x64, 0x42, 0x61, 0x6e, 0x6b, 0x54, 0x61, 0x6b, 0x65, 0x44, 0x69, 0x61, 0x6d,
+	0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f,
-	0x6f, 0x6e, 0x64, 0x10, 0xe4, 0x16, 0x12, 0x24, 0x0a, 0x1f, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
+	0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x77, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x62, 0x06, 0x70,
-	0x5f, 0x53, 0x43, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x42, 0x61, 0x6e, 0x6b, 0x54, 0x61,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
-	0x6b, 0x65, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x10, 0xe5, 0x16, 0x42, 0x27, 0x5a, 0x25,
-	0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x77, 0x65,
-	0x6c, 0x66, 0x61, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -3228,7 +3347,7 @@ func file_welfare_proto_rawDescGZIP() []byte {
 }
 
 var file_welfare_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_welfare_proto_msgTypes = make([]protoimpl.MessageInfo, 42)
+var file_welfare_proto_msgTypes = make([]protoimpl.MessageInfo, 43)
 var file_welfare_proto_goTypes = []interface{}{
 	(OpResultCode)(0),                  // 0: welfare.OpResultCode
 	(SPacketID)(0),                     // 1: welfare.SPacketID
@@ -3274,6 +3393,7 @@ var file_welfare_proto_goTypes = []interface{}{
 	(*SCPigbankTakeCoin)(nil),          // 41: welfare.SCPigbankTakeCoin
 	(*CSDiamondBankGetInfo)(nil),       // 42: welfare.CSDiamondBankGetInfo
 	(*SCDiamondBankGetInfo)(nil),       // 43: welfare.SCDiamondBankGetInfo
+	(*SCDiamondBankTakeDiamond)(nil),   // 44: welfare.SCDiamondBankTakeDiamond
 }
 var file_welfare_proto_depIdxs = []int32{
 	0,  // 0: welfare.SCGetReliefFund.OpRetCode:type_name -> welfare.OpResultCode
@@ -3304,11 +3424,12 @@ var file_welfare_proto_depIdxs = []int32{
 	0,  // 25: welfare.SCPigbankGetInfo.OpRetCode:type_name -> welfare.OpResultCode
 	0,  // 26: welfare.SCPigbankTakeCoin.OpRetCode:type_name -> welfare.OpResultCode
 	0,  // 27: welfare.SCDiamondBankGetInfo.OpRetCode:type_name -> welfare.OpResultCode
-	28, // [28:28] is the sub-list for method output_type
+	0,  // 28: welfare.SCDiamondBankTakeDiamond.OpRetCode:type_name -> welfare.OpResultCode
-	28, // [28:28] is the sub-list for method input_type
+	29, // [29:29] is the sub-list for method output_type
-	28, // [28:28] is the sub-list for extension type_name
+	29, // [29:29] is the sub-list for method input_type
-	28, // [28:28] is the sub-list for extension extendee
+	29, // [29:29] is the sub-list for extension type_name
-	0,  // [0:28] is the sub-list for field type_name
+	29, // [29:29] is the sub-list for extension extendee
+	0,  // [0:29] is the sub-list for field type_name
 }
 
 func init() { file_welfare_proto_init() }
@@ -3821,6 +3942,18 @@ func file_welfare_proto_init() {
 				return nil
 			}
 		}
+		file_welfare_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SCDiamondBankTakeDiamond); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -3828,7 +3961,7 @@ func file_welfare_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_welfare_proto_rawDesc,
 			NumEnums:      2,
-			NumMessages:   42,
+			NumMessages:   43,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

protocol/welfare/welfare.proto

@@ -59,8 +59,7 @@ enum SPacketID {
   
   PACKET_CSDiamondBankGetInfo = 2914;	//钻石存钱罐信息获取
   PACKET_SCDiamondBankGetInfo = 2915;	//钻石存钱罐信息返回
-  PACKET_CSDiamondBankTakeDiamond = 2916;	//钻石存钱罐领取
+  PACKET_SCDiamondBankTakeDiamond = 2916;	//钻石存钱罐领取返回
-  PACKET_SCDiamondBankTakeDiamond = 2917;	//钻石存钱罐领取返回
   
   
 }
@@ -351,4 +350,16 @@ message SCDiamondBankGetInfo{
   int64 Price = 6;	//原价
   int64 NowPrice = 7;	//现价
   int32 ShopId = 8;	//商城ID
+}
+// 钻石存钱罐领取金币
+//PACKET_SCDiamondBankTakeDiamond
+message SCDiamondBankTakeDiamond{
+  OpResultCode OpRetCode = 1;   // 结果
+  double TakeDiamondNum = 2;        // 领取钻石数量
+  int32 TakeTimes = 3;          // 领取次数
+  int64 BankMaxDiamond = 4;        // 存钱罐最大储存值
+  int32 DayBuyMaxCnt = 5;       // 今日最大可购买次数
+  int64 Price = 6;	//原价
+  int64 NowPrice = 7;	//现价
+  int32 ShopId = 8;	//商城ID
 }

srvdata/db_petskill.go

@@ -0,0 +1,77 @@
+
+// Code generated by xlsx2proto.
+// DO NOT EDIT!
+
+package srvdata
+
+import (
+	"google.golang.org/protobuf/proto"
+
+    "mongo.games.com/game/protocol/server"
+)
+
+var PBDB_PetSkillMgr = &DB_PetSkillMgr{
+    Datas: &server.DB_PetSkillArray{},
+    pool: make(map[int32]*server.DB_PetSkill),
+    
+}
+
+type DB_PetSkillMgr struct {
+	Datas *server.DB_PetSkillArray
+	pool  map[int32]*server.DB_PetSkill
+	
+}
+
+func (this *DB_PetSkillMgr) unmarshal(data []byte) error {
+	err := proto.Unmarshal(data, this.Datas)
+	if err == nil {
+		this.arrangeData()
+	}
+	return err
+}
+
+func (this *DB_PetSkillMgr) reunmarshal(data []byte) error {
+	newDatas := &server.DB_PetSkillArray{}
+	err := proto.Unmarshal(data, newDatas)
+	if err == nil {
+		for _, item := range newDatas.Arr {
+			existItem := this.GetData(item.GetId())
+			if existItem == nil {
+				this.pool[item.GetId()] = item
+				this.Datas.Arr = append(this.Datas.Arr, item)
+				
+			} else {
+				*existItem = *item
+			}
+		}
+	}
+	return err
+}
+
+func (this *DB_PetSkillMgr) arrangeData() {
+	if this.Datas == nil {
+		return
+	}
+
+	dataArr := this.Datas.GetArr()
+	if dataArr == nil {
+		return
+	}
+
+	for _, data := range dataArr {
+		this.pool[data.GetId()] = data
+		
+	}
+}
+
+func (this *DB_PetSkillMgr) GetData(id int32) *server.DB_PetSkill {
+	if data, ok := this.pool[id]; ok {
+		return data
+	}
+	return nil
+}
+
+
+func init() {
+	DataMgr.register("DB_PetSkill.dat", &ProtobufDataLoader{dh: PBDB_PetSkillMgr})
+}

srvdata/db_petskilldes.go

@@ -0,0 +1,77 @@
+
+// Code generated by xlsx2proto.
+// DO NOT EDIT!
+
+package srvdata
+
+import (
+	"google.golang.org/protobuf/proto"
+
+    "mongo.games.com/game/protocol/server"
+)
+
+var PBDB_PetSkillDesMgr = &DB_PetSkillDesMgr{
+    Datas: &server.DB_PetSkillDesArray{},
+    pool: make(map[int32]*server.DB_PetSkillDes),
+    
+}
+
+type DB_PetSkillDesMgr struct {
+	Datas *server.DB_PetSkillDesArray
+	pool  map[int32]*server.DB_PetSkillDes
+	
+}
+
+func (this *DB_PetSkillDesMgr) unmarshal(data []byte) error {
+	err := proto.Unmarshal(data, this.Datas)
+	if err == nil {
+		this.arrangeData()
+	}
+	return err
+}
+
+func (this *DB_PetSkillDesMgr) reunmarshal(data []byte) error {
+	newDatas := &server.DB_PetSkillDesArray{}
+	err := proto.Unmarshal(data, newDatas)
+	if err == nil {
+		for _, item := range newDatas.Arr {
+			existItem := this.GetData(item.GetId())
+			if existItem == nil {
+				this.pool[item.GetId()] = item
+				this.Datas.Arr = append(this.Datas.Arr, item)
+				
+			} else {
+				*existItem = *item
+			}
+		}
+	}
+	return err
+}
+
+func (this *DB_PetSkillDesMgr) arrangeData() {
+	if this.Datas == nil {
+		return
+	}
+
+	dataArr := this.Datas.GetArr()
+	if dataArr == nil {
+		return
+	}
+
+	for _, data := range dataArr {
+		this.pool[data.GetId()] = data
+		
+	}
+}
+
+func (this *DB_PetSkillDesMgr) GetData(id int32) *server.DB_PetSkillDes {
+	if data, ok := this.pool[id]; ok {
+		return data
+	}
+	return nil
+}
+
+
+func init() {
+	DataMgr.register("DB_PetSkillDes.dat", &ProtobufDataLoader{dh: PBDB_PetSkillDesMgr})
+}

worldsrv/welfmgr.go

@@ -289,6 +289,8 @@ func (this *WelfareMgr) MonitorWelfData(player *Player) {
 		player.WelfData.VIPBag = make(map[int32]map[int32]int32)
 	} else if player.WelfData.PigBank == nil {
 		player.WelfData.PigBank = &model.PigBankData{}
+	} else if player.WelfData.DiamondBank == nil {
+		player.WelfData.DiamondBank = &model.DiamondBankData{}
 	}
 
 }
@@ -1812,6 +1814,9 @@ func (this *WelfareMgr) DiamondBankGetInfo(p *Player) {
 
 	pool := srvdata.PBDB_PigBank_DiamondMgr.Datas.GetArr()
 	infoData := pool[0]
+	if p.WelfData.DiamondBank == nil {
+		p.WelfData.DiamondBank = &model.DiamondBankData{}
+	}
 	for _, data := range pool {
 		if p.WelfData.DiamondBank.DayBuyTimes+1 >= data.BuyCountMin && p.WelfData.DiamondBank.DayBuyTimes+1 <= data.BuyCountMax {
 			infoData = data