Merge branch 'online1.0' of http://60.1.1.230/backend/jieling_server into online1.0

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);
     }
 

serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java

@@ -43,22 +43,8 @@ public class UserMissionManager extends MongoBase {
                     dailyMissionIdsType.getFinishMissionIds().clear();
                     dailyMissionIdsType.getRewardedMissionIds().clear();
                     dailyCumulationData.reset();
-                    updateString("dailyCumulationData",dailyCumulationData);
-                }else{
                     dailyMissionIdsType.getDoingMissionIds().addAll(missionIds);
-                    for(Integer missionId : missionIds){
+                    updateString("dailyCumulationData",dailyCumulationData);
-                        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;
@@ -89,6 +75,8 @@ public class UserMissionManager extends MongoBase {
 
     public void calCumulationDataResult(User user, MissionType missionType, Map<GameMisionType, List<MissionStateChangeInfo>> missionTypeEnumListMap , Object...parm) throws Exception {
         if(!dailyMissionIdsType.getDoingMissionIds().isEmpty()){
+            List<SDailyTasksConfig> sTaskConfigs = SDailyTasksConfig.getsTaskConfigByTypeMap(missionType.getMissionTypeValue());
+            if (sTaskConfigs != null) {
                 CumulationData.Result result = dailyCumulationData.updateData(missionType, parm);
                 if(result!=null){
                     dailyMissionIdsType.calCumulationDataResult(user,result,missionTypeEnumListMap.get(GameMisionType.DAILYMISSION),dailyCumulationData);
@@ -97,6 +85,8 @@ public class UserMissionManager extends MongoBase {
                 }
             }
 
+        }
+
         CumulationData.Result result = cumulationData.updateData(missionType, parm);
         if(result!=null){
             vipMissionIdsType.calCumulationDataResult(user,result,missionTypeEnumListMap.get(GameMisionType.VIPMISSION),cumulationData);

serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java

@@ -382,6 +382,7 @@ public class CombatLogic {
         Map<Integer,Integer> randomRandomMap = new HashMap<>();
         CommonProto.Drop.Builder baseBuilder = CommonProto.Drop.newBuilder();
         CommonProto.Drop.Builder randomBuilder = CommonProto.Drop.newBuilder();
+        int takeTimes= 0;
         for(AdventureStateInfo adventureStateInfoTmp:adventureStateInfoMap.values()) {
             int positionTmp = adventureStateInfoTmp.getPosition();
             if (position != -1 && positionTmp != position) {
@@ -401,6 +402,7 @@ public class CombatLogic {
                 while (timesTemp-->0){
                     ItemUtil.combineReward(randomRewardGroup[adventureStateInfoTmp.getLevel()-1], 1f,randomItemMap,randomCardMap,randomEquipMap,randomRandomMap);
                 }
+                takeTimes++;
             }
             if(sendMail){
                 adventureStateInfoTmp.setStartTime(now);
@@ -435,7 +437,7 @@ public class CombatLogic {
         Map<Integer, CommonProto.Drop> result = new HashMap<>(2);
         result.put(1,baseBuilder.build());
         result.put(2,randomBuilder.build());
-        user.getUserMissionManager().onGameEvent(user,GameEvent.ADVENTURE_TAKEREWARD);
+        user.getUserMissionManager().onGameEvent(user,GameEvent.ADVENTURE_TAKEREWARD,takeTimes);
         return result;
     }
 

serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/TakeAdventureTimesManager.java

@@ -6,7 +6,7 @@ import com.ljsd.jieling.logic.mission.MissionType;
 public class TakeAdventureTimesManager implements BaseDataManager{
     @Override
     public CumulationData.Result updateData(CumulationData data, MissionType missionType, Object... parm) {
-        data.takeAdventurerewardTimes++;
+        data.takeAdventurerewardTimes+=(int)parm[0];
         return new CumulationData.Result(missionType);
     }
 }

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);

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;
-                }
-            }
-        }
 
     }
 }