diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java index 555349d53..3c1c6e1fd 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java @@ -234,5 +234,7 @@ public interface BIReason { int GUILD_SKILL_LEVEL_UP_CONSUME = 1056;//工会技能升级消耗 int FETE_CONSUME = 1057;//祭祀消耗 + int COMPLEX_JEVEL_EQUIP_CONSUME = 1058; //合成宝器 + } \ No newline at end of file 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 30f1020c0..8edf0b47b 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 @@ -74,7 +74,7 @@ public class GuildLogic { int guildId = user.getPlayerInfoManager().getGuildId(); if(guildId == 0){ - throw new ErrorCodeException(ErrorCode.FAMILY_NO); + return; } //check 最近一次公会id