From b2ced29b8ce4d231431abb8cfd91f897f1b69341 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Sun, 15 Mar 2020 21:19:05 +0800 Subject: [PATCH 1/5] fix rank --- .../com/ljsd/jieling/logic/rank/rankImpl/MainLevelRank.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/MainLevelRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/MainLevelRank.java index f58e7beb2..5905840be 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/MainLevelRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/MainLevelRank.java @@ -44,8 +44,12 @@ public class MainLevelRank extends AbstractRank { } return o1.getRankInfo().getRank()-o2.getRankInfo().getRank(); }); + List buildersCopy = new ArrayList<>(ranksBuilderList); + for(CommonProto.UserRank userRank : ranksBuilderList){ + buildersCopy.add(userRank.toBuilder().setRankInfo(userRank.toBuilder().getRankInfo().toBuilder().setRank(++start).build()).build()); + } PlayerInfoProto.RankResponse.Builder response = PlayerInfoProto.RankResponse.newBuilder(); - response.setMyRankInfo(allUserResponse.getMyRankInfo()).addAllRanks(builders); + response.setMyRankInfo(allUserResponse.getMyRankInfo()).addAllRanks(buildersCopy); return response; } From 4425bfd75b2f1e0b79dc32ef243c74c0e9964742 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 12 Mar 2020 14:14:36 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/rank/rankImpl/MainLevelRank.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/MainLevelRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/MainLevelRank.java index 5905840be..33d2ed1e4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/MainLevelRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/MainLevelRank.java @@ -44,9 +44,10 @@ public class MainLevelRank extends AbstractRank { } return o1.getRankInfo().getRank()-o2.getRankInfo().getRank(); }); - List buildersCopy = new ArrayList<>(ranksBuilderList); - for(CommonProto.UserRank userRank : ranksBuilderList){ - buildersCopy.add(userRank.toBuilder().setRankInfo(userRank.toBuilder().getRankInfo().toBuilder().setRank(++start).build()).build()); + List buildersCopy = new ArrayList<>(ranksBuilderList.size()); + for(CommonProto.UserRank userRank : builders){ + buildersCopy.add(userRank.toBuilder().setRankInfo(userRank.toBuilder().getRankInfo().toBuilder().setRank(start).build()).build()); + start++; } PlayerInfoProto.RankResponse.Builder response = PlayerInfoProto.RankResponse.newBuilder(); response.setMyRankInfo(allUserResponse.getMyRankInfo()).addAllRanks(buildersCopy); From f268f19439e821ceeb64f148e92af8af6a4f5011 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 12 Mar 2020 15:43:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=87=8F=E5=B0=91=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/util/MessageUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java index 7a38a101b..13e4abf4a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java @@ -37,7 +37,7 @@ public class MessageUtil { backMessage = new byte[0]; } else { backMessage = generatedMessage.toByteArray(); - LOGGER.info(JsonFormat.printToString(generatedMessage)); +// LOGGER.info(JsonFormat.printToString(generatedMessage)); } int length = PackageConstant.UID_FIELD_LEN + PackageConstant.TOKEN_LEN From 082671a2d97bec3d50ebae99aa2e26c369c6c311 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 13 Mar 2020 05:10:37 +0800 Subject: [PATCH 4/5] =?UTF-8?q?5=E7=82=B90=E7=82=B9=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java | 1 + 1 file changed, 1 insertion(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java index 7bab033b1..be2a0c533 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -347,6 +347,7 @@ public class GlobalDataManaager implements IManager { if (TimeUtils.isOverTime(0,user.getPlayerInfoManager().getLoginTime())) { flushGoodsTimes(user); } + user.getPlayerInfoManager().setLoginTime(TimeUtils.now()); } From 1a6b3fdd86d6443060d9e75eb07fcccf020fca5e Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 13 Mar 2020 10:15:31 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E5=8A=A0=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/common/mogodb/LjsdMongoTemplate.java | 4 ++++ serverlogic/src/main/java/com/ljsd/GameLogicService.java | 2 ++ 2 files changed, 6 insertions(+) diff --git a/common/src/main/java/com/ljsd/common/mogodb/LjsdMongoTemplate.java b/common/src/main/java/com/ljsd/common/mogodb/LjsdMongoTemplate.java index cd3f957ae..edc410946 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/LjsdMongoTemplate.java +++ b/common/src/main/java/com/ljsd/common/mogodb/LjsdMongoTemplate.java @@ -103,4 +103,8 @@ public class LjsdMongoTemplate { public Object convertToMongoType(Object obj){ return this.mongoTemplate.getConverter().convertToMongoType(obj); } + + public MongoTemplate getMongoTemplate() { + return mongoTemplate; + } } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/GameLogicService.java b/serverlogic/src/main/java/com/ljsd/GameLogicService.java index 937c590ba..9e78d9acc 100644 --- a/serverlogic/src/main/java/com/ljsd/GameLogicService.java +++ b/serverlogic/src/main/java/com/ljsd/GameLogicService.java @@ -13,6 +13,7 @@ import com.ljsd.jieling.logic.GlobalDataManaager; import com.ljsd.jieling.logic.activity.ActivityLogic; import com.ljsd.jieling.logic.dao.GuilidManager; import com.ljsd.jieling.logic.dao.MailingSystemManager; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.network.server.ProtocolsManager; import com.ljsd.jieling.thread.ThreadManager; @@ -48,6 +49,7 @@ public class GameLogicService implements IService { public void init() throws Exception { RedisUtil.getInstence().init(); MongoUtil.getInstence().init(); + MongoUtil.getLjsdMongoTemplate().getMongoTemplate().getCollection(User.getCollectionName()).createIndex("playerManager.level"); registerServerInfoToRedis(); }