diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index 211a18865..596483885 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -171,8 +171,8 @@ public class GetPlayerInfoHandler extends BaseHandler{ // 返利 GmActivityLogic.zeroUpdateGmActivity(user); // 临时代码,处理活动bug, 只有在1月24号当天开服得玩家需要优化 - xunbaoActivityHandler(user); - gmDeleteMail(user); +// xunbaoActivityHandler(user); +// gmDeleteMail(user); // initHeroStar(user); SGameSetting setting = STableManager.getConfig(SGameSetting.class).get(1); if(setting.getBornItem().length>0){ @@ -181,14 +181,14 @@ public class GetPlayerInfoHandler extends BaseHandler{ remove.removeAll(user.getItemManager().getItemMap().keySet()); remove.forEach(n-> user.getItemManager().newItem(n, 0)); } - upHeroStarHandle(user);//升星配方调整 - PlayerLogic.getInstance().checkOldHeadFrame(user);// 处理玩家旧头像框,兼容,一个玩家只执行一次 - PlayerLogic.getInstance().soulPrintHandBookDispose(user);// 魂印图鉴,旧数据容错 - wishOldUserRandomNumInit(user);// 心愿抽卡 旧玩家兼容 - calEquipStrongData(user);// 摘星阁装备强化调整后返还玩家强化道具 - maxEspecialEquipHandle(user);// 法宝最高等级处理 +// upHeroStarHandle(user);//升星配方调整 +// PlayerLogic.getInstance().checkOldHeadFrame(user);// 处理玩家旧头像框,兼容,一个玩家只执行一次 +// PlayerLogic.getInstance().soulPrintHandBookDispose(user);// 魂印图鉴,旧数据容错 +// wishOldUserRandomNumInit(user);// 心愿抽卡 旧玩家兼容 +// maxEspecialEquipHandle(user);// 法宝最高等级处理 godTreeLvHandle(user);// 建木神树等级处理 luckDialHandle(user);// 幸运转盘次数处理 + calEquipStrongData(user);// 摘星阁装备强化调整后返还玩家强化道具 FourChallengeLogic.getInstance().firstGetTimes(user);// 四灵试炼初始化 StoreLogic.reloadStoreInfo(user,7);//重载功能商店 ExplorerMapLogic.getInstance().calOfflineReward(user);//挂机探索 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 0ff34ed76..254ddf866 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 @@ -240,9 +240,7 @@ public class UserMissionManager extends MongoBase { achievementMap = new CumulationData(); updateString("achievementMissionTypMap", achievementMissionTypMap); updateString("achievementMap", achievementMap); - break; - case COW_FLY_SKY_REFRESH: int activityCowId = (int) parm[0]; // 牛气冲天 @@ -259,10 +257,10 @@ public class UserMissionManager extends MongoBase { if(TimeUtils.isSameMonth2(GameApplication.serverConfig.getCacheOpenTime(),TimeUtils.now())){ int days = new Date(GameApplication.serverConfig.getCacheOpenTime()).getDate();//当月第几天 endlessTask = STableManager.getConfig(SEndlessTask.class).values().stream().filter(n->days >=n. - getViewDateUp()&& days <=n.getViewDataDown()).map(n ->n.getId()).collect(Collectors.toSet()); + getViewDateUp()&& days <=n.getViewDataDown()).map(SEndlessTask::getId).collect(Collectors.toSet()); }else{ endlessTask = STableManager.getConfig(SEndlessTask.class).values().stream().filter(n->n.getViewDateUp() == 1). - map(n ->n.getId()).collect(Collectors.toSet()); + map(SEndlessTask::getId).collect(Collectors.toSet()); } endlessMissionType.getDoingMissionIds().clear(); endlessMissionType.getFinishMissionIds().clear(); @@ -373,7 +371,7 @@ public class UserMissionManager extends MongoBase { } int[][] mustArray = mustList.toArray(new int[mustList.size()][]); int[] missions = MathUtils.randomFromWeightWithTaking(mustArray, entry.getValue()); - Arrays.stream(missions).forEach(mission -> mustMissions.add(mission)); + Arrays.stream(missions).forEach(mustMissions::add); } } int[][] qualityRate = SMazeTreasureSetting.sMazeTreasureSetting.getQualityRate(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/MissingRoomMissionType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/MissingRoomMissionType.java index 7511735b5..d055ecb09 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/MissingRoomMissionType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/MissingRoomMissionType.java @@ -56,7 +56,7 @@ public class MissingRoomMissionType extends AbstractMissionType{ if(!missingTime.containsKey(missionId)||!getFinishMissionIds().contains(missionId)){ return; } - if(missingTime.get(missionId)!=0&&missingTime.get(missionId)>TimeUtils.now()/1000){ + if(missingTime.get(missionId)!=0&&missingTime.get(missionId)>TimeUtils.nowInt()){ return; } missingTime.put(missionId,-1); @@ -68,11 +68,9 @@ public class MissingRoomMissionType extends AbstractMissionType{ if(missingTime.get(id)==-1){ continue; } - if (missingTime.get(id)==0||missingTime.get(id) <= TimeUtils.now() / 1000) { + if (missingTime.get(id)==0||missingTime.get(id) <= TimeUtils.nowInt()) { missingTime.put(id,-1); - for(int[] re: reward(id)){ - reward.add(re); - } + reward.addAll(Arrays.asList(reward(id))); } } MissionStateChangeInfo stateChangeInfo = new MissionStateChangeInfo(missionId, MissionState.REWARD,reward.toArray(new int[reward.size()][]));