From 98abec3a9d4e9f7ebdf2e65d4150e8fac3768883 Mon Sep 17 00:00:00 2001
From: qiaoxin <qiaoxin@bantus.cn>
Date: Thu, 20 May 2021 20:55:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=EF=BC=9A=E4=B8=83=E5=A4=A9?=
 =?UTF-8?q?=E4=B9=90=E6=AF=8F=E6=97=A5=E4=BC=98=E6=83=A0=E5=AD=98=E5=82=A8?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/servers/activity/handler/sevenDaysHandler.ts        | 6 +++---
 shared/db/ActivityDailyGifts.ts                             | 2 +-
 shared/domain/activityField/dailyGiftsField.ts              | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/game-server/app/servers/activity/handler/sevenDaysHandler.ts b/game-server/app/servers/activity/handler/sevenDaysHandler.ts
index 9839db452..c73484782 100644
--- a/game-server/app/servers/activity/handler/sevenDaysHandler.ts
+++ b/game-server/app/servers/activity/handler/sevenDaysHandler.ts
@@ -111,9 +111,9 @@ export class SevenDaysHandler {
         if (dayItemData.getPointReward) {//已经领取过
             return resResult(STATUS.ACTIVITY_REWARDED);
         }
-        if (playerData.today() != dayIndex) {
-            return resResult(STATUS.ACTIVITY_TIME_ERROR);
-        }
+        // if (playerData.today() != dayIndex) {
+        //     return resResult(STATUS.ACTIVITY_TIME_ERROR);
+        // }
 
         await ActivityGrowthModel.addDayRecord(serverId, activityId, roleId, dayIndex, 1);
 
diff --git a/shared/db/ActivityDailyGifts.ts b/shared/db/ActivityDailyGifts.ts
index 1f353488b..11493a319 100644
--- a/shared/db/ActivityDailyGifts.ts
+++ b/shared/db/ActivityDailyGifts.ts
@@ -24,7 +24,7 @@ export default class ActivityDailyGifts extends BaseModel {
     //购买记录
     public static async buyRecord(serverId: number, activityId: number, roleId: string, dayIndex: number, cellIndex: number, count: number, lean = true) {
         let result: ActivityDailyGiftsModelType = await ActivityDailyGiftsModel.findOneAndUpdate({ serverId, roleId, activityId, dayIndex, cellIndex },
-            { $inc: { receiveRewardCount: count } }, { upsert: true, new: true }).lean(lean);
+            { $inc: { buyCount: count } }, { upsert: true, new: true }).lean(lean);
         return result;
     }
 
diff --git a/shared/domain/activityField/dailyGiftsField.ts b/shared/domain/activityField/dailyGiftsField.ts
index 44de116ed..eeab19920 100644
--- a/shared/domain/activityField/dailyGiftsField.ts
+++ b/shared/domain/activityField/dailyGiftsField.ts
@@ -28,6 +28,7 @@ export class DailyGiftItem {
         this.reward = data.reward;
         this.maxCount = data.maxCount;
         this.discount = data.discount;
+        this.buyCount = 0;
     }
 
     //消耗的资源
@@ -77,7 +78,7 @@ export class DailyGiftsData extends ActivityBase {
         for (let obj of this.list) {
             let index = data.findIndex(record => { return obj.dayIndex == record.dayIndex && obj.cellIndex == record.cellIndex })
             if (index != -1) {
-                obj.buyCount = data[index].buyCount;
+                obj.buyCount = data[index].buyCount ? data[index].buyCount : 0;
             } else {
                 obj.buyCount = 0;
             }