update

data/DB_GameFree.json

@@ -4520,7 +4520,7 @@
 		{
 			"Id": 2110001,
 			"Name": "十三张四人",
-			"Title": "1",
+			"Title": "新手场",
 			"GameId": 211,
 			"GameRule": 21100,
 			"GameType": 2,
@@ -4574,7 +4574,7 @@
 		{
 			"Id": 2110002,
 			"Name": "十三张四人",
-			"Title": "2",
+			"Title": "小康场",
 			"GameId": 211,
 			"GameRule": 21100,
 			"GameType": 2,
@@ -4628,7 +4628,7 @@
 		{
 			"Id": 2110003,
 			"Name": "十三张四人",
-			"Title": "3",
+			"Title": "土豪场",
 			"GameId": 211,
 			"GameRule": 21100,
 			"GameType": 2,
@@ -4682,7 +4682,7 @@
 		{
 			"Id": 2110004,
 			"Name": "十三张四人",
-			"Title": "4",
+			"Title": "新手场",
 			"GameId": 211,
 			"GameRule": 21100,
 			"GameType": 2,
@@ -4736,7 +4736,7 @@
 		{
 			"Id": 2110005,
 			"Name": "十三张四人",
-			"Title": "5",
+			"Title": "小康场",
 			"GameId": 211,
 			"GameRule": 21100,
 			"GameType": 2,
@@ -4790,7 +4790,7 @@
 		{
 			"Id": 2110006,
 			"Name": "十三张四人",
-			"Title": "6",
+			"Title": "土豪场",
 			"GameId": 211,
 			"GameRule": 21100,
 			"GameType": 2,
@@ -4843,7 +4843,7 @@
 		{
 			"Id": 2120001,
 			"Name": "十三张八人",
-			"Title": "1",
+			"Title": "新手场",
 			"GameId": 212,
 			"GameRule": 21200,
 			"GameType": 2,
@@ -4897,7 +4897,7 @@
 		{
 			"Id": 2120002,
 			"Name": "十三张八人",
-			"Title": "2",
+			"Title": "小康场",
 			"GameId": 212,
 			"GameRule": 21200,
 			"GameType": 2,
@@ -4951,7 +4951,7 @@
 		{
 			"Id": 2120003,
 			"Name": "十三张八人",
-			"Title": "3",
+			"Title": "土豪场",
 			"GameId": 212,
 			"GameRule": 21200,
 			"GameType": 2,
@@ -5005,7 +5005,7 @@
 		{
 			"Id": 2120004,
 			"Name": "十三张八人",
-			"Title": "4",
+			"Title": "新手场",
 			"GameId": 212,
 			"GameRule": 21200,
 			"GameType": 2,
@@ -5059,7 +5059,7 @@
 		{
 			"Id": 2120005,
 			"Name": "十三张八人",
-			"Title": "5",
+			"Title": "小康场",
 			"GameId": 212,
 			"GameRule": 21200,
 			"GameType": 2,
@@ -5113,7 +5113,7 @@
 		{
 			"Id": 2120006,
 			"Name": "十三张八人",
-			"Title": "6",
+			"Title": "土豪场",
 			"GameId": 212,
 			"GameRule": 21200,
 			"GameType": 2,
@@ -7019,6 +7019,27 @@
 			"PlayerWaterRate": 100,
 			"BetWaterRate": 100,
 			"GameName": "娃娃机"
+		},
+		{
+			"Id": 6090001,
+			"Name": "推币机",
+			"GameId": 609,
+			"GameRule": 60900,
+			"GameType": 5,
+			"SceneType": 1,
+			"ShowType": 3,
+			"ShowId": 60900,
+			"Turn": 60900,
+			"OtherIntParams": [
+				5000,
+				10000,
+				15000
+			],
+			"SameIpLimit": 1,
+			"GameDif": "609",
+			"GameClass": 2,
+			"PlatformName": "越南棋牌",
+			"GameName": "推币机"
 		}
 	]
 }

data/DB_GameRule.json

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

data/DB_NewYearRankReward.dat

@@ -4,7 +4,7 @@
 
"¡<>"¢<>d"¸ê


 
"¡<>"¢<>d
 
"¡<>"¢<>c
-
"¢<EFBFBD>b"¡<>
+
"¡<EFBFBD>"¢<>b
 
"¡<>"¢<>a
 
"¡<>"¢<>`
 	
	"¡<>"¢<>_
@@ -12,17 +12,17 @@
 

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


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

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

 +"¢<>d"¸ê

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

data/gameconfig/pushcoin.json

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

protocol/doc.md

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

protocol/pushcoin/pushcoin.proto

@@ -0,0 +1,103 @@
+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; //抽奖信息
+}
+
+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; // 抽奖信息，掉落到桌面
+}