root
/
miduo_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master_prb_gn' into master_test_gn

back_recharge
xuexinpeng 2021-11-08 15:03:50 +08:00
parent 5729561082 41e12db5a7
commit 047acea4e4
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
serverlogic/src/main/java/com/ljsd/jieling/handler/hardStage/StartHardStageRequestHandler.java
View File

@ -104,6 +104,7 @@ public class StartHardStageRequestHandler extends BaseHandler<PlayerInfoProto.Ha
dropList.addAll(HardStageLogic.getFirstRewards(user, nodeConfig)); dropList.addAll(HardStageLogic.getFirstRewards(user, nodeConfig));
HardStageLogic.updateChapterAndNodeLevel(user,nodeConfig); HardStageLogic.updateChapterAndNodeLevel(user,nodeConfig);
logResult = 1; logResult = 1;
user.getHardStageManager().updateString("chapterMap." + nodeConfig.getChapter(), chapterMap.get(nodeConfig.getChapter()));
} }
} else if (nodeConfig.getStageType() == 1 || nodeConfig.getStageType() == 3) { } else if (nodeConfig.getStageType() == 1 || nodeConfig.getStageType() == 3) {
if (teamPosHeroInfos == null || teamPosHeroInfos.size() == 0) { if (teamPosHeroInfos == null || teamPosHeroInfos.size() == 0) {

2
serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java
View File

@ -47,6 +47,8 @@ class ExpectRankActivity extends AbstractActivity {
//排除神秘关卡 //排除神秘关卡
if(trialInfo.getFloor()<10000 && trialInfo.getFloor() > activityMission.getV()){ if(trialInfo.getFloor()<10000 && trialInfo.getFloor() > activityMission.getV()){
activityMission.setV(trialInfo.getFloor()); activityMission.setV(trialInfo.getFloor());
}else if(trialInfo.getFloor()>10000){
activityMission.setV(trialInfo.getFloor()-10000);
} }
//activityMission.setV(count + activityMission.getV()); //activityMission.setV(count + activityMission.getV());
RankContext.getRankEnum(RankEnum.EXPERT_RANK.getType()).addRank(user.getId(),String.valueOf(id),activityMission.getV()); RankContext.getRankEnum(RankEnum.EXPERT_RANK.getType()).addRank(user.getId(),String.valueOf(id),activityMission.getV());