From b44f083637c76a97fb11d58950c675f6b230dcc0 Mon Sep 17 00:00:00 2001
From: xichaoyin <xcy@.qx.com>
Date: Fri, 12 Jan 2024 01:43:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=E9=BB=84=E8=8A=AA=E9=85=92=E9=A6=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api_s2c/event/huangqijiuguan/fun.ts |  6 +++++-
 src/public/task.ts                      | 12 ++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/api_s2c/event/huangqijiuguan/fun.ts b/src/api_s2c/event/huangqijiuguan/fun.ts
index 1494752..8fbca9d 100644
--- a/src/api_s2c/event/huangqijiuguan/fun.ts
+++ b/src/api_s2c/event/huangqijiuguan/fun.ts
@@ -5,7 +5,7 @@ import { PublicShared } from "../../../shared/public/public"
 import { EmailFun } from "../../../public/email"
 import { playerInfo } from "../../../shared/protocols/user/PtlLogin"
 import { PlayerFun } from "../../../public/player"
-import { Player } from "../../../shared/fightControl/Player"
+import { TaskFun } from "../../../public/task"
 
 // hddata.data
 export interface Data {
@@ -374,6 +374,10 @@ export default class HQJGFun {
 
         if (!mydata.task.val[`day${today}`]) {
             mydata.task.val[`day${today}`] = {}
+            for (let taskid in tasks) {
+                let taskcon = tasks[taskid];
+                mydata.task.val[`day${today}`][taskid] = await TaskFun.getTaskNval(call, taskcon);
+            }
         }
 
         let isset = 0;
diff --git a/src/public/task.ts b/src/public/task.ts
index ba5d130..33e29fe 100644
--- a/src/public/task.ts
+++ b/src/public/task.ts
@@ -1,9 +1,9 @@
-import {ApiCall, ApiReturn} from "tsrpc";
-import {HongDianChange} from "../api_s2c/hongdian/fun";
-import {taskType} from "../shared/protocols/task/type";
-import {PublicShared} from "../shared/public/public";
-import {PeijianFun} from "./peijian";
-import {manager} from "./taskclass";
+import { ApiCall, ApiReturn } from "tsrpc";
+import { HongDianChange } from "../api_s2c/hongdian/fun";
+import { taskType } from "../shared/protocols/task/type";
+import { PublicShared } from "../shared/public/public";
+import { PeijianFun } from "./peijian";
+import { manager } from "./taskclass";
 
 let taskDict = {};
 const SHUJUKU = "task";

From cd8e1a44ba5b951aa8d83e689af2ef84402c1318 Mon Sep 17 00:00:00 2001
From: xichaoyin <xcy@.qx.com>
Date: Fri, 12 Jan 2024 01:51:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api_s2c/event/huangqijiuguan/fun.ts | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/api_s2c/event/huangqijiuguan/fun.ts b/src/api_s2c/event/huangqijiuguan/fun.ts
index 8fbca9d..7a1a81d 100644
--- a/src/api_s2c/event/huangqijiuguan/fun.ts
+++ b/src/api_s2c/event/huangqijiuguan/fun.ts
@@ -372,7 +372,9 @@ export default class HQJGFun {
 
         let mydata = await this.getMydata(call, hd.hdid);
 
+        let isset = 0;
         if (!mydata.task.val[`day${today}`]) {
+            isset = 1;
             mydata.task.val[`day${today}`] = {}
             for (let taskid in tasks) {
                 let taskcon = tasks[taskid];
@@ -380,12 +382,6 @@ export default class HQJGFun {
             }
         }
 
-        let isset = 0;
-        let setData = {
-            $inc: {},
-            $set: {}
-        };
-
         for (let taskid of Object.keys(tasks)) {
             let taskCon = tasks[taskid];
             if (taskCon.stype != stype) continue
@@ -397,18 +393,20 @@ export default class HQJGFun {
             val = await alchangeVal(call, taskCon, val, arg)
 
             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
+            if (isinc != 1) {    // 累加
+                mydata.task.val[`day${today}`][taskid] = val;
             } else {
-                mydata.task.val[`day${today}`][taskid] = val
-                setData["$set"][`task.val.day${today}.${taskid}`] = val
+                mydata.task.val[`day${today}`][taskid] = (mydata.task.val[`day${today}`][taskid] || 0) + val;
             }
         }
 
         // 设置任务
         if (isset == 1) {
-            await G.mongodb.collection('event').updateOne({ uid: call.uid, type: this.dataType(hd.hdid) }, setData)
+            await G.mongodb.collection('event').updateOne({ uid: call.uid, type: this.dataType(hd.hdid) }, {
+                $set: {
+                    [`task.val.day${today}`]: mydata.task.val[`day${today}`]
+                }
+            })
 
             if ((await this.getHongDian(call, hd, mydata)).show) {
                 G.server.sendMsgByUid(call.uid, "msg_s2c/HongDianChange", ["huodonghd"])