update

data/DB_PetSkill.dat

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

data/DB_PetSkill.json

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

data/DB_PetSkillDes.dat

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

data/DB_PetSkillDes.json

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

data/DB_PigBank_Diamond.dat

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


 
+


 (Ђ­в0–
8Сэ@dH–
Pc
- (
+ ((Ђ­в0¬8Тэ@dH¬PЗ

-<18>ﾁﾗ/ 2
+яБЧ/ 2(Ђ­в0о8Уэ@dHоPу

data/DB_PigBank_Diamond.json

@@ -4,19 +4,37 @@
 			"Id": 1,
 			"BuyCountMin": 1,
 			"BuyCountMax": 1,
-			"CostDiamond": 30
+			"CostDiamond": 30,
+			"MaxGold": 10000000,
+			"MaxDiamond": 150,
+			"DiamondId": 98001,
+			"CoinPrice": 100,
+			"DiamondPrice": 150,
+			"DiamondNowPrice": 99
 		},
 		{
 			"Id": 2,
 			"BuyCountMin": 2,
 			"BuyCountMax": 2,
-			"CostDiamond": 40
+			"CostDiamond": 40,
+			"MaxGold": 10000000,
+			"MaxDiamond": 300,
+			"DiamondId": 98002,
+			"CoinPrice": 100,
+			"DiamondPrice": 300,
+			"DiamondNowPrice": 199
 		},
 		{
 			"Id": 3,
 			"BuyCountMin": 3,
 			"BuyCountMax": 99999999,
-			"CostDiamond": 50
+			"CostDiamond": 50,
+			"MaxGold": 10000000,
+			"MaxDiamond": 750,
+			"DiamondId": 98003,
+			"CoinPrice": 100,
+			"DiamondPrice": 750,
+			"DiamondNowPrice": 499
 		}
 	]
 }

data/DB_Pigbank_Prop.dat

@@ -1,6 +1,8 @@
 
-
BankMaxCoin€­â
+
WinCoinRate
-WinCoinRate
+LoseCoinRate
-LoseCoinRate
 
-DayBuyMaxCnt
+DayBuyMaxCnt
+WinCoinRateDiamond
+LoseCoinRateDiamond
+DayBuyMaxCntDiamond

data/DB_Pigbank_Prop.json

@@ -2,23 +2,31 @@
 	"Arr": [
 		{
 			"Id": 1,
-			"PorpName": "BankMaxCoin",
-			"PropValue": 10000000
-		},
-		{
-			"Id": 2,
 			"PorpName": "WinCoinRate",
 			"PropValue": 5
 		},
 		{
-			"Id": 3,
+			"Id": 2,
 			"PorpName": "LoseCoinRate",
 			"PropValue": 10
 		},
 		{
-			"Id": 4,
+			"Id": 3,
 			"PorpName": "DayBuyMaxCnt",
 			"PropValue": 3
+		},
+		{
+			"Id": 4,
+			"PorpName": "WinCoinRateDiamond"
+		},
+		{
+			"Id": 5,
+			"PorpName": "LoseCoinRateDiamond"
+		},
+		{
+			"Id": 6,
+			"PorpName": "DayBuyMaxCntDiamond",
+			"PropValue": 3
 		}
 	]
 }

data/DB_VIP.json

@@ -52,7 +52,8 @@
 			],
 			"RewardOutlineID": [
 				2
-			]
+			],
+			"MatchFreeTimes": 1
 		},
 		{
 			"Id": 2,
@@ -81,7 +82,8 @@
 			],
 			"RewardOutlineID": [
 				2
-			]
+			],
+			"MatchFreeTimes": 2
 		},
 		{
 			"Id": 3,
@@ -110,7 +112,8 @@
 			],
 			"RewardOutlineID": [
 				3
-			]
+			],
+			"MatchFreeTimes": 3
 		},
 		{
 			"Id": 4,
@@ -139,7 +142,8 @@
 			],
 			"RewardOutlineID": [
 				3
-			]
+			],
+			"MatchFreeTimes": 4
 		},
 		{
 			"Id": 5,
@@ -168,7 +172,8 @@
 			],
 			"RewardOutlineID": [
 				4
-			]
+			],
+			"MatchFreeTimes": 5
 		},
 		{
 			"Id": 6,
@@ -197,7 +202,8 @@
 			],
 			"RewardOutlineID": [
 				4
-			]
+			],
+			"MatchFreeTimes": 6
 		},
 		{
 			"Id": 7,
@@ -226,7 +232,8 @@
 			],
 			"RewardOutlineID": [
 				3
-			]
+			],
+			"MatchFreeTimes": 7
 		},
 		{
 			"Id": 8,
@@ -255,7 +262,8 @@
 			],
 			"RewardOutlineID": [
 				3
-			]
+			],
+			"MatchFreeTimes": 8
 		},
 		{
 			"Id": 9,
@@ -284,7 +292,8 @@
 			],
 			"RewardOutlineID": [
 				4
-			]
+			],
+			"MatchFreeTimes": 9
 		},
 		{
 			"Id": 10,
@@ -313,7 +322,8 @@
 			],
 			"RewardOutlineID": [
 				4
-			]
+			],
+			"MatchFreeTimes": 10
 		},
 		{
 			"Id": 11,
@@ -342,7 +352,8 @@
 			],
 			"RewardOutlineID": [
 				0
-			]
+			],
+			"MatchFreeTimes": 11
 		},
 		{
 			"Id": 12,
@@ -371,7 +382,8 @@
 			],
 			"RewardOutlineID": [
 				0
-			]
+			],
+			"MatchFreeTimes": 12
 		},
 		{
 			"Id": 13,
@@ -400,7 +412,8 @@
 			],
 			"RewardOutlineID": [
 				0
-			]
+			],
+			"MatchFreeTimes": 13
 		},
 		{
 			"Id": 14,
@@ -429,7 +442,8 @@
 			],
 			"RewardOutlineID": [
 				0
-			]
+			],
+			"MatchFreeTimes": 14
 		},
 		{
 			"Id": 15,
@@ -458,7 +472,8 @@
 			],
 			"RewardOutlineID": [
 				0
-			]
+			],
+			"MatchFreeTimes": 15
 		},
 		{
 			"Id": 16,
@@ -487,7 +502,8 @@
 			],
 			"RewardOutlineID": [
 				0
-			]
+			],
+			"MatchFreeTimes": 16
 		},
 		{}
 	]

