Merge branch 'develop' into release

mgrsrv/api/webapi_gamesrv.go

@@ -182,7 +182,7 @@ func init() {
 				err := proto.Unmarshal(netlib.SkipHeaderGetRaw(v), &msg)
 				if err == nil && msg.GetTag() == webapi.TagCode_SUCCESS {
 					tNode.TransEnv.SetField(GAMESRVAPI_TRANSACTE_RESPONSE, ud)
-				} else {
+				} else if err != nil {
 					logger.Logger.Errorf("GameSrvApi OnChildRespWrapper unmarshal err %v", err)
 				}
 			}

protocol/webapi/common.proto

@@ -248,6 +248,7 @@ message RoomInfo{
   string Password = 22;// 密码
   int32 CostType = 23;// 付费方式 1房主 2AA
   int32 Voice = 24;// 语音开关 1开启
+  int32 PlayerNum = 25; // 房间最大人数
 }
 
 message PlayerSingleAdjust{

worldsrv/scenemgr.go

@@ -199,6 +199,7 @@ func (m *SceneMgr) MarshalAllRoom(platform string, groupId, gameId int, gameMode
 				Password:     s.GetPassword(),
 				CostType:     s.GetCostType(),
 				Voice:        s.GetVoice(),
+				PlayerNum:    int32(s.playerNum),
 			}
 			if s.starting {
 				si.Start = 1