update

data/DB_GameBankruptcy.dat

@@ -0,0 +1,23 @@
+
+
Tienlen207 Àš
+欢ä¹<C3A4>æ<EFBFBD>•é±¼401 Àš
+高棉象棋521 Àš
+	å<><C3A5>三水211 Àš
+愤怒的大å<C2A7>”606 Àš
+	å°<C3A5>ç<EFBFBD>«ç®­607 Àš
+	è´¢è¿<C3A8>神301 à§
+å¤<C3A5>仇者è<E280A6>”盟302 à§
+	å¤<C3A5>活节岛303 à§
+
+冰河世纪304 à§
+百战æˆ<C3A6>神305 à§
+水果拉霸306 à§
+
多ç¦<C3A7>多财307 à§
+FortuneTiger308 à§
+
FortuneDragon309 à§
+
FortuneRabbit310 à§
+	FortuneOx311 à§
+FortuneMouse312 à§
+	CashMania313 à§
+GatesOfOlympus314 à§
+	娃娃机608

data/DB_GameBankruptcy.json

@@ -0,0 +1,129 @@
+{
+	"Arr": [
+		{
+			"Id": 1,
+			"GameName": "Tienlen",
+			"GameDif": "207",
+			"LimitNum": 200000
+		},
+		{
+			"Id": 2,
+			"GameName": "欢乐捕鱼",
+			"GameDif": "401",
+			"LimitNum": 200000
+		},
+		{
+			"Id": 3,
+			"GameName": "高棉象棋",
+			"GameDif": "521",
+			"LimitNum": 200000
+		},
+		{
+			"Id": 4,
+			"GameName": "十三水",
+			"GameDif": "211",
+			"LimitNum": 200000
+		},
+		{
+			"Id": 5,
+			"GameName": "愤怒的大叔",
+			"GameDif": "606",
+			"LimitNum": 200000
+		},
+		{
+			"Id": 6,
+			"GameName": "小火箭",
+			"GameDif": "607",
+			"LimitNum": 200000
+		},
+		{
+			"Id": 7,
+			"GameName": "财运神",
+			"GameDif": "301",
+			"LimitNum": 300000
+		},
+		{
+			"Id": 8,
+			"GameName": "复仇者联盟",
+			"GameDif": "302",
+			"LimitNum": 300000
+		},
+		{
+			"Id": 9,
+			"GameName": "复活节岛",
+			"GameDif": "303",
+			"LimitNum": 300000
+		},
+		{
+			"Id": 10,
+			"GameName": "冰河世纪",
+			"GameDif": "304",
+			"LimitNum": 300000
+		},
+		{
+			"Id": 11,
+			"GameName": "百战成神",
+			"GameDif": "305",
+			"LimitNum": 300000
+		},
+		{
+			"Id": 12,
+			"GameName": "水果拉霸",
+			"GameDif": "306",
+			"LimitNum": 300000
+		},
+		{
+			"Id": 13,
+			"GameName": "多福多财",
+			"GameDif": "307",
+			"LimitNum": 300000
+		},
+		{
+			"Id": 14,
+			"GameName": "FortuneTiger",
+			"GameDif": "308",
+			"LimitNum": 300000
+		},
+		{
+			"Id": 15,
+			"GameName": "FortuneDragon",
+			"GameDif": "309",
+			"LimitNum": 300000
+		},
+		{
+			"Id": 16,
+			"GameName": "FortuneRabbit",
+			"GameDif": "310",
+			"LimitNum": 300000
+		},
+		{
+			"Id": 17,
+			"GameName": "FortuneOx",
+			"GameDif": "311",
+			"LimitNum": 300000
+		},
+		{
+			"Id": 18,
+			"GameName": "FortuneMouse",
+			"GameDif": "312",
+			"LimitNum": 300000
+		},
+		{
+			"Id": 19,
+			"GameName": "CashMania",
+			"GameDif": "313",
+			"LimitNum": 300000
+		},
+		{
+			"Id": 20,
+			"GameName": "GatesOfOlympus",
+			"GameDif": "314",
+			"LimitNum": 300000
+		},
+		{
+			"Id": 21,
+			"GameName": "娃娃机",
+			"GameDif": "608"
+		}
+	]
+}

data/DB_GameItem.json

@@ -7154,6 +7154,78 @@
 			"Compound": {
 				"71002": 10
 			}
+		},
+		{
+			"Id": 40005,
+			"Name": "金币赛门票",
+			"ShowLocation": [
+				1,
+				1,
+				0
+			],
+			"Classify": [
+				1,
+				1,
+				0
+			],
+			"Type": 4,
+			"Effect0": [
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			],
+			"Effect": [
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			],
+			"SaleGold": 100000,
+			"Composition": 1,
+			"CompositionMax": 1,
+			"Location": "0",
+			"Describe": "作用：用于报名特殊钻石赛事；\n产出途径：存钱罐"
+		},
+		{
+			"Id": 40006,
+			"Name": "钻石赛门票",
+			"ShowLocation": [
+				1,
+				1,
+				0
+			],
+			"Classify": [
+				1,
+				1,
+				0
+			],
+			"Type": 4,
+			"Effect0": [
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			],
+			"Effect": [
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			],
+			"SaleGold": 100000,
+			"Composition": 1,
+			"CompositionMax": 1,
+			"Location": "0",
+			"Describe": "作用：用于报名特殊钻石赛事；\n产出途径：存钱罐"
 		}
 	]
 }

