From bb7deac07215678da1dce5f0ab6d3c0fc3f1d1b7 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 29 Jun 2020 18:10:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/dao/WorldTreasureReward.java | 2 +- .../main/java/com/ljsd/jieling/logic/player/PlayerLogic.java | 3 +++ .../com/ljsd/jieling/logic/rank/rankImpl/GuildForceRank.java | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WorldTreasureReward.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WorldTreasureReward.java index 8d7c45144..c3412139f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WorldTreasureReward.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WorldTreasureReward.java @@ -14,7 +14,7 @@ public class WorldTreasureReward extends MongoBase { private int score; private Map rewardStatusMap = new HashMap<>(); //领取状态 1:表示领取基础奖励 2:表示领取额外奖励。 - public WorldTreasureReward(){ + WorldTreasureReward(){ this.setRootCollection(User._COLLECTION_NAME); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index bebf0ac0d..e740410cd 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -651,6 +651,9 @@ public class PlayerLogic { } EquipManager equipManager = userInMem.getEquipManager(); Map equipMap = equipManager.getEquipMap(); + for(String equipId : hero.getJewelInfo()){ + builder.addEquip(CBean2Proto.getEquipProto(equipMap.get(equipId))); + } for(String equipId : hero.getEquipByPositionMap().values()){ builder.addEquip(CBean2Proto.getEquipProto(equipMap.get(equipId))); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildForceRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildForceRank.java index 2d53ac03d..183442992 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildForceRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildForceRank.java @@ -47,6 +47,7 @@ public class GuildForceRank extends AbstractRank { User user = UserManager.getUser(chairManId); CommonProto.UserRank.Builder everyRank = CommonProto.UserRank.newBuilder() .setUid(user.getId()) + .setLevel(user.getPlayerInfoManager().getLevel()) .setGuildName(guildInfo.getName()) .setRankInfo(everyRankInfo); builder.addRanks(everyRank);