diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java index 8208650ea..d4da74132 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java @@ -35,7 +35,7 @@ public abstract class AbstractActivity implements IActivity, IEventHandler { } @Override - public void onEvent(IEvent event)throws Exception { + public void onEvent(IEvent event) throws Exception { } @@ -109,7 +109,7 @@ public abstract class AbstractActivity implements IActivity, IEventHandler { //up miss int[][] reward = sActivityRewardConfig.getReward(); CommonProto.Drop.Builder drop = ItemUtil.drop(user, reward, BIReason.TAKE_ACTIVITY_REWARD); - checkAndSetProgress(activityMission,activityProgressInfo,sActivityRewardConfig,missionId); + checkAndSetProgress(activityMission, activityProgressInfo, sActivityRewardConfig, missionId); //send sendActivityProgress(session, activityMission, Collections.singleton(missionId)); KtEventUtils.onKtEvent(user, ParamEventBean.UserActivityEvent, id, missionId); @@ -118,7 +118,7 @@ public abstract class AbstractActivity implements IActivity, IEventHandler { return true; } - void checkAndSetProgress(ActivityMission activityMission, ActivityProgressInfo activityProgressInfo, SActivityRewardConfig sActivityRewardConfig,int missionId) { + void checkAndSetProgress(ActivityMission activityMission, ActivityProgressInfo activityProgressInfo, SActivityRewardConfig sActivityRewardConfig, int missionId) { activityProgressInfo.setState(ActivityType.HAD_TAKED); activityMission.updateProgressInfo(missionId, activityProgressInfo); } @@ -155,6 +155,7 @@ public abstract class AbstractActivity implements IActivity, IEventHandler { @Override public void onActivityEnd() throws Exception { + } public List getAllMissInfo(ActivityMission activityMission) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DailyRechargeActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DailyRechargeActivity.java index 3e9d3cc14..5703743b3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DailyRechargeActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DailyRechargeActivity.java @@ -6,7 +6,7 @@ import com.ljsd.jieling.logic.dao.ActivityProgressInfo; import com.ljsd.jieling.network.session.ISession; /** - * 名字叫首冲 其实不是 策划说按每日 + * 名字叫首冲 其实不是 策划说按每日累计 */ class DailyRechargeActivity extends AbstractActivity { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java index efca85670..9d5b75ce2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java @@ -4,6 +4,7 @@ package com.ljsd.jieling.logic.activity; import com.ljsd.jieling.config.SActivityRankingReward; import com.ljsd.jieling.config.SActivityRewardConfig; import com.ljsd.jieling.config.SErrorCodeEerverConfig; +import com.ljsd.jieling.config.SGlobalActivity; import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.globals.Global; @@ -83,13 +84,12 @@ class ExpectRankActivity extends AbstractActivity { //check value SActivityRankingReward sActivityRankingReward1 = SActivityRankingReward.getsActivityRankingRewardMap().get(missionId); //sendmail - String content = SErrorCodeEerverConfig.getI18NMessage("powerrank_activity_title"); - String title = SErrorCodeEerverConfig.getI18NMessage("powerrank_activity_txt", new Object[]{rank}); + SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id); + String content = SErrorCodeEerverConfig.getI18NMessage("expertrank_activity_title"); + String title = SErrorCodeEerverConfig.getI18NMessage("expertrank_activity_txt", new Object[]{sGlobalActivity.getSesc(), rank}); String mailReward = ItemUtil.getMailReward(sActivityRankingReward1.getRankingReward()); MailLogic.getInstance().sendMail(uid, title, content, mailReward, nowTime, Global.MAIL_EFFECTIVE_TIME); } - - } private Set getRankSet(int start, int end) { @@ -102,6 +102,4 @@ class ExpectRankActivity extends AbstractActivity { } return set; } - - } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeSumDayActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeSumDayActivity.java index 026c96287..5908be916 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeSumDayActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeSumDayActivity.java @@ -9,9 +9,6 @@ import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.util.MessageUtil; -import java.util.Map; -import java.util.TreeMap; - class RechargeSumDayActivity extends AbstractActivity { public RechargeSumDayActivity(int id) {