From 401889401ca17df505ac1b4e280eb497b466c947 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Thu, 21 Apr 2022 18:34:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=AE=E7=BD=97=E5=B9=BB=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/activity/ExpectRankActivity.java | 45 +++---------------- .../jieling/logic/arena/ChallengeLogic.java | 4 +- 2 files changed, 7 insertions(+), 42 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java index 8e9807578..72ce07969 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java @@ -37,42 +37,6 @@ class ExpectRankActivity extends AbstractActivity { super(id); } - - @Override - public void onActivityStart() throws Exception { - - - } - - @Override - public void initActivity(User user) throws Exception { - //PlayerManager player = user.getPlayerInfoManager(); - if (SGlobalActivity.getsGlobalActivityMap().get(id).getType() != 70){ - return; - } - ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(id); - if (null == activityMission) { - return; - } - Map activityProgressInfoMap = activityMission.getActivityMissionMap(); - - MapManager mapManager = user.getMapManager(); - TrialInfo trialInfo = mapManager.getTrialInfo(); - SActivityRewardConfig.getsActivityRewardConfigByActivityId(id).stream().forEach(n -> - { - if (trialInfo.getFloor() >= n.getValues()[1][0]) { - ActivityProgressInfo activityProgressInfo = activityProgressInfoMap.getOrDefault(n.getId(), null); - if (null == activityProgressInfo) - return; - activityProgressInfo.setState(1); - } - } - ); - //更新进度 - ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId()); - sendActivityProgress(sessionByUid, activityMission, null); - } - @Override void updateProgressWithUser(User user, ActivityMission activityMission, int count) { @@ -82,13 +46,14 @@ class ExpectRankActivity extends AbstractActivity { MapManager mapManager = user.getMapManager(); TrialInfo trialInfo = mapManager.getTrialInfo(); //排除神秘关卡 + int floor = 0 ; if (trialInfo.getFloor() < 10000 && trialInfo.getFloor() > activityMission.getV()) { - activityMission.setV(trialInfo.getFloor()); + floor = trialInfo.getFloor(); } else if (trialInfo.getFloor() > 10000) { - activityMission.setV(trialInfo.getFloor() - 10000); - + floor = trialInfo.getFloor() - 10000; } - RankContext.getRankEnum(RankEnum.EXPERT_RANK.getType()).addRank(user.getId(), String.valueOf(id), activityMission.getV()); + activityMission.setV(count + activityMission.getV()); + RankContext.getRankEnum(RankEnum.EXPERT_RANK.getType()).addRank(user.getId(), String.valueOf(id), floor); } else { activityMission.setV(count + activityMission.getV()); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ChallengeLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ChallengeLogic.java index 17f33504d..4f69abeb6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ChallengeLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ChallengeLogic.java @@ -201,10 +201,10 @@ public class ChallengeLogic { int endlessNewReplicaLexel = user.getPlayerInfoManager().getEndlessNewReplica(); int treasureReplicaLexel = user.getPlayerInfoManager().getTreasureReplica(); //限制 - /* boolean consume = PlayerLogic.getInstance().checkAndUpdate(user, sChallengeConfig.getPivilegeID()[1], 1); + boolean consume = PlayerLogic.getInstance().checkAndUpdate(user, sChallengeConfig.getPivilegeID()[1], 1); if (!consume) { throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); - }*/ + } Map comDropMap = new HashMap<>(); if (model == 2) { //扫荡