data/DB_PigBank_Diamond.dat

@@ -1,4 +1,4 @@
 
-


 (Ђ­в0–
8Ўи;@dH–
Pc
+


 (€­β8–
@΅θ;PdX–
`c
- ((Ђ­в0¬8ўи;@dH¬PЗ

+< ((€­β2ΕΈ
2συ
8¬@Άθ;Jσυ
JΖΈ
PdX¬`Η

-яБЧ/ 2(Ђ­в0о8Ји;@dHоPу
+?<18>ΑΧ/ 2(€­β2συ
2ΕΈ8ξ@£θ;JΖΈJσυ
PdXξ`σ

data/DB_PigBank_Diamond.json

@@ -18,8 +18,16 @@
 			"BuyCountMax": 2,
 			"CostDiamond": 40,
 			"MaxGold": 10000000,
+			"GoldExc": {
+				"310003": 1,
+				"40005": 1
+			},
 			"MaxDiamond": 300,
 			"DiamondId": 980002,
+			"DiamondExc": {
+				"310003": 1,
+				"40006": 1
+			},
 			"CoinPrice": 100,
 			"DiamondPrice": 300,
 			"DiamondNowPrice": 199
@@ -30,8 +38,16 @@
 			"BuyCountMax": 99999999,
 			"CostDiamond": 50,
 			"MaxGold": 10000000,
+			"GoldExc": {
+				"310003": 1,
+				"40005": 2
+			},
 			"MaxDiamond": 750,
 			"DiamondId": 980003,
+			"DiamondExc": {
+				"310003": 1,
+				"40006": 2
+			},
 			"CoinPrice": 100,
 			"DiamondPrice": 750,
 			"DiamondNowPrice": 499

protocol/server/pbdata.proto

@@ -659,6 +659,22 @@ message DB_GamMatchLVArray {
     repeated DB_GamMatchLV Arr = 1;
 }
 
+message DB_GameBankruptcy {
+
+	int32 Id = 1;
+
+	string GameName = 2;
+
+	string GameDif = 3;
+
+	int32 LimitNum = 4;
+
+}
+
+message DB_GameBankruptcyArray {
+    repeated DB_GameBankruptcy Arr = 1;
+}
+
 message DB_GameCoinPool {
 
 	int32 Id = 1;
@@ -839,6 +855,8 @@ message DB_GameFree {
 
 	int32 IsCustom = 73;
 
+	string GameName = 74;
+
 }
 
 message DB_GameFreeArray {
@@ -1331,15 +1349,19 @@ message DB_PigBank_Diamond {
 
 	int32 MaxGold = 5;
 
-	int32 MaxDiamond = 6;
+	map<int64, int64> GoldExc = 6;
 
-	int32 DiamondId = 7;
+	int32 MaxDiamond = 7;
 
-	int32 CoinPrice = 8;
+	int32 DiamondId = 8;
 
-	int32 DiamondPrice = 9;
+	map<int64, int64> DiamondExc = 9;
 
-	int32 DiamondNowPrice = 10;
+	int32 CoinPrice = 10;
+
+	int32 DiamondPrice = 11;
+
+	int32 DiamondNowPrice = 12;
 
 }
 

protocol/thirteen/thirteen.pb.go

@@ -386,7 +386,7 @@ type CSThirteenPlayerOp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	OpCode int32 `protobuf:"varint,1,opt,name=OpCode,proto3" json:"OpCode,omitempty"` // 1:确定牌 2站起状态 3test 4重新选牌 5加入游戏 6预选
+	OpCode int32 `protobuf:"varint,1,opt,name=OpCode,proto3" json:"OpCode,omitempty"` // 1:确定牌 2站起状态 3test 4重新选牌 5加入游戏 6预选 7自动手动切换(1自动，2手动)
 	// 确定牌时，两种参数规则,都可以
 	// 第一种：玩家从推荐牌型中选择一个，把Poker.IndexType发过来（减少数据传输）
 	// 第二种：按头墩中墩尾墩顺序把牌发过来

protocol/thirteen/thirteen.proto

@@ -73,7 +73,7 @@ message SCThirteenPlayerCards {
 //玩家操作
 //PACKET_CSThirteenPlayerOp
 message CSThirteenPlayerOp {
-    int32 OpCode = 1; // 1:确定牌 2站起状态 3test 4重新选牌 5加入游戏 6预选
+    int32 OpCode = 1; // 1:确定牌 2站起状态 3test 4重新选牌 5加入游戏 6预选 7自动手动切换(1自动，2手动)
 
     // 确定牌时，两种参数规则,都可以
     // 第一种：玩家从推荐牌型中选择一个，把Poker.IndexType发过来（减少数据传输）

protocol/webapi/common.pb.go

@@ -9550,6 +9550,316 @@ func (x *UserLottery) GetOn() int32 {
 	return 0
 }
 
+type PigBankDiamondInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id              int32       `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"`
+	BuyCountMin     int32       `protobuf:"varint,2,opt,name=BuyCountMin,proto3" json:"BuyCountMin,omitempty"`
+	BuyCountMax     int32       `protobuf:"varint,3,opt,name=BuyCountMax,proto3" json:"BuyCountMax,omitempty"`
+	CostDiamond     int32       `protobuf:"varint,4,opt,name=CostDiamond,proto3" json:"CostDiamond,omitempty"`
+	MaxGold         int32       `protobuf:"varint,5,opt,name=MaxGold,proto3" json:"MaxGold,omitempty"`
+	MaxDiamond      int32       `protobuf:"varint,6,opt,name=MaxDiamond,proto3" json:"MaxDiamond,omitempty"`
+	DiamondId       int32       `protobuf:"varint,7,opt,name=DiamondId,proto3" json:"DiamondId,omitempty"`
+	CoinPrice       int32       `protobuf:"varint,8,opt,name=CoinPrice,proto3" json:"CoinPrice,omitempty"`
+	DiamondPrice    int32       `protobuf:"varint,9,opt,name=DiamondPrice,proto3" json:"DiamondPrice,omitempty"`
+	DiamondNowPrice int32       `protobuf:"varint,10,opt,name=DiamondNowPrice,proto3" json:"DiamondNowPrice,omitempty"`
+	GoldExc         []*ItemInfo `protobuf:"bytes,11,rep,name=GoldExc,proto3" json:"GoldExc,omitempty"`
+	DiamondExc      []*ItemInfo `protobuf:"bytes,12,rep,name=DiamondExc,proto3" json:"DiamondExc,omitempty"`
+}
+
+func (x *PigBankDiamondInfo) Reset() {
+	*x = PigBankDiamondInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_protocol_webapi_common_proto_msgTypes[100]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PigBankDiamondInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PigBankDiamondInfo) ProtoMessage() {}
+
+func (x *PigBankDiamondInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_protocol_webapi_common_proto_msgTypes[100]
+	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 PigBankDiamondInfo.ProtoReflect.Descriptor instead.
+func (*PigBankDiamondInfo) Descriptor() ([]byte, []int) {
+	return file_protocol_webapi_common_proto_rawDescGZIP(), []int{100}
+}
+
+func (x *PigBankDiamondInfo) GetId() int32 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *PigBankDiamondInfo) GetBuyCountMin() int32 {
+	if x != nil {
+		return x.BuyCountMin
+	}
+	return 0
+}
+
+func (x *PigBankDiamondInfo) GetBuyCountMax() int32 {
+	if x != nil {
+		return x.BuyCountMax
+	}
+	return 0
+}
+
+func (x *PigBankDiamondInfo) GetCostDiamond() int32 {
+	if x != nil {
+		return x.CostDiamond
+	}
+	return 0
+}
+
+func (x *PigBankDiamondInfo) GetMaxGold() int32 {
+	if x != nil {
+		return x.MaxGold
+	}
+	return 0
+}
+
+func (x *PigBankDiamondInfo) GetMaxDiamond() int32 {
+	if x != nil {
+		return x.MaxDiamond
+	}
+	return 0
+}
+
+func (x *PigBankDiamondInfo) GetDiamondId() int32 {
+	if x != nil {
+		return x.DiamondId
+	}
+	return 0
+}
+
+func (x *PigBankDiamondInfo) GetCoinPrice() int32 {
+	if x != nil {
+		return x.CoinPrice
+	}
+	return 0
+}
+
+func (x *PigBankDiamondInfo) GetDiamondPrice() int32 {
+	if x != nil {
+		return x.DiamondPrice
+	}
+	return 0
+}
+
+func (x *PigBankDiamondInfo) GetDiamondNowPrice() int32 {
+	if x != nil {
+		return x.DiamondNowPrice
+	}
+	return 0
+}
+
+func (x *PigBankDiamondInfo) GetGoldExc() []*ItemInfo {
+	if x != nil {
+		return x.GoldExc
+	}
+	return nil
+}
+
+func (x *PigBankDiamondInfo) GetDiamondExc() []*ItemInfo {
+	if x != nil {
+		return x.DiamondExc
+	}
+	return nil
+}
+
+// etcd /game/pigbank_diamond
+type GamePigBankDiamondConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Platform    string                `protobuf:"bytes,1,opt,name=Platform,proto3" json:"Platform,omitempty"`       // 平台
+	DiamondInfo []*PigBankDiamondInfo `protobuf:"bytes,2,rep,name=DiamondInfo,proto3" json:"DiamondInfo,omitempty"` // 存钱罐消耗信息
+}
+
+func (x *GamePigBankDiamondConfig) Reset() {
+	*x = GamePigBankDiamondConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_protocol_webapi_common_proto_msgTypes[101]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GamePigBankDiamondConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GamePigBankDiamondConfig) ProtoMessage() {}
+
+func (x *GamePigBankDiamondConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_protocol_webapi_common_proto_msgTypes[101]
+	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 GamePigBankDiamondConfig.ProtoReflect.Descriptor instead.
+func (*GamePigBankDiamondConfig) Descriptor() ([]byte, []int) {
+	return file_protocol_webapi_common_proto_rawDescGZIP(), []int{101}
+}
+
+func (x *GamePigBankDiamondConfig) GetPlatform() string {
+	if x != nil {
+		return x.Platform
+	}
+	return ""
+}
+
+func (x *GamePigBankDiamondConfig) GetDiamondInfo() []*PigBankDiamondInfo {
+	if x != nil {
+		return x.DiamondInfo
+	}
+	return nil
+}
+
+type PigBankPropInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id        int32  `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"`
+	PorpName  string `protobuf:"bytes,2,opt,name=PorpName,proto3" json:"PorpName,omitempty"`
+	PropValue int32  `protobuf:"varint,3,opt,name=PropValue,proto3" json:"PropValue,omitempty"`
+}
+
+func (x *PigBankPropInfo) Reset() {
+	*x = PigBankPropInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_protocol_webapi_common_proto_msgTypes[102]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PigBankPropInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PigBankPropInfo) ProtoMessage() {}
+
+func (x *PigBankPropInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_protocol_webapi_common_proto_msgTypes[102]
+	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 PigBankPropInfo.ProtoReflect.Descriptor instead.
+func (*PigBankPropInfo) Descriptor() ([]byte, []int) {
+	return file_protocol_webapi_common_proto_rawDescGZIP(), []int{102}
+}
+
+func (x *PigBankPropInfo) GetId() int32 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *PigBankPropInfo) GetPorpName() string {
+	if x != nil {
+		return x.PorpName
+	}
+	return ""
+}
+
+func (x *PigBankPropInfo) GetPropValue() int32 {
+	if x != nil {
+		return x.PropValue
+	}
+	return 0
+}
+
+// etcd /game/pigbank_prop
+type GamePigBankPropConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Platform string             `protobuf:"bytes,1,opt,name=Platform,proto3" json:"Platform,omitempty"` // 平台
+	PropInfo []*PigBankPropInfo `protobuf:"bytes,2,rep,name=PropInfo,proto3" json:"PropInfo,omitempty"` // 存钱罐属性
+}
+
+func (x *GamePigBankPropConfig) Reset() {
+	*x = GamePigBankPropConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_protocol_webapi_common_proto_msgTypes[103]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GamePigBankPropConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GamePigBankPropConfig) ProtoMessage() {}
+
+func (x *GamePigBankPropConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_protocol_webapi_common_proto_msgTypes[103]
+	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 GamePigBankPropConfig.ProtoReflect.Descriptor instead.
+func (*GamePigBankPropConfig) Descriptor() ([]byte, []int) {
+	return file_protocol_webapi_common_proto_rawDescGZIP(), []int{103}
+}
+
+func (x *GamePigBankPropConfig) GetPlatform() string {
+	if x != nil {
+		return x.Platform
+	}
+	return ""
+}
+
+func (x *GamePigBankPropConfig) GetPropInfo() []*PigBankPropInfo {
+	if x != nil {
+		return x.PropInfo
+	}
+	return nil
+}
+
 var File_protocol_webapi_common_proto protoreflect.FileDescriptor
 
 var file_protocol_webapi_common_proto_rawDesc = []byte{
@@ -11030,10 +11340,57 @@ var file_protocol_webapi_common_proto_rawDesc = []byte{
 	0x04, 0x53, 0x6e, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x04, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d,
 	0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x4f,
-	0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x4f, 0x6e, 0x42, 0x26, 0x5a, 0x24, 0x6d,
+	0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x4f, 0x6e, 0x22, 0xac, 0x03, 0x0a, 0x12,
-	0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67,
+	0x50, 0x69, 0x67, 0x42, 0x61, 0x6e, 0x6b, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x49, 0x6e,
-	0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x77, 0x65, 0x62,
+	0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
-	0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x42, 0x75, 0x79, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x4d, 0x69,
+	0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x42, 0x75, 0x79, 0x43, 0x6f, 0x75, 0x6e,
+	0x74, 0x4d, 0x69, 0x6e, 0x12, 0x20, 0x0a, 0x0b, 0x42, 0x75, 0x79, 0x43, 0x6f, 0x75, 0x6e, 0x74,
+	0x4d, 0x61, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x42, 0x75, 0x79, 0x43, 0x6f,
+	0x75, 0x6e, 0x74, 0x4d, 0x61, 0x78, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x6f, 0x73, 0x74, 0x44, 0x69,
+	0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x43, 0x6f, 0x73,
+	0x74, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x4d, 0x61, 0x78, 0x47,
+	0x6f, 0x6c, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x4d, 0x61, 0x78, 0x47, 0x6f,
+	0x6c, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x4d, 0x61, 0x78, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x4d, 0x61, 0x78, 0x44, 0x69, 0x61, 0x6d, 0x6f,
+	0x6e, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x49, 0x64, 0x18,
+	0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x49, 0x64,
+	0x12, 0x1c, 0x0a, 0x09, 0x43, 0x6f, 0x69, 0x6e, 0x50, 0x72, 0x69, 0x63, 0x65, 0x18, 0x08, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x09, 0x43, 0x6f, 0x69, 0x6e, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x22,
+	0x0a, 0x0c, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x50, 0x72, 0x69, 0x63, 0x65, 0x18, 0x09,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x50, 0x72, 0x69,
+	0x63, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4e, 0x6f, 0x77,
+	0x50, 0x72, 0x69, 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x44, 0x69, 0x61,
+	0x6d, 0x6f, 0x6e, 0x64, 0x4e, 0x6f, 0x77, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x2a, 0x0a, 0x07,
+	0x47, 0x6f, 0x6c, 0x64, 0x45, 0x78, 0x63, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e,
+	0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+	0x07, 0x47, 0x6f, 0x6c, 0x64, 0x45, 0x78, 0x63, 0x12, 0x30, 0x0a, 0x0a, 0x44, 0x69, 0x61, 0x6d,
+	0x6f, 0x6e, 0x64, 0x45, 0x78, 0x63, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x77,
+	0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0a,
+	0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x45, 0x78, 0x63, 0x22, 0x74, 0x0a, 0x18, 0x47, 0x61,
+	0x6d, 0x65, 0x50, 0x69, 0x67, 0x42, 0x61, 0x6e, 0x6b, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f,
+	0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f,
+	0x72, 0x6d, 0x12, 0x3c, 0x0a, 0x0b, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x49, 0x6e, 0x66,
+	0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69,
+	0x2e, 0x50, 0x69, 0x67, 0x42, 0x61, 0x6e, 0x6b, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x49,
+	0x6e, 0x66, 0x6f, 0x52, 0x0b, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x49, 0x6e, 0x66, 0x6f,
+	0x22, 0x5b, 0x0a, 0x0f, 0x50, 0x69, 0x67, 0x42, 0x61, 0x6e, 0x6b, 0x50, 0x72, 0x6f, 0x70, 0x49,
+	0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x02, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6f, 0x72, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6f, 0x72, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x12,
+	0x1c, 0x0a, 0x09, 0x50, 0x72, 0x6f, 0x70, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x09, 0x50, 0x72, 0x6f, 0x70, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x68, 0x0a,
+	0x15, 0x47, 0x61, 0x6d, 0x65, 0x50, 0x69, 0x67, 0x42, 0x61, 0x6e, 0x6b, 0x50, 0x72, 0x6f, 0x70,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f,
+	0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f,
+	0x72, 0x6d, 0x12, 0x33, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x02,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x50, 0x69,
+	0x67, 0x42, 0x61, 0x6e, 0x6b, 0x50, 0x72, 0x6f, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x50,
+	0x72, 0x6f, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x26, 0x5a, 0x24, 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, 0x62, 0x61, 0x70, 0x69, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -11048,7 +11405,7 @@ func file_protocol_webapi_common_proto_rawDescGZIP() []byte {
 	return file_protocol_webapi_common_proto_rawDescData
 }
 
-var file_protocol_webapi_common_proto_msgTypes = make([]protoimpl.MessageInfo, 110)
+var file_protocol_webapi_common_proto_msgTypes = make([]protoimpl.MessageInfo, 114)
 var file_protocol_webapi_common_proto_goTypes = []interface{}{
 	(*MysqlDbSetting)(nil),               // 0: webapi.MysqlDbSetting
 	(*MongoDbSetting)(nil),               // 1: webapi.MongoDbSetting
@@ -11150,32 +11507,36 @@ var file_protocol_webapi_common_proto_goTypes = []interface{}{
 	(*LotteryConfig)(nil),                // 97: webapi.LotteryConfig
 	(*LotteryInfo)(nil),                  // 98: webapi.LotteryInfo
 	(*UserLottery)(nil),                  // 99: webapi.UserLottery
-	nil,                                  // 100: webapi.Platform.BindTelRewardEntry
+	(*PigBankDiamondInfo)(nil),           // 100: webapi.PigBankDiamondInfo
-	nil,                                  // 101: webapi.PlayerData.RankScoreEntry
+	(*GamePigBankDiamondConfig)(nil),     // 101: webapi.GamePigBankDiamondConfig
-	nil,                                  // 102: webapi.ItemShop.AwardEntry
+	(*PigBankPropInfo)(nil),              // 102: webapi.PigBankPropInfo
-	nil,                                  // 103: webapi.VIPcfg.AwardEntry
+	(*GamePigBankPropConfig)(nil),        // 103: webapi.GamePigBankPropConfig
-	nil,                                  // 104: webapi.VIPcfg.Privilege1Entry
+	nil,                                  // 104: webapi.Platform.BindTelRewardEntry
-	nil,                                  // 105: webapi.VIPcfg.Privilege7Entry
+	nil,                                  // 105: webapi.PlayerData.RankScoreEntry
-	nil,                                  // 106: webapi.VIPcfg.Privilege9Entry
+	nil,                                  // 106: webapi.ItemShop.AwardEntry
-	nil,                                  // 107: webapi.ActInviteConfig.PayScoreEntry
+	nil,                                  // 107: webapi.VIPcfg.AwardEntry
-	nil,                                  // 108: webapi.SkinLevel.UpItemEntry
+	nil,                                  // 108: webapi.VIPcfg.Privilege1Entry
-	nil,                                  // 109: webapi.SkinItem.UnlockParamEntry
+	nil,                                  // 109: webapi.VIPcfg.Privilege7Entry
-	(*server.DB_GameFree)(nil),           // 110: server.DB_GameFree
+	nil,                                  // 110: webapi.VIPcfg.Privilege9Entry
-	(*server.DB_GameItem)(nil),           // 111: server.DB_GameItem
+	nil,                                  // 111: webapi.ActInviteConfig.PayScoreEntry
+	nil,                                  // 112: webapi.SkinLevel.UpItemEntry
+	nil,                                  // 113: webapi.SkinItem.UnlockParamEntry
+	(*server.DB_GameFree)(nil),           // 114: server.DB_GameFree
+	(*server.DB_GameItem)(nil),           // 115: server.DB_GameItem
 }
 var file_protocol_webapi_common_proto_depIdxs = []int32{
 	2,   // 0: webapi.Platform.Leaderboard:type_name -> webapi.RankSwitch
 	3,   // 1: webapi.Platform.ClubConfig:type_name -> webapi.ClubConfig
 	4,   // 2: webapi.Platform.ThirdGameMerchant:type_name -> webapi.ThirdGame
-	100, // 3: webapi.Platform.BindTelReward:type_name -> webapi.Platform.BindTelRewardEntry
+	104, // 3: webapi.Platform.BindTelReward:type_name -> webapi.Platform.BindTelRewardEntry
 	6,   // 4: webapi.GameConfigGlobal.GameStatus:type_name -> webapi.GameStatus
-	110, // 5: webapi.GameFree.DbGameFree:type_name -> server.DB_GameFree
+	114, // 5: webapi.GameFree.DbGameFree:type_name -> server.DB_GameFree
 	8,   // 6: webapi.PlatformGameConfig.DbGameFrees:type_name -> webapi.GameFree
 	0,   // 7: webapi.PlatformDbConfig.Mysql:type_name -> webapi.MysqlDbSetting
 	1,   // 8: webapi.PlatformDbConfig.MongoDb:type_name -> webapi.MongoDbSetting
 	1,   // 9: webapi.PlatformDbConfig.MongoDbLog:type_name -> webapi.MongoDbSetting
-	110, // 10: webapi.GameConfigGroup.DbGameFree:type_name -> server.DB_GameFree
+	114, // 10: webapi.GameConfigGroup.DbGameFree:type_name -> server.DB_GameFree
-	101, // 11: webapi.PlayerData.RankScore:type_name -> webapi.PlayerData.RankScoreEntry
+	105, // 11: webapi.PlayerData.RankScore:type_name -> webapi.PlayerData.RankScoreEntry
 	32,  // 12: webapi.PlayerData.Items:type_name -> webapi.ItemInfo
 	14,  // 13: webapi.PlayerData.RoleUnlockList:type_name -> webapi.ModInfo
 	14,  // 14: webapi.PlayerData.PetUnlockList:type_name -> webapi.ModInfo
@@ -11188,7 +11549,7 @@ var file_protocol_webapi_common_proto_depIdxs = []int32{
 	32,  // 21: webapi.ExchangeShop.Items:type_name -> webapi.ItemInfo
 	25,  // 22: webapi.ExchangeShopList.List:type_name -> webapi.ExchangeShop
 	29,  // 23: webapi.ExchangeShopList.Weight:type_name -> webapi.ShopWeight
-	102, // 24: webapi.ItemShop.Award:type_name -> webapi.ItemShop.AwardEntry
+	106, // 24: webapi.ItemShop.Award:type_name -> webapi.ItemShop.AwardEntry
 	30,  // 25: webapi.ItemShopList.List:type_name -> webapi.ItemShop
 	32,  // 26: webapi.MatchInfoAward.ItemId:type_name -> webapi.ItemInfo
 	33,  // 27: webapi.GameMatchDate.Award:type_name -> webapi.MatchInfoAward
@@ -11209,14 +11570,14 @@ var file_protocol_webapi_common_proto_depIdxs = []int32{
 	38,  // 42: webapi.WelfareSpree.Item:type_name -> webapi.WelfareDate
 	48,  // 43: webapi.WelfareFirstPayDataList.List:type_name -> webapi.WelfareSpree
 	48,  // 44: webapi.WelfareContinuousPayDataList.List:type_name -> webapi.WelfareSpree
-	103, // 45: webapi.VIPcfg.Award:type_name -> webapi.VIPcfg.AwardEntry
+	107, // 45: webapi.VIPcfg.Award:type_name -> webapi.VIPcfg.AwardEntry
-	104, // 46: webapi.VIPcfg.Privilege1:type_name -> webapi.VIPcfg.Privilege1Entry
+	108, // 46: webapi.VIPcfg.Privilege1:type_name -> webapi.VIPcfg.Privilege1Entry
-	105, // 47: webapi.VIPcfg.Privilege7:type_name -> webapi.VIPcfg.Privilege7Entry
+	109, // 47: webapi.VIPcfg.Privilege7:type_name -> webapi.VIPcfg.Privilege7Entry
-	106, // 48: webapi.VIPcfg.Privilege9:type_name -> webapi.VIPcfg.Privilege9Entry
+	110, // 48: webapi.VIPcfg.Privilege9:type_name -> webapi.VIPcfg.Privilege9Entry
 	51,  // 49: webapi.VIPcfgDataList.List:type_name -> webapi.VIPcfg
 	38,  // 50: webapi.ChessRankConfig.Item:type_name -> webapi.WelfareDate
 	55,  // 51: webapi.ChessRankcfgData.Datas:type_name -> webapi.ChessRankConfig
-	107, // 52: webapi.ActInviteConfig.PayScore:type_name -> webapi.ActInviteConfig.PayScoreEntry
+	111, // 52: webapi.ActInviteConfig.PayScore:type_name -> webapi.ActInviteConfig.PayScoreEntry
 	62,  // 53: webapi.ActInviteConfig.Awards1:type_name -> webapi.RankAward
 	62,  // 54: webapi.ActInviteConfig.Awards2:type_name -> webapi.RankAward
 	62,  // 55: webapi.ActInviteConfig.Awards3:type_name -> webapi.RankAward
@@ -11233,12 +11594,12 @@ var file_protocol_webapi_common_proto_depIdxs = []int32{
 	69,  // 66: webapi.DiamondLotteryData.Info:type_name -> webapi.DiamondLotteryInfo
 	70,  // 67: webapi.DiamondLotteryData.Players:type_name -> webapi.DiamondLotteryPlayers
 	72,  // 68: webapi.DiamondLotteryConfig.LotteryData:type_name -> webapi.DiamondLotteryData
-	111, // 69: webapi.ItemConfig.Items:type_name -> server.DB_GameItem
+	115, // 69: webapi.ItemConfig.Items:type_name -> server.DB_GameItem
 	32,  // 70: webapi.RankAwardInfo.Item:type_name -> webapi.ItemInfo
 	75,  // 71: webapi.RankTypeInfo.Award:type_name -> webapi.RankAwardInfo
 	76,  // 72: webapi.RankTypeConfig.Info:type_name -> webapi.RankTypeInfo
-	108, // 73: webapi.SkinLevel.UpItem:type_name -> webapi.SkinLevel.UpItemEntry
+	112, // 73: webapi.SkinLevel.UpItem:type_name -> webapi.SkinLevel.UpItemEntry
-	109, // 74: webapi.SkinItem.UnlockParam:type_name -> webapi.SkinItem.UnlockParamEntry
+	113, // 74: webapi.SkinItem.UnlockParam:type_name -> webapi.SkinItem.UnlockParamEntry
 	78,  // 75: webapi.SkinItem.Levels:type_name -> webapi.SkinLevel
 	79,  // 76: webapi.SkinConfig.Items:type_name -> webapi.SkinItem
 	82,  // 77: webapi.AwardLogConfig.AwardLog:type_name -> webapi.AwardLogData
@@ -11253,11 +11614,15 @@ var file_protocol_webapi_common_proto_depIdxs = []int32{
 	96,  // 86: webapi.PopUpWindowConfig.Info:type_name -> webapi.PopUpWindowInfo
 	98,  // 87: webapi.LotteryConfig.List:type_name -> webapi.LotteryInfo
 	32,  // 88: webapi.LotteryInfo.Reward:type_name -> webapi.ItemInfo
-	89,  // [89:89] is the sub-list for method output_type
+	32,  // 89: webapi.PigBankDiamondInfo.GoldExc:type_name -> webapi.ItemInfo
-	89,  // [89:89] is the sub-list for method input_type
+	32,  // 90: webapi.PigBankDiamondInfo.DiamondExc:type_name -> webapi.ItemInfo
-	89,  // [89:89] is the sub-list for extension type_name
+	100, // 91: webapi.GamePigBankDiamondConfig.DiamondInfo:type_name -> webapi.PigBankDiamondInfo
-	89,  // [89:89] is the sub-list for extension extendee
+	102, // 92: webapi.GamePigBankPropConfig.PropInfo:type_name -> webapi.PigBankPropInfo
-	0,   // [0:89] is the sub-list for field type_name
+	93,  // [93:93] is the sub-list for method output_type
+	93,  // [93:93] is the sub-list for method input_type
+	93,  // [93:93] is the sub-list for extension type_name
+	93,  // [93:93] is the sub-list for extension extendee
+	0,   // [0:93] is the sub-list for field type_name
 }
 
 func init() { file_protocol_webapi_common_proto_init() }
@@ -12466,6 +12831,54 @@ func file_protocol_webapi_common_proto_init() {
 				return nil
 			}
 		}
+		file_protocol_webapi_common_proto_msgTypes[100].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PigBankDiamondInfo); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_protocol_webapi_common_proto_msgTypes[101].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GamePigBankDiamondConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_protocol_webapi_common_proto_msgTypes[102].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PigBankPropInfo); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_protocol_webapi_common_proto_msgTypes[103].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GamePigBankPropConfig); 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{
@@ -12473,7 +12886,7 @@ func file_protocol_webapi_common_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_protocol_webapi_common_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   110,
+			NumMessages:   114,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

protocol/webapi/common.proto

@@ -1047,3 +1047,53 @@ message UserLottery{
   int64 Num = 5; // 第几期
   int32 On = 6; // 开关 1开启 2关闭
 }
+
+message PigBankDiamondInfo {
+
+  int32 Id = 1;
+
+  int32 BuyCountMin = 2;
+
+  int32 BuyCountMax = 3;
+
+  int32 CostDiamond = 4;
+
+  int32 MaxGold = 5;
+
+  int32 MaxDiamond = 6;
+
+  int32 DiamondId = 7;
+
+  int32 CoinPrice = 8;
+
+  int32 DiamondPrice = 9;
+
+  int32 DiamondNowPrice = 10;
+
+  repeated ItemInfo GoldExc = 11;
+
+  repeated ItemInfo DiamondExc = 12;
+}
+
+// etcd /game/pigbank_diamond
+message GamePigBankDiamondConfig{
+  string Platform = 1; // 平台
+  repeated PigBankDiamondInfo DiamondInfo = 2; // 存钱罐消耗信息
+}
+
+
+message PigBankPropInfo {
+
+  int32 Id = 1;
+
+  string PorpName = 2;
+
+  int32 PropValue = 3;
+
+}
+
+// etcd /game/pigbank_prop
+message GamePigBankPropConfig{
+  string Platform = 1; // 平台
+  repeated PigBankPropInfo PropInfo = 2; // 存钱罐属性
+}

protocol/webapi/webapi.proto

@@ -513,6 +513,8 @@ message ASQueryOnlineReportList{
   int32 OrderType = 6;//排序方式 0,、倒序 1、正序
   int32 GameFreeId = 7;
   string Channel = 8;
+  string GameDif = 9; // 游戏组
+  string ChannelId = 10; // 推广渠道ID
 }
 message SAQueryOnlineReportList{
   TagCode Tag = 1; //错误码

protocol/welfare/welfare.proto

@@ -336,6 +336,17 @@ message SCBindInvite{
   OpResultCode OpRetCode = 1;    //结果
 }
 
+
+message PigBankCoinInfo{
+  int32 IndexId = 1;
+  int64 TakeCoin = 2; //
+  int64 BankMaxCoin = 3; // 存钱罐最大储存值
+  int32 DayBuyMaxCnt = 4;       // 今日最大可购买次数
+  int64 Price = 5;	//原价
+  int64 CostDiamond = 6;	//现价
+  map<int64, int64> GoldExc = 7;  // 奖励道具
+}
+
 // 存钱罐信息
 //PACKET_CSPigbankGetInfo
 message CSPigbankGetInfo{
@@ -347,13 +358,9 @@ message SCPigbankGetInfo{
   OpResultCode OpRetCode = 1;    //结果
   int64 BankCoin = 2; // 当前已存金额
   int32 TakeTimes = 3;  // 领取次数
-  int64 CostDiamond = 4; // 耗费钻石
+  repeated PigBankCoinInfo infoArr = 4;
-  int64 BankMaxCoin = 5; // 存钱罐最储存值
-  int32 DayBuyMaxCnt = 6;       // 今日最大可购买次数
-  int64 Price = 7;			//消耗钻石原价
 }
 
-
 // 存钱罐领取金币
 //PACKET_CSPigbankTakeCoin
 message CSPigbankTakeCoin{
@@ -365,10 +372,7 @@ message SCPigbankTakeCoin{
   OpResultCode OpRetCode = 1;   // 结果
   int64 TakeCoinNum = 2;        // 领取金币数量
   int32 TakeTimes = 3;          // 领取次数
-  int64 CostDiamond = 4;        // 耗费钻石
+  //repeated PigBankCoinInfo info = 4;
-  int64 BankMaxCoin = 5;        // 存钱罐最储存值
-  int32 DayBuyMaxCnt = 6;       // 今日最大可购买次数
-  int64 Price = 7;			//消耗钻石原价
 }
 
 // 钻石存钱罐信息
@@ -376,17 +380,24 @@ message SCPigbankTakeCoin{
 message CSDiamondBankGetInfo{
 }
 
+message PigBankDiamondInfo{
+  int32 IndexId = 1;
+  double TakeDiamond = 2; //
+  int64 BankMaxDiamond = 3; // 存钱罐最大储存值
+  int32 DayBuyMaxCnt = 4;       // 今日最大可购买次数
+  int64 Price = 5;	//原价
+  int64 NowPrice = 6;	//现价
+  int32 ShopId = 7;	//商城ID
+  map<int64, int64> DiamondExc = 8;
+}
+
 // 钻石存钱罐信息
 //PACKET_SCDiamondBankGetInfo
 message SCDiamondBankGetInfo{
   OpResultCode OpRetCode = 1;    //结果
   double BankDiamond = 2; // 当前已存钻石
   int32 TakeTimes = 3;  // 领取次数
-  int64 BankMaxCoin = 4; // 存钱罐最大储存值
+  repeated PigBankDiamondInfo  infoArr = 4; // 奖励道具
-  int32 DayBuyMaxCnt = 5;       // 今日最大可购买次数
-  int64 Price = 6;	//原价
-  int64 NowPrice = 7;	//现价
-  int32 ShopId = 8;	//商城ID
 }
 // 钻石存钱罐领取金币
 //PACKET_SCDiamondBankTakeDiamond
@@ -394,11 +405,7 @@ message SCDiamondBankTakeDiamond{
   OpResultCode OpRetCode = 1;   // 结果
   double TakeDiamondNum = 2;        // 领取钻石数量
   int32 TakeTimes = 3;          // 领取次数
-  int64 BankMaxDiamond = 4;        // 存钱罐最大储存值
+  //repeated PigBankDiamondInfo  info = 4;
-  int32 DayBuyMaxCnt = 5;       // 今日最大可购买次数
-  int64 Price = 6;	//原价
-  int64 NowPrice = 7;	//现价
-  int32 ShopId = 8;	//商城ID
 }
 
 // 赛季通行证信息