From 230e2dcaebf4e57c0cd1d764585cbc460014e7e1 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 28 Apr 2020 17:25:02 +0800 Subject: [PATCH] fix login mission & open shop --- .../ljsd/jieling/handler/GameGM/GMRequestHandler.java | 2 +- .../java/com/ljsd/jieling/jbean/ActivityManager.java | 11 +++++++++++ .../ljsd/jieling/logic/activity/ActivityLogic.java | 6 +++--- .../jieling/logic/activity/DefaultEmptyActivity.java | 2 ++ 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java index 88f7808c5..cd0f6eeeb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java @@ -112,7 +112,7 @@ public class GMRequestHandler extends BaseHandler{ SCHero scHero = SCHero.getsCHero().get(hero.getTemplateId()); Map scHeroRankUpConfigByType = STableManager.getFigureConfig(HeroStaticConfig.class).getScHeroRankUpConfigByShow(GlobalsDef.UP_STAR_TYPE,scHero.getStar()); Map scHeroRankUpConfigByTypeTree = new TreeMap<>(scHeroRankUpConfigByType); - SCHeroRankUpConfig scHeroRankUpConfig = ((TreeMap) scHeroRankUpConfigByTypeTree).lastEntry().getValue(); + SCHeroRankUpConfig scHeroRankUpConfig = ((TreeMap) scHeroRankUpConfigByTypeTree).lowerEntry(hero.getStar()).getValue(); hero.setLevel(cUser,scHeroRankUpConfig.getOpenLevel()); hero.setStarBreakId(scHeroRankUpConfig.getId()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/jbean/ActivityManager.java b/serverlogic/src/main/java/com/ljsd/jieling/jbean/ActivityManager.java index 2e55cdb2e..4c42a3e4d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/jbean/ActivityManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/jbean/ActivityManager.java @@ -15,6 +15,7 @@ public final class ActivityManager extends MongoBase { @Transient private LogHashMap> activityMissionMapLog ; private long senvenTime; // 七日狂欢结束时间 + private long senvenStartTime; // 七日狂欢开始时间 private com.ljsd.jieling.jbean.LuckWheelMission luckWheel; // 幸运探宝奖池 private com.ljsd.jieling.jbean.LuckWheelMission luckWheelAdvance; // 高级幸运探宝奖池 @@ -48,6 +49,16 @@ public final class ActivityManager extends MongoBase { return this.luckWheelAdvance; } + + public void setSenvenStartTime(long senvenStartTime) { + updateString("senvenStartTime",senvenStartTime); + this.senvenStartTime = senvenStartTime; + } + + public long getSenvenStartTime() { + return senvenStartTime; + } + public void setSenvenTime(long senventime) { // 七日狂欢结束时间 updateString("senvenTime",senventime); this.senvenTime = senventime; 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 e3c8c0370..605d4886f 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 @@ -381,9 +381,9 @@ public class ActivityLogic implements IEventHandler{ continue; } openNewActivityIds.add(activityId); -// for (int shopID : sGlobalActivity.getShopId()) { -// checkNeedOpenStore(user,shopID,startTime,endTime); -// } + for (int shopID : sGlobalActivity.getShopId()) { + checkNeedOpenStore(user,shopID,startTime,endTime); + } } else { long endTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),userCreateTime, 2); 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 8d9e67777..5ddac41e5 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 @@ -33,7 +33,9 @@ public class DefaultEmptyActivity extends AbstractActivity{ if(sGlobalActivity.getType() == ActivityType.SERVERHAPPY){ user.getUserMissionManager().onGameEvent(user, GameEvent.SERVENHAPPY_REFRESH,id); long endTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),user.getPlayerInfoManager().getCreateTime(), 2) - 24 * 3600 * 1000; + long startTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),user.getPlayerInfoManager().getCreateTime(), 1); user.getActivityManager().setSenvenTime(endTime); + user.getActivityManager().setSenvenStartTime(startTime); } }