diff --git a/game-server/app/servers/activity/handler/gachaHandler.ts b/game-server/app/servers/activity/handler/gachaHandler.ts
index 0711dcd86..8d11509e8 100644
--- a/game-server/app/servers/activity/handler/gachaHandler.ts
+++ b/game-server/app/servers/activity/handler/gachaHandler.ts
@@ -108,14 +108,9 @@ export class GachaHandler {
         }
         await checkActivityTask(serverId, sid, roleId, TASK_TYPE.GACHA_QUALITY_COUNT, count, { heroes: activityData })
 
-        let resultRefFreeTime = 0;
-        if (dicGacha.free.count > 0) {
-            let f = getTimeFun(userGacha.refFreeTime);
-            resultRefFreeTime = <number>f.getAfterDayWithHour(dicGacha.free.day);
-        }
         return resResult(STATUS.SUCCESS, {
             gachaId, activityId,
-            freeCount, refFreeTime: resultRefFreeTime, count: userGacha.count, point: userGacha.point, floor, hope,
+            freeCount, refFreeTime: userGacha.refFreeTime, count: userGacha.count, point: userGacha.point, floor, hope,
             heroes: resultHeroes, 
             addHeros: heroes,
             result: resultList
diff --git a/shared/pubUtils/timeUtil.ts b/shared/pubUtils/timeUtil.ts
index 842ef6a79..a5b651fe8 100644
--- a/shared/pubUtils/timeUtil.ts
+++ b/shared/pubUtils/timeUtil.ts
@@ -87,7 +87,7 @@ class Time {
      * @param minute 几分
      * @param seconds 几秒
      */
-    private _setHour(time: Date, hour: number, minute = 0, seconds = 0, millionseconds = 0) {
+    private _setHour(time: number, hour: number, minute = 0, seconds = 0, millionseconds = 0) {
         let t = new Date(time);
         t.setHours(hour, minute, seconds, millionseconds);
         return t;
@@ -101,7 +101,7 @@ class Time {
      * @param seconds 几秒
      */
     private _getDayZeroPoint(time: Date, hour = REFRESH_TIME, minute = 0, seconds = 0) {
-        let t = this._setHour(time, hour, minute, seconds);
+        let t = this._setHour(time.getTime(), hour, minute, seconds);
         if(this.now > t) {
             return t;
         } else {
@@ -203,7 +203,7 @@ class Time {
      * @param seconds 几秒
      */
     public getTimeWithHour(hour = REFRESH_TIME, minute = 0, seconds = 0) {
-        let t = this._setHour(this.time, hour, minute, seconds);
+        let t = this._setHour(this.time.getTime(), hour, minute, seconds);
         return this._returnResult(t);
     }
 
@@ -284,7 +284,7 @@ class Time {
      * @param seconds 几秒
      */
     public getBeforeDayWithHour(day: number = 0, hour = REFRESH_TIME, minute = 0, seconds = 0) {
-        let t = this._setHour(this.time, hour, minute, seconds);
+        let t = this._setHour(this.time.getTime(), hour, minute, seconds);
         if(this.time > t) {
             let timestamp = t.getTime() - day * this.DAY_TO_MS;
             return this._returnResult(timestamp);
@@ -302,8 +302,9 @@ class Time {
      * @param seconds 几秒
      */
     public getAfterDayWithHour(day: number = 0, hour = REFRESH_TIME, minute = 0, seconds = 0) {
-        let t = this._setHour(this.time, hour, minute, seconds, 0);
-        if(this.time > t) {
+        let t = this._setHour(this.time.getTime(), hour, minute, seconds, 0);
+        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);
         } else {
@@ -320,7 +321,7 @@ class Time {
      * @param seconds 几秒
      */
      public getBeforeDayAndSetHour(day: number = 0, hour = REFRESH_TIME, minute = 0, seconds = 0) {
-        let t = this._setHour(this.time, hour, minute, seconds);
+        let t = this._setHour(this.time.getTime(), hour, minute, seconds);
         let timestamp = t.getTime() - day * this.DAY_TO_MS;
         return this._returnResult(timestamp);
     }
@@ -333,7 +334,7 @@ class Time {
      * @param seconds 几秒
      */
      public getAfterDayAndSetHour(day: number = 0, hour = REFRESH_TIME, minute = 0, seconds = 0) {
-        let t = this._setHour(this.time, hour, minute, seconds);
+        let t = this._setHour(this.time.getTime(), hour, minute, seconds);
         let timestamp = t.getTime() + day * this.DAY_TO_MS;
         return this._returnResult(timestamp);
     }
@@ -391,7 +392,7 @@ class Time {
     public getAfterDayByGap(preDate: Date, day: number) {
         let gap = this._getDayGap(preDate, this.time);
         let n = Math.floor(gap / day);
-        return this.getAfterDayWithHour(n * day);
+        return this._returnResult(preDate.getTime() + n * day * this.DAY_TO_MS);
     }
 
     /**