back_recharge
wangyuan 2019-05-29 15:33:11 +08:00
parent 0c21ef4ad6
commit 3d2bcae72f
2 changed files with 3 additions and 3 deletions

View File

@ -1290,7 +1290,7 @@ public class MapLogic {
stars = new HashSet<>();
}
stars.add(STAR_1);
user.getUserMissionManager().onGameEvent(user,GameEvent.STORY_FIGHT,mapManager.getCurMapId());
user.getUserMissionManager().onGameEvent(user,GameEvent.STORY_FIGHT,mapManager.getCurMapId(),1);
mapManager.setStars(stars);
SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId());
if (useTime > 0 && useTime <= sChallengeConfig.getTime()) {
@ -1701,7 +1701,7 @@ public class MapLogic {
if (levelDifficulty.getState() != Global.FIGHT_CLEARANCE) {
reward = sLevelDifficultyConfig.getFirstReward();
levelDifficulty.setState(Global.FIGHT_CLEARANCE);
user.getUserMissionManager().onGameEvent(user,GameEvent.STORY_FIGHT,fightId);
user.getUserMissionManager().onGameEvent(user,GameEvent.STORY_FIGHT,fightId,0);
}
CommonProto.Drop.Builder drop = ItemUtil.drop(user,reward, 1, 0);
levelDifficulty.setChallengeTimes(levelDifficulty.getChallengeTimes() +1);

View File

@ -671,7 +671,7 @@ public class CombatLogic {
return hurt;
}
List<Integer> result =new ArrayList<>(5);
for(int i=1;i<checkResult.length;i++){
for(int i=1;i<=oldRemainHp.size();i++){
result.add(checkResult[i]);
hurt+=(oldRemainHp.get(i-1)-checkResult[i]);
}