From 8946f22d57210993ec2a197829d8fbc77471816f Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 6 Jan 2022 14:59:08 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B3=95=E5=AE=9D=E8=81=9A=E7=81=B5&?= =?UTF-8?q?=E8=B7=A8=E6=9C=8Drpc=E3=80=91=201=E3=80=81=E8=81=9A=E7=81=B5?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=88=97=202=E3=80=81rpc?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=B7=BB=E5=8A=A0catch=EF=BC=8C=E7=AE=80?= =?UTF-8?q?=E5=8C=96log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/hero/HeroLogic.java | 1 + .../jieling/logic/player/PlayerLogic.java | 10 ++----- .../logic/ridingSward/RidingSwardLogic.java | 30 +++++++++++-------- .../src/main/java/config/STrumpStar.java | 6 +++- 4 files changed, 26 insertions(+), 21 deletions(-) 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 04074ffce..3e9cf60d4 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 @@ -2677,6 +2677,7 @@ public class HeroLogic { for (STrumpStar star : trumpStars) { if (sumStar >= star.getStarNum()){ combinedAttribute(star.getPropList(), heroAllAttribute); + break; } } //玩家皮肤加成 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 4b217cb5a..3ce810493 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 @@ -1681,22 +1681,19 @@ public class PlayerLogic { String ip = rpcString.split(":")[0]; String port = rpcString.split(":")[3]; StringBuilder sb = new StringBuilder(); - sb.append("RPCCORE").append("|") - .append(ip).append("|") - .append(port); + sb.append("RPCCORE").append("|").append(ip).append("|").append(port); ClientAdapterPo rPCClient = null; String userStr = null ; try{ rPCClient = ClientAdapterPo.getClientAdapterPo(sb.toString()); userStr = rPCClient.getClient().getUserByRPC(uid); }catch (Exception e) { - LOGGER.error("callback=>{}", e); + LOGGER.error("callback=>{}", e.getMessage()); } finally { if(rPCClient != null){ rPCClient.returnObject(sb.toString()); }else{ LOGGER.info("callback=> rPCClient is null "); - return null; } } if (userStr == null || userStr.isEmpty()) { @@ -1704,8 +1701,7 @@ public class PlayerLogic { return null; } Gson gson = RedisUtil.getInstence().getGson(); - User user = gson.fromJson(userStr, User.class); - return user; + return gson.fromJson(userStr, User.class); } //森罗幻境自动挂机奖励展示 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/ridingSward/RidingSwardLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/ridingSward/RidingSwardLogic.java index 490181735..adba088f0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/ridingSward/RidingSwardLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/ridingSward/RidingSwardLogic.java @@ -252,20 +252,24 @@ public class RidingSwardLogic{ else { // 跨服排行榜玩家排名玩家信息 ArrayList infos = new ArrayList<>(4); - // 跨服排行数据 - AbstractRank rank = RankContext.getRankEnum(RankEnum.CROSS_FORCE_CURR_RANK.getType()); - Set> tupleSet = rank.getCrossRankByKey("", 1, 4); - for (ZSetOperations.TypedTuple tuple : tupleSet) { - // 跨服排行榜玩家数据 - CSPlayer csPlayer = CrossServiceLogic.getPlayerByRedis(Integer.parseInt(tuple.getValue())); - if (csPlayer == null){ - continue; + try { + // 跨服排行数据 + AbstractRank rank = RankContext.getRankEnum(RankEnum.CROSS_FORCE_CURR_RANK.getType()); + Set> tupleSet = rank.getCrossRankByKey("", 1, 4); + for (ZSetOperations.TypedTuple tuple : tupleSet) { + // 跨服排行榜玩家数据 + CSPlayer csPlayer = CrossServiceLogic.getPlayerByRedis(Integer.parseInt(tuple.getValue())); + if (csPlayer == null){ + continue; + } + CommonProto.ModelUserInfo.Builder builder = CommonProto.ModelUserInfo.newBuilder() + .setUserName(csPlayer.getName()) + .setSex(csPlayer.getSex()) + .setPracticeLevel(csPlayer.getPracticeLevel()); + infos.add(builder.build()); } - CommonProto.ModelUserInfo.Builder builder = CommonProto.ModelUserInfo.newBuilder() - .setUserName(csPlayer.getName()) - .setSex(csPlayer.getSex()) - .setPracticeLevel(csPlayer.getPracticeLevel()); - infos.add(builder.build()); + }catch (Exception e){ + LOGGER.error(e.getMessage()); } build.addAllModelInfo(infos); build.setState(getState()); diff --git a/tablemanager/src/main/java/config/STrumpStar.java b/tablemanager/src/main/java/config/STrumpStar.java index 6a3dd7fd0..61029f266 100644 --- a/tablemanager/src/main/java/config/STrumpStar.java +++ b/tablemanager/src/main/java/config/STrumpStar.java @@ -12,6 +12,8 @@ public class STrumpStar implements BaseConfig { private int starNum; + private int[][] propListShow; + private int[][] propList; @@ -33,5 +35,7 @@ public class STrumpStar implements BaseConfig { return propList; } - + public int[][] getPropListShow() { + return propListShow; + } } \ No newline at end of file