Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
785fef38e8
|
|
@ -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 <configValues[0].length;i++){
|
||||
if(eventId!=configValues[0][i]){
|
||||
continue;
|
||||
}
|
||||
missionValue++;
|
||||
}
|
||||
if(missionValue==configValues[1][0]){
|
||||
missionValue = -1;
|
||||
}
|
||||
return missionValue;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -121,7 +121,10 @@ public class ActivityLogic {
|
|||
ActivityManager activityManager = user.getActivityManager();
|
||||
Map<Integer, SGlobalActivity> 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);
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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){
|
||||
|
|
|
|||
Loading…
Reference in New Issue