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

worldsrv/scenemgr.go

@@ -198,6 +198,7 @@ func (m *SceneMgr) MarshalAllRoom(platform string, groupId, gameId int, gameMode
 				GameMode:     int32(s.gameMode),
 				SceneMode:    int32(s.sceneMode),
 				GroupId:      s.groupId,
+				GameFreeId:   s.dbGameFree.GetId(),
 				Creator:      s.creator,
 				ReplayCode:   s.replayCode,
 				Params:       common.CopySliceInt64ToInt32(s.params),
@@ -205,12 +206,12 @@ func (m *SceneMgr) MarshalAllRoom(platform string, groupId, gameId int, gameMode
 				RobotCnt:     int32(s.robotNum),
 				CreateTime:   s.createTime.Unix(),
 				BaseScore:    s.dbGameFree.BaseScore,
-				GameFreeId: s.dbGameFree.GetId(),
+				RoomConfigId: s.GetRoomConfigId(),
+				CurrRound:    s.currRound,
 				MaxRound:     s.totalRound,
 				Password:     s.GetPassword(),
 				CostType:     s.GetCostType(),
 				Voice:        s.GetVoice(),
-				CurrRound:  s.currRound,
 			}
 			if s.starting {
 				si.Start = 1