0点5点遗留修改

back_recharge
lvxinran 2021-01-08 13:58:36 +08:00
parent 11aa829ae0
commit 127a5f4abd
5 changed files with 12 additions and 15 deletions

View File

@ -21,7 +21,7 @@ class RechargeTotalActivity extends AbstractActivity {
long now = TimeUtils.now(); long now = TimeUtils.now();
User user = UserManager.getUser(session.getUid()); User user = UserManager.getUser(session.getUid());
RechargeInfo rechargeInfo = user.getPlayerInfoManager().getRechargeInfo(); RechargeInfo rechargeInfo = user.getPlayerInfoManager().getRechargeInfo();
int days = TimeUtils.differentDaysByHour(rechargeInfo.getCreateTime(), now,5) + 1; int days = TimeUtils.differentDaysByHour(rechargeInfo.getCreateTime(), now,0) + 1;
if (missionProgress/1000 < values[0][0] || days < values[0][1]) { if (missionProgress/1000 < values[0][0] || days < values[0][1]) {
return false; return false;
} }

View File

@ -399,12 +399,9 @@ public class PlayerManager extends MongoBase {
}else { }else {
maxTime = TimeUtils.now()/1000+config.getContinueTime()[0]; maxTime = TimeUtils.now()/1000+config.getContinueTime()[0];
} }
//todo 记得删掉
if(privilageId==4013){ maxTime = (int)(TimeUtils.getLastOrUnderHour(maxTime*1000,0,0,true)/1000);
maxTime = (int)(TimeUtils.getLastOrUnderHour(maxTime*1000,5,0,true)/1000);
}else{
maxTime = (int)(TimeUtils.getLastOrUnderHour(maxTime*1000,0,0,true)/1000);
}
newVipInfo.setEffectTime((int)maxTime); newVipInfo.setEffectTime((int)maxTime);
} }
this.vipInfo.put(privilageId,newVipInfo); this.vipInfo.put(privilageId,newVipInfo);

View File

