fix login mission & open shop
parent
8c09de153d
commit
230e2dcaeb
|
@ -112,7 +112,7 @@ public class GMRequestHandler extends BaseHandler{
|
||||||
SCHero scHero = SCHero.getsCHero().get(hero.getTemplateId());
|
SCHero scHero = SCHero.getsCHero().get(hero.getTemplateId());
|
||||||
Map<Integer, SCHeroRankUpConfig> scHeroRankUpConfigByType = STableManager.getFigureConfig(HeroStaticConfig.class).getScHeroRankUpConfigByShow(GlobalsDef.UP_STAR_TYPE,scHero.getStar());
|
Map<Integer, SCHeroRankUpConfig> scHeroRankUpConfigByType = STableManager.getFigureConfig(HeroStaticConfig.class).getScHeroRankUpConfigByShow(GlobalsDef.UP_STAR_TYPE,scHero.getStar());
|
||||||
Map<Integer, SCHeroRankUpConfig> scHeroRankUpConfigByTypeTree = new TreeMap<>(scHeroRankUpConfigByType);
|
Map<Integer, SCHeroRankUpConfig> scHeroRankUpConfigByTypeTree = new TreeMap<>(scHeroRankUpConfigByType);
|
||||||
SCHeroRankUpConfig scHeroRankUpConfig = ((TreeMap<Integer, SCHeroRankUpConfig>) scHeroRankUpConfigByTypeTree).lastEntry().getValue();
|
SCHeroRankUpConfig scHeroRankUpConfig = ((TreeMap<Integer, SCHeroRankUpConfig>) scHeroRankUpConfigByTypeTree).lowerEntry(hero.getStar()).getValue();
|
||||||
hero.setLevel(cUser,scHeroRankUpConfig.getOpenLevel());
|
hero.setLevel(cUser,scHeroRankUpConfig.getOpenLevel());
|
||||||
hero.setStarBreakId(scHeroRankUpConfig.getId());
|
hero.setStarBreakId(scHeroRankUpConfig.getId());
|
||||||
|
|
||||||
|
|
|
@ -15,6 +15,7 @@ public final class ActivityManager extends MongoBase {
|
||||||
@Transient
|
@Transient
|
||||||
private LogHashMap<Integer, com.ljsd.jieling.jbean.ActivityMission, Map<Integer, com.ljsd.jieling.jbean.ActivityMission>> activityMissionMapLog ;
|
private LogHashMap<Integer, com.ljsd.jieling.jbean.ActivityMission, Map<Integer, com.ljsd.jieling.jbean.ActivityMission>> activityMissionMapLog ;
|
||||||
private long senvenTime; // 七日狂欢结束时间
|
private long senvenTime; // 七日狂欢结束时间
|
||||||
|
private long senvenStartTime; // 七日狂欢开始时间
|
||||||
private com.ljsd.jieling.jbean.LuckWheelMission luckWheel; // 幸运探宝奖池
|
private com.ljsd.jieling.jbean.LuckWheelMission luckWheel; // 幸运探宝奖池
|
||||||
private com.ljsd.jieling.jbean.LuckWheelMission luckWheelAdvance; // 高级幸运探宝奖池
|
private com.ljsd.jieling.jbean.LuckWheelMission luckWheelAdvance; // 高级幸运探宝奖池
|
||||||
|
|
||||||
|
@ -48,6 +49,16 @@ public final class ActivityManager extends MongoBase {
|
||||||
return this.luckWheelAdvance;
|
return this.luckWheelAdvance;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void setSenvenStartTime(long senvenStartTime) {
|
||||||
|
updateString("senvenStartTime",senvenStartTime);
|
||||||
|
this.senvenStartTime = senvenStartTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getSenvenStartTime() {
|
||||||
|
return senvenStartTime;
|
||||||
|
}
|
||||||
|
|
||||||
public void setSenvenTime(long senventime) { // 七日狂欢结束时间
|
public void setSenvenTime(long senventime) { // 七日狂欢结束时间
|
||||||
updateString("senvenTime",senventime);
|
updateString("senvenTime",senventime);
|
||||||
this.senvenTime = senventime;
|
this.senvenTime = senventime;
|
||||||
|
|
|
@ -381,9 +381,9 @@ public class ActivityLogic implements IEventHandler{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
openNewActivityIds.add(activityId);
|
openNewActivityIds.add(activityId);
|
||||||
// for (int shopID : sGlobalActivity.getShopId()) {
|
for (int shopID : sGlobalActivity.getShopId()) {
|
||||||
// checkNeedOpenStore(user,shopID,startTime,endTime);
|
checkNeedOpenStore(user,shopID,startTime,endTime);
|
||||||
// }
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
long endTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),userCreateTime, 2);
|
long endTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),userCreateTime, 2);
|
||||||
|
|
|
@ -33,7 +33,9 @@ public class DefaultEmptyActivity extends AbstractActivity{
|
||||||
if(sGlobalActivity.getType() == ActivityType.SERVERHAPPY){
|
if(sGlobalActivity.getType() == ActivityType.SERVERHAPPY){
|
||||||
user.getUserMissionManager().onGameEvent(user, GameEvent.SERVENHAPPY_REFRESH,id);
|
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 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().setSenvenTime(endTime);
|
||||||
|
user.getActivityManager().setSenvenStartTime(startTime);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue