From 56bd49949d47ee74eef39957cef845bcc84412a2 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Wed, 27 Oct 2021 17:27:59 +0800 Subject: [PATCH 1/8] =?UTF-8?q?7201=E6=B4=BB=E5=8A=A8=E5=BC=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/activity/ActivityLogic.java | 7 +++++++ 1 file changed, 7 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 5819c9631..d56235316 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 @@ -551,6 +551,9 @@ public class ActivityLogic implements IEventHandler{ if (activityMission == null) { continue; } + if(activityId == 7201){ + continue; + } int activityStatus = activityMission.getActivityState(); if(activityStatus == -1){ continue; @@ -779,6 +782,10 @@ public class ActivityLogic implements IEventHandler{ if (activityMission.getActivityState() != ActivityType.OPEN_STATE) { continue; } + //7201活动弃用 + if(item.getKey() == 7201){ + continue; + } AbstractActivity activityType = ActivityTypeEnum.getActicityType(item.getKey()); if (activityType != null){ activityType.checkActivityMissionFinishAndTake(user.getId(),item.getKey(), activityMission); From bd08edc34e8b2d06eeeacd6ae2c0a1fab45c0e59 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Wed, 27 Oct 2021 17:35:11 +0800 Subject: [PATCH 2/8] =?UTF-8?q?7201=E6=B4=BB=E5=8A=A8=E5=BC=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java index 8375c6502..fb547bdbf 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java @@ -187,6 +187,9 @@ public class MissionLoigc { Map activityMissionMap = user.getActivityManager().getActivityMissionMap(); int treasureActivityId = 0; for(Integer activityId : activityMissionMap.keySet()){ + if(!SGlobalActivity.getsGlobalActivityMap().containsKey(activityId)){ + continue; + } if(SGlobalActivity.getsGlobalActivityMap().get(activityId).getType() == activityType){ treasureActivityId = activityId; } From 7d96a9e494696756c1b1bcfb434a5a5f9a4a1b37 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Wed, 27 Oct 2021 18:30:51 +0800 Subject: [PATCH 3/8] =?UTF-8?q?6962=206963=E7=A4=BC=E5=8C=85=E5=BA=9F?= =?UTF-8?q?=E5=BC=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java index ed17ad00d..3fb6c4863 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java @@ -636,6 +636,9 @@ public class BuyGoodsNewLogic { boolean needChange = refreshWelfareState(user); NewRechargeInfo rechargeInfo = user.getPlayerInfoManager().getNewRechargeInfo(); for(AbstractWelfareBag bag : rechargeInfo.getPerpetualMap().values()){ + if(bag.getModId() == 6962 || bag.getModId() == 6963){ + continue; + } if(bag.isOpen()){ giftGoodsInfoList.add(buildGoodsInfo(bag)); } @@ -646,11 +649,17 @@ public class BuyGoodsNewLogic { } } for(AbstractWelfareBag bag : rechargeInfo.getReceiveMap().values()){ + if(bag.getModId() == 6962 || bag.getModId() == 6963){ + continue; + } if(bag.isOpen()){ giftGoodsInfoList.add(buildGoodsInfo(bag)); } } for(AbstractWelfareBag bag : rechargeInfo.getPushMap().values()){ + if(bag.getModId() == 6962 || bag.getModId() == 6963){ + continue; + } if(bag.isOpen()){ giftGoodsInfoList.add(buildGoodsInfo(bag)); } From b66139651f9b9188c5e0f375c1ceb8b3f4269634 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Wed, 27 Oct 2021 19:01:09 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=B3=A8=E9=87=8A6962=206963=E7=A4=BC?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java index 3fb6c4863..ed17ad00d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java @@ -636,9 +636,6 @@ public class BuyGoodsNewLogic { boolean needChange = refreshWelfareState(user); NewRechargeInfo rechargeInfo = user.getPlayerInfoManager().getNewRechargeInfo(); for(AbstractWelfareBag bag : rechargeInfo.getPerpetualMap().values()){ - if(bag.getModId() == 6962 || bag.getModId() == 6963){ - continue; - } if(bag.isOpen()){ giftGoodsInfoList.add(buildGoodsInfo(bag)); } @@ -649,17 +646,11 @@ public class BuyGoodsNewLogic { } } for(AbstractWelfareBag bag : rechargeInfo.getReceiveMap().values()){ - if(bag.getModId() == 6962 || bag.getModId() == 6963){ - continue; - } if(bag.isOpen()){ giftGoodsInfoList.add(buildGoodsInfo(bag)); } } for(AbstractWelfareBag bag : rechargeInfo.getPushMap().values()){ - if(bag.getModId() == 6962 || bag.getModId() == 6963){ - continue; - } if(bag.isOpen()){ giftGoodsInfoList.add(buildGoodsInfo(bag)); } From f72b071efd35b281030ba2c4b2820e4f9d83c58c Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Wed, 27 Oct 2021 19:17:58 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=88=A4=E7=A9=BA=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/activity/ActivityLogic.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 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 d56235316..19fa3f25a 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 @@ -779,13 +779,16 @@ public class ActivityLogic implements IEventHandler{ Map activityMissionMap = activityManager.getActivityMissionMap(); for (Map.Entry item : activityMissionMap.entrySet()) { ActivityMission activityMission = item.getValue(); - if (activityMission.getActivityState() != ActivityType.OPEN_STATE) { + //7201活动弃用 + if(activityMission == null){ continue; } - //7201活动弃用 if(item.getKey() == 7201){ continue; } + if (activityMission.getActivityState() != ActivityType.OPEN_STATE) { + continue; + } AbstractActivity activityType = ActivityTypeEnum.getActicityType(item.getKey()); if (activityType != null){ activityType.checkActivityMissionFinishAndTake(user.getId(),item.getKey(), activityMission); From 6021025dc6f4398480146814724bd4794a867a16 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Wed, 27 Oct 2021 19:39:37 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=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 --- .../java/com/ljsd/jieling/logic/activity/ActivityLogic.java | 3 +++ .../main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java | 3 +++ 2 files changed, 6 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 19fa3f25a..d10adee29 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 @@ -778,6 +778,9 @@ public class ActivityLogic implements IEventHandler{ ActivityManager activityManager = user.getActivityManager(); Map activityMissionMap = activityManager.getActivityMissionMap(); for (Map.Entry item : activityMissionMap.entrySet()) { + if(item == null || item.getValue() == null){ + continue; + } ActivityMission activityMission = item.getValue(); //7201活动弃用 if(activityMission == null){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java index fb547bdbf..0948a7c11 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java @@ -187,6 +187,9 @@ public class MissionLoigc { Map activityMissionMap = user.getActivityManager().getActivityMissionMap(); int treasureActivityId = 0; for(Integer activityId : activityMissionMap.keySet()){ + if(activityId == null){ + continue; + } if(!SGlobalActivity.getsGlobalActivityMap().containsKey(activityId)){ continue; } From 18201b0de6dc1799aff2ee13a74465e0438b346d Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Wed, 27 Oct 2021 19:47:27 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java | 1 + 1 file changed, 1 insertion(+) 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 d10adee29..a07e00aa0 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 @@ -781,6 +781,7 @@ public class ActivityLogic implements IEventHandler{ if(item == null || item.getValue() == null){ continue; } + LOGGER.error("xuexinpeng 1027"); ActivityMission activityMission = item.getValue(); //7201活动弃用 if(activityMission == null){ From 61a71d847c506be66f7b8bb33c426406fc5534b1 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Wed, 27 Oct 2021 20:24:44 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java | 1 - 1 file changed, 1 deletion(-) 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 a07e00aa0..d10adee29 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 @@ -781,7 +781,6 @@ public class ActivityLogic implements IEventHandler{ if(item == null || item.getValue() == null){ continue; } - LOGGER.error("xuexinpeng 1027"); ActivityMission activityMission = item.getValue(); //7201活动弃用 if(activityMission == null){