update

data/DB_CollectBox.dat

@@ -0,0 +1,16 @@
+
+

ъ
У†

+
ъ
Ф†

+
ъ
Х†

+
ъ
Ц†

+
ъ
Ч†

+
И
Ш†

+
И
Щ†

+
И
Ъ†

+
	И
Ы†

+
+
+Ь†

+
2ЎЌђN
+¬ЎЌР†
+
2ЎЌ Ќ

data/DB_CollectBox.json

@@ -0,0 +1,95 @@
+{
+	"Arr": [
+		{
+			"Id": 1,
+			"Rate": 250,
+			"ItemID": {
+				"50003": 1
+			}
+		},
+		{
+			"Id": 2,
+			"Rate": 250,
+			"ItemID": {
+				"50004": 1
+			}
+		},
+		{
+			"Id": 3,
+			"Rate": 250,
+			"ItemID": {
+				"50005": 1
+			}
+		},
+		{
+			"Id": 4,
+			"Rate": 250,
+			"ItemID": {
+				"50006": 1
+			}
+		},
+		{
+			"Id": 5,
+			"Rate": 250,
+			"ItemID": {
+				"50007": 1
+			}
+		},
+		{
+			"Id": 6,
+			"Rate": 200,
+			"ItemID": {
+				"50008": 1
+			}
+		},
+		{
+			"Id": 7,
+			"Rate": 200,
+			"ItemID": {
+				"50009": 1
+			}
+		},
+		{
+			"Id": 8,
+			"Rate": 200,
+			"ItemID": {
+				"50010": 1
+			}
+		},
+		{
+			"Id": 9,
+			"Rate": 200,
+			"ItemID": {
+				"50011": 1
+			}
+		},
+		{
+			"Id": 10,
+			"Rate": 10,
+			"ItemID": {
+				"50012": 1
+			}
+		},
+		{
+			"Id": 11,
+			"Rate": 50,
+			"ItemID": {
+				"100001": 10000
+			}
+		},
+		{
+			"Id": 12,
+			"Rate": 300,
+			"ItemID": {
+				"100001": 50000
+			}
+		},
+		{
+			"Id": 13,
+			"Rate": 50,
+			"ItemID": {
+				"100001": 100000
+			}
+		}
+	]
+}

data/DB_CollectBoxGain.dat

@@ -0,0 +1,29 @@
+
+¡Ú“

+¢Ú“

+
+£Ú“

+¤Ú“

+¥Ú“

+¦Ú“

+á’–

+â’–

+
+ã’–

+ä’–

+å’–

+æ’–

+±¨”

+²¨”

+
+³¨”

+´¨”

+µ¨”

+¶¨”

+ñà–

+òà–

+
+óà–

+ôà–

+õà–

+öà–


data/DB_CollectBoxGain.json

@@ -0,0 +1,100 @@
+{
+	"Arr": [
+		{
+			"Id": 2420001,
+			"Rate": 3
+		},
+		{
+			"Id": 2420002,
+			"Rate": 10
+		},
+		{
+			"Id": 2420003,
+			"Rate": 15
+		},
+		{
+			"Id": 2420004,
+			"Rate": 20
+		},
+		{
+			"Id": 2420005,
+			"Rate": 25
+		},
+		{
+			"Id": 2420006,
+			"Rate": 30
+		},
+		{
+			"Id": 2460001,
+			"Rate": 3
+		},
+		{
+			"Id": 2460002,
+			"Rate": 10
+		},
+		{
+			"Id": 2460003,
+			"Rate": 15
+		},
+		{
+			"Id": 2460004,
+			"Rate": 20
+		},
+		{
+			"Id": 2460005,
+			"Rate": 25
+		},
+		{
+			"Id": 2460006,
+			"Rate": 30
+		},
+		{
+			"Id": 2430001,
+			"Rate": 3
+		},
+		{
+			"Id": 2430002,
+			"Rate": 10
+		},
+		{
+			"Id": 2430003,
+			"Rate": 15
+		},
+		{
+			"Id": 2430004,
+			"Rate": 20
+		},
+		{
+			"Id": 2430005,
+			"Rate": 25
+		},
+		{
+			"Id": 2430006,
+			"Rate": 30
+		},
+		{
+			"Id": 2470001,
+			"Rate": 3
+		},
+		{
+			"Id": 2470002,
+			"Rate": 10
+		},
+		{
+			"Id": 2470003,
+			"Rate": 15
+		},
+		{
+			"Id": 2470004,
+			"Rate": 20
+		},
+		{
+			"Id": 2470005,
+			"Rate": 25
+		},
+		{
+			"Id": 2470006,
+			"Rate": 30
+		}
+	]
+}

data/DB_GameItem.json

@@ -411,7 +411,7 @@
 		},
 		{
 			"Id": 50003,
-			"Name": "M卡片",
+			"Name": "M卡片红色",
 			"ShowLocation": [
 				1,
 				1
@@ -441,7 +441,7 @@
 		},
 		{
 			"Id": 50004,
-			"Name": "A卡片",
+			"Name": "A卡片红色",
 			"ShowLocation": [
 				1,
 				1
@@ -471,7 +471,7 @@
 		},
 		{
 			"Id": 50005,
-			"Name": "N卡片",
+			"Name": "N卡片红色",
 			"ShowLocation": [
 				1,
 				1
@@ -501,7 +501,7 @@
 		},
 		{
 			"Id": 50006,
-			"Name": "G卡片",
+			"Name": "G卡片红色",
 			"ShowLocation": [
 				1,
 				1
@@ -531,7 +531,7 @@
 		},
 		{
 			"Id": 50007,
-			"Name": "O卡片",
+			"Name": "O卡片红色",
 			"ShowLocation": [
 				1,
 				1
@@ -561,7 +561,7 @@
 		},
 		{
 			"Id": 50008,
-			"Name": "G卡片",
+			"Name": "G卡片黄色",
 			"ShowLocation": [
 				1,
 				1
@@ -591,7 +591,7 @@
 		},
 		{
 			"Id": 50009,
-			"Name": "A卡片",
+			"Name": "A卡片黄色",
 			"ShowLocation": [
 				1,
 				1
@@ -621,7 +621,7 @@
 		},
 		{
 			"Id": 50010,
-			"Name": "M卡片",
+			"Name": "M卡片黄色",
 			"ShowLocation": [
 				1,
 				1
@@ -651,7 +651,7 @@
 		},
 		{
 			"Id": 50011,
-			"Name": "E卡片",
+			"Name": "E卡片黄色",
 			"ShowLocation": [
 				1,
 				1

data/DB_PropExchange.dat

@@ -0,0 +1,5 @@
+
+6

у├
ж├
в├
с├
т├
"║█ю└=
+.
ы├
з├
ш├
ь├
"║█ю└=
+W
т├
в├
з├
с├
у├
ж├
ь├
ы├
ш├
"	║█─╜Б
+]
с├
у├
ь├
ы├
э├
т├
ж├
в├
з├
ш├
"╒█Т

data/DB_PropExchange.json

@@ -0,0 +1,68 @@
+{
+	"Arr": [
+		{
+			"Id": 1,
+			"Group": 1,
+			"Cost": {
+				"50003": 1,
+				"50004": 1,
+				"50005": 1,
+				"50006": 1,
+				"50007": 1
+			},
+			"Gain": {
+				"100001": 1000000
+			}
+		},
+		{
+			"Id": 2,
+			"Group": 1,
+			"Cost": {
+				"50008": 1,
+				"50009": 1,
+				"50010": 1,
+				"50011": 1
+			},
+			"Gain": {
+				"100001": 1000000
+			}
+		},
+		{
+			"Id": 3,
+			"Group": 1,
+			"Cost": {
+				"50003": 1,
+				"50004": 1,
+				"50005": 1,
+				"50006": 1,
+				"50007": 1,
+				"50008": 1,
+				"50009": 1,
+				"50010": 1,
+				"50011": 1
+			},
+			"Gain": {
+				"100001": 10000000
+			}
+		},
+		{
+			"Id": 4,
+			"Group": 1,
+			"Cost": {
+				"50003": 1,
+				"50004": 1,
+				"50005": 1,
+				"50006": 1,
+				"50007": 1,
+				"50008": 1,
+				"50009": 1,
+				"50010": 1,
+				"50011": 1,
+				"50012": 1
+			},
+			"Gain": {
+				"100002": 500
+			}
+		}
+	]
+}

protocol/server/pbdata.proto

@@ -303,6 +303,32 @@ message DB_ClientVerArray {
     repeated DB_ClientVer Arr = 1;
 }
 
+message DB_CollectBox {
+
+	int32 Id = 1;
+
+	int32 Rate = 2;
+
+	map<int64, int64> ItemID = 3;
+
+}
+
+message DB_CollectBoxArray {
+    repeated DB_CollectBox Arr = 1;
+}
+
+message DB_CollectBoxGain {
+
+	int32 Id = 1;
+
+	int32 Rate = 2;
+
+}
+
+message DB_CollectBoxGainArray {
+    repeated DB_CollectBoxGain Arr = 1;
+}
+
 message DB_CrashSearch {
 
 	int32 Id = 1;
@@ -1305,6 +1331,22 @@ message DB_PotOddArray {
     repeated DB_PotOdd Arr = 1;
 }
 
+message DB_PropExchange {
+
+	int32 Id = 1;
+
+	int32 Group = 2;
+
+	map<int64, int64> Cost = 3;
+
+	map<int64, int64> Gain = 4;
+
+}
+
+message DB_PropExchangeArray {
+    repeated DB_PropExchange Arr = 1;
+}
+
 message DB_RankCycle {
 
 	int32 Id = 1;