From 5e561f5fcdbc19d08f63860f3ee1c00edeba1c3c Mon Sep 17 00:00:00 2001 From: duhui Date: Tue, 24 Aug 2021 13:40:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9B=E7=81=B5=E8=AF=95=E7=82=BC=EF=BC=8C?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/core/GlobalsDef.java | 5 +++++ .../main/java/com/ljsd/jieling/db/redis/RedisUtil.java | 3 ++- .../activity/fourChallenge/FourChallengeLogic.java | 2 +- .../main/java/com/ljsd/jieling/logic/dao/Jewel.java | 6 +----- .../ljsd/jieling/logic/family/CrossDeathPathLogic.java | 10 ++++------ .../java/com/ljsd/jieling/logic/hero/HeroLogic.java | 4 ---- 6 files changed, 13 insertions(+), 17 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java b/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java index a8ebd4a75..13f044464 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java @@ -104,6 +104,11 @@ public interface GlobalsDef { int VIP_UNLOCK_PRIVILEGE = 3; int RECHARGE_UNLOCK_PRIVILEGE = 4; + // 四灵试炼 + int FOURCHALLENGE_PEOPLE_TEAM = 1701; + int FOURCHALLENGE_BUDDHA_TEAM = 1702; + int FOURCHALLENGE_MONSTER_TEAM = 1703; + int FOURCHALLENGE_MORALITY_TEAM = 1704; //特殊商店id int DAILY_GOODS_FAST_ID = 1004;//每日礼包一键购买的礼包ID diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java index ba13f49e1..d9f0e6019 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java @@ -1239,8 +1239,9 @@ public class RedisUtil { for (int i = 0; i < MAX_TRY_TIMES; i++) { try { String valueStr = (String) redisTemplate.opsForHash().get(rkey, mapKey); - if (valueStr != null) + if (valueStr != null) { return gson.fromJson(valueStr, clazz); + } } catch (Exception e) { TimeUtils.sleep(FAILED_SLEEP); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/fourChallenge/FourChallengeLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/fourChallenge/FourChallengeLogic.java index 7aedb540e..bccf08c8f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/fourChallenge/FourChallengeLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/fourChallenge/FourChallengeLogic.java @@ -210,7 +210,7 @@ public class FourChallengeLogic { // 战斗逻辑 PVEFightEvent pveFightEvent = new PVEFightEvent(user.getId(), teamId, 20, "", GameFightType.FourChallenge, sCampTowerConfig.getMonster(), 3); FightResult fightResult = FightDispatcher.dispatcher(pveFightEvent); - int[] checkResult = fightResult.getCheckResult(); + long[] checkResult = fightResult.getCheckResult(); response.setFightData(fightResult.getFightData()); AbstractRank rank = RankContext.getRankEnum(RankEnum.FOUR_CHALLENGE_TIER_RANK.getType()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Jewel.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Jewel.java index 86efbd870..d15d5e405 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Jewel.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Jewel.java @@ -84,11 +84,7 @@ public class Jewel extends PropertyItem implements Cloneable { @Override public Jewel clone() { Jewel jewel = null; - try { - jewel = (Jewel) super.clone(); - } catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + jewel = (Jewel) super.clone(); return jewel; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/CrossDeathPathLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/CrossDeathPathLogic.java index 2d68589f6..27c0d4c64 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/CrossDeathPathLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/CrossDeathPathLogic.java @@ -181,12 +181,10 @@ public class CrossDeathPathLogic { Map hmget = RedisUtil.getInstence().hmget(RedisKey.DEATH_PATH_EVERY_OVER_HASH); if (hmget == null || hmget.size() < 1) { - Cursor cursor = RedisUtil.getInstence().scan("DEATH_PATH*"+groupId+":*", -1); - while (cursor.hasNext()) { - //找到一次就添加一次 - String next = cursor.next(); - LOGGER.info("=================删除跨服十绝阵排行:{}", next); - RedisUtil.getInstence().del(next); + Set dimKey = RedisUtil.getInstence().getDimKey("DEATH_PATH*" + groupId + ":*", -1); + for (String key : dimKey) { + RedisUtil.getInstence().del(key); + LOGGER.info("=================删除跨服十绝阵排行:{}", key); } } return hashMap; 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 1edf2ab96..99d0b0455 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 @@ -2298,10 +2298,6 @@ public class HeroLogic{ //装备总战力评分 int equipForce=0; Iterator> iterator = hero.getEquipByHongmengPositionMap(user.getHeroManager()).entrySet().iterator(); -<<<<<<< HEAD -======= - ->>>>>>> master_test_hw_four_challenge // 套装list初始化 ArrayList suiteNumList = new ArrayList<>(); while (iterator.hasNext()){