From a1cea20bdcd016849bb0f048d7ae46c298a894bb Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 25 Dec 2020 10:06:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=B0=86=E6=9D=A5=E8=A2=AD=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E7=BB=93=E6=9D=9F=EF=BC=8C=E6=B8=85=E7=A9=BA=E9=81=93?= =?UTF-8?q?=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/activity/DefaultEmptyActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DefaultEmptyActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DefaultEmptyActivity.java index 04062dac7..e3fe03f64 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DefaultEmptyActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DefaultEmptyActivity.java @@ -55,7 +55,8 @@ public class DefaultEmptyActivity extends AbstractActivity{ MailLogic.getInstance().sendMail(user.getId(),title,content,mailReward,(int)(System.currentTimeMillis()/1000), Global.MAIL_EFFECTIVE_TIME); }*/ } - }else if(sGlobalActivity.getType() == ActivityType.EXCHANGEANDDROP){ + }else if(sGlobalActivity.getType() == ActivityType.EXCHANGEANDDROP || sGlobalActivity.getType() == ActivityType.NEW_GENERAL_ATTACK){ + // 限时兑换和新将来袭活动结束会清空道具 int shopId = sGlobalActivity.getShopId()[0]; SStoreConfig sStoreConfig = SStoreConfig.getSstoreConfigBuyStore().get(shopId).get(0); int removeItemId = sStoreConfig.getCost()[0][0];