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

worldsrv/scenemgr.go

@@ -192,25 +192,26 @@ func (m *SceneMgr) MarshalAllRoom(platform string, groupId, gameId int, gameMode
 			}
 
 			si := &webapiproto.RoomInfo{
-				Platform:   platformName,
+				Platform:     platformName,
-				SceneId:    int32(s.sceneId),
+				SceneId:      int32(s.sceneId),
-				GameId:     int32(s.gameId),
+				GameId:       int32(s.gameId),
-				GameMode:   int32(s.gameMode),
+				GameMode:     int32(s.gameMode),
-				SceneMode:  int32(s.sceneMode),
+				SceneMode:    int32(s.sceneMode),
-				GroupId:    s.groupId,
+				GroupId:      s.groupId,
-				Creator:    s.creator,
+				GameFreeId:   s.dbGameFree.GetId(),
-				ReplayCode: s.replayCode,
+				Creator:      s.creator,
-				Params:     common.CopySliceInt64ToInt32(s.params),
+				ReplayCode:   s.replayCode,
-				PlayerCnt:  int32(len(s.players) - s.robotNum),
+				Params:       common.CopySliceInt64ToInt32(s.params),
-				RobotCnt:   int32(s.robotNum),
+				PlayerCnt:    int32(len(s.players) - s.robotNum),
-				CreateTime: s.createTime.Unix(),
+				RobotCnt:     int32(s.robotNum),
-				BaseScore:  s.dbGameFree.BaseScore,
+				CreateTime:   s.createTime.Unix(),
-				GameFreeId: s.dbGameFree.GetId(),
+				BaseScore:    s.dbGameFree.BaseScore,
-				MaxRound:   s.totalRound,
+				RoomConfigId: s.GetRoomConfigId(),
-				Password:   s.GetPassword(),
+				CurrRound:    s.currRound,
-				CostType:   s.GetCostType(),
+				MaxRound:     s.totalRound,
-				Voice:      s.GetVoice(),
+				Password:     s.GetPassword(),
-				CurrRound:  s.currRound,
+				CostType:     s.GetCostType(),
+				Voice:        s.GetVoice(),
 			}
 			if s.starting {
 				si.Start = 1