Merge branch 'master_prb_gn' into master_test_gn
commit
372c0f9f9f
|
@ -36,6 +36,33 @@ class ExpectRankActivity extends AbstractActivity {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
void updateProgressWithUser(User user, ActivityMission activityMission, int count) {
|
||||||
|
|
||||||
|
if(SGlobalActivity.getsGlobalActivityMap().get(id).getType() == 70){
|
||||||
|
//森罗幻境特殊处理
|
||||||
|
if(SGlobalActivity.getsGlobalActivityMap().get(id).getOpenRanking()==1){
|
||||||
|
MapManager mapManager = user.getMapManager();
|
||||||
|
TrialInfo trialInfo = mapManager.getTrialInfo();
|
||||||
|
//排除神秘关卡
|
||||||
|
if(trialInfo.getFloor()<10000 && trialInfo.getFloor() > activityMission.getV()){
|
||||||
|
activityMission.setV(trialInfo.getFloor());
|
||||||
|
}else if(trialInfo.getFloor()>10000){
|
||||||
|
activityMission.setV(trialInfo.getFloor()-10000);
|
||||||
|
}
|
||||||
|
RankContext.getRankEnum(RankEnum.EXPERT_RANK.getType()).addRank(user.getId(),String.valueOf(id),activityMission.getV());
|
||||||
|
}else{
|
||||||
|
activityMission.setV(count + activityMission.getV());
|
||||||
|
}
|
||||||
|
}else {
|
||||||
|
activityMission.setV(count + activityMission.getV());
|
||||||
|
if(SGlobalActivity.getsGlobalActivityMap().get(id).getOpenRanking()==1){
|
||||||
|
// String key = RedisKey.getKey(RedisKey.EXPERT_RANK, String.valueOf(id), false);
|
||||||
|
// RedisUtil.getInstence().zsetAddOne(key, String.valueOf(user.getId()), activityMission.getV());
|
||||||
|
RankContext.getRankEnum(RankEnum.EXPERT_RANK.getType()).addRank(user.getId(),String.valueOf(id),activityMission.getV());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/*@Override
|
||||||
void updateProgressWithUser(User user, ActivityMission activityMission, int count) {
|
void updateProgressWithUser(User user, ActivityMission activityMission, int count) {
|
||||||
|
|
||||||
if(SGlobalActivity.getsGlobalActivityMap().get(id).getOpenRanking()==1){
|
if(SGlobalActivity.getsGlobalActivityMap().get(id).getOpenRanking()==1){
|
||||||
|
@ -55,7 +82,7 @@ class ExpectRankActivity extends AbstractActivity {
|
||||||
}else{
|
}else{
|
||||||
activityMission.setV(count + activityMission.getV());
|
activityMission.setV(count + activityMission.getV());
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue