累计充值

src/api_s2c/event/leijichongzhi/ApiOpen.ts

@@ -22,11 +22,14 @@ export default async function (call: ApiCall<ReqOpen, ResOpen>) {
             {upsert: true}
         );
     }
+    let payNum = (await PayFun.getPayDaysAllPayNum(call.uid, _hdinfo.stime, _hdinfo.rtime)) * 10
+    payNum = payNum - (db.round || 0) * R.compose(R.sum(), R.map(i => i.total))(_hdinfo.data.tasks)
 
     call.succ({
         sTime: sTime,
         recIndex: db?.recIndex || [],
-        payNum: (await PayFun.getPayDaysAllPayNum(call.uid, _hdinfo.stime, _hdinfo.rtime)) * 10,
+        payNum: payNum,
-        hdinfo: _hdinfo
+        hdinfo: _hdinfo,
+        round: db.round || 0
     });
 }

src/api_s2c/event/leijichongzhi/ApiRec.ts

@@ -21,14 +21,22 @@ export default async function (call: ApiCall<ReqRec, ResRec>) {
     if (db.recIndex.includes(call.req.index)) return call.error('', {code: -2});
 
     let payNum = (await PayFun.getPayDaysAllPayNum(call.uid, _hdinfo.stime, _hdinfo.rtime)) * 10;
+    payNum = payNum - (db.round || 0) * R.compose(R.sum(), R.map(i => i.total))(_hdinfo.data.tasks)
     if (payNum < conf.total) return call.error('', {code: -3});
 
     await PlayerFun.sendPrize(call, conf.prize);
 
-    G.mongodb.cEvent(_dbType).updateOne(
+    if (db.recIndex.length + 1 >= _hdinfo.data.tasks.length) {
+        await G.mongodb.cEvent(_dbType).updateOne(
+            {uid: call.uid, type: _dbType},
+            {$set: {recIndex: []}, $inc: {round: 1}}
+        );
+    } else {
+        await G.mongodb.cEvent(_dbType).updateOne(
             {uid: call.uid, type: _dbType},
             {$push: {recIndex: call.req.index}}
         );
+    }
 
     HongDianChange.sendChangeKey(call.uid, ['huodonghd'])
     call.succ({

src/shared/protocols/event/leijichongzhi/PtlOpen.ts

@@ -16,4 +16,6 @@ export type ResOpen = {
     payNum: number;
     /**活动信息 */
     hdinfo: ReqAddHuoDong;
+    /** 当前领取轮次 */
+    round: number
 };

src/shared/protocols/serviceProto.ts

@@ -10263,6 +10263,13 @@ export const serviceProto: ServiceProto<ServiceType> = {
                         "type": "Reference",
                         "target": "../../monopoly/protocols/PtlAddHuoDong/ReqAddHuoDong"
                     }
+                },
+                {
+                    "id": 4,
+                    "name": "round",
+                    "type": {
+                        "type": "Number"
+                    }
                 }
             ]
         },