diff --git a/gamecommon/src/main/java/util/TimeUtils.java b/gamecommon/src/main/java/util/TimeUtils.java index e2b5abd12..df0d599c7 100644 --- a/gamecommon/src/main/java/util/TimeUtils.java +++ b/gamecommon/src/main/java/util/TimeUtils.java @@ -1553,7 +1553,7 @@ public class TimeUtils { * @return */ public static double getDoubleTime(){ - return (Integer.MAX_VALUE-now()/1000)/Math.pow(10,9); + return (Integer.MAX_VALUE-nowInt())/Math.pow(10,9); } 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 6b5203aa1..20e7b2ca8 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 @@ -261,19 +261,19 @@ public class FourChallengeLogic { String miniSubKey = MINI + campId; // 首次通关记录 - Map first = RedisUtil.getInstence().getMapValues(RedisKey.FOUR_CHALLENGE, firstSubKey, String.class, ArenaRecord.class); - if (first.get(floorIds) == null){ + ArenaRecord first = RedisUtil.getInstence().getMapValue(RedisKey.FOUR_CHALLENGE, firstSubKey, floorIds, ArenaRecord.class); + if (first == null){ // 记录redis RedisUtil.getInstence().putMapEntry(RedisKey.FOUR_CHALLENGE, firstSubKey, floorIds, arenaRecord); } // 最低战力记录 - Map force = RedisUtil.getInstence().getMapValues(RedisKey.FOUR_CHALLENGE, miniSubKey, String.class, ArenaRecord.class); - if (force.get(floorIds) == null){ + ArenaRecord force = RedisUtil.getInstence().getMapValue(RedisKey.FOUR_CHALLENGE, miniSubKey, floorIds, ArenaRecord.class); + if (force == null){ // 记录redis RedisUtil.getInstence().putMapEntry(RedisKey.FOUR_CHALLENGE, miniSubKey, floorIds, arenaRecord); }else { - int attackForce = force.get(floorIds).getAttackForce(); + int attackForce = force.getAttackForce(); if (myforce < attackForce){ // 记录redis RedisUtil.getInstence().putMapEntry(RedisKey.FOUR_CHALLENGE, miniSubKey, floorIds, arenaRecord); @@ -427,12 +427,7 @@ public class FourChallengeLogic { */ private void getFightRecord2(int tier,int function, String subKey, List lists) throws Exception { // 根据子key获取对应的回放信息 - Map mapValues = RedisUtil.getInstence().getMapValues(RedisKey.FOUR_CHALLENGE, subKey, String.class, ArenaRecord.class); - if (mapValues == null || mapValues.isEmpty()){ - return; - } - // 获取对应层数的战斗记录 - ArenaRecord arenaRecord = mapValues.get(String.valueOf(tier)); + ArenaRecord arenaRecord = RedisUtil.getInstence().getMapValue(RedisKey.FOUR_CHALLENGE, subKey, String.valueOf(tier), ArenaRecord.class); if (arenaRecord == null){ return; } 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 99d0b0455..01be83d72 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 @@ -3043,7 +3043,7 @@ public class HeroLogic{ * * // TODO isMyself ??? */ - public int calTeamTotalForce(User targetUser,int teamId,boolean isMyself){ + public int calTeamTotalForce(User targetUser,int teamId,boolean isMyself){ int totalForce =0; targetUser.getTeamPosManager().setCurTeamPosId(teamId); Map> teamPosForHero = targetUser.getTeamPosManager().getTeamPosForHero(); @@ -3060,7 +3060,11 @@ public class HeroLogic{ for (TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfoList) { Hero hero = targetUser.getHeroManager().getHero(teamPosHeroInfo.getHeroId()); if (hero == null) { - continue; + // 助战获取,随后最好加上编队验证 + hero = HelpHeroLogic.getHelpHero(targetUser.getId(),teamPosHeroInfo.getHeroId()).getHero(); + if (hero == null){ + continue; + } } long force = calHeoForce(targetUser, hero, teamId); if(maxForceHero