From 0c9f09b13c04d5e03ca7d44b99546acbe26fcf87 Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 28 Jul 2021 16:25:38 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E5=8D=81=E7=BB=9D?= =?UTF-8?q?=E9=98=B5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/db/redis/RedisUtil.java | 2 +- .../java/com/ljsd/jieling/handler/RankHandler.java | 2 +- .../java/com/ljsd/jieling/logic/rank/RankEnum.java | 8 ++++---- .../java/com/ljsd/jieling/logic/rank/RankLogic.java | 7 +++---- .../jieling/logic/rank/rankImpl/AbstractRank.java | 13 ++++++++++++- .../jieling/logic/rank/rankImpl/CrossArenaRank.java | 5 +++++ .../rank/rankImpl/DeathPathEveryPersonRank.java | 1 + 7 files changed, 27 insertions(+), 11 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java index a19d96b3f..1768cf42e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java @@ -1289,7 +1289,7 @@ public class RedisUtil { } public String getKey(String type,String key,boolean judge){ - if (judge){ + if (!judge){ return type + RedisKey.Delimiter_colon + key; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/RankHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/RankHandler.java index 13f70c728..474ee19c5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/RankHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/RankHandler.java @@ -17,6 +17,6 @@ public class RankHandler extends BaseHandler { @Override public void processWithProto(ISession iSession, PlayerInfoProto.RankRequest proto) throws Exception { RankLogic.getInstance().getRank(iSession,proto.getType(),proto.getActiviteId(), - proto.getIndex(),MessageTypeProto.MessageType.GET_ONE_RANK_RESPONSE); + proto.getIndex(),proto.getIsCross(),MessageTypeProto.MessageType.GET_ONE_RANK_RESPONSE); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java index 921f27c2f..f1e126b18 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java @@ -24,10 +24,10 @@ public enum RankEnum { GUILD_RED_PACKAGE_RANK(13,RedisKey.GUILD_RED_PACKAGE_RANK,GuildRedPackageRank::new,false),//param1:红包总价格 param2:无 param3:无 CAR_DEALY_RANK(14,RedisKey.CAR_DEALY_RANK,CarDealyRank::new,false),//param1:伤害 param2:无 param3:无 CAR_DEALY_GUILD_RANK(19,RedisKey.CAR_DEALY_GUILD_RANK,CarDealyGuildRank::new,false),//param1:伤害 param2:无 param3:无 - DEATH_PATH_EVERY_PERSON_RANK(15,RedisKey.DEATH_PATH_EVERY_PERSON_RANK,DeathPathEveryPersonRank::new,false),//param1:当前阵玩家伤害 param2:无 param3:无 - DEATH_PATH_EVERY_GUILD_RANK(16,RedisKey.DEATH_PATH_EVERY_GUILD_RANK, DeathPathEveryGuildRank::new,false),//param1:当前阵公会伤害 param2:当前工会挑战人数 param3:无 - DEATH_PATH_TOTAL_PERSON_RANK(17,RedisKey.DEATH_PATH_TOTAL_PERSON_RANK,DeathPathTotalPersonRank::new,false),//param1:玩家总伤害 param2:无 param3:无 - DEATH_PATH_TOTAL_GUILD_RANK(18,RedisKey.DEATH_PATH_TOTAL_GUILD_RANK,DeathPathTotalGuildRank::new,false),//param1:工会总伤害 param2:无 param3:无 + DEATH_PATH_EVERY_PERSON_RANK(15,RedisKey.DEATH_PATH_EVERY_PERSON_RANK,DeathPathEveryPersonRank::new,true),//param1:当前阵玩家伤害 param2:无 param3:无 + DEATH_PATH_EVERY_GUILD_RANK(16,RedisKey.DEATH_PATH_EVERY_GUILD_RANK, DeathPathEveryGuildRank::new,true),//param1:当前阵公会伤害 param2:当前工会挑战人数 param3:无 + DEATH_PATH_TOTAL_PERSON_RANK(17,RedisKey.DEATH_PATH_TOTAL_PERSON_RANK,DeathPathTotalPersonRank::new,true),//param1:玩家总伤害 param2:无 param3:无 + DEATH_PATH_TOTAL_GUILD_RANK(18,RedisKey.DEATH_PATH_TOTAL_GUILD_RANK,DeathPathTotalGuildRank::new,true),//param1:工会总伤害 param2:无 param3:无 GUILD_FORCE_RANK(20,RedisKey.GUILD_FORCE_RANK,GuildForceRank::new,false),//param1:公会总战力 param2:无 param3:无 //达人排行榜 EXPERT_RANK(21,RedisKey.EXPERT_RANK,GoldRank::new,false),//param1:活动进度 param2:无 param3:无 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankLogic.java index 13372829a..dabe0589b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankLogic.java @@ -66,20 +66,19 @@ public class RankLogic { public static class Instance { public final static RankLogic instance = new RankLogic(); } - public void getRank(ISession session, int type, int activityId,int index,MessageTypeProto.MessageType messageType) throws Exception { + public void getRank(ISession session, int type, int activityId,int index,int isCross,MessageTypeProto.MessageType messageType) throws Exception { LOGGER.info("获取排行榜信息type={},activityId={}",type,activityId); - int page = 1; String rkey = ""; if(activityId != 0){ rkey = String.valueOf(activityId); } PlayerInfoProto.RankResponse rankResponse=null; AbstractRank rank = RankContext.getRankEnum(type); - if(RankContext.isCrossRank(type)){ + if(RankContext.isCrossRank(type) || isCross == 1){ //跨服 int crossGroup = GlobleSystemLogic.getInstence().getCrossGroup(); if(crossGroup>0){ - rankResponse = rank.getRank(session.getUid(),String.valueOf(crossGroup),index/20+1, 20); + rankResponse = rank.getCrossRank(session.getUid(),String.valueOf(crossGroup),index/20+1, 20); } }else{ rankResponse = rank.getRank(session.getUid(),rkey,index/20+1, 20); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java index 35ed53fce..12bed3827 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java @@ -2,6 +2,7 @@ package com.ljsd.jieling.logic.rank.rankImpl; import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisUtil; +import com.ljsd.jieling.logic.GlobleSystemLogic; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.rank.IRank; @@ -36,7 +37,7 @@ public abstract class AbstractRank implements IRank { * @return 当前排行榜数据 * @throws Exception */ - public PlayerInfoProto.RankResponse getRank(int uid, String rkey, int page, int rankEndLine) throws Exception { + public PlayerInfoProto.RankResponse getRank(int uid, String rkey, int page, int rankEndLine) throws Exception { if(rankEndLine==-1){ rankEndLine = 100; } @@ -55,6 +56,16 @@ public abstract class AbstractRank implements IRank { return allUserResponse.build(); } + /** + * 跨服排行数据 + * @throws Exception + */ + public PlayerInfoProto.RankResponse getCrossRank(int uid, String rkey, int page, int rankEndLine) throws Exception { + int groupId = GlobleSystemLogic.getInstence().getCrossGroup(); + redisKey = RedisUtil.getInstence().getKey(String.valueOf(groupId),redisKey,false); + return getRank(uid,rkey,page,rankEndLine); + } + /** * 向排行榜添加或修改某条数据 * @param uid 修改用户id diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossArenaRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossArenaRank.java index ab06fda14..71dcdc68d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossArenaRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossArenaRank.java @@ -105,4 +105,9 @@ public class CrossArenaRank extends AbstractRank { e.printStackTrace(); } } + + @Override + public PlayerInfoProto.RankResponse getCrossRank(int uid, String rkey, int page, int rankEndLine) throws Exception { + return getRank(uid,rkey,page,rankEndLine); + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryPersonRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryPersonRank.java index d53ac2a12..aaaba5ad2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryPersonRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryPersonRank.java @@ -23,6 +23,7 @@ public class DeathPathEveryPersonRank extends AbstractRank { return data[0]; } + @Override public void addRank(int uid,String rkey,double... data){ RedisUtil.getInstence().incrementZsetScore(redisKey,rkey,String.valueOf(uid), Double.valueOf(getScore(data)).intValue()); } From 15544cbab828bf7048ea72403bdc8b0039740715 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 31 Jul 2021 00:13:02 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E5=88=87=E7=A3=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/arena/PlayWithSbHandler.java | 2 +- .../ljsd/jieling/logic/arena/ArenaLogic.java | 25 +++++++++++++------ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/arena/PlayWithSbHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/arena/PlayWithSbHandler.java index 94cb6d49f..1cbfd22f4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/arena/PlayWithSbHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/arena/PlayWithSbHandler.java @@ -16,6 +16,6 @@ public class PlayWithSbHandler extends BaseHandler Date: Sat, 31 Jul 2021 00:56:47 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java | 1 - .../src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java | 1 - .../java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java | 1 - 3 files changed, 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index b98628d50..e0f321c6d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -429,7 +429,6 @@ public class GuildLogic { Integer position = memberEntry.getKey(); Set value = memberEntry.getValue(); for(Integer uidTmp : value){ - LOGGER.info("family有问题的uid:{}",uidTmp); User userTmp = UserManager.getUser(uidTmp); builder.addFamilyUserInfo(CBean2Proto.getFamilyUserInfo(userTmp,position)); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java index 3686cc8dd..a186b44c2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java @@ -76,7 +76,6 @@ public class FriendLogic { List friends = friendManager.getFriends(); List friendList = new CopyOnWriteArrayList<>(); for (Integer friendId :friends){ - LOGGER.info("有问题的Uid:{}",friendId); CommonProto.Friend friend = CBean2Proto.getFriendInfo(friendId,friendManager); friendList.add(friend); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java index 35ed53fce..02d2f445d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java @@ -129,7 +129,6 @@ public abstract class AbstractRank implements IRank { } protected void getOptional(int index,ZSetOperations.TypedTuple data,PlayerInfoProto.RankResponse.Builder builder) throws Exception { - LOGGER.info("获取排行榜信息===================玩家id:{}"+data.getValue()); User everyUser = UserManager.getUser(Integer.parseInt(data.getValue()), true); if (everyUser == null){ return; From 8cf5c7af9c6836dbfd0b377ad91bc30686970db2 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 31 Jul 2021 01:01:11 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=8A=A5=E7=A9=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java index 428946cd5..accdca1a2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java @@ -213,6 +213,9 @@ public class MissionLoigc { int jadeMissionType = GameMisionType.JADE_DYNASTY_MISSION.getType(); for(Integer id:jadeDynastyMissionType.getDoingMissionIds()){ SThemeActivityTaskConfig config = SThemeActivityTaskConfig.idTaskConfig.get(id); + if(config==null){ + continue; + } int progress = config.getTaskValue()[1][0]; switch (config.getType()){ case 1: From 44b3b2881fa052425f77a96d4585c64c48a83586 Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 28 Jul 2021 16:48:40 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E8=B7=A8=E6=9C=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/GetCrossServerHandler.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/handler/GetCrossServerHandler.java diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetCrossServerHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetCrossServerHandler.java new file mode 100644 index 000000000..755481b65 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetCrossServerHandler.java @@ -0,0 +1,28 @@ +package com.ljsd.jieling.handler; + +import com.google.protobuf.GeneratedMessage; +import com.ljsd.jieling.logic.GlobleSystemLogic; +import rpc.protocols.MessageTypeProto; +import rpc.protocols.PlayerInfoProto; + +/** + * @Author hj + * @Date 2021/7/28 16:36:26 + * @Description: 跨服信息 + * @Version 1.0 + */ +public class GetCrossServerHandler extends BaseHandler { + + @Override + public MessageTypeProto.MessageType getMessageCode() { + return MessageTypeProto.MessageType.GetCrossServerRequest; + } + + @Override + public GeneratedMessage processWithProto(int uid, PlayerInfoProto.IsCrossRequert proto) throws Exception { + int crossGroup = GlobleSystemLogic.getInstence().getCrossGroup(); + int result = crossGroup == -1 ? 0 : 1; + return PlayerInfoProto.IsCrossResponse.newBuilder().setIsCross(result).build(); + } + +} From 01ec371f1dfb30a20a01a0db3f26197700e9ba60 Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 28 Jul 2021 17:51:23 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E6=8E=92=E8=A1=8C?= =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BA=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=90=8D?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crossService/CrossServiceLogic.java | 27 ++++++++++++++----- .../ljsd/jieling/logic/hero/HeroLogic.java | 1 + .../logic/rank/rankImpl/AbstractRank.java | 11 +++++--- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java index 486e57369..a83d33693 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java @@ -39,7 +39,7 @@ public class CrossServiceLogic { return CrossServiceLogic.Instance.instance; } - public String findServerName(int serverId) throws UnknownHostException { + public String findServerName(int serverId) { return CrossDeathPathLogic.getInstance().getServerName(serverId); } @@ -143,11 +143,7 @@ public class CrossServiceLogic { arenaOfPlayerManager.setGender(player.getSex()); arenaOfPlayerManager.setSkin(player.getUserSkin()); arenaOfPlayerManager.setUserMount(player.getUserMount()); - try { - arenaOfPlayerManager.setServerName(CrossServiceLogic.getInstance().findServerName(GameApplication.serverId)); - } catch (UnknownHostException e) { - e.printStackTrace(); - } + arenaOfPlayerManager.setServerName(CrossServiceLogic.getInstance().findServerName(GameApplication.serverId)); return arenaOfPlayerManager; } private ArenaOfHeroManager buildArenaOfHeroManager(User user){ @@ -197,4 +193,23 @@ public class CrossServiceLogic { return arenaOfHero; } + /** + * 根据uid获取服务器名称 + * @param uid + * @return + */ + public String getServerNameByUId(int uid){ + String name = ""; + try { + ArenaOfUser query = query(uid); + if (query != null){ + int serverId = query.getPlayerManager().getServerId(); + return CrossDeathPathLogic.getInstance().getServerNameByDeathPath(serverId); + } + } catch (UnknownHostException e) { + LOGGER.error("===========获取跨服玩家信息报错=======:{}",e.getMessage()); + } + return name; + } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index f0c7bb0e1..17ffcd2b6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -1169,6 +1169,7 @@ public class HeroLogic{ } if (teamId == GlobalsDef.FORMATION_NORMAL) { Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(iSession.getUid())); + CrossServiceLogic.getInstance().dispose(user); } // 跨服 更新编队信息 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java index c6463e0e0..fd3e2ef08 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java @@ -3,6 +3,7 @@ package com.ljsd.jieling.logic.rank.rankImpl; import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.logic.GlobleSystemLogic; +import com.ljsd.jieling.logic.activity.crossService.CrossServiceLogic; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.rank.IRank; @@ -152,8 +153,10 @@ public abstract class AbstractRank implements IRank { CommonProto.UserRank.Builder oneUserRank = getOneUserRank(everyUser, everyRankInfo); builder.addRanks(oneUserRank); } - public CommonProto.UserRank.Builder getOneUserRank(User everyUser,CommonProto.RankInfo.Builder everyRankInfo) throws Exception { - CommonProto.UserRank.Builder everyRank = CommonProto.UserRank.newBuilder() + + private CommonProto.UserRank.Builder getOneUserRank(User everyUser,CommonProto.RankInfo.Builder everyRankInfo){ + String serverName = CrossServiceLogic.getInstance().getServerNameByUId(everyUser.getId()); + return CommonProto.UserRank.newBuilder() .setUid(everyUser.getId()) .setUserName(everyUser.getPlayerInfoManager().getNickName()) .setHead(everyUser.getPlayerInfoManager().getHead()) @@ -165,8 +168,8 @@ public abstract class AbstractRank implements IRank { .setUserSkin(everyUser.getPlayerInfoManager().getUserSkin()) .setUserTitle(everyUser.getPlayerInfoManager().getUserTitle()) .setUserMount(everyUser.getPlayerInfoManager().getUserMount()) - .setPracticeLevel(everyUser.getHeroManager().getPracticeLevel()); - return everyRank; + .setPracticeLevel(everyUser.getHeroManager().getPracticeLevel()) + .setServerName(serverName); } protected void getMyInfo(User user,String rkey,PlayerInfoProto.RankResponse.Builder allUserResponse){