Merge remote-tracking branch 'origin/dev-tequan' into dev

src/api_s2c/event/huobanzhaomu/ApiRec.ts

@@ -2,6 +2,7 @@ import { ApiCall } from "tsrpc";
 import {PlayerFun} from '../../../public/player';
 import {ReqRec, ResRec} from "../../../shared/protocols/event/huobanzhaomu/PtlRec";
 import {HongDianChange} from "../../hongdian/fun";
+import {PayFun} from "../../../public/pay";
 
 export default async function (call: ApiCall<ReqRec, ResRec>) {
     let conf = G.gc.huobanzhaomu[call.req.index];
@@ -10,7 +11,17 @@ export default async function (call: ApiCall<ReqRec, ResRec>) {
 
     let db = await G.mongodb.cEvent('huobanzhaomu').findOne({uid: call.uid, type: 'huobanzhaomu'});
     if (db?.rec.includes(call.req.index)) return call.error('', {code: -3});
-    if (!conf.gudKey && (db?.rec?.length || 0) < G.gc.huobanzhaomu.length - 1) return call.error('', { code: -4 });
+
+    if (conf.gudKey == "chaozhiyueka") {
+        let logs = await PayFun.getPayLog(call.uid, "chaozhiyueka");
+        if (!logs || logs.slice(-1)[0].eTime < G.time) {
+            return call.error('', {code: -4});
+        }
+    } else {
+        if (!conf.gudKey && (db?.rec?.length || 0) < G.gc.huobanzhaomu.length - 1) {
+            return call.error('', {code: -4});
+        }
+    }
 
     await PlayerFun.sendPrize(call, conf.prize);
 

src/api_s2c/xstask/ApiAllGet.ts

@@ -4,10 +4,12 @@ import { XstaskFun } from '../../public/xstask';
 import {ReqAllGet, ResAllGet} from "../../shared/protocols/xstask/PtlAllGet";
 import {HongDianChange} from "../hongdian/fun";
 import {PublicShared} from "../../shared/public/public";
+import {TeQuanFun} from "../../public/tequan";
 
 export default async function (call: ApiCall<ReqAllGet, ResAllGet>) {
     const taskList = JSON.parse(JSON.stringify(await XstaskFun.getAllTask(call.uid)));
     let taskInfo = await XstaskFun.getInfo(call.uid);
+    let tequan = await TeQuanFun.getXsTaskNum(call);
     let prizeArr: atn[] = []
     for (let task of taskList) {
         const taskConf = G.gc.xstask[task?.taskId];
@@ -38,6 +40,14 @@ export default async function (call: ApiCall<ReqAllGet, ResAllGet>) {
         XstaskFun.changeInfo(call.uid, change);
         await PlayerFun.sendPrize(call, taskConf.prize);
         HongDianChange.sendChangeKey(call.uid, ['xstaskhd', 'huodonghd']);
+
+        if (!tequan) {
+            prizeArr.push(...taskConf.prize)
+        } else {
+            for (let i = 0; i < 3; i++) {
+                prizeArr.push(...taskConf.prize)
+            }
+        }
         prizeArr.push(...taskConf.prize)
     }
     call.succ({

src/api_s2c/xstask/ApiGet.ts

@@ -4,6 +4,7 @@ import { XstaskFun } from '../../public/xstask';
 import {ReqGet, ResGet} from "../../shared/protocols/xstask/PtlGet";
 import {HongDianChange} from "../hongdian/fun";
 import {PublicShared} from '../../shared/public/public';
+import {TeQuanFun} from "../../public/tequan";
 
 export default async function (call: ApiCall<ReqGet, ResGet>) {
 
@@ -35,12 +36,20 @@ export default async function (call: ApiCall<ReqGet, ResGet>) {
         XstaskFun.finishTask(call.uid, call.req._id)
     }
     // XstaskFun.delTask(call.uid, call.req._id);
+    let send_prize = [];
     XstaskFun.changeInfo(call.uid, change);
-    await PlayerFun.sendPrize(call, taskConf.prize);
+    if (!await TeQuanFun.getXsTaskNum(call)) {
+        send_prize = taskConf.prize;
+    } else {
+        for (let i = 0; i < 3; i++) {
+            send_prize = send_prize.concat(taskConf.prize)
+        }
+    }
+    await PlayerFun.sendPrize(call, send_prize);
     HongDianChange.sendChangeKey(call.uid, ['xstaskhd', 'huodonghd']);
 
     call.succ({
         taskList: await XstaskFun.getAllTask(call.uid),
-        prize: taskConf.prize
+        prize: send_prize
     });
 }

src/api_s2c/xstask/ApiOpen.ts

@@ -36,7 +36,7 @@ export default async function (call: ApiCall<ReqOpen, ResOpen>) {
         XstaskFun.delTasks(call.uid, delTask.map(task => task._id));
     }
 
-    needAddTask += await TeQuanFun.getXsTaskNum(call);
+    // needAddTask += await TeQuanFun.getXsTaskNum(call);
     needAddTask && await XstaskFun.addTasks(call.uid, XstaskFun.randomTasks(taskInfo?.lv || changeInfo.lv, needAddTask));
 
     let { _id, uid, type, ...info } = taskInfo || changeInfo as typeof taskInfo;