From a600998fd32c9bb5d3d739cba1c07fa49f2e4681 Mon Sep 17 00:00:00 2001
From: xichaoyin <xcy@.qx.com>
Date: Thu, 11 Jan 2024 20:52:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=BB=84=E8=8A=AA=E9=85=92=E9=A6=86?=
 =?UTF-8?q?=E7=BA=A2=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api_s2c/event/huangqijiuguan/ApiFight.ts  |  2 +
 .../event/huangqijiuguan/ApiGiftRec.ts        |  2 +
 .../event/huangqijiuguan/ApiRecDpsPrize.ts    |  2 +
 .../event/huangqijiuguan/ApiTaskRec.ts        |  2 +
 .../event/huangqijiuguan/ApiZhaoMuPrizeRec.ts |  2 +
 src/api_s2c/event/huangqijiuguan/fun.ts       | 61 ++++++++++++++++++-
 src/api_s2c/hongdian/fun.ts                   |  5 ++
 7 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/src/api_s2c/event/huangqijiuguan/ApiFight.ts b/src/api_s2c/event/huangqijiuguan/ApiFight.ts
index 41974cd..d4ee3a8 100644
--- a/src/api_s2c/event/huangqijiuguan/ApiFight.ts
+++ b/src/api_s2c/event/huangqijiuguan/ApiFight.ts
@@ -37,4 +37,6 @@ export default async function (call: ApiCall<ReqFight, ResFight>) {
     up && await HQJGFun.setMyData(call.uid, call.req.hdid, { bossres: mydata.bossres });
 
     call.succ({ data: mydata, result: result });
+
+    G.server.sendMsgByUid(call.uid, "msg_s2c/HongDianChange", ["huodonghd"])
 }
\ No newline at end of file
diff --git a/src/api_s2c/event/huangqijiuguan/ApiGiftRec.ts b/src/api_s2c/event/huangqijiuguan/ApiGiftRec.ts
index 741c88c..39f9e97 100644
--- a/src/api_s2c/event/huangqijiuguan/ApiGiftRec.ts
+++ b/src/api_s2c/event/huangqijiuguan/ApiGiftRec.ts
@@ -39,4 +39,6 @@ export default async function (call: ApiCall<ReqGiftRec, ResGiftRec>) {
     await HQJGFun.setMyData(call.uid, call.req.hdid, { giftbuy: mydata.giftbuy });
 
     call.succ({ data: mydata, prize: prize })
+
+    G.server.sendMsgByUid(call.uid, "msg_s2c/HongDianChange", ["huodonghd"])
 }
diff --git a/src/api_s2c/event/huangqijiuguan/ApiRecDpsPrize.ts b/src/api_s2c/event/huangqijiuguan/ApiRecDpsPrize.ts
index 888b3b3..2f77d9a 100644
--- a/src/api_s2c/event/huangqijiuguan/ApiRecDpsPrize.ts
+++ b/src/api_s2c/event/huangqijiuguan/ApiRecDpsPrize.ts
@@ -43,4 +43,6 @@ export default async function (call: ApiCall<ReqRecDpsPrize, ResRecDpsPrize>) {
     }
 
     call.succ({ data: mydata, prize: prize })
+
+    G.server.sendMsgByUid(call.uid, "msg_s2c/HongDianChange", ["huodonghd"])
 }
\ No newline at end of file
diff --git a/src/api_s2c/event/huangqijiuguan/ApiTaskRec.ts b/src/api_s2c/event/huangqijiuguan/ApiTaskRec.ts
index ae5d668..558aab3 100644
--- a/src/api_s2c/event/huangqijiuguan/ApiTaskRec.ts
+++ b/src/api_s2c/event/huangqijiuguan/ApiTaskRec.ts
@@ -49,4 +49,6 @@ export default async function (call: ApiCall<ReqTaskRec, ResTaskRec>) {
     await HQJGFun.setMyData(call.uid, call.req.hdid, mydata);
 
     call.succ({ data: mydata, prize: prize });
+
+    G.server.sendMsgByUid(call.uid, "msg_s2c/HongDianChange", ["huodonghd"])
 }   
\ No newline at end of file
diff --git a/src/api_s2c/event/huangqijiuguan/ApiZhaoMuPrizeRec.ts b/src/api_s2c/event/huangqijiuguan/ApiZhaoMuPrizeRec.ts
index 7ec2586..546de54 100644
--- a/src/api_s2c/event/huangqijiuguan/ApiZhaoMuPrizeRec.ts
+++ b/src/api_s2c/event/huangqijiuguan/ApiZhaoMuPrizeRec.ts
@@ -39,4 +39,6 @@ export default async function (call: ApiCall<ReqZhaoMuPrizeRec, ResZhaoMuPrizeRe
     await HQJGFun.setMyData(call.uid, call.req.hdid, { zhaomu: mydata.zhaomu });
 
     call.succ({ prize: prize, data: mydata })
+
+    G.server.sendMsgByUid(call.uid, "msg_s2c/HongDianChange", ["huodonghd"])
 }
