From 5ab554b6629d4f96c8e2148fb0746a52427dfbc9 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Thu, 18 Jun 2020 14:07:12 +0800 Subject: [PATCH] =?UTF-8?q?TASK=E3=80=90ID1006384=E3=80=91=E3=80=90?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BC=98=E5=8C=96=E3=80=918=E6=97=A5?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B4=BB=E5=8A=A8=E5=A5=96=E5=8A=B1=E9=A2=86?= =?UTF-8?q?=E5=8F=96=E6=9C=BA=E5=88=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/activity/ActivityType.java | 2 ++ .../logic/activity/ActivityTypeEnum.java | 5 ++- .../logic/activity/NewEightActivity.java | 35 +++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewEightActivity.java diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java index 83fdaca86..76f1bd286 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java @@ -64,5 +64,7 @@ public interface ActivityType { int ECPEDITION_ACTIVITY = 54; //天宫密宝 int COPY_PASS = 55; // 开服福利 副本限时通过奖励 + int NEW_EIGHT_LOGIN = 56;//新的八日登录 + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java index 2fb553f22..6e273bcfd 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java @@ -47,7 +47,10 @@ public enum ActivityTypeEnum { FIND_FAIRY_FESTIVAL(ActivityType.FIND_FAIRY_FESTIVAL,RechargeSumActivity::new), BUY_GOLD(ActivityType.BUY_GOLD,BuyGoldActivity::new), ECPEDITION_ACTIVITY(ActivityType.ECPEDITION_ACTIVITY,DefaultEmptyActivity::new), - COPY_PASS(ActivityType.COPY_PASS,ChapterRewardActivity::new) + COPY_PASS(ActivityType.COPY_PASS,ChapterRewardActivity::new), + NEW_EIGHT_LOGIN(ActivityType.NEW_EIGHT_LOGIN,NewEightActivity::new) + + ; private int type; private Function toActivityFunction; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewEightActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewEightActivity.java new file mode 100644 index 000000000..f315d16a9 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewEightActivity.java @@ -0,0 +1,35 @@ +package com.ljsd.jieling.logic.activity; + +import com.ljsd.jieling.exception.ErrorCode; +import com.ljsd.jieling.exception.ErrorCodeException; +import com.ljsd.jieling.logic.dao.UserManager; +import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.network.session.ISession; +import config.SActivityRewardConfig; +import util.TimeUtils; + +/** + * Description: 新的八日登录 + * Author: zsx + * CreateDate: 2020/6/18 11:55 + */ +public class NewEightActivity extends AbstractActivity { + + public NewEightActivity(int id) { + super(id); + } + + @Override + public boolean takeReward(ISession session, int missionId) throws Exception { + User user = UserManager.getUser(session.getUid()); + //checkAndUpdate cfg + SActivityRewardConfig sActivityRewardConfig = SActivityRewardConfig.getsActivityRewardConfigByMissionId(missionId); + if (sActivityRewardConfig == null || sActivityRewardConfig.getActivityId() != id) { + throw new ErrorCodeException(ErrorCode.CFG_NULL); + } + if(TimeUtils.getSoFarWentDays(user.getPlayerInfoManager().getCreateTime(),System.currentTimeMillis())