add sugarrush proto

data/DB_ACTPushCoin.dat

@@ -0,0 +1,11 @@
+
+

иб†

+
Ьв†2
+
Рв†
+
ф±к

+
Ьа†

+
иўЌ
+
иа†
+
ЬўЌ

+
+	жЩ

data/DB_ACTPushCoin.json

@@ -0,0 +1,66 @@
+{
+	"Arr": [
+		{
+			"Id": 1,
+			"Rate": 1000,
+			"Gain": {
+				"50017": 1
+			}
+		},
+		{
+			"Id": 2,
+			"Rate": 1500,
+			"Gain": {
+				"50018": 50
+			}
+		},
+		{
+			"Id": 3,
+			"Rate": 2000,
+			"Gain": {
+				"50018": 20
+			}
+		},
+		{
+			"Id": 4,
+			"Rate": 500,
+			"Gain": {
+				"30001": 5
+			}
+		},
+		{
+			"Id": 5,
+			"Rate": 1500,
+			"Gain": {
+				"50016": 1
+			}
+		},
+		{
+			"Id": 6,
+			"Rate": 1000,
+			"Gain": {
+				"100002": 3
+			}
+		},
+		{
+			"Id": 7,
+			"Rate": 1000,
+			"Gain": {
+				"50016": 3
+			}
+		},
+		{
+			"Id": 8,
+			"Rate": 1500,
+			"Gain": {
+				"100002": 1
+			}
+		},
+		{
+			"Id": 9,
+			"Gain": {
+				"77030": 1
+			}
+		}
+	]
+}

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

@@ -1437,7 +1437,7 @@
 			"CompositionMax": 1,
 			"Location": "0",
 			"Describe": "房间内互动表情",
-			"Num": 2
+			"Num": 1000
 		},
 		{
 			"Id": 100008,
@@ -1472,7 +1472,7 @@
 			"CompositionMax": 1,
 			"Location": "0",
 			"Describe": "房间内互动表情",
-			"Num": 2
+			"Num": 1000
 		},
 		{
 			"Id": 100009,
@@ -1507,7 +1507,7 @@
 			"CompositionMax": 1,
 			"Location": "0",
 			"Describe": "房间内互动表情",
-			"Num": 2
+			"Num": 1000
 		},
 		{
 			"Id": 100010,
@@ -1542,7 +1542,7 @@
 			"CompositionMax": 1,
 			"Location": "0",
 			"Describe": "房间内互动表情",
-			"Num": 2
+			"Num": 1000
 		},
 		{
 			"Id": 100011,
@@ -7154,6 +7154,374 @@
 			"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产出途径：存钱罐"
+		},
+		{
+			"Id": 50014,
+			"Name": "爆竹",
+			"ShowLocation": [
+				0,
+				0,
+				0
+			],
+			"Classify": [
+				0,
+				0,
+				0
+			],
+			"Type": 28,
+			"Effect0": [
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			],
+			"Effect": [
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			],
+			"SaleType": 1,
+			"SaleGold": 5000,
+			"Composition": 1,
+			"CompositionMax": 9999,
+			"Location": "0",
+			"Describe": "可在年兽活动中击退年兽，获得奖品"
+		},
+		{
+			"Id": 50015,
+			"Name": "火箭爆竹",
+			"ShowLocation": [
+				0,
+				0,
+				0
+			],
+			"Classify": [
+				0,
+				0,
+				0
+			],
+			"Type": 28,
+			"Effect0": [
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			],
+			"Effect": [
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			],
+			"SaleType": 1,
+			"SaleGold": 5000,
+			"Composition": 1,
+			"CompositionMax": 9999,
+			"Location": "0",
+			"Describe": "可在年兽活动中击退年兽，获得奖品"
+		},
+		{
+			"Id": 50016,
+			"Name": "梅花",
+			"ShowLocation": [
+				0,
+				0,
+				0
+			],
+			"Classify": [
+				0,
+				0,
+				0
+			],
+			"Type": 29,
+			"Effect0": [
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			],
+			"Effect": [
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			],
+			"SaleType": 1,
+			"SaleGold": 5000,
+			"Composition": 1,
+			"CompositionMax": 9999,
+			"Location": "0",
+			"Describe": "可在推币机活动兑换道具"
+		},
+		{
+			"Id": 50017,
+			"Name": "大金币",
+			"ShowLocation": [
+				0,
+				0,
+				0
+			],
+			"Classify": [
+				0,
+				0,
+				0
+			],
+			"Type": 29,
+			"Effect0": [
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			],
+			"Effect": [
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			],
+			"SaleType": 1,
+			"SaleGold": 5000,
+			"Composition": 1,
+			"CompositionMax": 9999,
+			"Location": "0",
+			"Describe": "推币机活动中掉落的3D道具",
+			"Num": 50000
+		},
+		{
+			"Id": 50018,
+			"Name": "3D金币5K",
+			"ShowLocation": [
+				0,
+				0,
+				0
+			],
+			"Classify": [
+				0,
+				0,
+				0
+			],
+			"Type": 29,
+			"Effect0": [
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			],
+			"Effect": [
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			],
+			"SaleType": 1,
+			"SaleGold": 5000,
+			"Composition": 1,
+			"CompositionMax": 9999,
+			"Location": "0",
+			"Describe": "推币机活动中掉落的3D道具",
+			"Num": 5000
+		},
+		{
+			"Id": 50019,
+			"Name": "3D金币10K",
+			"ShowLocation": [
+				0,
+				0,
+				0
+			],
+			"Classify": [
+				0,
+				0,
+				0
+			],
+			"Type": 29,
+			"Effect0": [
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			],
+			"Effect": [
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			],
+			"SaleType": 1,
+			"SaleGold": 5000,
+			"Composition": 1,
+			"CompositionMax": 9999,
+			"Location": "0",
+			"Describe": "推币机活动中掉落的3D道具",
+			"Num": 10000
+		},
+		{
+			"Id": 50020,
+			"Name": "3D金币15K",
+			"ShowLocation": [
+				0,
+				0,
+				0
+			],
+			"Classify": [
+				0,
+				0,
+				0
+			],
+			"Type": 29,
+			"Effect0": [
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			],
+			"Effect": [
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			],
+			"SaleType": 1,
+			"SaleGold": 5000,
+			"Composition": 1,
+			"CompositionMax": 9999,
+			"Location": "0",
+			"Describe": "推币机活动中掉落的3D道具",
+			"Num": 15000
+		},
+		{
+			"Id": 50021,
+			"Name": "震动效果",
+			"ShowLocation": [
+				0,
+				0,
+				0
+			],
+			"Classify": [
+				0,
+				0,
+				0
+			],
+			"Type": 29,
+			"Effect0": [
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			],
+			"Effect": [
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			],
+			"Location": "0",
+			"Describe": "推币机震动次数"
 		}
 	]
 }

data/DB_GameRule.json

@@ -267,6 +267,12 @@
 			"Name": "娃娃机",
 			"GameId": 608,
 			"GameDif": "608"
+		},
+		{
+			"Id": 60900,
+			"Name": "推币机",
+			"GameId": 609,
+			"GameDif": "609"
 		}
 	]
 }

data/DB_NewYearActivity.dat

@@ -0,0 +1,29 @@
+
+4

+SignReward50014,10;100001,100000"签到奖励
+.
SignExcReward50015,1"签到额外奖励
+=SignExcRewardMax
2"$签到额外奖励赠送次数上限
+9SignExcRewardProp30"签到额外奖励赠送概率
+ BossExp6800000"
+BOSS血量
+:
+BossReward100001,1000000;100002,10"BOSS击杀奖励
+/
LuckyRankNeed10000"幸运榜上榜条件
+/RankNeed7000000"总伤害榜上榜条件
+>	LittleHurtGold
+8000,12000"小爆竹造成的伤害范围
+>
+BigHurtGold
400000,600000"大爆竹造成的伤害范围
+4
+BigHurtExc30001"大爆竹额外掉落道具ID
+=BigHurtExcNumber3,15"!大爆竹额外掉落数量范围
+5
LittleGuaranteed30"小爆竹保底掉落次数
+ALittleGuaranteedReward100002,5"小爆竹保底掉落物品
+2
BigGuaranteed10"大爆竹保底掉落次数
+>BigGuaranteedReward30001,80"大爆竹保底掉落物品
+.
+GiftShopID991001,991002,991003"礼包ID
+@
GiftShopLimit3,0,0"&礼包每日限购次数,0为不限购
+4BossExcLimit30"年兽死亡额外掉落要求
+"	BuffCount
1"Buff生效次数
+oExchangeDiamond30,5,1500000"L单次兑换爆竹所需要消耗的钻石,获得数量，获得金币数量

data/DB_NewYearActivity.json

@@ -0,0 +1,130 @@
+{
+	"Arr": [
+		{
+			"Id": 1,
+			"PorpName": "SignReward",
+			"PropValue": "50014,10;100001,100000",
+			"PropDec": "签到奖励"
+		},
+		{
+			"Id": 2,
+			"PorpName": "SignExcReward",
+			"PropValue": "50015,1",
+			"PropDec": "签到额外奖励"
+		},
+		{
+			"Id": 3,
+			"PorpName": "SignExcRewardMax",
+			"PropValue": "2",
+			"PropDec": "签到额外奖励赠送次数上限"
+		},
+		{
+			"Id": 4,
+			"PorpName": "SignExcRewardProp",
+			"PropValue": "30",
+			"PropDec": "签到额外奖励赠送概率"
+		},
+		{
+			"Id": 5,
+			"PorpName": "BossExp",
+			"PropValue": "6800000",
+			"PropDec": "BOSS血量"
+		},
+		{
+			"Id": 6,
+			"PorpName": "BossReward",
+			"PropValue": "100001,1000000;100002,10",
+			"PropDec": "BOSS击杀奖励"
+		},
+		{
+			"Id": 7,
+			"PorpName": "LuckyRankNeed",
+			"PropValue": "10000",
+			"PropDec": "幸运榜上榜条件"
+		},
+		{
+			"Id": 8,
+			"PorpName": "RankNeed",
+			"PropValue": "7000000",
+			"PropDec": "总伤害榜上榜条件"
+		},
+		{
+			"Id": 9,
+			"PorpName": "LittleHurtGold",
+			"PropValue": "8000,12000",
+			"PropDec": "小爆竹造成的伤害范围"
+		},
+		{
+			"Id": 10,
+			"PorpName": "BigHurtGold",
+			"PropValue": "400000,600000",
+			"PropDec": "大爆竹造成的伤害范围"
+		},
+		{
+			"Id": 11,
+			"PorpName": "BigHurtExc",
+			"PropValue": "30001",
+			"PropDec": "大爆竹额外掉落道具ID"
+		},
+		{
+			"Id": 12,
+			"PorpName": "BigHurtExcNumber",
+			"PropValue": "3,15",
+			"PropDec": "大爆竹额外掉落数量范围"
+		},
+		{
+			"Id": 13,
+			"PorpName": "LittleGuaranteed",
+			"PropValue": "30",
+			"PropDec": "小爆竹保底掉落次数"
+		},
+		{
+			"Id": 14,
+			"PorpName": "LittleGuaranteedReward",
+			"PropValue": "100002,5",
+			"PropDec": "小爆竹保底掉落物品"
+		},
+		{
+			"Id": 15,
+			"PorpName": "BigGuaranteed",
+			"PropValue": "10",
+			"PropDec": "大爆竹保底掉落次数"
+		},
+		{
+			"Id": 16,
+			"PorpName": "BigGuaranteedReward",
+			"PropValue": "30001,80",
+			"PropDec": "大爆竹保底掉落物品"
+		},
+		{
+			"Id": 17,
+			"PorpName": "GiftShopID",
+			"PropValue": "991001,991002,991003",
+			"PropDec": "礼包ID"
+		},
+		{
+			"Id": 18,
+			"PorpName": "GiftShopLimit",
+			"PropValue": "3,0,0",
+			"PropDec": "礼包每日限购次数,0为不限购"
+		},
+		{
+			"Id": 19,
+			"PorpName": "BossExcLimit",
+			"PropValue": "30",
+			"PropDec": "年兽死亡额外掉落要求"
+		},
+		{
+			"Id": 20,
+			"PorpName": "BuffCount",
+			"PropValue": "1",
+			"PropDec": "Buff生效次数"
+		},
+		{
+			"Id": 21,
+			"PorpName": "ExchangeDiamond",
+			"PropValue": "30,5,1500000",
+			"PropDec": "单次兑换爆竹所需要消耗的钻石,获得数量，获得金币数量"
+		}
+	]
+}

data/DB_NewYearRankReward.dat

@@ -0,0 +1,84 @@
+
+


"¹ê
"¡<>"¢<>d
+
"¡<>"¢<>d"¸ê

+
"¡<>"¢<>d"¸ê


+
"¡<>"¢<>d
+
"¡<>"¢<>c
+
"¡<>"¢<>b
+
"¡<>"¢<>a
+
"¡<>"¢<>`
+	
	"¡<>"¢<>_
+
+

+"¡<>"¢<>^
+
"¡<>"¢<>]
+
"¢<>\"¡<>
+


"¡<>"¢<>[
+
"¢<>Z"¡<>
+
"¡<>"¢<>Y
+
"¡<>"¢<>X
+
"¡<>"¢<>W
+
"¡<>"¢<>V
+
"¡<>"¢<>U
+
"¡<>"¢<>T
+
"¡<>"¢<>S
+
"¡<>"¢<>R
+
"¡<>"¢<>Q
+
"¡<>"¢<>P
+
"¡<>"¢<>O
+
"¡<>"¢<>N
+
"¢<>M"¡<>
+
"¢<>L"¡<>
+
"¡<>"¢<>K
+
"¡<>"¢<>J
+
"¡<>"¢<>I
+ 
 "¢<>H"¡<>
+!
!"¡<>"¢<>G
+"
""¡<>"¢<>F
+#
#"¡<>"¢<>E
+$
$"¡<>"¢<>D
+%
%"¡<>"¢<>C
+&
&"¡<>"¢<>B
+'
'"¡<>"¢<>A
+(
("¡<>"¢<>@
+)
"¡<>"¢<>d"¹ê

+*"¡<>"¢<>d"¸ê

++"¡<>"¢<>d"¸ê


+,"¡<>"¢<>d
+-"¡<>"¢<>c
+."¡<>"¢<>b
+/"¢<>a"¡<>
+0"¡<>"¢<>`
+1	"¢<>_"¡<>
+2
+"¡<>"¢<>^
+3"¡<>"¢<>]
+4"¡<>"¢<>\
+5
"¡<>"¢<>[
+6"¢<>Z"¡<>
+7"¡<>"¢<>Y
+8"¢<>X"¡<>
+9"¡<>"¢<>W
+:"¡<>"¢<>V
+;"¡<>"¢<>U
+<"¡<>"¢<>T
+="¡<>"¢<>S
+>"¡<>"¢<>R
+?"¢<>Q"¡<>
+@"¡<>"¢<>P
+A"¡<>"¢<>O
+B"¡<>"¢<>N
+C"¡<>"¢<>M
+D"¡<>"¢<>L
+E"¡<>"¢<>K
+F"¡<>"¢<>J
+G"¡<>"¢<>I
+H "¡<>"¢<>H
+I!"¢<>G"¡<>
+J""¡<>"¢<>F
+K#"¡<>"¢<>E
+L$"¡<>"¢<>D
+M%"¡<>"¢<>C
+N&"¡<>"¢<>B
+O'"¡<>"¢<>A
+P("¡<>"¢<>@

data/DB_NewYearRankReward.json

@@ -0,0 +1,730 @@
+{
+	"Arr": [
+		{
+			"Id": 1,
+			"RankType": 1,
+			"RankLevelId": 1,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 100,
+				"30009": 2
+			}
+		},
+		{
+			"Id": 2,
+			"RankType": 1,
+			"RankLevelId": 2,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 100,
+				"30008": 2
+			}
+		},
+		{
+			"Id": 3,
+			"RankType": 1,
+			"RankLevelId": 3,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 100,
+				"30008": 1
+			}
+		},
+		{
+			"Id": 4,
+			"RankType": 1,
+			"RankLevelId": 4,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 100
+			}
+		},
+		{
+			"Id": 5,
+			"RankType": 1,
+			"RankLevelId": 5,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 99
+			}
+		},
+		{
+			"Id": 6,
+			"RankType": 1,
+			"RankLevelId": 6,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 98
+			}
+		},
+		{
+			"Id": 7,
+			"RankType": 1,
+			"RankLevelId": 7,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 97
+			}
+		},
+		{
+			"Id": 8,
+			"RankType": 1,
+			"RankLevelId": 8,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 96
+			}
+		},
+		{
+			"Id": 9,
+			"RankType": 1,
+			"RankLevelId": 9,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 95
+			}
+		},
+		{
+			"Id": 10,
+			"RankType": 1,
+			"RankLevelId": 10,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 94
+			}
+		},
+		{
+			"Id": 11,
+			"RankType": 1,
+			"RankLevelId": 11,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 93
+			}
+		},
+		{
+			"Id": 12,
+			"RankType": 1,
+			"RankLevelId": 12,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 92
+			}
+		},
+		{
+			"Id": 13,
+			"RankType": 1,
+			"RankLevelId": 13,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 91
+			}
+		},
+		{
+			"Id": 14,
+			"RankType": 1,
+			"RankLevelId": 14,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 90
+			}
+		},
+		{
+			"Id": 15,
+			"RankType": 1,
+			"RankLevelId": 15,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 89
+			}
+		},
+		{
+			"Id": 16,
+			"RankType": 1,
+			"RankLevelId": 16,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 88
+			}
+		},
+		{
+			"Id": 17,
+			"RankType": 1,
+			"RankLevelId": 17,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 87
+			}
+		},
+		{
+			"Id": 18,
+			"RankType": 1,
+			"RankLevelId": 18,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 86
+			}
+		},
+		{
+			"Id": 19,
+			"RankType": 1,
+			"RankLevelId": 19,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 85
+			}
+		},
+		{
+			"Id": 20,
+			"RankType": 1,
+			"RankLevelId": 20,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 84
+			}
+		},
+		{
+			"Id": 21,
+			"RankType": 1,
+			"RankLevelId": 21,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 83
+			}
+		},
+		{
+			"Id": 22,
+			"RankType": 1,
+			"RankLevelId": 22,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 82
+			}
+		},
+		{
+			"Id": 23,
+			"RankType": 1,
+			"RankLevelId": 23,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 81
+			}
+		},
+		{
+			"Id": 24,
+			"RankType": 1,
+			"RankLevelId": 24,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 80
+			}
+		},
+		{
+			"Id": 25,
+			"RankType": 1,
+			"RankLevelId": 25,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 79
+			}
+		},
+		{
+			"Id": 26,
+			"RankType": 1,
+			"RankLevelId": 26,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 78
+			}
+		},
+		{
+			"Id": 27,
+			"RankType": 1,
+			"RankLevelId": 27,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 77
+			}
+		},
+		{
+			"Id": 28,
+			"RankType": 1,
+			"RankLevelId": 28,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 76
+			}
+		},
+		{
+			"Id": 29,
+			"RankType": 1,
+			"RankLevelId": 29,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 75
+			}
+		},
+		{
+			"Id": 30,
+			"RankType": 1,
+			"RankLevelId": 30,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 74
+			}
+		},
+		{
+			"Id": 31,
+			"RankType": 1,
+			"RankLevelId": 31,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 73
+			}
+		},
+		{
+			"Id": 32,
+			"RankType": 1,
+			"RankLevelId": 32,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 72
+			}
+		},
+		{
+			"Id": 33,
+			"RankType": 1,
+			"RankLevelId": 33,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 71
+			}
+		},
+		{
+			"Id": 34,
+			"RankType": 1,
+			"RankLevelId": 34,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 70
+			}
+		},
+		{
+			"Id": 35,
+			"RankType": 1,
+			"RankLevelId": 35,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 69
+			}
+		},
+		{
+			"Id": 36,
+			"RankType": 1,
+			"RankLevelId": 36,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 68
+			}
+		},
+		{
+			"Id": 37,
+			"RankType": 1,
+			"RankLevelId": 37,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 67
+			}
+		},
+		{
+			"Id": 38,
+			"RankType": 1,
+			"RankLevelId": 38,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 66
+			}
+		},
+		{
+			"Id": 39,
+			"RankType": 1,
+			"RankLevelId": 39,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 65
+			}
+		},
+		{
+			"Id": 40,
+			"RankType": 1,
+			"RankLevelId": 40,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 64
+			}
+		},
+		{
+			"Id": 41,
+			"RankType": 2,
+			"RankLevelId": 1,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 100,
+				"30009": 2
+			}
+		},
+		{
+			"Id": 42,
+			"RankType": 2,
+			"RankLevelId": 2,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 100,
+				"30008": 2
+			}
+		},
+		{
+			"Id": 43,
+			"RankType": 2,
+			"RankLevelId": 3,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 100,
+				"30008": 1
+			}
+		},
+		{
+			"Id": 44,
+			"RankType": 2,
+			"RankLevelId": 4,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 100
+			}
+		},
+		{
+			"Id": 45,
+			"RankType": 2,
+			"RankLevelId": 5,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 99
+			}
+		},
+		{
+			"Id": 46,
+			"RankType": 2,
+			"RankLevelId": 6,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 98
+			}
+		},
+		{
+			"Id": 47,
+			"RankType": 2,
+			"RankLevelId": 7,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 97
+			}
+		},
+		{
+			"Id": 48,
+			"RankType": 2,
+			"RankLevelId": 8,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 96
+			}
+		},
+		{
+			"Id": 49,
+			"RankType": 2,
+			"RankLevelId": 9,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 95
+			}
+		},
+		{
+			"Id": 50,
+			"RankType": 2,
+			"RankLevelId": 10,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 94
+			}
+		},
+		{
+			"Id": 51,
+			"RankType": 2,
+			"RankLevelId": 11,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 93
+			}
+		},
+		{
+			"Id": 52,
+			"RankType": 2,
+			"RankLevelId": 12,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 92
+			}
+		},
+		{
+			"Id": 53,
+			"RankType": 2,
+			"RankLevelId": 13,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 91
+			}
+		},
+		{
+			"Id": 54,
+			"RankType": 2,
+			"RankLevelId": 14,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 90
+			}
+		},
+		{
+			"Id": 55,
+			"RankType": 2,
+			"RankLevelId": 15,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 89
+			}
+		},
+		{
+			"Id": 56,
+			"RankType": 2,
+			"RankLevelId": 16,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 88
+			}
+		},
+		{
+			"Id": 57,
+			"RankType": 2,
+			"RankLevelId": 17,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 87
+			}
+		},
+		{
+			"Id": 58,
+			"RankType": 2,
+			"RankLevelId": 18,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 86
+			}
+		},
+		{
+			"Id": 59,
+			"RankType": 2,
+			"RankLevelId": 19,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 85
+			}
+		},
+		{
+			"Id": 60,
+			"RankType": 2,
+			"RankLevelId": 20,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 84
+			}
+		},
+		{
+			"Id": 61,
+			"RankType": 2,
+			"RankLevelId": 21,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 83
+			}
+		},
+		{
+			"Id": 62,
+			"RankType": 2,
+			"RankLevelId": 22,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 82
+			}
+		},
+		{
+			"Id": 63,
+			"RankType": 2,
+			"RankLevelId": 23,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 81
+			}
+		},
+		{
+			"Id": 64,
+			"RankType": 2,
+			"RankLevelId": 24,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 80
+			}
+		},
+		{
+			"Id": 65,
+			"RankType": 2,
+			"RankLevelId": 25,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 79
+			}
+		},
+		{
+			"Id": 66,
+			"RankType": 2,
+			"RankLevelId": 26,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 78
+			}
+		},
+		{
+			"Id": 67,
+			"RankType": 2,
+			"RankLevelId": 27,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 77
+			}
+		},
+		{
+			"Id": 68,
+			"RankType": 2,
+			"RankLevelId": 28,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 76
+			}
+		},
+		{
+			"Id": 69,
+			"RankType": 2,
+			"RankLevelId": 29,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 75
+			}
+		},
+		{
+			"Id": 70,
+			"RankType": 2,
+			"RankLevelId": 30,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 74
+			}
+		},
+		{
+			"Id": 71,
+			"RankType": 2,
+			"RankLevelId": 31,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 73
+			}
+		},
+		{
+			"Id": 72,
+			"RankType": 2,
+			"RankLevelId": 32,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 72
+			}
+		},
+		{
+			"Id": 73,
+			"RankType": 2,
+			"RankLevelId": 33,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 71
+			}
+		},
+		{
+			"Id": 74,
+			"RankType": 2,
+			"RankLevelId": 34,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 70
+			}
+		},
+		{
+			"Id": 75,
+			"RankType": 2,
+			"RankLevelId": 35,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 69
+			}
+		},
+		{
+			"Id": 76,
+			"RankType": 2,
+			"RankLevelId": 36,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 68
+			}
+		},
+		{
+			"Id": 77,
+			"RankType": 2,
+			"RankLevelId": 37,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 67
+			}
+		},
+		{
+			"Id": 78,
+			"RankType": 2,
+			"RankLevelId": 38,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 66
+			}
+		},
+		{
+			"Id": 79,
+			"RankType": 2,
+			"RankLevelId": 39,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 65
+			}
+		},
+		{
+			"Id": 80,
+			"RankType": 2,
+			"RankLevelId": 40,
+			"AwardMap": {
+				"100001": 30,
+				"100002": 64
+			}
+		}
+	]
+}

data/DB_PigBank_Diamond.dat

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


 (Ђ­в0–
8Ўи;@dH–
Pc
- ((Ђ­в0¬8ўи;@dH¬PЗ

-яБЧ/ 2(Ђ­в0о8Ји;@dHоPу
+


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

+?<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

data/DB_PropExchange.json

@@ -64,12 +64,60 @@
 				"100002": 500
 			}
 		},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
+		{
+			"Id": 5,
+			"Group": 2,
+			"Cost": {
+				"50016": 30
+			},
+			"Gain": {
+				"40002": 1
+			},
+			"Times": 5
+		},
+		{
+			"Id": 6,
+			"Group": 2,
+			"Cost": {
+				"50016": 10
+			},
+			"Gain": {
+				"100002": 3
+			},
+			"Times": 10
+		},
+		{
+			"Id": 7,
+			"Group": 2,
+			"Cost": {
+				"50016": 5
+			},
+			"Gain": {
+				"30001": 15
+			},
+			"Times": 15
+		},
+		{
+			"Id": 8,
+			"Group": 2,
+			"Cost": {
+				"50016": 1
+			},
+			"Gain": {
+				"20003": 1
+			},
+			"Times": 20
+		},
+		{
+			"Id": 9,
+			"Group": 2,
+			"Cost": {
+				"50016": 1
+			},
+			"Gain": {
+				"100001": 30000
+			}
+		},
 		{},
 		{},
 		{},

data/DB_Skin.json

@@ -28,14 +28,14 @@
 			"UnlockItem": {
 				"310002": 20
 			},
-			"SkinSkillName": "0",
-			"SkinSkillIcon": "0",
-			"SkinSkillDes": "0",
+			"SkinSkillName": "福气东来",
+			"SkinSkillIcon": "SkillIcon-30002",
+			"SkinSkillDes": "排位赛积分提升",
 			"Turn": [
-				0
+				1
 			],
 			"TurnKey": [
-				"0"
+				"DBSkinUnlock_300002_t1"
 			]
 		},
 		{
@@ -49,14 +49,14 @@
 			"UnlockItem": {
 				"310003": 20
 			},
-			"SkinSkillName": "0",
-			"SkinSkillIcon": "0",
-			"SkinSkillDes": "0",
+			"SkinSkillName": "活力满满",
+			"SkinSkillIcon": "SkillIcon-30003",
+			"SkinSkillDes": "VIP赛每日免费报名次数提升",
 			"Turn": [
-				0
+				2
 			],
 			"TurnKey": [
-				"0"
+				"DBSkinUnlock_300003_t1"
 			]
 		},
 		{
@@ -70,14 +70,14 @@
 			"UnlockItem": {
 				"310004": 20
 			},
-			"SkinSkillName": "0",
-			"SkinSkillIcon": "0",
-			"SkinSkillDes": "0",
+			"SkinSkillName": "金币满满",
+			"SkinSkillIcon": "SkillIcon-30004",
+			"SkinSkillDes": "每日礼包金币奖励提升",
 			"Turn": [
-				0
+				2
 			],
 			"TurnKey": [
-				"0"
+				"DBSkinUnlock_300004_t1"
 			]
 		},
 		{
@@ -91,14 +91,14 @@
 			"UnlockItem": {
 				"310005": 20
 			},
-			"SkinSkillName": "0",
-			"SkinSkillIcon": "0",
-			"SkinSkillDes": "0",
+			"SkinSkillName": "金币加成",
+			"SkinSkillIcon": "SkillIcon-30005",
+			"SkinSkillDes": "每日任务金币奖励加成",
 			"Turn": [
-				0
+				3
 			],
 			"TurnKey": [
-				"0"
+				"DBSkinUnlock_300005_t1"
 			]
 		},
 		{
@@ -116,10 +116,10 @@
 			"SkinSkillIcon": "0",
 			"SkinSkillDes": "0",
 			"Turn": [
-				0
+				4
 			],
 			"TurnKey": [
-				"0"
+				"DBSkinUnlock_300006_t1"
 			]
 		},
 		{
@@ -133,14 +133,14 @@
 			"UnlockItem": {
 				"310007": 20
 			},
-			"SkinSkillName": "0",
-			"SkinSkillIcon": "0",
-			"SkinSkillDes": "0",
+			"SkinSkillName": "好运加成",
+			"SkinSkillIcon": "SkillIcon-30007",
+			"SkinSkillDes": "每次钻石抽奖幸运值提升",
 			"Turn": [
-				0
+				5
 			],
 			"TurnKey": [
-				"0"
+				"DBSkinUnlock_300007_t1"
 			]
 		}
 	]

data/DB_SkinLevel.dat

@@ -11,50 +11,58 @@
 
 瓰
 "髟<10>
