diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/EventType.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/EventType.java index f8a249324..cd750400f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/EventType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/EventType.java @@ -13,7 +13,7 @@ public class EventType { public static final int businessman = 6; public static final int box = 7; public static final int hinder = 8; - public static final int allEvents = 9; + public static final int towerBuff = 9; public static final int suddenlyBoss = 11; //精英怪 /** diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index af69f67b7..930e921f2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -657,6 +657,11 @@ public class MapLogic { SEventPointConfig sEventPointConfig = STableManager.getConfig(SEventPointConfig.class).get(initialEventId); StoreLogic.initOneStore(user, sEventPointConfig.getOption()[0]); } + }else if(mapPointConfig.getStyle()==EventType.towerBuff){ + if(cell.getEventId()==0){ + BehaviorUtil.destoryApointXY(user,triggerXY); + throw new ErrorCodeException(ErrorCode.newDefineCode("该点已被清除")); + } } mapManager.setTriggerXY(triggerXY); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/EndlessMap.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/EndlessMap.java index 9ec80cece..22506ec36 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/EndlessMap.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/EndlessMap.java @@ -471,6 +471,7 @@ public class EndlessMap extends AbstractMap{ } } private int getMapIdByWorldLevel() throws Exception { +// return 4002; return GlobalDataManaager.getEndleeMapIdByLevel(); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java index b2ef96a2c..3a4ab9c58 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java @@ -113,7 +113,7 @@ public class GuildChallengeLogic { } int remainHp; if(bossHpRemain==0){ - remainHp = 0; + remainHp = 10000; }else if(bossHpRemain==-1){ remainHp = -1; }else{ @@ -304,7 +304,7 @@ public class GuildChallengeLogic { } int remainHp; if(guildInfo.getBossHpRemain()==0){ - remainHp = 0; + remainHp = 10000; }else if(guildInfo.getBossHpRemain()==-1){ remainHp = -1; }else{ 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 e423521be..aee4cdfee 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 @@ -682,7 +682,7 @@ public class HeroLogic{ // 卡牌不存在 return "card not exists"; } - }if(teamId==GlobalsDef.TRIAL_TEAM){ + }else if(teamId==GlobalsDef.TRIAL_TEAM){ if(!user.getMapManager().getTrialInfo().getHeroInfo().containsKey(heroId)){ return "card not exists"; }