diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java index 78501edae..1fd77b8a0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java @@ -23,6 +23,7 @@ import com.ljsd.jieling.logic.activity.event.Poster; import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.gm.ArenaOfUser; import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.family.CrossDeathPathLogic; import com.ljsd.jieling.logic.fight.*; import com.ljsd.jieling.logic.fight.result.FightResult; import com.ljsd.jieling.logic.hero.HeroLogic; @@ -969,11 +970,12 @@ public class ArenaLogic { Object get = RedisUtil.getInstence().hget(RedisKey.ARENA_PROUD_COUNT, String.valueOf(enemy.getId())); int proudTime = get==null?1:Integer.parseInt((String)get); int enemyId = enemy.getId(); + String serverName = CrossDeathPathLogic.getInstance().getServerNameByDeathPath(enemy.getPlayerManager().getServerId()); CommonProto.ArenaPersonInfo personInfoBuild = CommonProto.ArenaPersonInfo.newBuilder() .setUid(enemyId) .setLevel(enemy.getPlayerManager().getLevel()) .setName(enemy.getPlayerManager().getName()) - .setServername(enemy.getPlayerManager().getServerName()) + .setServername(serverName) .setTotalForce(enemy.getHeroManager().getTotalForce()) .setUserTitle(enemy.getPlayerManager().getUserTitle()) .setUserMount(enemy.getPlayerManager().getUserMount()) @@ -993,13 +995,14 @@ public class ArenaLogic { int enemyId = enemy.getEnemyId(); SArenaRobotConfig sArenaRobotConfig = SArenaRobotConfig.getsArenaRobotConfigById(enemyId); CommonProto.Team teamBuild = CommonProto.Team.newBuilder().addAllHeroTid(sArenaRobotConfig.getHeroList()).build(); + String serverName = CrossDeathPathLogic.getInstance().getServerNameByDeathPath(enemy.getServerID()); CommonProto.ArenaPersonInfo personInfoBuild = CommonProto.ArenaPersonInfo.newBuilder() .setUid(enemy.getEnemyId_UUid()) .setLevel(sArenaRobotConfig.getRobotLevel()) .setName(enemy.getRandomName()==null?"":enemy.getRandomName()) .setScore(sArenaRobotConfig.getRobotScore()) .setTotalForce(sArenaRobotConfig.getTotalForce()) - .setServername(CrossServiceLogic.getInstance().findServerName(enemy.getServerID())) + .setServername(serverName) .setUserSkin(80012) .setGender(enemy.isGender()?1:0) .setRank(rank) 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 a2e503b4c..2ec675de4 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 @@ -823,7 +823,7 @@ public class GuildLogic { throw new ErrorCodeException(ErrorCode.FAMILY_IN_SENSITIVE); }else{ if(type==1){ - if(content.length()<0||content.length()>32){ + if(content.length() > 32){ throw new ErrorCodeException(ErrorCode.ANNOUNCE_SIZE); } guildInfo.setAnnounce(content); @@ -835,6 +835,8 @@ public class GuildLogic { throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH); } guildInfo.setName(content); + // 缓存同步 + RedisUtil.getInstence().putMapEntry(RedisKey.FAMILY_INFO,"",String.valueOf(guildInfo.getId()),GuildCache.create(guildInfo)); } MessageUtil.sendMessage(session,resultCode,msgId,response,true); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index 512df7354..4c16deb27 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -14,6 +14,7 @@ import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.gm.ArenaOfHero; import com.ljsd.jieling.logic.dao.root.GuildInfo; import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.family.CrossDeathPathLogic; import com.ljsd.jieling.logic.fight.CombatLogic; import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.logic.store.newRechargeInfo.NewRechargeInfo; @@ -550,7 +551,8 @@ public class CBean2Proto { chatInfo.setMessageId(messageId); chatInfo.setUserTitle(playerInfoManager.getUserTitle()); chatInfo.setPracticeLevel(user.getHeroManager().getPracticeLevel()); - chatInfo.setServerName(CrossServiceLogic.getInstance().findServerName(GameApplication.serverId)); + String serverName = CrossDeathPathLogic.getInstance().getServerNameByDeathPath(GameApplication.serverId); + chatInfo.setServerName(serverName); return chatInfo.build(); }