森罗幻境
parent
b64879f4b2
commit
401889401c
|
@ -37,42 +37,6 @@ class ExpectRankActivity extends AbstractActivity {
|
||||||
super(id);
|
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<Integer, ActivityProgressInfo> 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
|
@Override
|
||||||
void updateProgressWithUser(User user, ActivityMission activityMission, int count) {
|
void updateProgressWithUser(User user, ActivityMission activityMission, int count) {
|
||||||
|
|
||||||
|
@ -82,13 +46,14 @@ class ExpectRankActivity extends AbstractActivity {
|
||||||
MapManager mapManager = user.getMapManager();
|
MapManager mapManager = user.getMapManager();
|
||||||
TrialInfo trialInfo = mapManager.getTrialInfo();
|
TrialInfo trialInfo = mapManager.getTrialInfo();
|
||||||
//排除神秘关卡
|
//排除神秘关卡
|
||||||
|
int floor = 0 ;
|
||||||
if (trialInfo.getFloor() < 10000 && trialInfo.getFloor() > activityMission.getV()) {
|
if (trialInfo.getFloor() < 10000 && trialInfo.getFloor() > activityMission.getV()) {
|
||||||
activityMission.setV(trialInfo.getFloor());
|
floor = trialInfo.getFloor();
|
||||||
} else if (trialInfo.getFloor() > 10000) {
|
} 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 {
|
} else {
|
||||||
activityMission.setV(count + activityMission.getV());
|
activityMission.setV(count + activityMission.getV());
|
||||||
}
|
}
|
||||||
|
|
|
@ -201,10 +201,10 @@ public class ChallengeLogic {
|
||||||
int endlessNewReplicaLexel = user.getPlayerInfoManager().getEndlessNewReplica();
|
int endlessNewReplicaLexel = user.getPlayerInfoManager().getEndlessNewReplica();
|
||||||
int treasureReplicaLexel = user.getPlayerInfoManager().getTreasureReplica();
|
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) {
|
if (!consume) {
|
||||||
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
|
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
|
||||||
}*/
|
}
|
||||||
Map<Integer, Integer> comDropMap = new HashMap<>();
|
Map<Integer, Integer> comDropMap = new HashMap<>();
|
||||||
if (model == 2) {
|
if (model == 2) {
|
||||||
//扫荡
|
//扫荡
|
||||||
|
|
Loading…
Reference in New Issue