From 9f7a7b0725a1ea89db62bc9d194407388e4026e8 Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 10 Nov 2021 18:22:23 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit a1fce080ee439e34e5862dd4c2ae4cf3477590c6) --- .../com/ljsd/jieling/logic/friend/FriendLogic.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 d322ff6cc..432eb9674 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 @@ -330,13 +330,16 @@ public class FriendLogic { public void sendAgree(ISession iSession, int type, int friendId ) throws Exception { int msgId = MessageTypeProto.MessageType.FRIEND_INVITE_OPERATION_RESPONSE_VALUE; int uid = iSession.getUid(); + // 自己的信息 User user = UserManager.getUser(uid); FriendManager friendManager = user.getFriendManager(); - User friendUser = UserManager.getUserNotCache(friendId); - if (friendId == 0 || friendUser == null){ - return; + // 好友的信息 + User friendUser = null; + FriendManager friendManager1 = null; + if(friendId!=0){ + friendUser = UserManager.getUserNotCache(friendId); + friendManager1 = friendUser.getFriendManager(); } - FriendManager friendManager1 = friendUser.getFriendManager(); List friends = friendManager.getFriends(); List applyFriends = friendManager.getApplyFriends(); int maxFriends = SSpecialConfig.getIntegerValue(SSpecialConfig.FRIENDAMOUNT_LIMIT); From f0fa655dc857aa05d7d453149e4898c5097488fd Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Sat, 13 Nov 2021 22:18:09 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=A3=AE=E7=BD=97=E5=B9=BB=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/activity/ExpectRankActivity.java | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java index 308bf1564..105c44dba 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java @@ -38,22 +38,29 @@ class ExpectRankActivity extends AbstractActivity { @Override void updateProgressWithUser(User user, ActivityMission activityMission, int count) { - if(SGlobalActivity.getsGlobalActivityMap().get(id).getOpenRanking()==1){ + if(SGlobalActivity.getsGlobalActivityMap().get(id).getType() == 70){ + //森罗幻境特殊处理 + if(SGlobalActivity.getsGlobalActivityMap().get(id).getOpenRanking()==1){ + MapManager mapManager = user.getMapManager(); + TrialInfo trialInfo = mapManager.getTrialInfo(); + //排除神秘关卡 + if(trialInfo.getFloor()<10000 && trialInfo.getFloor() > activityMission.getV()){ + activityMission.setV(trialInfo.getFloor()); + }else if(trialInfo.getFloor()>10000){ + activityMission.setV(trialInfo.getFloor()-10000); + + } + RankContext.getRankEnum(RankEnum.EXPERT_RANK.getType()).addRank(user.getId(),String.valueOf(id),activityMission.getV()); + }else{ + activityMission.setV(count + activityMission.getV()); + } + }else { + activityMission.setV(count + activityMission.getV()); + if(SGlobalActivity.getsGlobalActivityMap().get(id).getOpenRanking()==1){ // String key = RedisKey.getKey(RedisKey.EXPERT_RANK, String.valueOf(id), false); // RedisUtil.getInstence().zsetAddOne(key, String.valueOf(user.getId()), activityMission.getV()); - //RankContext.getRankEnum(RankEnum.EXPERT_RANK.getType()).addRank(user.getId(),String.valueOf(id),activityMission.getV()); - MapManager mapManager = user.getMapManager(); - TrialInfo trialInfo = mapManager.getTrialInfo(); - //排除神秘关卡 - if(trialInfo.getFloor()<10000 && trialInfo.getFloor() > activityMission.getV()){ - activityMission.setV(trialInfo.getFloor()); - }else if(trialInfo.getFloor()>10000){ - activityMission.setV(trialInfo.getFloor()-10000); + RankContext.getRankEnum(RankEnum.EXPERT_RANK.getType()).addRank(user.getId(),String.valueOf(id),activityMission.getV()); } - //activityMission.setV(count + activityMission.getV()); - RankContext.getRankEnum(RankEnum.EXPERT_RANK.getType()).addRank(user.getId(),String.valueOf(id),activityMission.getV()); - }else{ - activityMission.setV(count + activityMission.getV()); } } From fbb977b360c5ff04b5f426dfc83097d701dab006 Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 17 Nov 2021 08:31:25 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=AD=82=E5=AE=9D=E7=81=B5=E5=AE=9D?= =?UTF-8?q?=E5=BC=BA=E8=BD=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 1a817c59e..68c9a571f 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 @@ -1,5 +1,7 @@ package com.ljsd.jieling.logic.hero; +import com.alibaba.fastjson.JSONObject; +import com.google.gson.Gson; import com.ljsd.GameApplication; import com.ljsd.fight.FamilyHeroInfo; import com.ljsd.jieling.chat.logic.ChatLogic; @@ -2685,7 +2687,8 @@ public class HeroLogic { if (propertyItem == null) { continue; } - Jewel j = (Jewel) propertyItem; + Gson gson = RedisUtil.getInstence().getGson(); + Jewel j = gson.fromJson(gson.toJson(propertyItem),Jewel.class); SJewelConfig config = STableManager.getConfig(SJewelConfig.class).get(j.getEquipId()); // 进阶 Map> rankPoolMap = SJewelRankupConfig.rankupMap.get(config.getRankupPool()); From a52e39292dfafdfeaf7703afd2702974487bdeed Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 17 Nov 2021 08:52:43 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E9=AD=82=E5=AE=9D=E7=81=B5=E5=AE=9D?= =?UTF-8?q?=E4=BA=8C=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/hero/HeroLogic.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 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 68c9a571f..96fe009d2 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 @@ -2687,9 +2687,16 @@ public class HeroLogic { if (propertyItem == null) { continue; } - Gson gson = RedisUtil.getInstence().getGson(); - Jewel j = gson.fromJson(gson.toJson(propertyItem),Jewel.class); - SJewelConfig config = STableManager.getConfig(SJewelConfig.class).get(j.getEquipId()); + Jewel j; + if (propertyItem instanceof Jewel){ + j = (Jewel) propertyItem; + }else { + j = new Jewel(); + j.setHeroId(propertyItem.getHeroId()); + j.setLevel(propertyItem.getLevel()); + j.setEquipId(propertyItem.getEquipId()); + j.setBuildLevel(1); + } // 进阶 Map> rankPoolMap = SJewelRankupConfig.rankupMap.get(config.getRankupPool()); // 升级 From 849f0d4d5276500a3bdeba319b5af5c3a3b44a2e Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 17 Nov 2021 08:59:12 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 96fe009d2..f84710b06 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 @@ -2687,7 +2687,7 @@ public class HeroLogic { if (propertyItem == null) { continue; } - Jewel j; + Jewel j = null; if (propertyItem instanceof Jewel){ j = (Jewel) propertyItem; }else { @@ -2697,6 +2697,7 @@ public class HeroLogic { j.setEquipId(propertyItem.getEquipId()); j.setBuildLevel(1); } + SJewelConfig config = STableManager.getConfig(SJewelConfig.class).get(j.getEquipId()); // 进阶 Map> rankPoolMap = SJewelRankupConfig.rankupMap.get(config.getRankupPool()); // 升级 From dbfd1588c461d60db244fddffdbc72e72404150c Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Wed, 17 Nov 2021 09:34:39 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0null=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/player/PlayerLogic.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 1f415f213..ccd9b0717 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 @@ -1739,7 +1739,8 @@ public class PlayerLogic { return null; } } - if (userStr == null) { + if (userStr == null || userStr.isEmpty()) { + LOGGER.error("getUserByRpc ,userStr == null uid={}", uid); return null; } Gson gson = RedisUtil.getInstence().getGson(); From 9d90b6b6bf12f9a81cef4aa9a7c93e73e751da1b Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Wed, 17 Nov 2021 10:32:17 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8id=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/dao/cross/CSPlayer.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/cross/CSPlayer.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/cross/CSPlayer.java index dda3657b9..b087690dc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/cross/CSPlayer.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/cross/CSPlayer.java @@ -1,5 +1,8 @@ package com.ljsd.jieling.logic.dao.cross; +import com.ljsd.GameApplication; +import com.ljsd.jieling.db.mongo.AreaManager; + /** * @Author hj * @Date 2021/8/31 15:30:04 @@ -189,6 +192,7 @@ public class CSPlayer { } public int getServerId() { + int serverId = AreaManager.getInstance().getServerIdByUid(userId, GameApplication.serverId); return serverId; }