From cb75ce8f9dd89ccbdc39751c67975fae2f789e38 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 16 Sep 2020 05:03:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A0=B4=E9=98=B5=E8=AF=9B=E4=BB=99=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=20=E5=88=B7=E6=96=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/activity/ActivityLogic.java | 2 ++ .../logic/activity/JadeDynastyTaskActivity.java | 2 +- .../com/ljsd/jieling/logic/dao/UserMissionManager.java | 10 +--------- 3 files changed, 4 insertions(+), 10 deletions(-) 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 1eecb89be..11d881b1c 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 @@ -88,6 +88,8 @@ public class ActivityLogic implements IEventHandler{ user.getPlayerInfoManager().getRechargeInfo().setDailyFirst(0); //更新累计充值天数 ActivityLogic.getInstance().resumeActivity(user, ActivityType.RECHARGE_SUM_DAY); + + ActivityLogic.getInstance().resumeActivity(user,ActivityType.JADE_DYNASTY_MISSION); user.getPlayerInfoManager().setRechargedaily(0); user.getPlayerInfoManager().setLuckWheelLimitTime(0); user.getPlayerInfoManager().setLuckAdvanceWheelLimitTime(0); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/JadeDynastyTaskActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/JadeDynastyTaskActivity.java index 8ef51a6e5..8a360e100 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/JadeDynastyTaskActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/JadeDynastyTaskActivity.java @@ -18,7 +18,7 @@ public class JadeDynastyTaskActivity extends AbstractActivity { public void onResume(User user) throws Exception { LOGGER.info("[破阵诛仙任务活动刷新] [uid:{}] [activityId:{}]",user.getId(),id); user.getUserMissionManager().onGameEvent(user, GameEvent.JADE_DYNASTY_REFRESH, id); - user.getUserMissionManager().onGameEvent(user, GameEvent.JADE_DYNASTY_WEEK_REFRESH, id); +// user.getUserMissionManager().onGameEvent(user, GameEvent.JADE_DYNASTY_WEEK_REFRESH, id); } @Override 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 98f4497b8..7107707df 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 @@ -144,20 +144,12 @@ public class UserMissionManager extends MongoBase { int jadeAId = (int) parm[0];//当前轮次破阵诛仙的活动ID int[] mIds = resetJadeDynastyTaskInfo(1,jadeAId,missionTypeEnumListMap,jadeDynastyCumulationData); jadeDynastyCumulationData = new CumulationData(); - int nextRefreshTime= (int) (TimeUtils.getLastOrUnderHour(TimeUtils.now(), 5, 0,false)/1000); - CommonProto.RefreshTask.Builder t = treasureIndicationBuild(1, mIds).setRefreshTime(nextRefreshTime); - PlayerInfoProto.JadeDynastyRefreshIndication indi = PlayerInfoProto.JadeDynastyRefreshIndication.newBuilder().addTasks(t.build()).build(); - MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.JADE_DYNASTY_REFRESH_INDICATION_VALUE,indi,true); break; case JADE_DYNASTY_WEEK_REFRESH: int jadeAid = (int) parm[0];//当前轮次破阵诛仙的活动ID int[] weekMIds = resetJadeDynastyTaskInfo(2,jadeAid,missionTypeEnumListMap,jadeDynastyWeekCumulationData); if(weekMIds != null){ jadeDynastyWeekCumulationData = new CumulationData(); - int weekRefreshTime = (int)(TimeUtils.getNextWeekendStartTime(1,5)/1000); - CommonProto.RefreshTask.Builder task2= treasureIndicationBuild(2, weekMIds).setRefreshTime(weekRefreshTime); - PlayerInfoProto.JadeDynastyRefreshIndication indication2 = PlayerInfoProto.JadeDynastyRefreshIndication.newBuilder().addTasks(task2.build()).build(); - MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.JADE_DYNASTY_REFRESH_INDICATION_VALUE,indication2,true); } break; case SERVENHAPPY_REFRESH: @@ -559,7 +551,7 @@ public class UserMissionManager extends MongoBase { private int[] resetJadeDynastyTaskInfo(int type, int activityId, Map> missionTypeEnumListMap,CumulationData jadeDynastyCumulationData){ //周刷新检测 if (type == 2) { - if (jadeDynastyMissionType.getWeekRefresh() != 0 && !TimeUtils.isSpanTime(jadeDynastyMissionType.getWeekRefresh(), TimeUtils.now(), 1, 5)) { + if (jadeDynastyMissionType.getWeekRefresh() != 0) { return null; } jadeDynastyMissionType.setWeekRefresh(TimeUtils.now());