From 3d2bcae72fa02975b3c53c6f47d205e4f4db1970 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 29 May 2019 15:33:11 +0800 Subject: [PATCH] fix --- .../src/main/java/com/ljsd/jieling/handler/map/MapLogic.java | 4 ++-- .../main/java/com/ljsd/jieling/logic/fight/CombatLogic.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 794ea1e4a..3bdb2a1e3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -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); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index 1cf9e48a4..8b889a8a1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -671,7 +671,7 @@ public class CombatLogic { return hurt; } List result =new ArrayList<>(5); - for(int i=1;i