cehua json

修改伙伴招募的奖励领取条件

src/api_cross/wzry/ApiRank.ts

@@ -1,39 +1,32 @@
-import { ApiCall } from "tsrpc";
-import { ReqRank, ResRank } from "../../cross/protocols/wzry/PtlRank";
-import { ChatFun } from "../../public/chat";
-import { EmailFun } from "../../public/email";
-import { FightFun } from "../../public/fight";
-import { Rank } from '../../public/rank/rank';
-import { SchedulerWzryDlDstart, wzrygroup } from "../../public/scheduler/scheduler_wzry";
-import { WangZheRongYaofun } from "../../public/wzry";
-import { PublicShared } from "../../shared/public/public";
-import { player } from "../../shared/protocols/user/type";
-import { rankInfo } from "../../shared/protocols/type";
-import { FindOptions } from "mongodb";
+import {ApiCall} from "tsrpc";
+import {ReqRank, ResRank} from "../../cross/protocols/wzry/PtlRank";
+import {player} from "../../shared/protocols/user/type";
+import {FindOptions} from "mongodb";
 
-export async function getRankList(limit?: number, projection?:any){
-    let option : FindOptions = {
-        sort : {
-            'data.valArr': -1
+export async function getRankList(limit?: number, projection?: any) {
+    let option: FindOptions = {
+        sort: {
+            'data.valArr': -1,
+            'data.player.power': -1
         }
     }
-    if(limit!=null){
+    if (limit != null) {
         option.limit = limit;
     }
-    if(projection!=null){
+    if (projection != null) {
         option.projection = projection;
     }
 
-    let listArr = await G.mongodb.collection('rankList').find({ type: 'wzryCross' },option).toArray();
+    let listArr = await G.mongodb.collection('rankList').find({type: 'wzryCross'}, option).toArray();
     let list = listArr.map(l => l.data);
 
     return list;
 }
 
 export async function getPlayerRank(uid: string) {
-    let _r = await getRankList(50,{
-        "data.player.uid":1,
-        "data.valArr":1,
+    let _r = await getRankList(50, {
+        "data.player.uid": 1,
+        "data.valArr": 1,
     });
     if (!Object.keys(_r).length) {
         return -1
@@ -42,14 +35,14 @@ export async function getPlayerRank(uid: string) {
     return myrank;
 }
 
-export async function getWzryRankList(uid: string, gud: player){
+export async function getWzryRankList(uid: string, gud: player) {
     let list = await getRankList(50);
     return {
         rankList: list,
         myRank: {
             rank: list.findIndex(li => li.player.uid == uid) + 1 || -1,
             player: gud,
-            valArr: [(await G.mongodb.collection('wzry_fight').findOne({ uid: uid }))?.jifen || 0]
+            valArr: [(await G.mongodb.collection('wzry_fight').findOne({uid: uid}))?.jifen || 0]
         }
     };
 }

src/api_s2c/event/huobanzhaomu/ApiRec.ts

@@ -1,27 +1,38 @@
-import { ApiCall } from "tsrpc";
-import { PlayerFun } from '../../../public/player';
-import { ReqRec, ResRec } from "../../../shared/protocols/event/huobanzhaomu/PtlRec";
-import { HongDianChange } from "../../hongdian/fun";
+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];
-    if (!conf) return call.error('', { code: -1 });
-    if (conf.gudKey && call.conn.gud[conf.gudKey] < conf.total) return call.error('', { code: -2 });
+    if (!conf) return call.error('', {code: -1});
+    if (conf.gudKey && call.conn.gud[conf.gudKey] < conf.total) return call.error('', {code: -2});
 
-    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 });
+    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 == "zhizunyueka") {
+        let logs = await PayFun.getPayLog(call.uid, "zhizunyueka");
+        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);
 
     if (db?.rec?.length + 1 >= G.gc.huobanzhaomu.length) {
-        G.mongodb.collection('syncBtns').updateOne({ uid: call.uid }, { $set: { 'huobanzhaomu.active': false } }, { upsert: true });
+        G.mongodb.collection('syncBtns').updateOne({uid: call.uid}, {$set: {'huobanzhaomu.active': false}}, {upsert: true});
     }
 
     G.mongodb.cEvent('huobanzhaomu').updateOne(
-        { uid: call.uid, type: 'huobanzhaomu' },
-        { $push: { rec: call.req.index } },
-        { upsert: true }
+        {uid: call.uid, type: 'huobanzhaomu'},
+        {$push: {rec: call.req.index}},
+        {upsert: true}
     );
 
     HongDianChange.sendChangeKey(call.uid, ['huobanzhaomuhd'])

src/api_s2c/event/shouchong/ApiOpen.ts

@@ -1,11 +1,14 @@
 import { ApiCall } from "tsrpc";
 import { ReqOpen, ResOpen } from "../../../shared/protocols/event/shouchong/PtlOpen";
+import {PayFun} from "../../../public/pay";
 
 export default async function (call: ApiCall<ReqOpen, ResOpen>) {
-    let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' });
+    let data = await G.mongodb.cEvent('shouchongzhigou').findOne({uid: call.uid, type: 'shouchongzhigou'})
+
+    let payIds = R.compose(R.map(i=>i.payid),R.values())(G.gc.shouchong)
 
     call.succ({
-        payNum: call.conn.gud.payExp / 10,
-        receive: Object.fromEntries(Object.keys(G.gc.shouchong).map(k => [k, data?.receive?.[k] || []]))
-    });
+        receive: data?.receive || {},
+        buyLog: await PayFun.getPayLogs(call.uid, payIds)
+    })
 }

src/api_s2c/event/shouchong/ApiReceive.ts

@@ -1,28 +1,31 @@
-import { ApiCall } from "tsrpc";
-import { PlayerFun } from '../../../public/player';
-import { ReqReceive, ResReceive } from "../../../shared/protocols/event/shouchong/PtlReceive";
-import { PublicShared } from '../../../shared/public/public';
-import { HongDianChange } from "../../hongdian/fun";
+import {ApiCall} from "tsrpc";
+import {PlayerFun} from '../../../public/player';
+import {ReqReceive, ResReceive} from "../../../shared/protocols/event/shouchong/PtlReceive";
+import {PublicShared} from '../../../shared/public/public';
+import {HongDianChange} from "../../hongdian/fun";
+import {PayFun} from "../../../public/pay";
 
 export default async function (call: ApiCall<ReqReceive, ResReceive>) {
 
     let conf = G.gc.shouchong[call.req.k];
-
     if (!conf) return call.error(globalThis.lng.pata_getprize_1);
 
-    let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' });
+    let payLog = await PayFun.getPayLog(call.uid, conf.payid)
+    if (!payLog) return call.errorCode(-1)
+
+    let data = await G.mongodb.cEvent('shouchongzhigou').findOne({ uid: call.uid, type: 'shouchongzhigou' });
 
     let recArr = data?.receive?.[call.req.k] || [];
 
-    if (call.conn.gud.payExp < conf.paynum) return call.error(globalThis.lng.event_kfkh_9);
+    // if (call.conn.gud.payExp < conf.paynum) return call.error(globalThis.lng.event_kfkh_9);
 
     if (recArr.length >= conf.prize.length) return call.error(globalThis.lng.event_kfkh_3);
 
     if (recArr.slice(-1)[0] && PublicShared.getToDayZeroTime() < recArr.slice(-1)[0]) return call.error(globalThis.lng.event_kfkh_10);
 
     await PlayerFun.sendPrize(call, conf.prize[recArr.length]);
-    await G.mongodb.cEvent('shouchong').updateOne(
-        { uid: call.uid, type: 'shouchong' },
+    await G.mongodb.cEvent('shouchongzhigou').updateOne(
+        { uid: call.uid, type: 'shouchongzhigou' },
         { $push: G.mongodb.createTreeObj({ key: 'receive', k: call.req.k, val: G.time }) },
         { upsert: true }
     );
@@ -40,17 +43,16 @@ export default async function (call: ApiCall<ReqReceive, ResReceive>) {
 }
 
 export async function getShouChongRedPoint(call: ApiCall) {
-    let res = { show: false };
-    let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' });
+    // let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' });
+    //
+    // for (let [id, conf] of Object.entries(G.gc.shouchong)) {
+    //     let rec = data?.receive?.[id] || [];
+    //     if (call.conn.gud.payExp / 10 < conf.paynum || rec.length >= conf.prize.length) continue;
+    //     if (rec.length == 0 || rec.slice(-1)[0] < PublicShared.getToDayZeroTime(G.time)) {
+    //         res = { show: true };
+    //         break;
+    //     }
+    // }
 
-    for (let [id, conf] of Object.entries(G.gc.shouchong)) {
-        let rec = data?.receive?.[id] || [];
-        if (call.conn.gud.payExp / 10 < conf.paynum || rec.length >= conf.prize.length) continue;
-        if (rec.length == 0 || rec.slice(-1)[0] < PublicShared.getToDayZeroTime(G.time)) {
-            res = { show: true };
-            break;
-        }
-    }
-
-    return res;
+    return {show: false};
 }

src/api_s2c/xstask/ApiAllGet.ts

@@ -1,15 +1,17 @@
-import { ApiCall } from "tsrpc";
-import { PlayerFun } from '../../public/player';
-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 {ApiCall} from "tsrpc";
+import {PlayerFun} from '../../public/player';
+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 prizeArr:atn[] = []
-    for(let task of taskList) {
+    let tequan = await TeQuanFun.getXsTaskNum(call);
+    let prizeArr: atn[] = []
+    for (let task of taskList) {
         const taskConf = G.gc.xstask[task?.taskId];
         if (!task) continue;
         if (task.receiveData == undefined) continue;
@@ -23,12 +25,12 @@ export default async function (call: ApiCall<ReqAllGet, ResAllGet>) {
             // }
             continue
         }
-        let change: Parameters<typeof XstaskFun.changeInfo>[1] = { $inc: {} };
+        let change: Parameters<typeof XstaskFun.changeInfo>[1] = {$inc: {}};
         change.$inc[`finishNum.${taskConf.colour}`] = 1;
         // 比对派遣时间，如果小于当日0点，则更新新任务，否则该变领取状态为true
-        if(task.receiveData.time < PublicShared.getToDayZeroTime()) {
+        if (task.receiveData.time < PublicShared.getToDayZeroTime()) {
             // 更新任务
-            let newTask =  XstaskFun.randomTasks(taskInfo?.lv, 1)
+            let newTask = XstaskFun.randomTasks(taskInfo?.lv, 1)
             XstaskFun.updateTask(call.uid, task._id, newTask[0].taskId)
         } else {
             // 更新领取状态
@@ -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

@@ -1,9 +1,10 @@
-import { ApiCall } from "tsrpc";
-import { PlayerFun } from '../../public/player';
-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 {ApiCall} from "tsrpc";
+import {PlayerFun} from '../../public/player';
+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>) {
 
@@ -23,24 +24,32 @@ export default async function (call: ApiCall<ReqGet, ResGet>) {
         }
     }
 
-    let change: Parameters<typeof XstaskFun.changeInfo>[1] = { $inc: {} };
+    let change: Parameters<typeof XstaskFun.changeInfo>[1] = {$inc: {}};
     change.$inc[`finishNum.${taskConf.colour}`] = 1;
     // 比对派遣时间，如果小于当日0点，则更新新任务，否则该变领取状态为true
-    if(task.receiveData.time < PublicShared.getToDayZeroTime()) {
+    if (task.receiveData.time < PublicShared.getToDayZeroTime()) {
         // 更新任务
-        let newTask =  XstaskFun.randomTasks(taskInfo?.lv, 1)
+        let newTask = XstaskFun.randomTasks(taskInfo?.lv, 1)
         XstaskFun.updateTask(call.uid, call.req._id, newTask[0].taskId)
     } else {
         // 更新领取状态
         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;

src/json/chongzhi.json5

@@ -85,7 +85,7 @@
 
         },
         '5': {
-            gift: { buyNum: 1, sale: 1, need: [{ a: 'attr', t: 'rmbmoney', n: 4280 }], prize: [{"a":"attr","t":"jinbi","n":2000000},{"a":"equip","t":"2008","n":1},{"a":"item","t":"12","n":500},{"a":"item","t":"26","n":5},{"a":"item","t":"24","n":3}] },
+            gift: { buyNum: 1, sale: 1, need: [{ a: 'attr', t: 'rmbmoney', n: 4280 }], prize: [{"a":"attr","t":"jinbi","n":2000000},{"a":"item","t":"607","n":20},{"a":"item","t":"12","n":500},{"a":"item","t":"26","n":5},{"a":"item","t":"24","n":3}] },
             "tip": "intr_viplibao_title_5",
             "tq": {
         '1': { tip: ['intr_viplibao_intr_16'], isnew: true},
@@ -103,7 +103,7 @@
 
         },
         '6': {
-            gift: { buyNum: 1, sale: 1, need: [{ a: 'attr', t: 'rmbmoney', n: 5880 }], prize: [{"a":"attr","t":"jinbi","n":2500000},{"a":"equip","t":"2006","n":1},{"a":"item","t":"30","n":10},{"a":"item","t":"2","n":500},{"a":"item","t":"25","n":5},{"a":"item","t":"24","n":5}] },
+            gift: { buyNum: 1, sale: 1, need: [{ a: 'attr', t: 'rmbmoney', n: 5880 }], prize: [{"a":"attr","t":"jinbi","n":2500000},{"a":"item","t":"607","n":20},{"a":"item","t":"30","n":10},{"a":"item","t":"2","n":500},{"a":"item","t":"25","n":5},{"a":"item","t":"24","n":5}] },
             "tip": "intr_viplibao_title_6",
             "tq": {
         '1': { tip: ['intr_viplibao_intr_1', 6], isnew: true}, 
@@ -119,7 +119,7 @@
 
         },
         '7': {
-            gift: { buyNum: 1, sale: 1, need: [{ a: 'attr', t: 'rmbmoney', n: 8280 }], prize: [{"a":"attr","t":"jinbi","n":3000000},{"a":"equip","t":"4008","n":1},{"a":"item","t":"6","n":10},{"a":"item","t":"18","n":100},{"a":"item","t":"26","n":5},{"a":"item","t":"24","n":5}] },
+            gift: { buyNum: 1, sale: 1, need: [{ a: 'attr', t: 'rmbmoney', n: 8280 }], prize: [{"a":"attr","t":"jinbi","n":3000000},{"a":"item","t":"607","n":20},{"a":"item","t":"6","n":10},{"a":"item","t":"18","n":100},{"a":"item","t":"26","n":5},{"a":"item","t":"24","n":5}] },
             "tip": "intr_viplibao_title_7",
             "tq": {
         '1': { tip: ['intr_viplibao_intr_1', 7], isnew: true}, 
@@ -135,7 +135,7 @@
 
         },
         '8': {
-            gift: { buyNum: 1, sale: 1, need: [{ a: 'attr', t: 'rmbmoney', n: 11280 }], prize: [{"a":"attr","t":"jinbi","n":4000000},{"a":"equip","t":"3009","n":1},{"a":"item","t":"6","n":20},{"a":"item","t":"20","n":50},{"a":"item","t":"9","n":500},{"a":"item","t":"24","n":7}] },
+            gift: { buyNum: 1, sale: 1, need: [{ a: 'attr', t: 'rmbmoney', n: 11280 }], prize: [{"a":"attr","t":"jinbi","n":4000000},{"a":"item","t":"617","n":1},{"a":"item","t":"6","n":20},{"a":"item","t":"20","n":50},{"a":"item","t":"9","n":500},{"a":"item","t":"24","n":7}] },
             "tip": "intr_viplibao_title_8",
             "tq": {
         '1': { tip: ['intr_viplibao_intr_9', 2], isnew: true}, 
@@ -153,7 +153,7 @@
 
         },
         '9': {
-            gift: { buyNum: 1, sale: 1, need: [{ a: 'attr', t: 'rmbmoney', n: 15880 }], prize: [{"a":"attr","t":"jinbi","n":5000000},{"a":"equip","t":"2009","n":1},{"a":"item","t":"18","n":150},{"a":"item","t":"10","n":80},{"a":"item","t":"24","n":7}] },
+            gift: { buyNum: 1, sale: 1, need: [{ a: 'attr', t: 'rmbmoney', n: 15880 }], prize: [{"a":"attr","t":"jinbi","n":5000000},{"a":"item","t":"617","n":1},{"a":"item","t":"18","n":150},{"a":"item","t":"10","n":80},{"a":"item","t":"24","n":7}] },
             "tip": "intr_viplibao_title_9",
             "tq": {
         '1': { tip: ['intr_viplibao_intr_1', 9], isnew: true}, 
@@ -169,7 +169,7 @@
 
         },
         '10': {
-            gift: { buyNum: 1, sale: 1, need: [{ a: 'attr', t: 'rmbmoney', n: 21280 }], prize: [{"a":"attr","t":"jinbi","n":10000000},{"a":"equip","t":"1009","n":1},{"a":"item","t":"20","n":80},{"a":"item","t":"9","n":500},{"a":"item","t":"24","n":8}] },
+            gift: { buyNum: 1, sale: 1, need: [{ a: 'attr', t: 'rmbmoney', n: 21280 }], prize: [{"a":"attr","t":"jinbi","n":10000000},{"a":"item","t":"617","n":1},{"a":"item","t":"20","n":80},{"a":"item","t":"9","n":500},{"a":"item","t":"24","n":8}] },
             "tip": "intr_viplibao_title_10",
             "tq": {
         '1': { tip: ['intr_viplibao_intr_1', 10], isnew: true}, 
@@ -185,7 +185,7 @@
 
         },
         '11': {
-            gift: { buyNum: 1, sale: 1, need: [{ a: 'attr', t: 'rmbmoney', n: 28880 }], prize: [{"a":"attr","t":"jinbi","n":15000000},{"a":"item","t":"609","n":1},{"a":"item","t":"18","n":200},{"a":"item","t":"24","n":10},{"a":"item","t":"10","n":80}] },
+            gift: { buyNum: 1, sale: 1, need: [{ a: 'attr', t: 'rmbmoney', n: 28880 }], prize: [{"a":"attr","t":"jinbi","n":15000000},{"a":"item","t":"617","n":1},{"a":"item","t":"18","n":200},{"a":"item","t":"24","n":10},{"a":"item","t":"10","n":80}] },
             "tip": "intr_viplibao_title_11",
             "tq": {
         '1': { tip: ['intr_viplibao_intr_9', 4], isnew: true},
@@ -202,7 +202,7 @@
 
         },
         '12': {
-            gift: { buyNum: 1, sale: 1, need: [{ a: 'attr', t: 'rmbmoney', n: 36880 }], prize: [{"a":"attr","t":"jinbi","n":20000000},{"a":"item","t":"609","n":1},{"a":"item","t":"20","n":100},{"a":"item","t":"9","n":1000},{"a":"item","t":"10","n":80}] },
+            gift: { buyNum: 1, sale: 1, need: [{ a: 'attr', t: 'rmbmoney', n: 36880 }], prize: [{"a":"attr","t":"jinbi","n":20000000},{"a":"item","t":"617","n":1},{"a":"item","t":"20","n":100},{"a":"item","t":"9","n":1000},{"a":"item","t":"10","n":80}] },
             "tip": "intr_viplibao_title_12",
             "tq": {
         '1': { tip: ['intr_viplibao_intr_1', 12], isnew: true}, 
@@ -219,7 +219,7 @@
 
         },
         '13': {
-            gift: { buyNum: 1, sale: 1, need: [{ a: 'attr', t: 'rmbmoney', n: 48880 }], prize: [{"a":"attr","t":"jinbi","n":25000000},{"a":"item","t":"609","n":1},{"a":"item","t":"619","n":1},{"a":"item","t":"18","n":500},{"a":"item","t":"606","n":2},{"a":"item","t":"10","n":80}] },
+            gift: { buyNum: 1, sale: 1, need: [{ a: 'attr', t: 'rmbmoney', n: 48880 }], prize: [{"a":"attr","t":"jinbi","n":25000000},{"a":"item","t":"20","n":100},{"a":"item","t":"619","n":1},{"a":"item","t":"18","n":500},{"a":"item","t":"606","n":2},{"a":"item","t":"10","n":80}] },
             "tip": "intr_viplibao_title_13",
             "tq": {
         '1': { tip: ['intr_viplibao_intr_18', 1], isnew: true},

src/json/guideConfig.json

@@ -835,6 +835,7 @@
     "Type": "finger",
     "path": "Canvas/draw/uiRoot/uiView_mainMenu/mainMenu/btnLayout/gb",
     "undefined": "点干部",
+    "initiative": 1,
     "location": 2
   },
   "80": {
@@ -844,6 +845,7 @@
     "Type": "finger",
     "path": "Canvas/draw/uiRoot/uiView_heroInfo/heroInfo/img_bg/btnScrollView/view/content/leftBtn/btn_sj",
     "undefined": "点升级页签",
+    "initiative": 1,
     "location": 2
   },
   "81": {
@@ -853,6 +855,7 @@
     "Type": "finger",
     "path": "Canvas/draw/uiRoot/uiView_heroInfo/heroInfo/img_bg/panel_down/panel_rdown/panel_sj/btn_shengji",
     "undefined": "点升级按钮",
+    "initiative": 1,
     "location": 1
   },
   "82": {

src/json/huobanzhaomu.json5

@@ -11,7 +11,7 @@
     },
     {
         total: 1,
-        gudKey: 'payExp',
+        gudKey: 'zhizunyueka',
         prize: [{a: 'item', t: '4', n: 10}]
     },
     {

src/json/huodong.json5

@@ -2456,7 +2456,7 @@
                             'stype': 118
                         },
                         '2003': {
-                            'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '626', 'n': 20}],
+                            'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 20}],
                             'tujing': '',
                             'title': 'intr_yczm_day_des_2',
                             'type': 2,
@@ -2604,7 +2604,7 @@
                             'stype': 118
                         },
                         '2003': {
-                            'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '626', 'n': 20}],
+                            'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 20}],
                             'tujing': '',
                             'title': 'intr_yczm_day_des_2',
                             'type': 2,

src/json/pay.json

@@ -922,7 +922,7 @@
       {
         "a": "attr",
         "t": "payExp",
-        "n": 10
+        "n": 5
       }
     ],
     "prize": [

src/json/payEmail.json5

@@ -4,7 +4,7 @@
             day: 1,
             title: 'title_email_caifutequan_day1', 
             content: 'intr_email_caifutequan_day1', 
-            prize: [{ a: 'attr', t: 'rmbmoney', n: 200 }] 
+            prize: [{ a: 'attr', t: 'rmbmoney', n: 300 },{ a: 'attr', t: 'jinbi', n: 1000000 }] 
         }
     ],
     jiubatequan: [

src/json/task.json

@@ -1118,7 +1118,7 @@
         {
           "a": "item",
           "t": "12",
-          "n": 20
+          "n": 100
         },
         {
           "a": "attr",
@@ -1334,7 +1334,7 @@
         {
           "a": "item",
           "t": "12",
-          "n": 50
+          "n": 200
         },
         {
           "a": "item",
@@ -1410,7 +1410,7 @@
         {
           "a": "item",
           "t": "12",
-          "n": 50
+          "n": 600
         },
         {
           "a": "item",
@@ -1562,7 +1562,7 @@
         {
           "a": "item",
           "t": "12",
-          "n": 200
+          "n": 400
         },
         {
           "a": "item",

src/json/yibaichou.json5

@@ -11,11 +11,11 @@
         },
         {
             total: 1200,
-            prize: [{a: 'item', t: '4007', n: 20}]
+            prize: [{a: 'attr', t: 'rmbmoney', n: 400}]
         },
         {
             total: 1800,
-            prize: [{a: 'attr', t: 'rmbmoney', n: 200}]
+            prize: [{a: 'attr', t: 'rmbmoney', n: 600}]
         },
         {
             total: 2400,

src/module/collection_event.ts

@@ -26,6 +26,9 @@ export type eventType = {
     shouchong: {
         receive: k_v<number[]>;
     };
+    shouchongzhigou: {
+        receive: k_v<number[]>;
+    };
     kaifukuanghuan: Omit<ResOpen, 'day' | 'taskFinished'>;
     dayjijin: Omit<ResOpenJiJin, 'isPay' | 'finished'>;
     dengjijijin: Omit<ResOpenJiJin, 'isPay' | 'finished'>;

src/setMongodb.ts

@@ -640,25 +640,25 @@ export class _mongodb {
     }
 }
 
-//@ts-ignore
-FindCursor.prototype._toArray = FindCursor.prototype.toArray;
-//@ts-ignore
-FindCursor.prototype.toArray = async function(){
-    let rss = await this._toArray();
-
-    //如果返回的数据超过50条
-    if(rss.length>50){
-        addGameLog("system","findCount",null,{
-            collection: this.namespace.collection,
-            db:this.namespace.db,
-            count:rss.length
-        })
-        console.log("system,findCount",{
-            collection: this.namespace.collection,
-            db:this.namespace.db,
-            count:rss.length
-        })
-        console.trace();
-    }
-    return rss;
-}
+// //@ts-ignore
+// FindCursor.prototype._toArray = FindCursor.prototype.toArray;
+// //@ts-ignore
+// FindCursor.prototype.toArray = async function(){
+//     let rss = await this._toArray();
+//
+//     //如果返回的数据超过50条
+//     if(rss.length>50){
+//         addGameLog("system","findCount",null,{
+//             collection: this.namespace.collection,
+//             db:this.namespace.db,
+//             count:rss.length
+//         })
+//         console.log("system,findCount",{
+//             collection: this.namespace.collection,
+//             db:this.namespace.db,
+//             count:rss.length
+//         })
+//         console.trace();
+//     }
+//     return rss;
+// }

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

@@ -8,8 +8,10 @@ export type ReqOpen = {
 };
 
 export type ResOpen = {
-    payNum: number;
     receive: {
         [k: string]: number[];
     };
+    buyLog:{
+        [k: string]: any;
+    }
 };

src/shared/protocols/serviceProto.ts

@@ -10262,13 +10262,6 @@ export const serviceProto: ServiceProto<ServiceType> = {
             "properties": [
                 {
                     "id": 0,
-                    "name": "payNum",
-                    "type": {
-                        "type": "Number"
-                    }
-                },
-                {
-                    "id": 1,
                     "name": "receive",
                     "type": {
                         "type": "Interface",
@@ -10282,6 +10275,19 @@ export const serviceProto: ServiceProto<ServiceType> = {
                             }
                         }
                     }
+                },
+                {
+                    "id": 1,
+                    "name": "buyLog",
+                    "type": {
+                        "type": "Interface",
+                        "indexSignature": {
+                            "keyType": "String",
+                            "type": {
+                                "type": "Any"
+                            }
+                        }
+                    }
                 }
             ]
         },