From 595735ff93a24622a15daa52138819719f744f44 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Tue, 7 Dec 2021 10:28:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B6=85=E5=80=BC=E5=9F=BA=E9=87=91?= =?UTF-8?q?=E5=8A=A0=E5=88=A4=E7=A9=BA=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/activity/SuperFundActivity.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperFundActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperFundActivity.java index 442a0263d..f53f8e632 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperFundActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperFundActivity.java @@ -152,6 +152,10 @@ public class SuperFundActivity extends AbstractActivity { private void updateState(User user) throws Exception { // 活动信息 ActivityMission mission = user.getActivityManager().getActivityMissionMap().get(id); + if(mission == null){ + LOGGER.info("updateState 玩家id ={},activityId={}",user.getId(),id); + return; + } if (mission.getV() != 2){ return; } From a19352578e5ae8b766f7614e7f3456aebe91afb2 Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Mon, 13 Dec 2021 11:30:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E5=B7=B2=E5=BC=80=E5=90=AF=E7=9A=84=E6=B4=BB=E5=8A=A8=EF=BC=8C?= =?UTF-8?q?=E5=95=86=E5=BA=97=E6=98=AF=E5=90=A6=E5=BC=80=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/activity/ActivityLogic.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 8c2addbaf..f5b793169 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 @@ -402,6 +402,14 @@ public class ActivityLogic implements IEventHandler{ } } } + // 登录检测已开启的活动,商店是否开启 + int[] shopId = sGlobalActivity.getShopId(); + if (shopId != null && shopId.length > 0) { + boolean b = user.getStoreManager().getStoreInfoMap().containsKey(shopId[0]); + if (!b) { + LOGGER.info("checkActivityOfUser uid={} activityId={} reopen shopId={}", user.getId(), openActivityId, shopId[0]); + Poster.getPoster().dispatchEvent(new ActivityStateChangeEvent(user.getId(),openActivityId,1)); + } continue; } initAllActivityMission(activityManager.getActivityMissionMap(),openActivityId);