From 81d51c6099702bdcdec765cb46356fd4ad98ad8c Mon Sep 17 00:00:00 2001
From: mamengke01 <794347210@qq.com>
Date: Mon, 11 Jan 2021 18:07:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E5=8F=96=E5=AE=9D=E7=AE=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/servers/battle/handler/pvpHandler.ts | 2 +-
 game-server/app/services/playerEventService.ts       | 4 ++--
 shared/db/PvpDefense.ts                              | 2 +-
 shared/db/PvpRecord.ts                               | 2 +-
 shared/pubUtils/timeUtil.ts                          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/game-server/app/servers/battle/handler/pvpHandler.ts b/game-server/app/servers/battle/handler/pvpHandler.ts
index e37c3ad39..ea9ff78fd 100644
--- a/game-server/app/servers/battle/handler/pvpHandler.ts
+++ b/game-server/app/servers/battle/handler/pvpHandler.ts
@@ -390,7 +390,7 @@ export class PvpHandler {
         if (hisScore < pvpBox.score) {
             return resResult(STATUS.PVP_NOT_REACH_BOX_SCORE);
         }
-        if (_.indexOf(receivedBox, id) != -1 ) {
+        if (receivedBox.indexOf(id) != -1 ) {
             return resResult(STATUS.PVP_BOX_IS_GOT);
         }
         receivedBox.push(id);
diff --git a/game-server/app/services/playerEventService.ts b/game-server/app/services/playerEventService.ts
index 0fb74d8d3..30bd327d8 100644
--- a/game-server/app/services/playerEventService.ts
+++ b/game-server/app/services/playerEventService.ts
@@ -8,14 +8,14 @@ import { startEvent } from "./eventSercive";
 
 export async function eventOnPlayerLvUp(roleId: string, lv: number, addFuncs: Array<number>, dataFuncs: Array<number>) {
 
-    if (!dataFuncs.includes(FUNCS_ID.PVP)) {//开启pvp
+    // if (!dataFuncs.includes(FUNCS_ID.PVP)) {//开启pvp
         let res = getFuncsSwitch(FUNCS_ID.PVP);
         if (!res || lv >= res.param) {
             let role = await RoleModel.findByRoleId(roleId);
             await checkPvp(role);
             addFuncs.push(FUNCS_ID.PVP);
         } 
-    }    
+    // }    
     
     if (!dataFuncs.includes(FUNCS_ID.EVENT)) {//开启奇遇
         let res = getFuncsSwitch(FUNCS_ID.EVENT);
diff --git a/shared/db/PvpDefense.ts b/shared/db/PvpDefense.ts
index 2adb45724..3d58e3660 100644
--- a/shared/db/PvpDefense.ts
+++ b/shared/db/PvpDefense.ts
@@ -141,7 +141,7 @@ export default class PvpDefense extends BaseModel {
     challengeCnt: number;       // 可挑战次数
     @prop({ required: true, default: 0 })
     challengeRefTime: number;    // 上一次刷新的时间
-    @prop({ required: true, default: [] })
+    @prop({ required: true, type: Number, default: [] })
     receivedBox: Array<number>;
     @prop({ required: true, default: 0 })
     seasonNum: number;
diff --git a/shared/db/PvpRecord.ts b/shared/db/PvpRecord.ts
index 6f42b66e0..82d869d0d 100644
--- a/shared/db/PvpRecord.ts
+++ b/shared/db/PvpRecord.ts
@@ -81,7 +81,7 @@ export default class PvpRecord extends BaseModel {
     }
 
     public static async delPvpRecords() {
-        let result = await PvpRecordModel.deleteMany({ createdAt: {$lt: getBeforeDayDate(3)}});//删除小于三天的战报
+        let result = await PvpRecordModel.deleteMany({ createTime: {$lt: getBeforeDayDate(3)}});//删除小于三天的战报
         return result;
     }
 }
diff --git a/shared/pubUtils/timeUtil.ts b/shared/pubUtils/timeUtil.ts
index a00e3a41f..ffaf2053a 100644
--- a/shared/pubUtils/timeUtil.ts
+++ b/shared/pubUtils/timeUtil.ts
@@ -24,5 +24,5 @@ export function checkTodayTime(seasonEndTime: number) {
 
 export function getBeforeDayDate(day: number) {     
     let time = getTodayZeroPoint() - day * PER_DAY;
-    return new Date(time * PER_SECOND);     
+    return time;     
 }
\ No newline at end of file