111

bin/client_msg/common.proto

@@ -13,6 +13,15 @@ message ReqLogin {
   string userId = 2;
   string gameStatus = 3;
   MsgError error = 4;
+  int32 points = 5;
+
+}
+//用户信息
+message UserInfo {
+  string nikeName = 1;
+  string userId = 2;
+  int32 points = 3;
+
 }
 
 //进入大厅
@@ -59,6 +68,34 @@ message Shop {
 message ResGameInfo {
   string gameId = 1;
 }
+message ResRoomID {
+  string gameId = 1;
+  string confId = 2;
+  string userId = 3; 
+}
+message ReqRoomID {
+  string gameId = 1;
+  string roomId = 2;
+  string userId = 3;
+}
+message ResLeaveRoom {
+  string gameId = 1;
+  string roomId = 2;
+  string userId = 3;
+}
+message ReqLeaveRoom {
+  string gameId = 1;
+  string roomId = 2;
+  string userId = 3;
+}
+message ResBet {
+  int32 minBlindBet =1;
+  int32 maxBlindBet =2;
+  int32 minCheelBet =3;
+  int32 maxCheelBet =4;
+  int32 roomMinBet = 5;
+  int32 roomMaxBet = 6;
+}
 message ReqGameInfo {
   string gameId = 1;
   string gameName = 2;
@@ -73,14 +110,15 @@ message TeenPattiRoomList {
 
 message TeenPattiRoom {
   
-  string boot = 1; //0.1
+  string boot = 1; //1
   string minBuyin = 2; // 1
-  string chaalLimmit = 3; // 12.8
-  string potLimit = 4; //102.40
+  string chaalLimmit = 3; // 128
+  string potLimit = 4; //1024
   string totalPlayers = 5; // 3999
   string roomLevel = 6; //low - mid - high
-  string roomId = 7;
+  string confId = 7;
   string type = 8; 
+
 }
 
 // 通知客户端发牌
@@ -110,10 +148,11 @@ enum PlayerOptType {
     OPT_SEEN   = 1;  // 看牌
     OPT_PACKED     = 2;  // 弃牌
     OPT_CHAAL        = 3;  // 跟注
-    OPT_BIND         = 4;  // 绑定
+    OPT_BLIND         = 4;  // 不看牌跟注
     OPT_SELECT      = 5;  // 选择操作
     OPT_SHOW         = 6;  // 亮牌
     OPT_ANTE         = 7;  // 底注
+    OPT_SITESHOW         =8;  // 底注
 }
 
 message PlayerOpt {
@@ -121,6 +160,7 @@ message PlayerOpt {
     int32 bet_amount = 2;        // 下注金额
     int64 timestamp = 3;         // 操作时间戳
     repeated ReqCard seenCards = 4;  // 看牌的牌
+
 }
 
 message ReqRoom {
@@ -129,6 +169,7 @@ message ReqRoom {
   int32 Status = 3;
   int32 Round = 4;
   ReqGameRound GameRound = 5;
+  ResBet BetInfo = 6;
 }
 
 
@@ -155,6 +196,8 @@ message ReqPlayerList {
 
 message ReqGameRound {
   repeated ReqRound Rounds = 1;
+
+
 }
 
 message ReqBet {
@@ -162,8 +205,8 @@ message ReqBet {
 }
 
 message ReqResult {
-  int32 roundSitPos = 1;
-  int32 result = 2;
+  optional  int32 roundSitPos = 1;
+  optional  int32 result = 2;
 }
 
 message ReqRound {
@@ -175,6 +218,8 @@ message ReqRound {
     PlayerOpt playerOpt = 3;
     // 用户id
     string userId = 4;
+    ResBet resBet = 5;
+
 }
 
 

src/server/msg/msg.go

@@ -46,6 +46,8 @@ func init() {
 	Processor.Register(&ReqRoomTipsMessage{})
 	Processor.Register(&ReqHeartBeat{})
 	Processor.Register(&ResHeartBeat{})
+	Processor.Register(&NextRound{})
+	Processor.Register(&ResRoomID{})
 	Processor.Range(func(id uint16, t reflect.Type) {
 		log.Debug("消息ID: %d, 消息类型: %s\n", id, t.Elem().Name())
 		msgList = append(msgList, MsgInfo{