@ -100,7 +100,7 @@ public class UserMissionManager extends MongoBase {
int activityId = (int) parm[0];//当前轮次青龙秘宝的活动ID int activityId = (int) parm[0];//当前轮次青龙秘宝的活动ID
int[] refreshIds = resetTreasureTaskInfo(1,activityId,missionTypeEnumListMap,treasureCumulationData); int[] refreshIds = resetTreasureTaskInfo(1,activityId,missionTypeEnumListMap,treasureCumulationData);
treasureCumulationData = new CumulationData(); treasureCumulationData = new CumulationData();
int dayRefreshTime=(int) (TimeUtils.getLastOrUnderHour(TimeUtils.now(), 5, 0,false)/1000); int dayRefreshTime=(int) (TimeUtils.getLastOrUnderHour(TimeUtils.now(), 0, 0,false)/1000);
CommonProto.RefreshTask.Builder task = treasureIndicationBuild(1, refreshIds).setRefreshTime(dayRefreshTime); CommonProto.RefreshTask.Builder task = treasureIndicationBuild(1, refreshIds).setRefreshTime(dayRefreshTime);
PlayerInfoProto.TreasureRefreshIndication indication1 = PlayerInfoProto.TreasureRefreshIndication.newBuilder().addTasks(task.build()).build(); PlayerInfoProto.TreasureRefreshIndication indication1 = PlayerInfoProto.TreasureRefreshIndication.newBuilder().addTasks(task.build()).build();
MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.TREASURE_REFRESH_INDICATION_VALUE,indication1,true); MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.TREASURE_REFRESH_INDICATION_VALUE,indication1,true);
@ -110,7 +110,7 @@ public class UserMissionManager extends MongoBase {
int[] weekRefreshIds = resetTreasureTaskInfo(2,aId,missionTypeEnumListMap,treasureWeekCumulationData); int[] weekRefreshIds = resetTreasureTaskInfo(2,aId,missionTypeEnumListMap,treasureWeekCumulationData);
if(weekRefreshIds != null){ if(weekRefreshIds != null){
treasureWeekCumulationData = new CumulationData(); treasureWeekCumulationData = new CumulationData();
int weekRefreshTime = (int)(TimeUtils.getNextWeekendStartTime(1,5)/1000); int weekRefreshTime = (int)(TimeUtils.getNextWeekendStartTime(1,0)/1000);
user.getPlayerInfoManager().clearVipCount(VipPrivilegeType.DRAGON_TREASURE_SUPPLY); user.getPlayerInfoManager().clearVipCount(VipPrivilegeType.DRAGON_TREASURE_SUPPLY);
CommonProto.RefreshTask.Builder task2= treasureIndicationBuild(2, weekRefreshIds).setRefreshTime(weekRefreshTime); CommonProto.RefreshTask.Builder task2= treasureIndicationBuild(2, weekRefreshIds).setRefreshTime(weekRefreshTime);
PlayerInfoProto.TreasureRefreshIndication indication2 = PlayerInfoProto.TreasureRefreshIndication.newBuilder().addTasks(task2.build()).build(); PlayerInfoProto.TreasureRefreshIndication indication2 = PlayerInfoProto.TreasureRefreshIndication.newBuilder().addTasks(task2.build()).build();
@ -541,14 +541,14 @@ public class UserMissionManager extends MongoBase {
} }
do{ do{
startTime += TimeUtils.WEEK; startTime += TimeUtils.WEEK;
}while(startTime+5*TimeUtils.HOUR<TimeUtils.now()&&startTime+5*TimeUtils.HOUR<endTime); }while(startTime<TimeUtils.now()&&startTime<endTime);
//如果小于两周 直接到结束 //如果小于两周 直接到结束
if(endTime-startTime-5*TimeUtils.HOUR<TimeUtils.WEEK){ if(endTime-startTime<TimeUtils.WEEK){
startTime = endTime; startTime = endTime;
} }
treasureMissionIdsType.setWeekRefresh(startTime+5*TimeUtils.HOUR); treasureMissionIdsType.setWeekRefresh(startTime);
}else{ }else{
if (treasureMissionIdsType.getWeekRefresh() != 0 && !TimeUtils.isSpanTime(treasureMissionIdsType.getWeekRefresh(), TimeUtils.now(), 1, 5)) { if (treasureMissionIdsType.getWeekRefresh() != 0 && !TimeUtils.isSpanTime(treasureMissionIdsType.getWeekRefresh(), TimeUtils.now(), 1, 0)) {
return null; return null;
} }
treasureMissionIdsType.setWeekRefresh(TimeUtils.now()); treasureMissionIdsType.setWeekRefresh(TimeUtils.now());

View File

@ -27,7 +27,7 @@ public class WorldTreasureReward extends MongoBase {
SExpeditionSetting setting = STableManager.getConfig(SExpeditionSetting.class).get(1); SExpeditionSetting setting = STableManager.getConfig(SExpeditionSetting.class).get(1);
int treasureTime = setting.getTreasureTime()[0][1]; int treasureTime = setting.getTreasureTime()[0][1];
if(createTime == 0){ if(createTime == 0){
createTime =(int)((TimeUtils.getLastOrUnderHour(TimeUtils.now(), 5,0, true)+TimeUtils.DAY*treasureTime)/1000); createTime =(int)((TimeUtils.getLastOrUnderHour(TimeUtils.now(), 0,0, true)+TimeUtils.DAY*treasureTime)/1000);
}else{ }else{
do{ do{
createTime+=TimeUtils.DAY*treasureTime/1000; createTime+=TimeUtils.DAY*treasureTime/1000;

View File

@ -395,7 +395,7 @@ public class GuildChallengeLogic {
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
} }
guildInfo.setBuffIndex(guildInfo.getBuffIndex()+1); guildInfo.setBuffIndex(guildInfo.getBuffIndex()+1);
int fiveTime = (int)(TimeUtils.getLastOrUnderHour(TimeUtils.now(), 5, 0, false)/1000); int fiveTime = (int)(TimeUtils.getLastOrUnderHour(TimeUtils.now(), 0, 0, false)/1000);
guildInfo.setBuffOverTime(Math.min(time,fiveTime)); guildInfo.setBuffOverTime(Math.min(time,fiveTime));
} }
Family.GuildChallengeBuyBuffIndication indication = Family.GuildChallengeBuyBuffIndication.newBuilder() Family.GuildChallengeBuyBuffIndication indication = Family.GuildChallengeBuyBuffIndication.newBuilder()