From d5d5d72badc7a3d533d6308b585d5338f17428ec Mon Sep 17 00:00:00 2001
From: dy <askjjdk@153.com>
Date: Fri, 29 Dec 2023 16:21:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=83=E6=97=A6=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api_s2c/event/yuandan/ApiDMRec.ts    | 2 +-
 src/api_s2c/event/yuandan/ApiDZRec.ts    | 2 +-
 src/api_s2c/event/yuandan/ApiExchange.ts | 2 +-
 src/api_s2c/event/yuandan/ApiTaskRec.ts  | 6 +++---
 src/api_s2c/event/yuandan/ApiZLRec.ts    | 2 +-
 src/api_s2c/event/yuandan/fun.ts         | 2 +-
 src/api_s2c/hongdian/fun.ts              | 9 ++++-----
 src/shared/protocols/hongdian/PtlGet.ts  | 2 +-
 8 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/api_s2c/event/yuandan/ApiDMRec.ts b/src/api_s2c/event/yuandan/ApiDMRec.ts
index 693d595..5527059 100644
--- a/src/api_s2c/event/yuandan/ApiDMRec.ts
+++ b/src/api_s2c/event/yuandan/ApiDMRec.ts
@@ -31,5 +31,5 @@ export default async function (call: ApiCall<ReqDMRec, ResDMRec>) {
 
     call.succ({prize})
 
-    HongDianChange.sendChangeKey(call.uid, ['yuandan']);
+    HongDianChange.sendChangeKey(call.uid, ['huodonghd']);
 }
diff --git a/src/api_s2c/event/yuandan/ApiDZRec.ts b/src/api_s2c/event/yuandan/ApiDZRec.ts
index a2dd1b8..bc6e083 100644
--- a/src/api_s2c/event/yuandan/ApiDZRec.ts
+++ b/src/api_s2c/event/yuandan/ApiDZRec.ts
@@ -32,5 +32,5 @@ export default async function (call: ApiCall<ReqDZRec, ResDZRec>) {
 
     call.succ({[gift.id]: prize})
 
-    HongDianChange.sendChangeKey(call.uid, ['yuandan']);
+    HongDianChange.sendChangeKey(call.uid, ['huodonghd']);
 }
diff --git a/src/api_s2c/event/yuandan/ApiExchange.ts b/src/api_s2c/event/yuandan/ApiExchange.ts
index 72bbe41..6278286 100644
--- a/src/api_s2c/event/yuandan/ApiExchange.ts
+++ b/src/api_s2c/event/yuandan/ApiExchange.ts
@@ -25,5 +25,5 @@ export default async function (call: ApiCall<ReqExchange, ResExchange>) {
 
     call.succ({})
 
-    HongDianChange.sendChangeKey(call.uid, ['yuandan']);
+    HongDianChange.sendChangeKey(call.uid, ['huodonghd']);
 }
diff --git a/src/api_s2c/event/yuandan/ApiTaskRec.ts b/src/api_s2c/event/yuandan/ApiTaskRec.ts
index 04e95eb..5966b31 100644
--- a/src/api_s2c/event/yuandan/ApiTaskRec.ts
+++ b/src/api_s2c/event/yuandan/ApiTaskRec.ts
@@ -29,9 +29,9 @@ export default async function (call: ApiCall<ReqTaskRec, ResTaskRec>) {
 
     await PlayerFun.sendPrize(call, _prize);
     let changedata = { data: _mydata, prize: _prize}
-    // 推送红点
-    HongDianChange.sendChangeKey(call.uid, ['huodonghd']);
+
     call.succ(changedata);
 
-
+    // 推送红点
+    HongDianChange.sendChangeKey(call.uid, ['huodonghd']);
 }
\ No newline at end of file
diff --git a/src/api_s2c/event/yuandan/ApiZLRec.ts b/src/api_s2c/event/yuandan/ApiZLRec.ts
index 4b1340a..5902f8f 100644
--- a/src/api_s2c/event/yuandan/ApiZLRec.ts
+++ b/src/api_s2c/event/yuandan/ApiZLRec.ts
@@ -40,5 +40,5 @@ export default async function (call: ApiCall<ReqZLRec, ResZLRec>) {
 
     call.succ({[call.req.id]: prize})
 
-    HongDianChange.sendChangeKey(call.uid, ['yuandan']);
+    HongDianChange.sendChangeKey(call.uid, ['huodonghd']);
 }
diff --git a/src/api_s2c/event/yuandan/fun.ts b/src/api_s2c/event/yuandan/fun.ts
index 785049d..b09da3d 100644
--- a/src/api_s2c/event/yuandan/fun.ts
+++ b/src/api_s2c/event/yuandan/fun.ts
@@ -24,7 +24,7 @@ export class Yuandanfun {
                     exchange: {},
                     taskfinish: [],
                     taskval: await this.getTaskVal(call),
-                    qiandaoTime: data?.qiandaoTime || 0,
+                    qiandaoTime: data?.qiandaoTime || 1,
                     refreshTime: G.time
                 },
             }, {upsert: true, returnDocument: 'after'})).value
diff --git a/src/api_s2c/hongdian/fun.ts b/src/api_s2c/hongdian/fun.ts
index 7f7781c..345af02 100644
--- a/src/api_s2c/hongdian/fun.ts
+++ b/src/api_s2c/hongdian/fun.ts
@@ -349,7 +349,7 @@ export class HuoDongHongDianFun {
                 ishd = await this.pobinglibao(call, element)
             }
             if (element.htype == 14) {
-                // 检测 htype 10 破冰活动红点
+                // 检测 htype 10 元旦活动红点
                 ishd = await this.yuandan(call, element)
             }
 
@@ -392,16 +392,15 @@ export class HuoDongHongDianFun {
 
         if (data?.gameNum < _hd.data.gamefree) return {show: true}
 
-        if (!PublicShared.chkSameDate(data?.qiandaoTime || 0, G.time)) {
+        if (!PublicShared.chkSameDate(data?.qiandaoTime || 1, G.time)) {
             return {show: true}
         }
 
-        for (let i = 1; i <= data.taskval.length; i++) {
-            if (data?.taskval[i] >= _hd?.data?.task?.[i]?.pval && !data?.taskfinish.find(v => v == i + '')) {
+        for (const i in data.taskval) {
+            if (data?.taskval[i] >= _hd?.data?.task?.[i]?.pval && !data?.taskfinish.find(v => v == i)) {
                 return {show: true}
             }
         }
-
         return {show: false}
     }
 
diff --git a/src/shared/protocols/hongdian/PtlGet.ts b/src/shared/protocols/hongdian/PtlGet.ts
index 2d661c0..5e97353 100644
--- a/src/shared/protocols/hongdian/PtlGet.ts
+++ b/src/shared/protocols/hongdian/PtlGet.ts
@@ -55,7 +55,7 @@ export type hongdianKey =
     | 'pobinglibao'
     | 'payForDiamond'
     | 'leichonglibao'
-    | 'yuandan';
+
 export type hongdianVal = {
     show?: boolean;
     // 看功能需要