From 541e8a391d2ef081dcd1adec45b4f6a2359ea399 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Mon, 9 Nov 2020 13:48:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=A2=AF=E6=B4=BE?=
 =?UTF-8?q?=E9=81=A3=E6=98=9F=E7=BA=A7=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/battleService.ts | 7 +++----
 game-server/app/services/eventSercive.ts  | 5 ++---
 shared/db/DailyRecord.ts                  | 1 -
 shared/pubUtils/util.ts                   | 2 --
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/game-server/app/services/battleService.ts b/game-server/app/services/battleService.ts
index fc81b361c..bc1ebd2e4 100644
--- a/game-server/app/services/battleService.ts
+++ b/game-server/app/services/battleService.ts
@@ -165,7 +165,7 @@ export async function calcuHangUpReward(roleId: string, speedUp = false, speedUp
 
         let multi = Math.floor(deltaTime / HANG_UP_CONSTS.UNIT_TIME); // 结算奖励的倍数，受最大时间限制
 
-        console.log(deltaTime, multi, baseReward);
+        // console.log(deltaTime, multi, baseReward);
         for(let {gid, count} of baseReward) {
             let newCount = cal.mul(count, multi);
             let oldGoods = notReceivedGoods.find(cur => cur.gid == gid);
@@ -197,10 +197,9 @@ async function checkCond(roleId: string, heroes, type: number, param: number, cn
 
     switch (type) {
         case 1:
-            let field = param == 1?'star': 'fire'; // fire：觉醒的火，在满星了之后会继续进行觉醒，显示类似6星1火
             for(let hid of heroes) {
                 const rec = await HeroModel.findByHidAndRole(hid, roleId);
-                if (rec[field] >= param) {
+                if (rec.star >= param) {
                     heroCnt++;
                 }
             }
@@ -277,7 +276,7 @@ export function treatTask(recs: Array<any>, curTime: Date) {
         let { heroes, batchCode, taskId, taskCode, status, completeTime} = cur;
         let remainTime = 0;
         if(status == 1) {
-            console.log(curTime.getTime(), completeTime.getTime())
+            // console.log(curTime.getTime(), completeTime.getTime())
             remainTime = Math.floor((completeTime.getTime() - curTime.getTime())/1000);
           if(remainTime < 0) {
             status = 2; remainTime = 0;
diff --git a/game-server/app/services/eventSercive.ts b/game-server/app/services/eventSercive.ts
index b9caa1edb..8f31fa74f 100644
--- a/game-server/app/services/eventSercive.ts
+++ b/game-server/app/services/eventSercive.ts
@@ -23,7 +23,7 @@ export async function checkEventBattle(roleId: string, eventStatus: number, batt
     if (!result) {
         if(refTime) {
             let preTime = getEventTime(new Date(refTime - 1));
-            console.log('preTime:', preTime);
+            // console.log('preTime:', preTime);
             result = await EventRecordModel.setBattleCode(roleId, battleId, preTime, battleCode);
         }
     }
@@ -73,7 +73,6 @@ export function getEventTime(now: Date) {
     } else if (curTime >= todayB) {
         t = todayB;
     }
-    console.log('getEventTime', curTime, todayA, todayB, yesterdayB, t);
     return t
 }
 
@@ -353,7 +352,7 @@ export function getEventSuccessStatus(type: number, status: number, question: Ar
     } else if (type == EVENT_TYPE.QUIZ) {
         isSuccess = true;
         for(let { status = EVENT_ANSWER_STATUS.WAITING } of question) {
-            console.log(status);
+            // console.log(status);
             if(status == EVENT_ANSWER_STATUS.WRONG) {
                 isSuccess = false;
             } else if(status == EVENT_ANSWER_STATUS.WAITING) {
diff --git a/shared/db/DailyRecord.ts b/shared/db/DailyRecord.ts
index e12206fb3..a3201b5c8 100644
--- a/shared/db/DailyRecord.ts
+++ b/shared/db/DailyRecord.ts
@@ -32,7 +32,6 @@ export default class DailyRecord extends BaseModel {
     let now = new Date();
     let today = setLocalHours(DAILY_CONST.REFRESH_TIME, now);
 
-    console.log('******dailyTime*******', today, now, new Date(), refTime);
     if(today > refTime) {
         refTime = today; count = 0; buyCount = 0;
     }
diff --git a/shared/pubUtils/util.ts b/shared/pubUtils/util.ts
index 7548cb892..457f3697e 100644
--- a/shared/pubUtils/util.ts
+++ b/shared/pubUtils/util.ts
@@ -19,7 +19,6 @@ const moment = require('moment');
     if(str == '&'|| !str) {
       return []
     } else {
-      console.log(str)
       return str.split(splitForm).map(cur => {
         return decodeStrSingle(type,cur);
       });
@@ -307,7 +306,6 @@ export function calculateNum(ratio: {A: number, B: number}, params: {num: number
 export function setLocalHours(hour: number, curTime = new Date()) {
   // curTime: 格林威治时间
   let offset = curTime.getTimezoneOffset(); // 格林威治时间和本地时间之间的时差(分)
-  console.log('offset：', offset);
   let localTime = new Date(curTime.getTime() - offset * 60 * 1000 + 8 * 60 * 60 * 1000); // 中国时间
   localTime.setUTCHours(hour, 0, 0, 0); // 中国的几点
   return localTime.getTime() + offset * 60 * 1000 - 8 * 60 * 60 * 1000; // 回到格林威治时间