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

protocol/webapi/webapi.proto

@@ -513,6 +513,8 @@ message ASQueryOnlineReportList{
   int32 OrderType = 6;//排序方式 0,、倒序 1、正序
   int32 GameFreeId = 7;
   string Channel = 8;
+  string GameDif = 9; // 游戏组
+  string ChannelId = 10; // 推广渠道ID
 }
 message SAQueryOnlineReportList{
   TagCode Tag = 1; //错误码

worldsrv/trascate_webapi.go

@@ -1113,12 +1113,10 @@ func init() {
 				pack.Msg = "数据序列化失败" + err.Error()
 				return common.ResponseTag_ParamError, pack
 			}
-			platform := msg.Platform
 			pageNo := msg.PageNo
 			pageSize := msg.PageSize
 			orderColumn := msg.OrderColumn
 			orderType := msg.OrderType
-			channel := msg.Channel
 
 			start := (pageNo - 1) * pageSize
 			end := pageNo * pageSize
@@ -1132,21 +1130,37 @@ func init() {
 				if !p.IsOnLine() {
 					continue
 				}
-				if msg.GameFreeId == 0 {
+				if msg.GameDif != "" {
-					if msg.GameId != 0 && (p.scene == nil || p.scene.gameId != int(msg.GameId)) {
+					if p.scene == nil || p.scene.dbGameFree.GetGameDif() != msg.GameDif {
-						continue
-					}
-				} else {
-					if p.scene == nil || p.scene.dbGameFree.GetId() != msg.GameFreeId {
 						continue
 					}
 				}
-				if platform != DefaultPlatform && p.Platform != platform {
+				if msg.ChannelId != "" {
+					if p.ChannelId != msg.ChannelId {
 						continue
 					}
-				if channel != "" && p.Channel != channel {
+				}
+				if msg.GameFreeId > 0 {
+					if p.scene == nil || p.scene.GetGameFreeId() != msg.GameFreeId {
 						continue
 					}
+				}
+				if msg.GameId > 0 {
+					if p.scene == nil || p.scene.gameId != int(msg.GameId) {
+						continue
+					}
+				}
+
+				if msg.Platform != DefaultPlatform && msg.Platform != "" {
+					if p.Platform != msg.Platform {
+						continue
+					}
+				}
+
+				if msg.Channel != "" && p.Channel != msg.Channel {
+					continue
+				}
+
 				players = append(players, p)
 			}
 			// 排序