Merge remote-tracking branch 'origin/bugfix' into bugfix

src/api_s2c/xstask/ApiRefresh.ts

@@ -1,9 +1,9 @@
-import { ApiCall } from "tsrpc";
-import { PlayerFun } from '../../public/player';
-import { TeQuanFun } from '../../public/tequan';
-import { XstaskFun } from '../../public/xstask';
-import { ReqRefresh, ResRefresh } from "../../shared/protocols/xstask/PtlRefresh";
-import { HongDianChange } from "../hongdian/fun";
+import {ApiCall} from "tsrpc";
+import {PlayerFun} from '../../public/player';
+import {TeQuanFun} from '../../public/tequan';
+import {XstaskFun} from '../../public/xstask';
+import {ReqRefresh, ResRefresh} from "../../shared/protocols/xstask/PtlRefresh";
+import {HongDianChange} from "../hongdian/fun";
 
 export default async function (call: ApiCall<ReqRefresh, ResRefresh>) {
     let info = await XstaskFun.getInfo(call.uid);
@@ -15,6 +15,8 @@ export default async function (call: ApiCall<ReqRefresh, ResRefresh>) {
     let event = await G.mongodb.cEvent('xstask').findOne({uid: call.uid, type: 'xstask'});
     if (event?.receiveNum >= 8) return call.error(globalThis.lng.xstask_11);
 
+    delNum = delNum - (event?.receiveNum || 0)
+
     let change: ResRefresh = {};
     let needDel = taskList.filter(task => task.receiveData == undefined || task.receiveData.rec == true);
 
@@ -23,7 +25,7 @@ export default async function (call: ApiCall<ReqRefresh, ResRefresh>) {
         await PlayerFun.cutNeed(call, [meet.atn]);
     } else {
         change.useFreeRefreshNum = info.useFreeRefreshNum + 1;
-        XstaskFun.changeInfo(call.uid, { $inc: { useFreeRefreshNum: 1 } });
+        XstaskFun.changeInfo(call.uid, {$inc: {useFreeRefreshNum: 1}});
     }
 
     XstaskFun.delTasks(call.uid, needDel.map(v => v._id));