From 8b47dc9a0ebb8c564981671426b2d5c86b2f4920 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 5 Aug 2020 21:22:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=96=E7=95=8C?= =?UTF-8?q?=E7=AD=89=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index 89bfbac42..5aec4ed3a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -142,7 +142,7 @@ public class GetPlayerInfoHandler extends BaseHandler{ int equipPool = user.getEquipManager().getSoulEquipPool(); CommonProto.EndlessInfo.Builder endless = CommonProto.EndlessInfo.newBuilder(); endless.setMapId(MapLogic.getEndlessMapId()); - endless.setWorldLevel(MongoUtil.getInstence().getMyMongoTemplate().findById(1, ServerConfig.class).getWorldLevel()); + endless.setWorldLevel(1); endless.setBloodScore(RedisUtil.getInstence().getZSetScore(RedisKey.BLOODY_RANK,Integer.toString(1), Integer.toString(userId)).intValue()); List goodsBagInfo = new ArrayList<>(SRechargeCommodityConfig.rechargeCommodityConfigMap.size()); BuyGoodsLogic.getGoodsBagInfo(userId,goodsBagInfo,true); From dcddda577787e316085fe0a26c29abe90be9f210 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Fri, 28 Aug 2020 21:25:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=B7=85=E5=B3=B0=E8=B5=9B=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/championship/ChampionshipLogic.java | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java index eec8f5869..e8dcc6893 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java @@ -498,25 +498,25 @@ public class ChampionshipLogic { .setHeadFrame(playerManager.getHeadFrame()) .setLevel(playerManager.getLevel()) .setName(playerManager.getNickName()).setUid(uid); - CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder(); - teamInfo.setTotalForce(fightInfo.getForce()); - if (!fightInfo.getPokenmonIds().isEmpty()) { - teamInfo.addAllPokemonInfos(fightInfo.getPokenmonIds()); - } - -// int i = 1; - for (Map.Entry entry : fightInfo.getHeroAttribute().entrySet()) { - FamilyHeroInfo familyHeroInfo = entry.getValue(); - teamInfo.addTeam(CommonProto.TeamSimpleInfo.newBuilder() - .setHeroid(entry.getKey()) - .setHeroTid(familyHeroInfo.getTempleteId()) - .setStar(familyHeroInfo.getStar()) - .setLevel(familyHeroInfo.getLevel()) - .setPosition(familyHeroInfo.getPosition()) - .build() - ); - } - oneInfo.setTeam(teamInfo); +// CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder(); +// teamInfo.setTotalForce(fightInfo.getForce()); +// if (!fightInfo.getPokenmonIds().isEmpty()) { +// teamInfo.addAllPokemonInfos(fightInfo.getPokenmonIds()); +// } +// +//// int i = 1; +// for (Map.Entry entry : fightInfo.getHeroAttribute().entrySet()) { +// FamilyHeroInfo familyHeroInfo = entry.getValue(); +// teamInfo.addTeam(CommonProto.TeamSimpleInfo.newBuilder() +// .setHeroid(entry.getKey()) +// .setHeroTid(familyHeroInfo.getTempleteId()) +// .setStar(familyHeroInfo.getStar()) +// .setLevel(familyHeroInfo.getLevel()) +// .setPosition(familyHeroInfo.getPosition()) +// .build() +// ); +// } +// oneInfo.setTeam(teamInfo); return oneInfo; } From 5be771fb3b3efd0e2df0b955f3d3b5870913aa8d Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Wed, 29 Jul 2020 20:04:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=83=AD=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/championship/ChampionshipLogic.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java index 42a371422..3d18c2105 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java @@ -1162,6 +1162,12 @@ public class ChampionshipLogic { int duration = sChampionshipSetting.getGuessTime() + sChampionshipSetting.getBattleTime(); //fix 只有竞猜和战斗 int progressState = getProgress((int) ((now - startTime) / 1000 % duration + 1)); //阶段 long round = (now - startTime) / 1000 / duration + 1;//轮数 + if(round>30){ + progress=-2; + //sendAllProgressUpdate(); + return; + } + roundTimes = (int) round; long diff = round - (sChampionshipSetting.getTrialsGroup() - 1); int progressTmp; From 7020797e78ae50846940022aa847583ece5fd26b Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Thu, 30 Jul 2020 10:26:01 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=81=93=E5=85=B7=E9=85=8D=E7=9A=84?= =?UTF-8?q?=E4=B8=8D=E5=AF=B9=20=E6=94=BE=E5=BC=80=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java index 643e84ae5..363ee353c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java @@ -193,7 +193,7 @@ public class ItemLogic { throw new ErrorCodeException(ErrorCode.ITEM_USE_ONE_MAX); } if (sItem.getUseType() !=2){ //n 选1 - throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); + LOGGER.info("Exception::useItem ==>uid={},itemNum={},openBoxLimits={}",uid,item.getItemNum(),openBoxLimits); } }