diff --git a/gamecommon/src/main/java/util/TimeUtils.java b/gamecommon/src/main/java/util/TimeUtils.java index 7a0cb3008..e063d7c80 100644 --- a/gamecommon/src/main/java/util/TimeUtils.java +++ b/gamecommon/src/main/java/util/TimeUtils.java @@ -1727,8 +1727,9 @@ public class TimeUtils { return calendar.getTimeInMillis(); } - public static int getZeroInt(int time){ - return (int) (getZeroLong(time*1000)/1000); + public static int getZeroInt(long time){ + long zeroLong = getZeroLong(time * 1000L); + return (int) (zeroLong/1000); } public static long getZeroLong(long time){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java index 4cd058122..da102729c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java @@ -114,7 +114,7 @@ public enum ActivityTypeEnum { // bt BRUSH_PRIVILEGE(ActivityType.BRUSH_PRIVILEGE, BrushPrivilegeActivity::new),//刷充特权 INFINITE_RESOURCES_PAVILION(ActivityType.INFINITE_RESOURCES_PAVILION, InfiniteResourcesPavilionActivity::new),//无限资源阁 - ALL_PEOPLE_WELFARE(ActivityType.ALL_PEOPLE_WELFARE,AllPeopleWelfareActivity::new),//全民福利 + ALL_PEOPLE_WELFARE(ActivityType.ALL_PEOPLE_WELFARE, AllPeopleWelfareActivity::new),//全民福利 GIVE_ENDLESS_DRAW(ActivityType.GIVE_ENDLESS_DRAW, GiveEndlessDrawActivity::new),//送无限抽 ; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/InfiniteResourcesPavilionActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/InfiniteResourcesPavilionActivity.java index e8c62aa1b..cc811f8cd 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/InfiniteResourcesPavilionActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/InfiniteResourcesPavilionActivity.java @@ -73,6 +73,8 @@ public class InfiniteResourcesPavilionActivity extends AbstractActivity { if (id != giftId){ continue; } + ActivityProgressInfo info = new ActivityProgressInfo(); + info.setProgrss(TimeUtils.nowInt()); activityMission.getActivityMissionMap().putIfAbsent(giftId,new ActivityProgressInfo()); } }