Merge branch 'master_prb_gn' into master_test_gn

back_recharge
jiahuiwen 2021-10-19 11:14:56 +08:00
commit d70cbe1509
2 changed files with 4220 additions and 37053 deletions

View File

@ -632,6 +632,12 @@ public class MissionEventDistributor {
if(gameMisionType==GameMisionType.MISSINGROOMMISSION){
continue;
}
if (gameMisionType == GameMisionType.ACHIEVEMISSION) {
SAchievementConfig sAchievementConfig = STableManager.getConfig(SAchievementConfig.class).get(missionStateChangeInfo.getMissionId());
if (sAchievementConfig.getEffectTime() != 0 && openTime >= sAchievementConfig.getEffectTime()) {
continue;
}
}
if(gameMisionType == GameMisionType.COPYMISSION || gameMisionType == GameMisionType.TREASUREMISSION
|| gameMisionType == GameMisionType.SEVENMISSION || gameMisionType == GameMisionType.BLOODYMISSION
|| gameMisionType == GameMisionType.ACHIEVEMISSION || gameMisionType == GameMisionType.JADE_DYNASTY_MISSION
@ -669,9 +675,6 @@ public class MissionEventDistributor {
if(gameMisionType == GameMisionType.ACHIEVEMISSION){
SAchievementConfig sAchievementConfig = STableManager.getConfig(SAchievementConfig.class).get(missionStateChangeInfo.getMissionId());
if (sAchievementConfig.getEffectTime() != 0 && openTime >= sAchievementConfig.getEffectTime()) {
continue;
}
progress= sAchievementConfig.getValues()[1][0];
}

File diff suppressed because it is too large Load Diff