From bef4bdc9b45dc5371ef1655307ce6a80978b5324 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 8 Aug 2019 11:20:35 +0800 Subject: [PATCH 1/4] =?UTF-8?q?21=E5=8A=9F=E7=BB=A9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../missionProcessor/KillMonsterAccProcessor.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/missionProcessor/KillMonsterAccProcessor.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/missionProcessor/KillMonsterAccProcessor.java index 4364ff018..8948fbfab 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/missionProcessor/KillMonsterAccProcessor.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/missionProcessor/KillMonsterAccProcessor.java @@ -10,6 +10,9 @@ import com.ljsd.jieling.logic.dao.root.User; public class KillMonsterAccProcessor implements BaseMissionProcesor{ @Override public int checkAndUpdateMissionProcessor(User user, SAccomplishmentConfig sAccomplishmentConfig, int eventId, int time, MapMissionType mapMissionType, int missionValue) { + if(missionValue==-1){ + return GlobalsDef.MAP_MISSION_RETURN; + } int[][] configValues = sAccomplishmentConfig.getValues(); MapManager mapManager = user.getMapManager(); SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()); @@ -19,18 +22,17 @@ public class KillMonsterAccProcessor implements BaseMissionProcesor{ if(configValues[0].length<2){ return GlobalsDef.MAP_MISSION_RETURN; } - if(missionValue==configValues[1][0]){ - missionValue = -1; - } - if(missionValue==-1){ - return missionValue; - } + + for(int i = 1 ; i Date: Thu, 8 Aug 2019 11:26:01 +0800 Subject: [PATCH 2/4] activity --- .../com/ljsd/jieling/logic/activity/BlessActivity.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/BlessActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/BlessActivity.java index bb6cf7c16..946a101dd 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/BlessActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/BlessActivity.java @@ -1,10 +1,18 @@ package com.ljsd.jieling.logic.activity; +import com.ljsd.jieling.config.SGlobalActivity; +import com.ljsd.jieling.logic.dao.root.User; + public class BlessActivity extends AbstractActivity { public BlessActivity(int id) { super(id); } + + @Override + public void initActivity(User user) throws Exception { + ActivityLogic.getInstance().initOtherActivity(user, SGlobalActivity.getsGlobalActivityMap().get(id)); + } } From 2761bc3b766550aa987c3212e9d2f82270acdf01 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 8 Aug 2019 11:35:15 +0800 Subject: [PATCH 3/4] fix activity --- .../java/com/ljsd/jieling/logic/activity/ActivityLogic.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index 1f17bd23b..f9acb225d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -123,7 +123,10 @@ public class ActivityLogic { ActivityManager activityManager = user.getActivityManager(); Map sGlobalActivityMap = SGlobalActivity.getsGlobalActivityMap(); for (Integer openActivityId : openActivityIds) { - if (!activityManager.initAllActivityMission(openActivityId)) { + if (activityManager.initAllActivityMission(openActivityId)) { + continue; + } + if(activityManager.getActivityMissionMap().containsKey(openActivityId)){ continue; } AbstractActivity abstractActivity = ActivityTypeEnum.getActicityType(openActivityId); From b2a4a89d4c32e9c4427b07b9450648f782b72494 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 8 Aug 2019 13:36:53 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E6=89=8B=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/mission/event/MissionEventDistributor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java index 098f1236e..987e745f4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java @@ -284,7 +284,7 @@ public class MissionEventDistributor { progress= MissionLoigc.getDoingProgress(user,user.getUserMissionManager().getDailyCumulationData(),sDailyTasksConfig.getType(),sDailyTasksConfig.getValues()[0]); }else if(gameMisionType == GameMisionType.BEGINNERMISSION){ SBeginnerTask sBeginnerTask = SBeginnerTask.sBeginnerTaskCongigMap.get(missionStateChangeInfo.getMissionId()); - progress= MissionLoigc.getDoingProgress(user,user.getUserMissionManager().getDailyCumulationData(),sBeginnerTask.getTaskType(),sBeginnerTask.getTaskValue()[0]); + progress= MissionLoigc.getDoingProgress(user,user.getUserMissionManager().getBeginCumulationData(),sBeginnerTask.getTaskType(),sBeginnerTask.getTaskValue()[0]); } }else if(missionState == MissionState.FINISH || missionState == MissionState.REWARD){ if(gameMisionType == GameMisionType.VIPMISSION){