protocol/server/pbdata.proto

@@ -1237,6 +1237,48 @@ message DB_NewPlayerArray {
     repeated DB_NewPlayer Arr = 1;
 }
 
+message DB_PetSkill {
+
+	int32 Id = 1;
+
+	int32 PetId = 2;
+
+	string SkillName = 3;
+
+	string SKillDes = 4;
+
+	int32 SKillLevel = 5;
+
+	int32 SKillUnlockType = 6;
+
+	string SKillUnlockTakes = 7;
+
+}
+
+message DB_PetSkillArray {
+    repeated DB_PetSkill Arr = 1;
+}
+
+message DB_PetSkillDes {
+
+	int32 Id = 1;
+
+	int32 SkillId = 2;
+
+	int32 SkillLevel = 3;
+
+	string SKillValue = 4;
+
+	int32 Fragment = 5;
+
+	int32 Amount = 6;
+
+}
+
+message DB_PetSkillDesArray {
+    repeated DB_PetSkillDes Arr = 1;
+}
+
 message DB_PhoneLottery {
 
 	int32 Id = 1;
@@ -1279,6 +1321,18 @@ message DB_PigBank_Diamond {
 
 	int32 CostDiamond = 4;
 
+	int32 MaxGold = 5;
+
+	int32 MaxDiamond = 6;
+
+	int32 DiamondId = 7;
+
+	int32 CoinPrice = 8;
+
+	int32 DiamondPrice = 9;
+
+	int32 DiamondNowPrice = 10;
+
 }
 
 message DB_PigBank_DiamondArray {

protocol/webapi/common.proto

@@ -496,11 +496,20 @@ message AddUpWelfareDate {
   int32 AddUpDay = 1;                               // 累计几天
   repeated WelfareDate AddUpDate = 2;               // 累计奖励
 }
+message AddUpDate2TypeData {
+  int32 Day = 1;
+  int32 Id = 2;
+  int32 Num = 3;
+}
+
 
 message Welfare7SignDate {
   int32 Day = 1;                               // 第几天
   repeated WelfareDate Date = 2;               // 奖励
   repeated AddUpWelfareDate AddUpDate = 3;     // 累计奖励
+  repeated AddUpWelfareDate AddUpDate2 = 4; //进阶奖励
+  repeated AddUpWelfareDate AddUpDate2Google = 5; //谷歌渠道进阶奖励
+  repeated AddUpDate2TypeData AddUpDate2Type = 6; //进阶奖励领取条件
 }
 
 

protocol/welfare/welfare.proto

@@ -40,6 +40,8 @@ enum SPacketID {
   PACKET_SC_WELF_CONTINPAYINFO = 2597;//连续充值信息
   PACKET_CS_WELF_CONTINPAY = 2598;//领取(购买)连续充值 后期走充值回调
   PACKET_SC_WELF_CONTINPAY = 2599;//领取连续充值
+  PACKET_CS_SignDay_Addup2Award = 2600;//领取七日签到进阶奖励
+  PACKET_SC_SignDay_Addup2Award = 2601;//返回七日签到进阶奖励
 
   // 2900~2999
   PACKET_CSWelfRelief = 2900;//救济金信息
@@ -54,6 +56,12 @@ enum SPacketID {
   PACKET_SCPigbankGetInfo = 2911;// 存钱罐信息获取
   PACKET_CSPigbankTakeCoin = 2912;// 存钱罐领取金币
   PACKET_SCPigbankTakeCoin = 2913;// 存钱罐领取金币
+  
+  PACKET_CSDiamondBankGetInfo = 2914;	//钻石存钱罐信息获取
+  PACKET_SCDiamondBankGetInfo = 2915;	//钻石存钱罐信息返回
+  PACKET_SCDiamondBankTakeDiamond = 2916;	//钻石存钱罐领取返回
+  
+  
 }
 
 //救济金领取
@@ -76,6 +84,11 @@ message WelfareDate {
   int32 Item_Id = 4;             // 道具id
 }
 
+message AddUp2TypeDate{
+	int32 Day = 1;
+	int32 Id = 2;	// 1，代表观看视频 2，代表钻石类型
+	int32 Num = 3;	//完成次数
+}
 
 //转动转盘
 //PACKET_CS_WELF_GETTURNPLATE
@@ -95,6 +108,8 @@ message SCGetTurnplate{
 message AddUpWelfareDate {
   int32 AddUpDay = 1;                               // 累计几天
   repeated WelfareDate AddUpDate = 2;               // 累计奖励
+  repeated WelfareDate AddUp2Date =3;				//进阶奖励
+  repeated AddUp2TypeDate AddUp2Type = 4;			//进阶奖励领取条件
 }
 
 //累计签到
@@ -124,6 +139,12 @@ message Welfare7SignDate {
   int32 Day = 1;                               // 第几天
   repeated WelfareDate Date = 2;               // 奖励
   repeated AddUpWelfareDate AddUpDate = 3;     // 累计奖励
+  
+}
+message Addup2Data{
+	int32 Day = 1;	//天数
+	int32 Num = 2;	//任务次数
+	int64 EndTime = 3;//结束时间戳 -1代表已领取
 }
 
 //PACKET_SC_WELF_WELFAREINFO
@@ -135,6 +156,19 @@ message SCWelfaredInfo{
   repeated int32    AddUpSignDay = 5;     // 已领取累计奖励天数
   repeated int32    TurnplateIdx = 6;     // 已领取转盘奖励下标0开始
   int32    Switch = 7;     // 1.开启 2.关闭
+  repeated Addup2Data Addup2 = 8;	//七日签到进阶奖励数据
+}
+
+//领取7日签到累计进阶奖励
+//PACKET_CS_SignDay_Addup2Award
+message CSSignDayAddup2Award{
+	int32 Day = 1;
+}
+//PACKET_SC_SignDay_Addup2Award
+message SCSignDayAddup2Award{
+	int32 Day = 1;	//天数
+	int32 Num = 2;	//任务次数
+	int64 EndTime = 3;//结束时间戳 -1代表已领取
 }
 
 message BlindBoxData {
@@ -293,6 +327,7 @@ message SCPigbankGetInfo{
   int64 CostDiamond = 4; // 耗费钻石
   int64 BankMaxCoin = 5; // 存钱罐最储存值
   int32 DayBuyMaxCnt = 6;       // 今日最大可购买次数
+  int64 Price = 7;			//消耗钻石原价
 }
 
 
@@ -310,5 +345,35 @@ message SCPigbankTakeCoin{
   int64 CostDiamond = 4;        // 耗费钻石
   int64 BankMaxCoin = 5;        // 存钱罐最储存值
   int32 DayBuyMaxCnt = 6;       // 今日最大可购买次数
+  int64 Price = 7;			//消耗钻石原价
+}
 
+// 钻石存钱罐信息
+//PACKET_CSDiamondBankGetInfo
+message CSDiamondBankGetInfo{
+}
+
+// 钻石存钱罐信息
+//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
+}
+// 钻石存钱罐领取金币
+//PACKET_SCDiamondBankTakeDiamond
+message SCDiamondBankTakeDiamond{
+  OpResultCode OpRetCode = 1;   // 结果
+  double TakeDiamondNum = 2;        // 领取钻石数量
+  int32 TakeTimes = 3;          // 领取次数
+  int64 BankMaxDiamond = 4;        // 存钱罐最大储存值
+  int32 DayBuyMaxCnt = 5;       // 今日最大可购买次数
+  int64 Price = 6;	//原价
+  int64 NowPrice = 7;	//现价
+  int32 ShopId = 8;	//商城ID
 }