From c9f3eaaaa6fe21003b0ac4ccdb12e4bd6729cf21 Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Thu, 6 May 2021 21:21:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=A4=BC=E5=8C=85=E9=A6=96=E5=86=B2bu?= =?UTF-8?q?g=E6=8C=87=E5=AE=9A=E6=97=B6=E9=97=B45=E6=9C=886=E6=97=A518?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gamecommon/src/main/java/util/TimeUtils.java | 25 ++++++++++++------- .../com/ljsd/jieling/util/CBean2Proto.java | 4 +-- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/gamecommon/src/main/java/util/TimeUtils.java b/gamecommon/src/main/java/util/TimeUtils.java index 6bc88e281..515627a34 100644 --- a/gamecommon/src/main/java/util/TimeUtils.java +++ b/gamecommon/src/main/java/util/TimeUtils.java @@ -1477,14 +1477,21 @@ public class TimeUtils { return todayZero; } - public static long getTodayHourNum(int hour){ - Calendar calendar = Calendar.getInstance(); - System.out.println(calendar.getTimeInMillis()); - calendar.set(Calendar.SECOND, 0); - calendar.set(Calendar.MINUTE, 0); - calendar.set(Calendar.HOUR_OF_DAY, hour); - calendar.set(Calendar.MILLISECOND, 0); - long todayZero = calendar.getTimeInMillis(); - return todayZero; + /** + * 5月6日首冲bug解决方案 + * @return + */ + public static long getFirsatRechargeTime(){ + DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date date = new Date(); + try{ + date = df.parse("2021-05-06 18:00:00"); + }catch(Exception e){ + e.printStackTrace(); + } + Calendar cal = Calendar.getInstance(); + cal.setTime(date); + long timestamp = cal.getTimeInMillis(); + return timestamp; } } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index ce8eabdd0..def20ef6d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -31,10 +31,10 @@ public class CBean2Proto { public static CommonProto.Player getPlayer(int uid, PlayerManager playerManager, int maxMapId, int mapId, MapManager mapManager) { NewRechargeInfo rechargeInfo = playerManager.getNewRechargeInfo(); - //临时判断,开服第一天没记recahrgeTime的bug + //临时代码,开服第一天没记recahrgeTime的bug if(!rechargeInfo.getIsFirst() && rechargeInfo.getRr()>0){ rechargeInfo.setIsFirst(true); - rechargeInfo.setFirstTime(TimeUtils.getTodayHourNum(18)); + rechargeInfo.setFirstTime(TimeUtils.getFirsatRechargeTime()); } CommonProto.Player.Builder builder = CommonProto.Player .newBuilder()