diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/EndlessMapInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/EndlessMapInfo.java index 46cbd9257..4da403b06 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/EndlessMapInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/EndlessMapInfo.java @@ -26,7 +26,7 @@ public class EndlessMapInfo { private Map mapInfo = new HashMap<>(); - private int skipFight; + private int skipFight = 1; private int season; 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 9bbee39b2..2daadb49d 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 @@ -682,10 +682,11 @@ public class GuildFightLogic { for (Map.Entry defendEntry:fightDefend.entrySet()){ //删除布防信息 redisUtil.removeMapEntrys(RedisKey.FAMILY_FIGHT,index,defendEntry.getKey().toString()); - //删除公会结算 - String starRankKey = RedisKey.getKey(RedisKey.FAMILY_FIGHT_STAR_RANK, String.valueOf(index), false); - redisUtil.removeZSetRangeByRank(starRankKey,0,redisUtil.getZsetSize(starRankKey)); + redisUtil.del(RedisKey.getKey(RedisKey.FAMILY_ATTACK_BLOOD,String.valueOf(defendEntry.getValue().getUid()),false)); } + //删除公会结算 + String starRankKey = RedisKey.getKey(RedisKey.FAMILY_FIGHT_STAR_RANK, String.valueOf(index), false); + redisUtil.removeZSetRangeByRank(starRankKey,0,redisUtil.getZsetSize(starRankKey)); for(int i = 1;i<=3;i++){ //删除获得星数信息 if(redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_CAL_STAR,String.valueOf(index),String.valueOf(i),Integer.class)!=null){ @@ -718,7 +719,7 @@ public class GuildFightLogic { redisUtil.del(extraStar); redisUtil.del(expKey); redisUtil.del(totalStar); - redisUtil.del(attackBlood); +// redisUtil.deleteByPrex(attackBlood); Integer fightSign = redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_FINISH_MATCHING, "", String.valueOf(GameApplication.serverId), int.class); if(fightSign!=-1){ redisUtil.putMapEntry(RedisKey.FAMILY_FIGHT_FINISH_MATCHING,"",String.valueOf(GameApplication.serverId),0);