diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java index 9e4eafc8f..085341af1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -419,6 +419,11 @@ public class GlobalDataManaager implements IManager { public static void checkNeedReFlush(ISession session,User user,PlayerInfoProto.FivePlayerUpdateIndication.Builder fBuilder) throws Exception { // 需要隔天刷新的字段统一在这里处理 if (TimeUtils.isOverTime(0,user.getPlayerInfoManager().getLoginTime())) { + // 周一零点执行逻辑,跨周执行 + if (!TimeUtils.isSameWeek7(user.getPlayerInfoManager().getLoginTime())){ + // 灵兽限时抽卡重置 + ActivityLogic.getInstance().zeroResetSpecialMonsterActivity(session); + } //活动刷新 ActivityLogic.getInstance().flushEveryDay(user,fBuilder); PlayerLogic.getInstance().vipflushEveryDay(user,fBuilder); @@ -429,7 +434,6 @@ public class GlobalDataManaager implements IManager { //检测下称号 CBean2Proto.getUserTitleList(user); user.getUserMissionManager().onGameEvent(user, GameEvent.DAILY_REFRESH,0); -// user.getUserMissionManager().onGameEvent(user, GameEvent.BLOODY_REFRESH,0); FriendLogic.getInstance().refreshState(session); PlayerLogic.getInstance().sendTimingMail(user); user.getGuildMyInfo().setLastHurt(0); 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 4ec86aa55..14a9d2ad1 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 @@ -1872,4 +1872,16 @@ public class ActivityLogic implements IEventHandler{ return result; } + + /** + * 零点刷新灵兽限时抽卡活动 + * @param session + * @throws Exception + */ + public void zeroResetSpecialMonsterActivity(ISession session) throws Exception { + AbstractActivity activity = ActivityTypeEnum.getActicityType(14501); + if (activity != null){ + activity.takeAllReward(session); + } + } }