From 956e6893966204513f47062d5ca2d786cd29795a Mon Sep 17 00:00:00 2001
From: wangyuan <wangyuan@qq.com>
Date: Fri, 12 Jul 2019 16:48:38 +0800
Subject: [PATCH] mission

---
 .../com/ljsd/jieling/logic/dao/UserManager.java   |  1 +
 .../jieling/logic/dao/UserMissionManager.java     | 15 ---------------
 .../mission/event/MissionEventDistributor.java    |  2 +-
 .../mission/event/UserLevelEventProcessor.java    | 11 -----------
 4 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java
index 784f4671d..12949e1ed 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java
@@ -101,6 +101,7 @@ public class UserManager {
         PlayerLogic.getInstance().vipflushEveryDay(user,null);
         ActivityLogic.getInstance().newPlayerOpenActivityMission(user);
         user.getUserMissionManager().onGameEvent(user, GameEvent.USER_LEVELUP,0,1);
+        user.getUserMissionManager().onGameEvent(user, GameEvent.DAILY_REFRESH,0);
         KtEventUtils.onKtEvent(user, ParamEventBean.UserRegister);
     }
 
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java
index 10fa78414..58938a756 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java
@@ -45,21 +45,6 @@ public class UserMissionManager extends MongoBase {
                     dailyCumulationData.reset();
                     dailyMissionIdsType.getDoingMissionIds().addAll(missionIds);
                     updateString("dailyCumulationData",dailyCumulationData);
-                }else{
-                    dailyMissionIdsType.getDoingMissionIds().addAll(missionIds);
-                    for(Integer missionId : missionIds){
-                        SDailyTasksConfig sDailyTasksConfigById = SDailyTasksConfig.getSDailyTasksConfigById(missionId);
-                        boolean isFinish = MissionLoigc.getDoingProgress(user, cumulationData, sDailyTasksConfigById.getType(), sDailyTasksConfigById.getValues()[0]) >= sDailyTasksConfigById.getValues()[1][0];
-                        MissionStateChangeInfo stateChangeInfo = new MissionStateChangeInfo(missionId,
-                                MissionState.DOING, null);
-                        if(isFinish){
-                            stateChangeInfo = new MissionStateChangeInfo(missionId,
-                                    MissionState.FINISH, null);
-                            dailyMissionIdsType.getDoingMissionIds().remove(missionId);
-                            dailyMissionIdsType.getFinishMissionIds().add(missionId);
-                        }
-                        missionTypeEnumListMap.get(GameMisionType.DAILYMISSION).add(stateChangeInfo);
-                    }
                 }
                 updateString("dailyMissionIdsType",dailyMissionIdsType);
                 break;
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 0999df480..40bbbc97b 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
@@ -30,7 +30,7 @@ public class MissionEventDistributor {
     public static void init(){
 
         eventProcessor.put(GameEvent.VIP_LEVLUP,new VipLevelUpEventProcessor());
-        eventProcessor.put(GameEvent.DAILY_REFRESH,new VipLevelUpEventProcessor());
+        eventProcessor.put(GameEvent.DAILY_REFRESH,new DailyRefreshEventProcess());
 
         List<MissionType> typeList = new ArrayList<>();
         typeList.add(MissionType.RECRUITMENT_RANDOM_HEROES);
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/UserLevelEventProcessor.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/UserLevelEventProcessor.java
index 35dba22c2..6133c15b3 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/UserLevelEventProcessor.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/UserLevelEventProcessor.java
@@ -14,21 +14,10 @@ import java.util.Map;
 public class UserLevelEventProcessor implements BaseGameEventProcessor{
     @Override
     public void onGameEvent(User user, Map<GameMisionType, List<MissionStateChangeInfo>> misionTypeListMap, GameEvent event, Object... parm) throws Exception {
-        int openRule = SGlobalSystemConfig.getsGlobalSystemConfigByFunctionId(FunctionIdEnum.DailyTasks).getOpenRules()[1];
-        int  level= (int)parm[0];
-        int  upToLevel= (int)parm[1];
         List<MissionType> typeList = MissionEventDistributor.eventEnumListMap.get(event);
         for (MissionType type : typeList) {
             user.getUserMissionManager().calCumulationDataResult(user,type,misionTypeListMap,parm);
         }
-        if(upToLevel>=openRule ){
-            for(;level<=upToLevel;level++){
-                if(level==openRule){
-                    user.getUserMissionManager().onGameEvent(user,GameEvent.DAILY_REFRESH,1);
-                    return;
-                }
-            }
-        }
 
     }
 }