From ec1d89d998d416236f7eec1d65c021db9b9fadf0 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Fri, 25 Aug 2023 11:06:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=83=AD=E6=9B=B4=E5=85=AC=E4=BC=9Abug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/hotfix.json | 4 +++- .../main/java/com/ljsd/jieling/logic/dao/GuilidManager.java | 6 +++++- .../main/java/com/ljsd/jieling/logic/family/GuildLogic.java | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/conf/hotfix.json b/conf/hotfix.json index 2e5c7ac7a..b461670f0 100644 --- a/conf/hotfix.json +++ b/conf/hotfix.json @@ -1,5 +1,7 @@ { - "version":"5", + "version":"6", "classes":[ + {"name":"GuildLogic.class","fullName":"com.ljsd.jieling.logic.family.GuildLogic"}, + {"name":"GuilidManager.class","fullName":"com.ljsd.jieling.logic.dao.GuilidManager"} ] } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuilidManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuilidManager.java index dbab3602d..a0390ab15 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuilidManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuilidManager.java @@ -155,12 +155,16 @@ public class GuilidManager { needContinue=false; break; } + GuildInfo guildInfo = RedisUtil.getInstence().getMapValue2(getFamilyKey(), value, GuildInfo.class); + if (guildInfo != null && guildInfo.getServerId() != GameApplication.serverId){ + return; + } + // redis清理key AbstractRank guildRank = RankContext.getRankEnum(RankEnum.CAR_DEALY_GUILD_RANK.getType()); RedisUtil.getInstence().zsetRemoveOne(RedisUtil.getInstence().getKey(guildRank.getRedisKey(),""),value); RedisUtil.getInstence().zsetRemoveOne(RedisUtil.getInstence().getKey2(guildRank.getCrossRedisKey(),""),value); - GuildInfo guildInfo = RedisUtil.getInstence().getMapValue2(getFamilyKey(), value, GuildInfo.class); if(guildInfo != null){ // 公会存在 String delKey = RedisUtil.getInstence().getKey(RedisKey.GUILD_SERVERID, String.valueOf(guildInfo.getId())); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index 1cd246e3e..b17e08c6b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -847,7 +847,10 @@ public class GuildLogic { String title = SErrorCodeEerverConfig.getI18NMessage("guild_breakup_title"); Set chairmans = guildInfo.getMembers().get(GlobalsDef.CHAIRMAN); Integer chairmanUid = chairmans.iterator().next(); - User chairmanUser = UserManager.getUser(chairmanUid); + User chairmanUser = UserManager.getUserNotCache(chairmanUid); + if (chairmanUser == null){ + return; + } String content = SErrorCodeEerverConfig.getI18NMessageNeedConvert("guild_breakup_txt",new String[]{guildInfo.getName(),chairmanUser.getPlayerInfoManager().getNickName()},new int[]{0,0},"#"); for(Set items : members.values()){ for(Integer sendUid : items){ From 3ded8132e3395dd0bd8267a852d8feff7d340d13 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Fri, 25 Aug 2023 11:23:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=83=AD=E6=9B=B4=E5=85=AC=E4=BC=9Abug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/hotfix.json | 4 +++- .../main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 6 +++--- .../java/com/ljsd/jieling/logic/player/PlayerLogic.java | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/conf/hotfix.json b/conf/hotfix.json index b461670f0..bee2706e6 100644 --- a/conf/hotfix.json +++ b/conf/hotfix.json @@ -2,6 +2,8 @@ "version":"6", "classes":[ {"name":"GuildLogic.class","fullName":"com.ljsd.jieling.logic.family.GuildLogic"}, - {"name":"GuilidManager.class","fullName":"com.ljsd.jieling.logic.dao.GuilidManager"} + {"name":"GuilidManager.class","fullName":"com.ljsd.jieling.logic.dao.GuilidManager"}, + {"name":"PlayerLogic.class","fullName":"com.ljsd.jieling.logic.player.PlayerLogic"}, + {"name":"HeroLogic.class","fullName":"com.ljsd.jieling.logic.hero.HeroLogic"} ] } \ No newline at end of file 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 1706c519f..3ed2cefde 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 @@ -3402,7 +3402,7 @@ public class HeroLogic { public int calForce(Map heroAllAttribute) { float forceNum = 0;//基础值 float forceAdd = 0;//加成值 - LOGGER.info("战力基础属性=================={}",heroAllAttribute); +// LOGGER.info("战力基础属性=================={}",heroAllAttribute); //战力计算 for(Map.Entry item : heroAllAttribute.entrySet()){ Integer propertyId = item.getKey(); @@ -3417,7 +3417,7 @@ public class HeroLogic { } if(sPropertyConfig.getStyle() == GlobalsDef.PERCENT_TYPE){ forceAdd += propertyValue * sPropertyConfig.getScore() / 10000; - LOGGER.info("战力加成值 ================> {},{}" , propertyId, propertyValue * sPropertyConfig.getScore() / 10000); +// LOGGER.info("战力加成值 ================> {},{}" , propertyId, propertyValue * sPropertyConfig.getScore() / 10000); }else{ forceNum += propertyValue * sPropertyConfig.getScore(); } @@ -3425,7 +3425,7 @@ public class HeroLogic { // BigDecimal bg = new BigDecimal(forceAdd).setScale(4, RoundingMode.UP); // float v = bg.floatValue(); float result = (forceAdd + 1) * forceNum; - LOGGER.info("战力总结果==============={},{},{}",forceNum,forceAdd,result); +// LOGGER.info("战力总结果==============={},{},{}",forceNum,forceAdd,result); return (int)result; } 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 08c749467..4a1efd34a 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 @@ -1805,7 +1805,7 @@ public class PlayerLogic { } // JSONObject jsonObject = JSONObject.parseObject(userStr); // jsonObject.remove("activityManager"); - LOGGER.info("callback=> rPCClient is =>{}",userStr); +// LOGGER.info("callback=> rPCClient is =>{}",userStr); return gson.fromJson(userStr, User.class); } From 53dff854cdd829f8d72e3eefb84239f4968a37b7 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Fri, 25 Aug 2023 11:26:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=83=AD=E6=9B=B4=E5=85=AC=E4=BC=9Abug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/dao/GuilidManager.java | 3 --- .../main/java/com/ljsd/jieling/logic/family/GuildLogic.java | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuilidManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuilidManager.java index a0390ab15..2d889e834 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuilidManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuilidManager.java @@ -156,9 +156,6 @@ public class GuilidManager { break; } GuildInfo guildInfo = RedisUtil.getInstence().getMapValue2(getFamilyKey(), value, GuildInfo.class); - if (guildInfo != null && guildInfo.getServerId() != GameApplication.serverId){ - return; - } // redis清理key AbstractRank guildRank = RankContext.getRankEnum(RankEnum.CAR_DEALY_GUILD_RANK.getType()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index b17e08c6b..55b9bab70 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -847,11 +847,11 @@ public class GuildLogic { String title = SErrorCodeEerverConfig.getI18NMessage("guild_breakup_title"); Set chairmans = guildInfo.getMembers().get(GlobalsDef.CHAIRMAN); Integer chairmanUid = chairmans.iterator().next(); - User chairmanUser = UserManager.getUserNotCache(chairmanUid); - if (chairmanUser == null){ + CSPlayer player = CrossServiceLogic.getPlayerByRedis(chairmanUid); + if (player == null){ return; } - String content = SErrorCodeEerverConfig.getI18NMessageNeedConvert("guild_breakup_txt",new String[]{guildInfo.getName(),chairmanUser.getPlayerInfoManager().getNickName()},new int[]{0,0},"#"); + String content = SErrorCodeEerverConfig.getI18NMessageNeedConvert("guild_breakup_txt",new String[]{guildInfo.getName(),player.getName()},new int[]{0,0},"#"); for(Set items : members.values()){ for(Integer sendUid : items){ try {