Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop

common/constant.go

@@ -86,6 +86,8 @@ const (
 	GameId_FortuneMouse                   = 312 // FortuneMouse
 	GameId_CashMania                      = 313 // CashMania
 	GameId_GatesOfOlympus                 = 314 // GatesOfOlympus
+	GameId_FortuneSnake                   = 315 // FortuneSnake
+	GameId_GaneshaGold                    = 316 // GaneshaGold
 	__GameId_Fishing_Min__                = 400 //################捕鱼类################
 	GameId_HFishing                       = 401 //欢乐捕鱼
 	GameId_TFishing                       = 402 //天天捕鱼

data/DB_GameCoinPool.dat

@@ -107,4 +107,8 @@
 Ñ̼
€ŽÎ€áë €„¯_XÈ
`À¤ÿ
 áš½
€Æ†<C386>
€åšw €”ëÜXÈ
`À¶üš

  ñè½
€Œ<E282AC>ž€Êµî
 €¨Ö¹XÈ
`€íøµ
- <08><><EFBFBD>
<10><><EFBFBD><EFBFBD><18>ʵ<EFBFBD>
 <20><>ֹX<>
`<60><><EFBFBD><EFBFBD>
+ <08>·¾
€Œ<E282AC>ž€Êµî
 €¨Ö¹XÈ
`€íøµ
+‘…¿
€Œ<E282AC>ž€Êµî
 €¨Ö¹
+¡Ó¿
€Œ<E282AC>ž€Êµî
 €¨Ö¹
+±¡À
€Œ<E282AC>ž€Êµî
 €¨Ö¹
+ÁïÀ
€Œ<E282AC>ž€Êµî
 €¨Ö¹

data/DB_GameCoinPool.json

@@ -1105,6 +1105,30 @@
 			"UpperLimit": 2000000000,
 			"CtrlRate": 200,
 			"InitNovicValue": 650000000
+		},
+		{
+			"Id": 3130001,
+			"InitValue": 600000000,
+			"LowerLimit": 500000000,
+			"UpperLimit": 2000000000
+		},
+		{
+			"Id": 3140001,
+			"InitValue": 600000000,
+			"LowerLimit": 500000000,
+			"UpperLimit": 2000000000
+		},
+		{
+			"Id": 3150001,
+			"InitValue": 600000000,
+			"LowerLimit": 500000000,
+			"UpperLimit": 2000000000
+		},
+		{
+			"Id": 3160001,
+			"InitValue": 600000000,
+			"LowerLimit": 500000000,
+			"UpperLimit": 2000000000
 		}
 	]
 }

data/DB_GameFree.json

@@ -6884,6 +6884,76 @@
 			"BetWaterRate": 100,
 			"GameName": "GatesOfOlympus"
 		},
+		{
+			"Id": 3150001,
+			"Name": "FortuneSnake",
+			"Title": "1",
+			"GameId": 315,
+			"GameRule": 31500,
+			"GameType": 3,
+			"SceneType": 1,
+			"Desc": "0",
+			"ShowType": 2,
+			"ShowId": 31500,
+			"LimitCoin": 10000,
+			"BaseScore": 1000,
+			"Turn": 31500,
+			"BetDec": "1000",
+			"Ai": [
+				0
+			],
+			"OtherIntParams": [
+				0
+			],
+			"RobotNumRng": [
+				0
+			],
+			"SameIpLimit": 1,
+			"GameDif": "315",
+			"GameClass": 2,
+			"PlatformName": "越南棋牌",
+			"MaxBetCoin": [
+				0
+			],
+			"PlayerWaterRate": 100,
+			"BetWaterRate": 100,
+			"GameName": "FortuneSnake"
+		},
+		{
+			"Id": 3160001,
+			"Name": "GaneshaGold",
+			"Title": "1",
+			"GameId": 316,
+			"GameRule": 31600,
+			"GameType": 3,
+			"SceneType": 1,
+			"Desc": "0",
+			"ShowType": 2,
+			"ShowId": 31600,
+			"LimitCoin": 10000,
+			"BaseScore": 1000,
+			"Turn": 31600,
+			"BetDec": "1000",
+			"Ai": [
+				0
+			],
+			"OtherIntParams": [
+				0
+			],
+			"RobotNumRng": [
+				0
+			],
+			"SameIpLimit": 1,
+			"GameDif": "316",
+			"GameClass": 2,
+			"PlatformName": "越南棋牌",
+			"MaxBetCoin": [
+				0
+			],
+			"PlayerWaterRate": 100,
+			"BetWaterRate": 100,
+			"GameName": "GaneshaGold"
+		},
 		{
 			"Id": 6080001,
 			"Name": "娃娃机",

data/DB_GameRule.json

@@ -262,6 +262,18 @@
 			"GameId": 314,
 			"GameDif": "314"
 		},
+		{
+			"Id": 31500,
+			"Name": "FortuneSnake",
+			"GameId": 315,
+			"GameDif": "315"
+		},
+		{
+			"Id": 31600,
+			"Name": "GaneshaGold",
+			"GameId": 316,
+			"GameDif": "316"
+		},
 		{
 			"Id": 60800,
 			"Name": "娃娃机",

data/DB_PigBank_Diamond.dat

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


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

-?<18>ΑΧ/ 2(€­β2ΕΈ2συ
8ξ@£θ;JΖΈJσυ
PdXξ`σ
+?<18>ΑΧ/ 2(€­β2ΕΈ2συ
8ξ@£θ;Jσυ
JΖΈPdXξ`σ

data/DB_PropExchange.dat

@@ -1,8 +1,8 @@
 
 6

Ó†
Ô†
Õ†
Ö†
׆
"¡<>À„=
-.
й<>
к<>
л<EFBFBD>
и<EFBFBD>
"Ё<>Р<>=
-W
к<EFBFBD>
г<>
з<>
и<>
й<>
л<>
д<>
е<>
ж<EFBFBD>
"	Ё<><10>­т
-]
ж<EFBFBD>
з<>
и<>
й<>
к<>
л<>
г<>
д<>
е<>
м<EFBFBD>
"Ђ<>є
+.
и<EFBFBD>
й<EFBFBD>
к<>
л<>
"Ё<>Р<>=
+W
л<EFBFBD>
г<>
д<>
й<>
к<>
е<>
ж<>
з<>
и<EFBFBD>
"	Ё<><10>­т
+]
е<EFBFBD>
й<>
к<>
л<>
м<>
г<>
д<>
ж<>
з<>
и<EFBFBD>
"Ђ<>є
 à†"¸
(
 à†
 "¢<>(

data/gameconfig/fortunesnake.json

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

data/gameconfig/ganeshagold.json

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