From 5498f054a045f963dd5d6934d34f927a9f6371ab Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 21 Apr 2023 15:14:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=80=BC=E8=BF=9E=E5=85=85=E9=87=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/activity/ActivityLogic.java | 7 ------- .../activity/NewRechargeSumDayActivity.java | 17 ++++++++++++++++- 2 files changed, 16 insertions(+), 8 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 2564e3abf..ae2b67fa9 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 @@ -289,17 +289,10 @@ public class ActivityLogic implements IEventHandler{ if (map.containsKey(activityId)) { return false; } - - //不开了 - if(activityId==6301){ - return false; - } ActivityMission activityMission = new ActivityMission(); //自动初始化 map.put(activityId, activityMission); initMissionInfo(activityMission,activityId); - // activityMission.init(getRootId(), getMongoKey() + ".activityMissionMap." + activityId); - return true; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewRechargeSumDayActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewRechargeSumDayActivity.java index debac08d8..6f5938da0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewRechargeSumDayActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewRechargeSumDayActivity.java @@ -1,5 +1,6 @@ package com.ljsd.jieling.logic.activity; +import com.ljsd.jieling.jbean.ActivityManager; import com.ljsd.jieling.jbean.ActivityMission; import com.ljsd.jieling.jbean.ActivityProgressInfo; import com.ljsd.jieling.logic.activity.event.ActivityStateChangeEvent; @@ -56,9 +57,23 @@ class NewRechargeSumDayActivity extends AbstractActivity { * 跨天更新数据 * @param user */ - private void zeroUpdate(User user){ + private void zeroUpdate(User user) throws Exception { ActivityMission mission = user.getActivityManager().getActivityMissionMap().get(id); mission.setV(0); + boolean finishAndTake = checkActivityMissionFinishAndTake(user.getId(), id, mission); + if (finishAndTake){ + reSetValue(user); + } + } + + /** + * 活动期间活动进度会进行多次 领完所有活动奖励重置 + */ + @Override + public void reSetValue(User user) throws Exception { + ActivityManager activityManager = user.getActivityManager(); + activityManager.getActivityMissionMap().remove(id); + initActivity(user); } /**