B
0
-β§
B
0
-β§"ςυB
0
-
β§"ςυB
0
-β§"ςυB
0
-β§"ςυ
B
0
-β§"ςυB
0
-β§"ςυ"B
0
-β§"ςυ7B
0
-β§	"ςυYB
0
-β§
-"ςυ<10>
B
0
-γ§
B
0
-γ§"συB
0
-γ§"συB
0
-γ§"συB
0
-γ§"συ
B
0
-γ§"συB
0
-γ§"συ"B
0
-γ§"συ7B
0
-γ§	"συYB
0
-γ§
-"συ<10>
B
0
-δ§
B
0
- δ§"τυB
0
-!δ§"τυB
0
-"δ§"τυB
0
-#δ§"τυ
B
0
-$δ§"τυB
0
-%δ§"τυ"B
0
-&δ§"τυ7B
0
-'δ§	"τυYB
0
-(δ§
-"τυ<10>
B
0
-)ε§
B
0
-*ε§"υυB
0
-+ε§"υυB
0
-,ε§"υυB
0
--ε§"υυ
B
0
-.ε§"υυB
0
-/ε§"υυ"B
0
-0ε§"υυ7B
0
-1ε§	"υυYB
0
-2ε§
-"υυ<10>
B
0
++â§
(²ê
0
8
B排ä½<C3A4>赛积分æ<E280A0><C3A6>å<EFBFBD>‡{0}%
+3â§"òõ(²ê
08B排ä½<C3A4>赛积分æ<E280A0><C3A6>å<EFBFBD>‡{0}%
+3
â§"òõ(²ê
08B排ä½<C3A4>赛积分æ<E280A0><C3A6>å<EFBFBD>‡{0}%
+3â§"òõ(²ê
08B排ä½<C3A4>赛积分æ<E280A0><C3A6>å<EFBFBD>‡{0}%
+3â§"òõ
(²ê
08B排ä½<C3A4>赛积分æ<E280A0><C3A6>å<EFBFBD>‡{0}%
+3â§"òõ(²ê
08B排ä½<C3A4>赛积分æ<E280A0><C3A6>å<EFBFBD>‡{0}%
+3â§"òõ"(²ê
08B排ä½<C3A4>赛积分æ<E280A0><C3A6>å<EFBFBD>‡{0}%
+3â§"òõ7(²ê
08B排ä½<C3A4>赛积分æ<E280A0><C3A6>å<EFBFBD>‡{0}%
+3â§	"òõY(²ê
0	8	B排ä½<C3A4>赛积分æ<E280A0><C3A6>å<EFBFBD>‡{0}%
+4â§
+"òõ<10>
(²ê
0
+8
+B排ä½<C3A4>赛积分æ<E280A0><C3A6>å<EFBFBD>‡{0}%
+9ã§
(³ê
0
8
B'VIPèµ›æ¯<C3A6>æ—¥å…<C3A5>费报å<C2A5><C3A5>次数æ<C2B0><C3A6>å<EFBFBD>‡{0}
+Aã§"óõ(³ê
08B'VIPèµ›æ¯<C3A6>æ—¥å…<C3A5>费报å<C2A5><C3A5>次数æ<C2B0><C3A6>å<EFBFBD>‡{0}
+Aã§"óõ(³ê
08B'VIPèµ›æ¯<C3A6>æ—¥å…<C3A5>费报å<C2A5><C3A5>次数æ<C2B0><C3A6>å<EFBFBD>‡{0}
+Aã§"óõ(³ê
08B'VIPèµ›æ¯<C3A6>æ—¥å…<C3A5>费报å<C2A5><C3A5>次数æ<C2B0><C3A6>å<EFBFBD>‡{0}
+Aã§"óõ
(³ê
08B'VIPèµ›æ¯<C3A6>æ—¥å…<C3A5>费报å<C2A5><C3A5>次数æ<C2B0><C3A6>å<EFBFBD>‡{0}
+Aã§"óõ(³ê
08B'VIPèµ›æ¯<C3A6>æ—¥å…<C3A5>费报å<C2A5><C3A5>次数æ<C2B0><C3A6>å<EFBFBD>‡{0}
+Aã§"óõ"(³ê
08B'VIPèµ›æ¯<C3A6>æ—¥å…<C3A5>费报å<C2A5><C3A5>次数æ<C2B0><C3A6>å<EFBFBD>‡{0}
+Aã§"óõ7(³ê
08B'VIPèµ›æ¯<C3A6>æ—¥å…<C3A5>费报å<C2A5><C3A5>次数æ<C2B0><C3A6>å<EFBFBD>‡{0}
+Aã§	"óõY(³ê
0	8	B'VIPèµ›æ¯<C3A6>æ—¥å…<C3A5>费报å<C2A5><C3A5>次数æ<C2B0><C3A6>å<EFBFBD>‡{0}
+Bã§
+"óõ<10>
(³ê
0
+8
+B'VIPèµ›æ¯<C3A6>æ—¥å…<C3A5>费报å<C2A5><C3A5>次数æ<C2B0><C3A6>å<EFBFBD>‡{0}
+4ä§
(´ê
0
8
B"æ¯<C3A6>日礼包金å¸<C3A5>奖励æ<C2B1><C3A6>å<EFBFBD>‡{0}%
+< ä§"ôõ(´ê
08B"æ¯<C3A6>日礼包金å¸<C3A5>奖励æ<C2B1><C3A6>å<EFBFBD>‡{0}%
+<!ä§"ôõ(´ê
08B"æ¯<C3A6>日礼包金å¸<C3A5>奖励æ<C2B1><C3A6>å<EFBFBD>‡{0}%
+<"ä§"ôõ(´ê
08B"æ¯<C3A6>日礼包金å¸<C3A5>奖励æ<C2B1><C3A6>å<EFBFBD>‡{0}%
+<#ä§"ôõ
(´ê
08B"æ¯<C3A6>日礼包金å¸<C3A5>奖励æ<C2B1><C3A6>å<EFBFBD>‡{0}%
+<$ä§"ôõ(´ê
08B"æ¯<C3A6>日礼包金å¸<C3A5>奖励æ<C2B1><C3A6>å<EFBFBD>‡{0}%
+<%ä§"ôõ"(´ê
08B"æ¯<C3A6>日礼包金å¸<C3A5>奖励æ<C2B1><C3A6>å<EFBFBD>‡{0}%
+<&ä§"ôõ7(´ê
08B"æ¯<C3A6>日礼包金å¸<C3A5>奖励æ<C2B1><C3A6>å<EFBFBD>‡{0}%
+<'ä§	"ôõY(´ê
0	8	B"æ¯<C3A6>日礼包金å¸<C3A5>奖励æ<C2B1><C3A6>å<EFBFBD>‡{0}%
+=(ä§
+"ôõ<10>
(´ê
0
+8
+B"æ¯<C3A6>日礼包金å¸<C3A5>奖励æ<C2B1><C3A6>å<EFBFBD>‡{0}%
+4)å§
(µê
0
8
B"æ¯<C3A6>日任务金å¸<C3A5>奖励æ<C2B1><C3A6>å<EFBFBD>‡{0}%
+<*å§"õõ(µê
08B"æ¯<C3A6>日任务金å¸<C3A5>奖励æ<C2B1><C3A6>å<EFBFBD>‡{0}%
+<+å§"õõ(µê
08B"æ¯<C3A6>日任务金å¸<C3A5>奖励æ<C2B1><C3A6>å<EFBFBD>‡{0}%
+<,å§"õõ(µê
08B"æ¯<C3A6>日任务金å¸<C3A5>奖励æ<C2B1><C3A6>å<EFBFBD>‡{0}%
+<-å§"õõ
(µê
08B"æ¯<C3A6>日任务金å¸<C3A5>奖励æ<C2B1><C3A6>å<EFBFBD>‡{0}%
+<.å§"õõ(µê
08B"æ¯<C3A6>日任务金å¸<C3A5>奖励æ<C2B1><C3A6>å<EFBFBD>‡{0}%
+</å§"õõ"(µê
08B"æ¯<C3A6>日任务金å¸<C3A5>奖励æ<C2B1><C3A6>å<EFBFBD>‡{0}%
+<0å§"õõ7(µê
08B"æ¯<C3A6>日任务金å¸<C3A5>奖励æ<C2B1><C3A6>å<EFBFBD>‡{0}%
+<1å§	"õõY(µê
0	8	B"æ¯<C3A6>日任务金å¸<C3A5>奖励æ<C2B1><C3A6>å<EFBFBD>‡{0}%
+=2å§
+"õõ<10>
(µê
0
+8
+B"æ¯<C3A6>日任务金å¸<C3A5>奖励æ<C2B1><C3A6>å<EFBFBD>‡{0}%
 3罕
B
0
 4罕"<08>B
0
 5罕"<08>B
0
@@ -66,14 +74,16 @@
 ;罕	"<08>YB
0
 <罕
 "<08><10>
B
0
-=η§
B
0
->η§"χυB
0
-?η§"χυB
0
-@η§"χυB
0
-Aη§"χυ
B
0
-Bη§"χυB
0
-Cη§"χυ"B
0
-Dη§"χυ7B
0
-Eη§	"χυYB
0
-Fη§
-"χυ<10>
B
0
+7=ç§
(·ê
0
8
B%æ¯<C3A6>次钻石抽奖幸è¿<C3A8>值æ<C2BC><C3A6>å<EFBFBD>‡{0}%
+?>ç§"÷õ(·ê
08B%æ¯<C3A6>次钻石抽奖幸è¿<C3A8>值æ<C2BC><C3A6>å<EFBFBD>‡{0}%
+??ç§"÷õ(·ê
08B%æ¯<C3A6>次钻石抽奖幸è¿<C3A8>值æ<C2BC><C3A6>å<EFBFBD>‡{0}%
+?@ç§"÷õ(·ê
08B%æ¯<C3A6>次钻石抽奖幸è¿<C3A8>值æ<C2BC><C3A6>å<EFBFBD>‡{0}%
+?Aç§"÷õ
(·ê
08B%æ¯<C3A6>次钻石抽奖幸è¿<C3A8>值æ<C2BC><C3A6>å<EFBFBD>‡{0}%
+?Bç§"÷õ(·ê
08B%æ¯<C3A6>次钻石抽奖幸è¿<C3A8>值æ<C2BC><C3A6>å<EFBFBD>‡{0}%
+?Cç§"÷õ"(·ê
08B%æ¯<C3A6>次钻石抽奖幸è¿<C3A8>值æ<C2BC><C3A6>å<EFBFBD>‡{0}%
+?Dç§"÷õ7(·ê
08B%æ¯<C3A6>次钻石抽奖幸è¿<C3A8>值æ<C2BC><C3A6>å<EFBFBD>‡{0}%
+?Eç§	"÷õY(·ê
0	8	B%æ¯<C3A6>次钻石抽奖幸è¿<C3A8>值æ<C2BC><C3A6>å<EFBFBD>‡{0}%
+@Fç§
+"÷õ<10>
(·ê
0
+8
+B%æ¯<C3A6>次钻石抽奖幸è¿<C3A8>值æ<C2BC><C3A6>å<EFBFBD>‡{0}%

data/DB_SkinLevel.json

@@ -91,7 +91,10 @@
 			"Id": 11,
 			"SkinId": 300002,
 			"Level": 1,
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30002,
+			"SkinSkillLevel": 1,
+			"SkinSkillValue": 1,
+			"SkinSkillDes": "排位赛积分提升{0}%"
 		},
 		{
 			"Id": 12,
@@ -100,7 +103,10 @@
 			"UpItem": {
 				"310002": 3
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30002,
+			"SkinSkillLevel": 2,
+			"SkinSkillValue": 2,
+			"SkinSkillDes": "排位赛积分提升{0}%"
 		},
 		{
 			"Id": 13,
@@ -109,7 +115,10 @@
 			"UpItem": {
 				"310002": 5
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30002,
+			"SkinSkillLevel": 3,
+			"SkinSkillValue": 3,
+			"SkinSkillDes": "排位赛积分提升{0}%"
 		},
 		{
 			"Id": 14,
@@ -118,7 +127,10 @@
 			"UpItem": {
 				"310002": 8
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30002,
+			"SkinSkillLevel": 4,
+			"SkinSkillValue": 4,
+			"SkinSkillDes": "排位赛积分提升{0}%"
 		},
 		{
 			"Id": 15,
@@ -127,7 +139,10 @@
 			"UpItem": {
 				"310002": 13
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30002,
+			"SkinSkillLevel": 5,
+			"SkinSkillValue": 5,
+			"SkinSkillDes": "排位赛积分提升{0}%"
 		},
 		{
 			"Id": 16,
@@ -136,7 +151,10 @@
 			"UpItem": {
 				"310002": 21
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30002,
+			"SkinSkillLevel": 6,
+			"SkinSkillValue": 6,
+			"SkinSkillDes": "排位赛积分提升{0}%"
 		},
 		{
 			"Id": 17,
@@ -145,7 +163,10 @@
 			"UpItem": {
 				"310002": 34
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30002,
+			"SkinSkillLevel": 7,
+			"SkinSkillValue": 7,
+			"SkinSkillDes": "排位赛积分提升{0}%"
 		},
 		{
 			"Id": 18,
@@ -154,7 +175,10 @@
 			"UpItem": {
 				"310002": 55
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30002,
+			"SkinSkillLevel": 8,
+			"SkinSkillValue": 8,
+			"SkinSkillDes": "排位赛积分提升{0}%"
 		},
 		{
 			"Id": 19,
@@ -163,7 +187,10 @@
 			"UpItem": {
 				"310002": 89
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30002,
+			"SkinSkillLevel": 9,
+			"SkinSkillValue": 9,
+			"SkinSkillDes": "排位赛积分提升{0}%"
 		},
 		{
 			"Id": 20,
@@ -172,13 +199,19 @@
 			"UpItem": {
 				"310002": 144
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30002,
+			"SkinSkillLevel": 10,
+			"SkinSkillValue": 10,
+			"SkinSkillDes": "排位赛积分提升{0}%"
 		},
 		{
 			"Id": 21,
 			"SkinId": 300003,
 			"Level": 1,
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30003,
+			"SkinSkillLevel": 1,
+			"SkinSkillValue": 1,
+			"SkinSkillDes": "VIP赛每日免费报名次数提升{0}"
 		},
 		{
 			"Id": 22,
@@ -187,7 +220,10 @@
 			"UpItem": {
 				"310003": 3
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30003,
+			"SkinSkillLevel": 2,
+			"SkinSkillValue": 2,
+			"SkinSkillDes": "VIP赛每日免费报名次数提升{0}"
 		},
 		{
 			"Id": 23,
@@ -196,7 +232,10 @@
 			"UpItem": {
 				"310003": 5
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30003,
+			"SkinSkillLevel": 3,
+			"SkinSkillValue": 3,
+			"SkinSkillDes": "VIP赛每日免费报名次数提升{0}"
 		},
 		{
 			"Id": 24,
@@ -205,7 +244,10 @@
 			"UpItem": {
 				"310003": 8
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30003,
+			"SkinSkillLevel": 4,
+			"SkinSkillValue": 4,
+			"SkinSkillDes": "VIP赛每日免费报名次数提升{0}"
 		},
 		{
 			"Id": 25,
@@ -214,7 +256,10 @@
 			"UpItem": {
 				"310003": 13
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30003,
+			"SkinSkillLevel": 5,
+			"SkinSkillValue": 5,
+			"SkinSkillDes": "VIP赛每日免费报名次数提升{0}"
 		},
 		{
 			"Id": 26,
@@ -223,7 +268,10 @@
 			"UpItem": {
 				"310003": 21
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30003,
+			"SkinSkillLevel": 6,
+			"SkinSkillValue": 6,
+			"SkinSkillDes": "VIP赛每日免费报名次数提升{0}"
 		},
 		{
 			"Id": 27,
@@ -232,7 +280,10 @@
 			"UpItem": {
 				"310003": 34
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30003,
+			"SkinSkillLevel": 7,
+			"SkinSkillValue": 7,
+			"SkinSkillDes": "VIP赛每日免费报名次数提升{0}"
 		},
 		{
 			"Id": 28,
@@ -241,7 +292,10 @@
 			"UpItem": {
 				"310003": 55
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30003,
+			"SkinSkillLevel": 8,
+			"SkinSkillValue": 8,
+			"SkinSkillDes": "VIP赛每日免费报名次数提升{0}"
 		},
 		{
 			"Id": 29,
@@ -250,7 +304,10 @@
 			"UpItem": {
 				"310003": 89
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30003,
+			"SkinSkillLevel": 9,
+			"SkinSkillValue": 9,
+			"SkinSkillDes": "VIP赛每日免费报名次数提升{0}"
 		},
 		{
 			"Id": 30,
@@ -259,13 +316,19 @@
 			"UpItem": {
 				"310003": 144
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30003,
+			"SkinSkillLevel": 10,
+			"SkinSkillValue": 10,
+			"SkinSkillDes": "VIP赛每日免费报名次数提升{0}"
 		},
 		{
 			"Id": 31,
 			"SkinId": 300004,
 			"Level": 1,
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30004,
+			"SkinSkillLevel": 1,
+			"SkinSkillValue": 1,
+			"SkinSkillDes": "每日礼包金币奖励提升{0}%"
 		},
 		{
 			"Id": 32,
@@ -274,7 +337,10 @@
 			"UpItem": {
 				"310004": 3
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30004,
+			"SkinSkillLevel": 2,
+			"SkinSkillValue": 2,
+			"SkinSkillDes": "每日礼包金币奖励提升{0}%"
 		},
 		{
 			"Id": 33,
@@ -283,7 +349,10 @@
 			"UpItem": {
 				"310004": 5
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30004,
+			"SkinSkillLevel": 3,
+			"SkinSkillValue": 3,
+			"SkinSkillDes": "每日礼包金币奖励提升{0}%"
 		},
 		{
 			"Id": 34,
@@ -292,7 +361,10 @@
 			"UpItem": {
 				"310004": 8
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30004,
+			"SkinSkillLevel": 4,
+			"SkinSkillValue": 4,
+			"SkinSkillDes": "每日礼包金币奖励提升{0}%"
 		},
 		{
 			"Id": 35,
@@ -301,7 +373,10 @@
 			"UpItem": {
 				"310004": 13
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30004,
+			"SkinSkillLevel": 5,
+			"SkinSkillValue": 5,
+			"SkinSkillDes": "每日礼包金币奖励提升{0}%"
 		},
 		{
 			"Id": 36,
@@ -310,7 +385,10 @@
 			"UpItem": {
 				"310004": 21
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30004,
+			"SkinSkillLevel": 6,
+			"SkinSkillValue": 6,
+			"SkinSkillDes": "每日礼包金币奖励提升{0}%"
 		},
 		{
 			"Id": 37,
@@ -319,7 +397,10 @@
 			"UpItem": {
 				"310004": 34
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30004,
+			"SkinSkillLevel": 7,
+			"SkinSkillValue": 7,
+			"SkinSkillDes": "每日礼包金币奖励提升{0}%"
 		},
 		{
 			"Id": 38,
@@ -328,7 +409,10 @@
 			"UpItem": {
 				"310004": 55
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30004,
+			"SkinSkillLevel": 8,
+			"SkinSkillValue": 8,
+			"SkinSkillDes": "每日礼包金币奖励提升{0}%"
 		},
 		{
 			"Id": 39,
@@ -337,7 +421,10 @@
 			"UpItem": {
 				"310004": 89
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30004,
+			"SkinSkillLevel": 9,
+			"SkinSkillValue": 9,
+			"SkinSkillDes": "每日礼包金币奖励提升{0}%"
 		},
 		{
 			"Id": 40,
@@ -346,13 +433,19 @@
 			"UpItem": {
 				"310004": 144
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30004,
+			"SkinSkillLevel": 10,
+			"SkinSkillValue": 10,
+			"SkinSkillDes": "每日礼包金币奖励提升{0}%"
 		},
 		{
 			"Id": 41,
 			"SkinId": 300005,
 			"Level": 1,
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30005,
+			"SkinSkillLevel": 1,
+			"SkinSkillValue": 1,
+			"SkinSkillDes": "每日任务金币奖励提升{0}%"
 		},
 		{
 			"Id": 42,
@@ -361,7 +454,10 @@
 			"UpItem": {
 				"310005": 3
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30005,
+			"SkinSkillLevel": 2,
+			"SkinSkillValue": 2,
+			"SkinSkillDes": "每日任务金币奖励提升{0}%"
 		},
 		{
 			"Id": 43,
@@ -370,7 +466,10 @@
 			"UpItem": {
 				"310005": 5
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30005,
+			"SkinSkillLevel": 3,
+			"SkinSkillValue": 3,
+			"SkinSkillDes": "每日任务金币奖励提升{0}%"
 		},
 		{
 			"Id": 44,
@@ -379,7 +478,10 @@
 			"UpItem": {
 				"310005": 8
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30005,
+			"SkinSkillLevel": 4,
+			"SkinSkillValue": 4,
+			"SkinSkillDes": "每日任务金币奖励提升{0}%"
 		},
 		{
 			"Id": 45,
@@ -388,7 +490,10 @@
 			"UpItem": {
 				"310005": 13
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30005,
+			"SkinSkillLevel": 5,
+			"SkinSkillValue": 5,
+			"SkinSkillDes": "每日任务金币奖励提升{0}%"
 		},
 		{
 			"Id": 46,
@@ -397,7 +502,10 @@
 			"UpItem": {
 				"310005": 21
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30005,
+			"SkinSkillLevel": 6,
+			"SkinSkillValue": 6,
+			"SkinSkillDes": "每日任务金币奖励提升{0}%"
 		},
 		{
 			"Id": 47,
@@ -406,7 +514,10 @@
 			"UpItem": {
 				"310005": 34
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30005,
+			"SkinSkillLevel": 7,
+			"SkinSkillValue": 7,
+			"SkinSkillDes": "每日任务金币奖励提升{0}%"
 		},
 		{
 			"Id": 48,
@@ -415,7 +526,10 @@
 			"UpItem": {
 				"310005": 55
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30005,
+			"SkinSkillLevel": 8,
+			"SkinSkillValue": 8,
+			"SkinSkillDes": "每日任务金币奖励提升{0}%"
 		},
 		{
 			"Id": 49,
@@ -424,7 +538,10 @@
 			"UpItem": {
 				"310005": 89
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30005,
+			"SkinSkillLevel": 9,
+			"SkinSkillValue": 9,
+			"SkinSkillDes": "每日任务金币奖励提升{0}%"
 		},
 		{
 			"Id": 50,
@@ -433,7 +550,10 @@
 			"UpItem": {
 				"310005": 144
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30005,
+			"SkinSkillLevel": 10,
+			"SkinSkillValue": 10,
+			"SkinSkillDes": "每日任务金币奖励提升{0}%"
 		},
 		{
 			"Id": 51,
@@ -526,7 +646,10 @@
 			"Id": 61,
 			"SkinId": 300007,
 			"Level": 1,
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30007,
+			"SkinSkillLevel": 1,
+			"SkinSkillValue": 1,
+			"SkinSkillDes": "每次钻石抽奖幸运值提升{0}%"
 		},
 		{
 			"Id": 62,
@@ -535,7 +658,10 @@
 			"UpItem": {
 				"310007": 3
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30007,
+			"SkinSkillLevel": 2,
+			"SkinSkillValue": 2,
+			"SkinSkillDes": "每次钻石抽奖幸运值提升{0}%"
 		},
 		{
 			"Id": 63,
@@ -544,7 +670,10 @@
 			"UpItem": {
 				"310007": 5
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30007,
+			"SkinSkillLevel": 3,
+			"SkinSkillValue": 3,
+			"SkinSkillDes": "每次钻石抽奖幸运值提升{0}%"
 		},
 		{
 			"Id": 64,
@@ -553,7 +682,10 @@
 			"UpItem": {
 				"310007": 8
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30007,
+			"SkinSkillLevel": 4,
+			"SkinSkillValue": 4,
+			"SkinSkillDes": "每次钻石抽奖幸运值提升{0}%"
 		},
 		{
 			"Id": 65,
@@ -562,7 +694,10 @@
 			"UpItem": {
 				"310007": 13
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30007,
+			"SkinSkillLevel": 5,
+			"SkinSkillValue": 5,
+			"SkinSkillDes": "每次钻石抽奖幸运值提升{0}%"
 		},
 		{
 			"Id": 66,
@@ -571,7 +706,10 @@
 			"UpItem": {
 				"310007": 21
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30007,
+			"SkinSkillLevel": 6,
+			"SkinSkillValue": 6,
+			"SkinSkillDes": "每次钻石抽奖幸运值提升{0}%"
 		},
 		{
 			"Id": 67,
@@ -580,7 +718,10 @@
 			"UpItem": {
 				"310007": 34
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30007,
+			"SkinSkillLevel": 7,
+			"SkinSkillValue": 7,
+			"SkinSkillDes": "每次钻石抽奖幸运值提升{0}%"
 		},
 		{
 			"Id": 68,
@@ -589,7 +730,10 @@
 			"UpItem": {
 				"310007": 55
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30007,
+			"SkinSkillLevel": 8,
+			"SkinSkillValue": 8,
+			"SkinSkillDes": "每次钻石抽奖幸运值提升{0}%"
 		},
 		{
 			"Id": 69,
@@ -598,7 +742,10 @@
 			"UpItem": {
 				"310007": 89
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30007,
+			"SkinSkillLevel": 9,
+			"SkinSkillValue": 9,
+			"SkinSkillDes": "每次钻石抽奖幸运值提升{0}%"
 		},
 		{
 			"Id": 70,
@@ -607,7 +754,10 @@
 			"UpItem": {
 				"310007": 144
 			},
-			"SkinSkillDes": "0"
+			"SkinSkillId": 30007,
+			"SkinSkillLevel": 10,
+			"SkinSkillValue": 10,
+			"SkinSkillDes": "每次钻石抽奖幸运值提升{0}%"
 		}
 	]
 }

data/DB_Task.json

@@ -1234,6 +1234,439 @@
 			"Award": {
 				"100011": 50
 			}
+		},
+		{
+			"Id": 13001,
+			"Order": 1,
+			"Name": "年兽活动",
+			"Des": "领取年兽签到奖励",
+			"ActivityType": 8,
+			"TaskType": 35,
+			"TargetTimes": 1,
+			"FinishTimes": 1,
+			"Award": {
+				"50001": 5,
+				"50014": 1
+			}
+		},
+		{
+			"Id": 13002,
+			"Order": 2,
+			"Name": "年兽活动",
+			"Des": "在线时长60分钟",
+			"ActivityType": 8,
+			"TaskType": 21,
+			"TargetTimes": 3600,
+			"FinishTimes": 1,
+			"Award": {
+				"100001": 100000,
+				"50014": 10
+			}
+		},
+		{
+			"Id": 13003,
+			"Order": 3,
+			"Name": "年兽活动",
+			"Des": "购买1次任意存钱罐",
+			"ActivityType": 8,
+			"TaskType": 22,
+			"TargetTimes": 1,
+			"FinishTimes": 1,
+			"Award": {
+				"50001": 5,
+				"50014": 5
+			}
+		},
+		{
+			"Id": 13004,
+			"Order": 4,
+			"Name": "年兽活动",
+			"Des": "游戏Tienlen比赛场5次",
+			"ActivityType": 8,
+			"TaskType": 25,
+			"TargetTimes": 1,
+			"FinishTimes": 1,
+			"Award": {
+				"100002": 5,
+				"50014": 5
+			},
+			"GameType": 1
+		},
+		{
+			"Id": 13005,
+			"Order": 5,
+			"Name": "年兽活动",
+			"Des": "游戏十三水10次",
+			"ActivityType": 8,
+			"TaskType": 5,
+			"TargetTimes": 10,
+			"FinishTimes": 1,
+			"Award": {
+				"100001": 30000,
+				"50014": 5
+			},
+			"GameType": 2
+		},
+		{
+			"Id": 13006,
+			"Order": 6,
+			"Name": "年兽活动",
+			"Des": "今日累计赢取1M金币",
+			"ActivityType": 8,
+			"TaskType": 8,
+			"TargetTimes": 1000000,
+			"FinishTimes": 1,
+			"Award": {
+				"50014": 5
+			}
+		},
+		{
+			"Id": 13007,
+			"Order": 7,
+			"Name": "年兽活动",
+			"Des": "今日消耗100钻石",
+			"ActivityType": 8,
+			"TaskType": 27,
+			"TargetTimes": 100,
+			"FinishTimes": 1,
+			"Award": {
+				"50014": 20
+			}
+		},
+		{
+			"Id": 13008,
+			"Order": 8,
+			"Name": "年兽活动",
+			"Des": "今日累计赢取5M金币",
+			"ActivityType": 8,
+			"TaskType": 8,
+			"TargetTimes": 5000000,
+			"FinishTimes": 1,
+			"Award": {
+				"50014": 10
+			}
+		},
+		{
+			"Id": 13009,
+			"Order": 9,
+			"Name": "年兽活动",
+			"Des": "今日累计赢取10M金币",
+			"ActivityType": 8,
+			"TaskType": 8,
+			"TargetTimes": 10000000,
+			"FinishTimes": 1,
+			"Award": {
+				"50014": 15
+			}
+		},
+		{
+			"Id": 13010,
+			"Order": 10,
+			"Name": "年兽活动",
+			"Des": "今日累计赢取20M金币",
+			"ActivityType": 8,
+			"TaskType": 8,
+			"TargetTimes": 20000000,
+			"FinishTimes": 1,
+			"Award": {
+				"50014": 20
+			}
+		},
+		{
+			"Id": 13011,
+			"Order": 11,
+			"Name": "年兽活动",
+			"Des": "充值任意金额",
+			"ActivityType": 8,
+			"TaskType": 7,
+			"TargetTimes": 1,
+			"FinishTimes": 1,
+			"Award": {
+				"50014": 10
+			}
+		},
+		{
+			"Id": 13012,
+			"Order": 12,
+			"Name": "年兽活动",
+			"Des": "今日消耗500钻石",
+			"ActivityType": 8,
+			"TaskType": 27,
+			"TargetTimes": 500,
+			"FinishTimes": 1,
+			"Award": {
+				"50015": 5
+			}
+		},
+		{
+			"Id": 13013,
+			"Order": 13,
+			"Name": "年兽活动",
+			"Des": "今日充值1.99$",
+			"ActivityType": 8,
+			"TaskType": 7,
+			"TargetTimes": 199,
+			"FinishTimes": 1,
+			"Award": {
+				"50015": 3
+			}
+		},
+		{
+			"Id": 13014,
+			"Order": 14,
+			"Name": "年兽活动",
+			"Des": "参与红包雨活动1次",
+			"ActivityType": 8,
+			"TaskType": 32,
+			"TargetTimes": 1,
+			"FinishTimes": 1,
+			"Award": {
+				"50014": 5
+			}
+		},
+		{
+			"Id": 13015,
+			"Order": 15,
+			"Name": "年兽活动",
+			"Des": "成功对年兽造成伤害1000000点",
+			"ActivityType": 8,
+			"TaskType": 34,
+			"TargetTimes": 1000000,
+			"FinishTimes": 1,
+			"Award": {
+				"100001": 500000
+			}
+		},
+		{
+			"Id": 13016,
+			"Order": 16,
+			"Name": "年兽活动",
+			"Des": "成功对年兽造成伤害10000000点",
+			"ActivityType": 8,
+			"TaskType": 34,
+			"TargetTimes": 10000000,
+			"FinishTimes": 1,
+			"Award": {
+				"100002": 5
+			}
+		},
+		{
+			"Id": 13017,
+			"Order": 17,
+			"Name": "年兽活动",
+			"Des": "累计充值9.99$",
+			"ActivityType": 9,
+			"TaskType": 7,
+			"TargetTimes": 999,
+			"FinishTimes": 1,
+			"Award": {
+				"100001": 1000000,
+				"50015": 5
+			}
+		},
+		{
+			"Id": 13018,
+			"Order": 18,
+			"Name": "年兽活动",
+			"Des": "累计充值19.99$",
+			"ActivityType": 9,
+			"TaskType": 7,
+			"TargetTimes": 1999,
+			"FinishTimes": 1,
+			"Award": {
+				"100001": 10000000,
+				"50015": 10
+			}
+		},
+		{
+			"Id": 13019,
+			"Order": 19,
+			"Name": "年兽活动",
+			"Des": "累计充值59.99$",
+			"ActivityType": 9,
+			"TaskType": 7,
+			"TargetTimes": 5999,
+			"FinishTimes": 1,
+			"Award": {
+				"100001": 30000000,
+				"50015": 20
+			}
+		},
+		{
+			"Id": 13020,
+			"Order": 20,
+			"Name": "年兽活动",
+			"Des": "累计充值99.99$",
+			"ActivityType": 9,
+			"TaskType": 7,
+			"TargetTimes": 9999,
+			"FinishTimes": 1,
+			"Award": {
+				"100001": 50000000,
+				"50015": 45
+			}
+		},
+		{
+			"Id": 13021,
+			"Order": 21,
+			"Name": "年兽活动",
+			"Des": "成功击杀1只年兽",
+			"ActivityType": 9,
+			"TaskType": 33,
+			"TargetTimes": 1,
+			"FinishTimes": 1,
+			"Award": {
+				"50015": 2
+			}
+		},
+		{
+			"Id": 13022,
+			"Order": 22,
+			"Name": "年兽活动",
+			"Des": "成功击杀3只年兽",
+			"ActivityType": 9,
+			"TaskType": 33,
+			"TargetTimes": 3,
+			"FinishTimes": 1,
+			"Award": {
+				"50015": 5
+			}
+		},
+		{
+			"Id": 13023,
+			"Order": 23,
+			"Name": "年兽活动",
+			"Des": "成功击杀6只年兽",
+			"ActivityType": 9,
+			"TaskType": 33,
+			"TargetTimes": 6,
+			"FinishTimes": 1,
+			"Award": {
+				"50015": 10
+			}
+		},
+		{
+			"Id": 13024,
+			"Order": 24,
+			"Name": "年兽活动",
+			"Des": "成功击杀9只年兽",
+			"ActivityType": 9,
+			"TaskType": 33,
+			"TargetTimes": 9,
+			"FinishTimes": 1,
+			"Award": {
+				"50015": 15
+			}
+		},
+		{
+			"Id": 13025,
+			"Order": 25,
+			"Name": "年兽活动",
+			"Des": "成功击杀12只年兽",
+			"ActivityType": 9,
+			"TaskType": 33,
+			"TargetTimes": 12,
+			"FinishTimes": 1,
+			"Award": {
+				"50015": 20
+			}
+		},
+		{
+			"Id": 13026,
+			"Order": 26,
+			"Name": "年兽活动",
+			"Des": "成功击杀20只年兽",
+			"ActivityType": 9,
+			"TaskType": 33,
+			"TargetTimes": 20,
+			"FinishTimes": 1,
+			"Award": {
+				"50015": 45
+			}
+		},
+		{
+			"Id": 14001,
+			"Order": 1,
+			"Name": "累消活动",
+			"Des": "今日消耗99钻石",
+			"ActivityType": 10,
+			"TaskType": 27,
+			"TargetTimes": 99,
+			"FinishTimes": 1,
+			"Award": {
+				"100001": 100000,
+				"50014": 2
+			}
+		},
+		{
+			"Id": 14002,
+			"Order": 2,
+			"Name": "累消活动",
+			"Des": "今日消耗499钻石",
+			"ActivityType": 10,
+			"TaskType": 27,
+			"TargetTimes": 499,
+			"FinishTimes": 1,
+			"Award": {
+				"100001": 200000,
+				"50015": 2
+			}
+		},
+		{
+			"Id": 14003,
+			"Order": 3,
+			"Name": "累消活动",
+			"Des": "今日消耗999钻石",
+			"ActivityType": 10,
+			"TaskType": 27,
+			"TargetTimes": 999,
+			"FinishTimes": 1,
+			"Award": {
+				"100001": 300000,
+				"50015": 5
+			}
+		},
+		{
+			"Id": 14004,
+			"Order": 4,
+			"Name": "累消活动",
+			"Des": "今日消耗1999钻石",
+			"ActivityType": 10,
+			"TaskType": 27,
+			"TargetTimes": 1999,
+			"FinishTimes": 1,
+			"Award": {
+				"100001": 500000,
+				"50015": 10
+			}
+		},
+		{
+			"Id": 14005,
+			"Order": 5,
+			"Name": "累消活动",
+			"Des": "今日消耗2999钻石",
+			"ActivityType": 10,
+			"TaskType": 27,
+			"TargetTimes": 2999,
+			"FinishTimes": 1,
+			"Award": {
+				"100001": 1000000,
+				"50015": 15
+			}
+		},
+		{
+			"Id": 14006,
+			"Order": 6,
+			"Name": "累消活动",
+			"Des": "今日消耗4999钻石",
+			"ActivityType": 10,
+			"TaskType": 27,
+			"TargetTimes": 4999,
+			"FinishTimes": 1,
+			"Award": {
+				"100001": 2000000,
+				"50015": 25
+			}
 		}
 	]
 }

data/gameconfig/cashmania.json

@@ -0,0 +1,10 @@
+{
+	"GameName":"cashmania",
+	"GameId":313,
+	"GameMode":[0],
+	"SceneType":[1,2,3,4],
+	"CanForceStart":true,
+	"DefaultPlayerCnt":1,
+	"DependentPlayerCnt":true,
+	"EnterAfterStart":true
+}

data/gameconfig/gatesofolympus.json

@@ -0,0 +1,10 @@
+{
+	"GameName":"gatesofolympus",
+	"GameId":314,
+	"GameMode":[0],
+	"SceneType":[1,2,3,4],
+	"CanForceStart":true,
+	"DefaultPlayerCnt":1,
+	"DependentPlayerCnt":true,
+	"EnterAfterStart":true
+}

data/gameconfig/pushcoin.json

@@ -0,0 +1,9 @@
+{
+  "GameName":"推币机",
+  "GameId":609,
+  "GameMode":[0],
+  "SceneType":[1],
+  "CanForceStart":true,
+  "MinPlayerCnt":1,
+  "DefaultPlayerCnt":1
+}

data/i18n/languages.json

@@ -14,5 +14,9 @@
   	"Upgrade": "{\"zh\":\"感谢您更新客户端，更新奖励已发放至附近，请注意查收\",\"vi\":\"Cảm ơn bạn đã cập nhật ứng dụng khách. Phần thưởng cập nhật đã được phân phối gần đó, vui lòng chú ý kiểm tra nhận\",\"en\":\"Thank you for updating the client. The update reward has been distributed to everyone. Please check it carefully.\",\"kh\":\"អរគុណសម្រាប់ការធ្វើបច្ចុប្បន្នភាពហ្គេម។ រង្វាន់នៃការធ្វើបច្ចុប្បន្នភាពត្រូវបានចែកចាយទៅគ្រប់គ្នា។ សូមពិនិត្យអោយបានច្បាស់លាស់។\"}",
   	"LotteryTitle": "{\"zh\":\"玩游戏抽奖品\",\"vi\":\"Chơi game rút thưởng\",\"en\":\"Play games, draw prizes\",\"kh\":\"លេងហ្គេម ចាប់រង្វាន់\"}",
   	"Lottery": "{\"zh\":\"恭喜您在好友房玩游戏抽奖品活动中获得了大奖，奖品随邮件发放，请注意查收\",\"vi\":\"Chúc mừng bạn đã trúng giải thưởng lớn trong hoạt động rút thưởng trò chơi tại phòng bạn bè. Giải thưởng sẽ được gửi qua email, vui lòng kiểm tra cẩn thận.\",\"en\":\"Congratulations on winning the grand prize in the lucky draw activity in the friend room. The prize will be sent via email, please check it carefully.\",\"kh\":\"សូមអបអរសាទរចំពោះការឈ្នះរង្វាន់ធំក្នុងសកម្មភាពចាប់រង្វាន់ក្នុងបន្ទប់មិត្តភ័ក្តិរបស់អ្នក រង្វាន់នឹងត្រូវបានផ្ញើតាមអ៊ីម៉ែល សូមពិនិត្យមើលវាដោយយកចិត្តទុកដាក់។\"}",
-	"TelCodeTitle": "{\"zh\":\"话费卡兑换码\",\"vi\":\"Mã đổi thẻ điện thoại\",\"en\":\"Phone card redemption code\",\"kh\":\"លេខកូដប្រោសលោះកាតទូរស័ព្ទ\"}"
+	"TelCodeTitle": "{\"zh\":\"话费卡兑换码\",\"vi\":\"Mã đổi thẻ điện thoại\",\"en\":\"Phone card redemption code\",\"kh\":\"លេខកូដប្រោសលោះកាតទូរស័ព្ទ\"}",
+	"NianLuckTitle": "{\"zh\":\"幸运榜排行奖励\",\"vi\":\"Vượt qua phần thưởng xếp hạng\",\"en\":\"Pass Ranking Rewards\",\"kh\":\"រង្វាន់ចំណាត់ថ្នាក់ឆ្លងកាត់\"}",
+	"NianLuckAward": "{\"zh\":\"恭喜您在昨日年兽活动幸运排行中名次达到%v名，排行奖励已发放，请查收\",\"vi\":\"Chúc mừng bạn đã đạt được %v trong bảng xếp hạng vượt qua. Phần thưởng xếp hạng đã được phân phối, vui lòng kiểm tra.\",\"en\":\"Congratulations on reaching %vth place in the pass ranking. Ranking rewards have been issued. Please check.\",\"kh\":\"សូមអបអរសាទរចំពោះការឈានដល់ចំណាត់ថ្នាក់ទី %v ក្នុងចំណាត់ថ្នាក់ឆ្លងកាត់។ រង្វាន់ចំណាត់ថ្នាក់ត្រូវបានចេញ។ សូមត្រួតពិនិត្យ។\"}",
+	"NianDamageTitle": "{\"zh\":\"年兽活动排行奖励\",\"vi\":\"Vượt qua phần thưởng xếp hạng\",\"en\":\"Pass Ranking Rewards\",\"kh\":\"រង្វាន់ចំណាត់ថ្នាក់ឆ្លងកាត់\"}",
+	"NianDamageAward": "{\"zh\":\"恭喜您在本次年兽活动总排行中名次达到%v名，排行奖励已发放，请查收\",\"vi\":\"Chúc mừng bạn đã đạt được %v trong bảng xếp hạng vượt qua. Phần thưởng xếp hạng đã được phân phối, vui lòng kiểm tra.\",\"en\":\"Congratulations on reaching %vth place in the pass ranking. Ranking rewards have been issued. Please check.\",\"kh\":\"សូមអបអរសាទរចំពោះការឈានដល់ចំណាត់ថ្នាក់ទី %v ក្នុងចំណាត់ថ្នាក់ឆ្លងកាត់។ រង្វាន់ចំណាត់ថ្នាក់ត្រូវបានចេញ។ សូមត្រួតពិនិត្យ។\"}"
 }

protocol/activity/nian.proto

@@ -0,0 +1,129 @@
+syntax = "proto3";
+package activity;
+option go_package = "mongo.games.com/game/protocol/activity";
+
+enum NianPacketID {
+   PACKET_Nian_ZERO = 0;                                // 弃用消息号
+   PACKET_CSNianData         = 2660; // 获取年兽信息
+   PACKET_SCNianData         = 2661; // 返回年兽信息
+   PACKET_CSNianBuff        = 2662; // 请求领取BUFF
+   PACKET_SCNianBuff      = 2663; // 返回Buff信息
+   PACKET_CSNianRankData      = 2664; // 请求排行榜信息
+   PACKET_SCNianRankData = 2665; // 返回排行榜信息
+   PACKET_CSNianAttack         = 2666; //请求攻击年兽
+   PACKET_SCNianAttackData       = 2667; //返回攻击年兽信息
+   PACKET_CSNianSignAward			= 2668; //请求签到
+   PACKET_SCNianSignAward			= 2669; //签到返回
+   PACKET_CSNianChange				= 2670;//请求兑换小爆竹
+   PACKET_SCNianChange				= 2671;//返回兑换道具
+}
+//操作结果
+enum OpResultCode_Nian {
+    OPRC_Sucess_Nian = 0; //成功
+    OPRC_Error_Nian = 1; //失败
+}
+
+//获取年兽活动信息
+//PACKET_CSNianData
+message CSNianData{
+}
+//PACKET_SCNianData
+message SCNianData{
+	int64 ActivityStartTime = 1; //活动开始时间
+	int64 ActivityEndTime = 2;	//活动结束时间
+	int64 BossMaxHp = 3;		//Boss最大血量
+	int64 BossHp = 4;			//Boss当前血量
+	repeated NianRankData RankData = 5;//排行榜奖励配置
+	int64 AwardTime = 6;//每日签到领取时间
+	int64 BuffCount = 7;//Buff剩余次数
+	bool BuffStatus = 8;//Buff领取状态
+	int64 SignAwardTime = 9;//签到领取时间 0-未领取
+	int64 BuffStartTime = 10; //Buff开始领取时间
+	int64 BuffEndTime = 11;		//Buff结束领取时间
+	repeated ShopData shopData = 12;//购买礼包数量
+	string ChangeData = 13; //兑换数据
+	string LuckyRankNeed = 14; //幸运榜上榜条件
+	string RankNeed = 15; //总伤害榜上榜条件
+	int32 Switch = 16; //活动开关 1.开启 2.关闭
+	int32 OtherSignAwardCount = 17;//额外奖励领取次数
+	int32 OtherSignAwardProp = 18;//额外奖励概率
+	repeated RankAwardData OtherSignAward = 19;//签到额外奖励
+	int32 OtherSignMaxCount = 20;//额外奖励领取次数上限
+	int64 AttackMaxHp =21; //单次攻击最大血量
+	int64 AttackSumHp = 22; //攻击总伤害
+	repeated RankAwardData SignAward = 23;//签到奖励
+}
+
+message ShopData{
+	int32 ShopId =1; //shopId
+	int32 ShopNum = 2; //已购买次数
+	int32 MaxShopNum = 3; //最大购买次数
+}
+
+//贺春
+//请求领取BUFF
+//PACKET_CSNianBuff
+message CSNianBuff{
+}
+//PACKET_SCNianBuff
+message SCNianBuff{
+	int64 BuffCount = 1; //BUFF剩余次数
+	OpResultCode_Nian OpRetCode = 2; // 返回错误码
+}
+
+message NianRankData{
+	int32 TypeId = 1; //1-幸运榜 2-总榜
+	repeated NianRankInfo Data = 2;
+}
+message NianRankInfo{
+	int32 RankId =1;
+	repeated RankAwardData Award = 2;
+}
+
+message RankAwardData{
+	int32 ItemId =1;
+	int64 ItemNum = 2;
+}
+//攻击年兽
+//PACKET_CSNianAttack
+message CSNianAttack{
+	int32 TypeId = 1;	//1-小爆竹 2-小爆竹*10 3-大爆竹 
+}
+//PACKET_SCNianAttackData
+message SCNianAttackData{
+	int32 TypeId = 1;	//1-小爆竹 2-小爆竹*10 3-大爆竹 
+	int64 BossHp = 2;	//BOSS当前血量
+	repeated RankAwardData Award = 3; //获得道具
+	int64 AttackHp = 4; // 攻击伤害
+	bool IsDie = 5;	//BOSS是否死亡
+	repeated RankAwardData DieAward = 6;//BOSS死亡奖励
+	int64 BuffCount = 7; //BUFF剩余次数
+	repeated RankAwardData ExtraDrop = 8;//大爆竹额外掉落
+	repeated RankAwardData  FloorReward = 9;//保底奖励
+	int64 AttackMaxHp = 10; //单次攻击最大血量
+	int64 AttackSumHp = 11; //攻击总伤害
+}
+//领取签到奖励
+//PACKET_CSNianSignAward
+message CSNianSignAward{
+}
+//PACKET_SCNianSignAward
+message SCNianSignAward{
+	int64 SignAwardTime = 1;
+	repeated RankAwardData SignAward = 2;//签到奖励
+	repeated RankAwardData OtherSignAward = 3;//签到额外奖励
+	int32 OtherSignAwardCount = 4;//额外奖励领取次数
+	int32 OtherSignAwardProp = 5;//额外奖励概率
+	OpResultCode_Nian OpRetCode = 6; // 返回错误码
+}
+//兑换
+//PACKET_CSNianChange
+message CSNianChange{
+	int32 Num = 1;
+}
+//PACKET_SCNianChange
+message SCNianChange{
+	int32 Num = 1;
+	repeated RankAwardData Award =2;
+	OpResultCode_Nian OpRetCode = 3; // 返回错误码
+}

protocol/activity/pushcoin.proto

@@ -0,0 +1,100 @@
+syntax = "proto3";
+package activity;
+option go_package = "mongo.games.com/game/protocol/activity";
+
+enum PushCoinPacketID {
+  PACKET_PushCoin_ZERO = 0;// 弃用消息号
+  PACKET_CSPushCoinInfo = 2680; // 信息
+  PACKET_SCPushCoinInfo = 2681; // 信息返回
+  PACKET_CSPushCoinPlayerOp = 2682; // 玩家操作
+  PACKET_SCPushCoinPlayerOp = 2683; // 玩家操作返回
+  PACKET_NotifyPowerLine = 2684; // 通知能量值
+  PACKET_NotifyDrawInfo = 2685; // 抽奖信息
+  PACKET_NotifyAward = 2686; // 广播中奖信息
+}
+
+//信息
+//PACKET_CSPushCoinInfo
+message CSPushCoinInfo {
+}
+//PACKET_SCPushCoinInfo
+message SCPushCoinInfo {
+  repeated ExchangeInfo ExchangeList = 1; //兑换信息
+  repeated DrawInfo DrawList = 2; //抽奖信息
+  int64 PowerLine = 3; // 当前能量值
+  int64 PowerLineMax = 4; // 能量值上限
+  repeated ItemInfo Items = 5; // 桌面数据
+}
+
+message ItemInfo{
+  int32 ItemId = 1; //道具id
+  int64 ItemNum = 2; //道具数量
+}
+
+message ExchangeInfo{
+  int32 Id = 1; //兑换id
+  repeated ItemInfo Cost = 2; //消耗道具
+  repeated ItemInfo Gain = 3; //获得道具
+  int64 Times = 4; //可兑换次数 -1无限
+  int64 TotalTimes = 5; //总共兑换次数 -1无限
+}
+
+message DrawInfo{
+  int32 Id = 1; //抽奖id
+  int32 ItemId = 2; //道具id
+  int64 ItemNum = 3; //道具数量
+}
+
+//抽奖信息
+//PACKET_NotifyDrawInfo
+message NotifyDrawInfo {
+  DrawInfo Draw = 1; // 中奖信息
+  repeated DrawInfo Info = 2; // 刷新信息
+}
+
+//玩家操作
+//PACKET_CSPushCoinPlayerOp
+message CSPushCoinPlayerOp {
+  OpCodes OpCode = 1;
+  int64 OpParam = 2;
+  repeated ItemInfo OpItem = 3;
+}
+
+enum OpCodes {
+  OP_Zero = 0;
+  OP_Bet = 1;  // 下注 OpParam 道具id
+  OP_Gain = 2; // 得分 OpParam 1有效区 2无效区 OpItem 获得道具
+  OP_Shake = 3; // 震动 OpParam 消耗次数
+  OP_Exchange = 4; // 兑换 OpParam 兑换id
+}
+
+enum OpResultPushCoinCode {
+  OPRC_PushCoin_Success = 0; //成功
+  OPRC_PushCoin_Error = 1; //失败
+  OPRC_PushCoin_BetNotEnough = 2; //投币，金币不足
+  OPRC_PushCoin_ExchangeNotEnough = 3; //兑换次数不足
+  OPRC_PushCoin_ShakeNotEnough = 4; //震动次数不足
+  OPRC_PushCoin_ItemNotEnough = 5; //兑换消耗道具不足
+}
+
+//PACKET_SCPushCoinPlayerOp
+message SCPushCoinPlayerOp {
+  OpResultPushCoinCode OpRetCode = 1;
+  OpCodes OpCode = 2;
+  ExchangeInfo Exchange = 3; // 兑换信息,加到背包
+  int32 BetId = 4; // 金币id
+}
+
+//通知能量值
+//PACKET_NotifyPowerLine
+message NotifyPowerLine {
+  int64 PowerLine = 1; // 当前能量值
+  int64 PowerLineMax = 2; // 能量值上限
+}
+
+//广播中奖信息
+//PACKET_NotifyAward
+message NotifyAward {
+  DrawInfo Draw = 1; // 中奖信息
+  string Name = 2; // 玩家名字
+}

protocol/cashmania/cashmania.pb.go

@@ -208,7 +208,7 @@ func (x *CashManiaPlayerData) GetVIP() int32 {
 }
 
 //房间信息
-//PACKET_FORTUNEMOUSE_SCFORTUNEMOUSEROOMINFO
+//PACKET_CASHMANIA_SCCASHMANIAROOMINFO
 type SCCashManiaRoomInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -337,7 +337,7 @@ func (x *SCCashManiaRoomInfo) GetPlayerInfo() string {
 }
 
 //玩家操作
-//PACKET_FORTUNEMOUSE_CSFORTUNEMOUSEOP
+//PACKET_CASHMANIA_CSCASHMANIAOP
 type CSCashManiaOp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -394,7 +394,7 @@ func (x *CSCashManiaOp) GetParams() []int64 {
 }
 
 //玩家操作返回
-//PACKET_FORTUNEMOUSE_SCFORTUNEMOUSEOP
+//PACKET_CASHMANIA_SCCASHMANIAOP
 type SCCashManiaOp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -459,7 +459,7 @@ func (x *SCCashManiaOp) GetParams() []int64 {
 }
 
 //房间状态
-//PACKET_FORTUNEMOUSE_SCFORTUNEMOUSEROOMSTATE
+//PACKET_CASHMANIA_SCCASHMANIAROOMSTATE
 type SCCashManiaRoomState struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -523,7 +523,7 @@ func (x *SCCashManiaRoomState) GetParams() []int32 {
 	return nil
 }
 
-//PACKET_FORTUNEMOUSE_SCFORTUNEMOUSEBILLED
+//PACKET_CASHMANIA_SCCASHMANIABILLED
 type SCCashManiaBilled struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache

protocol/cashmania/cashmania.proto

@@ -27,7 +27,7 @@ message CashManiaPlayerData {
   int32 VIP = 11;
 }
 //房间信息
-//PACKET_FORTUNEMOUSE_SCFORTUNEMOUSEROOMINFO
+//PACKET_CASHMANIA_SCCASHMANIAROOMINFO
 message SCCashManiaRoomInfo {
   int32 RoomId = 1; //房间id
   int32 GameFreeId = 2;
@@ -42,26 +42,26 @@ message SCCashManiaRoomInfo {
   string PlayerInfo = 11;
 }
 //玩家操作
-//PACKET_FORTUNEMOUSE_CSFORTUNEMOUSEOP
+//PACKET_CASHMANIA_CSCASHMANIAOP
 message CSCashManiaOp {
   int32 OpCode = 1; //操作码 0.spin
   repeated int64 Params = 2; //操作参数 下注索引编号
 }
 //玩家操作返回
-//PACKET_FORTUNEMOUSE_SCFORTUNEMOUSEOP
+//PACKET_CASHMANIA_SCCASHMANIAOP
 message SCCashManiaOp {
   int32 OpCode = 1; //操作码
   int32 OpRetCode = 2; //操作结果 1.金币不足 2.低于该值不能押注
   repeated int64 Params = 3; //操作参数
 }
 //房间状态
-//PACKET_FORTUNEMOUSE_SCFORTUNEMOUSEROOMSTATE
+//PACKET_CASHMANIA_SCCASHMANIAROOMSTATE
 message SCCashManiaRoomState {
   int32 State = 1; //房间当前状态
   int32 SubState = 2; //房间当前子状态
   repeated int32 Params = 3; //状态参数
 }
-//PACKET_FORTUNEMOUSE_SCFORTUNEMOUSEBILLED
+//PACKET_CASHMANIA_SCCASHMANIABILLED
 message SCCashManiaBilled{
   int32 OpRetCode = 1;//0.spin成功 1.spin失败
   string GameEndStr = 2;

protocol/doc.md

@@ -193,5 +193,9 @@
 
 - 5660~5669
 
+### pushcoin.proto
+
+- 5670~5679
+
 ### game.proto(玩家离开)
 - 8000~8099

protocol/gamehall/game.proto

@@ -293,7 +293,6 @@ message CSCreatePrivateRoom{
   int32 NeedPassword = 6;   //是否需要密码 1需要
   int32 CostType = 7;       // 房卡支付方式 1AA 2房主
   int32 Voice = 8;          //是否开启语音 1开启
-  int32 BaseScore = 9;      //底分
 }
 //PACKET_SC_CREATEPRIVATEROOM
 message SCCreatePrivateRoom{
@@ -322,7 +321,6 @@ message PrivatePlayerInfo{
   int32 SnId = 1; // 玩家id
   string Name = 2; // 玩家昵称
   int32 UseRoleId = 3;//使用的人物模型id
-  string HeadUrl = 4; // 头像
 }
 
 //个人创建的房间信息
@@ -346,10 +344,6 @@ message PrivateRoomInfo{
   int32 WinRoleId = 17;   //赢家人物模型id
   int32 CostType = 18;    //房卡支付方式 1AA 2房主
   int32 Creator = 19;     //房主id
-  int32 BaseScore = 20;   //底分
-  string WinHeadUrl = 21; //赢家头像
-  repeated ItemInfo Cost = 22; //房费消耗
-  int64 LimitCoin = 23;   //进房金币下限
 }
 
 //PACKET_SC_GETPRIVATEROOMLIST
@@ -543,8 +537,6 @@ message RoomConfigInfo{
   int32 CostType = 14; // 消耗类型 1AA 2房主 3自定义
   int32 Voice = 15; // 是否开启语音 1是 2否 3自定义
   string ImageURI = 16; // 奖励图片
-  repeated int32 BaseScore = 17; // 底分
-  repeated int64 LimitCoin = 18; // 限制金币
 }
 
 message RoomTypeInfo{

protocol/gatesofolympus/gatesofolympus.pb.go

@@ -208,7 +208,7 @@ func (x *GatesOfOlympusPlayerData) GetVIP() int32 {
 }
 
 //房间信息
-//PACKET_FORTUNEMOUSE_SCFORTUNEMOUSEROOMINFO
+//PACKET_GATESOFOLYMPUS_SCGATESOFOLYMPUSROOMINFO
 type SCGatesOfOlympusRoomInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -337,7 +337,7 @@ func (x *SCGatesOfOlympusRoomInfo) GetPlayerInfo() string {
 }
 
 //玩家操作
-//PACKET_FORTUNEMOUSE_CSFORTUNEMOUSEOP
+//PACKET_GATESOFOLYMPUS_CSGATESOFOLYMPUSOP
 type CSGatesOfOlympusOp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -394,7 +394,7 @@ func (x *CSGatesOfOlympusOp) GetParams() []int64 {
 }
 
 //玩家操作返回
-//PACKET_FORTUNEMOUSE_SCFORTUNEMOUSEOP
+//PACKET_GATESOFOLYMPUS_SCGATESOFOLYMPUSOP
 type SCGatesOfOlympusOp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -459,7 +459,7 @@ func (x *SCGatesOfOlympusOp) GetParams() []int64 {
 }
 
 //房间状态
-//PACKET_FORTUNEMOUSE_SCFORTUNEMOUSEROOMSTATE
+//PACKET_GATESOFOLYMPUS_SCGATESOFOLYMPUSROOMSTATE
 type SCGatesOfOlympusRoomState struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -523,7 +523,7 @@ func (x *SCGatesOfOlympusRoomState) GetParams() []int32 {
 	return nil
 }
 
-//PACKET_FORTUNEMOUSE_SCFORTUNEMOUSEBILLED
+//PACKET_GATESOFOLYMPUS_SCGATESOFOLYMPUSBILLED
 type SCGatesOfOlympusBilled struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache

protocol/gatesofolympus/gatesofolympus.proto

@@ -27,7 +27,7 @@ message GatesOfOlympusPlayerData {
   int32 VIP = 11;
 }
 //房间信息
-//PACKET_FORTUNEMOUSE_SCFORTUNEMOUSEROOMINFO
+//PACKET_GATESOFOLYMPUS_SCGATESOFOLYMPUSROOMINFO
 message SCGatesOfOlympusRoomInfo {
   int32 RoomId = 1; //房间id
   int32 GameFreeId = 2;
@@ -42,26 +42,26 @@ message SCGatesOfOlympusRoomInfo {
   string PlayerInfo = 11;
 }
 //玩家操作
-//PACKET_FORTUNEMOUSE_CSFORTUNEMOUSEOP
+//PACKET_GATESOFOLYMPUS_CSGATESOFOLYMPUSOP
 message CSGatesOfOlympusOp {
   int32 OpCode = 1; //操作码 0.spin
   repeated int64 Params = 2; //操作参数 下注索引编号
 }
 //玩家操作返回
-//PACKET_FORTUNEMOUSE_SCFORTUNEMOUSEOP
+//PACKET_GATESOFOLYMPUS_SCGATESOFOLYMPUSOP
 message SCGatesOfOlympusOp {
   int32 OpCode = 1; //操作码
   int32 OpRetCode = 2; //操作结果 1.金币不足 2.低于该值不能押注
   repeated int64 Params = 3; //操作参数
 }
 //房间状态
-//PACKET_FORTUNEMOUSE_SCFORTUNEMOUSEROOMSTATE
+//PACKET_GATESOFOLYMPUS_SCGATESOFOLYMPUSROOMSTATE
 message SCGatesOfOlympusRoomState {
   int32 State = 1; //房间当前状态
   int32 SubState = 2; //房间当前子状态
   repeated int32 Params = 3; //状态参数
 }
-//PACKET_FORTUNEMOUSE_SCFORTUNEMOUSEBILLED
+//PACKET_GATESOFOLYMPUS_SCGATESOFOLYMPUSBILLED
 message SCGatesOfOlympusBilled{
   int32 OpRetCode = 1;//0.spin成功 1.spin失败
   string GameEndStr = 2;

protocol/player/player.pb.go

@@ -7986,7 +7986,7 @@ type SCEasyWelfaredInfo struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	WelfareSwitch []int32 `protobuf:"varint,1,rep,packed,name=WelfareSwitch,proto3" json:"WelfareSwitch,omitempty"` // 下标 0转盘1盲盒2首冲3连续充值4抽手机活动5集卡活动  1显示 2不显示
+	WelfareSwitch []int32 `protobuf:"varint,1,rep,packed,name=WelfareSwitch,proto3" json:"WelfareSwitch,omitempty"` // 下标 0转盘1盲盒2首冲3连续充值4抽手机活动5集卡活动6年兽活动  1显示 2不显示
 }
 
 func (x *SCEasyWelfaredInfo) Reset() {

protocol/player/player.proto

@@ -1057,7 +1057,7 @@ message SCVIPInfo {
 // 
 //PACKET_SC_SWELFAREINFO
 message SCEasyWelfaredInfo{
-	repeated int32    WelfareSwitch     = 1;     // 下标 0转盘1盲盒2首冲3连续充值4抽手机活动5集卡活动  1显示 2不显示
+	repeated int32    WelfareSwitch     = 1;     // 下标 0转盘1盲盒2首冲3连续充值4抽手机活动5集卡活动6年兽活动  1显示 2不显示
 }
 
 message CSVIPPrivilegeInfo {

protocol/pushcoin/pushcoin.proto

@@ -0,0 +1,104 @@
+syntax = "proto3";
+package pushcoin;
+option go_package = "mongo.games.com/game/protocol/pushcoin";
+
+// 5670~5679
+enum PushCoinPacketID {
+  PACKET_PushCoin_ZERO = 0;// 弃用消息号
+  PACKET_SCPushCoinRoomInfo = 5670; // 房间信息
+  PACKET_SCPushCoinRoomState = 5671; // 房间状态
+  PACKET_CSPushCoinPlayerOp = 5672; // 玩家操作
+  PACKET_SCPushCoinPlayerOp = 5673; // 玩家操作返回
+}
+
+//房间信息
+//PACKET_SCPushCoinRoomInfo
+message SCPushCoinRoomInfo {
+  int32 RoomId = 1; //房间id
+  int32 GameId = 2; //游戏id
+  int32 RoomMode = 3; //游戏模式
+  repeated int32 Params = 4; //规则参数
+  int32 State = 5; //房间当前状态
+  int32 TimeOut = 6; //等待剩余时间 单位:秒
+  repeated PushCoinPlayerData Players = 7; //房间内的玩家信息
+  repeated ExchangeInfo ExchangeList = 8; //兑换信息
+  repeated DrawInfo DrawList = 9; //抽奖信息
+  repeated int64 BetList = 10; //下注金额列表
+}
+
+message ItemInfo{
+  int32 ItemId = 1; //道具id
+  int32 ItemNum = 2; //道具数量
+}
+
+message ExchangeInfo{
+  int32 Id = 1; //兑换id
+  repeated ItemInfo Cost = 2; //消耗道具
+  repeated ItemInfo Gain = 3; //获得道具
+  int32 ShakeTimes = 4; //获得震动次数
+}
+
+message DrawInfo{
+  int32 Id = 1; //抽奖id
+  int32 ItemId = 2; //道具id
+  int32 ItemNum = 3; //道具数量
+  int64 Coin = 4; //价值
+}
+
+message PushCoinPlayerData {
+  string Name = 1; //名字
+  int32 SnId = 2; //账号
+  int32 Head = 3; //头像
+  int32 Sex = 4; //性别
+  int64 Coin = 5; //金币
+  int32 Flag = 6; //二进制标记 第一位:是否掉线(0:在线 1:掉线) 第二位:是否准备(0:未准备 1:已准备)
+  repeated string Params = 7; //其他数据 如:ip 等
+  int32 VIP = 8;
+  int32 RoleId = 9; //使用中的角色id
+  int64 Level = 10; //玩家等级
+  int64 Exp = 11;	//玩家经验
+  int32 SkinId = 12; //皮肤id
+  int32 ShakeTimes = 13; //可震动次数
+  int64 BaseCoin = 14; //当前底分(单次投币金额)
+  int64 PowerLine = 15; // 当前能量值
+  int64 PowerLineMax = 16; // 能量值上限
+  int64 RefreshTimes = 17; // 刷新次数
+}
+
+//房间状态
+//PACKET_SCPushCoinRoomState
+message SCPushCoinRoomState {
+  int32 State = 1; //房间当前状态
+  int32 SubState = 2; //房间当前子状态
+  repeated int32 Params = 3; //状态参数
+}
+
+//玩家操作
+//PACKET_CSPushCoinPlayerOp
+message CSPushCoinPlayerOp {
+  OpCodes OpCode = 1;
+  repeated int64 OpParam = 2;
+}
+
+enum OpCodes {
+  OP_Zero = 0;
+  OP_Bet = 1;  // 下注 [下注金额]
+  OP_Gain = 2; // 得分 [得分金额]
+  OP_Shake = 3; // 震动 [消耗次数]
+  OP_Refresh = 4; // 刷新 [桌面金额]
+  OP_Exchange = 5; // 兑换 [兑换id]
+  OP_Draw = 6; // 抽奖 [抽奖id]
+}
+
+enum OpResultCode {
+  OPRC_Success = 0; //成功
+  OPRC_Error = 1; //失败
+}
+
+//PACKET_SCPushCoinPlayerOp
+message SCPushCoinPlayerOp {
+  OpResultCode OpRetCode = 1;
+  OpCodes OpCode = 2;
+  ExchangeInfo Exchange = 3; // 兑换信息,加到背包
+  DrawInfo Draw = 4; // 抽奖信息，掉落到桌面
+}

protocol/rank/rank.pb.go

@@ -52,6 +52,12 @@ const (
 	// 竞技馆抽奖历史
 	Rank_PACKET_CSLotteryHistory Rank = 10017
 	Rank_PACKET_SCLotteryHistory Rank = 10018
+	//年兽排行榜
+	Rank_PACKET_RANK_CSNian Rank = 10019
+	Rank_PACKET_RANK_SCNian Rank = 10020
+	// 红包抽奖记录
+	Rank_PACKET_CSRedPacketHistory Rank = 10021
+	Rank_PACKET_SCRedPacketHistory Rank = 10022
 )
 
 // Enum value maps for Rank.
@@ -77,28 +83,36 @@ var (
 		10016: "PACKET_SCRoomAwardOne",
 		10017: "PACKET_CSLotteryHistory",
 		10018: "PACKET_SCLotteryHistory",
+		10019: "PACKET_RANK_CSNian",
+		10020: "PACKET_RANK_SCNian",
+		10021: "PACKET_CSRedPacketHistory",
+		10022: "PACKET_SCRedPacketHistory",
 	}
 	Rank_value = map[string]int32{
-		"PACKET_RANK_ZERO":        0,
-		"PACKET_RANK_CSRankMatch": 10000,
-		"PACKET_RANK_SCRankMatch": 10001,
-		"PACKET_RANK_CSCoin":      10002,
-		"PACKET_RANK_SCCoin":      10003,
-		"PACKET_RANK_CSInvite":    10004,
-		"PACKET_RANK_SCInvite":    10005,
-		"PACKET_CSInviteLog":      10006,
-		"PACKET_SCInviteLog":      10007,
-		"PACKET_RANK_CSWinCoin":   10008,
-		"PACKET_RANK_SCWinCoin":   10009,
-		"PACKET_RANK_CSLevel":     10010,
-		"PACKET_RANK_SCLevel":     10011,
-		"PACKET_RANK_CSPermit":    10012,
-		"PACKET_RANK_SCPermit":    10013,
-		"PACKET_CSRoomAward":      10014,
-		"PACKET_SCRoomAward":      10015,
-		"PACKET_SCRoomAwardOne":   10016,
-		"PACKET_CSLotteryHistory": 10017,
-		"PACKET_SCLotteryHistory": 10018,
+		"PACKET_RANK_ZERO":          0,
+		"PACKET_RANK_CSRankMatch":   10000,
+		"PACKET_RANK_SCRankMatch":   10001,
+		"PACKET_RANK_CSCoin":        10002,
+		"PACKET_RANK_SCCoin":        10003,
+		"PACKET_RANK_CSInvite":      10004,
+		"PACKET_RANK_SCInvite":      10005,
+		"PACKET_CSInviteLog":        10006,
+		"PACKET_SCInviteLog":        10007,
+		"PACKET_RANK_CSWinCoin":     10008,
+		"PACKET_RANK_SCWinCoin":     10009,
+		"PACKET_RANK_CSLevel":       10010,
+		"PACKET_RANK_SCLevel":       10011,
+		"PACKET_RANK_CSPermit":      10012,
+		"PACKET_RANK_SCPermit":      10013,
+		"PACKET_CSRoomAward":        10014,
+		"PACKET_SCRoomAward":        10015,
+		"PACKET_SCRoomAwardOne":     10016,
+		"PACKET_CSLotteryHistory":   10017,
+		"PACKET_SCLotteryHistory":   10018,
+		"PACKET_RANK_CSNian":        10019,
+		"PACKET_RANK_SCNian":        10020,
+		"PACKET_CSRedPacketHistory": 10021,
+		"PACKET_SCRedPacketHistory": 10022,
 	}
 )
 
@@ -2331,6 +2345,396 @@ func (x *SCLotteryHistory) GetList() []*LotteryHistory {
 	return nil
 }
 
+// PACKET_RANK_CSNian
+type CSNian struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Page     int32 `protobuf:"varint,1,opt,name=Page,proto3" json:"Page,omitempty"`         // 页数
+	PageSize int32 `protobuf:"varint,2,opt,name=PageSize,proto3" json:"PageSize,omitempty"` // 每页数量
+	TypeId   int32 `protobuf:"varint,3,opt,name=TypeId,proto3" json:"TypeId,omitempty"`     //1-幸运榜 2-伤害榜
+}
+
+func (x *CSNian) Reset() {
+	*x = CSNian{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_protocol_rank_rank_proto_msgTypes[30]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CSNian) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CSNian) ProtoMessage() {}
+
+func (x *CSNian) ProtoReflect() protoreflect.Message {
+	mi := &file_protocol_rank_rank_proto_msgTypes[30]
+	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 CSNian.ProtoReflect.Descriptor instead.
+func (*CSNian) Descriptor() ([]byte, []int) {
+	return file_protocol_rank_rank_proto_rawDescGZIP(), []int{30}
+}
+
+func (x *CSNian) GetPage() int32 {
+	if x != nil {
+		return x.Page
+	}
+	return 0
+}
+
+func (x *CSNian) GetPageSize() int32 {
+	if x != nil {
+		return x.PageSize
+	}
+	return 0
+}
+
+func (x *CSNian) GetTypeId() int32 {
+	if x != nil {
+		return x.TypeId
+	}
+	return 0
+}
+
+type NianRankData struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Snid  int32  `protobuf:"varint,1,opt,name=Snid,proto3" json:"Snid,omitempty"` // 玩家id
+	Name  string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`  // 昵称
+	Score int64  `protobuf:"varint,3,opt,name=Score,proto3" json:"Score,omitempty"`
+	Rank  int32  `protobuf:"varint,4,opt,name=Rank,proto3" json:"Rank,omitempty"`   // 排名
+	ModId int32  `protobuf:"varint,5,opt,name=ModId,proto3" json:"ModId,omitempty"` // 角色id
+}
+
+func (x *NianRankData) Reset() {
+	*x = NianRankData{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_protocol_rank_rank_proto_msgTypes[31]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *NianRankData) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*NianRankData) ProtoMessage() {}
+
+func (x *NianRankData) ProtoReflect() protoreflect.Message {
+	mi := &file_protocol_rank_rank_proto_msgTypes[31]
+	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 NianRankData.ProtoReflect.Descriptor instead.
+func (*NianRankData) Descriptor() ([]byte, []int) {
+	return file_protocol_rank_rank_proto_rawDescGZIP(), []int{31}
+}
+
+func (x *NianRankData) GetSnid() int32 {
+	if x != nil {
+		return x.Snid
+	}
+	return 0
+}
+
+func (x *NianRankData) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *NianRankData) GetScore() int64 {
+	if x != nil {
+		return x.Score
+	}
+	return 0
+}
+
+func (x *NianRankData) GetRank() int32 {
+	if x != nil {
+		return x.Rank
+	}
+	return 0
+}
+
+func (x *NianRankData) GetModId() int32 {
+	if x != nil {
+		return x.ModId
+	}
+	return 0
+}
+
+// PACKET_RANK_SCCoin
+type SCNian struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Ranks    []*NianRankData `protobuf:"bytes,1,rep,name=Ranks,proto3" json:"Ranks,omitempty"`        // 排行榜
+	Me       *NianRankData   `protobuf:"bytes,2,opt,name=Me,proto3" json:"Me,omitempty"`              // 玩家自己的排行信息
+	Page     int32           `protobuf:"varint,3,opt,name=Page,proto3" json:"Page,omitempty"`         // 页数
+	PageSize int32           `protobuf:"varint,4,opt,name=PageSize,proto3" json:"PageSize,omitempty"` // 每页数量
+	Total    int32           `protobuf:"varint,5,opt,name=Total,proto3" json:"Total,omitempty"`       // 总数量
+	TypeId   int32           `protobuf:"varint,6,opt,name=TypeId,proto3" json:"TypeId,omitempty"`
+}
+
+func (x *SCNian) Reset() {
+	*x = SCNian{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_protocol_rank_rank_proto_msgTypes[32]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SCNian) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SCNian) ProtoMessage() {}
+
+func (x *SCNian) ProtoReflect() protoreflect.Message {
+	mi := &file_protocol_rank_rank_proto_msgTypes[32]
+	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 SCNian.ProtoReflect.Descriptor instead.
+func (*SCNian) Descriptor() ([]byte, []int) {
+	return file_protocol_rank_rank_proto_rawDescGZIP(), []int{32}
+}
+
+func (x *SCNian) GetRanks() []*NianRankData {
+	if x != nil {
+		return x.Ranks
+	}
+	return nil
+}
+
+func (x *SCNian) GetMe() *NianRankData {
+	if x != nil {
+		return x.Me
+	}
+	return nil
+}
+
+func (x *SCNian) GetPage() int32 {
+	if x != nil {
+		return x.Page
+	}
+	return 0
+}
+
+func (x *SCNian) GetPageSize() int32 {
+	if x != nil {
+		return x.PageSize
+	}
+	return 0
+}
+
+func (x *SCNian) GetTotal() int32 {
+	if x != nil {
+		return x.Total
+	}
+	return 0
+}
+
+func (x *SCNian) GetTypeId() int32 {
+	if x != nil {
+		return x.TypeId
+	}
+	return 0
+}
+
+// 红包抽奖记录
+// PACKET_CSRedPacketHistory
+type CSRedPacketHistory struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id int64 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"` // 红包活动id
+}
+
+func (x *CSRedPacketHistory) Reset() {
+	*x = CSRedPacketHistory{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_protocol_rank_rank_proto_msgTypes[33]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CSRedPacketHistory) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CSRedPacketHistory) ProtoMessage() {}
+
+func (x *CSRedPacketHistory) ProtoReflect() protoreflect.Message {
+	mi := &file_protocol_rank_rank_proto_msgTypes[33]
+	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 CSRedPacketHistory.ProtoReflect.Descriptor instead.
+func (*CSRedPacketHistory) Descriptor() ([]byte, []int) {
+	return file_protocol_rank_rank_proto_rawDescGZIP(), []int{33}
+}
+
+func (x *CSRedPacketHistory) GetId() int64 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+type RedPacketHistory struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Ts      int64 `protobuf:"varint,1,opt,name=Ts,proto3" json:"Ts,omitempty"`           // 时间戳
+	ItemId  int32 `protobuf:"varint,5,opt,name=ItemId,proto3" json:"ItemId,omitempty"`   // 道具id
+	ItemNum int64 `protobuf:"varint,6,opt,name=ItemNum,proto3" json:"ItemNum,omitempty"` // 道具数量
+}
+
+func (x *RedPacketHistory) Reset() {
+	*x = RedPacketHistory{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_protocol_rank_rank_proto_msgTypes[34]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *RedPacketHistory) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*RedPacketHistory) ProtoMessage() {}
+
+func (x *RedPacketHistory) ProtoReflect() protoreflect.Message {
+	mi := &file_protocol_rank_rank_proto_msgTypes[34]
+	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 RedPacketHistory.ProtoReflect.Descriptor instead.
+func (*RedPacketHistory) Descriptor() ([]byte, []int) {
+	return file_protocol_rank_rank_proto_rawDescGZIP(), []int{34}
+}
+
+func (x *RedPacketHistory) GetTs() int64 {
+	if x != nil {
+		return x.Ts
+	}
+	return 0
+}
+
+func (x *RedPacketHistory) GetItemId() int32 {
+	if x != nil {
+		return x.ItemId
+	}
+	return 0
+}
+
+func (x *RedPacketHistory) GetItemNum() int64 {
+	if x != nil {
+		return x.ItemNum
+	}
+	return 0
+}
+
+type SCRedPacketHistory struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	List []*RedPacketHistory `protobuf:"bytes,1,rep,name=List,proto3" json:"List,omitempty"`
+}
+
+func (x *SCRedPacketHistory) Reset() {
+	*x = SCRedPacketHistory{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_protocol_rank_rank_proto_msgTypes[35]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SCRedPacketHistory) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SCRedPacketHistory) ProtoMessage() {}
+
+func (x *SCRedPacketHistory) ProtoReflect() protoreflect.Message {
+	mi := &file_protocol_rank_rank_proto_msgTypes[35]
+	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 SCRedPacketHistory.ProtoReflect.Descriptor instead.
+func (*SCRedPacketHistory) Descriptor() ([]byte, []int) {
+	return file_protocol_rank_rank_proto_rawDescGZIP(), []int{35}
+}
+
+func (x *SCRedPacketHistory) GetList() []*RedPacketHistory {
+	if x != nil {
+		return x.List
+	}
+	return nil
+}
+
 var File_protocol_rank_rank_proto protoreflect.FileDescriptor
 
 var file_protocol_rank_rank_proto_rawDesc = []byte{
@@ -2543,53 +2947,96 @@ var file_protocol_rank_rank_proto_rawDesc = []byte{
 	0x43, 0x4c, 0x6f, 0x74, 0x74, 0x65, 0x72, 0x79, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x12,
 	0x28, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e,
 	0x72, 0x61, 0x6e, 0x6b, 0x2e, 0x4c, 0x6f, 0x74, 0x74, 0x65, 0x72, 0x79, 0x48, 0x69, 0x73, 0x74,
-	0x6f, 0x72, 0x79, 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x2a, 0x9e, 0x04, 0x0a, 0x04, 0x52, 0x61,
-	0x6e, 0x6b, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x41, 0x4e,
-	0x4b, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b,
-	0x45, 0x54, 0x5f, 0x52, 0x41, 0x4e, 0x4b, 0x5f, 0x43, 0x53, 0x52, 0x61, 0x6e, 0x6b, 0x4d, 0x61,
-	0x74, 0x63, 0x68, 0x10, 0x90, 0x4e, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
-	0x5f, 0x52, 0x41, 0x4e, 0x4b, 0x5f, 0x53, 0x43, 0x52, 0x61, 0x6e, 0x6b, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x10, 0x91, 0x4e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52,
-	0x41, 0x4e, 0x4b, 0x5f, 0x43, 0x53, 0x43, 0x6f, 0x69, 0x6e, 0x10, 0x92, 0x4e, 0x12, 0x17, 0x0a,
-	0x12, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x41, 0x4e, 0x4b, 0x5f, 0x53, 0x43, 0x43,
-	0x6f, 0x69, 0x6e, 0x10, 0x93, 0x4e, 0x12, 0x19, 0x0a, 0x14, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
-	0x5f, 0x52, 0x41, 0x4e, 0x4b, 0x5f, 0x43, 0x53, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x10, 0x94,
-	0x4e, 0x12, 0x19, 0x0a, 0x14, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x41, 0x4e, 0x4b,
-	0x5f, 0x53, 0x43, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x10, 0x95, 0x4e, 0x12, 0x17, 0x0a, 0x12,
-	0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x4c,
-	0x6f, 0x67, 0x10, 0x96, 0x4e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f,
-	0x53, 0x43, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x4c, 0x6f, 0x67, 0x10, 0x97, 0x4e, 0x12, 0x1a,
-	0x0a, 0x15, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x41, 0x4e, 0x4b, 0x5f, 0x43, 0x53,
-	0x57, 0x69, 0x6e, 0x43, 0x6f, 0x69, 0x6e, 0x10, 0x98, 0x4e, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x41,
-	0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x41, 0x4e, 0x4b, 0x5f, 0x53, 0x43, 0x57, 0x69, 0x6e, 0x43,
-	0x6f, 0x69, 0x6e, 0x10, 0x99, 0x4e, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
-	0x5f, 0x52, 0x41, 0x4e, 0x4b, 0x5f, 0x43, 0x53, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x10, 0x9a, 0x4e,
-	0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x41, 0x4e, 0x4b, 0x5f,
-	0x53, 0x43, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x10, 0x9b, 0x4e, 0x12, 0x19, 0x0a, 0x14, 0x50, 0x41,
-	0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x41, 0x4e, 0x4b, 0x5f, 0x43, 0x53, 0x50, 0x65, 0x72, 0x6d,
-	0x69, 0x74, 0x10, 0x9c, 0x4e, 0x12, 0x19, 0x0a, 0x14, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f,
-	0x52, 0x41, 0x4e, 0x4b, 0x5f, 0x53, 0x43, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x74, 0x10, 0x9d, 0x4e,
-	0x12, 0x17, 0x0a, 0x12, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x52, 0x6f, 0x6f,
-	0x6d, 0x41, 0x77, 0x61, 0x72, 0x64, 0x10, 0x9e, 0x4e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x41, 0x43,
-	0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x52, 0x6f, 0x6f, 0x6d, 0x41, 0x77, 0x61, 0x72, 0x64, 0x10,
-	0x9f, 0x4e, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x52,
-	0x6f, 0x6f, 0x6d, 0x41, 0x77, 0x61, 0x72, 0x64, 0x4f, 0x6e, 0x65, 0x10, 0xa0, 0x4e, 0x12, 0x1c,
-	0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x4c, 0x6f, 0x74, 0x74, 0x65,
-	0x72, 0x79, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x10, 0xa1, 0x4e, 0x12, 0x1c, 0x0a, 0x17,
-	0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x4c, 0x6f, 0x74, 0x74, 0x65, 0x72, 0x79,
-	0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x10, 0xa2, 0x4e, 0x2a, 0x8d, 0x01, 0x0a, 0x0a, 0x52,
-	0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x12, 0x13, 0x0a, 0x0f, 0x49, 0x6e, 0x76,
-	0x69, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x5f, 0x4e, 0x6f, 0x6e, 0x65, 0x10, 0x00, 0x12, 0x14,
-	0x0a, 0x10, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x5f, 0x54, 0x6f, 0x74,
-	0x61, 0x6c, 0x10, 0x01, 0x12, 0x13, 0x0a, 0x0f, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x54, 0x79,
-	0x70, 0x65, 0x5f, 0x57, 0x65, 0x65, 0x6b, 0x10, 0x02, 0x12, 0x14, 0x0a, 0x10, 0x49, 0x6e, 0x76,
-	0x69, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x5f, 0x4d, 0x6f, 0x6e, 0x74, 0x68, 0x10, 0x03, 0x12,
-	0x15, 0x0a, 0x11, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x5f, 0x55, 0x70,
-	0x57, 0x65, 0x65, 0x6b, 0x10, 0x04, 0x12, 0x12, 0x0a, 0x0e, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65,
-	0x54, 0x79, 0x70, 0x65, 0x5f, 0x4d, 0x61, 0x78, 0x10, 0x05, 0x42, 0x24, 0x5a, 0x22, 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, 0x72, 0x61, 0x6e, 0x6b,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6f, 0x72, 0x79, 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x50, 0x0a, 0x06, 0x43, 0x53, 0x4e,
+	0x69, 0x61, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x04, 0x50, 0x61, 0x67, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x61, 0x67, 0x65, 0x53,
+	0x69, 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x50, 0x61, 0x67, 0x65, 0x53,
+	0x69, 0x7a, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x22, 0x76, 0x0a, 0x0c, 0x4e,
+	0x69, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x53,
+	0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x12,
+	0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e,
+	0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x52, 0x61, 0x6e,
+	0x6b, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x52, 0x61, 0x6e, 0x6b, 0x12, 0x14, 0x0a,
+	0x05, 0x4d, 0x6f, 0x64, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x4d, 0x6f,
+	0x64, 0x49, 0x64, 0x22, 0xb4, 0x01, 0x0a, 0x06, 0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x12, 0x28,
+	0x0a, 0x05, 0x52, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e,
+	0x72, 0x61, 0x6e, 0x6b, 0x2e, 0x4e, 0x69, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x44, 0x61, 0x74,
+	0x61, 0x52, 0x05, 0x52, 0x61, 0x6e, 0x6b, 0x73, 0x12, 0x22, 0x0a, 0x02, 0x4d, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x72, 0x61, 0x6e, 0x6b, 0x2e, 0x4e, 0x69, 0x61, 0x6e,
+	0x52, 0x61, 0x6e, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x52, 0x02, 0x4d, 0x65, 0x12, 0x12, 0x0a, 0x04,
+	0x50, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x50, 0x61, 0x67, 0x65,
+	0x12, 0x1a, 0x0a, 0x08, 0x50, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x08, 0x50, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x14, 0x0a, 0x05,
+	0x54, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x54, 0x6f, 0x74,
+	0x61, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x22, 0x24, 0x0a, 0x12, 0x43, 0x53,
+	0x52, 0x65, 0x64, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79,
+	0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x49, 0x64,
+	0x22, 0x54, 0x0a, 0x10, 0x52, 0x65, 0x64, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x48, 0x69, 0x73,
+	0x74, 0x6f, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x54, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x02, 0x54, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07,
+	0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x49,
+	0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x22, 0x40, 0x0a, 0x12, 0x53, 0x43, 0x52, 0x65, 0x64, 0x50,
+	0x61, 0x63, 0x6b, 0x65, 0x74, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x2a, 0x0a, 0x04,
+	0x4c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x72, 0x61, 0x6e,
+	0x6b, 0x2e, 0x52, 0x65, 0x64, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x48, 0x69, 0x73, 0x74, 0x6f,
+	0x72, 0x79, 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x2a, 0x90, 0x05, 0x0a, 0x04, 0x52, 0x61, 0x6e,
+	0x6b, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x41, 0x4e, 0x4b,
+	0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b, 0x45,
+	0x54, 0x5f, 0x52, 0x41, 0x4e, 0x4b, 0x5f, 0x43, 0x53, 0x52, 0x61, 0x6e, 0x6b, 0x4d, 0x61, 0x74,
+	0x63, 0x68, 0x10, 0x90, 0x4e, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f,
+	0x52, 0x41, 0x4e, 0x4b, 0x5f, 0x53, 0x43, 0x52, 0x61, 0x6e, 0x6b, 0x4d, 0x61, 0x74, 0x63, 0x68,
+	0x10, 0x91, 0x4e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x41,
+	0x4e, 0x4b, 0x5f, 0x43, 0x53, 0x43, 0x6f, 0x69, 0x6e, 0x10, 0x92, 0x4e, 0x12, 0x17, 0x0a, 0x12,
+	0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x41, 0x4e, 0x4b, 0x5f, 0x53, 0x43, 0x43, 0x6f,
+	0x69, 0x6e, 0x10, 0x93, 0x4e, 0x12, 0x19, 0x0a, 0x14, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f,
+	0x52, 0x41, 0x4e, 0x4b, 0x5f, 0x43, 0x53, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x10, 0x94, 0x4e,
+	0x12, 0x19, 0x0a, 0x14, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x41, 0x4e, 0x4b, 0x5f,
+	0x53, 0x43, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x10, 0x95, 0x4e, 0x12, 0x17, 0x0a, 0x12, 0x50,
+	0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x4c, 0x6f,
+	0x67, 0x10, 0x96, 0x4e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53,
+	0x43, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x4c, 0x6f, 0x67, 0x10, 0x97, 0x4e, 0x12, 0x1a, 0x0a,
+	0x15, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x41, 0x4e, 0x4b, 0x5f, 0x43, 0x53, 0x57,
+	0x69, 0x6e, 0x43, 0x6f, 0x69, 0x6e, 0x10, 0x98, 0x4e, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x41, 0x43,
+	0x4b, 0x45, 0x54, 0x5f, 0x52, 0x41, 0x4e, 0x4b, 0x5f, 0x53, 0x43, 0x57, 0x69, 0x6e, 0x43, 0x6f,
+	0x69, 0x6e, 0x10, 0x99, 0x4e, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f,
+	0x52, 0x41, 0x4e, 0x4b, 0x5f, 0x43, 0x53, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x10, 0x9a, 0x4e, 0x12,
+	0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x41, 0x4e, 0x4b, 0x5f, 0x53,
+	0x43, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x10, 0x9b, 0x4e, 0x12, 0x19, 0x0a, 0x14, 0x50, 0x41, 0x43,
+	0x4b, 0x45, 0x54, 0x5f, 0x52, 0x41, 0x4e, 0x4b, 0x5f, 0x43, 0x53, 0x50, 0x65, 0x72, 0x6d, 0x69,
+	0x74, 0x10, 0x9c, 0x4e, 0x12, 0x19, 0x0a, 0x14, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52,
+	0x41, 0x4e, 0x4b, 0x5f, 0x53, 0x43, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x74, 0x10, 0x9d, 0x4e, 0x12,
+	0x17, 0x0a, 0x12, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x52, 0x6f, 0x6f, 0x6d,
+	0x41, 0x77, 0x61, 0x72, 0x64, 0x10, 0x9e, 0x4e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x41, 0x43, 0x4b,
+	0x45, 0x54, 0x5f, 0x53, 0x43, 0x52, 0x6f, 0x6f, 0x6d, 0x41, 0x77, 0x61, 0x72, 0x64, 0x10, 0x9f,
+	0x4e, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x52, 0x6f,
+	0x6f, 0x6d, 0x41, 0x77, 0x61, 0x72, 0x64, 0x4f, 0x6e, 0x65, 0x10, 0xa0, 0x4e, 0x12, 0x1c, 0x0a,
+	0x17, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x4c, 0x6f, 0x74, 0x74, 0x65, 0x72,
+	0x79, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x10, 0xa1, 0x4e, 0x12, 0x1c, 0x0a, 0x17, 0x50,
+	0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x4c, 0x6f, 0x74, 0x74, 0x65, 0x72, 0x79, 0x48,
+	0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x10, 0xa2, 0x4e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x41, 0x43,
+	0x4b, 0x45, 0x54, 0x5f, 0x52, 0x41, 0x4e, 0x4b, 0x5f, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x10,
+	0xa3, 0x4e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x41, 0x4e,
+	0x4b, 0x5f, 0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x10, 0xa4, 0x4e, 0x12, 0x1e, 0x0a, 0x19, 0x50,
+	0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x52, 0x65, 0x64, 0x50, 0x61, 0x63, 0x6b, 0x65,
+	0x74, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x10, 0xa5, 0x4e, 0x12, 0x1e, 0x0a, 0x19, 0x50,
+	0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x52, 0x65, 0x64, 0x50, 0x61, 0x63, 0x6b, 0x65,
+	0x74, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x10, 0xa6, 0x4e, 0x2a, 0x8d, 0x01, 0x0a, 0x0a,
+	0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x12, 0x13, 0x0a, 0x0f, 0x49, 0x6e,
+	0x76, 0x69, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x5f, 0x4e, 0x6f, 0x6e, 0x65, 0x10, 0x00, 0x12,
+	0x14, 0x0a, 0x10, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x5f, 0x54, 0x6f,
+	0x74, 0x61, 0x6c, 0x10, 0x01, 0x12, 0x13, 0x0a, 0x0f, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x54,
+	0x79, 0x70, 0x65, 0x5f, 0x57, 0x65, 0x65, 0x6b, 0x10, 0x02, 0x12, 0x14, 0x0a, 0x10, 0x49, 0x6e,
+	0x76, 0x69, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x5f, 0x4d, 0x6f, 0x6e, 0x74, 0x68, 0x10, 0x03,
+	0x12, 0x15, 0x0a, 0x11, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x5f, 0x55,
+	0x70, 0x57, 0x65, 0x65, 0x6b, 0x10, 0x04, 0x12, 0x12, 0x0a, 0x0e, 0x49, 0x6e, 0x76, 0x69, 0x74,
+	0x65, 0x54, 0x79, 0x70, 0x65, 0x5f, 0x4d, 0x61, 0x78, 0x10, 0x05, 0x42, 0x24, 0x5a, 0x22, 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, 0x72, 0x61, 0x6e,
+	0x6b, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2605,7 +3052,7 @@ func file_protocol_rank_rank_proto_rawDescGZIP() []byte {
 }
 
 var file_protocol_rank_rank_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_protocol_rank_rank_proto_msgTypes = make([]protoimpl.MessageInfo, 30)
+var file_protocol_rank_rank_proto_msgTypes = make([]protoimpl.MessageInfo, 36)
 var file_protocol_rank_rank_proto_goTypes = []interface{}{
 	(Rank)(0),                   // 0: rank.Rank
 	(RankInvite)(0),             // 1: rank.RankInvite
@@ -2639,6 +3086,12 @@ var file_protocol_rank_rank_proto_goTypes = []interface{}{
 	(*LotteryShow)(nil),         // 29: rank.LotteryShow
 	(*LotteryHistory)(nil),      // 30: rank.LotteryHistory
 	(*SCLotteryHistory)(nil),    // 31: rank.SCLotteryHistory
+	(*CSNian)(nil),              // 32: rank.CSNian
+	(*NianRankData)(nil),        // 33: rank.NianRankData
+	(*SCNian)(nil),              // 34: rank.SCNian
+	(*CSRedPacketHistory)(nil),  // 35: rank.CSRedPacketHistory
+	(*RedPacketHistory)(nil),    // 36: rank.RedPacketHistory
+	(*SCRedPacketHistory)(nil),  // 37: rank.SCRedPacketHistory
 }
 var file_protocol_rank_rank_proto_depIdxs = []int32{
 	3,  // 0: rank.SCRankMatch.Ranks:type_name -> rank.SeasonRank
@@ -2659,11 +3112,14 @@ var file_protocol_rank_rank_proto_depIdxs = []int32{
 	25, // 15: rank.LotteryHistory.Award:type_name -> rank.Item
 	29, // 16: rank.LotteryHistory.Show:type_name -> rank.LotteryShow
 	30, // 17: rank.SCLotteryHistory.List:type_name -> rank.LotteryHistory
-	18, // [18:18] is the sub-list for method output_type
-	18, // [18:18] is the sub-list for method input_type
-	18, // [18:18] is the sub-list for extension type_name
-	18, // [18:18] is the sub-list for extension extendee
-	0,  // [0:18] is the sub-list for field type_name
+	33, // 18: rank.SCNian.Ranks:type_name -> rank.NianRankData
+	33, // 19: rank.SCNian.Me:type_name -> rank.NianRankData
+	36, // 20: rank.SCRedPacketHistory.List:type_name -> rank.RedPacketHistory
+	21, // [21:21] is the sub-list for method output_type
+	21, // [21:21] is the sub-list for method input_type
+	21, // [21:21] is the sub-list for extension type_name
+	21, // [21:21] is the sub-list for extension extendee
+	0,  // [0:21] is the sub-list for field type_name
 }
 
 func init() { file_protocol_rank_rank_proto_init() }
@@ -3032,6 +3488,78 @@ func file_protocol_rank_rank_proto_init() {
 				return nil
 			}
 		}
+		file_protocol_rank_rank_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CSNian); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_protocol_rank_rank_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*NianRankData); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_protocol_rank_rank_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SCNian); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_protocol_rank_rank_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CSRedPacketHistory); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_protocol_rank_rank_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*RedPacketHistory); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_protocol_rank_rank_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SCRedPacketHistory); 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{
@@ -3039,7 +3567,7 @@ func file_protocol_rank_rank_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_protocol_rank_rank_proto_rawDesc,
 			NumEnums:      2,
-			NumMessages:   30,
+			NumMessages:   36,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

protocol/rank/rank.proto

@@ -33,6 +33,12 @@ enum Rank{
   // 竞技馆抽奖历史
   PACKET_CSLotteryHistory = 10017;
   PACKET_SCLotteryHistory = 10018;
+  //年兽排行榜
+  PACKET_RANK_CSNian = 10019;
+  PACKET_RANK_SCNian = 10020;
+  // 红包抽奖记录
+  PACKET_CSRedPacketHistory = 10021;
+  PACKET_SCRedPacketHistory = 10022;
 }
 
 // 排位榜
@@ -270,4 +276,43 @@ message LotteryHistory{
 // PACKET_SCLotteryHistory
 message SCLotteryHistory{
   repeated LotteryHistory List = 1;
+}
+
+// PACKET_RANK_CSNian
+message CSNian{
+  int32 Page = 1; // 页数
+  int32 PageSize = 2; // 每页数量
+  int32 TypeId = 3; //1-幸运榜 2-伤害榜
+}
+
+message NianRankData {
+  int32 Snid = 1; // 玩家id
+  string Name = 2; // 昵称
+  int64 Score = 3; 
+  int32 Rank = 4; // 排名
+  int32 ModId = 5; // 角色id
+}
+
+// PACKET_RANK_SCCoin
+message SCNian{
+  repeated NianRankData Ranks = 1; // 排行榜
+  NianRankData Me = 2; // 玩家自己的排行信息
+  int32 Page = 3; // 页数
+  int32 PageSize = 4; // 每页数量
+  int32 Total = 5; // 总数量
+  int32 TypeId = 6;
+}
+
+// 红包抽奖记录
+// PACKET_CSRedPacketHistory
+message CSRedPacketHistory{
+  int64 Id = 1; // 红包活动id
+}
+message RedPacketHistory{
+  int64 Ts = 1; // 时间戳
+  int32 ItemId = 5; // 道具id
+  int64 ItemNum = 6; // 道具数量
+}
+message SCRedPacketHistory{
+  repeated RedPacketHistory List = 1;
 }

protocol/server/pbdata.proto

@@ -5,6 +5,20 @@ syntax = "proto3";
 package server;
 option go_package = "mongo.games.com/game/protocol/server";
 
+message DB_ACTPushCoin {
+
+	int32 Id = 1;
+
+	int32 Rate = 2;
+
+	map<int64, int64> Gain = 3;
+
+}
+
+message DB_ACTPushCoinArray {
+    repeated DB_ACTPushCoin Arr = 1;
+}
+
 message DB_ActSign {
 
 	int32 Id = 1;
@@ -659,6 +673,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 +869,8 @@ message DB_GameFree {
 
 	int32 IsCustom = 73;
 
+	string GameName = 74;
+
 }
 
 message DB_GameFreeArray {
@@ -1245,6 +1277,22 @@ message DB_NewPlayerArray {
     repeated DB_NewPlayer Arr = 1;
 }
 
+message DB_NewYearActivity {
+
+	int32 Id = 1;
+
+	string PorpName = 2;
+
+	string PropValue = 3;
+
+	string PropDec = 4;
+
+}
+
+message DB_NewYearActivityArray {
+    repeated DB_NewYearActivity Arr = 1;
+}
+
 message DB_PassShow {
 
 	int32 Id = 1;
@@ -1331,15 +1379,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;
 
 }
 
@@ -1443,6 +1495,8 @@ message DB_PropExchange {
 
 	map<int64, int64> Gain = 4;
 
+	int32 Times = 5;
+
 }
 
 message DB_PropExchangeArray {

protocol/server/server.proto

@@ -175,7 +175,6 @@ message CustomParam {
   int32 Voice = 5; // 是否开启语音 1开启 2关闭
   int64 Price = 6; // 奖品价值
   string ImageURL = 7; // 图片地址
-  repeated Item Items = 8; // 房费
 }
 
 message MatchParam {

protocol/sugarrush/sugarrush.pb.go

@@ -0,0 +1,799 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.27.1-devel
+// 	protoc        v3.19.4
+// source: protocol/sugarrush/sugarrush.proto
+
+package sugarrush
+
+import (
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+//sugarrush
+//龙
+type SugarRushPID int32
+
+const (
+	SugarRushPID_PACKET_SUGARRUSH_ZERO                 SugarRushPID = 0    // 弃用消息号
+	SugarRushPID_PACKET_SUGARRUSH_SCSUGARRUSHROOMINFO  SugarRushPID = 5700 //房间信息
+	SugarRushPID_PACKET_SUGARRUSH_CSSUGARRUSHOP        SugarRushPID = 5701
+	SugarRushPID_PACKET_SUGARRUSH_SCSUGARRUSHOP        SugarRushPID = 5702
+	SugarRushPID_PACKET_SUGARRUSH_SCSUGARRUSHROOMSTATE SugarRushPID = 5703
+	SugarRushPID_PACKET_SUGARRUSH_SCSUGARRUSHBILLED    SugarRushPID = 5704
+)
+
+// Enum value maps for SugarRushPID.
+var (
+	SugarRushPID_name = map[int32]string{
+		0:    "PACKET_SUGARRUSH_ZERO",
+		5700: "PACKET_SUGARRUSH_SCSUGARRUSHROOMINFO",
+		5701: "PACKET_SUGARRUSH_CSSUGARRUSHOP",
+		5702: "PACKET_SUGARRUSH_SCSUGARRUSHOP",
+		5703: "PACKET_SUGARRUSH_SCSUGARRUSHROOMSTATE",
+		5704: "PACKET_SUGARRUSH_SCSUGARRUSHBILLED",
+	}
+	SugarRushPID_value = map[string]int32{
+		"PACKET_SUGARRUSH_ZERO":                 0,
+		"PACKET_SUGARRUSH_SCSUGARRUSHROOMINFO":  5700,
+		"PACKET_SUGARRUSH_CSSUGARRUSHOP":        5701,
+		"PACKET_SUGARRUSH_SCSUGARRUSHOP":        5702,
+		"PACKET_SUGARRUSH_SCSUGARRUSHROOMSTATE": 5703,
+		"PACKET_SUGARRUSH_SCSUGARRUSHBILLED":    5704,
+	}
+)
+
+func (x SugarRushPID) Enum() *SugarRushPID {
+	p := new(SugarRushPID)
+	*p = x
+	return p
+}
+
+func (x SugarRushPID) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (SugarRushPID) Descriptor() protoreflect.EnumDescriptor {
+	return file_protocol_sugarrush_sugarrush_proto_enumTypes[0].Descriptor()
+}
+
+func (SugarRushPID) Type() protoreflect.EnumType {
+	return &file_protocol_sugarrush_sugarrush_proto_enumTypes[0]
+}
+
+func (x SugarRushPID) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use SugarRushPID.Descriptor instead.
+func (SugarRushPID) EnumDescriptor() ([]byte, []int) {
+	return file_protocol_sugarrush_sugarrush_proto_rawDescGZIP(), []int{0}
+}
+
+type SugarRushPlayerData struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Name        string   `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`                 //名字
+	SnId        int32    `protobuf:"varint,2,opt,name=SnId,proto3" json:"SnId,omitempty"`                //账号
+	Head        int32    `protobuf:"varint,3,opt,name=Head,proto3" json:"Head,omitempty"`                //头像
+	Sex         int32    `protobuf:"varint,4,opt,name=Sex,proto3" json:"Sex,omitempty"`                  //性别
+	Coin        int64    `protobuf:"varint,5,opt,name=Coin,proto3" json:"Coin,omitempty"`                //金币
+	Pos         int32    `protobuf:"varint,6,opt,name=Pos,proto3" json:"Pos,omitempty"`                  //座位位置
+	Flag        int32    `protobuf:"varint,7,opt,name=Flag,proto3" json:"Flag,omitempty"`                //二进制标记
+	Params      []string `protobuf:"bytes,8,rep,name=Params,proto3" json:"Params,omitempty"`             //其他数据 如:ip 等
+	City        string   `protobuf:"bytes,9,opt,name=City,proto3" json:"City,omitempty"`                 //城市
+	HeadOutLine int32    `protobuf:"varint,10,opt,name=HeadOutLine,proto3" json:"HeadOutLine,omitempty"` //头像框
+	VIP         int32    `protobuf:"varint,11,opt,name=VIP,proto3" json:"VIP,omitempty"`
+}
+
+func (x *SugarRushPlayerData) Reset() {
+	*x = SugarRushPlayerData{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_protocol_sugarrush_sugarrush_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SugarRushPlayerData) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SugarRushPlayerData) ProtoMessage() {}
+
+func (x *SugarRushPlayerData) ProtoReflect() protoreflect.Message {
+	mi := &file_protocol_sugarrush_sugarrush_proto_msgTypes[0]
+	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 SugarRushPlayerData.ProtoReflect.Descriptor instead.
+func (*SugarRushPlayerData) Descriptor() ([]byte, []int) {
+	return file_protocol_sugarrush_sugarrush_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *SugarRushPlayerData) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *SugarRushPlayerData) GetSnId() int32 {
+	if x != nil {
+		return x.SnId
+	}
+	return 0
+}
+
+func (x *SugarRushPlayerData) GetHead() int32 {
+	if x != nil {
+		return x.Head
+	}
+	return 0
+}
+
+func (x *SugarRushPlayerData) GetSex() int32 {
+	if x != nil {
+		return x.Sex
+	}
+	return 0
+}
+
+func (x *SugarRushPlayerData) GetCoin() int64 {
+	if x != nil {
+		return x.Coin
+	}
+	return 0
+}
+
+func (x *SugarRushPlayerData) GetPos() int32 {
+	if x != nil {
+		return x.Pos
+	}
+	return 0
+}
+
+func (x *SugarRushPlayerData) GetFlag() int32 {
+	if x != nil {
+		return x.Flag
+	}
+	return 0
+}
+
+func (x *SugarRushPlayerData) GetParams() []string {
+	if x != nil {
+		return x.Params
+	}
+	return nil
+}
+
+func (x *SugarRushPlayerData) GetCity() string {
+	if x != nil {
+		return x.City
+	}
+	return ""
+}
+
+func (x *SugarRushPlayerData) GetHeadOutLine() int32 {
+	if x != nil {
+		return x.HeadOutLine
+	}
+	return 0
+}
+
+func (x *SugarRushPlayerData) GetVIP() int32 {
+	if x != nil {
+		return x.VIP
+	}
+	return 0
+}
+
+//房间信息
+//PACKET_SUGARRUSH_SCSUGARRUSHROOMINFO
+type SCSugarRushRoomInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	RoomId     int32                `protobuf:"varint,1,opt,name=RoomId,proto3" json:"RoomId,omitempty"` //房间id
+	GameFreeId int32                `protobuf:"varint,2,opt,name=GameFreeId,proto3" json:"GameFreeId,omitempty"`
+	GameId     int32                `protobuf:"varint,3,opt,name=GameId,proto3" json:"GameId,omitempty"`            //游戏id
+	RoomMode   int32                `protobuf:"varint,4,opt,name=RoomMode,proto3" json:"RoomMode,omitempty"`        //游戏模式
+	Params     []int32              `protobuf:"varint,5,rep,packed,name=Params,proto3" json:"Params,omitempty"`     //规则参数
+	NumOfGames int32                `protobuf:"varint,6,opt,name=NumOfGames,proto3" json:"NumOfGames,omitempty"`    //当前第几局
+	State      int32                `protobuf:"varint,7,opt,name=State,proto3" json:"State,omitempty"`              //房间当前状态
+	ParamsEx   []int64              `protobuf:"varint,8,rep,packed,name=ParamsEx,proto3" json:"ParamsEx,omitempty"` //其他参数
+	SceneType  int32                `protobuf:"varint,9,opt,name=SceneType,proto3" json:"SceneType,omitempty"`      //房间模式
+	Player     *SugarRushPlayerData `protobuf:"bytes,10,opt,name=Player,proto3" json:"Player,omitempty"`            //房间内的玩家信息
+	PlayerInfo string               `protobuf:"bytes,11,opt,name=PlayerInfo,proto3" json:"PlayerInfo,omitempty"`
+}
+
+func (x *SCSugarRushRoomInfo) Reset() {
+	*x = SCSugarRushRoomInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_protocol_sugarrush_sugarrush_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SCSugarRushRoomInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SCSugarRushRoomInfo) ProtoMessage() {}
+
+func (x *SCSugarRushRoomInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_protocol_sugarrush_sugarrush_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SCSugarRushRoomInfo.ProtoReflect.Descriptor instead.
+func (*SCSugarRushRoomInfo) Descriptor() ([]byte, []int) {
+	return file_protocol_sugarrush_sugarrush_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *SCSugarRushRoomInfo) GetRoomId() int32 {
+	if x != nil {
+		return x.RoomId
+	}
+	return 0
+}
+
+func (x *SCSugarRushRoomInfo) GetGameFreeId() int32 {
+	if x != nil {
+		return x.GameFreeId
+	}
+	return 0
+}
+
+func (x *SCSugarRushRoomInfo) GetGameId() int32 {
+	if x != nil {
+		return x.GameId
+	}
+	return 0
+}
+
+func (x *SCSugarRushRoomInfo) GetRoomMode() int32 {
+	if x != nil {
+		return x.RoomMode
+	}
+	return 0
+}
+
+func (x *SCSugarRushRoomInfo) GetParams() []int32 {
+	if x != nil {
+		return x.Params
+	}
+	return nil
+}
+
+func (x *SCSugarRushRoomInfo) GetNumOfGames() int32 {
+	if x != nil {
+		return x.NumOfGames
+	}
+	return 0
+}
+
+func (x *SCSugarRushRoomInfo) GetState() int32 {
+	if x != nil {
+		return x.State
+	}
+	return 0
+}
+
+func (x *SCSugarRushRoomInfo) GetParamsEx() []int64 {
+	if x != nil {
+		return x.ParamsEx
+	}
+	return nil
+}
+
+func (x *SCSugarRushRoomInfo) GetSceneType() int32 {
+	if x != nil {
+		return x.SceneType
+	}
+	return 0
+}
+
+func (x *SCSugarRushRoomInfo) GetPlayer() *SugarRushPlayerData {
+	if x != nil {
+		return x.Player
+	}
+	return nil
+}
+
+func (x *SCSugarRushRoomInfo) GetPlayerInfo() string {
+	if x != nil {
+		return x.PlayerInfo
+	}
+	return ""
+}
+
+//玩家操作
+//PACKET_SUGARRUSH_CSSUGARRUSHOP
+type CSSugarRushOp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	OpCode int32   `protobuf:"varint,1,opt,name=OpCode,proto3" json:"OpCode,omitempty"`        //操作码 0.spin
+	Params []int64 `protobuf:"varint,2,rep,packed,name=Params,proto3" json:"Params,omitempty"` //操作参数 下注索引编号
+}
+
+func (x *CSSugarRushOp) Reset() {
+	*x = CSSugarRushOp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_protocol_sugarrush_sugarrush_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CSSugarRushOp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CSSugarRushOp) ProtoMessage() {}
+
+func (x *CSSugarRushOp) ProtoReflect() protoreflect.Message {
+	mi := &file_protocol_sugarrush_sugarrush_proto_msgTypes[2]
+	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 CSSugarRushOp.ProtoReflect.Descriptor instead.
+func (*CSSugarRushOp) Descriptor() ([]byte, []int) {
+	return file_protocol_sugarrush_sugarrush_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *CSSugarRushOp) GetOpCode() int32 {
+	if x != nil {
+		return x.OpCode
+	}
+	return 0
+}
+
+func (x *CSSugarRushOp) GetParams() []int64 {
+	if x != nil {
+		return x.Params
+	}
+	return nil
+}
+
+//玩家操作返回
+//PACKET_SUGARRUSH_SCSUGARRUSHOP
+type SCSugarRushOp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	OpCode    int32   `protobuf:"varint,1,opt,name=OpCode,proto3" json:"OpCode,omitempty"`        //操作码
+	OpRetCode int32   `protobuf:"varint,2,opt,name=OpRetCode,proto3" json:"OpRetCode,omitempty"`  //操作结果 1.金币不足 2.低于该值不能押注
+	Params    []int64 `protobuf:"varint,3,rep,packed,name=Params,proto3" json:"Params,omitempty"` //操作参数
+}
+
+func (x *SCSugarRushOp) Reset() {
+	*x = SCSugarRushOp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_protocol_sugarrush_sugarrush_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SCSugarRushOp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SCSugarRushOp) ProtoMessage() {}
+
+func (x *SCSugarRushOp) ProtoReflect() protoreflect.Message {
+	mi := &file_protocol_sugarrush_sugarrush_proto_msgTypes[3]
+	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 SCSugarRushOp.ProtoReflect.Descriptor instead.
+func (*SCSugarRushOp) Descriptor() ([]byte, []int) {
+	return file_protocol_sugarrush_sugarrush_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *SCSugarRushOp) GetOpCode() int32 {
+	if x != nil {
+		return x.OpCode
+	}
+	return 0
+}
+
+func (x *SCSugarRushOp) GetOpRetCode() int32 {
+	if x != nil {
+		return x.OpRetCode
+	}
+	return 0
+}
+
+func (x *SCSugarRushOp) GetParams() []int64 {
+	if x != nil {
+		return x.Params
+	}
+	return nil
+}
+
+//房间状态
+//PACKET_SUGARRUSH_SCSUGARRUSHROOMSTATE
+type SCSugarRushRoomState struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	State    int32   `protobuf:"varint,1,opt,name=State,proto3" json:"State,omitempty"`          //房间当前状态
+	SubState int32   `protobuf:"varint,2,opt,name=SubState,proto3" json:"SubState,omitempty"`    //房间当前子状态
+	Params   []int32 `protobuf:"varint,3,rep,packed,name=Params,proto3" json:"Params,omitempty"` //状态参数
+}
+
+func (x *SCSugarRushRoomState) Reset() {
+	*x = SCSugarRushRoomState{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_protocol_sugarrush_sugarrush_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SCSugarRushRoomState) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SCSugarRushRoomState) ProtoMessage() {}
+
+func (x *SCSugarRushRoomState) ProtoReflect() protoreflect.Message {
+	mi := &file_protocol_sugarrush_sugarrush_proto_msgTypes[4]
+	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 SCSugarRushRoomState.ProtoReflect.Descriptor instead.
+func (*SCSugarRushRoomState) Descriptor() ([]byte, []int) {
+	return file_protocol_sugarrush_sugarrush_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *SCSugarRushRoomState) GetState() int32 {
+	if x != nil {
+		return x.State
+	}
+	return 0
+}
+
+func (x *SCSugarRushRoomState) GetSubState() int32 {
+	if x != nil {
+		return x.SubState
+	}
+	return 0
+}
+
+func (x *SCSugarRushRoomState) GetParams() []int32 {
+	if x != nil {
+		return x.Params
+	}
+	return nil
+}
+
+//PACKET_SUGARRUSH_SCSUGARRUSHBILLED
+type SCSugarRushBilled struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	OpRetCode  int32  `protobuf:"varint,1,opt,name=OpRetCode,proto3" json:"OpRetCode,omitempty"` //0.spin成功 1.spin失败
+	GameEndStr string `protobuf:"bytes,2,opt,name=GameEndStr,proto3" json:"GameEndStr,omitempty"`
+}
+
+func (x *SCSugarRushBilled) Reset() {
+	*x = SCSugarRushBilled{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_protocol_sugarrush_sugarrush_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SCSugarRushBilled) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SCSugarRushBilled) ProtoMessage() {}
+
+func (x *SCSugarRushBilled) ProtoReflect() protoreflect.Message {
+	mi := &file_protocol_sugarrush_sugarrush_proto_msgTypes[5]
+	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 SCSugarRushBilled.ProtoReflect.Descriptor instead.
+func (*SCSugarRushBilled) Descriptor() ([]byte, []int) {
+	return file_protocol_sugarrush_sugarrush_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *SCSugarRushBilled) GetOpRetCode() int32 {
+	if x != nil {
+		return x.OpRetCode
+	}
+	return 0
+}
+
+func (x *SCSugarRushBilled) GetGameEndStr() string {
+	if x != nil {
+		return x.GameEndStr
+	}
+	return ""
+}
+
+var File_protocol_sugarrush_sugarrush_proto protoreflect.FileDescriptor
+
+var file_protocol_sugarrush_sugarrush_proto_rawDesc = []byte{
+	0x0a, 0x22, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x73, 0x75, 0x67, 0x61, 0x72,
+	0x72, 0x75, 0x73, 0x68, 0x2f, 0x73, 0x75, 0x67, 0x61, 0x72, 0x72, 0x75, 0x73, 0x68, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x09, 0x73, 0x75, 0x67, 0x61, 0x72, 0x72, 0x75, 0x73, 0x68, 0x22,
+	0xfd, 0x01, 0x0a, 0x13, 0x53, 0x75, 0x67, 0x61, 0x72, 0x52, 0x75, 0x73, 0x68, 0x50, 0x6c, 0x61,
+	0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x53,
+	0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x12,
+	0x12, 0x0a, 0x04, 0x48, 0x65, 0x61, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x48,
+	0x65, 0x61, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x53, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x03, 0x53, 0x65, 0x78, 0x12, 0x12, 0x0a, 0x04, 0x43, 0x6f, 0x69, 0x6e, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x04, 0x43, 0x6f, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x50, 0x6f, 0x73,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x50, 0x6f, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x46,
+	0x6c, 0x61, 0x67, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x46, 0x6c, 0x61, 0x67, 0x12,
+	0x16, 0x0a, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52,
+	0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x43, 0x69, 0x74, 0x79, 0x18,
+	0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x43, 0x69, 0x74, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x48,
+	0x65, 0x61, 0x64, 0x4f, 0x75, 0x74, 0x4c, 0x69, 0x6e, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x0b, 0x48, 0x65, 0x61, 0x64, 0x4f, 0x75, 0x74, 0x4c, 0x69, 0x6e, 0x65, 0x12, 0x10, 0x0a,
+	0x03, 0x56, 0x49, 0x50, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x56, 0x49, 0x50, 0x22,
+	0xe1, 0x02, 0x0a, 0x13, 0x53, 0x43, 0x53, 0x75, 0x67, 0x61, 0x72, 0x52, 0x75, 0x73, 0x68, 0x52,
+	0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x12,
+	0x1e, 0x0a, 0x0a, 0x47, 0x61, 0x6d, 0x65, 0x46, 0x72, 0x65, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x0a, 0x47, 0x61, 0x6d, 0x65, 0x46, 0x72, 0x65, 0x65, 0x49, 0x64, 0x12,
+	0x16, 0x0a, 0x06, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x06, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x6f, 0x6f, 0x6d, 0x4d,
+	0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x52, 0x6f, 0x6f, 0x6d, 0x4d,
+	0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x05, 0x20,
+	0x03, 0x28, 0x05, 0x52, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x4e,
+	0x75, 0x6d, 0x4f, 0x66, 0x47, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x0a, 0x4e, 0x75, 0x6d, 0x4f, 0x66, 0x47, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x53,
+	0x74, 0x61, 0x74, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x53, 0x74, 0x61, 0x74,
+	0x65, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x45, 0x78, 0x18, 0x08, 0x20,
+	0x03, 0x28, 0x03, 0x52, 0x08, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x45, 0x78, 0x12, 0x1c, 0x0a,
+	0x09, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x09, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x36, 0x0a, 0x06, 0x50,
+	0x6c, 0x61, 0x79, 0x65, 0x72, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x73, 0x75,
+	0x67, 0x61, 0x72, 0x72, 0x75, 0x73, 0x68, 0x2e, 0x53, 0x75, 0x67, 0x61, 0x72, 0x52, 0x75, 0x73,
+	0x68, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x06, 0x50, 0x6c, 0x61,
+	0x79, 0x65, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x49, 0x6e, 0x66,
+	0x6f, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x49,
+	0x6e, 0x66, 0x6f, 0x22, 0x3f, 0x0a, 0x0d, 0x43, 0x53, 0x53, 0x75, 0x67, 0x61, 0x72, 0x52, 0x75,
+	0x73, 0x68, 0x4f, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06,
+	0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x03, 0x52, 0x06, 0x50, 0x61,
+	0x72, 0x61, 0x6d, 0x73, 0x22, 0x5d, 0x0a, 0x0d, 0x53, 0x43, 0x53, 0x75, 0x67, 0x61, 0x72, 0x52,
+	0x75, 0x73, 0x68, 0x4f, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x1c, 0x0a,
+	0x09, 0x4f, 0x70, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x09, 0x4f, 0x70, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x50,
+	0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x03, 0x52, 0x06, 0x50, 0x61, 0x72,
+	0x61, 0x6d, 0x73, 0x22, 0x60, 0x0a, 0x14, 0x53, 0x43, 0x53, 0x75, 0x67, 0x61, 0x72, 0x52, 0x75,
+	0x73, 0x68, 0x52, 0x6f, 0x6f, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x53,
+	0x74, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x53, 0x74, 0x61, 0x74,
+	0x65, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x75, 0x62, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x08, 0x53, 0x75, 0x62, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x16, 0x0a,
+	0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x50,
+	0x61, 0x72, 0x61, 0x6d, 0x73, 0x22, 0x51, 0x0a, 0x11, 0x53, 0x43, 0x53, 0x75, 0x67, 0x61, 0x72,
+	0x52, 0x75, 0x73, 0x68, 0x42, 0x69, 0x6c, 0x6c, 0x65, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x4f, 0x70,
+	0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x4f,
+	0x70, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x47, 0x61, 0x6d, 0x65,
+	0x45, 0x6e, 0x64, 0x53, 0x74, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x47, 0x61,
+	0x6d, 0x65, 0x45, 0x6e, 0x64, 0x53, 0x74, 0x72, 0x2a, 0xf3, 0x01, 0x0a, 0x0c, 0x53, 0x75, 0x67,
+	0x61, 0x72, 0x52, 0x75, 0x73, 0x68, 0x50, 0x49, 0x44, 0x12, 0x19, 0x0a, 0x15, 0x50, 0x41, 0x43,
+	0x4b, 0x45, 0x54, 0x5f, 0x53, 0x55, 0x47, 0x41, 0x52, 0x52, 0x55, 0x53, 0x48, 0x5f, 0x5a, 0x45,
+	0x52, 0x4f, 0x10, 0x00, 0x12, 0x29, 0x0a, 0x24, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53,
+	0x55, 0x47, 0x41, 0x52, 0x52, 0x55, 0x53, 0x48, 0x5f, 0x53, 0x43, 0x53, 0x55, 0x47, 0x41, 0x52,
+	0x52, 0x55, 0x53, 0x48, 0x52, 0x4f, 0x4f, 0x4d, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0xc4, 0x2c, 0x12,
+	0x23, 0x0a, 0x1e, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x55, 0x47, 0x41, 0x52, 0x52,
+	0x55, 0x53, 0x48, 0x5f, 0x43, 0x53, 0x53, 0x55, 0x47, 0x41, 0x52, 0x52, 0x55, 0x53, 0x48, 0x4f,
+	0x50, 0x10, 0xc5, 0x2c, 0x12, 0x23, 0x0a, 0x1e, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53,
+	0x55, 0x47, 0x41, 0x52, 0x52, 0x55, 0x53, 0x48, 0x5f, 0x53, 0x43, 0x53, 0x55, 0x47, 0x41, 0x52,
+	0x52, 0x55, 0x53, 0x48, 0x4f, 0x50, 0x10, 0xc6, 0x2c, 0x12, 0x2a, 0x0a, 0x25, 0x50, 0x41, 0x43,
+	0x4b, 0x45, 0x54, 0x5f, 0x53, 0x55, 0x47, 0x41, 0x52, 0x52, 0x55, 0x53, 0x48, 0x5f, 0x53, 0x43,
+	0x53, 0x55, 0x47, 0x41, 0x52, 0x52, 0x55, 0x53, 0x48, 0x52, 0x4f, 0x4f, 0x4d, 0x53, 0x54, 0x41,
+	0x54, 0x45, 0x10, 0xc7, 0x2c, 0x12, 0x27, 0x0a, 0x22, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f,
+	0x53, 0x55, 0x47, 0x41, 0x52, 0x52, 0x55, 0x53, 0x48, 0x5f, 0x53, 0x43, 0x53, 0x55, 0x47, 0x41,
+	0x52, 0x52, 0x55, 0x53, 0x48, 0x42, 0x49, 0x4c, 0x4c, 0x45, 0x44, 0x10, 0xc8, 0x2c, 0x42, 0x29,
+	0x5a, 0x27, 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,
+	0x73, 0x75, 0x67, 0x61, 0x72, 0x72, 0x75, 0x73, 0x68, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
+}
+
+var (
+	file_protocol_sugarrush_sugarrush_proto_rawDescOnce sync.Once
+	file_protocol_sugarrush_sugarrush_proto_rawDescData = file_protocol_sugarrush_sugarrush_proto_rawDesc
+)
+
+func file_protocol_sugarrush_sugarrush_proto_rawDescGZIP() []byte {
+	file_protocol_sugarrush_sugarrush_proto_rawDescOnce.Do(func() {
+		file_protocol_sugarrush_sugarrush_proto_rawDescData = protoimpl.X.CompressGZIP(file_protocol_sugarrush_sugarrush_proto_rawDescData)
+	})
+	return file_protocol_sugarrush_sugarrush_proto_rawDescData
+}
+
+var file_protocol_sugarrush_sugarrush_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_protocol_sugarrush_sugarrush_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_protocol_sugarrush_sugarrush_proto_goTypes = []interface{}{
+	(SugarRushPID)(0),            // 0: sugarrush.SugarRushPID
+	(*SugarRushPlayerData)(nil),  // 1: sugarrush.SugarRushPlayerData
+	(*SCSugarRushRoomInfo)(nil),  // 2: sugarrush.SCSugarRushRoomInfo
+	(*CSSugarRushOp)(nil),        // 3: sugarrush.CSSugarRushOp
+	(*SCSugarRushOp)(nil),        // 4: sugarrush.SCSugarRushOp
+	(*SCSugarRushRoomState)(nil), // 5: sugarrush.SCSugarRushRoomState
+	(*SCSugarRushBilled)(nil),    // 6: sugarrush.SCSugarRushBilled
+}
+var file_protocol_sugarrush_sugarrush_proto_depIdxs = []int32{
+	1, // 0: sugarrush.SCSugarRushRoomInfo.Player:type_name -> sugarrush.SugarRushPlayerData
+	1, // [1:1] is the sub-list for method output_type
+	1, // [1:1] is the sub-list for method input_type
+	1, // [1:1] is the sub-list for extension type_name
+	1, // [1:1] is the sub-list for extension extendee
+	0, // [0:1] is the sub-list for field type_name
+}
+
+func init() { file_protocol_sugarrush_sugarrush_proto_init() }
+func file_protocol_sugarrush_sugarrush_proto_init() {
+	if File_protocol_sugarrush_sugarrush_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_protocol_sugarrush_sugarrush_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SugarRushPlayerData); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_protocol_sugarrush_sugarrush_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SCSugarRushRoomInfo); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_protocol_sugarrush_sugarrush_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CSSugarRushOp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_protocol_sugarrush_sugarrush_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SCSugarRushOp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_protocol_sugarrush_sugarrush_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SCSugarRushRoomState); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_protocol_sugarrush_sugarrush_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SCSugarRushBilled); 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{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_protocol_sugarrush_sugarrush_proto_rawDesc,
+			NumEnums:      1,
+			NumMessages:   6,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_protocol_sugarrush_sugarrush_proto_goTypes,
+		DependencyIndexes: file_protocol_sugarrush_sugarrush_proto_depIdxs,
+		EnumInfos:         file_protocol_sugarrush_sugarrush_proto_enumTypes,
+		MessageInfos:      file_protocol_sugarrush_sugarrush_proto_msgTypes,
+	}.Build()
+	File_protocol_sugarrush_sugarrush_proto = out.File
+	file_protocol_sugarrush_sugarrush_proto_rawDesc = nil
+	file_protocol_sugarrush_sugarrush_proto_goTypes = nil
+	file_protocol_sugarrush_sugarrush_proto_depIdxs = nil
+}

protocol/sugarrush/sugarrush.proto

@@ -0,0 +1,68 @@
+syntax = "proto3";
+package sugarrush;
+option go_package = "mongo.games.com/game/protocol/sugarrush";
+
+//sugarrush
+//龙
+enum SugarRushPID {
+  PACKET_SUGARRUSH_ZERO = 0;// 弃用消息号
+  PACKET_SUGARRUSH_SCSUGARRUSHROOMINFO = 5700; //房间信息
+  PACKET_SUGARRUSH_CSSUGARRUSHOP = 5701;
+  PACKET_SUGARRUSH_SCSUGARRUSHOP = 5702;
+  PACKET_SUGARRUSH_SCSUGARRUSHROOMSTATE = 5703;
+  PACKET_SUGARRUSH_SCSUGARRUSHBILLED = 5704;
+}
+
+message SugarRushPlayerData {
+  string Name = 1; //名字
+  int32 SnId = 2; //账号
+  int32 Head = 3; //头像
+  int32 Sex = 4; //性别
+  int64 Coin = 5; //金币
+  int32 Pos = 6; //座位位置
+  int32 Flag = 7; //二进制标记
+  repeated string Params = 8; //其他数据 如:ip 等
+  string City = 9; //城市
+  int32 HeadOutLine = 10;  //头像框
+  int32 VIP = 11;
+}
+//房间信息
+//PACKET_SUGARRUSH_SCSUGARRUSHROOMINFO
+message SCSugarRushRoomInfo {
+  int32 RoomId = 1; //房间id
+  int32 GameFreeId = 2;
+  int32 GameId = 3; //游戏id
+  int32 RoomMode = 4; //游戏模式
+  repeated int32 Params = 5; //规则参数
+  int32 NumOfGames = 6; //当前第几局
+  int32 State = 7; //房间当前状态
+  repeated int64 ParamsEx = 8; //其他参数
+  int32 SceneType = 9; //房间模式
+  SugarRushPlayerData Player = 10; //房间内的玩家信息
+  string PlayerInfo = 11;
+}
+//玩家操作
+//PACKET_SUGARRUSH_CSSUGARRUSHOP
+message CSSugarRushOp {
+  int32 OpCode = 1; //操作码 0.spin
+  repeated int64 Params = 2; //操作参数 cval
+}
+//玩家操作返回
+//PACKET_SUGARRUSH_SCSUGARRUSHOP
+message SCSugarRushOp {
+  int32 OpCode = 1; //操作码
+  int32 OpRetCode = 2; //操作结果 1.金币不足 2.低于该值不能押注
+  repeated int64 Params = 3; //操作参数
+}
+//房间状态
+//PACKET_SUGARRUSH_SCSUGARRUSHROOMSTATE
+message SCSugarRushRoomState {
+  int32 State = 1; //房间当前状态
+  int32 SubState = 2; //房间当前子状态
+  repeated int32 Params = 3; //状态参数
+}
+//PACKET_SUGARRUSH_SCSUGARRUSHBILLED
+message SCSugarRushBilled{
+  int32 OpRetCode = 1;//0.spin成功 1.spin失败
+  string GameEndStr = 2;
+}

protocol/task/task.pb.go

@@ -227,7 +227,7 @@ type CSTaskList struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统
+	Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统 6:赛季通行证任务 8:年兽每日任务 9:年兽活动任务 10:累计消耗任务
 }
 
 func (x *CSTaskList) Reset() {
@@ -275,8 +275,11 @@ type SCTaskList struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Tp   int32       `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"`    // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统
-	List []*TaskData `protobuf:"bytes,2,rep,name=List,proto3" json:"List,omitempty"` // 任务列表
+	Tp      int32       `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"`           // 任务类型
+	List    []*TaskData `protobuf:"bytes,2,rep,name=List,proto3" json:"List,omitempty"`        // 任务列表
+	StartTs int64       `protobuf:"varint,3,opt,name=StartTs,proto3" json:"StartTs,omitempty"` // 开始时间
+	EndTs   int64       `protobuf:"varint,4,opt,name=EndTs,proto3" json:"EndTs,omitempty"`     // 结束时间
+	On      bool        `protobuf:"varint,5,opt,name=On,proto3" json:"On,omitempty"`           // 活动开关
 }
 
 func (x *SCTaskList) Reset() {
@@ -325,6 +328,27 @@ func (x *SCTaskList) GetList() []*TaskData {
 	return nil
 }
 
+func (x *SCTaskList) GetStartTs() int64 {
+	if x != nil {
+		return x.StartTs
+	}
+	return 0
+}
+
+func (x *SCTaskList) GetEndTs() int64 {
+	if x != nil {
+		return x.EndTs
+	}
+	return 0
+}
+
+func (x *SCTaskList) GetOn() bool {
+	if x != nil {
+		return x.On
+	}
+	return false
+}
+
 // 领取任务奖励
 // PACKET_CSTaskReward
 type CSTaskReward struct {
@@ -332,7 +356,7 @@ type CSTaskReward struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统 6:赛季通行证任务
+	Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型
 	Id int32 `protobuf:"varint,2,opt,name=Id,proto3" json:"Id,omitempty"` // 任务id; 0 表示一键领取
 }
 
@@ -461,7 +485,7 @@ type SCTaskChange struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Tp   int32       `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"`    // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统
+	Tp   int32       `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"`    // 任务类型
 	List []*TaskData `protobuf:"bytes,2,rep,name=List,proto3" json:"List,omitempty"` // 任务列表
 }
 
@@ -516,7 +540,7 @@ type CSTaskDebugInc struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Tp     int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"`         // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统
+	Tp     int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"`         // 任务类型
 	Id     int32 `protobuf:"varint,2,opt,name=Id,proto3" json:"Id,omitempty"`         // 任务id
 	AddNum int32 `protobuf:"varint,3,opt,name=AddNum,proto3" json:"AddNum,omitempty"` // 直接增加次数
 }
@@ -642,59 +666,63 @@ var file_protocol_task_task_proto_rawDesc = []byte{
 	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76,
 	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x1c, 0x0a, 0x0a, 0x43, 0x53, 0x54, 0x61,
 	0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x54, 0x70, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x02, 0x54, 0x70, 0x22, 0x40, 0x0a, 0x0a, 0x53, 0x43, 0x54, 0x61, 0x73, 0x6b,
-	0x4c, 0x69, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x54, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x02, 0x54, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x61,
-	0x74, 0x61, 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x2e, 0x0a, 0x0c, 0x43, 0x53, 0x54, 0x61,
-	0x73, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x54, 0x70, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x54, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x22, 0xcd, 0x01, 0x0a, 0x0c, 0x53, 0x43, 0x54,
-	0x61, 0x73, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x2a, 0x0a, 0x06, 0x4f, 0x70, 0x43,
+	0x28, 0x05, 0x52, 0x02, 0x54, 0x70, 0x22, 0x80, 0x01, 0x0a, 0x0a, 0x53, 0x43, 0x54, 0x61, 0x73,
+	0x6b, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x54, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x02, 0x54, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x44,
+	0x61, 0x74, 0x61, 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x74, 0x61,
+	0x72, 0x74, 0x54, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x53, 0x74, 0x61, 0x72,
+	0x74, 0x54, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x45, 0x6e, 0x64, 0x54, 0x73, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x05, 0x45, 0x6e, 0x64, 0x54, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x4f, 0x6e, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x02, 0x4f, 0x6e, 0x22, 0x2e, 0x0a, 0x0c, 0x43, 0x53, 0x54,
+	0x61, 0x73, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x54, 0x70, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x54, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x22, 0xcd, 0x01, 0x0a, 0x0c, 0x53, 0x43,
+	0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x2a, 0x0a, 0x06, 0x4f, 0x70,
+	0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x12, 0x2e, 0x74, 0x61, 0x73,
+	0x6b, 0x2e, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x06,
+	0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x54, 0x70, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x02, 0x54, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x36, 0x0a, 0x06, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64,
+	0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x53, 0x43,
+	0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72,
+	0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x39,
+	0x0a, 0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+	0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x42, 0x0a, 0x0c, 0x53, 0x43, 0x54,
+	0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x54, 0x70, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x54, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x4c, 0x69, 0x73,
+	0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x54,
+	0x61, 0x73, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x48, 0x0a,
+	0x0e, 0x43, 0x53, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x65, 0x62, 0x75, 0x67, 0x49, 0x6e, 0x63, 0x12,
+	0x0e, 0x0a, 0x02, 0x54, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x54, 0x70, 0x12,
+	0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12,
+	0x16, 0x0a, 0x06, 0x41, 0x64, 0x64, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x06, 0x41, 0x64, 0x64, 0x4e, 0x75, 0x6d, 0x22, 0x3c, 0x0a, 0x0e, 0x53, 0x43, 0x54, 0x61, 0x73,
+	0x6b, 0x44, 0x65, 0x62, 0x75, 0x67, 0x49, 0x6e, 0x63, 0x12, 0x2a, 0x0a, 0x06, 0x4f, 0x70, 0x43,
 	0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x12, 0x2e, 0x74, 0x61, 0x73, 0x6b,
 	0x2e, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x06, 0x4f,
-	0x70, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x54, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x02, 0x54, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x36, 0x0a, 0x06, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18,
-	0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x53, 0x43, 0x54,
-	0x61, 0x73, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x39, 0x0a,
-	0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
-	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
-	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x42, 0x0a, 0x0c, 0x53, 0x43, 0x54, 0x61,
-	0x73, 0x6b, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x54, 0x70, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x54, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74,
-	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x54, 0x61,
-	0x73, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x48, 0x0a, 0x0e,
-	0x43, 0x53, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x65, 0x62, 0x75, 0x67, 0x49, 0x6e, 0x63, 0x12, 0x0e,
-	0x0a, 0x02, 0x54, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x54, 0x70, 0x12, 0x0e,
-	0x0a, 0x02, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x16,
-	0x0a, 0x06, 0x41, 0x64, 0x64, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
-	0x41, 0x64, 0x64, 0x4e, 0x75, 0x6d, 0x22, 0x3c, 0x0a, 0x0e, 0x53, 0x43, 0x54, 0x61, 0x73, 0x6b,
-	0x44, 0x65, 0x62, 0x75, 0x67, 0x49, 0x6e, 0x63, 0x12, 0x2a, 0x0a, 0x06, 0x4f, 0x70, 0x43, 0x6f,
-	0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x12, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x2e,
-	0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x06, 0x4f, 0x70,
-	0x43, 0x6f, 0x64, 0x65, 0x2a, 0x30, 0x0a, 0x0c, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74,
-	0x43, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x0c, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x53, 0x75, 0x63,
-	0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x45,
-	0x72, 0x72, 0x6f, 0x72, 0x10, 0x01, 0x2a, 0xd2, 0x01, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x50,
-	0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x44, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x41, 0x43, 0x4b, 0x45,
-	0x54, 0x5f, 0x54, 0x61, 0x73, 0x6b, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x16, 0x0a,
-	0x11, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69,
-	0x73, 0x74, 0x10, 0xe0, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f,
-	0x53, 0x43, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x10, 0xe1, 0x12, 0x12, 0x18, 0x0a,
-	0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65,
-	0x77, 0x61, 0x72, 0x64, 0x10, 0xe2, 0x12, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45,
-	0x54, 0x5f, 0x53, 0x43, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe3,
-	0x12, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x54, 0x61,
-	0x73, 0x6b, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x10, 0xe4, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x50,
-	0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x44, 0x65, 0x62, 0x75, 0x67, 0x49, 0x6e, 0x63,
-	0x10, 0xe5, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43,
-	0x44, 0x65, 0x62, 0x75, 0x67, 0x49, 0x6e, 0x63, 0x10, 0xe6, 0x12, 0x42, 0x24, 0x5a, 0x22, 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, 0x74, 0x61, 0x73,
-	0x6b, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x70, 0x43, 0x6f, 0x64, 0x65, 0x2a, 0x30, 0x0a, 0x0c, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c,
+	0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x0c, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x53, 0x75,
+	0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50, 0x52, 0x43, 0x5f,
+	0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x01, 0x2a, 0xd2, 0x01, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b,
+	0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x44, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x41, 0x43, 0x4b,
+	0x45, 0x54, 0x5f, 0x54, 0x61, 0x73, 0x6b, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x16,
+	0x0a, 0x11, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x54, 0x61, 0x73, 0x6b, 0x4c,
+	0x69, 0x73, 0x74, 0x10, 0xe0, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
+	0x5f, 0x53, 0x43, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x10, 0xe1, 0x12, 0x12, 0x18,
+	0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x54, 0x61, 0x73, 0x6b, 0x52,
+	0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe2, 0x12, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b,
+	0x45, 0x54, 0x5f, 0x53, 0x43, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10,
+	0xe3, 0x12, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x54,
+	0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x10, 0xe4, 0x12, 0x12, 0x16, 0x0a, 0x11,
+	0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x44, 0x65, 0x62, 0x75, 0x67, 0x49, 0x6e,
+	0x63, 0x10, 0xe5, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53,
+	0x43, 0x44, 0x65, 0x62, 0x75, 0x67, 0x49, 0x6e, 0x63, 0x10, 0xe6, 0x12, 0x42, 0x24, 0x5a, 0x22,
+	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, 0x74, 0x61,
+	0x73, 0x6b, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

protocol/task/task.proto

@@ -33,18 +33,21 @@ message TaskData{
 // 任务列表
 // PACKET_CSTaskList
 message CSTaskList{
-	int32 Tp = 1; // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统
+	int32 Tp = 1; // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统 6:赛季通行证任务 8:年兽每日任务 9:年兽活动任务 10:累计消耗任务
 }
 // PACKET_SCTaskList
 message SCTaskList{
-		int32 Tp = 1; // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统
+		int32 Tp = 1; // 任务类型
     repeated TaskData List = 2; // 任务列表
+		int64 StartTs = 3; // 开始时间
+		int64 EndTs = 4; // 结束时间
+	  bool On = 5; // 活动开关
 }
 
 // 领取任务奖励
 // PACKET_CSTaskReward
 message CSTaskReward{
-		int32 Tp = 1; // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统 6:赛季通行证任务
+		int32 Tp = 1; // 任务类型
     int32 Id = 2; // 任务id; 0 表示一键领取
 }
 // PACKET_SCTaskReward
@@ -58,12 +61,12 @@ message SCTaskReward{
 // 任务变更通知
 // PACKET_SCTaskChange
 message SCTaskChange{
-	int32 Tp = 1; // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统
+	int32 Tp = 1; // 任务类型
 	repeated TaskData List = 2; // 任务列表
 }
 
 message CSTaskDebugInc{
-	int32 Tp = 1; // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统
+	int32 Tp = 1; // 任务类型
 	int32 Id = 2; // 任务id
 	int32 AddNum = 3; // 直接增加次数
 }

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/tienlen/tienlen.pb.go

@@ -208,7 +208,6 @@ type TienLenPlayerData struct {
 	PigBankCoin      int64           `protobuf:"varint,29,opt,name=PigBankCoin,proto3" json:"PigBankCoin,omitempty"`   //存钱罐金币
 	SkillInfo        []*PetSkillInfo `protobuf:"bytes,30,rep,name=SkillInfo,proto3" json:"SkillInfo,omitempty"`        //宠物技能信息
 	SkinId           int32           `protobuf:"varint,31,opt,name=SkinId,proto3" json:"SkinId,omitempty"`             //皮肤id
-	HeadUrl          string          `protobuf:"bytes,32,opt,name=HeadUrl,proto3" json:"HeadUrl,omitempty"`            // 头像地址
 }
 
 func (x *TienLenPlayerData) Reset() {
@@ -460,13 +459,6 @@ func (x *TienLenPlayerData) GetSkinId() int32 {
 	return 0
 }
 
-func (x *TienLenPlayerData) GetHeadUrl() string {
-	if x != nil {
-		return x.HeadUrl
-	}
-	return ""
-}
-
 //宠物技能
 type PetSkillInfo struct {
 	state         protoimpl.MessageState
@@ -664,13 +656,14 @@ type SCTienLenRoomInfo struct {
 	ItemRecExpireTime int64   `protobuf:"varint,32,opt,name=ItemRecExpireTime,proto3" json:"ItemRecExpireTime,omitempty"` //记牌器到期时间
 	TMInfoId          int32   `protobuf:"varint,33,opt,name=TMInfoId,proto3" json:"TMInfoId,omitempty"`                   //比赛配置ID
 	// 房卡场配置
-	RoomTypeId   int32       `protobuf:"varint,34,opt,name=RoomTypeId,proto3" json:"RoomTypeId,omitempty"`     //房间类型id
-	RoomConfigId int32       `protobuf:"varint,35,opt,name=RoomConfigId,proto3" json:"RoomConfigId,omitempty"` //房间配置id
-	NeedPassword int32       `protobuf:"varint,36,opt,name=NeedPassword,proto3" json:"NeedPassword,omitempty"` //是否需要密码 1需要
-	CostType     int32       `protobuf:"varint,37,opt,name=CostType,proto3" json:"CostType,omitempty"`         //房卡支付方式 1AA 2房主
-	Voice        int32       `protobuf:"varint,38,opt,name=Voice,proto3" json:"Voice,omitempty"`               //是否开启语音 1开启
-	Password     string      `protobuf:"bytes,39,opt,name=Password,proto3" json:"Password,omitempty"`          //房间密码
-	Cost         []*ItemInfo `protobuf:"bytes,40,rep,name=Cost,proto3" json:"Cost,omitempty"`                  //房费消耗
+	RoomTypeId   int32  `protobuf:"varint,34,opt,name=RoomTypeId,proto3" json:"RoomTypeId,omitempty"`     //房间类型id
+	RoomConfigId int32  `protobuf:"varint,35,opt,name=RoomConfigId,proto3" json:"RoomConfigId,omitempty"` //房间配置id
+	NeedPassword int32  `protobuf:"varint,36,opt,name=NeedPassword,proto3" json:"NeedPassword,omitempty"` //是否需要密码 1需要
+	CostType     int32  `protobuf:"varint,37,opt,name=CostType,proto3" json:"CostType,omitempty"`         //房卡支付方式 1AA 2房主
+	Voice        int32  `protobuf:"varint,38,opt,name=Voice,proto3" json:"Voice,omitempty"`               //是否开启语音 1开启
+	Password     string `protobuf:"bytes,39,opt,name=Password,proto3" json:"Password,omitempty"`          //房间密码
+	// 房卡场配置
+	IsSmallCard bool `protobuf:"varint,40,opt,name=IsSmallCard,proto3" json:"IsSmallCard,omitempty"` //必出最小牌
 }
 
 func (x *SCTienLenRoomInfo) Reset() {
@@ -957,11 +950,11 @@ func (x *SCTienLenRoomInfo) GetPassword() string {
 	return ""
 }
 
-func (x *SCTienLenRoomInfo) GetCost() []*ItemInfo {
+func (x *SCTienLenRoomInfo) GetIsSmallCard() bool {
 	if x != nil {
-		return x.Cost
+		return x.IsSmallCard
 	}
-	return nil
+	return false
 }
 
 //房间状态更新
@@ -1026,7 +1019,7 @@ type CSTienLenPlayerOp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	OpCode  int32   `protobuf:"varint,1,opt,name=OpCode,proto3" json:"OpCode,omitempty"` //1出牌 2过牌 3开始游戏 4调试发牌5,托管状态下出牌 6,取消托管状态 7,客户端提示出牌 8,继续游戏
+	OpCode  int32   `protobuf:"varint,1,opt,name=OpCode,proto3" json:"OpCode,omitempty"` //1出牌 2过牌 3开始游戏 4调试发牌
 	OpParam []int64 `protobuf:"varint,2,rep,packed,name=OpParam,proto3" json:"OpParam,omitempty"`
 }
 
@@ -1081,7 +1074,7 @@ type SCTienLenPlayerOp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	OpCode    int32        `protobuf:"varint,1,opt,name=OpCode,proto3" json:"OpCode,omitempty"`                                 //1出牌 2过牌 3开始游戏 ...
+	OpCode    int32        `protobuf:"varint,1,opt,name=OpCode,proto3" json:"OpCode,omitempty"`                                 //1出牌 2过牌 3开始游戏
 	OpParam   []int64      `protobuf:"varint,2,rep,packed,name=OpParam,proto3" json:"OpParam,omitempty"`                        //参数
 	SnId      int32        `protobuf:"varint,3,opt,name=SnId,proto3" json:"SnId,omitempty"`                                     //玩家位置
 	OpRetCode OpResultCode `protobuf:"varint,4,opt,name=OpRetCode,proto3,enum=tienlen.OpResultCode" json:"OpRetCode,omitempty"` //返回错误码,详见:enums.proto
@@ -2156,7 +2149,8 @@ type SCTienLenFirstOpPos struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Pos int32 `protobuf:"varint,1,opt,name=Pos,proto3" json:"Pos,omitempty"` //座位位置
+	Pos         int32 `protobuf:"varint,1,opt,name=Pos,proto3" json:"Pos,omitempty"`                 //座位位置
+	IsSmallCard bool  `protobuf:"varint,2,opt,name=IsSmallCard,proto3" json:"IsSmallCard,omitempty"` //必出最小牌
 }
 
 func (x *SCTienLenFirstOpPos) Reset() {
@@ -2198,6 +2192,13 @@ func (x *SCTienLenFirstOpPos) GetPos() int32 {
 	return 0
 }
 
+func (x *SCTienLenFirstOpPos) GetIsSmallCard() bool {
+	if x != nil {
+		return x.IsSmallCard
+	}
+	return false
+}
+
 //PACKET_SCTienLenThinkLongCnt
 type SCTienLenPlayerThinkLongCnt struct {
 	state         protoimpl.MessageState
@@ -2554,7 +2555,7 @@ var File_protocol_tienlen_tienlen_proto protoreflect.FileDescriptor
 var file_protocol_tienlen_tienlen_proto_rawDesc = []byte{
 	0x0a, 0x1e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x74, 0x69, 0x65, 0x6e, 0x6c,
 	0x65, 0x6e, 0x2f, 0x74, 0x69, 0x65, 0x6e, 0x6c, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x12, 0x07, 0x74, 0x69, 0x65, 0x6e, 0x6c, 0x65, 0x6e, 0x22, 0xb3, 0x07, 0x0a, 0x11, 0x54, 0x69,
+	0x12, 0x07, 0x74, 0x69, 0x65, 0x6e, 0x6c, 0x65, 0x6e, 0x22, 0x99, 0x07, 0x0a, 0x11, 0x54, 0x69,
 	0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x12,
 	0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e,
 	0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
@@ -2608,354 +2609,355 @@ var file_protocol_tienlen_tienlen_proto_rawDesc = []byte{
 	0x0b, 0x32, 0x15, 0x2e, 0x74, 0x69, 0x65, 0x6e, 0x6c, 0x65, 0x6e, 0x2e, 0x50, 0x65, 0x74, 0x53,
 	0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49,
 	0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x6b, 0x69, 0x6e, 0x49, 0x64, 0x18, 0x1f, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x06, 0x53, 0x6b, 0x69, 0x6e, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x48,
-	0x65, 0x61, 0x64, 0x55, 0x72, 0x6c, 0x18, 0x20, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x48, 0x65,
-	0x61, 0x64, 0x55, 0x72, 0x6c, 0x1a, 0x38, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e,
-	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
-	0x56, 0x0a, 0x0c, 0x50, 0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x12,
-	0x14, 0x0a, 0x05, 0x50, 0x65, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
-	0x50, 0x65, 0x74, 0x49, 0x64, 0x12, 0x30, 0x0a, 0x09, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61,
-	0x74, 0x61, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, 0x69, 0x65, 0x6e, 0x6c,
-	0x65, 0x6e, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x53, 0x6b,
-	0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x22, 0x45, 0x0a, 0x09, 0x53, 0x6b, 0x69, 0x6c, 0x6c,
-	0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x64, 0x18,
-	0x01, 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, 0x02, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0x23,
-	0x0a, 0x0b, 0x4c, 0x61, 0x73, 0x74, 0x44, 0x65, 0x6c, 0x43, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a,
-	0x05, 0x43, 0x61, 0x72, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x43, 0x61,
-	0x72, 0x64, 0x73, 0x22, 0xa4, 0x09, 0x0a, 0x11, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65,
-	0x6e, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x6f, 0x6f,
-	0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49,
-	0x64, 0x12, 0x18, 0x0a, 0x07, 0x43, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x07, 0x43, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x47,
-	0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x47, 0x61, 0x6d,
-	0x65, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x6f, 0x6f, 0x6d, 0x4d, 0x6f, 0x64, 0x65, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x52, 0x6f, 0x6f, 0x6d, 0x4d, 0x6f, 0x64, 0x65, 0x12,
-	0x16, 0x0a, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52,
-	0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x42, 0x61, 0x6e, 0x6b, 0x65,
-	0x72, 0x50, 0x6f, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x42, 0x61, 0x6e, 0x6b,
-	0x65, 0x72, 0x50, 0x6f, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x07,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x54,
-	0x69, 0x6d, 0x65, 0x4f, 0x75, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x54, 0x69,
-	0x6d, 0x65, 0x4f, 0x75, 0x74, 0x12, 0x34, 0x0a, 0x07, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73,
-	0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x74, 0x69, 0x65, 0x6e, 0x6c, 0x65, 0x6e,
-	0x2e, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61,
-	0x74, 0x61, 0x52, 0x07, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x41,
-	0x75, 0x64, 0x69, 0x65, 0x6e, 0x63, 0x65, 0x4e, 0x75, 0x6d, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x0b, 0x41, 0x75, 0x64, 0x69, 0x65, 0x6e, 0x63, 0x65, 0x4e, 0x75, 0x6d, 0x12, 0x1a, 0x0a,
-	0x08, 0x43, 0x75, 0x72, 0x4f, 0x70, 0x49, 0x64, 0x78, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x08, 0x43, 0x75, 0x72, 0x4f, 0x70, 0x49, 0x64, 0x78, 0x12, 0x38, 0x0a, 0x0c, 0x4c, 0x61, 0x73,
-	0x74, 0x44, 0x65, 0x6c, 0x43, 0x61, 0x72, 0x64, 0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x14, 0x2e, 0x74, 0x69, 0x65, 0x6e, 0x6c, 0x65, 0x6e, 0x2e, 0x4c, 0x61, 0x73, 0x74, 0x44, 0x65,
-	0x6c, 0x43, 0x61, 0x72, 0x64, 0x52, 0x0c, 0x4c, 0x61, 0x73, 0x74, 0x44, 0x65, 0x6c, 0x43, 0x61,
-	0x72, 0x64, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x4e, 0x75, 0x6d, 0x4f, 0x66, 0x47, 0x61, 0x6d, 0x65,
-	0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x4e, 0x75, 0x6d, 0x4f, 0x66, 0x47, 0x61,
-	0x6d, 0x65, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x4f, 0x66, 0x47, 0x61,
-	0x6d, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x54, 0x6f, 0x74, 0x61, 0x6c,
-	0x4f, 0x66, 0x47, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x4d, 0x61, 0x73, 0x74, 0x65,
-	0x72, 0x53, 0x6e, 0x69, 0x64, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x4d, 0x61, 0x73,
-	0x74, 0x65, 0x72, 0x53, 0x6e, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x42, 0x61, 0x73, 0x65, 0x53,
-	0x63, 0x6f, 0x72, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x42, 0x61, 0x73, 0x65,
-	0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x4d, 0x61, 0x78, 0x50, 0x6c, 0x61, 0x79,
-	0x65, 0x72, 0x4e, 0x75, 0x6d, 0x18, 0x12, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x4d, 0x61, 0x78,
-	0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x57, 0x69, 0x6e,
-	0x53, 0x6e, 0x69, 0x64, 0x73, 0x18, 0x13, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x57, 0x69, 0x6e,
-	0x53, 0x6e, 0x69, 0x64, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x49, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x18, 0x14, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x49, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12,
-	0x14, 0x0a, 0x05, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x16, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
-	0x52, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x43, 0x75, 0x72, 0x50, 0x6c, 0x61, 0x79,
-	0x65, 0x72, 0x4e, 0x75, 0x6d, 0x18, 0x18, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x43, 0x75, 0x72,
-	0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x65, 0x78,
-	0x74, 0x4e, 0x65, 0x65, 0x64, 0x18, 0x19, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x4e, 0x65, 0x78,
-	0x74, 0x4e, 0x65, 0x65, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x46, 0x69,
-	0x6e, 0x61, 0x6c, 0x73, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x61, 0x6e, 0x6b, 0x54,
-	0x79, 0x70, 0x65, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x52, 0x61, 0x6e, 0x6b, 0x54,
-	0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x41, 0x64, 0x64, 0x18,
-	0x1c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x41, 0x64, 0x64, 0x12,
-	0x1a, 0x0a, 0x08, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x49, 0x64, 0x18, 0x1d, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x08, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x4f,
-	0x75, 0x74, 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x1e, 0x20, 0x03,
-	0x28, 0x05, 0x52, 0x0d, 0x4f, 0x75, 0x74, 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x72,
-	0x64, 0x12, 0x20, 0x0a, 0x0b, 0x49, 0x73, 0x4f, 0x75, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64,
-	0x18, 0x1f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x49, 0x73, 0x4f, 0x75, 0x74, 0x52, 0x65, 0x63,
-	0x6f, 0x72, 0x64, 0x12, 0x2c, 0x0a, 0x11, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x63, 0x45, 0x78,
-	0x70, 0x69, 0x72, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x20, 0x20, 0x01, 0x28, 0x03, 0x52, 0x11,
-	0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x63, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x54, 0x69, 0x6d,
-	0x65, 0x12, 0x1a, 0x0a, 0x08, 0x54, 0x4d, 0x49, 0x6e, 0x66, 0x6f, 0x49, 0x64, 0x18, 0x21, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x08, 0x54, 0x4d, 0x49, 0x6e, 0x66, 0x6f, 0x49, 0x64, 0x12, 0x1e, 0x0a,
-	0x0a, 0x52, 0x6f, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x18, 0x22, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x0a, 0x52, 0x6f, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x12, 0x22, 0x0a,
-	0x0c, 0x52, 0x6f, 0x6f, 0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x64, 0x18, 0x23, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x0c, 0x52, 0x6f, 0x6f, 0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x49,
-	0x64, 0x12, 0x22, 0x0a, 0x0c, 0x4e, 0x65, 0x65, 0x64, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72,
-	0x64, 0x18, 0x24, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x4e, 0x65, 0x65, 0x64, 0x50, 0x61, 0x73,
-	0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x79, 0x70,
-	0x65, 0x18, 0x25, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x79, 0x70,
-	0x65, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x6f, 0x69, 0x63, 0x65, 0x18, 0x26, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x05, 0x56, 0x6f, 0x69, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x61, 0x73, 0x73, 0x77,
-	0x6f, 0x72, 0x64, 0x18, 0x27, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x61, 0x73, 0x73, 0x77,
-	0x6f, 0x72, 0x64, 0x12, 0x25, 0x0a, 0x04, 0x43, 0x6f, 0x73, 0x74, 0x18, 0x28, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x11, 0x2e, 0x74, 0x69, 0x65, 0x6e, 0x6c, 0x65, 0x6e, 0x2e, 0x49, 0x74, 0x65, 0x6d,
-	0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x43, 0x6f, 0x73, 0x74, 0x22, 0x42, 0x0a, 0x12, 0x53, 0x43,
-	0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x52, 0x6f, 0x6f, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65,
-	0x12, 0x14, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73,
-	0x18, 0x02, 0x20, 0x03, 0x28, 0x03, 0x52, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22, 0x45,
-	0x0a, 0x11, 0x43, 0x53, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65,
-	0x72, 0x4f, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x06, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x4f,
-	0x70, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x02, 0x20, 0x03, 0x28, 0x03, 0x52, 0x07, 0x4f, 0x70,
-	0x50, 0x61, 0x72, 0x61, 0x6d, 0x22, 0x8e, 0x01, 0x0a, 0x11, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e,
-	0x4c, 0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4f, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x4f,
-	0x70, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x4f, 0x70, 0x43,
-	0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x4f, 0x70, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x02,
-	0x20, 0x03, 0x28, 0x03, 0x52, 0x07, 0x4f, 0x70, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x12, 0x0a,
-	0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x49,
-	0x64, 0x12, 0x33, 0x0a, 0x09, 0x4f, 0x70, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x0e, 0x32, 0x15, 0x2e, 0x74, 0x69, 0x65, 0x6e, 0x6c, 0x65, 0x6e, 0x2e, 0x4f,
-	0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x09, 0x4f, 0x70, 0x52,
-	0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x22, 0x46, 0x0a, 0x14, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e,
-	0x4c, 0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x2e,
-	0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x74,
+	0x01, 0x28, 0x05, 0x52, 0x06, 0x53, 0x6b, 0x69, 0x6e, 0x49, 0x64, 0x1a, 0x38, 0x0a, 0x0a, 0x49,
+	0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x56, 0x0a, 0x0c, 0x50, 0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c,
+	0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x50, 0x65, 0x74, 0x49, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x50, 0x65, 0x74, 0x49, 0x64, 0x12, 0x30, 0x0a, 0x09, 0x53,
+	0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12,
+	0x2e, 0x74, 0x69, 0x65, 0x6e, 0x6c, 0x65, 0x6e, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e,
+	0x66, 0x6f, 0x52, 0x09, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x22, 0x45, 0x0a,
+	0x09, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x6b,
+	0x69, 0x6c, 0x6c, 0x49, 0x64, 0x18, 0x01, 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, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c,
+	0x65, 0x76, 0x65, 0x6c, 0x22, 0x23, 0x0a, 0x0b, 0x4c, 0x61, 0x73, 0x74, 0x44, 0x65, 0x6c, 0x43,
+	0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x43, 0x61, 0x72, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03,
+	0x28, 0x05, 0x52, 0x05, 0x43, 0x61, 0x72, 0x64, 0x73, 0x22, 0x9f, 0x09, 0x0a, 0x11, 0x53, 0x43,
+	0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12,
+	0x16, 0x0a, 0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x43, 0x72, 0x65, 0x61, 0x74,
+	0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x43, 0x72, 0x65, 0x61, 0x74, 0x6f,
+	0x72, 0x12, 0x16, 0x0a, 0x06, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x06, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x6f, 0x6f,
+	0x6d, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x52, 0x6f, 0x6f,
+	0x6d, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18,
+	0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x1c, 0x0a,
+	0x09, 0x42, 0x61, 0x6e, 0x6b, 0x65, 0x72, 0x50, 0x6f, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x09, 0x42, 0x61, 0x6e, 0x6b, 0x65, 0x72, 0x50, 0x6f, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x53,
+	0x74, 0x61, 0x74, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x53, 0x74, 0x61, 0x74,
+	0x65, 0x12, 0x18, 0x0a, 0x07, 0x54, 0x69, 0x6d, 0x65, 0x4f, 0x75, 0x74, 0x18, 0x08, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x07, 0x54, 0x69, 0x6d, 0x65, 0x4f, 0x75, 0x74, 0x12, 0x34, 0x0a, 0x07, 0x50,
+	0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x74,
 	0x69, 0x65, 0x6e, 0x6c, 0x65, 0x6e, 0x2e, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x6c,
-	0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22, 0x28,
-	0x0a, 0x14, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65,
-	0x72, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x50, 0x6f, 0x73, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x03, 0x50, 0x6f, 0x73, 0x22, 0x6f, 0x0a, 0x07, 0x41, 0x64, 0x64, 0x49,
-	0x74, 0x65, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x12,
-	0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x41, 0x64, 0x64, 0x69, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x41, 0x64, 0x64, 0x69, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x22, 0xb3, 0x02, 0x0a, 0x17, 0x54, 0x69,
-	0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x47, 0x61, 0x6d, 0x65, 0x42,
-	0x69, 0x6c, 0x6c, 0x65, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x43, 0x61, 0x72,
-	0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x43, 0x61, 0x72, 0x64, 0x73, 0x12,
-	0x18, 0x0a, 0x07, 0x57, 0x69, 0x6e, 0x43, 0x6f, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x07, 0x57, 0x69, 0x6e, 0x43, 0x6f, 0x69, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x47, 0x61, 0x6d,
-	0x65, 0x43, 0x6f, 0x69, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x47, 0x61, 0x6d,
-	0x65, 0x43, 0x6f, 0x69, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x73, 0x57, 0x69, 0x6e, 0x18, 0x05,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x49, 0x73, 0x57, 0x69, 0x6e, 0x12, 0x22, 0x0a, 0x0c, 0x57,
-	0x69, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x0c, 0x57, 0x69, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12,
-	0x1c, 0x0a, 0x09, 0x52, 0x61, 0x6e, 0x6b, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x07, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x09, 0x52, 0x61, 0x6e, 0x6b, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1a, 0x0a,
-	0x08, 0x41, 0x64, 0x64, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x08, 0x41, 0x64, 0x64, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x2c, 0x0a, 0x08, 0x41, 0x64, 0x64,
-	0x49, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x74, 0x69,
-	0x65, 0x6e, 0x6c, 0x65, 0x6e, 0x2e, 0x41, 0x64, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x08, 0x41,
-	0x64, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x54, 0x69, 0x61, 0x6e, 0x48,
-	0x75, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x54, 0x69, 0x61, 0x6e, 0x48, 0x75, 0x22,
-	0x4d, 0x0a, 0x13, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x47, 0x61, 0x6d, 0x65,
-	0x42, 0x69, 0x6c, 0x6c, 0x65, 0x64, 0x12, 0x36, 0x0a, 0x05, 0x44, 0x61, 0x74, 0x61, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x74, 0x69, 0x65, 0x6e, 0x6c, 0x65, 0x6e, 0x2e,
-	0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x47, 0x61, 0x6d,
-	0x65, 0x42, 0x69, 0x6c, 0x6c, 0x65, 0x64, 0x52, 0x05, 0x44, 0x61, 0x74, 0x61, 0x73, 0x22, 0xc4,
-	0x01, 0x0a, 0x18, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x53, 0x6d, 0x61, 0x6c,
-	0x6c, 0x47, 0x61, 0x6d, 0x65, 0x42, 0x69, 0x6c, 0x6c, 0x65, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x57,
-	0x69, 0x6e, 0x50, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x57, 0x69, 0x6e,
-	0x50, 0x6f, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x57, 0x69, 0x6e, 0x50, 0x6f, 0x73, 0x43, 0x6f, 0x69,
-	0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x57, 0x69, 0x6e, 0x50, 0x6f, 0x73, 0x43,
-	0x6f, 0x69, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x4c, 0x6f, 0x73, 0x65, 0x50, 0x6f, 0x73, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x4c, 0x6f, 0x73, 0x65, 0x50, 0x6f, 0x73, 0x12, 0x20, 0x0a,
-	0x0b, 0x4c, 0x6f, 0x73, 0x65, 0x50, 0x6f, 0x73, 0x43, 0x6f, 0x69, 0x6e, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x0b, 0x4c, 0x6f, 0x73, 0x65, 0x50, 0x6f, 0x73, 0x43, 0x6f, 0x69, 0x6e, 0x12,
-	0x18, 0x0a, 0x07, 0x57, 0x69, 0x6e, 0x43, 0x6f, 0x69, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x07, 0x57, 0x69, 0x6e, 0x43, 0x6f, 0x69, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x4c, 0x6f, 0x73,
-	0x65, 0x43, 0x6f, 0x69, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x4c, 0x6f, 0x73,
-	0x65, 0x43, 0x6f, 0x69, 0x6e, 0x22, 0x5b, 0x0a, 0x0d, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c,
-	0x65, 0x6e, 0x43, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x43, 0x61, 0x72, 0x64, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x43, 0x61, 0x72, 0x64, 0x73, 0x12, 0x20, 0x0a, 0x0b,
-	0x49, 0x73, 0x4f, 0x75, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x0b, 0x49, 0x73, 0x4f, 0x75, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x12,
+	0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72,
+	0x73, 0x12, 0x20, 0x0a, 0x0b, 0x41, 0x75, 0x64, 0x69, 0x65, 0x6e, 0x63, 0x65, 0x4e, 0x75, 0x6d,
+	0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x41, 0x75, 0x64, 0x69, 0x65, 0x6e, 0x63, 0x65,
+	0x4e, 0x75, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x75, 0x72, 0x4f, 0x70, 0x49, 0x64, 0x78, 0x18,
+	0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x43, 0x75, 0x72, 0x4f, 0x70, 0x49, 0x64, 0x78, 0x12,
+	0x38, 0x0a, 0x0c, 0x4c, 0x61, 0x73, 0x74, 0x44, 0x65, 0x6c, 0x43, 0x61, 0x72, 0x64, 0x73, 0x18,
+	0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x69, 0x65, 0x6e, 0x6c, 0x65, 0x6e, 0x2e,
+	0x4c, 0x61, 0x73, 0x74, 0x44, 0x65, 0x6c, 0x43, 0x61, 0x72, 0x64, 0x52, 0x0c, 0x4c, 0x61, 0x73,
+	0x74, 0x44, 0x65, 0x6c, 0x43, 0x61, 0x72, 0x64, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x4e, 0x75, 0x6d,
+	0x4f, 0x66, 0x47, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x4e,
+	0x75, 0x6d, 0x4f, 0x66, 0x47, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x54, 0x6f, 0x74,
+	0x61, 0x6c, 0x4f, 0x66, 0x47, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x0c, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x4f, 0x66, 0x47, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x1e, 0x0a,
+	0x0a, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x53, 0x6e, 0x69, 0x64, 0x18, 0x10, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x0a, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x53, 0x6e, 0x69, 0x64, 0x12, 0x1c, 0x0a,
+	0x09, 0x42, 0x61, 0x73, 0x65, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x09, 0x42, 0x61, 0x73, 0x65, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x4d,
+	0x61, 0x78, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x18, 0x12, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x0c, 0x4d, 0x61, 0x78, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x12,
+	0x1a, 0x0a, 0x08, 0x57, 0x69, 0x6e, 0x53, 0x6e, 0x69, 0x64, 0x73, 0x18, 0x13, 0x20, 0x03, 0x28,
+	0x05, 0x52, 0x08, 0x57, 0x69, 0x6e, 0x53, 0x6e, 0x69, 0x64, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x49,
+	0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x14, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x49, 0x73,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x16,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x43,
+	0x75, 0x72, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x18, 0x18, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x0c, 0x43, 0x75, 0x72, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x12,
+	0x1a, 0x0a, 0x08, 0x4e, 0x65, 0x78, 0x74, 0x4e, 0x65, 0x65, 0x64, 0x18, 0x19, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x08, 0x4e, 0x65, 0x78, 0x74, 0x4e, 0x65, 0x65, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x4d,
+	0x61, 0x74, 0x63, 0x68, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x73, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x0b, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x73, 0x12, 0x1a, 0x0a,
+	0x08, 0x52, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x08, 0x52, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x63, 0x65,
+	0x6e, 0x65, 0x41, 0x64, 0x64, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x53, 0x63, 0x65,
+	0x6e, 0x65, 0x41, 0x64, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x49,
+	0x64, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x49,
+	0x64, 0x12, 0x24, 0x0a, 0x0d, 0x4f, 0x75, 0x74, 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x6f,
+	0x72, 0x64, 0x18, 0x1e, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0d, 0x4f, 0x75, 0x74, 0x43, 0x61, 0x72,
+	0x64, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x49, 0x73, 0x4f, 0x75, 0x74,
+	0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x49, 0x73,
+	0x4f, 0x75, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x2c, 0x0a, 0x11, 0x49, 0x74, 0x65,
+	0x6d, 0x52, 0x65, 0x63, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x20,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x11, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x63, 0x45, 0x78, 0x70,
+	0x69, 0x72, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x54, 0x4d, 0x49, 0x6e, 0x66,
+	0x6f, 0x49, 0x64, 0x18, 0x21, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x54, 0x4d, 0x49, 0x6e, 0x66,
+	0x6f, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x52, 0x6f, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x49,
+	0x64, 0x18, 0x22, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x52, 0x6f, 0x6f, 0x6d, 0x54, 0x79, 0x70,
+	0x65, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x52, 0x6f, 0x6f, 0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x49, 0x64, 0x18, 0x23, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x52, 0x6f, 0x6f, 0x6d, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x4e, 0x65, 0x65, 0x64, 0x50,
+	0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x24, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x4e,
+	0x65, 0x65, 0x64, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x43,
+	0x6f, 0x73, 0x74, 0x54, 0x79, 0x70, 0x65, 0x18, 0x25, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x43,
+	0x6f, 0x73, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x6f, 0x69, 0x63, 0x65,
+	0x18, 0x26, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x56, 0x6f, 0x69, 0x63, 0x65, 0x12, 0x1a, 0x0a,
+	0x08, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x27, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x08, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x49, 0x73, 0x53,
+	0x6d, 0x61, 0x6c, 0x6c, 0x43, 0x61, 0x72, 0x64, 0x18, 0x28, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b,
+	0x49, 0x73, 0x53, 0x6d, 0x61, 0x6c, 0x6c, 0x43, 0x61, 0x72, 0x64, 0x22, 0x42, 0x0a, 0x12, 0x53,
+	0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x52, 0x6f, 0x6f, 0x6d, 0x53, 0x74, 0x61, 0x74,
+	0x65, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d,
+	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x03, 0x52, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22,
+	0x45, 0x0a, 0x11, 0x43, 0x53, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79,
+	0x65, 0x72, 0x4f, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07,
+	0x4f, 0x70, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x02, 0x20, 0x03, 0x28, 0x03, 0x52, 0x07, 0x4f,
+	0x70, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x22, 0x8e, 0x01, 0x0a, 0x11, 0x53, 0x43, 0x54, 0x69, 0x65,
+	0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4f, 0x70, 0x12, 0x16, 0x0a, 0x06,
+	0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x4f, 0x70,
+	0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x4f, 0x70, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x18,
+	0x02, 0x20, 0x03, 0x28, 0x03, 0x52, 0x07, 0x4f, 0x70, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x12,
 	0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e,
-	0x49, 0x64, 0x22, 0x88, 0x02, 0x0a, 0x11, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e,
-	0x43, 0x61, 0x72, 0x64, 0x54, 0x65, 0x73, 0x74, 0x12, 0x3e, 0x0a, 0x06, 0x47, 0x72, 0x61, 0x64,
-	0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x74, 0x69, 0x65, 0x6e, 0x6c,
-	0x65, 0x6e, 0x2e, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x43, 0x61, 0x72, 0x64,
-	0x54, 0x65, 0x73, 0x74, 0x2e, 0x47, 0x72, 0x61, 0x64, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x52, 0x06, 0x47, 0x72, 0x61, 0x64, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07,
-	0x54, 0x6f, 0x74, 0x61, 0x6c, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x54,
-	0x6f, 0x74, 0x61, 0x6c, 0x69, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x6f,
-	0x75, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x6f,
-	0x75, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x4c, 0x6f, 0x73, 0x65, 0x52, 0x61, 0x74, 0x65, 0x18, 0x05,
-	0x20, 0x01, 0x28, 0x01, 0x52, 0x08, 0x4c, 0x6f, 0x73, 0x65, 0x52, 0x61, 0x74, 0x65, 0x12, 0x12,
-	0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x44, 0x61,
-	0x74, 0x61, 0x1a, 0x39, 0x0a, 0x0b, 0x47, 0x72, 0x61, 0x64, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
-	0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x7f, 0x0a,
-	0x11, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x43, 0x75, 0x72, 0x4f, 0x70, 0x50,
-	0x6f, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x50, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x03, 0x50, 0x6f, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x73, 0x4e, 0x65, 0x77, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x05, 0x49, 0x73, 0x4e, 0x65, 0x77, 0x12, 0x14, 0x0a, 0x05, 0x43, 0x61,
-	0x72, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x43, 0x61, 0x72, 0x64, 0x73,
-	0x12, 0x18, 0x0a, 0x07, 0x45, 0x78, 0x44, 0x65, 0x6c, 0x61, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x07, 0x45, 0x78, 0x44, 0x65, 0x6c, 0x61, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6c,
-	0x61, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x22, 0x3b,
-	0x0a, 0x19, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x53, 0x6e, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x4d,
-	0x61, 0x73, 0x74, 0x65, 0x72, 0x53, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x0a, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x53, 0x6e, 0x69, 0x64, 0x22, 0x3e, 0x0a, 0x1a, 0x53,
-	0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x75,
-	0x64, 0x69, 0x65, 0x6e, 0x63, 0x65, 0x4e, 0x75, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x41, 0x75, 0x64,
-	0x69, 0x65, 0x6e, 0x63, 0x65, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b,
-	0x41, 0x75, 0x64, 0x69, 0x65, 0x6e, 0x63, 0x65, 0x4e, 0x75, 0x6d, 0x22, 0xcb, 0x07, 0x0a, 0x0f,
-	0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x41, 0x49, 0x44, 0x61, 0x74, 0x61, 0x12,
-	0x19, 0x0a, 0x08, 0x42, 0x6f, 0x6d, 0x62, 0x5f, 0x6e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x07, 0x42, 0x6f, 0x6d, 0x62, 0x4e, 0x75, 0x6d, 0x12, 0x2f, 0x0a, 0x14, 0x43, 0x61,
-	0x72, 0x64, 0x5f, 0x70, 0x6c, 0x61, 0x79, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x73,
-	0x65, 0x71, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x43, 0x61, 0x72, 0x64, 0x50, 0x6c,
-	0x61, 0x79, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0b, 0x4c,
-	0x61, 0x73, 0x74, 0x5f, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x30, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x09, 0x4c, 0x61, 0x73, 0x74, 0x4d, 0x6f, 0x76, 0x65, 0x30, 0x12, 0x1e, 0x0a, 0x0b, 0x4c,
-	0x61, 0x73, 0x74, 0x5f, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x31, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x09, 0x4c, 0x61, 0x73, 0x74, 0x4d, 0x6f, 0x76, 0x65, 0x31, 0x12, 0x1e, 0x0a, 0x0b, 0x4c,
-	0x61, 0x73, 0x74, 0x5f, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x32, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x09, 0x4c, 0x61, 0x73, 0x74, 0x4d, 0x6f, 0x76, 0x65, 0x32, 0x12, 0x1e, 0x0a, 0x0b, 0x4c,
-	0x61, 0x73, 0x74, 0x5f, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x33, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x09, 0x4c, 0x61, 0x73, 0x74, 0x4d, 0x6f, 0x76, 0x65, 0x33, 0x12, 0x27, 0x0a, 0x10, 0x4e,
-	0x75, 0x6d, 0x5f, 0x63, 0x61, 0x72, 0x64, 0x73, 0x5f, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x30, 0x18,
-	0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x4e, 0x75, 0x6d, 0x43, 0x61, 0x72, 0x64, 0x73, 0x4c,
-	0x65, 0x66, 0x74, 0x30, 0x12, 0x27, 0x0a, 0x10, 0x4e, 0x75, 0x6d, 0x5f, 0x63, 0x61, 0x72, 0x64,
-	0x73, 0x5f, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x31, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d,
-	0x4e, 0x75, 0x6d, 0x43, 0x61, 0x72, 0x64, 0x73, 0x4c, 0x65, 0x66, 0x74, 0x31, 0x12, 0x27, 0x0a,
-	0x10, 0x4e, 0x75, 0x6d, 0x5f, 0x63, 0x61, 0x72, 0x64, 0x73, 0x5f, 0x6c, 0x65, 0x66, 0x74, 0x5f,
-	0x32, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x4e, 0x75, 0x6d, 0x43, 0x61, 0x72, 0x64,
-	0x73, 0x4c, 0x65, 0x66, 0x74, 0x32, 0x12, 0x27, 0x0a, 0x10, 0x4e, 0x75, 0x6d, 0x5f, 0x63, 0x61,
-	0x72, 0x64, 0x73, 0x5f, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x33, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x0d, 0x4e, 0x75, 0x6d, 0x43, 0x61, 0x72, 0x64, 0x73, 0x4c, 0x65, 0x66, 0x74, 0x33, 0x12,
-	0x28, 0x0a, 0x10, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x5f, 0x68, 0x61, 0x6e, 0x64, 0x5f, 0x63, 0x61,
-	0x72, 0x64, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x4f, 0x74, 0x68, 0x65, 0x72,
-	0x48, 0x61, 0x6e, 0x64, 0x43, 0x61, 0x72, 0x64, 0x73, 0x12, 0x24, 0x0a, 0x0e, 0x50, 0x6c, 0x61,
-	0x79, 0x65, 0x64, 0x5f, 0x63, 0x61, 0x72, 0x64, 0x73, 0x5f, 0x30, 0x18, 0x0c, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0c, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x64, 0x43, 0x61, 0x72, 0x64, 0x73, 0x30, 0x12,
-	0x24, 0x0a, 0x0e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x64, 0x5f, 0x63, 0x61, 0x72, 0x64, 0x73, 0x5f,
-	0x31, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x64, 0x43,
-	0x61, 0x72, 0x64, 0x73, 0x31, 0x12, 0x24, 0x0a, 0x0e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x64, 0x5f,
-	0x63, 0x61, 0x72, 0x64, 0x73, 0x5f, 0x32, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x50,
-	0x6c, 0x61, 0x79, 0x65, 0x64, 0x43, 0x61, 0x72, 0x64, 0x73, 0x32, 0x12, 0x24, 0x0a, 0x0e, 0x50,
-	0x6c, 0x61, 0x79, 0x65, 0x64, 0x5f, 0x63, 0x61, 0x72, 0x64, 0x73, 0x5f, 0x33, 0x18, 0x0f, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0c, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x64, 0x43, 0x61, 0x72, 0x64, 0x73,
-	0x33, 0x12, 0x2a, 0x0a, 0x11, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x5f, 0x68, 0x61, 0x6e, 0x64,
-	0x5f, 0x63, 0x61, 0x72, 0x64, 0x73, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x50, 0x6c,
-	0x61, 0x79, 0x65, 0x72, 0x48, 0x61, 0x6e, 0x64, 0x43, 0x61, 0x72, 0x64, 0x73, 0x12, 0x27, 0x0a,
-	0x0f, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x5f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e,
-	0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x50, 0x6f,
-	0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a, 0x0d, 0x49, 0x73, 0x54, 0x69, 0x65, 0x6e,
-	0x4c, 0x65, 0x6e, 0x59, 0x75, 0x6c, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x49,
-	0x73, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x59, 0x75, 0x6c, 0x65, 0x12, 0x20, 0x0a, 0x0b,
-	0x49, 0x73, 0x46, 0x69, 0x72, 0x73, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x18, 0x13, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x0b, 0x49, 0x73, 0x46, 0x69, 0x72, 0x73, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x12, 0x20,
-	0x0a, 0x0c, 0x43, 0x61, 0x72, 0x64, 0x73, 0x5f, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x30, 0x18, 0x14,
-	0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x43, 0x61, 0x72, 0x64, 0x73, 0x4c, 0x65, 0x66, 0x74, 0x30,
-	0x12, 0x20, 0x0a, 0x0c, 0x43, 0x61, 0x72, 0x64, 0x73, 0x5f, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x31,
-	0x18, 0x15, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x43, 0x61, 0x72, 0x64, 0x73, 0x4c, 0x65, 0x66,
-	0x74, 0x31, 0x12, 0x20, 0x0a, 0x0c, 0x43, 0x61, 0x72, 0x64, 0x73, 0x5f, 0x6c, 0x65, 0x66, 0x74,
-	0x5f, 0x32, 0x18, 0x16, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x43, 0x61, 0x72, 0x64, 0x73, 0x4c,
-	0x65, 0x66, 0x74, 0x32, 0x12, 0x20, 0x0a, 0x0c, 0x43, 0x61, 0x72, 0x64, 0x73, 0x5f, 0x6c, 0x65,
-	0x66, 0x74, 0x5f, 0x33, 0x18, 0x17, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x43, 0x61, 0x72, 0x64,
-	0x73, 0x4c, 0x65, 0x66, 0x74, 0x33, 0x12, 0x19, 0x0a, 0x08, 0x4c, 0x61, 0x73, 0x74, 0x5f, 0x70,
-	0x6f, 0x73, 0x18, 0x18, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x4c, 0x61, 0x73, 0x74, 0x50, 0x6f,
-	0x73, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x73, 0x45, 0x6e, 0x64, 0x18, 0x19, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x05, 0x49, 0x73, 0x45, 0x6e, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x57, 0x69, 0x6e, 0x53, 0x6e,
-	0x69, 0x64, 0x73, 0x18, 0x1a, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x57, 0x69, 0x6e, 0x53, 0x6e,
-	0x69, 0x64, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x73, 0x57, 0x69, 0x6e, 0x18, 0x1b, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x05, 0x49, 0x73, 0x57, 0x69, 0x6e, 0x22, 0x27, 0x0a, 0x13, 0x53, 0x43, 0x54,
-	0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x46, 0x69, 0x72, 0x73, 0x74, 0x4f, 0x70, 0x50, 0x6f, 0x73,
-	0x12, 0x10, 0x0a, 0x03, 0x50, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x50,
-	0x6f, 0x73, 0x22, 0x41, 0x0a, 0x1b, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50,
-	0x6c, 0x61, 0x79, 0x65, 0x72, 0x54, 0x68, 0x69, 0x6e, 0x6b, 0x4c, 0x6f, 0x6e, 0x67, 0x43, 0x6e,
-	0x74, 0x12, 0x22, 0x0a, 0x0c, 0x54, 0x68, 0x69, 0x6e, 0x6b, 0x4c, 0x6f, 0x6e, 0x67, 0x43, 0x6e,
-	0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x54, 0x68, 0x69, 0x6e, 0x6b, 0x4c, 0x6f,
-	0x6e, 0x67, 0x43, 0x6e, 0x74, 0x22, 0x68, 0x0a, 0x20, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c,
-	0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x46, 0x69, 0x72, 0x73, 0x74, 0x47, 0x69, 0x76,
-	0x65, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65,
-	0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49,
-	0x64, 0x12, 0x2c, 0x0a, 0x11, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x63, 0x45, 0x78, 0x70, 0x69,
-	0x72, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x11, 0x49, 0x74,
-	0x65, 0x6d, 0x52, 0x65, 0x63, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22,
-	0x5e, 0x0a, 0x14, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x65, 0x74, 0x53,
-	0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x50,
-	0x6f, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x50, 0x6f, 0x73, 0x12, 0x20, 0x0a,
-	0x0b, 0x50, 0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x0b, 0x50, 0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x22,
-	0x2c, 0x0a, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x49,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x4e,
-	0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x22, 0xab, 0x01,
-	0x0a, 0x16, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x43, 0x79, 0x63, 0x6c, 0x65, 0x42, 0x69,
-	0x6c, 0x6c, 0x65, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a,
-	0x52, 0x6f, 0x75, 0x6e, 0x64, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x03,
-	0x52, 0x0a, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x14, 0x0a, 0x05,
-	0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x53, 0x63, 0x6f,
-	0x72, 0x65, 0x12, 0x27, 0x0a, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x11, 0x2e, 0x74, 0x69, 0x65, 0x6e, 0x6c, 0x65, 0x6e, 0x2e, 0x49, 0x74, 0x65, 0x6d,
-	0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x54,
-	0x6f, 0x74, 0x61, 0x6c, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x0a, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x4b, 0x0a, 0x14, 0x53,
-	0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x43, 0x79, 0x63, 0x6c, 0x65, 0x42, 0x69, 0x6c,
-	0x6c, 0x65, 0x64, 0x12, 0x33, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x1f, 0x2e, 0x74, 0x69, 0x65, 0x6e, 0x6c, 0x65, 0x6e, 0x2e, 0x54, 0x69, 0x65, 0x6e,
-	0x4c, 0x65, 0x6e, 0x43, 0x79, 0x63, 0x6c, 0x65, 0x42, 0x69, 0x6c, 0x6c, 0x65, 0x64, 0x49, 0x6e,
-	0x66, 0x6f, 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x2a, 0x3e, 0x0a, 0x0c, 0x4f, 0x70, 0x52, 0x65,
-	0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x4f, 0x50, 0x52, 0x43,
-	0x5f, 0x53, 0x75, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50, 0x52,
-	0x43, 0x5f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x4f, 0x50, 0x52,
-	0x43, 0x5f, 0x48, 0x69, 0x6e, 0x74, 0x10, 0x02, 0x2a, 0xa2, 0x05, 0x0a, 0x0f, 0x54, 0x69, 0x65,
-	0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x12,
-	0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x5a, 0x45,
-	0x52, 0x4f, 0x10, 0x00, 0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53,
-	0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x66, 0x6f,
-	0x10, 0xfa, 0x29, 0x12, 0x1e, 0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43,
-	0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x52, 0x6f, 0x6f, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65,
-	0x10, 0xfb, 0x29, 0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53,
-	0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4f, 0x70, 0x10,
-	0xfc, 0x29, 0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x54,
-	0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4f, 0x70, 0x10, 0xfd,
-	0x29, 0x12, 0x20, 0x0a, 0x1b, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x54, 0x69,
-	0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x65, 0x72,
-	0x10, 0xfe, 0x29, 0x12, 0x20, 0x0a, 0x1b, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43,
-	0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4c, 0x65, 0x61,
-	0x76, 0x65, 0x10, 0xff, 0x29, 0x12, 0x19, 0x0a, 0x14, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f,
-	0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x43, 0x61, 0x72, 0x64, 0x10, 0x80, 0x2a,
-	0x12, 0x1f, 0x0a, 0x1a, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x54, 0x69, 0x65,
-	0x6e, 0x4c, 0x65, 0x6e, 0x47, 0x61, 0x6d, 0x65, 0x42, 0x69, 0x6c, 0x6c, 0x65, 0x64, 0x10, 0x81,
-	0x2a, 0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x54, 0x69,
-	0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x43, 0x75, 0x72, 0x4f, 0x70, 0x50, 0x6f, 0x73, 0x10, 0x82, 0x2a,
-	0x12, 0x24, 0x0a, 0x1f, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x54, 0x69, 0x65,
-	0x6e, 0x4c, 0x65, 0x6e, 0x53, 0x6d, 0x61, 0x6c, 0x6c, 0x47, 0x61, 0x6d, 0x65, 0x42, 0x69, 0x6c,
-	0x6c, 0x65, 0x64, 0x10, 0x83, 0x2a, 0x12, 0x25, 0x0a, 0x20, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
-	0x5f, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x53, 0x6e, 0x69, 0x64, 0x10, 0x84, 0x2a, 0x12, 0x26, 0x0a,
-	0x21, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65,
-	0x6e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x75, 0x64, 0x69, 0x65, 0x6e, 0x63, 0x65, 0x4e,
-	0x75, 0x6d, 0x10, 0x85, 0x2a, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f,
-	0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x41, 0x49, 0x10, 0x86, 0x2a, 0x12, 0x1f,
-	0x0a, 0x1a, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c,
-	0x65, 0x6e, 0x46, 0x69, 0x72, 0x73, 0x74, 0x4f, 0x70, 0x50, 0x6f, 0x73, 0x10, 0x87, 0x2a, 0x12,
-	0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e,
-	0x4c, 0x65, 0x6e, 0x43, 0x61, 0x72, 0x64, 0x54, 0x65, 0x73, 0x74, 0x10, 0x88, 0x2a, 0x12, 0x21,
-	0x0a, 0x1c, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c,
-	0x65, 0x6e, 0x54, 0x68, 0x69, 0x6e, 0x6b, 0x4c, 0x6f, 0x6e, 0x67, 0x43, 0x6e, 0x74, 0x10, 0x89,
-	0x2a, 0x12, 0x26, 0x0a, 0x21, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x54, 0x69,
-	0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x46, 0x69, 0x72, 0x73, 0x74, 0x47, 0x69, 0x76, 0x65, 0x49, 0x74,
-	0x65, 0x6d, 0x49, 0x74, 0x65, 0x6d, 0x10, 0x8a, 0x2a, 0x12, 0x20, 0x0a, 0x1b, 0x50, 0x41, 0x43,
-	0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x65, 0x74,
-	0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x10, 0x8b, 0x2a, 0x12, 0x20, 0x0a, 0x1b, 0x50,
-	0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x43,
-	0x79, 0x63, 0x6c, 0x65, 0x42, 0x69, 0x6c, 0x6c, 0x65, 0x64, 0x10, 0x8c, 0x2a, 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, 0x74,
-	0x69, 0x65, 0x6e, 0x6c, 0x65, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x49, 0x64, 0x12, 0x33, 0x0a, 0x09, 0x4f, 0x70, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x15, 0x2e, 0x74, 0x69, 0x65, 0x6e, 0x6c, 0x65, 0x6e, 0x2e,
+	0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x09, 0x4f, 0x70,
+	0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x22, 0x46, 0x0a, 0x14, 0x53, 0x43, 0x54, 0x69, 0x65,
+	0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x12,
+	0x2e, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e,
+	0x74, 0x69, 0x65, 0x6e, 0x6c, 0x65, 0x6e, 0x2e, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50,
+	0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22,
+	0x28, 0x0a, 0x14, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79,
+	0x65, 0x72, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x50, 0x6f, 0x73, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x50, 0x6f, 0x73, 0x22, 0x6f, 0x0a, 0x07, 0x41, 0x64, 0x64,
+	0x49, 0x74, 0x65, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x54, 0x79, 0x70, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x54, 0x79, 0x70, 0x65,
+	0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x41, 0x64, 0x64, 0x69,
+	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x41, 0x64, 0x64, 0x69,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x22, 0xb3, 0x02, 0x0a, 0x17, 0x54,
+	0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x47, 0x61, 0x6d, 0x65,
+	0x42, 0x69, 0x6c, 0x6c, 0x65, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x43, 0x61,
+	0x72, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x43, 0x61, 0x72, 0x64, 0x73,
+	0x12, 0x18, 0x0a, 0x07, 0x57, 0x69, 0x6e, 0x43, 0x6f, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x07, 0x57, 0x69, 0x6e, 0x43, 0x6f, 0x69, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x47, 0x61,
+	0x6d, 0x65, 0x43, 0x6f, 0x69, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x47, 0x61,
+	0x6d, 0x65, 0x43, 0x6f, 0x69, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x73, 0x57, 0x69, 0x6e, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x49, 0x73, 0x57, 0x69, 0x6e, 0x12, 0x22, 0x0a, 0x0c,
+	0x57, 0x69, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x0c, 0x57, 0x69, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x53, 0x63, 0x6f, 0x72, 0x65,
+	0x12, 0x1c, 0x0a, 0x09, 0x52, 0x61, 0x6e, 0x6b, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x07, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x09, 0x52, 0x61, 0x6e, 0x6b, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1a,
+	0x0a, 0x08, 0x41, 0x64, 0x64, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x08, 0x41, 0x64, 0x64, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x2c, 0x0a, 0x08, 0x41, 0x64,
+	0x64, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x74,
+	0x69, 0x65, 0x6e, 0x6c, 0x65, 0x6e, 0x2e, 0x41, 0x64, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x08,
+	0x41, 0x64, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x54, 0x69, 0x61, 0x6e,
+	0x48, 0x75, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x54, 0x69, 0x61, 0x6e, 0x48, 0x75,
+	0x22, 0x4d, 0x0a, 0x13, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x47, 0x61, 0x6d,
+	0x65, 0x42, 0x69, 0x6c, 0x6c, 0x65, 0x64, 0x12, 0x36, 0x0a, 0x05, 0x44, 0x61, 0x74, 0x61, 0x73,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x74, 0x69, 0x65, 0x6e, 0x6c, 0x65, 0x6e,
+	0x2e, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x47, 0x61,
+	0x6d, 0x65, 0x42, 0x69, 0x6c, 0x6c, 0x65, 0x64, 0x52, 0x05, 0x44, 0x61, 0x74, 0x61, 0x73, 0x22,
+	0xc4, 0x01, 0x0a, 0x18, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x53, 0x6d, 0x61,
+	0x6c, 0x6c, 0x47, 0x61, 0x6d, 0x65, 0x42, 0x69, 0x6c, 0x6c, 0x65, 0x64, 0x12, 0x16, 0x0a, 0x06,
+	0x57, 0x69, 0x6e, 0x50, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x57, 0x69,
+	0x6e, 0x50, 0x6f, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x57, 0x69, 0x6e, 0x50, 0x6f, 0x73, 0x43, 0x6f,
+	0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x57, 0x69, 0x6e, 0x50, 0x6f, 0x73,
+	0x43, 0x6f, 0x69, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x4c, 0x6f, 0x73, 0x65, 0x50, 0x6f, 0x73, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x4c, 0x6f, 0x73, 0x65, 0x50, 0x6f, 0x73, 0x12, 0x20,
+	0x0a, 0x0b, 0x4c, 0x6f, 0x73, 0x65, 0x50, 0x6f, 0x73, 0x43, 0x6f, 0x69, 0x6e, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x0b, 0x4c, 0x6f, 0x73, 0x65, 0x50, 0x6f, 0x73, 0x43, 0x6f, 0x69, 0x6e,
+	0x12, 0x18, 0x0a, 0x07, 0x57, 0x69, 0x6e, 0x43, 0x6f, 0x69, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x07, 0x57, 0x69, 0x6e, 0x43, 0x6f, 0x69, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x4c, 0x6f,
+	0x73, 0x65, 0x43, 0x6f, 0x69, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x4c, 0x6f,
+	0x73, 0x65, 0x43, 0x6f, 0x69, 0x6e, 0x22, 0x5b, 0x0a, 0x0d, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e,
+	0x4c, 0x65, 0x6e, 0x43, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x43, 0x61, 0x72, 0x64, 0x73,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x43, 0x61, 0x72, 0x64, 0x73, 0x12, 0x20, 0x0a,
+	0x0b, 0x49, 0x73, 0x4f, 0x75, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x0b, 0x49, 0x73, 0x4f, 0x75, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12,
+	0x12, 0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53,
+	0x6e, 0x49, 0x64, 0x22, 0x88, 0x02, 0x0a, 0x11, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65,
+	0x6e, 0x43, 0x61, 0x72, 0x64, 0x54, 0x65, 0x73, 0x74, 0x12, 0x3e, 0x0a, 0x06, 0x47, 0x72, 0x61,
+	0x64, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x74, 0x69, 0x65, 0x6e,
+	0x6c, 0x65, 0x6e, 0x2e, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x43, 0x61, 0x72,
+	0x64, 0x54, 0x65, 0x73, 0x74, 0x2e, 0x47, 0x72, 0x61, 0x64, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72,
+	0x79, 0x52, 0x06, 0x47, 0x72, 0x61, 0x64, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x79, 0x70,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a,
+	0x07, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07,
+	0x54, 0x6f, 0x74, 0x61, 0x6c, 0x69, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x54, 0x6f, 0x74, 0x61, 0x6c,
+	0x6f, 0x75, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x54, 0x6f, 0x74, 0x61, 0x6c,
+	0x6f, 0x75, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x4c, 0x6f, 0x73, 0x65, 0x52, 0x61, 0x74, 0x65, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x01, 0x52, 0x08, 0x4c, 0x6f, 0x73, 0x65, 0x52, 0x61, 0x74, 0x65, 0x12,
+	0x12, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x44,
+	0x61, 0x74, 0x61, 0x1a, 0x39, 0x0a, 0x0b, 0x47, 0x72, 0x61, 0x64, 0x65, 0x73, 0x45, 0x6e, 0x74,
+	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x7f,
+	0x0a, 0x11, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x43, 0x75, 0x72, 0x4f, 0x70,
+	0x50, 0x6f, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x50, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x03, 0x50, 0x6f, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x73, 0x4e, 0x65, 0x77, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x49, 0x73, 0x4e, 0x65, 0x77, 0x12, 0x14, 0x0a, 0x05, 0x43,
+	0x61, 0x72, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x43, 0x61, 0x72, 0x64,
+	0x73, 0x12, 0x18, 0x0a, 0x07, 0x45, 0x78, 0x44, 0x65, 0x6c, 0x61, 0x79, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x07, 0x45, 0x78, 0x44, 0x65, 0x6c, 0x61, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x66,
+	0x6c, 0x61, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x22,
+	0x3b, 0x0a, 0x19, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x55, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x53, 0x6e, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a,
+	0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x53, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x0a, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x53, 0x6e, 0x69, 0x64, 0x22, 0x3e, 0x0a, 0x1a,
+	0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41,
+	0x75, 0x64, 0x69, 0x65, 0x6e, 0x63, 0x65, 0x4e, 0x75, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x41, 0x75,
+	0x64, 0x69, 0x65, 0x6e, 0x63, 0x65, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x0b, 0x41, 0x75, 0x64, 0x69, 0x65, 0x6e, 0x63, 0x65, 0x4e, 0x75, 0x6d, 0x22, 0xcb, 0x07, 0x0a,
+	0x0f, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x41, 0x49, 0x44, 0x61, 0x74, 0x61,
+	0x12, 0x19, 0x0a, 0x08, 0x42, 0x6f, 0x6d, 0x62, 0x5f, 0x6e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x07, 0x42, 0x6f, 0x6d, 0x62, 0x4e, 0x75, 0x6d, 0x12, 0x2f, 0x0a, 0x14, 0x43,
+	0x61, 0x72, 0x64, 0x5f, 0x70, 0x6c, 0x61, 0x79, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
+	0x73, 0x65, 0x71, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x43, 0x61, 0x72, 0x64, 0x50,
+	0x6c, 0x61, 0x79, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0b,
+	0x4c, 0x61, 0x73, 0x74, 0x5f, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x30, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x09, 0x4c, 0x61, 0x73, 0x74, 0x4d, 0x6f, 0x76, 0x65, 0x30, 0x12, 0x1e, 0x0a, 0x0b,
+	0x4c, 0x61, 0x73, 0x74, 0x5f, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x31, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x09, 0x4c, 0x61, 0x73, 0x74, 0x4d, 0x6f, 0x76, 0x65, 0x31, 0x12, 0x1e, 0x0a, 0x0b,
+	0x4c, 0x61, 0x73, 0x74, 0x5f, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x32, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x09, 0x4c, 0x61, 0x73, 0x74, 0x4d, 0x6f, 0x76, 0x65, 0x32, 0x12, 0x1e, 0x0a, 0x0b,
+	0x4c, 0x61, 0x73, 0x74, 0x5f, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x33, 0x18, 0x06, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x09, 0x4c, 0x61, 0x73, 0x74, 0x4d, 0x6f, 0x76, 0x65, 0x33, 0x12, 0x27, 0x0a, 0x10,
+	0x4e, 0x75, 0x6d, 0x5f, 0x63, 0x61, 0x72, 0x64, 0x73, 0x5f, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x30,
+	0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x4e, 0x75, 0x6d, 0x43, 0x61, 0x72, 0x64, 0x73,
+	0x4c, 0x65, 0x66, 0x74, 0x30, 0x12, 0x27, 0x0a, 0x10, 0x4e, 0x75, 0x6d, 0x5f, 0x63, 0x61, 0x72,
+	0x64, 0x73, 0x5f, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x31, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x0d, 0x4e, 0x75, 0x6d, 0x43, 0x61, 0x72, 0x64, 0x73, 0x4c, 0x65, 0x66, 0x74, 0x31, 0x12, 0x27,
+	0x0a, 0x10, 0x4e, 0x75, 0x6d, 0x5f, 0x63, 0x61, 0x72, 0x64, 0x73, 0x5f, 0x6c, 0x65, 0x66, 0x74,
+	0x5f, 0x32, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x4e, 0x75, 0x6d, 0x43, 0x61, 0x72,
+	0x64, 0x73, 0x4c, 0x65, 0x66, 0x74, 0x32, 0x12, 0x27, 0x0a, 0x10, 0x4e, 0x75, 0x6d, 0x5f, 0x63,
+	0x61, 0x72, 0x64, 0x73, 0x5f, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x33, 0x18, 0x0a, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x0d, 0x4e, 0x75, 0x6d, 0x43, 0x61, 0x72, 0x64, 0x73, 0x4c, 0x65, 0x66, 0x74, 0x33,
+	0x12, 0x28, 0x0a, 0x10, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x5f, 0x68, 0x61, 0x6e, 0x64, 0x5f, 0x63,
+	0x61, 0x72, 0x64, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x4f, 0x74, 0x68, 0x65,
+	0x72, 0x48, 0x61, 0x6e, 0x64, 0x43, 0x61, 0x72, 0x64, 0x73, 0x12, 0x24, 0x0a, 0x0e, 0x50, 0x6c,
+	0x61, 0x79, 0x65, 0x64, 0x5f, 0x63, 0x61, 0x72, 0x64, 0x73, 0x5f, 0x30, 0x18, 0x0c, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0c, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x64, 0x43, 0x61, 0x72, 0x64, 0x73, 0x30,
+	0x12, 0x24, 0x0a, 0x0e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x64, 0x5f, 0x63, 0x61, 0x72, 0x64, 0x73,
+	0x5f, 0x31, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x64,
+	0x43, 0x61, 0x72, 0x64, 0x73, 0x31, 0x12, 0x24, 0x0a, 0x0e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x64,
+	0x5f, 0x63, 0x61, 0x72, 0x64, 0x73, 0x5f, 0x32, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c,
+	0x50, 0x6c, 0x61, 0x79, 0x65, 0x64, 0x43, 0x61, 0x72, 0x64, 0x73, 0x32, 0x12, 0x24, 0x0a, 0x0e,
+	0x50, 0x6c, 0x61, 0x79, 0x65, 0x64, 0x5f, 0x63, 0x61, 0x72, 0x64, 0x73, 0x5f, 0x33, 0x18, 0x0f,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x64, 0x43, 0x61, 0x72, 0x64,
+	0x73, 0x33, 0x12, 0x2a, 0x0a, 0x11, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x5f, 0x68, 0x61, 0x6e,
+	0x64, 0x5f, 0x63, 0x61, 0x72, 0x64, 0x73, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x50,
+	0x6c, 0x61, 0x79, 0x65, 0x72, 0x48, 0x61, 0x6e, 0x64, 0x43, 0x61, 0x72, 0x64, 0x73, 0x12, 0x27,
+	0x0a, 0x0f, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x5f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f,
+	0x6e, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x50,
+	0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a, 0x0d, 0x49, 0x73, 0x54, 0x69, 0x65,
+	0x6e, 0x4c, 0x65, 0x6e, 0x59, 0x75, 0x6c, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d,
+	0x49, 0x73, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x59, 0x75, 0x6c, 0x65, 0x12, 0x20, 0x0a,
+	0x0b, 0x49, 0x73, 0x46, 0x69, 0x72, 0x73, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x18, 0x13, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x0b, 0x49, 0x73, 0x46, 0x69, 0x72, 0x73, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x12,
+	0x20, 0x0a, 0x0c, 0x43, 0x61, 0x72, 0x64, 0x73, 0x5f, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x30, 0x18,
+	0x14, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x43, 0x61, 0x72, 0x64, 0x73, 0x4c, 0x65, 0x66, 0x74,
+	0x30, 0x12, 0x20, 0x0a, 0x0c, 0x43, 0x61, 0x72, 0x64, 0x73, 0x5f, 0x6c, 0x65, 0x66, 0x74, 0x5f,
+	0x31, 0x18, 0x15, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x43, 0x61, 0x72, 0x64, 0x73, 0x4c, 0x65,
+	0x66, 0x74, 0x31, 0x12, 0x20, 0x0a, 0x0c, 0x43, 0x61, 0x72, 0x64, 0x73, 0x5f, 0x6c, 0x65, 0x66,
+	0x74, 0x5f, 0x32, 0x18, 0x16, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x43, 0x61, 0x72, 0x64, 0x73,
+	0x4c, 0x65, 0x66, 0x74, 0x32, 0x12, 0x20, 0x0a, 0x0c, 0x43, 0x61, 0x72, 0x64, 0x73, 0x5f, 0x6c,
+	0x65, 0x66, 0x74, 0x5f, 0x33, 0x18, 0x17, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x43, 0x61, 0x72,
+	0x64, 0x73, 0x4c, 0x65, 0x66, 0x74, 0x33, 0x12, 0x19, 0x0a, 0x08, 0x4c, 0x61, 0x73, 0x74, 0x5f,
+	0x70, 0x6f, 0x73, 0x18, 0x18, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x4c, 0x61, 0x73, 0x74, 0x50,
+	0x6f, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x73, 0x45, 0x6e, 0x64, 0x18, 0x19, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x05, 0x49, 0x73, 0x45, 0x6e, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x57, 0x69, 0x6e, 0x53,
+	0x6e, 0x69, 0x64, 0x73, 0x18, 0x1a, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x57, 0x69, 0x6e, 0x53,
+	0x6e, 0x69, 0x64, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x73, 0x57, 0x69, 0x6e, 0x18, 0x1b, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x05, 0x49, 0x73, 0x57, 0x69, 0x6e, 0x22, 0x49, 0x0a, 0x13, 0x53, 0x43,
+	0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x46, 0x69, 0x72, 0x73, 0x74, 0x4f, 0x70, 0x50, 0x6f,
+	0x73, 0x12, 0x10, 0x0a, 0x03, 0x50, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
+	0x50, 0x6f, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x49, 0x73, 0x53, 0x6d, 0x61, 0x6c, 0x6c, 0x43, 0x61,
+	0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x49, 0x73, 0x53, 0x6d, 0x61, 0x6c,
+	0x6c, 0x43, 0x61, 0x72, 0x64, 0x22, 0x41, 0x0a, 0x1b, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c,
+	0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x54, 0x68, 0x69, 0x6e, 0x6b, 0x4c, 0x6f, 0x6e,
+	0x67, 0x43, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x54, 0x68, 0x69, 0x6e, 0x6b, 0x4c, 0x6f, 0x6e,
+	0x67, 0x43, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x54, 0x68, 0x69, 0x6e,
+	0x6b, 0x4c, 0x6f, 0x6e, 0x67, 0x43, 0x6e, 0x74, 0x22, 0x68, 0x0a, 0x20, 0x53, 0x43, 0x54, 0x69,
+	0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x46, 0x69, 0x72, 0x73, 0x74,
+	0x47, 0x69, 0x76, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x16, 0x0a, 0x06,
+	0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74,
+	0x65, 0x6d, 0x49, 0x64, 0x12, 0x2c, 0x0a, 0x11, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x63, 0x45,
+	0x78, 0x70, 0x69, 0x72, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x11, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x63, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x54, 0x69,
+	0x6d, 0x65, 0x22, 0x5e, 0x0a, 0x14, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50,
+	0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x12, 0x10,
+	0x0a, 0x03, 0x50, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x50, 0x6f, 0x73,
+	0x12, 0x20, 0x0a, 0x0b, 0x50, 0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x50, 0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52,
+	0x65, 0x73, 0x22, 0x2c, 0x0a, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e,
+	0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x10,
+	0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x4e, 0x75, 0x6d,
+	0x22, 0xab, 0x01, 0x0a, 0x16, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x43, 0x79, 0x63, 0x6c,
+	0x65, 0x42, 0x69, 0x6c, 0x6c, 0x65, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x53,
+	0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x12,
+	0x1e, 0x0a, 0x0a, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x02, 0x20,
+	0x03, 0x28, 0x03, 0x52, 0x0a, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12,
+	0x14, 0x0a, 0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
+	0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x27, 0x0a, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x74, 0x69, 0x65, 0x6e, 0x6c, 0x65, 0x6e, 0x2e, 0x49,
+	0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1e,
+	0x0a, 0x0a, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x0a, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x4b,
+	0x0a, 0x14, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x43, 0x79, 0x63, 0x6c, 0x65,
+	0x42, 0x69, 0x6c, 0x6c, 0x65, 0x64, 0x12, 0x33, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x74, 0x69, 0x65, 0x6e, 0x6c, 0x65, 0x6e, 0x2e, 0x54,
+	0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x43, 0x79, 0x63, 0x6c, 0x65, 0x42, 0x69, 0x6c, 0x6c, 0x65,
+	0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x2a, 0x3e, 0x0a, 0x0c, 0x4f,
+	0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x4f,
+	0x50, 0x52, 0x43, 0x5f, 0x53, 0x75, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a,
+	0x4f, 0x50, 0x52, 0x43, 0x5f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09,
+	0x4f, 0x50, 0x52, 0x43, 0x5f, 0x48, 0x69, 0x6e, 0x74, 0x10, 0x02, 0x2a, 0xa2, 0x05, 0x0a, 0x0f,
+	0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x44, 0x12,
+	0x16, 0x0a, 0x12, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65,
+	0x6e, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45,
+	0x54, 0x5f, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x52, 0x6f, 0x6f, 0x6d, 0x49,
+	0x6e, 0x66, 0x6f, 0x10, 0xfa, 0x29, 0x12, 0x1e, 0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
+	0x5f, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x52, 0x6f, 0x6f, 0x6d, 0x53, 0x74,
+	0x61, 0x74, 0x65, 0x10, 0xfb, 0x29, 0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
+	0x5f, 0x43, 0x53, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72,
+	0x4f, 0x70, 0x10, 0xfc, 0x29, 0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f,
+	0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4f,
+	0x70, 0x10, 0xfd, 0x29, 0x12, 0x20, 0x0a, 0x1b, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53,
+	0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x45, 0x6e,
+	0x74, 0x65, 0x72, 0x10, 0xfe, 0x29, 0x12, 0x20, 0x0a, 0x1b, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
+	0x5f, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72,
+	0x4c, 0x65, 0x61, 0x76, 0x65, 0x10, 0xff, 0x29, 0x12, 0x19, 0x0a, 0x14, 0x50, 0x41, 0x43, 0x4b,
+	0x45, 0x54, 0x5f, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x43, 0x61, 0x72, 0x64,
+	0x10, 0x80, 0x2a, 0x12, 0x1f, 0x0a, 0x1a, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43,
+	0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x47, 0x61, 0x6d, 0x65, 0x42, 0x69, 0x6c, 0x6c, 0x65,
+	0x64, 0x10, 0x81, 0x2a, 0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53,
+	0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x43, 0x75, 0x72, 0x4f, 0x70, 0x50, 0x6f, 0x73,
+	0x10, 0x82, 0x2a, 0x12, 0x24, 0x0a, 0x1f, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43,
+	0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x53, 0x6d, 0x61, 0x6c, 0x6c, 0x47, 0x61, 0x6d, 0x65,
+	0x42, 0x69, 0x6c, 0x6c, 0x65, 0x64, 0x10, 0x83, 0x2a, 0x12, 0x25, 0x0a, 0x20, 0x50, 0x41, 0x43,
+	0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x55, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x53, 0x6e, 0x69, 0x64, 0x10, 0x84, 0x2a,
+	0x12, 0x26, 0x0a, 0x21, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x54, 0x69, 0x65,
+	0x6e, 0x4c, 0x65, 0x6e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x75, 0x64, 0x69, 0x65, 0x6e,
+	0x63, 0x65, 0x4e, 0x75, 0x6d, 0x10, 0x85, 0x2a, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x41, 0x43, 0x4b,
+	0x45, 0x54, 0x5f, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x41, 0x49, 0x10, 0x86,
+	0x2a, 0x12, 0x1f, 0x0a, 0x1a, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x54, 0x69,
+	0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x46, 0x69, 0x72, 0x73, 0x74, 0x4f, 0x70, 0x50, 0x6f, 0x73, 0x10,
+	0x87, 0x2a, 0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x54,
+	0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x43, 0x61, 0x72, 0x64, 0x54, 0x65, 0x73, 0x74, 0x10, 0x88,
+	0x2a, 0x12, 0x21, 0x0a, 0x1c, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x54, 0x69,
+	0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x54, 0x68, 0x69, 0x6e, 0x6b, 0x4c, 0x6f, 0x6e, 0x67, 0x43, 0x6e,
+	0x74, 0x10, 0x89, 0x2a, 0x12, 0x26, 0x0a, 0x21, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53,
+	0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e, 0x46, 0x69, 0x72, 0x73, 0x74, 0x47, 0x69, 0x76,
+	0x65, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x74, 0x65, 0x6d, 0x10, 0x8a, 0x2a, 0x12, 0x20, 0x0a, 0x1b,
+	0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c, 0x65, 0x6e,
+	0x50, 0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x10, 0x8b, 0x2a, 0x12, 0x20,
+	0x0a, 0x1b, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x54, 0x69, 0x65, 0x6e, 0x4c,
+	0x65, 0x6e, 0x43, 0x79, 0x63, 0x6c, 0x65, 0x42, 0x69, 0x6c, 0x6c, 0x65, 0x64, 0x10, 0x8c, 0x2a,
+	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, 0x74, 0x69, 0x65, 0x6e, 0x6c, 0x65, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
@@ -3011,19 +3013,18 @@ var file_protocol_tienlen_tienlen_proto_depIdxs = []int32{
 	4,  // 2: tienlen.PetSkillInfo.SkillData:type_name -> tienlen.SkillInfo
 	2,  // 3: tienlen.SCTienLenRoomInfo.Players:type_name -> tienlen.TienLenPlayerData
 	5,  // 4: tienlen.SCTienLenRoomInfo.LastDelCards:type_name -> tienlen.LastDelCard
-	26, // 5: tienlen.SCTienLenRoomInfo.Cost:type_name -> tienlen.ItemInfo
-	0,  // 6: tienlen.SCTienLenPlayerOp.OpRetCode:type_name -> tienlen.OpResultCode
-	2,  // 7: tienlen.SCTienLenPlayerEnter.Data:type_name -> tienlen.TienLenPlayerData
-	12, // 8: tienlen.TienLenPlayerGameBilled.AddItems:type_name -> tienlen.AddItem
-	13, // 9: tienlen.SCTienLenGameBilled.Datas:type_name -> tienlen.TienLenPlayerGameBilled
-	30, // 10: tienlen.SCTienLenCardTest.Grades:type_name -> tienlen.SCTienLenCardTest.GradesEntry
-	26, // 11: tienlen.TienLenCycleBilledInfo.Award:type_name -> tienlen.ItemInfo
-	27, // 12: tienlen.SCTienLenCycleBilled.List:type_name -> tienlen.TienLenCycleBilledInfo
-	13, // [13:13] is the sub-list for method output_type
-	13, // [13:13] is the sub-list for method input_type
-	13, // [13:13] is the sub-list for extension type_name
-	13, // [13:13] is the sub-list for extension extendee
-	0,  // [0:13] is the sub-list for field type_name
+	0,  // 5: tienlen.SCTienLenPlayerOp.OpRetCode:type_name -> tienlen.OpResultCode
+	2,  // 6: tienlen.SCTienLenPlayerEnter.Data:type_name -> tienlen.TienLenPlayerData
+	12, // 7: tienlen.TienLenPlayerGameBilled.AddItems:type_name -> tienlen.AddItem
+	13, // 8: tienlen.SCTienLenGameBilled.Datas:type_name -> tienlen.TienLenPlayerGameBilled
+	30, // 9: tienlen.SCTienLenCardTest.Grades:type_name -> tienlen.SCTienLenCardTest.GradesEntry
+	26, // 10: tienlen.TienLenCycleBilledInfo.Award:type_name -> tienlen.ItemInfo
+	27, // 11: tienlen.SCTienLenCycleBilled.List:type_name -> tienlen.TienLenCycleBilledInfo
+	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_protocol_tienlen_tienlen_proto_init() }

protocol/tienlen/tienlen.proto

@@ -67,7 +67,6 @@ message  TienLenPlayerData {
     int64 PigBankCoin = 29; //存钱罐金币
 	  repeated PetSkillInfo SkillInfo = 30;//宠物技能信息
     int32 SkinId = 31; //皮肤id
-    string HeadUrl = 32; // 头像地址
 }
 
 //宠物技能
@@ -126,8 +125,8 @@ message SCTienLenRoomInfo {
     int32 CostType = 37;               //房卡支付方式 1AA 2房主
     int32 Voice = 38;                  //是否开启语音 1开启
     string Password = 39;             //房间密码
-    repeated ItemInfo Cost = 40;           //房费消耗
     // 房卡场配置
+    bool IsSmallCard = 40; //必出最小牌
 }
 
 //房间状态更新
@@ -138,11 +137,11 @@ message SCTienLenRoomState {
 
 //玩家操作
 message CSTienLenPlayerOp {
-    int32 OpCode = 1;               //1出牌 2过牌 3开始游戏 4调试发牌5,托管状态下出牌 6,取消托管状态 7,客户端提示出牌 8,继续游戏
+    int32 OpCode = 1;               //1出牌 2过牌 3开始游戏 4调试发牌
     repeated int64 OpParam = 2;
 }
 message SCTienLenPlayerOp {
-    int32 OpCode = 1;                   //1出牌 2过牌 3开始游戏 ...
+    int32 OpCode = 1;                   //1出牌 2过牌 3开始游戏
     repeated int64 OpParam = 2;         //参数
     int32 SnId = 3;                      //玩家位置
     OpResultCode OpRetCode = 4;         //返回错误码,详见:enums.proto
@@ -259,6 +258,7 @@ message  SCTienLenAIData {
 //PACKET_SCTienLenFirstOpPos
 message SCTienLenFirstOpPos {
     int32 Pos = 1;//座位位置
+    bool IsSmallCard = 2; //必出最小牌
 }
 
 //PACKET_SCTienLenThinkLongCnt

protocol/webapi/common.proto

@@ -976,8 +976,6 @@ message RoomConfig {
   int32 Voice = 15; // 是否开启语音 1是 2否 3自定义
   string ImageURI = 16; // 奖励图片
   int64 Price = 17; // 奖品价值
-  repeated int32 BaseScore = 18; // 底分
-  repeated int64 LimitCoin = 19; // 进入限制
 }
 
 // etcd /game/room_config_system
@@ -1048,4 +1046,149 @@ message UserLottery{
   string Time = 4; // 抽奖时间 2006-01-02 15:04:05
   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; // 存钱罐属性
+}
+//etcd /game/activity_nian
+message ActivityNianConfig {
+  string Platform = 1; // 平台
+  repeated NianInfo List = 2;
+  int32 Switch = 3; // 活动开关 1.开启 2.关闭
+}
+
+message NianInfo{
+  string ActivityStart = 1; // 活动开始时间
+  string ActivityEnd = 2; // 活动结束时间
+  int64 BuffStartTime = 3; //Buff领取开始时间 18
+  int64 BuffEndTime = 4;	//Buff领取结束时间 21
+  repeated ItemInfo SignReward = 5; // 签到奖励
+  repeated ItemInfo BossDieReward = 6; // 击杀BOSS奖励
+  repeated NianDropInfo BossDieOtherReward = 7; // 击杀Boss额外奖励
+}
+message NianDropInfo{
+  int32 Id = 1;
+  int32 ItemId = 2;  // 物品ID
+  int64 ItemNum = 3; // 物品数量
+  int32 DropRate = 4;//掉落概率
+  int32 DropUp = 5;//掉落上限
+}
+//年兽排行榜奖励
+//etcd /game/activity_nian_rank
+message NianRankReward{
+	string Platform = 1; // 平台
+	repeated NianRankData RankData = 2;
+}
+message NianRankData{
+	int32 TypeId = 1; //1-幸运榜 2-伤害榜
+	repeated NianRankAwardInfo RankInfo = 2;
+}
+message NianRankAwardInfo{
+	int32 RankId =1;//排名
+	repeated ItemInfo Award = 2; //奖励
+}
+
+// etcd /game/act_redpacket
+message RedPacketConfig{
+  string Platform = 1; // 平台
+  repeated RedPacketInfo List = 2; // 活动列表
+  int32 PlayerLimit = 3; // 玩家最大领取红包次数 0无限制
+}
+
+message RedPacketInfo{
+  int64 Id = 1; // 配置id
+  int32 On = 2; // 开关 1开启 2关闭
+  int64 StartHMS = 3; // 开始时间,时*10000 + 分*100 + 秒
+  int64 EndHMS = 4; // 结束时间,时*10000 + 分*100 + 秒
+  int64 StayTs = 5; // 持续时长,单位秒
+  int64 MaxCount = 6; // 每人最大领取次数 0无限制
+  int64 LessCount = 7; // 保底红包个数
+  int32 ItemId = 8; // 奖励类型(道具id,100001金币 100002钻石)
+  int64 TotalNum = 9; // 总奖励数量
+  repeated RedInfo RedList = 10; // 红包奖励列表
+}
+
+message RedInfo{
+  int64 Num = 1; // 数量
+  int64 Rate = 2; // 概率，百分比
+}
+
+// etcd /game/act_consume
+message ConsumeConfig{
+  string Platform = 1; // 平台
+  int32 On = 2; // 活动开关 1.开启 2.关闭
+  string StartTime = 3; // 活动开始时间
+  string EndTime = 4; // 活动结束时间
+}
+
+// etcd /game/act_pushcoin
+message PushCoinConfig{
+  string Platform = 1; // 平台
+  int32 On = 2; // 活动开关 1.开启 2.关闭
+  string StartTime = 3; // 活动开始时间
+  string EndTime = 4; // 活动结束时间
+  PushCoinPool Pool1 = 5; // 奖池1
+  PushCoinPool Pool2 = 6; // 奖池2
+  PushCoinPool Pool3 = 7; // 奖池3
+}
+
+message PushCoinPoolElement{
+  int32 On = 1; // 开关 1开启 2关闭
+  int32 Tp = 2; // 类型 1实物
+  repeated ItemInfo Award = 3; // 奖励
+  int32 Weight = 4; // 概率，万分比
+  int64 Value = 5; // 价值(只有实物有用)
+}
+
+message PushCoinPool{
+  int32 On = 1; // 开关 1开启 2关闭
+  repeated PushCoinPoolElement Pool = 2; // 奖池
+  int64 UpperLimit = 3; // 奖池上限（达到上线发奖）
 }

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

@@ -84,6 +84,12 @@ enum SPacketID {
   PACKET_SCLotteryInfo = 2927; // 抽奖信息
   PACKET_NotifyLotteryAward = 2928; // 通知抽奖中奖
   PACKET_NotifyLotteryCode = 2929; // 通知获得抽奖号码
+
+  PACKET_CSRedPacketInfo = 2930; // 红包信息
+  PACKET_SCRedPacketInfo = 2931; // 红包信息
+
+  PACKET_CSRedPacketDraw = 2932; // 抽红包
+  PACKET_SCRedPacketDraw = 2933; // 抽红包
 }
 
 //救济金领取
@@ -336,6 +342,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 +364,9 @@ message SCPigbankGetInfo{
   OpResultCode OpRetCode = 1;    //结果
   int64 BankCoin = 2; // 当前已存金额
   int32 TakeTimes = 3;  // 领取次数
-  int64 CostDiamond = 4; // 耗费钻石
-  int64 BankMaxCoin = 5; // 存钱罐最储存值
-  int32 DayBuyMaxCnt = 6;       // 今日最大可购买次数
-  int64 Price = 7;			//消耗钻石原价
+  repeated PigBankCoinInfo infoArr = 4;
 }
 
-
 // 存钱罐领取金币
 //PACKET_CSPigbankTakeCoin
 message CSPigbankTakeCoin{
@@ -365,10 +378,7 @@ message SCPigbankTakeCoin{
   OpResultCode OpRetCode = 1;   // 结果
   int64 TakeCoinNum = 2;        // 领取金币数量
   int32 TakeTimes = 3;          // 领取次数
-  int64 CostDiamond = 4;        // 耗费钻石
-  int64 BankMaxCoin = 5;        // 存钱罐最储存值
-  int32 DayBuyMaxCnt = 6;       // 今日最大可购买次数
-  int64 Price = 7;			//消耗钻石原价
+  repeated PropInfo RewardItems = 4;
 }
 
 // 钻石存钱罐信息
@@ -376,17 +386,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; // 存钱罐最大储存值
-  int32 DayBuyMaxCnt = 5;       // 今日最大可购买次数
-  int64 Price = 6;	//原价
-  int64 NowPrice = 7;	//现价
-  int32 ShopId = 8;	//商城ID
+  repeated PigBankDiamondInfo  infoArr = 4; // 奖励道具
 }
 // 钻石存钱罐领取金币
 //PACKET_SCDiamondBankTakeDiamond
@@ -394,11 +411,7 @@ 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
+  //repeated PropInfo RewardItems = 4;
 }
 
 // 赛季通行证信息
@@ -549,4 +562,35 @@ message NotifyLotteryAward{
 //PACKET_NotifyLotteryCode
 message NotifyLotteryCode{
   repeated LotteryInfo Info = 1;
+}
+
+// 红包信息
+//PACKET_CSRedPacketInfo
+message CSRedPacketInfo{
+}
+//PACKET_SCRedPacketInfo
+message SCRedPacketInfo{
+  repeated RedPacketInfo Info = 1; // 红包信息
+}
+message RedPacketInfo{
+  int64 Id = 1; // id
+  int64 StartTs = 2; // 开始时间
+  int64 EndTs = 3; // 结束时间
+  int64 StayTs = 4; // 持续时长,单位秒;0代表不限制
+  int64 RemainCount = 5; // 剩余次数;-1代表不限制
+  bool IsJoin = 6; // 是否参与过
+  int32 RedType = 7; // 红包类型 1.金币 2.钻石
+}
+
+// 抽红包
+//PACKET_CSRedPacketDraw
+message CSRedPacketDraw{
+  int64 Id = 1; // 活动id RedPacketInfo.Id 0表示参与过当前的抽奖活动了
+}
+//PACKET_SCRedPacketDraw
+message SCRedPacketDraw{
+  OpResultCode OpRetCode = 1;  // 错误码
+  int64 Id = 2; // id
+  repeated PropInfo Award = 3; // 奖励
+  int64 RemainCount = 4; // 剩余次数;-1代表不限制
 }