Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

modules/arena/api_rank.go

@@ -17,6 +17,7 @@ func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (errd
 		info     *pb.DBArenaUser
 		uids     []string
 		ranks    []*pb.DBArenaUser
+		ranksMap map[string]*pb.DBArenaUser
 		players  []*pb.ArenaPlayer
 		err      error
 	)
@@ -48,16 +49,21 @@ func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (errd
 		}
 		return
 	}
-	players = make([]*pb.ArenaPlayer, len(ranks))
+	ranksMap = make(map[string]*pb.DBArenaUser)
-	for i, v := range ranks {
+	for _, v := range ranks {
-		rank := int32(i + 1)
+		ranksMap[v.Uid] = v
-		players[i] = &pb.ArenaPlayer{
-			Uinfo:    v.Uinfo,
-			Dan:      v.Dan,
-			Rank:     rank,
-			Integral: v.Integral,
 	}
-		if session.GetUserId() == v.Uinfo.Uid && info.Rank != rank {
+	players = make([]*pb.ArenaPlayer, 0, len(uids))
+	for i, v := range uids {
+		if player, ok := ranksMap[v]; ok {
+			rank := int32(i + 1)
+			players = append(players, &pb.ArenaPlayer{
+				Uinfo:    player.Uinfo,
+				Dan:      player.Dan,
+				Rank:     rank,
+				Integral: player.Integral,
+			})
+			if session.GetUserId() == player.Uinfo.Uid && info.Rank != rank {
 				info.Rank = rank
 				if err = this.module.modelArena.updateArenaUserInfo(info); err != nil {
 					errdata = &pb.ErrorData{
@@ -68,6 +74,8 @@ func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (errd
 				}
 			}
 		}
+
+	}
 	session.SendMsg(string(this.module.GetType()), "rank", &pb.ArenaRankResp{Players: players, Info: info})
 	return
 }