Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
8847964740
|
@ -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());
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,7 @@ import com.ljsd.jieling.logic.activity.ActivityType;
|
||||||
import com.ljsd.jieling.logic.dao.UserManager;
|
import com.ljsd.jieling.logic.dao.UserManager;
|
||||||
import com.ljsd.jieling.logic.dao.root.User;
|
import com.ljsd.jieling.logic.dao.root.User;
|
||||||
import com.ljsd.jieling.logic.mail.MailLogic;
|
import com.ljsd.jieling.logic.mail.MailLogic;
|
||||||
|
import com.ljsd.jieling.logic.mission.GameEvent;
|
||||||
import com.ljsd.jieling.logic.player.PlayerLogic;
|
import com.ljsd.jieling.logic.player.PlayerLogic;
|
||||||
import com.ljsd.jieling.netty.cocdex.PacketNetData;
|
import com.ljsd.jieling.netty.cocdex.PacketNetData;
|
||||||
import com.ljsd.jieling.network.session.ISession;
|
import com.ljsd.jieling.network.session.ISession;
|
||||||
|
@ -31,6 +32,7 @@ public class ServerZeroHandler extends BaseHandler {
|
||||||
User user = UserManager.getUser(iSession.getUid());
|
User user = UserManager.getUser(iSession.getUid());
|
||||||
GlobalDataManaager.flushGoodsTimes(user);
|
GlobalDataManaager.flushGoodsTimes(user);
|
||||||
PlayerLogic.getInstance().sendDayilyMail(user,-1);
|
PlayerLogic.getInstance().sendDayilyMail(user,-1);
|
||||||
|
user.getUserMissionManager().onGameEvent(user, GameEvent.LOGIN_GAME,0);
|
||||||
//发送每日孙龙邮件
|
//发送每日孙龙邮件
|
||||||
if(user.getPlayerInfoManager().getHadBuyTreasure()!=0){
|
if(user.getPlayerInfoManager().getHadBuyTreasure()!=0){
|
||||||
Map<Integer, ActivityMission> activityMissionMap = user.getActivityManager().getActivityMissionMap();
|
Map<Integer, ActivityMission> activityMissionMap = user.getActivityManager().getActivityMissionMap();
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -341,13 +341,14 @@ public class GlobalDataManaager implements IManager {
|
||||||
byte[] byteBuf = MessageUtil.wrappedBuffer(session.getUid(), session.getToken(), indicationIndex,1, MessageTypeProto.MessageType.FIVE_PLAYER_REFLUSH_INDICATION_VALUE, fBuilder.build());
|
byte[] byteBuf = MessageUtil.wrappedBuffer(session.getUid(), session.getToken(), indicationIndex,1, MessageTypeProto.MessageType.FIVE_PLAYER_REFLUSH_INDICATION_VALUE, fBuilder.build());
|
||||||
session.setFiveByteBuf(byteBuf);
|
session.setFiveByteBuf(byteBuf);
|
||||||
}
|
}
|
||||||
user.getUserMissionManager().onGameEvent(user, GameEvent.LOGIN_GAME,0);
|
|
||||||
}else {
|
}else {
|
||||||
user.getPlayerInfoManager().setIsdayFirst(0);
|
user.getPlayerInfoManager().setIsdayFirst(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (TimeUtils.isOverTime(0,user.getPlayerInfoManager().getLoginTime())) {
|
if (TimeUtils.isOverTime(0,user.getPlayerInfoManager().getLoginTime())) {
|
||||||
flushGoodsTimes(user);
|
flushGoodsTimes(user);
|
||||||
|
user.getUserMissionManager().onGameEvent(user, GameEvent.LOGIN_GAME,0);
|
||||||
}
|
}
|
||||||
user.getPlayerInfoManager().setLoginTime(TimeUtils.now());
|
user.getPlayerInfoManager().setLoginTime(TimeUtils.now());
|
||||||
|
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -372,7 +372,7 @@ public class UserMissionManager extends MongoBase {
|
||||||
List<STreasureTaskConfig> sTreasureTaskConfigs = STableManager.getFigureConfig(TaskStaticConfig.class).getsTreasureTaskConfigListByTypeMap().get(missionType.getMissionTypeValue());
|
List<STreasureTaskConfig> sTreasureTaskConfigs = STableManager.getFigureConfig(TaskStaticConfig.class).getsTreasureTaskConfigListByTypeMap().get(missionType.getMissionTypeValue());
|
||||||
if(sTreasureTaskConfigs!=null && user.getActivityManager().getSenvenTime()>System.currentTimeMillis()){
|
if(sTreasureTaskConfigs!=null && user.getActivityManager().getSenvenTime()>System.currentTimeMillis()){
|
||||||
if(missionType == MissionType.LOGIN_TIMES){
|
if(missionType == MissionType.LOGIN_TIMES){
|
||||||
parm=new Object[]{TimeUtils.differentDays(user.getActivityManager().getSenvenTime(),System.currentTimeMillis())};
|
parm=new Object[]{TimeUtils.differentDays(user.getActivityManager().getSenvenStartTime(),System.currentTimeMillis())+1};
|
||||||
}
|
}
|
||||||
CumulationData.Result result = sevenHappyCumulationData.updateData(missionType, parm);
|
CumulationData.Result result = sevenHappyCumulationData.updateData(missionType, parm);
|
||||||
if(result!=null){
|
if(result!=null){
|
||||||
|
|
Loading…
Reference in New Issue