Merge branch 'develop' into dev_slots

data/DB_GameCoinPool.dat

@@ -102,4 +102,9 @@
 ±°»
€›îÀ–± €ÚÄ	XÈ
` ÝŒ
 ²°»
€ŽÎ€áë €„¯_XÈ
`À¤ÿ
 ³°»
€Æ†<C386>
€åšw €”ëÜXÈ
`À¶üš

- <08><><EFBFBD>
<10><><EFBFBD><EFBFBD><18>ʵ<EFBFBD>
 <20><>ֹX<>
`<60><><EFBFBD><EFBFBD>
+ ´°»
€Œ<E282AC>ž€Êµî
 €¨Ö¹XÈ
`€íøµ
+Áþ»
€›îÀ–± €ÚÄ	XÈ
` ÝŒ
+Ñ̼
€ŽÎ€áë €„¯_XÈ
`À¤ÿ
+áš½
€Æ†<C386>
€åšw €”ëÜXÈ
`À¶üš

+ ñè½
€Œ<E282AC>ž€Êµî
 €¨Ö¹XÈ
`€íøµ
+ <08>·¾
€Œ<E282AC>ž€Êµî
 €¨Ö¹XÈ
`€íøµ

data/DB_GameCoinPool.json

@@ -1065,6 +1065,46 @@
 			"UpperLimit": 2000000000,
 			"CtrlRate": 200,
 			"InitNovicValue": 650000000
+		},
+		{
+			"Id": 3080001,
+			"InitValue": 6000000,
+			"LowerLimit": 5000000,
+			"UpperLimit": 20000000,
+			"CtrlRate": 200,
+			"InitNovicValue": 6500000
+		},
+		{
+			"Id": 3090001,
+			"InitValue": 60000000,
+			"LowerLimit": 50000000,
+			"UpperLimit": 200000000,
+			"CtrlRate": 200,
+			"InitNovicValue": 65000000
+		},
+		{
+			"Id": 3100001,
+			"InitValue": 300000000,
+			"LowerLimit": 250000000,
+			"UpperLimit": 1000000000,
+			"CtrlRate": 200,
+			"InitNovicValue": 325000000
+		},
+		{
+			"Id": 3110001,
+			"InitValue": 600000000,
+			"LowerLimit": 500000000,
+			"UpperLimit": 2000000000,
+			"CtrlRate": 200,
+			"InitNovicValue": 650000000
+		},
+		{
+			"Id": 3120001,
+			"InitValue": 600000000,
+			"LowerLimit": 500000000,
+			"UpperLimit": 2000000000,
+			"CtrlRate": 200,
+			"InitNovicValue": 650000000
 		}
 	]
 }