From 88cb571347c8bf03497246e1b4e977792cb224c1 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Wed, 17 Aug 2022 10:04:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=95=87=E5=BF=B5=E5=A1=94=EF=BC=9A=E6=B4=BE?=
 =?UTF-8?q?=E9=81=A3=E5=88=B7=E6=96=B0=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/battleService.ts | 2 +-
 shared/pubUtils/timeUtil.ts               | 2 +-
 shared/pubUtils/util.ts                   | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/game-server/app/services/battleService.ts b/game-server/app/services/battleService.ts
index 1396b2cea..3fbeeac2d 100644
--- a/game-server/app/services/battleService.ts
+++ b/game-server/app/services/battleService.ts
@@ -493,7 +493,7 @@ function randomTask(towerLv: number, oldQuality: number, rids: number[]) {
 // }
 
 export function getRemainTime(curTime: Date) {
-    let nextTime = <number>getTimeFunM(curTime).getAfterDayWithHour(1);
+    let nextTime = <number>getTimeFunM(curTime).getAfterDayWithHour();
     return Math.floor((nextTime - curTime.getTime()) / 1000);
 }
 
diff --git a/shared/pubUtils/timeUtil.ts b/shared/pubUtils/timeUtil.ts
index 0ee658429..3812bdad8 100644
--- a/shared/pubUtils/timeUtil.ts
+++ b/shared/pubUtils/timeUtil.ts
@@ -304,7 +304,7 @@ class Time {
      */
     public getAfterDayWithHour(day: number = 0, hour = REFRESH_TIME, minute = 0, seconds = 0) {
         let t = this._setHour(this.time.getTime(), hour, minute, seconds, 0);
-        console.log(t.getTime(), this.time.getTime());
+        // console.log(t.getTime(), this.time.getTime());
         if(this.time.getTime() > t.getTime()) {
             let timestamp = t.getTime() + (day + 1) * this.DAY_TO_MS;
             return this._returnResult(timestamp);
diff --git a/shared/pubUtils/util.ts b/shared/pubUtils/util.ts
index fb20c1b54..cdead7e74 100644
--- a/shared/pubUtils/util.ts
+++ b/shared/pubUtils/util.ts
@@ -130,7 +130,6 @@ export function deltaDays(preTime: Date, proTime: Date): number {
  * @param deltaDay 间隔几天刷新，默认每天刷新(deltaDay = 1)
  */
 export function shouldRefresh(preTime: Date, now: Date, hour: number = REFRESH_TIME, deltaDay = 1): boolean {
-    console.log('##### shouldRefresh preTime', preTime, 'now', now, 'hour', hour, 'deltaDay', deltaDay)
     if (!preTime) return true;
     let curTime = new Date(now.getTime());
     let refreshTime = getZeroPointD(SHOP_REFRESH_TYPE.DAILY, hour);