From c3dc931ea219e717f039adecb3709fbe386e390c Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 10 Sep 2019 20:09:30 +0800 Subject: [PATCH 1/3] fix --- .../com/ljsd/jieling/logic/GlobalDataManaager.java | 13 ++++++++++--- .../com/ljsd/jieling/logic/dao/GuildMyInfo.java | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) 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 8a017e015..d453ed938 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -200,10 +200,17 @@ public class GlobalDataManaager { checkSystemFunctioIsOpen(); GlobalSystemControl globalSystemControl = MongoUtil.getInstence().getMyMongoTemplate().findById(GameApplication.serverId, GlobalSystemControl.class); if(globalSystemControl != null){ + TimeControllerOfFunction timeControllerOfFunction = globalSystemControl.getTimeControllerOfFunctionMap().get(8); - ArenaLogic.getInstance().updateArenaSeason(timeControllerOfFunction.getTimes()); - MapLogic.getInstance().updateEndlessSeason(globalSystemControl.getTimeControllerOfFunctionMap().get(46).getTimes()); - MapLogic.setEndlessMapId(getEndleeMapIdByLevel()); + if(timeControllerOfFunction != null){ + ArenaLogic.getInstance().updateArenaSeason(timeControllerOfFunction.getTimes()); + } + if(globalSystemControl.getTimeControllerOfFunctionMap().containsKey(46)){ + MapLogic.getInstance().updateEndlessSeason(globalSystemControl.getTimeControllerOfFunctionMap().get(46).getTimes()); + MapLogic.setEndlessMapId(getEndleeMapIdByLevel()); + } + + } MissionEventDistributor.init(); DataManagerDistributor.init(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java index e5fefe1a8..697af2219 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java @@ -27,7 +27,7 @@ public class GuildMyInfo extends MongoBase { public void clearOfLevelGuild(){ path.clear(); - curPos = 257; + curPos = initPos; setCurPos(curPos); setPath(new ArrayList<>()); } From d49eb6114ba80fc5d6723785fc1c70b7361f99e2 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 12 Sep 2019 12:12:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=81=8A=E5=A4=A9=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/chat/logic/ChatLogic.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/chat/logic/ChatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/chat/logic/ChatLogic.java index 702090c63..304970926 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/chat/logic/ChatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/chat/logic/ChatLogic.java @@ -101,7 +101,9 @@ public class ChatLogic { boolean result = true; switch (chatType){ case 1: - result = ShieldedWordUtils.checkName(user,message,false,ChatContentType.WORLD_CHAT); + //0|content需要解字符串 + String s = message.split("|",3)[2]; + result = ShieldedWordUtils.checkName(user,s,false,ChatContentType.WORLD_CHAT); break; case 2: result= ShieldedWordUtils.checkName(user,message,false,ChatContentType.FAMILY); From 08324adb9189d5fd38c4772ddeb150ef0b8a45cc Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 13 Sep 2019 12:19:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8C=B9=E9=85=8D=E6=97=B6=E6=98=9F?= =?UTF-8?q?=E6=95=B0=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/family/GuildFightLogic.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java index 2cc8be711..c27bf4c12 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java @@ -311,6 +311,7 @@ public class GuildFightLogic { .setName(enemyInfo.getName()) .setPictureId(1) .setTotalStar(redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_TOTAL_STAR,"",String.valueOf(enemyFamily),Integer.class)) + .setMyTotalStar(redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_TOTAL_STAR,"",String.valueOf(guildInfo.getId()),Integer.class)) .build(); GuildLogic.sendIndicationToMember(guildInfo, MessageTypeProto.MessageType.FAMILY_FIGHT_MATCHING_SUCCESS_INDICATION, familyInfo); } @@ -501,7 +502,14 @@ public class GuildFightLogic { .setJoinType(1); if (enemyFamily != -1) { GuildInfo guildInfo = GuilidManager.guildInfoMap.get(enemyFamily); - Family.EnemyFamily familyInfo = Family.EnemyFamily.newBuilder().setId(guildInfo.getId()).setLevel(guildInfo.getLevel()).setName(guildInfo.getName()).setPictureId(1).build(); + Family.EnemyFamily familyInfo = Family.EnemyFamily.newBuilder() + .setId(guildInfo.getId()) + .setLevel(guildInfo.getLevel()) + .setName(guildInfo.getName()) + .setPictureId(1) + .setTotalStar(redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_TOTAL_STAR,"",String.valueOf(enemyFamily),Integer.class)) + .setMyTotalStar(redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_TOTAL_STAR,"",String.valueOf(guildInfo.getId()),Integer.class)) + .build(); response.setEnemy(familyInfo); }else{ if(status!=0&&status!=1){