\ No newline at end of file
diff --git a/src/api_s2c/event/huangqijiuguan/fun.ts b/src/api_s2c/event/huangqijiuguan/fun.ts
index 64510ef..f4f9ded 100644
--- a/src/api_s2c/event/huangqijiuguan/fun.ts
+++ b/src/api_s2c/event/huangqijiuguan/fun.ts
@@ -334,7 +334,11 @@ export default class HQJGFun {
 
         if (!tasks) return
 
-        await this.getMydata(call, hd.hdid)
+        let mydata = await this.getMydata(call, hd.hdid);
+
+        if (!mydata.task.val[`day${today}`]) {
+            mydata.task.val[`day${today}`] = {}
+        }
 
         let isset = 0;
         let setData = {
@@ -354,8 +358,10 @@ export default class HQJGFun {
 
             isset = 1
             if (isinc == 1) {    // 累加
+                mydata.task.val[`day${today}`][taskid] = (mydata.task.val[`day${today}`][taskid] || 0) + val
                 setData["$inc"][`task.val.day${today}.${taskid}`] = val
             } else {
+                mydata.task.val[`day${today}`][taskid] = val
                 setData["$set"][`task.val.day${today}.${taskid}`] = val
             }
         }
@@ -363,6 +369,10 @@ export default class HQJGFun {
         // 设置任务
         if (isset == 1) {
             await G.mongodb.collection('event').updateOne({ uid: call.uid, type: this.dataType(hd.hdid) }, setData)
+            
+            if ((await this.getHongDian(call, hd, mydata)).show) {
+                G.server.sendMsgByUid(call.uid, "msg_s2c/HongDianChange", ["huodonghd"])
+            }
         }
     }
 
@@ -406,4 +416,51 @@ export default class HQJGFun {
         await PlayerFun.sendPrize(call, prize)
         await this.setMyData(call.uid, hd.hdid, { giftbuy: mydata.giftbuy });
     }
-}
\ No newline at end of file
+
+    static async getHongDian(call: ApiCall, hd: ReqAddHuoDong, mydata?: PlayerData) {
+        let hdid = hd.hdid;
+        let hddata = hd.data as Data;
+
+        mydata = mydata || await this.getMydata(call, hdid);
+        // 当黄旗招募存在可领取的可选奖励时
+        for (let i = 0; i < hddata.choukajiangli.length; i++) {
+            let ele = hddata.choukajiangli[i];
+            if (mydata.zhaomu.num >= ele.num && !mydata.zhaomu.prize.includes(i)) {
+                return { show: true }
+            }
+        }
+
+        let today = this.today(hd);
+        // 当今日没有进行boss挑战时
+        if (!mydata.bossres.todaydps[today]) {
+            return { show: true }
+        }
+
+        // 当每日任务界面存在可领取的任务奖励时
+        for (let day = 1; day <= today; day++) {
+            for (let taskid in hddata.task[`day${day}`]) {
+                let task = hddata.task[`day${day}`][taskid];
+                if (mydata.task.val[`day${day}`][taskid] >= task.pval && !mydata.task.rec[`day${day}`].includes(Number(taskid))) {
+                    return { show: true }
+                }
+
+            }
+        }
+
+        // 当干部挑战界面存在可领取的挑战任务奖励时
+        for (let mb of hddata.bossTask) {
+            if (mb.need <= mydata.bossres.maxdps && !mydata.bossres.recdpstask.includes(mb.id)) {
+                return { show: true }
+            }
+        }
+
+        // 当存在可以领取的免费礼包时
+        for (let gift of hddata.gift) {
+            if (gift.free && (mydata.giftbuy[gift.id]?.num || 0) < gift.buynum) {
+                return { show: true }
+            }
+        }
+
+        return { show: false }
+    }
+}   
\ No newline at end of file
diff --git a/src/api_s2c/hongdian/fun.ts b/src/api_s2c/hongdian/fun.ts
index 99973d6..410378c 100644
--- a/src/api_s2c/hongdian/fun.ts
+++ b/src/api_s2c/hongdian/fun.ts
@@ -21,6 +21,7 @@ import kfjsFun from "../../public/kaifujingsai";
 import {RankKfjs} from "../../public/rank/rank_kfjs";
 import {ShopFun} from "../../public/shop";
 import {Christmasfun} from '../event/christmas/fun';
+import HQJGFun from '../event/huangqijiuguan/fun';
 
 export class HongDianFun {
     /**黑榜争霸红点 */
@@ -352,6 +353,10 @@ export class HuoDongHongDianFun {
                 // 检测 htype 10 元旦活动红点
                 ishd = await this.yuandan(call, element)
             }
+            if (element.htype == 15) {
+                // 检测 htype 15 黄芪酒馆活动红点
+                ishd = await HQJGFun.getHongDian(call, element)
+            }
 
             // 此活动有红点
             if (ishd.show) {