From 38e04d29ab55707983af9a8aff30cfa567ab5d5f Mon Sep 17 00:00:00 2001 From: dy Date: Tue, 19 Dec 2023 13:42:23 +0800 Subject: [PATCH 01/90] =?UTF-8?q?=E7=A0=B4=E5=86=B0=E7=A4=BC=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/pobinglibao/ApiOpen.ts | 54 +++++++ src/api_s2c/event/pobinglibao/ApiReceive.ts | 32 ++++ src/module/collection_event.ts | 2 + .../protocols/event/christmas/huodong.json | 151 ------------------ .../protocols/event/pobinglibao/PtlOpen.ts | 16 ++ .../protocols/event/pobinglibao/PtlReceive.ts | 11 ++ 6 files changed, 115 insertions(+), 151 deletions(-) create mode 100644 src/api_s2c/event/pobinglibao/ApiOpen.ts create mode 100644 src/api_s2c/event/pobinglibao/ApiReceive.ts delete mode 100644 src/shared/protocols/event/christmas/huodong.json create mode 100644 src/shared/protocols/event/pobinglibao/PtlOpen.ts create mode 100644 src/shared/protocols/event/pobinglibao/PtlReceive.ts diff --git a/src/api_s2c/event/pobinglibao/ApiOpen.ts b/src/api_s2c/event/pobinglibao/ApiOpen.ts new file mode 100644 index 0000000..0bc97df --- /dev/null +++ b/src/api_s2c/event/pobinglibao/ApiOpen.ts @@ -0,0 +1,54 @@ +import {ApiCall} from "tsrpc"; +import {ReqOpen, ResOpen} from "../../../shared/protocols/event/zhoumolibao/PtlOpen"; +import {PayFun} from "../../../public/pay"; +import {HuoDongFun} from "../../../public/huodongfun"; +import {PublicShared} from "../../../shared/public/public"; + + +export default async function (call: ApiCall) { + let data = await G.mongodb.cEvent('pobinglibao').findOne({uid: call.uid, type: 'pobinglibao'}) + + let gift = await getConf(call) + + let payIds = gift.filter(i => i.payId)?.map(i => i.payId) + + call.succ({ + record: data?.record || {}, + buyLog: await PayFun.getPayLogs(call.uid, payIds) + }) +} + +export async function getConf(call, args?: { id?: string; payId?: string }) { + let _hd = (await HuoDongFun.gethdList(call, 10))[0] + if (!_hd) return [] + if (args?.id) return _hd?.data?.gift?.find(i => i.id == args.id) + if (args?.payId) return _hd?.data?.gift?.find(i => i.payId == args.payId) + return _hd?.data?.gift +} + +export async function checkResetBuyLog(call) { + + + + + + // let zeroTime = PublicShared.getToDayZeroTime() + + // let data = await G.mongodb.cEvent('zhoumolibao').findOne({uid: call.uid, type: 'zhoumolibao'}) + // if (!data?.refreshTime || data?.refreshTime < zeroTime) { + // G.mongodb.cEvent(`zhoumolibao`).updateOne( + // {uid: call.uid, type: `zhoumolibao`}, + // {$set: {record: {}, refreshTime: G.time}}, + // {upsert: true} + // ) + // } + // + // let gifts = await getConf(call) + // + // let payIds = gifts.filter(i => i.payId)?.map(i => i.payId) + // let payLogs = await PayFun.getPayLogs(call.uid, payIds) + // let payLogLength = R.flatten(R.values(payLogs)).filter(i => i.time < zeroTime).length + // if (payLogLength) { + // PayFun.delPayLog(call.uid, ...payIds.map(i => ({payId: i, val: []}))) + // } +} \ No newline at end of file diff --git a/src/api_s2c/event/pobinglibao/ApiReceive.ts b/src/api_s2c/event/pobinglibao/ApiReceive.ts new file mode 100644 index 0000000..b8e28c1 --- /dev/null +++ b/src/api_s2c/event/pobinglibao/ApiReceive.ts @@ -0,0 +1,32 @@ +import {ApiCall} from "tsrpc"; +import {ReqReceive, ResReceive} from "../../../shared/protocols/event/pobinglibao/PtlReceive"; +import {HuoDongFun} from "../../../public/huodongfun"; +import {PlayerFun} from "../../../public/player"; +import {HongDianChange} from "../../hongdian/fun"; +import {PayFun} from "../../../public/pay"; + +export default async function (call: ApiCall) { + // 查询活动是否有当前领奖的免费选项 + let _hd = (await HuoDongFun.gethdList(call, 10))[0] + let gift = _hd?.data?.gift?.find(i => i.id == call.req.id) + if (!gift) return call.errorCode(-1) + + let payLog = await PayFun.getPayLog(call.uid, gift.payId) + if (!payLog) return call.errorCode(-2) + + + // 取奖励列表，判断是否有可领取奖励 + let data = await G.mongodb.cEvent('pobinglibao').findOne({uid: call.uid, type: 'pobinglibao'}) + let rec = data?.record?.[call.req.id].length + if (rec && rec >= 2) return call.errorCode(-3) + + await PlayerFun.sendPrize(call, gift.prize); + + await G.mongodb.cEvent('pobinglibao').updateOne({uid: call.uid, type: 'pobinglibao'}, { + $push: {[`record.${gift.id}`]: call.req.recId}, + }, {upsert: true}) + + call.succ({}) + + // HongDianChange.sendChangeKey(call.uid, ['pobinglibao']); +} diff --git a/src/module/collection_event.ts b/src/module/collection_event.ts index e1eeef3..d481b9b 100644 --- a/src/module/collection_event.ts +++ b/src/module/collection_event.ts @@ -21,6 +21,7 @@ import {ResOpen as ResOpenZhoulibao} from '../shared/protocols/event/zhoulibao/P import {ResOpen as ResOpenZixuanlibao} from '../shared/protocols/event/zixuanlibao/PtlOpen'; import {ResOpen as ResOpenKaifujingsai} from '../shared/protocols/kaifujingsai/PtlOpen'; import {ResOpen as ResOpenZhoumolibao} from '../shared/protocols/event/zhoumolibao/PtlOpen'; +import {ResOpen as ResOpenPobinglibao} from '../shared/protocols/event/pobinglibao/PtlOpen'; export type eventType = { shouchong: { @@ -48,6 +49,7 @@ export type eventType = { jierihuodong: Omit & { refreshTime: number; }; kaifujingsai: ResOpenKaifujingsai; zhoumolibao: ResOpenZhoumolibao & { refreshTime: number; } + pobinglibao: ResOpenPobinglibao } & { [k: `${number}jijin`]: ResOpenYuedujijin; [k: `yangchengmubiao${number}`]: yangchengmubiao; diff --git a/src/shared/protocols/event/christmas/huodong.json b/src/shared/protocols/event/christmas/huodong.json deleted file mode 100644 index cea9f66..0000000 --- a/src/shared/protocols/event/christmas/huodong.json +++ /dev/null @@ -1,151 +0,0 @@ -{ - "hdid" : 91029302193, - "htype" : 8, - "stype" : 800, - "ttype" : 0, - "stime" : 1702396800, - "rtime" : 1703088000, - "etime" : 1703088000, - "name" : "christmas", - "icon" : "icon_xfdj", - "showtime" : "根据玩家注册时间，游戏返回时复写", - "data" : { - "task" : { - "1": { - "pval" : 1, - "stype" : "", - "cond": [], - "prize" : [ - { - "a" : "item", - "t" : "1", - "n" : 500000 - } - ], - "des" : "intr_cszl_des_1" - }, - "2": { - "pval" : 1, - "stype" : "101", - "cond": [], - "prize" : [ - { - "a" : "item", - "t" : "1", - "n" : 500000 - } - ], - "des" : "intr_cszl_des_1" - }, - "3": { - "pval" : 2, - "stype" : "101", - "cond": [], - "prize" : [ - { - "a" : "item", - "t" : "1", - "n" : 500000 - } - ], - "des" : "intr_cszl_des_1" - } - }, - "gameneed": [{"a": "attr", "t":"jinbi", "n": 1}], - "game": [0,1, 2, 3, 4, 5], - "gamefree": 3, - "zhanling":[{ - "val": 1, - "pt": [{"a": "attr", "t":"jinbi", "n": 1}], - "gj": [{"a": "attr", "t":"jinbi", "n": 1},{"a": "attr", "t":"jinbi", "n": 1}] - }, - { - "val": 2, - "pt": [{"a": "attr", "t":"rmbmoney", "n": 100}], - "gj": [{"a": "attr", "t":"rmbmoney", "n": 100},{"a": "attr", "t":"jinbi", "n": 1}] - }, - { - "val": 3, - "pt": [{"a": "attr", "t":"jinbi", "n": 1}], - "gj": [{"a": "attr", "t":"jinbi", "n": 1},{"a": "attr", "t":"jinbi", "n": 1}] - },{ - "val": 4, - "pt": [{"a": "attr", "t":"jinbi", "n": 1}], - "gj": [{"a": "attr", "t":"jinbi", "n": 1},{"a": "attr", "t":"jinbi", "n": 1}] - }, - { - "val": 5, - "pt": [{"a": "attr", "t":"rmbmoney", "n": 100}], - "gj": [{"a": "attr", "t":"rmbmoney", "n": 100},{"a": "attr", "t":"jinbi", "n": 1}] - }, - { - "val": 6, - "pt": [{"a": "attr", "t":"jinbi", "n": 1}], - "gj": [{"a": "attr", "t":"jinbi", "n": 1},{"a": "attr", "t":"jinbi", "n": 1}] - },{ - "val": 7, - "pt": [{"a": "attr", "t":"jinbi", "n": 1}], - "gj": [{"a": "attr", "t":"jinbi", "n": 1},{"a": "attr", "t":"jinbi", "n": 1}] - }, - { - "val": 8, - "pt": [{"a": "attr", "t":"rmbmoney", "n": 100}], - "gj": [{"a": "attr", "t":"rmbmoney", "n": 100},{"a": "attr", "t":"jinbi", "n": 1}] - }, - { - "val": 9, - "pt": [{"a": "attr", "t":"jinbi", "n": 1}], - "gj": [{"a": "attr", "t":"jinbi", "n": 1},{"a": "attr", "t":"jinbi", "n": 1}] - }], - "zlpayid":"ycmb_1_1", - "libao": { - "1": { - "payid": "", - "buynum": 2, - "basep": [{"a": "attr", "t":"rmbmoney", "n": 1}], - "des" : "intr_cszl_des_1", - "dlz": [ - { - "1": {"a": "attr", "t":"rmbmoney", "n": 1}, - "2": {"a": "attr", "t":"rmbmoney", "n": 2}, - "3": {"a": "attr", "t":"rmbmoney", "n": 3} - }, - { - "1": {"a": "attr", "t":"rmbmoney", "n": 1}, - "2": {"a": "attr", "t":"rmbmoney", "n": 2}, - "3": {"a": "attr", "t":"rmbmoney", "n": 3} - } - ] - }, - "2": { - "payid": "ycmb_1_2", - "buynum": 2, - "basep": [{"a": "attr", "t":"rmbmoney", "n": 2}], - "des" : "intr_cszl_des_2", - "dlz": [ - { - "1": {"a": "attr", "t":"rmbmoney", "n": 1}, - "2": {"a": "attr", "t":"rmbmoney", "n": 2}, - "3": {"a": "attr", "t":"rmbmoney", "n": 3} - }, - { - "1": {"a": "attr", "t":"rmbmoney", "n": 1}, - "2": {"a": "attr", "t":"rmbmoney", "n": 2}, - "3": {"a": "attr", "t":"rmbmoney", "n": 3} - } - ] - } - }, - "qiandao": [ - [{"a": "attr", "t":"jinbi", "n": 1}], - [{"a": "attr", "t":"jinbi", "n": 1}], - [{"a": "attr", "t":"jinbi", "n": 1}], - [{"a": "attr", "t":"jinbi", "n": 1}], - [{"a": "attr", "t":"jinbi", "n": 1}], - [{"a": "attr", "t":"jinbi", "n": 1}], - [{"a": "attr", "t":"jinbi", "n": 1}] - ] - - - } -} \ No newline at end of file diff --git a/src/shared/protocols/event/pobinglibao/PtlOpen.ts b/src/shared/protocols/event/pobinglibao/PtlOpen.ts new file mode 100644 index 0000000..f7c775b --- /dev/null +++ b/src/shared/protocols/event/pobinglibao/PtlOpen.ts @@ -0,0 +1,16 @@ + +/** + * 破冰礼包 + */ +export type ReqOpen = { + +}; + +export type ResOpen = { + record:{ + [k: string]: any; + } + buyLog:{ + [k: string]: any; + } +}; \ No newline at end of file diff --git a/src/shared/protocols/event/pobinglibao/PtlReceive.ts b/src/shared/protocols/event/pobinglibao/PtlReceive.ts new file mode 100644 index 0000000..bb057a3 --- /dev/null +++ b/src/shared/protocols/event/pobinglibao/PtlReceive.ts @@ -0,0 +1,11 @@ +/** + * 破冰礼包领奖 + */ +export interface ReqReceive { + id: string + recId: string +} + +export interface ResReceive { + +} From beae71eb7ff4810195a53c9ff123fcf76094f4cc Mon Sep 17 00:00:00 2001 From: dy Date: Tue, 19 Dec 2023 14:29:14 +0800 Subject: [PATCH 02/90] =?UTF-8?q?=E9=93=81=E7=AC=BC=E6=AD=BB=E6=96=97?= =?UTF-8?q?=EF=BC=8C=E7=9B=B8=E5=90=8C=E7=A7=AF=E5=88=86=E7=94=A8=E6=88=98?= =?UTF-8?q?=E5=8A=9B=E6=8E=92=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_cross/wzry/ApiRank.ts | 41 +++++++++++++++-------------------- 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/src/api_cross/wzry/ApiRank.ts b/src/api_cross/wzry/ApiRank.ts index 79c9d3c..767fdc8 100644 --- a/src/api_cross/wzry/ApiRank.ts +++ b/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] } }; } From 0ceae9c2bb6d0c3821bc399fd305bb6a3ec68718 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Tue, 19 Dec 2023 14:42:51 +0800 Subject: [PATCH 03/90] =?UTF-8?q?fix:=E8=B7=A8=E6=9C=8D=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/public/scheduler/scheduler_cross_email_pull.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/public/scheduler/scheduler_cross_email_pull.ts b/src/public/scheduler/scheduler_cross_email_pull.ts index 71c26da..e955d0c 100644 --- a/src/public/scheduler/scheduler_cross_email_pull.ts +++ b/src/public/scheduler/scheduler_cross_email_pull.ts @@ -22,12 +22,15 @@ export class CrossEmailPull extends Scheduler { G.clientCross.callApi("email/GetCrossEmail", {server_id: G.config.serverId + ""}).then((res) => { if (!res.isSucc) return; res.res.emails.forEach(async (email) => { + let _prize = email?.prizeData?.prize || []; + if (email?.prizeData) delete email.prizeData; + + email["prize"] = _prize; if (email.uid != "system") { await EmailFun.addEmail(email) } else { await EmailFun.addQuanFuEmail(email) } - await EmailFun.addEmail(email) }) if (res.res.emails.length > 0) { G.clientCross.callApi("email/DelCrossEmail", {eids: res.res.emails.map(e => e._id)}) From 0326ceffd74197d75c58a13ae0dacebc9b46e3c4 Mon Sep 17 00:00:00 2001 From: yushunrui <364203175@qq.com> Date: Tue, 19 Dec 2023 17:38:59 +0800 Subject: [PATCH 04/90] =?UTF-8?q?fix:=E5=9C=A3=E8=AF=9E=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9C=A3=E8=AF=9E=E7=BB=8F=E9=AA=8C=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/christmas/ApiTaskRec.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/api_s2c/event/christmas/ApiTaskRec.ts b/src/api_s2c/event/christmas/ApiTaskRec.ts index 1227d85..d0af2c9 100644 --- a/src/api_s2c/event/christmas/ApiTaskRec.ts +++ b/src/api_s2c/event/christmas/ApiTaskRec.ts @@ -22,11 +22,14 @@ export default async function (call: ApiCall) { return call.error('', { code: -3, message: globalThis.lng.yangchengmubiao_4 }) } _mydata.taskfinish.push(taskid) - + let _addval = _con.addval let _setData = {} + _mydata["val"] += _addval + _setData["val"] = _mydata.val _setData["taskfinish"] = _mydata.taskfinish await Christmasfun.setMyData(call.uid, call.req.hdid, { $set: _setData }) let _prize = _con.prize + await PlayerFun.sendPrize(call, _prize); let changedata = { mydata: _mydata, prize: _prize} // 推送红点 From 8d765e50273f80e12e27424567e575fef2e41102 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Tue, 19 Dec 2023 19:00:11 +0800 Subject: [PATCH 05/90] =?UTF-8?q?fix:=E4=BC=99=E4=BC=B4=E6=8B=9B=E5=8B=9F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A1=E4=BB=B6=E8=87=B3=E5=B0=8A=E6=9C=88?= =?UTF-8?q?=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/huobanzhaomu/ApiOpen.ts | 29 ++++++++++++++++------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/api_s2c/event/huobanzhaomu/ApiOpen.ts b/src/api_s2c/event/huobanzhaomu/ApiOpen.ts index 860e426..cbe74fe 100644 --- a/src/api_s2c/event/huobanzhaomu/ApiOpen.ts +++ b/src/api_s2c/event/huobanzhaomu/ApiOpen.ts @@ -1,14 +1,25 @@ -import { ApiCall } from "tsrpc"; -import { ReqOpen, ResOpen } from "../../../shared/protocols/event/huobanzhaomu/PtlOpen"; +import {ApiCall} from "tsrpc"; +import {ReqOpen, ResOpen} from "../../../shared/protocols/event/huobanzhaomu/PtlOpen"; +import {PayFun} from "../../../public/pay"; +import {payLog} from "../../../shared/protocols/pay/PtlGetList"; export default async function (call: ApiCall) { - let db = await G.mongodb.cEvent('huobanzhaomu').findOne({ uid: call.uid, type: 'huobanzhaomu' }); + let db = await G.mongodb.cEvent('huobanzhaomu').findOne({uid: call.uid, type: 'huobanzhaomu'}); - call.succ({ - finish: Object.fromEntries(G.gc.huobanzhaomu.map((conf, i) => { - return [i, conf.gudKey ? call.conn.gud[conf.gudKey] >= conf.total : db?.rec?.length >= G.gc.huobanzhaomu.length - 1]; - })), - rec: db?.rec || [] - }); + let logs: payLog[]; + let finish: { [k: number]: boolean } = {}; + for (let i = 0; i < G.gc.huobanzhaomu.length; i++) { + let conf = G.gc.huobanzhaomu[i]; + if (conf.gudKey == "zhizunyueka") { + if (!logs) { + logs = await PayFun.getPayLog(call.uid, "zhizunyueka"); + } + finish[i] = !(logs.length < 0 || logs.slice(-1)[0].eTime < G.time); + } else { + finish[i] = call.conn.gud[conf.gudKey] >= conf.total; + } + } + + call.succ({finish: finish, rec: db?.rec || []}); } \ No newline at end of file From eb7c4204b84095e5ac36bb701878d9292951811c Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Tue, 19 Dec 2023 19:03:29 +0800 Subject: [PATCH 06/90] =?UTF-8?q?fix:=E4=BD=9C=E6=88=98=E7=89=B9=E6=9D=83?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=8D=E8=B4=B9=E5=BF=AB=E9=80=9F=E6=8E=A2?= =?UTF-8?q?=E9=99=A9=E6=AC=A1=E6=95=B02->5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/public/tequan.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/public/tequan.ts b/src/public/tequan.ts index 078097f..7482b71 100644 --- a/src/public/tequan.ts +++ b/src/public/tequan.ts @@ -15,6 +15,6 @@ export class TeQuanFun { return await this.getIsAcTive(call, 'qingbaotequan') ? 1 : 0; } static async getTxFreeNum(call: ApiCall) { - return await this.getIsAcTive(call, 'zuozhantequan') ? 2 : 0; + return await this.getIsAcTive(call, 'zuozhantequan') ? 5 : 0; } } \ No newline at end of file From 4bdee9fc7c2f86806982b822c1db95ab27c952c7 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Tue, 19 Dec 2023 19:11:08 +0800 Subject: [PATCH 07/90] =?UTF-8?q?fix:=E4=BC=99=E4=BC=B4=E6=8B=9B=E5=8B=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/huobanzhaomu/ApiOpen.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api_s2c/event/huobanzhaomu/ApiOpen.ts b/src/api_s2c/event/huobanzhaomu/ApiOpen.ts index cbe74fe..2960c08 100644 --- a/src/api_s2c/event/huobanzhaomu/ApiOpen.ts +++ b/src/api_s2c/event/huobanzhaomu/ApiOpen.ts @@ -15,7 +15,7 @@ export default async function (call: ApiCall) { if (!logs) { logs = await PayFun.getPayLog(call.uid, "zhizunyueka"); } - finish[i] = !(logs.length < 0 || logs.slice(-1)[0].eTime < G.time); + finish[i] = !(logs.length <= 0 || logs.slice(-1)[0].eTime < G.time); } else { finish[i] = call.conn.gud[conf.gudKey] >= conf.total; } From b0cc406d43fef86693682fe8160652971bdbc2d1 Mon Sep 17 00:00:00 2001 From: yushunrui <364203175@qq.com> Date: Tue, 19 Dec 2023 19:35:45 +0800 Subject: [PATCH 08/90] =?UTF-8?q?fix:=E5=9C=A3=E8=AF=9E=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=85=85=E5=80=BC=E4=B8=8D=E5=88=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/christmas/fun.ts | 12 +++++++++--- src/globalListener.ts | 2 -- src/public/pay.ts | 5 +++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/api_s2c/event/christmas/fun.ts b/src/api_s2c/event/christmas/fun.ts index 327422c..9ecaa7f 100644 --- a/src/api_s2c/event/christmas/fun.ts +++ b/src/api_s2c/event/christmas/fun.ts @@ -117,7 +117,7 @@ export class Christmasfun { return mydata } - static async payChristmas(payid, call: ApiCall) { + static async payChristmas(payid, call: any) { let _hd = await HuoDongFun.gethdList(call, 8) for (let index = 0; index < _hd.length; index++) { const hdinfo = _hd[index]; @@ -126,8 +126,8 @@ export class Christmasfun { let _mydata = await Christmasfun.getMyData(call, _hdid) if (_mydata.pay) continue await this.setMyData(call.uid, _hdid, { $set: { pay: true} }) - let _prize = hdinfo.data.zlpayprize - await PlayerFun.sendPrize(call, _prize); + // let _prize = hdinfo.data.zlpayprize + // await PlayerFun.sendPrize(call, _prize); } else{ const libaos = hdinfo.data.libao @@ -140,6 +140,12 @@ export class Christmasfun { if (_buyNum >= _tmp["buynum"]) continue _mydata.libao[lbid] = _buyNum + 1 this.setMyData(call.uid, _hdid, { $set: { libao: _mydata.libao} }) + let _select = _mydata.select[lbid] || {} + let _prize: atn[] = _tmp["basep"] + for (let key in _select) { + _prize.push(_tmp["dlz"][parseInt(key)][_select[key]]) + } + await PlayerFun.sendPrize(call, _prize); break } diff --git a/src/globalListener.ts b/src/globalListener.ts index 2c3aa37..1e81c29 100644 --- a/src/globalListener.ts +++ b/src/globalListener.ts @@ -177,8 +177,6 @@ export function addListener() { ActionLog.addRetainLog(player.uid, { key: 'pay', val: conf.payExp[0].n }); if (payId == G.gc.zhanling.payId) payZhanLing(player); - //圣诞节活动充值 - Christmasfun.payChristmas(payId, call); let payEmailConf = G.gc.payEmail[payId] as _gcType['payEmail']['caifutequan']; if (payEmailConf?.length > 0) { let sendEmailConfs = payEmailConf; diff --git a/src/public/pay.ts b/src/public/pay.ts index 43a0e58..61fef69 100644 --- a/src/public/pay.ts +++ b/src/public/pay.ts @@ -10,6 +10,7 @@ import {call, PlayerFun} from './player'; import {number} from "mathjs"; import {getGud} from './gud'; import {getConf as zmlbGetConf} from '../api_s2c/event/zhoumolibao/ApiOpen'; +import {Christmasfun} from "../api_s2c/event/christmas/fun"; async function checkPayIsActive(payId: string, logs: payLog[], payArgs) { let conf: any = await this.getConf(payId, payArgs); @@ -230,7 +231,8 @@ export class PayFun { let conf = await zmlbGetConf(call, {payId}) prize.push(...conf.prize) } - + //圣诞节活动充值 + await Christmasfun.payChristmas(payId, call); let isReplaceConf = await this.checkBuysAfterPay(uid, payId, conf, payArgs, player) if (isReplaceConf) { let prizePayId = `zuanshi_${conf.money}` @@ -239,7 +241,6 @@ export class PayFun { prize = [...conf.prize] } - await PlayerFun.sendPrize(call, prize); await PlayerFun.addAttr(call, conf.payExp); if (payId == 'G123SendGift') { From 1a6789b17b584a770d745301a78207b5b917187a Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 20 Dec 2023 11:27:25 +0800 Subject: [PATCH 09/90] =?UTF-8?q?=E7=A0=B4=E5=86=B0=E7=A4=BC=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/pobinglibao/ApiOpen.ts | 43 +- src/api_s2c/event/pobinglibao/ApiReceive.ts | 7 +- src/api_s2c/hongdian/ApiGet.ts | 2 +- src/api_s2c/hongdian/fun.ts | 26 +- src/public/pay.ts | 5 +- src/shared/protocols/hongdian/PtlGet.ts | 3 +- src/shared/protocols/serviceProto.ts | 919 +++++++++++--------- 7 files changed, 539 insertions(+), 466 deletions(-) diff --git a/src/api_s2c/event/pobinglibao/ApiOpen.ts b/src/api_s2c/event/pobinglibao/ApiOpen.ts index 0bc97df..77e62a5 100644 --- a/src/api_s2c/event/pobinglibao/ApiOpen.ts +++ b/src/api_s2c/event/pobinglibao/ApiOpen.ts @@ -8,47 +8,14 @@ import {PublicShared} from "../../../shared/public/public"; export default async function (call: ApiCall) { let data = await G.mongodb.cEvent('pobinglibao').findOne({uid: call.uid, type: 'pobinglibao'}) - let gift = await getConf(call) + let _hd = (await HuoDongFun.gethdList(call, 10))[0] - let payIds = gift.filter(i => i.payId)?.map(i => i.payId) + let payIds = _hd?.data?.gift?.filter(i => i.payId)?.map(i => i.payId) + + let payLog = await PayFun.getPayLogs(call.uid, payIds, [_hd.stime, _hd.etime]) call.succ({ record: data?.record || {}, - buyLog: await PayFun.getPayLogs(call.uid, payIds) + buyLog: payLog }) -} - -export async function getConf(call, args?: { id?: string; payId?: string }) { - let _hd = (await HuoDongFun.gethdList(call, 10))[0] - if (!_hd) return [] - if (args?.id) return _hd?.data?.gift?.find(i => i.id == args.id) - if (args?.payId) return _hd?.data?.gift?.find(i => i.payId == args.payId) - return _hd?.data?.gift -} - -export async function checkResetBuyLog(call) { - - - - - - // let zeroTime = PublicShared.getToDayZeroTime() - - // let data = await G.mongodb.cEvent('zhoumolibao').findOne({uid: call.uid, type: 'zhoumolibao'}) - // if (!data?.refreshTime || data?.refreshTime < zeroTime) { - // G.mongodb.cEvent(`zhoumolibao`).updateOne( - // {uid: call.uid, type: `zhoumolibao`}, - // {$set: {record: {}, refreshTime: G.time}}, - // {upsert: true} - // ) - // } - // - // let gifts = await getConf(call) - // - // let payIds = gifts.filter(i => i.payId)?.map(i => i.payId) - // let payLogs = await PayFun.getPayLogs(call.uid, payIds) - // let payLogLength = R.flatten(R.values(payLogs)).filter(i => i.time < zeroTime).length - // if (payLogLength) { - // PayFun.delPayLog(call.uid, ...payIds.map(i => ({payId: i, val: []}))) - // } } \ No newline at end of file diff --git a/src/api_s2c/event/pobinglibao/ApiReceive.ts b/src/api_s2c/event/pobinglibao/ApiReceive.ts index b8e28c1..a2edfa0 100644 --- a/src/api_s2c/event/pobinglibao/ApiReceive.ts +++ b/src/api_s2c/event/pobinglibao/ApiReceive.ts @@ -12,13 +12,14 @@ export default async function (call: ApiCall) { if (!gift) return call.errorCode(-1) let payLog = await PayFun.getPayLog(call.uid, gift.payId) - if (!payLog) return call.errorCode(-2) + payLog = payLog?.filter(i => i.time >= _hd.stime && i.time <= _hd.etime) || [] + if (!payLog || !payLog.length) return call.errorCode(-2) // 取奖励列表，判断是否有可领取奖励 let data = await G.mongodb.cEvent('pobinglibao').findOne({uid: call.uid, type: 'pobinglibao'}) let rec = data?.record?.[call.req.id].length - if (rec && rec >= 2) return call.errorCode(-3) + if (rec && (rec >= 2 || data?.record?.[gift.id] == call.req.recId)) return call.errorCode(-3) await PlayerFun.sendPrize(call, gift.prize); @@ -28,5 +29,5 @@ export default async function (call: ApiCall) { call.succ({}) - // HongDianChange.sendChangeKey(call.uid, ['pobinglibao']); + HongDianChange.sendChangeKey(call.uid, ['pobinglibao']); } diff --git a/src/api_s2c/hongdian/ApiGet.ts b/src/api_s2c/hongdian/ApiGet.ts index ce0c8d4..09a5d81 100644 --- a/src/api_s2c/hongdian/ApiGet.ts +++ b/src/api_s2c/hongdian/ApiGet.ts @@ -19,7 +19,7 @@ import {getShouChongRedPoint} from "../event/shouchong/ApiReceive"; const defaultKeys: hongdianKey[] = ['jiuba', 'jiaotang', 'shouchong', 'clslhd', 'dixiaqianzhuanghd', 'gonghuihd', 'hbzbhd', 'jjchd', 'taskhd', 'xstaskhd', 'lingzhulaixihd', 'dxlthd', 'wzcjhd', 'slzdhd', 'qjzzdhd', 'kuangdonghd', 'qiandaohd', 'kaifukuanghuanhd', 'jijinhd', 'zhuishalinghd', 'yibaichouhd', 'huobanzhaomuhd', 'qirileichonghd', 'jierihd', 'kbzzhd', 'wzryhd', 'yuedujijin', 'mingdao', 'patahd', - 'heishihd', 'huodonghd', 'renown', 'weixiuchang', 'kaifujingsai', 'zhoumolibao']; + 'heishihd', 'huodonghd', 'renown', 'weixiuchang', 'kaifujingsai', 'zhoumolibao', 'pobinglibao']; export default async function (call: ApiCall) { diff --git a/src/api_s2c/hongdian/fun.ts b/src/api_s2c/hongdian/fun.ts index 4b58691..d173a22 100644 --- a/src/api_s2c/hongdian/fun.ts +++ b/src/api_s2c/hongdian/fun.ts @@ -327,10 +327,7 @@ export class HuoDongHongDianFun { hdxq: {} } }; - let _hdList = [] - for (let i = 0; i < 8; i++) { - _hdList.push(...await HuoDongFun.gethdList(call, i + 1)) - } + let _hdList = await HuoDongFun.gethdList(call) // let _hdList = await HuoDongFun.gethdList(call) for (let index = 0; index < _hdList.length; index++) { const element = _hdList[index]; @@ -365,6 +362,11 @@ export class HuoDongHongDianFun { ishd = await this.qiridengluHongDian(call, element) } + if (element.htype == 10) { + // 检测 htype 10 破冰活动红点 + ishd = await this.pobinglibao(call, element) + } + // 此活动有红点 if (ishd.show) { _res.show = true @@ -376,6 +378,22 @@ export class HuoDongHongDianFun { return _res; } + /**破冰礼包红点 */ + static async pobinglibao(call: ApiCall, _hd: ReqAddHuoDong): Promise { + let gift = _hd?.data?.gift?.find(i => i.id == call.req.id) + if (!gift) return {show: false} + + let payLog = await PayFun.getPayLog(call.uid, gift.payId) + payLog = payLog?.filter(i => i.time >= _hd.stime && i.time <= _hd.etime) || [] + if (!payLog || !payLog.length) return {show: false} + + // 取奖励列表，判断是否有可领取奖励 + let data = await G.mongodb.cEvent('pobinglibao').findOne({uid: call.uid, type: 'pobinglibao'}) + let rec = data?.record?.[call.req.id].length + if (rec && (rec >= 2 || data?.record?.[gift.id] == call.req.recId)) return {show: false} + return {show: true} + } + /**开服狂欢红点 */ static async kfkhHongDian(call: ApiCall) { let _res: hongdianVal = { diff --git a/src/public/pay.ts b/src/public/pay.ts index 43a0e58..4f25679 100644 --- a/src/public/pay.ts +++ b/src/public/pay.ts @@ -83,12 +83,15 @@ export class PayFun { return allPlayerPayLog?.[payId] || []; } - static async getPayLogs(uid: string, payIds?: string[]) { + static async getPayLogs(uid: string, payIds?: string[], times?: number[]) { let where = { uid: uid, del_time: {$exists: false} } if (payIds?.length) where['key'] = {$in: payIds} + if (times?.length) { + where['time'] = {$gte: times[0], $lte: times[1]} + } let logs = await G.mongodb.collection("payLogNew").find(where, { projection: { diff --git a/src/shared/protocols/hongdian/PtlGet.ts b/src/shared/protocols/hongdian/PtlGet.ts index e09f771..d283e3d 100644 --- a/src/shared/protocols/hongdian/PtlGet.ts +++ b/src/shared/protocols/hongdian/PtlGet.ts @@ -51,7 +51,8 @@ export type hongdianKey = | 'heishiMrjx' | 'weixiuchang' | 'kaifujingsai' - | 'zhoumolibao'; + | 'zhoumolibao' + | 'pobinglibao'; export type hongdianVal = { diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index c60ab37..7c9c16e 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -68,51 +68,53 @@ import { ReqOpen as ReqOpen_14, ResOpen as ResOpen_14 } from './event/leijichong import { ReqRec as ReqRec_5, ResRec as ResRec_5 } from './event/leijichongzhi/PtlRec'; import { ReqLottery, ResLottery } from './event/niudanji/PtlLottery'; import { ReqOpen as ReqOpen_15, ResOpen as ResOpen_15 } from './event/niudanji/PtlOpen'; -import { ReqOpen as ReqOpen_16, ResOpen as ResOpen_16 } from './event/qirichongzhi/PtlOpen'; +import { ReqOpen as ReqOpen_16, ResOpen as ResOpen_16 } from './event/pobinglibao/PtlOpen'; +import { ReqReceive as ReqReceive_2, ResReceive as ResReceive_2 } from './event/pobinglibao/PtlReceive'; +import { ReqOpen as ReqOpen_17, ResOpen as ResOpen_17 } from './event/qirichongzhi/PtlOpen'; import { ReqRec as ReqRec_6, ResRec as ResRec_6 } from './event/qirichongzhi/PtlRec'; -import { ReqOpen as ReqOpen_17, ResOpen as ResOpen_17 } from './event/qiridenglu/PtlOpen'; +import { ReqOpen as ReqOpen_18, ResOpen as ResOpen_18 } from './event/qiridenglu/PtlOpen'; import { ReqRecPrize as ReqRecPrize_1, ResRecPrize as ResRecPrize_1 } from './event/qiridenglu/PtlRecPrize'; -import { ReqOpen as ReqOpen_18, ResOpen as ResOpen_18 } from './event/shiwuleichong/PtlOpen'; -import { ReqOpen as ReqOpen_19, ResOpen as ResOpen_19 } from './event/shouchong/PtlOpen'; -import { ReqReceive as ReqReceive_2, ResReceive as ResReceive_2 } from './event/shouchong/PtlReceive'; +import { ReqOpen as ReqOpen_19, ResOpen as ResOpen_19 } from './event/shiwuleichong/PtlOpen'; +import { ReqOpen as ReqOpen_20, ResOpen as ResOpen_20 } from './event/shouchong/PtlOpen'; +import { ReqReceive as ReqReceive_3, ResReceive as ResReceive_3 } from './event/shouchong/PtlReceive'; import { ReqBuy as ReqBuy_1, ResBuy as ResBuy_1 } from './event/xianshizhaomu/PtlBuy'; import { ReqDuihuan, ResDuihuan } from './event/xianshizhaomu/PtlDuihuan'; import { ReqLottery as ReqLottery_1, ResLottery as ResLottery_1 } from './event/xianshizhaomu/PtlLottery'; -import { ReqOpen as ReqOpen_20, ResOpen as ResOpen_20 } from './event/xianshizhaomu/PtlOpen'; +import { ReqOpen as ReqOpen_21, ResOpen as ResOpen_21 } from './event/xianshizhaomu/PtlOpen'; import { ReqRec as ReqRec_7, ResRec as ResRec_7 } from './event/xianshizhaomu/PtlRec'; -import { ReqOpen as ReqOpen_21, ResOpen as ResOpen_21 } from './event/xinshoulibao/PtlOpen'; +import { ReqOpen as ReqOpen_22, ResOpen as ResOpen_22 } from './event/xinshoulibao/PtlOpen'; import { ReqBuy as ReqBuy_2, ResBuy as ResBuy_2 } from './event/yangchengmubiao/PtlBuy'; -import { ReqOpen as ReqOpen_22, ResOpen as ResOpen_22 } from './event/yangchengmubiao/PtlOpen'; +import { ReqOpen as ReqOpen_23, ResOpen as ResOpen_23 } from './event/yangchengmubiao/PtlOpen'; import { ReqRec as ReqRec_8, ResRec as ResRec_8 } from './event/yangchengmubiao/PtlRec'; -import { ReqOpen as ReqOpen_23, ResOpen as ResOpen_23 } from './event/yibaichou/PtlOpen'; +import { ReqOpen as ReqOpen_24, ResOpen as ResOpen_24 } from './event/yibaichou/PtlOpen'; import { ReqRec as ReqRec_9, ResRec as ResRec_9 } from './event/yibaichou/PtlRec'; import { ReqRecAll, ResRecAll } from './event/yibaichou/PtlRecAll'; -import { ReqOpen as ReqOpen_24, ResOpen as ResOpen_24 } from './event/yuedujijin/PtlOpen'; +import { ReqOpen as ReqOpen_25, ResOpen as ResOpen_25 } from './event/yuedujijin/PtlOpen'; import { ReqRec as ReqRec_10, ResRec as ResRec_10 } from './event/yuedujijin/PtlRec'; import { ReqBuyLv, ResBuyLv } from './event/zhanling/PtlBuyLv'; -import { ReqOpen as ReqOpen_25, ResOpen as ResOpen_25 } from './event/zhanling/PtlOpen'; +import { ReqOpen as ReqOpen_26, ResOpen as ResOpen_26 } from './event/zhanling/PtlOpen'; import { ReqRecPrize as ReqRecPrize_2, ResRecPrize as ResRecPrize_2 } from './event/zhanling/PtlRecPrize'; import { ReqRecTask, ResRecTask } from './event/zhanling/PtlRecTask'; -import { ReqOpen as ReqOpen_26, ResOpen as ResOpen_26 } from './event/zhoulibao/PtlOpen'; -import { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } from './event/zhoumolibao/PtlOpen'; -import { ReqReceive as ReqReceive_3, ResReceive as ResReceive_3 } from './event/zhoumolibao/PtlReceive'; +import { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } from './event/zhoulibao/PtlOpen'; +import { ReqOpen as ReqOpen_28, ResOpen as ResOpen_28 } from './event/zhoumolibao/PtlOpen'; +import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } from './event/zhoumolibao/PtlReceive'; import { ReqBuy as ReqBuy_3, ResBuy as ResBuy_3 } from './event/zixuanlibao/PtlBuy'; -import { ReqOpen as ReqOpen_28, ResOpen as ResOpen_28 } from './event/zixuanlibao/PtlOpen'; +import { ReqOpen as ReqOpen_29, ResOpen as ResOpen_29 } from './event/zixuanlibao/PtlOpen'; import { ReqhdGetList, ReshdGetList } from './eventlist/PtlhdGetList'; import { ReqApply, ResApply } from './friend/PtlApply'; import { ReqDel, ResDel } from './friend/PtlDel'; import { ReqGift, ResGift } from './friend/PtlGift'; import { ReqList, ResList } from './friend/PtlList'; -import { ReqOpen as ReqOpen_29, ResOpen as ResOpen_29 } from './friend/PtlOpen'; +import { ReqOpen as ReqOpen_30, ResOpen as ResOpen_30 } from './friend/PtlOpen'; import { ReqRespond, ResRespond } from './friend/PtlRespond'; import { ReqRmBlackList, ResRmBlackList } from './friend/PtlRmBlackList'; import { ReqSearch, ResSearch } from './friend/PtlSearch'; import { ReqChallenge, ResChallenge } from './ganbutexun/PtlChallenge'; -import { ReqOpen as ReqOpen_30, ResOpen as ResOpen_30 } from './ganbutexun/PtlOpen'; +import { ReqOpen as ReqOpen_31, ResOpen as ResOpen_31 } from './ganbutexun/PtlOpen'; import { ReqFast, ResFast } from './ganhai/PtlFast'; import { ReqFight as ReqFight_1, ResFight as ResFight_1 } from './ganhai/PtlFight'; import { ReqLog, ResLog } from './ganhai/PtlLog'; -import { ReqOpen as ReqOpen_31, ResOpen as ResOpen_31 } from './ganhai/PtlOpen'; +import { ReqOpen as ReqOpen_32, ResOpen as ResOpen_32 } from './ganhai/PtlOpen'; import { ReqRefresh, ResRefresh } from './ganhai/PtlRefresh'; import { ReqRefreshShip, ResRefreshShip } from './ganhai/PtlRefreshShip'; import { ReqSelect as ReqSelect_1, ResSelect as ResSelect_1 } from './ganhai/PtlSelect'; @@ -134,19 +136,19 @@ import { ReqJx, ResJx } from './gonghui/PtlJx'; import { ReqJxOpen, ResJxOpen } from './gonghui/PtlJxOpen'; import { ReqList as ReqList_1, ResList as ResList_1 } from './gonghui/PtlList'; import { ReqManage, ResManage } from './gonghui/PtlManage'; -import { ReqOpen as ReqOpen_32, ResOpen as ResOpen_32 } from './gonghui/PtlOpen'; +import { ReqOpen as ReqOpen_33, ResOpen as ResOpen_33 } from './gonghui/PtlOpen'; import { ReqTanHe, ResTanHe } from './gonghui/PtlTanHe'; import { ReqTaskOpen, ResTaskOpen } from './gonghui/PtlTaskOpen'; import { ReqTaskReceive, ResTaskReceive } from './gonghui/PtlTaskReceive'; import { ReqUpWz, ResUpWz } from './gonghui/PtlUpWz'; import { ReqLottery as ReqLottery_2, ResLottery as ResLottery_2 } from './gonghuibaozang/PtlLottery'; -import { ReqOpen as ReqOpen_33, ResOpen as ResOpen_33 } from './gonghuibaozang/PtlOpen'; +import { ReqOpen as ReqOpen_34, ResOpen as ResOpen_34 } from './gonghuibaozang/PtlOpen'; import { ReqBuy as ReqBuy_4, ResBuy as ResBuy_4 } from './gonglukuangbiao/PtlBuy'; import { ReqFight as ReqFight_2, ResFight as ResFight_2 } from './gonglukuangbiao/PtlFight'; -import { ReqOpen as ReqOpen_34, ResOpen as ResOpen_34 } from './gonglukuangbiao/PtlOpen'; +import { ReqOpen as ReqOpen_35, ResOpen as ResOpen_35 } from './gonglukuangbiao/PtlOpen'; import { ReqRefresh as ReqRefresh_1, ResRefresh as ResRefresh_1 } from './gonglukuangbiao/PtlRefresh'; import { ReqActive, ResActive } from './gongyu/mingdao/PtlActive'; -import { ReqOpen as ReqOpen_35, ResOpen as ResOpen_35 } from './gongyu/mingdao/PtlOpen'; +import { ReqOpen as ReqOpen_36, ResOpen as ResOpen_36 } from './gongyu/mingdao/PtlOpen'; import { ReqRecPrize as ReqRecPrize_3, ResRecPrize as ResRecPrize_3 } from './gongyu/mingdao/PtlRecPrize'; import { ReqRepair, ResRepair } from './gongyu/mingdao/PtlRepair'; import { ReqReset as ReqReset_1, ResReset as ResReset_1 } from './gongyu/xunlianjihua/PtlReset'; @@ -155,14 +157,14 @@ import { ReqSetSkill, ResSetSkill } from './gongyu/zuozhanjihua/PtlSetSkill'; import { ReqBuyNum as ReqBuyNum_1, ResBuyNum as ResBuyNum_1 } from './hbzb/jfs/PtlBuyNum'; import { ReqFight as ReqFight_3, ResFight as ResFight_3 } from './hbzb/jfs/PtlFight'; import { ReqGetLog as ReqGetLog_1, ResGetLog as ResGetLog_1 } from './hbzb/jfs/PtlGetLog'; -import { ReqOpen as ReqOpen_36, ResOpen as ResOpen_36 } from './hbzb/jfs/PtlOpen'; +import { ReqOpen as ReqOpen_37, ResOpen as ResOpen_37 } from './hbzb/jfs/PtlOpen'; import { ReqRec as ReqRec_11, ResRec as ResRec_11 } from './hbzb/jfs/PtlRec'; import { ReqRefresh as ReqRefresh_2, ResRefresh as ResRefresh_2 } from './hbzb/jfs/PtlRefresh'; import { ReqGetStatus, ResGetStatus } from './hbzb/PtlGetStatus'; import { ReqBuyNum as ReqBuyNum_2, ResBuyNum as ResBuyNum_2 } from './hbzb/zbs/PtlBuyNum'; import { ReqFight as ReqFight_4, ResFight as ResFight_4 } from './hbzb/zbs/PtlFight'; import { ReqGetLog as ReqGetLog_2, ResGetLog as ResGetLog_2 } from './hbzb/zbs/PtlGetLog'; -import { ReqOpen as ReqOpen_37, ResOpen as ResOpen_37 } from './hbzb/zbs/PtlOpen'; +import { ReqOpen as ReqOpen_38, ResOpen as ResOpen_38 } from './hbzb/zbs/PtlOpen'; import { ReqRefresh as ReqRefresh_3, ResRefresh as ResRefresh_3 } from './hbzb/zbs/PtlRefresh'; import { ReqAwake, ResAwake } from './hero/PtlAwake'; import { ReqChangePos, ResChangePos } from './hero/PtlChangePos'; @@ -178,40 +180,40 @@ import { ReqGet as ReqGet_2, ResGet as ResGet_2 } from './hongdian/PtlGet'; import { ReqGetList as ReqGetList_4, ResGetList as ResGetList_4 } from './item/PtlGetList'; import { ReqUse, ResUse } from './item/PtlUse'; import { ReqLottery as ReqLottery_3, ResLottery as ResLottery_3 } from './jiaotang/PtlLottery'; -import { ReqOpen as ReqOpen_38, ResOpen as ResOpen_38 } from './jiaotang/PtlOpen'; +import { ReqOpen as ReqOpen_39, ResOpen as ResOpen_39 } from './jiaotang/PtlOpen'; import { ReqLottery as ReqLottery_4, ResLottery as ResLottery_4 } from './jiuba/PtlLottery'; -import { ReqOpen as ReqOpen_39, ResOpen as ResOpen_39 } from './jiuba/PtlOpen'; +import { ReqOpen as ReqOpen_40, ResOpen as ResOpen_40 } from './jiuba/PtlOpen'; import { ReqBuyFightNum, ResBuyFightNum } from './jjc/PtlBuyFightNum'; import { ReqFight as ReqFight_5, ResFight as ResFight_5 } from './jjc/PtlFight'; import { ReqFightLog, ResFightLog } from './jjc/PtlFightLog'; -import { ReqOpen as ReqOpen_40, ResOpen as ResOpen_40 } from './jjc/PtlOpen'; -import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } from './jjc/PtlReceive'; +import { ReqOpen as ReqOpen_41, ResOpen as ResOpen_41 } from './jjc/PtlOpen'; +import { ReqReceive as ReqReceive_5, ResReceive as ResReceive_5 } from './jjc/PtlReceive'; import { ReqRefresh as ReqRefresh_4, ResRefresh as ResRefresh_4 } from './jjc/PtlRefresh'; -import { ReqOpen as ReqOpen_41, ResOpen as ResOpen_41 } from './kaifujingsai/PtlOpen'; -import { ReqReceive as ReqReceive_5, ResReceive as ResReceive_5 } from './kaifujingsai/PtlReceive'; +import { ReqOpen as ReqOpen_42, ResOpen as ResOpen_42 } from './kaifujingsai/PtlOpen'; +import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } from './kaifujingsai/PtlReceive'; import { ReqApply as ReqApply_2, ResApply as ResApply_2 } from './kbzz/PtlApply'; import { ReqAutoApply, ResAutoApply } from './kbzz/PtlAutoApply'; import { ReqBuyNum as ReqBuyNum_3, ResBuyNum as ResBuyNum_3 } from './kbzz/PtlBuyNum'; import { ReqFight as ReqFight_6, ResFight as ResFight_6 } from './kbzz/PtlFight'; import { ReqFightLog as ReqFightLog_1, ResFightLog as ResFightLog_1 } from './kbzz/PtlFightLog'; import { ReqGroupState, ResGroupState } from './kbzz/PtlGroupState'; -import { ReqOpen as ReqOpen_42, ResOpen as ResOpen_42 } from './kbzz/PtlOpen'; +import { ReqOpen as ReqOpen_43, ResOpen as ResOpen_43 } from './kbzz/PtlOpen'; import { ReqRecPrize as ReqRecPrize_4, ResRecPrize as ResRecPrize_4 } from './kbzz/PtlRecPrize'; import { ReqRefresh as ReqRefresh_5, ResRefresh as ResRefresh_5 } from './kbzz/PtlRefresh'; import { ReqAddPkNum, ResAddPkNum } from './kuangdong/PtlAddPkNum'; import { ReqGetPrize, ResGetPrize } from './kuangdong/PtlGetPrize'; import { ReqKdInfo, ResKdInfo } from './kuangdong/PtlKdInfo'; import { ReqLog as ReqLog_1, ResLog as ResLog_1 } from './kuangdong/PtlLog'; -import { ReqOpen as ReqOpen_43, ResOpen as ResOpen_43 } from './kuangdong/PtlOpen'; +import { ReqOpen as ReqOpen_44, ResOpen as ResOpen_44 } from './kuangdong/PtlOpen'; import { ReqYanShi, ResYanShi } from './kuangdong/PtlYanShi'; import { ReqZhanLing, ResZhanLing } from './kuangdong/PtlZhanLing'; -import { ReqOpen as ReqOpen_44, ResOpen as ResOpen_44 } from './lingzhulaixi/PtlOpen'; +import { ReqOpen as ReqOpen_45, ResOpen as ResOpen_45 } from './lingzhulaixi/PtlOpen'; import { ReqPkBoss, ResPkBoss } from './lingzhulaixi/PtlPkBoss'; import { ReqPkRank, ResPkRank } from './lingzhulaixi/PtlPkRank'; import { ReqSaoDang, ResSaoDang } from './lingzhulaixi/PtlSaoDang'; import { ReqBuy as ReqBuy_5, ResBuy as ResBuy_5 } from './meirishilian/PtlBuy'; import { ReqFight as ReqFight_7, ResFight as ResFight_7 } from './meirishilian/PtlFight'; -import { ReqOpen as ReqOpen_45, ResOpen as ResOpen_45 } from './meirishilian/PtlOpen'; +import { ReqOpen as ReqOpen_46, ResOpen as ResOpen_46 } from './meirishilian/PtlOpen'; import { MsgBindUid } from './msg_c2s/MsgBindUid'; import { MsgPay } from './msg_c2s/MsgPay'; import { MsgSync } from './msg_c2s/MsgSync'; @@ -242,7 +244,7 @@ import { MsgTaskChange } from './msg_s2c/MsgTaskChange'; import { MsgXianshilibao } from './msg_s2c/MsgXianshilibao'; import { ReqFight as ReqFight_8, ResFight as ResFight_8 } from './pata/PtlFight'; import { ReqGetPrize as ReqGetPrize_1, ResGetPrize as ResGetPrize_1 } from './pata/PtlGetPrize'; -import { ReqOpen as ReqOpen_46, ResOpen as ResOpen_46 } from './pata/PtlOpen'; +import { ReqOpen as ReqOpen_47, ResOpen as ResOpen_47 } from './pata/PtlOpen'; import { ReqSaoDang as ReqSaoDang_1, ResSaoDang as ResSaoDang_1 } from './pata/PtlSaoDang'; import { ReqGetList as ReqGetList_5, ResGetList as ResGetList_5 } from './pay/PtlGetList'; import { ReqGetList as ReqGetList_6, ResGetList as ResGetList_6 } from './peijian/PtlGetList'; @@ -258,14 +260,14 @@ import { ReqUnLock, ResUnLock } from './peijian/PtlUnLock'; import { ReqWear as ReqWear_1, ResWear as ResWear_1 } from './peijian/PtlWear'; import { ReqDeal, ResDeal } from './peijiancangku/PtlDeal'; import { ReqJump, ResJump } from './peijiancangku/PtlJump'; -import { ReqOpen as ReqOpen_47, ResOpen as ResOpen_47 } from './peijiancangku/PtlOpen'; +import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } from './peijiancangku/PtlOpen'; import { ReqBingo, ResBingo } from './PtlBingo'; import { ReqFightTest, ResFightTest } from './PtlFightTest'; import { ReqSyncBtn, ResSyncBtn } from './PtlSyncBtn'; import { ReqTest, ResTest } from './PtlTest'; import { ReqFight as ReqFight_9, ResFight as ResFight_9 } from './qjzzd/PtlFight'; -import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } from './qjzzd/PtlOpen'; -import { ReqOpen as ReqOpen_49, ResOpen as ResOpen_49 } from './rank/PtlOpen'; +import { ReqOpen as ReqOpen_49, ResOpen as ResOpen_49 } from './qjzzd/PtlOpen'; +import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } from './rank/PtlOpen'; import { ReqConcise, ResConcise } from './shiwu/PtlConcise'; import { ReqExtract, ResExtract } from './shiwu/PtlExtract'; import { ReqGetList as ReqGetList_7, ResGetList as ResGetList_7 } from './shiwu/PtlGetList'; @@ -273,20 +275,20 @@ import { ReqLvUp as ReqLvUp_3, ResLvUp as ResLvUp_3 } from './shiwu/PtlLvUp'; import { ReqRecast, ResRecast } from './shiwu/PtlRecast'; import { ReqTakeOff as ReqTakeOff_2, ResTakeOff as ResTakeOff_2 } from './shiwu/PtlTakeOff'; import { ReqWear as ReqWear_2, ResWear as ResWear_2 } from './shiwu/PtlWear'; -import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } from './shootGame/PtlOpen'; +import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './shootGame/PtlOpen'; import { ReqRec as ReqRec_13, ResRec as ResRec_13 } from './shootGame/PtlRec'; import { ReqBuy as ReqBuy_6, ResBuy as ResBuy_6 } from './shop/PtlBuy'; -import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './shop/PtlOpen'; +import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './shop/PtlOpen'; import { ReqRefresh as ReqRefresh_6, ResRefresh as ResRefresh_6 } from './shop/PtlRefresh'; import { ReqGetBoxPrize, ResGetBoxPrize } from './sign/PtlGetBoxPrize'; import { ReqGetPrize as ReqGetPrize_2, ResGetPrize as ResGetPrize_2 } from './sign/PtlGetPrize'; -import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './sign/PtlOpen'; +import { ReqOpen as ReqOpen_53, ResOpen as ResOpen_53 } from './sign/PtlOpen'; import { ReqAim, ResAim } from './slzd/PtlAim'; import { ReqBuyNum as ReqBuyNum_4, ResBuyNum as ResBuyNum_4 } from './slzd/PtlBuyNum'; import { ReqFight as ReqFight_10, ResFight as ResFight_10 } from './slzd/PtlFight'; import { ReqFightLog as ReqFightLog_2, ResFightLog as ResFightLog_2 } from './slzd/PtlFightLog'; import { ReqMyRank, ResMyRank } from './slzd/PtlMyRank'; -import { ReqOpen as ReqOpen_53, ResOpen as ResOpen_53 } from './slzd/PtlOpen'; +import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } from './slzd/PtlOpen'; import { ReqOpenFort, ResOpenFort } from './slzd/PtlOpenFort'; import { ReqRec as ReqRec_14, ResRec as ResRec_14 } from './slzd/PtlRec'; import { ReqRefresh as ReqRefresh_7, ResRefresh as ResRefresh_7 } from './slzd/PtlRefresh'; @@ -295,11 +297,11 @@ import { ReqEvent, ResEvent } from './tanxian/PtlEvent'; import { ReqFastGuaJi, ResFastGuaJi } from './tanxian/PtlFastGuaJi'; import { ReqFight as ReqFight_11, ResFight as ResFight_11 } from './tanxian/PtlFight'; import { ReqGuaJi, ResGuaJi } from './tanxian/PtlGuaJi'; -import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } from './tanxian/PtlOpen'; -import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } from './tanxian/PtlReceive'; +import { ReqOpen as ReqOpen_55, ResOpen as ResOpen_55 } from './tanxian/PtlOpen'; +import { ReqReceive as ReqReceive_7, ResReceive as ResReceive_7 } from './tanxian/PtlReceive'; import { ReqAllFinsh, ResAllFinsh } from './task/PtlAllFinsh'; import { ReqFinsh, ResFinsh } from './task/PtlFinsh'; -import { ReqOpen as ReqOpen_55, ResOpen as ResOpen_55 } from './task/PtlOpen'; +import { ReqOpen as ReqOpen_56, ResOpen as ResOpen_56 } from './task/PtlOpen'; import { ReqCDKEY, ResCDKEY } from './user/PtlCDKEY'; import { ReqChangeInfo, ResChangeInfo } from './user/PtlChangeInfo'; import { ReqChangeName, ResChangeName } from './user/PtlChangeName'; @@ -315,7 +317,7 @@ import { ReqRenownOpen, ResRenownOpen } from './user/PtlRenownOpen'; import { ReqTujian, ResTujian } from './user/PtlTujian'; import { ReqDecompose, ResDecompose } from './weixiuchang/PtlDecompose'; import { ReqExchange, ResExchange } from './weixiuchang/PtlExchange'; -import { ReqOpen as ReqOpen_56, ResOpen as ResOpen_56 } from './weixiuchang/PtlOpen'; +import { ReqOpen as ReqOpen_57, ResOpen as ResOpen_57 } from './weixiuchang/PtlOpen'; import { ReqUpLv, ResUpLv } from './weixiuchang/PtlUpLv'; import { ReqUpStar, ResUpStar } from './weixiuchang/PtlUpStar'; import { ReqAutoBaoMing, ResAutoBaoMing } from './wzry/PtlAutoBaoMing'; @@ -326,7 +328,7 @@ import { ReqDldFight, ResDldFight } from './wzry/PtlDldFight'; import { ReqDldRefre, ResDldRefre } from './wzry/PtlDldRefre'; import { ReqJingCai, ResJingCai } from './wzry/PtlJingCai'; import { ReqJingCaiOpen, ResJingCaiOpen } from './wzry/PtlJingCaiOpen'; -import { ReqOpen as ReqOpen_57, ResOpen as ResOpen_57 } from './wzry/PtlOpen'; +import { ReqOpen as ReqOpen_58, ResOpen as ResOpen_58 } from './wzry/PtlOpen'; import { ReqUpdateFight, ResUpdateFight } from './wzry/PtlUpdateFight'; import { ReqWzzd, ResWzzd } from './wzry/PtlWzzd'; import { ReqZuanShiOpen, ResZuanShiOpen } from './wzry/PtlZuanShiOpen'; @@ -334,8 +336,8 @@ import { ReqAllGet, ResAllGet } from './xstask/PtlAllGet'; import { ReqGet as ReqGet_3, ResGet as ResGet_3 } from './xstask/PtlGet'; import { ReqLvUp as ReqLvUp_4, ResLvUp as ResLvUp_4 } from './xstask/PtlLvUp'; import { ReqOnekeyReceive, ResOnekeyReceive } from './xstask/PtlOnekeyReceive'; -import { ReqOpen as ReqOpen_58, ResOpen as ResOpen_58 } from './xstask/PtlOpen'; -import { ReqReceive as ReqReceive_7, ResReceive as ResReceive_7 } from './xstask/PtlReceive'; +import { ReqOpen as ReqOpen_59, ResOpen as ResOpen_59 } from './xstask/PtlOpen'; +import { ReqReceive as ReqReceive_8, ResReceive as ResReceive_8 } from './xstask/PtlReceive'; import { ReqRefresh as ReqRefresh_8, ResRefresh as ResRefresh_8 } from './xstask/PtlRefresh'; import { ReqHandle, ResHandle } from './yongbingzhuzhan/PtlHandle'; import { ReqChangePos as ReqChangePos_1, ResChangePos as ResChangePos_1 } from './zhanqianbushu/PtlChangePos'; @@ -620,33 +622,41 @@ export interface ServiceType { req: ReqOpen_15, res: ResOpen_15 }, - "event/qirichongzhi/Open": { + "event/pobinglibao/Open": { req: ReqOpen_16, res: ResOpen_16 }, + "event/pobinglibao/Receive": { + req: ReqReceive_2, + res: ResReceive_2 + }, + "event/qirichongzhi/Open": { + req: ReqOpen_17, + res: ResOpen_17 + }, "event/qirichongzhi/Rec": { req: ReqRec_6, res: ResRec_6 }, "event/qiridenglu/Open": { - req: ReqOpen_17, - res: ResOpen_17 + req: ReqOpen_18, + res: ResOpen_18 }, "event/qiridenglu/RecPrize": { req: ReqRecPrize_1, res: ResRecPrize_1 }, "event/shiwuleichong/Open": { - req: ReqOpen_18, - res: ResOpen_18 - }, - "event/shouchong/Open": { req: ReqOpen_19, res: ResOpen_19 }, + "event/shouchong/Open": { + req: ReqOpen_20, + res: ResOpen_20 + }, "event/shouchong/Receive": { - req: ReqReceive_2, - res: ResReceive_2 + req: ReqReceive_3, + res: ResReceive_3 }, "event/xianshizhaomu/Buy": { req: ReqBuy_1, @@ -661,32 +671,32 @@ export interface ServiceType { res: ResLottery_1 }, "event/xianshizhaomu/Open": { - req: ReqOpen_20, - res: ResOpen_20 + req: ReqOpen_21, + res: ResOpen_21 }, "event/xianshizhaomu/Rec": { req: ReqRec_7, res: ResRec_7 }, "event/xinshoulibao/Open": { - req: ReqOpen_21, - res: ResOpen_21 + req: ReqOpen_22, + res: ResOpen_22 }, "event/yangchengmubiao/Buy": { req: ReqBuy_2, res: ResBuy_2 }, "event/yangchengmubiao/Open": { - req: ReqOpen_22, - res: ResOpen_22 + req: ReqOpen_23, + res: ResOpen_23 }, "event/yangchengmubiao/Rec": { req: ReqRec_8, res: ResRec_8 }, "event/yibaichou/Open": { - req: ReqOpen_23, - res: ResOpen_23 + req: ReqOpen_24, + res: ResOpen_24 }, "event/yibaichou/Rec": { req: ReqRec_9, @@ -697,8 +707,8 @@ export interface ServiceType { res: ResRecAll }, "event/yuedujijin/Open": { - req: ReqOpen_24, - res: ResOpen_24 + req: ReqOpen_25, + res: ResOpen_25 }, "event/yuedujijin/Rec": { req: ReqRec_10, @@ -709,8 +719,8 @@ export interface ServiceType { res: ResBuyLv }, "event/zhanling/Open": { - req: ReqOpen_25, - res: ResOpen_25 + req: ReqOpen_26, + res: ResOpen_26 }, "event/zhanling/RecPrize": { req: ReqRecPrize_2, @@ -721,24 +731,24 @@ export interface ServiceType { res: ResRecTask }, "event/zhoulibao/Open": { - req: ReqOpen_26, - res: ResOpen_26 - }, - "event/zhoumolibao/Open": { req: ReqOpen_27, res: ResOpen_27 }, + "event/zhoumolibao/Open": { + req: ReqOpen_28, + res: ResOpen_28 + }, "event/zhoumolibao/Receive": { - req: ReqReceive_3, - res: ResReceive_3 + req: ReqReceive_4, + res: ResReceive_4 }, "event/zixuanlibao/Buy": { req: ReqBuy_3, res: ResBuy_3 }, "event/zixuanlibao/Open": { - req: ReqOpen_28, - res: ResOpen_28 + req: ReqOpen_29, + res: ResOpen_29 }, "eventlist/hdGetList": { req: ReqhdGetList, @@ -761,8 +771,8 @@ export interface ServiceType { res: ResList }, "friend/Open": { - req: ReqOpen_29, - res: ResOpen_29 + req: ReqOpen_30, + res: ResOpen_30 }, "friend/Respond": { req: ReqRespond, @@ -781,8 +791,8 @@ export interface ServiceType { res: ResChallenge }, "ganbutexun/Open": { - req: ReqOpen_30, - res: ResOpen_30 + req: ReqOpen_31, + res: ResOpen_31 }, "ganhai/Fast": { req: ReqFast, @@ -797,8 +807,8 @@ export interface ServiceType { res: ResLog }, "ganhai/Open": { - req: ReqOpen_31, - res: ResOpen_31 + req: ReqOpen_32, + res: ResOpen_32 }, "ganhai/Refresh": { req: ReqRefresh, @@ -885,8 +895,8 @@ export interface ServiceType { res: ResManage }, "gonghui/Open": { - req: ReqOpen_32, - res: ResOpen_32 + req: ReqOpen_33, + res: ResOpen_33 }, "gonghui/TanHe": { req: ReqTanHe, @@ -909,8 +919,8 @@ export interface ServiceType { res: ResLottery_2 }, "gonghuibaozang/Open": { - req: ReqOpen_33, - res: ResOpen_33 + req: ReqOpen_34, + res: ResOpen_34 }, "gonglukuangbiao/Buy": { req: ReqBuy_4, @@ -921,8 +931,8 @@ export interface ServiceType { res: ResFight_2 }, "gonglukuangbiao/Open": { - req: ReqOpen_34, - res: ResOpen_34 + req: ReqOpen_35, + res: ResOpen_35 }, "gonglukuangbiao/Refresh": { req: ReqRefresh_1, @@ -933,8 +943,8 @@ export interface ServiceType { res: ResActive }, "gongyu/mingdao/Open": { - req: ReqOpen_35, - res: ResOpen_35 + req: ReqOpen_36, + res: ResOpen_36 }, "gongyu/mingdao/RecPrize": { req: ReqRecPrize_3, @@ -969,8 +979,8 @@ export interface ServiceType { res: ResGetLog_1 }, "hbzb/jfs/Open": { - req: ReqOpen_36, - res: ResOpen_36 + req: ReqOpen_37, + res: ResOpen_37 }, "hbzb/jfs/Rec": { req: ReqRec_11, @@ -997,8 +1007,8 @@ export interface ServiceType { res: ResGetLog_2 }, "hbzb/zbs/Open": { - req: ReqOpen_37, - res: ResOpen_37 + req: ReqOpen_38, + res: ResOpen_38 }, "hbzb/zbs/Refresh": { req: ReqRefresh_3, @@ -1061,16 +1071,16 @@ export interface ServiceType { res: ResLottery_3 }, "jiaotang/Open": { - req: ReqOpen_38, - res: ResOpen_38 + req: ReqOpen_39, + res: ResOpen_39 }, "jiuba/Lottery": { req: ReqLottery_4, res: ResLottery_4 }, "jiuba/Open": { - req: ReqOpen_39, - res: ResOpen_39 + req: ReqOpen_40, + res: ResOpen_40 }, "jjc/BuyFightNum": { req: ReqBuyFightNum, @@ -1085,24 +1095,24 @@ export interface ServiceType { res: ResFightLog }, "jjc/Open": { - req: ReqOpen_40, - res: ResOpen_40 + req: ReqOpen_41, + res: ResOpen_41 }, "jjc/Receive": { - req: ReqReceive_4, - res: ResReceive_4 + req: ReqReceive_5, + res: ResReceive_5 }, "jjc/Refresh": { req: ReqRefresh_4, res: ResRefresh_4 }, "kaifujingsai/Open": { - req: ReqOpen_41, - res: ResOpen_41 + req: ReqOpen_42, + res: ResOpen_42 }, "kaifujingsai/Receive": { - req: ReqReceive_5, - res: ResReceive_5 + req: ReqReceive_6, + res: ResReceive_6 }, "kbzz/Apply": { req: ReqApply_2, @@ -1129,8 +1139,8 @@ export interface ServiceType { res: ResGroupState }, "kbzz/Open": { - req: ReqOpen_42, - res: ResOpen_42 + req: ReqOpen_43, + res: ResOpen_43 }, "kbzz/RecPrize": { req: ReqRecPrize_4, @@ -1157,8 +1167,8 @@ export interface ServiceType { res: ResLog_1 }, "kuangdong/Open": { - req: ReqOpen_43, - res: ResOpen_43 + req: ReqOpen_44, + res: ResOpen_44 }, "kuangdong/YanShi": { req: ReqYanShi, @@ -1169,8 +1179,8 @@ export interface ServiceType { res: ResZhanLing }, "lingzhulaixi/Open": { - req: ReqOpen_44, - res: ResOpen_44 + req: ReqOpen_45, + res: ResOpen_45 }, "lingzhulaixi/PkBoss": { req: ReqPkBoss, @@ -1193,8 +1203,8 @@ export interface ServiceType { res: ResFight_7 }, "meirishilian/Open": { - req: ReqOpen_45, - res: ResOpen_45 + req: ReqOpen_46, + res: ResOpen_46 }, "pata/Fight": { req: ReqFight_8, @@ -1205,8 +1215,8 @@ export interface ServiceType { res: ResGetPrize_1 }, "pata/Open": { - req: ReqOpen_46, - res: ResOpen_46 + req: ReqOpen_47, + res: ResOpen_47 }, "pata/SaoDang": { req: ReqSaoDang_1, @@ -1269,8 +1279,8 @@ export interface ServiceType { res: ResJump }, "peijiancangku/Open": { - req: ReqOpen_47, - res: ResOpen_47 + req: ReqOpen_48, + res: ResOpen_48 }, "Bingo": { req: ReqBingo, @@ -1293,13 +1303,13 @@ export interface ServiceType { res: ResFight_9 }, "qjzzd/Open": { - req: ReqOpen_48, - res: ResOpen_48 - }, - "rank/Open": { req: ReqOpen_49, res: ResOpen_49 }, + "rank/Open": { + req: ReqOpen_50, + res: ResOpen_50 + }, "shiwu/Concise": { req: ReqConcise, res: ResConcise @@ -1329,8 +1339,8 @@ export interface ServiceType { res: ResWear_2 }, "shootGame/Open": { - req: ReqOpen_50, - res: ResOpen_50 + req: ReqOpen_51, + res: ResOpen_51 }, "shootGame/Rec": { req: ReqRec_13, @@ -1341,8 +1351,8 @@ export interface ServiceType { res: ResBuy_6 }, "shop/Open": { - req: ReqOpen_51, - res: ResOpen_51 + req: ReqOpen_52, + res: ResOpen_52 }, "shop/Refresh": { req: ReqRefresh_6, @@ -1357,8 +1367,8 @@ export interface ServiceType { res: ResGetPrize_2 }, "sign/Open": { - req: ReqOpen_52, - res: ResOpen_52 + req: ReqOpen_53, + res: ResOpen_53 }, "slzd/Aim": { req: ReqAim, @@ -1381,8 +1391,8 @@ export interface ServiceType { res: ResMyRank }, "slzd/Open": { - req: ReqOpen_53, - res: ResOpen_53 + req: ReqOpen_54, + res: ResOpen_54 }, "slzd/OpenFort": { req: ReqOpenFort, @@ -1417,12 +1427,12 @@ export interface ServiceType { res: ResGuaJi }, "tanxian/Open": { - req: ReqOpen_54, - res: ResOpen_54 + req: ReqOpen_55, + res: ResOpen_55 }, "tanxian/Receive": { - req: ReqReceive_6, - res: ResReceive_6 + req: ReqReceive_7, + res: ResReceive_7 }, "task/AllFinsh": { req: ReqAllFinsh, @@ -1433,8 +1443,8 @@ export interface ServiceType { res: ResFinsh }, "task/Open": { - req: ReqOpen_55, - res: ResOpen_55 + req: ReqOpen_56, + res: ResOpen_56 }, "user/CDKEY": { req: ReqCDKEY, @@ -1497,8 +1507,8 @@ export interface ServiceType { res: ResExchange }, "weixiuchang/Open": { - req: ReqOpen_56, - res: ResOpen_56 + req: ReqOpen_57, + res: ResOpen_57 }, "weixiuchang/UpLv": { req: ReqUpLv, @@ -1541,8 +1551,8 @@ export interface ServiceType { res: ResJingCaiOpen }, "wzry/Open": { - req: ReqOpen_57, - res: ResOpen_57 + req: ReqOpen_58, + res: ResOpen_58 }, "wzry/UpdateFight": { req: ReqUpdateFight, @@ -1573,12 +1583,12 @@ export interface ServiceType { res: ResOnekeyReceive }, "xstask/Open": { - req: ReqOpen_58, - res: ResOpen_58 + req: ReqOpen_59, + res: ResOpen_59 }, "xstask/Receive": { - req: ReqReceive_7, - res: ResReceive_7 + req: ReqReceive_8, + res: ResReceive_8 }, "xstask/Refresh": { req: ReqRefresh_8, @@ -1982,101 +1992,111 @@ export const serviceProto: ServiceProto = { }, { "id": 69, - "name": "event/qirichongzhi/Open", + "name": "event/pobinglibao/Open", "type": "api" }, { "id": 70, - "name": "event/qirichongzhi/Rec", + "name": "event/pobinglibao/Receive", "type": "api" }, { "id": 71, - "name": "event/qiridenglu/Open", + "name": "event/qirichongzhi/Open", "type": "api" }, { "id": 72, - "name": "event/qiridenglu/RecPrize", + "name": "event/qirichongzhi/Rec", "type": "api" }, { "id": 73, - "name": "event/shiwuleichong/Open", + "name": "event/qiridenglu/Open", "type": "api" }, { "id": 74, - "name": "event/shouchong/Open", + "name": "event/qiridenglu/RecPrize", "type": "api" }, { "id": 75, - "name": "event/shouchong/Receive", + "name": "event/shiwuleichong/Open", "type": "api" }, { "id": 76, - "name": "event/xianshizhaomu/Buy", + "name": "event/shouchong/Open", "type": "api" }, { "id": 77, - "name": "event/xianshizhaomu/Duihuan", + "name": "event/shouchong/Receive", "type": "api" }, { "id": 78, - "name": "event/xianshizhaomu/Lottery", + "name": "event/xianshizhaomu/Buy", "type": "api" }, { "id": 79, - "name": "event/xianshizhaomu/Open", + "name": "event/xianshizhaomu/Duihuan", "type": "api" }, { "id": 80, - "name": "event/xianshizhaomu/Rec", + "name": "event/xianshizhaomu/Lottery", "type": "api" }, { "id": 81, - "name": "event/xinshoulibao/Open", + "name": "event/xianshizhaomu/Open", "type": "api" }, { "id": 82, - "name": "event/yangchengmubiao/Buy", + "name": "event/xianshizhaomu/Rec", "type": "api" }, { "id": 83, - "name": "event/yangchengmubiao/Open", + "name": "event/xinshoulibao/Open", "type": "api" }, { "id": 84, - "name": "event/yangchengmubiao/Rec", + "name": "event/yangchengmubiao/Buy", "type": "api" }, { "id": 85, - "name": "event/yibaichou/Open", + "name": "event/yangchengmubiao/Open", "type": "api" }, { "id": 86, - "name": "event/yibaichou/Rec", + "name": "event/yangchengmubiao/Rec", "type": "api" }, { "id": 87, - "name": "event/yibaichou/RecAll", + "name": "event/yibaichou/Open", "type": "api" }, { "id": 88, + "name": "event/yibaichou/Rec", + "type": "api" + }, + { + "id": 89, + "name": "event/yibaichou/RecAll", + "type": "api" + }, + { + "id": 90, "name": "event/yuedujijin/Open", "type": "api", "conf": { @@ -2084,157 +2104,157 @@ export const serviceProto: ServiceProto = { } }, { - "id": 89, + "id": 91, "name": "event/yuedujijin/Rec", "type": "api" }, { - "id": 90, + "id": 92, "name": "event/zhanling/BuyLv", "type": "api" }, { - "id": 91, + "id": 93, "name": "event/zhanling/Open", "type": "api" }, { - "id": 92, + "id": 94, "name": "event/zhanling/RecPrize", "type": "api" }, { - "id": 93, + "id": 95, "name": "event/zhanling/RecTask", "type": "api" }, { - "id": 94, + "id": 96, "name": "event/zhoulibao/Open", "type": "api" }, { - "id": 95, + "id": 97, "name": "event/zhoumolibao/Open", "type": "api" }, { - "id": 96, + "id": 98, "name": "event/zhoumolibao/Receive", "type": "api" }, { - "id": 97, + "id": 99, "name": "event/zixuanlibao/Buy", "type": "api" }, { - "id": 98, + "id": 100, "name": "event/zixuanlibao/Open", "type": "api" }, { - "id": 99, + "id": 101, "name": "eventlist/hdGetList", "type": "api" }, { - "id": 100, + "id": 102, "name": "friend/Apply", "type": "api" }, { - "id": 101, + "id": 103, "name": "friend/Del", "type": "api" }, { - "id": 102, + "id": 104, "name": "friend/Gift", "type": "api" }, { - "id": 103, + "id": 105, "name": "friend/List", "type": "api" }, { - "id": 104, + "id": 106, "name": "friend/Open", "type": "api" }, { - "id": 105, + "id": 107, "name": "friend/Respond", "type": "api" }, { - "id": 106, + "id": 108, "name": "friend/RmBlackList", "type": "api" }, { - "id": 107, + "id": 109, "name": "friend/Search", "type": "api" }, { - "id": 108, + "id": 110, "name": "ganbutexun/Challenge", "type": "api" }, { - "id": 109, + "id": 111, "name": "ganbutexun/Open", "type": "api" }, { - "id": 110, + "id": 112, "name": "ganhai/Fast", "type": "api" }, { - "id": 111, + "id": 113, "name": "ganhai/Fight", "type": "api" }, { - "id": 112, + "id": 114, "name": "ganhai/Log", "type": "api" }, { - "id": 113, + "id": 115, "name": "ganhai/Open", "type": "api" }, { - "id": 114, + "id": 116, "name": "ganhai/Refresh", "type": "api" }, { - "id": 115, + "id": 117, "name": "ganhai/RefreshShip", "type": "api" }, { - "id": 116, + "id": 118, "name": "ganhai/Select", "type": "api" }, { - "id": 117, + "id": 119, "name": "gmapi/Gift", "type": "api" }, { - "id": 118, + "id": 120, "name": "gmapi/Post", "type": "api" }, { - "id": 119, + "id": 121, "name": "gonghui/Apply", "type": "api", "conf": { @@ -2244,7 +2264,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 120, + "id": 122, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2254,7 +2274,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 121, + "id": 123, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2264,7 +2284,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 122, + "id": 124, "name": "gonghui/Change", "type": "api", "conf": { @@ -2274,12 +2294,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 123, + "id": 125, "name": "gonghui/Create", "type": "api" }, { - "id": 124, + "id": 126, "name": "gonghui/Dissolve", "type": "api", "conf": { @@ -2289,7 +2309,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 125, + "id": 127, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2299,12 +2319,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 126, + "id": 128, "name": "gonghui/FbBuyNum", "type": "api" }, { - "id": 127, + "id": 129, "name": "gonghui/FbFight", "type": "api", "conf": { @@ -2314,7 +2334,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 128, + "id": 130, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2324,17 +2344,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 129, + "id": 131, "name": "gonghui/GetList", "type": "api" }, { - "id": 130, + "id": 132, "name": "gonghui/Join", "type": "api" }, { - "id": 131, + "id": 133, "name": "gonghui/Jx", "type": "api", "conf": { @@ -2344,7 +2364,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 132, + "id": 134, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2354,7 +2374,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 133, + "id": 135, "name": "gonghui/List", "type": "api", "conf": { @@ -2364,7 +2384,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 134, + "id": 136, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2374,7 +2394,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 135, + "id": 137, "name": "gonghui/Open", "type": "api", "conf": { @@ -2384,7 +2404,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 136, + "id": 138, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2394,7 +2414,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 137, + "id": 139, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2404,7 +2424,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 138, + "id": 140, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2414,7 +2434,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 139, + "id": 141, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2424,137 +2444,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 140, + "id": 142, "name": "gonghuibaozang/Lottery", "type": "api" }, { - "id": 141, + "id": 143, "name": "gonghuibaozang/Open", "type": "api" }, { - "id": 142, + "id": 144, "name": "gonglukuangbiao/Buy", "type": "api" }, { - "id": 143, + "id": 145, "name": "gonglukuangbiao/Fight", "type": "api" }, { - "id": 144, + "id": 146, "name": "gonglukuangbiao/Open", "type": "api" }, { - "id": 145, + "id": 147, "name": "gonglukuangbiao/Refresh", "type": "api" }, { - "id": 146, + "id": 148, "name": "gongyu/mingdao/Active", "type": "api" }, { - "id": 147, + "id": 149, "name": "gongyu/mingdao/Open", "type": "api" }, { - "id": 148, + "id": 150, "name": "gongyu/mingdao/RecPrize", "type": "api" }, { - "id": 149, + "id": 151, "name": "gongyu/mingdao/Repair", "type": "api" }, { - "id": 150, + "id": 152, "name": "gongyu/xunlianjihua/Reset", "type": "api" }, { - "id": 151, + "id": 153, "name": "gongyu/xunlianjihua/UpSkill", "type": "api" }, { - "id": 152, + "id": 154, "name": "gongyu/zuozhanjihua/SetSkill", "type": "api" }, { - "id": 153, + "id": 155, "name": "hbzb/jfs/BuyNum", "type": "api" }, { - "id": 154, + "id": 156, "name": "hbzb/jfs/Fight", "type": "api" }, { - "id": 155, + "id": 157, "name": "hbzb/jfs/GetLog", "type": "api" }, { - "id": 156, + "id": 158, "name": "hbzb/jfs/Open", "type": "api" }, { - "id": 157, + "id": 159, "name": "hbzb/jfs/Rec", "type": "api" }, { - "id": 158, + "id": 160, "name": "hbzb/jfs/Refresh", "type": "api" }, { - "id": 159, + "id": 161, "name": "hbzb/GetStatus", "type": "api" }, { - "id": 160, + "id": 162, "name": "hbzb/zbs/BuyNum", "type": "api" }, { - "id": 161, + "id": 163, "name": "hbzb/zbs/Fight", "type": "api" }, { - "id": 162, + "id": 164, "name": "hbzb/zbs/GetLog", "type": "api" }, { - "id": 163, + "id": 165, "name": "hbzb/zbs/Open", "type": "api" }, { - "id": 164, + "id": 166, "name": "hbzb/zbs/Refresh", "type": "api" }, { - "id": 165, + "id": 167, "name": "hero/Awake", "type": "api" }, { - "id": 166, + "id": 168, "name": "hero/ChangePos", "type": "api", "conf": { @@ -2562,17 +2582,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 167, + "id": 169, "name": "hero/GetList", "type": "api" }, { - "id": 168, + "id": 170, "name": "hero/JinJie", "type": "api" }, { - "id": 169, + "id": 171, "name": "hero/LvUp", "type": "api", "conf": { @@ -2580,32 +2600,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 170, + "id": 172, "name": "hero/Potency", "type": "api" }, { - "id": 171, + "id": 173, "name": "hero/Rec", "type": "api" }, { - "id": 172, + "id": 174, "name": "hero/Reset", "type": "api" }, { - "id": 173, + "id": 175, "name": "hero/Talent", "type": "api" }, { - "id": 174, + "id": 176, "name": "hero/WeaponUp", "type": "api" }, { - "id": 175, + "id": 177, "name": "hongdian/Get", "type": "api", "conf": { @@ -2613,117 +2633,117 @@ export const serviceProto: ServiceProto = { } }, { - "id": 176, + "id": 178, "name": "item/GetList", "type": "api" }, { - "id": 177, + "id": 179, "name": "item/Use", "type": "api" }, { - "id": 178, + "id": 180, "name": "jiaotang/Lottery", "type": "api" }, { - "id": 179, + "id": 181, "name": "jiaotang/Open", "type": "api" }, { - "id": 180, + "id": 182, "name": "jiuba/Lottery", "type": "api" }, { - "id": 181, + "id": 183, "name": "jiuba/Open", "type": "api" }, { - "id": 182, + "id": 184, "name": "jjc/BuyFightNum", "type": "api" }, { - "id": 183, + "id": 185, "name": "jjc/Fight", "type": "api" }, { - "id": 184, + "id": 186, "name": "jjc/FightLog", "type": "api" }, { - "id": 185, + "id": 187, "name": "jjc/Open", "type": "api" }, { - "id": 186, + "id": 188, "name": "jjc/Receive", "type": "api" }, { - "id": 187, + "id": 189, "name": "jjc/Refresh", "type": "api" }, { - "id": 188, + "id": 190, "name": "kaifujingsai/Open", "type": "api" }, { - "id": 189, + "id": 191, "name": "kaifujingsai/Receive", "type": "api" }, { - "id": 190, + "id": 192, "name": "kbzz/Apply", "type": "api" }, { - "id": 191, + "id": 193, "name": "kbzz/AutoApply", "type": "api" }, { - "id": 192, + "id": 194, "name": "kbzz/BuyNum", "type": "api" }, { - "id": 193, + "id": 195, "name": "kbzz/Fight", "type": "api" }, { - "id": 194, + "id": 196, "name": "kbzz/FightLog", "type": "api" }, { - "id": 195, + "id": 197, "name": "kbzz/GroupState", "type": "api" }, { - "id": 196, + "id": 198, "name": "kbzz/Open", "type": "api" }, { - "id": 197, + "id": 199, "name": "kbzz/RecPrize", "type": "api" }, { - "id": 198, + "id": 200, "name": "kbzz/Refresh", "type": "api", "conf": { @@ -2731,282 +2751,282 @@ export const serviceProto: ServiceProto = { } }, { - "id": 199, + "id": 201, "name": "kuangdong/AddPkNum", "type": "api" }, { - "id": 200, + "id": 202, "name": "kuangdong/GetPrize", "type": "api" }, { - "id": 201, + "id": 203, "name": "kuangdong/KdInfo", "type": "api" }, { - "id": 202, + "id": 204, "name": "kuangdong/Log", "type": "api" }, { - "id": 203, + "id": 205, "name": "kuangdong/Open", "type": "api" }, { - "id": 204, + "id": 206, "name": "kuangdong/YanShi", "type": "api" }, { - "id": 205, + "id": 207, "name": "kuangdong/ZhanLing", "type": "api" }, { - "id": 206, + "id": 208, "name": "lingzhulaixi/Open", "type": "api" }, { - "id": 207, + "id": 209, "name": "lingzhulaixi/PkBoss", "type": "api" }, { - "id": 208, + "id": 210, "name": "lingzhulaixi/PkRank", "type": "api" }, { - "id": 209, + "id": 211, "name": "lingzhulaixi/SaoDang", "type": "api" }, { - "id": 210, + "id": 212, "name": "meirishilian/Buy", "type": "api" }, { - "id": 211, + "id": 213, "name": "meirishilian/Fight", "type": "api" }, { - "id": 212, + "id": 214, "name": "meirishilian/Open", "type": "api" }, { - "id": 213, + "id": 215, "name": "msg_c2s/BindUid", "type": "msg" }, { - "id": 214, + "id": 216, "name": "msg_c2s/Pay", "type": "msg" }, { - "id": 215, + "id": 217, "name": "msg_c2s/Sync", "type": "msg" }, { - "id": 216, + "id": 218, "name": "msg_s2c/Chat", "type": "msg" }, { - "id": 217, + "id": 219, "name": "msg_s2c/ChatHelp", "type": "msg" }, { - "id": 218, + "id": 220, "name": "msg_s2c/Collection", "type": "msg" }, { - "id": 219, + "id": 221, "name": "msg_s2c/Email", "type": "msg" }, { - "id": 220, + "id": 222, "name": "msg_s2c/EmailDel", "type": "msg" }, { - "id": 221, + "id": 223, "name": "msg_s2c/EquipChange", "type": "msg" }, { - "id": 222, + "id": 224, "name": "msg_s2c/Friend", "type": "msg" }, { - "id": 223, + "id": 225, "name": "msg_s2c/GhChange", "type": "msg" }, { - "id": 224, + "id": 226, "name": "msg_s2c/GongHuiBaoZang", "type": "msg" }, { - "id": 225, + "id": 227, "name": "msg_s2c/HeroChange", "type": "msg" }, { - "id": 226, + "id": 228, "name": "msg_s2c/HongDianChange", "type": "msg" }, { - "id": 227, + "id": 229, "name": "msg_s2c/ItemChange", "type": "msg" }, { - "id": 228, + "id": 230, "name": "msg_s2c/LoginQueue", "type": "msg" }, { - "id": 229, + "id": 231, "name": "msg_s2c/LshdChange", "type": "msg" }, { - "id": 230, + "id": 232, "name": "msg_s2c/NewDay", "type": "msg" }, { - "id": 231, + "id": 233, "name": "msg_s2c/OtherLogin", "type": "msg" }, { - "id": 232, + "id": 234, "name": "msg_s2c/PayChange", "type": "msg" }, { - "id": 233, + "id": 235, "name": "msg_s2c/PayResult", "type": "msg" }, { - "id": 234, + "id": 236, "name": "msg_s2c/PeijianChange", "type": "msg" }, { - "id": 235, + "id": 237, "name": "msg_s2c/PlayerChange", "type": "msg" }, { - "id": 236, + "id": 238, "name": "msg_s2c/Private", "type": "msg" }, { - "id": 237, + "id": 239, "name": "msg_s2c/SendGift", "type": "msg" }, { - "id": 238, + "id": 240, "name": "msg_s2c/ShiwuChange", "type": "msg" }, { - "id": 239, + "id": 241, "name": "msg_s2c/TaskChange", "type": "msg" }, { - "id": 240, + "id": 242, "name": "msg_s2c/Xianshilibao", "type": "msg" }, { - "id": 241, + "id": 243, "name": "pata/Fight", "type": "api" }, { - "id": 242, + "id": 244, "name": "pata/GetPrize", "type": "api" }, { - "id": 243, + "id": 245, "name": "pata/Open", "type": "api" }, { - "id": 244, + "id": 246, "name": "pata/SaoDang", "type": "api" }, { - "id": 245, + "id": 247, "name": "pay/GetList", "type": "api" }, { - "id": 246, + "id": 248, "name": "peijian/GetList", "type": "api" }, { - "id": 247, + "id": 249, "name": "peijian/JingLian", "type": "api" }, { - "id": 248, + "id": 250, "name": "peijian/JinJie", "type": "api" }, { - "id": 249, + "id": 251, "name": "peijian/LvUp", "type": "api" }, { - "id": 250, + "id": 252, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 251, + "id": 253, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 252, + "id": 254, "name": "peijian/Reset", "type": "api" }, { - "id": 253, + "id": 255, "name": "peijian/Rm", "type": "api" }, { - "id": 254, + "id": 256, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3014,32 +3034,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 255, + "id": 257, "name": "peijian/UnLock", "type": "api" }, { - "id": 256, + "id": 258, "name": "peijian/Wear", "type": "api" }, { - "id": 257, + "id": 259, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 258, + "id": 260, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 259, + "id": 261, "name": "peijiancangku/Open", "type": "api" }, { - "id": 260, + "id": 262, "name": "Bingo", "type": "api", "conf": { @@ -3047,137 +3067,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 261, + "id": 263, "name": "FightTest", "type": "api" }, { - "id": 262, + "id": 264, "name": "SyncBtn", "type": "api" }, { - "id": 263, + "id": 265, "name": "Test", "type": "api" }, { - "id": 264, + "id": 266, "name": "qjzzd/Fight", "type": "api" }, { - "id": 265, + "id": 267, "name": "qjzzd/Open", "type": "api" }, { - "id": 266, + "id": 268, "name": "rank/Open", "type": "api" }, { - "id": 267, + "id": 269, "name": "shiwu/Concise", "type": "api" }, { - "id": 268, + "id": 270, "name": "shiwu/Extract", "type": "api" }, { - "id": 269, + "id": 271, "name": "shiwu/GetList", "type": "api" }, { - "id": 270, + "id": 272, "name": "shiwu/LvUp", "type": "api" }, { - "id": 271, + "id": 273, "name": "shiwu/Recast", "type": "api" }, { - "id": 272, + "id": 274, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 273, + "id": 275, "name": "shiwu/Wear", "type": "api" }, { - "id": 274, + "id": 276, "name": "shootGame/Open", "type": "api" }, { - "id": 275, + "id": 277, "name": "shootGame/Rec", "type": "api" }, { - "id": 276, + "id": 278, "name": "shop/Buy", "type": "api" }, { - "id": 277, + "id": 279, "name": "shop/Open", "type": "api" }, { - "id": 278, + "id": 280, "name": "shop/Refresh", "type": "api" }, { - "id": 279, + "id": 281, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 280, + "id": 282, "name": "sign/GetPrize", "type": "api" }, { - "id": 281, + "id": 283, "name": "sign/Open", "type": "api" }, { - "id": 282, + "id": 284, "name": "slzd/Aim", "type": "api" }, { - "id": 283, + "id": 285, "name": "slzd/BuyNum", "type": "api" }, { - "id": 284, + "id": 286, "name": "slzd/Fight", "type": "api" }, { - "id": 285, + "id": 287, "name": "slzd/FightLog", "type": "api" }, { - "id": 286, + "id": 288, "name": "slzd/MyRank", "type": "api" }, { - "id": 287, + "id": 289, "name": "slzd/Open", "type": "api", "conf": { @@ -3187,77 +3207,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 288, + "id": 290, "name": "slzd/OpenFort", "type": "api" }, { - "id": 289, + "id": 291, "name": "slzd/Rec", "type": "api" }, { - "id": 290, + "id": 292, "name": "slzd/Refresh", "type": "api" }, { - "id": 291, + "id": 293, "name": "slzd/Slot", "type": "api" }, { - "id": 292, + "id": 294, "name": "tanxian/Event", "type": "api" }, { - "id": 293, + "id": 295, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 294, + "id": 296, "name": "tanxian/Fight", "type": "api" }, { - "id": 295, + "id": 297, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 296, + "id": 298, "name": "tanxian/Open", "type": "api" }, { - "id": 297, + "id": 299, "name": "tanxian/Receive", "type": "api" }, { - "id": 298, + "id": 300, "name": "task/AllFinsh", "type": "api" }, { - "id": 299, + "id": 301, "name": "task/Finsh", "type": "api" }, { - "id": 300, + "id": 302, "name": "task/Open", "type": "api" }, { - "id": 301, + "id": 303, "name": "user/CDKEY", "type": "api" }, { - "id": 302, + "id": 304, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3265,197 +3285,197 @@ export const serviceProto: ServiceProto = { } }, { - "id": 303, + "id": 305, "name": "user/ChangeName", "type": "api" }, { - "id": 304, + "id": 306, "name": "user/Fight", "type": "api" }, { - "id": 305, + "id": 307, "name": "user/GetInfo", "type": "api" }, { - "id": 306, + "id": 308, "name": "user/InfoOpen", "type": "api" }, { - "id": 307, + "id": 309, "name": "user/Login", "type": "api" }, { - "id": 308, + "id": 310, "name": "user/Ping", "type": "api" }, { - "id": 309, + "id": 311, "name": "user/Renown", "type": "api" }, { - "id": 310, + "id": 312, "name": "user/RenownBuy", "type": "api" }, { - "id": 311, + "id": 313, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 312, + "id": 314, "name": "user/RenownOpen", "type": "api" }, { - "id": 313, + "id": 315, "name": "user/Tujian", "type": "api" }, { - "id": 314, + "id": 316, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 315, + "id": 317, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 316, + "id": 318, "name": "weixiuchang/Open", "type": "api" }, { - "id": 317, + "id": 319, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 318, + "id": 320, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 319, + "id": 321, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 320, + "id": 322, "name": "wzry/BaoMing", "type": "api" }, { - "id": 321, + "id": 323, "name": "wzry/catFightLog", "type": "api" }, { - "id": 322, + "id": 324, "name": "wzry/CatGroup", "type": "api" }, { - "id": 323, + "id": 325, "name": "wzry/DldFight", "type": "api" }, { - "id": 324, + "id": 326, "name": "wzry/DldRefre", "type": "api" }, { - "id": 325, + "id": 327, "name": "wzry/JingCai", "type": "api" }, { - "id": 326, + "id": 328, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 327, + "id": 329, "name": "wzry/Open", "type": "api" }, { - "id": 328, + "id": 330, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 329, + "id": 331, "name": "wzry/Wzzd", "type": "api" }, { - "id": 330, + "id": 332, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 331, + "id": 333, "name": "xstask/AllGet", "type": "api" }, { - "id": 332, + "id": 334, "name": "xstask/Get", "type": "api" }, { - "id": 333, + "id": 335, "name": "xstask/LvUp", "type": "api" }, { - "id": 334, + "id": 336, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 335, + "id": 337, "name": "xstask/Open", "type": "api" }, { - "id": 336, + "id": 338, "name": "xstask/Receive", "type": "api" }, { - "id": 337, + "id": 339, "name": "xstask/Refresh", "type": "api" }, { - "id": 338, + "id": 340, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 339, + "id": 341, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 340, + "id": 342, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 341, + "id": 343, "name": "zhanqianbushu/Up", "type": "api" } @@ -10085,6 +10105,62 @@ export const serviceProto: ServiceProto = { } ] }, + "event/pobinglibao/PtlOpen/ReqOpen": { + "type": "Interface" + }, + "event/pobinglibao/PtlOpen/ResOpen": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "record", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" + } + } + } + }, + { + "id": 1, + "name": "buyLog", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" + } + } + } + } + ] + }, + "event/pobinglibao/PtlReceive/ReqReceive": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "id", + "type": { + "type": "String" + } + }, + { + "id": 1, + "name": "recId", + "type": { + "type": "String" + } + } + ] + }, + "event/pobinglibao/PtlReceive/ResReceive": { + "type": "Interface" + }, "event/qirichongzhi/PtlOpen/ReqOpen": { "type": "Interface" }, @@ -14855,6 +14931,13 @@ export const serviceProto: ServiceProto = { "type": "Literal", "literal": "zhoumolibao" } + }, + { + "id": 37, + "type": { + "type": "Literal", + "literal": "pobinglibao" + } } ] }, From 7488802fd01de2993802f4b34a863ff54f9621d7 Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 20 Dec 2023 13:56:20 +0800 Subject: [PATCH 10/90] =?UTF-8?q?revert=20=E6=8E=A8=E9=80=81=E7=A4=BC?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/jiuba/ApiLottery.ts | 5 + src/api_s2c/pushgift/ApiOpen.ts | 29 ++++ src/jsonType.ts | 19 +++ src/module/collection_pushgift.ts | 13 ++ src/module/mongodb.ts | 2 + src/public/fight.ts | 20 ++- src/public/player.ts | 64 +++++--- src/public/pushgift.ts | 155 ++++++++++++++++++ .../protocols/msg_s2c/MsgPushGiftChange.ts | 1 + src/shared/protocols/pushgift/PtlOpen.ts | 5 + 10 files changed, 289 insertions(+), 24 deletions(-) create mode 100644 src/api_s2c/pushgift/ApiOpen.ts create mode 100644 src/module/collection_pushgift.ts create mode 100644 src/public/pushgift.ts create mode 100644 src/shared/protocols/msg_s2c/MsgPushGiftChange.ts create mode 100644 src/shared/protocols/pushgift/PtlOpen.ts diff --git a/src/api_s2c/jiuba/ApiLottery.ts b/src/api_s2c/jiuba/ApiLottery.ts index 968cd79..89266e0 100644 --- a/src/api_s2c/jiuba/ApiLottery.ts +++ b/src/api_s2c/jiuba/ApiLottery.ts @@ -9,6 +9,7 @@ import {ReqLottery, ResLottery} from "../../shared/protocols/jiuba/PtlLottery"; import {PublicShared} from '../../shared/public/public'; import {HongDianChange} from '../hongdian/fun'; import {RankKfjs} from "../../public/rank/rank_kfjs"; +import {PushGiftFun} from "../../public/pushgift"; export default async function (call: ApiCall) { @@ -142,4 +143,8 @@ export default async function (call: ApiCall) { valArr: [await rankKfjs.getRankScore(call.uid) + call.req.type] }); + // 十连抽推送礼包 + if (call.req.type == 10) { + PushGiftFun.chkRecruitGift(call.uid) + } } \ No newline at end of file diff --git a/src/api_s2c/pushgift/ApiOpen.ts b/src/api_s2c/pushgift/ApiOpen.ts new file mode 100644 index 0000000..58d85b2 --- /dev/null +++ b/src/api_s2c/pushgift/ApiOpen.ts @@ -0,0 +1,29 @@ +import {ApiCall} from "tsrpc"; +import {ReqOpen, ResOpen} from "../../shared/protocols/pushgift/PtlOpen"; +import {PushGiftFun} from "../../public/pushgift"; +import {Gift} from "../../module/collection_pushgift"; + +export default async function (call: ApiCall) { + let res: ResOpen = {gifts: []}; + + // 过滤过期的礼包 和购买完毕的礼包 + (await PushGiftFun.getGift(call.uid)).forEach((gift) => { + if (gift.passTime > G.time && chkBuyNum(gift.id, gift)) { + res.gifts.push(gift) + } + }) + + call.succ(res) +} + +function chkBuyNum(gift_id: string, gift_info: Gift) { + let conf = G.gc.tuisonglibao[gift_id]; + for (let i = 0; i < conf.payId.length; i++) { + let pay = G.gc.pay[conf.payId[i]]; + if (pay.buys > 0 && gift_info.buy[i] < pay.buys) { + return true + } + } + + return false +} \ No newline at end of file diff --git a/src/jsonType.ts b/src/jsonType.ts index 43654a4..8788f60 100644 --- a/src/jsonType.ts +++ b/src/jsonType.ts @@ -1773,6 +1773,24 @@ type gc_yuyuemail = { 'prize': { "a": string, "t": string, "n": number, [x: string]: any }[] }; +type gc_push_gift = { + [k: string]: { + /**礼包id*/ + id: number + /**礼包类型*/ + type: number + /**礼包参数*/ + num: any[] + /**购买id*/ + payId: string[] + /**持续时间*/ + time: number + /**冷却时间*/ + displayCD: number + /**显示返利比*/ + scale: number + } +} type gcType = { [key: string]: any @@ -1922,6 +1940,7 @@ type gcType = { kfcb_content: gc_kfcb_content kfcb_prize: gc_kfcb_prize yuyuemail: gc_yuyuemail + tuisonglibao: gc_push_gift } diff --git a/src/module/collection_pushgift.ts b/src/module/collection_pushgift.ts new file mode 100644 index 0000000..c62fff0 --- /dev/null +++ b/src/module/collection_pushgift.ts @@ -0,0 +1,13 @@ +import {ObjectId} from "mongodb"; +import {ResOpen} from "../shared/protocols/pushgift/PtlOpen"; + +export type Gift = { + id: string + uid: string + buy: number[] + ctime: number + passTime: number + ext_data: { [key: string]: any } +} + +export type CollectionPushGift = Gift & { _id: ObjectId }; \ No newline at end of file diff --git a/src/module/mongodb.ts b/src/module/mongodb.ts index f912ad7..5d8c8ac 100644 --- a/src/module/mongodb.ts +++ b/src/module/mongodb.ts @@ -59,6 +59,7 @@ import {CollectionPlayerBehavior} from "./collection_player_behavior"; import {CollectionRmbuse} from "./collection_rmbuse"; import {CollectionFightLog} from "./collection_fightLog"; import {CollectionShop} from "./collection_shop"; +import {CollectionPushGift} from "./collection_pushgift"; export type MongodbCollections = { user: CollectionUser; @@ -131,4 +132,5 @@ export type MongodbCollections = { rmbuse: CollectionRmbuse fightLog: CollectionFightLog shop: CollectionShop + pushgift:CollectionPushGift }; \ No newline at end of file diff --git a/src/public/fight.ts b/src/public/fight.ts index 202369c..c13c029 100644 --- a/src/public/fight.ts +++ b/src/public/fight.ts @@ -9,6 +9,7 @@ import {HeroFun} from './hero'; import {UserFun} from './user'; import {re, string} from "mathjs"; import {getGud} from './gud'; +import {PushGiftFun} from "./pushgift"; type fightType = 'tanxian' | 'pata' | 'jjc' | 'gbtx' | 'qjzzd' | 'meirishilian' | 'wzrycross'; @@ -86,9 +87,16 @@ export class FightFun { /**挑战竞技场 */ static async fightJJc(call: ApiCall, rankInfo: rankInfo) { - if (rankInfo.player.uid.indexOf('npc_') != -1) return await this.fightNpc(call, G.gc.jjc_npc[rankInfo.player.uid].npcId, 'jjc', await this.getPlayerFightData(call.conn.uid)); - return this.fight([await this.getPlayerFightData(call.conn.uid), await this.getPlayerFightData(rankInfo.player.uid)]); + + let result = this.fight([await this.getPlayerFightData(call.conn.uid), await this.getPlayerFightData(rankInfo.player.uid)]); + + // 竞技场 战败触发推送礼包 + if (result.winSide != 0) { + PushGiftFun.chkLoseGift(call.uid) + } + + return result } /**挑战npc */ @@ -106,7 +114,13 @@ export class FightFun { let npc = formatNpcData(npcId); - return this.fight([my, npc], 30, 'pve'); + let result = this.fight([my, npc], 30, 'pve'); + + // 主线 爬塔 战败触发推送礼包 + if (result.winSide != 0 && ["tanxian", "pata"].includes(type)) { + PushGiftFun.chkLoseGift(data[0].player.uid) + } + return result } /** diff --git a/src/public/player.ts b/src/public/player.ts index d8322dd..27d8ddc 100644 --- a/src/public/player.ts +++ b/src/public/player.ts @@ -14,9 +14,10 @@ import {PublicShared} from '../shared/public/public'; import {HeroFun} from './hero'; import {ShiwuFun} from './shiwu'; import {UserFun} from './user'; -import { getItemByItemId, getItemNum } from './item'; -import { getGud, setGud } from './gud'; +import {getItemByItemId, getItemNum} from './item'; +import {getGud, setGud} from './gud'; import {addGameLog} from "../gameLog"; +import {PushGiftFun} from "./pushgift"; export type call = { @@ -35,7 +36,7 @@ export type call = { }; service: { name: string }; addEventMsg: ApiCall['addEventMsg']; - req: { } + req: {} }; export class PlayerFun { @@ -66,6 +67,8 @@ export class PlayerFun { if (has < atn.n) { if (err) { + // 消耗不足 触发推送礼包 + PushGiftFun.chkItemGift(call.uid, atn) throw new TsrpcError('', {code: -104, atn: atn}); } else { return {isOk: false, atn: atn}; @@ -143,15 +146,15 @@ export class PlayerFun { shiwu.length > 0 && this.addShiwu(call, shiwu), peijian.length > 0 && this.addPeijian(call, peijian) ]); - + return prizeList; }; //attr里的指定字段的值，不能小于0 - static fixAttrLteZero(t:string, val:number){ - if(['jinbi','rmbmoney','payExp','nexp'].includes(t) && val < 0){ + static fixAttrLteZero(t: string, val: number) { + if (['jinbi', 'rmbmoney', 'payExp', 'nexp'].includes(t) && val < 0) { return 0 - }else{ + } else { return val; } } @@ -189,6 +192,16 @@ export class PlayerFun { // 修改属性应在相关奖励领取之前，否则奖励内获取的用户数据是旧数据 // await this.changeAttr(call.conn.uid, change); call.addEventMsg('msg_s2c/PlayerChange', change); + + // 等级改变 触发推送礼包 + if (change["lv"]) { + PushGiftFun.chkLvGift(call.uid, change["lv"]) + } + // 关卡改变 触发推送礼包 + if (change["mapId"]) { + PushGiftFun.chkLevelGift(call.uid, change["mapId"]) + } + } static async changeAttrLog(uid: string, change, atn, before) { @@ -207,9 +220,9 @@ export class PlayerFun { static async changeAttr(uid: string, change: Partial) { //for (let k in change) { - //G.redis.set('user', uid, k as any, change[k]); + //G.redis.set('user', uid, k as any, change[k]); //} - setGud(uid,change); + setGud(uid, change); G.mongodb.collection('user').updateOne({uid: uid}, {$set: change}); @@ -290,7 +303,11 @@ export class PlayerFun { G.mongodb.collection('item').updateOne(upObj.filter, upObj.update, upObj.options); call.addEventMsg('msg_s2c/ItemChange', atn.t, data); - addGameLog(call.uid, "_itemChange", {"additem":1}, {"filter": upObj.filter, "update": upObj.update, "options": upObj.options}) + addGameLog(call.uid, "_itemChange", {"additem": 1}, { + "filter": upObj.filter, + "update": upObj.update, + "options": upObj.options + }) } else { if (item.num + atn.n <= 0) { await Promise.all([ @@ -302,13 +319,13 @@ export class PlayerFun { //await G.redis.del('item', call.uid, atn.t); //await G.mongodb.collection('item').deleteOne({uid: call.uid, itemId: atn.t}); call.addEventMsg('msg_s2c/ItemChange', atn.t, {num: 0}); - addGameLog(call.uid, "_itemChange",{"delitem":1}, {"itemId": atn.t}) + addGameLog(call.uid, "_itemChange", {"delitem": 1}, {"itemId": atn.t}) } else { await Promise.all([ ////去掉item Redis相关 //G.redis.set('item', call.uid, atn.t, 'lastTime', upObj.update.$set.lastTime), //G.redis.numIncrBy('item', call.uid, atn.t, 'num', atn.n), - + G.mongodb.collection('item').updateOne(upObj.filter, upObj.update, upObj.options) ]); // await G.redis.set('item', call.uid, atn.t, 'lastTime', upObj.update.$set.lastTime); @@ -318,7 +335,12 @@ export class PlayerFun { num: item.num + atn.n, lastTime: upObj.update.$set.lastTime }); - addGameLog(call.uid, "_itemChange",{"attritem":1}, {"filter": upObj.filter, "update": upObj.update, "options": upObj.options,newNum:item.num + atn.n}) + addGameLog(call.uid, "_itemChange", {"attritem": 1}, { + "filter": upObj.filter, + "update": upObj.update, + "options": upObj.options, + newNum: item.num + atn.n + }) } } } @@ -344,7 +366,7 @@ export class PlayerFun { }).reduce((a, b) => a.concat(b)); let result = await G.mongodb.collection('equip').insertMany(insertData); - addGameLog(call.uid, "_addEquip",{}, insertData) + addGameLog(call.uid, "_addEquip", {}, insertData) insertData.forEach((v, key) => { let id = result.insertedIds[key].toHexString(); @@ -391,7 +413,7 @@ export class PlayerFun { G.mongodb.collection('equip').deleteOne({uid: call.uid, _id: new ObjectId(_id)}); call.addEventMsg('msg_s2c/EquipChange', _id, {num: 0}); - addGameLog(call.uid, "_cutEquip",{}, {_id:_id}) + addGameLog(call.uid, "_cutEquip", {}, {_id: _id}) } } @@ -419,7 +441,7 @@ export class PlayerFun { }); let result = await G.mongodb.collection('hero').insertMany(insertData); - addGameLog(call.uid, "_addHero",{}, insertData) + addGameLog(call.uid, "_addHero", {}, insertData) for (let key = 0; key < insertData.length; key++) { let v = insertData[key] @@ -474,7 +496,7 @@ export class PlayerFun { G.redis.del('hero', call.uid, _id); G.mongodb.collection('hero').deleteOne({uid: call.uid, _id: new ObjectId(_id)}); call.addEventMsg('msg_s2c/HeroChange', _id, {num: 0}); - addGameLog(call.uid, "_cutHero",{}, {_id:_id}) + addGameLog(call.uid, "_cutHero", {}, {_id: _id}) } } @@ -505,7 +527,7 @@ export class PlayerFun { }).reduce((a, b) => a.concat(b)); let result = await G.mongodb.collection('shiwu').insertMany(insertData); - addGameLog(call.uid, "_addShiWu",{}, insertData) + addGameLog(call.uid, "_addShiWu", {}, insertData) insertData.forEach((v, key) => { let id = result.insertedIds[key].toHexString(); @@ -537,7 +559,7 @@ export class PlayerFun { // G.redis.del('shiwu', call.uid, _id); G.mongodb.collection('shiwu').deleteOne({uid: call.uid, _id: new ObjectId(_id)}); call.addEventMsg('msg_s2c/ShiwuChange', _id, {num: 0}); - addGameLog(call.uid, "_cutShiwu",{}, {_id:_id}) + addGameLog(call.uid, "_cutShiwu", {}, {_id: _id}) } } @@ -559,7 +581,7 @@ export class PlayerFun { }).reduce((a, b) => a.concat(b)); let result = await G.mongodb.collection('peijian').insertMany(insertData); - addGameLog(call.uid, "_addPeiJian",{}, insertData) + addGameLog(call.uid, "_addPeiJian", {}, insertData) insertData.forEach((v, key) => { let {_id, uid, ...ops} = v; @@ -600,7 +622,7 @@ export class PlayerFun { G.redis.del('peijian', call.uid, _id); G.mongodb.collection('peijian').deleteOne({uid: call.uid, _id: new ObjectId(_id)}); call.addEventMsg('msg_s2c/PeijianChange', _id, {num: 0}); - addGameLog(call.uid, "_cutPeijian",{}, {_id:_id}) + addGameLog(call.uid, "_cutPeijian", {}, {_id: _id}) } } diff --git a/src/public/pushgift.ts b/src/public/pushgift.ts new file mode 100644 index 0000000..72fcfde --- /dev/null +++ b/src/public/pushgift.ts @@ -0,0 +1,155 @@ +import {PayFun} from "./pay"; + +const PushGiftType = { + LevelGift: 1, // 关卡推送 + ItemGift: 2, // 道具推送 + LoseGift: 3, // 战败推送 + RecruitGift: 4, // 十连推送 + LvGift: 5, // 等级推送 +} + +export class PushGiftFun { + + static async getGift(uid: string) { + // 查询所有礼包 + return (await G.mongodb.collection("pushgift").find({ + uid: uid + }).toArray()).map((i) => { + let {_id, ...gift} = i; + return gift + }) + } + + static async chkItemGift(uid: string, atn: atn) { + let gift_ids = []; + for (let id in G.gc.tuisonglibao) { + let conf = G.gc.tuisonglibao[id]; + if (conf.type == PushGiftType.ItemGift && conf.num[0].a == atn.a && conf.num[0].t == atn.t) { + gift_ids.push(id); + } + } + if (gift_ids.length <= 0) { + return + } else { + this.pushGift(uid, gift_ids) + } + } + + static async chkLevelGift(uid: string, level: number) { + let gift_ids = []; + for (let id in G.gc.tuisonglibao) { + let conf = G.gc.tuisonglibao[id]; + if (conf.type == PushGiftType.LevelGift && conf.num[0] == level) { + gift_ids.push(id); + } + } + if (gift_ids.length <= 0) { + return + } else { + this.pushGift(uid, gift_ids) + } + } + + static async chkLvGift(uid: string, lv: number) { + let gift_ids = []; + for (let id in G.gc.tuisonglibao) { + let conf = G.gc.tuisonglibao[id]; + if (conf.type == PushGiftType.LevelGift && conf.num[0] == lv) { + gift_ids.push(id); + } + } + if (gift_ids.length <= 0) { + return + } else { + this.pushGift(uid, gift_ids) + } + } + + static async chkLoseGift(uid: string) { + let gift_ids = []; + for (let id in G.gc.tuisonglibao) { + let conf = G.gc.tuisonglibao[id]; + if (conf.type == PushGiftType.LoseGift) { + gift_ids.push(id); + } + } + if (gift_ids.length <= 0) { + return + } else { + this.pushGift(uid, gift_ids) + } + } + + static async chkRecruitGift(uid: string) { + let gift_ids = []; + for (let id in G.gc.tuisonglibao) { + let conf = G.gc.tuisonglibao[id]; + if (conf.type == PushGiftType.RecruitGift) { + gift_ids.push(id); + } + } + if (gift_ids.length <= 0) { + return + } else { + this.pushGift(uid, gift_ids) + } + } + + static async pushGift(uid: string, gift_ids: string[]) { + let gifts = {}; + (await this.getGift(uid)).forEach(i => gifts[i.id] = i) + for (let gift_id of gift_ids) { + let conf = G.gc.tuisonglibao[gift_id]; + if (gifts[gift_id] && conf.displayCD > 0 && gifts[gift_id].ctime + conf.displayCD > G.time) { + continue + } + if (conf.type == PushGiftType.RecruitGift) { + if (gifts[gift_id]) { + if (gift_ids[gift_id].ext_data.num + 1 >= conf.num[0]) { + this.addGift(uid, gift_id, {num: 0}) + } else { + G.mongodb.collection("pushgift").updateOne({ + uid: uid, id: gift_id + }, {"$inc": {"ext_data.num": 1}}) + } + } else { + // 招募礼包不存在 初始化数据 记录招募次数 + G.mongodb.collection("pushgift").updateOne({ + uid: uid, id: gift_id + }, { + $set: { + ctime: 0, + passTime: 0, + ext_data: {num: 1}, + buy: conf.payId.map(() => 0), + } + }, {upsert: true}) + } + } else { + this.addGift(uid, gift_id, {}) + } + } + } + + static async addGift(uid: string, giftid: string, ext_data: { [key: string]: any }) { + let conf = G.gc.tuisonglibao[giftid]; + // 更新礼包 + G.mongodb.collection("pushgift").updateOne({ + uid: uid, id: giftid + }, { + $set: { + ctime: G.time, + ext_data: ext_data, + passTime: G.time + conf.time, + buy: conf.payId.map(() => 0), + } + }, {upsert: true}) + + // 删除购买记录 + PayFun.delPayLog(uid, ...conf.payId.map(i => { + return {payId: i, val: []} + })) + // 推送客户端消息 + G.server.sendMsgByUid(uid, "msg_s2c/PushGiftChange", 1); + } +} \ No newline at end of file diff --git a/src/shared/protocols/msg_s2c/MsgPushGiftChange.ts b/src/shared/protocols/msg_s2c/MsgPushGiftChange.ts new file mode 100644 index 0000000..4c04b9b --- /dev/null +++ b/src/shared/protocols/msg_s2c/MsgPushGiftChange.ts @@ -0,0 +1 @@ +export type MsgPushGiftChange = 1; diff --git a/src/shared/protocols/pushgift/PtlOpen.ts b/src/shared/protocols/pushgift/PtlOpen.ts new file mode 100644 index 0000000..829c306 --- /dev/null +++ b/src/shared/protocols/pushgift/PtlOpen.ts @@ -0,0 +1,5 @@ +import {Gift} from "../../../module/collection_pushgift"; + +export type ReqOpen = {} + +export type ResOpen = { gifts: Gift[] } From 146f5a1daa193f8a0c342431098d291840af774a Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 20 Dec 2023 13:56:24 +0800 Subject: [PATCH 11/90] Revert "Revert "feat:"" This reverts commit ce5836be83cfd72acf26a6ef64d8681371257851. --- src/globalListener.ts | 2 ++ src/public/pushgift.ts | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/globalListener.ts b/src/globalListener.ts index 2c3aa37..a5a750f 100644 --- a/src/globalListener.ts +++ b/src/globalListener.ts @@ -17,6 +17,7 @@ import { PublicShared } from './shared/public/public'; import { setGud } from './public/gud'; import {checkResetBuyLog} from "./api_s2c/event/zhoumolibao/ApiOpen"; import {Christmasfun} from "./api_s2c/event/christmas/fun"; +import {PushGiftFun} from "./public/pushgift"; export type gEventType = { /**玩家断开连接 */ @@ -198,6 +199,7 @@ export function addListener() { { $inc: { payNum: conf.money } }, { upsert: true } ); + PushGiftFun.buy(player.uid, payId) // 推送礼包 }); G.on("FIRST_LOGIN_EVERY_DAY", (gud, lastTime, curTime) => { diff --git a/src/public/pushgift.ts b/src/public/pushgift.ts index 72fcfde..e003088 100644 --- a/src/public/pushgift.ts +++ b/src/public/pushgift.ts @@ -152,4 +152,22 @@ export class PushGiftFun { // 推送客户端消息 G.server.sendMsgByUid(uid, "msg_s2c/PushGiftChange", 1); } + + static async buy(uid: string, payId: string) { + // 购买礼包 + let gift; + for (let gift_id in G.gc.tuisonglibao) { + gift = G.gc.tuisonglibao[gift_id]; + if (gift.payId.includes(payId)) break; + } + let index = gift.payId.indexOf(payId); + let info = await G.mongodb.collection("pushgift").findOne({ + uid: uid, id: gift.id.toString() + }) + if (info.passTime >= G.time) { + G.mongodb.collection("pushgift").updateOne({ + uid: uid, id: gift.id.toString() + }, {$inc: {[`buy.${index}`]: 1}}) + } + } } \ No newline at end of file From a113f4c461479e1baf347c656db3519add356faf Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 20 Dec 2023 13:56:45 +0800 Subject: [PATCH 12/90] Revert "Revert "feat:"" This reverts commit c282ece109dd987633b3aaf3da67ac226c05938e. --- src/public/fight.ts | 2 +- src/public/pushgift.ts | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/public/fight.ts b/src/public/fight.ts index c13c029..c2388b5 100644 --- a/src/public/fight.ts +++ b/src/public/fight.ts @@ -118,7 +118,7 @@ export class FightFun { // 主线 爬塔 战败触发推送礼包 if (result.winSide != 0 && ["tanxian", "pata"].includes(type)) { - PushGiftFun.chkLoseGift(data[0].player.uid) + PushGiftFun.chkLoseGift(call.uid) } return result } diff --git a/src/public/pushgift.ts b/src/public/pushgift.ts index e003088..22fb397 100644 --- a/src/public/pushgift.ts +++ b/src/public/pushgift.ts @@ -54,7 +54,7 @@ export class PushGiftFun { let gift_ids = []; for (let id in G.gc.tuisonglibao) { let conf = G.gc.tuisonglibao[id]; - if (conf.type == PushGiftType.LevelGift && conf.num[0] == lv) { + if (conf.type == PushGiftType.LvGift && conf.num[0] == lv) { gift_ids.push(id); } } @@ -157,17 +157,23 @@ export class PushGiftFun { // 购买礼包 let gift; for (let gift_id in G.gc.tuisonglibao) { - gift = G.gc.tuisonglibao[gift_id]; - if (gift.payId.includes(payId)) break; + let temp = G.gc.tuisonglibao[gift_id]; + if (temp.payId.includes(payId)) { + gift = temp; + break + } } + if (!gift) return; let index = gift.payId.indexOf(payId); let info = await G.mongodb.collection("pushgift").findOne({ uid: uid, id: gift.id.toString() }) if (info.passTime >= G.time) { - G.mongodb.collection("pushgift").updateOne({ + await G.mongodb.collection("pushgift").updateOne({ uid: uid, id: gift.id.toString() }, {$inc: {[`buy.${index}`]: 1}}) + // 推送客户端消息 + G.server.sendMsgByUid(uid, "msg_s2c/PushGiftChange", 1); } } } \ No newline at end of file From 105af9bbc7eb9e2877bc21bb388f59fc70cc18b2 Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 20 Dec 2023 13:59:38 +0800 Subject: [PATCH 13/90] =?UTF-8?q?revert=20=E6=8E=A8=E9=80=81=E7=A4=BC?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/protocols/serviceProto.ts | 376 +++++++++++++++++---------- 1 file changed, 236 insertions(+), 140 deletions(-) diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index c60ab37..7dad19f 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -236,6 +236,7 @@ import { MsgPayResult } from './msg_s2c/MsgPayResult'; import { MsgPeijianChange } from './msg_s2c/MsgPeijianChange'; import { MsgPlayerChange } from './msg_s2c/MsgPlayerChange'; import { MsgPrivate } from './msg_s2c/MsgPrivate'; +import { MsgPushGiftChange } from './msg_s2c/MsgPushGiftChange'; import { MsgSendGift } from './msg_s2c/MsgSendGift'; import { MsgShiwuChange } from './msg_s2c/MsgShiwuChange'; import { MsgTaskChange } from './msg_s2c/MsgTaskChange'; @@ -263,9 +264,10 @@ import { ReqBingo, ResBingo } from './PtlBingo'; import { ReqFightTest, ResFightTest } from './PtlFightTest'; import { ReqSyncBtn, ResSyncBtn } from './PtlSyncBtn'; import { ReqTest, ResTest } from './PtlTest'; +import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } from './pushgift/PtlOpen'; import { ReqFight as ReqFight_9, ResFight as ResFight_9 } from './qjzzd/PtlFight'; -import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } from './qjzzd/PtlOpen'; -import { ReqOpen as ReqOpen_49, ResOpen as ResOpen_49 } from './rank/PtlOpen'; +import { ReqOpen as ReqOpen_49, ResOpen as ResOpen_49 } from './qjzzd/PtlOpen'; +import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } from './rank/PtlOpen'; import { ReqConcise, ResConcise } from './shiwu/PtlConcise'; import { ReqExtract, ResExtract } from './shiwu/PtlExtract'; import { ReqGetList as ReqGetList_7, ResGetList as ResGetList_7 } from './shiwu/PtlGetList'; @@ -273,20 +275,20 @@ import { ReqLvUp as ReqLvUp_3, ResLvUp as ResLvUp_3 } from './shiwu/PtlLvUp'; import { ReqRecast, ResRecast } from './shiwu/PtlRecast'; import { ReqTakeOff as ReqTakeOff_2, ResTakeOff as ResTakeOff_2 } from './shiwu/PtlTakeOff'; import { ReqWear as ReqWear_2, ResWear as ResWear_2 } from './shiwu/PtlWear'; -import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } from './shootGame/PtlOpen'; +import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './shootGame/PtlOpen'; import { ReqRec as ReqRec_13, ResRec as ResRec_13 } from './shootGame/PtlRec'; import { ReqBuy as ReqBuy_6, ResBuy as ResBuy_6 } from './shop/PtlBuy'; -import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './shop/PtlOpen'; +import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './shop/PtlOpen'; import { ReqRefresh as ReqRefresh_6, ResRefresh as ResRefresh_6 } from './shop/PtlRefresh'; import { ReqGetBoxPrize, ResGetBoxPrize } from './sign/PtlGetBoxPrize'; import { ReqGetPrize as ReqGetPrize_2, ResGetPrize as ResGetPrize_2 } from './sign/PtlGetPrize'; -import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './sign/PtlOpen'; +import { ReqOpen as ReqOpen_53, ResOpen as ResOpen_53 } from './sign/PtlOpen'; import { ReqAim, ResAim } from './slzd/PtlAim'; import { ReqBuyNum as ReqBuyNum_4, ResBuyNum as ResBuyNum_4 } from './slzd/PtlBuyNum'; import { ReqFight as ReqFight_10, ResFight as ResFight_10 } from './slzd/PtlFight'; import { ReqFightLog as ReqFightLog_2, ResFightLog as ResFightLog_2 } from './slzd/PtlFightLog'; import { ReqMyRank, ResMyRank } from './slzd/PtlMyRank'; -import { ReqOpen as ReqOpen_53, ResOpen as ResOpen_53 } from './slzd/PtlOpen'; +import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } from './slzd/PtlOpen'; import { ReqOpenFort, ResOpenFort } from './slzd/PtlOpenFort'; import { ReqRec as ReqRec_14, ResRec as ResRec_14 } from './slzd/PtlRec'; import { ReqRefresh as ReqRefresh_7, ResRefresh as ResRefresh_7 } from './slzd/PtlRefresh'; @@ -295,11 +297,11 @@ import { ReqEvent, ResEvent } from './tanxian/PtlEvent'; import { ReqFastGuaJi, ResFastGuaJi } from './tanxian/PtlFastGuaJi'; import { ReqFight as ReqFight_11, ResFight as ResFight_11 } from './tanxian/PtlFight'; import { ReqGuaJi, ResGuaJi } from './tanxian/PtlGuaJi'; -import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } from './tanxian/PtlOpen'; +import { ReqOpen as ReqOpen_55, ResOpen as ResOpen_55 } from './tanxian/PtlOpen'; import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } from './tanxian/PtlReceive'; import { ReqAllFinsh, ResAllFinsh } from './task/PtlAllFinsh'; import { ReqFinsh, ResFinsh } from './task/PtlFinsh'; -import { ReqOpen as ReqOpen_55, ResOpen as ResOpen_55 } from './task/PtlOpen'; +import { ReqOpen as ReqOpen_56, ResOpen as ResOpen_56 } from './task/PtlOpen'; import { ReqCDKEY, ResCDKEY } from './user/PtlCDKEY'; import { ReqChangeInfo, ResChangeInfo } from './user/PtlChangeInfo'; import { ReqChangeName, ResChangeName } from './user/PtlChangeName'; @@ -315,7 +317,7 @@ import { ReqRenownOpen, ResRenownOpen } from './user/PtlRenownOpen'; import { ReqTujian, ResTujian } from './user/PtlTujian'; import { ReqDecompose, ResDecompose } from './weixiuchang/PtlDecompose'; import { ReqExchange, ResExchange } from './weixiuchang/PtlExchange'; -import { ReqOpen as ReqOpen_56, ResOpen as ResOpen_56 } from './weixiuchang/PtlOpen'; +import { ReqOpen as ReqOpen_57, ResOpen as ResOpen_57 } from './weixiuchang/PtlOpen'; import { ReqUpLv, ResUpLv } from './weixiuchang/PtlUpLv'; import { ReqUpStar, ResUpStar } from './weixiuchang/PtlUpStar'; import { ReqAutoBaoMing, ResAutoBaoMing } from './wzry/PtlAutoBaoMing'; @@ -326,7 +328,7 @@ import { ReqDldFight, ResDldFight } from './wzry/PtlDldFight'; import { ReqDldRefre, ResDldRefre } from './wzry/PtlDldRefre'; import { ReqJingCai, ResJingCai } from './wzry/PtlJingCai'; import { ReqJingCaiOpen, ResJingCaiOpen } from './wzry/PtlJingCaiOpen'; -import { ReqOpen as ReqOpen_57, ResOpen as ResOpen_57 } from './wzry/PtlOpen'; +import { ReqOpen as ReqOpen_58, ResOpen as ResOpen_58 } from './wzry/PtlOpen'; import { ReqUpdateFight, ResUpdateFight } from './wzry/PtlUpdateFight'; import { ReqWzzd, ResWzzd } from './wzry/PtlWzzd'; import { ReqZuanShiOpen, ResZuanShiOpen } from './wzry/PtlZuanShiOpen'; @@ -334,7 +336,7 @@ import { ReqAllGet, ResAllGet } from './xstask/PtlAllGet'; import { ReqGet as ReqGet_3, ResGet as ResGet_3 } from './xstask/PtlGet'; import { ReqLvUp as ReqLvUp_4, ResLvUp as ResLvUp_4 } from './xstask/PtlLvUp'; import { ReqOnekeyReceive, ResOnekeyReceive } from './xstask/PtlOnekeyReceive'; -import { ReqOpen as ReqOpen_58, ResOpen as ResOpen_58 } from './xstask/PtlOpen'; +import { ReqOpen as ReqOpen_59, ResOpen as ResOpen_59 } from './xstask/PtlOpen'; import { ReqReceive as ReqReceive_7, ResReceive as ResReceive_7 } from './xstask/PtlReceive'; import { ReqRefresh as ReqRefresh_8, ResRefresh as ResRefresh_8 } from './xstask/PtlRefresh'; import { ReqHandle, ResHandle } from './yongbingzhuzhan/PtlHandle'; @@ -1288,18 +1290,22 @@ export interface ServiceType { req: ReqTest, res: ResTest }, + "pushgift/Open": { + req: ReqOpen_48, + res: ResOpen_48 + }, "qjzzd/Fight": { req: ReqFight_9, res: ResFight_9 }, "qjzzd/Open": { - req: ReqOpen_48, - res: ResOpen_48 - }, - "rank/Open": { req: ReqOpen_49, res: ResOpen_49 }, + "rank/Open": { + req: ReqOpen_50, + res: ResOpen_50 + }, "shiwu/Concise": { req: ReqConcise, res: ResConcise @@ -1329,8 +1335,8 @@ export interface ServiceType { res: ResWear_2 }, "shootGame/Open": { - req: ReqOpen_50, - res: ResOpen_50 + req: ReqOpen_51, + res: ResOpen_51 }, "shootGame/Rec": { req: ReqRec_13, @@ -1341,8 +1347,8 @@ export interface ServiceType { res: ResBuy_6 }, "shop/Open": { - req: ReqOpen_51, - res: ResOpen_51 + req: ReqOpen_52, + res: ResOpen_52 }, "shop/Refresh": { req: ReqRefresh_6, @@ -1357,8 +1363,8 @@ export interface ServiceType { res: ResGetPrize_2 }, "sign/Open": { - req: ReqOpen_52, - res: ResOpen_52 + req: ReqOpen_53, + res: ResOpen_53 }, "slzd/Aim": { req: ReqAim, @@ -1381,8 +1387,8 @@ export interface ServiceType { res: ResMyRank }, "slzd/Open": { - req: ReqOpen_53, - res: ResOpen_53 + req: ReqOpen_54, + res: ResOpen_54 }, "slzd/OpenFort": { req: ReqOpenFort, @@ -1417,8 +1423,8 @@ export interface ServiceType { res: ResGuaJi }, "tanxian/Open": { - req: ReqOpen_54, - res: ResOpen_54 + req: ReqOpen_55, + res: ResOpen_55 }, "tanxian/Receive": { req: ReqReceive_6, @@ -1433,8 +1439,8 @@ export interface ServiceType { res: ResFinsh }, "task/Open": { - req: ReqOpen_55, - res: ResOpen_55 + req: ReqOpen_56, + res: ResOpen_56 }, "user/CDKEY": { req: ReqCDKEY, @@ -1497,8 +1503,8 @@ export interface ServiceType { res: ResExchange }, "weixiuchang/Open": { - req: ReqOpen_56, - res: ResOpen_56 + req: ReqOpen_57, + res: ResOpen_57 }, "weixiuchang/UpLv": { req: ReqUpLv, @@ -1541,8 +1547,8 @@ export interface ServiceType { res: ResJingCaiOpen }, "wzry/Open": { - req: ReqOpen_57, - res: ResOpen_57 + req: ReqOpen_58, + res: ResOpen_58 }, "wzry/UpdateFight": { req: ReqUpdateFight, @@ -1573,8 +1579,8 @@ export interface ServiceType { res: ResOnekeyReceive }, "xstask/Open": { - req: ReqOpen_58, - res: ResOpen_58 + req: ReqOpen_59, + res: ResOpen_59 }, "xstask/Receive": { req: ReqReceive_7, @@ -1626,6 +1632,7 @@ export interface ServiceType { "msg_s2c/PeijianChange": MsgPeijianChange, "msg_s2c/PlayerChange": MsgPlayerChange, "msg_s2c/Private": MsgPrivate, + "msg_s2c/PushGiftChange": MsgPushGiftChange, "msg_s2c/SendGift": MsgSendGift, "msg_s2c/ShiwuChange": MsgShiwuChange, "msg_s2c/TaskChange": MsgTaskChange, @@ -2922,91 +2929,96 @@ export const serviceProto: ServiceProto = { }, { "id": 237, - "name": "msg_s2c/SendGift", + "name": "msg_s2c/PushGiftChange", "type": "msg" }, { "id": 238, - "name": "msg_s2c/ShiwuChange", + "name": "msg_s2c/SendGift", "type": "msg" }, { "id": 239, - "name": "msg_s2c/TaskChange", + "name": "msg_s2c/ShiwuChange", "type": "msg" }, { "id": 240, - "name": "msg_s2c/Xianshilibao", + "name": "msg_s2c/TaskChange", "type": "msg" }, { "id": 241, + "name": "msg_s2c/Xianshilibao", + "type": "msg" + }, + { + "id": 242, "name": "pata/Fight", "type": "api" }, { - "id": 242, + "id": 243, "name": "pata/GetPrize", "type": "api" }, { - "id": 243, + "id": 244, "name": "pata/Open", "type": "api" }, { - "id": 244, + "id": 245, "name": "pata/SaoDang", "type": "api" }, { - "id": 245, + "id": 246, "name": "pay/GetList", "type": "api" }, { - "id": 246, + "id": 247, "name": "peijian/GetList", "type": "api" }, { - "id": 247, + "id": 248, "name": "peijian/JingLian", "type": "api" }, { - "id": 248, + "id": 249, "name": "peijian/JinJie", "type": "api" }, { - "id": 249, + "id": 250, "name": "peijian/LvUp", "type": "api" }, { - "id": 250, + "id": 251, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 251, + "id": 252, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 252, + "id": 253, "name": "peijian/Reset", "type": "api" }, { - "id": 253, + "id": 254, "name": "peijian/Rm", "type": "api" }, { - "id": 254, + "id": 255, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3014,32 +3026,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 255, + "id": 256, "name": "peijian/UnLock", "type": "api" }, { - "id": 256, + "id": 257, "name": "peijian/Wear", "type": "api" }, { - "id": 257, + "id": 258, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 258, + "id": 259, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 259, + "id": 260, "name": "peijiancangku/Open", "type": "api" }, { - "id": 260, + "id": 261, "name": "Bingo", "type": "api", "conf": { @@ -3047,137 +3059,142 @@ export const serviceProto: ServiceProto = { } }, { - "id": 261, + "id": 262, "name": "FightTest", "type": "api" }, { - "id": 262, + "id": 263, "name": "SyncBtn", "type": "api" }, { - "id": 263, + "id": 264, "name": "Test", "type": "api" }, - { - "id": 264, - "name": "qjzzd/Fight", - "type": "api" - }, { "id": 265, - "name": "qjzzd/Open", + "name": "pushgift/Open", "type": "api" }, { "id": 266, - "name": "rank/Open", + "name": "qjzzd/Fight", "type": "api" }, { "id": 267, - "name": "shiwu/Concise", + "name": "qjzzd/Open", "type": "api" }, { "id": 268, - "name": "shiwu/Extract", + "name": "rank/Open", "type": "api" }, { "id": 269, - "name": "shiwu/GetList", + "name": "shiwu/Concise", "type": "api" }, { "id": 270, - "name": "shiwu/LvUp", + "name": "shiwu/Extract", "type": "api" }, { "id": 271, - "name": "shiwu/Recast", + "name": "shiwu/GetList", "type": "api" }, { "id": 272, - "name": "shiwu/TakeOff", + "name": "shiwu/LvUp", "type": "api" }, { "id": 273, - "name": "shiwu/Wear", + "name": "shiwu/Recast", "type": "api" }, { "id": 274, - "name": "shootGame/Open", + "name": "shiwu/TakeOff", "type": "api" }, { "id": 275, - "name": "shootGame/Rec", + "name": "shiwu/Wear", "type": "api" }, { "id": 276, - "name": "shop/Buy", + "name": "shootGame/Open", "type": "api" }, { "id": 277, - "name": "shop/Open", + "name": "shootGame/Rec", "type": "api" }, { "id": 278, - "name": "shop/Refresh", + "name": "shop/Buy", "type": "api" }, { "id": 279, - "name": "sign/GetBoxPrize", + "name": "shop/Open", "type": "api" }, { "id": 280, - "name": "sign/GetPrize", + "name": "shop/Refresh", "type": "api" }, { "id": 281, - "name": "sign/Open", + "name": "sign/GetBoxPrize", "type": "api" }, { "id": 282, - "name": "slzd/Aim", + "name": "sign/GetPrize", "type": "api" }, { "id": 283, - "name": "slzd/BuyNum", + "name": "sign/Open", "type": "api" }, { "id": 284, - "name": "slzd/Fight", + "name": "slzd/Aim", "type": "api" }, { "id": 285, - "name": "slzd/FightLog", + "name": "slzd/BuyNum", "type": "api" }, { "id": 286, - "name": "slzd/MyRank", + "name": "slzd/Fight", "type": "api" }, { "id": 287, + "name": "slzd/FightLog", + "type": "api" + }, + { + "id": 288, + "name": "slzd/MyRank", + "type": "api" + }, + { + "id": 289, "name": "slzd/Open", "type": "api", "conf": { @@ -3187,77 +3204,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 288, + "id": 290, "name": "slzd/OpenFort", "type": "api" }, { - "id": 289, + "id": 291, "name": "slzd/Rec", "type": "api" }, { - "id": 290, + "id": 292, "name": "slzd/Refresh", "type": "api" }, { - "id": 291, + "id": 293, "name": "slzd/Slot", "type": "api" }, { - "id": 292, + "id": 294, "name": "tanxian/Event", "type": "api" }, { - "id": 293, + "id": 295, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 294, + "id": 296, "name": "tanxian/Fight", "type": "api" }, { - "id": 295, + "id": 297, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 296, + "id": 298, "name": "tanxian/Open", "type": "api" }, { - "id": 297, + "id": 299, "name": "tanxian/Receive", "type": "api" }, { - "id": 298, + "id": 300, "name": "task/AllFinsh", "type": "api" }, { - "id": 299, + "id": 301, "name": "task/Finsh", "type": "api" }, { - "id": 300, + "id": 302, "name": "task/Open", "type": "api" }, { - "id": 301, + "id": 303, "name": "user/CDKEY", "type": "api" }, { - "id": 302, + "id": 304, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3265,197 +3282,197 @@ export const serviceProto: ServiceProto = { } }, { - "id": 303, + "id": 305, "name": "user/ChangeName", "type": "api" }, { - "id": 304, + "id": 306, "name": "user/Fight", "type": "api" }, { - "id": 305, + "id": 307, "name": "user/GetInfo", "type": "api" }, { - "id": 306, + "id": 308, "name": "user/InfoOpen", "type": "api" }, { - "id": 307, + "id": 309, "name": "user/Login", "type": "api" }, { - "id": 308, + "id": 310, "name": "user/Ping", "type": "api" }, { - "id": 309, + "id": 311, "name": "user/Renown", "type": "api" }, { - "id": 310, + "id": 312, "name": "user/RenownBuy", "type": "api" }, { - "id": 311, + "id": 313, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 312, + "id": 314, "name": "user/RenownOpen", "type": "api" }, { - "id": 313, + "id": 315, "name": "user/Tujian", "type": "api" }, { - "id": 314, + "id": 316, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 315, + "id": 317, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 316, + "id": 318, "name": "weixiuchang/Open", "type": "api" }, { - "id": 317, + "id": 319, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 318, + "id": 320, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 319, + "id": 321, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 320, + "id": 322, "name": "wzry/BaoMing", "type": "api" }, { - "id": 321, + "id": 323, "name": "wzry/catFightLog", "type": "api" }, { - "id": 322, + "id": 324, "name": "wzry/CatGroup", "type": "api" }, { - "id": 323, + "id": 325, "name": "wzry/DldFight", "type": "api" }, { - "id": 324, + "id": 326, "name": "wzry/DldRefre", "type": "api" }, { - "id": 325, + "id": 327, "name": "wzry/JingCai", "type": "api" }, { - "id": 326, + "id": 328, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 327, + "id": 329, "name": "wzry/Open", "type": "api" }, { - "id": 328, + "id": 330, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 329, + "id": 331, "name": "wzry/Wzzd", "type": "api" }, { - "id": 330, + "id": 332, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 331, + "id": 333, "name": "xstask/AllGet", "type": "api" }, { - "id": 332, + "id": 334, "name": "xstask/Get", "type": "api" }, { - "id": 333, + "id": 335, "name": "xstask/LvUp", "type": "api" }, { - "id": 334, + "id": 336, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 335, + "id": 337, "name": "xstask/Open", "type": "api" }, { - "id": 336, + "id": 338, "name": "xstask/Receive", "type": "api" }, { - "id": 337, + "id": 339, "name": "xstask/Refresh", "type": "api" }, { - "id": 338, + "id": 340, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 339, + "id": 341, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 340, + "id": 342, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 341, + "id": 343, "name": "zhanqianbushu/Up", "type": "api" } @@ -17888,6 +17905,10 @@ export const serviceProto: ServiceProto = { } } }, + "msg_s2c/MsgPushGiftChange/MsgPushGiftChange": { + "type": "Literal", + "literal": 1 + }, "msg_s2c/MsgSendGift/MsgSendGift": { "type": "Interface", "indexSignature": { @@ -18969,6 +18990,81 @@ export const serviceProto: ServiceProto = { "PtlTest/ResTest": { "type": "Any" }, + "pushgift/PtlOpen/ReqOpen": { + "type": "Interface" + }, + "pushgift/PtlOpen/ResOpen": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "gifts", + "type": { + "type": "Array", + "elementType": { + "type": "Reference", + "target": "../../module/collection_pushgift/Gift" + } + } + } + ] + }, + "../../module/collection_pushgift/Gift": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "id", + "type": { + "type": "String" + } + }, + { + "id": 1, + "name": "uid", + "type": { + "type": "String" + } + }, + { + "id": 2, + "name": "buy", + "type": { + "type": "Array", + "elementType": { + "type": "Number" + } + } + }, + { + "id": 3, + "name": "ctime", + "type": { + "type": "Number" + } + }, + { + "id": 4, + "name": "passTime", + "type": { + "type": "Number" + } + }, + { + "id": 5, + "name": "ext_data", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" + } + } + } + } + ] + }, "qjzzd/PtlFight/ReqFight": { "type": "Interface" }, From 8247613c27a079f710414741da256908e8dc3902 Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 20 Dec 2023 14:52:02 +0800 Subject: [PATCH 14/90] proto --- src/shared/protocols/serviceProto.ts | 929 +++++++++++++++------------ 1 file changed, 506 insertions(+), 423 deletions(-) diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 7dad19f..8a42249 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -68,51 +68,53 @@ import { ReqOpen as ReqOpen_14, ResOpen as ResOpen_14 } from './event/leijichong import { ReqRec as ReqRec_5, ResRec as ResRec_5 } from './event/leijichongzhi/PtlRec'; import { ReqLottery, ResLottery } from './event/niudanji/PtlLottery'; import { ReqOpen as ReqOpen_15, ResOpen as ResOpen_15 } from './event/niudanji/PtlOpen'; -import { ReqOpen as ReqOpen_16, ResOpen as ResOpen_16 } from './event/qirichongzhi/PtlOpen'; +import { ReqOpen as ReqOpen_16, ResOpen as ResOpen_16 } from './event/pobinglibao/PtlOpen'; +import { ReqReceive as ReqReceive_2, ResReceive as ResReceive_2 } from './event/pobinglibao/PtlReceive'; +import { ReqOpen as ReqOpen_17, ResOpen as ResOpen_17 } from './event/qirichongzhi/PtlOpen'; import { ReqRec as ReqRec_6, ResRec as ResRec_6 } from './event/qirichongzhi/PtlRec'; -import { ReqOpen as ReqOpen_17, ResOpen as ResOpen_17 } from './event/qiridenglu/PtlOpen'; +import { ReqOpen as ReqOpen_18, ResOpen as ResOpen_18 } from './event/qiridenglu/PtlOpen'; import { ReqRecPrize as ReqRecPrize_1, ResRecPrize as ResRecPrize_1 } from './event/qiridenglu/PtlRecPrize'; -import { ReqOpen as ReqOpen_18, ResOpen as ResOpen_18 } from './event/shiwuleichong/PtlOpen'; -import { ReqOpen as ReqOpen_19, ResOpen as ResOpen_19 } from './event/shouchong/PtlOpen'; -import { ReqReceive as ReqReceive_2, ResReceive as ResReceive_2 } from './event/shouchong/PtlReceive'; +import { ReqOpen as ReqOpen_19, ResOpen as ResOpen_19 } from './event/shiwuleichong/PtlOpen'; +import { ReqOpen as ReqOpen_20, ResOpen as ResOpen_20 } from './event/shouchong/PtlOpen'; +import { ReqReceive as ReqReceive_3, ResReceive as ResReceive_3 } from './event/shouchong/PtlReceive'; import { ReqBuy as ReqBuy_1, ResBuy as ResBuy_1 } from './event/xianshizhaomu/PtlBuy'; import { ReqDuihuan, ResDuihuan } from './event/xianshizhaomu/PtlDuihuan'; import { ReqLottery as ReqLottery_1, ResLottery as ResLottery_1 } from './event/xianshizhaomu/PtlLottery'; -import { ReqOpen as ReqOpen_20, ResOpen as ResOpen_20 } from './event/xianshizhaomu/PtlOpen'; +import { ReqOpen as ReqOpen_21, ResOpen as ResOpen_21 } from './event/xianshizhaomu/PtlOpen'; import { ReqRec as ReqRec_7, ResRec as ResRec_7 } from './event/xianshizhaomu/PtlRec'; -import { ReqOpen as ReqOpen_21, ResOpen as ResOpen_21 } from './event/xinshoulibao/PtlOpen'; +import { ReqOpen as ReqOpen_22, ResOpen as ResOpen_22 } from './event/xinshoulibao/PtlOpen'; import { ReqBuy as ReqBuy_2, ResBuy as ResBuy_2 } from './event/yangchengmubiao/PtlBuy'; -import { ReqOpen as ReqOpen_22, ResOpen as ResOpen_22 } from './event/yangchengmubiao/PtlOpen'; +import { ReqOpen as ReqOpen_23, ResOpen as ResOpen_23 } from './event/yangchengmubiao/PtlOpen'; import { ReqRec as ReqRec_8, ResRec as ResRec_8 } from './event/yangchengmubiao/PtlRec'; -import { ReqOpen as ReqOpen_23, ResOpen as ResOpen_23 } from './event/yibaichou/PtlOpen'; +import { ReqOpen as ReqOpen_24, ResOpen as ResOpen_24 } from './event/yibaichou/PtlOpen'; import { ReqRec as ReqRec_9, ResRec as ResRec_9 } from './event/yibaichou/PtlRec'; import { ReqRecAll, ResRecAll } from './event/yibaichou/PtlRecAll'; -import { ReqOpen as ReqOpen_24, ResOpen as ResOpen_24 } from './event/yuedujijin/PtlOpen'; +import { ReqOpen as ReqOpen_25, ResOpen as ResOpen_25 } from './event/yuedujijin/PtlOpen'; import { ReqRec as ReqRec_10, ResRec as ResRec_10 } from './event/yuedujijin/PtlRec'; import { ReqBuyLv, ResBuyLv } from './event/zhanling/PtlBuyLv'; -import { ReqOpen as ReqOpen_25, ResOpen as ResOpen_25 } from './event/zhanling/PtlOpen'; +import { ReqOpen as ReqOpen_26, ResOpen as ResOpen_26 } from './event/zhanling/PtlOpen'; import { ReqRecPrize as ReqRecPrize_2, ResRecPrize as ResRecPrize_2 } from './event/zhanling/PtlRecPrize'; import { ReqRecTask, ResRecTask } from './event/zhanling/PtlRecTask'; -import { ReqOpen as ReqOpen_26, ResOpen as ResOpen_26 } from './event/zhoulibao/PtlOpen'; -import { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } from './event/zhoumolibao/PtlOpen'; -import { ReqReceive as ReqReceive_3, ResReceive as ResReceive_3 } from './event/zhoumolibao/PtlReceive'; +import { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } from './event/zhoulibao/PtlOpen'; +import { ReqOpen as ReqOpen_28, ResOpen as ResOpen_28 } from './event/zhoumolibao/PtlOpen'; +import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } from './event/zhoumolibao/PtlReceive'; import { ReqBuy as ReqBuy_3, ResBuy as ResBuy_3 } from './event/zixuanlibao/PtlBuy'; -import { ReqOpen as ReqOpen_28, ResOpen as ResOpen_28 } from './event/zixuanlibao/PtlOpen'; +import { ReqOpen as ReqOpen_29, ResOpen as ResOpen_29 } from './event/zixuanlibao/PtlOpen'; import { ReqhdGetList, ReshdGetList } from './eventlist/PtlhdGetList'; import { ReqApply, ResApply } from './friend/PtlApply'; import { ReqDel, ResDel } from './friend/PtlDel'; import { ReqGift, ResGift } from './friend/PtlGift'; import { ReqList, ResList } from './friend/PtlList'; -import { ReqOpen as ReqOpen_29, ResOpen as ResOpen_29 } from './friend/PtlOpen'; +import { ReqOpen as ReqOpen_30, ResOpen as ResOpen_30 } from './friend/PtlOpen'; import { ReqRespond, ResRespond } from './friend/PtlRespond'; import { ReqRmBlackList, ResRmBlackList } from './friend/PtlRmBlackList'; import { ReqSearch, ResSearch } from './friend/PtlSearch'; import { ReqChallenge, ResChallenge } from './ganbutexun/PtlChallenge'; -import { ReqOpen as ReqOpen_30, ResOpen as ResOpen_30 } from './ganbutexun/PtlOpen'; +import { ReqOpen as ReqOpen_31, ResOpen as ResOpen_31 } from './ganbutexun/PtlOpen'; import { ReqFast, ResFast } from './ganhai/PtlFast'; import { ReqFight as ReqFight_1, ResFight as ResFight_1 } from './ganhai/PtlFight'; import { ReqLog, ResLog } from './ganhai/PtlLog'; -import { ReqOpen as ReqOpen_31, ResOpen as ResOpen_31 } from './ganhai/PtlOpen'; +import { ReqOpen as ReqOpen_32, ResOpen as ResOpen_32 } from './ganhai/PtlOpen'; import { ReqRefresh, ResRefresh } from './ganhai/PtlRefresh'; import { ReqRefreshShip, ResRefreshShip } from './ganhai/PtlRefreshShip'; import { ReqSelect as ReqSelect_1, ResSelect as ResSelect_1 } from './ganhai/PtlSelect'; @@ -134,19 +136,19 @@ import { ReqJx, ResJx } from './gonghui/PtlJx'; import { ReqJxOpen, ResJxOpen } from './gonghui/PtlJxOpen'; import { ReqList as ReqList_1, ResList as ResList_1 } from './gonghui/PtlList'; import { ReqManage, ResManage } from './gonghui/PtlManage'; -import { ReqOpen as ReqOpen_32, ResOpen as ResOpen_32 } from './gonghui/PtlOpen'; +import { ReqOpen as ReqOpen_33, ResOpen as ResOpen_33 } from './gonghui/PtlOpen'; import { ReqTanHe, ResTanHe } from './gonghui/PtlTanHe'; import { ReqTaskOpen, ResTaskOpen } from './gonghui/PtlTaskOpen'; import { ReqTaskReceive, ResTaskReceive } from './gonghui/PtlTaskReceive'; import { ReqUpWz, ResUpWz } from './gonghui/PtlUpWz'; import { ReqLottery as ReqLottery_2, ResLottery as ResLottery_2 } from './gonghuibaozang/PtlLottery'; -import { ReqOpen as ReqOpen_33, ResOpen as ResOpen_33 } from './gonghuibaozang/PtlOpen'; +import { ReqOpen as ReqOpen_34, ResOpen as ResOpen_34 } from './gonghuibaozang/PtlOpen'; import { ReqBuy as ReqBuy_4, ResBuy as ResBuy_4 } from './gonglukuangbiao/PtlBuy'; import { ReqFight as ReqFight_2, ResFight as ResFight_2 } from './gonglukuangbiao/PtlFight'; -import { ReqOpen as ReqOpen_34, ResOpen as ResOpen_34 } from './gonglukuangbiao/PtlOpen'; +import { ReqOpen as ReqOpen_35, ResOpen as ResOpen_35 } from './gonglukuangbiao/PtlOpen'; import { ReqRefresh as ReqRefresh_1, ResRefresh as ResRefresh_1 } from './gonglukuangbiao/PtlRefresh'; import { ReqActive, ResActive } from './gongyu/mingdao/PtlActive'; -import { ReqOpen as ReqOpen_35, ResOpen as ResOpen_35 } from './gongyu/mingdao/PtlOpen'; +import { ReqOpen as ReqOpen_36, ResOpen as ResOpen_36 } from './gongyu/mingdao/PtlOpen'; import { ReqRecPrize as ReqRecPrize_3, ResRecPrize as ResRecPrize_3 } from './gongyu/mingdao/PtlRecPrize'; import { ReqRepair, ResRepair } from './gongyu/mingdao/PtlRepair'; import { ReqReset as ReqReset_1, ResReset as ResReset_1 } from './gongyu/xunlianjihua/PtlReset'; @@ -155,14 +157,14 @@ import { ReqSetSkill, ResSetSkill } from './gongyu/zuozhanjihua/PtlSetSkill'; import { ReqBuyNum as ReqBuyNum_1, ResBuyNum as ResBuyNum_1 } from './hbzb/jfs/PtlBuyNum'; import { ReqFight as ReqFight_3, ResFight as ResFight_3 } from './hbzb/jfs/PtlFight'; import { ReqGetLog as ReqGetLog_1, ResGetLog as ResGetLog_1 } from './hbzb/jfs/PtlGetLog'; -import { ReqOpen as ReqOpen_36, ResOpen as ResOpen_36 } from './hbzb/jfs/PtlOpen'; +import { ReqOpen as ReqOpen_37, ResOpen as ResOpen_37 } from './hbzb/jfs/PtlOpen'; import { ReqRec as ReqRec_11, ResRec as ResRec_11 } from './hbzb/jfs/PtlRec'; import { ReqRefresh as ReqRefresh_2, ResRefresh as ResRefresh_2 } from './hbzb/jfs/PtlRefresh'; import { ReqGetStatus, ResGetStatus } from './hbzb/PtlGetStatus'; import { ReqBuyNum as ReqBuyNum_2, ResBuyNum as ResBuyNum_2 } from './hbzb/zbs/PtlBuyNum'; import { ReqFight as ReqFight_4, ResFight as ResFight_4 } from './hbzb/zbs/PtlFight'; import { ReqGetLog as ReqGetLog_2, ResGetLog as ResGetLog_2 } from './hbzb/zbs/PtlGetLog'; -import { ReqOpen as ReqOpen_37, ResOpen as ResOpen_37 } from './hbzb/zbs/PtlOpen'; +import { ReqOpen as ReqOpen_38, ResOpen as ResOpen_38 } from './hbzb/zbs/PtlOpen'; import { ReqRefresh as ReqRefresh_3, ResRefresh as ResRefresh_3 } from './hbzb/zbs/PtlRefresh'; import { ReqAwake, ResAwake } from './hero/PtlAwake'; import { ReqChangePos, ResChangePos } from './hero/PtlChangePos'; @@ -178,40 +180,40 @@ import { ReqGet as ReqGet_2, ResGet as ResGet_2 } from './hongdian/PtlGet'; import { ReqGetList as ReqGetList_4, ResGetList as ResGetList_4 } from './item/PtlGetList'; import { ReqUse, ResUse } from './item/PtlUse'; import { ReqLottery as ReqLottery_3, ResLottery as ResLottery_3 } from './jiaotang/PtlLottery'; -import { ReqOpen as ReqOpen_38, ResOpen as ResOpen_38 } from './jiaotang/PtlOpen'; +import { ReqOpen as ReqOpen_39, ResOpen as ResOpen_39 } from './jiaotang/PtlOpen'; import { ReqLottery as ReqLottery_4, ResLottery as ResLottery_4 } from './jiuba/PtlLottery'; -import { ReqOpen as ReqOpen_39, ResOpen as ResOpen_39 } from './jiuba/PtlOpen'; +import { ReqOpen as ReqOpen_40, ResOpen as ResOpen_40 } from './jiuba/PtlOpen'; import { ReqBuyFightNum, ResBuyFightNum } from './jjc/PtlBuyFightNum'; import { ReqFight as ReqFight_5, ResFight as ResFight_5 } from './jjc/PtlFight'; import { ReqFightLog, ResFightLog } from './jjc/PtlFightLog'; -import { ReqOpen as ReqOpen_40, ResOpen as ResOpen_40 } from './jjc/PtlOpen'; -import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } from './jjc/PtlReceive'; +import { ReqOpen as ReqOpen_41, ResOpen as ResOpen_41 } from './jjc/PtlOpen'; +import { ReqReceive as ReqReceive_5, ResReceive as ResReceive_5 } from './jjc/PtlReceive'; import { ReqRefresh as ReqRefresh_4, ResRefresh as ResRefresh_4 } from './jjc/PtlRefresh'; -import { ReqOpen as ReqOpen_41, ResOpen as ResOpen_41 } from './kaifujingsai/PtlOpen'; -import { ReqReceive as ReqReceive_5, ResReceive as ResReceive_5 } from './kaifujingsai/PtlReceive'; +import { ReqOpen as ReqOpen_42, ResOpen as ResOpen_42 } from './kaifujingsai/PtlOpen'; +import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } from './kaifujingsai/PtlReceive'; import { ReqApply as ReqApply_2, ResApply as ResApply_2 } from './kbzz/PtlApply'; import { ReqAutoApply, ResAutoApply } from './kbzz/PtlAutoApply'; import { ReqBuyNum as ReqBuyNum_3, ResBuyNum as ResBuyNum_3 } from './kbzz/PtlBuyNum'; import { ReqFight as ReqFight_6, ResFight as ResFight_6 } from './kbzz/PtlFight'; import { ReqFightLog as ReqFightLog_1, ResFightLog as ResFightLog_1 } from './kbzz/PtlFightLog'; import { ReqGroupState, ResGroupState } from './kbzz/PtlGroupState'; -import { ReqOpen as ReqOpen_42, ResOpen as ResOpen_42 } from './kbzz/PtlOpen'; +import { ReqOpen as ReqOpen_43, ResOpen as ResOpen_43 } from './kbzz/PtlOpen'; import { ReqRecPrize as ReqRecPrize_4, ResRecPrize as ResRecPrize_4 } from './kbzz/PtlRecPrize'; import { ReqRefresh as ReqRefresh_5, ResRefresh as ResRefresh_5 } from './kbzz/PtlRefresh'; import { ReqAddPkNum, ResAddPkNum } from './kuangdong/PtlAddPkNum'; import { ReqGetPrize, ResGetPrize } from './kuangdong/PtlGetPrize'; import { ReqKdInfo, ResKdInfo } from './kuangdong/PtlKdInfo'; import { ReqLog as ReqLog_1, ResLog as ResLog_1 } from './kuangdong/PtlLog'; -import { ReqOpen as ReqOpen_43, ResOpen as ResOpen_43 } from './kuangdong/PtlOpen'; +import { ReqOpen as ReqOpen_44, ResOpen as ResOpen_44 } from './kuangdong/PtlOpen'; import { ReqYanShi, ResYanShi } from './kuangdong/PtlYanShi'; import { ReqZhanLing, ResZhanLing } from './kuangdong/PtlZhanLing'; -import { ReqOpen as ReqOpen_44, ResOpen as ResOpen_44 } from './lingzhulaixi/PtlOpen'; +import { ReqOpen as ReqOpen_45, ResOpen as ResOpen_45 } from './lingzhulaixi/PtlOpen'; import { ReqPkBoss, ResPkBoss } from './lingzhulaixi/PtlPkBoss'; import { ReqPkRank, ResPkRank } from './lingzhulaixi/PtlPkRank'; import { ReqSaoDang, ResSaoDang } from './lingzhulaixi/PtlSaoDang'; import { ReqBuy as ReqBuy_5, ResBuy as ResBuy_5 } from './meirishilian/PtlBuy'; import { ReqFight as ReqFight_7, ResFight as ResFight_7 } from './meirishilian/PtlFight'; -import { ReqOpen as ReqOpen_45, ResOpen as ResOpen_45 } from './meirishilian/PtlOpen'; +import { ReqOpen as ReqOpen_46, ResOpen as ResOpen_46 } from './meirishilian/PtlOpen'; import { MsgBindUid } from './msg_c2s/MsgBindUid'; import { MsgPay } from './msg_c2s/MsgPay'; import { MsgSync } from './msg_c2s/MsgSync'; @@ -243,7 +245,7 @@ import { MsgTaskChange } from './msg_s2c/MsgTaskChange'; import { MsgXianshilibao } from './msg_s2c/MsgXianshilibao'; import { ReqFight as ReqFight_8, ResFight as ResFight_8 } from './pata/PtlFight'; import { ReqGetPrize as ReqGetPrize_1, ResGetPrize as ResGetPrize_1 } from './pata/PtlGetPrize'; -import { ReqOpen as ReqOpen_46, ResOpen as ResOpen_46 } from './pata/PtlOpen'; +import { ReqOpen as ReqOpen_47, ResOpen as ResOpen_47 } from './pata/PtlOpen'; import { ReqSaoDang as ReqSaoDang_1, ResSaoDang as ResSaoDang_1 } from './pata/PtlSaoDang'; import { ReqGetList as ReqGetList_5, ResGetList as ResGetList_5 } from './pay/PtlGetList'; import { ReqGetList as ReqGetList_6, ResGetList as ResGetList_6 } from './peijian/PtlGetList'; @@ -259,15 +261,15 @@ import { ReqUnLock, ResUnLock } from './peijian/PtlUnLock'; import { ReqWear as ReqWear_1, ResWear as ResWear_1 } from './peijian/PtlWear'; import { ReqDeal, ResDeal } from './peijiancangku/PtlDeal'; import { ReqJump, ResJump } from './peijiancangku/PtlJump'; -import { ReqOpen as ReqOpen_47, ResOpen as ResOpen_47 } from './peijiancangku/PtlOpen'; +import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } from './peijiancangku/PtlOpen'; import { ReqBingo, ResBingo } from './PtlBingo'; import { ReqFightTest, ResFightTest } from './PtlFightTest'; import { ReqSyncBtn, ResSyncBtn } from './PtlSyncBtn'; import { ReqTest, ResTest } from './PtlTest'; -import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } from './pushgift/PtlOpen'; +import { ReqOpen as ReqOpen_49, ResOpen as ResOpen_49 } from './pushgift/PtlOpen'; import { ReqFight as ReqFight_9, ResFight as ResFight_9 } from './qjzzd/PtlFight'; -import { ReqOpen as ReqOpen_49, ResOpen as ResOpen_49 } from './qjzzd/PtlOpen'; -import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } from './rank/PtlOpen'; +import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } from './qjzzd/PtlOpen'; +import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './rank/PtlOpen'; import { ReqConcise, ResConcise } from './shiwu/PtlConcise'; import { ReqExtract, ResExtract } from './shiwu/PtlExtract'; import { ReqGetList as ReqGetList_7, ResGetList as ResGetList_7 } from './shiwu/PtlGetList'; @@ -275,20 +277,20 @@ import { ReqLvUp as ReqLvUp_3, ResLvUp as ResLvUp_3 } from './shiwu/PtlLvUp'; import { ReqRecast, ResRecast } from './shiwu/PtlRecast'; import { ReqTakeOff as ReqTakeOff_2, ResTakeOff as ResTakeOff_2 } from './shiwu/PtlTakeOff'; import { ReqWear as ReqWear_2, ResWear as ResWear_2 } from './shiwu/PtlWear'; -import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './shootGame/PtlOpen'; +import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './shootGame/PtlOpen'; import { ReqRec as ReqRec_13, ResRec as ResRec_13 } from './shootGame/PtlRec'; import { ReqBuy as ReqBuy_6, ResBuy as ResBuy_6 } from './shop/PtlBuy'; -import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './shop/PtlOpen'; +import { ReqOpen as ReqOpen_53, ResOpen as ResOpen_53 } from './shop/PtlOpen'; import { ReqRefresh as ReqRefresh_6, ResRefresh as ResRefresh_6 } from './shop/PtlRefresh'; import { ReqGetBoxPrize, ResGetBoxPrize } from './sign/PtlGetBoxPrize'; import { ReqGetPrize as ReqGetPrize_2, ResGetPrize as ResGetPrize_2 } from './sign/PtlGetPrize'; -import { ReqOpen as ReqOpen_53, ResOpen as ResOpen_53 } from './sign/PtlOpen'; +import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } from './sign/PtlOpen'; import { ReqAim, ResAim } from './slzd/PtlAim'; import { ReqBuyNum as ReqBuyNum_4, ResBuyNum as ResBuyNum_4 } from './slzd/PtlBuyNum'; import { ReqFight as ReqFight_10, ResFight as ResFight_10 } from './slzd/PtlFight'; import { ReqFightLog as ReqFightLog_2, ResFightLog as ResFightLog_2 } from './slzd/PtlFightLog'; import { ReqMyRank, ResMyRank } from './slzd/PtlMyRank'; -import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } from './slzd/PtlOpen'; +import { ReqOpen as ReqOpen_55, ResOpen as ResOpen_55 } from './slzd/PtlOpen'; import { ReqOpenFort, ResOpenFort } from './slzd/PtlOpenFort'; import { ReqRec as ReqRec_14, ResRec as ResRec_14 } from './slzd/PtlRec'; import { ReqRefresh as ReqRefresh_7, ResRefresh as ResRefresh_7 } from './slzd/PtlRefresh'; @@ -297,11 +299,11 @@ import { ReqEvent, ResEvent } from './tanxian/PtlEvent'; import { ReqFastGuaJi, ResFastGuaJi } from './tanxian/PtlFastGuaJi'; import { ReqFight as ReqFight_11, ResFight as ResFight_11 } from './tanxian/PtlFight'; import { ReqGuaJi, ResGuaJi } from './tanxian/PtlGuaJi'; -import { ReqOpen as ReqOpen_55, ResOpen as ResOpen_55 } from './tanxian/PtlOpen'; -import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } from './tanxian/PtlReceive'; +import { ReqOpen as ReqOpen_56, ResOpen as ResOpen_56 } from './tanxian/PtlOpen'; +import { ReqReceive as ReqReceive_7, ResReceive as ResReceive_7 } from './tanxian/PtlReceive'; import { ReqAllFinsh, ResAllFinsh } from './task/PtlAllFinsh'; import { ReqFinsh, ResFinsh } from './task/PtlFinsh'; -import { ReqOpen as ReqOpen_56, ResOpen as ResOpen_56 } from './task/PtlOpen'; +import { ReqOpen as ReqOpen_57, ResOpen as ResOpen_57 } from './task/PtlOpen'; import { ReqCDKEY, ResCDKEY } from './user/PtlCDKEY'; import { ReqChangeInfo, ResChangeInfo } from './user/PtlChangeInfo'; import { ReqChangeName, ResChangeName } from './user/PtlChangeName'; @@ -317,7 +319,7 @@ import { ReqRenownOpen, ResRenownOpen } from './user/PtlRenownOpen'; import { ReqTujian, ResTujian } from './user/PtlTujian'; import { ReqDecompose, ResDecompose } from './weixiuchang/PtlDecompose'; import { ReqExchange, ResExchange } from './weixiuchang/PtlExchange'; -import { ReqOpen as ReqOpen_57, ResOpen as ResOpen_57 } from './weixiuchang/PtlOpen'; +import { ReqOpen as ReqOpen_58, ResOpen as ResOpen_58 } from './weixiuchang/PtlOpen'; import { ReqUpLv, ResUpLv } from './weixiuchang/PtlUpLv'; import { ReqUpStar, ResUpStar } from './weixiuchang/PtlUpStar'; import { ReqAutoBaoMing, ResAutoBaoMing } from './wzry/PtlAutoBaoMing'; @@ -328,7 +330,7 @@ import { ReqDldFight, ResDldFight } from './wzry/PtlDldFight'; import { ReqDldRefre, ResDldRefre } from './wzry/PtlDldRefre'; import { ReqJingCai, ResJingCai } from './wzry/PtlJingCai'; import { ReqJingCaiOpen, ResJingCaiOpen } from './wzry/PtlJingCaiOpen'; -import { ReqOpen as ReqOpen_58, ResOpen as ResOpen_58 } from './wzry/PtlOpen'; +import { ReqOpen as ReqOpen_59, ResOpen as ResOpen_59 } from './wzry/PtlOpen'; import { ReqUpdateFight, ResUpdateFight } from './wzry/PtlUpdateFight'; import { ReqWzzd, ResWzzd } from './wzry/PtlWzzd'; import { ReqZuanShiOpen, ResZuanShiOpen } from './wzry/PtlZuanShiOpen'; @@ -336,8 +338,8 @@ import { ReqAllGet, ResAllGet } from './xstask/PtlAllGet'; import { ReqGet as ReqGet_3, ResGet as ResGet_3 } from './xstask/PtlGet'; import { ReqLvUp as ReqLvUp_4, ResLvUp as ResLvUp_4 } from './xstask/PtlLvUp'; import { ReqOnekeyReceive, ResOnekeyReceive } from './xstask/PtlOnekeyReceive'; -import { ReqOpen as ReqOpen_59, ResOpen as ResOpen_59 } from './xstask/PtlOpen'; -import { ReqReceive as ReqReceive_7, ResReceive as ResReceive_7 } from './xstask/PtlReceive'; +import { ReqOpen as ReqOpen_60, ResOpen as ResOpen_60 } from './xstask/PtlOpen'; +import { ReqReceive as ReqReceive_8, ResReceive as ResReceive_8 } from './xstask/PtlReceive'; import { ReqRefresh as ReqRefresh_8, ResRefresh as ResRefresh_8 } from './xstask/PtlRefresh'; import { ReqHandle, ResHandle } from './yongbingzhuzhan/PtlHandle'; import { ReqChangePos as ReqChangePos_1, ResChangePos as ResChangePos_1 } from './zhanqianbushu/PtlChangePos'; @@ -622,33 +624,41 @@ export interface ServiceType { req: ReqOpen_15, res: ResOpen_15 }, - "event/qirichongzhi/Open": { + "event/pobinglibao/Open": { req: ReqOpen_16, res: ResOpen_16 }, + "event/pobinglibao/Receive": { + req: ReqReceive_2, + res: ResReceive_2 + }, + "event/qirichongzhi/Open": { + req: ReqOpen_17, + res: ResOpen_17 + }, "event/qirichongzhi/Rec": { req: ReqRec_6, res: ResRec_6 }, "event/qiridenglu/Open": { - req: ReqOpen_17, - res: ResOpen_17 + req: ReqOpen_18, + res: ResOpen_18 }, "event/qiridenglu/RecPrize": { req: ReqRecPrize_1, res: ResRecPrize_1 }, "event/shiwuleichong/Open": { - req: ReqOpen_18, - res: ResOpen_18 - }, - "event/shouchong/Open": { req: ReqOpen_19, res: ResOpen_19 }, + "event/shouchong/Open": { + req: ReqOpen_20, + res: ResOpen_20 + }, "event/shouchong/Receive": { - req: ReqReceive_2, - res: ResReceive_2 + req: ReqReceive_3, + res: ResReceive_3 }, "event/xianshizhaomu/Buy": { req: ReqBuy_1, @@ -663,32 +673,32 @@ export interface ServiceType { res: ResLottery_1 }, "event/xianshizhaomu/Open": { - req: ReqOpen_20, - res: ResOpen_20 + req: ReqOpen_21, + res: ResOpen_21 }, "event/xianshizhaomu/Rec": { req: ReqRec_7, res: ResRec_7 }, "event/xinshoulibao/Open": { - req: ReqOpen_21, - res: ResOpen_21 + req: ReqOpen_22, + res: ResOpen_22 }, "event/yangchengmubiao/Buy": { req: ReqBuy_2, res: ResBuy_2 }, "event/yangchengmubiao/Open": { - req: ReqOpen_22, - res: ResOpen_22 + req: ReqOpen_23, + res: ResOpen_23 }, "event/yangchengmubiao/Rec": { req: ReqRec_8, res: ResRec_8 }, "event/yibaichou/Open": { - req: ReqOpen_23, - res: ResOpen_23 + req: ReqOpen_24, + res: ResOpen_24 }, "event/yibaichou/Rec": { req: ReqRec_9, @@ -699,8 +709,8 @@ export interface ServiceType { res: ResRecAll }, "event/yuedujijin/Open": { - req: ReqOpen_24, - res: ResOpen_24 + req: ReqOpen_25, + res: ResOpen_25 }, "event/yuedujijin/Rec": { req: ReqRec_10, @@ -711,8 +721,8 @@ export interface ServiceType { res: ResBuyLv }, "event/zhanling/Open": { - req: ReqOpen_25, - res: ResOpen_25 + req: ReqOpen_26, + res: ResOpen_26 }, "event/zhanling/RecPrize": { req: ReqRecPrize_2, @@ -723,24 +733,24 @@ export interface ServiceType { res: ResRecTask }, "event/zhoulibao/Open": { - req: ReqOpen_26, - res: ResOpen_26 - }, - "event/zhoumolibao/Open": { req: ReqOpen_27, res: ResOpen_27 }, + "event/zhoumolibao/Open": { + req: ReqOpen_28, + res: ResOpen_28 + }, "event/zhoumolibao/Receive": { - req: ReqReceive_3, - res: ResReceive_3 + req: ReqReceive_4, + res: ResReceive_4 }, "event/zixuanlibao/Buy": { req: ReqBuy_3, res: ResBuy_3 }, "event/zixuanlibao/Open": { - req: ReqOpen_28, - res: ResOpen_28 + req: ReqOpen_29, + res: ResOpen_29 }, "eventlist/hdGetList": { req: ReqhdGetList, @@ -763,8 +773,8 @@ export interface ServiceType { res: ResList }, "friend/Open": { - req: ReqOpen_29, - res: ResOpen_29 + req: ReqOpen_30, + res: ResOpen_30 }, "friend/Respond": { req: ReqRespond, @@ -783,8 +793,8 @@ export interface ServiceType { res: ResChallenge }, "ganbutexun/Open": { - req: ReqOpen_30, - res: ResOpen_30 + req: ReqOpen_31, + res: ResOpen_31 }, "ganhai/Fast": { req: ReqFast, @@ -799,8 +809,8 @@ export interface ServiceType { res: ResLog }, "ganhai/Open": { - req: ReqOpen_31, - res: ResOpen_31 + req: ReqOpen_32, + res: ResOpen_32 }, "ganhai/Refresh": { req: ReqRefresh, @@ -887,8 +897,8 @@ export interface ServiceType { res: ResManage }, "gonghui/Open": { - req: ReqOpen_32, - res: ResOpen_32 + req: ReqOpen_33, + res: ResOpen_33 }, "gonghui/TanHe": { req: ReqTanHe, @@ -911,8 +921,8 @@ export interface ServiceType { res: ResLottery_2 }, "gonghuibaozang/Open": { - req: ReqOpen_33, - res: ResOpen_33 + req: ReqOpen_34, + res: ResOpen_34 }, "gonglukuangbiao/Buy": { req: ReqBuy_4, @@ -923,8 +933,8 @@ export interface ServiceType { res: ResFight_2 }, "gonglukuangbiao/Open": { - req: ReqOpen_34, - res: ResOpen_34 + req: ReqOpen_35, + res: ResOpen_35 }, "gonglukuangbiao/Refresh": { req: ReqRefresh_1, @@ -935,8 +945,8 @@ export interface ServiceType { res: ResActive }, "gongyu/mingdao/Open": { - req: ReqOpen_35, - res: ResOpen_35 + req: ReqOpen_36, + res: ResOpen_36 }, "gongyu/mingdao/RecPrize": { req: ReqRecPrize_3, @@ -971,8 +981,8 @@ export interface ServiceType { res: ResGetLog_1 }, "hbzb/jfs/Open": { - req: ReqOpen_36, - res: ResOpen_36 + req: ReqOpen_37, + res: ResOpen_37 }, "hbzb/jfs/Rec": { req: ReqRec_11, @@ -999,8 +1009,8 @@ export interface ServiceType { res: ResGetLog_2 }, "hbzb/zbs/Open": { - req: ReqOpen_37, - res: ResOpen_37 + req: ReqOpen_38, + res: ResOpen_38 }, "hbzb/zbs/Refresh": { req: ReqRefresh_3, @@ -1063,16 +1073,16 @@ export interface ServiceType { res: ResLottery_3 }, "jiaotang/Open": { - req: ReqOpen_38, - res: ResOpen_38 + req: ReqOpen_39, + res: ResOpen_39 }, "jiuba/Lottery": { req: ReqLottery_4, res: ResLottery_4 }, "jiuba/Open": { - req: ReqOpen_39, - res: ResOpen_39 + req: ReqOpen_40, + res: ResOpen_40 }, "jjc/BuyFightNum": { req: ReqBuyFightNum, @@ -1087,24 +1097,24 @@ export interface ServiceType { res: ResFightLog }, "jjc/Open": { - req: ReqOpen_40, - res: ResOpen_40 + req: ReqOpen_41, + res: ResOpen_41 }, "jjc/Receive": { - req: ReqReceive_4, - res: ResReceive_4 + req: ReqReceive_5, + res: ResReceive_5 }, "jjc/Refresh": { req: ReqRefresh_4, res: ResRefresh_4 }, "kaifujingsai/Open": { - req: ReqOpen_41, - res: ResOpen_41 + req: ReqOpen_42, + res: ResOpen_42 }, "kaifujingsai/Receive": { - req: ReqReceive_5, - res: ResReceive_5 + req: ReqReceive_6, + res: ResReceive_6 }, "kbzz/Apply": { req: ReqApply_2, @@ -1131,8 +1141,8 @@ export interface ServiceType { res: ResGroupState }, "kbzz/Open": { - req: ReqOpen_42, - res: ResOpen_42 + req: ReqOpen_43, + res: ResOpen_43 }, "kbzz/RecPrize": { req: ReqRecPrize_4, @@ -1159,8 +1169,8 @@ export interface ServiceType { res: ResLog_1 }, "kuangdong/Open": { - req: ReqOpen_43, - res: ResOpen_43 + req: ReqOpen_44, + res: ResOpen_44 }, "kuangdong/YanShi": { req: ReqYanShi, @@ -1171,8 +1181,8 @@ export interface ServiceType { res: ResZhanLing }, "lingzhulaixi/Open": { - req: ReqOpen_44, - res: ResOpen_44 + req: ReqOpen_45, + res: ResOpen_45 }, "lingzhulaixi/PkBoss": { req: ReqPkBoss, @@ -1195,8 +1205,8 @@ export interface ServiceType { res: ResFight_7 }, "meirishilian/Open": { - req: ReqOpen_45, - res: ResOpen_45 + req: ReqOpen_46, + res: ResOpen_46 }, "pata/Fight": { req: ReqFight_8, @@ -1207,8 +1217,8 @@ export interface ServiceType { res: ResGetPrize_1 }, "pata/Open": { - req: ReqOpen_46, - res: ResOpen_46 + req: ReqOpen_47, + res: ResOpen_47 }, "pata/SaoDang": { req: ReqSaoDang_1, @@ -1271,8 +1281,8 @@ export interface ServiceType { res: ResJump }, "peijiancangku/Open": { - req: ReqOpen_47, - res: ResOpen_47 + req: ReqOpen_48, + res: ResOpen_48 }, "Bingo": { req: ReqBingo, @@ -1291,21 +1301,21 @@ export interface ServiceType { res: ResTest }, "pushgift/Open": { - req: ReqOpen_48, - res: ResOpen_48 + req: ReqOpen_49, + res: ResOpen_49 }, "qjzzd/Fight": { req: ReqFight_9, res: ResFight_9 }, "qjzzd/Open": { - req: ReqOpen_49, - res: ResOpen_49 - }, - "rank/Open": { req: ReqOpen_50, res: ResOpen_50 }, + "rank/Open": { + req: ReqOpen_51, + res: ResOpen_51 + }, "shiwu/Concise": { req: ReqConcise, res: ResConcise @@ -1335,8 +1345,8 @@ export interface ServiceType { res: ResWear_2 }, "shootGame/Open": { - req: ReqOpen_51, - res: ResOpen_51 + req: ReqOpen_52, + res: ResOpen_52 }, "shootGame/Rec": { req: ReqRec_13, @@ -1347,8 +1357,8 @@ export interface ServiceType { res: ResBuy_6 }, "shop/Open": { - req: ReqOpen_52, - res: ResOpen_52 + req: ReqOpen_53, + res: ResOpen_53 }, "shop/Refresh": { req: ReqRefresh_6, @@ -1363,8 +1373,8 @@ export interface ServiceType { res: ResGetPrize_2 }, "sign/Open": { - req: ReqOpen_53, - res: ResOpen_53 + req: ReqOpen_54, + res: ResOpen_54 }, "slzd/Aim": { req: ReqAim, @@ -1387,8 +1397,8 @@ export interface ServiceType { res: ResMyRank }, "slzd/Open": { - req: ReqOpen_54, - res: ResOpen_54 + req: ReqOpen_55, + res: ResOpen_55 }, "slzd/OpenFort": { req: ReqOpenFort, @@ -1423,12 +1433,12 @@ export interface ServiceType { res: ResGuaJi }, "tanxian/Open": { - req: ReqOpen_55, - res: ResOpen_55 + req: ReqOpen_56, + res: ResOpen_56 }, "tanxian/Receive": { - req: ReqReceive_6, - res: ResReceive_6 + req: ReqReceive_7, + res: ResReceive_7 }, "task/AllFinsh": { req: ReqAllFinsh, @@ -1439,8 +1449,8 @@ export interface ServiceType { res: ResFinsh }, "task/Open": { - req: ReqOpen_56, - res: ResOpen_56 + req: ReqOpen_57, + res: ResOpen_57 }, "user/CDKEY": { req: ReqCDKEY, @@ -1503,8 +1513,8 @@ export interface ServiceType { res: ResExchange }, "weixiuchang/Open": { - req: ReqOpen_57, - res: ResOpen_57 + req: ReqOpen_58, + res: ResOpen_58 }, "weixiuchang/UpLv": { req: ReqUpLv, @@ -1547,8 +1557,8 @@ export interface ServiceType { res: ResJingCaiOpen }, "wzry/Open": { - req: ReqOpen_58, - res: ResOpen_58 + req: ReqOpen_59, + res: ResOpen_59 }, "wzry/UpdateFight": { req: ReqUpdateFight, @@ -1579,12 +1589,12 @@ export interface ServiceType { res: ResOnekeyReceive }, "xstask/Open": { - req: ReqOpen_59, - res: ResOpen_59 + req: ReqOpen_60, + res: ResOpen_60 }, "xstask/Receive": { - req: ReqReceive_7, - res: ResReceive_7 + req: ReqReceive_8, + res: ResReceive_8 }, "xstask/Refresh": { req: ReqRefresh_8, @@ -1989,101 +1999,111 @@ export const serviceProto: ServiceProto = { }, { "id": 69, - "name": "event/qirichongzhi/Open", + "name": "event/pobinglibao/Open", "type": "api" }, { "id": 70, - "name": "event/qirichongzhi/Rec", + "name": "event/pobinglibao/Receive", "type": "api" }, { "id": 71, - "name": "event/qiridenglu/Open", + "name": "event/qirichongzhi/Open", "type": "api" }, { "id": 72, - "name": "event/qiridenglu/RecPrize", + "name": "event/qirichongzhi/Rec", "type": "api" }, { "id": 73, - "name": "event/shiwuleichong/Open", + "name": "event/qiridenglu/Open", "type": "api" }, { "id": 74, - "name": "event/shouchong/Open", + "name": "event/qiridenglu/RecPrize", "type": "api" }, { "id": 75, - "name": "event/shouchong/Receive", + "name": "event/shiwuleichong/Open", "type": "api" }, { "id": 76, - "name": "event/xianshizhaomu/Buy", + "name": "event/shouchong/Open", "type": "api" }, { "id": 77, - "name": "event/xianshizhaomu/Duihuan", + "name": "event/shouchong/Receive", "type": "api" }, { "id": 78, - "name": "event/xianshizhaomu/Lottery", + "name": "event/xianshizhaomu/Buy", "type": "api" }, { "id": 79, - "name": "event/xianshizhaomu/Open", + "name": "event/xianshizhaomu/Duihuan", "type": "api" }, { "id": 80, - "name": "event/xianshizhaomu/Rec", + "name": "event/xianshizhaomu/Lottery", "type": "api" }, { "id": 81, - "name": "event/xinshoulibao/Open", + "name": "event/xianshizhaomu/Open", "type": "api" }, { "id": 82, - "name": "event/yangchengmubiao/Buy", + "name": "event/xianshizhaomu/Rec", "type": "api" }, { "id": 83, - "name": "event/yangchengmubiao/Open", + "name": "event/xinshoulibao/Open", "type": "api" }, { "id": 84, - "name": "event/yangchengmubiao/Rec", + "name": "event/yangchengmubiao/Buy", "type": "api" }, { "id": 85, - "name": "event/yibaichou/Open", + "name": "event/yangchengmubiao/Open", "type": "api" }, { "id": 86, - "name": "event/yibaichou/Rec", + "name": "event/yangchengmubiao/Rec", "type": "api" }, { "id": 87, - "name": "event/yibaichou/RecAll", + "name": "event/yibaichou/Open", "type": "api" }, { "id": 88, + "name": "event/yibaichou/Rec", + "type": "api" + }, + { + "id": 89, + "name": "event/yibaichou/RecAll", + "type": "api" + }, + { + "id": 90, "name": "event/yuedujijin/Open", "type": "api", "conf": { @@ -2091,157 +2111,157 @@ export const serviceProto: ServiceProto = { } }, { - "id": 89, + "id": 91, "name": "event/yuedujijin/Rec", "type": "api" }, { - "id": 90, + "id": 92, "name": "event/zhanling/BuyLv", "type": "api" }, { - "id": 91, + "id": 93, "name": "event/zhanling/Open", "type": "api" }, { - "id": 92, + "id": 94, "name": "event/zhanling/RecPrize", "type": "api" }, { - "id": 93, + "id": 95, "name": "event/zhanling/RecTask", "type": "api" }, { - "id": 94, + "id": 96, "name": "event/zhoulibao/Open", "type": "api" }, { - "id": 95, + "id": 97, "name": "event/zhoumolibao/Open", "type": "api" }, { - "id": 96, + "id": 98, "name": "event/zhoumolibao/Receive", "type": "api" }, { - "id": 97, + "id": 99, "name": "event/zixuanlibao/Buy", "type": "api" }, { - "id": 98, + "id": 100, "name": "event/zixuanlibao/Open", "type": "api" }, { - "id": 99, + "id": 101, "name": "eventlist/hdGetList", "type": "api" }, { - "id": 100, + "id": 102, "name": "friend/Apply", "type": "api" }, { - "id": 101, + "id": 103, "name": "friend/Del", "type": "api" }, { - "id": 102, + "id": 104, "name": "friend/Gift", "type": "api" }, { - "id": 103, + "id": 105, "name": "friend/List", "type": "api" }, { - "id": 104, + "id": 106, "name": "friend/Open", "type": "api" }, { - "id": 105, + "id": 107, "name": "friend/Respond", "type": "api" }, { - "id": 106, + "id": 108, "name": "friend/RmBlackList", "type": "api" }, { - "id": 107, + "id": 109, "name": "friend/Search", "type": "api" }, { - "id": 108, + "id": 110, "name": "ganbutexun/Challenge", "type": "api" }, { - "id": 109, + "id": 111, "name": "ganbutexun/Open", "type": "api" }, { - "id": 110, + "id": 112, "name": "ganhai/Fast", "type": "api" }, { - "id": 111, + "id": 113, "name": "ganhai/Fight", "type": "api" }, { - "id": 112, + "id": 114, "name": "ganhai/Log", "type": "api" }, { - "id": 113, + "id": 115, "name": "ganhai/Open", "type": "api" }, { - "id": 114, + "id": 116, "name": "ganhai/Refresh", "type": "api" }, { - "id": 115, + "id": 117, "name": "ganhai/RefreshShip", "type": "api" }, { - "id": 116, + "id": 118, "name": "ganhai/Select", "type": "api" }, { - "id": 117, + "id": 119, "name": "gmapi/Gift", "type": "api" }, { - "id": 118, + "id": 120, "name": "gmapi/Post", "type": "api" }, { - "id": 119, + "id": 121, "name": "gonghui/Apply", "type": "api", "conf": { @@ -2251,7 +2271,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 120, + "id": 122, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2261,7 +2281,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 121, + "id": 123, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2271,7 +2291,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 122, + "id": 124, "name": "gonghui/Change", "type": "api", "conf": { @@ -2281,12 +2301,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 123, + "id": 125, "name": "gonghui/Create", "type": "api" }, { - "id": 124, + "id": 126, "name": "gonghui/Dissolve", "type": "api", "conf": { @@ -2296,7 +2316,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 125, + "id": 127, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2306,12 +2326,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 126, + "id": 128, "name": "gonghui/FbBuyNum", "type": "api" }, { - "id": 127, + "id": 129, "name": "gonghui/FbFight", "type": "api", "conf": { @@ -2321,7 +2341,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 128, + "id": 130, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2331,17 +2351,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 129, + "id": 131, "name": "gonghui/GetList", "type": "api" }, { - "id": 130, + "id": 132, "name": "gonghui/Join", "type": "api" }, { - "id": 131, + "id": 133, "name": "gonghui/Jx", "type": "api", "conf": { @@ -2351,7 +2371,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 132, + "id": 134, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2361,7 +2381,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 133, + "id": 135, "name": "gonghui/List", "type": "api", "conf": { @@ -2371,7 +2391,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 134, + "id": 136, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2381,7 +2401,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 135, + "id": 137, "name": "gonghui/Open", "type": "api", "conf": { @@ -2391,7 +2411,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 136, + "id": 138, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2401,7 +2421,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 137, + "id": 139, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2411,7 +2431,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 138, + "id": 140, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2421,7 +2441,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 139, + "id": 141, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2431,137 +2451,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 140, + "id": 142, "name": "gonghuibaozang/Lottery", "type": "api" }, { - "id": 141, + "id": 143, "name": "gonghuibaozang/Open", "type": "api" }, { - "id": 142, + "id": 144, "name": "gonglukuangbiao/Buy", "type": "api" }, { - "id": 143, + "id": 145, "name": "gonglukuangbiao/Fight", "type": "api" }, { - "id": 144, + "id": 146, "name": "gonglukuangbiao/Open", "type": "api" }, { - "id": 145, + "id": 147, "name": "gonglukuangbiao/Refresh", "type": "api" }, { - "id": 146, + "id": 148, "name": "gongyu/mingdao/Active", "type": "api" }, { - "id": 147, + "id": 149, "name": "gongyu/mingdao/Open", "type": "api" }, { - "id": 148, + "id": 150, "name": "gongyu/mingdao/RecPrize", "type": "api" }, { - "id": 149, + "id": 151, "name": "gongyu/mingdao/Repair", "type": "api" }, { - "id": 150, + "id": 152, "name": "gongyu/xunlianjihua/Reset", "type": "api" }, { - "id": 151, + "id": 153, "name": "gongyu/xunlianjihua/UpSkill", "type": "api" }, { - "id": 152, + "id": 154, "name": "gongyu/zuozhanjihua/SetSkill", "type": "api" }, { - "id": 153, + "id": 155, "name": "hbzb/jfs/BuyNum", "type": "api" }, { - "id": 154, + "id": 156, "name": "hbzb/jfs/Fight", "type": "api" }, { - "id": 155, + "id": 157, "name": "hbzb/jfs/GetLog", "type": "api" }, { - "id": 156, + "id": 158, "name": "hbzb/jfs/Open", "type": "api" }, { - "id": 157, + "id": 159, "name": "hbzb/jfs/Rec", "type": "api" }, { - "id": 158, + "id": 160, "name": "hbzb/jfs/Refresh", "type": "api" }, { - "id": 159, + "id": 161, "name": "hbzb/GetStatus", "type": "api" }, { - "id": 160, + "id": 162, "name": "hbzb/zbs/BuyNum", "type": "api" }, { - "id": 161, + "id": 163, "name": "hbzb/zbs/Fight", "type": "api" }, { - "id": 162, + "id": 164, "name": "hbzb/zbs/GetLog", "type": "api" }, { - "id": 163, + "id": 165, "name": "hbzb/zbs/Open", "type": "api" }, { - "id": 164, + "id": 166, "name": "hbzb/zbs/Refresh", "type": "api" }, { - "id": 165, + "id": 167, "name": "hero/Awake", "type": "api" }, { - "id": 166, + "id": 168, "name": "hero/ChangePos", "type": "api", "conf": { @@ -2569,17 +2589,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 167, + "id": 169, "name": "hero/GetList", "type": "api" }, { - "id": 168, + "id": 170, "name": "hero/JinJie", "type": "api" }, { - "id": 169, + "id": 171, "name": "hero/LvUp", "type": "api", "conf": { @@ -2587,32 +2607,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 170, + "id": 172, "name": "hero/Potency", "type": "api" }, { - "id": 171, + "id": 173, "name": "hero/Rec", "type": "api" }, { - "id": 172, + "id": 174, "name": "hero/Reset", "type": "api" }, { - "id": 173, + "id": 175, "name": "hero/Talent", "type": "api" }, { - "id": 174, + "id": 176, "name": "hero/WeaponUp", "type": "api" }, { - "id": 175, + "id": 177, "name": "hongdian/Get", "type": "api", "conf": { @@ -2620,117 +2640,117 @@ export const serviceProto: ServiceProto = { } }, { - "id": 176, + "id": 178, "name": "item/GetList", "type": "api" }, { - "id": 177, + "id": 179, "name": "item/Use", "type": "api" }, { - "id": 178, + "id": 180, "name": "jiaotang/Lottery", "type": "api" }, { - "id": 179, + "id": 181, "name": "jiaotang/Open", "type": "api" }, { - "id": 180, + "id": 182, "name": "jiuba/Lottery", "type": "api" }, { - "id": 181, + "id": 183, "name": "jiuba/Open", "type": "api" }, { - "id": 182, + "id": 184, "name": "jjc/BuyFightNum", "type": "api" }, { - "id": 183, + "id": 185, "name": "jjc/Fight", "type": "api" }, { - "id": 184, + "id": 186, "name": "jjc/FightLog", "type": "api" }, { - "id": 185, + "id": 187, "name": "jjc/Open", "type": "api" }, { - "id": 186, + "id": 188, "name": "jjc/Receive", "type": "api" }, { - "id": 187, + "id": 189, "name": "jjc/Refresh", "type": "api" }, { - "id": 188, + "id": 190, "name": "kaifujingsai/Open", "type": "api" }, { - "id": 189, + "id": 191, "name": "kaifujingsai/Receive", "type": "api" }, { - "id": 190, + "id": 192, "name": "kbzz/Apply", "type": "api" }, { - "id": 191, + "id": 193, "name": "kbzz/AutoApply", "type": "api" }, { - "id": 192, + "id": 194, "name": "kbzz/BuyNum", "type": "api" }, { - "id": 193, + "id": 195, "name": "kbzz/Fight", "type": "api" }, { - "id": 194, + "id": 196, "name": "kbzz/FightLog", "type": "api" }, { - "id": 195, + "id": 197, "name": "kbzz/GroupState", "type": "api" }, { - "id": 196, + "id": 198, "name": "kbzz/Open", "type": "api" }, { - "id": 197, + "id": 199, "name": "kbzz/RecPrize", "type": "api" }, { - "id": 198, + "id": 200, "name": "kbzz/Refresh", "type": "api", "conf": { @@ -2738,287 +2758,287 @@ export const serviceProto: ServiceProto = { } }, { - "id": 199, + "id": 201, "name": "kuangdong/AddPkNum", "type": "api" }, { - "id": 200, + "id": 202, "name": "kuangdong/GetPrize", "type": "api" }, { - "id": 201, + "id": 203, "name": "kuangdong/KdInfo", "type": "api" }, { - "id": 202, + "id": 204, "name": "kuangdong/Log", "type": "api" }, { - "id": 203, + "id": 205, "name": "kuangdong/Open", "type": "api" }, { - "id": 204, + "id": 206, "name": "kuangdong/YanShi", "type": "api" }, { - "id": 205, + "id": 207, "name": "kuangdong/ZhanLing", "type": "api" }, { - "id": 206, + "id": 208, "name": "lingzhulaixi/Open", "type": "api" }, { - "id": 207, + "id": 209, "name": "lingzhulaixi/PkBoss", "type": "api" }, { - "id": 208, + "id": 210, "name": "lingzhulaixi/PkRank", "type": "api" }, { - "id": 209, + "id": 211, "name": "lingzhulaixi/SaoDang", "type": "api" }, { - "id": 210, + "id": 212, "name": "meirishilian/Buy", "type": "api" }, { - "id": 211, + "id": 213, "name": "meirishilian/Fight", "type": "api" }, { - "id": 212, + "id": 214, "name": "meirishilian/Open", "type": "api" }, { - "id": 213, + "id": 215, "name": "msg_c2s/BindUid", "type": "msg" }, { - "id": 214, + "id": 216, "name": "msg_c2s/Pay", "type": "msg" }, { - "id": 215, + "id": 217, "name": "msg_c2s/Sync", "type": "msg" }, { - "id": 216, + "id": 218, "name": "msg_s2c/Chat", "type": "msg" }, { - "id": 217, + "id": 219, "name": "msg_s2c/ChatHelp", "type": "msg" }, { - "id": 218, + "id": 220, "name": "msg_s2c/Collection", "type": "msg" }, { - "id": 219, + "id": 221, "name": "msg_s2c/Email", "type": "msg" }, { - "id": 220, + "id": 222, "name": "msg_s2c/EmailDel", "type": "msg" }, { - "id": 221, + "id": 223, "name": "msg_s2c/EquipChange", "type": "msg" }, { - "id": 222, + "id": 224, "name": "msg_s2c/Friend", "type": "msg" }, { - "id": 223, + "id": 225, "name": "msg_s2c/GhChange", "type": "msg" }, { - "id": 224, + "id": 226, "name": "msg_s2c/GongHuiBaoZang", "type": "msg" }, { - "id": 225, + "id": 227, "name": "msg_s2c/HeroChange", "type": "msg" }, { - "id": 226, + "id": 228, "name": "msg_s2c/HongDianChange", "type": "msg" }, { - "id": 227, + "id": 229, "name": "msg_s2c/ItemChange", "type": "msg" }, { - "id": 228, + "id": 230, "name": "msg_s2c/LoginQueue", "type": "msg" }, { - "id": 229, + "id": 231, "name": "msg_s2c/LshdChange", "type": "msg" }, { - "id": 230, + "id": 232, "name": "msg_s2c/NewDay", "type": "msg" }, { - "id": 231, + "id": 233, "name": "msg_s2c/OtherLogin", "type": "msg" }, { - "id": 232, + "id": 234, "name": "msg_s2c/PayChange", "type": "msg" }, { - "id": 233, + "id": 235, "name": "msg_s2c/PayResult", "type": "msg" }, { - "id": 234, + "id": 236, "name": "msg_s2c/PeijianChange", "type": "msg" }, { - "id": 235, + "id": 237, "name": "msg_s2c/PlayerChange", "type": "msg" }, { - "id": 236, + "id": 238, "name": "msg_s2c/Private", "type": "msg" }, { - "id": 237, + "id": 239, "name": "msg_s2c/PushGiftChange", "type": "msg" }, { - "id": 238, + "id": 240, "name": "msg_s2c/SendGift", "type": "msg" }, { - "id": 239, + "id": 241, "name": "msg_s2c/ShiwuChange", "type": "msg" }, { - "id": 240, + "id": 242, "name": "msg_s2c/TaskChange", "type": "msg" }, { - "id": 241, + "id": 243, "name": "msg_s2c/Xianshilibao", "type": "msg" }, { - "id": 242, + "id": 244, "name": "pata/Fight", "type": "api" }, { - "id": 243, + "id": 245, "name": "pata/GetPrize", "type": "api" }, { - "id": 244, + "id": 246, "name": "pata/Open", "type": "api" }, { - "id": 245, + "id": 247, "name": "pata/SaoDang", "type": "api" }, { - "id": 246, + "id": 248, "name": "pay/GetList", "type": "api" }, { - "id": 247, + "id": 249, "name": "peijian/GetList", "type": "api" }, { - "id": 248, + "id": 250, "name": "peijian/JingLian", "type": "api" }, { - "id": 249, + "id": 251, "name": "peijian/JinJie", "type": "api" }, { - "id": 250, + "id": 252, "name": "peijian/LvUp", "type": "api" }, { - "id": 251, + "id": 253, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 252, + "id": 254, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 253, + "id": 255, "name": "peijian/Reset", "type": "api" }, { - "id": 254, + "id": 256, "name": "peijian/Rm", "type": "api" }, { - "id": 255, + "id": 257, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3026,32 +3046,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 256, + "id": 258, "name": "peijian/UnLock", "type": "api" }, { - "id": 257, + "id": 259, "name": "peijian/Wear", "type": "api" }, { - "id": 258, + "id": 260, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 259, + "id": 261, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 260, + "id": 262, "name": "peijiancangku/Open", "type": "api" }, { - "id": 261, + "id": 263, "name": "Bingo", "type": "api", "conf": { @@ -3059,142 +3079,142 @@ export const serviceProto: ServiceProto = { } }, { - "id": 262, + "id": 264, "name": "FightTest", "type": "api" }, { - "id": 263, + "id": 265, "name": "SyncBtn", "type": "api" }, { - "id": 264, + "id": 266, "name": "Test", "type": "api" }, { - "id": 265, + "id": 267, "name": "pushgift/Open", "type": "api" }, { - "id": 266, + "id": 268, "name": "qjzzd/Fight", "type": "api" }, { - "id": 267, + "id": 269, "name": "qjzzd/Open", "type": "api" }, { - "id": 268, + "id": 270, "name": "rank/Open", "type": "api" }, { - "id": 269, + "id": 271, "name": "shiwu/Concise", "type": "api" }, { - "id": 270, + "id": 272, "name": "shiwu/Extract", "type": "api" }, { - "id": 271, + "id": 273, "name": "shiwu/GetList", "type": "api" }, { - "id": 272, + "id": 274, "name": "shiwu/LvUp", "type": "api" }, { - "id": 273, + "id": 275, "name": "shiwu/Recast", "type": "api" }, { - "id": 274, + "id": 276, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 275, + "id": 277, "name": "shiwu/Wear", "type": "api" }, { - "id": 276, + "id": 278, "name": "shootGame/Open", "type": "api" }, { - "id": 277, + "id": 279, "name": "shootGame/Rec", "type": "api" }, { - "id": 278, + "id": 280, "name": "shop/Buy", "type": "api" }, { - "id": 279, + "id": 281, "name": "shop/Open", "type": "api" }, { - "id": 280, + "id": 282, "name": "shop/Refresh", "type": "api" }, { - "id": 281, + "id": 283, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 282, + "id": 284, "name": "sign/GetPrize", "type": "api" }, { - "id": 283, + "id": 285, "name": "sign/Open", "type": "api" }, { - "id": 284, + "id": 286, "name": "slzd/Aim", "type": "api" }, { - "id": 285, + "id": 287, "name": "slzd/BuyNum", "type": "api" }, { - "id": 286, + "id": 288, "name": "slzd/Fight", "type": "api" }, { - "id": 287, + "id": 289, "name": "slzd/FightLog", "type": "api" }, { - "id": 288, + "id": 290, "name": "slzd/MyRank", "type": "api" }, { - "id": 289, + "id": 291, "name": "slzd/Open", "type": "api", "conf": { @@ -3204,77 +3224,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 290, + "id": 292, "name": "slzd/OpenFort", "type": "api" }, { - "id": 291, + "id": 293, "name": "slzd/Rec", "type": "api" }, { - "id": 292, + "id": 294, "name": "slzd/Refresh", "type": "api" }, { - "id": 293, + "id": 295, "name": "slzd/Slot", "type": "api" }, { - "id": 294, + "id": 296, "name": "tanxian/Event", "type": "api" }, { - "id": 295, + "id": 297, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 296, + "id": 298, "name": "tanxian/Fight", "type": "api" }, { - "id": 297, + "id": 299, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 298, + "id": 300, "name": "tanxian/Open", "type": "api" }, { - "id": 299, + "id": 301, "name": "tanxian/Receive", "type": "api" }, { - "id": 300, + "id": 302, "name": "task/AllFinsh", "type": "api" }, { - "id": 301, + "id": 303, "name": "task/Finsh", "type": "api" }, { - "id": 302, + "id": 304, "name": "task/Open", "type": "api" }, { - "id": 303, + "id": 305, "name": "user/CDKEY", "type": "api" }, { - "id": 304, + "id": 306, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3282,197 +3302,197 @@ export const serviceProto: ServiceProto = { } }, { - "id": 305, + "id": 307, "name": "user/ChangeName", "type": "api" }, { - "id": 306, + "id": 308, "name": "user/Fight", "type": "api" }, { - "id": 307, + "id": 309, "name": "user/GetInfo", "type": "api" }, { - "id": 308, + "id": 310, "name": "user/InfoOpen", "type": "api" }, { - "id": 309, + "id": 311, "name": "user/Login", "type": "api" }, { - "id": 310, + "id": 312, "name": "user/Ping", "type": "api" }, { - "id": 311, + "id": 313, "name": "user/Renown", "type": "api" }, { - "id": 312, + "id": 314, "name": "user/RenownBuy", "type": "api" }, { - "id": 313, + "id": 315, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 314, + "id": 316, "name": "user/RenownOpen", "type": "api" }, { - "id": 315, + "id": 317, "name": "user/Tujian", "type": "api" }, { - "id": 316, + "id": 318, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 317, + "id": 319, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 318, + "id": 320, "name": "weixiuchang/Open", "type": "api" }, { - "id": 319, + "id": 321, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 320, + "id": 322, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 321, + "id": 323, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 322, + "id": 324, "name": "wzry/BaoMing", "type": "api" }, { - "id": 323, + "id": 325, "name": "wzry/catFightLog", "type": "api" }, { - "id": 324, + "id": 326, "name": "wzry/CatGroup", "type": "api" }, { - "id": 325, + "id": 327, "name": "wzry/DldFight", "type": "api" }, { - "id": 326, + "id": 328, "name": "wzry/DldRefre", "type": "api" }, { - "id": 327, + "id": 329, "name": "wzry/JingCai", "type": "api" }, { - "id": 328, + "id": 330, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 329, + "id": 331, "name": "wzry/Open", "type": "api" }, { - "id": 330, + "id": 332, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 331, + "id": 333, "name": "wzry/Wzzd", "type": "api" }, { - "id": 332, + "id": 334, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 333, + "id": 335, "name": "xstask/AllGet", "type": "api" }, { - "id": 334, + "id": 336, "name": "xstask/Get", "type": "api" }, { - "id": 335, + "id": 337, "name": "xstask/LvUp", "type": "api" }, { - "id": 336, + "id": 338, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 337, + "id": 339, "name": "xstask/Open", "type": "api" }, { - "id": 338, + "id": 340, "name": "xstask/Receive", "type": "api" }, { - "id": 339, + "id": 341, "name": "xstask/Refresh", "type": "api" }, { - "id": 340, + "id": 342, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 341, + "id": 343, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 342, + "id": 344, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 343, + "id": 345, "name": "zhanqianbushu/Up", "type": "api" } @@ -10102,6 +10122,62 @@ export const serviceProto: ServiceProto = { } ] }, + "event/pobinglibao/PtlOpen/ReqOpen": { + "type": "Interface" + }, + "event/pobinglibao/PtlOpen/ResOpen": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "record", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" + } + } + } + }, + { + "id": 1, + "name": "buyLog", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" + } + } + } + } + ] + }, + "event/pobinglibao/PtlReceive/ReqReceive": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "id", + "type": { + "type": "String" + } + }, + { + "id": 1, + "name": "recId", + "type": { + "type": "String" + } + } + ] + }, + "event/pobinglibao/PtlReceive/ResReceive": { + "type": "Interface" + }, "event/qirichongzhi/PtlOpen/ReqOpen": { "type": "Interface" }, @@ -14872,6 +14948,13 @@ export const serviceProto: ServiceProto = { "type": "Literal", "literal": "zhoumolibao" } + }, + { + "id": 37, + "type": { + "type": "Literal", + "literal": "pobinglibao" + } } ] }, From 7e24671983a04ba9399a9ee59fc6e94ae6b8d585 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Wed, 20 Dec 2023 15:18:31 +0800 Subject: [PATCH 15/90] =?UTF-8?q?fix:=201.=E4=B8=8B=E9=99=90=E4=BF=9D?= =?UTF-8?q?=E5=BA=95=EF=BC=8C=E6=8B=89=E5=8E=BB=E8=8B=B1=E9=9B=84=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=97=B6=EF=BC=8C=E6=A3=80=E6=B5=8B=E8=8B=B1=E9=9B=84?= =?UTF-8?q?=E7=A9=BF=E6=88=B4=E7=9A=84peijian=E6=98=AF=E5=90=A6=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=EF=BC=8C=E4=B8=8D=E5=AD=98=E5=9C=A8=E5=B0=B1=E7=BD=AE?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/hero/ApiGetList.ts | 52 ++++++++++++++++++++++++++++------ 1 file changed, 43 insertions(+), 9 deletions(-) diff --git a/src/api_s2c/hero/ApiGetList.ts b/src/api_s2c/hero/ApiGetList.ts index c0882cb..5cc5a8f 100644 --- a/src/api_s2c/hero/ApiGetList.ts +++ b/src/api_s2c/hero/ApiGetList.ts @@ -1,11 +1,12 @@ -import { ApiCall } from "tsrpc"; -import { RedisCollections2 } from '../../module/redis'; -import { ReqGetList, ResGetList } from "../../shared/protocols/hero/PtlGetList"; +import {ApiCall} from "tsrpc"; +import {RedisCollections2} from '../../module/redis'; +import {ReqGetList, ResGetList} from "../../shared/protocols/hero/PtlGetList"; +import {PeijianShared} from "../../shared/public/peijian"; export default async function (call: ApiCall) { let list: ResGetList['list'] = {}; //let kvList: k_v = {}; - let arrList = await G.mongodb.collection('hero').find({ uid: call.uid }).toArray(); + let arrList = await G.mongodb.collection('hero').find({uid: call.uid}).toArray(); let heroCon = G.gc.hero; let color = {}; @@ -19,14 +20,47 @@ export default async function (call: ApiCall) { if (!color[heroCon[v.heroId].colour]) color[heroCon[v.heroId].colour] = 0; color[heroCon[v.heroId].colour] += 1; }); + + // 修复配件数据 + let peijianids = []; + Object.values(list).map(hero => { + hero.peijian && Object.values(hero.peijian).map( + i => peijianids.push(G.mongodb.conversionId(PeijianShared.fmt(i)._id)) + ) + }); + + let peijians = (await G.mongodb.collection("peijian").find( + {uid: call.uid, _id: {$in: peijianids}}, {projection: {_id: 1}} + ).toArray()).map(temp => G.mongodb.conversionId(temp._id)); + + let changes = {}; + Object.values(list).map(hero => { + for (let pos in hero.peijian) { + if (!peijians.includes(PeijianShared.fmt(hero.peijian[pos])._id)) { + hero.peijian[pos] = ""; + changes[hero._id] = hero.peijian; + } + } + }) + + for (let oid in changes) { + // 修复数据 + G.mongodb.collection("hero").updateOne( + G.mongodb.conversionIdObj({_id: oid}), {$set: {peijian: changes[oid]}} + ) + } + // 记录玩家最大等级，颜色相关数据 注册任务用 - await G.mongodb.collection('playerInfo', 'usertasklog').updateOne({ uid: call.conn.uid, type: 'usertasklog' }, - { $set: { maxherolv: maxherolv, herocolor: color } }, { upsert: true }); + await G.mongodb.collection('playerInfo', 'usertasklog').updateOne({uid: call.conn.uid, type: 'usertasklog'}, + {$set: {maxherolv: maxherolv, herocolor: color}}, {upsert: true}); //G.redis.set('hero', call.uid, kvList); - let recLshd = await G.mongodb.collection('playerInfo', 'lshd_hero').findOne({ uid: call.conn.uid, type: 'lshd_hero' }); - let { uid, _id, type, ...heros } = (recLshd || {}); + let recLshd = await G.mongodb.collection('playerInfo', 'lshd_hero').findOne({ + uid: call.conn.uid, + type: 'lshd_hero' + }); + let {uid, _id, type, ...heros} = (recLshd || {}); call.conn.lshd.hero = heros || {}; @@ -34,6 +68,6 @@ export default async function (call: ApiCall) { list: list, pos: call.conn.heroPos, lshd: heros || {}, - gbzj: (await G.mongodb.cPlayerInfo('gbzj').findOne({ uid: call.uid, type: 'gbzj' }))?.rec || {} + gbzj: (await G.mongodb.cPlayerInfo('gbzj').findOne({uid: call.uid, type: 'gbzj'}))?.rec || {} }); } \ No newline at end of file From fb7684326e33fa9e6539e8f357aff1ef6d0dcdab Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Wed, 20 Dec 2023 15:19:45 +0800 Subject: [PATCH 16/90] =?UTF-8?q?feat:=20=E5=9C=A8=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E5=81=9C=E6=9C=8D=E6=89=A7=E8=A1=8C=E8=84=9A=E6=9C=AC=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E4=BB=A5=E4=BD=BF=E7=94=A8=E8=BF=99=E4=B8=AA?= =?UTF-8?q?=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/setWs.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/setWs.ts b/src/setWs.ts index 3a97c54..f5af54c 100644 --- a/src/setWs.ts +++ b/src/setWs.ts @@ -98,6 +98,15 @@ function setWs(server: WsServer) { //执行 API 接口实现之前 server.flows.preApiCallFlow.push(async call => { + // 临时停服维护方案 + // let lng = { + // "zh-TW": "停服維護中，請等待！", + // "ko": "서버 점검 중, 잠시만 기다려 주세요.", + // "ja": "サーバーメンテナンス中、しばらくお待ちください。", + // "en": "Server under maintenance. Please wait.", + // } + // call.error("", {code: -1, message: lng[call.req.lng] || lng["ja"]}) + // return null; //是否短时间内重复请求某个api // let timeIntervalLimit = call.service.conf?.timeIntervalLimit == undefined ? 500 : call.service.conf?.timeIntervalLimit; From 276ca85bc3e66c47e0ebcce41833d365b897bba1 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Wed, 20 Dec 2023 15:20:16 +0800 Subject: [PATCH 17/90] =?UTF-8?q?feat:=20=E8=84=9A=E6=9C=AC=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/patch_email_find.ts | 22 +++++++++++++++++ src/path_20231220.ts | 43 ++++++++++++++++++++++++++++++++++ src/queryEmail.ts | 52 +++++++++++++++++++++++++---------------- 3 files changed, 97 insertions(+), 20 deletions(-) create mode 100644 src/patch_email_find.ts create mode 100644 src/path_20231220.ts diff --git a/src/patch_email_find.ts b/src/patch_email_find.ts new file mode 100644 index 0000000..140648d --- /dev/null +++ b/src/patch_email_find.ts @@ -0,0 +1,22 @@ +import {initMongoDB} from "./setMongodb"; +import {ctor} from "./global"; + +async function start() { + await initMongoDB(); + + let emails = await G.mongodb.collection("email").find({ + title: {$regex: "wzry"} + }).toArray(); + + for (let i = 0; i < emails.length; i++) { + console.log(); + } +} + +ctor(); +start().then(() => { + setInterval(() => { + console.log(new Date().format("MM-dd hh:mm:ss")); + }, 1000) + console.log("逻辑执行完成...等待退出！！！"); +}); diff --git a/src/path_20231220.ts b/src/path_20231220.ts new file mode 100644 index 0000000..5649024 --- /dev/null +++ b/src/path_20231220.ts @@ -0,0 +1,43 @@ +import {ctor} from "./global"; +import {initMongoDB} from "./setMongodb"; + +async function start() { + await initMongoDB() + + let datas = await G.mongodb.collection("event").find( + {type: {$in: ["yangchengmubiao100", "yangchengmubiao101"]}} + ).toArray(); + + for (let i = 0; i < datas.length; i++) { + let add = 0; + let data = datas[i]; + if (!Array.isArray(data.taskval)) continue; + let taskval: { [taskid: string]: number } = {}; + for (let i = 0; i < data.taskval.length; i++) { + if (data.taskval[i] === null) continue; + + if (typeof data.taskval[i] == "number") { + add = data.taskval[i]; + } else { + taskval = Object.assign(taskval, data.taskval[i]); + } + } + for (let taskid in taskval) { + taskval[taskid] = (taskval[taskid] || 0) + add; + } + await G.mongodb.collection("event").updateOne( + {uid: data.uid, type: data.type}, {$set: {taskval: taskval}} + ) + console.log(`修复玩家${data.uid}人才计划数据完成...`); + } +} + +ctor(); +start().then(() => { + setInterval(() => { + console.log(new Date().format("MM-dd hh:mm:ss")); + }, 1000) + console.log("逻辑执行完成...等待退出！！！"); +}); + + diff --git a/src/queryEmail.ts b/src/queryEmail.ts index 2a6c5c8..1db1128 100644 --- a/src/queryEmail.ts +++ b/src/queryEmail.ts @@ -1,35 +1,47 @@ -import {MongoClient} from "mongodb"; -import * as ramda from 'ramda' import fs from "fs"; +import {MongoClient} from "mongodb"; -let R = ramda async function start() { + let mongodbUrl = "mongodb://blacklagoon:lffu2bD%5eGn2%5eE%2bE7@blacklagoon-mongo-secondary.pro.g123-cpp.com:3717,blacklagoon-mongo-primary.pro.g123-cpp.com:3717?replicaSet=mgset-351738825" //连接mongodb - let client = await MongoClient.connect('mongodbUrl'); + let client = await MongoClient.connect(mongodbUrl); - console.log('链接成功') + console.log('链接成功'); - let a: any = {} - - for (let i = 1; i < 20; i++) { + let user2email: { [uid: string]: { [title: string]: { prize: any, get_num: number, unget_num: number } } } = {}; + for (let i = 1; i < 49; i++) { let dbName = `blacklagoon_s${i}` console.log(dbName) - let mongodb = client.db(dbName); - a[dbName] = {}; - (await mongodb.collection('email').find({type: 'gm', uid: 'system'}).toArray()).map(i => { - a[dbName][i.title] = R.compose(R.map(i => ({[i[0]]: i.length})), R.values, R.filter(i => i.length > 1), R.groupBy(i => i))(i.prizelist) - console.log(a[dbName][i.title]) - }) - console.log(dbName, '查询完成') - } - fs.writeFileSync('tab.json', JSON.stringify(a, null, 2)) + let mongodb = client.db(dbName); + let emails = await mongodb.collection("email").find({ + title: {$regex: "wzry"} + }).toArray(); + + for (let i = 0; i < emails.length; i++) { + let email = emails[i]; + if (!email.prizeData?.prize) continue; + if (!user2email[email.uid]) { + user2email[email.uid] = {}; + } + if (!user2email[email.uid][email.title]) { + user2email[email.uid][email.title] = { + prize: email.prizeData.prize, + get_num: 0, + unget_num: 0, + } + } + if (email.prizeData.isGet) { + user2email[email.uid][email.title].get_num += 1; + } else { + user2email[email.uid][email.title].unget_num += 1; + } + } + } + fs.writeFileSync('email.json', JSON.stringify(user2email, null, 2)) } -//定义全局变量 -// ctor(); -//启动服务 start().then(() => { process.exit() }); From b2ef913c267782e162626fb42ff86b96ec03f144 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Wed, 20 Dec 2023 15:20:38 +0800 Subject: [PATCH 18/90] =?UTF-8?q?feat:=20=E8=84=9A=E6=9C=AC=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/path_20231215.ts | 1932 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1932 insertions(+) create mode 100644 src/path_20231215.ts diff --git a/src/path_20231215.ts b/src/path_20231215.ts new file mode 100644 index 0000000..297a5b1 --- /dev/null +++ b/src/path_20231215.ts @@ -0,0 +1,1932 @@ +import {ctor} from "./global"; +import {initMongoDB} from "./setMongodb"; +import {ReqEmail} from "./monopoly/protocols/PtlEmail"; +import {MsgEmail} from "./shared/protocols/msg_s2c/MsgEmail"; +import {yangchengmubiao} from "./shared/protocols/event/yangchengmubiao/PtlOpen"; + + +/** + * 标题：首充优化 + * 日語:初回チャージ仕様改善 + * 繁體:首儲機制改善 + * 韓国語: 초회 충전 시스템 개선 + * 英語: First Top-Up optimization + * + * 內文：这是您的补偿，请查收！ + * 日語:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + * 繁體中文:這是您的補償內容，煩請查收! + * 韓国語:투자 시스템 개선으로 인한 보상을 보내드립니다. + * 英語: Please find attached a few items as a compensation for the wait during our adjustments. + * + * 线上玩家脚本 + * 1、已激活首充档位且没领完3天奖励的玩家，邮件补发剩下的奖励 + * 2、重置所有玩家首充活动到新版本状态*/ + +async function addEmail(email: ReqEmail) { + let {prize, uid, ...e} = email; + let sendEmail: MsgEmail = { + _id: null, + uid: uid, + type: e.type, + title: e.title, + content: e.content, + createTime: G.time, + contentInsertArr: e.contentInsertArr || [] + }; + + if (email.lngTitle) { + sendEmail.lngTitle = email.lngTitle; + sendEmail.lngContent = email.lngContent; + } + + if ((prize === null || prize === void 0 ? void 0 : prize.length) > 0) { + sendEmail.prizeData = { + prize: email.prize, + isGet: false + }; + } + + if (email.g123log && Object.keys(email.g123log).length > 0) { + sendEmail.g123log = email.g123log; + } + await G.mongodb.collection('email').insertOne({ + ttl: new Date(), ...G.mongodb.conversionIdObj(sendEmail) + }) +} + +async function shouChongReSet() { + let shouchong = { + "shouchong1": { + "paynum": 6, + "cartoon": { + "hero": 5001 + }, + "prize": [ + [ + { + "a": "hero", + "t": "5001", + "n": 1 + }, + { + "a": "attr", + "t": "jinbi", + "n": 100000 + } + ], + [ + { + "a": "item", + "t": "12", + "n": 200 + }, + { + "a": "attr", + "t": "jinbi", + "n": 200000 + } + ], + [ + { + "a": "item", + "t": "12", + "n": 200 + }, + { + "a": "attr", + "t": "jinbi", + "n": 300000 + } + ] + ] + }, + "shouchong2": { + "paynum": 30, + "cartoon": { + "img": 5001 + }, + "prize": [ + [ + { + "a": "equip", + "t": "1009", + "n": 1 + }, + { + "a": "equip", + "t": "2009", + "n": 1 + } + ], + [ + { + "a": "equip", + "t": "3009", + "n": 1 + }, + { + "a": "item", + "t": "2", + "n": 1000 + } + ], + [ + { + "a": "equip", + "t": "4009", + "n": 1 + }, + { + "a": "item", + "t": "2", + "n": 1000 + } + ] + ] + }, + "shouchong3": { + "paynum": 98, + "cartoon": { + "hero": 5002 + }, + "prize": [ + [ + { + "a": "hero", + "t": "5002", + "n": 1 + }, + { + "a": "item", + "t": "4", + "n": 10 + } + ], + [ + { + "a": "equip", + "t": "1010", + "n": 1 + }, + { + "a": "item", + "t": "2", + "n": 2000 + } + ], + [ + { + "a": "equip", + "t": "3010", + "n": 1 + }, + { + "a": "item", + "t": "2", + "n": 2000 + } + ] + ] + } + }; + let users = await G.mongodb.collection("user").find({}, { + projection: {uid: 1, payExp: 1} + }).toArray(); + + for (let i = 0; i < users.length; i++) { + let user = users[i]; + let data = await G.mongodb.cEvent("shouchong").findOne({ + uid: user.uid, + type: "shouchong", + }); + + if (!data) { + data = {uid: user.uid, receive: {}, type: "shouchong", _id: G.mongodb.conversionId("")}; + } + + let send_prize = []; + for (let key in shouchong) { + // 充值不足 + if (user.payExp < shouchong[key]["paynum"] * 10) { + continue + } + + // 奖励已经领取完毕 + if (data?.receive && data.receive[key] && data.receive[key].length >= shouchong[key]["prize"].length) { + continue + } + + // 补发未领取奖励 + for (let i = 0; i < shouchong[key]["prize"].length; i++) { + if (data?.receive && data.receive[key] && data.receive[key][i]) { + continue + } + + if (!data.receive[key]) { + data.receive[key] = []; + } + data.receive[key][i] = G.time; + send_prize = send_prize.concat(shouchong[key]["prize"][i]); + } + } + if (send_prize.length <= 0) continue; + + let title = "首充优化"; + let content = "这是您的补偿，请查收！"; + + let lngTitle = { + "en": "First Top-Up optimization", + "ja": "初回チャージ仕様改善", + "ko": "초회 충전 시스템 개선", + "zh-TW": "首儲機制改善" + }; + let lngContent = { + "en": "Please find attached a few items as a compensation for the wait during our adjustments.", + "ja": "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + "ko": "투자 시스템 개선으로 인한 보상을 보내드립니다.", + "zh-TW": "這是您的補償內容，煩請查收!", + }; + + // 发放邮件 + await addEmail({ + uid: user.uid, + type: "system", + title: title, + content: content, + prize: send_prize, + lngTitle: lngTitle, + lngContent: lngContent, + }); + // 设置奖励发放记录 + await G.mongodb.cEvent("shouchong").updateOne({ + uid: user.uid, + type: "shouchong", + }, {"$set": {receive: data.receive, patch: 1}}, {upsert: true}); + + console.log(`玩家${user.uid}首充奖励补发完成...`); + } +} + + +/** + * "zhizunyueka" + 标题：至尊月卡优化 + 日語:豪華月パス仕様改善 + 繁體:至尊月卡改善 + 韓国語:고급 월간 패스 시스템 개선 + 英語: Luxurious Monthly Pass optimization + + 邮件内容：这是您的补偿，请查收！ + 日語:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + 繁體中文:這是您的補償內容，煩請查收! + 韓国語:투자 시스템 개선으로 인한 보상을 보내드립니다. + 英語: Please find attached a few items as a compensation for the wait during our adjustments. + + 线上玩家脚本： + 线上已购买至尊月卡的玩家，脚本补发：钻石*10000 + **/ +async function zhizunyueka() { + let w = { + key: "zhizunyueka", + del_time: {$exists: false} + }; + let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + users.forEach(user => { + let uid = user.uid; + if (!uid2Prize[uid]) uid2Prize[uid] = []; + uid2Prize[uid].push({a: "attr", t: "rmbmoney", n: 10000}); + }); + + let title = "至尊月卡优化"; + let content = "这是您的补偿，请查收！"; + let lngTitle = { + "en": "Luxurious Monthly Pass optimization", + "ja": "豪華月パス仕様改善", + "ko": "고급 월간 패스 시스템 개선", + "zh-TW": "至尊月卡改善", + }; + let lngContent = { + "en": "Please find attached a few items as a compensation for the wait during our adjustments.", + "ja": "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + "ko": "투자 시스템 개선으로 인한 보상을 보내드립니다.", + "zh-TW": "這是您的補償內容，煩請查收!", + }; + + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, + }); + + // 处理重复执行 + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1}} + ) + + console.log(`玩家${uid}至尊月卡奖励补发完成...`); + } +} + +/** + * "chaozhiyueka" + 标题 超值月卡优化 + ja:お得月パス仕様改善 + zh-TW:超值月卡改善 + ko:월간 패스 시스템 개선 + en: Value Monthly Pass optimization + + 內文： + 这是您的补偿，请查收！ + ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + zh-TW:這是您的補償內容，煩請查收! + ko:투자 시스템 개선으로 인한 보상을 보내드립니다. + en: Please find attached a few items as a compensation for the wait during our adjustments. + + 线上已购买超值月卡的玩家，脚本补发：招募卡*30 + **/ +async function chaozhiyueka() { + let w = { + key: "chaozhiyueka", + del_time: {$exists: false} + }; + let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + users.forEach(user => { + let uid = user.uid; + if (!uid2Prize[uid]) uid2Prize[uid] = []; + uid2Prize[uid].push({a: "item", t: "4", n: 30}); + }); + + let title = "超值月卡优化"; + let content = "这是您的补偿，请查收！"; + let lngTitle = { + "ja": "お得月パス仕様改善", + "zh-TW": "超值月卡改善", + "ko": "월간 패스 시스템 개선", + "en": "Value Monthly Pass optimization", + }; + let lngContent = { + "en": "Please find attached a few items as a compensation for the wait during our adjustments.", + "ja": "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + "ko": "투자 시스템 개선으로 인한 보상을 보내드립니다.", + "zh-TW": "這是您的補償內容，煩請查收!" + }; + + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, + }); + + // 处理重复执行 + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1}} + ) + + console.log(`玩家${uid}超值月卡奖励补发完成...`); + } +} + +/** + * "zhongshenka" + 标题:终身卡优化 + ja:永久パス仕様改善 + zh-TW:永久通行證改善 + ko:영구 패스 시스템 개선 + en: Lifetime Pass optimization + + 內文： 这是您的补偿，请查收！ + ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + zh-TW:這是您的補償內容，煩請查收! + ko:투자 시스템 개선으로 인한 보상을 보내드립니다. + en: Please find attached a few items as a compensation for the wait during our adjustments. + + 线上已购买永久卡的玩家，脚本补发：汉塞尔1，能量饮料500w + **/ +async function zhongshenka() { + let w = { + key: "zhongshenka", + del_time: {$exists: false} + }; + let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + users.forEach(user => { + let uid = user.uid; + if (!uid2Prize[uid]) uid2Prize[uid] = []; + uid2Prize[uid].push({"a": "item", "t": "1", "n": 5000000}) + uid2Prize[uid].push({a: "hero", t: "4012", n: 1}) + }); + + let title = "终身卡优化"; + let content = "这是您的补偿，请查收！"; + let lngTitle = { + "ja": "永久パス仕様改善", + "zh-TW": "永久通行證改善", + "ko": "영구 패스 시스템 개선", + "en": "Lifetime Pass optimization", + }; + let lngContent = { + "en": "Please find attached a few items as a compensation for the wait during our adjustments.", + "ja": "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + "ko": "투자 시스템 개선으로 인한 보상을 보내드립니다.", + "zh-TW": "這是您的補償內容，煩請查收!" + }; + + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, + }); + + // 处理重复执行 + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1}} + ) + + console.log(`玩家${uid}终身卡奖励补发完成...`); + } +} + + +/** + "qingbaotequan" + 标题:资讯特权优化 + ja:情報特権仕様改善 + zh-TW:資訊特權改善 + ko:정보 특권 시스템 개선 + en: Intel Benefit optimization + + 內文：这是您的补偿，请查收！ + ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + zh-TW:這是您的補償內容，煩請查收! + ko:투자 시스템 개선으로 인한 보상을 보내드립니다. + en: Please find attached a few items as a compensation for the wait during our adjustments. + + 线上玩家脚本 + 1、特权内容：已购买特权的玩家，特权效果更新，不重置时间 + 2、已购买资讯特权的玩家，脚本补发：钻石*680，顶级紫色套装*1 + * */ +async function qingbaotequan() { + let w = { + key: "qingbaotequan", + patch: {$exists: false}, + del_time: {$exists: false} + }; + let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + users.forEach(user => { + let uid = user.uid; + + if (!uid2Prize[uid]) uid2Prize[uid] = []; + uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 680}); + uid2Prize[uid].push({"a": "item", "t": "609", "n": 1}); + }); + + let title = "资讯特权优化"; + let content = "这是您的补偿，请查收！"; + let lngTitle = { + "ja": "情報特権仕様改善", + "zh-TW": "資訊特權改善", + "ko": "정보 특권 시스템 개선", + "en": "Intel Benefit optimization", + }; + let lngContent = { + "en": "Please find attached a few items as a compensation for the wait during our adjustments.", + "ja": "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + "ko": "투자 시스템 개선으로 인한 보상을 보내드립니다.", + "zh-TW": "這是您的補償內容，煩請查收!" + }; + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, + }); + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1}} + ) + + console.log(`玩家${uid}特权奖励补发完成...`); + } +} + +/** + "zuozhantequan" + 标题:作战特权优化 + ja:作戦特権仕様改善 + zh-TW:作戰特權改善 + ko:작전 특권 시스템 개선 + en: Strategy Benefit optimization + + 內文：这是您的补偿，请查收！ + ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + zh-TW:這是您的補償內容，煩請查收! + ko:투자 시스템 개선으로 인한 보상을 보내드립니다. + en: Please find attached a few items as a compensation for the wait during our adjustments. + + 线上玩家脚本 + 1、特权内容：已购买特权的玩家，特权效果更新，不重置时间 + 2、已购买快速特权的玩家，脚本补发：钻石300，快速探险券30 + * */ +async function zuozhantequan() { + let w = { + key: "zuozhantequan", + patch: {$exists: false}, + del_time: {$exists: false} + }; + let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + users.forEach(user => { + let uid = user.uid; + + if (!uid2Prize[uid]) uid2Prize[uid] = []; + uid2Prize[uid].push({"a": "item", "t": "24", "n": 30}); + uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 300}); + }); + + let title = "作战特权优化"; + let content = "这是您的补偿，请查收！"; + let lngTitle = { + "ja": "作戦特権仕様改善", + "zh-TW": "作戰特權改善", + "ko": "작전 특권 시스템 개선", + "en": "Strategy Benefit optimization", + }; + let lngContent = { + "en": "Please find attached a few items as a compensation for the wait during our adjustments.", + "ja": "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + "ko": "투자 시스템 개선으로 인한 보상을 보내드립니다.", + "zh-TW": "這是您的補償內容，煩請查收!" + }; + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, + }); + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1}} + ) + + console.log(`玩家${uid}特权奖励补发完成...`); + } +} + +/** + "caifutequan" + 标题:资产特权优化 + ja:資産特権仕様改善 + zh-TW:資産特權改善 + ko:자산 특권 시스템 개선 + en: Asset Benefit optimization + + 內文：这是您的补偿，请查收！ + ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + zh-TW:這是您的補償內容，煩請查收! + ko:투자 시스템 개선으로 인한 보상을 보내드립니다. + en: Please find attached a few items as a compensation for the wait during our adjustments. + + 线上玩家脚本 + 1、特权内容：已购买特权的玩家，特权效果更新，不重置时间 + 2、已购买资产特权的玩家，脚本补发：钻石*300，美金*1000万 + * */ +async function caifutequan() { + let w = { + key: "caifutequan", + patch: {$exists: false}, + del_time: {$exists: false} + }; + let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + users.forEach(user => { + let uid = user.uid; + + if (!uid2Prize[uid]) uid2Prize[uid] = []; + uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 300}) + uid2Prize[uid].push({"a": "attr", "t": "jinbi", "n": 10000000}) + }); + + let title = "资产特权优化"; + let content = "这是您的补偿，请查收！"; + let lngTitle = { + "ja": "資産特権仕様改善", + "zh-TW": "資産特權改善", + "ko": "자산 특권 시스템 개선", + "en": "Asset Benefit optimization", + }; + let lngContent = { + "en": "Please find attached a few items as a compensation for the wait during our adjustments.", + "ja": "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + "ko": "투자 시스템 개선으로 인한 보상을 보내드립니다.", + "zh-TW": "這是您的補償內容，煩請查收!" + }; + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, + }); + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1}} + ) + + console.log(`玩家${uid}资产特权奖励补发完成...`); + } +} + +/** + "jiubatequan" + 标题:抽奖特权优化 + ja:ガチャ特権仕様改善 + zh-TW:抽獎特權改善 + ko:모집 특권 시스템 개선 + en: Gacha Benefit optimization + + 內文：这是您的补偿，请查收！ + ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + zh-TW:這是您的補償內容，煩請查收! + ko:투자 시스템 개선으로 인한 보상을 보내드립니다. + en: Please find attached a few items as a compensation for the wait during our adjustments. + + 线上玩家脚本 + 1、特权内容：已购买特权的玩家，特权效果更新，不重置时间 + 2、已购买抽奖特权的玩家，脚本补发：钻石*680，招募卡*10 + * */ +async function jiubatequan() { + let w = { + key: "jiubatequan", + patch: {$exists: false}, + del_time: {$exists: false} + }; + let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + users.forEach(user => { + let uid = user.uid; + + if (!uid2Prize[uid]) uid2Prize[uid] = []; + uid2Prize[uid].push({"a": "item", "t": "4", "n": 10}); + uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 680}); + }); + + let title = "抽奖特权优化"; + let content = "这是您的补偿，请查收！"; + let lngTitle = { + "ja": "ガチャ特権仕様改善", + "zh-TW": "抽獎特權改善", + "ko": "모집 특권 시스템 개선", + "en": "Gacha Benefit optimization", + }; + let lngContent = { + "en": "Please find attached a few items as a compensation for the wait during our adjustments.", + "ja": "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + "ko": "투자 시스템 개선으로 인한 보상을 보내드립니다.", + "zh-TW": "這是您的補償內容，煩請查收!" + }; + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, + }); + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1}} + ) + + console.log(`玩家${uid}抽奖特权奖励补发完成...`); + } +} + +/** + 不需要给玩家发送邮件 + + 线上玩家脚本 + 刷新所有玩家各档位VIP礼包到未购买状态 + **/ +async function resetVipLiBao() { + await G.mongodb.cPlayerInfo("chongzhi").updateMany( + {type: 'chongzhi'}, {$set: {giftBy: {}}} + ) +} + + +/** + 人才计划调整 + 1、线上已有该活动的玩家，保留次数进度；达到新加档位可领取的奖励则直接领取 + **/ +async function rcjhReSet() { + const hdid = [100, 101]; + const task = { + '2001': { + 'prize': [{'a': 'item', 't': '4', 'n': 5}, {'a': 'item', 't': '626', 'n': 10}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 50, + 'cond': [], + 'stype': 118 + }, + '2002': { + 'prize': [{'a': 'item', 't': '4', 'n': 5}, {'a': 'item', 't': '626', 'n': 10}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 100, + 'cond': [], + 'stype': 118 + }, + '2003': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '626', 'n': 20}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 200, + 'cond': [], + 'stype': 118 + }, + '2004': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 20}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 250, + 'cond': [], + 'stype': 118 + }, + '2005': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 20}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 300, + 'cond': [], + 'stype': 118 + }, + '2006': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 400, + 'cond': [], + 'stype': 118 + }, + '2007': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 500, + 'cond': [], + 'stype': 118 + } + }; + // 中间插入了2004 所以之前的任务id一次往后顺延 + const change = {2004: 2005, 2005: 2006, 2006: 2007}; + // 刷新活动配置 + await G.mongodb.collection("hdinfo").updateOne({hdid: {$in: hdid}}, { + "$set": {'data.tasklist.2': task} + }) + + let datas: yangchengmubiao[] = []; + // 刷新玩家领取记录 + datas = datas.concat(await G.mongodb.cEvent(`yangchengmubiao${hdid[0]}`).find( + {type: `yangchengmubiao${hdid[0]}`} + ).toArray()); + datas = datas.concat(await G.mongodb.cEvent(`yangchengmubiao${hdid[1]}`).find( + {type: `yangchengmubiao${hdid[1]}`} + ).toArray()); + for (let i = 0; i < datas.length; i++) { + let data = datas[i]; + let finished = data.finishid["2"].map((task) => { + return change[task] ? change[task] : task + }); + let maxtaskval = Math.max(...Object.values(data.taskval)); + let taskval = Object.assign(Object.keys(task).map((taskid) => { + return {[taskid]: maxtaskval} + })); + await G.mongodb.collection("event").updateOne( + {uid: data.uid, type: data.type}, {$set: {taskval: taskval, "finishid.2": finished}} + ) + console.log(`修复玩家${data.uid}人才计划数据完成...`); + } +} + + +/** + * 标题：等级基金优化 + * ja:レベル投資仕様改善 + * zh-TW:等級基金改善 + * ko:레벨 투자 시스템 개선 + * en: Level Investment optimization + + * 內文： + * 这是您的补偿，请查收！ + * ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + * zh-TW:這是您的補償內容，煩請查收! + * ko:투자 시스템 개선으로 인한 보상을 보내드립니다. + * en: Please find attached a few items as a compensation for the wait during our adjustments. + + * 线上玩家脚本 + * 1、已购买等级基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； + * 2、未购买的玩家活动刷新到新版本； + * 3、刷新等级基金到未购买状态； + */ +async function dengjiJiJinReSet() { + let w = {key: "dengjijijin", del_time: {$exists: false}} + // 激活了的玩家 + let _payList = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + const prizeList = [ + { + "type": "dengjijijin", + "total": 20, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 300 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 1700 + } + ] + }, + { + "type": "dengjijijin", + "total": 25, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 300 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 1700 + } + ] + }, + { + "type": "dengjijijin", + "total": 30, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 300 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 1700 + } + ] + }, + + { + "type": "dengjijijin", + "total": 35, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 300 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 1700 + } + ] + }, + { + "type": "dengjijijin", + "total": 40, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 300 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 1700 + } + ] + }, + { + "type": "dengjijijin", + "total": 45, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 300 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 1700 + } + ] + }, + + { + "type": "dengjijijin", + "total": 50, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 300 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 1700 + } + ] + }, + { + "type": "dengjijijin", + "total": 55, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 300 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 1700 + } + ] + } + ]; + let _users = await G.mongodb.cEvent("dengjijijin").find( + {"uid": {"$in": _payList.map(pay => pay.uid)}, type: 'dengjijijin'} + ).toArray() + + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + _users.forEach((user) => { + let uid = user.uid; + let idx2Type2Bool = user.rec; + if (!uid2Prize[uid]) uid2Prize[uid] = []; + + // 没领的全发 + prizeList.forEach((con, idx) => { + // 普通奖励没领 + if (!idx2Type2Bool[idx]?.pt) { + uid2Prize[uid].push(...con.pt) + } + // 高级奖励没领 + if (!idx2Type2Bool[idx]?.tq) { + uid2Prize[uid].push(...con.tq) + } + }); + }) + + let title = "等级基金优化"; + let content = "这是您的补偿，请查收！"; + let lngTitle = { + "ja": "レベル投資仕様改善", + "zh-TW": "等級基金改善", + "ko": "레벨 투자 시스템 개선", + "en": "Level Investment optimization", + }; + let lngContent = { + "en": "Please find attached a few items as a compensation for the wait during our adjustments.", + "ja": "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + "ko": "투자 시스템 개선으로 인한 보상을 보내드립니다.", + "zh-TW": "這是您的補償內容，煩請查收!" + }; + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, + }); + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} + ) + // 基金数据清除 + await G.mongodb.collection("event").updateMany( + {type: "dengjijijin", uid: uid}, {"$set": {uid: `${uid}_patch_del`}} + ); + console.log(`玩家${uid}等级基金奖补发完成...`); + } +} + + +/** + * 标题：关卡基金优化 + * ja:ステージ投資仕様改善 + * zh-TW:關卡基金改善 + * ko:스테이지 투자 시스템 개선 + * en: Stage Investment optimization + * + * 內文：这是您的补偿，请查收！ + * ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + * zh-TW:這是您的補償內容，煩請查收! + * ko:투자 시스템 개선으로 인한 보상을 보내드립니다. + * en: Please find attached a few items as a compensation for the wait during our adjustments. + + * 线上玩家脚本 + * 1、已购买关卡基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； + * 2、未购买的玩家活动刷新到新版本； + * 3、刷新关卡基金到未购买状态； + * */ +async function guanqiaJiJinReSet() { + let w = {key: "guanqiajijin"}; + // 激活了的玩家 + let _payList = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + const prizeList = [ + { + "type": "guanqiajijin", + "total": 30, + "pt": [], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2000 + } + ], + "des": "guanqiajijin_des_1" + }, + { + "type": "guanqiajijin", + "total": 50, + "pt": [], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2000 + } + ], + "des": "guanqiajijin_des_2" + }, + { + "type": "guanqiajijin", + "total": 70, + "pt": [], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2000 + } + ], + "des": "guanqiajijin_des_3" + }, + { + "type": "guanqiajijin", + "total": 90, + "pt": [], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2000 + } + ], + "des": "guanqiajijin_des_4" + }, + { + "type": "guanqiajijin", + "total": 110, + "pt": [], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2000 + } + ], + "des": "guanqiajijin_des_5" + }, + { + "type": "guanqiajijin", + "total": 150, + "pt": [], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2000 + } + ], + "des": "guanqiajijin_des_6" + }, + { + "type": "guanqiajijin", + "total": 180, + "pt": [], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2000 + } + ], + "des": "guanqiajijin_des_7" + }, + { + "type": "guanqiajijin", + "total": 250, + "pt": [], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2000 + } + ], + "des": "guanqiajijin_des_8" + } + ]; + + // 没激活不处理 + let _users = await G.mongodb.cEvent("guanqiajijin").find( + { + "uid": {"$in": _payList.map(pay => pay.uid)}, + "type": 'guanqiajijin' + }, + {projection: {_id: 0}} + ).toArray(); + + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + _users.forEach(user => { + let uid = user.uid; + let idx2Type2Bool = user.rec; + if (!uid2Prize[uid]) uid2Prize[uid] = []; + + // 没领的全发 + prizeList.forEach((con, idx) => { + // 普通奖励没领 + if (!idx2Type2Bool[idx]?.pt) { + uid2Prize[uid].push(...con.pt) + } + // 高级奖励没领 + if (!idx2Type2Bool[idx]?.tq) { + uid2Prize[uid].push(...con.tq) + } + }); + }) + + let title = "关卡基金优化"; + let content = "这是您的补偿，请查收！"; + let lngTitle = { + "ja": "ステージ投資仕様改善", + "zh-TW": "關卡基金改善", + "ko": "스테이지 투자 시스템 개선", + "en": "Stage Investment optimization", + }; + let lngContent = { + "en": "Please find attached a few items as a compensation for the wait during our adjustments.", + "ja": "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + "ko": "투자 시스템 개선으로 인한 보상을 보내드립니다.", + "zh-TW": "這是您的補償內容，煩請查收!" + }; + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, + }); + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} + ) + // 基金数据清除 + await G.mongodb.collection("event").updateMany( + {type: "guanqiajijin", uid: uid}, {"$set": {uid: `${uid}_patch_del`}} + ); + console.log(`玩家${uid}关卡基金奖补发完成...`); + } +} + + +/** + * 标题：特别通行证优化 + * ja:特別通行証仕様改善 + * zh-TW:特別通行證改善 + * ko:특별 통행증 시스템 개선 + * en: Special Permit optimization + + * 內文：这是您的补偿，请查收！ + * ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + * zh-TW:這是您的補償內容，煩請查收! + * ko:투자 시스템 개선으로 인한 보상을 보내드립니다. + * en: Please find attached a few items as a compensation for the wait during our adjustments. + + * 线上玩家脚本 + * 1、已购买通行证基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； + * 2、未购买的玩家活动刷新到新版本； + * 3、刷新通行证基金到未购买状态； + * */ +async function dayjiJiJinReSet() { + let w = {key: "dayjijin"}; + + // 激活了的玩家 + let _payList = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + const prizeList = [ + { + "type": "dayjijin", + "total": 5, + "pt": [ + { + "a": "item", + "t": "23", + "n": 20000 + } + ], + "tq": [ + { + "a": "item", + "t": "4", + "n": 5 + } + ] + }, + { + "type": "dayjijin", + "total": 15, + "pt": [ + { + "a": "item", + "t": "2", + "n": 200 + } + ], + "tq": [ + { + "a": "item", + "t": "2", + "n": 2000 + } + ] + }, + { + "type": "dayjijin", + "total": 30, + "pt": [ + { + "a": "item", + "t": "23", + "n": 20000 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 888 + } + ] + }, + { + "type": "dayjijin", + "total": 45, + "pt": [ + { + "a": "item", + "t": "2", + "n": 200 + } + ], + "tq": [ + { + "a": "item", + "t": "615", + "n": 1 + } + ] + }, + { + "type": "dayjijin", + "total": 60, + "pt": [ + { + "a": "item", + "t": "23", + "n": 20000 + } + ], + "tq": [ + { + "a": "item", + "t": "4", + "n": 5 + } + ] + }, + { + "type": "dayjijin", + "total": 75, + "pt": [ + { + "a": "item", + "t": "2", + "n": 300 + } + ], + "tq": [ + { + "a": "item", + "t": "2", + "n": 2000 + } + ] + }, + { + "type": "dayjijin", + "total": 90, + "pt": [ + { + "a": "item", + "t": "23", + "n": 20000 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 888 + } + ] + }, + { + "type": "dayjijin", + "total": 105, + "pt": [ + { + "a": "item", + "t": "2", + "n": 300 + } + ], + "tq": [ + { + "a": "item", + "t": "615", + "n": 1 + } + ] + }, + { + "type": "dayjijin", + "total": 120, + "pt": [ + { + "a": "item", + "t": "23", + "n": 20000 + } + ], + "tq": [ + { + "a": "item", + "t": "4", + "n": 5 + } + ] + }, + { + "type": "dayjijin", + "total": 135, + "pt": [ + { + "a": "item", + "t": "2", + "n": 400 + } + ], + "tq": [ + { + "a": "item", + "t": "2", + "n": 2000 + } + ] + }, + { + "type": "dayjijin", + "total": 150, + "pt": [ + { + "a": "item", + "t": "23", + "n": 20000 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 888 + } + ] + }, + { + "type": "dayjijin", + "total": 165, + "pt": [ + { + "a": "item", + "t": "2", + "n": 400 + } + ], + "tq": [ + { + "a": "item", + "t": "615", + "n": 1 + } + ] + }, + { + "type": "dayjijin", + "total": 180, + "pt": [ + { + "a": "item", + "t": "23", + "n": 20000 + } + ], + "tq": [ + { + "a": "item", + "t": "4", + "n": 5 + } + ] + }, + { + "type": "dayjijin", + "total": 200, + "pt": [ + { + "a": "item", + "t": "2", + "n": 500 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 1888 + } + ] + } + ]; + // 没激活不处理 + let _users = await G.mongodb.cEvent("dayjijin").find( + {uid: {$in: _payList.map(pay => pay.uid)}, type: "dayjijin"} + ).toArray(); + + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + _users.forEach(user => { + let uid = user.uid; + let idx2Type2Bool = user.rec; + if (!uid2Prize[uid]) uid2Prize[uid] = []; + + // 没领的全发 + prizeList.forEach((con, idx) => { + // 普通奖励没领 + if (!idx2Type2Bool[idx]?.pt) { + uid2Prize[uid].push(...con.pt) + } + // 高级奖励没领 + if (!idx2Type2Bool[idx]?.tq) { + uid2Prize[uid].push(...con.tq) + } + }); + }) + + let title = "特别通行证优化"; + let content = "这是您的补偿，请查收！"; + let lngTitle = { + "ja": "特別通行証仕様改善", + "zh-TW": "特別通行證改善", + "ko": "특별 통행증 시스템 개선", + "en": "Special Permit optimization", + }; + let lngContent = { + "en": "Please find attached a few items as a compensation for the wait during our adjustments.", + "ja": "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + "ko": "투자 시스템 개선으로 인한 보상을 보내드립니다.", + "zh-TW": "這是您的補償內容，煩請查收!" + }; + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, + }); + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} + ) + // 基金数据清除 + await G.mongodb.collection("event").updateMany( + {type: "dayjijin", uid: uid}, {"$set": {uid: `${uid}_patch_del`}} + ); + + console.log(`玩家${uid}通行证基金奖补发完成...`); + } +} + +/** + * 标题:特价基金优化 + * ja:特価投資仕様改善 + * zh-TW:特價基金改善 + * ko:특가 투자 시스템 개선 + * en: Value Investment optimization + + * 內文：这是您的补偿，请查收！ + * ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + * zh-TW:這是您的補償內容，煩請查收! + * ko:투자 시스템 개선으로 인한 보상을 보내드립니다. + * en: Please find attached a few items as a compensation for the wait during our adjustments. + + * 线上玩家脚本 + * 1、已购买特价基金128的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； + * 2、未购买的玩家活动刷新到新版本； + * 3、刷新月基金到未购买状态； + * */ +async function yue128JiJinReSet() { + let w = {key: "128jijin"}; + // 激活了的玩家 + let _payList = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + // 没激活不处理 + let _users = await G.mongodb.cEvent(`${128}jijin`).find( + { + "uid": {"$in": _payList.map(pay => pay.uid)}, + "type": `${128}jijin` + } + ).toArray(); + + const prizeList = [ + {a: 'item', t: '4', n: 10}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'item', t: '9', n: 2000}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'item', t: '609', n: 1}, + {a: 'item', t: '4', n: 10}, + {a: 'attr', t: 'rmbmoney', n: 500}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'item', t: '18', n: 300}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'item', t: '6', n: 20}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'item', t: '9', n: 3000}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'item', t: '4', n: 10}, + {a: 'attr', t: 'rmbmoney', n: 500}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'item', t: '20', n: 200}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'item', t: '9', n: 3000}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'attr', t: 'rmbmoney', n: 1000}, + {a: 'item', t: '628', n: 1}, + ]; + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + + _users.forEach(user => { + let uid = user.uid; + let gotarr = user.rec || []; + if (!uid2Prize[uid]) uid2Prize[uid] = []; + + // 没领的全发 + prizeList.forEach((onePrize, idx) => { + // 领过了 + if (gotarr.includes(idx)) { + return + } + uid2Prize[uid].push(onePrize) + }); + }) + + let title = "特价基金优化"; + let content = "这是您的补偿，请查收！"; + let lngTitle = { + "ja": "特価投資仕様改善", + "zh-TW": "特價基金改善", + "ko": "특가 투자 시스템 개선", + "en": "Value Investment optimization", + }; + let lngContent = { + "en": "Please find attached a few items as a compensation for the wait during our adjustments.", + "ja": "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + "ko": "투자 시스템 개선으로 인한 보상을 보내드립니다.", + "zh-TW": "這是您的補償內容，煩請查收!" + }; + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, + }); + + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} + ) + // 基金数据清除 + await G.mongodb.cEvent(`${128}jijin`).updateMany( + {uid: uid, type: `${128}jijin`}, {"$set": {uid: `${uid}_patch_del`}} + ); + + console.log(`玩家${uid}月度128基金奖补发完成...`); + } +} + +/** + * 标题：特别基金优化 + * ja:特別投資仕様改善 + * zh-TW:特別基金改善 + * ko:특별 투자 시스템 개선 + * en: Special Investment optimization + + * 內文：这是您的补偿，请查收！ + * ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + * zh-TW:這是您的補償內容，煩請查收! + * ko:투자 시스템 개선으로 인한 보상을 보내드립니다. + * en: Please find attached a few items as a compensation for the wait during our adjustments. + + * 线上玩家脚本 + * 1、已购买特别基金328的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； + * 2、未购买的玩家活动刷新到新版本； + * 3、刷新月基金到未购买状态； + * */ +async function yue328JiJinReSet() { + let w = {key: "328jijin"}; + // 激活了的玩家 + let _payList = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + // 没激活不处理 + let _users = await G.mongodb.cEvent(`${328}jijin`).find( + { + "uid": {"$in": _payList.map(pay => pay.uid)}, "type": `${328}jijin` + } + ).toArray(); + + const prizeList = [ + {a: 'item', t: '4', n: 30}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'item', t: '10', n: 300}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'item', t: '628', n: 1}, + {a: 'item', t: '4', n: 20}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'item', t: '628', n: 1}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'item', t: '628', n: 1}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'item', t: '628', n: 1}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'item', t: '4', n: 20}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'item', t: '10', n: 400}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'item', t: '10', n: 400}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'attr', t: 'rmbmoney', n: 1500}, + {a: 'item', t: '617', n: 1}, + ]; + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + + _users.forEach(user => { + let uid = user.uid; + let gotarr = user.rec || []; + if (!uid2Prize[uid]) uid2Prize[uid] = []; + + // 没领的全发 + prizeList.forEach((onePrize, idx) => { + // 领过了 + if (gotarr.includes(idx)) { + return + } + uid2Prize[uid].push(onePrize) + }); + }) + + let title = "特别基金优化"; + let content = "这是您的补偿，请查收！"; + let lngTitle = { + "ja": "特別投資仕様改善", + "zh-TW": "特別基金改善", + "ko": "특별 투자 시스템 개선", + "en": "Special Investment optimization", + }; + let lngContent = { + "en": "Please find attached a few items as a compensation for the wait during our adjustments.", + "ja": "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + "ko": "투자 시스템 개선으로 인한 보상을 보내드립니다.", + "zh-TW": "這是您的補償內容，煩請查收!" + }; + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, + }); + + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} + ) + // 基金数据清除 + await G.mongodb.cEvent(`${328}jijin`).updateMany( + {uid: uid, type: `${328}jijin`}, {"$set": {uid: `${uid}_patch_del`}} + ); + + console.log(`玩家${uid}月度128基金奖补发完成...`); + } +} + +async function start() { + await initMongoDB(); + + await shouChongReSet(); + await zhizunyueka(); + await chaozhiyueka(); + await zhongshenka(); + + await qingbaotequan(); + await zuozhantequan(); + await caifutequan(); + await jiubatequan(); + + await resetVipLiBao(); + + await rcjhReSet(); + + await dengjiJiJinReSet(); + await guanqiaJiJinReSet(); + + await dayjiJiJinReSet(); + + await yue128JiJinReSet(); + await yue328JiJinReSet(); +} + +ctor(); +start().then(() => { + setInterval(() => { + console.log(new Date().format("MM-dd hh:mm:ss")); + }, 1000) + console.log("逻辑执行完成...等待退出！！！"); +}); + + From d1750bb097fc81430dbf7b9f2a82e6940280f61d Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Wed, 20 Dec 2023 15:42:14 +0800 Subject: [PATCH 19/90] =?UTF-8?q?fix:=20=E7=8E=A9=E5=AE=B6=E9=80=80?= =?UTF-8?q?=E5=87=BA=E5=85=AC=E4=BC=9A=E6=97=B6gud=E6=AE=8B=E7=95=99ghid?= =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E7=99=BB=E5=BD=95=E6=97=B6=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/user/ApiLogin.ts | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/api_s2c/user/ApiLogin.ts b/src/api_s2c/user/ApiLogin.ts index 33ef532..6b54a15 100644 --- a/src/api_s2c/user/ApiLogin.ts +++ b/src/api_s2c/user/ApiLogin.ts @@ -132,6 +132,9 @@ async function doLogin(call: ApiCall) { //await G.redis.set('user', gud.uid, gud); await initGud(gud.uid, gud); + // 修复公会id + await fixUnionData(gud); + //记录玩家所在的进程，change: 更换到处理完踢线操作在写入。 // setUidProcessId(gud.uid); @@ -278,4 +281,19 @@ async function LoginFun(call: ApiCall) { // // G.mongodb.collection("hero").findOneAndUpdate({_id: i._id}, {$set: {shiwu: shiwuChange}}) // }) -// } \ No newline at end of file +// } + +// 修复玩家退出公会 但是gud中残留公会id +async function fixUnionData(gud: ResLogin["gud"]) { + if (gud.ghId) { + let ghdata = await G.mongodb.collection("gonghui").findOne( + {_id: G.mongodb.conversionId(gud.ghId), 'players.uid': gud.uid} + ) + if (!ghdata) { + gud.ghId = ""; + gud.ghName = ""; + gud.ghLevel = 0; + PlayerFun.changeAttr(gud.uid, {ghId: '', ghLevel: 0}) + } + } +} \ No newline at end of file From 4631cba0b3826825b6367aaad6809ecd41bf16d7 Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 20 Dec 2023 16:07:59 +0800 Subject: [PATCH 20/90] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E7=AB=9E=E8=B5=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 1792 ++++++++++++++++- package.json | 1 + src/api_s2c/event/xiaofeijingsai/ApiOpen.ts | 29 + .../protocols/event/xiaofeijingsai/PtlOpen.ts | 8 + src/shared/protocols/serviceProto.ts | 774 +++---- 5 files changed, 2191 insertions(+), 413 deletions(-) create mode 100644 src/api_s2c/event/xiaofeijingsai/ApiOpen.ts create mode 100644 src/shared/protocols/event/xiaofeijingsai/PtlOpen.ts diff --git a/package-lock.json b/package-lock.json index 824ac2d..12225a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "json5": "^2.2.3", "mathjs": "^11.4.0", "mongodb": "^4.17.1", + "node-gyp": "^10.0.1", "ramda": "^0.29.1", "redis": "^4.3.1", "shelljs": "^0.8.5", @@ -1070,6 +1071,95 @@ "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz", "integrity": "sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==" }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" + }, + "node_modules/@isaacs/cliui/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/@jridgewell/resolve-uri": { "version": "3.1.0", "resolved": "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", @@ -1104,6 +1194,79 @@ "sparse-bitfield": "^3.0.3" } }, + "node_modules/@npmcli/agent": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.0.tgz", + "integrity": "sha512-2yThA1Es98orMkpSLVqlDZAMPK3jHJhifP2gnNUdk1754uZ8yI5c+ulCoVG+WlntQA6MzhrURMXjSd9Z7dJ2/Q==", + "dependencies": { + "agent-base": "^7.1.0", + "http-proxy-agent": "^7.0.0", + "https-proxy-agent": "^7.0.1", + "lru-cache": "^10.0.1", + "socks-proxy-agent": "^8.0.1" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/agent/node_modules/lru-cache": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz", + "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==", + "engines": { + "node": "14 || >=16.14" + } + }, + "node_modules/@npmcli/fs": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz", + "integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==", + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/fs/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@npmcli/fs/node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@npmcli/fs/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "optional": true, + "engines": { + "node": ">=14" + } + }, "node_modules/@redis/bloom": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@redis/bloom/-/bloom-1.0.2.tgz", @@ -1292,6 +1455,14 @@ "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", "dev": true }, + "node_modules/abbrev": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", + "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", @@ -1333,6 +1504,50 @@ "node": ">=0.8" } }, + "node_modules/agent-base": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", + "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==", + "dependencies": { + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/agent-base/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/agent-base/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "node_modules/aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "dependencies": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/ansi-colors": { "version": "4.1.1", "resolved": "https://registry.npmmirror.com/ansi-colors/-/ansi-colors-4.1.1.tgz", @@ -1358,7 +1573,6 @@ "version": "5.0.1", "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, "engines": { "node": ">=8" } @@ -1583,6 +1797,79 @@ "node": ">= 0.8" } }, + "node_modules/cacache": { + "version": "18.0.1", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.1.tgz", + "integrity": "sha512-g4Uf2CFZPaxtJKre6qr4zqLDOOPU7bNVhWjlNhvzc51xaTOx2noMOLhfFkTAqwtrAZAKQUuDfyjitzilpA8WsQ==", + "dependencies": { + "@npmcli/fs": "^3.1.0", + "fs-minipass": "^3.0.0", + "glob": "^10.2.2", + "lru-cache": "^10.0.1", + "minipass": "^7.0.3", + "minipass-collect": "^2.0.1", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "p-map": "^4.0.0", + "ssri": "^10.0.0", + "tar": "^6.1.11", + "unique-filename": "^3.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/cacache/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/cacache/node_modules/glob": { + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/cacache/node_modules/lru-cache": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz", + "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==", + "engines": { + "node": "14 || >=16.14" + } + }, + "node_modules/cacache/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/call-bind": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz", @@ -1668,6 +1955,22 @@ "fsevents": "~2.3.2" } }, + "node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "engines": { + "node": ">=10" + } + }, + "node_modules/clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "engines": { + "node": ">=6" + } + }, "node_modules/cli-cursor": { "version": "3.1.0", "resolved": "https://registry.npmmirror.com/cli-cursor/-/cli-cursor-3.1.0.tgz", @@ -1890,7 +2193,6 @@ "version": "7.0.3", "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -1909,7 +2211,6 @@ "version": "4.3.3", "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.3.tgz", "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", - "dev": true, "dependencies": { "ms": "2.1.2" }, @@ -1925,8 +2226,7 @@ "node_modules/debug/node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/decamelize": { "version": "4.0.0", @@ -1993,6 +2293,11 @@ "node": ">=0.3.1" } }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" + }, "node_modules/editorconfig": { "version": "0.15.3", "resolved": "https://registry.npmmirror.com/editorconfig/-/editorconfig-0.15.3.tgz", @@ -2016,8 +2321,7 @@ "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "node_modules/encodeurl": { "version": "1.0.2", @@ -2027,6 +2331,27 @@ "node": ">= 0.8" } }, + "node_modules/encoding": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", + "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "optional": true, + "dependencies": { + "iconv-lite": "^0.6.2" + } + }, + "node_modules/encoding/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "optional": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmmirror.com/end-of-stream/-/end-of-stream-1.4.4.tgz", @@ -2036,6 +2361,19 @@ "once": "^1.4.0" } }, + "node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "engines": { + "node": ">=6" + } + }, + "node_modules/err-code": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", + "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==" + }, "node_modules/escalade": { "version": "3.1.1", "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz", @@ -2092,6 +2430,11 @@ "node": ">=10" } }, + "node_modules/exponential-backoff": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", + "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==" + }, "node_modules/express": { "version": "4.18.2", "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", @@ -2280,6 +2623,32 @@ } } }, + "node_modules/foreground-child": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", + "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/foreground-child/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/form-data": { "version": "2.5.1", "resolved": "https://registry.npmmirror.com/form-data/-/form-data-2.5.1.tgz", @@ -2339,6 +2708,17 @@ "node": ">=12" } }, + "node_modules/fs-minipass": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -2486,8 +2866,7 @@ "node_modules/graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" }, "node_modules/growl": { "version": "1.10.5", @@ -2559,6 +2938,11 @@ "node": ">=6.0.0" } }, + "node_modules/http-cache-semantics": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==" + }, "node_modules/http-errors": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", @@ -2574,6 +2958,39 @@ "node": ">= 0.8" } }, + "node_modules/http-proxy-agent": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz", + "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==", + "dependencies": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/http-proxy-agent/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/http-proxy-agent/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, "node_modules/http-response-object": { "version": "3.0.2", "resolved": "https://registry.npmmirror.com/http-response-object/-/http-response-object-3.0.2.tgz", @@ -2587,6 +3004,18 @@ "resolved": "https://registry.npmmirror.com/@types/node/-/node-10.17.60.tgz", "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==" }, + "node_modules/https-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz", + "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==", + "dependencies": { + "agent-base": "^7.0.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" + } + }, "node_modules/human-signals": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/human-signals/-/human-signals-1.1.1.tgz", @@ -2621,6 +3050,22 @@ "node": ">= 4" } }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "engines": { + "node": ">=8" + } + }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmmirror.com/inflight/-/inflight-1.0.6.tgz", @@ -2771,7 +3216,6 @@ "version": "3.0.0", "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, "engines": { "node": ">=8" } @@ -2797,6 +3241,11 @@ "node": ">=8" } }, + "node_modules/is-lambda": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", + "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==" + }, "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz", @@ -2842,8 +3291,24 @@ "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + }, + "node_modules/jackspeak": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } }, "node_modules/javascript-natural-sort": { "version": "0.7.1", @@ -2985,6 +3450,27 @@ "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", "dev": true }, + "node_modules/make-fetch-happen": { + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz", + "integrity": "sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A==", + "dependencies": { + "@npmcli/agent": "^2.0.0", + "cacache": "^18.0.0", + "http-cache-semantics": "^4.1.1", + "is-lambda": "^1.0.1", + "minipass": "^7.0.2", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "ssri": "^10.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, "node_modules/map-age-cleaner": { "version": "0.1.3", "resolved": "https://registry.npmmirror.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", @@ -3123,6 +3609,161 @@ "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", "dev": true }, + "node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/minipass-collect": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", + "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/minipass-fetch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz", + "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==", + "dependencies": { + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/minipass-flush": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", + "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minipass-flush/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-flush/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/minipass-pipeline": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", + "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-pipeline/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-pipeline/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/minipass-sized": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", + "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-sized/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-sized/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minizlib/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/mocha": { "version": "9.2.2", "resolved": "https://registry.npmmirror.com/mocha/-/mocha-9.2.2.tgz", @@ -3219,6 +3860,138 @@ "node": ">= 0.6" } }, + "node_modules/node-gyp": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.0.1.tgz", + "integrity": "sha512-gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg==", + "dependencies": { + "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", + "glob": "^10.3.10", + "graceful-fs": "^4.2.6", + "make-fetch-happen": "^13.0.0", + "nopt": "^7.0.0", + "proc-log": "^3.0.0", + "semver": "^7.3.5", + "tar": "^6.1.2", + "which": "^4.0.0" + }, + "bin": { + "node-gyp": "bin/node-gyp.js" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/node-gyp/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/node-gyp/node_modules/glob": { + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/node-gyp/node_modules/isexe": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", + "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", + "engines": { + "node": ">=16" + } + }, + "node_modules/node-gyp/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/node-gyp/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/node-gyp/node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/node-gyp/node_modules/which": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", + "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "dependencies": { + "isexe": "^3.1.1" + }, + "bin": { + "node-which": "bin/which.js" + }, + "engines": { + "node": "^16.13.0 || >=18.0.0" + } + }, + "node_modules/node-gyp/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/nopt": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.0.tgz", + "integrity": "sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA==", + "dependencies": { + "abbrev": "^2.0.0" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz", @@ -3379,6 +4152,20 @@ "node": ">=10" } }, + "node_modules/p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/parse-cache-control": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/parse-cache-control/-/parse-cache-control-1.0.1.tgz", @@ -3413,7 +4200,6 @@ "version": "3.1.1", "resolved": "https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, "engines": { "node": ">=8" } @@ -3423,6 +4209,29 @@ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" }, + "node_modules/path-scurry": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", + "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", + "dependencies": { + "lru-cache": "^9.1.1 || ^10.0.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-scurry/node_modules/lru-cache": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz", + "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==", + "engines": { + "node": "14 || >=16.14" + } + }, "node_modules/path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", @@ -3437,6 +4246,14 @@ "node": ">=8.6" } }, + "node_modules/proc-log": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz", + "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -3450,6 +4267,18 @@ "asap": "~2.0.6" } }, + "node_modules/promise-retry": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", + "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", + "dependencies": { + "err-code": "^2.0.2", + "retry": "^0.12.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", @@ -3654,6 +4483,14 @@ "node": ">=8" } }, + "node_modules/retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", + "engines": { + "node": ">= 4" + } + }, "node_modules/run-async": { "version": "2.4.1", "resolved": "https://registry.npmmirror.com/run-async/-/run-async-2.4.1.tgz", @@ -3764,7 +4601,6 @@ "version": "2.0.0", "resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, "dependencies": { "shebang-regex": "^3.0.0" }, @@ -3776,7 +4612,6 @@ "version": "3.0.0", "resolved": "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, "engines": { "node": ">=8" } @@ -3841,6 +4676,40 @@ "npm": ">= 3.0.0" } }, + "node_modules/socks-proxy-agent": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz", + "integrity": "sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==", + "dependencies": { + "agent-base": "^7.0.2", + "debug": "^4.3.4", + "socks": "^2.7.1" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/socks-proxy-agent/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/socks-proxy-agent/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, "node_modules/sparse-bitfield": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", @@ -3861,6 +4730,17 @@ "node": ">=0.8" } }, + "node_modules/ssri": { + "version": "10.0.5", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz", + "integrity": "sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/standard-as-callback": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz", @@ -3887,7 +4767,20 @@ "version": "4.2.3", "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -3901,7 +4794,18 @@ "version": "6.0.1", "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -3977,6 +4881,57 @@ "get-port": "^3.1.0" } }, + "node_modules/tar": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz", + "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==", + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^5.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/tar/node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/tar/node_modules/fs-minipass/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/tar/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/tar/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, "node_modules/then-request": { "version": "6.0.2", "resolved": "https://registry.npmmirror.com/then-request/-/then-request-6.0.2.tgz", @@ -4318,6 +5273,28 @@ "typescript": "^2.1.6 || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev" } }, + "node_modules/unique-filename": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", + "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "dependencies": { + "unique-slug": "^4.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/unique-slug": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", + "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "dependencies": { + "imurmurhash": "^0.1.4" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/universalify": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/universalify/-/universalify-2.0.0.tgz", @@ -4403,7 +5380,6 @@ "version": "2.0.2", "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, "dependencies": { "isexe": "^2.0.0" }, @@ -4450,6 +5426,23 @@ "node": ">=10" } }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz", @@ -5456,6 +6449,64 @@ "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz", "integrity": "sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==" }, + "@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "requires": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==" + }, + "ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==" + }, + "emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" + }, + "string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "requires": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + } + }, + "strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "requires": { + "ansi-regex": "^6.0.1" + } + }, + "wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "requires": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + } + } + } + }, "@jridgewell/resolve-uri": { "version": "3.1.0", "resolved": "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", @@ -5487,6 +6538,62 @@ "sparse-bitfield": "^3.0.3" } }, + "@npmcli/agent": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.0.tgz", + "integrity": "sha512-2yThA1Es98orMkpSLVqlDZAMPK3jHJhifP2gnNUdk1754uZ8yI5c+ulCoVG+WlntQA6MzhrURMXjSd9Z7dJ2/Q==", + "requires": { + "agent-base": "^7.1.0", + "http-proxy-agent": "^7.0.0", + "https-proxy-agent": "^7.0.1", + "lru-cache": "^10.0.1", + "socks-proxy-agent": "^8.0.1" + }, + "dependencies": { + "lru-cache": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz", + "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==" + } + } + }, + "@npmcli/fs": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz", + "integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==", + "requires": { + "semver": "^7.3.5" + }, + "dependencies": { + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "requires": { + "yallist": "^4.0.0" + } + }, + "semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "requires": { + "lru-cache": "^6.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + } + }, + "@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "optional": true + }, "@redis/bloom": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@redis/bloom/-/bloom-1.0.2.tgz", @@ -5660,6 +6767,11 @@ "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", "dev": true }, + "abbrev": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", + "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==" + }, "accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", @@ -5686,6 +6798,38 @@ "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz", "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==" }, + "agent-base": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", + "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==", + "requires": { + "debug": "^4.3.4" + }, + "dependencies": { + "debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, + "aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "requires": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + } + }, "ansi-colors": { "version": "4.1.1", "resolved": "https://registry.npmmirror.com/ansi-colors/-/ansi-colors-4.1.1.tgz", @@ -5704,8 +6848,7 @@ "ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" }, "ansi-styles": { "version": "4.3.0", @@ -5892,6 +7035,60 @@ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" }, + "cacache": { + "version": "18.0.1", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.1.tgz", + "integrity": "sha512-g4Uf2CFZPaxtJKre6qr4zqLDOOPU7bNVhWjlNhvzc51xaTOx2noMOLhfFkTAqwtrAZAKQUuDfyjitzilpA8WsQ==", + "requires": { + "@npmcli/fs": "^3.1.0", + "fs-minipass": "^3.0.0", + "glob": "^10.2.2", + "lru-cache": "^10.0.1", + "minipass": "^7.0.3", + "minipass-collect": "^2.0.1", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "p-map": "^4.0.0", + "ssri": "^10.0.0", + "tar": "^6.1.11", + "unique-filename": "^3.0.0" + }, + "dependencies": { + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "requires": { + "balanced-match": "^1.0.0" + } + }, + "glob": { + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", + "requires": { + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + } + }, + "lru-cache": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz", + "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==" + }, + "minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "requires": { + "brace-expansion": "^2.0.1" + } + } + } + }, "call-bind": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz", @@ -5962,6 +7159,16 @@ "readdirp": "~3.6.0" } }, + "chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" + }, + "clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==" + }, "cli-cursor": { "version": "3.1.0", "resolved": "https://registry.npmmirror.com/cli-cursor/-/cli-cursor-3.1.0.tgz", @@ -6141,7 +7348,6 @@ "version": "7.0.3", "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, "requires": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -6157,7 +7363,6 @@ "version": "4.3.3", "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.3.tgz", "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", - "dev": true, "requires": { "ms": "2.1.2" }, @@ -6165,8 +7370,7 @@ "ms": { "version": "2.1.2", "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" } } }, @@ -6216,6 +7420,11 @@ "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", "dev": true }, + "eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" + }, "editorconfig": { "version": "0.15.3", "resolved": "https://registry.npmmirror.com/editorconfig/-/editorconfig-0.15.3.tgz", @@ -6236,14 +7445,33 @@ "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" }, + "encoding": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", + "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "optional": true, + "requires": { + "iconv-lite": "^0.6.2" + }, + "dependencies": { + "iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "optional": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + } + } + } + }, "end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmmirror.com/end-of-stream/-/end-of-stream-1.4.4.tgz", @@ -6253,6 +7481,16 @@ "once": "^1.4.0" } }, + "env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==" + }, + "err-code": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", + "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==" + }, "escalade": { "version": "3.1.1", "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz", @@ -6297,6 +7535,11 @@ "strip-final-newline": "^2.0.0" } }, + "exponential-backoff": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", + "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==" + }, "express": { "version": "4.18.2", "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", @@ -6446,6 +7689,22 @@ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==" }, + "foreground-child": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", + "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "requires": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "dependencies": { + "signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==" + } + } + }, "form-data": { "version": "2.5.1", "resolved": "https://registry.npmmirror.com/form-data/-/form-data-2.5.1.tgz", @@ -6487,6 +7746,14 @@ "universalify": "^2.0.0" } }, + "fs-minipass": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "requires": { + "minipass": "^7.0.3" + } + }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -6604,8 +7871,7 @@ "graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" }, "growl": { "version": "1.10.5", @@ -6656,6 +7922,11 @@ "parse-cache-control": "^1.0.1" } }, + "http-cache-semantics": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==" + }, "http-errors": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", @@ -6668,6 +7939,30 @@ "toidentifier": "1.0.1" } }, + "http-proxy-agent": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz", + "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==", + "requires": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + }, + "dependencies": { + "debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, "http-response-object": { "version": "3.0.2", "resolved": "https://registry.npmmirror.com/http-response-object/-/http-response-object-3.0.2.tgz", @@ -6683,6 +7978,15 @@ } } }, + "https-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz", + "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==", + "requires": { + "agent-base": "^7.0.2", + "debug": "4" + } + }, "human-signals": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/human-signals/-/human-signals-1.1.1.tgz", @@ -6708,6 +8012,16 @@ "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", "dev": true }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==" + }, + "indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" + }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmmirror.com/inflight/-/inflight-1.0.6.tgz", @@ -6823,8 +8137,7 @@ "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "is-glob": { "version": "4.0.3", @@ -6841,6 +8154,11 @@ "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", "dev": true }, + "is-lambda": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", + "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==" + }, "is-number": { "version": "7.0.0", "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz", @@ -6874,8 +8192,16 @@ "isexe": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + }, + "jackspeak": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "requires": { + "@isaacs/cliui": "^8.0.2", + "@pkgjs/parseargs": "^0.11.0" + } }, "javascript-natural-sort": { "version": "0.7.1", @@ -6997,6 +8323,24 @@ "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", "dev": true }, + "make-fetch-happen": { + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz", + "integrity": "sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A==", + "requires": { + "@npmcli/agent": "^2.0.0", + "cacache": "^18.0.0", + "http-cache-semantics": "^4.1.1", + "is-lambda": "^1.0.1", + "minipass": "^7.0.2", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "ssri": "^10.0.0" + } + }, "map-age-cleaner": { "version": "0.1.3", "resolved": "https://registry.npmmirror.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", @@ -7099,6 +8443,128 @@ "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", "dev": true }, + "minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==" + }, + "minipass-collect": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", + "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==", + "requires": { + "minipass": "^7.0.3" + } + }, + "minipass-fetch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz", + "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==", + "requires": { + "encoding": "^0.1.13", + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + } + }, + "minipass-flush": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", + "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", + "requires": { + "minipass": "^3.0.0" + }, + "dependencies": { + "minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "requires": { + "yallist": "^4.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + } + }, + "minipass-pipeline": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", + "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", + "requires": { + "minipass": "^3.0.0" + }, + "dependencies": { + "minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "requires": { + "yallist": "^4.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + } + }, + "minipass-sized": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", + "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", + "requires": { + "minipass": "^3.0.0" + }, + "dependencies": { + "minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "requires": { + "yallist": "^4.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + } + }, + "minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "requires": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "dependencies": { + "minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "requires": { + "yallist": "^4.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + } + }, + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + }, "mocha": { "version": "9.2.2", "resolved": "https://registry.npmmirror.com/mocha/-/mocha-9.2.2.tgz", @@ -7174,6 +8640,95 @@ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" }, + "node-gyp": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.0.1.tgz", + "integrity": "sha512-gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg==", + "requires": { + "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", + "glob": "^10.3.10", + "graceful-fs": "^4.2.6", + "make-fetch-happen": "^13.0.0", + "nopt": "^7.0.0", + "proc-log": "^3.0.0", + "semver": "^7.3.5", + "tar": "^6.1.2", + "which": "^4.0.0" + }, + "dependencies": { + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "requires": { + "balanced-match": "^1.0.0" + } + }, + "glob": { + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", + "requires": { + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + } + }, + "isexe": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", + "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==" + }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "requires": { + "yallist": "^4.0.0" + } + }, + "minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "requires": { + "brace-expansion": "^2.0.1" + } + }, + "semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "requires": { + "lru-cache": "^6.0.0" + } + }, + "which": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", + "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "requires": { + "isexe": "^3.1.1" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + } + }, + "nopt": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.0.tgz", + "integrity": "sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA==", + "requires": { + "abbrev": "^2.0.0" + } + }, "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz", @@ -7298,6 +8853,14 @@ "p-limit": "^3.0.2" } }, + "p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "requires": { + "aggregate-error": "^3.0.0" + } + }, "parse-cache-control": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/parse-cache-control/-/parse-cache-control-1.0.1.tgz", @@ -7322,14 +8885,29 @@ "path-key": { "version": "3.1.1", "resolved": "https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" }, "path-parse": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" }, + "path-scurry": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", + "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", + "requires": { + "lru-cache": "^9.1.1 || ^10.0.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "dependencies": { + "lru-cache": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz", + "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==" + } + } + }, "path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", @@ -7341,6 +8919,11 @@ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true }, + "proc-log": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz", + "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==" + }, "process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -7354,6 +8937,15 @@ "asap": "~2.0.6" } }, + "promise-retry": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", + "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", + "requires": { + "err-code": "^2.0.2", + "retry": "^0.12.0" + } + }, "proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", @@ -7512,6 +9104,11 @@ "signal-exit": "^3.0.2" } }, + "retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==" + }, "run-async": { "version": "2.4.1", "resolved": "https://registry.npmmirror.com/run-async/-/run-async-2.4.1.tgz", @@ -7614,7 +9211,6 @@ "version": "2.0.0", "resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, "requires": { "shebang-regex": "^3.0.0" } @@ -7622,8 +9218,7 @@ "shebang-regex": { "version": "3.0.0", "resolved": "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" }, "shelljs": { "version": "0.8.5", @@ -7671,6 +9266,31 @@ "smart-buffer": "^4.2.0" } }, + "socks-proxy-agent": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz", + "integrity": "sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==", + "requires": { + "agent-base": "^7.0.2", + "debug": "^4.3.4", + "socks": "^2.7.1" + }, + "dependencies": { + "debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, "sparse-bitfield": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", @@ -7688,6 +9308,14 @@ "frac": "~1.1.2" } }, + "ssri": { + "version": "10.0.5", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz", + "integrity": "sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==", + "requires": { + "minipass": "^7.0.3" + } + }, "standard-as-callback": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz", @@ -7711,7 +9339,16 @@ "version": "4.2.3", "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, + "string-width-cjs": { + "version": "npm:string-width@4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -7722,7 +9359,14 @@ "version": "6.0.1", "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + } + }, + "strip-ansi-cjs": { + "version": "npm:strip-ansi@6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "requires": { "ansi-regex": "^5.0.1" } @@ -7777,6 +9421,49 @@ "get-port": "^3.1.0" } }, + "tar": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz", + "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==", + "requires": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^5.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "dependencies": { + "fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "requires": { + "minipass": "^3.0.0" + }, + "dependencies": { + "minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "requires": { + "yallist": "^4.0.0" + } + } + } + }, + "minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==" + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + } + }, "then-request": { "version": "6.0.2", "resolved": "https://registry.npmmirror.com/then-request/-/then-request-6.0.2.tgz", @@ -8046,6 +9733,22 @@ "editorconfig": "^0.15.0" } }, + "unique-filename": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", + "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "requires": { + "unique-slug": "^4.0.0" + } + }, + "unique-slug": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", + "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "requires": { + "imurmurhash": "^0.1.4" + } + }, "universalify": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/universalify/-/universalify-2.0.0.tgz", @@ -8110,7 +9813,6 @@ "version": "2.0.2", "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, "requires": { "isexe": "^2.0.0" } @@ -8142,6 +9844,16 @@ "strip-ansi": "^6.0.0" } }, + "wrap-ansi-cjs": { + "version": "npm:wrap-ansi@7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz", diff --git a/package.json b/package.json index 99faaea..ccc3f16 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "json5": "^2.2.3", "mathjs": "^11.4.0", "mongodb": "^4.17.1", + "node-gyp": "^10.0.1", "ramda": "^0.29.1", "redis": "^4.3.1", "shelljs": "^0.8.5", diff --git a/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts b/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts new file mode 100644 index 0000000..79c06bb --- /dev/null +++ b/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts @@ -0,0 +1,29 @@ +import {ApiCall} from "tsrpc"; +import {ReqOpen, ResOpen} from "../../../shared/protocols/event/xiaofeijingsai/PtlOpen"; +import {PayFun} from "../../../public/pay"; +import {HuoDongFun} from "../../../public/huodongfun"; +import {PublicShared} from "../../../shared/public/public"; + + +export default async function (call: ApiCall) { + // let data = await G.mongodb.cEvent('zhoumolibao').findOne({uid: call.uid, type: 'zhoumolibao'}) + // + let _hd = (await HuoDongFun.gethdList(call, 11))[0] + console.log(_hd) + // + // let payIds = _hd?.data?.gift?.filter(i => i.payId)?.map(i => i.payId) + // let a = [] + let rmbuse = await G.mongodb.collection('rmbuse').aggregate([ + {$match: {isAdd: false}}, + {$group: {_id: "$uid", total: {$sum: "$change"}}}, + {$sort: {total: 1}} + ]).toArray() + + let list: any = rmbuse.map(i => ({...i, total: R.negate(i.total)})) + + let users = await G.mongodb.collection('user').find({uid: {$in: list.map(i => i._id)}}).toArray() + + list = list.map(i => ({...i, player: users.find(v => v.uid == i._id)})) + + call.succ({list}) +} \ No newline at end of file diff --git a/src/shared/protocols/event/xiaofeijingsai/PtlOpen.ts b/src/shared/protocols/event/xiaofeijingsai/PtlOpen.ts new file mode 100644 index 0000000..5145ee7 --- /dev/null +++ b/src/shared/protocols/event/xiaofeijingsai/PtlOpen.ts @@ -0,0 +1,8 @@ +/** + * 消费竞赛 + */ +export type ReqOpen = {}; + +export type ResOpen = { + list: any[] +}; \ No newline at end of file diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index c60ab37..4bb9ce9 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -80,39 +80,40 @@ import { ReqDuihuan, ResDuihuan } from './event/xianshizhaomu/PtlDuihuan'; import { ReqLottery as ReqLottery_1, ResLottery as ResLottery_1 } from './event/xianshizhaomu/PtlLottery'; import { ReqOpen as ReqOpen_20, ResOpen as ResOpen_20 } from './event/xianshizhaomu/PtlOpen'; import { ReqRec as ReqRec_7, ResRec as ResRec_7 } from './event/xianshizhaomu/PtlRec'; -import { ReqOpen as ReqOpen_21, ResOpen as ResOpen_21 } from './event/xinshoulibao/PtlOpen'; +import { ReqOpen as ReqOpen_21, ResOpen as ResOpen_21 } from './event/xiaofeijingsai/PtlOpen'; +import { ReqOpen as ReqOpen_22, ResOpen as ResOpen_22 } from './event/xinshoulibao/PtlOpen'; import { ReqBuy as ReqBuy_2, ResBuy as ResBuy_2 } from './event/yangchengmubiao/PtlBuy'; -import { ReqOpen as ReqOpen_22, ResOpen as ResOpen_22 } from './event/yangchengmubiao/PtlOpen'; +import { ReqOpen as ReqOpen_23, ResOpen as ResOpen_23 } from './event/yangchengmubiao/PtlOpen'; import { ReqRec as ReqRec_8, ResRec as ResRec_8 } from './event/yangchengmubiao/PtlRec'; -import { ReqOpen as ReqOpen_23, ResOpen as ResOpen_23 } from './event/yibaichou/PtlOpen'; +import { ReqOpen as ReqOpen_24, ResOpen as ResOpen_24 } from './event/yibaichou/PtlOpen'; import { ReqRec as ReqRec_9, ResRec as ResRec_9 } from './event/yibaichou/PtlRec'; import { ReqRecAll, ResRecAll } from './event/yibaichou/PtlRecAll'; -import { ReqOpen as ReqOpen_24, ResOpen as ResOpen_24 } from './event/yuedujijin/PtlOpen'; +import { ReqOpen as ReqOpen_25, ResOpen as ResOpen_25 } from './event/yuedujijin/PtlOpen'; import { ReqRec as ReqRec_10, ResRec as ResRec_10 } from './event/yuedujijin/PtlRec'; import { ReqBuyLv, ResBuyLv } from './event/zhanling/PtlBuyLv'; -import { ReqOpen as ReqOpen_25, ResOpen as ResOpen_25 } from './event/zhanling/PtlOpen'; +import { ReqOpen as ReqOpen_26, ResOpen as ResOpen_26 } from './event/zhanling/PtlOpen'; import { ReqRecPrize as ReqRecPrize_2, ResRecPrize as ResRecPrize_2 } from './event/zhanling/PtlRecPrize'; import { ReqRecTask, ResRecTask } from './event/zhanling/PtlRecTask'; -import { ReqOpen as ReqOpen_26, ResOpen as ResOpen_26 } from './event/zhoulibao/PtlOpen'; -import { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } from './event/zhoumolibao/PtlOpen'; +import { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } from './event/zhoulibao/PtlOpen'; +import { ReqOpen as ReqOpen_28, ResOpen as ResOpen_28 } from './event/zhoumolibao/PtlOpen'; import { ReqReceive as ReqReceive_3, ResReceive as ResReceive_3 } from './event/zhoumolibao/PtlReceive'; import { ReqBuy as ReqBuy_3, ResBuy as ResBuy_3 } from './event/zixuanlibao/PtlBuy'; -import { ReqOpen as ReqOpen_28, ResOpen as ResOpen_28 } from './event/zixuanlibao/PtlOpen'; +import { ReqOpen as ReqOpen_29, ResOpen as ResOpen_29 } from './event/zixuanlibao/PtlOpen'; import { ReqhdGetList, ReshdGetList } from './eventlist/PtlhdGetList'; import { ReqApply, ResApply } from './friend/PtlApply'; import { ReqDel, ResDel } from './friend/PtlDel'; import { ReqGift, ResGift } from './friend/PtlGift'; import { ReqList, ResList } from './friend/PtlList'; -import { ReqOpen as ReqOpen_29, ResOpen as ResOpen_29 } from './friend/PtlOpen'; +import { ReqOpen as ReqOpen_30, ResOpen as ResOpen_30 } from './friend/PtlOpen'; import { ReqRespond, ResRespond } from './friend/PtlRespond'; import { ReqRmBlackList, ResRmBlackList } from './friend/PtlRmBlackList'; import { ReqSearch, ResSearch } from './friend/PtlSearch'; import { ReqChallenge, ResChallenge } from './ganbutexun/PtlChallenge'; -import { ReqOpen as ReqOpen_30, ResOpen as ResOpen_30 } from './ganbutexun/PtlOpen'; +import { ReqOpen as ReqOpen_31, ResOpen as ResOpen_31 } from './ganbutexun/PtlOpen'; import { ReqFast, ResFast } from './ganhai/PtlFast'; import { ReqFight as ReqFight_1, ResFight as ResFight_1 } from './ganhai/PtlFight'; import { ReqLog, ResLog } from './ganhai/PtlLog'; -import { ReqOpen as ReqOpen_31, ResOpen as ResOpen_31 } from './ganhai/PtlOpen'; +import { ReqOpen as ReqOpen_32, ResOpen as ResOpen_32 } from './ganhai/PtlOpen'; import { ReqRefresh, ResRefresh } from './ganhai/PtlRefresh'; import { ReqRefreshShip, ResRefreshShip } from './ganhai/PtlRefreshShip'; import { ReqSelect as ReqSelect_1, ResSelect as ResSelect_1 } from './ganhai/PtlSelect'; @@ -134,19 +135,19 @@ import { ReqJx, ResJx } from './gonghui/PtlJx'; import { ReqJxOpen, ResJxOpen } from './gonghui/PtlJxOpen'; import { ReqList as ReqList_1, ResList as ResList_1 } from './gonghui/PtlList'; import { ReqManage, ResManage } from './gonghui/PtlManage'; -import { ReqOpen as ReqOpen_32, ResOpen as ResOpen_32 } from './gonghui/PtlOpen'; +import { ReqOpen as ReqOpen_33, ResOpen as ResOpen_33 } from './gonghui/PtlOpen'; import { ReqTanHe, ResTanHe } from './gonghui/PtlTanHe'; import { ReqTaskOpen, ResTaskOpen } from './gonghui/PtlTaskOpen'; import { ReqTaskReceive, ResTaskReceive } from './gonghui/PtlTaskReceive'; import { ReqUpWz, ResUpWz } from './gonghui/PtlUpWz'; import { ReqLottery as ReqLottery_2, ResLottery as ResLottery_2 } from './gonghuibaozang/PtlLottery'; -import { ReqOpen as ReqOpen_33, ResOpen as ResOpen_33 } from './gonghuibaozang/PtlOpen'; +import { ReqOpen as ReqOpen_34, ResOpen as ResOpen_34 } from './gonghuibaozang/PtlOpen'; import { ReqBuy as ReqBuy_4, ResBuy as ResBuy_4 } from './gonglukuangbiao/PtlBuy'; import { ReqFight as ReqFight_2, ResFight as ResFight_2 } from './gonglukuangbiao/PtlFight'; -import { ReqOpen as ReqOpen_34, ResOpen as ResOpen_34 } from './gonglukuangbiao/PtlOpen'; +import { ReqOpen as ReqOpen_35, ResOpen as ResOpen_35 } from './gonglukuangbiao/PtlOpen'; import { ReqRefresh as ReqRefresh_1, ResRefresh as ResRefresh_1 } from './gonglukuangbiao/PtlRefresh'; import { ReqActive, ResActive } from './gongyu/mingdao/PtlActive'; -import { ReqOpen as ReqOpen_35, ResOpen as ResOpen_35 } from './gongyu/mingdao/PtlOpen'; +import { ReqOpen as ReqOpen_36, ResOpen as ResOpen_36 } from './gongyu/mingdao/PtlOpen'; import { ReqRecPrize as ReqRecPrize_3, ResRecPrize as ResRecPrize_3 } from './gongyu/mingdao/PtlRecPrize'; import { ReqRepair, ResRepair } from './gongyu/mingdao/PtlRepair'; import { ReqReset as ReqReset_1, ResReset as ResReset_1 } from './gongyu/xunlianjihua/PtlReset'; @@ -155,14 +156,14 @@ import { ReqSetSkill, ResSetSkill } from './gongyu/zuozhanjihua/PtlSetSkill'; import { ReqBuyNum as ReqBuyNum_1, ResBuyNum as ResBuyNum_1 } from './hbzb/jfs/PtlBuyNum'; import { ReqFight as ReqFight_3, ResFight as ResFight_3 } from './hbzb/jfs/PtlFight'; import { ReqGetLog as ReqGetLog_1, ResGetLog as ResGetLog_1 } from './hbzb/jfs/PtlGetLog'; -import { ReqOpen as ReqOpen_36, ResOpen as ResOpen_36 } from './hbzb/jfs/PtlOpen'; +import { ReqOpen as ReqOpen_37, ResOpen as ResOpen_37 } from './hbzb/jfs/PtlOpen'; import { ReqRec as ReqRec_11, ResRec as ResRec_11 } from './hbzb/jfs/PtlRec'; import { ReqRefresh as ReqRefresh_2, ResRefresh as ResRefresh_2 } from './hbzb/jfs/PtlRefresh'; import { ReqGetStatus, ResGetStatus } from './hbzb/PtlGetStatus'; import { ReqBuyNum as ReqBuyNum_2, ResBuyNum as ResBuyNum_2 } from './hbzb/zbs/PtlBuyNum'; import { ReqFight as ReqFight_4, ResFight as ResFight_4 } from './hbzb/zbs/PtlFight'; import { ReqGetLog as ReqGetLog_2, ResGetLog as ResGetLog_2 } from './hbzb/zbs/PtlGetLog'; -import { ReqOpen as ReqOpen_37, ResOpen as ResOpen_37 } from './hbzb/zbs/PtlOpen'; +import { ReqOpen as ReqOpen_38, ResOpen as ResOpen_38 } from './hbzb/zbs/PtlOpen'; import { ReqRefresh as ReqRefresh_3, ResRefresh as ResRefresh_3 } from './hbzb/zbs/PtlRefresh'; import { ReqAwake, ResAwake } from './hero/PtlAwake'; import { ReqChangePos, ResChangePos } from './hero/PtlChangePos'; @@ -178,16 +179,16 @@ import { ReqGet as ReqGet_2, ResGet as ResGet_2 } from './hongdian/PtlGet'; import { ReqGetList as ReqGetList_4, ResGetList as ResGetList_4 } from './item/PtlGetList'; import { ReqUse, ResUse } from './item/PtlUse'; import { ReqLottery as ReqLottery_3, ResLottery as ResLottery_3 } from './jiaotang/PtlLottery'; -import { ReqOpen as ReqOpen_38, ResOpen as ResOpen_38 } from './jiaotang/PtlOpen'; +import { ReqOpen as ReqOpen_39, ResOpen as ResOpen_39 } from './jiaotang/PtlOpen'; import { ReqLottery as ReqLottery_4, ResLottery as ResLottery_4 } from './jiuba/PtlLottery'; -import { ReqOpen as ReqOpen_39, ResOpen as ResOpen_39 } from './jiuba/PtlOpen'; +import { ReqOpen as ReqOpen_40, ResOpen as ResOpen_40 } from './jiuba/PtlOpen'; import { ReqBuyFightNum, ResBuyFightNum } from './jjc/PtlBuyFightNum'; import { ReqFight as ReqFight_5, ResFight as ResFight_5 } from './jjc/PtlFight'; import { ReqFightLog, ResFightLog } from './jjc/PtlFightLog'; -import { ReqOpen as ReqOpen_40, ResOpen as ResOpen_40 } from './jjc/PtlOpen'; +import { ReqOpen as ReqOpen_41, ResOpen as ResOpen_41 } from './jjc/PtlOpen'; import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } from './jjc/PtlReceive'; import { ReqRefresh as ReqRefresh_4, ResRefresh as ResRefresh_4 } from './jjc/PtlRefresh'; -import { ReqOpen as ReqOpen_41, ResOpen as ResOpen_41 } from './kaifujingsai/PtlOpen'; +import { ReqOpen as ReqOpen_42, ResOpen as ResOpen_42 } from './kaifujingsai/PtlOpen'; import { ReqReceive as ReqReceive_5, ResReceive as ResReceive_5 } from './kaifujingsai/PtlReceive'; import { ReqApply as ReqApply_2, ResApply as ResApply_2 } from './kbzz/PtlApply'; import { ReqAutoApply, ResAutoApply } from './kbzz/PtlAutoApply'; @@ -195,23 +196,23 @@ import { ReqBuyNum as ReqBuyNum_3, ResBuyNum as ResBuyNum_3 } from './kbzz/PtlBu import { ReqFight as ReqFight_6, ResFight as ResFight_6 } from './kbzz/PtlFight'; import { ReqFightLog as ReqFightLog_1, ResFightLog as ResFightLog_1 } from './kbzz/PtlFightLog'; import { ReqGroupState, ResGroupState } from './kbzz/PtlGroupState'; -import { ReqOpen as ReqOpen_42, ResOpen as ResOpen_42 } from './kbzz/PtlOpen'; +import { ReqOpen as ReqOpen_43, ResOpen as ResOpen_43 } from './kbzz/PtlOpen'; import { ReqRecPrize as ReqRecPrize_4, ResRecPrize as ResRecPrize_4 } from './kbzz/PtlRecPrize'; import { ReqRefresh as ReqRefresh_5, ResRefresh as ResRefresh_5 } from './kbzz/PtlRefresh'; import { ReqAddPkNum, ResAddPkNum } from './kuangdong/PtlAddPkNum'; import { ReqGetPrize, ResGetPrize } from './kuangdong/PtlGetPrize'; import { ReqKdInfo, ResKdInfo } from './kuangdong/PtlKdInfo'; import { ReqLog as ReqLog_1, ResLog as ResLog_1 } from './kuangdong/PtlLog'; -import { ReqOpen as ReqOpen_43, ResOpen as ResOpen_43 } from './kuangdong/PtlOpen'; +import { ReqOpen as ReqOpen_44, ResOpen as ResOpen_44 } from './kuangdong/PtlOpen'; import { ReqYanShi, ResYanShi } from './kuangdong/PtlYanShi'; import { ReqZhanLing, ResZhanLing } from './kuangdong/PtlZhanLing'; -import { ReqOpen as ReqOpen_44, ResOpen as ResOpen_44 } from './lingzhulaixi/PtlOpen'; +import { ReqOpen as ReqOpen_45, ResOpen as ResOpen_45 } from './lingzhulaixi/PtlOpen'; import { ReqPkBoss, ResPkBoss } from './lingzhulaixi/PtlPkBoss'; import { ReqPkRank, ResPkRank } from './lingzhulaixi/PtlPkRank'; import { ReqSaoDang, ResSaoDang } from './lingzhulaixi/PtlSaoDang'; import { ReqBuy as ReqBuy_5, ResBuy as ResBuy_5 } from './meirishilian/PtlBuy'; import { ReqFight as ReqFight_7, ResFight as ResFight_7 } from './meirishilian/PtlFight'; -import { ReqOpen as ReqOpen_45, ResOpen as ResOpen_45 } from './meirishilian/PtlOpen'; +import { ReqOpen as ReqOpen_46, ResOpen as ResOpen_46 } from './meirishilian/PtlOpen'; import { MsgBindUid } from './msg_c2s/MsgBindUid'; import { MsgPay } from './msg_c2s/MsgPay'; import { MsgSync } from './msg_c2s/MsgSync'; @@ -242,7 +243,7 @@ import { MsgTaskChange } from './msg_s2c/MsgTaskChange'; import { MsgXianshilibao } from './msg_s2c/MsgXianshilibao'; import { ReqFight as ReqFight_8, ResFight as ResFight_8 } from './pata/PtlFight'; import { ReqGetPrize as ReqGetPrize_1, ResGetPrize as ResGetPrize_1 } from './pata/PtlGetPrize'; -import { ReqOpen as ReqOpen_46, ResOpen as ResOpen_46 } from './pata/PtlOpen'; +import { ReqOpen as ReqOpen_47, ResOpen as ResOpen_47 } from './pata/PtlOpen'; import { ReqSaoDang as ReqSaoDang_1, ResSaoDang as ResSaoDang_1 } from './pata/PtlSaoDang'; import { ReqGetList as ReqGetList_5, ResGetList as ResGetList_5 } from './pay/PtlGetList'; import { ReqGetList as ReqGetList_6, ResGetList as ResGetList_6 } from './peijian/PtlGetList'; @@ -258,14 +259,14 @@ import { ReqUnLock, ResUnLock } from './peijian/PtlUnLock'; import { ReqWear as ReqWear_1, ResWear as ResWear_1 } from './peijian/PtlWear'; import { ReqDeal, ResDeal } from './peijiancangku/PtlDeal'; import { ReqJump, ResJump } from './peijiancangku/PtlJump'; -import { ReqOpen as ReqOpen_47, ResOpen as ResOpen_47 } from './peijiancangku/PtlOpen'; +import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } from './peijiancangku/PtlOpen'; import { ReqBingo, ResBingo } from './PtlBingo'; import { ReqFightTest, ResFightTest } from './PtlFightTest'; import { ReqSyncBtn, ResSyncBtn } from './PtlSyncBtn'; import { ReqTest, ResTest } from './PtlTest'; import { ReqFight as ReqFight_9, ResFight as ResFight_9 } from './qjzzd/PtlFight'; -import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } from './qjzzd/PtlOpen'; -import { ReqOpen as ReqOpen_49, ResOpen as ResOpen_49 } from './rank/PtlOpen'; +import { ReqOpen as ReqOpen_49, ResOpen as ResOpen_49 } from './qjzzd/PtlOpen'; +import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } from './rank/PtlOpen'; import { ReqConcise, ResConcise } from './shiwu/PtlConcise'; import { ReqExtract, ResExtract } from './shiwu/PtlExtract'; import { ReqGetList as ReqGetList_7, ResGetList as ResGetList_7 } from './shiwu/PtlGetList'; @@ -273,20 +274,20 @@ import { ReqLvUp as ReqLvUp_3, ResLvUp as ResLvUp_3 } from './shiwu/PtlLvUp'; import { ReqRecast, ResRecast } from './shiwu/PtlRecast'; import { ReqTakeOff as ReqTakeOff_2, ResTakeOff as ResTakeOff_2 } from './shiwu/PtlTakeOff'; import { ReqWear as ReqWear_2, ResWear as ResWear_2 } from './shiwu/PtlWear'; -import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } from './shootGame/PtlOpen'; +import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './shootGame/PtlOpen'; import { ReqRec as ReqRec_13, ResRec as ResRec_13 } from './shootGame/PtlRec'; import { ReqBuy as ReqBuy_6, ResBuy as ResBuy_6 } from './shop/PtlBuy'; -import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './shop/PtlOpen'; +import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './shop/PtlOpen'; import { ReqRefresh as ReqRefresh_6, ResRefresh as ResRefresh_6 } from './shop/PtlRefresh'; import { ReqGetBoxPrize, ResGetBoxPrize } from './sign/PtlGetBoxPrize'; import { ReqGetPrize as ReqGetPrize_2, ResGetPrize as ResGetPrize_2 } from './sign/PtlGetPrize'; -import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './sign/PtlOpen'; +import { ReqOpen as ReqOpen_53, ResOpen as ResOpen_53 } from './sign/PtlOpen'; import { ReqAim, ResAim } from './slzd/PtlAim'; import { ReqBuyNum as ReqBuyNum_4, ResBuyNum as ResBuyNum_4 } from './slzd/PtlBuyNum'; import { ReqFight as ReqFight_10, ResFight as ResFight_10 } from './slzd/PtlFight'; import { ReqFightLog as ReqFightLog_2, ResFightLog as ResFightLog_2 } from './slzd/PtlFightLog'; import { ReqMyRank, ResMyRank } from './slzd/PtlMyRank'; -import { ReqOpen as ReqOpen_53, ResOpen as ResOpen_53 } from './slzd/PtlOpen'; +import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } from './slzd/PtlOpen'; import { ReqOpenFort, ResOpenFort } from './slzd/PtlOpenFort'; import { ReqRec as ReqRec_14, ResRec as ResRec_14 } from './slzd/PtlRec'; import { ReqRefresh as ReqRefresh_7, ResRefresh as ResRefresh_7 } from './slzd/PtlRefresh'; @@ -295,11 +296,11 @@ import { ReqEvent, ResEvent } from './tanxian/PtlEvent'; import { ReqFastGuaJi, ResFastGuaJi } from './tanxian/PtlFastGuaJi'; import { ReqFight as ReqFight_11, ResFight as ResFight_11 } from './tanxian/PtlFight'; import { ReqGuaJi, ResGuaJi } from './tanxian/PtlGuaJi'; -import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } from './tanxian/PtlOpen'; +import { ReqOpen as ReqOpen_55, ResOpen as ResOpen_55 } from './tanxian/PtlOpen'; import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } from './tanxian/PtlReceive'; import { ReqAllFinsh, ResAllFinsh } from './task/PtlAllFinsh'; import { ReqFinsh, ResFinsh } from './task/PtlFinsh'; -import { ReqOpen as ReqOpen_55, ResOpen as ResOpen_55 } from './task/PtlOpen'; +import { ReqOpen as ReqOpen_56, ResOpen as ResOpen_56 } from './task/PtlOpen'; import { ReqCDKEY, ResCDKEY } from './user/PtlCDKEY'; import { ReqChangeInfo, ResChangeInfo } from './user/PtlChangeInfo'; import { ReqChangeName, ResChangeName } from './user/PtlChangeName'; @@ -315,7 +316,7 @@ import { ReqRenownOpen, ResRenownOpen } from './user/PtlRenownOpen'; import { ReqTujian, ResTujian } from './user/PtlTujian'; import { ReqDecompose, ResDecompose } from './weixiuchang/PtlDecompose'; import { ReqExchange, ResExchange } from './weixiuchang/PtlExchange'; -import { ReqOpen as ReqOpen_56, ResOpen as ResOpen_56 } from './weixiuchang/PtlOpen'; +import { ReqOpen as ReqOpen_57, ResOpen as ResOpen_57 } from './weixiuchang/PtlOpen'; import { ReqUpLv, ResUpLv } from './weixiuchang/PtlUpLv'; import { ReqUpStar, ResUpStar } from './weixiuchang/PtlUpStar'; import { ReqAutoBaoMing, ResAutoBaoMing } from './wzry/PtlAutoBaoMing'; @@ -326,7 +327,7 @@ import { ReqDldFight, ResDldFight } from './wzry/PtlDldFight'; import { ReqDldRefre, ResDldRefre } from './wzry/PtlDldRefre'; import { ReqJingCai, ResJingCai } from './wzry/PtlJingCai'; import { ReqJingCaiOpen, ResJingCaiOpen } from './wzry/PtlJingCaiOpen'; -import { ReqOpen as ReqOpen_57, ResOpen as ResOpen_57 } from './wzry/PtlOpen'; +import { ReqOpen as ReqOpen_58, ResOpen as ResOpen_58 } from './wzry/PtlOpen'; import { ReqUpdateFight, ResUpdateFight } from './wzry/PtlUpdateFight'; import { ReqWzzd, ResWzzd } from './wzry/PtlWzzd'; import { ReqZuanShiOpen, ResZuanShiOpen } from './wzry/PtlZuanShiOpen'; @@ -334,7 +335,7 @@ import { ReqAllGet, ResAllGet } from './xstask/PtlAllGet'; import { ReqGet as ReqGet_3, ResGet as ResGet_3 } from './xstask/PtlGet'; import { ReqLvUp as ReqLvUp_4, ResLvUp as ResLvUp_4 } from './xstask/PtlLvUp'; import { ReqOnekeyReceive, ResOnekeyReceive } from './xstask/PtlOnekeyReceive'; -import { ReqOpen as ReqOpen_58, ResOpen as ResOpen_58 } from './xstask/PtlOpen'; +import { ReqOpen as ReqOpen_59, ResOpen as ResOpen_59 } from './xstask/PtlOpen'; import { ReqReceive as ReqReceive_7, ResReceive as ResReceive_7 } from './xstask/PtlReceive'; import { ReqRefresh as ReqRefresh_8, ResRefresh as ResRefresh_8 } from './xstask/PtlRefresh'; import { ReqHandle, ResHandle } from './yongbingzhuzhan/PtlHandle'; @@ -668,25 +669,29 @@ export interface ServiceType { req: ReqRec_7, res: ResRec_7 }, - "event/xinshoulibao/Open": { + "event/xiaofeijingsai/Open": { req: ReqOpen_21, res: ResOpen_21 }, + "event/xinshoulibao/Open": { + req: ReqOpen_22, + res: ResOpen_22 + }, "event/yangchengmubiao/Buy": { req: ReqBuy_2, res: ResBuy_2 }, "event/yangchengmubiao/Open": { - req: ReqOpen_22, - res: ResOpen_22 + req: ReqOpen_23, + res: ResOpen_23 }, "event/yangchengmubiao/Rec": { req: ReqRec_8, res: ResRec_8 }, "event/yibaichou/Open": { - req: ReqOpen_23, - res: ResOpen_23 + req: ReqOpen_24, + res: ResOpen_24 }, "event/yibaichou/Rec": { req: ReqRec_9, @@ -697,8 +702,8 @@ export interface ServiceType { res: ResRecAll }, "event/yuedujijin/Open": { - req: ReqOpen_24, - res: ResOpen_24 + req: ReqOpen_25, + res: ResOpen_25 }, "event/yuedujijin/Rec": { req: ReqRec_10, @@ -709,8 +714,8 @@ export interface ServiceType { res: ResBuyLv }, "event/zhanling/Open": { - req: ReqOpen_25, - res: ResOpen_25 + req: ReqOpen_26, + res: ResOpen_26 }, "event/zhanling/RecPrize": { req: ReqRecPrize_2, @@ -721,13 +726,13 @@ export interface ServiceType { res: ResRecTask }, "event/zhoulibao/Open": { - req: ReqOpen_26, - res: ResOpen_26 - }, - "event/zhoumolibao/Open": { req: ReqOpen_27, res: ResOpen_27 }, + "event/zhoumolibao/Open": { + req: ReqOpen_28, + res: ResOpen_28 + }, "event/zhoumolibao/Receive": { req: ReqReceive_3, res: ResReceive_3 @@ -737,8 +742,8 @@ export interface ServiceType { res: ResBuy_3 }, "event/zixuanlibao/Open": { - req: ReqOpen_28, - res: ResOpen_28 + req: ReqOpen_29, + res: ResOpen_29 }, "eventlist/hdGetList": { req: ReqhdGetList, @@ -761,8 +766,8 @@ export interface ServiceType { res: ResList }, "friend/Open": { - req: ReqOpen_29, - res: ResOpen_29 + req: ReqOpen_30, + res: ResOpen_30 }, "friend/Respond": { req: ReqRespond, @@ -781,8 +786,8 @@ export interface ServiceType { res: ResChallenge }, "ganbutexun/Open": { - req: ReqOpen_30, - res: ResOpen_30 + req: ReqOpen_31, + res: ResOpen_31 }, "ganhai/Fast": { req: ReqFast, @@ -797,8 +802,8 @@ export interface ServiceType { res: ResLog }, "ganhai/Open": { - req: ReqOpen_31, - res: ResOpen_31 + req: ReqOpen_32, + res: ResOpen_32 }, "ganhai/Refresh": { req: ReqRefresh, @@ -885,8 +890,8 @@ export interface ServiceType { res: ResManage }, "gonghui/Open": { - req: ReqOpen_32, - res: ResOpen_32 + req: ReqOpen_33, + res: ResOpen_33 }, "gonghui/TanHe": { req: ReqTanHe, @@ -909,8 +914,8 @@ export interface ServiceType { res: ResLottery_2 }, "gonghuibaozang/Open": { - req: ReqOpen_33, - res: ResOpen_33 + req: ReqOpen_34, + res: ResOpen_34 }, "gonglukuangbiao/Buy": { req: ReqBuy_4, @@ -921,8 +926,8 @@ export interface ServiceType { res: ResFight_2 }, "gonglukuangbiao/Open": { - req: ReqOpen_34, - res: ResOpen_34 + req: ReqOpen_35, + res: ResOpen_35 }, "gonglukuangbiao/Refresh": { req: ReqRefresh_1, @@ -933,8 +938,8 @@ export interface ServiceType { res: ResActive }, "gongyu/mingdao/Open": { - req: ReqOpen_35, - res: ResOpen_35 + req: ReqOpen_36, + res: ResOpen_36 }, "gongyu/mingdao/RecPrize": { req: ReqRecPrize_3, @@ -969,8 +974,8 @@ export interface ServiceType { res: ResGetLog_1 }, "hbzb/jfs/Open": { - req: ReqOpen_36, - res: ResOpen_36 + req: ReqOpen_37, + res: ResOpen_37 }, "hbzb/jfs/Rec": { req: ReqRec_11, @@ -997,8 +1002,8 @@ export interface ServiceType { res: ResGetLog_2 }, "hbzb/zbs/Open": { - req: ReqOpen_37, - res: ResOpen_37 + req: ReqOpen_38, + res: ResOpen_38 }, "hbzb/zbs/Refresh": { req: ReqRefresh_3, @@ -1061,16 +1066,16 @@ export interface ServiceType { res: ResLottery_3 }, "jiaotang/Open": { - req: ReqOpen_38, - res: ResOpen_38 + req: ReqOpen_39, + res: ResOpen_39 }, "jiuba/Lottery": { req: ReqLottery_4, res: ResLottery_4 }, "jiuba/Open": { - req: ReqOpen_39, - res: ResOpen_39 + req: ReqOpen_40, + res: ResOpen_40 }, "jjc/BuyFightNum": { req: ReqBuyFightNum, @@ -1085,8 +1090,8 @@ export interface ServiceType { res: ResFightLog }, "jjc/Open": { - req: ReqOpen_40, - res: ResOpen_40 + req: ReqOpen_41, + res: ResOpen_41 }, "jjc/Receive": { req: ReqReceive_4, @@ -1097,8 +1102,8 @@ export interface ServiceType { res: ResRefresh_4 }, "kaifujingsai/Open": { - req: ReqOpen_41, - res: ResOpen_41 + req: ReqOpen_42, + res: ResOpen_42 }, "kaifujingsai/Receive": { req: ReqReceive_5, @@ -1129,8 +1134,8 @@ export interface ServiceType { res: ResGroupState }, "kbzz/Open": { - req: ReqOpen_42, - res: ResOpen_42 + req: ReqOpen_43, + res: ResOpen_43 }, "kbzz/RecPrize": { req: ReqRecPrize_4, @@ -1157,8 +1162,8 @@ export interface ServiceType { res: ResLog_1 }, "kuangdong/Open": { - req: ReqOpen_43, - res: ResOpen_43 + req: ReqOpen_44, + res: ResOpen_44 }, "kuangdong/YanShi": { req: ReqYanShi, @@ -1169,8 +1174,8 @@ export interface ServiceType { res: ResZhanLing }, "lingzhulaixi/Open": { - req: ReqOpen_44, - res: ResOpen_44 + req: ReqOpen_45, + res: ResOpen_45 }, "lingzhulaixi/PkBoss": { req: ReqPkBoss, @@ -1193,8 +1198,8 @@ export interface ServiceType { res: ResFight_7 }, "meirishilian/Open": { - req: ReqOpen_45, - res: ResOpen_45 + req: ReqOpen_46, + res: ResOpen_46 }, "pata/Fight": { req: ReqFight_8, @@ -1205,8 +1210,8 @@ export interface ServiceType { res: ResGetPrize_1 }, "pata/Open": { - req: ReqOpen_46, - res: ResOpen_46 + req: ReqOpen_47, + res: ResOpen_47 }, "pata/SaoDang": { req: ReqSaoDang_1, @@ -1269,8 +1274,8 @@ export interface ServiceType { res: ResJump }, "peijiancangku/Open": { - req: ReqOpen_47, - res: ResOpen_47 + req: ReqOpen_48, + res: ResOpen_48 }, "Bingo": { req: ReqBingo, @@ -1293,13 +1298,13 @@ export interface ServiceType { res: ResFight_9 }, "qjzzd/Open": { - req: ReqOpen_48, - res: ResOpen_48 - }, - "rank/Open": { req: ReqOpen_49, res: ResOpen_49 }, + "rank/Open": { + req: ReqOpen_50, + res: ResOpen_50 + }, "shiwu/Concise": { req: ReqConcise, res: ResConcise @@ -1329,8 +1334,8 @@ export interface ServiceType { res: ResWear_2 }, "shootGame/Open": { - req: ReqOpen_50, - res: ResOpen_50 + req: ReqOpen_51, + res: ResOpen_51 }, "shootGame/Rec": { req: ReqRec_13, @@ -1341,8 +1346,8 @@ export interface ServiceType { res: ResBuy_6 }, "shop/Open": { - req: ReqOpen_51, - res: ResOpen_51 + req: ReqOpen_52, + res: ResOpen_52 }, "shop/Refresh": { req: ReqRefresh_6, @@ -1357,8 +1362,8 @@ export interface ServiceType { res: ResGetPrize_2 }, "sign/Open": { - req: ReqOpen_52, - res: ResOpen_52 + req: ReqOpen_53, + res: ResOpen_53 }, "slzd/Aim": { req: ReqAim, @@ -1381,8 +1386,8 @@ export interface ServiceType { res: ResMyRank }, "slzd/Open": { - req: ReqOpen_53, - res: ResOpen_53 + req: ReqOpen_54, + res: ResOpen_54 }, "slzd/OpenFort": { req: ReqOpenFort, @@ -1417,8 +1422,8 @@ export interface ServiceType { res: ResGuaJi }, "tanxian/Open": { - req: ReqOpen_54, - res: ResOpen_54 + req: ReqOpen_55, + res: ResOpen_55 }, "tanxian/Receive": { req: ReqReceive_6, @@ -1433,8 +1438,8 @@ export interface ServiceType { res: ResFinsh }, "task/Open": { - req: ReqOpen_55, - res: ResOpen_55 + req: ReqOpen_56, + res: ResOpen_56 }, "user/CDKEY": { req: ReqCDKEY, @@ -1497,8 +1502,8 @@ export interface ServiceType { res: ResExchange }, "weixiuchang/Open": { - req: ReqOpen_56, - res: ResOpen_56 + req: ReqOpen_57, + res: ResOpen_57 }, "weixiuchang/UpLv": { req: ReqUpLv, @@ -1541,8 +1546,8 @@ export interface ServiceType { res: ResJingCaiOpen }, "wzry/Open": { - req: ReqOpen_57, - res: ResOpen_57 + req: ReqOpen_58, + res: ResOpen_58 }, "wzry/UpdateFight": { req: ReqUpdateFight, @@ -1573,8 +1578,8 @@ export interface ServiceType { res: ResOnekeyReceive }, "xstask/Open": { - req: ReqOpen_58, - res: ResOpen_58 + req: ReqOpen_59, + res: ResOpen_59 }, "xstask/Receive": { req: ReqReceive_7, @@ -2042,41 +2047,46 @@ export const serviceProto: ServiceProto = { }, { "id": 81, - "name": "event/xinshoulibao/Open", + "name": "event/xiaofeijingsai/Open", "type": "api" }, { "id": 82, - "name": "event/yangchengmubiao/Buy", + "name": "event/xinshoulibao/Open", "type": "api" }, { "id": 83, - "name": "event/yangchengmubiao/Open", + "name": "event/yangchengmubiao/Buy", "type": "api" }, { "id": 84, - "name": "event/yangchengmubiao/Rec", + "name": "event/yangchengmubiao/Open", "type": "api" }, { "id": 85, - "name": "event/yibaichou/Open", + "name": "event/yangchengmubiao/Rec", "type": "api" }, { "id": 86, - "name": "event/yibaichou/Rec", + "name": "event/yibaichou/Open", "type": "api" }, { "id": 87, - "name": "event/yibaichou/RecAll", + "name": "event/yibaichou/Rec", "type": "api" }, { "id": 88, + "name": "event/yibaichou/RecAll", + "type": "api" + }, + { + "id": 89, "name": "event/yuedujijin/Open", "type": "api", "conf": { @@ -2084,157 +2094,157 @@ export const serviceProto: ServiceProto = { } }, { - "id": 89, + "id": 90, "name": "event/yuedujijin/Rec", "type": "api" }, { - "id": 90, + "id": 91, "name": "event/zhanling/BuyLv", "type": "api" }, { - "id": 91, + "id": 92, "name": "event/zhanling/Open", "type": "api" }, { - "id": 92, + "id": 93, "name": "event/zhanling/RecPrize", "type": "api" }, { - "id": 93, + "id": 94, "name": "event/zhanling/RecTask", "type": "api" }, { - "id": 94, + "id": 95, "name": "event/zhoulibao/Open", "type": "api" }, { - "id": 95, + "id": 96, "name": "event/zhoumolibao/Open", "type": "api" }, { - "id": 96, + "id": 97, "name": "event/zhoumolibao/Receive", "type": "api" }, { - "id": 97, + "id": 98, "name": "event/zixuanlibao/Buy", "type": "api" }, { - "id": 98, + "id": 99, "name": "event/zixuanlibao/Open", "type": "api" }, { - "id": 99, + "id": 100, "name": "eventlist/hdGetList", "type": "api" }, { - "id": 100, + "id": 101, "name": "friend/Apply", "type": "api" }, { - "id": 101, + "id": 102, "name": "friend/Del", "type": "api" }, { - "id": 102, + "id": 103, "name": "friend/Gift", "type": "api" }, { - "id": 103, + "id": 104, "name": "friend/List", "type": "api" }, { - "id": 104, + "id": 105, "name": "friend/Open", "type": "api" }, { - "id": 105, + "id": 106, "name": "friend/Respond", "type": "api" }, { - "id": 106, + "id": 107, "name": "friend/RmBlackList", "type": "api" }, { - "id": 107, + "id": 108, "name": "friend/Search", "type": "api" }, { - "id": 108, + "id": 109, "name": "ganbutexun/Challenge", "type": "api" }, { - "id": 109, + "id": 110, "name": "ganbutexun/Open", "type": "api" }, { - "id": 110, + "id": 111, "name": "ganhai/Fast", "type": "api" }, { - "id": 111, + "id": 112, "name": "ganhai/Fight", "type": "api" }, { - "id": 112, + "id": 113, "name": "ganhai/Log", "type": "api" }, { - "id": 113, + "id": 114, "name": "ganhai/Open", "type": "api" }, { - "id": 114, + "id": 115, "name": "ganhai/Refresh", "type": "api" }, { - "id": 115, + "id": 116, "name": "ganhai/RefreshShip", "type": "api" }, { - "id": 116, + "id": 117, "name": "ganhai/Select", "type": "api" }, { - "id": 117, + "id": 118, "name": "gmapi/Gift", "type": "api" }, { - "id": 118, + "id": 119, "name": "gmapi/Post", "type": "api" }, { - "id": 119, + "id": 120, "name": "gonghui/Apply", "type": "api", "conf": { @@ -2244,7 +2254,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 120, + "id": 121, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2254,7 +2264,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 121, + "id": 122, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2264,7 +2274,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 122, + "id": 123, "name": "gonghui/Change", "type": "api", "conf": { @@ -2274,12 +2284,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 123, + "id": 124, "name": "gonghui/Create", "type": "api" }, { - "id": 124, + "id": 125, "name": "gonghui/Dissolve", "type": "api", "conf": { @@ -2289,7 +2299,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 125, + "id": 126, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2299,12 +2309,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 126, + "id": 127, "name": "gonghui/FbBuyNum", "type": "api" }, { - "id": 127, + "id": 128, "name": "gonghui/FbFight", "type": "api", "conf": { @@ -2314,7 +2324,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 128, + "id": 129, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2324,17 +2334,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 129, + "id": 130, "name": "gonghui/GetList", "type": "api" }, { - "id": 130, + "id": 131, "name": "gonghui/Join", "type": "api" }, { - "id": 131, + "id": 132, "name": "gonghui/Jx", "type": "api", "conf": { @@ -2344,7 +2354,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 132, + "id": 133, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2354,7 +2364,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 133, + "id": 134, "name": "gonghui/List", "type": "api", "conf": { @@ -2364,7 +2374,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 134, + "id": 135, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2374,7 +2384,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 135, + "id": 136, "name": "gonghui/Open", "type": "api", "conf": { @@ -2384,7 +2394,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 136, + "id": 137, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2394,7 +2404,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 137, + "id": 138, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2404,7 +2414,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 138, + "id": 139, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2414,7 +2424,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 139, + "id": 140, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2424,137 +2434,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 140, + "id": 141, "name": "gonghuibaozang/Lottery", "type": "api" }, { - "id": 141, + "id": 142, "name": "gonghuibaozang/Open", "type": "api" }, { - "id": 142, + "id": 143, "name": "gonglukuangbiao/Buy", "type": "api" }, { - "id": 143, + "id": 144, "name": "gonglukuangbiao/Fight", "type": "api" }, { - "id": 144, + "id": 145, "name": "gonglukuangbiao/Open", "type": "api" }, { - "id": 145, + "id": 146, "name": "gonglukuangbiao/Refresh", "type": "api" }, { - "id": 146, + "id": 147, "name": "gongyu/mingdao/Active", "type": "api" }, { - "id": 147, + "id": 148, "name": "gongyu/mingdao/Open", "type": "api" }, { - "id": 148, + "id": 149, "name": "gongyu/mingdao/RecPrize", "type": "api" }, { - "id": 149, + "id": 150, "name": "gongyu/mingdao/Repair", "type": "api" }, { - "id": 150, + "id": 151, "name": "gongyu/xunlianjihua/Reset", "type": "api" }, { - "id": 151, + "id": 152, "name": "gongyu/xunlianjihua/UpSkill", "type": "api" }, { - "id": 152, + "id": 153, "name": "gongyu/zuozhanjihua/SetSkill", "type": "api" }, { - "id": 153, + "id": 154, "name": "hbzb/jfs/BuyNum", "type": "api" }, { - "id": 154, + "id": 155, "name": "hbzb/jfs/Fight", "type": "api" }, { - "id": 155, + "id": 156, "name": "hbzb/jfs/GetLog", "type": "api" }, { - "id": 156, + "id": 157, "name": "hbzb/jfs/Open", "type": "api" }, { - "id": 157, + "id": 158, "name": "hbzb/jfs/Rec", "type": "api" }, { - "id": 158, + "id": 159, "name": "hbzb/jfs/Refresh", "type": "api" }, { - "id": 159, + "id": 160, "name": "hbzb/GetStatus", "type": "api" }, { - "id": 160, + "id": 161, "name": "hbzb/zbs/BuyNum", "type": "api" }, { - "id": 161, + "id": 162, "name": "hbzb/zbs/Fight", "type": "api" }, { - "id": 162, + "id": 163, "name": "hbzb/zbs/GetLog", "type": "api" }, { - "id": 163, + "id": 164, "name": "hbzb/zbs/Open", "type": "api" }, { - "id": 164, + "id": 165, "name": "hbzb/zbs/Refresh", "type": "api" }, { - "id": 165, + "id": 166, "name": "hero/Awake", "type": "api" }, { - "id": 166, + "id": 167, "name": "hero/ChangePos", "type": "api", "conf": { @@ -2562,17 +2572,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 167, + "id": 168, "name": "hero/GetList", "type": "api" }, { - "id": 168, + "id": 169, "name": "hero/JinJie", "type": "api" }, { - "id": 169, + "id": 170, "name": "hero/LvUp", "type": "api", "conf": { @@ -2580,32 +2590,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 170, + "id": 171, "name": "hero/Potency", "type": "api" }, { - "id": 171, + "id": 172, "name": "hero/Rec", "type": "api" }, { - "id": 172, + "id": 173, "name": "hero/Reset", "type": "api" }, { - "id": 173, + "id": 174, "name": "hero/Talent", "type": "api" }, { - "id": 174, + "id": 175, "name": "hero/WeaponUp", "type": "api" }, { - "id": 175, + "id": 176, "name": "hongdian/Get", "type": "api", "conf": { @@ -2613,117 +2623,117 @@ export const serviceProto: ServiceProto = { } }, { - "id": 176, + "id": 177, "name": "item/GetList", "type": "api" }, { - "id": 177, + "id": 178, "name": "item/Use", "type": "api" }, { - "id": 178, + "id": 179, "name": "jiaotang/Lottery", "type": "api" }, { - "id": 179, + "id": 180, "name": "jiaotang/Open", "type": "api" }, { - "id": 180, + "id": 181, "name": "jiuba/Lottery", "type": "api" }, { - "id": 181, + "id": 182, "name": "jiuba/Open", "type": "api" }, { - "id": 182, + "id": 183, "name": "jjc/BuyFightNum", "type": "api" }, { - "id": 183, + "id": 184, "name": "jjc/Fight", "type": "api" }, { - "id": 184, + "id": 185, "name": "jjc/FightLog", "type": "api" }, { - "id": 185, + "id": 186, "name": "jjc/Open", "type": "api" }, { - "id": 186, + "id": 187, "name": "jjc/Receive", "type": "api" }, { - "id": 187, + "id": 188, "name": "jjc/Refresh", "type": "api" }, { - "id": 188, + "id": 189, "name": "kaifujingsai/Open", "type": "api" }, { - "id": 189, + "id": 190, "name": "kaifujingsai/Receive", "type": "api" }, { - "id": 190, + "id": 191, "name": "kbzz/Apply", "type": "api" }, { - "id": 191, + "id": 192, "name": "kbzz/AutoApply", "type": "api" }, { - "id": 192, + "id": 193, "name": "kbzz/BuyNum", "type": "api" }, { - "id": 193, + "id": 194, "name": "kbzz/Fight", "type": "api" }, { - "id": 194, + "id": 195, "name": "kbzz/FightLog", "type": "api" }, { - "id": 195, + "id": 196, "name": "kbzz/GroupState", "type": "api" }, { - "id": 196, + "id": 197, "name": "kbzz/Open", "type": "api" }, { - "id": 197, + "id": 198, "name": "kbzz/RecPrize", "type": "api" }, { - "id": 198, + "id": 199, "name": "kbzz/Refresh", "type": "api", "conf": { @@ -2731,282 +2741,282 @@ export const serviceProto: ServiceProto = { } }, { - "id": 199, + "id": 200, "name": "kuangdong/AddPkNum", "type": "api" }, { - "id": 200, + "id": 201, "name": "kuangdong/GetPrize", "type": "api" }, { - "id": 201, + "id": 202, "name": "kuangdong/KdInfo", "type": "api" }, { - "id": 202, + "id": 203, "name": "kuangdong/Log", "type": "api" }, { - "id": 203, + "id": 204, "name": "kuangdong/Open", "type": "api" }, { - "id": 204, + "id": 205, "name": "kuangdong/YanShi", "type": "api" }, { - "id": 205, + "id": 206, "name": "kuangdong/ZhanLing", "type": "api" }, { - "id": 206, + "id": 207, "name": "lingzhulaixi/Open", "type": "api" }, { - "id": 207, + "id": 208, "name": "lingzhulaixi/PkBoss", "type": "api" }, { - "id": 208, + "id": 209, "name": "lingzhulaixi/PkRank", "type": "api" }, { - "id": 209, + "id": 210, "name": "lingzhulaixi/SaoDang", "type": "api" }, { - "id": 210, + "id": 211, "name": "meirishilian/Buy", "type": "api" }, { - "id": 211, + "id": 212, "name": "meirishilian/Fight", "type": "api" }, { - "id": 212, + "id": 213, "name": "meirishilian/Open", "type": "api" }, { - "id": 213, + "id": 214, "name": "msg_c2s/BindUid", "type": "msg" }, { - "id": 214, + "id": 215, "name": "msg_c2s/Pay", "type": "msg" }, { - "id": 215, + "id": 216, "name": "msg_c2s/Sync", "type": "msg" }, { - "id": 216, + "id": 217, "name": "msg_s2c/Chat", "type": "msg" }, { - "id": 217, + "id": 218, "name": "msg_s2c/ChatHelp", "type": "msg" }, { - "id": 218, + "id": 219, "name": "msg_s2c/Collection", "type": "msg" }, { - "id": 219, + "id": 220, "name": "msg_s2c/Email", "type": "msg" }, { - "id": 220, + "id": 221, "name": "msg_s2c/EmailDel", "type": "msg" }, { - "id": 221, + "id": 222, "name": "msg_s2c/EquipChange", "type": "msg" }, { - "id": 222, + "id": 223, "name": "msg_s2c/Friend", "type": "msg" }, { - "id": 223, + "id": 224, "name": "msg_s2c/GhChange", "type": "msg" }, { - "id": 224, + "id": 225, "name": "msg_s2c/GongHuiBaoZang", "type": "msg" }, { - "id": 225, + "id": 226, "name": "msg_s2c/HeroChange", "type": "msg" }, { - "id": 226, + "id": 227, "name": "msg_s2c/HongDianChange", "type": "msg" }, { - "id": 227, + "id": 228, "name": "msg_s2c/ItemChange", "type": "msg" }, { - "id": 228, + "id": 229, "name": "msg_s2c/LoginQueue", "type": "msg" }, { - "id": 229, + "id": 230, "name": "msg_s2c/LshdChange", "type": "msg" }, { - "id": 230, + "id": 231, "name": "msg_s2c/NewDay", "type": "msg" }, { - "id": 231, + "id": 232, "name": "msg_s2c/OtherLogin", "type": "msg" }, { - "id": 232, + "id": 233, "name": "msg_s2c/PayChange", "type": "msg" }, { - "id": 233, + "id": 234, "name": "msg_s2c/PayResult", "type": "msg" }, { - "id": 234, + "id": 235, "name": "msg_s2c/PeijianChange", "type": "msg" }, { - "id": 235, + "id": 236, "name": "msg_s2c/PlayerChange", "type": "msg" }, { - "id": 236, + "id": 237, "name": "msg_s2c/Private", "type": "msg" }, { - "id": 237, + "id": 238, "name": "msg_s2c/SendGift", "type": "msg" }, { - "id": 238, + "id": 239, "name": "msg_s2c/ShiwuChange", "type": "msg" }, { - "id": 239, + "id": 240, "name": "msg_s2c/TaskChange", "type": "msg" }, { - "id": 240, + "id": 241, "name": "msg_s2c/Xianshilibao", "type": "msg" }, { - "id": 241, + "id": 242, "name": "pata/Fight", "type": "api" }, { - "id": 242, + "id": 243, "name": "pata/GetPrize", "type": "api" }, { - "id": 243, + "id": 244, "name": "pata/Open", "type": "api" }, { - "id": 244, + "id": 245, "name": "pata/SaoDang", "type": "api" }, { - "id": 245, + "id": 246, "name": "pay/GetList", "type": "api" }, { - "id": 246, + "id": 247, "name": "peijian/GetList", "type": "api" }, { - "id": 247, + "id": 248, "name": "peijian/JingLian", "type": "api" }, { - "id": 248, + "id": 249, "name": "peijian/JinJie", "type": "api" }, { - "id": 249, + "id": 250, "name": "peijian/LvUp", "type": "api" }, { - "id": 250, + "id": 251, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 251, + "id": 252, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 252, + "id": 253, "name": "peijian/Reset", "type": "api" }, { - "id": 253, + "id": 254, "name": "peijian/Rm", "type": "api" }, { - "id": 254, + "id": 255, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3014,32 +3024,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 255, + "id": 256, "name": "peijian/UnLock", "type": "api" }, { - "id": 256, + "id": 257, "name": "peijian/Wear", "type": "api" }, { - "id": 257, + "id": 258, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 258, + "id": 259, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 259, + "id": 260, "name": "peijiancangku/Open", "type": "api" }, { - "id": 260, + "id": 261, "name": "Bingo", "type": "api", "conf": { @@ -3047,137 +3057,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 261, + "id": 262, "name": "FightTest", "type": "api" }, { - "id": 262, + "id": 263, "name": "SyncBtn", "type": "api" }, { - "id": 263, + "id": 264, "name": "Test", "type": "api" }, { - "id": 264, + "id": 265, "name": "qjzzd/Fight", "type": "api" }, { - "id": 265, + "id": 266, "name": "qjzzd/Open", "type": "api" }, { - "id": 266, + "id": 267, "name": "rank/Open", "type": "api" }, { - "id": 267, + "id": 268, "name": "shiwu/Concise", "type": "api" }, { - "id": 268, + "id": 269, "name": "shiwu/Extract", "type": "api" }, { - "id": 269, + "id": 270, "name": "shiwu/GetList", "type": "api" }, { - "id": 270, + "id": 271, "name": "shiwu/LvUp", "type": "api" }, { - "id": 271, + "id": 272, "name": "shiwu/Recast", "type": "api" }, { - "id": 272, + "id": 273, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 273, + "id": 274, "name": "shiwu/Wear", "type": "api" }, { - "id": 274, + "id": 275, "name": "shootGame/Open", "type": "api" }, { - "id": 275, + "id": 276, "name": "shootGame/Rec", "type": "api" }, { - "id": 276, + "id": 277, "name": "shop/Buy", "type": "api" }, { - "id": 277, + "id": 278, "name": "shop/Open", "type": "api" }, { - "id": 278, + "id": 279, "name": "shop/Refresh", "type": "api" }, { - "id": 279, + "id": 280, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 280, + "id": 281, "name": "sign/GetPrize", "type": "api" }, { - "id": 281, + "id": 282, "name": "sign/Open", "type": "api" }, { - "id": 282, + "id": 283, "name": "slzd/Aim", "type": "api" }, { - "id": 283, + "id": 284, "name": "slzd/BuyNum", "type": "api" }, { - "id": 284, + "id": 285, "name": "slzd/Fight", "type": "api" }, { - "id": 285, + "id": 286, "name": "slzd/FightLog", "type": "api" }, { - "id": 286, + "id": 287, "name": "slzd/MyRank", "type": "api" }, { - "id": 287, + "id": 288, "name": "slzd/Open", "type": "api", "conf": { @@ -3187,77 +3197,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 288, + "id": 289, "name": "slzd/OpenFort", "type": "api" }, { - "id": 289, + "id": 290, "name": "slzd/Rec", "type": "api" }, { - "id": 290, + "id": 291, "name": "slzd/Refresh", "type": "api" }, { - "id": 291, + "id": 292, "name": "slzd/Slot", "type": "api" }, { - "id": 292, + "id": 293, "name": "tanxian/Event", "type": "api" }, { - "id": 293, + "id": 294, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 294, + "id": 295, "name": "tanxian/Fight", "type": "api" }, { - "id": 295, + "id": 296, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 296, + "id": 297, "name": "tanxian/Open", "type": "api" }, { - "id": 297, + "id": 298, "name": "tanxian/Receive", "type": "api" }, { - "id": 298, + "id": 299, "name": "task/AllFinsh", "type": "api" }, { - "id": 299, + "id": 300, "name": "task/Finsh", "type": "api" }, { - "id": 300, + "id": 301, "name": "task/Open", "type": "api" }, { - "id": 301, + "id": 302, "name": "user/CDKEY", "type": "api" }, { - "id": 302, + "id": 303, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3265,197 +3275,197 @@ export const serviceProto: ServiceProto = { } }, { - "id": 303, + "id": 304, "name": "user/ChangeName", "type": "api" }, { - "id": 304, + "id": 305, "name": "user/Fight", "type": "api" }, { - "id": 305, + "id": 306, "name": "user/GetInfo", "type": "api" }, { - "id": 306, + "id": 307, "name": "user/InfoOpen", "type": "api" }, { - "id": 307, + "id": 308, "name": "user/Login", "type": "api" }, { - "id": 308, + "id": 309, "name": "user/Ping", "type": "api" }, { - "id": 309, + "id": 310, "name": "user/Renown", "type": "api" }, { - "id": 310, + "id": 311, "name": "user/RenownBuy", "type": "api" }, { - "id": 311, + "id": 312, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 312, + "id": 313, "name": "user/RenownOpen", "type": "api" }, { - "id": 313, + "id": 314, "name": "user/Tujian", "type": "api" }, { - "id": 314, + "id": 315, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 315, + "id": 316, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 316, + "id": 317, "name": "weixiuchang/Open", "type": "api" }, { - "id": 317, + "id": 318, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 318, + "id": 319, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 319, + "id": 320, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 320, + "id": 321, "name": "wzry/BaoMing", "type": "api" }, { - "id": 321, + "id": 322, "name": "wzry/catFightLog", "type": "api" }, { - "id": 322, + "id": 323, "name": "wzry/CatGroup", "type": "api" }, { - "id": 323, + "id": 324, "name": "wzry/DldFight", "type": "api" }, { - "id": 324, + "id": 325, "name": "wzry/DldRefre", "type": "api" }, { - "id": 325, + "id": 326, "name": "wzry/JingCai", "type": "api" }, { - "id": 326, + "id": 327, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 327, + "id": 328, "name": "wzry/Open", "type": "api" }, { - "id": 328, + "id": 329, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 329, + "id": 330, "name": "wzry/Wzzd", "type": "api" }, { - "id": 330, + "id": 331, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 331, + "id": 332, "name": "xstask/AllGet", "type": "api" }, { - "id": 332, + "id": 333, "name": "xstask/Get", "type": "api" }, { - "id": 333, + "id": 334, "name": "xstask/LvUp", "type": "api" }, { - "id": 334, + "id": 335, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 335, + "id": 336, "name": "xstask/Open", "type": "api" }, { - "id": 336, + "id": 337, "name": "xstask/Receive", "type": "api" }, { - "id": 337, + "id": 338, "name": "xstask/Refresh", "type": "api" }, { - "id": 338, + "id": 339, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 339, + "id": 340, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 340, + "id": 341, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 341, + "id": 342, "name": "zhanqianbushu/Up", "type": "api" } @@ -10523,6 +10533,24 @@ export const serviceProto: ServiceProto = { } ] }, + "event/xiaofeijingsai/PtlOpen/ReqOpen": { + "type": "Interface" + }, + "event/xiaofeijingsai/PtlOpen/ResOpen": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "list", + "type": { + "type": "Array", + "elementType": { + "type": "Any" + } + } + } + ] + }, "event/xinshoulibao/PtlOpen/ReqOpen": { "type": "Interface" }, From 88aa94bc0954688ca1db4d6859a69acbfc92db04 Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 20 Dec 2023 16:08:52 +0800 Subject: [PATCH 21/90] proto --- src/shared/protocols/serviceProto.ts | 784 ++++++++++++++------------- 1 file changed, 406 insertions(+), 378 deletions(-) diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 8a42249..a2028b2 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -82,39 +82,40 @@ import { ReqDuihuan, ResDuihuan } from './event/xianshizhaomu/PtlDuihuan'; import { ReqLottery as ReqLottery_1, ResLottery as ResLottery_1 } from './event/xianshizhaomu/PtlLottery'; import { ReqOpen as ReqOpen_21, ResOpen as ResOpen_21 } from './event/xianshizhaomu/PtlOpen'; import { ReqRec as ReqRec_7, ResRec as ResRec_7 } from './event/xianshizhaomu/PtlRec'; -import { ReqOpen as ReqOpen_22, ResOpen as ResOpen_22 } from './event/xinshoulibao/PtlOpen'; +import { ReqOpen as ReqOpen_22, ResOpen as ResOpen_22 } from './event/xiaofeijingsai/PtlOpen'; +import { ReqOpen as ReqOpen_23, ResOpen as ResOpen_23 } from './event/xinshoulibao/PtlOpen'; import { ReqBuy as ReqBuy_2, ResBuy as ResBuy_2 } from './event/yangchengmubiao/PtlBuy'; -import { ReqOpen as ReqOpen_23, ResOpen as ResOpen_23 } from './event/yangchengmubiao/PtlOpen'; +import { ReqOpen as ReqOpen_24, ResOpen as ResOpen_24 } from './event/yangchengmubiao/PtlOpen'; import { ReqRec as ReqRec_8, ResRec as ResRec_8 } from './event/yangchengmubiao/PtlRec'; -import { ReqOpen as ReqOpen_24, ResOpen as ResOpen_24 } from './event/yibaichou/PtlOpen'; +import { ReqOpen as ReqOpen_25, ResOpen as ResOpen_25 } from './event/yibaichou/PtlOpen'; import { ReqRec as ReqRec_9, ResRec as ResRec_9 } from './event/yibaichou/PtlRec'; import { ReqRecAll, ResRecAll } from './event/yibaichou/PtlRecAll'; -import { ReqOpen as ReqOpen_25, ResOpen as ResOpen_25 } from './event/yuedujijin/PtlOpen'; +import { ReqOpen as ReqOpen_26, ResOpen as ResOpen_26 } from './event/yuedujijin/PtlOpen'; import { ReqRec as ReqRec_10, ResRec as ResRec_10 } from './event/yuedujijin/PtlRec'; import { ReqBuyLv, ResBuyLv } from './event/zhanling/PtlBuyLv'; -import { ReqOpen as ReqOpen_26, ResOpen as ResOpen_26 } from './event/zhanling/PtlOpen'; +import { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } from './event/zhanling/PtlOpen'; import { ReqRecPrize as ReqRecPrize_2, ResRecPrize as ResRecPrize_2 } from './event/zhanling/PtlRecPrize'; import { ReqRecTask, ResRecTask } from './event/zhanling/PtlRecTask'; -import { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } from './event/zhoulibao/PtlOpen'; -import { ReqOpen as ReqOpen_28, ResOpen as ResOpen_28 } from './event/zhoumolibao/PtlOpen'; +import { ReqOpen as ReqOpen_28, ResOpen as ResOpen_28 } from './event/zhoulibao/PtlOpen'; +import { ReqOpen as ReqOpen_29, ResOpen as ResOpen_29 } from './event/zhoumolibao/PtlOpen'; import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } from './event/zhoumolibao/PtlReceive'; import { ReqBuy as ReqBuy_3, ResBuy as ResBuy_3 } from './event/zixuanlibao/PtlBuy'; -import { ReqOpen as ReqOpen_29, ResOpen as ResOpen_29 } from './event/zixuanlibao/PtlOpen'; +import { ReqOpen as ReqOpen_30, ResOpen as ResOpen_30 } from './event/zixuanlibao/PtlOpen'; import { ReqhdGetList, ReshdGetList } from './eventlist/PtlhdGetList'; import { ReqApply, ResApply } from './friend/PtlApply'; import { ReqDel, ResDel } from './friend/PtlDel'; import { ReqGift, ResGift } from './friend/PtlGift'; import { ReqList, ResList } from './friend/PtlList'; -import { ReqOpen as ReqOpen_30, ResOpen as ResOpen_30 } from './friend/PtlOpen'; +import { ReqOpen as ReqOpen_31, ResOpen as ResOpen_31 } from './friend/PtlOpen'; import { ReqRespond, ResRespond } from './friend/PtlRespond'; import { ReqRmBlackList, ResRmBlackList } from './friend/PtlRmBlackList'; import { ReqSearch, ResSearch } from './friend/PtlSearch'; import { ReqChallenge, ResChallenge } from './ganbutexun/PtlChallenge'; -import { ReqOpen as ReqOpen_31, ResOpen as ResOpen_31 } from './ganbutexun/PtlOpen'; +import { ReqOpen as ReqOpen_32, ResOpen as ResOpen_32 } from './ganbutexun/PtlOpen'; import { ReqFast, ResFast } from './ganhai/PtlFast'; import { ReqFight as ReqFight_1, ResFight as ResFight_1 } from './ganhai/PtlFight'; import { ReqLog, ResLog } from './ganhai/PtlLog'; -import { ReqOpen as ReqOpen_32, ResOpen as ResOpen_32 } from './ganhai/PtlOpen'; +import { ReqOpen as ReqOpen_33, ResOpen as ResOpen_33 } from './ganhai/PtlOpen'; import { ReqRefresh, ResRefresh } from './ganhai/PtlRefresh'; import { ReqRefreshShip, ResRefreshShip } from './ganhai/PtlRefreshShip'; import { ReqSelect as ReqSelect_1, ResSelect as ResSelect_1 } from './ganhai/PtlSelect'; @@ -136,19 +137,19 @@ import { ReqJx, ResJx } from './gonghui/PtlJx'; import { ReqJxOpen, ResJxOpen } from './gonghui/PtlJxOpen'; import { ReqList as ReqList_1, ResList as ResList_1 } from './gonghui/PtlList'; import { ReqManage, ResManage } from './gonghui/PtlManage'; -import { ReqOpen as ReqOpen_33, ResOpen as ResOpen_33 } from './gonghui/PtlOpen'; +import { ReqOpen as ReqOpen_34, ResOpen as ResOpen_34 } from './gonghui/PtlOpen'; import { ReqTanHe, ResTanHe } from './gonghui/PtlTanHe'; import { ReqTaskOpen, ResTaskOpen } from './gonghui/PtlTaskOpen'; import { ReqTaskReceive, ResTaskReceive } from './gonghui/PtlTaskReceive'; import { ReqUpWz, ResUpWz } from './gonghui/PtlUpWz'; import { ReqLottery as ReqLottery_2, ResLottery as ResLottery_2 } from './gonghuibaozang/PtlLottery'; -import { ReqOpen as ReqOpen_34, ResOpen as ResOpen_34 } from './gonghuibaozang/PtlOpen'; +import { ReqOpen as ReqOpen_35, ResOpen as ResOpen_35 } from './gonghuibaozang/PtlOpen'; import { ReqBuy as ReqBuy_4, ResBuy as ResBuy_4 } from './gonglukuangbiao/PtlBuy'; import { ReqFight as ReqFight_2, ResFight as ResFight_2 } from './gonglukuangbiao/PtlFight'; -import { ReqOpen as ReqOpen_35, ResOpen as ResOpen_35 } from './gonglukuangbiao/PtlOpen'; +import { ReqOpen as ReqOpen_36, ResOpen as ResOpen_36 } from './gonglukuangbiao/PtlOpen'; import { ReqRefresh as ReqRefresh_1, ResRefresh as ResRefresh_1 } from './gonglukuangbiao/PtlRefresh'; import { ReqActive, ResActive } from './gongyu/mingdao/PtlActive'; -import { ReqOpen as ReqOpen_36, ResOpen as ResOpen_36 } from './gongyu/mingdao/PtlOpen'; +import { ReqOpen as ReqOpen_37, ResOpen as ResOpen_37 } from './gongyu/mingdao/PtlOpen'; import { ReqRecPrize as ReqRecPrize_3, ResRecPrize as ResRecPrize_3 } from './gongyu/mingdao/PtlRecPrize'; import { ReqRepair, ResRepair } from './gongyu/mingdao/PtlRepair'; import { ReqReset as ReqReset_1, ResReset as ResReset_1 } from './gongyu/xunlianjihua/PtlReset'; @@ -157,14 +158,14 @@ import { ReqSetSkill, ResSetSkill } from './gongyu/zuozhanjihua/PtlSetSkill'; import { ReqBuyNum as ReqBuyNum_1, ResBuyNum as ResBuyNum_1 } from './hbzb/jfs/PtlBuyNum'; import { ReqFight as ReqFight_3, ResFight as ResFight_3 } from './hbzb/jfs/PtlFight'; import { ReqGetLog as ReqGetLog_1, ResGetLog as ResGetLog_1 } from './hbzb/jfs/PtlGetLog'; -import { ReqOpen as ReqOpen_37, ResOpen as ResOpen_37 } from './hbzb/jfs/PtlOpen'; +import { ReqOpen as ReqOpen_38, ResOpen as ResOpen_38 } from './hbzb/jfs/PtlOpen'; import { ReqRec as ReqRec_11, ResRec as ResRec_11 } from './hbzb/jfs/PtlRec'; import { ReqRefresh as ReqRefresh_2, ResRefresh as ResRefresh_2 } from './hbzb/jfs/PtlRefresh'; import { ReqGetStatus, ResGetStatus } from './hbzb/PtlGetStatus'; import { ReqBuyNum as ReqBuyNum_2, ResBuyNum as ResBuyNum_2 } from './hbzb/zbs/PtlBuyNum'; import { ReqFight as ReqFight_4, ResFight as ResFight_4 } from './hbzb/zbs/PtlFight'; import { ReqGetLog as ReqGetLog_2, ResGetLog as ResGetLog_2 } from './hbzb/zbs/PtlGetLog'; -import { ReqOpen as ReqOpen_38, ResOpen as ResOpen_38 } from './hbzb/zbs/PtlOpen'; +import { ReqOpen as ReqOpen_39, ResOpen as ResOpen_39 } from './hbzb/zbs/PtlOpen'; import { ReqRefresh as ReqRefresh_3, ResRefresh as ResRefresh_3 } from './hbzb/zbs/PtlRefresh'; import { ReqAwake, ResAwake } from './hero/PtlAwake'; import { ReqChangePos, ResChangePos } from './hero/PtlChangePos'; @@ -180,16 +181,16 @@ import { ReqGet as ReqGet_2, ResGet as ResGet_2 } from './hongdian/PtlGet'; import { ReqGetList as ReqGetList_4, ResGetList as ResGetList_4 } from './item/PtlGetList'; import { ReqUse, ResUse } from './item/PtlUse'; import { ReqLottery as ReqLottery_3, ResLottery as ResLottery_3 } from './jiaotang/PtlLottery'; -import { ReqOpen as ReqOpen_39, ResOpen as ResOpen_39 } from './jiaotang/PtlOpen'; +import { ReqOpen as ReqOpen_40, ResOpen as ResOpen_40 } from './jiaotang/PtlOpen'; import { ReqLottery as ReqLottery_4, ResLottery as ResLottery_4 } from './jiuba/PtlLottery'; -import { ReqOpen as ReqOpen_40, ResOpen as ResOpen_40 } from './jiuba/PtlOpen'; +import { ReqOpen as ReqOpen_41, ResOpen as ResOpen_41 } from './jiuba/PtlOpen'; import { ReqBuyFightNum, ResBuyFightNum } from './jjc/PtlBuyFightNum'; import { ReqFight as ReqFight_5, ResFight as ResFight_5 } from './jjc/PtlFight'; import { ReqFightLog, ResFightLog } from './jjc/PtlFightLog'; -import { ReqOpen as ReqOpen_41, ResOpen as ResOpen_41 } from './jjc/PtlOpen'; +import { ReqOpen as ReqOpen_42, ResOpen as ResOpen_42 } from './jjc/PtlOpen'; import { ReqReceive as ReqReceive_5, ResReceive as ResReceive_5 } from './jjc/PtlReceive'; import { ReqRefresh as ReqRefresh_4, ResRefresh as ResRefresh_4 } from './jjc/PtlRefresh'; -import { ReqOpen as ReqOpen_42, ResOpen as ResOpen_42 } from './kaifujingsai/PtlOpen'; +import { ReqOpen as ReqOpen_43, ResOpen as ResOpen_43 } from './kaifujingsai/PtlOpen'; import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } from './kaifujingsai/PtlReceive'; import { ReqApply as ReqApply_2, ResApply as ResApply_2 } from './kbzz/PtlApply'; import { ReqAutoApply, ResAutoApply } from './kbzz/PtlAutoApply'; @@ -197,23 +198,23 @@ import { ReqBuyNum as ReqBuyNum_3, ResBuyNum as ResBuyNum_3 } from './kbzz/PtlBu import { ReqFight as ReqFight_6, ResFight as ResFight_6 } from './kbzz/PtlFight'; import { ReqFightLog as ReqFightLog_1, ResFightLog as ResFightLog_1 } from './kbzz/PtlFightLog'; import { ReqGroupState, ResGroupState } from './kbzz/PtlGroupState'; -import { ReqOpen as ReqOpen_43, ResOpen as ResOpen_43 } from './kbzz/PtlOpen'; +import { ReqOpen as ReqOpen_44, ResOpen as ResOpen_44 } from './kbzz/PtlOpen'; import { ReqRecPrize as ReqRecPrize_4, ResRecPrize as ResRecPrize_4 } from './kbzz/PtlRecPrize'; import { ReqRefresh as ReqRefresh_5, ResRefresh as ResRefresh_5 } from './kbzz/PtlRefresh'; import { ReqAddPkNum, ResAddPkNum } from './kuangdong/PtlAddPkNum'; import { ReqGetPrize, ResGetPrize } from './kuangdong/PtlGetPrize'; import { ReqKdInfo, ResKdInfo } from './kuangdong/PtlKdInfo'; import { ReqLog as ReqLog_1, ResLog as ResLog_1 } from './kuangdong/PtlLog'; -import { ReqOpen as ReqOpen_44, ResOpen as ResOpen_44 } from './kuangdong/PtlOpen'; +import { ReqOpen as ReqOpen_45, ResOpen as ResOpen_45 } from './kuangdong/PtlOpen'; import { ReqYanShi, ResYanShi } from './kuangdong/PtlYanShi'; import { ReqZhanLing, ResZhanLing } from './kuangdong/PtlZhanLing'; -import { ReqOpen as ReqOpen_45, ResOpen as ResOpen_45 } from './lingzhulaixi/PtlOpen'; +import { ReqOpen as ReqOpen_46, ResOpen as ResOpen_46 } from './lingzhulaixi/PtlOpen'; import { ReqPkBoss, ResPkBoss } from './lingzhulaixi/PtlPkBoss'; import { ReqPkRank, ResPkRank } from './lingzhulaixi/PtlPkRank'; import { ReqSaoDang, ResSaoDang } from './lingzhulaixi/PtlSaoDang'; import { ReqBuy as ReqBuy_5, ResBuy as ResBuy_5 } from './meirishilian/PtlBuy'; import { ReqFight as ReqFight_7, ResFight as ResFight_7 } from './meirishilian/PtlFight'; -import { ReqOpen as ReqOpen_46, ResOpen as ResOpen_46 } from './meirishilian/PtlOpen'; +import { ReqOpen as ReqOpen_47, ResOpen as ResOpen_47 } from './meirishilian/PtlOpen'; import { MsgBindUid } from './msg_c2s/MsgBindUid'; import { MsgPay } from './msg_c2s/MsgPay'; import { MsgSync } from './msg_c2s/MsgSync'; @@ -245,7 +246,7 @@ import { MsgTaskChange } from './msg_s2c/MsgTaskChange'; import { MsgXianshilibao } from './msg_s2c/MsgXianshilibao'; import { ReqFight as ReqFight_8, ResFight as ResFight_8 } from './pata/PtlFight'; import { ReqGetPrize as ReqGetPrize_1, ResGetPrize as ResGetPrize_1 } from './pata/PtlGetPrize'; -import { ReqOpen as ReqOpen_47, ResOpen as ResOpen_47 } from './pata/PtlOpen'; +import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } from './pata/PtlOpen'; import { ReqSaoDang as ReqSaoDang_1, ResSaoDang as ResSaoDang_1 } from './pata/PtlSaoDang'; import { ReqGetList as ReqGetList_5, ResGetList as ResGetList_5 } from './pay/PtlGetList'; import { ReqGetList as ReqGetList_6, ResGetList as ResGetList_6 } from './peijian/PtlGetList'; @@ -261,15 +262,15 @@ import { ReqUnLock, ResUnLock } from './peijian/PtlUnLock'; import { ReqWear as ReqWear_1, ResWear as ResWear_1 } from './peijian/PtlWear'; import { ReqDeal, ResDeal } from './peijiancangku/PtlDeal'; import { ReqJump, ResJump } from './peijiancangku/PtlJump'; -import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } from './peijiancangku/PtlOpen'; +import { ReqOpen as ReqOpen_49, ResOpen as ResOpen_49 } from './peijiancangku/PtlOpen'; import { ReqBingo, ResBingo } from './PtlBingo'; import { ReqFightTest, ResFightTest } from './PtlFightTest'; import { ReqSyncBtn, ResSyncBtn } from './PtlSyncBtn'; import { ReqTest, ResTest } from './PtlTest'; -import { ReqOpen as ReqOpen_49, ResOpen as ResOpen_49 } from './pushgift/PtlOpen'; +import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } from './pushgift/PtlOpen'; import { ReqFight as ReqFight_9, ResFight as ResFight_9 } from './qjzzd/PtlFight'; -import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } from './qjzzd/PtlOpen'; -import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './rank/PtlOpen'; +import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './qjzzd/PtlOpen'; +import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './rank/PtlOpen'; import { ReqConcise, ResConcise } from './shiwu/PtlConcise'; import { ReqExtract, ResExtract } from './shiwu/PtlExtract'; import { ReqGetList as ReqGetList_7, ResGetList as ResGetList_7 } from './shiwu/PtlGetList'; @@ -277,20 +278,20 @@ import { ReqLvUp as ReqLvUp_3, ResLvUp as ResLvUp_3 } from './shiwu/PtlLvUp'; import { ReqRecast, ResRecast } from './shiwu/PtlRecast'; import { ReqTakeOff as ReqTakeOff_2, ResTakeOff as ResTakeOff_2 } from './shiwu/PtlTakeOff'; import { ReqWear as ReqWear_2, ResWear as ResWear_2 } from './shiwu/PtlWear'; -import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './shootGame/PtlOpen'; +import { ReqOpen as ReqOpen_53, ResOpen as ResOpen_53 } from './shootGame/PtlOpen'; import { ReqRec as ReqRec_13, ResRec as ResRec_13 } from './shootGame/PtlRec'; import { ReqBuy as ReqBuy_6, ResBuy as ResBuy_6 } from './shop/PtlBuy'; -import { ReqOpen as ReqOpen_53, ResOpen as ResOpen_53 } from './shop/PtlOpen'; +import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } from './shop/PtlOpen'; import { ReqRefresh as ReqRefresh_6, ResRefresh as ResRefresh_6 } from './shop/PtlRefresh'; import { ReqGetBoxPrize, ResGetBoxPrize } from './sign/PtlGetBoxPrize'; import { ReqGetPrize as ReqGetPrize_2, ResGetPrize as ResGetPrize_2 } from './sign/PtlGetPrize'; -import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } from './sign/PtlOpen'; +import { ReqOpen as ReqOpen_55, ResOpen as ResOpen_55 } from './sign/PtlOpen'; import { ReqAim, ResAim } from './slzd/PtlAim'; import { ReqBuyNum as ReqBuyNum_4, ResBuyNum as ResBuyNum_4 } from './slzd/PtlBuyNum'; import { ReqFight as ReqFight_10, ResFight as ResFight_10 } from './slzd/PtlFight'; import { ReqFightLog as ReqFightLog_2, ResFightLog as ResFightLog_2 } from './slzd/PtlFightLog'; import { ReqMyRank, ResMyRank } from './slzd/PtlMyRank'; -import { ReqOpen as ReqOpen_55, ResOpen as ResOpen_55 } from './slzd/PtlOpen'; +import { ReqOpen as ReqOpen_56, ResOpen as ResOpen_56 } from './slzd/PtlOpen'; import { ReqOpenFort, ResOpenFort } from './slzd/PtlOpenFort'; import { ReqRec as ReqRec_14, ResRec as ResRec_14 } from './slzd/PtlRec'; import { ReqRefresh as ReqRefresh_7, ResRefresh as ResRefresh_7 } from './slzd/PtlRefresh'; @@ -299,11 +300,11 @@ import { ReqEvent, ResEvent } from './tanxian/PtlEvent'; import { ReqFastGuaJi, ResFastGuaJi } from './tanxian/PtlFastGuaJi'; import { ReqFight as ReqFight_11, ResFight as ResFight_11 } from './tanxian/PtlFight'; import { ReqGuaJi, ResGuaJi } from './tanxian/PtlGuaJi'; -import { ReqOpen as ReqOpen_56, ResOpen as ResOpen_56 } from './tanxian/PtlOpen'; +import { ReqOpen as ReqOpen_57, ResOpen as ResOpen_57 } from './tanxian/PtlOpen'; import { ReqReceive as ReqReceive_7, ResReceive as ResReceive_7 } from './tanxian/PtlReceive'; import { ReqAllFinsh, ResAllFinsh } from './task/PtlAllFinsh'; import { ReqFinsh, ResFinsh } from './task/PtlFinsh'; -import { ReqOpen as ReqOpen_57, ResOpen as ResOpen_57 } from './task/PtlOpen'; +import { ReqOpen as ReqOpen_58, ResOpen as ResOpen_58 } from './task/PtlOpen'; import { ReqCDKEY, ResCDKEY } from './user/PtlCDKEY'; import { ReqChangeInfo, ResChangeInfo } from './user/PtlChangeInfo'; import { ReqChangeName, ResChangeName } from './user/PtlChangeName'; @@ -319,7 +320,7 @@ import { ReqRenownOpen, ResRenownOpen } from './user/PtlRenownOpen'; import { ReqTujian, ResTujian } from './user/PtlTujian'; import { ReqDecompose, ResDecompose } from './weixiuchang/PtlDecompose'; import { ReqExchange, ResExchange } from './weixiuchang/PtlExchange'; -import { ReqOpen as ReqOpen_58, ResOpen as ResOpen_58 } from './weixiuchang/PtlOpen'; +import { ReqOpen as ReqOpen_59, ResOpen as ResOpen_59 } from './weixiuchang/PtlOpen'; import { ReqUpLv, ResUpLv } from './weixiuchang/PtlUpLv'; import { ReqUpStar, ResUpStar } from './weixiuchang/PtlUpStar'; import { ReqAutoBaoMing, ResAutoBaoMing } from './wzry/PtlAutoBaoMing'; @@ -330,7 +331,7 @@ import { ReqDldFight, ResDldFight } from './wzry/PtlDldFight'; import { ReqDldRefre, ResDldRefre } from './wzry/PtlDldRefre'; import { ReqJingCai, ResJingCai } from './wzry/PtlJingCai'; import { ReqJingCaiOpen, ResJingCaiOpen } from './wzry/PtlJingCaiOpen'; -import { ReqOpen as ReqOpen_59, ResOpen as ResOpen_59 } from './wzry/PtlOpen'; +import { ReqOpen as ReqOpen_60, ResOpen as ResOpen_60 } from './wzry/PtlOpen'; import { ReqUpdateFight, ResUpdateFight } from './wzry/PtlUpdateFight'; import { ReqWzzd, ResWzzd } from './wzry/PtlWzzd'; import { ReqZuanShiOpen, ResZuanShiOpen } from './wzry/PtlZuanShiOpen'; @@ -338,7 +339,7 @@ import { ReqAllGet, ResAllGet } from './xstask/PtlAllGet'; import { ReqGet as ReqGet_3, ResGet as ResGet_3 } from './xstask/PtlGet'; import { ReqLvUp as ReqLvUp_4, ResLvUp as ResLvUp_4 } from './xstask/PtlLvUp'; import { ReqOnekeyReceive, ResOnekeyReceive } from './xstask/PtlOnekeyReceive'; -import { ReqOpen as ReqOpen_60, ResOpen as ResOpen_60 } from './xstask/PtlOpen'; +import { ReqOpen as ReqOpen_61, ResOpen as ResOpen_61 } from './xstask/PtlOpen'; import { ReqReceive as ReqReceive_8, ResReceive as ResReceive_8 } from './xstask/PtlReceive'; import { ReqRefresh as ReqRefresh_8, ResRefresh as ResRefresh_8 } from './xstask/PtlRefresh'; import { ReqHandle, ResHandle } from './yongbingzhuzhan/PtlHandle'; @@ -680,25 +681,29 @@ export interface ServiceType { req: ReqRec_7, res: ResRec_7 }, - "event/xinshoulibao/Open": { + "event/xiaofeijingsai/Open": { req: ReqOpen_22, res: ResOpen_22 }, + "event/xinshoulibao/Open": { + req: ReqOpen_23, + res: ResOpen_23 + }, "event/yangchengmubiao/Buy": { req: ReqBuy_2, res: ResBuy_2 }, "event/yangchengmubiao/Open": { - req: ReqOpen_23, - res: ResOpen_23 + req: ReqOpen_24, + res: ResOpen_24 }, "event/yangchengmubiao/Rec": { req: ReqRec_8, res: ResRec_8 }, "event/yibaichou/Open": { - req: ReqOpen_24, - res: ResOpen_24 + req: ReqOpen_25, + res: ResOpen_25 }, "event/yibaichou/Rec": { req: ReqRec_9, @@ -709,8 +714,8 @@ export interface ServiceType { res: ResRecAll }, "event/yuedujijin/Open": { - req: ReqOpen_25, - res: ResOpen_25 + req: ReqOpen_26, + res: ResOpen_26 }, "event/yuedujijin/Rec": { req: ReqRec_10, @@ -721,8 +726,8 @@ export interface ServiceType { res: ResBuyLv }, "event/zhanling/Open": { - req: ReqOpen_26, - res: ResOpen_26 + req: ReqOpen_27, + res: ResOpen_27 }, "event/zhanling/RecPrize": { req: ReqRecPrize_2, @@ -733,13 +738,13 @@ export interface ServiceType { res: ResRecTask }, "event/zhoulibao/Open": { - req: ReqOpen_27, - res: ResOpen_27 - }, - "event/zhoumolibao/Open": { req: ReqOpen_28, res: ResOpen_28 }, + "event/zhoumolibao/Open": { + req: ReqOpen_29, + res: ResOpen_29 + }, "event/zhoumolibao/Receive": { req: ReqReceive_4, res: ResReceive_4 @@ -749,8 +754,8 @@ export interface ServiceType { res: ResBuy_3 }, "event/zixuanlibao/Open": { - req: ReqOpen_29, - res: ResOpen_29 + req: ReqOpen_30, + res: ResOpen_30 }, "eventlist/hdGetList": { req: ReqhdGetList, @@ -773,8 +778,8 @@ export interface ServiceType { res: ResList }, "friend/Open": { - req: ReqOpen_30, - res: ResOpen_30 + req: ReqOpen_31, + res: ResOpen_31 }, "friend/Respond": { req: ReqRespond, @@ -793,8 +798,8 @@ export interface ServiceType { res: ResChallenge }, "ganbutexun/Open": { - req: ReqOpen_31, - res: ResOpen_31 + req: ReqOpen_32, + res: ResOpen_32 }, "ganhai/Fast": { req: ReqFast, @@ -809,8 +814,8 @@ export interface ServiceType { res: ResLog }, "ganhai/Open": { - req: ReqOpen_32, - res: ResOpen_32 + req: ReqOpen_33, + res: ResOpen_33 }, "ganhai/Refresh": { req: ReqRefresh, @@ -897,8 +902,8 @@ export interface ServiceType { res: ResManage }, "gonghui/Open": { - req: ReqOpen_33, - res: ResOpen_33 + req: ReqOpen_34, + res: ResOpen_34 }, "gonghui/TanHe": { req: ReqTanHe, @@ -921,8 +926,8 @@ export interface ServiceType { res: ResLottery_2 }, "gonghuibaozang/Open": { - req: ReqOpen_34, - res: ResOpen_34 + req: ReqOpen_35, + res: ResOpen_35 }, "gonglukuangbiao/Buy": { req: ReqBuy_4, @@ -933,8 +938,8 @@ export interface ServiceType { res: ResFight_2 }, "gonglukuangbiao/Open": { - req: ReqOpen_35, - res: ResOpen_35 + req: ReqOpen_36, + res: ResOpen_36 }, "gonglukuangbiao/Refresh": { req: ReqRefresh_1, @@ -945,8 +950,8 @@ export interface ServiceType { res: ResActive }, "gongyu/mingdao/Open": { - req: ReqOpen_36, - res: ResOpen_36 + req: ReqOpen_37, + res: ResOpen_37 }, "gongyu/mingdao/RecPrize": { req: ReqRecPrize_3, @@ -981,8 +986,8 @@ export interface ServiceType { res: ResGetLog_1 }, "hbzb/jfs/Open": { - req: ReqOpen_37, - res: ResOpen_37 + req: ReqOpen_38, + res: ResOpen_38 }, "hbzb/jfs/Rec": { req: ReqRec_11, @@ -1009,8 +1014,8 @@ export interface ServiceType { res: ResGetLog_2 }, "hbzb/zbs/Open": { - req: ReqOpen_38, - res: ResOpen_38 + req: ReqOpen_39, + res: ResOpen_39 }, "hbzb/zbs/Refresh": { req: ReqRefresh_3, @@ -1073,16 +1078,16 @@ export interface ServiceType { res: ResLottery_3 }, "jiaotang/Open": { - req: ReqOpen_39, - res: ResOpen_39 + req: ReqOpen_40, + res: ResOpen_40 }, "jiuba/Lottery": { req: ReqLottery_4, res: ResLottery_4 }, "jiuba/Open": { - req: ReqOpen_40, - res: ResOpen_40 + req: ReqOpen_41, + res: ResOpen_41 }, "jjc/BuyFightNum": { req: ReqBuyFightNum, @@ -1097,8 +1102,8 @@ export interface ServiceType { res: ResFightLog }, "jjc/Open": { - req: ReqOpen_41, - res: ResOpen_41 + req: ReqOpen_42, + res: ResOpen_42 }, "jjc/Receive": { req: ReqReceive_5, @@ -1109,8 +1114,8 @@ export interface ServiceType { res: ResRefresh_4 }, "kaifujingsai/Open": { - req: ReqOpen_42, - res: ResOpen_42 + req: ReqOpen_43, + res: ResOpen_43 }, "kaifujingsai/Receive": { req: ReqReceive_6, @@ -1141,8 +1146,8 @@ export interface ServiceType { res: ResGroupState }, "kbzz/Open": { - req: ReqOpen_43, - res: ResOpen_43 + req: ReqOpen_44, + res: ResOpen_44 }, "kbzz/RecPrize": { req: ReqRecPrize_4, @@ -1169,8 +1174,8 @@ export interface ServiceType { res: ResLog_1 }, "kuangdong/Open": { - req: ReqOpen_44, - res: ResOpen_44 + req: ReqOpen_45, + res: ResOpen_45 }, "kuangdong/YanShi": { req: ReqYanShi, @@ -1181,8 +1186,8 @@ export interface ServiceType { res: ResZhanLing }, "lingzhulaixi/Open": { - req: ReqOpen_45, - res: ResOpen_45 + req: ReqOpen_46, + res: ResOpen_46 }, "lingzhulaixi/PkBoss": { req: ReqPkBoss, @@ -1205,8 +1210,8 @@ export interface ServiceType { res: ResFight_7 }, "meirishilian/Open": { - req: ReqOpen_46, - res: ResOpen_46 + req: ReqOpen_47, + res: ResOpen_47 }, "pata/Fight": { req: ReqFight_8, @@ -1217,8 +1222,8 @@ export interface ServiceType { res: ResGetPrize_1 }, "pata/Open": { - req: ReqOpen_47, - res: ResOpen_47 + req: ReqOpen_48, + res: ResOpen_48 }, "pata/SaoDang": { req: ReqSaoDang_1, @@ -1281,8 +1286,8 @@ export interface ServiceType { res: ResJump }, "peijiancangku/Open": { - req: ReqOpen_48, - res: ResOpen_48 + req: ReqOpen_49, + res: ResOpen_49 }, "Bingo": { req: ReqBingo, @@ -1301,21 +1306,21 @@ export interface ServiceType { res: ResTest }, "pushgift/Open": { - req: ReqOpen_49, - res: ResOpen_49 + req: ReqOpen_50, + res: ResOpen_50 }, "qjzzd/Fight": { req: ReqFight_9, res: ResFight_9 }, "qjzzd/Open": { - req: ReqOpen_50, - res: ResOpen_50 - }, - "rank/Open": { req: ReqOpen_51, res: ResOpen_51 }, + "rank/Open": { + req: ReqOpen_52, + res: ResOpen_52 + }, "shiwu/Concise": { req: ReqConcise, res: ResConcise @@ -1345,8 +1350,8 @@ export interface ServiceType { res: ResWear_2 }, "shootGame/Open": { - req: ReqOpen_52, - res: ResOpen_52 + req: ReqOpen_53, + res: ResOpen_53 }, "shootGame/Rec": { req: ReqRec_13, @@ -1357,8 +1362,8 @@ export interface ServiceType { res: ResBuy_6 }, "shop/Open": { - req: ReqOpen_53, - res: ResOpen_53 + req: ReqOpen_54, + res: ResOpen_54 }, "shop/Refresh": { req: ReqRefresh_6, @@ -1373,8 +1378,8 @@ export interface ServiceType { res: ResGetPrize_2 }, "sign/Open": { - req: ReqOpen_54, - res: ResOpen_54 + req: ReqOpen_55, + res: ResOpen_55 }, "slzd/Aim": { req: ReqAim, @@ -1397,8 +1402,8 @@ export interface ServiceType { res: ResMyRank }, "slzd/Open": { - req: ReqOpen_55, - res: ResOpen_55 + req: ReqOpen_56, + res: ResOpen_56 }, "slzd/OpenFort": { req: ReqOpenFort, @@ -1433,8 +1438,8 @@ export interface ServiceType { res: ResGuaJi }, "tanxian/Open": { - req: ReqOpen_56, - res: ResOpen_56 + req: ReqOpen_57, + res: ResOpen_57 }, "tanxian/Receive": { req: ReqReceive_7, @@ -1449,8 +1454,8 @@ export interface ServiceType { res: ResFinsh }, "task/Open": { - req: ReqOpen_57, - res: ResOpen_57 + req: ReqOpen_58, + res: ResOpen_58 }, "user/CDKEY": { req: ReqCDKEY, @@ -1513,8 +1518,8 @@ export interface ServiceType { res: ResExchange }, "weixiuchang/Open": { - req: ReqOpen_58, - res: ResOpen_58 + req: ReqOpen_59, + res: ResOpen_59 }, "weixiuchang/UpLv": { req: ReqUpLv, @@ -1557,8 +1562,8 @@ export interface ServiceType { res: ResJingCaiOpen }, "wzry/Open": { - req: ReqOpen_59, - res: ResOpen_59 + req: ReqOpen_60, + res: ResOpen_60 }, "wzry/UpdateFight": { req: ReqUpdateFight, @@ -1589,8 +1594,8 @@ export interface ServiceType { res: ResOnekeyReceive }, "xstask/Open": { - req: ReqOpen_60, - res: ResOpen_60 + req: ReqOpen_61, + res: ResOpen_61 }, "xstask/Receive": { req: ReqReceive_8, @@ -2069,41 +2074,46 @@ export const serviceProto: ServiceProto = { }, { "id": 83, - "name": "event/xinshoulibao/Open", + "name": "event/xiaofeijingsai/Open", "type": "api" }, { "id": 84, - "name": "event/yangchengmubiao/Buy", + "name": "event/xinshoulibao/Open", "type": "api" }, { "id": 85, - "name": "event/yangchengmubiao/Open", + "name": "event/yangchengmubiao/Buy", "type": "api" }, { "id": 86, - "name": "event/yangchengmubiao/Rec", + "name": "event/yangchengmubiao/Open", "type": "api" }, { "id": 87, - "name": "event/yibaichou/Open", + "name": "event/yangchengmubiao/Rec", "type": "api" }, { "id": 88, - "name": "event/yibaichou/Rec", + "name": "event/yibaichou/Open", "type": "api" }, { "id": 89, - "name": "event/yibaichou/RecAll", + "name": "event/yibaichou/Rec", "type": "api" }, { "id": 90, + "name": "event/yibaichou/RecAll", + "type": "api" + }, + { + "id": 91, "name": "event/yuedujijin/Open", "type": "api", "conf": { @@ -2111,157 +2121,157 @@ export const serviceProto: ServiceProto = { } }, { - "id": 91, + "id": 92, "name": "event/yuedujijin/Rec", "type": "api" }, { - "id": 92, + "id": 93, "name": "event/zhanling/BuyLv", "type": "api" }, { - "id": 93, + "id": 94, "name": "event/zhanling/Open", "type": "api" }, { - "id": 94, + "id": 95, "name": "event/zhanling/RecPrize", "type": "api" }, { - "id": 95, + "id": 96, "name": "event/zhanling/RecTask", "type": "api" }, { - "id": 96, + "id": 97, "name": "event/zhoulibao/Open", "type": "api" }, { - "id": 97, + "id": 98, "name": "event/zhoumolibao/Open", "type": "api" }, { - "id": 98, + "id": 99, "name": "event/zhoumolibao/Receive", "type": "api" }, { - "id": 99, + "id": 100, "name": "event/zixuanlibao/Buy", "type": "api" }, { - "id": 100, + "id": 101, "name": "event/zixuanlibao/Open", "type": "api" }, { - "id": 101, + "id": 102, "name": "eventlist/hdGetList", "type": "api" }, { - "id": 102, + "id": 103, "name": "friend/Apply", "type": "api" }, { - "id": 103, + "id": 104, "name": "friend/Del", "type": "api" }, { - "id": 104, + "id": 105, "name": "friend/Gift", "type": "api" }, { - "id": 105, + "id": 106, "name": "friend/List", "type": "api" }, { - "id": 106, + "id": 107, "name": "friend/Open", "type": "api" }, { - "id": 107, + "id": 108, "name": "friend/Respond", "type": "api" }, { - "id": 108, + "id": 109, "name": "friend/RmBlackList", "type": "api" }, { - "id": 109, + "id": 110, "name": "friend/Search", "type": "api" }, { - "id": 110, + "id": 111, "name": "ganbutexun/Challenge", "type": "api" }, { - "id": 111, + "id": 112, "name": "ganbutexun/Open", "type": "api" }, { - "id": 112, + "id": 113, "name": "ganhai/Fast", "type": "api" }, { - "id": 113, + "id": 114, "name": "ganhai/Fight", "type": "api" }, { - "id": 114, + "id": 115, "name": "ganhai/Log", "type": "api" }, { - "id": 115, + "id": 116, "name": "ganhai/Open", "type": "api" }, { - "id": 116, + "id": 117, "name": "ganhai/Refresh", "type": "api" }, { - "id": 117, + "id": 118, "name": "ganhai/RefreshShip", "type": "api" }, { - "id": 118, + "id": 119, "name": "ganhai/Select", "type": "api" }, { - "id": 119, + "id": 120, "name": "gmapi/Gift", "type": "api" }, { - "id": 120, + "id": 121, "name": "gmapi/Post", "type": "api" }, { - "id": 121, + "id": 122, "name": "gonghui/Apply", "type": "api", "conf": { @@ -2271,7 +2281,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 122, + "id": 123, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2281,7 +2291,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 123, + "id": 124, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2291,7 +2301,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 124, + "id": 125, "name": "gonghui/Change", "type": "api", "conf": { @@ -2301,12 +2311,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 125, + "id": 126, "name": "gonghui/Create", "type": "api" }, { - "id": 126, + "id": 127, "name": "gonghui/Dissolve", "type": "api", "conf": { @@ -2316,7 +2326,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 127, + "id": 128, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2326,12 +2336,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 128, + "id": 129, "name": "gonghui/FbBuyNum", "type": "api" }, { - "id": 129, + "id": 130, "name": "gonghui/FbFight", "type": "api", "conf": { @@ -2341,7 +2351,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 130, + "id": 131, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2351,17 +2361,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 131, + "id": 132, "name": "gonghui/GetList", "type": "api" }, { - "id": 132, + "id": 133, "name": "gonghui/Join", "type": "api" }, { - "id": 133, + "id": 134, "name": "gonghui/Jx", "type": "api", "conf": { @@ -2371,7 +2381,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 134, + "id": 135, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2381,7 +2391,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 135, + "id": 136, "name": "gonghui/List", "type": "api", "conf": { @@ -2391,7 +2401,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 136, + "id": 137, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2401,7 +2411,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 137, + "id": 138, "name": "gonghui/Open", "type": "api", "conf": { @@ -2411,7 +2421,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 138, + "id": 139, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2421,7 +2431,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 139, + "id": 140, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2431,7 +2441,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 140, + "id": 141, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2441,7 +2451,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 141, + "id": 142, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2451,137 +2461,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 142, + "id": 143, "name": "gonghuibaozang/Lottery", "type": "api" }, { - "id": 143, + "id": 144, "name": "gonghuibaozang/Open", "type": "api" }, { - "id": 144, + "id": 145, "name": "gonglukuangbiao/Buy", "type": "api" }, { - "id": 145, + "id": 146, "name": "gonglukuangbiao/Fight", "type": "api" }, { - "id": 146, + "id": 147, "name": "gonglukuangbiao/Open", "type": "api" }, { - "id": 147, + "id": 148, "name": "gonglukuangbiao/Refresh", "type": "api" }, { - "id": 148, + "id": 149, "name": "gongyu/mingdao/Active", "type": "api" }, { - "id": 149, + "id": 150, "name": "gongyu/mingdao/Open", "type": "api" }, { - "id": 150, + "id": 151, "name": "gongyu/mingdao/RecPrize", "type": "api" }, { - "id": 151, + "id": 152, "name": "gongyu/mingdao/Repair", "type": "api" }, { - "id": 152, + "id": 153, "name": "gongyu/xunlianjihua/Reset", "type": "api" }, { - "id": 153, + "id": 154, "name": "gongyu/xunlianjihua/UpSkill", "type": "api" }, { - "id": 154, + "id": 155, "name": "gongyu/zuozhanjihua/SetSkill", "type": "api" }, { - "id": 155, + "id": 156, "name": "hbzb/jfs/BuyNum", "type": "api" }, { - "id": 156, + "id": 157, "name": "hbzb/jfs/Fight", "type": "api" }, { - "id": 157, + "id": 158, "name": "hbzb/jfs/GetLog", "type": "api" }, { - "id": 158, + "id": 159, "name": "hbzb/jfs/Open", "type": "api" }, { - "id": 159, + "id": 160, "name": "hbzb/jfs/Rec", "type": "api" }, { - "id": 160, + "id": 161, "name": "hbzb/jfs/Refresh", "type": "api" }, { - "id": 161, + "id": 162, "name": "hbzb/GetStatus", "type": "api" }, { - "id": 162, + "id": 163, "name": "hbzb/zbs/BuyNum", "type": "api" }, { - "id": 163, + "id": 164, "name": "hbzb/zbs/Fight", "type": "api" }, { - "id": 164, + "id": 165, "name": "hbzb/zbs/GetLog", "type": "api" }, { - "id": 165, + "id": 166, "name": "hbzb/zbs/Open", "type": "api" }, { - "id": 166, + "id": 167, "name": "hbzb/zbs/Refresh", "type": "api" }, { - "id": 167, + "id": 168, "name": "hero/Awake", "type": "api" }, { - "id": 168, + "id": 169, "name": "hero/ChangePos", "type": "api", "conf": { @@ -2589,17 +2599,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 169, + "id": 170, "name": "hero/GetList", "type": "api" }, { - "id": 170, + "id": 171, "name": "hero/JinJie", "type": "api" }, { - "id": 171, + "id": 172, "name": "hero/LvUp", "type": "api", "conf": { @@ -2607,32 +2617,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 172, + "id": 173, "name": "hero/Potency", "type": "api" }, { - "id": 173, + "id": 174, "name": "hero/Rec", "type": "api" }, { - "id": 174, + "id": 175, "name": "hero/Reset", "type": "api" }, { - "id": 175, + "id": 176, "name": "hero/Talent", "type": "api" }, { - "id": 176, + "id": 177, "name": "hero/WeaponUp", "type": "api" }, { - "id": 177, + "id": 178, "name": "hongdian/Get", "type": "api", "conf": { @@ -2640,117 +2650,117 @@ export const serviceProto: ServiceProto = { } }, { - "id": 178, + "id": 179, "name": "item/GetList", "type": "api" }, { - "id": 179, + "id": 180, "name": "item/Use", "type": "api" }, { - "id": 180, + "id": 181, "name": "jiaotang/Lottery", "type": "api" }, { - "id": 181, + "id": 182, "name": "jiaotang/Open", "type": "api" }, { - "id": 182, + "id": 183, "name": "jiuba/Lottery", "type": "api" }, { - "id": 183, + "id": 184, "name": "jiuba/Open", "type": "api" }, { - "id": 184, + "id": 185, "name": "jjc/BuyFightNum", "type": "api" }, { - "id": 185, + "id": 186, "name": "jjc/Fight", "type": "api" }, { - "id": 186, + "id": 187, "name": "jjc/FightLog", "type": "api" }, { - "id": 187, + "id": 188, "name": "jjc/Open", "type": "api" }, { - "id": 188, + "id": 189, "name": "jjc/Receive", "type": "api" }, { - "id": 189, + "id": 190, "name": "jjc/Refresh", "type": "api" }, { - "id": 190, + "id": 191, "name": "kaifujingsai/Open", "type": "api" }, { - "id": 191, + "id": 192, "name": "kaifujingsai/Receive", "type": "api" }, { - "id": 192, + "id": 193, "name": "kbzz/Apply", "type": "api" }, { - "id": 193, + "id": 194, "name": "kbzz/AutoApply", "type": "api" }, { - "id": 194, + "id": 195, "name": "kbzz/BuyNum", "type": "api" }, { - "id": 195, + "id": 196, "name": "kbzz/Fight", "type": "api" }, { - "id": 196, + "id": 197, "name": "kbzz/FightLog", "type": "api" }, { - "id": 197, + "id": 198, "name": "kbzz/GroupState", "type": "api" }, { - "id": 198, + "id": 199, "name": "kbzz/Open", "type": "api" }, { - "id": 199, + "id": 200, "name": "kbzz/RecPrize", "type": "api" }, { - "id": 200, + "id": 201, "name": "kbzz/Refresh", "type": "api", "conf": { @@ -2758,287 +2768,287 @@ export const serviceProto: ServiceProto = { } }, { - "id": 201, + "id": 202, "name": "kuangdong/AddPkNum", "type": "api" }, { - "id": 202, + "id": 203, "name": "kuangdong/GetPrize", "type": "api" }, { - "id": 203, + "id": 204, "name": "kuangdong/KdInfo", "type": "api" }, { - "id": 204, + "id": 205, "name": "kuangdong/Log", "type": "api" }, { - "id": 205, + "id": 206, "name": "kuangdong/Open", "type": "api" }, { - "id": 206, + "id": 207, "name": "kuangdong/YanShi", "type": "api" }, { - "id": 207, + "id": 208, "name": "kuangdong/ZhanLing", "type": "api" }, { - "id": 208, + "id": 209, "name": "lingzhulaixi/Open", "type": "api" }, { - "id": 209, + "id": 210, "name": "lingzhulaixi/PkBoss", "type": "api" }, { - "id": 210, + "id": 211, "name": "lingzhulaixi/PkRank", "type": "api" }, { - "id": 211, + "id": 212, "name": "lingzhulaixi/SaoDang", "type": "api" }, { - "id": 212, + "id": 213, "name": "meirishilian/Buy", "type": "api" }, { - "id": 213, + "id": 214, "name": "meirishilian/Fight", "type": "api" }, { - "id": 214, + "id": 215, "name": "meirishilian/Open", "type": "api" }, { - "id": 215, + "id": 216, "name": "msg_c2s/BindUid", "type": "msg" }, { - "id": 216, + "id": 217, "name": "msg_c2s/Pay", "type": "msg" }, { - "id": 217, + "id": 218, "name": "msg_c2s/Sync", "type": "msg" }, { - "id": 218, + "id": 219, "name": "msg_s2c/Chat", "type": "msg" }, { - "id": 219, + "id": 220, "name": "msg_s2c/ChatHelp", "type": "msg" }, { - "id": 220, + "id": 221, "name": "msg_s2c/Collection", "type": "msg" }, { - "id": 221, + "id": 222, "name": "msg_s2c/Email", "type": "msg" }, { - "id": 222, + "id": 223, "name": "msg_s2c/EmailDel", "type": "msg" }, { - "id": 223, + "id": 224, "name": "msg_s2c/EquipChange", "type": "msg" }, { - "id": 224, + "id": 225, "name": "msg_s2c/Friend", "type": "msg" }, { - "id": 225, + "id": 226, "name": "msg_s2c/GhChange", "type": "msg" }, { - "id": 226, + "id": 227, "name": "msg_s2c/GongHuiBaoZang", "type": "msg" }, { - "id": 227, + "id": 228, "name": "msg_s2c/HeroChange", "type": "msg" }, { - "id": 228, + "id": 229, "name": "msg_s2c/HongDianChange", "type": "msg" }, { - "id": 229, + "id": 230, "name": "msg_s2c/ItemChange", "type": "msg" }, { - "id": 230, + "id": 231, "name": "msg_s2c/LoginQueue", "type": "msg" }, { - "id": 231, + "id": 232, "name": "msg_s2c/LshdChange", "type": "msg" }, { - "id": 232, + "id": 233, "name": "msg_s2c/NewDay", "type": "msg" }, { - "id": 233, + "id": 234, "name": "msg_s2c/OtherLogin", "type": "msg" }, { - "id": 234, + "id": 235, "name": "msg_s2c/PayChange", "type": "msg" }, { - "id": 235, + "id": 236, "name": "msg_s2c/PayResult", "type": "msg" }, { - "id": 236, + "id": 237, "name": "msg_s2c/PeijianChange", "type": "msg" }, { - "id": 237, + "id": 238, "name": "msg_s2c/PlayerChange", "type": "msg" }, { - "id": 238, + "id": 239, "name": "msg_s2c/Private", "type": "msg" }, { - "id": 239, + "id": 240, "name": "msg_s2c/PushGiftChange", "type": "msg" }, { - "id": 240, + "id": 241, "name": "msg_s2c/SendGift", "type": "msg" }, { - "id": 241, + "id": 242, "name": "msg_s2c/ShiwuChange", "type": "msg" }, { - "id": 242, + "id": 243, "name": "msg_s2c/TaskChange", "type": "msg" }, { - "id": 243, + "id": 244, "name": "msg_s2c/Xianshilibao", "type": "msg" }, { - "id": 244, + "id": 245, "name": "pata/Fight", "type": "api" }, { - "id": 245, + "id": 246, "name": "pata/GetPrize", "type": "api" }, { - "id": 246, + "id": 247, "name": "pata/Open", "type": "api" }, { - "id": 247, + "id": 248, "name": "pata/SaoDang", "type": "api" }, { - "id": 248, + "id": 249, "name": "pay/GetList", "type": "api" }, { - "id": 249, + "id": 250, "name": "peijian/GetList", "type": "api" }, { - "id": 250, + "id": 251, "name": "peijian/JingLian", "type": "api" }, { - "id": 251, + "id": 252, "name": "peijian/JinJie", "type": "api" }, { - "id": 252, + "id": 253, "name": "peijian/LvUp", "type": "api" }, { - "id": 253, + "id": 254, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 254, + "id": 255, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 255, + "id": 256, "name": "peijian/Reset", "type": "api" }, { - "id": 256, + "id": 257, "name": "peijian/Rm", "type": "api" }, { - "id": 257, + "id": 258, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3046,32 +3056,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 258, + "id": 259, "name": "peijian/UnLock", "type": "api" }, { - "id": 259, + "id": 260, "name": "peijian/Wear", "type": "api" }, { - "id": 260, + "id": 261, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 261, + "id": 262, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 262, + "id": 263, "name": "peijiancangku/Open", "type": "api" }, { - "id": 263, + "id": 264, "name": "Bingo", "type": "api", "conf": { @@ -3079,142 +3089,142 @@ export const serviceProto: ServiceProto = { } }, { - "id": 264, + "id": 265, "name": "FightTest", "type": "api" }, { - "id": 265, + "id": 266, "name": "SyncBtn", "type": "api" }, { - "id": 266, + "id": 267, "name": "Test", "type": "api" }, { - "id": 267, + "id": 268, "name": "pushgift/Open", "type": "api" }, { - "id": 268, + "id": 269, "name": "qjzzd/Fight", "type": "api" }, { - "id": 269, + "id": 270, "name": "qjzzd/Open", "type": "api" }, { - "id": 270, + "id": 271, "name": "rank/Open", "type": "api" }, { - "id": 271, + "id": 272, "name": "shiwu/Concise", "type": "api" }, { - "id": 272, + "id": 273, "name": "shiwu/Extract", "type": "api" }, { - "id": 273, + "id": 274, "name": "shiwu/GetList", "type": "api" }, { - "id": 274, + "id": 275, "name": "shiwu/LvUp", "type": "api" }, { - "id": 275, + "id": 276, "name": "shiwu/Recast", "type": "api" }, { - "id": 276, + "id": 277, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 277, + "id": 278, "name": "shiwu/Wear", "type": "api" }, { - "id": 278, + "id": 279, "name": "shootGame/Open", "type": "api" }, { - "id": 279, + "id": 280, "name": "shootGame/Rec", "type": "api" }, { - "id": 280, + "id": 281, "name": "shop/Buy", "type": "api" }, { - "id": 281, + "id": 282, "name": "shop/Open", "type": "api" }, { - "id": 282, + "id": 283, "name": "shop/Refresh", "type": "api" }, { - "id": 283, + "id": 284, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 284, + "id": 285, "name": "sign/GetPrize", "type": "api" }, { - "id": 285, + "id": 286, "name": "sign/Open", "type": "api" }, { - "id": 286, + "id": 287, "name": "slzd/Aim", "type": "api" }, { - "id": 287, + "id": 288, "name": "slzd/BuyNum", "type": "api" }, { - "id": 288, + "id": 289, "name": "slzd/Fight", "type": "api" }, { - "id": 289, + "id": 290, "name": "slzd/FightLog", "type": "api" }, { - "id": 290, + "id": 291, "name": "slzd/MyRank", "type": "api" }, { - "id": 291, + "id": 292, "name": "slzd/Open", "type": "api", "conf": { @@ -3224,77 +3234,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 292, + "id": 293, "name": "slzd/OpenFort", "type": "api" }, { - "id": 293, + "id": 294, "name": "slzd/Rec", "type": "api" }, { - "id": 294, + "id": 295, "name": "slzd/Refresh", "type": "api" }, { - "id": 295, + "id": 296, "name": "slzd/Slot", "type": "api" }, { - "id": 296, + "id": 297, "name": "tanxian/Event", "type": "api" }, { - "id": 297, + "id": 298, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 298, + "id": 299, "name": "tanxian/Fight", "type": "api" }, { - "id": 299, + "id": 300, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 300, + "id": 301, "name": "tanxian/Open", "type": "api" }, { - "id": 301, + "id": 302, "name": "tanxian/Receive", "type": "api" }, { - "id": 302, + "id": 303, "name": "task/AllFinsh", "type": "api" }, { - "id": 303, + "id": 304, "name": "task/Finsh", "type": "api" }, { - "id": 304, + "id": 305, "name": "task/Open", "type": "api" }, { - "id": 305, + "id": 306, "name": "user/CDKEY", "type": "api" }, { - "id": 306, + "id": 307, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3302,197 +3312,197 @@ export const serviceProto: ServiceProto = { } }, { - "id": 307, + "id": 308, "name": "user/ChangeName", "type": "api" }, { - "id": 308, + "id": 309, "name": "user/Fight", "type": "api" }, { - "id": 309, + "id": 310, "name": "user/GetInfo", "type": "api" }, { - "id": 310, + "id": 311, "name": "user/InfoOpen", "type": "api" }, { - "id": 311, + "id": 312, "name": "user/Login", "type": "api" }, { - "id": 312, + "id": 313, "name": "user/Ping", "type": "api" }, { - "id": 313, + "id": 314, "name": "user/Renown", "type": "api" }, { - "id": 314, + "id": 315, "name": "user/RenownBuy", "type": "api" }, { - "id": 315, + "id": 316, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 316, + "id": 317, "name": "user/RenownOpen", "type": "api" }, { - "id": 317, + "id": 318, "name": "user/Tujian", "type": "api" }, { - "id": 318, + "id": 319, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 319, + "id": 320, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 320, + "id": 321, "name": "weixiuchang/Open", "type": "api" }, { - "id": 321, + "id": 322, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 322, + "id": 323, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 323, + "id": 324, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 324, + "id": 325, "name": "wzry/BaoMing", "type": "api" }, { - "id": 325, + "id": 326, "name": "wzry/catFightLog", "type": "api" }, { - "id": 326, + "id": 327, "name": "wzry/CatGroup", "type": "api" }, { - "id": 327, + "id": 328, "name": "wzry/DldFight", "type": "api" }, { - "id": 328, + "id": 329, "name": "wzry/DldRefre", "type": "api" }, { - "id": 329, + "id": 330, "name": "wzry/JingCai", "type": "api" }, { - "id": 330, + "id": 331, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 331, + "id": 332, "name": "wzry/Open", "type": "api" }, { - "id": 332, + "id": 333, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 333, + "id": 334, "name": "wzry/Wzzd", "type": "api" }, { - "id": 334, + "id": 335, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 335, + "id": 336, "name": "xstask/AllGet", "type": "api" }, { - "id": 336, + "id": 337, "name": "xstask/Get", "type": "api" }, { - "id": 337, + "id": 338, "name": "xstask/LvUp", "type": "api" }, { - "id": 338, + "id": 339, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 339, + "id": 340, "name": "xstask/Open", "type": "api" }, { - "id": 340, + "id": 341, "name": "xstask/Receive", "type": "api" }, { - "id": 341, + "id": 342, "name": "xstask/Refresh", "type": "api" }, { - "id": 342, + "id": 343, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 343, + "id": 344, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 344, + "id": 345, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 345, + "id": 346, "name": "zhanqianbushu/Up", "type": "api" } @@ -10616,6 +10626,24 @@ export const serviceProto: ServiceProto = { } ] }, + "event/xiaofeijingsai/PtlOpen/ReqOpen": { + "type": "Interface" + }, + "event/xiaofeijingsai/PtlOpen/ResOpen": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "list", + "type": { + "type": "Array", + "elementType": { + "type": "Any" + } + } + } + ] + }, "event/xinshoulibao/PtlOpen/ReqOpen": { "type": "Interface" }, From 8a10552203fcf6ed239bbbdc7b6eb65c7b710809 Mon Sep 17 00:00:00 2001 From: yushunrui <364203175@qq.com> Date: Wed, 20 Dec 2023 16:17:09 +0800 Subject: [PATCH 22/90] =?UTF-8?q?fix:=E5=9C=A3=E8=AF=9E=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/hongdian/fun.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/api_s2c/hongdian/fun.ts b/src/api_s2c/hongdian/fun.ts index d173a22..d6b30ec 100644 --- a/src/api_s2c/hongdian/fun.ts +++ b/src/api_s2c/hongdian/fun.ts @@ -361,7 +361,10 @@ export class HuoDongHongDianFun { // 检测 htype 6 七日登录活动红点 ishd = await this.qiridengluHongDian(call, element) } - + if (element.htype == 8) { + // 检测 htype 8 圣诞活动红点 + ishd = await this.christmasHongDian(call, element) + } if (element.htype == 10) { // 检测 htype 10 破冰活动红点 ishd = await this.pobinglibao(call, element) From 16254610b035e5cc10ce5d69b830b4df41f06e6d Mon Sep 17 00:00:00 2001 From: yushunrui <364203175@qq.com> Date: Wed, 20 Dec 2023 16:25:22 +0800 Subject: [PATCH 23/90] =?UTF-8?q?fix:=E6=96=B0=E5=A2=9E=E5=9C=A3=E8=AF=9E?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=AF=8F=E6=97=A5=E6=B6=88=E8=80=97=E9=92=BB?= =?UTF-8?q?=E7=9F=B3=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/globalListener.ts | 2 ++ src/public/player.ts | 5 +++++ src/public/taskclass.ts | 11 ++++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/globalListener.ts b/src/globalListener.ts index 594a3e3..648a0bf 100644 --- a/src/globalListener.ts +++ b/src/globalListener.ts @@ -144,6 +144,8 @@ export type gEventType = { Class_task_154: (eventname, call, val, chkVal) => void; /**每日任务宝箱领取 */ Class_task_155: (eventname, call, val, chkVal) => void; + /**每日钻石消耗 */ + Class_task_156: (eventname, call, val, chkVal) => void; }; export function addListener() { diff --git a/src/public/player.ts b/src/public/player.ts index 27d8ddc..c179fd7 100644 --- a/src/public/player.ts +++ b/src/public/player.ts @@ -172,6 +172,11 @@ export class PlayerFun { change[atn.t] = this.fixAttrLteZero(atn.t, await this.getAtnNum(call, atn) + atn.n); if (atn.t == 'rmbmoney') { this.changeAttrLog(call.conn.uid, change[atn.t], atn, call.conn.gud.rmbmoney) + // 扣除钻石时 + if (atn.n < 0) { + // 监听任务消耗任务 + G.emit("Class_task_156", 'Class_task_156', call, -atn.n, 0); + } } all.push(this.changeAttr(call.conn.uid, change)); all.push(this.upAttr(call, {...atn, n: change[atn.t]})); diff --git a/src/public/taskclass.ts b/src/public/taskclass.ts index 5266c85..332df27 100644 --- a/src/public/taskclass.ts +++ b/src/public/taskclass.ts @@ -772,7 +772,7 @@ export module manager { isinc = 1 async initVal(call: ApiCall, con) { - return 1; + return 0; } } // 第57个任务 领取每日任务最终宝箱 @@ -780,6 +780,15 @@ export module manager { stype = 155 isinc = 0 + async initVal(call: ApiCall, con) { + return 0; + } + } + // 第58个任务 每日钻石消耗 + export class Class_task_156 extends BaseClass { + stype = 156 + isinc = 1 + async initVal(call: ApiCall, con) { return 1; } From c22d471260e7f337a6a685006a7cd8ab138eab3e Mon Sep 17 00:00:00 2001 From: yushunrui <364203175@qq.com> Date: Wed, 20 Dec 2023 16:39:29 +0800 Subject: [PATCH 24/90] =?UTF-8?q?fix:=E6=96=B0=E5=A2=9E=E5=9C=A3=E8=AF=9E?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AD=BE=E5=88=B0=E4=B9=9F=E5=8A=A0=E4=B8=8A?= =?UTF-8?q?=E7=BB=8F=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/christmas/ApiQianDao.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/api_s2c/event/christmas/ApiQianDao.ts b/src/api_s2c/event/christmas/ApiQianDao.ts index 5eb2830..0dba7b9 100644 --- a/src/api_s2c/event/christmas/ApiQianDao.ts +++ b/src/api_s2c/event/christmas/ApiQianDao.ts @@ -19,17 +19,23 @@ export default async function (call: ApiCall) { _mydata.qiandao.push(i) _prize = _prize.concat(_con[i]) } - if (!_prize){ // 没有奖励可以领取 return call.error('', { code: -1, message: globalThis.lng.yangchengmubiao_2 }) } - - let _setData = {} + let _addVal = 0 + // 懒得喊后台和前端修改了，直接取prize里面的对应的经验字段去添加zhanling经验 + for (const p of _prize) { + // 战令经验 + if (p.t == "shengdanExp") { + _addVal += p.n + } + } + _mydata["val"] += _addVal + _setData["val"] = _mydata.val _setData["qiandao"] = _mydata.qiandao await Christmasfun.setMyData(call.uid, call.req.hdid, { $set: _setData }) - await PlayerFun.sendPrize(call, _prize); let changedata = { mydata: _mydata, prize: _prize} // 推送红点 From fa88c44593769088d664f6909ebacb3b44782356 Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 20 Dec 2023 16:44:30 +0800 Subject: [PATCH 25/90] =?UTF-8?q?=E7=A0=B4=E5=86=B0=E7=A4=BC=E5=8C=85fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/pobinglibao/ApiOpen.ts | 6 +++++- src/public/pay.ts | 5 +---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/api_s2c/event/pobinglibao/ApiOpen.ts b/src/api_s2c/event/pobinglibao/ApiOpen.ts index 77e62a5..b97d08a 100644 --- a/src/api_s2c/event/pobinglibao/ApiOpen.ts +++ b/src/api_s2c/event/pobinglibao/ApiOpen.ts @@ -12,7 +12,11 @@ export default async function (call: ApiCall) { let payIds = _hd?.data?.gift?.filter(i => i.payId)?.map(i => i.payId) - let payLog = await PayFun.getPayLogs(call.uid, payIds, [_hd.stime, _hd.etime]) + let payLog: any = await PayFun.getPayLogs(call.uid, payIds) + + for (let key in payLog) { + payLog[key]?.filter(i => i.time > _hd.stime && i.time < _hd.etime) + } call.succ({ record: data?.record || {}, diff --git a/src/public/pay.ts b/src/public/pay.ts index 4f25679..43a0e58 100644 --- a/src/public/pay.ts +++ b/src/public/pay.ts @@ -83,15 +83,12 @@ export class PayFun { return allPlayerPayLog?.[payId] || []; } - static async getPayLogs(uid: string, payIds?: string[], times?: number[]) { + static async getPayLogs(uid: string, payIds?: string[]) { let where = { uid: uid, del_time: {$exists: false} } if (payIds?.length) where['key'] = {$in: payIds} - if (times?.length) { - where['time'] = {$gte: times[0], $lte: times[1]} - } let logs = await G.mongodb.collection("payLogNew").find(where, { projection: { From d3f8d9d9e87f731390b0bec4caeb71358dd24a6a Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 20 Dec 2023 16:47:39 +0800 Subject: [PATCH 26/90] cehua public json --- src/json/dixiaheishi.json5 | 8 +- src/json/huodong.json5 | 223 ++++- src/json/openCond.json | 26 + src/json/pay.json | 1624 +++++++++++++++++++++++++++++++++--- src/json/playerHead.json | 30 + src/json/shop.json | 6 +- src/json/shopItem.json | 52 +- src/json/shopcom.json | 17 + src/json/tuisonglibao.json | 501 ++++++++--- 9 files changed, 2197 insertions(+), 290 deletions(-) diff --git a/src/json/dixiaheishi.json5 b/src/json/dixiaheishi.json5 index 83751f3..ab8b01d 100644 --- a/src/json/dixiaheishi.json5 +++ b/src/json/dixiaheishi.json5 @@ -33,10 +33,10 @@ }, //136礼包 '136Gift': [ - { payId: '136Gift1', prize: [] }, + { payId: '136Gift1', prize: [], bonus: [{"a": "attr", "t": "rmbmoney", "n": 10}] }, { prize: [{"a": "attr", "t": "rmbmoney", "n": 10},{"a": "item", "t": "12", "n": 10},{"a": "attr", "t": "jinbi", "n": 10000}] }, - { payId: '136Gift2', prize: [] }, - { payId: '136Gift3', prize: [] }, - { payId: '136Gift4', prize: [] }, + { payId: '136Gift2', prize: [], bonus: [{"a": "attr", "t": "rmbmoney", "n": 10}] }, + { payId: '136Gift3', prize: [], bonus: [{"a": "attr", "t": "rmbmoney", "n": 10}] }, + { payId: '136Gift4', prize: [], bonus: [{"a": "attr", "t": "rmbmoney", "n": 10}] }, ], } \ No newline at end of file diff --git a/src/json/huodong.json5 b/src/json/huodong.json5 index 48ff890..377c6ae 100644 --- a/src/json/huodong.json5 +++ b/src/json/huodong.json5 @@ -3849,27 +3849,33 @@ free: false, payId: 'czlb_1', buyNum: 1, + equal: 15000, prize: [ { "a": "item", "t": "13", - "n": 600 + "n": 601 } - ], - "recPrize1": [ + ], + "recPrize1": [ { "a": "item", - "t": "13", + "t": "12", "n": 600 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 333 } - ], - "recPrize2": [ + ], + "recPrize2": [ { "a": "item", - "t": "13", - "n": 600 + "t": "4", + "n": 10 } - ] + ] }, { id: '2', @@ -3878,27 +3884,62 @@ free: false, payId: 'czlb_2', buyNum: 1, + equal: 35000, prize: [ { "a": "item", - "t": "13", - "n": 600 + "t": "1", + "n": 1200 } - ], - "recPrize1": [ + ], + "recPrize1": [ { "a": "item", - "t": "13", - "n": 600 + "t": "2", + "n": 4400 } - ], - "recPrize2": [ + ], + "recPrize2": [ { "a": "item", + "t": "9", + "n": 63300 + }, + { + "a": "attr", + "t": "jinbi", + "n": 114514 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 31313 + }, + { + "a": "item", + "t": "2", + "n": 111 + }, + { + "a": "item", "t": "13", - "n": 600 + "n": 515 + },{ + "a": "item", + "t": "601", + "n": 1 + }, + { + "a": "item", + "t": "633", + "n": 2 + }, + { + "a": "hero", + "t": "5001", + "n": 1 } - ] + ] }, { id: '3', @@ -3907,27 +3948,28 @@ free: false, payId: 'czlb_3', buyNum: 1, + equal: 65000, prize: [ { "a": "item", "t": "13", - "n": 600 + "n": 123 } - ], - "recPrize1": [ + ], + "recPrize1": [ { "a": "item", "t": "13", - "n": 600 + "n": 321 } - ], - "recPrize2": [ + ], + "recPrize2": [ { "a": "item", "t": "13", - "n": 600 + "n": 548 } - ] + ] } ] } @@ -3986,5 +4028,132 @@ } ] } + }, + { + "hdid" : 12000, // 唯一活动id 累计购买礼包 + "htype" : 12, // 后端唯一识别标识 + "stype" : 1200, // 前端唯一识别标识（看前端需要是否修改） + "ttype" : 0, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动 + "stime" : 0, // 活动开始天数 + "rtime" : 30, // 活动显示结束天数 + "etime" : 30, // 活动实际结束 + "name": "ljlibao", + "icon": "icon_ljlibao", + "showtime" : "仅供参考，会复写正确值", // 自选礼包，如果存在多个活动，计费点不要设置一样；如果是一样，可能会存在付费一次，购买多次。 + "data" : { + //活动文本描述 + intr: "ljlibaotips_1", + intr: "ljlibaotips_2", + //礼包 + gift: [ + { + id: '1', + name: 'ljlibaotips_3', + need:[], + free: false, + payId: 'ljlibao_1', + buynum: 1, + prize:[] + }, + { + id: '2', + name: 'ljlibaotips_4', + need:[], + free: false, + payId: 'ljlibao_2', + buynum: 1, + prize:[] + }, + { + id: '3', + name: 'ljlibaotips_5', + need:[], + free: false, + payId: 'ljlibao_3', + buynum: 1, + prize:[] + }, + { + id: '4', + name: 'ljlibaotips_6', + need:[], + free: false, + payId: 'ljlibao_4', + buynum: 1, + prize:[] + }, + { + id: '5', + name: 'ljlibaotips_7', + need:[], + free: false, + payId: 'ljlibao_5', + buynum: 1, + prize:[] + }, + { + id: '6', + name: 'ljlibaotips_8', + need:[], + free: false, + payId: 'ljlibao_6', + buynum: 1, + prize:[] + }, + { + id: '7', + name: 'ljlibaotips_9', + need:[], + free: false, + payId: 'ljlibao_7', + buynum: 1, + prize:[] + }, + ], + //自选框掉落池 + dlz: [ + { + "1": {"a": "item", "t":"600", "n": 20}, + "2": {"a": "item", "t":"5002", "n": 10}, + "3": {"a": "item", "t":"5004", "n": 10} + }, + { + "1": {"a": "item", "t":"600", "n": 20}, + "2": {"a": "item", "t":"5002", "n": 10}, + "3": {"a": "item", "t":"5004", "n": 10} + }, + { + "1": {"a": "item", "t":"1", "n": 10000000}, + "2": {"a": "item", "t":"12", "n": 1000}, + "3": {"a": "item", "t":"2", "n": 2000}, + "4": {"a": "item", "t":"18", "n": 500} + }, + { + "1": {"a": "item", "t":"600", "n": 20}, + "2": {"a": "item", "t":"5002", "n": 10}, + "3": {"a": "item", "t":"5004", "n": 10} + }, + { + "1": {"a": "item", "t":"600", "n": 20}, + "2": {"a": "item", "t":"5002", "n": 10}, + "3": {"a": "item", "t":"5004", "n": 10} + }, + { + "1": {"a": "item", "t":"600", "n": 20}, + "2": {"a": "item", "t":"5002", "n": 10}, + "3": {"a": "item", "t":"5004", "n": 10} + }, + { + "1": {"a": "item", "t":"600", "n": 20}, + "2": {"a": "item", "t":"5002", "n": 10}, + "3": {"a": "item", "t":"5004", "n": 10} + }, + { + "1": {"a": "item", "t":"600", "n": 20}, + "2": {"a": "item", "t":"5002", "n": 10}, + "3": {"a": "item", "t":"5004", "n": 10} + } + ] + } } ] \ No newline at end of file diff --git a/src/json/openCond.json b/src/json/openCond.json index 2478204..07a8778 100644 --- a/src/json/openCond.json +++ b/src/json/openCond.json @@ -1339,5 +1339,31 @@ "display": { "lv": 15 } + }, + "czlibao": { + "name": "czlibao", + "undefined": "超值礼包破冰", + "and": { + "lv": 15 + }, + "or": {}, + "time": 0, + "tips": "openCond_tips_96", + "display": { + "lv": 15 + } + }, + "xiaofeijingsai": { + "name": "xiaofeijingsai", + "undefined": "钻石消费竞赛", + "and": { + "lv": 15 + }, + "or": {}, + "time": 0, + "tips": "openCond_tips_96", + "display": { + "lv": 15 + } } } \ No newline at end of file diff --git a/src/json/pay.json b/src/json/pay.json index d293892..5c24e3f 100644 --- a/src/json/pay.json +++ b/src/json/pay.json @@ -939,12 +939,12 @@ { "a": "item", "t": "12", - "n": 100 + "n": 200 } ], "firstPayPrize": [], "name": "pay_name_lv15", - "undefined": "等级推送礼包15", + "undefined": "等级豪礼（等级15）", "time": -1, "buys": 1, "needVip": 0, @@ -980,7 +980,7 @@ ], "firstPayPrize": [], "name": "pay_name_lv25", - "undefined": "等级推送礼包25", + "undefined": "等级豪礼（等级25）", "time": -1, "buys": 1, "needVip": 0, @@ -1016,7 +1016,7 @@ ], "firstPayPrize": [], "name": "pay_name_lv30", - "undefined": "等级推送礼包30", + "undefined": "等级豪礼（等级30）", "time": -1, "buys": 1, "needVip": 0, @@ -1025,34 +1025,142 @@ }, "lv40": { "id": "lv40", - "money": 6, + "money": 30, "payExp": [ { "a": "attr", "t": "payExp", - "n": 60 + "n": 300 } ], "prize": [ { "a": "attr", "t": "rmbmoney", - "n": 120 + "n": 600 }, { "a": "item", "t": "4", - "n": 5 + "n": 10 }, { "a": "item", - "t": "1", - "n": 200000 + "t": "2", + "n": 2000 } ], "firstPayPrize": [], "name": "pay_name_lv40", - "undefined": "等级推送礼包40", + "undefined": "等级豪礼（等级40小）", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "lv40_1": { + "id": "lv40_1", + "money": 128, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2560 + }, + { + "a": "item", + "t": "4", + "n": 50 + }, + { + "a": "item", + "t": "2", + "n": 10000 + } + ], + "firstPayPrize": [], + "name": "pay_name_lv40_1", + "undefined": "等级豪礼（等级40大）", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "lv50_1": { + "id": "lv50_1", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 600 + }, + { + "a": "item", + "t": "10", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800000 + } + ], + "firstPayPrize": [], + "name": "pay_name_lv50_1", + "undefined": "等级豪礼（等级50小）", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "lv50_2": { + "id": "lv50_2", + "money": 128, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2560 + }, + { + "a": "item", + "t": "10", + "n": 250 + }, + { + "a": "item", + "t": "23", + "n": 4000000 + } + ], + "firstPayPrize": [], + "name": "pay_name_lv50_2", + "undefined": "等级豪礼（等级50大）", "time": -1, "buys": 1, "needVip": 0, @@ -1073,22 +1181,58 @@ { "a": "attr", "t": "rmbmoney", - "n": 1200 + "n": 600 }, { "a": "item", - "t": "4", - "n": 5 + "t": "606", + "n": 6 }, { "a": "item", - "t": "12", - "n": 1500 + "t": "20", + "n": 100 } ], "firstPayPrize": [], "name": "pay_name_lv55", - "undefined": "等级推送礼包55", + "undefined": "等级豪礼（等级55小）", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "lv55_1": { + "id": "lv55_1", + "money": 128, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2560 + }, + { + "a": "item", + "t": "605", + "n": 12 + }, + { + "a": "item", + "t": "20", + "n": 500 + } + ], + "firstPayPrize": [], + "name": "pay_name_lv55_1", + "undefined": "等级豪礼（等级55大）", "time": -1, "buys": 1, "needVip": 0, @@ -1124,7 +1268,7 @@ ], "firstPayPrize": [], "name": "pay_name_lv58", - "undefined": "等级推送礼包58", + "undefined": "等级豪礼（等级58）", "time": -1, "buys": 1, "needVip": 0, @@ -1145,22 +1289,58 @@ { "a": "attr", "t": "rmbmoney", - "n": 1200 + "n": 600 }, { "a": "item", - "t": "4", - "n": 10 + "t": "615", + "n": 1 }, { "a": "item", - "t": "23", - "n": 200000 + "t": "18", + "n": 300 } ], "firstPayPrize": [], "name": "pay_name_lv60", - "undefined": "等级推送礼包60", + "undefined": "等级豪礼（等级60小）", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "lv60_1": { + "id": "lv60_1", + "money": 128, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2560 + }, + { + "a": "item", + "t": "628", + "n": 1 + }, + { + "a": "item", + "t": "18", + "n": 1500 + } + ], + "firstPayPrize": [], + "name": "pay_name_lv60_1", + "undefined": "等级豪礼（等级60大）", "time": -1, "buys": 1, "needVip": 0, @@ -1181,22 +1361,58 @@ { "a": "attr", "t": "rmbmoney", - "n": 1200 + "n": 600 }, { "a": "item", - "t": "10", - "n": 80 + "t": "4", + "n": 10 }, { "a": "item", - "t": "6", - "n": 20 + "t": "1", + "n": 5000000 } ], "firstPayPrize": [], "name": "pay_name_lv63", - "undefined": "等级推送礼包63", + "undefined": "等级豪礼（等级63小）", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "lv63_1": { + "id": "lv63_1", + "money": 128, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2560 + }, + { + "a": "item", + "t": "4", + "n": 50 + }, + { + "a": "item", + "t": "1", + "n": 10000000 + } + ], + "firstPayPrize": [], + "name": "pay_name_lv63_1", + "undefined": "等级豪礼（等级63大）", "time": -1, "buys": 1, "needVip": 0, @@ -1205,34 +1421,70 @@ }, "lv66": { "id": "lv66", - "money": 68, + "money": 30, "payExp": [ { "a": "attr", "t": "payExp", - "n": 680 + "n": 300 } ], "prize": [ { "a": "attr", "t": "rmbmoney", - "n": 2000 + "n": 600 }, { "a": "item", - "t": "4", - "n": 20 + "t": "615", + "n": 1 }, { "a": "item", - "t": "1", - "n": 800000 + "t": "18", + "n": 300 } ], "firstPayPrize": [], "name": "pay_name_lv66", - "undefined": "等级推送礼包66", + "undefined": "等级豪礼（等级66小）", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "lv66_1": { + "id": "lv66_1", + "money": 128, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2560 + }, + { + "a": "item", + "t": "628", + "n": 1 + }, + { + "a": "item", + "t": "18", + "n": 1500 + } + ], + "firstPayPrize": [], + "name": "pay_name_lv66_1", + "undefined": "等级豪礼（等级66大）", "time": -1, "buys": 1, "needVip": 0, @@ -1241,34 +1493,70 @@ }, "lv69": { "id": "lv69", - "money": 68, + "money": 30, "payExp": [ { "a": "attr", "t": "payExp", - "n": 680 + "n": 300 } ], "prize": [ { "a": "attr", "t": "rmbmoney", - "n": 1200 + "n": 600 }, { "a": "item", - "t": "600", - "n": 20 + "t": "606", + "n": 6 }, { "a": "item", - "t": "28", - "n": 8000 + "t": "20", + "n": 100 } ], "firstPayPrize": [], "name": "pay_name_lv69", - "undefined": "等级推送礼包69", + "undefined": "等级豪礼（等级69小）", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "lv69_1": { + "id": "lv69_1", + "money": 128, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2560 + }, + { + "a": "item", + "t": "605", + "n": 12 + }, + { + "a": "item", + "t": "20", + "n": 500 + } + ], + "firstPayPrize": [], + "name": "pay_name_lv69_1", + "undefined": "等级豪礼（等级69大）", "time": -1, "buys": 1, "needVip": 0, @@ -1304,7 +1592,79 @@ ], "firstPayPrize": [], "name": "pay_name_lv72", - "undefined": "等级推送礼包72", + "undefined": "等级豪礼（等级72）", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "lv73_1": { + "id": "lv73_1", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 600 + }, + { + "a": "item", + "t": "606", + "n": 6 + }, + { + "a": "item", + "t": "20", + "n": 100 + } + ], + "firstPayPrize": [], + "name": "pay_name_lv73_1", + "undefined": "等级豪礼（等级73小）", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "lv73_2": { + "id": "lv73_2", + "money": 128, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2560 + }, + { + "a": "item", + "t": "605", + "n": 12 + }, + { + "a": "item", + "t": "20", + "n": 500 + } + ], + "firstPayPrize": [], + "name": "pay_name_lv73_2", + "undefined": "等级豪礼（等级73大）", "time": -1, "buys": 1, "needVip": 0, @@ -1340,7 +1700,79 @@ ], "firstPayPrize": [], "name": "pay_name_lv75", - "undefined": "等级推送礼包75", + "undefined": "等级豪礼（等级75）", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "lv76_1": { + "id": "lv76_1", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 600 + }, + { + "a": "item", + "t": "615", + "n": 1 + }, + { + "a": "item", + "t": "18", + "n": 300 + } + ], + "firstPayPrize": [], + "name": "pay_name_lv76_1", + "undefined": "等级豪礼（等级76小）", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "lv76_2": { + "id": "lv76_2", + "money": 128, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2560 + }, + { + "a": "item", + "t": "628", + "n": 1 + }, + { + "a": "item", + "t": "18", + "n": 1500 + } + ], + "firstPayPrize": [], + "name": "pay_name_lv76_2", + "undefined": "等级豪礼（等级76大）", "time": -1, "buys": 1, "needVip": 0, @@ -1376,7 +1808,79 @@ ], "firstPayPrize": [], "name": "pay_name_lv78", - "undefined": "等级推送礼包78", + "undefined": "等级豪礼（等级78）", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "lv79_1": { + "id": "lv79_1", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 600 + }, + { + "a": "item", + "t": "606", + "n": 6 + }, + { + "a": "item", + "t": "20", + "n": 100 + } + ], + "firstPayPrize": [], + "name": "pay_name_lv79_1", + "undefined": "等级豪礼（等级79小）", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "lv79_2": { + "id": "lv79_2", + "money": 128, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2560 + }, + { + "a": "item", + "t": "605", + "n": 12 + }, + { + "a": "item", + "t": "20", + "n": 500 + } + ], + "firstPayPrize": [], + "name": "pay_name_lv79_2", + "undefined": "等级豪礼（等级79大）", "time": -1, "buys": 1, "needVip": 0, @@ -1412,7 +1916,79 @@ ], "firstPayPrize": [], "name": "pay_name_lv81", - "undefined": "等级推送礼包81", + "undefined": "等级豪礼（等级81）", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "lv82_1": { + "id": "lv82_1", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 600 + }, + { + "a": "item", + "t": "606", + "n": 6 + }, + { + "a": "item", + "t": "20", + "n": 100 + } + ], + "firstPayPrize": [], + "name": "pay_name_lv82_1", + "undefined": "等级豪礼（等级82小）", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "lv82_2": { + "id": "lv82_2", + "money": 128, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2560 + }, + { + "a": "item", + "t": "605", + "n": 12 + }, + { + "a": "item", + "t": "20", + "n": 500 + } + ], + "firstPayPrize": [], + "name": "pay_name_lv82_2", + "undefined": "等级豪礼（等级82大）", "time": -1, "buys": 1, "needVip": 0, @@ -1448,7 +2024,7 @@ ], "firstPayPrize": [], "name": "pay_name_lv84", - "undefined": "等级推送礼包84", + "undefined": "等级豪礼（等级84）", "time": -1, "buys": 1, "needVip": 0, @@ -1484,7 +2060,7 @@ ], "firstPayPrize": [], "name": "pay_name_lv87", - "undefined": "等级推送礼包87", + "undefined": "等级豪礼（等级87）", "time": -1, "buys": 1, "needVip": 0, @@ -1520,7 +2096,7 @@ ], "firstPayPrize": [], "name": "pay_name_lv90", - "undefined": "等级推送礼包90", + "undefined": "等级豪礼（等级90）", "time": -1, "buys": 1, "needVip": 0, @@ -1556,7 +2132,7 @@ ], "firstPayPrize": [], "name": "pay_name_lv93", - "undefined": "等级推送礼包93", + "undefined": "等级豪礼（等级93）", "time": -1, "buys": 1, "needVip": 0, @@ -1592,7 +2168,7 @@ ], "firstPayPrize": [], "name": "pay_name_lv96", - "undefined": "等级推送礼包96", + "undefined": "等级豪礼（等级96）", "time": -1, "buys": 1, "needVip": 0, @@ -1628,7 +2204,7 @@ ], "firstPayPrize": [], "name": "pay_name_lv99", - "undefined": "等级推送礼包99", + "undefined": "等级豪礼（等级99）", "time": -1, "buys": 1, "needVip": 0, @@ -3839,13 +4415,18 @@ "prize": [ { "a": "item", - "t": "49", - "n": 50 + "t": "4", + "n": 10 }, { "a": "attr", "t": "rmbmoney", - "n": 600 + "n": 120 + }, + { + "a": "item", + "t": "1", + "n": 100000 } ], "firstPayPrize": [], @@ -3859,24 +4440,29 @@ }, "guanqialibao_2": { "id": "guanqialibao_2", - "money": 30, + "money": 68, "payExp": [ { "a": "attr", "t": "payExp", - "n": 300 + "n": 680 } ], "prize": [ { "a": "item", - "t": "49", - "n": 100 + "t": "4", + "n": 30 }, { "a": "attr", "t": "rmbmoney", "n": 1360 + }, + { + "a": "item", + "t": "12", + "n": 1500 } ], "firstPayPrize": [], @@ -3890,24 +4476,29 @@ }, "guanqialibao_3": { "id": "guanqialibao_3", - "money": 68, + "money": 198, "payExp": [ { "a": "attr", "t": "payExp", - "n": 680 + "n": 1980 } ], "prize": [ { "a": "item", - "t": "49", - "n": 200 + "t": "617", + "n": 1 }, { "a": "attr", "t": "rmbmoney", - "n": 2560 + "n": 3960 + }, + { + "a": "item", + "t": "12", + "n": 5000 } ], "firstPayPrize": [], @@ -3919,39 +4510,44 @@ "front": {}, "currency": "CNY" }, - "daojulibao_1": { - "id": "daojulibao_1", - "money": 6, + "guanqialibao_4": { + "id": "guanqialibao_4", + "money": 198, "payExp": [ { "a": "attr", "t": "payExp", - "n": 60 + "n": 1980 } ], "prize": [ { "a": "item", - "t": "49", - "n": 50 + "t": "632", + "n": 20 }, { "a": "attr", "t": "rmbmoney", - "n": 700 + "n": 3960 + }, + { + "a": "item", + "t": "12", + "n": 2000 } ], "firstPayPrize": [], - "name": "pay_name_daojulibao_1", - "undefined": "道具礼包_6", + "name": "pay_name_guanqialibao_4", + "undefined": "关卡礼包_68", "time": -1, "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" }, - "daojulibao_2": { - "id": "daojulibao_2", + "daojulibao_1": { + "id": "daojulibao_1", "money": 30, "payExp": [ { @@ -3961,28 +4557,38 @@ } ], "prize": [ - { - "a": "item", - "t": "49", - "n": 100 - }, { "a": "attr", "t": "rmbmoney", - "n": 1260 + "n": 300 + }, + { + "a": "item", + "t": "23", + "n": 400000 + }, + { + "a": "item", + "t": "9", + "n": 1500 + }, + { + "a": "item", + "t": "10", + "n": 30 } ], "firstPayPrize": [], - "name": "pay_name_daojulibao_2", - "undefined": "道具礼包_30", + "name": "pay_name_daojulibao_1", + "undefined": "专属润滑剂不足_30", "time": -1, "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" }, - "daojulibao_3": { - "id": "daojulibao_3", + "daojulibao_2": { + "id": "daojulibao_2", "money": 68, "payExp": [ { @@ -3993,19 +4599,439 @@ ], "prize": [ { - "a": "item", - "t": "49", - "n": 200 + "a": "attr", + "t": "rmbmoney", + "n": 680 }, + { + "a": "item", + "t": "23", + "n": 800000 + }, + { + "a": "item", + "t": "9", + "n": 4000 + }, + { + "a": "item", + "t": "10", + "n": 80 + } + ], + "firstPayPrize": [], + "name": "pay_name_daojulibao_2", + "undefined": "专属润滑剂不足_68", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "daojulibao_3": { + "id": "daojulibao_3", + "money": 128, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [ { "a": "attr", "t": "rmbmoney", - "n": 2660 + "n": 1280 + }, + { + "a": "item", + "t": "23", + "n": 1500000 + }, + { + "a": "item", + "t": "9", + "n": 10000 + }, + { + "a": "item", + "t": "10", + "n": 100 } ], "firstPayPrize": [], "name": "pay_name_daojulibao_3", - "undefined": "道具礼包_68", + "undefined": "专属润滑剂不足_128", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "daojulibao_4": { + "id": "daojulibao_4", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 300 + }, + { + "a": "item", + "t": "28", + "n": 5000 + }, + { + "a": "item", + "t": "20", + "n": 200 + }, + { + "a": "item", + "t": "606", + "n": 2 + } + ], + "firstPayPrize": [], + "name": "pay_name_daojulibao_4", + "undefined": "配件零件不足_30", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "daojulibao_5": { + "id": "daojulibao_5", + "money": 68, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 680 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 680 + }, + { + "a": "item", + "t": "28", + "n": 10000 + }, + { + "a": "item", + "t": "20", + "n": 500 + }, + { + "a": "item", + "t": "605", + "n": 2 + } + ], + "firstPayPrize": [], + "name": "pay_name_daojulibao_5", + "undefined": "配件零件不足_68", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "daojulibao_6": { + "id": "daojulibao_6", + "money": 128, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 1280 + }, + { + "a": "item", + "t": "28", + "n": 20000 + }, + { + "a": "item", + "t": "20", + "n": 1000 + }, + { + "a": "item", + "t": "605", + "n": 4 + } + ], + "firstPayPrize": [], + "name": "pay_name_daojulibao_6", + "undefined": "配件零件不足_128", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "daojulibao_7": { + "id": "daojulibao_7", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 300 + }, + { + "a": "item", + "t": "627", + "n": 1 + }, + { + "a": "item", + "t": "18", + "n": 200 + }, + { + "a": "attr", + "t": "jinbi", + "n": 1000000 + } + ], + "firstPayPrize": [], + "name": "pay_name_daojulibao_7", + "undefined": "装备蓝图不足_30", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "daojulibao_8": { + "id": "daojulibao_8", + "money": 68, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 680 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 680 + }, + { + "a": "item", + "t": "627", + "n": 2 + }, + { + "a": "item", + "t": "18", + "n": 500 + }, + { + "a": "attr", + "t": "jinbi", + "n": 5000000 + } + ], + "firstPayPrize": [], + "name": "pay_name_daojulibao_8", + "undefined": "装备蓝图不足_68", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "daojulibao_9": { + "id": "daojulibao_9", + "money": 128, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 1280 + }, + { + "a": "item", + "t": "625", + "n": 1 + }, + { + "a": "item", + "t": "18", + "n": 1100 + }, + { + "a": "attr", + "t": "jinbi", + "n": 10000000 + } + ], + "firstPayPrize": [], + "name": "pay_name_daojulibao_9", + "undefined": "装备蓝图不足_128", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "daojulibao_10": { + "id": "daojulibao_10", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 300 + }, + { + "a": "item", + "t": "627", + "n": 1 + }, + { + "a": "item", + "t": "19", + "n": 80 + }, + { + "a": "attr", + "t": "jinbi", + "n": 5000000 + } + ], + "firstPayPrize": [], + "name": "pay_name_daojulibao_10", + "undefined": "调校合金不足_30", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "daojulibao_11": { + "id": "daojulibao_11", + "money": 68, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 680 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 680 + }, + { + "a": "item", + "t": "627", + "n": 2 + }, + { + "a": "item", + "t": "19", + "n": 200 + }, + { + "a": "attr", + "t": "jinbi", + "n": 10000000 + } + ], + "firstPayPrize": [], + "name": "pay_name_daojulibao_11", + "undefined": "调校合金不足_68", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "daojulibao_12": { + "id": "daojulibao_12", + "money": 128, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 1280 + }, + { + "a": "item", + "t": "625", + "n": 1 + }, + { + "a": "item", + "t": "19", + "n": 500 + }, + { + "a": "attr", + "t": "jinbi", + "n": 20000000 + } + ], + "firstPayPrize": [], + "name": "pay_name_daojulibao_12", + "undefined": "调校合金不足_128", "time": -1, "buys": 1, "needVip": 0, @@ -4953,7 +5979,7 @@ "name": "pay_name_sdhd_libao_2", "undefined": "圣诞自选_2", "time": -1, - "buys": 1, + "buys": 2, "needVip": 0, "front": {}, "currency": "CNY" @@ -4973,7 +5999,7 @@ "name": "pay_name_sdhd_libao_3", "undefined": "圣诞自选_3", "time": -1, - "buys": 1, + "buys": 2, "needVip": 0, "front": {}, "currency": "CNY" @@ -4993,7 +6019,7 @@ "name": "pay_name_sdhd_libao_4", "undefined": "圣诞自选_4", "time": -1, - "buys": 1, + "buys": 5, "needVip": 0, "front": {}, "currency": "CNY" @@ -5013,7 +6039,7 @@ "name": "pay_name_sdhd_libao_5", "undefined": "圣诞自选_5", "time": -1, - "buys": 1, + "buys": 9, "needVip": 0, "front": {}, "currency": "CNY" @@ -5033,7 +6059,7 @@ "name": "pay_name_sdhd_libao_6", "undefined": "圣诞自选_6", "time": -1, - "buys": 1, + "buys": 9, "needVip": 0, "front": {}, "currency": "CNY" @@ -5053,9 +6079,409 @@ "name": "pay_name_sdhd_libao_7", "undefined": "圣诞自选_7", "time": -1, + "buys": 9, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "czlibao_libao_1": { + "id": "czlibao_libao_1", + "money": 0.5, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 5 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_czlibao_libao_1", + "undefined": "超值好礼_1", + "time": -1, "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" + }, + "czlibao_libao_2": { + "id": "czlibao_libao_2", + "money": 1, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 10 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_czlibao_libao_2", + "undefined": "超值好礼_2", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "czlibao_libao_3": { + "id": "czlibao_libao_3", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_czlibao_libao_3", + "undefined": "超值好礼_3", + "time": -1, + "buys": 2, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "czlibao_libao_4": { + "id": "czlibao_libao_4", + "money": 18, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 180 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_czlibao_libao_4", + "undefined": "超值好礼_4", + "time": -1, + "buys": 2, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "czlibao_libao_5": { + "id": "czlibao_libao_5", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_czlibao_libao_5", + "undefined": "超值好礼_5", + "time": -1, + "buys": 2, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "czlibao_libao_6": { + "id": "czlibao_libao_6", + "money": 68, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 680 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_czlibao_libao_6", + "undefined": "超值好礼_6", + "time": -1, + "buys": 5, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "czlibao_libao_7": { + "id": "czlibao_libao_7", + "money": 128, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_czlibao_libao_7", + "undefined": "超值好礼_7", + "time": -1, + "buys": 9, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "czlibao_libao_8": { + "id": "czlibao_libao_8", + "money": 198, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1980 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_czlibao_libao_8", + "undefined": "超值好礼_8", + "time": -1, + "buys": 9, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "czlibao_libao_9": { + "id": "czlibao_libao_9", + "money": 328, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 3280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_czlibao_libao_9", + "undefined": "超值好礼_9", + "time": -1, + "buys": 9, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "czlibao_libao_10": { + "id": "czlibao_libao_10", + "money": 648, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 6480 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_czlibao_libao_10", + "undefined": "超值好礼_10", + "time": -1, + "buys": 9, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "ljlibao_1": { + "id": "ljlibao_1", + "money": 0.5, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 5 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_ljlibao_1", + "undefined": "累日礼包_1", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "ljlibao_2": { + "id": "ljlibao_2", + "money": 1, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 10 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_ljlibao_2", + "undefined": "累日礼包_2", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "ljlibao_3": { + "id": "ljlibao_3", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_ljlibao_3", + "undefined": "累日礼包_3", + "time": -1, + "buys": 2, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "ljlibao_4": { + "id": "ljlibao_4", + "money": 18, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 180 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_ljlibao_4", + "undefined": "累日礼包_4", + "time": -1, + "buys": 2, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "ljlibao_5": { + "id": "ljlibao_5", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_ljlibao_5", + "undefined": "累日礼包_5", + "time": -1, + "buys": 2, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "ljlibao_6": { + "id": "ljlibao_6", + "money": 68, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 680 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_ljlibao_6", + "undefined": "累日礼包_6", + "time": -1, + "buys": 5, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "ljlibao_7": { + "id": "ljlibao_7", + "money": 128, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_ljlibao_7", + "undefined": "累日礼包_7", + "time": -1, + "buys": 9, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "ljlibao_8": { + "id": "ljlibao_8", + "money": 198, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1980 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_ljlibao_8", + "undefined": "累日礼包_8", + "time": -1, + "buys": 9, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "ljlibao_9": { + "id": "ljlibao_9", + "money": 328, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 3280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_ljlibao_9", + "undefined": "累日礼包_9", + "time": -1, + "buys": 9, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "ljlibao_10": { + "id": "ljlibao_10", + "money": 648, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 6480 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_ljlibao_10", + "undefined": "累日礼包_10", + "time": -1, + "buys": 9, + "needVip": 0, + "front": {}, + "currency": "CNY" } } \ No newline at end of file diff --git a/src/json/playerHead.json b/src/json/playerHead.json index 04f1367..e062e3f 100644 --- a/src/json/playerHead.json +++ b/src/json/playerHead.json @@ -29,6 +29,36 @@ "colour": 1, "ani": "" }, + "3": { + "id": 3, + "name": "intr_playerinfo_name_3", + "undefined": "获得圣诞活动皮肤【圣诞庆典：男】后解锁", + "img": 10001, + "cond": [ + "time", + -1 + ], + "intr": "intr_playerinfo_intr_3", + "sort": 42, + "buff": {}, + "colour": 1, + "ani": "" + }, + "4": { + "id": 4, + "name": "intr_playerinfo_name_4", + "undefined": "获得圣诞活动皮肤【圣诞庆典：女】后解锁", + "img": 10002, + "cond": [ + "time", + -1 + ], + "intr": "intr_playerinfo_intr_4", + "sort": 43, + "buff": {}, + "colour": 1, + "ani": "" + }, "1001": { "id": 1001, "name": "intr_playerinfo_name_1001", diff --git a/src/json/shop.json b/src/json/shop.json index d13cfdf..9893e4e 100644 --- a/src/json/shop.json +++ b/src/json/shop.json @@ -499,8 +499,8 @@ "13": { "id": 13, "type": 12, - "name": "wsw_wz_dhsd", - "undefined": "兑换商店", + "name": "wsw_wz_mrjxdh", + "undefined": "每日精选兑换商店", "openCond": [ "lv", 15 @@ -511,7 +511,7 @@ "freeRefreshInterval": 0, "freeRefreshNum": 0, "shopItems": [ - 4001 + 10001 ], "showItem": [ { diff --git a/src/json/shopItem.json b/src/json/shopItem.json index ec6950d..46da62c 100644 --- a/src/json/shopItem.json +++ b/src/json/shopItem.json @@ -3918,31 +3918,6 @@ 9999 ], "vipAddbuyNum": [] - }, - { - "id": 4001, - "a": "item", - "t": 4, - "n": 10, - "p": 1, - "colour": 4, - "buyNum": -1, - "openDay": 1, - "buyNeed": [ - { - "a": "item", - "t": "15", - "n": 2800 - } - ], - "sale": 10, - "needVip": 0, - "needZCCG": 0, - "lv": [ - 1, - 9999 - ], - "vipAddbuyNum": [] } ], "4002": [ @@ -6294,6 +6269,33 @@ "vipAddbuyNum": [] } ], + "10001": [ + { + "id": 10001, + "a": "item", + "t": 4, + "n": 10, + "p": 1, + "colour": 4, + "buyNum": -1, + "openDay": 1, + "buyNeed": [ + { + "a": "item", + "t": "15", + "n": 2800 + } + ], + "sale": 10, + "needVip": 0, + "needZCCG": 0, + "lv": [ + 1, + 9999 + ], + "vipAddbuyNum": [] + } + ], "120001": [ { "id": 120001, diff --git a/src/json/shopcom.json b/src/json/shopcom.json index b8b86ba..b5157f4 100644 --- a/src/json/shopcom.json +++ b/src/json/shopcom.json @@ -198,5 +198,22 @@ "npcImg": "img_sd_3015", "npcText": "intr_shopCom_text_10", "helpText": "intr_shopCom_helpText_10" + }, + "11": { + "id": 11, + "shopId": 13, + "shopType": 12, + "title": "wsw_wz_dhsd", + "undefined": "兑换商店", + "openCond": "shop_13", + "des": "intr_shop_des_13", + "img": "wsw_wz_dhsd", + "cost": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 1 + } + ] } } \ No newline at end of file diff --git a/src/json/tuisonglibao.json b/src/json/tuisonglibao.json index 737dbc1..c64eb5e 100644 --- a/src/json/tuisonglibao.json +++ b/src/json/tuisonglibao.json @@ -3,7 +3,35 @@ "id": 1, "type": 1, "num": [ - 5 + 100 + ], + "payId": [ + "guanqialibao_1", + "guanqialibao_3" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3000 + }, + "2": { + "id": 2, + "type": 1, + "num": [ + 140 + ], + "payId": [ + "guanqialibao_1", + "guanqialibao_3" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3000 + }, + "3": { + "id": 3, + "type": 1, + "num": [ + 180 ], "payId": [ "guanqialibao_1", @@ -11,78 +39,241 @@ "guanqialibao_3" ], "time": 3600, - "displayCD": 7200, - "scale": 500 - }, - "2": { - "id": 2, - "type": 1, - "num": [ - 10 - ], - "payId": [ - "guanqialibao_1", - "guanqialibao_2" - ], - "time": 3600, - "displayCD": 7200, - "scale": 501 - }, - "3": { - "id": 3, - "type": 1, - "num": [ - 20 - ], - "payId": [ - "guanqialibao_1", - "guanqialibao_3" - ], - "time": 3600, - "displayCD": 7200, - "scale": 502 + "displayCD": 3600, + "scale": 3000 }, "4": { "id": 4, - "type": 2, + "type": 1, "num": [ - { - "a": "item", - "t": "1" - } + 240 ], "payId": [ - "daojulibao_1", - "daojulibao_2" + "guanqialibao_1", + "guanqialibao_2", + "guanqialibao_3" ], "time": 3600, - "displayCD": 7200, - "scale": 503 + "displayCD": 3600, + "scale": 3000 }, "5": { "id": 5, + "type": 1, + "num": [ + 300 + ], + "payId": [ + "guanqialibao_1", + "guanqialibao_2", + "guanqialibao_3" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3000 + }, + "6": { + "id": 6, + "type": 1, + "num": [ + 360 + ], + "payId": [ + "guanqialibao_1", + "guanqialibao_2", + "guanqialibao_3" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3000 + }, + "7": { + "id": 7, + "type": 1, + "num": [ + 400 + ], + "payId": [ + "guanqialibao_1", + "guanqialibao_2", + "guanqialibao_3" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3000 + }, + "8": { + "id": 8, + "type": 1, + "num": [ + 460 + ], + "payId": [ + "guanqialibao_1", + "guanqialibao_2", + "guanqialibao_3" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3000 + }, + "9": { + "id": 9, + "type": 1, + "num": [ + 490 + ], + "payId": [ + "guanqialibao_1", + "guanqialibao_2", + "guanqialibao_3" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3000 + }, + "10": { + "id": 10, + "type": 1, + "num": [ + 520 + ], + "payId": [ + "guanqialibao_1", + "guanqialibao_2", + "guanqialibao_3" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3000 + }, + "11": { + "id": 11, + "type": 1, + "num": [ + 550 + ], + "payId": [ + "guanqialibao_1", + "guanqialibao_2", + "guanqialibao_3" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3000 + }, + "12": { + "id": 12, + "type": 1, + "num": [ + 580 + ], + "payId": [ + "guanqialibao_1", + "guanqialibao_2", + "guanqialibao_4" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3000 + }, + "13": { + "id": 13, + "type": 1, + "num": [ + 610 + ], + "payId": [ + "guanqialibao_1", + "guanqialibao_2", + "guanqialibao_4" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3000 + }, + "14": { + "id": 14, + "type": 1, + "num": [ + 640 + ], + "payId": [ + "guanqialibao_1", + "guanqialibao_2", + "guanqialibao_4" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3000 + }, + "15": { + "id": 15, + "type": 1, + "num": [ + 670 + ], + "payId": [ + "guanqialibao_1", + "guanqialibao_2", + "guanqialibao_4" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3000 + }, + "16": { + "id": 16, + "type": 1, + "num": [ + 700 + ], + "payId": [ + "guanqialibao_1", + "guanqialibao_2", + "guanqialibao_4" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3000 + }, + "17": { + "id": 17, + "type": 1, + "num": [ + 730 + ], + "payId": [ + "guanqialibao_1", + "guanqialibao_2", + "guanqialibao_4" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3000 + }, + "18": { + "id": 18, + "type": 1, + "num": [ + 760 + ], + "payId": [ + "guanqialibao_1", + "guanqialibao_2", + "guanqialibao_4" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3000 + }, + "101": { + "id": 101, "type": 2, "num": [ { "a": "item", - "t": "2" - } - ], - "payId": [ - "daojulibao_1", - "daojulibao_3" - ], - "time": 3600, - "displayCD": 7200, - "scale": 504 - }, - "6": { - "id": 6, - "type": 2, - "num": [ - { - "a": "attr", - "t": "jinbi" + "t": "9" } ], "payId": [ @@ -91,167 +282,213 @@ "daojulibao_3" ], "time": 3600, - "displayCD": 7200, - "scale": 505 + "displayCD": 86400, + "scale": 3000 }, - "7": { - "id": 7, - "type": 3, + "102": { + "id": 102, + "type": 2, "num": [ - 1 + { + "a": "item", + "t": "28" + } ], "payId": [ - "zhanbailibao_1", - "zhanbailibao_2", - "zhanbailibao_3" + "daojulibao_4", + "daojulibao_5", + "daojulibao_6" ], "time": 3600, - "displayCD": 7200, - "scale": 506 + "displayCD": 86400, + "scale": 3000 }, - "8": { - "id": 8, - "type": 4, + "103": { + "id": 103, + "type": 2, "num": [ - 3 + { + "a": "item", + "t": "18" + } ], "payId": [ - "choukalibao_1", - "choukalibao_2", - "choukalibao_3" + "daojulibao_7", + "daojulibao_8", + "daojulibao_9" ], "time": 3600, - "displayCD": 7200, - "scale": 507 + "displayCD": 86400, + "scale": 3000 }, - "9": { - "id": 9, + "104": { + "id": 104, + "type": 2, + "num": [ + { + "a": "item", + "t": "19" + } + ], + "payId": [ + "daojulibao_10", + "daojulibao_11", + "daojulibao_12" + ], + "time": 3600, + "displayCD": 86400, + "scale": 3000 + }, + "401": { + "id": 401, "type": 5, "num": [ - 31 + 15 ], "payId": [ - "lv30" + "lv15" ], "time": 3600, "displayCD": 3600, - "scale": 3300 + "scale": 3000 }, - "10": { - "id": 10, + "402": { + "id": 402, "type": 5, "num": [ - 45 + 25 ], "payId": [ - "lv40" + "lv25" ], "time": 3600, "displayCD": 3600, - "scale": 3300 + "scale": 3000 }, - "11": { - "id": 11, + "403": { + "id": 403, + "type": 5, + "num": [ + 40 + ], + "payId": [ + "lv40", + "lv40_1" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3000 + }, + "404": { + "id": 404, "type": 5, "num": [ 50 ], "payId": [ - "lv55" + "lv50_1", + "lv50_2" ], "time": 3600, "displayCD": 3600, - "scale": 2000 + "scale": 3000 }, - "12": { - "id": 12, + "405": { + "id": 405, "type": 5, "num": [ - 53 + 55 ], "payId": [ - "lv58" + "lv55", + "lv55_1" ], "time": 3600, "displayCD": 3600, - "scale": 2000 + "scale": 3000 }, - "13": { - "id": 13, - "type": 5, - "num": [ - 56 - ], - "payId": [ - "lv60" - ], - "time": 3600, - "displayCD": 3600, - "scale": 2000 - }, - "14": { - "id": 14, + "406": { + "id": 406, "type": 5, "num": [ 60 ], "payId": [ - "lv63" + "lv60", + "lv60_1" ], "time": 3600, "displayCD": 3600, - "scale": 2000 + "scale": 3000 }, - "15": { - "id": 15, + "407": { + "id": 407, "type": 5, "num": [ 63 ], "payId": [ - "lv66" + "lv63", + "lv63_1" ], "time": 3600, "displayCD": 3600, - "scale": 2000 + "scale": 3000 }, - "16": { - "id": 16, + "408": { + "id": 408, "type": 5, "num": [ 66 ], "payId": [ - "lv69" + "lv66", + "lv66_1" ], "time": 3600, "displayCD": 3600, - "scale": 1800 + "scale": 3000 }, - "17": { - "id": 17, + "409": { + "id": 409, "type": 5, "num": [ - 68 + 69 ], "payId": [ - "lv72" + "lv69", + "lv69_1" ], "time": 3600, "displayCD": 3600, - "scale": 1800 + "scale": 3000 }, - "18": { - "id": 18, + "410": { + "id": 410, "type": 5, "num": [ - 70 + 73 ], "payId": [ - "lv75" + "lv73_1", + "lv73_2" ], "time": 3600, "displayCD": 3600, - "scale": 1800 + "scale": 3000 + }, + "411": { + "id": 411, + "type": 5, + "num": [ + 82 + ], + "payId": [ + "lv82_1", + "lv82_2" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3000 } } \ No newline at end of file From d41cde329740ec89d7bf611aff748ece633699d4 Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 20 Dec 2023 16:55:21 +0800 Subject: [PATCH 27/90] cehua public json --- src/json/openCond.json | 6 +- src/json/pay.json | 160 ++++++++++++++++++++--------------------- 2 files changed, 83 insertions(+), 83 deletions(-) diff --git a/src/json/openCond.json b/src/json/openCond.json index 07a8778..ef4f726 100644 --- a/src/json/openCond.json +++ b/src/json/openCond.json @@ -718,7 +718,7 @@ }, "or": {}, "time": 0, - "tips": "openCond_tips_53", + "tips": "openCond_tips_96", "display": { "lv": 15 } @@ -839,7 +839,7 @@ }, "or": {}, "time": 0, - "tips": "openCond_tips_60", + "tips": "openCond_tips_96", "display": { "lv": 15 } @@ -904,7 +904,7 @@ }, "or": {}, "time": 0, - "tips": "openCond_tips_65", + "tips": "openCond_tips_96", "display": { "lv": 15 } diff --git a/src/json/pay.json b/src/json/pay.json index 5c24e3f..561515d 100644 --- a/src/json/pay.json +++ b/src/json/pay.json @@ -4119,7 +4119,7 @@ "name": "pay_name_djlb_2", "undefined": "枪油补充包", "time": 86400, - "buys": 3, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -4145,7 +4145,7 @@ "name": "pay_name_djlb_1", "undefined": "能量饮料补充包", "time": 86400, - "buys": 2, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -4171,7 +4171,7 @@ "name": "pay_name_djlb_12", "undefined": "弹壳补充包", "time": 86400, - "buys": 3, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -4197,7 +4197,7 @@ "name": "pay_name_djlb_18", "undefined": "装备蓝图补充包", "time": 86400, - "buys": 3, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -4217,7 +4217,7 @@ "name": "pay_name_mingwang_2", "undefined": "名望礼包_68元", "time": 86400, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -4237,7 +4237,7 @@ "name": "pay_name_mingwang_3", "undefined": "名望礼包_648元", "time": 86400, - "buys": 2, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -4257,7 +4257,7 @@ "name": "pay_name_mingwang_4", "undefined": "名望礼包_128元", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -4433,7 +4433,7 @@ "name": "pay_name_guanqialibao_1", "undefined": "关卡礼包_6", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -4469,7 +4469,7 @@ "name": "pay_name_guanqialibao_2", "undefined": "关卡礼包_30", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -4505,7 +4505,7 @@ "name": "pay_name_guanqialibao_3", "undefined": "关卡礼包_68", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -4541,7 +4541,7 @@ "name": "pay_name_guanqialibao_4", "undefined": "关卡礼包_68", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -4582,7 +4582,7 @@ "name": "pay_name_daojulibao_1", "undefined": "专属润滑剂不足_30", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -4623,7 +4623,7 @@ "name": "pay_name_daojulibao_2", "undefined": "专属润滑剂不足_68", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -4664,7 +4664,7 @@ "name": "pay_name_daojulibao_3", "undefined": "专属润滑剂不足_128", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -4705,7 +4705,7 @@ "name": "pay_name_daojulibao_4", "undefined": "配件零件不足_30", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -4746,7 +4746,7 @@ "name": "pay_name_daojulibao_5", "undefined": "配件零件不足_68", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -4787,7 +4787,7 @@ "name": "pay_name_daojulibao_6", "undefined": "配件零件不足_128", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -4828,7 +4828,7 @@ "name": "pay_name_daojulibao_7", "undefined": "装备蓝图不足_30", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -4869,7 +4869,7 @@ "name": "pay_name_daojulibao_8", "undefined": "装备蓝图不足_68", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -4910,7 +4910,7 @@ "name": "pay_name_daojulibao_9", "undefined": "装备蓝图不足_128", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -4951,7 +4951,7 @@ "name": "pay_name_daojulibao_10", "undefined": "调校合金不足_30", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -4992,7 +4992,7 @@ "name": "pay_name_daojulibao_11", "undefined": "调校合金不足_68", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5033,7 +5033,7 @@ "name": "pay_name_daojulibao_12", "undefined": "调校合金不足_128", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5064,7 +5064,7 @@ "name": "pay_name_zhanbailibao_1", "undefined": "战败礼包_68", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5095,7 +5095,7 @@ "name": "pay_name_zhanbailibao_2", "undefined": "战败礼包_68", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5126,7 +5126,7 @@ "name": "pay_name_zhanbailibao_3", "undefined": "战败礼包_68", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5157,7 +5157,7 @@ "name": "pay_name_choukalibao_1", "undefined": "抽卡礼包_68", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5188,7 +5188,7 @@ "name": "pay_name_choukalibao_2", "undefined": "抽卡礼包_68", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5219,7 +5219,7 @@ "name": "pay_name_choukalibao_3", "undefined": "抽卡礼包_68", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5239,7 +5239,7 @@ "name": "pay_name_shouchong_1", "undefined": "首充礼包_6", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5259,7 +5259,7 @@ "name": "pay_name_shouchong_2", "undefined": "首充礼包_30", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5279,7 +5279,7 @@ "name": "pay_name_shouchong_3", "undefined": "首充礼包_98", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5315,7 +5315,7 @@ "name": "pay_name_jitianlibao_1", "undefined": "积天礼包_6", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5351,7 +5351,7 @@ "name": "pay_name_jitianlibao_2", "undefined": "积天礼包_6", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5387,7 +5387,7 @@ "name": "pay_name_jitianlibao_3", "undefined": "积天礼包_6", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5423,7 +5423,7 @@ "name": "pay_name_jitianlibao_4", "undefined": "积天礼包_6", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5459,7 +5459,7 @@ "name": "pay_name_jitianlibao_5", "undefined": "积天礼包_6", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5495,7 +5495,7 @@ "name": "pay_name_jitianlibao_6", "undefined": "积天礼包_6", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5531,7 +5531,7 @@ "name": "pay_name_jitianlibao_7", "undefined": "积天礼包_6", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5567,7 +5567,7 @@ "name": "pay_name_jitianlibao_8", "undefined": "积天礼包_6", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5603,7 +5603,7 @@ "name": "pay_name_jitianlibao_9", "undefined": "积天礼包_6", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5639,7 +5639,7 @@ "name": "pay_name_jitianlibao_10", "undefined": "积天礼包_6", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5675,7 +5675,7 @@ "name": "pay_name_jitianlibao_11", "undefined": "积天礼包_6", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5711,7 +5711,7 @@ "name": "pay_name_jitianlibao_12", "undefined": "积天礼包_6", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5747,7 +5747,7 @@ "name": "pay_name_jitianlibao_13", "undefined": "积天礼包_6", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5783,7 +5783,7 @@ "name": "pay_name_jitianlibao_14", "undefined": "积天礼包_6", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5819,7 +5819,7 @@ "name": "pay_name_jitianlibao_15", "undefined": "积天礼包_6", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5839,7 +5839,7 @@ "name": "pay_name_czlb_1", "undefined": "超值好礼_6", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5859,7 +5859,7 @@ "name": "pay_name_czlb_2", "undefined": "超值好礼_30", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5879,7 +5879,7 @@ "name": "pay_name_czlb_3", "undefined": "超值好礼_68", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5899,7 +5899,7 @@ "name": "pay_name_sdhd_zhanling_1", "undefined": "圣诞战令_1", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5919,7 +5919,7 @@ "name": "pay_name_sdhd_zhanling_1", "undefined": "圣诞战令_2", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5939,7 +5939,7 @@ "name": "pay_name_sdhd_zhanling_1", "undefined": "圣诞战令_3", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5959,7 +5959,7 @@ "name": "pay_name_sdhd_libao_1", "undefined": "圣诞自选_1", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5979,7 +5979,7 @@ "name": "pay_name_sdhd_libao_2", "undefined": "圣诞自选_2", "time": -1, - "buys": 2, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -5999,7 +5999,7 @@ "name": "pay_name_sdhd_libao_3", "undefined": "圣诞自选_3", "time": -1, - "buys": 2, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6019,7 +6019,7 @@ "name": "pay_name_sdhd_libao_4", "undefined": "圣诞自选_4", "time": -1, - "buys": 5, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6039,7 +6039,7 @@ "name": "pay_name_sdhd_libao_5", "undefined": "圣诞自选_5", "time": -1, - "buys": 9, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6059,7 +6059,7 @@ "name": "pay_name_sdhd_libao_6", "undefined": "圣诞自选_6", "time": -1, - "buys": 9, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6079,7 +6079,7 @@ "name": "pay_name_sdhd_libao_7", "undefined": "圣诞自选_7", "time": -1, - "buys": 9, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6099,7 +6099,7 @@ "name": "pay_name_czlibao_libao_1", "undefined": "超值好礼_1", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6119,7 +6119,7 @@ "name": "pay_name_czlibao_libao_2", "undefined": "超值好礼_2", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6139,7 +6139,7 @@ "name": "pay_name_czlibao_libao_3", "undefined": "超值好礼_3", "time": -1, - "buys": 2, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6159,7 +6159,7 @@ "name": "pay_name_czlibao_libao_4", "undefined": "超值好礼_4", "time": -1, - "buys": 2, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6179,7 +6179,7 @@ "name": "pay_name_czlibao_libao_5", "undefined": "超值好礼_5", "time": -1, - "buys": 2, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6199,7 +6199,7 @@ "name": "pay_name_czlibao_libao_6", "undefined": "超值好礼_6", "time": -1, - "buys": 5, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6219,7 +6219,7 @@ "name": "pay_name_czlibao_libao_7", "undefined": "超值好礼_7", "time": -1, - "buys": 9, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6239,7 +6239,7 @@ "name": "pay_name_czlibao_libao_8", "undefined": "超值好礼_8", "time": -1, - "buys": 9, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6259,7 +6259,7 @@ "name": "pay_name_czlibao_libao_9", "undefined": "超值好礼_9", "time": -1, - "buys": 9, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6279,7 +6279,7 @@ "name": "pay_name_czlibao_libao_10", "undefined": "超值好礼_10", "time": -1, - "buys": 9, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6299,7 +6299,7 @@ "name": "pay_name_ljlibao_1", "undefined": "累日礼包_1", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6319,7 +6319,7 @@ "name": "pay_name_ljlibao_2", "undefined": "累日礼包_2", "time": -1, - "buys": 1, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6339,7 +6339,7 @@ "name": "pay_name_ljlibao_3", "undefined": "累日礼包_3", "time": -1, - "buys": 2, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6359,7 +6359,7 @@ "name": "pay_name_ljlibao_4", "undefined": "累日礼包_4", "time": -1, - "buys": 2, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6379,7 +6379,7 @@ "name": "pay_name_ljlibao_5", "undefined": "累日礼包_5", "time": -1, - "buys": 2, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6399,7 +6399,7 @@ "name": "pay_name_ljlibao_6", "undefined": "累日礼包_6", "time": -1, - "buys": 5, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6419,7 +6419,7 @@ "name": "pay_name_ljlibao_7", "undefined": "累日礼包_7", "time": -1, - "buys": 9, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6439,7 +6439,7 @@ "name": "pay_name_ljlibao_8", "undefined": "累日礼包_8", "time": -1, - "buys": 9, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6459,7 +6459,7 @@ "name": "pay_name_ljlibao_9", "undefined": "累日礼包_9", "time": -1, - "buys": 9, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" @@ -6479,7 +6479,7 @@ "name": "pay_name_ljlibao_10", "undefined": "累日礼包_10", "time": -1, - "buys": 9, + "buys": 0, "needVip": 0, "front": {}, "currency": "CNY" From ec524e1ebda6864a0330406f454c3a6ec90a06e3 Mon Sep 17 00:00:00 2001 From: yushunrui <364203175@qq.com> Date: Wed, 20 Dec 2023 16:59:16 +0800 Subject: [PATCH 28/90] =?UTF-8?q?fix:=E5=9C=A3=E8=AF=9E=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E7=BA=A2=E7=82=B9=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/hongdian/fun.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api_s2c/hongdian/fun.ts b/src/api_s2c/hongdian/fun.ts index d6b30ec..39b5afa 100644 --- a/src/api_s2c/hongdian/fun.ts +++ b/src/api_s2c/hongdian/fun.ts @@ -725,7 +725,7 @@ export class HuoDongHongDianFun { for (let indextask = 0; indextask < Object.keys(_tasks).length; indextask++) { const elementtask = Object.keys(_tasks)[indextask]; let _tmp = _tasks[elementtask]; - if (_tmp.pval <= (_mydata.taskval[elementtask] || 0) && !_mydata.taskfinsih.includes(elementtask)) { + if (_tmp.pval <= (_mydata.taskval[elementtask] || 0) && !_mydata.taskfinish.includes(elementtask)) { // 任务完成且没有领取 _res.show = true; return _res; From fcf79d7df0eb84e1cbc4af96bf66f7adfd17a395 Mon Sep 17 00:00:00 2001 From: yushunrui <364203175@qq.com> Date: Wed, 20 Dec 2023 17:32:31 +0800 Subject: [PATCH 29/90] =?UTF-8?q?fix:=E5=9C=A3=E8=AF=9E=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E7=A4=BC=E5=8C=85=E6=94=B9=E6=88=90=E6=AF=8F=E6=97=A5=E9=87=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/christmas/fun.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/api_s2c/event/christmas/fun.ts b/src/api_s2c/event/christmas/fun.ts index 9ecaa7f..9c1fb4f 100644 --- a/src/api_s2c/event/christmas/fun.ts +++ b/src/api_s2c/event/christmas/fun.ts @@ -113,7 +113,11 @@ export class Christmasfun { mydata.taskval = await this.getTaskVal(call, hdid) mydata.refresh = G.time mydata.gamenum = 0 - await this.setMyData(call.uid, hdid, { $set: { refresh: mydata.refresh, taskfinish: mydata.taskfinish, taskval: mydata.taskval, gamenum: mydata.gamenum} }) + mydata.libao = {} + await this.setMyData(call.uid, hdid, { $set: { refresh: mydata.refresh, taskfinish: mydata.taskfinish, + taskval: mydata.taskval, + gamenum: mydata.gamenum, + libao:mydata.libao} }) return mydata } From e09d057f32156e268da9dc8e4cf2d92d932a81c9 Mon Sep 17 00:00:00 2001 From: yushunrui <364203175@qq.com> Date: Wed, 20 Dec 2023 17:47:37 +0800 Subject: [PATCH 30/90] =?UTF-8?q?fix:=E5=9C=A3=E8=AF=9E=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9Evip=E7=BB=8F=E9=AA=8C=E4=BB=BB=E5=8A=A1157?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/christmas/fun.ts | 4 +++- src/globalListener.ts | 2 ++ src/public/player.ts | 4 ++++ src/public/taskclass.ts | 9 +++++++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/api_s2c/event/christmas/fun.ts b/src/api_s2c/event/christmas/fun.ts index 9c1fb4f..b3e5fca 100644 --- a/src/api_s2c/event/christmas/fun.ts +++ b/src/api_s2c/event/christmas/fun.ts @@ -114,7 +114,9 @@ export class Christmasfun { mydata.refresh = G.time mydata.gamenum = 0 mydata.libao = {} - await this.setMyData(call.uid, hdid, { $set: { refresh: mydata.refresh, taskfinish: mydata.taskfinish, + await this.setMyData(call.uid, hdid, { $set: { + refresh: mydata.refresh, + taskfinish: mydata.taskfinish, taskval: mydata.taskval, gamenum: mydata.gamenum, libao:mydata.libao} }) diff --git a/src/globalListener.ts b/src/globalListener.ts index 648a0bf..f4ada40 100644 --- a/src/globalListener.ts +++ b/src/globalListener.ts @@ -146,6 +146,8 @@ export type gEventType = { Class_task_155: (eventname, call, val, chkVal) => void; /**每日钻石消耗 */ Class_task_156: (eventname, call, val, chkVal) => void; + /**每日获取vip经验 */ + Class_task_157: (eventname, call, val, chkVal) => void; }; export function addListener() { diff --git a/src/public/player.ts b/src/public/player.ts index c179fd7..b8f5bf5 100644 --- a/src/public/player.ts +++ b/src/public/player.ts @@ -178,6 +178,10 @@ export class PlayerFun { G.emit("Class_task_156", 'Class_task_156', call, -atn.n, 0); } } + // 增加vip经验的任务监听 + if (atn.t == "payExp" && atn.n > 0) { + G.emit("Class_task_157", 'Class_task_157', call, atn.n, 0); + } all.push(this.changeAttr(call.conn.uid, change)); all.push(this.upAttr(call, {...atn, n: change[atn.t]})); //await this.changeAttr(call.conn.uid, change); diff --git a/src/public/taskclass.ts b/src/public/taskclass.ts index 332df27..c65944b 100644 --- a/src/public/taskclass.ts +++ b/src/public/taskclass.ts @@ -793,6 +793,15 @@ export module manager { return 1; } } + // 第59个任务 获得vip经验 + export class Class_task_157 extends BaseClass { + stype = 157 + isinc = 1 + + async initVal(call: ApiCall, con) { + return 0; + } + } } From 5b4e0cce65b76ee1a5103b9ca79a3a0fe02b7f6f Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 20 Dec 2023 17:48:42 +0800 Subject: [PATCH 31/90] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E7=AB=9E=E8=B5=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/xiaofeijingsai/ApiOpen.ts | 29 ++++++++++++++------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts b/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts index 79c06bb..209b72e 100644 --- a/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts +++ b/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts @@ -4,19 +4,28 @@ import {PayFun} from "../../../public/pay"; import {HuoDongFun} from "../../../public/huodongfun"; import {PublicShared} from "../../../shared/public/public"; - +/** + * 消费竞赛 + * redis缓存3分钟 + * 返回活动日期内的 + * @param call + */ export default async function (call: ApiCall) { - // let data = await G.mongodb.cEvent('zhoumolibao').findOne({uid: call.uid, type: 'zhoumolibao'}) - // + let ioList = await G.ioredis.get(`rank:xiaofeijingsai`); + if (ioList) { + return call.succ({list: JSON.parse(ioList)}) + } + let _hd = (await HuoDongFun.gethdList(call, 11))[0] - console.log(_hd) - // - // let payIds = _hd?.data?.gift?.filter(i => i.payId)?.map(i => i.payId) - // let a = [] + if (!_hd) return call.errorCode(-1) + + let limit = _hd.data?.rank?.slice(-1)?.[0]?.rank?.slice(-1)?.[0] || 50 + let rmbuse = await G.mongodb.collection('rmbuse').aggregate([ - {$match: {isAdd: false}}, + {$match: {isAdd: false, cTime: {$gte: _hd.stime, $lte: _hd.etime}}}, {$group: {_id: "$uid", total: {$sum: "$change"}}}, - {$sort: {total: 1}} + {$sort: {total: 1}}, + {$limit: limit} ]).toArray() let list: any = rmbuse.map(i => ({...i, total: R.negate(i.total)})) @@ -25,5 +34,7 @@ export default async function (call: ApiCall) { list = list.map(i => ({...i, player: users.find(v => v.uid == i._id)})) + G.ioredis.setex(`rank:xiaofeijingsai`, 180, JSON.stringify(list)); + call.succ({list}) } \ No newline at end of file From 44be68a8ca75b27ad93d26064cab5359696af865 Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 20 Dec 2023 18:02:26 +0800 Subject: [PATCH 32/90] =?UTF-8?q?=E7=A0=B4=E5=86=B0=E7=A4=BC=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/pobinglibao/ApiOpen.ts | 1 + src/api_s2c/event/pobinglibao/ApiReceive.ts | 4 ++-- src/api_s2c/hongdian/fun.ts | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/api_s2c/event/pobinglibao/ApiOpen.ts b/src/api_s2c/event/pobinglibao/ApiOpen.ts index b97d08a..5677a06 100644 --- a/src/api_s2c/event/pobinglibao/ApiOpen.ts +++ b/src/api_s2c/event/pobinglibao/ApiOpen.ts @@ -9,6 +9,7 @@ export default async function (call: ApiCall) { let data = await G.mongodb.cEvent('pobinglibao').findOne({uid: call.uid, type: 'pobinglibao'}) let _hd = (await HuoDongFun.gethdList(call, 10))[0] + if (!_hd) return call.errorCode(-1) let payIds = _hd?.data?.gift?.filter(i => i.payId)?.map(i => i.payId) diff --git a/src/api_s2c/event/pobinglibao/ApiReceive.ts b/src/api_s2c/event/pobinglibao/ApiReceive.ts index a2edfa0..40fe868 100644 --- a/src/api_s2c/event/pobinglibao/ApiReceive.ts +++ b/src/api_s2c/event/pobinglibao/ApiReceive.ts @@ -19,9 +19,9 @@ export default async function (call: ApiCall) { // 取奖励列表，判断是否有可领取奖励 let data = await G.mongodb.cEvent('pobinglibao').findOne({uid: call.uid, type: 'pobinglibao'}) let rec = data?.record?.[call.req.id].length - if (rec && (rec >= 2 || data?.record?.[gift.id] == call.req.recId)) return call.errorCode(-3) + if (rec && (rec >= 3 || data?.record?.[gift.id] == call.req.recId)) return call.errorCode(-3) - await PlayerFun.sendPrize(call, gift.prize); + await PlayerFun.sendPrize(call, gift[call.req.recId]); await G.mongodb.cEvent('pobinglibao').updateOne({uid: call.uid, type: 'pobinglibao'}, { $push: {[`record.${gift.id}`]: call.req.recId}, diff --git a/src/api_s2c/hongdian/fun.ts b/src/api_s2c/hongdian/fun.ts index d173a22..af9d85d 100644 --- a/src/api_s2c/hongdian/fun.ts +++ b/src/api_s2c/hongdian/fun.ts @@ -390,7 +390,7 @@ export class HuoDongHongDianFun { // 取奖励列表，判断是否有可领取奖励 let data = await G.mongodb.cEvent('pobinglibao').findOne({uid: call.uid, type: 'pobinglibao'}) let rec = data?.record?.[call.req.id].length - if (rec && (rec >= 2 || data?.record?.[gift.id] == call.req.recId)) return {show: false} + if (rec && (rec >= 3 || data?.record?.[gift.id] == call.req.recId)) return {show: false} return {show: true} } From 6953349058e070ec4138380f896369889a18da78 Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 20 Dec 2023 18:21:43 +0800 Subject: [PATCH 33/90] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E7=AB=9E=E8=B5=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/xiaofeijingsai/ApiOpen.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts b/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts index 209b72e..b60d885 100644 --- a/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts +++ b/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts @@ -34,7 +34,10 @@ export default async function (call: ApiCall) { list = list.map(i => ({...i, player: users.find(v => v.uid == i._id)})) - G.ioredis.setex(`rank:xiaofeijingsai`, 180, JSON.stringify(list)); + // 活动结束前半小时，缓存过期时间改为10秒 + let exTime = (G.time + 1800) < _hd.etime ? 10 : 180 + + G.ioredis.setex(`rank:xiaofeijingsai`, exTime, JSON.stringify(list)); call.succ({list}) } \ No newline at end of file From e71c562e089b37a55d447236198808ace807323b Mon Sep 17 00:00:00 2001 From: yushunrui <364203175@qq.com> Date: Wed, 20 Dec 2023 18:56:40 +0800 Subject: [PATCH 34/90] =?UTF-8?q?fix:=E5=9C=A3=E8=AF=9E=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=82=E6=AD=A5=E6=8C=89=E9=92=AE=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/ApiSyncBtn.ts | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/api_s2c/ApiSyncBtn.ts b/src/api_s2c/ApiSyncBtn.ts index 68065df..b420eb8 100644 --- a/src/api_s2c/ApiSyncBtn.ts +++ b/src/api_s2c/ApiSyncBtn.ts @@ -39,15 +39,14 @@ export default async function (call: ApiCall) { } break; case 'christmas': - //领完消失 - if (!data[key]) { - let _hdList = await HuoDongFun.gethdList(call, 8) - if (_hdList) { - // 无此活动 - data[key] = {active: true}; - change[key] = data[key]; - } - } + //领完消失 + change[key] = {active: false}; + let _hdList = await HuoDongFun.gethdList(call, 8) + if (_hdList) { + // 无此活动 + data[key] = {active: true}; + change[key] = data[key]; + } break; case 'dayjijin': case 'dengjijijin': From e1386c698acae200e10b64990eec69543b96aaaa Mon Sep 17 00:00:00 2001 From: yushunrui <364203175@qq.com> Date: Wed, 20 Dec 2023 19:03:41 +0800 Subject: [PATCH 35/90] =?UTF-8?q?fix:=E5=9C=A3=E8=AF=9E=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=82=E6=AD=A5=E6=8C=89=E9=92=AE=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/ApiSyncBtn.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/api_s2c/ApiSyncBtn.ts b/src/api_s2c/ApiSyncBtn.ts index b420eb8..062ff63 100644 --- a/src/api_s2c/ApiSyncBtn.ts +++ b/src/api_s2c/ApiSyncBtn.ts @@ -40,7 +40,8 @@ export default async function (call: ApiCall) { break; case 'christmas': //领完消失 - change[key] = {active: false}; + data[key] = {active: false}; + change[key] = data[key]; let _hdList = await HuoDongFun.gethdList(call, 8) if (_hdList) { // 无此活动 From fd3c13d2b5c43c94ba65ba1a7e0d9ab3b24f489b Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 20 Dec 2023 20:05:40 +0800 Subject: [PATCH 36/90] =?UTF-8?q?=E6=B6=88=E8=80=97=E7=AB=9E=E8=B5=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/xiaofeijingsai/ApiOpen.ts | 27 ++++++-- .../protocols/event/xiaofeijingsai/PtlOpen.ts | 7 +- src/shared/protocols/serviceProto.ts | 66 ++++++++++++++++++- 3 files changed, 92 insertions(+), 8 deletions(-) diff --git a/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts b/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts index b60d885..8eb9645 100644 --- a/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts +++ b/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts @@ -13,13 +13,14 @@ import {PublicShared} from "../../../shared/public/public"; export default async function (call: ApiCall) { let ioList = await G.ioredis.get(`rank:xiaofeijingsai`); if (ioList) { - return call.succ({list: JSON.parse(ioList)}) + let myData = await getMyData(call, JSON.parse(ioList)) + return call.succ({list: JSON.parse(ioList), myData}) } let _hd = (await HuoDongFun.gethdList(call, 11))[0] if (!_hd) return call.errorCode(-1) - let limit = _hd.data?.rank?.slice(-1)?.[0]?.rank?.slice(-1)?.[0] || 50 + let limit = call.req.limit || 50 let rmbuse = await G.mongodb.collection('rmbuse').aggregate([ {$match: {isAdd: false, cTime: {$gte: _hd.stime, $lte: _hd.etime}}}, @@ -35,9 +36,27 @@ export default async function (call: ApiCall) { list = list.map(i => ({...i, player: users.find(v => v.uid == i._id)})) // 活动结束前半小时，缓存过期时间改为10秒 - let exTime = (G.time + 1800) < _hd.etime ? 10 : 180 + let exTime = (G.time + 1800) > _hd.etime ? 10 : 180 G.ioredis.setex(`rank:xiaofeijingsai`, exTime, JSON.stringify(list)); - call.succ({list}) + let myData = await getMyData(call, list, _hd) + + call.succ({list, myData}) +} + +// 获取自己的信息 +async function getMyData(call, rankList, _hd?) { + let myData = rankList.find(i => i._id == call.uid) + if (myData) return myData + + if (!_hd) { + _hd = (await HuoDongFun.gethdList(call, 11))[0] + } + let a = await G.mongodb.collection('rmbuse').aggregate([ + {$match: {uid: call.uid, isAdd: false, cTime: {$gte: _hd.stime, $lte: _hd.etime}}}, + {$group: {_id: "$uid", total: {$sum: "$change"}}} + ]).toArray() + let myUser = await G.mongodb.collection('user').findOne({uid: call.uid}) + return {player: myUser, ...a} } \ No newline at end of file diff --git a/src/shared/protocols/event/xiaofeijingsai/PtlOpen.ts b/src/shared/protocols/event/xiaofeijingsai/PtlOpen.ts index 5145ee7..cf5b512 100644 --- a/src/shared/protocols/event/xiaofeijingsai/PtlOpen.ts +++ b/src/shared/protocols/event/xiaofeijingsai/PtlOpen.ts @@ -1,8 +1,11 @@ /** * 消费竞赛 */ -export type ReqOpen = {}; +export type ReqOpen = { + limit: number +}; export type ResOpen = { - list: any[] + list: { _id: string, total: number, player: any }[] + myData: { _id: string, total: number, player: any } }; \ No newline at end of file diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 4bb9ce9..1f614dd 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -10534,7 +10534,16 @@ export const serviceProto: ServiceProto = { ] }, "event/xiaofeijingsai/PtlOpen/ReqOpen": { - "type": "Interface" + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "limit", + "type": { + "type": "Number" + } + } + ] }, "event/xiaofeijingsai/PtlOpen/ResOpen": { "type": "Interface", @@ -10545,9 +10554,62 @@ export const serviceProto: ServiceProto = { "type": { "type": "Array", "elementType": { - "type": "Any" + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "_id", + "type": { + "type": "String" + } + }, + { + "id": 1, + "name": "total", + "type": { + "type": "Number" + } + }, + { + "id": 2, + "name": "player", + "type": { + "type": "Any" + } + } + ] } } + }, + { + "id": 1, + "name": "myData", + "type": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "_id", + "type": { + "type": "String" + } + }, + { + "id": 1, + "name": "total", + "type": { + "type": "Number" + } + }, + { + "id": 2, + "name": "player", + "type": { + "type": "Any" + } + } + ] + } } ] }, From 97d1ddb142f3a6a3da09f8e1f1b4cee5e0824b47 Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 20 Dec 2023 20:06:52 +0800 Subject: [PATCH 37/90] =?UTF-8?q?=E7=A0=B4=E5=86=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/pobinglibao/ApiReceive.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api_s2c/event/pobinglibao/ApiReceive.ts b/src/api_s2c/event/pobinglibao/ApiReceive.ts index 40fe868..1f60117 100644 --- a/src/api_s2c/event/pobinglibao/ApiReceive.ts +++ b/src/api_s2c/event/pobinglibao/ApiReceive.ts @@ -18,7 +18,7 @@ export default async function (call: ApiCall) { // 取奖励列表，判断是否有可领取奖励 let data = await G.mongodb.cEvent('pobinglibao').findOne({uid: call.uid, type: 'pobinglibao'}) - let rec = data?.record?.[call.req.id].length + let rec = data?.record?.[call.req.id]?.length if (rec && (rec >= 3 || data?.record?.[gift.id] == call.req.recId)) return call.errorCode(-3) await PlayerFun.sendPrize(call, gift[call.req.recId]); From 772993260e9c60243e57f3c94aaa7864a92b968a Mon Sep 17 00:00:00 2001 From: yushunrui <364203175@qq.com> Date: Mon, 25 Dec 2023 19:30:55 +0800 Subject: [PATCH 38/90] =?UTF-8?q?fix:=E5=9C=A3=E8=AF=9E=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=82=E6=AD=A5=E6=8C=89=E9=92=AE=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/ApiSyncBtn.ts | 2 +- src/api_s2c/event/christmas/ApiLiBao.ts | 1 - src/api_s2c/event/christmas/ApiQianDao.ts | 2 +- src/api_s2c/event/christmas/ApiZhanLingRec.ts | 2 +- src/public/huodongfun.ts | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/api_s2c/ApiSyncBtn.ts b/src/api_s2c/ApiSyncBtn.ts index 062ff63..959eb6e 100644 --- a/src/api_s2c/ApiSyncBtn.ts +++ b/src/api_s2c/ApiSyncBtn.ts @@ -43,7 +43,7 @@ export default async function (call: ApiCall) { data[key] = {active: false}; change[key] = data[key]; let _hdList = await HuoDongFun.gethdList(call, 8) - if (_hdList) { + if (_hdList.length > 0) { // 无此活动 data[key] = {active: true}; change[key] = data[key]; diff --git a/src/api_s2c/event/christmas/ApiLiBao.ts b/src/api_s2c/event/christmas/ApiLiBao.ts index ad070db..cb87f50 100644 --- a/src/api_s2c/event/christmas/ApiLiBao.ts +++ b/src/api_s2c/event/christmas/ApiLiBao.ts @@ -27,7 +27,6 @@ export default async function (call: ApiCall) { // 判断是否选择奖励了 return call.error('', { code: -3, message: globalThis.lng.yangchengmubiao_2 }) } - let _prize: atn[] = _con.basep for (let key in _select) { diff --git a/src/api_s2c/event/christmas/ApiQianDao.ts b/src/api_s2c/event/christmas/ApiQianDao.ts index 0dba7b9..06ac114 100644 --- a/src/api_s2c/event/christmas/ApiQianDao.ts +++ b/src/api_s2c/event/christmas/ApiQianDao.ts @@ -19,7 +19,7 @@ export default async function (call: ApiCall) { _mydata.qiandao.push(i) _prize = _prize.concat(_con[i]) } - if (!_prize){ + if (_prize.length <= 0){ // 没有奖励可以领取 return call.error('', { code: -1, message: globalThis.lng.yangchengmubiao_2 }) } diff --git a/src/api_s2c/event/christmas/ApiZhanLingRec.ts b/src/api_s2c/event/christmas/ApiZhanLingRec.ts index 42a460f..a95ff7d 100644 --- a/src/api_s2c/event/christmas/ApiZhanLingRec.ts +++ b/src/api_s2c/event/christmas/ApiZhanLingRec.ts @@ -30,7 +30,7 @@ export default async function (call: ApiCall) { _mydata.gj.push(index) } - if (!_prize) { + if (_prize.length <= 0) { // 没有奖励可以领取 return call.error('', { code: -1, message: globalThis.lng.yangchengmubiao_2 }) } diff --git a/src/public/huodongfun.ts b/src/public/huodongfun.ts index 99ed2a1..44d16cc 100644 --- a/src/public/huodongfun.ts +++ b/src/public/huodongfun.ts @@ -54,7 +54,6 @@ export class HuoDongFun { if (htype != 0) _where["htype"] = htype let _res = await this.catAllHD(_where) - let result = [] for (let index = 0; index < _res.length; index++) { const element = _res[index]; From 6cb39ad5234b556b93fd83da4ec807118c77bc21 Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 20 Dec 2023 21:08:06 +0800 Subject: [PATCH 39/90] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E7=AB=9E=E8=B5=9Blimit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/xiaofeijingsai/ApiOpen.ts | 2 +- src/shared/protocols/event/xiaofeijingsai/PtlOpen.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts b/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts index 8eb9645..1473ee6 100644 --- a/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts +++ b/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts @@ -20,7 +20,7 @@ export default async function (call: ApiCall) { let _hd = (await HuoDongFun.gethdList(call, 11))[0] if (!_hd) return call.errorCode(-1) - let limit = call.req.limit || 50 + let limit = _hd.data?.rank?.slice(-1)?.[0]?.rank?.slice(-1)?.[0] || call.req.limit || 100 let rmbuse = await G.mongodb.collection('rmbuse').aggregate([ {$match: {isAdd: false, cTime: {$gte: _hd.stime, $lte: _hd.etime}}}, diff --git a/src/shared/protocols/event/xiaofeijingsai/PtlOpen.ts b/src/shared/protocols/event/xiaofeijingsai/PtlOpen.ts index cf5b512..675b479 100644 --- a/src/shared/protocols/event/xiaofeijingsai/PtlOpen.ts +++ b/src/shared/protocols/event/xiaofeijingsai/PtlOpen.ts @@ -2,7 +2,7 @@ * 消费竞赛 */ export type ReqOpen = { - limit: number + limit?: number }; export type ResOpen = { From c20bf924911a192747fe215ae4f485963b606b45 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Thu, 21 Dec 2023 14:01:08 +0800 Subject: [PATCH 40/90] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E5=99=A8=E9=87=8D=E5=A4=8D=E6=89=A7=E8=A1=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E9=82=AE=E4=BB=B6=E9=87=8D=E5=A4=8D=E5=8F=91=E9=80=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/path_20231221.ts | 121 ++++++++++++++++++ .../scheduler/scheduler_cross_email_pull.ts | 2 +- 2 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 src/path_20231221.ts diff --git a/src/path_20231221.ts b/src/path_20231221.ts new file mode 100644 index 0000000..11098b7 --- /dev/null +++ b/src/path_20231221.ts @@ -0,0 +1,121 @@ +import {ctor} from "./global"; +import {initMongoDB} from "./setMongodb"; +import {yangchengmubiao} from "./shared/protocols/event/yangchengmubiao/PtlOpen"; + +async function start() { + await initMongoDB() + + const hdid = [100, 101]; + const task = { + '2001': { + 'prize': [{'a': 'item', 't': '4', 'n': 5}, {'a': 'item', 't': '626', 'n': 10}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 50, + 'cond': [], + 'stype': 118 + }, + '2002': { + 'prize': [{'a': 'item', 't': '4', 'n': 5}, {'a': 'item', 't': '626', 'n': 10}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 100, + 'cond': [], + 'stype': 118 + }, + '2003': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '626', 'n': 20}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 200, + 'cond': [], + 'stype': 118 + }, + '2004': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 20}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 250, + 'cond': [], + 'stype': 118 + }, + '2005': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 20}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 300, + 'cond': [], + 'stype': 118 + }, + '2006': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 400, + 'cond': [], + 'stype': 118 + }, + '2007': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 500, + 'cond': [], + 'stype': 118 + } + }; + // 中间插入了2004 所以之前的任务id一次往后顺延 + const change = {2004: 2005, 2005: 2006, 2006: 2007}; + // 刷新活动配置 + await G.mongodb.collection("hdinfo").updateMany({hdid: {$in: hdid}}, { + "$set": {'data.tasklist.2': task} + }) + + let datas: yangchengmubiao[] = []; + // 刷新玩家领取记录 + datas = datas.concat(await G.mongodb.cEvent(`yangchengmubiao${hdid[0]}`).find( + {type: `yangchengmubiao${hdid[0]}`} + ).toArray()); + + datas = datas.concat(await G.mongodb.cEvent(`yangchengmubiao${hdid[1]}`).find( + {type: `yangchengmubiao${hdid[1]}`} + ).toArray()); + + for (let i = 0; i < datas.length; i++) { + let data = datas[i]; + let finished = data.finishid["2"].map((task) => { + return change[task] ? change[task] : task + }); + let maxtaskval = Math.max(...Object.values(data.taskval)); + + let taskval = {}; + for (let taskid in task) { + taskval[taskid] = maxtaskval; + } + + await G.mongodb.collection("event").updateOne( + {uid: data.uid, type: data.type}, {$set: {taskval: taskval, "finishid.2": finished}} + ) + console.log(`修复玩家${data.uid}人才计划数据完成...`); + } +} + +ctor(); +start().then(() => { + let s = 0; + setInterval(() => { + s += 1; + console.log(new Date().format("MM-dd hh:mm:ss")); + if (s >= 3) process.exit(1); + }, 1000) + console.log("逻辑执行完成...等待退出！！！"); +}); + + diff --git a/src/public/scheduler/scheduler_cross_email_pull.ts b/src/public/scheduler/scheduler_cross_email_pull.ts index e955d0c..ceee41e 100644 --- a/src/public/scheduler/scheduler_cross_email_pull.ts +++ b/src/public/scheduler/scheduler_cross_email_pull.ts @@ -22,7 +22,7 @@ export class CrossEmailPull extends Scheduler { G.clientCross.callApi("email/GetCrossEmail", {server_id: G.config.serverId + ""}).then((res) => { if (!res.isSucc) return; res.res.emails.forEach(async (email) => { - let _prize = email?.prizeData?.prize || []; + let _prize = R.clone(email?.prizeData?.prize) || []; if (email?.prizeData) delete email.prizeData; email["prize"] = _prize; From 7bfa453beaa6b990c64d8ffc539f4c2075c8aea3 Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 21 Dec 2023 14:47:06 +0800 Subject: [PATCH 41/90] cehua json --- src/json/dixiaheishi.json5 | 8 +- src/json/huodong.json5 | 85 +++++++++++++++++++-- src/json/item.json | 44 ++++++++++- src/json/pay.json | 18 ++--- src/json/playerHead.json | 94 +++++++++++------------ src/json/playerHeadFrame.json | 17 +++++ src/json/playerModel.json | 138 +++++++++++++++++----------------- src/json/tuisonglibao.json | 33 ++++++++ 8 files changed, 294 insertions(+), 143 deletions(-) diff --git a/src/json/dixiaheishi.json5 b/src/json/dixiaheishi.json5 index ab8b01d..83751f3 100644 --- a/src/json/dixiaheishi.json5 +++ b/src/json/dixiaheishi.json5 @@ -33,10 +33,10 @@ }, //136礼包 '136Gift': [ - { payId: '136Gift1', prize: [], bonus: [{"a": "attr", "t": "rmbmoney", "n": 10}] }, + { payId: '136Gift1', prize: [] }, { prize: [{"a": "attr", "t": "rmbmoney", "n": 10},{"a": "item", "t": "12", "n": 10},{"a": "attr", "t": "jinbi", "n": 10000}] }, - { payId: '136Gift2', prize: [], bonus: [{"a": "attr", "t": "rmbmoney", "n": 10}] }, - { payId: '136Gift3', prize: [], bonus: [{"a": "attr", "t": "rmbmoney", "n": 10}] }, - { payId: '136Gift4', prize: [], bonus: [{"a": "attr", "t": "rmbmoney", "n": 10}] }, + { payId: '136Gift2', prize: [] }, + { payId: '136Gift3', prize: [] }, + { payId: '136Gift4', prize: [] }, ], } \ No newline at end of file diff --git a/src/json/huodong.json5 b/src/json/huodong.json5 index 377c6ae..e66b88a 100644 --- a/src/json/huodong.json5 +++ b/src/json/huodong.json5 @@ -3828,7 +3828,7 @@ "hdid" : 10000, // 唯一活动id 超值好礼 "htype" : 10, // 后端唯一识别标识 "stype" : 1000, // 前端唯一识别标识（看前端需要是否修改） - "ttype" : 0, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动 + "ttype" : 4, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动 "stime" : 0, // 活动开始天数 "rtime" : 30, // 活动显示结束天数 "etime" : 30, // 活动实际结束 @@ -4052,8 +4052,15 @@ need:[], free: false, payId: 'ljlibao_1', + scale: 200, buynum: 1, - prize:[] + prize:[ + { + "a": "item", + "t": "13", + "n": 123 + } + ] }, { id: '2', @@ -4062,7 +4069,14 @@ free: false, payId: 'ljlibao_2', buynum: 1, - prize:[] + scale: 201, + prize:[ + { + "a": "item", + "t": "12", + "n": 111 + } + ] }, { id: '3', @@ -4071,7 +4085,14 @@ free: false, payId: 'ljlibao_3', buynum: 1, - prize:[] + scale: 203, + prize:[ + { + "a": "item", + "t": "1", + "n": 111111 + } + ] }, { id: '4', @@ -4080,7 +4101,19 @@ free: false, payId: 'ljlibao_4', buynum: 1, - prize:[] + scale: 204, + prize:[ + { + "a": "item", + "t": "13", + "n": 123 + }, + { + "a": "item", + "t": "2", + "n": 123 + } + ] }, { id: '5', @@ -4089,7 +4122,19 @@ free: false, payId: 'ljlibao_5', buynum: 1, - prize:[] + scale: 201, + prize:[ + { + "a": "item", + "t": "13", + "n": 12 + }, + { + "a": "item", + "t": "1", + "n": 31 + } + ] }, { id: '6', @@ -4098,7 +4143,19 @@ free: false, payId: 'ljlibao_6', buynum: 1, - prize:[] + scale: 200, + prize:[ + { + "a": "item", + "t": "1", + "n": 123 + }, + { + "a": "item", + "t": "2", + "n": 123 + } + ] }, { id: '7', @@ -4107,7 +4164,19 @@ free: false, payId: 'ljlibao_7', buynum: 1, - prize:[] + scale: 300, + prize:[ + { + "a": "item", + "t": "4", + "n": 123 + }, + { + "a": "item", + "t": "2", + "n": 123 + } + ] }, ], //自选框掉落池 diff --git a/src/json/item.json b/src/json/item.json index 1802cff..a5551b3 100644 --- a/src/json/item.json +++ b/src/json/item.json @@ -3860,6 +3860,7 @@ "way": [], "go": "", "icon": "txk_019", + "sicon": "txk_019", "describe": "intr_item_describe_50001", "diaoluo": 3, "useNeed": [], @@ -3878,6 +3879,7 @@ "way": [], "go": "", "icon": "txk_016", + "sicon": "txk_016", "describe": "intr_item_describe_50002", "diaoluo": 4, "useNeed": [], @@ -3896,6 +3898,7 @@ "way": [], "go": "", "icon": "txk_023", + "sicon": "txk_023", "describe": "intr_item_describe_50003", "diaoluo": 6, "useNeed": [], @@ -3914,6 +3917,7 @@ "way": [], "go": "", "icon": "txk_009", + "sicon": "txk_009", "describe": "intr_item_describe_50004", "diaoluo": 7, "useNeed": [], @@ -3932,6 +3936,7 @@ "way": [], "go": "", "icon": "txk_026", + "sicon": "txk_026", "describe": "intr_item_describe_50005", "diaoluo": 8, "useNeed": [], @@ -3950,6 +3955,7 @@ "way": [], "go": "", "icon": "txk_018", + "sicon": "txk_018", "describe": "intr_item_describe_50006", "diaoluo": 9, "useNeed": [], @@ -3968,6 +3974,7 @@ "way": [], "go": "", "icon": "txk_014", + "sicon": "txk_014", "describe": "intr_item_describe_50007", "diaoluo": 10, "useNeed": [], @@ -3986,6 +3993,7 @@ "way": [], "go": "", "icon": "txk_022", + "sicon": "txk_022", "describe": "intr_item_describe_50008", "diaoluo": 11, "useNeed": [], @@ -4004,6 +4012,7 @@ "way": [], "go": "", "icon": "txk_028", + "sicon": "txk_028", "describe": "intr_item_describe_50009", "diaoluo": 23, "useNeed": [], @@ -4012,6 +4021,24 @@ "payId": "", "advancedEffects": "" }, + "50010": { + "id": 50010, + "name": "playerheadFrame_name_24", + "type": 7, + "sort": 1, + "colour": 4, + "way": [], + "go": "", + "icon": "txk_025", + "sicon": "txk_025", + "describe": "intr_item_describe_50010", + "diaoluo": 24, + "useNeed": [], + "usePrize": [], + "selecPrize": [], + "payId": "", + "advancedEffects": "" + }, "50101": { "id": 50101, "name": "playerChatFrame_name_6", @@ -4022,6 +4049,7 @@ "way": [], "go": "", "icon": "lt_dhk11", + "sicon": "lt_dhk11", "describe": "intr_item_describe_50101", "diaoluo": 6, "useNeed": [], @@ -4040,6 +4068,7 @@ "way": [], "go": "", "icon": "lt_dhk10", + "sicon": "lt_dhk10", "describe": "intr_item_describe_50102", "diaoluo": 7, "useNeed": [], @@ -4058,6 +4087,7 @@ "way": [], "go": "", "icon": "txk_020", + "sicon": "txk_020", "describe": "intr_item_describe_50103", "diaoluo": 15, "useNeed": [], @@ -4076,6 +4106,7 @@ "way": [], "go": "", "icon": "lt_dhk14", + "sicon": "lt_dhk14", "describe": "intr_item_describe_50104", "diaoluo": 8, "useNeed": [], @@ -4094,6 +4125,7 @@ "way": [], "go": "", "icon": "txk_017", + "sicon": "txk_017", "describe": "intr_item_describe_50201", "diaoluo": 16, "useNeed": [], @@ -4112,6 +4144,7 @@ "way": [], "go": "", "icon": "txk_011", + "sicon": "txk_011", "describe": "intr_item_describe_50202", "diaoluo": 17, "useNeed": [], @@ -4130,6 +4163,7 @@ "way": [], "go": "", "icon": "txk_005", + "sicon": "txk_005", "describe": "intr_item_describe_50203", "diaoluo": 18, "useNeed": [], @@ -4148,6 +4182,7 @@ "way": [], "go": "", "icon": "txk_004", + "sicon": "txk_004", "describe": "intr_item_describe_50204", "diaoluo": 19, "useNeed": [], @@ -4166,6 +4201,7 @@ "way": [], "go": "", "icon": "txk_024", + "sicon": "txk_024", "describe": "intr_item_describe_50205", "diaoluo": 20, "useNeed": [], @@ -4184,6 +4220,7 @@ "way": [], "go": "", "icon": "txk_013", + "sicon": "txk_013", "describe": "intr_item_describe_50206", "diaoluo": 21, "useNeed": [], @@ -4202,6 +4239,7 @@ "way": [], "go": "", "icon": "txk_021", + "sicon": "txk_021", "describe": "intr_item_describe_50207", "diaoluo": 22, "useNeed": [], @@ -4220,7 +4258,8 @@ "way": [], "go": "", "icon": 100011, - "describe": "intr_item_describe_50208", + "sicon": 100011, + "describe": "intr_item_describe_50301", "diaoluo": 3, "useNeed": [], "usePrize": [], @@ -4238,7 +4277,8 @@ "way": [], "go": "", "icon": 100021, - "describe": "intr_item_describe_50209", + "sicon": 100021, + "describe": "intr_item_describe_50302", "diaoluo": 4, "useNeed": [], "usePrize": [], diff --git a/src/json/pay.json b/src/json/pay.json index 561515d..bd82fb6 100644 --- a/src/json/pay.json +++ b/src/json/pay.json @@ -5951,7 +5951,7 @@ { "a": "attr", "t": "payExp", - "n": 1280 + "n": 5 } ], "prize": [], @@ -5971,7 +5971,7 @@ { "a": "attr", "t": "payExp", - "n": 1280 + "n": 60 } ], "prize": [], @@ -5991,7 +5991,7 @@ { "a": "attr", "t": "payExp", - "n": 1280 + "n": 30 } ], "prize": [], @@ -6011,7 +6011,7 @@ { "a": "attr", "t": "payExp", - "n": 1280 + "n": 680 } ], "prize": [], @@ -6047,13 +6047,7 @@ "sdhd_libao_6": { "id": "sdhd_libao_6", "money": 328, - "payExp": [ - { - "a": "attr", - "t": "payExp", - "n": 1280 - } - ], + "payExp": "[{\"a\": \"attr\", \"t\": \"payExp\", \"n\"3280}]", "prize": [], "firstPayPrize": [], "name": "pay_name_sdhd_libao_6", @@ -6071,7 +6065,7 @@ { "a": "attr", "t": "payExp", - "n": 1280 + "n": 6480 } ], "prize": [], diff --git a/src/json/playerHead.json b/src/json/playerHead.json index e062e3f..37bf3c9 100644 --- a/src/json/playerHead.json +++ b/src/json/playerHead.json @@ -33,13 +33,13 @@ "id": 3, "name": "intr_playerinfo_name_3", "undefined": "获得圣诞活动皮肤【圣诞庆典：男】后解锁", - "img": 10001, + "img": 100011, "cond": [ - "time", - -1 + "model", + 3 ], "intr": "intr_playerinfo_intr_3", - "sort": 42, + "sort": 3, "buff": {}, "colour": 1, "ani": "" @@ -48,13 +48,13 @@ "id": 4, "name": "intr_playerinfo_name_4", "undefined": "获得圣诞活动皮肤【圣诞庆典：女】后解锁", - "img": 10002, + "img": 100021, "cond": [ - "time", - -1 + "model", + 4 ], "intr": "intr_playerinfo_intr_4", - "sort": 43, + "sort": 4, "buff": {}, "colour": 1, "ani": "" @@ -69,7 +69,7 @@ 1001 ], "intr": "intr_playerinfo_intr_1001", - "sort": 40, + "sort": 42, "buff": {}, "colour": 1, "ani": "" @@ -84,7 +84,7 @@ 1002 ], "intr": "intr_playerinfo_intr_1002", - "sort": 41, + "sort": 43, "buff": {}, "colour": 1, "ani": "" @@ -99,7 +99,7 @@ 2001 ], "intr": "intr_playerinfo_intr_2001", - "sort": 38, + "sort": 40, "buff": {}, "colour": 1, "ani": "" @@ -114,7 +114,7 @@ 2002 ], "intr": "intr_playerinfo_intr_2002", - "sort": 39, + "sort": 41, "buff": {}, "colour": 1, "ani": "" @@ -129,7 +129,7 @@ 3001 ], "intr": "intr_playerinfo_intr_3001", - "sort": 23, + "sort": 25, "buff": {}, "colour": 1, "ani": "" @@ -144,7 +144,7 @@ 3002 ], "intr": "intr_playerinfo_intr_3002", - "sort": 24, + "sort": 26, "buff": {}, "colour": 1, "ani": "" @@ -159,7 +159,7 @@ 3003 ], "intr": "intr_playerinfo_intr_3003", - "sort": 25, + "sort": 27, "buff": {}, "colour": 1, "ani": "" @@ -174,7 +174,7 @@ 3004 ], "intr": "intr_playerinfo_intr_3004", - "sort": 26, + "sort": 28, "buff": {}, "colour": 1, "ani": "" @@ -189,7 +189,7 @@ 3005 ], "intr": "intr_playerinfo_intr_3005", - "sort": 27, + "sort": 29, "buff": {}, "colour": 1, "ani": "" @@ -204,7 +204,7 @@ 3006 ], "intr": "intr_playerinfo_intr_3006", - "sort": 28, + "sort": 30, "buff": {}, "colour": 1, "ani": "" @@ -219,7 +219,7 @@ 3007 ], "intr": "intr_playerinfo_intr_3007", - "sort": 29, + "sort": 31, "buff": {}, "colour": 1, "ani": "" @@ -234,7 +234,7 @@ 3008 ], "intr": "intr_playerinfo_intr_3008", - "sort": 30, + "sort": 32, "buff": {}, "colour": 1, "ani": "" @@ -249,7 +249,7 @@ 3009 ], "intr": "intr_playerinfo_intr_3009", - "sort": 31, + "sort": 33, "buff": {}, "colour": 1, "ani": "" @@ -264,7 +264,7 @@ 3010 ], "intr": "intr_playerinfo_intr_3010", - "sort": 32, + "sort": 34, "buff": {}, "colour": 1, "ani": "" @@ -279,7 +279,7 @@ 3011 ], "intr": "intr_playerinfo_intr_3011", - "sort": 33, + "sort": 35, "buff": {}, "colour": 1, "ani": "" @@ -294,7 +294,7 @@ 3012 ], "intr": "intr_playerinfo_intr_3012", - "sort": 34, + "sort": 36, "buff": {}, "colour": 1, "ani": "" @@ -309,7 +309,7 @@ 3013 ], "intr": "intr_playerinfo_intr_3013", - "sort": 35, + "sort": 37, "buff": {}, "colour": 1, "ani": "" @@ -324,7 +324,7 @@ 3014 ], "intr": "intr_playerinfo_intr_3014", - "sort": 36, + "sort": 38, "buff": {}, "colour": 1, "ani": "" @@ -339,7 +339,7 @@ 3015 ], "intr": "intr_playerinfo_intr_3015", - "sort": 37, + "sort": 39, "buff": {}, "colour": 1, "ani": "" @@ -354,7 +354,7 @@ 4001 ], "intr": "intr_playerinfo_intr_4001", - "sort": 8, + "sort": 10, "buff": {}, "colour": 1, "ani": "" @@ -369,7 +369,7 @@ 4002 ], "intr": "intr_playerinfo_intr_4002", - "sort": 9, + "sort": 11, "buff": {}, "colour": 1, "ani": "" @@ -384,7 +384,7 @@ 4003 ], "intr": "intr_playerinfo_intr_4003", - "sort": 10, + "sort": 12, "buff": {}, "colour": 1, "ani": "" @@ -399,7 +399,7 @@ 4004 ], "intr": "intr_playerinfo_intr_4004", - "sort": 11, + "sort": 13, "buff": {}, "colour": 1, "ani": "" @@ -414,7 +414,7 @@ 4005 ], "intr": "intr_playerinfo_intr_4005", - "sort": 12, + "sort": 14, "buff": {}, "colour": 1, "ani": "" @@ -429,7 +429,7 @@ 4006 ], "intr": "intr_playerinfo_intr_4006", - "sort": 13, + "sort": 15, "buff": {}, "colour": 1, "ani": "" @@ -444,7 +444,7 @@ 4007 ], "intr": "intr_playerinfo_intr_4007", - "sort": 14, + "sort": 16, "buff": {}, "colour": 1, "ani": "" @@ -459,7 +459,7 @@ 4008 ], "intr": "intr_playerinfo_intr_4008", - "sort": 15, + "sort": 17, "buff": {}, "colour": 1, "ani": "" @@ -474,7 +474,7 @@ 4009 ], "intr": "intr_playerinfo_intr_4009", - "sort": 16, + "sort": 18, "buff": {}, "colour": 1, "ani": "" @@ -489,7 +489,7 @@ 4010 ], "intr": "intr_playerinfo_intr_4010", - "sort": 17, + "sort": 19, "buff": {}, "colour": 1, "ani": "" @@ -504,7 +504,7 @@ 4011 ], "intr": "intr_playerinfo_intr_4011", - "sort": 18, + "sort": 20, "buff": {}, "colour": 1, "ani": "" @@ -519,7 +519,7 @@ 4012 ], "intr": "intr_playerinfo_intr_4012", - "sort": 19, + "sort": 21, "buff": {}, "colour": 1, "ani": "" @@ -534,7 +534,7 @@ 4013 ], "intr": "intr_playerinfo_intr_4013", - "sort": 20, + "sort": 22, "buff": {}, "colour": 1, "ani": "" @@ -549,7 +549,7 @@ 4014 ], "intr": "intr_playerinfo_intr_4014", - "sort": 21, + "sort": 23, "buff": {}, "colour": 1, "ani": "" @@ -564,7 +564,7 @@ 4015 ], "intr": "intr_playerinfo_intr_4015", - "sort": 22, + "sort": 24, "buff": {}, "colour": 1, "ani": "" @@ -579,7 +579,7 @@ 5001 ], "intr": "intr_playerinfo_intr_5001", - "sort": 3, + "sort": 5, "buff": {}, "colour": 1, "ani": "" @@ -594,7 +594,7 @@ 5002 ], "intr": "intr_playerinfo_intr_5002", - "sort": 4, + "sort": 6, "buff": {}, "colour": 1, "ani": "" @@ -609,7 +609,7 @@ 5003 ], "intr": "intr_playerinfo_intr_5003", - "sort": 5, + "sort": 7, "buff": {}, "colour": 1, "ani": "" @@ -624,7 +624,7 @@ 5004 ], "intr": "intr_playerinfo_intr_5004", - "sort": 6, + "sort": 8, "buff": {}, "colour": 1, "ani": "" @@ -639,7 +639,7 @@ 5005 ], "intr": "intr_playerinfo_intr_5005", - "sort": 7, + "sort": 9, "buff": {}, "colour": 1, "ani": "" diff --git a/src/json/playerHeadFrame.json b/src/json/playerHeadFrame.json index 485c541..a52191d 100644 --- a/src/json/playerHeadFrame.json +++ b/src/json/playerHeadFrame.json @@ -391,5 +391,22 @@ }, "colour": 4, "ani": "" + }, + "24": { + "id": 24, + "name": "playerheadFrame_name_24", + "undefined": "消费竞赛活动前三名获得，解锁后伤害加成+1%（限时7天）", + "img": "txk_025", + "cond": [ + "time", + 604800 + ], + "intr": "playerheadFrame_des_24", + "sort": 24, + "buff": { + "dpspro": 0.01 + }, + "colour": 5, + "ani": "" } } \ No newline at end of file diff --git a/src/json/playerModel.json b/src/json/playerModel.json index dcf972b..634d211 100644 --- a/src/json/playerModel.json +++ b/src/json/playerModel.json @@ -1,76 +1,74 @@ { "1": { - "1": { - "type": 1, - "id": 1, - "name": "playerModel_name_1", - "head": 10001, - "img": "zhu_10001", - "cond": [ - "lv", - 1 - ], - "intr": "playerModel_des_1", - "sort": 1, - "buff": {}, - "colour": 1, - "mwSpine": "ani_mingwangnan", - "fireHead": "img_lih2" + "id": 1, + "type": 1, + "name": "playerModel_name_1", + "head": 10001, + "img": "zhu_10001", + "cond": [ + "lv", + 1 + ], + "intr": "playerModel_des_1", + "sort": 1, + "buff": {}, + "colour": 1, + "mwSpine": "ani_mingwangnan", + "fireHead": "img_lih2" + }, + "2": { + "id": 2, + "type": 1, + "name": "playerModel_name_2", + "head": 10002, + "img": "zhu_10002", + "cond": [ + "lv", + 1 + ], + "intr": "playerModel_des_2", + "sort": 2, + "buff": {}, + "colour": 1, + "mwSpine": "ani_mingwangnv", + "fireHead": "img_lih1" + }, + "3": { + "id": 3, + "type": 1, + "name": "playerModel_name_3", + "head": 100011, + "img": 100011, + "cond": [ + "time", + -1 + ], + "intr": "playerModel_des_3", + "sort": 3, + "buff": { + "defpro": 0.02 }, - "2": { - "type": 1, - "id": 2, - "name": "playerModel_name_2", - "head": 10002, - "img": "zhu_10002", - "cond": [ - "lv", - 1 - ], - "intr": "playerModel_des_2", - "sort": 2, - "buff": {}, - "colour": 1, - "mwSpine": "ani_mingwangnv", - "fireHead": "img_lih1" + "colour": 5, + "mwSpine": "ani_mingwangnan", + "fireHead": "img_lih21" + }, + "4": { + "id": 4, + "type": 1, + "name": "playerModel_name_4", + "head": 100021, + "img": 100021, + "cond": [ + "time", + -1 + ], + "intr": "playerModel_des_4", + "sort": 4, + "buff": { + "atkpro": 0.02 }, - "3": { - "type": 1, - "id": 3, - "name": "playerModel_name_3", - "head": 100011, - "img": 100011, - "cond": [ - "time", - -1 - ], - "intr": "playerModel_des_3", - "sort": 3, - "buff": { - "defpro": 0.02 - }, - "colour": 5, - "mwSpine": "ani_mingwangnan", - "fireHead": "img_lih21" - }, - "4": { - "type": 1, - "id": 4, - "name": "playerModel_name_4", - "head": 100021, - "img": 100021, - "cond": [ - "time", - -1 - ], - "intr": "playerModel_des_4", - "sort": 4, - "buff": { - "atkpro": 0.02 - }, - "colour": 5, - "mwSpine": "ani_mingwangnv", - "fireHead": "img_lih11" - } + "colour": 5, + "mwSpine": "ani_mingwangnv", + "fireHead": "img_lih11" } } \ No newline at end of file diff --git a/src/json/tuisonglibao.json b/src/json/tuisonglibao.json index c64eb5e..e46aeef 100644 --- a/src/json/tuisonglibao.json +++ b/src/json/tuisonglibao.json @@ -2,6 +2,7 @@ "1": { "id": 1, "type": 1, + "typeName": "tuisonglibao_name_2", "num": [ 100 ], @@ -16,6 +17,7 @@ "2": { "id": 2, "type": 1, + "typeName": "tuisonglibao_name_2", "num": [ 140 ], @@ -30,6 +32,7 @@ "3": { "id": 3, "type": 1, + "typeName": "tuisonglibao_name_2", "num": [ 180 ], @@ -45,6 +48,7 @@ "4": { "id": 4, "type": 1, + "typeName": "tuisonglibao_name_2", "num": [ 240 ], @@ -60,6 +64,7 @@ "5": { "id": 5, "type": 1, + "typeName": "tuisonglibao_name_2", "num": [ 300 ], @@ -75,6 +80,7 @@ "6": { "id": 6, "type": 1, + "typeName": "tuisonglibao_name_2", "num": [ 360 ], @@ -90,6 +96,7 @@ "7": { "id": 7, "type": 1, + "typeName": "tuisonglibao_name_2", "num": [ 400 ], @@ -105,6 +112,7 @@ "8": { "id": 8, "type": 1, + "typeName": "tuisonglibao_name_2", "num": [ 460 ], @@ -120,6 +128,7 @@ "9": { "id": 9, "type": 1, + "typeName": "tuisonglibao_name_2", "num": [ 490 ], @@ -135,6 +144,7 @@ "10": { "id": 10, "type": 1, + "typeName": "tuisonglibao_name_2", "num": [ 520 ], @@ -150,6 +160,7 @@ "11": { "id": 11, "type": 1, + "typeName": "tuisonglibao_name_2", "num": [ 550 ], @@ -165,6 +176,7 @@ "12": { "id": 12, "type": 1, + "typeName": "tuisonglibao_name_2", "num": [ 580 ], @@ -180,6 +192,7 @@ "13": { "id": 13, "type": 1, + "typeName": "tuisonglibao_name_2", "num": [ 610 ], @@ -195,6 +208,7 @@ "14": { "id": 14, "type": 1, + "typeName": "tuisonglibao_name_2", "num": [ 640 ], @@ -210,6 +224,7 @@ "15": { "id": 15, "type": 1, + "typeName": "tuisonglibao_name_2", "num": [ 670 ], @@ -225,6 +240,7 @@ "16": { "id": 16, "type": 1, + "typeName": "tuisonglibao_name_2", "num": [ 700 ], @@ -240,6 +256,7 @@ "17": { "id": 17, "type": 1, + "typeName": "tuisonglibao_name_2", "num": [ 730 ], @@ -255,6 +272,7 @@ "18": { "id": 18, "type": 1, + "typeName": "tuisonglibao_name_2", "num": [ 760 ], @@ -270,6 +288,7 @@ "101": { "id": 101, "type": 2, + "typeName": "tuisonglibao_name_3", "num": [ { "a": "item", @@ -288,6 +307,7 @@ "102": { "id": 102, "type": 2, + "typeName": "tuisonglibao_name_3", "num": [ { "a": "item", @@ -306,6 +326,7 @@ "103": { "id": 103, "type": 2, + "typeName": "tuisonglibao_name_3", "num": [ { "a": "item", @@ -324,6 +345,7 @@ "104": { "id": 104, "type": 2, + "typeName": "tuisonglibao_name_3", "num": [ { "a": "item", @@ -342,6 +364,7 @@ "401": { "id": 401, "type": 5, + "typeName": "tuisonglibao_name_1", "num": [ 15 ], @@ -355,6 +378,7 @@ "402": { "id": 402, "type": 5, + "typeName": "tuisonglibao_name_1", "num": [ 25 ], @@ -368,6 +392,7 @@ "403": { "id": 403, "type": 5, + "typeName": "tuisonglibao_name_1", "num": [ 40 ], @@ -382,6 +407,7 @@ "404": { "id": 404, "type": 5, + "typeName": "tuisonglibao_name_1", "num": [ 50 ], @@ -396,6 +422,7 @@ "405": { "id": 405, "type": 5, + "typeName": "tuisonglibao_name_1", "num": [ 55 ], @@ -410,6 +437,7 @@ "406": { "id": 406, "type": 5, + "typeName": "tuisonglibao_name_1", "num": [ 60 ], @@ -424,6 +452,7 @@ "407": { "id": 407, "type": 5, + "typeName": "tuisonglibao_name_1", "num": [ 63 ], @@ -438,6 +467,7 @@ "408": { "id": 408, "type": 5, + "typeName": "tuisonglibao_name_1", "num": [ 66 ], @@ -452,6 +482,7 @@ "409": { "id": 409, "type": 5, + "typeName": "tuisonglibao_name_1", "num": [ 69 ], @@ -466,6 +497,7 @@ "410": { "id": 410, "type": 5, + "typeName": "tuisonglibao_name_1", "num": [ 73 ], @@ -480,6 +512,7 @@ "411": { "id": 411, "type": 5, + "typeName": "tuisonglibao_name_1", "num": [ 82 ], From 122041f40492bf4d4727fe1b85e6642885d0919d Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Thu, 21 Dec 2023 18:16:54 +0800 Subject: [PATCH 42/90] =?UTF-8?q?feat:=20=E8=84=9A=E6=9C=AC=E7=9B=AE?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../patch_20231215.ts} | 10 +- .../patch_20231220.ts} | 4 +- .../patch_20231221.ts} | 6 +- src/fix_patch/patch_20231221_1.ts | 126 ++++++++++++++++++ src/{ => fix_patch}/patch_email_find.ts | 4 +- .../patch_fix_all_user_hero_shiwu.ts | 4 +- .../patch_player_model_20231221.ts | 4 +- .../patch_queryEmail.ts} | 0 .../patch_shop_redis2db.ts} | 6 +- 9 files changed, 145 insertions(+), 19 deletions(-) rename src/{path_20231215.ts => fix_patch/patch_20231215.ts} (99%) rename src/{path_20231220.ts => fix_patch/patch_20231220.ts} (94%) rename src/{path_20231221.ts => fix_patch/patch_20231221.ts} (95%) create mode 100644 src/fix_patch/patch_20231221_1.ts rename src/{ => fix_patch}/patch_email_find.ts (85%) rename src/{ => fix_patch}/patch_fix_all_user_hero_shiwu.ts (96%) rename src/{ => fix_patch}/patch_player_model_20231221.ts (90%) rename src/{queryEmail.ts => fix_patch/patch_queryEmail.ts} (100%) rename src/{path_shop_redis2db.ts => fix_patch/patch_shop_redis2db.ts} (84%) diff --git a/src/path_20231215.ts b/src/fix_patch/patch_20231215.ts similarity index 99% rename from src/path_20231215.ts rename to src/fix_patch/patch_20231215.ts index 297a5b1..0a77b3d 100644 --- a/src/path_20231215.ts +++ b/src/fix_patch/patch_20231215.ts @@ -1,8 +1,8 @@ -import {ctor} from "./global"; -import {initMongoDB} from "./setMongodb"; -import {ReqEmail} from "./monopoly/protocols/PtlEmail"; -import {MsgEmail} from "./shared/protocols/msg_s2c/MsgEmail"; -import {yangchengmubiao} from "./shared/protocols/event/yangchengmubiao/PtlOpen"; +import {ctor} from "../global"; +import {initMongoDB} from "../setMongodb"; +import {ReqEmail} from "../monopoly/protocols/PtlEmail"; +import {MsgEmail} from "../shared/protocols/msg_s2c/MsgEmail"; +import {yangchengmubiao} from "../shared/protocols/event/yangchengmubiao/PtlOpen"; /** diff --git a/src/path_20231220.ts b/src/fix_patch/patch_20231220.ts similarity index 94% rename from src/path_20231220.ts rename to src/fix_patch/patch_20231220.ts index 5649024..7f1681b 100644 --- a/src/path_20231220.ts +++ b/src/fix_patch/patch_20231220.ts @@ -1,5 +1,5 @@ -import {ctor} from "./global"; -import {initMongoDB} from "./setMongodb"; +import {ctor} from "../global"; +import {initMongoDB} from "../setMongodb"; async function start() { await initMongoDB() diff --git a/src/path_20231221.ts b/src/fix_patch/patch_20231221.ts similarity index 95% rename from src/path_20231221.ts rename to src/fix_patch/patch_20231221.ts index 11098b7..8028e1f 100644 --- a/src/path_20231221.ts +++ b/src/fix_patch/patch_20231221.ts @@ -1,6 +1,6 @@ -import {ctor} from "./global"; -import {initMongoDB} from "./setMongodb"; -import {yangchengmubiao} from "./shared/protocols/event/yangchengmubiao/PtlOpen"; +import {ctor} from "../global"; +import {initMongoDB} from "../setMongodb"; +import {yangchengmubiao} from "../shared/protocols/event/yangchengmubiao/PtlOpen"; async function start() { await initMongoDB() diff --git a/src/fix_patch/patch_20231221_1.ts b/src/fix_patch/patch_20231221_1.ts new file mode 100644 index 0000000..1f31185 --- /dev/null +++ b/src/fix_patch/patch_20231221_1.ts @@ -0,0 +1,126 @@ +import {ctor} from "../global"; +import {initMongoDB} from "../setMongodb"; +import {yangchengmubiao} from "../shared/protocols/event/yangchengmubiao/PtlOpen"; +import {number} from "mathjs"; +import {PublicShared} from "../shared/public/public"; + +async function start() { + await initMongoDB() + + const task = { + '2001': { + 'prize': [{'a': 'item', 't': '4', 'n': 5}, {'a': 'item', 't': '626', 'n': 10}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 50, + 'cond': [], + 'stype': 118 + }, + '2002': { + 'prize': [{'a': 'item', 't': '4', 'n': 5}, {'a': 'item', 't': '626', 'n': 10}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 100, + 'cond': [], + 'stype': 118 + }, + '2003': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '626', 'n': 20}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 200, + 'cond': [], + 'stype': 118 + }, + '2004': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 20}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 250, + 'cond': [], + 'stype': 118 + }, + '2005': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 20}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 300, + 'cond': [], + 'stype': 118 + }, + '2006': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 400, + 'cond': [], + 'stype': 118 + }, + '2007': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 500, + 'cond': [], + 'stype': 118 + } + }; + let hdid = [100, 101]; + let openday = PublicShared.getOpenServerDay(); + let openhdlist = await G.mongodb.collection("hdinfo").find( + {hdid: {$in: hdid}, stime: {$lte: openday}, etime: {$gte: openday}} + ).toArray(); + + // 没有开启的活动 返回 + if (openhdlist.length <= 0) { + return; + } else { + hdid = openhdlist.map(hd => hd.hdid); + } + + let datas: yangchengmubiao[]; + datas = await G.mongodb.cEvent(`yangchengmubiao${hdid[0]}`).find( + {type: `yangchengmubiao${hdid[0]}`} + ).toArray(); + + for (let i = 0; i < datas.length; i++) { + let data = datas[i]; + let finishid = new Set(data.finishid["2"]); + // 查找任务未完成 但设置了领奖标识 + for (let taskid in task) { + let con = task[taskid]; + let taskval = data.taskval || {}; + if (finishid.has(number(taskid)) && (taskval[taskid] || 0) < con.pval) { + finishid.delete(number(taskid)); + } + } + // 没有删除的 + if (finishid.size == data.finishid["2"].length) { + continue + } + await G.mongodb.collection("event").updateOne( + {"uid": data.uid, "type": data.type}, {$set: {"finishid.2": [...finishid]}} + ) + console.log(`修复玩家${data.uid}人才计划${data.type}数据完成...`); + } +} + +ctor(); +start().then(() => { + let s = 0; + setInterval(() => { + s += 1; + console.log(new Date().format("MM-dd hh:mm:ss")); + if (s >= 3) process.exit(1); + }, 1000) + console.log("逻辑执行完成...等待退出！！！"); +}); + + diff --git a/src/patch_email_find.ts b/src/fix_patch/patch_email_find.ts similarity index 85% rename from src/patch_email_find.ts rename to src/fix_patch/patch_email_find.ts index 140648d..900687a 100644 --- a/src/patch_email_find.ts +++ b/src/fix_patch/patch_email_find.ts @@ -1,5 +1,5 @@ -import {initMongoDB} from "./setMongodb"; -import {ctor} from "./global"; +import {initMongoDB} from "../setMongodb"; +import {ctor} from "../global"; async function start() { await initMongoDB(); diff --git a/src/patch_fix_all_user_hero_shiwu.ts b/src/fix_patch/patch_fix_all_user_hero_shiwu.ts similarity index 96% rename from src/patch_fix_all_user_hero_shiwu.ts rename to src/fix_patch/patch_fix_all_user_hero_shiwu.ts index 31c8032..6bcea4d 100644 --- a/src/patch_fix_all_user_hero_shiwu.ts +++ b/src/fix_patch/patch_fix_all_user_hero_shiwu.ts @@ -1,5 +1,5 @@ -import {ctor} from './global'; -import {initMongoDB} from './setMongodb'; +import {ctor} from '../global'; +import {initMongoDB} from '../setMongodb'; async function start() { //连接mongodb diff --git a/src/patch_player_model_20231221.ts b/src/fix_patch/patch_player_model_20231221.ts similarity index 90% rename from src/patch_player_model_20231221.ts rename to src/fix_patch/patch_player_model_20231221.ts index 53c60ea..063eab9 100644 --- a/src/patch_player_model_20231221.ts +++ b/src/fix_patch/patch_player_model_20231221.ts @@ -1,5 +1,5 @@ -import {ctor} from "./global"; -import {initMongoDB} from "./setMongodb"; +import {ctor} from "../global"; +import {initMongoDB} from "../setMongodb"; async function start() { await initMongoDB() diff --git a/src/queryEmail.ts b/src/fix_patch/patch_queryEmail.ts similarity index 100% rename from src/queryEmail.ts rename to src/fix_patch/patch_queryEmail.ts diff --git a/src/path_shop_redis2db.ts b/src/fix_patch/patch_shop_redis2db.ts similarity index 84% rename from src/path_shop_redis2db.ts rename to src/fix_patch/patch_shop_redis2db.ts index ab437f2..a3736d5 100644 --- a/src/path_shop_redis2db.ts +++ b/src/fix_patch/patch_shop_redis2db.ts @@ -1,6 +1,6 @@ -import {ctor} from './global'; -import {initMongoDB} from './setMongodb'; -import {initRedis} from './setRedis'; +import {ctor} from '../global'; +import {initMongoDB} from '../setMongodb'; +import {initRedis} from '../setRedis'; async function start() { //连接mongodb From 82b4b6172510b1357fcb1eb041e329d45c405205 Mon Sep 17 00:00:00 2001 From: chenkai Date: Thu, 21 Dec 2023 19:52:19 +0800 Subject: [PATCH 43/90] =?UTF-8?q?feat:=20=E6=8A=A2=E7=BA=A2=E5=8C=85?= =?UTF-8?q?=E5=88=86=E9=92=BB=E7=9F=B3=E6=8E=A5=E5=8F=A3=20=E5=88=9D?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/payForDiamond/ApiCanReceive.ts | 45 ++++++++ src/api_s2c/event/payForDiamond/ApiReceive.ts | 104 ++++++++++++++++++ .../event/payForDiamond/PtlCanReceive.ts | 9 ++ .../event/payForDiamond/PtlReceive.ts | 8 ++ 4 files changed, 166 insertions(+) create mode 100644 src/api_s2c/event/payForDiamond/ApiCanReceive.ts create mode 100644 src/api_s2c/event/payForDiamond/ApiReceive.ts create mode 100644 src/shared/protocols/event/payForDiamond/PtlCanReceive.ts create mode 100644 src/shared/protocols/event/payForDiamond/PtlReceive.ts diff --git a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts new file mode 100644 index 0000000..b77fe24 --- /dev/null +++ b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts @@ -0,0 +1,45 @@ +import { ApiCall } from "tsrpc"; +import { HuoDongFun } from "../../../public/huodongfun"; +import { ReqCanReceive, ResCanReceive } from '../../../shared/protocols/event/payForDiamond/PtlCanReceive'; +import { PublicShared } from "../../../shared/public/public"; + +export async function playerCanReceive(call: ApiCall) { + const activityInfo = await HuoDongFun.getHdidInfo(call, call.req.activityId); + if (!activityInfo) { + return call.error('No such activity'); + } + const remaining = activityInfo.data['remaining']; + const zeroTime = PublicShared.getToDayZeroTime(); + const dayPayInfo = await G.mongodb.collection('dayPay').findOne({ uid: call.uid, time: zeroTime }); + if (!dayPayInfo || !dayPayInfo.payNum) { + return { + payNum: 0, remaining, result: false, activityInfo + }; + } + const payNum = dayPayInfo.payNum; + // 玩家充值未达标或者奖池余额耗尽则不能领取 + if (payNum < activityInfo.data['price'] || remaining <= 0) { + return { + payNum, remaining, result: false, activityInfo + } + } + // 检查玩家今日是否已经领取 + const playerActivityInfo = G.mongodb.cEvent('payForDiamond').findOne({ uid: call.uid }); + if (playerActivityInfo) { + if (playerActivityInfo[zeroTime]?.length) { + return { + payNum, remaining, result: false, activityInfo + }; + } + } + return { + payNum, remaining, result: true, activityInfo + }; +} + +export default async function (call: ApiCall) { + const canReceiveResult = await playerCanReceive(call); + if (canReceiveResult) { + call.succ(canReceiveResult); + } +} \ No newline at end of file diff --git a/src/api_s2c/event/payForDiamond/ApiReceive.ts b/src/api_s2c/event/payForDiamond/ApiReceive.ts new file mode 100644 index 0000000..46748ab --- /dev/null +++ b/src/api_s2c/event/payForDiamond/ApiReceive.ts @@ -0,0 +1,104 @@ +import { ApiCall } from "tsrpc"; +import { HuoDongFun } from "../../../public/huodongfun"; +import { ReqReceive, ResReceive } from '../../../shared/protocols/event/payForDiamond/PtlReceive'; +import { playerCanReceive } from './ApiCanReceive'; +import { PublicShared } from "../../../shared/public/public"; + +type diamondWeightGroup = { + weight: number; + numrange: [ min: number, max: number]; +}; + +/** + * @param groups 各分组及其权重 + */ +function randomWithWeight(groups: diamondWeightGroup[]) { + let minAmount: number; + let totalWeights = 0; + for (const group of groups) { + totalWeights += group.weight; + if (!minAmount) { + minAmount = group.numrange[0]; + } else { + minAmount = Math.min(minAmount, group.numrange[0]); + } + } + const randomValue = Math.random() * totalWeights; // 随机值落在[0, totalWeights) 之间 + let currSum = 0; + for (const group of groups) { + if (currSum <= randomValue && randomValue < currSum + group.weight) { + return { group, minAmount }; + } else { + currSum += group.weight; + } + } + const length = groups.length; + return { group: groups[length - 1], minAmount }; +} + +/** + * 计算玩家分得的钻石数量 + * @param remaining + * @param group + * @param minAmount + */ +function calcDiamondGot(remaining: number, group: diamondWeightGroup, minAmount: number) { + const [min, max] = group.numrange; + const randomAmount = Math.floor(Math.random() * (max - min)) + min + 1; // max 值应能够取到, 故 +1 + // 剩余数额小于组内随机得到的值, 全给吧 + if (randomAmount > remaining) { + return remaining; + } + // 玩家分过后的余额不足给到下一个玩家分配的最小额度, 也把当前剩的全给 + if (remaining - randomAmount < minAmount) { + return remaining; + } + return randomAmount; +} + +export default async function (call: ApiCall) { + const canReceiveResult = await playerCanReceive(call); + if (canReceiveResult) { + if (!canReceiveResult.result) { + return call.succ({ + amount: 0, + timesRemaining: 0 + }); + } + const activityData = canReceiveResult.activityInfo.data; + const remaining = activityData['remaining']? activityData['remaining'] : activityData['totalmoney']; + const { group, minAmount } = randomWithWeight(activityData['groupConf']['arr']); + const gotAmount = calcDiamondGot(remaining, group, minAmount); + // 减去余额 + const filter = { + hdid: call.req.activityId, + $or: [ + {'data.remaining': { $exists: false }}, + {$expr: {$gte: [ `$data.remaining - ${gotAmount}`, 0 ]}}, + ], + }; + const updateDoc = { + $set: { 'data.remaining': `$data.remaining - ${gotAmount}` } + } + const updateResult = await G.mongodb.collection('hdinfo').updateOne(filter, updateDoc); + // 更新成功 + if (updateResult.modifiedCount) { + // 请求返回 + call.succ({ + amount: gotAmount, + timesRemaining: 0 + }); + // 添加玩家领取记录 + const zeroTime = PublicShared.getToDayZeroTime(); + const setObj = {}; + setObj[zeroTime] = gotAmount; + G.mongodb.cEvent('payForDiamond').updateOne({ uid: call.uid }, { + $set: setObj + }); + } + // 发送炫耀 + if (gotAmount >= activityData['groupConf']['base']['loglimit']) { + + } + } +} \ No newline at end of file diff --git a/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts b/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts new file mode 100644 index 0000000..8d905ec --- /dev/null +++ b/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts @@ -0,0 +1,9 @@ +export type ReqCanReceive = { + activityId: number; +}; + +export type ResCanReceive = { + payNum: number; + remaining?: number; + result: boolean; +}; \ No newline at end of file diff --git a/src/shared/protocols/event/payForDiamond/PtlReceive.ts b/src/shared/protocols/event/payForDiamond/PtlReceive.ts new file mode 100644 index 0000000..beb4bf8 --- /dev/null +++ b/src/shared/protocols/event/payForDiamond/PtlReceive.ts @@ -0,0 +1,8 @@ +export type ReqReceive = { + activityId: number; +}; + +export type ResReceive = { + amount: number, + timesRemaining: number; +}; From 2ae2a1362d48b98c2b48df1de1cdb40379a64346 Mon Sep 17 00:00:00 2001 From: chenkai Date: Thu, 21 Dec 2023 20:16:29 +0800 Subject: [PATCH 44/90] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=82=AB?= =?UTF-8?q?=E8=80=80=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/payForDiamond/ApiReceive.ts | 13 +++++++++++-- src/json/pmd.json5 | 4 +++- src/module/collection_event.ts | 5 ++++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/api_s2c/event/payForDiamond/ApiReceive.ts b/src/api_s2c/event/payForDiamond/ApiReceive.ts index 46748ab..ff9748a 100644 --- a/src/api_s2c/event/payForDiamond/ApiReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiReceive.ts @@ -1,8 +1,8 @@ import { ApiCall } from "tsrpc"; -import { HuoDongFun } from "../../../public/huodongfun"; import { ReqReceive, ResReceive } from '../../../shared/protocols/event/payForDiamond/PtlReceive'; import { playerCanReceive } from './ApiCanReceive'; import { PublicShared } from "../../../shared/public/public"; +import { ChatFun } from "../../../public/chat"; type diamondWeightGroup = { weight: number; @@ -98,7 +98,16 @@ export default async function (call: ApiCall) { } // 发送炫耀 if (gotAmount >= activityData['groupConf']['base']['loglimit']) { - + ChatFun.newMsg({ + type: 'local', + msg: G.gc.pmd.get_hero_star5_pmd, + time: G.time, + sender: 'system', + otherData: { + pmd: true, + args: [gotAmount] + } + }); } } } \ No newline at end of file diff --git a/src/json/pmd.json5 b/src/json/pmd.json5 index 2e0db1c..bd2ec62 100644 --- a/src/json/pmd.json5 +++ b/src/json/pmd.json5 @@ -14,5 +14,7 @@ //黑帮争霸争霸赛第二名 hbzb_pmd2: 'intr_pmd_hbzb2', //黑帮争霸争霸赛第三名 - hbzb_pmd3: 'intr_pmd_hbzb3' + hbzb_pmd3: 'intr_pmd_hbzb3', + // 充值抢钻石 - 抢到大量钻石 + pay_for_diamond: 'intr_pmd_pfd' } \ No newline at end of file diff --git a/src/module/collection_event.ts b/src/module/collection_event.ts index 6681c58..901d3f9 100644 --- a/src/module/collection_event.ts +++ b/src/module/collection_event.ts @@ -50,7 +50,10 @@ export type eventType = { qirichongzhi: Omit; jierihuodong: Omit & { refreshTime: number; }; kaifujingsai: ResOpenKaifujingsai; - zhoumolibao: ResOpenZhoumolibao & { refreshTime: number; } + zhoumolibao: ResOpenZhoumolibao & { refreshTime: number; }; + payForDiamond: { + [time: number]: number[] + } } & { [k: `${number}jijin`]: ResOpenYuedujijin; [k: `yangchengmubiao${number}`]: yangchengmubiao; From 6808b53dd4be10bf64188c46db317ce34b35ffe6 Mon Sep 17 00:00:00 2001 From: chenkai Date: Thu, 21 Dec 2023 20:33:47 +0800 Subject: [PATCH 45/90] =?UTF-8?q?fix:=20=E5=85=81=E8=AE=B8=E7=8E=A9?= =?UTF-8?q?=E5=AE=B6=E9=A2=86=E5=8F=96=E5=88=B0=E7=9A=84=E9=92=BB=E7=9F=B3?= =?UTF-8?q?=E6=95=B0=E5=B0=8F=E4=BA=8E=E9=85=8D=E7=BD=AE=E7=9A=84=E6=9C=80?= =?UTF-8?q?=E4=BD=8E=E6=A1=A3=E4=BD=8D=E9=A2=9D=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/payForDiamond/ApiReceive.ts | 21 +- src/shared/protocols/serviceProto.ts | 670 ++++++++++-------- 2 files changed, 385 insertions(+), 306 deletions(-) diff --git a/src/api_s2c/event/payForDiamond/ApiReceive.ts b/src/api_s2c/event/payForDiamond/ApiReceive.ts index ff9748a..8aaf8e6 100644 --- a/src/api_s2c/event/payForDiamond/ApiReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiReceive.ts @@ -13,46 +13,35 @@ type diamondWeightGroup = { * @param groups 各分组及其权重 */ function randomWithWeight(groups: diamondWeightGroup[]) { - let minAmount: number; let totalWeights = 0; for (const group of groups) { totalWeights += group.weight; - if (!minAmount) { - minAmount = group.numrange[0]; - } else { - minAmount = Math.min(minAmount, group.numrange[0]); - } } const randomValue = Math.random() * totalWeights; // 随机值落在[0, totalWeights) 之间 let currSum = 0; for (const group of groups) { if (currSum <= randomValue && randomValue < currSum + group.weight) { - return { group, minAmount }; + return group; } else { currSum += group.weight; } } const length = groups.length; - return { group: groups[length - 1], minAmount }; + return groups[length - 1]; } /** * 计算玩家分得的钻石数量 * @param remaining * @param group - * @param minAmount */ -function calcDiamondGot(remaining: number, group: diamondWeightGroup, minAmount: number) { +function calcDiamondGot(remaining: number, group: diamondWeightGroup) { const [min, max] = group.numrange; const randomAmount = Math.floor(Math.random() * (max - min)) + min + 1; // max 值应能够取到, 故 +1 // 剩余数额小于组内随机得到的值, 全给吧 if (randomAmount > remaining) { return remaining; } - // 玩家分过后的余额不足给到下一个玩家分配的最小额度, 也把当前剩的全给 - if (remaining - randomAmount < minAmount) { - return remaining; - } return randomAmount; } @@ -67,8 +56,8 @@ export default async function (call: ApiCall) { } const activityData = canReceiveResult.activityInfo.data; const remaining = activityData['remaining']? activityData['remaining'] : activityData['totalmoney']; - const { group, minAmount } = randomWithWeight(activityData['groupConf']['arr']); - const gotAmount = calcDiamondGot(remaining, group, minAmount); + const group = randomWithWeight(activityData['groupConf']['arr']); + const gotAmount = calcDiamondGot(remaining, group); // 减去余额 const filter = { hdid: call.req.activityId, diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index c60ab37..5bef3a2 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -68,13 +68,15 @@ import { ReqOpen as ReqOpen_14, ResOpen as ResOpen_14 } from './event/leijichong import { ReqRec as ReqRec_5, ResRec as ResRec_5 } from './event/leijichongzhi/PtlRec'; import { ReqLottery, ResLottery } from './event/niudanji/PtlLottery'; import { ReqOpen as ReqOpen_15, ResOpen as ResOpen_15 } from './event/niudanji/PtlOpen'; +import { ReqCanReceive, ResCanReceive } from './event/payForDiamond/PtlCanReceive'; +import { ReqReceive as ReqReceive_2, ResReceive as ResReceive_2 } from './event/payForDiamond/PtlReceive'; import { ReqOpen as ReqOpen_16, ResOpen as ResOpen_16 } from './event/qirichongzhi/PtlOpen'; import { ReqRec as ReqRec_6, ResRec as ResRec_6 } from './event/qirichongzhi/PtlRec'; import { ReqOpen as ReqOpen_17, ResOpen as ResOpen_17 } from './event/qiridenglu/PtlOpen'; import { ReqRecPrize as ReqRecPrize_1, ResRecPrize as ResRecPrize_1 } from './event/qiridenglu/PtlRecPrize'; import { ReqOpen as ReqOpen_18, ResOpen as ResOpen_18 } from './event/shiwuleichong/PtlOpen'; import { ReqOpen as ReqOpen_19, ResOpen as ResOpen_19 } from './event/shouchong/PtlOpen'; -import { ReqReceive as ReqReceive_2, ResReceive as ResReceive_2 } from './event/shouchong/PtlReceive'; +import { ReqReceive as ReqReceive_3, ResReceive as ResReceive_3 } from './event/shouchong/PtlReceive'; import { ReqBuy as ReqBuy_1, ResBuy as ResBuy_1 } from './event/xianshizhaomu/PtlBuy'; import { ReqDuihuan, ResDuihuan } from './event/xianshizhaomu/PtlDuihuan'; import { ReqLottery as ReqLottery_1, ResLottery as ResLottery_1 } from './event/xianshizhaomu/PtlLottery'; @@ -95,7 +97,7 @@ import { ReqRecPrize as ReqRecPrize_2, ResRecPrize as ResRecPrize_2 } from './ev import { ReqRecTask, ResRecTask } from './event/zhanling/PtlRecTask'; import { ReqOpen as ReqOpen_26, ResOpen as ResOpen_26 } from './event/zhoulibao/PtlOpen'; import { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } from './event/zhoumolibao/PtlOpen'; -import { ReqReceive as ReqReceive_3, ResReceive as ResReceive_3 } from './event/zhoumolibao/PtlReceive'; +import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } from './event/zhoumolibao/PtlReceive'; import { ReqBuy as ReqBuy_3, ResBuy as ResBuy_3 } from './event/zixuanlibao/PtlBuy'; import { ReqOpen as ReqOpen_28, ResOpen as ResOpen_28 } from './event/zixuanlibao/PtlOpen'; import { ReqhdGetList, ReshdGetList } from './eventlist/PtlhdGetList'; @@ -185,10 +187,10 @@ import { ReqBuyFightNum, ResBuyFightNum } from './jjc/PtlBuyFightNum'; import { ReqFight as ReqFight_5, ResFight as ResFight_5 } from './jjc/PtlFight'; import { ReqFightLog, ResFightLog } from './jjc/PtlFightLog'; import { ReqOpen as ReqOpen_40, ResOpen as ResOpen_40 } from './jjc/PtlOpen'; -import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } from './jjc/PtlReceive'; +import { ReqReceive as ReqReceive_5, ResReceive as ResReceive_5 } from './jjc/PtlReceive'; import { ReqRefresh as ReqRefresh_4, ResRefresh as ResRefresh_4 } from './jjc/PtlRefresh'; import { ReqOpen as ReqOpen_41, ResOpen as ResOpen_41 } from './kaifujingsai/PtlOpen'; -import { ReqReceive as ReqReceive_5, ResReceive as ResReceive_5 } from './kaifujingsai/PtlReceive'; +import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } from './kaifujingsai/PtlReceive'; import { ReqApply as ReqApply_2, ResApply as ResApply_2 } from './kbzz/PtlApply'; import { ReqAutoApply, ResAutoApply } from './kbzz/PtlAutoApply'; import { ReqBuyNum as ReqBuyNum_3, ResBuyNum as ResBuyNum_3 } from './kbzz/PtlBuyNum'; @@ -296,7 +298,7 @@ import { ReqFastGuaJi, ResFastGuaJi } from './tanxian/PtlFastGuaJi'; import { ReqFight as ReqFight_11, ResFight as ResFight_11 } from './tanxian/PtlFight'; import { ReqGuaJi, ResGuaJi } from './tanxian/PtlGuaJi'; import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } from './tanxian/PtlOpen'; -import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } from './tanxian/PtlReceive'; +import { ReqReceive as ReqReceive_7, ResReceive as ResReceive_7 } from './tanxian/PtlReceive'; import { ReqAllFinsh, ResAllFinsh } from './task/PtlAllFinsh'; import { ReqFinsh, ResFinsh } from './task/PtlFinsh'; import { ReqOpen as ReqOpen_55, ResOpen as ResOpen_55 } from './task/PtlOpen'; @@ -335,7 +337,7 @@ import { ReqGet as ReqGet_3, ResGet as ResGet_3 } from './xstask/PtlGet'; import { ReqLvUp as ReqLvUp_4, ResLvUp as ResLvUp_4 } from './xstask/PtlLvUp'; import { ReqOnekeyReceive, ResOnekeyReceive } from './xstask/PtlOnekeyReceive'; import { ReqOpen as ReqOpen_58, ResOpen as ResOpen_58 } from './xstask/PtlOpen'; -import { ReqReceive as ReqReceive_7, ResReceive as ResReceive_7 } from './xstask/PtlReceive'; +import { ReqReceive as ReqReceive_8, ResReceive as ResReceive_8 } from './xstask/PtlReceive'; import { ReqRefresh as ReqRefresh_8, ResRefresh as ResRefresh_8 } from './xstask/PtlRefresh'; import { ReqHandle, ResHandle } from './yongbingzhuzhan/PtlHandle'; import { ReqChangePos as ReqChangePos_1, ResChangePos as ResChangePos_1 } from './zhanqianbushu/PtlChangePos'; @@ -620,6 +622,14 @@ export interface ServiceType { req: ReqOpen_15, res: ResOpen_15 }, + "event/payForDiamond/CanReceive": { + req: ReqCanReceive, + res: ResCanReceive + }, + "event/payForDiamond/Receive": { + req: ReqReceive_2, + res: ResReceive_2 + }, "event/qirichongzhi/Open": { req: ReqOpen_16, res: ResOpen_16 @@ -645,8 +655,8 @@ export interface ServiceType { res: ResOpen_19 }, "event/shouchong/Receive": { - req: ReqReceive_2, - res: ResReceive_2 + req: ReqReceive_3, + res: ResReceive_3 }, "event/xianshizhaomu/Buy": { req: ReqBuy_1, @@ -729,8 +739,8 @@ export interface ServiceType { res: ResOpen_27 }, "event/zhoumolibao/Receive": { - req: ReqReceive_3, - res: ResReceive_3 + req: ReqReceive_4, + res: ResReceive_4 }, "event/zixuanlibao/Buy": { req: ReqBuy_3, @@ -1089,8 +1099,8 @@ export interface ServiceType { res: ResOpen_40 }, "jjc/Receive": { - req: ReqReceive_4, - res: ResReceive_4 + req: ReqReceive_5, + res: ResReceive_5 }, "jjc/Refresh": { req: ReqRefresh_4, @@ -1101,8 +1111,8 @@ export interface ServiceType { res: ResOpen_41 }, "kaifujingsai/Receive": { - req: ReqReceive_5, - res: ResReceive_5 + req: ReqReceive_6, + res: ResReceive_6 }, "kbzz/Apply": { req: ReqApply_2, @@ -1421,8 +1431,8 @@ export interface ServiceType { res: ResOpen_54 }, "tanxian/Receive": { - req: ReqReceive_6, - res: ResReceive_6 + req: ReqReceive_7, + res: ResReceive_7 }, "task/AllFinsh": { req: ReqAllFinsh, @@ -1577,8 +1587,8 @@ export interface ServiceType { res: ResOpen_58 }, "xstask/Receive": { - req: ReqReceive_7, - res: ResReceive_7 + req: ReqReceive_8, + res: ResReceive_8 }, "xstask/Refresh": { req: ReqRefresh_8, @@ -1982,101 +1992,111 @@ export const serviceProto: ServiceProto = { }, { "id": 69, - "name": "event/qirichongzhi/Open", + "name": "event/payForDiamond/CanReceive", "type": "api" }, { "id": 70, - "name": "event/qirichongzhi/Rec", + "name": "event/payForDiamond/Receive", "type": "api" }, { "id": 71, - "name": "event/qiridenglu/Open", + "name": "event/qirichongzhi/Open", "type": "api" }, { "id": 72, - "name": "event/qiridenglu/RecPrize", + "name": "event/qirichongzhi/Rec", "type": "api" }, { "id": 73, - "name": "event/shiwuleichong/Open", + "name": "event/qiridenglu/Open", "type": "api" }, { "id": 74, - "name": "event/shouchong/Open", + "name": "event/qiridenglu/RecPrize", "type": "api" }, { "id": 75, - "name": "event/shouchong/Receive", + "name": "event/shiwuleichong/Open", "type": "api" }, { "id": 76, - "name": "event/xianshizhaomu/Buy", + "name": "event/shouchong/Open", "type": "api" }, { "id": 77, - "name": "event/xianshizhaomu/Duihuan", + "name": "event/shouchong/Receive", "type": "api" }, { "id": 78, - "name": "event/xianshizhaomu/Lottery", + "name": "event/xianshizhaomu/Buy", "type": "api" }, { "id": 79, - "name": "event/xianshizhaomu/Open", + "name": "event/xianshizhaomu/Duihuan", "type": "api" }, { "id": 80, - "name": "event/xianshizhaomu/Rec", + "name": "event/xianshizhaomu/Lottery", "type": "api" }, { "id": 81, - "name": "event/xinshoulibao/Open", + "name": "event/xianshizhaomu/Open", "type": "api" }, { "id": 82, - "name": "event/yangchengmubiao/Buy", + "name": "event/xianshizhaomu/Rec", "type": "api" }, { "id": 83, - "name": "event/yangchengmubiao/Open", + "name": "event/xinshoulibao/Open", "type": "api" }, { "id": 84, - "name": "event/yangchengmubiao/Rec", + "name": "event/yangchengmubiao/Buy", "type": "api" }, { "id": 85, - "name": "event/yibaichou/Open", + "name": "event/yangchengmubiao/Open", "type": "api" }, { "id": 86, - "name": "event/yibaichou/Rec", + "name": "event/yangchengmubiao/Rec", "type": "api" }, { "id": 87, - "name": "event/yibaichou/RecAll", + "name": "event/yibaichou/Open", "type": "api" }, { "id": 88, + "name": "event/yibaichou/Rec", + "type": "api" + }, + { + "id": 89, + "name": "event/yibaichou/RecAll", + "type": "api" + }, + { + "id": 90, "name": "event/yuedujijin/Open", "type": "api", "conf": { @@ -2084,157 +2104,157 @@ export const serviceProto: ServiceProto = { } }, { - "id": 89, + "id": 91, "name": "event/yuedujijin/Rec", "type": "api" }, { - "id": 90, + "id": 92, "name": "event/zhanling/BuyLv", "type": "api" }, { - "id": 91, + "id": 93, "name": "event/zhanling/Open", "type": "api" }, { - "id": 92, + "id": 94, "name": "event/zhanling/RecPrize", "type": "api" }, { - "id": 93, + "id": 95, "name": "event/zhanling/RecTask", "type": "api" }, { - "id": 94, + "id": 96, "name": "event/zhoulibao/Open", "type": "api" }, { - "id": 95, + "id": 97, "name": "event/zhoumolibao/Open", "type": "api" }, { - "id": 96, + "id": 98, "name": "event/zhoumolibao/Receive", "type": "api" }, { - "id": 97, + "id": 99, "name": "event/zixuanlibao/Buy", "type": "api" }, { - "id": 98, + "id": 100, "name": "event/zixuanlibao/Open", "type": "api" }, { - "id": 99, + "id": 101, "name": "eventlist/hdGetList", "type": "api" }, { - "id": 100, + "id": 102, "name": "friend/Apply", "type": "api" }, { - "id": 101, + "id": 103, "name": "friend/Del", "type": "api" }, { - "id": 102, + "id": 104, "name": "friend/Gift", "type": "api" }, { - "id": 103, + "id": 105, "name": "friend/List", "type": "api" }, { - "id": 104, + "id": 106, "name": "friend/Open", "type": "api" }, { - "id": 105, + "id": 107, "name": "friend/Respond", "type": "api" }, { - "id": 106, + "id": 108, "name": "friend/RmBlackList", "type": "api" }, { - "id": 107, + "id": 109, "name": "friend/Search", "type": "api" }, { - "id": 108, + "id": 110, "name": "ganbutexun/Challenge", "type": "api" }, { - "id": 109, + "id": 111, "name": "ganbutexun/Open", "type": "api" }, { - "id": 110, + "id": 112, "name": "ganhai/Fast", "type": "api" }, { - "id": 111, + "id": 113, "name": "ganhai/Fight", "type": "api" }, { - "id": 112, + "id": 114, "name": "ganhai/Log", "type": "api" }, { - "id": 113, + "id": 115, "name": "ganhai/Open", "type": "api" }, { - "id": 114, + "id": 116, "name": "ganhai/Refresh", "type": "api" }, { - "id": 115, + "id": 117, "name": "ganhai/RefreshShip", "type": "api" }, { - "id": 116, + "id": 118, "name": "ganhai/Select", "type": "api" }, { - "id": 117, + "id": 119, "name": "gmapi/Gift", "type": "api" }, { - "id": 118, + "id": 120, "name": "gmapi/Post", "type": "api" }, { - "id": 119, + "id": 121, "name": "gonghui/Apply", "type": "api", "conf": { @@ -2244,7 +2264,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 120, + "id": 122, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2254,7 +2274,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 121, + "id": 123, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2264,7 +2284,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 122, + "id": 124, "name": "gonghui/Change", "type": "api", "conf": { @@ -2274,12 +2294,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 123, + "id": 125, "name": "gonghui/Create", "type": "api" }, { - "id": 124, + "id": 126, "name": "gonghui/Dissolve", "type": "api", "conf": { @@ -2289,7 +2309,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 125, + "id": 127, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2299,12 +2319,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 126, + "id": 128, "name": "gonghui/FbBuyNum", "type": "api" }, { - "id": 127, + "id": 129, "name": "gonghui/FbFight", "type": "api", "conf": { @@ -2314,7 +2334,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 128, + "id": 130, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2324,17 +2344,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 129, + "id": 131, "name": "gonghui/GetList", "type": "api" }, { - "id": 130, + "id": 132, "name": "gonghui/Join", "type": "api" }, { - "id": 131, + "id": 133, "name": "gonghui/Jx", "type": "api", "conf": { @@ -2344,7 +2364,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 132, + "id": 134, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2354,7 +2374,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 133, + "id": 135, "name": "gonghui/List", "type": "api", "conf": { @@ -2364,7 +2384,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 134, + "id": 136, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2374,7 +2394,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 135, + "id": 137, "name": "gonghui/Open", "type": "api", "conf": { @@ -2384,7 +2404,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 136, + "id": 138, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2394,7 +2414,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 137, + "id": 139, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2404,7 +2424,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 138, + "id": 140, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2414,7 +2434,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 139, + "id": 141, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2424,137 +2444,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 140, + "id": 142, "name": "gonghuibaozang/Lottery", "type": "api" }, { - "id": 141, + "id": 143, "name": "gonghuibaozang/Open", "type": "api" }, { - "id": 142, + "id": 144, "name": "gonglukuangbiao/Buy", "type": "api" }, { - "id": 143, + "id": 145, "name": "gonglukuangbiao/Fight", "type": "api" }, { - "id": 144, + "id": 146, "name": "gonglukuangbiao/Open", "type": "api" }, { - "id": 145, + "id": 147, "name": "gonglukuangbiao/Refresh", "type": "api" }, { - "id": 146, + "id": 148, "name": "gongyu/mingdao/Active", "type": "api" }, { - "id": 147, + "id": 149, "name": "gongyu/mingdao/Open", "type": "api" }, { - "id": 148, + "id": 150, "name": "gongyu/mingdao/RecPrize", "type": "api" }, { - "id": 149, + "id": 151, "name": "gongyu/mingdao/Repair", "type": "api" }, { - "id": 150, + "id": 152, "name": "gongyu/xunlianjihua/Reset", "type": "api" }, { - "id": 151, + "id": 153, "name": "gongyu/xunlianjihua/UpSkill", "type": "api" }, { - "id": 152, + "id": 154, "name": "gongyu/zuozhanjihua/SetSkill", "type": "api" }, { - "id": 153, + "id": 155, "name": "hbzb/jfs/BuyNum", "type": "api" }, { - "id": 154, + "id": 156, "name": "hbzb/jfs/Fight", "type": "api" }, { - "id": 155, + "id": 157, "name": "hbzb/jfs/GetLog", "type": "api" }, { - "id": 156, + "id": 158, "name": "hbzb/jfs/Open", "type": "api" }, { - "id": 157, + "id": 159, "name": "hbzb/jfs/Rec", "type": "api" }, { - "id": 158, + "id": 160, "name": "hbzb/jfs/Refresh", "type": "api" }, { - "id": 159, + "id": 161, "name": "hbzb/GetStatus", "type": "api" }, { - "id": 160, + "id": 162, "name": "hbzb/zbs/BuyNum", "type": "api" }, { - "id": 161, + "id": 163, "name": "hbzb/zbs/Fight", "type": "api" }, { - "id": 162, + "id": 164, "name": "hbzb/zbs/GetLog", "type": "api" }, { - "id": 163, + "id": 165, "name": "hbzb/zbs/Open", "type": "api" }, { - "id": 164, + "id": 166, "name": "hbzb/zbs/Refresh", "type": "api" }, { - "id": 165, + "id": 167, "name": "hero/Awake", "type": "api" }, { - "id": 166, + "id": 168, "name": "hero/ChangePos", "type": "api", "conf": { @@ -2562,17 +2582,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 167, + "id": 169, "name": "hero/GetList", "type": "api" }, { - "id": 168, + "id": 170, "name": "hero/JinJie", "type": "api" }, { - "id": 169, + "id": 171, "name": "hero/LvUp", "type": "api", "conf": { @@ -2580,32 +2600,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 170, + "id": 172, "name": "hero/Potency", "type": "api" }, { - "id": 171, + "id": 173, "name": "hero/Rec", "type": "api" }, { - "id": 172, + "id": 174, "name": "hero/Reset", "type": "api" }, { - "id": 173, + "id": 175, "name": "hero/Talent", "type": "api" }, { - "id": 174, + "id": 176, "name": "hero/WeaponUp", "type": "api" }, { - "id": 175, + "id": 177, "name": "hongdian/Get", "type": "api", "conf": { @@ -2613,117 +2633,117 @@ export const serviceProto: ServiceProto = { } }, { - "id": 176, + "id": 178, "name": "item/GetList", "type": "api" }, { - "id": 177, + "id": 179, "name": "item/Use", "type": "api" }, { - "id": 178, + "id": 180, "name": "jiaotang/Lottery", "type": "api" }, { - "id": 179, + "id": 181, "name": "jiaotang/Open", "type": "api" }, { - "id": 180, + "id": 182, "name": "jiuba/Lottery", "type": "api" }, { - "id": 181, + "id": 183, "name": "jiuba/Open", "type": "api" }, { - "id": 182, + "id": 184, "name": "jjc/BuyFightNum", "type": "api" }, { - "id": 183, + "id": 185, "name": "jjc/Fight", "type": "api" }, { - "id": 184, + "id": 186, "name": "jjc/FightLog", "type": "api" }, { - "id": 185, + "id": 187, "name": "jjc/Open", "type": "api" }, { - "id": 186, + "id": 188, "name": "jjc/Receive", "type": "api" }, { - "id": 187, + "id": 189, "name": "jjc/Refresh", "type": "api" }, { - "id": 188, + "id": 190, "name": "kaifujingsai/Open", "type": "api" }, { - "id": 189, + "id": 191, "name": "kaifujingsai/Receive", "type": "api" }, { - "id": 190, + "id": 192, "name": "kbzz/Apply", "type": "api" }, { - "id": 191, + "id": 193, "name": "kbzz/AutoApply", "type": "api" }, { - "id": 192, + "id": 194, "name": "kbzz/BuyNum", "type": "api" }, { - "id": 193, + "id": 195, "name": "kbzz/Fight", "type": "api" }, { - "id": 194, + "id": 196, "name": "kbzz/FightLog", "type": "api" }, { - "id": 195, + "id": 197, "name": "kbzz/GroupState", "type": "api" }, { - "id": 196, + "id": 198, "name": "kbzz/Open", "type": "api" }, { - "id": 197, + "id": 199, "name": "kbzz/RecPrize", "type": "api" }, { - "id": 198, + "id": 200, "name": "kbzz/Refresh", "type": "api", "conf": { @@ -2731,282 +2751,282 @@ export const serviceProto: ServiceProto = { } }, { - "id": 199, + "id": 201, "name": "kuangdong/AddPkNum", "type": "api" }, { - "id": 200, + "id": 202, "name": "kuangdong/GetPrize", "type": "api" }, { - "id": 201, + "id": 203, "name": "kuangdong/KdInfo", "type": "api" }, { - "id": 202, + "id": 204, "name": "kuangdong/Log", "type": "api" }, { - "id": 203, + "id": 205, "name": "kuangdong/Open", "type": "api" }, { - "id": 204, + "id": 206, "name": "kuangdong/YanShi", "type": "api" }, { - "id": 205, + "id": 207, "name": "kuangdong/ZhanLing", "type": "api" }, { - "id": 206, + "id": 208, "name": "lingzhulaixi/Open", "type": "api" }, { - "id": 207, + "id": 209, "name": "lingzhulaixi/PkBoss", "type": "api" }, { - "id": 208, + "id": 210, "name": "lingzhulaixi/PkRank", "type": "api" }, { - "id": 209, + "id": 211, "name": "lingzhulaixi/SaoDang", "type": "api" }, { - "id": 210, + "id": 212, "name": "meirishilian/Buy", "type": "api" }, { - "id": 211, + "id": 213, "name": "meirishilian/Fight", "type": "api" }, { - "id": 212, + "id": 214, "name": "meirishilian/Open", "type": "api" }, { - "id": 213, + "id": 215, "name": "msg_c2s/BindUid", "type": "msg" }, { - "id": 214, + "id": 216, "name": "msg_c2s/Pay", "type": "msg" }, { - "id": 215, + "id": 217, "name": "msg_c2s/Sync", "type": "msg" }, { - "id": 216, + "id": 218, "name": "msg_s2c/Chat", "type": "msg" }, { - "id": 217, + "id": 219, "name": "msg_s2c/ChatHelp", "type": "msg" }, { - "id": 218, + "id": 220, "name": "msg_s2c/Collection", "type": "msg" }, { - "id": 219, + "id": 221, "name": "msg_s2c/Email", "type": "msg" }, { - "id": 220, + "id": 222, "name": "msg_s2c/EmailDel", "type": "msg" }, { - "id": 221, + "id": 223, "name": "msg_s2c/EquipChange", "type": "msg" }, { - "id": 222, + "id": 224, "name": "msg_s2c/Friend", "type": "msg" }, { - "id": 223, + "id": 225, "name": "msg_s2c/GhChange", "type": "msg" }, { - "id": 224, + "id": 226, "name": "msg_s2c/GongHuiBaoZang", "type": "msg" }, { - "id": 225, + "id": 227, "name": "msg_s2c/HeroChange", "type": "msg" }, { - "id": 226, + "id": 228, "name": "msg_s2c/HongDianChange", "type": "msg" }, { - "id": 227, + "id": 229, "name": "msg_s2c/ItemChange", "type": "msg" }, { - "id": 228, + "id": 230, "name": "msg_s2c/LoginQueue", "type": "msg" }, { - "id": 229, + "id": 231, "name": "msg_s2c/LshdChange", "type": "msg" }, { - "id": 230, + "id": 232, "name": "msg_s2c/NewDay", "type": "msg" }, { - "id": 231, + "id": 233, "name": "msg_s2c/OtherLogin", "type": "msg" }, { - "id": 232, + "id": 234, "name": "msg_s2c/PayChange", "type": "msg" }, { - "id": 233, + "id": 235, "name": "msg_s2c/PayResult", "type": "msg" }, { - "id": 234, + "id": 236, "name": "msg_s2c/PeijianChange", "type": "msg" }, { - "id": 235, + "id": 237, "name": "msg_s2c/PlayerChange", "type": "msg" }, { - "id": 236, + "id": 238, "name": "msg_s2c/Private", "type": "msg" }, { - "id": 237, + "id": 239, "name": "msg_s2c/SendGift", "type": "msg" }, { - "id": 238, + "id": 240, "name": "msg_s2c/ShiwuChange", "type": "msg" }, { - "id": 239, + "id": 241, "name": "msg_s2c/TaskChange", "type": "msg" }, { - "id": 240, + "id": 242, "name": "msg_s2c/Xianshilibao", "type": "msg" }, { - "id": 241, + "id": 243, "name": "pata/Fight", "type": "api" }, { - "id": 242, + "id": 244, "name": "pata/GetPrize", "type": "api" }, { - "id": 243, + "id": 245, "name": "pata/Open", "type": "api" }, { - "id": 244, + "id": 246, "name": "pata/SaoDang", "type": "api" }, { - "id": 245, + "id": 247, "name": "pay/GetList", "type": "api" }, { - "id": 246, + "id": 248, "name": "peijian/GetList", "type": "api" }, { - "id": 247, + "id": 249, "name": "peijian/JingLian", "type": "api" }, { - "id": 248, + "id": 250, "name": "peijian/JinJie", "type": "api" }, { - "id": 249, + "id": 251, "name": "peijian/LvUp", "type": "api" }, { - "id": 250, + "id": 252, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 251, + "id": 253, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 252, + "id": 254, "name": "peijian/Reset", "type": "api" }, { - "id": 253, + "id": 255, "name": "peijian/Rm", "type": "api" }, { - "id": 254, + "id": 256, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3014,32 +3034,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 255, + "id": 257, "name": "peijian/UnLock", "type": "api" }, { - "id": 256, + "id": 258, "name": "peijian/Wear", "type": "api" }, { - "id": 257, + "id": 259, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 258, + "id": 260, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 259, + "id": 261, "name": "peijiancangku/Open", "type": "api" }, { - "id": 260, + "id": 262, "name": "Bingo", "type": "api", "conf": { @@ -3047,137 +3067,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 261, + "id": 263, "name": "FightTest", "type": "api" }, { - "id": 262, + "id": 264, "name": "SyncBtn", "type": "api" }, { - "id": 263, + "id": 265, "name": "Test", "type": "api" }, { - "id": 264, + "id": 266, "name": "qjzzd/Fight", "type": "api" }, { - "id": 265, + "id": 267, "name": "qjzzd/Open", "type": "api" }, { - "id": 266, + "id": 268, "name": "rank/Open", "type": "api" }, { - "id": 267, + "id": 269, "name": "shiwu/Concise", "type": "api" }, { - "id": 268, + "id": 270, "name": "shiwu/Extract", "type": "api" }, { - "id": 269, + "id": 271, "name": "shiwu/GetList", "type": "api" }, { - "id": 270, + "id": 272, "name": "shiwu/LvUp", "type": "api" }, { - "id": 271, + "id": 273, "name": "shiwu/Recast", "type": "api" }, { - "id": 272, + "id": 274, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 273, + "id": 275, "name": "shiwu/Wear", "type": "api" }, { - "id": 274, + "id": 276, "name": "shootGame/Open", "type": "api" }, { - "id": 275, + "id": 277, "name": "shootGame/Rec", "type": "api" }, { - "id": 276, + "id": 278, "name": "shop/Buy", "type": "api" }, { - "id": 277, + "id": 279, "name": "shop/Open", "type": "api" }, { - "id": 278, + "id": 280, "name": "shop/Refresh", "type": "api" }, { - "id": 279, + "id": 281, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 280, + "id": 282, "name": "sign/GetPrize", "type": "api" }, { - "id": 281, + "id": 283, "name": "sign/Open", "type": "api" }, { - "id": 282, + "id": 284, "name": "slzd/Aim", "type": "api" }, { - "id": 283, + "id": 285, "name": "slzd/BuyNum", "type": "api" }, { - "id": 284, + "id": 286, "name": "slzd/Fight", "type": "api" }, { - "id": 285, + "id": 287, "name": "slzd/FightLog", "type": "api" }, { - "id": 286, + "id": 288, "name": "slzd/MyRank", "type": "api" }, { - "id": 287, + "id": 289, "name": "slzd/Open", "type": "api", "conf": { @@ -3187,77 +3207,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 288, + "id": 290, "name": "slzd/OpenFort", "type": "api" }, { - "id": 289, + "id": 291, "name": "slzd/Rec", "type": "api" }, { - "id": 290, + "id": 292, "name": "slzd/Refresh", "type": "api" }, { - "id": 291, + "id": 293, "name": "slzd/Slot", "type": "api" }, { - "id": 292, + "id": 294, "name": "tanxian/Event", "type": "api" }, { - "id": 293, + "id": 295, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 294, + "id": 296, "name": "tanxian/Fight", "type": "api" }, { - "id": 295, + "id": 297, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 296, + "id": 298, "name": "tanxian/Open", "type": "api" }, { - "id": 297, + "id": 299, "name": "tanxian/Receive", "type": "api" }, { - "id": 298, + "id": 300, "name": "task/AllFinsh", "type": "api" }, { - "id": 299, + "id": 301, "name": "task/Finsh", "type": "api" }, { - "id": 300, + "id": 302, "name": "task/Open", "type": "api" }, { - "id": 301, + "id": 303, "name": "user/CDKEY", "type": "api" }, { - "id": 302, + "id": 304, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3265,197 +3285,197 @@ export const serviceProto: ServiceProto = { } }, { - "id": 303, + "id": 305, "name": "user/ChangeName", "type": "api" }, { - "id": 304, + "id": 306, "name": "user/Fight", "type": "api" }, { - "id": 305, + "id": 307, "name": "user/GetInfo", "type": "api" }, { - "id": 306, + "id": 308, "name": "user/InfoOpen", "type": "api" }, { - "id": 307, + "id": 309, "name": "user/Login", "type": "api" }, { - "id": 308, + "id": 310, "name": "user/Ping", "type": "api" }, { - "id": 309, + "id": 311, "name": "user/Renown", "type": "api" }, { - "id": 310, + "id": 312, "name": "user/RenownBuy", "type": "api" }, { - "id": 311, + "id": 313, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 312, + "id": 314, "name": "user/RenownOpen", "type": "api" }, { - "id": 313, + "id": 315, "name": "user/Tujian", "type": "api" }, { - "id": 314, + "id": 316, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 315, + "id": 317, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 316, + "id": 318, "name": "weixiuchang/Open", "type": "api" }, { - "id": 317, + "id": 319, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 318, + "id": 320, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 319, + "id": 321, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 320, + "id": 322, "name": "wzry/BaoMing", "type": "api" }, { - "id": 321, + "id": 323, "name": "wzry/catFightLog", "type": "api" }, { - "id": 322, + "id": 324, "name": "wzry/CatGroup", "type": "api" }, { - "id": 323, + "id": 325, "name": "wzry/DldFight", "type": "api" }, { - "id": 324, + "id": 326, "name": "wzry/DldRefre", "type": "api" }, { - "id": 325, + "id": 327, "name": "wzry/JingCai", "type": "api" }, { - "id": 326, + "id": 328, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 327, + "id": 329, "name": "wzry/Open", "type": "api" }, { - "id": 328, + "id": 330, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 329, + "id": 331, "name": "wzry/Wzzd", "type": "api" }, { - "id": 330, + "id": 332, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 331, + "id": 333, "name": "xstask/AllGet", "type": "api" }, { - "id": 332, + "id": 334, "name": "xstask/Get", "type": "api" }, { - "id": 333, + "id": 335, "name": "xstask/LvUp", "type": "api" }, { - "id": 334, + "id": 336, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 335, + "id": 337, "name": "xstask/Open", "type": "api" }, { - "id": 336, + "id": 338, "name": "xstask/Receive", "type": "api" }, { - "id": 337, + "id": 339, "name": "xstask/Refresh", "type": "api" }, { - "id": 338, + "id": 340, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 339, + "id": 341, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 340, + "id": 342, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 341, + "id": 343, "name": "zhanqianbushu/Up", "type": "api" } @@ -10085,6 +10105,76 @@ export const serviceProto: ServiceProto = { } ] }, + "event/payForDiamond/PtlCanReceive/ReqCanReceive": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "activityId", + "type": { + "type": "Number" + } + } + ] + }, + "event/payForDiamond/PtlCanReceive/ResCanReceive": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "payNum", + "type": { + "type": "Number" + } + }, + { + "id": 1, + "name": "remaining", + "type": { + "type": "Number" + }, + "optional": true + }, + { + "id": 2, + "name": "result", + "type": { + "type": "Boolean" + } + } + ] + }, + "event/payForDiamond/PtlReceive/ReqReceive": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "activityId", + "type": { + "type": "Number" + } + } + ] + }, + "event/payForDiamond/PtlReceive/ResReceive": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "amount", + "type": { + "type": "Number" + } + }, + { + "id": 1, + "name": "timesRemaining", + "type": { + "type": "Number" + } + } + ] + }, "event/qirichongzhi/PtlOpen/ReqOpen": { "type": "Interface" }, From ba8653dca98515047b940363e9c9e8487c9f999c Mon Sep 17 00:00:00 2001 From: chenkai Date: Thu, 21 Dec 2023 21:08:22 +0800 Subject: [PATCH 46/90] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E9=A2=86?= =?UTF-8?q?=E5=8F=96=E6=95=B0=E9=A2=9D=E7=9A=84=E6=9C=80=E5=A4=A7=E5=80=BC?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/payForDiamond/ApiReceive.ts | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/api_s2c/event/payForDiamond/ApiReceive.ts b/src/api_s2c/event/payForDiamond/ApiReceive.ts index 8aaf8e6..aaf8a56 100644 --- a/src/api_s2c/event/payForDiamond/ApiReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiReceive.ts @@ -13,35 +13,46 @@ type diamondWeightGroup = { * @param groups 各分组及其权重 */ function randomWithWeight(groups: diamondWeightGroup[]) { + let maxAmount: number; let totalWeights = 0; for (const group of groups) { totalWeights += group.weight; + if (!maxAmount) { + maxAmount = group.numrange[1]; + } else { + maxAmount = Math.min(maxAmount, group.numrange[1]); + } } const randomValue = Math.random() * totalWeights; // 随机值落在[0, totalWeights) 之间 let currSum = 0; for (const group of groups) { if (currSum <= randomValue && randomValue < currSum + group.weight) { - return group; + return { group, maxAmount }; } else { currSum += group.weight; } } const length = groups.length; - return groups[length - 1]; + return { group: groups[length - 1], maxAmount }; } /** * 计算玩家分得的钻石数量 * @param remaining * @param group + * @param maxAmount */ -function calcDiamondGot(remaining: number, group: diamondWeightGroup) { +function calcDiamondGot(remaining: number, group: diamondWeightGroup, maxAmount: number) { const [min, max] = group.numrange; const randomAmount = Math.floor(Math.random() * (max - min)) + min + 1; // max 值应能够取到, 故 +1 // 剩余数额小于组内随机得到的值, 全给吧 if (randomAmount > remaining) { return remaining; } + // 随机值大于最大值, 取最大值 + if (randomAmount > maxAmount) { + return maxAmount; + } return randomAmount; } @@ -56,8 +67,8 @@ export default async function (call: ApiCall) { } const activityData = canReceiveResult.activityInfo.data; const remaining = activityData['remaining']? activityData['remaining'] : activityData['totalmoney']; - const group = randomWithWeight(activityData['groupConf']['arr']); - const gotAmount = calcDiamondGot(remaining, group); + const { group, maxAmount } = randomWithWeight(activityData['groupConf']['arr']); + const gotAmount = calcDiamondGot(remaining, group, maxAmount); // 减去余额 const filter = { hdid: call.req.activityId, From 2fc85853dc31131a9f20e28765dcf0b9aeed0c30 Mon Sep 17 00:00:00 2001 From: chenkai Date: Thu, 21 Dec 2023 21:14:13 +0800 Subject: [PATCH 47/90] =?UTF-8?q?feat:=20=E5=85=85=E5=80=BC=E6=8A=A2?= =?UTF-8?q?=E9=92=BB=E7=9F=B3=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/payForDiamond/ApiCanReceive.ts | 45 ++ src/api_s2c/event/payForDiamond/ApiReceive.ts | 113 +++ src/json/pmd.json5 | 4 +- src/module/collection_event.ts | 5 +- .../event/payForDiamond/PtlCanReceive.ts | 9 + .../event/payForDiamond/PtlReceive.ts | 8 + src/shared/protocols/serviceProto.ts | 689 ++++++++++-------- 7 files changed, 572 insertions(+), 301 deletions(-) create mode 100644 src/api_s2c/event/payForDiamond/ApiCanReceive.ts create mode 100644 src/api_s2c/event/payForDiamond/ApiReceive.ts create mode 100644 src/shared/protocols/event/payForDiamond/PtlCanReceive.ts create mode 100644 src/shared/protocols/event/payForDiamond/PtlReceive.ts diff --git a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts new file mode 100644 index 0000000..b77fe24 --- /dev/null +++ b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts @@ -0,0 +1,45 @@ +import { ApiCall } from "tsrpc"; +import { HuoDongFun } from "../../../public/huodongfun"; +import { ReqCanReceive, ResCanReceive } from '../../../shared/protocols/event/payForDiamond/PtlCanReceive'; +import { PublicShared } from "../../../shared/public/public"; + +export async function playerCanReceive(call: ApiCall) { + const activityInfo = await HuoDongFun.getHdidInfo(call, call.req.activityId); + if (!activityInfo) { + return call.error('No such activity'); + } + const remaining = activityInfo.data['remaining']; + const zeroTime = PublicShared.getToDayZeroTime(); + const dayPayInfo = await G.mongodb.collection('dayPay').findOne({ uid: call.uid, time: zeroTime }); + if (!dayPayInfo || !dayPayInfo.payNum) { + return { + payNum: 0, remaining, result: false, activityInfo + }; + } + const payNum = dayPayInfo.payNum; + // 玩家充值未达标或者奖池余额耗尽则不能领取 + if (payNum < activityInfo.data['price'] || remaining <= 0) { + return { + payNum, remaining, result: false, activityInfo + } + } + // 检查玩家今日是否已经领取 + const playerActivityInfo = G.mongodb.cEvent('payForDiamond').findOne({ uid: call.uid }); + if (playerActivityInfo) { + if (playerActivityInfo[zeroTime]?.length) { + return { + payNum, remaining, result: false, activityInfo + }; + } + } + return { + payNum, remaining, result: true, activityInfo + }; +} + +export default async function (call: ApiCall) { + const canReceiveResult = await playerCanReceive(call); + if (canReceiveResult) { + call.succ(canReceiveResult); + } +} \ No newline at end of file diff --git a/src/api_s2c/event/payForDiamond/ApiReceive.ts b/src/api_s2c/event/payForDiamond/ApiReceive.ts new file mode 100644 index 0000000..aaf8a56 --- /dev/null +++ b/src/api_s2c/event/payForDiamond/ApiReceive.ts @@ -0,0 +1,113 @@ +import { ApiCall } from "tsrpc"; +import { ReqReceive, ResReceive } from '../../../shared/protocols/event/payForDiamond/PtlReceive'; +import { playerCanReceive } from './ApiCanReceive'; +import { PublicShared } from "../../../shared/public/public"; +import { ChatFun } from "../../../public/chat"; + +type diamondWeightGroup = { + weight: number; + numrange: [ min: number, max: number]; +}; + +/** + * @param groups 各分组及其权重 + */ +function randomWithWeight(groups: diamondWeightGroup[]) { + let maxAmount: number; + let totalWeights = 0; + for (const group of groups) { + totalWeights += group.weight; + if (!maxAmount) { + maxAmount = group.numrange[1]; + } else { + maxAmount = Math.min(maxAmount, group.numrange[1]); + } + } + const randomValue = Math.random() * totalWeights; // 随机值落在[0, totalWeights) 之间 + let currSum = 0; + for (const group of groups) { + if (currSum <= randomValue && randomValue < currSum + group.weight) { + return { group, maxAmount }; + } else { + currSum += group.weight; + } + } + const length = groups.length; + return { group: groups[length - 1], maxAmount }; +} + +/** + * 计算玩家分得的钻石数量 + * @param remaining + * @param group + * @param maxAmount + */ +function calcDiamondGot(remaining: number, group: diamondWeightGroup, maxAmount: number) { + const [min, max] = group.numrange; + const randomAmount = Math.floor(Math.random() * (max - min)) + min + 1; // max 值应能够取到, 故 +1 + // 剩余数额小于组内随机得到的值, 全给吧 + if (randomAmount > remaining) { + return remaining; + } + // 随机值大于最大值, 取最大值 + if (randomAmount > maxAmount) { + return maxAmount; + } + return randomAmount; +} + +export default async function (call: ApiCall) { + const canReceiveResult = await playerCanReceive(call); + if (canReceiveResult) { + if (!canReceiveResult.result) { + return call.succ({ + amount: 0, + timesRemaining: 0 + }); + } + const activityData = canReceiveResult.activityInfo.data; + const remaining = activityData['remaining']? activityData['remaining'] : activityData['totalmoney']; + const { group, maxAmount } = randomWithWeight(activityData['groupConf']['arr']); + const gotAmount = calcDiamondGot(remaining, group, maxAmount); + // 减去余额 + const filter = { + hdid: call.req.activityId, + $or: [ + {'data.remaining': { $exists: false }}, + {$expr: {$gte: [ `$data.remaining - ${gotAmount}`, 0 ]}}, + ], + }; + const updateDoc = { + $set: { 'data.remaining': `$data.remaining - ${gotAmount}` } + } + const updateResult = await G.mongodb.collection('hdinfo').updateOne(filter, updateDoc); + // 更新成功 + if (updateResult.modifiedCount) { + // 请求返回 + call.succ({ + amount: gotAmount, + timesRemaining: 0 + }); + // 添加玩家领取记录 + const zeroTime = PublicShared.getToDayZeroTime(); + const setObj = {}; + setObj[zeroTime] = gotAmount; + G.mongodb.cEvent('payForDiamond').updateOne({ uid: call.uid }, { + $set: setObj + }); + } + // 发送炫耀 + if (gotAmount >= activityData['groupConf']['base']['loglimit']) { + ChatFun.newMsg({ + type: 'local', + msg: G.gc.pmd.get_hero_star5_pmd, + time: G.time, + sender: 'system', + otherData: { + pmd: true, + args: [gotAmount] + } + }); + } + } +} \ No newline at end of file diff --git a/src/json/pmd.json5 b/src/json/pmd.json5 index 2e0db1c..bd2ec62 100644 --- a/src/json/pmd.json5 +++ b/src/json/pmd.json5 @@ -14,5 +14,7 @@ //黑帮争霸争霸赛第二名 hbzb_pmd2: 'intr_pmd_hbzb2', //黑帮争霸争霸赛第三名 - hbzb_pmd3: 'intr_pmd_hbzb3' + hbzb_pmd3: 'intr_pmd_hbzb3', + // 充值抢钻石 - 抢到大量钻石 + pay_for_diamond: 'intr_pmd_pfd' } \ No newline at end of file diff --git a/src/module/collection_event.ts b/src/module/collection_event.ts index d8339fe..a667969 100644 --- a/src/module/collection_event.ts +++ b/src/module/collection_event.ts @@ -52,7 +52,10 @@ export type eventType = { jierihuodong: Omit & { refreshTime: number; }; kaifujingsai: ResOpenKaifujingsai; zhoumolibao: ResOpenZhoumolibao & { refreshTime: number; } - pobinglibao: ResOpenPobinglibao + pobinglibao: ResOpenPobinglibao; + payForDiamond: { + [time: number]: number[] + } } & { [k: `${number}jijin`]: ResOpenYuedujijin; [k: `yangchengmubiao${number}`]: yangchengmubiao; diff --git a/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts b/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts new file mode 100644 index 0000000..8d905ec --- /dev/null +++ b/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts @@ -0,0 +1,9 @@ +export type ReqCanReceive = { + activityId: number; +}; + +export type ResCanReceive = { + payNum: number; + remaining?: number; + result: boolean; +}; \ No newline at end of file diff --git a/src/shared/protocols/event/payForDiamond/PtlReceive.ts b/src/shared/protocols/event/payForDiamond/PtlReceive.ts new file mode 100644 index 0000000..beb4bf8 --- /dev/null +++ b/src/shared/protocols/event/payForDiamond/PtlReceive.ts @@ -0,0 +1,8 @@ +export type ReqReceive = { + activityId: number; +}; + +export type ResReceive = { + amount: number, + timesRemaining: number; +}; diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index d9413c9..df7b3e4 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -68,15 +68,17 @@ import { ReqOpen as ReqOpen_14, ResOpen as ResOpen_14 } from './event/leijichong import { ReqRec as ReqRec_5, ResRec as ResRec_5 } from './event/leijichongzhi/PtlRec'; import { ReqLottery, ResLottery } from './event/niudanji/PtlLottery'; import { ReqOpen as ReqOpen_15, ResOpen as ResOpen_15 } from './event/niudanji/PtlOpen'; +import { ReqCanReceive, ResCanReceive } from './event/payForDiamond/PtlCanReceive'; +import { ReqReceive as ReqReceive_2, ResReceive as ResReceive_2 } from './event/payForDiamond/PtlReceive'; import { ReqOpen as ReqOpen_16, ResOpen as ResOpen_16 } from './event/pobinglibao/PtlOpen'; -import { ReqReceive as ReqReceive_2, ResReceive as ResReceive_2 } from './event/pobinglibao/PtlReceive'; +import { ReqReceive as ReqReceive_3, ResReceive as ResReceive_3 } from './event/pobinglibao/PtlReceive'; import { ReqOpen as ReqOpen_17, ResOpen as ResOpen_17 } from './event/qirichongzhi/PtlOpen'; import { ReqRec as ReqRec_6, ResRec as ResRec_6 } from './event/qirichongzhi/PtlRec'; import { ReqOpen as ReqOpen_18, ResOpen as ResOpen_18 } from './event/qiridenglu/PtlOpen'; import { ReqRecPrize as ReqRecPrize_1, ResRecPrize as ResRecPrize_1 } from './event/qiridenglu/PtlRecPrize'; import { ReqOpen as ReqOpen_19, ResOpen as ResOpen_19 } from './event/shiwuleichong/PtlOpen'; import { ReqOpen as ReqOpen_20, ResOpen as ResOpen_20 } from './event/shouchong/PtlOpen'; -import { ReqReceive as ReqReceive_3, ResReceive as ResReceive_3 } from './event/shouchong/PtlReceive'; +import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } from './event/shouchong/PtlReceive'; import { ReqBuy as ReqBuy_1, ResBuy as ResBuy_1 } from './event/xianshizhaomu/PtlBuy'; import { ReqDuihuan, ResDuihuan } from './event/xianshizhaomu/PtlDuihuan'; import { ReqLottery as ReqLottery_1, ResLottery as ResLottery_1 } from './event/xianshizhaomu/PtlLottery'; @@ -98,7 +100,7 @@ import { ReqRecPrize as ReqRecPrize_2, ResRecPrize as ResRecPrize_2 } from './ev import { ReqRecTask, ResRecTask } from './event/zhanling/PtlRecTask'; import { ReqOpen as ReqOpen_28, ResOpen as ResOpen_28 } from './event/zhoulibao/PtlOpen'; import { ReqOpen as ReqOpen_29, ResOpen as ResOpen_29 } from './event/zhoumolibao/PtlOpen'; -import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } from './event/zhoumolibao/PtlReceive'; +import { ReqReceive as ReqReceive_5, ResReceive as ResReceive_5 } from './event/zhoumolibao/PtlReceive'; import { ReqBuy as ReqBuy_3, ResBuy as ResBuy_3 } from './event/zixuanlibao/PtlBuy'; import { ReqOpen as ReqOpen_30, ResOpen as ResOpen_30 } from './event/zixuanlibao/PtlOpen'; import { ReqhdGetList, ReshdGetList } from './eventlist/PtlhdGetList'; @@ -188,10 +190,10 @@ import { ReqBuyFightNum, ResBuyFightNum } from './jjc/PtlBuyFightNum'; import { ReqFight as ReqFight_5, ResFight as ResFight_5 } from './jjc/PtlFight'; import { ReqFightLog, ResFightLog } from './jjc/PtlFightLog'; import { ReqOpen as ReqOpen_42, ResOpen as ResOpen_42 } from './jjc/PtlOpen'; -import { ReqReceive as ReqReceive_5, ResReceive as ResReceive_5 } from './jjc/PtlReceive'; +import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } from './jjc/PtlReceive'; import { ReqRefresh as ReqRefresh_4, ResRefresh as ResRefresh_4 } from './jjc/PtlRefresh'; import { ReqOpen as ReqOpen_43, ResOpen as ResOpen_43 } from './kaifujingsai/PtlOpen'; -import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } from './kaifujingsai/PtlReceive'; +import { ReqReceive as ReqReceive_7, ResReceive as ResReceive_7 } from './kaifujingsai/PtlReceive'; import { ReqApply as ReqApply_2, ResApply as ResApply_2 } from './kbzz/PtlApply'; import { ReqAutoApply, ResAutoApply } from './kbzz/PtlAutoApply'; import { ReqBuyNum as ReqBuyNum_3, ResBuyNum as ResBuyNum_3 } from './kbzz/PtlBuyNum'; @@ -301,7 +303,7 @@ import { ReqFastGuaJi, ResFastGuaJi } from './tanxian/PtlFastGuaJi'; import { ReqFight as ReqFight_11, ResFight as ResFight_11 } from './tanxian/PtlFight'; import { ReqGuaJi, ResGuaJi } from './tanxian/PtlGuaJi'; import { ReqOpen as ReqOpen_57, ResOpen as ResOpen_57 } from './tanxian/PtlOpen'; -import { ReqReceive as ReqReceive_7, ResReceive as ResReceive_7 } from './tanxian/PtlReceive'; +import { ReqReceive as ReqReceive_8, ResReceive as ResReceive_8 } from './tanxian/PtlReceive'; import { ReqAllFinsh, ResAllFinsh } from './task/PtlAllFinsh'; import { ReqFinsh, ResFinsh } from './task/PtlFinsh'; import { ReqOpen as ReqOpen_58, ResOpen as ResOpen_58 } from './task/PtlOpen'; @@ -340,7 +342,7 @@ import { ReqGet as ReqGet_3, ResGet as ResGet_3 } from './xstask/PtlGet'; import { ReqLvUp as ReqLvUp_4, ResLvUp as ResLvUp_4 } from './xstask/PtlLvUp'; import { ReqOnekeyReceive, ResOnekeyReceive } from './xstask/PtlOnekeyReceive'; import { ReqOpen as ReqOpen_61, ResOpen as ResOpen_61 } from './xstask/PtlOpen'; -import { ReqReceive as ReqReceive_8, ResReceive as ResReceive_8 } from './xstask/PtlReceive'; +import { ReqReceive as ReqReceive_9, ResReceive as ResReceive_9 } from './xstask/PtlReceive'; import { ReqRefresh as ReqRefresh_8, ResRefresh as ResRefresh_8 } from './xstask/PtlRefresh'; import { ReqHandle, ResHandle } from './yongbingzhuzhan/PtlHandle'; import { ReqChangePos as ReqChangePos_1, ResChangePos as ResChangePos_1 } from './zhanqianbushu/PtlChangePos'; @@ -625,13 +627,21 @@ export interface ServiceType { req: ReqOpen_15, res: ResOpen_15 }, + "event/payForDiamond/CanReceive": { + req: ReqCanReceive, + res: ResCanReceive + }, + "event/payForDiamond/Receive": { + req: ReqReceive_2, + res: ResReceive_2 + }, "event/pobinglibao/Open": { req: ReqOpen_16, res: ResOpen_16 }, "event/pobinglibao/Receive": { - req: ReqReceive_2, - res: ResReceive_2 + req: ReqReceive_3, + res: ResReceive_3 }, "event/qirichongzhi/Open": { req: ReqOpen_17, @@ -658,8 +668,8 @@ export interface ServiceType { res: ResOpen_20 }, "event/shouchong/Receive": { - req: ReqReceive_3, - res: ResReceive_3 + req: ReqReceive_4, + res: ResReceive_4 }, "event/xianshizhaomu/Buy": { req: ReqBuy_1, @@ -746,8 +756,8 @@ export interface ServiceType { res: ResOpen_29 }, "event/zhoumolibao/Receive": { - req: ReqReceive_4, - res: ResReceive_4 + req: ReqReceive_5, + res: ResReceive_5 }, "event/zixuanlibao/Buy": { req: ReqBuy_3, @@ -1106,8 +1116,8 @@ export interface ServiceType { res: ResOpen_42 }, "jjc/Receive": { - req: ReqReceive_5, - res: ResReceive_5 + req: ReqReceive_6, + res: ResReceive_6 }, "jjc/Refresh": { req: ReqRefresh_4, @@ -1118,8 +1128,8 @@ export interface ServiceType { res: ResOpen_43 }, "kaifujingsai/Receive": { - req: ReqReceive_6, - res: ResReceive_6 + req: ReqReceive_7, + res: ResReceive_7 }, "kbzz/Apply": { req: ReqApply_2, @@ -1442,8 +1452,8 @@ export interface ServiceType { res: ResOpen_57 }, "tanxian/Receive": { - req: ReqReceive_7, - res: ResReceive_7 + req: ReqReceive_8, + res: ResReceive_8 }, "task/AllFinsh": { req: ReqAllFinsh, @@ -1598,8 +1608,8 @@ export interface ServiceType { res: ResOpen_61 }, "xstask/Receive": { - req: ReqReceive_8, - res: ResReceive_8 + req: ReqReceive_9, + res: ResReceive_9 }, "xstask/Refresh": { req: ReqRefresh_8, @@ -2004,116 +2014,126 @@ export const serviceProto: ServiceProto = { }, { "id": 69, - "name": "event/pobinglibao/Open", + "name": "event/payForDiamond/CanReceive", "type": "api" }, { "id": 70, - "name": "event/pobinglibao/Receive", + "name": "event/payForDiamond/Receive", "type": "api" }, { "id": 71, - "name": "event/qirichongzhi/Open", + "name": "event/pobinglibao/Open", "type": "api" }, { "id": 72, - "name": "event/qirichongzhi/Rec", + "name": "event/pobinglibao/Receive", "type": "api" }, { "id": 73, - "name": "event/qiridenglu/Open", + "name": "event/qirichongzhi/Open", "type": "api" }, { "id": 74, - "name": "event/qiridenglu/RecPrize", + "name": "event/qirichongzhi/Rec", "type": "api" }, { "id": 75, - "name": "event/shiwuleichong/Open", + "name": "event/qiridenglu/Open", "type": "api" }, { "id": 76, - "name": "event/shouchong/Open", + "name": "event/qiridenglu/RecPrize", "type": "api" }, { "id": 77, - "name": "event/shouchong/Receive", + "name": "event/shiwuleichong/Open", "type": "api" }, { "id": 78, - "name": "event/xianshizhaomu/Buy", + "name": "event/shouchong/Open", "type": "api" }, { "id": 79, - "name": "event/xianshizhaomu/Duihuan", + "name": "event/shouchong/Receive", "type": "api" }, { "id": 80, - "name": "event/xianshizhaomu/Lottery", + "name": "event/xianshizhaomu/Buy", "type": "api" }, { "id": 81, - "name": "event/xianshizhaomu/Open", + "name": "event/xianshizhaomu/Duihuan", "type": "api" }, { "id": 82, - "name": "event/xianshizhaomu/Rec", + "name": "event/xianshizhaomu/Lottery", "type": "api" }, { "id": 83, - "name": "event/xiaofeijingsai/Open", + "name": "event/xianshizhaomu/Open", "type": "api" }, { "id": 84, - "name": "event/xinshoulibao/Open", + "name": "event/xianshizhaomu/Rec", "type": "api" }, { "id": 85, - "name": "event/yangchengmubiao/Buy", + "name": "event/xiaofeijingsai/Open", "type": "api" }, { "id": 86, - "name": "event/yangchengmubiao/Open", + "name": "event/xinshoulibao/Open", "type": "api" }, { "id": 87, - "name": "event/yangchengmubiao/Rec", + "name": "event/yangchengmubiao/Buy", "type": "api" }, { "id": 88, - "name": "event/yibaichou/Open", + "name": "event/yangchengmubiao/Open", "type": "api" }, { "id": 89, - "name": "event/yibaichou/Rec", + "name": "event/yangchengmubiao/Rec", "type": "api" }, { "id": 90, - "name": "event/yibaichou/RecAll", + "name": "event/yibaichou/Open", "type": "api" }, { "id": 91, + "name": "event/yibaichou/Rec", + "type": "api" + }, + { + "id": 92, + "name": "event/yibaichou/RecAll", + "type": "api" + }, + { + "id": 93, "name": "event/yuedujijin/Open", "type": "api", "conf": { @@ -2121,157 +2141,157 @@ export const serviceProto: ServiceProto = { } }, { - "id": 92, + "id": 94, "name": "event/yuedujijin/Rec", "type": "api" }, { - "id": 93, + "id": 95, "name": "event/zhanling/BuyLv", "type": "api" }, { - "id": 94, + "id": 96, "name": "event/zhanling/Open", "type": "api" }, { - "id": 95, + "id": 97, "name": "event/zhanling/RecPrize", "type": "api" }, { - "id": 96, + "id": 98, "name": "event/zhanling/RecTask", "type": "api" }, { - "id": 97, + "id": 99, "name": "event/zhoulibao/Open", "type": "api" }, { - "id": 98, + "id": 100, "name": "event/zhoumolibao/Open", "type": "api" }, { - "id": 99, + "id": 101, "name": "event/zhoumolibao/Receive", "type": "api" }, { - "id": 100, + "id": 102, "name": "event/zixuanlibao/Buy", "type": "api" }, { - "id": 101, + "id": 103, "name": "event/zixuanlibao/Open", "type": "api" }, { - "id": 102, + "id": 104, "name": "eventlist/hdGetList", "type": "api" }, { - "id": 103, + "id": 105, "name": "friend/Apply", "type": "api" }, { - "id": 104, + "id": 106, "name": "friend/Del", "type": "api" }, { - "id": 105, + "id": 107, "name": "friend/Gift", "type": "api" }, { - "id": 106, + "id": 108, "name": "friend/List", "type": "api" }, { - "id": 107, + "id": 109, "name": "friend/Open", "type": "api" }, { - "id": 108, + "id": 110, "name": "friend/Respond", "type": "api" }, { - "id": 109, + "id": 111, "name": "friend/RmBlackList", "type": "api" }, { - "id": 110, + "id": 112, "name": "friend/Search", "type": "api" }, { - "id": 111, + "id": 113, "name": "ganbutexun/Challenge", "type": "api" }, { - "id": 112, + "id": 114, "name": "ganbutexun/Open", "type": "api" }, { - "id": 113, + "id": 115, "name": "ganhai/Fast", "type": "api" }, { - "id": 114, + "id": 116, "name": "ganhai/Fight", "type": "api" }, { - "id": 115, + "id": 117, "name": "ganhai/Log", "type": "api" }, { - "id": 116, + "id": 118, "name": "ganhai/Open", "type": "api" }, { - "id": 117, + "id": 119, "name": "ganhai/Refresh", "type": "api" }, { - "id": 118, + "id": 120, "name": "ganhai/RefreshShip", "type": "api" }, { - "id": 119, + "id": 121, "name": "ganhai/Select", "type": "api" }, { - "id": 120, + "id": 122, "name": "gmapi/Gift", "type": "api" }, { - "id": 121, + "id": 123, "name": "gmapi/Post", "type": "api" }, { - "id": 122, + "id": 124, "name": "gonghui/Apply", "type": "api", "conf": { @@ -2281,7 +2301,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 123, + "id": 125, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2291,7 +2311,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 124, + "id": 126, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2301,7 +2321,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 125, + "id": 127, "name": "gonghui/Change", "type": "api", "conf": { @@ -2311,12 +2331,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 126, + "id": 128, "name": "gonghui/Create", "type": "api" }, { - "id": 127, + "id": 129, "name": "gonghui/Dissolve", "type": "api", "conf": { @@ -2326,7 +2346,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 128, + "id": 130, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2336,12 +2356,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 129, + "id": 131, "name": "gonghui/FbBuyNum", "type": "api" }, { - "id": 130, + "id": 132, "name": "gonghui/FbFight", "type": "api", "conf": { @@ -2351,7 +2371,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 131, + "id": 133, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2361,17 +2381,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 132, + "id": 134, "name": "gonghui/GetList", "type": "api" }, { - "id": 133, + "id": 135, "name": "gonghui/Join", "type": "api" }, { - "id": 134, + "id": 136, "name": "gonghui/Jx", "type": "api", "conf": { @@ -2381,7 +2401,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 135, + "id": 137, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2391,7 +2411,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 136, + "id": 138, "name": "gonghui/List", "type": "api", "conf": { @@ -2401,7 +2421,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 137, + "id": 139, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2411,7 +2431,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 138, + "id": 140, "name": "gonghui/Open", "type": "api", "conf": { @@ -2421,7 +2441,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 139, + "id": 141, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2431,7 +2451,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 140, + "id": 142, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2441,7 +2461,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 141, + "id": 143, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2451,7 +2471,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 142, + "id": 144, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2461,137 +2481,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 143, + "id": 145, "name": "gonghuibaozang/Lottery", "type": "api" }, { - "id": 144, + "id": 146, "name": "gonghuibaozang/Open", "type": "api" }, { - "id": 145, + "id": 147, "name": "gonglukuangbiao/Buy", "type": "api" }, { - "id": 146, + "id": 148, "name": "gonglukuangbiao/Fight", "type": "api" }, { - "id": 147, + "id": 149, "name": "gonglukuangbiao/Open", "type": "api" }, { - "id": 148, + "id": 150, "name": "gonglukuangbiao/Refresh", "type": "api" }, { - "id": 149, + "id": 151, "name": "gongyu/mingdao/Active", "type": "api" }, { - "id": 150, + "id": 152, "name": "gongyu/mingdao/Open", "type": "api" }, { - "id": 151, + "id": 153, "name": "gongyu/mingdao/RecPrize", "type": "api" }, { - "id": 152, + "id": 154, "name": "gongyu/mingdao/Repair", "type": "api" }, { - "id": 153, + "id": 155, "name": "gongyu/xunlianjihua/Reset", "type": "api" }, { - "id": 154, + "id": 156, "name": "gongyu/xunlianjihua/UpSkill", "type": "api" }, { - "id": 155, + "id": 157, "name": "gongyu/zuozhanjihua/SetSkill", "type": "api" }, { - "id": 156, + "id": 158, "name": "hbzb/jfs/BuyNum", "type": "api" }, { - "id": 157, + "id": 159, "name": "hbzb/jfs/Fight", "type": "api" }, { - "id": 158, + "id": 160, "name": "hbzb/jfs/GetLog", "type": "api" }, { - "id": 159, + "id": 161, "name": "hbzb/jfs/Open", "type": "api" }, { - "id": 160, + "id": 162, "name": "hbzb/jfs/Rec", "type": "api" }, { - "id": 161, + "id": 163, "name": "hbzb/jfs/Refresh", "type": "api" }, { - "id": 162, + "id": 164, "name": "hbzb/GetStatus", "type": "api" }, { - "id": 163, + "id": 165, "name": "hbzb/zbs/BuyNum", "type": "api" }, { - "id": 164, + "id": 166, "name": "hbzb/zbs/Fight", "type": "api" }, { - "id": 165, + "id": 167, "name": "hbzb/zbs/GetLog", "type": "api" }, { - "id": 166, + "id": 168, "name": "hbzb/zbs/Open", "type": "api" }, { - "id": 167, + "id": 169, "name": "hbzb/zbs/Refresh", "type": "api" }, { - "id": 168, + "id": 170, "name": "hero/Awake", "type": "api" }, { - "id": 169, + "id": 171, "name": "hero/ChangePos", "type": "api", "conf": { @@ -2599,17 +2619,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 170, + "id": 172, "name": "hero/GetList", "type": "api" }, { - "id": 171, + "id": 173, "name": "hero/JinJie", "type": "api" }, { - "id": 172, + "id": 174, "name": "hero/LvUp", "type": "api", "conf": { @@ -2617,32 +2637,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 173, + "id": 175, "name": "hero/Potency", "type": "api" }, { - "id": 174, + "id": 176, "name": "hero/Rec", "type": "api" }, { - "id": 175, + "id": 177, "name": "hero/Reset", "type": "api" }, { - "id": 176, + "id": 178, "name": "hero/Talent", "type": "api" }, { - "id": 177, + "id": 179, "name": "hero/WeaponUp", "type": "api" }, { - "id": 178, + "id": 180, "name": "hongdian/Get", "type": "api", "conf": { @@ -2650,117 +2670,117 @@ export const serviceProto: ServiceProto = { } }, { - "id": 179, + "id": 181, "name": "item/GetList", "type": "api" }, { - "id": 180, + "id": 182, "name": "item/Use", "type": "api" }, { - "id": 181, + "id": 183, "name": "jiaotang/Lottery", "type": "api" }, { - "id": 182, + "id": 184, "name": "jiaotang/Open", "type": "api" }, { - "id": 183, + "id": 185, "name": "jiuba/Lottery", "type": "api" }, { - "id": 184, + "id": 186, "name": "jiuba/Open", "type": "api" }, { - "id": 185, + "id": 187, "name": "jjc/BuyFightNum", "type": "api" }, { - "id": 186, + "id": 188, "name": "jjc/Fight", "type": "api" }, { - "id": 187, + "id": 189, "name": "jjc/FightLog", "type": "api" }, { - "id": 188, + "id": 190, "name": "jjc/Open", "type": "api" }, { - "id": 189, + "id": 191, "name": "jjc/Receive", "type": "api" }, { - "id": 190, + "id": 192, "name": "jjc/Refresh", "type": "api" }, { - "id": 191, + "id": 193, "name": "kaifujingsai/Open", "type": "api" }, { - "id": 192, + "id": 194, "name": "kaifujingsai/Receive", "type": "api" }, { - "id": 193, + "id": 195, "name": "kbzz/Apply", "type": "api" }, { - "id": 194, + "id": 196, "name": "kbzz/AutoApply", "type": "api" }, { - "id": 195, + "id": 197, "name": "kbzz/BuyNum", "type": "api" }, { - "id": 196, + "id": 198, "name": "kbzz/Fight", "type": "api" }, { - "id": 197, + "id": 199, "name": "kbzz/FightLog", "type": "api" }, { - "id": 198, + "id": 200, "name": "kbzz/GroupState", "type": "api" }, { - "id": 199, + "id": 201, "name": "kbzz/Open", "type": "api" }, { - "id": 200, + "id": 202, "name": "kbzz/RecPrize", "type": "api" }, { - "id": 201, + "id": 203, "name": "kbzz/Refresh", "type": "api", "conf": { @@ -2768,287 +2788,287 @@ export const serviceProto: ServiceProto = { } }, { - "id": 202, + "id": 204, "name": "kuangdong/AddPkNum", "type": "api" }, { - "id": 203, + "id": 205, "name": "kuangdong/GetPrize", "type": "api" }, { - "id": 204, + "id": 206, "name": "kuangdong/KdInfo", "type": "api" }, { - "id": 205, + "id": 207, "name": "kuangdong/Log", "type": "api" }, { - "id": 206, + "id": 208, "name": "kuangdong/Open", "type": "api" }, { - "id": 207, + "id": 209, "name": "kuangdong/YanShi", "type": "api" }, { - "id": 208, + "id": 210, "name": "kuangdong/ZhanLing", "type": "api" }, { - "id": 209, + "id": 211, "name": "lingzhulaixi/Open", "type": "api" }, { - "id": 210, + "id": 212, "name": "lingzhulaixi/PkBoss", "type": "api" }, { - "id": 211, + "id": 213, "name": "lingzhulaixi/PkRank", "type": "api" }, { - "id": 212, + "id": 214, "name": "lingzhulaixi/SaoDang", "type": "api" }, { - "id": 213, + "id": 215, "name": "meirishilian/Buy", "type": "api" }, { - "id": 214, + "id": 216, "name": "meirishilian/Fight", "type": "api" }, { - "id": 215, + "id": 217, "name": "meirishilian/Open", "type": "api" }, { - "id": 216, + "id": 218, "name": "msg_c2s/BindUid", "type": "msg" }, { - "id": 217, + "id": 219, "name": "msg_c2s/Pay", "type": "msg" }, { - "id": 218, + "id": 220, "name": "msg_c2s/Sync", "type": "msg" }, { - "id": 219, + "id": 221, "name": "msg_s2c/Chat", "type": "msg" }, { - "id": 220, + "id": 222, "name": "msg_s2c/ChatHelp", "type": "msg" }, { - "id": 221, + "id": 223, "name": "msg_s2c/Collection", "type": "msg" }, { - "id": 222, + "id": 224, "name": "msg_s2c/Email", "type": "msg" }, { - "id": 223, + "id": 225, "name": "msg_s2c/EmailDel", "type": "msg" }, { - "id": 224, + "id": 226, "name": "msg_s2c/EquipChange", "type": "msg" }, { - "id": 225, + "id": 227, "name": "msg_s2c/Friend", "type": "msg" }, { - "id": 226, + "id": 228, "name": "msg_s2c/GhChange", "type": "msg" }, { - "id": 227, + "id": 229, "name": "msg_s2c/GongHuiBaoZang", "type": "msg" }, { - "id": 228, + "id": 230, "name": "msg_s2c/HeroChange", "type": "msg" }, { - "id": 229, + "id": 231, "name": "msg_s2c/HongDianChange", "type": "msg" }, { - "id": 230, + "id": 232, "name": "msg_s2c/ItemChange", "type": "msg" }, { - "id": 231, + "id": 233, "name": "msg_s2c/LoginQueue", "type": "msg" }, { - "id": 232, + "id": 234, "name": "msg_s2c/LshdChange", "type": "msg" }, { - "id": 233, + "id": 235, "name": "msg_s2c/NewDay", "type": "msg" }, { - "id": 234, + "id": 236, "name": "msg_s2c/OtherLogin", "type": "msg" }, { - "id": 235, + "id": 237, "name": "msg_s2c/PayChange", "type": "msg" }, { - "id": 236, + "id": 238, "name": "msg_s2c/PayResult", "type": "msg" }, { - "id": 237, + "id": 239, "name": "msg_s2c/PeijianChange", "type": "msg" }, { - "id": 238, + "id": 240, "name": "msg_s2c/PlayerChange", "type": "msg" }, { - "id": 239, + "id": 241, "name": "msg_s2c/Private", "type": "msg" }, { - "id": 240, + "id": 242, "name": "msg_s2c/PushGiftChange", "type": "msg" }, { - "id": 241, + "id": 243, "name": "msg_s2c/SendGift", "type": "msg" }, { - "id": 242, + "id": 244, "name": "msg_s2c/ShiwuChange", "type": "msg" }, { - "id": 243, + "id": 245, "name": "msg_s2c/TaskChange", "type": "msg" }, { - "id": 244, + "id": 246, "name": "msg_s2c/Xianshilibao", "type": "msg" }, { - "id": 245, + "id": 247, "name": "pata/Fight", "type": "api" }, { - "id": 246, + "id": 248, "name": "pata/GetPrize", "type": "api" }, { - "id": 247, + "id": 249, "name": "pata/Open", "type": "api" }, { - "id": 248, + "id": 250, "name": "pata/SaoDang", "type": "api" }, { - "id": 249, + "id": 251, "name": "pay/GetList", "type": "api" }, { - "id": 250, + "id": 252, "name": "peijian/GetList", "type": "api" }, { - "id": 251, + "id": 253, "name": "peijian/JingLian", "type": "api" }, { - "id": 252, + "id": 254, "name": "peijian/JinJie", "type": "api" }, { - "id": 253, + "id": 255, "name": "peijian/LvUp", "type": "api" }, { - "id": 254, + "id": 256, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 255, + "id": 257, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 256, + "id": 258, "name": "peijian/Reset", "type": "api" }, { - "id": 257, + "id": 259, "name": "peijian/Rm", "type": "api" }, { - "id": 258, + "id": 260, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3056,32 +3076,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 259, + "id": 261, "name": "peijian/UnLock", "type": "api" }, { - "id": 260, + "id": 262, "name": "peijian/Wear", "type": "api" }, { - "id": 261, + "id": 263, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 262, + "id": 264, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 263, + "id": 265, "name": "peijiancangku/Open", "type": "api" }, { - "id": 264, + "id": 266, "name": "Bingo", "type": "api", "conf": { @@ -3089,142 +3109,142 @@ export const serviceProto: ServiceProto = { } }, { - "id": 265, + "id": 267, "name": "FightTest", "type": "api" }, { - "id": 266, + "id": 268, "name": "SyncBtn", "type": "api" }, { - "id": 267, + "id": 269, "name": "Test", "type": "api" }, { - "id": 268, + "id": 270, "name": "pushgift/Open", "type": "api" }, { - "id": 269, + "id": 271, "name": "qjzzd/Fight", "type": "api" }, { - "id": 270, + "id": 272, "name": "qjzzd/Open", "type": "api" }, { - "id": 271, + "id": 273, "name": "rank/Open", "type": "api" }, { - "id": 272, + "id": 274, "name": "shiwu/Concise", "type": "api" }, { - "id": 273, + "id": 275, "name": "shiwu/Extract", "type": "api" }, { - "id": 274, + "id": 276, "name": "shiwu/GetList", "type": "api" }, { - "id": 275, + "id": 277, "name": "shiwu/LvUp", "type": "api" }, { - "id": 276, + "id": 278, "name": "shiwu/Recast", "type": "api" }, { - "id": 277, + "id": 279, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 278, + "id": 280, "name": "shiwu/Wear", "type": "api" }, { - "id": 279, + "id": 281, "name": "shootGame/Open", "type": "api" }, { - "id": 280, + "id": 282, "name": "shootGame/Rec", "type": "api" }, { - "id": 281, + "id": 283, "name": "shop/Buy", "type": "api" }, { - "id": 282, + "id": 284, "name": "shop/Open", "type": "api" }, { - "id": 283, + "id": 285, "name": "shop/Refresh", "type": "api" }, { - "id": 284, + "id": 286, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 285, + "id": 287, "name": "sign/GetPrize", "type": "api" }, { - "id": 286, + "id": 288, "name": "sign/Open", "type": "api" }, { - "id": 287, + "id": 289, "name": "slzd/Aim", "type": "api" }, { - "id": 288, + "id": 290, "name": "slzd/BuyNum", "type": "api" }, { - "id": 289, + "id": 291, "name": "slzd/Fight", "type": "api" }, { - "id": 290, + "id": 292, "name": "slzd/FightLog", "type": "api" }, { - "id": 291, + "id": 293, "name": "slzd/MyRank", "type": "api" }, { - "id": 292, + "id": 294, "name": "slzd/Open", "type": "api", "conf": { @@ -3234,77 +3254,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 293, + "id": 295, "name": "slzd/OpenFort", "type": "api" }, { - "id": 294, + "id": 296, "name": "slzd/Rec", "type": "api" }, { - "id": 295, + "id": 297, "name": "slzd/Refresh", "type": "api" }, { - "id": 296, + "id": 298, "name": "slzd/Slot", "type": "api" }, { - "id": 297, + "id": 299, "name": "tanxian/Event", "type": "api" }, { - "id": 298, + "id": 300, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 299, + "id": 301, "name": "tanxian/Fight", "type": "api" }, { - "id": 300, + "id": 302, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 301, + "id": 303, "name": "tanxian/Open", "type": "api" }, { - "id": 302, + "id": 304, "name": "tanxian/Receive", "type": "api" }, { - "id": 303, + "id": 305, "name": "task/AllFinsh", "type": "api" }, { - "id": 304, + "id": 306, "name": "task/Finsh", "type": "api" }, { - "id": 305, + "id": 307, "name": "task/Open", "type": "api" }, { - "id": 306, + "id": 308, "name": "user/CDKEY", "type": "api" }, { - "id": 307, + "id": 309, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3312,197 +3332,197 @@ export const serviceProto: ServiceProto = { } }, { - "id": 308, + "id": 310, "name": "user/ChangeName", "type": "api" }, { - "id": 309, + "id": 311, "name": "user/Fight", "type": "api" }, { - "id": 310, + "id": 312, "name": "user/GetInfo", "type": "api" }, { - "id": 311, + "id": 313, "name": "user/InfoOpen", "type": "api" }, { - "id": 312, + "id": 314, "name": "user/Login", "type": "api" }, { - "id": 313, + "id": 315, "name": "user/Ping", "type": "api" }, { - "id": 314, + "id": 316, "name": "user/Renown", "type": "api" }, { - "id": 315, + "id": 317, "name": "user/RenownBuy", "type": "api" }, { - "id": 316, + "id": 318, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 317, + "id": 319, "name": "user/RenownOpen", "type": "api" }, { - "id": 318, + "id": 320, "name": "user/Tujian", "type": "api" }, { - "id": 319, + "id": 321, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 320, + "id": 322, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 321, + "id": 323, "name": "weixiuchang/Open", "type": "api" }, { - "id": 322, + "id": 324, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 323, + "id": 325, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 324, + "id": 326, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 325, + "id": 327, "name": "wzry/BaoMing", "type": "api" }, { - "id": 326, + "id": 328, "name": "wzry/catFightLog", "type": "api" }, { - "id": 327, + "id": 329, "name": "wzry/CatGroup", "type": "api" }, { - "id": 328, + "id": 330, "name": "wzry/DldFight", "type": "api" }, { - "id": 329, + "id": 331, "name": "wzry/DldRefre", "type": "api" }, { - "id": 330, + "id": 332, "name": "wzry/JingCai", "type": "api" }, { - "id": 331, + "id": 333, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 332, + "id": 334, "name": "wzry/Open", "type": "api" }, { - "id": 333, + "id": 335, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 334, + "id": 336, "name": "wzry/Wzzd", "type": "api" }, { - "id": 335, + "id": 337, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 336, + "id": 338, "name": "xstask/AllGet", "type": "api" }, { - "id": 337, + "id": 339, "name": "xstask/Get", "type": "api" }, { - "id": 338, + "id": 340, "name": "xstask/LvUp", "type": "api" }, { - "id": 339, + "id": 341, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 340, + "id": 342, "name": "xstask/Open", "type": "api" }, { - "id": 341, + "id": 343, "name": "xstask/Receive", "type": "api" }, { - "id": 342, + "id": 344, "name": "xstask/Refresh", "type": "api" }, { - "id": 343, + "id": 345, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 344, + "id": 346, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 345, + "id": 347, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 346, + "id": 348, "name": "zhanqianbushu/Up", "type": "api" } @@ -10178,6 +10198,76 @@ export const serviceProto: ServiceProto = { } ] }, + "event/payForDiamond/PtlCanReceive/ReqCanReceive": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "activityId", + "type": { + "type": "Number" + } + } + ] + }, + "event/payForDiamond/PtlCanReceive/ResCanReceive": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "payNum", + "type": { + "type": "Number" + } + }, + { + "id": 1, + "name": "remaining", + "type": { + "type": "Number" + }, + "optional": true + }, + { + "id": 2, + "name": "result", + "type": { + "type": "Boolean" + } + } + ] + }, + "event/payForDiamond/PtlReceive/ReqReceive": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "activityId", + "type": { + "type": "Number" + } + } + ] + }, + "event/payForDiamond/PtlReceive/ResReceive": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "amount", + "type": { + "type": "Number" + } + }, + { + "id": 1, + "name": "timesRemaining", + "type": { + "type": "Number" + } + } + ] + }, "event/pobinglibao/PtlOpen/ReqOpen": { "type": "Interface" }, @@ -10680,7 +10770,8 @@ export const serviceProto: ServiceProto = { "name": "limit", "type": { "type": "Number" - } + }, + "optional": true } ] }, From c70c1540991a744e2398bdc71089c3771393e5a8 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Thu, 21 Dec 2023 21:38:53 +0800 Subject: [PATCH 48/90] =?UTF-8?q?feat:=20=E7=B4=AF=E5=85=85=E7=A4=BC?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/leichonglibao/ApiOpen.ts | 21 + src/api_s2c/event/leichonglibao/ApiReceive.ts | 108 ++ src/api_s2c/hongdian/ApiGet.ts | 6 +- src/lng.ts | 2 +- src/module/collection_event.ts | 2 + .../protocols/event/leichonglibao/PtlOpen.ts | 8 + .../event/leichonglibao/PtlReceive.ts | 8 + src/shared/protocols/hongdian/PtlGet.ts | 3 +- src/shared/protocols/serviceProto.ts | 955 ++++++++++-------- 9 files changed, 663 insertions(+), 450 deletions(-) create mode 100644 src/api_s2c/event/leichonglibao/ApiOpen.ts create mode 100644 src/api_s2c/event/leichonglibao/ApiReceive.ts create mode 100644 src/shared/protocols/event/leichonglibao/PtlOpen.ts create mode 100644 src/shared/protocols/event/leichonglibao/PtlReceive.ts diff --git a/src/api_s2c/event/leichonglibao/ApiOpen.ts b/src/api_s2c/event/leichonglibao/ApiOpen.ts new file mode 100644 index 0000000..78d89e5 --- /dev/null +++ b/src/api_s2c/event/leichonglibao/ApiOpen.ts @@ -0,0 +1,21 @@ +import {ApiCall} from "tsrpc"; +import {ReqOpen, ResOpen} from "../../../shared/protocols/event/leichonglibao/PtlOpen"; + +export default async function (call: ApiCall) { + let data = await G.mongodb.cEvent(`leichonglibao${call.req.hdid}`).findOne( + {type: `leichonglibao${call.req.hdid}`, uid: call.uid} + ) + let change = {opentime: G.time} + if (!data) { + Object.assign(change, {sc: false, buy: []}) + } + + // 每天open红点 + G.mongodb.cEvent(`leichonglibao${call.req.hdid}`).updateOne( + {type: `leichonglibao${call.req.hdid}`, uid: call.uid}, {$set: change} + ) + + let temp = Object.assign((data || {}), change) as ResOpen & { opentime } + + call.succ({sc: temp.sc, buy: temp.buy}); +} \ No newline at end of file diff --git a/src/api_s2c/event/leichonglibao/ApiReceive.ts b/src/api_s2c/event/leichonglibao/ApiReceive.ts new file mode 100644 index 0000000..aa58d3f --- /dev/null +++ b/src/api_s2c/event/leichonglibao/ApiReceive.ts @@ -0,0 +1,108 @@ +import {ApiCall} from "tsrpc"; +import {HuoDongFun} from "../../../public/huodongfun"; +import {ReqReceive, ResReceive} from "../../../shared/protocols/event/leichonglibao/PtlReceive"; +import {PlayerFun} from "../../../public/player"; +import {PublicShared} from "../../../shared/public/public"; + +export type LeiChongLiBaoData = { + intr: string + intr2: string + payRewardNum: number + dlz: { [key: string]: atn }[] + gift: { + id: string, name: string, need: atn[], free: boolean, payId: string, scale: number, buynum: number, prize: atn[] + }[] +} +export default async function (call: ApiCall) { + let hdinfo = await HuoDongFun.gethdList(call, 12); + + if (hdinfo.length <= 0) { + // 无此活动 + return call.error('', {code: -1, message: globalThis.lng.huodong_open_1}) + } + + let hddata = hdinfo.filter(i => i.hdid == call.req.hdid)[0].data as LeiChongLiBaoData; + + let data = await G.mongodb.cEvent(`leichonglibao${call.req.hdid}`).findOne( + {type: `leichonglibao${call.req.hdid}`, uid: call.uid} + ) + + if (data.sc) { + // 自选奖励已领取 + return call.error('', {code: -1, message: globalThis.lng.task_finsh_3}) + } + + if (data.buy.length < hddata.payRewardNum) { + // 累计购买礼包次数不足 + return call.error("", {code: -1, message: globalThis.lng.ljlibaotips_8}) + } + + let _prize: atn[] = []; + for (let i = 0; i < hddata.dlz.length; i++) { + _prize.push(hddata.dlz[i][call.req.select[i] || "1"]) + } + + PlayerFun.sendPrize(call, _prize) + call.succ({prize: _prize}) +} + +export async function LeiChongLiBaoBuyGift(call: ApiCall, payId: string) { + let hdinfo = await HuoDongFun.gethdList(call, 12); + + if (hdinfo.length <= 0) { + console.log(call.uid, "购买累充礼包 但是活动没有开启", payId); + return + } + + let gift: LeiChongLiBaoData["gift"][0]; + + let hdid = hdinfo[0].hdid; + let hddata = hdinfo[0].data as LeiChongLiBaoData; + for (let g of hddata.gift) { + if (g.payId == payId) { + gift = g; + break; + } + } + + if (!gift) return; // 不是购买累充礼包 + + let mydata = await G.mongodb.cEvent(`leichonglibao${hdid}`).findOne( + {type: `leichonglibao${hdid}`, uid: call.uid} + ) + + if (mydata.buy.includes(gift.payId)) { + console.log(call.uid, "购买累充礼包 重复购买", payId); + return + } + + PlayerFun.sendPrize(call, gift.prize) + G.mongodb.cEvent(`leichonglibao${hdid}`).updateOne( + {uid: call.uid, type: `leichonglibao${hdid}`}, {"$push": {buy: payId}} + ) +} + +export async function LeiChongLiBaoGetHongDian(call: ApiCall) { + let hdinfo = await HuoDongFun.gethdList(call, 12); + + if (hdinfo.length <= 0) { + return {show: false} + } + + let hdid = hdinfo[0].hdid; + let hddata = hdinfo[0].data as LeiChongLiBaoData; + + let mydata = await G.mongodb.cEvent(`leichonglibao${hdid}`).findOne( + {type: `leichonglibao${hdid}`, uid: call.uid} + ) + + if (!mydata || mydata.opentime < PublicShared.getToDayZeroTime()) { + return {show: true} + } + + if (!mydata.sc && mydata.buy.length >= hddata.payRewardNum) { + return {show: true} + } + + return {show: false} +} \ No newline at end of file diff --git a/src/api_s2c/hongdian/ApiGet.ts b/src/api_s2c/hongdian/ApiGet.ts index 09a5d81..c29a7a4 100644 --- a/src/api_s2c/hongdian/ApiGet.ts +++ b/src/api_s2c/hongdian/ApiGet.ts @@ -15,11 +15,12 @@ import {md_redPoint} from '../gongyu/mingdao/ApiOpen'; import {HongDianFun, HuoDongHongDianFun} from "./fun"; import {FunWeiXiuChang} from "../../public/weixiuchang"; import {getShouChongRedPoint} from "../event/shouchong/ApiReceive"; +import {LeiChongLiBaoGetHongDian} from "../event/leichonglibao/ApiReceive"; const defaultKeys: hongdianKey[] = ['jiuba', 'jiaotang', 'shouchong', 'clslhd', 'dixiaqianzhuanghd', 'gonghuihd', 'hbzbhd', 'jjchd', 'taskhd', 'xstaskhd', 'lingzhulaixihd', 'dxlthd', 'wzcjhd', 'slzdhd', 'qjzzdhd', 'kuangdonghd', 'qiandaohd', 'kaifukuanghuanhd', 'jijinhd', 'zhuishalinghd', 'yibaichouhd', 'huobanzhaomuhd', 'qirileichonghd', 'jierihd', 'kbzzhd', 'wzryhd', 'yuedujijin', 'mingdao', 'patahd', - 'heishihd', 'huodonghd', 'renown', 'weixiuchang', 'kaifujingsai', 'zhoumolibao', 'pobinglibao']; + 'heishihd', 'huodonghd', 'renown', 'weixiuchang', 'kaifujingsai', 'zhoumolibao', 'pobinglibao', 'leichonglibao']; export default async function (call: ApiCall) { @@ -163,6 +164,9 @@ export default async function (call: ApiCall) { case 'zhoumolibao': res[key] = await HongDianFun.zhoumolibao(call); break; + case "leichonglibao": + res[key] = await LeiChongLiBaoGetHongDian(call) + break; } } } diff --git a/src/lng.ts b/src/lng.ts index 90c1903..f0c9344 100644 --- a/src/lng.ts +++ b/src/lng.ts @@ -351,7 +351,7 @@ class Lng { huoqupaihang: "huoqupaihang"; wucigonghui: "wucigonghui"; nameyicunzai: "nameyicunzai"; - + ljlibaotips_8:"ljlibaotips_8"; "11111" = "globalThis.lng.chat_1" // return call.error('', { code: -3, message: globalThis.lng.chat_2 }); diff --git a/src/module/collection_event.ts b/src/module/collection_event.ts index d8339fe..fb13918 100644 --- a/src/module/collection_event.ts +++ b/src/module/collection_event.ts @@ -22,6 +22,7 @@ import {ResOpen as ResOpenZixuanlibao} from '../shared/protocols/event/zixuanlib import {ResOpen as ResOpenKaifujingsai} from '../shared/protocols/kaifujingsai/PtlOpen'; import {ResOpen as ResOpenZhoumolibao} from '../shared/protocols/event/zhoumolibao/PtlOpen'; import {ResOpen as ResOpenPobinglibao} from '../shared/protocols/event/pobinglibao/PtlOpen'; +import {ResOpen as ResOpenLeiChongLiBao} from '../shared/protocols/event/leichonglibao/PtlOpen'; export type eventType = { shouchong: { @@ -62,6 +63,7 @@ export type eventType = { [k: `zixuanlibao${number}`]: ResOpenZixuanlibao; [k: `leijichongzhi${number}`]: Omit; [k: `qiridenglu${number}`]: Pick; + [k: `leichonglibao${number}`]: ResOpenLeiChongLiBao & { opentime: number }; }; export type CollectionEvent = { diff --git a/src/shared/protocols/event/leichonglibao/PtlOpen.ts b/src/shared/protocols/event/leichonglibao/PtlOpen.ts new file mode 100644 index 0000000..dda43a2 --- /dev/null +++ b/src/shared/protocols/event/leichonglibao/PtlOpen.ts @@ -0,0 +1,8 @@ +export type ReqOpen = { + hdid: number +} + +export type ResOpen = { + sc: boolean // 自选奖励领取标识 + buy: string[] // 特价礼包购买记录 +} \ No newline at end of file diff --git a/src/shared/protocols/event/leichonglibao/PtlReceive.ts b/src/shared/protocols/event/leichonglibao/PtlReceive.ts new file mode 100644 index 0000000..dfdc7c5 --- /dev/null +++ b/src/shared/protocols/event/leichonglibao/PtlReceive.ts @@ -0,0 +1,8 @@ +export interface ReqReceive { + hdid: number + select: string[] +} + +export interface ResReceive { + prize: atn[] +} diff --git a/src/shared/protocols/hongdian/PtlGet.ts b/src/shared/protocols/hongdian/PtlGet.ts index d283e3d..3763cba 100644 --- a/src/shared/protocols/hongdian/PtlGet.ts +++ b/src/shared/protocols/hongdian/PtlGet.ts @@ -52,7 +52,8 @@ export type hongdianKey = | 'weixiuchang' | 'kaifujingsai' | 'zhoumolibao' - | 'pobinglibao'; + | 'pobinglibao' + | 'leichonglibao'; export type hongdianVal = { diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index d9413c9..7f2816a 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -64,58 +64,60 @@ import { ReqOpen as ReqOpen_13, ResOpen as ResOpen_13 } from './event/kaifukuang import { ReqShopBuy, ResShopBuy } from './event/kaifukuanghuan/PtlShopBuy'; import { ReqTaskBox, ResTaskBox } from './event/kaifukuanghuan/PtlTaskBox'; import { ReqTaskPrize, ResTaskPrize } from './event/kaifukuanghuan/PtlTaskPrize'; -import { ReqOpen as ReqOpen_14, ResOpen as ResOpen_14 } from './event/leijichongzhi/PtlOpen'; +import { ReqOpen as ReqOpen_14, ResOpen as ResOpen_14 } from './event/leichonglibao/PtlOpen'; +import { ReqReceive as ReqReceive_2, ResReceive as ResReceive_2 } from './event/leichonglibao/PtlReceive'; +import { ReqOpen as ReqOpen_15, ResOpen as ResOpen_15 } from './event/leijichongzhi/PtlOpen'; import { ReqRec as ReqRec_5, ResRec as ResRec_5 } from './event/leijichongzhi/PtlRec'; import { ReqLottery, ResLottery } from './event/niudanji/PtlLottery'; -import { ReqOpen as ReqOpen_15, ResOpen as ResOpen_15 } from './event/niudanji/PtlOpen'; -import { ReqOpen as ReqOpen_16, ResOpen as ResOpen_16 } from './event/pobinglibao/PtlOpen'; -import { ReqReceive as ReqReceive_2, ResReceive as ResReceive_2 } from './event/pobinglibao/PtlReceive'; -import { ReqOpen as ReqOpen_17, ResOpen as ResOpen_17 } from './event/qirichongzhi/PtlOpen'; +import { ReqOpen as ReqOpen_16, ResOpen as ResOpen_16 } from './event/niudanji/PtlOpen'; +import { ReqOpen as ReqOpen_17, ResOpen as ResOpen_17 } from './event/pobinglibao/PtlOpen'; +import { ReqReceive as ReqReceive_3, ResReceive as ResReceive_3 } from './event/pobinglibao/PtlReceive'; +import { ReqOpen as ReqOpen_18, ResOpen as ResOpen_18 } from './event/qirichongzhi/PtlOpen'; import { ReqRec as ReqRec_6, ResRec as ResRec_6 } from './event/qirichongzhi/PtlRec'; -import { ReqOpen as ReqOpen_18, ResOpen as ResOpen_18 } from './event/qiridenglu/PtlOpen'; +import { ReqOpen as ReqOpen_19, ResOpen as ResOpen_19 } from './event/qiridenglu/PtlOpen'; import { ReqRecPrize as ReqRecPrize_1, ResRecPrize as ResRecPrize_1 } from './event/qiridenglu/PtlRecPrize'; -import { ReqOpen as ReqOpen_19, ResOpen as ResOpen_19 } from './event/shiwuleichong/PtlOpen'; -import { ReqOpen as ReqOpen_20, ResOpen as ResOpen_20 } from './event/shouchong/PtlOpen'; -import { ReqReceive as ReqReceive_3, ResReceive as ResReceive_3 } from './event/shouchong/PtlReceive'; +import { ReqOpen as ReqOpen_20, ResOpen as ResOpen_20 } from './event/shiwuleichong/PtlOpen'; +import { ReqOpen as ReqOpen_21, ResOpen as ResOpen_21 } from './event/shouchong/PtlOpen'; +import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } from './event/shouchong/PtlReceive'; import { ReqBuy as ReqBuy_1, ResBuy as ResBuy_1 } from './event/xianshizhaomu/PtlBuy'; import { ReqDuihuan, ResDuihuan } from './event/xianshizhaomu/PtlDuihuan'; import { ReqLottery as ReqLottery_1, ResLottery as ResLottery_1 } from './event/xianshizhaomu/PtlLottery'; -import { ReqOpen as ReqOpen_21, ResOpen as ResOpen_21 } from './event/xianshizhaomu/PtlOpen'; +import { ReqOpen as ReqOpen_22, ResOpen as ResOpen_22 } from './event/xianshizhaomu/PtlOpen'; import { ReqRec as ReqRec_7, ResRec as ResRec_7 } from './event/xianshizhaomu/PtlRec'; -import { ReqOpen as ReqOpen_22, ResOpen as ResOpen_22 } from './event/xiaofeijingsai/PtlOpen'; -import { ReqOpen as ReqOpen_23, ResOpen as ResOpen_23 } from './event/xinshoulibao/PtlOpen'; +import { ReqOpen as ReqOpen_23, ResOpen as ResOpen_23 } from './event/xiaofeijingsai/PtlOpen'; +import { ReqOpen as ReqOpen_24, ResOpen as ResOpen_24 } from './event/xinshoulibao/PtlOpen'; import { ReqBuy as ReqBuy_2, ResBuy as ResBuy_2 } from './event/yangchengmubiao/PtlBuy'; -import { ReqOpen as ReqOpen_24, ResOpen as ResOpen_24 } from './event/yangchengmubiao/PtlOpen'; +import { ReqOpen as ReqOpen_25, ResOpen as ResOpen_25 } from './event/yangchengmubiao/PtlOpen'; import { ReqRec as ReqRec_8, ResRec as ResRec_8 } from './event/yangchengmubiao/PtlRec'; -import { ReqOpen as ReqOpen_25, ResOpen as ResOpen_25 } from './event/yibaichou/PtlOpen'; +import { ReqOpen as ReqOpen_26, ResOpen as ResOpen_26 } from './event/yibaichou/PtlOpen'; import { ReqRec as ReqRec_9, ResRec as ResRec_9 } from './event/yibaichou/PtlRec'; import { ReqRecAll, ResRecAll } from './event/yibaichou/PtlRecAll'; -import { ReqOpen as ReqOpen_26, ResOpen as ResOpen_26 } from './event/yuedujijin/PtlOpen'; +import { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } from './event/yuedujijin/PtlOpen'; import { ReqRec as ReqRec_10, ResRec as ResRec_10 } from './event/yuedujijin/PtlRec'; import { ReqBuyLv, ResBuyLv } from './event/zhanling/PtlBuyLv'; -import { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } from './event/zhanling/PtlOpen'; +import { ReqOpen as ReqOpen_28, ResOpen as ResOpen_28 } from './event/zhanling/PtlOpen'; import { ReqRecPrize as ReqRecPrize_2, ResRecPrize as ResRecPrize_2 } from './event/zhanling/PtlRecPrize'; import { ReqRecTask, ResRecTask } from './event/zhanling/PtlRecTask'; -import { ReqOpen as ReqOpen_28, ResOpen as ResOpen_28 } from './event/zhoulibao/PtlOpen'; -import { ReqOpen as ReqOpen_29, ResOpen as ResOpen_29 } from './event/zhoumolibao/PtlOpen'; -import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } from './event/zhoumolibao/PtlReceive'; +import { ReqOpen as ReqOpen_29, ResOpen as ResOpen_29 } from './event/zhoulibao/PtlOpen'; +import { ReqOpen as ReqOpen_30, ResOpen as ResOpen_30 } from './event/zhoumolibao/PtlOpen'; +import { ReqReceive as ReqReceive_5, ResReceive as ResReceive_5 } from './event/zhoumolibao/PtlReceive'; import { ReqBuy as ReqBuy_3, ResBuy as ResBuy_3 } from './event/zixuanlibao/PtlBuy'; -import { ReqOpen as ReqOpen_30, ResOpen as ResOpen_30 } from './event/zixuanlibao/PtlOpen'; +import { ReqOpen as ReqOpen_31, ResOpen as ResOpen_31 } from './event/zixuanlibao/PtlOpen'; import { ReqhdGetList, ReshdGetList } from './eventlist/PtlhdGetList'; import { ReqApply, ResApply } from './friend/PtlApply'; import { ReqDel, ResDel } from './friend/PtlDel'; import { ReqGift, ResGift } from './friend/PtlGift'; import { ReqList, ResList } from './friend/PtlList'; -import { ReqOpen as ReqOpen_31, ResOpen as ResOpen_31 } from './friend/PtlOpen'; +import { ReqOpen as ReqOpen_32, ResOpen as ResOpen_32 } from './friend/PtlOpen'; import { ReqRespond, ResRespond } from './friend/PtlRespond'; import { ReqRmBlackList, ResRmBlackList } from './friend/PtlRmBlackList'; import { ReqSearch, ResSearch } from './friend/PtlSearch'; import { ReqChallenge, ResChallenge } from './ganbutexun/PtlChallenge'; -import { ReqOpen as ReqOpen_32, ResOpen as ResOpen_32 } from './ganbutexun/PtlOpen'; +import { ReqOpen as ReqOpen_33, ResOpen as ResOpen_33 } from './ganbutexun/PtlOpen'; import { ReqFast, ResFast } from './ganhai/PtlFast'; import { ReqFight as ReqFight_1, ResFight as ResFight_1 } from './ganhai/PtlFight'; import { ReqLog, ResLog } from './ganhai/PtlLog'; -import { ReqOpen as ReqOpen_33, ResOpen as ResOpen_33 } from './ganhai/PtlOpen'; +import { ReqOpen as ReqOpen_34, ResOpen as ResOpen_34 } from './ganhai/PtlOpen'; import { ReqRefresh, ResRefresh } from './ganhai/PtlRefresh'; import { ReqRefreshShip, ResRefreshShip } from './ganhai/PtlRefreshShip'; import { ReqSelect as ReqSelect_1, ResSelect as ResSelect_1 } from './ganhai/PtlSelect'; @@ -137,19 +139,19 @@ import { ReqJx, ResJx } from './gonghui/PtlJx'; import { ReqJxOpen, ResJxOpen } from './gonghui/PtlJxOpen'; import { ReqList as ReqList_1, ResList as ResList_1 } from './gonghui/PtlList'; import { ReqManage, ResManage } from './gonghui/PtlManage'; -import { ReqOpen as ReqOpen_34, ResOpen as ResOpen_34 } from './gonghui/PtlOpen'; +import { ReqOpen as ReqOpen_35, ResOpen as ResOpen_35 } from './gonghui/PtlOpen'; import { ReqTanHe, ResTanHe } from './gonghui/PtlTanHe'; import { ReqTaskOpen, ResTaskOpen } from './gonghui/PtlTaskOpen'; import { ReqTaskReceive, ResTaskReceive } from './gonghui/PtlTaskReceive'; import { ReqUpWz, ResUpWz } from './gonghui/PtlUpWz'; import { ReqLottery as ReqLottery_2, ResLottery as ResLottery_2 } from './gonghuibaozang/PtlLottery'; -import { ReqOpen as ReqOpen_35, ResOpen as ResOpen_35 } from './gonghuibaozang/PtlOpen'; +import { ReqOpen as ReqOpen_36, ResOpen as ResOpen_36 } from './gonghuibaozang/PtlOpen'; import { ReqBuy as ReqBuy_4, ResBuy as ResBuy_4 } from './gonglukuangbiao/PtlBuy'; import { ReqFight as ReqFight_2, ResFight as ResFight_2 } from './gonglukuangbiao/PtlFight'; -import { ReqOpen as ReqOpen_36, ResOpen as ResOpen_36 } from './gonglukuangbiao/PtlOpen'; +import { ReqOpen as ReqOpen_37, ResOpen as ResOpen_37 } from './gonglukuangbiao/PtlOpen'; import { ReqRefresh as ReqRefresh_1, ResRefresh as ResRefresh_1 } from './gonglukuangbiao/PtlRefresh'; import { ReqActive, ResActive } from './gongyu/mingdao/PtlActive'; -import { ReqOpen as ReqOpen_37, ResOpen as ResOpen_37 } from './gongyu/mingdao/PtlOpen'; +import { ReqOpen as ReqOpen_38, ResOpen as ResOpen_38 } from './gongyu/mingdao/PtlOpen'; import { ReqRecPrize as ReqRecPrize_3, ResRecPrize as ResRecPrize_3 } from './gongyu/mingdao/PtlRecPrize'; import { ReqRepair, ResRepair } from './gongyu/mingdao/PtlRepair'; import { ReqReset as ReqReset_1, ResReset as ResReset_1 } from './gongyu/xunlianjihua/PtlReset'; @@ -158,14 +160,14 @@ import { ReqSetSkill, ResSetSkill } from './gongyu/zuozhanjihua/PtlSetSkill'; import { ReqBuyNum as ReqBuyNum_1, ResBuyNum as ResBuyNum_1 } from './hbzb/jfs/PtlBuyNum'; import { ReqFight as ReqFight_3, ResFight as ResFight_3 } from './hbzb/jfs/PtlFight'; import { ReqGetLog as ReqGetLog_1, ResGetLog as ResGetLog_1 } from './hbzb/jfs/PtlGetLog'; -import { ReqOpen as ReqOpen_38, ResOpen as ResOpen_38 } from './hbzb/jfs/PtlOpen'; +import { ReqOpen as ReqOpen_39, ResOpen as ResOpen_39 } from './hbzb/jfs/PtlOpen'; import { ReqRec as ReqRec_11, ResRec as ResRec_11 } from './hbzb/jfs/PtlRec'; import { ReqRefresh as ReqRefresh_2, ResRefresh as ResRefresh_2 } from './hbzb/jfs/PtlRefresh'; import { ReqGetStatus, ResGetStatus } from './hbzb/PtlGetStatus'; import { ReqBuyNum as ReqBuyNum_2, ResBuyNum as ResBuyNum_2 } from './hbzb/zbs/PtlBuyNum'; import { ReqFight as ReqFight_4, ResFight as ResFight_4 } from './hbzb/zbs/PtlFight'; import { ReqGetLog as ReqGetLog_2, ResGetLog as ResGetLog_2 } from './hbzb/zbs/PtlGetLog'; -import { ReqOpen as ReqOpen_39, ResOpen as ResOpen_39 } from './hbzb/zbs/PtlOpen'; +import { ReqOpen as ReqOpen_40, ResOpen as ResOpen_40 } from './hbzb/zbs/PtlOpen'; import { ReqRefresh as ReqRefresh_3, ResRefresh as ResRefresh_3 } from './hbzb/zbs/PtlRefresh'; import { ReqAwake, ResAwake } from './hero/PtlAwake'; import { ReqChangePos, ResChangePos } from './hero/PtlChangePos'; @@ -181,40 +183,40 @@ import { ReqGet as ReqGet_2, ResGet as ResGet_2 } from './hongdian/PtlGet'; import { ReqGetList as ReqGetList_4, ResGetList as ResGetList_4 } from './item/PtlGetList'; import { ReqUse, ResUse } from './item/PtlUse'; import { ReqLottery as ReqLottery_3, ResLottery as ResLottery_3 } from './jiaotang/PtlLottery'; -import { ReqOpen as ReqOpen_40, ResOpen as ResOpen_40 } from './jiaotang/PtlOpen'; +import { ReqOpen as ReqOpen_41, ResOpen as ResOpen_41 } from './jiaotang/PtlOpen'; import { ReqLottery as ReqLottery_4, ResLottery as ResLottery_4 } from './jiuba/PtlLottery'; -import { ReqOpen as ReqOpen_41, ResOpen as ResOpen_41 } from './jiuba/PtlOpen'; +import { ReqOpen as ReqOpen_42, ResOpen as ResOpen_42 } from './jiuba/PtlOpen'; import { ReqBuyFightNum, ResBuyFightNum } from './jjc/PtlBuyFightNum'; import { ReqFight as ReqFight_5, ResFight as ResFight_5 } from './jjc/PtlFight'; import { ReqFightLog, ResFightLog } from './jjc/PtlFightLog'; -import { ReqOpen as ReqOpen_42, ResOpen as ResOpen_42 } from './jjc/PtlOpen'; -import { ReqReceive as ReqReceive_5, ResReceive as ResReceive_5 } from './jjc/PtlReceive'; +import { ReqOpen as ReqOpen_43, ResOpen as ResOpen_43 } from './jjc/PtlOpen'; +import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } from './jjc/PtlReceive'; import { ReqRefresh as ReqRefresh_4, ResRefresh as ResRefresh_4 } from './jjc/PtlRefresh'; -import { ReqOpen as ReqOpen_43, ResOpen as ResOpen_43 } from './kaifujingsai/PtlOpen'; -import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } from './kaifujingsai/PtlReceive'; +import { ReqOpen as ReqOpen_44, ResOpen as ResOpen_44 } from './kaifujingsai/PtlOpen'; +import { ReqReceive as ReqReceive_7, ResReceive as ResReceive_7 } from './kaifujingsai/PtlReceive'; import { ReqApply as ReqApply_2, ResApply as ResApply_2 } from './kbzz/PtlApply'; import { ReqAutoApply, ResAutoApply } from './kbzz/PtlAutoApply'; import { ReqBuyNum as ReqBuyNum_3, ResBuyNum as ResBuyNum_3 } from './kbzz/PtlBuyNum'; import { ReqFight as ReqFight_6, ResFight as ResFight_6 } from './kbzz/PtlFight'; import { ReqFightLog as ReqFightLog_1, ResFightLog as ResFightLog_1 } from './kbzz/PtlFightLog'; import { ReqGroupState, ResGroupState } from './kbzz/PtlGroupState'; -import { ReqOpen as ReqOpen_44, ResOpen as ResOpen_44 } from './kbzz/PtlOpen'; +import { ReqOpen as ReqOpen_45, ResOpen as ResOpen_45 } from './kbzz/PtlOpen'; import { ReqRecPrize as ReqRecPrize_4, ResRecPrize as ResRecPrize_4 } from './kbzz/PtlRecPrize'; import { ReqRefresh as ReqRefresh_5, ResRefresh as ResRefresh_5 } from './kbzz/PtlRefresh'; import { ReqAddPkNum, ResAddPkNum } from './kuangdong/PtlAddPkNum'; import { ReqGetPrize, ResGetPrize } from './kuangdong/PtlGetPrize'; import { ReqKdInfo, ResKdInfo } from './kuangdong/PtlKdInfo'; import { ReqLog as ReqLog_1, ResLog as ResLog_1 } from './kuangdong/PtlLog'; -import { ReqOpen as ReqOpen_45, ResOpen as ResOpen_45 } from './kuangdong/PtlOpen'; +import { ReqOpen as ReqOpen_46, ResOpen as ResOpen_46 } from './kuangdong/PtlOpen'; import { ReqYanShi, ResYanShi } from './kuangdong/PtlYanShi'; import { ReqZhanLing, ResZhanLing } from './kuangdong/PtlZhanLing'; -import { ReqOpen as ReqOpen_46, ResOpen as ResOpen_46 } from './lingzhulaixi/PtlOpen'; +import { ReqOpen as ReqOpen_47, ResOpen as ResOpen_47 } from './lingzhulaixi/PtlOpen'; import { ReqPkBoss, ResPkBoss } from './lingzhulaixi/PtlPkBoss'; import { ReqPkRank, ResPkRank } from './lingzhulaixi/PtlPkRank'; import { ReqSaoDang, ResSaoDang } from './lingzhulaixi/PtlSaoDang'; import { ReqBuy as ReqBuy_5, ResBuy as ResBuy_5 } from './meirishilian/PtlBuy'; import { ReqFight as ReqFight_7, ResFight as ResFight_7 } from './meirishilian/PtlFight'; -import { ReqOpen as ReqOpen_47, ResOpen as ResOpen_47 } from './meirishilian/PtlOpen'; +import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } from './meirishilian/PtlOpen'; import { MsgBindUid } from './msg_c2s/MsgBindUid'; import { MsgPay } from './msg_c2s/MsgPay'; import { MsgSync } from './msg_c2s/MsgSync'; @@ -246,7 +248,7 @@ import { MsgTaskChange } from './msg_s2c/MsgTaskChange'; import { MsgXianshilibao } from './msg_s2c/MsgXianshilibao'; import { ReqFight as ReqFight_8, ResFight as ResFight_8 } from './pata/PtlFight'; import { ReqGetPrize as ReqGetPrize_1, ResGetPrize as ResGetPrize_1 } from './pata/PtlGetPrize'; -import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } from './pata/PtlOpen'; +import { ReqOpen as ReqOpen_49, ResOpen as ResOpen_49 } from './pata/PtlOpen'; import { ReqSaoDang as ReqSaoDang_1, ResSaoDang as ResSaoDang_1 } from './pata/PtlSaoDang'; import { ReqGetList as ReqGetList_5, ResGetList as ResGetList_5 } from './pay/PtlGetList'; import { ReqGetList as ReqGetList_6, ResGetList as ResGetList_6 } from './peijian/PtlGetList'; @@ -262,15 +264,15 @@ import { ReqUnLock, ResUnLock } from './peijian/PtlUnLock'; import { ReqWear as ReqWear_1, ResWear as ResWear_1 } from './peijian/PtlWear'; import { ReqDeal, ResDeal } from './peijiancangku/PtlDeal'; import { ReqJump, ResJump } from './peijiancangku/PtlJump'; -import { ReqOpen as ReqOpen_49, ResOpen as ResOpen_49 } from './peijiancangku/PtlOpen'; +import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } from './peijiancangku/PtlOpen'; import { ReqBingo, ResBingo } from './PtlBingo'; import { ReqFightTest, ResFightTest } from './PtlFightTest'; import { ReqSyncBtn, ResSyncBtn } from './PtlSyncBtn'; import { ReqTest, ResTest } from './PtlTest'; -import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } from './pushgift/PtlOpen'; +import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './pushgift/PtlOpen'; import { ReqFight as ReqFight_9, ResFight as ResFight_9 } from './qjzzd/PtlFight'; -import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './qjzzd/PtlOpen'; -import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './rank/PtlOpen'; +import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './qjzzd/PtlOpen'; +import { ReqOpen as ReqOpen_53, ResOpen as ResOpen_53 } from './rank/PtlOpen'; import { ReqConcise, ResConcise } from './shiwu/PtlConcise'; import { ReqExtract, ResExtract } from './shiwu/PtlExtract'; import { ReqGetList as ReqGetList_7, ResGetList as ResGetList_7 } from './shiwu/PtlGetList'; @@ -278,20 +280,20 @@ import { ReqLvUp as ReqLvUp_3, ResLvUp as ResLvUp_3 } from './shiwu/PtlLvUp'; import { ReqRecast, ResRecast } from './shiwu/PtlRecast'; import { ReqTakeOff as ReqTakeOff_2, ResTakeOff as ResTakeOff_2 } from './shiwu/PtlTakeOff'; import { ReqWear as ReqWear_2, ResWear as ResWear_2 } from './shiwu/PtlWear'; -import { ReqOpen as ReqOpen_53, ResOpen as ResOpen_53 } from './shootGame/PtlOpen'; +import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } from './shootGame/PtlOpen'; import { ReqRec as ReqRec_13, ResRec as ResRec_13 } from './shootGame/PtlRec'; import { ReqBuy as ReqBuy_6, ResBuy as ResBuy_6 } from './shop/PtlBuy'; -import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } from './shop/PtlOpen'; +import { ReqOpen as ReqOpen_55, ResOpen as ResOpen_55 } from './shop/PtlOpen'; import { ReqRefresh as ReqRefresh_6, ResRefresh as ResRefresh_6 } from './shop/PtlRefresh'; import { ReqGetBoxPrize, ResGetBoxPrize } from './sign/PtlGetBoxPrize'; import { ReqGetPrize as ReqGetPrize_2, ResGetPrize as ResGetPrize_2 } from './sign/PtlGetPrize'; -import { ReqOpen as ReqOpen_55, ResOpen as ResOpen_55 } from './sign/PtlOpen'; +import { ReqOpen as ReqOpen_56, ResOpen as ResOpen_56 } from './sign/PtlOpen'; import { ReqAim, ResAim } from './slzd/PtlAim'; import { ReqBuyNum as ReqBuyNum_4, ResBuyNum as ResBuyNum_4 } from './slzd/PtlBuyNum'; import { ReqFight as ReqFight_10, ResFight as ResFight_10 } from './slzd/PtlFight'; import { ReqFightLog as ReqFightLog_2, ResFightLog as ResFightLog_2 } from './slzd/PtlFightLog'; import { ReqMyRank, ResMyRank } from './slzd/PtlMyRank'; -import { ReqOpen as ReqOpen_56, ResOpen as ResOpen_56 } from './slzd/PtlOpen'; +import { ReqOpen as ReqOpen_57, ResOpen as ResOpen_57 } from './slzd/PtlOpen'; import { ReqOpenFort, ResOpenFort } from './slzd/PtlOpenFort'; import { ReqRec as ReqRec_14, ResRec as ResRec_14 } from './slzd/PtlRec'; import { ReqRefresh as ReqRefresh_7, ResRefresh as ResRefresh_7 } from './slzd/PtlRefresh'; @@ -300,11 +302,11 @@ import { ReqEvent, ResEvent } from './tanxian/PtlEvent'; import { ReqFastGuaJi, ResFastGuaJi } from './tanxian/PtlFastGuaJi'; import { ReqFight as ReqFight_11, ResFight as ResFight_11 } from './tanxian/PtlFight'; import { ReqGuaJi, ResGuaJi } from './tanxian/PtlGuaJi'; -import { ReqOpen as ReqOpen_57, ResOpen as ResOpen_57 } from './tanxian/PtlOpen'; -import { ReqReceive as ReqReceive_7, ResReceive as ResReceive_7 } from './tanxian/PtlReceive'; +import { ReqOpen as ReqOpen_58, ResOpen as ResOpen_58 } from './tanxian/PtlOpen'; +import { ReqReceive as ReqReceive_8, ResReceive as ResReceive_8 } from './tanxian/PtlReceive'; import { ReqAllFinsh, ResAllFinsh } from './task/PtlAllFinsh'; import { ReqFinsh, ResFinsh } from './task/PtlFinsh'; -import { ReqOpen as ReqOpen_58, ResOpen as ResOpen_58 } from './task/PtlOpen'; +import { ReqOpen as ReqOpen_59, ResOpen as ResOpen_59 } from './task/PtlOpen'; import { ReqCDKEY, ResCDKEY } from './user/PtlCDKEY'; import { ReqChangeInfo, ResChangeInfo } from './user/PtlChangeInfo'; import { ReqChangeName, ResChangeName } from './user/PtlChangeName'; @@ -320,7 +322,7 @@ import { ReqRenownOpen, ResRenownOpen } from './user/PtlRenownOpen'; import { ReqTujian, ResTujian } from './user/PtlTujian'; import { ReqDecompose, ResDecompose } from './weixiuchang/PtlDecompose'; import { ReqExchange, ResExchange } from './weixiuchang/PtlExchange'; -import { ReqOpen as ReqOpen_59, ResOpen as ResOpen_59 } from './weixiuchang/PtlOpen'; +import { ReqOpen as ReqOpen_60, ResOpen as ResOpen_60 } from './weixiuchang/PtlOpen'; import { ReqUpLv, ResUpLv } from './weixiuchang/PtlUpLv'; import { ReqUpStar, ResUpStar } from './weixiuchang/PtlUpStar'; import { ReqAutoBaoMing, ResAutoBaoMing } from './wzry/PtlAutoBaoMing'; @@ -331,7 +333,7 @@ import { ReqDldFight, ResDldFight } from './wzry/PtlDldFight'; import { ReqDldRefre, ResDldRefre } from './wzry/PtlDldRefre'; import { ReqJingCai, ResJingCai } from './wzry/PtlJingCai'; import { ReqJingCaiOpen, ResJingCaiOpen } from './wzry/PtlJingCaiOpen'; -import { ReqOpen as ReqOpen_60, ResOpen as ResOpen_60 } from './wzry/PtlOpen'; +import { ReqOpen as ReqOpen_61, ResOpen as ResOpen_61 } from './wzry/PtlOpen'; import { ReqUpdateFight, ResUpdateFight } from './wzry/PtlUpdateFight'; import { ReqWzzd, ResWzzd } from './wzry/PtlWzzd'; import { ReqZuanShiOpen, ResZuanShiOpen } from './wzry/PtlZuanShiOpen'; @@ -339,8 +341,8 @@ import { ReqAllGet, ResAllGet } from './xstask/PtlAllGet'; import { ReqGet as ReqGet_3, ResGet as ResGet_3 } from './xstask/PtlGet'; import { ReqLvUp as ReqLvUp_4, ResLvUp as ResLvUp_4 } from './xstask/PtlLvUp'; import { ReqOnekeyReceive, ResOnekeyReceive } from './xstask/PtlOnekeyReceive'; -import { ReqOpen as ReqOpen_61, ResOpen as ResOpen_61 } from './xstask/PtlOpen'; -import { ReqReceive as ReqReceive_8, ResReceive as ResReceive_8 } from './xstask/PtlReceive'; +import { ReqOpen as ReqOpen_62, ResOpen as ResOpen_62 } from './xstask/PtlOpen'; +import { ReqReceive as ReqReceive_9, ResReceive as ResReceive_9 } from './xstask/PtlReceive'; import { ReqRefresh as ReqRefresh_8, ResRefresh as ResRefresh_8 } from './xstask/PtlRefresh'; import { ReqHandle, ResHandle } from './yongbingzhuzhan/PtlHandle'; import { ReqChangePos as ReqChangePos_1, ResChangePos as ResChangePos_1 } from './zhanqianbushu/PtlChangePos'; @@ -609,10 +611,18 @@ export interface ServiceType { req: ReqTaskPrize, res: ResTaskPrize }, - "event/leijichongzhi/Open": { + "event/leichonglibao/Open": { req: ReqOpen_14, res: ResOpen_14 }, + "event/leichonglibao/Receive": { + req: ReqReceive_2, + res: ResReceive_2 + }, + "event/leijichongzhi/Open": { + req: ReqOpen_15, + res: ResOpen_15 + }, "event/leijichongzhi/Rec": { req: ReqRec_5, res: ResRec_5 @@ -622,44 +632,44 @@ export interface ServiceType { res: ResLottery }, "event/niudanji/Open": { - req: ReqOpen_15, - res: ResOpen_15 - }, - "event/pobinglibao/Open": { req: ReqOpen_16, res: ResOpen_16 }, - "event/pobinglibao/Receive": { - req: ReqReceive_2, - res: ResReceive_2 - }, - "event/qirichongzhi/Open": { + "event/pobinglibao/Open": { req: ReqOpen_17, res: ResOpen_17 }, + "event/pobinglibao/Receive": { + req: ReqReceive_3, + res: ResReceive_3 + }, + "event/qirichongzhi/Open": { + req: ReqOpen_18, + res: ResOpen_18 + }, "event/qirichongzhi/Rec": { req: ReqRec_6, res: ResRec_6 }, "event/qiridenglu/Open": { - req: ReqOpen_18, - res: ResOpen_18 + req: ReqOpen_19, + res: ResOpen_19 }, "event/qiridenglu/RecPrize": { req: ReqRecPrize_1, res: ResRecPrize_1 }, "event/shiwuleichong/Open": { - req: ReqOpen_19, - res: ResOpen_19 - }, - "event/shouchong/Open": { req: ReqOpen_20, res: ResOpen_20 }, + "event/shouchong/Open": { + req: ReqOpen_21, + res: ResOpen_21 + }, "event/shouchong/Receive": { - req: ReqReceive_3, - res: ResReceive_3 + req: ReqReceive_4, + res: ResReceive_4 }, "event/xianshizhaomu/Buy": { req: ReqBuy_1, @@ -674,36 +684,36 @@ export interface ServiceType { res: ResLottery_1 }, "event/xianshizhaomu/Open": { - req: ReqOpen_21, - res: ResOpen_21 + req: ReqOpen_22, + res: ResOpen_22 }, "event/xianshizhaomu/Rec": { req: ReqRec_7, res: ResRec_7 }, "event/xiaofeijingsai/Open": { - req: ReqOpen_22, - res: ResOpen_22 - }, - "event/xinshoulibao/Open": { req: ReqOpen_23, res: ResOpen_23 }, + "event/xinshoulibao/Open": { + req: ReqOpen_24, + res: ResOpen_24 + }, "event/yangchengmubiao/Buy": { req: ReqBuy_2, res: ResBuy_2 }, "event/yangchengmubiao/Open": { - req: ReqOpen_24, - res: ResOpen_24 + req: ReqOpen_25, + res: ResOpen_25 }, "event/yangchengmubiao/Rec": { req: ReqRec_8, res: ResRec_8 }, "event/yibaichou/Open": { - req: ReqOpen_25, - res: ResOpen_25 + req: ReqOpen_26, + res: ResOpen_26 }, "event/yibaichou/Rec": { req: ReqRec_9, @@ -714,8 +724,8 @@ export interface ServiceType { res: ResRecAll }, "event/yuedujijin/Open": { - req: ReqOpen_26, - res: ResOpen_26 + req: ReqOpen_27, + res: ResOpen_27 }, "event/yuedujijin/Rec": { req: ReqRec_10, @@ -726,8 +736,8 @@ export interface ServiceType { res: ResBuyLv }, "event/zhanling/Open": { - req: ReqOpen_27, - res: ResOpen_27 + req: ReqOpen_28, + res: ResOpen_28 }, "event/zhanling/RecPrize": { req: ReqRecPrize_2, @@ -738,24 +748,24 @@ export interface ServiceType { res: ResRecTask }, "event/zhoulibao/Open": { - req: ReqOpen_28, - res: ResOpen_28 - }, - "event/zhoumolibao/Open": { req: ReqOpen_29, res: ResOpen_29 }, + "event/zhoumolibao/Open": { + req: ReqOpen_30, + res: ResOpen_30 + }, "event/zhoumolibao/Receive": { - req: ReqReceive_4, - res: ResReceive_4 + req: ReqReceive_5, + res: ResReceive_5 }, "event/zixuanlibao/Buy": { req: ReqBuy_3, res: ResBuy_3 }, "event/zixuanlibao/Open": { - req: ReqOpen_30, - res: ResOpen_30 + req: ReqOpen_31, + res: ResOpen_31 }, "eventlist/hdGetList": { req: ReqhdGetList, @@ -778,8 +788,8 @@ export interface ServiceType { res: ResList }, "friend/Open": { - req: ReqOpen_31, - res: ResOpen_31 + req: ReqOpen_32, + res: ResOpen_32 }, "friend/Respond": { req: ReqRespond, @@ -798,8 +808,8 @@ export interface ServiceType { res: ResChallenge }, "ganbutexun/Open": { - req: ReqOpen_32, - res: ResOpen_32 + req: ReqOpen_33, + res: ResOpen_33 }, "ganhai/Fast": { req: ReqFast, @@ -814,8 +824,8 @@ export interface ServiceType { res: ResLog }, "ganhai/Open": { - req: ReqOpen_33, - res: ResOpen_33 + req: ReqOpen_34, + res: ResOpen_34 }, "ganhai/Refresh": { req: ReqRefresh, @@ -902,8 +912,8 @@ export interface ServiceType { res: ResManage }, "gonghui/Open": { - req: ReqOpen_34, - res: ResOpen_34 + req: ReqOpen_35, + res: ResOpen_35 }, "gonghui/TanHe": { req: ReqTanHe, @@ -926,8 +936,8 @@ export interface ServiceType { res: ResLottery_2 }, "gonghuibaozang/Open": { - req: ReqOpen_35, - res: ResOpen_35 + req: ReqOpen_36, + res: ResOpen_36 }, "gonglukuangbiao/Buy": { req: ReqBuy_4, @@ -938,8 +948,8 @@ export interface ServiceType { res: ResFight_2 }, "gonglukuangbiao/Open": { - req: ReqOpen_36, - res: ResOpen_36 + req: ReqOpen_37, + res: ResOpen_37 }, "gonglukuangbiao/Refresh": { req: ReqRefresh_1, @@ -950,8 +960,8 @@ export interface ServiceType { res: ResActive }, "gongyu/mingdao/Open": { - req: ReqOpen_37, - res: ResOpen_37 + req: ReqOpen_38, + res: ResOpen_38 }, "gongyu/mingdao/RecPrize": { req: ReqRecPrize_3, @@ -986,8 +996,8 @@ export interface ServiceType { res: ResGetLog_1 }, "hbzb/jfs/Open": { - req: ReqOpen_38, - res: ResOpen_38 + req: ReqOpen_39, + res: ResOpen_39 }, "hbzb/jfs/Rec": { req: ReqRec_11, @@ -1014,8 +1024,8 @@ export interface ServiceType { res: ResGetLog_2 }, "hbzb/zbs/Open": { - req: ReqOpen_39, - res: ResOpen_39 + req: ReqOpen_40, + res: ResOpen_40 }, "hbzb/zbs/Refresh": { req: ReqRefresh_3, @@ -1078,16 +1088,16 @@ export interface ServiceType { res: ResLottery_3 }, "jiaotang/Open": { - req: ReqOpen_40, - res: ResOpen_40 + req: ReqOpen_41, + res: ResOpen_41 }, "jiuba/Lottery": { req: ReqLottery_4, res: ResLottery_4 }, "jiuba/Open": { - req: ReqOpen_41, - res: ResOpen_41 + req: ReqOpen_42, + res: ResOpen_42 }, "jjc/BuyFightNum": { req: ReqBuyFightNum, @@ -1102,24 +1112,24 @@ export interface ServiceType { res: ResFightLog }, "jjc/Open": { - req: ReqOpen_42, - res: ResOpen_42 + req: ReqOpen_43, + res: ResOpen_43 }, "jjc/Receive": { - req: ReqReceive_5, - res: ResReceive_5 + req: ReqReceive_6, + res: ResReceive_6 }, "jjc/Refresh": { req: ReqRefresh_4, res: ResRefresh_4 }, "kaifujingsai/Open": { - req: ReqOpen_43, - res: ResOpen_43 + req: ReqOpen_44, + res: ResOpen_44 }, "kaifujingsai/Receive": { - req: ReqReceive_6, - res: ResReceive_6 + req: ReqReceive_7, + res: ResReceive_7 }, "kbzz/Apply": { req: ReqApply_2, @@ -1146,8 +1156,8 @@ export interface ServiceType { res: ResGroupState }, "kbzz/Open": { - req: ReqOpen_44, - res: ResOpen_44 + req: ReqOpen_45, + res: ResOpen_45 }, "kbzz/RecPrize": { req: ReqRecPrize_4, @@ -1174,8 +1184,8 @@ export interface ServiceType { res: ResLog_1 }, "kuangdong/Open": { - req: ReqOpen_45, - res: ResOpen_45 + req: ReqOpen_46, + res: ResOpen_46 }, "kuangdong/YanShi": { req: ReqYanShi, @@ -1186,8 +1196,8 @@ export interface ServiceType { res: ResZhanLing }, "lingzhulaixi/Open": { - req: ReqOpen_46, - res: ResOpen_46 + req: ReqOpen_47, + res: ResOpen_47 }, "lingzhulaixi/PkBoss": { req: ReqPkBoss, @@ -1210,8 +1220,8 @@ export interface ServiceType { res: ResFight_7 }, "meirishilian/Open": { - req: ReqOpen_47, - res: ResOpen_47 + req: ReqOpen_48, + res: ResOpen_48 }, "pata/Fight": { req: ReqFight_8, @@ -1222,8 +1232,8 @@ export interface ServiceType { res: ResGetPrize_1 }, "pata/Open": { - req: ReqOpen_48, - res: ResOpen_48 + req: ReqOpen_49, + res: ResOpen_49 }, "pata/SaoDang": { req: ReqSaoDang_1, @@ -1286,8 +1296,8 @@ export interface ServiceType { res: ResJump }, "peijiancangku/Open": { - req: ReqOpen_49, - res: ResOpen_49 + req: ReqOpen_50, + res: ResOpen_50 }, "Bingo": { req: ReqBingo, @@ -1306,21 +1316,21 @@ export interface ServiceType { res: ResTest }, "pushgift/Open": { - req: ReqOpen_50, - res: ResOpen_50 + req: ReqOpen_51, + res: ResOpen_51 }, "qjzzd/Fight": { req: ReqFight_9, res: ResFight_9 }, "qjzzd/Open": { - req: ReqOpen_51, - res: ResOpen_51 - }, - "rank/Open": { req: ReqOpen_52, res: ResOpen_52 }, + "rank/Open": { + req: ReqOpen_53, + res: ResOpen_53 + }, "shiwu/Concise": { req: ReqConcise, res: ResConcise @@ -1350,8 +1360,8 @@ export interface ServiceType { res: ResWear_2 }, "shootGame/Open": { - req: ReqOpen_53, - res: ResOpen_53 + req: ReqOpen_54, + res: ResOpen_54 }, "shootGame/Rec": { req: ReqRec_13, @@ -1362,8 +1372,8 @@ export interface ServiceType { res: ResBuy_6 }, "shop/Open": { - req: ReqOpen_54, - res: ResOpen_54 + req: ReqOpen_55, + res: ResOpen_55 }, "shop/Refresh": { req: ReqRefresh_6, @@ -1378,8 +1388,8 @@ export interface ServiceType { res: ResGetPrize_2 }, "sign/Open": { - req: ReqOpen_55, - res: ResOpen_55 + req: ReqOpen_56, + res: ResOpen_56 }, "slzd/Aim": { req: ReqAim, @@ -1402,8 +1412,8 @@ export interface ServiceType { res: ResMyRank }, "slzd/Open": { - req: ReqOpen_56, - res: ResOpen_56 + req: ReqOpen_57, + res: ResOpen_57 }, "slzd/OpenFort": { req: ReqOpenFort, @@ -1438,12 +1448,12 @@ export interface ServiceType { res: ResGuaJi }, "tanxian/Open": { - req: ReqOpen_57, - res: ResOpen_57 + req: ReqOpen_58, + res: ResOpen_58 }, "tanxian/Receive": { - req: ReqReceive_7, - res: ResReceive_7 + req: ReqReceive_8, + res: ResReceive_8 }, "task/AllFinsh": { req: ReqAllFinsh, @@ -1454,8 +1464,8 @@ export interface ServiceType { res: ResFinsh }, "task/Open": { - req: ReqOpen_58, - res: ResOpen_58 + req: ReqOpen_59, + res: ResOpen_59 }, "user/CDKEY": { req: ReqCDKEY, @@ -1518,8 +1528,8 @@ export interface ServiceType { res: ResExchange }, "weixiuchang/Open": { - req: ReqOpen_59, - res: ResOpen_59 + req: ReqOpen_60, + res: ResOpen_60 }, "weixiuchang/UpLv": { req: ReqUpLv, @@ -1562,8 +1572,8 @@ export interface ServiceType { res: ResJingCaiOpen }, "wzry/Open": { - req: ReqOpen_60, - res: ResOpen_60 + req: ReqOpen_61, + res: ResOpen_61 }, "wzry/UpdateFight": { req: ReqUpdateFight, @@ -1594,12 +1604,12 @@ export interface ServiceType { res: ResOnekeyReceive }, "xstask/Open": { - req: ReqOpen_61, - res: ResOpen_61 + req: ReqOpen_62, + res: ResOpen_62 }, "xstask/Receive": { - req: ReqReceive_8, - res: ResReceive_8 + req: ReqReceive_9, + res: ResReceive_9 }, "xstask/Refresh": { req: ReqRefresh_8, @@ -1984,136 +1994,146 @@ export const serviceProto: ServiceProto = { }, { "id": 65, - "name": "event/leijichongzhi/Open", + "name": "event/leichonglibao/Open", "type": "api" }, { "id": 66, - "name": "event/leijichongzhi/Rec", + "name": "event/leichonglibao/Receive", "type": "api" }, { "id": 67, - "name": "event/niudanji/Lottery", + "name": "event/leijichongzhi/Open", "type": "api" }, { "id": 68, - "name": "event/niudanji/Open", + "name": "event/leijichongzhi/Rec", "type": "api" }, { "id": 69, - "name": "event/pobinglibao/Open", + "name": "event/niudanji/Lottery", "type": "api" }, { "id": 70, - "name": "event/pobinglibao/Receive", + "name": "event/niudanji/Open", "type": "api" }, { "id": 71, - "name": "event/qirichongzhi/Open", + "name": "event/pobinglibao/Open", "type": "api" }, { "id": 72, - "name": "event/qirichongzhi/Rec", + "name": "event/pobinglibao/Receive", "type": "api" }, { "id": 73, - "name": "event/qiridenglu/Open", + "name": "event/qirichongzhi/Open", "type": "api" }, { "id": 74, - "name": "event/qiridenglu/RecPrize", + "name": "event/qirichongzhi/Rec", "type": "api" }, { "id": 75, - "name": "event/shiwuleichong/Open", + "name": "event/qiridenglu/Open", "type": "api" }, { "id": 76, - "name": "event/shouchong/Open", + "name": "event/qiridenglu/RecPrize", "type": "api" }, { "id": 77, - "name": "event/shouchong/Receive", + "name": "event/shiwuleichong/Open", "type": "api" }, { "id": 78, - "name": "event/xianshizhaomu/Buy", + "name": "event/shouchong/Open", "type": "api" }, { "id": 79, - "name": "event/xianshizhaomu/Duihuan", + "name": "event/shouchong/Receive", "type": "api" }, { "id": 80, - "name": "event/xianshizhaomu/Lottery", + "name": "event/xianshizhaomu/Buy", "type": "api" }, { "id": 81, - "name": "event/xianshizhaomu/Open", + "name": "event/xianshizhaomu/Duihuan", "type": "api" }, { "id": 82, - "name": "event/xianshizhaomu/Rec", + "name": "event/xianshizhaomu/Lottery", "type": "api" }, { "id": 83, - "name": "event/xiaofeijingsai/Open", + "name": "event/xianshizhaomu/Open", "type": "api" }, { "id": 84, - "name": "event/xinshoulibao/Open", + "name": "event/xianshizhaomu/Rec", "type": "api" }, { "id": 85, - "name": "event/yangchengmubiao/Buy", + "name": "event/xiaofeijingsai/Open", "type": "api" }, { "id": 86, - "name": "event/yangchengmubiao/Open", + "name": "event/xinshoulibao/Open", "type": "api" }, { "id": 87, - "name": "event/yangchengmubiao/Rec", + "name": "event/yangchengmubiao/Buy", "type": "api" }, { "id": 88, - "name": "event/yibaichou/Open", + "name": "event/yangchengmubiao/Open", "type": "api" }, { "id": 89, - "name": "event/yibaichou/Rec", + "name": "event/yangchengmubiao/Rec", "type": "api" }, { "id": 90, - "name": "event/yibaichou/RecAll", + "name": "event/yibaichou/Open", "type": "api" }, { "id": 91, + "name": "event/yibaichou/Rec", + "type": "api" + }, + { + "id": 92, + "name": "event/yibaichou/RecAll", + "type": "api" + }, + { + "id": 93, "name": "event/yuedujijin/Open", "type": "api", "conf": { @@ -2121,157 +2141,157 @@ export const serviceProto: ServiceProto = { } }, { - "id": 92, + "id": 94, "name": "event/yuedujijin/Rec", "type": "api" }, { - "id": 93, + "id": 95, "name": "event/zhanling/BuyLv", "type": "api" }, { - "id": 94, + "id": 96, "name": "event/zhanling/Open", "type": "api" }, { - "id": 95, + "id": 97, "name": "event/zhanling/RecPrize", "type": "api" }, { - "id": 96, + "id": 98, "name": "event/zhanling/RecTask", "type": "api" }, { - "id": 97, + "id": 99, "name": "event/zhoulibao/Open", "type": "api" }, { - "id": 98, + "id": 100, "name": "event/zhoumolibao/Open", "type": "api" }, { - "id": 99, + "id": 101, "name": "event/zhoumolibao/Receive", "type": "api" }, { - "id": 100, + "id": 102, "name": "event/zixuanlibao/Buy", "type": "api" }, { - "id": 101, + "id": 103, "name": "event/zixuanlibao/Open", "type": "api" }, { - "id": 102, + "id": 104, "name": "eventlist/hdGetList", "type": "api" }, { - "id": 103, + "id": 105, "name": "friend/Apply", "type": "api" }, { - "id": 104, + "id": 106, "name": "friend/Del", "type": "api" }, { - "id": 105, + "id": 107, "name": "friend/Gift", "type": "api" }, { - "id": 106, + "id": 108, "name": "friend/List", "type": "api" }, { - "id": 107, + "id": 109, "name": "friend/Open", "type": "api" }, { - "id": 108, + "id": 110, "name": "friend/Respond", "type": "api" }, { - "id": 109, + "id": 111, "name": "friend/RmBlackList", "type": "api" }, { - "id": 110, + "id": 112, "name": "friend/Search", "type": "api" }, { - "id": 111, + "id": 113, "name": "ganbutexun/Challenge", "type": "api" }, { - "id": 112, + "id": 114, "name": "ganbutexun/Open", "type": "api" }, { - "id": 113, + "id": 115, "name": "ganhai/Fast", "type": "api" }, { - "id": 114, + "id": 116, "name": "ganhai/Fight", "type": "api" }, { - "id": 115, + "id": 117, "name": "ganhai/Log", "type": "api" }, { - "id": 116, + "id": 118, "name": "ganhai/Open", "type": "api" }, { - "id": 117, + "id": 119, "name": "ganhai/Refresh", "type": "api" }, { - "id": 118, + "id": 120, "name": "ganhai/RefreshShip", "type": "api" }, { - "id": 119, + "id": 121, "name": "ganhai/Select", "type": "api" }, { - "id": 120, + "id": 122, "name": "gmapi/Gift", "type": "api" }, { - "id": 121, + "id": 123, "name": "gmapi/Post", "type": "api" }, { - "id": 122, + "id": 124, "name": "gonghui/Apply", "type": "api", "conf": { @@ -2281,7 +2301,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 123, + "id": 125, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2291,7 +2311,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 124, + "id": 126, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2301,7 +2321,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 125, + "id": 127, "name": "gonghui/Change", "type": "api", "conf": { @@ -2311,12 +2331,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 126, + "id": 128, "name": "gonghui/Create", "type": "api" }, { - "id": 127, + "id": 129, "name": "gonghui/Dissolve", "type": "api", "conf": { @@ -2326,7 +2346,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 128, + "id": 130, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2336,12 +2356,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 129, + "id": 131, "name": "gonghui/FbBuyNum", "type": "api" }, { - "id": 130, + "id": 132, "name": "gonghui/FbFight", "type": "api", "conf": { @@ -2351,7 +2371,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 131, + "id": 133, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2361,17 +2381,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 132, + "id": 134, "name": "gonghui/GetList", "type": "api" }, { - "id": 133, + "id": 135, "name": "gonghui/Join", "type": "api" }, { - "id": 134, + "id": 136, "name": "gonghui/Jx", "type": "api", "conf": { @@ -2381,7 +2401,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 135, + "id": 137, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2391,7 +2411,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 136, + "id": 138, "name": "gonghui/List", "type": "api", "conf": { @@ -2401,7 +2421,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 137, + "id": 139, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2411,7 +2431,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 138, + "id": 140, "name": "gonghui/Open", "type": "api", "conf": { @@ -2421,7 +2441,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 139, + "id": 141, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2431,7 +2451,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 140, + "id": 142, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2441,7 +2461,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 141, + "id": 143, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2451,7 +2471,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 142, + "id": 144, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2461,137 +2481,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 143, + "id": 145, "name": "gonghuibaozang/Lottery", "type": "api" }, { - "id": 144, + "id": 146, "name": "gonghuibaozang/Open", "type": "api" }, { - "id": 145, + "id": 147, "name": "gonglukuangbiao/Buy", "type": "api" }, { - "id": 146, + "id": 148, "name": "gonglukuangbiao/Fight", "type": "api" }, { - "id": 147, + "id": 149, "name": "gonglukuangbiao/Open", "type": "api" }, { - "id": 148, + "id": 150, "name": "gonglukuangbiao/Refresh", "type": "api" }, { - "id": 149, + "id": 151, "name": "gongyu/mingdao/Active", "type": "api" }, { - "id": 150, + "id": 152, "name": "gongyu/mingdao/Open", "type": "api" }, { - "id": 151, + "id": 153, "name": "gongyu/mingdao/RecPrize", "type": "api" }, { - "id": 152, + "id": 154, "name": "gongyu/mingdao/Repair", "type": "api" }, { - "id": 153, + "id": 155, "name": "gongyu/xunlianjihua/Reset", "type": "api" }, { - "id": 154, + "id": 156, "name": "gongyu/xunlianjihua/UpSkill", "type": "api" }, { - "id": 155, + "id": 157, "name": "gongyu/zuozhanjihua/SetSkill", "type": "api" }, { - "id": 156, + "id": 158, "name": "hbzb/jfs/BuyNum", "type": "api" }, { - "id": 157, + "id": 159, "name": "hbzb/jfs/Fight", "type": "api" }, { - "id": 158, + "id": 160, "name": "hbzb/jfs/GetLog", "type": "api" }, { - "id": 159, + "id": 161, "name": "hbzb/jfs/Open", "type": "api" }, { - "id": 160, + "id": 162, "name": "hbzb/jfs/Rec", "type": "api" }, { - "id": 161, + "id": 163, "name": "hbzb/jfs/Refresh", "type": "api" }, { - "id": 162, + "id": 164, "name": "hbzb/GetStatus", "type": "api" }, { - "id": 163, + "id": 165, "name": "hbzb/zbs/BuyNum", "type": "api" }, { - "id": 164, + "id": 166, "name": "hbzb/zbs/Fight", "type": "api" }, { - "id": 165, + "id": 167, "name": "hbzb/zbs/GetLog", "type": "api" }, { - "id": 166, + "id": 168, "name": "hbzb/zbs/Open", "type": "api" }, { - "id": 167, + "id": 169, "name": "hbzb/zbs/Refresh", "type": "api" }, { - "id": 168, + "id": 170, "name": "hero/Awake", "type": "api" }, { - "id": 169, + "id": 171, "name": "hero/ChangePos", "type": "api", "conf": { @@ -2599,17 +2619,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 170, + "id": 172, "name": "hero/GetList", "type": "api" }, { - "id": 171, + "id": 173, "name": "hero/JinJie", "type": "api" }, { - "id": 172, + "id": 174, "name": "hero/LvUp", "type": "api", "conf": { @@ -2617,32 +2637,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 173, + "id": 175, "name": "hero/Potency", "type": "api" }, { - "id": 174, + "id": 176, "name": "hero/Rec", "type": "api" }, { - "id": 175, + "id": 177, "name": "hero/Reset", "type": "api" }, { - "id": 176, + "id": 178, "name": "hero/Talent", "type": "api" }, { - "id": 177, + "id": 179, "name": "hero/WeaponUp", "type": "api" }, { - "id": 178, + "id": 180, "name": "hongdian/Get", "type": "api", "conf": { @@ -2650,117 +2670,117 @@ export const serviceProto: ServiceProto = { } }, { - "id": 179, + "id": 181, "name": "item/GetList", "type": "api" }, { - "id": 180, + "id": 182, "name": "item/Use", "type": "api" }, { - "id": 181, + "id": 183, "name": "jiaotang/Lottery", "type": "api" }, { - "id": 182, + "id": 184, "name": "jiaotang/Open", "type": "api" }, { - "id": 183, + "id": 185, "name": "jiuba/Lottery", "type": "api" }, { - "id": 184, + "id": 186, "name": "jiuba/Open", "type": "api" }, { - "id": 185, + "id": 187, "name": "jjc/BuyFightNum", "type": "api" }, { - "id": 186, + "id": 188, "name": "jjc/Fight", "type": "api" }, { - "id": 187, + "id": 189, "name": "jjc/FightLog", "type": "api" }, { - "id": 188, + "id": 190, "name": "jjc/Open", "type": "api" }, { - "id": 189, + "id": 191, "name": "jjc/Receive", "type": "api" }, { - "id": 190, + "id": 192, "name": "jjc/Refresh", "type": "api" }, { - "id": 191, + "id": 193, "name": "kaifujingsai/Open", "type": "api" }, { - "id": 192, + "id": 194, "name": "kaifujingsai/Receive", "type": "api" }, { - "id": 193, + "id": 195, "name": "kbzz/Apply", "type": "api" }, { - "id": 194, + "id": 196, "name": "kbzz/AutoApply", "type": "api" }, { - "id": 195, + "id": 197, "name": "kbzz/BuyNum", "type": "api" }, { - "id": 196, + "id": 198, "name": "kbzz/Fight", "type": "api" }, { - "id": 197, + "id": 199, "name": "kbzz/FightLog", "type": "api" }, { - "id": 198, + "id": 200, "name": "kbzz/GroupState", "type": "api" }, { - "id": 199, + "id": 201, "name": "kbzz/Open", "type": "api" }, { - "id": 200, + "id": 202, "name": "kbzz/RecPrize", "type": "api" }, { - "id": 201, + "id": 203, "name": "kbzz/Refresh", "type": "api", "conf": { @@ -2768,287 +2788,287 @@ export const serviceProto: ServiceProto = { } }, { - "id": 202, + "id": 204, "name": "kuangdong/AddPkNum", "type": "api" }, { - "id": 203, + "id": 205, "name": "kuangdong/GetPrize", "type": "api" }, { - "id": 204, + "id": 206, "name": "kuangdong/KdInfo", "type": "api" }, { - "id": 205, + "id": 207, "name": "kuangdong/Log", "type": "api" }, { - "id": 206, + "id": 208, "name": "kuangdong/Open", "type": "api" }, { - "id": 207, + "id": 209, "name": "kuangdong/YanShi", "type": "api" }, { - "id": 208, + "id": 210, "name": "kuangdong/ZhanLing", "type": "api" }, { - "id": 209, + "id": 211, "name": "lingzhulaixi/Open", "type": "api" }, { - "id": 210, + "id": 212, "name": "lingzhulaixi/PkBoss", "type": "api" }, { - "id": 211, + "id": 213, "name": "lingzhulaixi/PkRank", "type": "api" }, { - "id": 212, + "id": 214, "name": "lingzhulaixi/SaoDang", "type": "api" }, { - "id": 213, + "id": 215, "name": "meirishilian/Buy", "type": "api" }, { - "id": 214, + "id": 216, "name": "meirishilian/Fight", "type": "api" }, { - "id": 215, + "id": 217, "name": "meirishilian/Open", "type": "api" }, { - "id": 216, + "id": 218, "name": "msg_c2s/BindUid", "type": "msg" }, { - "id": 217, + "id": 219, "name": "msg_c2s/Pay", "type": "msg" }, { - "id": 218, + "id": 220, "name": "msg_c2s/Sync", "type": "msg" }, { - "id": 219, + "id": 221, "name": "msg_s2c/Chat", "type": "msg" }, { - "id": 220, + "id": 222, "name": "msg_s2c/ChatHelp", "type": "msg" }, { - "id": 221, + "id": 223, "name": "msg_s2c/Collection", "type": "msg" }, { - "id": 222, + "id": 224, "name": "msg_s2c/Email", "type": "msg" }, { - "id": 223, + "id": 225, "name": "msg_s2c/EmailDel", "type": "msg" }, { - "id": 224, + "id": 226, "name": "msg_s2c/EquipChange", "type": "msg" }, { - "id": 225, + "id": 227, "name": "msg_s2c/Friend", "type": "msg" }, { - "id": 226, + "id": 228, "name": "msg_s2c/GhChange", "type": "msg" }, { - "id": 227, + "id": 229, "name": "msg_s2c/GongHuiBaoZang", "type": "msg" }, { - "id": 228, + "id": 230, "name": "msg_s2c/HeroChange", "type": "msg" }, { - "id": 229, + "id": 231, "name": "msg_s2c/HongDianChange", "type": "msg" }, { - "id": 230, + "id": 232, "name": "msg_s2c/ItemChange", "type": "msg" }, { - "id": 231, + "id": 233, "name": "msg_s2c/LoginQueue", "type": "msg" }, { - "id": 232, + "id": 234, "name": "msg_s2c/LshdChange", "type": "msg" }, { - "id": 233, + "id": 235, "name": "msg_s2c/NewDay", "type": "msg" }, { - "id": 234, + "id": 236, "name": "msg_s2c/OtherLogin", "type": "msg" }, { - "id": 235, + "id": 237, "name": "msg_s2c/PayChange", "type": "msg" }, { - "id": 236, + "id": 238, "name": "msg_s2c/PayResult", "type": "msg" }, { - "id": 237, + "id": 239, "name": "msg_s2c/PeijianChange", "type": "msg" }, { - "id": 238, + "id": 240, "name": "msg_s2c/PlayerChange", "type": "msg" }, { - "id": 239, + "id": 241, "name": "msg_s2c/Private", "type": "msg" }, { - "id": 240, + "id": 242, "name": "msg_s2c/PushGiftChange", "type": "msg" }, { - "id": 241, + "id": 243, "name": "msg_s2c/SendGift", "type": "msg" }, { - "id": 242, + "id": 244, "name": "msg_s2c/ShiwuChange", "type": "msg" }, { - "id": 243, + "id": 245, "name": "msg_s2c/TaskChange", "type": "msg" }, { - "id": 244, + "id": 246, "name": "msg_s2c/Xianshilibao", "type": "msg" }, { - "id": 245, + "id": 247, "name": "pata/Fight", "type": "api" }, { - "id": 246, + "id": 248, "name": "pata/GetPrize", "type": "api" }, { - "id": 247, + "id": 249, "name": "pata/Open", "type": "api" }, { - "id": 248, + "id": 250, "name": "pata/SaoDang", "type": "api" }, { - "id": 249, + "id": 251, "name": "pay/GetList", "type": "api" }, { - "id": 250, + "id": 252, "name": "peijian/GetList", "type": "api" }, { - "id": 251, + "id": 253, "name": "peijian/JingLian", "type": "api" }, { - "id": 252, + "id": 254, "name": "peijian/JinJie", "type": "api" }, { - "id": 253, + "id": 255, "name": "peijian/LvUp", "type": "api" }, { - "id": 254, + "id": 256, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 255, + "id": 257, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 256, + "id": 258, "name": "peijian/Reset", "type": "api" }, { - "id": 257, + "id": 259, "name": "peijian/Rm", "type": "api" }, { - "id": 258, + "id": 260, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3056,32 +3076,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 259, + "id": 261, "name": "peijian/UnLock", "type": "api" }, { - "id": 260, + "id": 262, "name": "peijian/Wear", "type": "api" }, { - "id": 261, + "id": 263, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 262, + "id": 264, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 263, + "id": 265, "name": "peijiancangku/Open", "type": "api" }, { - "id": 264, + "id": 266, "name": "Bingo", "type": "api", "conf": { @@ -3089,142 +3109,142 @@ export const serviceProto: ServiceProto = { } }, { - "id": 265, + "id": 267, "name": "FightTest", "type": "api" }, { - "id": 266, + "id": 268, "name": "SyncBtn", "type": "api" }, { - "id": 267, + "id": 269, "name": "Test", "type": "api" }, { - "id": 268, + "id": 270, "name": "pushgift/Open", "type": "api" }, { - "id": 269, + "id": 271, "name": "qjzzd/Fight", "type": "api" }, { - "id": 270, + "id": 272, "name": "qjzzd/Open", "type": "api" }, { - "id": 271, + "id": 273, "name": "rank/Open", "type": "api" }, { - "id": 272, + "id": 274, "name": "shiwu/Concise", "type": "api" }, { - "id": 273, + "id": 275, "name": "shiwu/Extract", "type": "api" }, { - "id": 274, + "id": 276, "name": "shiwu/GetList", "type": "api" }, { - "id": 275, + "id": 277, "name": "shiwu/LvUp", "type": "api" }, { - "id": 276, + "id": 278, "name": "shiwu/Recast", "type": "api" }, { - "id": 277, + "id": 279, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 278, + "id": 280, "name": "shiwu/Wear", "type": "api" }, { - "id": 279, + "id": 281, "name": "shootGame/Open", "type": "api" }, { - "id": 280, + "id": 282, "name": "shootGame/Rec", "type": "api" }, { - "id": 281, + "id": 283, "name": "shop/Buy", "type": "api" }, { - "id": 282, + "id": 284, "name": "shop/Open", "type": "api" }, { - "id": 283, + "id": 285, "name": "shop/Refresh", "type": "api" }, { - "id": 284, + "id": 286, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 285, + "id": 287, "name": "sign/GetPrize", "type": "api" }, { - "id": 286, + "id": 288, "name": "sign/Open", "type": "api" }, { - "id": 287, + "id": 289, "name": "slzd/Aim", "type": "api" }, { - "id": 288, + "id": 290, "name": "slzd/BuyNum", "type": "api" }, { - "id": 289, + "id": 291, "name": "slzd/Fight", "type": "api" }, { - "id": 290, + "id": 292, "name": "slzd/FightLog", "type": "api" }, { - "id": 291, + "id": 293, "name": "slzd/MyRank", "type": "api" }, { - "id": 292, + "id": 294, "name": "slzd/Open", "type": "api", "conf": { @@ -3234,77 +3254,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 293, + "id": 295, "name": "slzd/OpenFort", "type": "api" }, { - "id": 294, + "id": 296, "name": "slzd/Rec", "type": "api" }, { - "id": 295, + "id": 297, "name": "slzd/Refresh", "type": "api" }, { - "id": 296, + "id": 298, "name": "slzd/Slot", "type": "api" }, { - "id": 297, + "id": 299, "name": "tanxian/Event", "type": "api" }, { - "id": 298, + "id": 300, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 299, + "id": 301, "name": "tanxian/Fight", "type": "api" }, { - "id": 300, + "id": 302, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 301, + "id": 303, "name": "tanxian/Open", "type": "api" }, { - "id": 302, + "id": 304, "name": "tanxian/Receive", "type": "api" }, { - "id": 303, + "id": 305, "name": "task/AllFinsh", "type": "api" }, { - "id": 304, + "id": 306, "name": "task/Finsh", "type": "api" }, { - "id": 305, + "id": 307, "name": "task/Open", "type": "api" }, { - "id": 306, + "id": 308, "name": "user/CDKEY", "type": "api" }, { - "id": 307, + "id": 309, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3312,197 +3332,197 @@ export const serviceProto: ServiceProto = { } }, { - "id": 308, + "id": 310, "name": "user/ChangeName", "type": "api" }, { - "id": 309, + "id": 311, "name": "user/Fight", "type": "api" }, { - "id": 310, + "id": 312, "name": "user/GetInfo", "type": "api" }, { - "id": 311, + "id": 313, "name": "user/InfoOpen", "type": "api" }, { - "id": 312, + "id": 314, "name": "user/Login", "type": "api" }, { - "id": 313, + "id": 315, "name": "user/Ping", "type": "api" }, { - "id": 314, + "id": 316, "name": "user/Renown", "type": "api" }, { - "id": 315, + "id": 317, "name": "user/RenownBuy", "type": "api" }, { - "id": 316, + "id": 318, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 317, + "id": 319, "name": "user/RenownOpen", "type": "api" }, { - "id": 318, + "id": 320, "name": "user/Tujian", "type": "api" }, { - "id": 319, + "id": 321, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 320, + "id": 322, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 321, + "id": 323, "name": "weixiuchang/Open", "type": "api" }, { - "id": 322, + "id": 324, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 323, + "id": 325, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 324, + "id": 326, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 325, + "id": 327, "name": "wzry/BaoMing", "type": "api" }, { - "id": 326, + "id": 328, "name": "wzry/catFightLog", "type": "api" }, { - "id": 327, + "id": 329, "name": "wzry/CatGroup", "type": "api" }, { - "id": 328, + "id": 330, "name": "wzry/DldFight", "type": "api" }, { - "id": 329, + "id": 331, "name": "wzry/DldRefre", "type": "api" }, { - "id": 330, + "id": 332, "name": "wzry/JingCai", "type": "api" }, { - "id": 331, + "id": 333, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 332, + "id": 334, "name": "wzry/Open", "type": "api" }, { - "id": 333, + "id": 335, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 334, + "id": 336, "name": "wzry/Wzzd", "type": "api" }, { - "id": 335, + "id": 337, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 336, + "id": 338, "name": "xstask/AllGet", "type": "api" }, { - "id": 337, + "id": 339, "name": "xstask/Get", "type": "api" }, { - "id": 338, + "id": 340, "name": "xstask/LvUp", "type": "api" }, { - "id": 339, + "id": 341, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 340, + "id": 342, "name": "xstask/Open", "type": "api" }, { - "id": 341, + "id": 343, "name": "xstask/Receive", "type": "api" }, { - "id": 342, + "id": 344, "name": "xstask/Refresh", "type": "api" }, { - "id": 343, + "id": 345, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 344, + "id": 346, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 345, + "id": 347, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 346, + "id": 348, "name": "zhanqianbushu/Up", "type": "api" } @@ -10025,6 +10045,46 @@ export const serviceProto: ServiceProto = { } ] }, + "event/leichonglibao/PtlOpen/ReqOpen": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "hdid", + "type": { + "type": "Number" + } + } + ] + }, + "event/leichonglibao/PtlOpen/ResOpen": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "sc", + "type": { + "type": "Boolean" + } + }, + { + "id": 1, + "name": "buy", + "type": { + "type": "Array", + "elementType": { + "type": "String" + } + } + } + ] + }, + "event/leichonglibao/PtlReceive/ReqReceive": { + "type": "Interface" + }, + "event/leichonglibao/PtlReceive/ResReceive": { + "type": "Interface" + }, "event/leijichongzhi/PtlOpen/ReqOpen": { "type": "Interface", "properties": [ @@ -10680,7 +10740,8 @@ export const serviceProto: ServiceProto = { "name": "limit", "type": { "type": "Number" - } + }, + "optional": true } ] }, From bfb6e4ff4ecc6d494f856d4575326075b8874829 Mon Sep 17 00:00:00 2001 From: chenkai Date: Thu, 21 Dec 2023 21:40:49 +0800 Subject: [PATCH 49/90] =?UTF-8?q?build:=20=E6=9B=B4=E6=96=B0=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/json/huodong.json5 | 76 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 70 insertions(+), 6 deletions(-) diff --git a/src/json/huodong.json5 b/src/json/huodong.json5 index e66b88a..4e332e8 100644 --- a/src/json/huodong.json5 +++ b/src/json/huodong.json5 @@ -3988,27 +3988,31 @@ "data" : { //活动文本描述 intr: "xfjstips_1", - intr: "xfjstips_2", - //排名 + intr2: "xfjstips_2", + //奖励邮件标题 + mailTitle: "intr_xfjs_mailTitle", + //奖励邮件内容 + mailDes: "intr_xfjs_mailDes", + //排名 rank: [ { id: '1', name: 'xfjstips_3', - rank:[1], + rank:[1,1], need: [{'a': 'attr', 't': 'rmbmoney', 'n': 20000}], prize: [{'a': 'item', 't': '13', 'n': 600}] }, { id: '2', name: 'xfjstips_4', - rank:[2], + rank:[2,2], need: [{'a': 'attr', 't': 'rmbmoney', 'n': 18000}], prize: [{'a': 'item', 't': '13', 'n': 600}] }, { id: '3', name: 'xfjstips_5', - rank:[3], + rank:[3,3], need: [{'a': 'attr', 't': 'rmbmoney', 'n': 16000}], prize: [{'a': 'item', 't': '13', 'n': 600}] }, @@ -4025,6 +4029,13 @@ rank:[11,30], need: [{'a': 'attr', 't': 'rmbmoney', 'n': 12000}], prize: [{'a': 'item', 't': '13', 'n': 600}] + }, + { + id: '6', + name: 'xfjstips_8', + rank:[31,9999], + need: [{'a': 'attr', 't': 'rmbmoney', 'n': 12000}], + prize: [{'a': 'item', 't': '13', 'n': 600}] } ] } @@ -4043,15 +4054,17 @@ "data" : { //活动文本描述 intr: "ljlibaotips_1", - intr: "ljlibaotips_2", + intr2: "ljlibaotips_2", //礼包 gift: [ { id: '1', + name: 'ljlibaotips_3', need:[], free: false, payId: 'ljlibao_1', + //返利比 scale: 200, buynum: 1, prize:[ @@ -4179,7 +4192,11 @@ ] }, ], + //买X次可以领大奖 + payRewardNum: 5, //自选框掉落池 + //配几组就显示有几个格子 + //配置的是可选的道具 dlz: [ { "1": {"a": "item", "t":"600", "n": 20}, @@ -4224,5 +4241,52 @@ } ] } + }, + { + "hdid" : 13000, // 唯一活动id 累计购买礼包 + "htype" : 13, // 后端唯一识别标识 + "stype" : 1300, // 前端唯一识别标识（看前端需要是否修改） + "ttype" : 0, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动 + "stime" : 0, // 活动开始天数 + "rtime" : 30, // 活动显示结束天数 + "etime" : 30, // 活动实际结束 + "name": "fenhongbao", + "icon": "icon_fenhongbao", + "showtime" : "仅供参考，会复写正确值", // 自选礼包，如果存在多个活动，计费点不要设置一样；如果是一样，可能会存在付费一次，购买多次。 + "data" : { + //活动文本描述 + intr: "zuanshihongbao_5", + //分红包所需最低钻石数 + loglimit: 1000, + //奖池总数量 + jackpot: 100000, + //档位 + arr: [ + { + //权重 + "weight": 50, + //获得范围 + "numrange": [1000,1500] + }, + { + //权重 + "weight": 30, + //获得范围 + "numrange": [1500,2000] + }, + { + //权重 + "weight": 15, + //获得范围 + "numrange": [2000,3000] + }, + { + //权重 + "weight": 5, + //获得范围 + "numrange": [3000,8000] + } + ] + } } ] \ No newline at end of file From 3d43fa1a34f9121c060a9b3a16ae16a546c0557b Mon Sep 17 00:00:00 2001 From: chenkai Date: Fri, 22 Dec 2023 10:07:23 +0800 Subject: [PATCH 50/90] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E6=8A=A2?= =?UTF-8?q?=E9=92=BB=E7=9F=B3=E6=B4=BB=E5=8A=A8=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/json/huodong.json5 | 62 +++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/src/json/huodong.json5 b/src/json/huodong.json5 index 4e332e8..c049895 100644 --- a/src/json/huodong.json5 +++ b/src/json/huodong.json5 @@ -4257,36 +4257,42 @@ //活动文本描述 intr: "zuanshihongbao_5", //分红包所需最低钻石数 - loglimit: 1000, + price: 1000, + reset: 0, //奖池总数量 - jackpot: 100000, - //档位 - arr: [ - { - //权重 - "weight": 50, - //获得范围 - "numrange": [1000,1500] - }, - { - //权重 - "weight": 30, - //获得范围 - "numrange": [1500,2000] - }, - { - //权重 - "weight": 15, - //获得范围 - "numrange": [2000,3000] - }, - { - //权重 - "weight": 5, - //获得范围 - "numrange": [3000,8000] + totalmoney: 100000, + groupConf: { + //档位 + base: { + loglimit:2000, + arr:[ + { + //权重 + "weight": 50, + //获得范围 + "numrange": [1000,1500] + }, + { + //权重 + "weight": 30, + //获得范围 + "numrange": [1500,2000] + }, + { + //权重 + "weight": 15, + //获得范围 + "numrange": [2000,3000] + }, + { + //权重 + "weight": 5, + //获得范围 + "numrange": [3000,8000] + } + ] } - ] + } } } ] \ No newline at end of file From 4b190272b172f277053b66aeff566afb7db4c714 Mon Sep 17 00:00:00 2001 From: chenkai Date: Fri, 22 Dec 2023 10:11:24 +0800 Subject: [PATCH 51/90] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=20remaining=20?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/payForDiamond/ApiCanReceive.ts | 2 +- src/api_s2c/event/payForDiamond/ApiReceive.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts index b77fe24..a39596f 100644 --- a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts @@ -8,7 +8,7 @@ export async function playerCanReceive(call: ApiCall) { if (!activityInfo) { return call.error('No such activity'); } - const remaining = activityInfo.data['remaining']; + const remaining = typeof activityInfo.data['remaining'] === 'number'? activityInfo.data['remaining'] : activityInfo.data['totalmoney']; const zeroTime = PublicShared.getToDayZeroTime(); const dayPayInfo = await G.mongodb.collection('dayPay').findOne({ uid: call.uid, time: zeroTime }); if (!dayPayInfo || !dayPayInfo.payNum) { diff --git a/src/api_s2c/event/payForDiamond/ApiReceive.ts b/src/api_s2c/event/payForDiamond/ApiReceive.ts index aaf8a56..bb1d00d 100644 --- a/src/api_s2c/event/payForDiamond/ApiReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiReceive.ts @@ -66,7 +66,7 @@ export default async function (call: ApiCall) { }); } const activityData = canReceiveResult.activityInfo.data; - const remaining = activityData['remaining']? activityData['remaining'] : activityData['totalmoney']; + const remaining = typeof activityData['remaining'] === 'number'? activityData['remaining'] : activityData['totalmoney']; const { group, maxAmount } = randomWithWeight(activityData['groupConf']['arr']); const gotAmount = calcDiamondGot(remaining, group, maxAmount); // 减去余额 From 76a04a34d5b6ca9e3eaaf4d66dd304786c1fd205 Mon Sep 17 00:00:00 2001 From: chenkai Date: Fri, 22 Dec 2023 11:30:54 +0800 Subject: [PATCH 52/90] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20groups=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=96=E5=80=BC=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/payForDiamond/ApiReceive.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api_s2c/event/payForDiamond/ApiReceive.ts b/src/api_s2c/event/payForDiamond/ApiReceive.ts index bb1d00d..cb45b06 100644 --- a/src/api_s2c/event/payForDiamond/ApiReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiReceive.ts @@ -67,7 +67,7 @@ export default async function (call: ApiCall) { } const activityData = canReceiveResult.activityInfo.data; const remaining = typeof activityData['remaining'] === 'number'? activityData['remaining'] : activityData['totalmoney']; - const { group, maxAmount } = randomWithWeight(activityData['groupConf']['arr']); + const { group, maxAmount } = randomWithWeight(activityData['groupConf']['base']['arr']); const gotAmount = calcDiamondGot(remaining, group, maxAmount); // 减去余额 const filter = { From f17f4182a9f92ab166b993a864d7157b3c971132 Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 22 Dec 2023 11:39:17 +0800 Subject: [PATCH 53/90] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E7=AB=9E=E8=B5=9B?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/xiaofeijingsai/ApiOpen.ts | 51 ++++++++--- src/public/scheduler/scheduler.ts | 5 +- .../scheduler/scheduler_xiaofeijingsai.ts | 68 ++++++++++++++ .../protocols/event/xiaofeijingsai/PtlOpen.ts | 13 ++- src/shared/protocols/serviceProto.ts | 88 ++++++++----------- 5 files changed, 160 insertions(+), 65 deletions(-) create mode 100644 src/public/scheduler/scheduler_xiaofeijingsai.ts diff --git a/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts b/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts index 1473ee6..940eec1 100644 --- a/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts +++ b/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts @@ -1,16 +1,15 @@ import {ApiCall} from "tsrpc"; import {ReqOpen, ResOpen} from "../../../shared/protocols/event/xiaofeijingsai/PtlOpen"; -import {PayFun} from "../../../public/pay"; import {HuoDongFun} from "../../../public/huodongfun"; -import {PublicShared} from "../../../shared/public/public"; /** * 消费竞赛 - * redis缓存3分钟 + * redis缓存120秒 * 返回活动日期内的 * @param call */ export default async function (call: ApiCall) { + let ioList = await G.ioredis.get(`rank:xiaofeijingsai`); if (ioList) { let myData = await getMyData(call, JSON.parse(ioList)) @@ -31,18 +30,42 @@ export default async function (call: ApiCall) { let list: any = rmbuse.map(i => ({...i, total: R.negate(i.total)})) - let users = await G.mongodb.collection('user').find({uid: {$in: list.map(i => i._id)}}).toArray() - list = list.map(i => ({...i, player: users.find(v => v.uid == i._id)})) + let rankList = sortRankList(_hd.data.rank, list) + + let users = await G.mongodb.collection('user').find({uid: {$in: rankList.map(i => i._id).filter(i => i._id != 'system')}}).toArray() + + rankList = rankList.map(i => ({...i, player: users.find(v => v.uid == i._id) || {}})) // 活动结束前半小时，缓存过期时间改为10秒 let exTime = (G.time + 1800) > _hd.etime ? 10 : 180 - G.ioredis.setex(`rank:xiaofeijingsai`, exTime, JSON.stringify(list)); + G.ioredis.setex(`rank:xiaofeijingsai`, exTime, JSON.stringify(rankList)); - let myData = await getMyData(call, list, _hd) + let myData = await getMyData(call, rankList, _hd) - call.succ({list, myData}) + call.succ({list: rankList, myData}) +} + +/** + * 需要满足消耗条件才能添加到排行榜，不满足的时候排行榜加system占位 + * @param rank + * @param list + */ +export function sortRankList(rank, list) { + let rankList = [] + let ccc = 0 + rank.map(i => { + for (let k = i.rank[0] - 1; k < i.rank[1]; k++) { + if (list[k]?.total >= i.need[0].n) { + rankList.push({...list[k - ccc], rank: k}) + } else { + rankList.push({_id: 'system', total: 0, rank: k, player: {}}) + ccc += 1 + } + } + }) + return R.sort((a, b) => a.rank - b.rank)(rankList) } // 获取自己的信息 @@ -53,10 +76,16 @@ async function getMyData(call, rankList, _hd?) { if (!_hd) { _hd = (await HuoDongFun.gethdList(call, 11))[0] } - let a = await G.mongodb.collection('rmbuse').aggregate([ + let myCut = (await G.mongodb.collection('rmbuse').aggregate([ {$match: {uid: call.uid, isAdd: false, cTime: {$gte: _hd.stime, $lte: _hd.etime}}}, {$group: {_id: "$uid", total: {$sum: "$change"}}} - ]).toArray() + ]).toArray())[0] + let myUser = await G.mongodb.collection('user').findOne({uid: call.uid}) - return {player: myUser, ...a} + + if (!myCut) { + myCut = {_id: myUser.uid, total: 0} + } + + return {player: myUser, ...myCut, rank: -1} } \ No newline at end of file diff --git a/src/public/scheduler/scheduler.ts b/src/public/scheduler/scheduler.ts index a738ed2..a8b93a7 100644 --- a/src/public/scheduler/scheduler.ts +++ b/src/public/scheduler/scheduler.ts @@ -37,7 +37,8 @@ export type schedulerType = | 'hbzb_zbs_clear' | 'hbzb_zbs_group' | 'wzry_zuanshi16to8' - | "cross_email_pull"; + | "cross_email_pull" + | "xiaofeijingsai_local_ctor"; export class SchedulerManage { static logTime = false; @@ -102,7 +103,7 @@ export abstract class Scheduler { } - init(){ + init() { Scheduler.schedulers.push(this); this.read().then(_ => { this.log(`state: 准备完毕 预计下次执行时间：${new Date(this.startTime * 1000).format("YYYY-MM-DD hh:mm:ss")}`); diff --git a/src/public/scheduler/scheduler_xiaofeijingsai.ts b/src/public/scheduler/scheduler_xiaofeijingsai.ts new file mode 100644 index 0000000..fb50c51 --- /dev/null +++ b/src/public/scheduler/scheduler_xiaofeijingsai.ts @@ -0,0 +1,68 @@ +import {Scheduler, schedulerType} from './scheduler'; +import {PublicShared} from "../../shared/public/public"; +import {Wjjl} from "../../module/collection_wjjl"; +import {ZhanLingTasks} from "../zhanling"; +import {setGud} from '../gud'; +import {HuoDongFun} from "../huodongfun"; +import {EmailFun} from "../email"; +import {sortRankList} from "../../api_s2c/event/xiaofeijingsai/ApiOpen"; + + +export class SchedulerXiaofeijingsaiLocalCtor extends Scheduler { + id: schedulerType = 'xiaofeijingsai_local_ctor'; + time = 300; + name = '消费竞赛定时器发奖'; + type: 'day' | 'week' = 'day'; + + // todo 测试 + // get nextTime() { + // return G.time + 60; + // } + + async read() { + await this.ctorStartTime(); + this.isReady = false; + } + + async start() { + let _hd = (await G.mongodb.collection('hdinfo').find({ + htype: 11, + ttype: 0, + etime: {$lt: G.time, $gt: 99999999}, + isSendPrize: {$or: [{$exists: false}, {$eq: false}]}, + }).sort({etime: -1}).limit(1).toArray())[0] + + if (!_hd) return + + let limit = _hd.data?.rank?.slice(-1)?.[0]?.rank?.slice(-1)?.[0] || 100 + let rmbuse = await G.mongodb.collection('rmbuse').aggregate([ + {$match: {isAdd: false, cTime: {$gte: _hd.stime, $lte: _hd.etime}}}, + {$group: {_id: "$uid", total: {$sum: "$change"}}}, + {$sort: {total: 1}}, + {$limit: limit} + ]).toArray() + + let list: any = rmbuse.map(i => ({...i, total: R.negate(i.total)})) + + let ranklist = sortRankList(_hd.data.rank, list) + + R.forEach(i => { + let users = R.slice(i.rank[0] - 1, i.rank[1])(ranklist) + users.map(v=>{ + EmailFun.addEmail({ + uid: v._id, + type: 'system', + title: 'email.titel', + content: 'email.content', + prize: i.prize, + // contentInsertArr: [conf.ph[0] + index] + }); + }) + })(_hd.data.rank) + + await G.mongodb.collection('hdinfo').findOneAndUpdate({hdid: _hd.hdid}, {$set: {isSendPrize: true}}) + + console.log(_hd) + + } +} diff --git a/src/shared/protocols/event/xiaofeijingsai/PtlOpen.ts b/src/shared/protocols/event/xiaofeijingsai/PtlOpen.ts index 675b479..150e12a 100644 --- a/src/shared/protocols/event/xiaofeijingsai/PtlOpen.ts +++ b/src/shared/protocols/event/xiaofeijingsai/PtlOpen.ts @@ -6,6 +6,13 @@ export type ReqOpen = { }; export type ResOpen = { - list: { _id: string, total: number, player: any }[] - myData: { _id: string, total: number, player: any } -}; \ No newline at end of file + list: data[] + myData: data +}; + +type data = { + _id: string, + total: number, + rank: number, + player: any +} \ No newline at end of file diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 1f614dd..0c851c1 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -10541,7 +10541,8 @@ export const serviceProto: ServiceProto = { "name": "limit", "type": { "type": "Number" - } + }, + "optional": true } ] }, @@ -10554,30 +10555,8 @@ export const serviceProto: ServiceProto = { "type": { "type": "Array", "elementType": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "_id", - "type": { - "type": "String" - } - }, - { - "id": 1, - "name": "total", - "type": { - "type": "Number" - } - }, - { - "id": 2, - "name": "player", - "type": { - "type": "Any" - } - } - ] + "type": "Reference", + "target": "event/xiaofeijingsai/PtlOpen/data" } } }, @@ -10585,30 +10564,41 @@ export const serviceProto: ServiceProto = { "id": 1, "name": "myData", "type": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "_id", - "type": { - "type": "String" - } - }, - { - "id": 1, - "name": "total", - "type": { - "type": "Number" - } - }, - { - "id": 2, - "name": "player", - "type": { - "type": "Any" - } - } - ] + "type": "Reference", + "target": "event/xiaofeijingsai/PtlOpen/data" + } + } + ] + }, + "event/xiaofeijingsai/PtlOpen/data": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "_id", + "type": { + "type": "String" + } + }, + { + "id": 1, + "name": "total", + "type": { + "type": "Number" + } + }, + { + "id": 2, + "name": "rank", + "type": { + "type": "Number" + } + }, + { + "id": 3, + "name": "player", + "type": { + "type": "Any" } } ] From a326ef7d39bfad2b5501b59f23e84f924a45892f Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 22 Dec 2023 11:49:14 +0800 Subject: [PATCH 54/90] =?UTF-8?q?feat:=20=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/fix_patch/patch_20231222.ts | 98 +++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 src/fix_patch/patch_20231222.ts diff --git a/src/fix_patch/patch_20231222.ts b/src/fix_patch/patch_20231222.ts new file mode 100644 index 0000000..1aba776 --- /dev/null +++ b/src/fix_patch/patch_20231222.ts @@ -0,0 +1,98 @@ +import {ctor} from "../global"; +import {_mongodb} from "../setMongodb"; +import {MongoClient} from "mongodb"; + +async function initMongoDB() { + console.log('connect mongodb ......'); + let client = await MongoClient.connect(G.config.mongodbUrl); + G.mongodb = new _mongodb(client.db(G.config.dbName || '')); + console.log('connect mongodb succ'); +} + +async function start() { + await initMongoDB() + + const task = { + '2001': { + 'prize': [{'a': 'item', 't': '4', 'n': 5}, {'a': 'item', 't': '626', 'n': 10}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 50, + 'cond': [], + 'stype': 118 + }, + '2002': { + 'prize': [{'a': 'item', 't': '4', 'n': 5}, {'a': 'item', 't': '626', 'n': 10}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 100, + 'cond': [], + 'stype': 118 + }, + '2003': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '626', 'n': 20}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 200, + 'cond': [], + 'stype': 118 + }, + '2004': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 20}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 250, + 'cond': [], + 'stype': 118 + }, + '2005': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 20}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 300, + 'cond': [], + 'stype': 118 + }, + '2006': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 400, + 'cond': [], + 'stype': 118 + }, + '2007': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 500, + 'cond': [], + 'stype': 118 + } + }; + let hdid = [100, 101]; + await G.mongodb.collection("hdinfo").updateMany( + {hdid: {$in: hdid}}, {$set: {"data.tasklist.2": task}} + ) + console.log(`修复区服${G.config.serverId}人才计划活动数据完成...`); +} + +ctor(); +start().then(() => { + let s = 0; + setInterval(() => { + s += 1; + console.log(new Date().format("MM-dd hh:mm:ss")); + if (s >= 3) process.exit(1); + }, 1000) + console.log("逻辑执行完成...等待退出！！！"); +}); + + From 1184b0b6ded6003e18694acd7239aa0c4e04ae5e Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 22 Dec 2023 11:50:45 +0800 Subject: [PATCH 55/90] =?UTF-8?q?feat:=20=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/protocols/serviceProto.ts | 43 ++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 7f2816a..40d1b27 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -10080,10 +10080,42 @@ export const serviceProto: ServiceProto = { ] }, "event/leichonglibao/PtlReceive/ReqReceive": { - "type": "Interface" + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "hdid", + "type": { + "type": "Number" + } + }, + { + "id": 1, + "name": "select", + "type": { + "type": "Array", + "elementType": { + "type": "String" + } + } + } + ] }, "event/leichonglibao/PtlReceive/ResReceive": { - "type": "Interface" + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "prize", + "type": { + "type": "Array", + "elementType": { + "type": "Reference", + "target": "type/prizeType" + } + } + } + ] }, "event/leijichongzhi/PtlOpen/ReqOpen": { "type": "Interface", @@ -15152,6 +15184,13 @@ export const serviceProto: ServiceProto = { "type": "Literal", "literal": "pobinglibao" } + }, + { + "id": 38, + "type": { + "type": "Literal", + "literal": "leichonglibao" + } } ] }, From bafed44a568f01dc9c0fa8b94df09221b67cc37c Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 22 Dec 2023 11:57:39 +0800 Subject: [PATCH 56/90] feat: proto --- .../event/leichonglibao/PtlReceive.ts | 4 +- src/shared/protocols/serviceProto.ts | 1001 +++++++++-------- 2 files changed, 553 insertions(+), 452 deletions(-) diff --git a/src/shared/protocols/event/leichonglibao/PtlReceive.ts b/src/shared/protocols/event/leichonglibao/PtlReceive.ts index dfdc7c5..f4519e0 100644 --- a/src/shared/protocols/event/leichonglibao/PtlReceive.ts +++ b/src/shared/protocols/event/leichonglibao/PtlReceive.ts @@ -1,8 +1,10 @@ +import {prizeType} from "../../type"; + export interface ReqReceive { hdid: number select: string[] } export interface ResReceive { - prize: atn[] + prize: prizeType[] } diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index df7b3e4..fa0d54f 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -64,60 +64,62 @@ import { ReqOpen as ReqOpen_13, ResOpen as ResOpen_13 } from './event/kaifukuang import { ReqShopBuy, ResShopBuy } from './event/kaifukuanghuan/PtlShopBuy'; import { ReqTaskBox, ResTaskBox } from './event/kaifukuanghuan/PtlTaskBox'; import { ReqTaskPrize, ResTaskPrize } from './event/kaifukuanghuan/PtlTaskPrize'; -import { ReqOpen as ReqOpen_14, ResOpen as ResOpen_14 } from './event/leijichongzhi/PtlOpen'; +import { ReqOpen as ReqOpen_14, ResOpen as ResOpen_14 } from './event/leichonglibao/PtlOpen'; +import { ReqReceive as ReqReceive_2, ResReceive as ResReceive_2 } from './event/leichonglibao/PtlReceive'; +import { ReqOpen as ReqOpen_15, ResOpen as ResOpen_15 } from './event/leijichongzhi/PtlOpen'; import { ReqRec as ReqRec_5, ResRec as ResRec_5 } from './event/leijichongzhi/PtlRec'; import { ReqLottery, ResLottery } from './event/niudanji/PtlLottery'; -import { ReqOpen as ReqOpen_15, ResOpen as ResOpen_15 } from './event/niudanji/PtlOpen'; +import { ReqOpen as ReqOpen_16, ResOpen as ResOpen_16 } from './event/niudanji/PtlOpen'; import { ReqCanReceive, ResCanReceive } from './event/payForDiamond/PtlCanReceive'; -import { ReqReceive as ReqReceive_2, ResReceive as ResReceive_2 } from './event/payForDiamond/PtlReceive'; -import { ReqOpen as ReqOpen_16, ResOpen as ResOpen_16 } from './event/pobinglibao/PtlOpen'; -import { ReqReceive as ReqReceive_3, ResReceive as ResReceive_3 } from './event/pobinglibao/PtlReceive'; -import { ReqOpen as ReqOpen_17, ResOpen as ResOpen_17 } from './event/qirichongzhi/PtlOpen'; +import { ReqReceive as ReqReceive_3, ResReceive as ResReceive_3 } from './event/payForDiamond/PtlReceive'; +import { ReqOpen as ReqOpen_17, ResOpen as ResOpen_17 } from './event/pobinglibao/PtlOpen'; +import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } from './event/pobinglibao/PtlReceive'; +import { ReqOpen as ReqOpen_18, ResOpen as ResOpen_18 } from './event/qirichongzhi/PtlOpen'; import { ReqRec as ReqRec_6, ResRec as ResRec_6 } from './event/qirichongzhi/PtlRec'; -import { ReqOpen as ReqOpen_18, ResOpen as ResOpen_18 } from './event/qiridenglu/PtlOpen'; +import { ReqOpen as ReqOpen_19, ResOpen as ResOpen_19 } from './event/qiridenglu/PtlOpen'; import { ReqRecPrize as ReqRecPrize_1, ResRecPrize as ResRecPrize_1 } from './event/qiridenglu/PtlRecPrize'; -import { ReqOpen as ReqOpen_19, ResOpen as ResOpen_19 } from './event/shiwuleichong/PtlOpen'; -import { ReqOpen as ReqOpen_20, ResOpen as ResOpen_20 } from './event/shouchong/PtlOpen'; -import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } from './event/shouchong/PtlReceive'; +import { ReqOpen as ReqOpen_20, ResOpen as ResOpen_20 } from './event/shiwuleichong/PtlOpen'; +import { ReqOpen as ReqOpen_21, ResOpen as ResOpen_21 } from './event/shouchong/PtlOpen'; +import { ReqReceive as ReqReceive_5, ResReceive as ResReceive_5 } from './event/shouchong/PtlReceive'; import { ReqBuy as ReqBuy_1, ResBuy as ResBuy_1 } from './event/xianshizhaomu/PtlBuy'; import { ReqDuihuan, ResDuihuan } from './event/xianshizhaomu/PtlDuihuan'; import { ReqLottery as ReqLottery_1, ResLottery as ResLottery_1 } from './event/xianshizhaomu/PtlLottery'; -import { ReqOpen as ReqOpen_21, ResOpen as ResOpen_21 } from './event/xianshizhaomu/PtlOpen'; +import { ReqOpen as ReqOpen_22, ResOpen as ResOpen_22 } from './event/xianshizhaomu/PtlOpen'; import { ReqRec as ReqRec_7, ResRec as ResRec_7 } from './event/xianshizhaomu/PtlRec'; -import { ReqOpen as ReqOpen_22, ResOpen as ResOpen_22 } from './event/xiaofeijingsai/PtlOpen'; -import { ReqOpen as ReqOpen_23, ResOpen as ResOpen_23 } from './event/xinshoulibao/PtlOpen'; +import { ReqOpen as ReqOpen_23, ResOpen as ResOpen_23 } from './event/xiaofeijingsai/PtlOpen'; +import { ReqOpen as ReqOpen_24, ResOpen as ResOpen_24 } from './event/xinshoulibao/PtlOpen'; import { ReqBuy as ReqBuy_2, ResBuy as ResBuy_2 } from './event/yangchengmubiao/PtlBuy'; -import { ReqOpen as ReqOpen_24, ResOpen as ResOpen_24 } from './event/yangchengmubiao/PtlOpen'; +import { ReqOpen as ReqOpen_25, ResOpen as ResOpen_25 } from './event/yangchengmubiao/PtlOpen'; import { ReqRec as ReqRec_8, ResRec as ResRec_8 } from './event/yangchengmubiao/PtlRec'; -import { ReqOpen as ReqOpen_25, ResOpen as ResOpen_25 } from './event/yibaichou/PtlOpen'; +import { ReqOpen as ReqOpen_26, ResOpen as ResOpen_26 } from './event/yibaichou/PtlOpen'; import { ReqRec as ReqRec_9, ResRec as ResRec_9 } from './event/yibaichou/PtlRec'; import { ReqRecAll, ResRecAll } from './event/yibaichou/PtlRecAll'; -import { ReqOpen as ReqOpen_26, ResOpen as ResOpen_26 } from './event/yuedujijin/PtlOpen'; +import { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } from './event/yuedujijin/PtlOpen'; import { ReqRec as ReqRec_10, ResRec as ResRec_10 } from './event/yuedujijin/PtlRec'; import { ReqBuyLv, ResBuyLv } from './event/zhanling/PtlBuyLv'; -import { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } from './event/zhanling/PtlOpen'; +import { ReqOpen as ReqOpen_28, ResOpen as ResOpen_28 } from './event/zhanling/PtlOpen'; import { ReqRecPrize as ReqRecPrize_2, ResRecPrize as ResRecPrize_2 } from './event/zhanling/PtlRecPrize'; import { ReqRecTask, ResRecTask } from './event/zhanling/PtlRecTask'; -import { ReqOpen as ReqOpen_28, ResOpen as ResOpen_28 } from './event/zhoulibao/PtlOpen'; -import { ReqOpen as ReqOpen_29, ResOpen as ResOpen_29 } from './event/zhoumolibao/PtlOpen'; -import { ReqReceive as ReqReceive_5, ResReceive as ResReceive_5 } from './event/zhoumolibao/PtlReceive'; +import { ReqOpen as ReqOpen_29, ResOpen as ResOpen_29 } from './event/zhoulibao/PtlOpen'; +import { ReqOpen as ReqOpen_30, ResOpen as ResOpen_30 } from './event/zhoumolibao/PtlOpen'; +import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } from './event/zhoumolibao/PtlReceive'; import { ReqBuy as ReqBuy_3, ResBuy as ResBuy_3 } from './event/zixuanlibao/PtlBuy'; -import { ReqOpen as ReqOpen_30, ResOpen as ResOpen_30 } from './event/zixuanlibao/PtlOpen'; +import { ReqOpen as ReqOpen_31, ResOpen as ResOpen_31 } from './event/zixuanlibao/PtlOpen'; import { ReqhdGetList, ReshdGetList } from './eventlist/PtlhdGetList'; import { ReqApply, ResApply } from './friend/PtlApply'; import { ReqDel, ResDel } from './friend/PtlDel'; import { ReqGift, ResGift } from './friend/PtlGift'; import { ReqList, ResList } from './friend/PtlList'; -import { ReqOpen as ReqOpen_31, ResOpen as ResOpen_31 } from './friend/PtlOpen'; +import { ReqOpen as ReqOpen_32, ResOpen as ResOpen_32 } from './friend/PtlOpen'; import { ReqRespond, ResRespond } from './friend/PtlRespond'; import { ReqRmBlackList, ResRmBlackList } from './friend/PtlRmBlackList'; import { ReqSearch, ResSearch } from './friend/PtlSearch'; import { ReqChallenge, ResChallenge } from './ganbutexun/PtlChallenge'; -import { ReqOpen as ReqOpen_32, ResOpen as ResOpen_32 } from './ganbutexun/PtlOpen'; +import { ReqOpen as ReqOpen_33, ResOpen as ResOpen_33 } from './ganbutexun/PtlOpen'; import { ReqFast, ResFast } from './ganhai/PtlFast'; import { ReqFight as ReqFight_1, ResFight as ResFight_1 } from './ganhai/PtlFight'; import { ReqLog, ResLog } from './ganhai/PtlLog'; -import { ReqOpen as ReqOpen_33, ResOpen as ResOpen_33 } from './ganhai/PtlOpen'; +import { ReqOpen as ReqOpen_34, ResOpen as ResOpen_34 } from './ganhai/PtlOpen'; import { ReqRefresh, ResRefresh } from './ganhai/PtlRefresh'; import { ReqRefreshShip, ResRefreshShip } from './ganhai/PtlRefreshShip'; import { ReqSelect as ReqSelect_1, ResSelect as ResSelect_1 } from './ganhai/PtlSelect'; @@ -139,19 +141,19 @@ import { ReqJx, ResJx } from './gonghui/PtlJx'; import { ReqJxOpen, ResJxOpen } from './gonghui/PtlJxOpen'; import { ReqList as ReqList_1, ResList as ResList_1 } from './gonghui/PtlList'; import { ReqManage, ResManage } from './gonghui/PtlManage'; -import { ReqOpen as ReqOpen_34, ResOpen as ResOpen_34 } from './gonghui/PtlOpen'; +import { ReqOpen as ReqOpen_35, ResOpen as ResOpen_35 } from './gonghui/PtlOpen'; import { ReqTanHe, ResTanHe } from './gonghui/PtlTanHe'; import { ReqTaskOpen, ResTaskOpen } from './gonghui/PtlTaskOpen'; import { ReqTaskReceive, ResTaskReceive } from './gonghui/PtlTaskReceive'; import { ReqUpWz, ResUpWz } from './gonghui/PtlUpWz'; import { ReqLottery as ReqLottery_2, ResLottery as ResLottery_2 } from './gonghuibaozang/PtlLottery'; -import { ReqOpen as ReqOpen_35, ResOpen as ResOpen_35 } from './gonghuibaozang/PtlOpen'; +import { ReqOpen as ReqOpen_36, ResOpen as ResOpen_36 } from './gonghuibaozang/PtlOpen'; import { ReqBuy as ReqBuy_4, ResBuy as ResBuy_4 } from './gonglukuangbiao/PtlBuy'; import { ReqFight as ReqFight_2, ResFight as ResFight_2 } from './gonglukuangbiao/PtlFight'; -import { ReqOpen as ReqOpen_36, ResOpen as ResOpen_36 } from './gonglukuangbiao/PtlOpen'; +import { ReqOpen as ReqOpen_37, ResOpen as ResOpen_37 } from './gonglukuangbiao/PtlOpen'; import { ReqRefresh as ReqRefresh_1, ResRefresh as ResRefresh_1 } from './gonglukuangbiao/PtlRefresh'; import { ReqActive, ResActive } from './gongyu/mingdao/PtlActive'; -import { ReqOpen as ReqOpen_37, ResOpen as ResOpen_37 } from './gongyu/mingdao/PtlOpen'; +import { ReqOpen as ReqOpen_38, ResOpen as ResOpen_38 } from './gongyu/mingdao/PtlOpen'; import { ReqRecPrize as ReqRecPrize_3, ResRecPrize as ResRecPrize_3 } from './gongyu/mingdao/PtlRecPrize'; import { ReqRepair, ResRepair } from './gongyu/mingdao/PtlRepair'; import { ReqReset as ReqReset_1, ResReset as ResReset_1 } from './gongyu/xunlianjihua/PtlReset'; @@ -160,14 +162,14 @@ import { ReqSetSkill, ResSetSkill } from './gongyu/zuozhanjihua/PtlSetSkill'; import { ReqBuyNum as ReqBuyNum_1, ResBuyNum as ResBuyNum_1 } from './hbzb/jfs/PtlBuyNum'; import { ReqFight as ReqFight_3, ResFight as ResFight_3 } from './hbzb/jfs/PtlFight'; import { ReqGetLog as ReqGetLog_1, ResGetLog as ResGetLog_1 } from './hbzb/jfs/PtlGetLog'; -import { ReqOpen as ReqOpen_38, ResOpen as ResOpen_38 } from './hbzb/jfs/PtlOpen'; +import { ReqOpen as ReqOpen_39, ResOpen as ResOpen_39 } from './hbzb/jfs/PtlOpen'; import { ReqRec as ReqRec_11, ResRec as ResRec_11 } from './hbzb/jfs/PtlRec'; import { ReqRefresh as ReqRefresh_2, ResRefresh as ResRefresh_2 } from './hbzb/jfs/PtlRefresh'; import { ReqGetStatus, ResGetStatus } from './hbzb/PtlGetStatus'; import { ReqBuyNum as ReqBuyNum_2, ResBuyNum as ResBuyNum_2 } from './hbzb/zbs/PtlBuyNum'; import { ReqFight as ReqFight_4, ResFight as ResFight_4 } from './hbzb/zbs/PtlFight'; import { ReqGetLog as ReqGetLog_2, ResGetLog as ResGetLog_2 } from './hbzb/zbs/PtlGetLog'; -import { ReqOpen as ReqOpen_39, ResOpen as ResOpen_39 } from './hbzb/zbs/PtlOpen'; +import { ReqOpen as ReqOpen_40, ResOpen as ResOpen_40 } from './hbzb/zbs/PtlOpen'; import { ReqRefresh as ReqRefresh_3, ResRefresh as ResRefresh_3 } from './hbzb/zbs/PtlRefresh'; import { ReqAwake, ResAwake } from './hero/PtlAwake'; import { ReqChangePos, ResChangePos } from './hero/PtlChangePos'; @@ -183,40 +185,40 @@ import { ReqGet as ReqGet_2, ResGet as ResGet_2 } from './hongdian/PtlGet'; import { ReqGetList as ReqGetList_4, ResGetList as ResGetList_4 } from './item/PtlGetList'; import { ReqUse, ResUse } from './item/PtlUse'; import { ReqLottery as ReqLottery_3, ResLottery as ResLottery_3 } from './jiaotang/PtlLottery'; -import { ReqOpen as ReqOpen_40, ResOpen as ResOpen_40 } from './jiaotang/PtlOpen'; +import { ReqOpen as ReqOpen_41, ResOpen as ResOpen_41 } from './jiaotang/PtlOpen'; import { ReqLottery as ReqLottery_4, ResLottery as ResLottery_4 } from './jiuba/PtlLottery'; -import { ReqOpen as ReqOpen_41, ResOpen as ResOpen_41 } from './jiuba/PtlOpen'; +import { ReqOpen as ReqOpen_42, ResOpen as ResOpen_42 } from './jiuba/PtlOpen'; import { ReqBuyFightNum, ResBuyFightNum } from './jjc/PtlBuyFightNum'; import { ReqFight as ReqFight_5, ResFight as ResFight_5 } from './jjc/PtlFight'; import { ReqFightLog, ResFightLog } from './jjc/PtlFightLog'; -import { ReqOpen as ReqOpen_42, ResOpen as ResOpen_42 } from './jjc/PtlOpen'; -import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } from './jjc/PtlReceive'; +import { ReqOpen as ReqOpen_43, ResOpen as ResOpen_43 } from './jjc/PtlOpen'; +import { ReqReceive as ReqReceive_7, ResReceive as ResReceive_7 } from './jjc/PtlReceive'; import { ReqRefresh as ReqRefresh_4, ResRefresh as ResRefresh_4 } from './jjc/PtlRefresh'; -import { ReqOpen as ReqOpen_43, ResOpen as ResOpen_43 } from './kaifujingsai/PtlOpen'; -import { ReqReceive as ReqReceive_7, ResReceive as ResReceive_7 } from './kaifujingsai/PtlReceive'; +import { ReqOpen as ReqOpen_44, ResOpen as ResOpen_44 } from './kaifujingsai/PtlOpen'; +import { ReqReceive as ReqReceive_8, ResReceive as ResReceive_8 } from './kaifujingsai/PtlReceive'; import { ReqApply as ReqApply_2, ResApply as ResApply_2 } from './kbzz/PtlApply'; import { ReqAutoApply, ResAutoApply } from './kbzz/PtlAutoApply'; import { ReqBuyNum as ReqBuyNum_3, ResBuyNum as ResBuyNum_3 } from './kbzz/PtlBuyNum'; import { ReqFight as ReqFight_6, ResFight as ResFight_6 } from './kbzz/PtlFight'; import { ReqFightLog as ReqFightLog_1, ResFightLog as ResFightLog_1 } from './kbzz/PtlFightLog'; import { ReqGroupState, ResGroupState } from './kbzz/PtlGroupState'; -import { ReqOpen as ReqOpen_44, ResOpen as ResOpen_44 } from './kbzz/PtlOpen'; +import { ReqOpen as ReqOpen_45, ResOpen as ResOpen_45 } from './kbzz/PtlOpen'; import { ReqRecPrize as ReqRecPrize_4, ResRecPrize as ResRecPrize_4 } from './kbzz/PtlRecPrize'; import { ReqRefresh as ReqRefresh_5, ResRefresh as ResRefresh_5 } from './kbzz/PtlRefresh'; import { ReqAddPkNum, ResAddPkNum } from './kuangdong/PtlAddPkNum'; import { ReqGetPrize, ResGetPrize } from './kuangdong/PtlGetPrize'; import { ReqKdInfo, ResKdInfo } from './kuangdong/PtlKdInfo'; import { ReqLog as ReqLog_1, ResLog as ResLog_1 } from './kuangdong/PtlLog'; -import { ReqOpen as ReqOpen_45, ResOpen as ResOpen_45 } from './kuangdong/PtlOpen'; +import { ReqOpen as ReqOpen_46, ResOpen as ResOpen_46 } from './kuangdong/PtlOpen'; import { ReqYanShi, ResYanShi } from './kuangdong/PtlYanShi'; import { ReqZhanLing, ResZhanLing } from './kuangdong/PtlZhanLing'; -import { ReqOpen as ReqOpen_46, ResOpen as ResOpen_46 } from './lingzhulaixi/PtlOpen'; +import { ReqOpen as ReqOpen_47, ResOpen as ResOpen_47 } from './lingzhulaixi/PtlOpen'; import { ReqPkBoss, ResPkBoss } from './lingzhulaixi/PtlPkBoss'; import { ReqPkRank, ResPkRank } from './lingzhulaixi/PtlPkRank'; import { ReqSaoDang, ResSaoDang } from './lingzhulaixi/PtlSaoDang'; import { ReqBuy as ReqBuy_5, ResBuy as ResBuy_5 } from './meirishilian/PtlBuy'; import { ReqFight as ReqFight_7, ResFight as ResFight_7 } from './meirishilian/PtlFight'; -import { ReqOpen as ReqOpen_47, ResOpen as ResOpen_47 } from './meirishilian/PtlOpen'; +import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } from './meirishilian/PtlOpen'; import { MsgBindUid } from './msg_c2s/MsgBindUid'; import { MsgPay } from './msg_c2s/MsgPay'; import { MsgSync } from './msg_c2s/MsgSync'; @@ -248,7 +250,7 @@ import { MsgTaskChange } from './msg_s2c/MsgTaskChange'; import { MsgXianshilibao } from './msg_s2c/MsgXianshilibao'; import { ReqFight as ReqFight_8, ResFight as ResFight_8 } from './pata/PtlFight'; import { ReqGetPrize as ReqGetPrize_1, ResGetPrize as ResGetPrize_1 } from './pata/PtlGetPrize'; -import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } from './pata/PtlOpen'; +import { ReqOpen as ReqOpen_49, ResOpen as ResOpen_49 } from './pata/PtlOpen'; import { ReqSaoDang as ReqSaoDang_1, ResSaoDang as ResSaoDang_1 } from './pata/PtlSaoDang'; import { ReqGetList as ReqGetList_5, ResGetList as ResGetList_5 } from './pay/PtlGetList'; import { ReqGetList as ReqGetList_6, ResGetList as ResGetList_6 } from './peijian/PtlGetList'; @@ -264,15 +266,15 @@ import { ReqUnLock, ResUnLock } from './peijian/PtlUnLock'; import { ReqWear as ReqWear_1, ResWear as ResWear_1 } from './peijian/PtlWear'; import { ReqDeal, ResDeal } from './peijiancangku/PtlDeal'; import { ReqJump, ResJump } from './peijiancangku/PtlJump'; -import { ReqOpen as ReqOpen_49, ResOpen as ResOpen_49 } from './peijiancangku/PtlOpen'; +import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } from './peijiancangku/PtlOpen'; import { ReqBingo, ResBingo } from './PtlBingo'; import { ReqFightTest, ResFightTest } from './PtlFightTest'; import { ReqSyncBtn, ResSyncBtn } from './PtlSyncBtn'; import { ReqTest, ResTest } from './PtlTest'; -import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } from './pushgift/PtlOpen'; +import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './pushgift/PtlOpen'; import { ReqFight as ReqFight_9, ResFight as ResFight_9 } from './qjzzd/PtlFight'; -import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './qjzzd/PtlOpen'; -import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './rank/PtlOpen'; +import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './qjzzd/PtlOpen'; +import { ReqOpen as ReqOpen_53, ResOpen as ResOpen_53 } from './rank/PtlOpen'; import { ReqConcise, ResConcise } from './shiwu/PtlConcise'; import { ReqExtract, ResExtract } from './shiwu/PtlExtract'; import { ReqGetList as ReqGetList_7, ResGetList as ResGetList_7 } from './shiwu/PtlGetList'; @@ -280,20 +282,20 @@ import { ReqLvUp as ReqLvUp_3, ResLvUp as ResLvUp_3 } from './shiwu/PtlLvUp'; import { ReqRecast, ResRecast } from './shiwu/PtlRecast'; import { ReqTakeOff as ReqTakeOff_2, ResTakeOff as ResTakeOff_2 } from './shiwu/PtlTakeOff'; import { ReqWear as ReqWear_2, ResWear as ResWear_2 } from './shiwu/PtlWear'; -import { ReqOpen as ReqOpen_53, ResOpen as ResOpen_53 } from './shootGame/PtlOpen'; +import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } from './shootGame/PtlOpen'; import { ReqRec as ReqRec_13, ResRec as ResRec_13 } from './shootGame/PtlRec'; import { ReqBuy as ReqBuy_6, ResBuy as ResBuy_6 } from './shop/PtlBuy'; -import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } from './shop/PtlOpen'; +import { ReqOpen as ReqOpen_55, ResOpen as ResOpen_55 } from './shop/PtlOpen'; import { ReqRefresh as ReqRefresh_6, ResRefresh as ResRefresh_6 } from './shop/PtlRefresh'; import { ReqGetBoxPrize, ResGetBoxPrize } from './sign/PtlGetBoxPrize'; import { ReqGetPrize as ReqGetPrize_2, ResGetPrize as ResGetPrize_2 } from './sign/PtlGetPrize'; -import { ReqOpen as ReqOpen_55, ResOpen as ResOpen_55 } from './sign/PtlOpen'; +import { ReqOpen as ReqOpen_56, ResOpen as ResOpen_56 } from './sign/PtlOpen'; import { ReqAim, ResAim } from './slzd/PtlAim'; import { ReqBuyNum as ReqBuyNum_4, ResBuyNum as ResBuyNum_4 } from './slzd/PtlBuyNum'; import { ReqFight as ReqFight_10, ResFight as ResFight_10 } from './slzd/PtlFight'; import { ReqFightLog as ReqFightLog_2, ResFightLog as ResFightLog_2 } from './slzd/PtlFightLog'; import { ReqMyRank, ResMyRank } from './slzd/PtlMyRank'; -import { ReqOpen as ReqOpen_56, ResOpen as ResOpen_56 } from './slzd/PtlOpen'; +import { ReqOpen as ReqOpen_57, ResOpen as ResOpen_57 } from './slzd/PtlOpen'; import { ReqOpenFort, ResOpenFort } from './slzd/PtlOpenFort'; import { ReqRec as ReqRec_14, ResRec as ResRec_14 } from './slzd/PtlRec'; import { ReqRefresh as ReqRefresh_7, ResRefresh as ResRefresh_7 } from './slzd/PtlRefresh'; @@ -302,11 +304,11 @@ import { ReqEvent, ResEvent } from './tanxian/PtlEvent'; import { ReqFastGuaJi, ResFastGuaJi } from './tanxian/PtlFastGuaJi'; import { ReqFight as ReqFight_11, ResFight as ResFight_11 } from './tanxian/PtlFight'; import { ReqGuaJi, ResGuaJi } from './tanxian/PtlGuaJi'; -import { ReqOpen as ReqOpen_57, ResOpen as ResOpen_57 } from './tanxian/PtlOpen'; -import { ReqReceive as ReqReceive_8, ResReceive as ResReceive_8 } from './tanxian/PtlReceive'; +import { ReqOpen as ReqOpen_58, ResOpen as ResOpen_58 } from './tanxian/PtlOpen'; +import { ReqReceive as ReqReceive_9, ResReceive as ResReceive_9 } from './tanxian/PtlReceive'; import { ReqAllFinsh, ResAllFinsh } from './task/PtlAllFinsh'; import { ReqFinsh, ResFinsh } from './task/PtlFinsh'; -import { ReqOpen as ReqOpen_58, ResOpen as ResOpen_58 } from './task/PtlOpen'; +import { ReqOpen as ReqOpen_59, ResOpen as ResOpen_59 } from './task/PtlOpen'; import { ReqCDKEY, ResCDKEY } from './user/PtlCDKEY'; import { ReqChangeInfo, ResChangeInfo } from './user/PtlChangeInfo'; import { ReqChangeName, ResChangeName } from './user/PtlChangeName'; @@ -322,7 +324,7 @@ import { ReqRenownOpen, ResRenownOpen } from './user/PtlRenownOpen'; import { ReqTujian, ResTujian } from './user/PtlTujian'; import { ReqDecompose, ResDecompose } from './weixiuchang/PtlDecompose'; import { ReqExchange, ResExchange } from './weixiuchang/PtlExchange'; -import { ReqOpen as ReqOpen_59, ResOpen as ResOpen_59 } from './weixiuchang/PtlOpen'; +import { ReqOpen as ReqOpen_60, ResOpen as ResOpen_60 } from './weixiuchang/PtlOpen'; import { ReqUpLv, ResUpLv } from './weixiuchang/PtlUpLv'; import { ReqUpStar, ResUpStar } from './weixiuchang/PtlUpStar'; import { ReqAutoBaoMing, ResAutoBaoMing } from './wzry/PtlAutoBaoMing'; @@ -333,7 +335,7 @@ import { ReqDldFight, ResDldFight } from './wzry/PtlDldFight'; import { ReqDldRefre, ResDldRefre } from './wzry/PtlDldRefre'; import { ReqJingCai, ResJingCai } from './wzry/PtlJingCai'; import { ReqJingCaiOpen, ResJingCaiOpen } from './wzry/PtlJingCaiOpen'; -import { ReqOpen as ReqOpen_60, ResOpen as ResOpen_60 } from './wzry/PtlOpen'; +import { ReqOpen as ReqOpen_61, ResOpen as ResOpen_61 } from './wzry/PtlOpen'; import { ReqUpdateFight, ResUpdateFight } from './wzry/PtlUpdateFight'; import { ReqWzzd, ResWzzd } from './wzry/PtlWzzd'; import { ReqZuanShiOpen, ResZuanShiOpen } from './wzry/PtlZuanShiOpen'; @@ -341,8 +343,8 @@ import { ReqAllGet, ResAllGet } from './xstask/PtlAllGet'; import { ReqGet as ReqGet_3, ResGet as ResGet_3 } from './xstask/PtlGet'; import { ReqLvUp as ReqLvUp_4, ResLvUp as ResLvUp_4 } from './xstask/PtlLvUp'; import { ReqOnekeyReceive, ResOnekeyReceive } from './xstask/PtlOnekeyReceive'; -import { ReqOpen as ReqOpen_61, ResOpen as ResOpen_61 } from './xstask/PtlOpen'; -import { ReqReceive as ReqReceive_9, ResReceive as ResReceive_9 } from './xstask/PtlReceive'; +import { ReqOpen as ReqOpen_62, ResOpen as ResOpen_62 } from './xstask/PtlOpen'; +import { ReqReceive as ReqReceive_10, ResReceive as ResReceive_10 } from './xstask/PtlReceive'; import { ReqRefresh as ReqRefresh_8, ResRefresh as ResRefresh_8 } from './xstask/PtlRefresh'; import { ReqHandle, ResHandle } from './yongbingzhuzhan/PtlHandle'; import { ReqChangePos as ReqChangePos_1, ResChangePos as ResChangePos_1 } from './zhanqianbushu/PtlChangePos'; @@ -611,10 +613,18 @@ export interface ServiceType { req: ReqTaskPrize, res: ResTaskPrize }, - "event/leijichongzhi/Open": { + "event/leichonglibao/Open": { req: ReqOpen_14, res: ResOpen_14 }, + "event/leichonglibao/Receive": { + req: ReqReceive_2, + res: ResReceive_2 + }, + "event/leijichongzhi/Open": { + req: ReqOpen_15, + res: ResOpen_15 + }, "event/leijichongzhi/Rec": { req: ReqRec_5, res: ResRec_5 @@ -624,52 +634,52 @@ export interface ServiceType { res: ResLottery }, "event/niudanji/Open": { - req: ReqOpen_15, - res: ResOpen_15 + req: ReqOpen_16, + res: ResOpen_16 }, "event/payForDiamond/CanReceive": { req: ReqCanReceive, res: ResCanReceive }, "event/payForDiamond/Receive": { - req: ReqReceive_2, - res: ResReceive_2 - }, - "event/pobinglibao/Open": { - req: ReqOpen_16, - res: ResOpen_16 - }, - "event/pobinglibao/Receive": { req: ReqReceive_3, res: ResReceive_3 }, - "event/qirichongzhi/Open": { + "event/pobinglibao/Open": { req: ReqOpen_17, res: ResOpen_17 }, + "event/pobinglibao/Receive": { + req: ReqReceive_4, + res: ResReceive_4 + }, + "event/qirichongzhi/Open": { + req: ReqOpen_18, + res: ResOpen_18 + }, "event/qirichongzhi/Rec": { req: ReqRec_6, res: ResRec_6 }, "event/qiridenglu/Open": { - req: ReqOpen_18, - res: ResOpen_18 + req: ReqOpen_19, + res: ResOpen_19 }, "event/qiridenglu/RecPrize": { req: ReqRecPrize_1, res: ResRecPrize_1 }, "event/shiwuleichong/Open": { - req: ReqOpen_19, - res: ResOpen_19 - }, - "event/shouchong/Open": { req: ReqOpen_20, res: ResOpen_20 }, + "event/shouchong/Open": { + req: ReqOpen_21, + res: ResOpen_21 + }, "event/shouchong/Receive": { - req: ReqReceive_4, - res: ResReceive_4 + req: ReqReceive_5, + res: ResReceive_5 }, "event/xianshizhaomu/Buy": { req: ReqBuy_1, @@ -684,36 +694,36 @@ export interface ServiceType { res: ResLottery_1 }, "event/xianshizhaomu/Open": { - req: ReqOpen_21, - res: ResOpen_21 + req: ReqOpen_22, + res: ResOpen_22 }, "event/xianshizhaomu/Rec": { req: ReqRec_7, res: ResRec_7 }, "event/xiaofeijingsai/Open": { - req: ReqOpen_22, - res: ResOpen_22 - }, - "event/xinshoulibao/Open": { req: ReqOpen_23, res: ResOpen_23 }, + "event/xinshoulibao/Open": { + req: ReqOpen_24, + res: ResOpen_24 + }, "event/yangchengmubiao/Buy": { req: ReqBuy_2, res: ResBuy_2 }, "event/yangchengmubiao/Open": { - req: ReqOpen_24, - res: ResOpen_24 + req: ReqOpen_25, + res: ResOpen_25 }, "event/yangchengmubiao/Rec": { req: ReqRec_8, res: ResRec_8 }, "event/yibaichou/Open": { - req: ReqOpen_25, - res: ResOpen_25 + req: ReqOpen_26, + res: ResOpen_26 }, "event/yibaichou/Rec": { req: ReqRec_9, @@ -724,8 +734,8 @@ export interface ServiceType { res: ResRecAll }, "event/yuedujijin/Open": { - req: ReqOpen_26, - res: ResOpen_26 + req: ReqOpen_27, + res: ResOpen_27 }, "event/yuedujijin/Rec": { req: ReqRec_10, @@ -736,8 +746,8 @@ export interface ServiceType { res: ResBuyLv }, "event/zhanling/Open": { - req: ReqOpen_27, - res: ResOpen_27 + req: ReqOpen_28, + res: ResOpen_28 }, "event/zhanling/RecPrize": { req: ReqRecPrize_2, @@ -748,24 +758,24 @@ export interface ServiceType { res: ResRecTask }, "event/zhoulibao/Open": { - req: ReqOpen_28, - res: ResOpen_28 - }, - "event/zhoumolibao/Open": { req: ReqOpen_29, res: ResOpen_29 }, + "event/zhoumolibao/Open": { + req: ReqOpen_30, + res: ResOpen_30 + }, "event/zhoumolibao/Receive": { - req: ReqReceive_5, - res: ResReceive_5 + req: ReqReceive_6, + res: ResReceive_6 }, "event/zixuanlibao/Buy": { req: ReqBuy_3, res: ResBuy_3 }, "event/zixuanlibao/Open": { - req: ReqOpen_30, - res: ResOpen_30 + req: ReqOpen_31, + res: ResOpen_31 }, "eventlist/hdGetList": { req: ReqhdGetList, @@ -788,8 +798,8 @@ export interface ServiceType { res: ResList }, "friend/Open": { - req: ReqOpen_31, - res: ResOpen_31 + req: ReqOpen_32, + res: ResOpen_32 }, "friend/Respond": { req: ReqRespond, @@ -808,8 +818,8 @@ export interface ServiceType { res: ResChallenge }, "ganbutexun/Open": { - req: ReqOpen_32, - res: ResOpen_32 + req: ReqOpen_33, + res: ResOpen_33 }, "ganhai/Fast": { req: ReqFast, @@ -824,8 +834,8 @@ export interface ServiceType { res: ResLog }, "ganhai/Open": { - req: ReqOpen_33, - res: ResOpen_33 + req: ReqOpen_34, + res: ResOpen_34 }, "ganhai/Refresh": { req: ReqRefresh, @@ -912,8 +922,8 @@ export interface ServiceType { res: ResManage }, "gonghui/Open": { - req: ReqOpen_34, - res: ResOpen_34 + req: ReqOpen_35, + res: ResOpen_35 }, "gonghui/TanHe": { req: ReqTanHe, @@ -936,8 +946,8 @@ export interface ServiceType { res: ResLottery_2 }, "gonghuibaozang/Open": { - req: ReqOpen_35, - res: ResOpen_35 + req: ReqOpen_36, + res: ResOpen_36 }, "gonglukuangbiao/Buy": { req: ReqBuy_4, @@ -948,8 +958,8 @@ export interface ServiceType { res: ResFight_2 }, "gonglukuangbiao/Open": { - req: ReqOpen_36, - res: ResOpen_36 + req: ReqOpen_37, + res: ResOpen_37 }, "gonglukuangbiao/Refresh": { req: ReqRefresh_1, @@ -960,8 +970,8 @@ export interface ServiceType { res: ResActive }, "gongyu/mingdao/Open": { - req: ReqOpen_37, - res: ResOpen_37 + req: ReqOpen_38, + res: ResOpen_38 }, "gongyu/mingdao/RecPrize": { req: ReqRecPrize_3, @@ -996,8 +1006,8 @@ export interface ServiceType { res: ResGetLog_1 }, "hbzb/jfs/Open": { - req: ReqOpen_38, - res: ResOpen_38 + req: ReqOpen_39, + res: ResOpen_39 }, "hbzb/jfs/Rec": { req: ReqRec_11, @@ -1024,8 +1034,8 @@ export interface ServiceType { res: ResGetLog_2 }, "hbzb/zbs/Open": { - req: ReqOpen_39, - res: ResOpen_39 + req: ReqOpen_40, + res: ResOpen_40 }, "hbzb/zbs/Refresh": { req: ReqRefresh_3, @@ -1088,16 +1098,16 @@ export interface ServiceType { res: ResLottery_3 }, "jiaotang/Open": { - req: ReqOpen_40, - res: ResOpen_40 + req: ReqOpen_41, + res: ResOpen_41 }, "jiuba/Lottery": { req: ReqLottery_4, res: ResLottery_4 }, "jiuba/Open": { - req: ReqOpen_41, - res: ResOpen_41 + req: ReqOpen_42, + res: ResOpen_42 }, "jjc/BuyFightNum": { req: ReqBuyFightNum, @@ -1112,24 +1122,24 @@ export interface ServiceType { res: ResFightLog }, "jjc/Open": { - req: ReqOpen_42, - res: ResOpen_42 + req: ReqOpen_43, + res: ResOpen_43 }, "jjc/Receive": { - req: ReqReceive_6, - res: ResReceive_6 + req: ReqReceive_7, + res: ResReceive_7 }, "jjc/Refresh": { req: ReqRefresh_4, res: ResRefresh_4 }, "kaifujingsai/Open": { - req: ReqOpen_43, - res: ResOpen_43 + req: ReqOpen_44, + res: ResOpen_44 }, "kaifujingsai/Receive": { - req: ReqReceive_7, - res: ResReceive_7 + req: ReqReceive_8, + res: ResReceive_8 }, "kbzz/Apply": { req: ReqApply_2, @@ -1156,8 +1166,8 @@ export interface ServiceType { res: ResGroupState }, "kbzz/Open": { - req: ReqOpen_44, - res: ResOpen_44 + req: ReqOpen_45, + res: ResOpen_45 }, "kbzz/RecPrize": { req: ReqRecPrize_4, @@ -1184,8 +1194,8 @@ export interface ServiceType { res: ResLog_1 }, "kuangdong/Open": { - req: ReqOpen_45, - res: ResOpen_45 + req: ReqOpen_46, + res: ResOpen_46 }, "kuangdong/YanShi": { req: ReqYanShi, @@ -1196,8 +1206,8 @@ export interface ServiceType { res: ResZhanLing }, "lingzhulaixi/Open": { - req: ReqOpen_46, - res: ResOpen_46 + req: ReqOpen_47, + res: ResOpen_47 }, "lingzhulaixi/PkBoss": { req: ReqPkBoss, @@ -1220,8 +1230,8 @@ export interface ServiceType { res: ResFight_7 }, "meirishilian/Open": { - req: ReqOpen_47, - res: ResOpen_47 + req: ReqOpen_48, + res: ResOpen_48 }, "pata/Fight": { req: ReqFight_8, @@ -1232,8 +1242,8 @@ export interface ServiceType { res: ResGetPrize_1 }, "pata/Open": { - req: ReqOpen_48, - res: ResOpen_48 + req: ReqOpen_49, + res: ResOpen_49 }, "pata/SaoDang": { req: ReqSaoDang_1, @@ -1296,8 +1306,8 @@ export interface ServiceType { res: ResJump }, "peijiancangku/Open": { - req: ReqOpen_49, - res: ResOpen_49 + req: ReqOpen_50, + res: ResOpen_50 }, "Bingo": { req: ReqBingo, @@ -1316,21 +1326,21 @@ export interface ServiceType { res: ResTest }, "pushgift/Open": { - req: ReqOpen_50, - res: ResOpen_50 + req: ReqOpen_51, + res: ResOpen_51 }, "qjzzd/Fight": { req: ReqFight_9, res: ResFight_9 }, "qjzzd/Open": { - req: ReqOpen_51, - res: ResOpen_51 - }, - "rank/Open": { req: ReqOpen_52, res: ResOpen_52 }, + "rank/Open": { + req: ReqOpen_53, + res: ResOpen_53 + }, "shiwu/Concise": { req: ReqConcise, res: ResConcise @@ -1360,8 +1370,8 @@ export interface ServiceType { res: ResWear_2 }, "shootGame/Open": { - req: ReqOpen_53, - res: ResOpen_53 + req: ReqOpen_54, + res: ResOpen_54 }, "shootGame/Rec": { req: ReqRec_13, @@ -1372,8 +1382,8 @@ export interface ServiceType { res: ResBuy_6 }, "shop/Open": { - req: ReqOpen_54, - res: ResOpen_54 + req: ReqOpen_55, + res: ResOpen_55 }, "shop/Refresh": { req: ReqRefresh_6, @@ -1388,8 +1398,8 @@ export interface ServiceType { res: ResGetPrize_2 }, "sign/Open": { - req: ReqOpen_55, - res: ResOpen_55 + req: ReqOpen_56, + res: ResOpen_56 }, "slzd/Aim": { req: ReqAim, @@ -1412,8 +1422,8 @@ export interface ServiceType { res: ResMyRank }, "slzd/Open": { - req: ReqOpen_56, - res: ResOpen_56 + req: ReqOpen_57, + res: ResOpen_57 }, "slzd/OpenFort": { req: ReqOpenFort, @@ -1448,12 +1458,12 @@ export interface ServiceType { res: ResGuaJi }, "tanxian/Open": { - req: ReqOpen_57, - res: ResOpen_57 + req: ReqOpen_58, + res: ResOpen_58 }, "tanxian/Receive": { - req: ReqReceive_8, - res: ResReceive_8 + req: ReqReceive_9, + res: ResReceive_9 }, "task/AllFinsh": { req: ReqAllFinsh, @@ -1464,8 +1474,8 @@ export interface ServiceType { res: ResFinsh }, "task/Open": { - req: ReqOpen_58, - res: ResOpen_58 + req: ReqOpen_59, + res: ResOpen_59 }, "user/CDKEY": { req: ReqCDKEY, @@ -1528,8 +1538,8 @@ export interface ServiceType { res: ResExchange }, "weixiuchang/Open": { - req: ReqOpen_59, - res: ResOpen_59 + req: ReqOpen_60, + res: ResOpen_60 }, "weixiuchang/UpLv": { req: ReqUpLv, @@ -1572,8 +1582,8 @@ export interface ServiceType { res: ResJingCaiOpen }, "wzry/Open": { - req: ReqOpen_60, - res: ResOpen_60 + req: ReqOpen_61, + res: ResOpen_61 }, "wzry/UpdateFight": { req: ReqUpdateFight, @@ -1604,12 +1614,12 @@ export interface ServiceType { res: ResOnekeyReceive }, "xstask/Open": { - req: ReqOpen_61, - res: ResOpen_61 + req: ReqOpen_62, + res: ResOpen_62 }, "xstask/Receive": { - req: ReqReceive_9, - res: ResReceive_9 + req: ReqReceive_10, + res: ResReceive_10 }, "xstask/Refresh": { req: ReqRefresh_8, @@ -1994,146 +2004,156 @@ export const serviceProto: ServiceProto = { }, { "id": 65, - "name": "event/leijichongzhi/Open", + "name": "event/leichonglibao/Open", "type": "api" }, { "id": 66, - "name": "event/leijichongzhi/Rec", + "name": "event/leichonglibao/Receive", "type": "api" }, { "id": 67, - "name": "event/niudanji/Lottery", + "name": "event/leijichongzhi/Open", "type": "api" }, { "id": 68, - "name": "event/niudanji/Open", + "name": "event/leijichongzhi/Rec", "type": "api" }, { "id": 69, - "name": "event/payForDiamond/CanReceive", + "name": "event/niudanji/Lottery", "type": "api" }, { "id": 70, - "name": "event/payForDiamond/Receive", + "name": "event/niudanji/Open", "type": "api" }, { "id": 71, - "name": "event/pobinglibao/Open", + "name": "event/payForDiamond/CanReceive", "type": "api" }, { "id": 72, - "name": "event/pobinglibao/Receive", + "name": "event/payForDiamond/Receive", "type": "api" }, { "id": 73, - "name": "event/qirichongzhi/Open", + "name": "event/pobinglibao/Open", "type": "api" }, { "id": 74, - "name": "event/qirichongzhi/Rec", + "name": "event/pobinglibao/Receive", "type": "api" }, { "id": 75, - "name": "event/qiridenglu/Open", + "name": "event/qirichongzhi/Open", "type": "api" }, { "id": 76, - "name": "event/qiridenglu/RecPrize", + "name": "event/qirichongzhi/Rec", "type": "api" }, { "id": 77, - "name": "event/shiwuleichong/Open", + "name": "event/qiridenglu/Open", "type": "api" }, { "id": 78, - "name": "event/shouchong/Open", + "name": "event/qiridenglu/RecPrize", "type": "api" }, { "id": 79, - "name": "event/shouchong/Receive", + "name": "event/shiwuleichong/Open", "type": "api" }, { "id": 80, - "name": "event/xianshizhaomu/Buy", + "name": "event/shouchong/Open", "type": "api" }, { "id": 81, - "name": "event/xianshizhaomu/Duihuan", + "name": "event/shouchong/Receive", "type": "api" }, { "id": 82, - "name": "event/xianshizhaomu/Lottery", + "name": "event/xianshizhaomu/Buy", "type": "api" }, { "id": 83, - "name": "event/xianshizhaomu/Open", + "name": "event/xianshizhaomu/Duihuan", "type": "api" }, { "id": 84, - "name": "event/xianshizhaomu/Rec", + "name": "event/xianshizhaomu/Lottery", "type": "api" }, { "id": 85, - "name": "event/xiaofeijingsai/Open", + "name": "event/xianshizhaomu/Open", "type": "api" }, { "id": 86, - "name": "event/xinshoulibao/Open", + "name": "event/xianshizhaomu/Rec", "type": "api" }, { "id": 87, - "name": "event/yangchengmubiao/Buy", + "name": "event/xiaofeijingsai/Open", "type": "api" }, { "id": 88, - "name": "event/yangchengmubiao/Open", + "name": "event/xinshoulibao/Open", "type": "api" }, { "id": 89, - "name": "event/yangchengmubiao/Rec", + "name": "event/yangchengmubiao/Buy", "type": "api" }, { "id": 90, - "name": "event/yibaichou/Open", + "name": "event/yangchengmubiao/Open", "type": "api" }, { "id": 91, - "name": "event/yibaichou/Rec", + "name": "event/yangchengmubiao/Rec", "type": "api" }, { "id": 92, - "name": "event/yibaichou/RecAll", + "name": "event/yibaichou/Open", "type": "api" }, { "id": 93, + "name": "event/yibaichou/Rec", + "type": "api" + }, + { + "id": 94, + "name": "event/yibaichou/RecAll", + "type": "api" + }, + { + "id": 95, "name": "event/yuedujijin/Open", "type": "api", "conf": { @@ -2141,157 +2161,157 @@ export const serviceProto: ServiceProto = { } }, { - "id": 94, + "id": 96, "name": "event/yuedujijin/Rec", "type": "api" }, { - "id": 95, + "id": 97, "name": "event/zhanling/BuyLv", "type": "api" }, { - "id": 96, + "id": 98, "name": "event/zhanling/Open", "type": "api" }, { - "id": 97, + "id": 99, "name": "event/zhanling/RecPrize", "type": "api" }, { - "id": 98, + "id": 100, "name": "event/zhanling/RecTask", "type": "api" }, { - "id": 99, + "id": 101, "name": "event/zhoulibao/Open", "type": "api" }, { - "id": 100, + "id": 102, "name": "event/zhoumolibao/Open", "type": "api" }, { - "id": 101, + "id": 103, "name": "event/zhoumolibao/Receive", "type": "api" }, { - "id": 102, + "id": 104, "name": "event/zixuanlibao/Buy", "type": "api" }, { - "id": 103, + "id": 105, "name": "event/zixuanlibao/Open", "type": "api" }, { - "id": 104, + "id": 106, "name": "eventlist/hdGetList", "type": "api" }, { - "id": 105, + "id": 107, "name": "friend/Apply", "type": "api" }, { - "id": 106, + "id": 108, "name": "friend/Del", "type": "api" }, { - "id": 107, + "id": 109, "name": "friend/Gift", "type": "api" }, { - "id": 108, + "id": 110, "name": "friend/List", "type": "api" }, { - "id": 109, + "id": 111, "name": "friend/Open", "type": "api" }, { - "id": 110, + "id": 112, "name": "friend/Respond", "type": "api" }, { - "id": 111, + "id": 113, "name": "friend/RmBlackList", "type": "api" }, { - "id": 112, + "id": 114, "name": "friend/Search", "type": "api" }, { - "id": 113, + "id": 115, "name": "ganbutexun/Challenge", "type": "api" }, { - "id": 114, + "id": 116, "name": "ganbutexun/Open", "type": "api" }, { - "id": 115, + "id": 117, "name": "ganhai/Fast", "type": "api" }, { - "id": 116, + "id": 118, "name": "ganhai/Fight", "type": "api" }, { - "id": 117, + "id": 119, "name": "ganhai/Log", "type": "api" }, { - "id": 118, + "id": 120, "name": "ganhai/Open", "type": "api" }, { - "id": 119, + "id": 121, "name": "ganhai/Refresh", "type": "api" }, { - "id": 120, + "id": 122, "name": "ganhai/RefreshShip", "type": "api" }, { - "id": 121, + "id": 123, "name": "ganhai/Select", "type": "api" }, { - "id": 122, + "id": 124, "name": "gmapi/Gift", "type": "api" }, { - "id": 123, + "id": 125, "name": "gmapi/Post", "type": "api" }, { - "id": 124, + "id": 126, "name": "gonghui/Apply", "type": "api", "conf": { @@ -2301,7 +2321,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 125, + "id": 127, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2311,7 +2331,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 126, + "id": 128, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2321,7 +2341,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 127, + "id": 129, "name": "gonghui/Change", "type": "api", "conf": { @@ -2331,12 +2351,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 128, + "id": 130, "name": "gonghui/Create", "type": "api" }, { - "id": 129, + "id": 131, "name": "gonghui/Dissolve", "type": "api", "conf": { @@ -2346,7 +2366,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 130, + "id": 132, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2356,12 +2376,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 131, + "id": 133, "name": "gonghui/FbBuyNum", "type": "api" }, { - "id": 132, + "id": 134, "name": "gonghui/FbFight", "type": "api", "conf": { @@ -2371,7 +2391,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 133, + "id": 135, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2381,17 +2401,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 134, + "id": 136, "name": "gonghui/GetList", "type": "api" }, { - "id": 135, + "id": 137, "name": "gonghui/Join", "type": "api" }, { - "id": 136, + "id": 138, "name": "gonghui/Jx", "type": "api", "conf": { @@ -2401,7 +2421,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 137, + "id": 139, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2411,7 +2431,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 138, + "id": 140, "name": "gonghui/List", "type": "api", "conf": { @@ -2421,7 +2441,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 139, + "id": 141, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2431,7 +2451,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 140, + "id": 142, "name": "gonghui/Open", "type": "api", "conf": { @@ -2441,7 +2461,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 141, + "id": 143, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2451,7 +2471,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 142, + "id": 144, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2461,7 +2481,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 143, + "id": 145, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2471,7 +2491,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 144, + "id": 146, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2481,137 +2501,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 145, + "id": 147, "name": "gonghuibaozang/Lottery", "type": "api" }, { - "id": 146, + "id": 148, "name": "gonghuibaozang/Open", "type": "api" }, { - "id": 147, + "id": 149, "name": "gonglukuangbiao/Buy", "type": "api" }, { - "id": 148, + "id": 150, "name": "gonglukuangbiao/Fight", "type": "api" }, { - "id": 149, + "id": 151, "name": "gonglukuangbiao/Open", "type": "api" }, { - "id": 150, + "id": 152, "name": "gonglukuangbiao/Refresh", "type": "api" }, { - "id": 151, + "id": 153, "name": "gongyu/mingdao/Active", "type": "api" }, { - "id": 152, + "id": 154, "name": "gongyu/mingdao/Open", "type": "api" }, { - "id": 153, + "id": 155, "name": "gongyu/mingdao/RecPrize", "type": "api" }, { - "id": 154, + "id": 156, "name": "gongyu/mingdao/Repair", "type": "api" }, { - "id": 155, + "id": 157, "name": "gongyu/xunlianjihua/Reset", "type": "api" }, { - "id": 156, + "id": 158, "name": "gongyu/xunlianjihua/UpSkill", "type": "api" }, { - "id": 157, + "id": 159, "name": "gongyu/zuozhanjihua/SetSkill", "type": "api" }, { - "id": 158, + "id": 160, "name": "hbzb/jfs/BuyNum", "type": "api" }, { - "id": 159, + "id": 161, "name": "hbzb/jfs/Fight", "type": "api" }, { - "id": 160, + "id": 162, "name": "hbzb/jfs/GetLog", "type": "api" }, { - "id": 161, + "id": 163, "name": "hbzb/jfs/Open", "type": "api" }, { - "id": 162, + "id": 164, "name": "hbzb/jfs/Rec", "type": "api" }, { - "id": 163, + "id": 165, "name": "hbzb/jfs/Refresh", "type": "api" }, { - "id": 164, + "id": 166, "name": "hbzb/GetStatus", "type": "api" }, { - "id": 165, + "id": 167, "name": "hbzb/zbs/BuyNum", "type": "api" }, { - "id": 166, + "id": 168, "name": "hbzb/zbs/Fight", "type": "api" }, { - "id": 167, + "id": 169, "name": "hbzb/zbs/GetLog", "type": "api" }, { - "id": 168, + "id": 170, "name": "hbzb/zbs/Open", "type": "api" }, { - "id": 169, + "id": 171, "name": "hbzb/zbs/Refresh", "type": "api" }, { - "id": 170, + "id": 172, "name": "hero/Awake", "type": "api" }, { - "id": 171, + "id": 173, "name": "hero/ChangePos", "type": "api", "conf": { @@ -2619,17 +2639,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 172, + "id": 174, "name": "hero/GetList", "type": "api" }, { - "id": 173, + "id": 175, "name": "hero/JinJie", "type": "api" }, { - "id": 174, + "id": 176, "name": "hero/LvUp", "type": "api", "conf": { @@ -2637,32 +2657,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 175, + "id": 177, "name": "hero/Potency", "type": "api" }, { - "id": 176, + "id": 178, "name": "hero/Rec", "type": "api" }, { - "id": 177, + "id": 179, "name": "hero/Reset", "type": "api" }, { - "id": 178, + "id": 180, "name": "hero/Talent", "type": "api" }, { - "id": 179, + "id": 181, "name": "hero/WeaponUp", "type": "api" }, { - "id": 180, + "id": 182, "name": "hongdian/Get", "type": "api", "conf": { @@ -2670,117 +2690,117 @@ export const serviceProto: ServiceProto = { } }, { - "id": 181, + "id": 183, "name": "item/GetList", "type": "api" }, { - "id": 182, + "id": 184, "name": "item/Use", "type": "api" }, { - "id": 183, + "id": 185, "name": "jiaotang/Lottery", "type": "api" }, { - "id": 184, + "id": 186, "name": "jiaotang/Open", "type": "api" }, { - "id": 185, + "id": 187, "name": "jiuba/Lottery", "type": "api" }, { - "id": 186, + "id": 188, "name": "jiuba/Open", "type": "api" }, { - "id": 187, + "id": 189, "name": "jjc/BuyFightNum", "type": "api" }, { - "id": 188, + "id": 190, "name": "jjc/Fight", "type": "api" }, { - "id": 189, + "id": 191, "name": "jjc/FightLog", "type": "api" }, { - "id": 190, + "id": 192, "name": "jjc/Open", "type": "api" }, { - "id": 191, + "id": 193, "name": "jjc/Receive", "type": "api" }, { - "id": 192, + "id": 194, "name": "jjc/Refresh", "type": "api" }, { - "id": 193, + "id": 195, "name": "kaifujingsai/Open", "type": "api" }, { - "id": 194, + "id": 196, "name": "kaifujingsai/Receive", "type": "api" }, { - "id": 195, + "id": 197, "name": "kbzz/Apply", "type": "api" }, { - "id": 196, + "id": 198, "name": "kbzz/AutoApply", "type": "api" }, { - "id": 197, + "id": 199, "name": "kbzz/BuyNum", "type": "api" }, { - "id": 198, + "id": 200, "name": "kbzz/Fight", "type": "api" }, { - "id": 199, + "id": 201, "name": "kbzz/FightLog", "type": "api" }, { - "id": 200, + "id": 202, "name": "kbzz/GroupState", "type": "api" }, { - "id": 201, + "id": 203, "name": "kbzz/Open", "type": "api" }, { - "id": 202, + "id": 204, "name": "kbzz/RecPrize", "type": "api" }, { - "id": 203, + "id": 205, "name": "kbzz/Refresh", "type": "api", "conf": { @@ -2788,287 +2808,287 @@ export const serviceProto: ServiceProto = { } }, { - "id": 204, + "id": 206, "name": "kuangdong/AddPkNum", "type": "api" }, { - "id": 205, + "id": 207, "name": "kuangdong/GetPrize", "type": "api" }, { - "id": 206, + "id": 208, "name": "kuangdong/KdInfo", "type": "api" }, { - "id": 207, + "id": 209, "name": "kuangdong/Log", "type": "api" }, { - "id": 208, + "id": 210, "name": "kuangdong/Open", "type": "api" }, { - "id": 209, + "id": 211, "name": "kuangdong/YanShi", "type": "api" }, { - "id": 210, + "id": 212, "name": "kuangdong/ZhanLing", "type": "api" }, { - "id": 211, + "id": 213, "name": "lingzhulaixi/Open", "type": "api" }, { - "id": 212, + "id": 214, "name": "lingzhulaixi/PkBoss", "type": "api" }, { - "id": 213, + "id": 215, "name": "lingzhulaixi/PkRank", "type": "api" }, { - "id": 214, + "id": 216, "name": "lingzhulaixi/SaoDang", "type": "api" }, { - "id": 215, + "id": 217, "name": "meirishilian/Buy", "type": "api" }, { - "id": 216, + "id": 218, "name": "meirishilian/Fight", "type": "api" }, { - "id": 217, + "id": 219, "name": "meirishilian/Open", "type": "api" }, { - "id": 218, + "id": 220, "name": "msg_c2s/BindUid", "type": "msg" }, { - "id": 219, + "id": 221, "name": "msg_c2s/Pay", "type": "msg" }, { - "id": 220, + "id": 222, "name": "msg_c2s/Sync", "type": "msg" }, { - "id": 221, + "id": 223, "name": "msg_s2c/Chat", "type": "msg" }, { - "id": 222, + "id": 224, "name": "msg_s2c/ChatHelp", "type": "msg" }, { - "id": 223, + "id": 225, "name": "msg_s2c/Collection", "type": "msg" }, { - "id": 224, + "id": 226, "name": "msg_s2c/Email", "type": "msg" }, { - "id": 225, + "id": 227, "name": "msg_s2c/EmailDel", "type": "msg" }, { - "id": 226, + "id": 228, "name": "msg_s2c/EquipChange", "type": "msg" }, { - "id": 227, + "id": 229, "name": "msg_s2c/Friend", "type": "msg" }, { - "id": 228, + "id": 230, "name": "msg_s2c/GhChange", "type": "msg" }, { - "id": 229, + "id": 231, "name": "msg_s2c/GongHuiBaoZang", "type": "msg" }, { - "id": 230, + "id": 232, "name": "msg_s2c/HeroChange", "type": "msg" }, { - "id": 231, + "id": 233, "name": "msg_s2c/HongDianChange", "type": "msg" }, { - "id": 232, + "id": 234, "name": "msg_s2c/ItemChange", "type": "msg" }, { - "id": 233, + "id": 235, "name": "msg_s2c/LoginQueue", "type": "msg" }, { - "id": 234, + "id": 236, "name": "msg_s2c/LshdChange", "type": "msg" }, { - "id": 235, + "id": 237, "name": "msg_s2c/NewDay", "type": "msg" }, { - "id": 236, + "id": 238, "name": "msg_s2c/OtherLogin", "type": "msg" }, { - "id": 237, + "id": 239, "name": "msg_s2c/PayChange", "type": "msg" }, { - "id": 238, + "id": 240, "name": "msg_s2c/PayResult", "type": "msg" }, { - "id": 239, + "id": 241, "name": "msg_s2c/PeijianChange", "type": "msg" }, { - "id": 240, + "id": 242, "name": "msg_s2c/PlayerChange", "type": "msg" }, { - "id": 241, + "id": 243, "name": "msg_s2c/Private", "type": "msg" }, { - "id": 242, + "id": 244, "name": "msg_s2c/PushGiftChange", "type": "msg" }, { - "id": 243, + "id": 245, "name": "msg_s2c/SendGift", "type": "msg" }, { - "id": 244, + "id": 246, "name": "msg_s2c/ShiwuChange", "type": "msg" }, { - "id": 245, + "id": 247, "name": "msg_s2c/TaskChange", "type": "msg" }, { - "id": 246, + "id": 248, "name": "msg_s2c/Xianshilibao", "type": "msg" }, { - "id": 247, + "id": 249, "name": "pata/Fight", "type": "api" }, { - "id": 248, + "id": 250, "name": "pata/GetPrize", "type": "api" }, { - "id": 249, + "id": 251, "name": "pata/Open", "type": "api" }, { - "id": 250, + "id": 252, "name": "pata/SaoDang", "type": "api" }, { - "id": 251, + "id": 253, "name": "pay/GetList", "type": "api" }, { - "id": 252, + "id": 254, "name": "peijian/GetList", "type": "api" }, { - "id": 253, + "id": 255, "name": "peijian/JingLian", "type": "api" }, { - "id": 254, + "id": 256, "name": "peijian/JinJie", "type": "api" }, { - "id": 255, + "id": 257, "name": "peijian/LvUp", "type": "api" }, { - "id": 256, + "id": 258, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 257, + "id": 259, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 258, + "id": 260, "name": "peijian/Reset", "type": "api" }, { - "id": 259, + "id": 261, "name": "peijian/Rm", "type": "api" }, { - "id": 260, + "id": 262, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3076,32 +3096,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 261, + "id": 263, "name": "peijian/UnLock", "type": "api" }, { - "id": 262, + "id": 264, "name": "peijian/Wear", "type": "api" }, { - "id": 263, + "id": 265, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 264, + "id": 266, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 265, + "id": 267, "name": "peijiancangku/Open", "type": "api" }, { - "id": 266, + "id": 268, "name": "Bingo", "type": "api", "conf": { @@ -3109,142 +3129,142 @@ export const serviceProto: ServiceProto = { } }, { - "id": 267, + "id": 269, "name": "FightTest", "type": "api" }, { - "id": 268, + "id": 270, "name": "SyncBtn", "type": "api" }, { - "id": 269, + "id": 271, "name": "Test", "type": "api" }, { - "id": 270, + "id": 272, "name": "pushgift/Open", "type": "api" }, { - "id": 271, + "id": 273, "name": "qjzzd/Fight", "type": "api" }, { - "id": 272, + "id": 274, "name": "qjzzd/Open", "type": "api" }, { - "id": 273, + "id": 275, "name": "rank/Open", "type": "api" }, { - "id": 274, + "id": 276, "name": "shiwu/Concise", "type": "api" }, { - "id": 275, + "id": 277, "name": "shiwu/Extract", "type": "api" }, { - "id": 276, + "id": 278, "name": "shiwu/GetList", "type": "api" }, { - "id": 277, + "id": 279, "name": "shiwu/LvUp", "type": "api" }, { - "id": 278, + "id": 280, "name": "shiwu/Recast", "type": "api" }, { - "id": 279, + "id": 281, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 280, + "id": 282, "name": "shiwu/Wear", "type": "api" }, { - "id": 281, + "id": 283, "name": "shootGame/Open", "type": "api" }, { - "id": 282, + "id": 284, "name": "shootGame/Rec", "type": "api" }, { - "id": 283, + "id": 285, "name": "shop/Buy", "type": "api" }, { - "id": 284, + "id": 286, "name": "shop/Open", "type": "api" }, { - "id": 285, + "id": 287, "name": "shop/Refresh", "type": "api" }, { - "id": 286, + "id": 288, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 287, + "id": 289, "name": "sign/GetPrize", "type": "api" }, { - "id": 288, + "id": 290, "name": "sign/Open", "type": "api" }, { - "id": 289, + "id": 291, "name": "slzd/Aim", "type": "api" }, { - "id": 290, + "id": 292, "name": "slzd/BuyNum", "type": "api" }, { - "id": 291, + "id": 293, "name": "slzd/Fight", "type": "api" }, { - "id": 292, + "id": 294, "name": "slzd/FightLog", "type": "api" }, { - "id": 293, + "id": 295, "name": "slzd/MyRank", "type": "api" }, { - "id": 294, + "id": 296, "name": "slzd/Open", "type": "api", "conf": { @@ -3254,77 +3274,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 295, + "id": 297, "name": "slzd/OpenFort", "type": "api" }, { - "id": 296, + "id": 298, "name": "slzd/Rec", "type": "api" }, { - "id": 297, + "id": 299, "name": "slzd/Refresh", "type": "api" }, { - "id": 298, + "id": 300, "name": "slzd/Slot", "type": "api" }, { - "id": 299, + "id": 301, "name": "tanxian/Event", "type": "api" }, { - "id": 300, + "id": 302, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 301, + "id": 303, "name": "tanxian/Fight", "type": "api" }, { - "id": 302, + "id": 304, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 303, + "id": 305, "name": "tanxian/Open", "type": "api" }, { - "id": 304, + "id": 306, "name": "tanxian/Receive", "type": "api" }, { - "id": 305, + "id": 307, "name": "task/AllFinsh", "type": "api" }, { - "id": 306, + "id": 308, "name": "task/Finsh", "type": "api" }, { - "id": 307, + "id": 309, "name": "task/Open", "type": "api" }, { - "id": 308, + "id": 310, "name": "user/CDKEY", "type": "api" }, { - "id": 309, + "id": 311, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3332,197 +3352,197 @@ export const serviceProto: ServiceProto = { } }, { - "id": 310, + "id": 312, "name": "user/ChangeName", "type": "api" }, { - "id": 311, + "id": 313, "name": "user/Fight", "type": "api" }, { - "id": 312, + "id": 314, "name": "user/GetInfo", "type": "api" }, { - "id": 313, + "id": 315, "name": "user/InfoOpen", "type": "api" }, { - "id": 314, + "id": 316, "name": "user/Login", "type": "api" }, { - "id": 315, + "id": 317, "name": "user/Ping", "type": "api" }, { - "id": 316, + "id": 318, "name": "user/Renown", "type": "api" }, { - "id": 317, + "id": 319, "name": "user/RenownBuy", "type": "api" }, { - "id": 318, + "id": 320, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 319, + "id": 321, "name": "user/RenownOpen", "type": "api" }, { - "id": 320, + "id": 322, "name": "user/Tujian", "type": "api" }, { - "id": 321, + "id": 323, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 322, + "id": 324, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 323, + "id": 325, "name": "weixiuchang/Open", "type": "api" }, { - "id": 324, + "id": 326, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 325, + "id": 327, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 326, + "id": 328, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 327, + "id": 329, "name": "wzry/BaoMing", "type": "api" }, { - "id": 328, + "id": 330, "name": "wzry/catFightLog", "type": "api" }, { - "id": 329, + "id": 331, "name": "wzry/CatGroup", "type": "api" }, { - "id": 330, + "id": 332, "name": "wzry/DldFight", "type": "api" }, { - "id": 331, + "id": 333, "name": "wzry/DldRefre", "type": "api" }, { - "id": 332, + "id": 334, "name": "wzry/JingCai", "type": "api" }, { - "id": 333, + "id": 335, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 334, + "id": 336, "name": "wzry/Open", "type": "api" }, { - "id": 335, + "id": 337, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 336, + "id": 338, "name": "wzry/Wzzd", "type": "api" }, { - "id": 337, + "id": 339, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 338, + "id": 340, "name": "xstask/AllGet", "type": "api" }, { - "id": 339, + "id": 341, "name": "xstask/Get", "type": "api" }, { - "id": 340, + "id": 342, "name": "xstask/LvUp", "type": "api" }, { - "id": 341, + "id": 343, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 342, + "id": 344, "name": "xstask/Open", "type": "api" }, { - "id": 343, + "id": 345, "name": "xstask/Receive", "type": "api" }, { - "id": 344, + "id": 346, "name": "xstask/Refresh", "type": "api" }, { - "id": 345, + "id": 347, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 346, + "id": 348, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 347, + "id": 349, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 348, + "id": 350, "name": "zhanqianbushu/Up", "type": "api" } @@ -10045,6 +10065,78 @@ export const serviceProto: ServiceProto = { } ] }, + "event/leichonglibao/PtlOpen/ReqOpen": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "hdid", + "type": { + "type": "Number" + } + } + ] + }, + "event/leichonglibao/PtlOpen/ResOpen": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "sc", + "type": { + "type": "Boolean" + } + }, + { + "id": 1, + "name": "buy", + "type": { + "type": "Array", + "elementType": { + "type": "String" + } + } + } + ] + }, + "event/leichonglibao/PtlReceive/ReqReceive": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "hdid", + "type": { + "type": "Number" + } + }, + { + "id": 1, + "name": "select", + "type": { + "type": "Array", + "elementType": { + "type": "String" + } + } + } + ] + }, + "event/leichonglibao/PtlReceive/ResReceive": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "prize", + "type": { + "type": "Array", + "elementType": { + "type": "Reference", + "target": "type/prizeType" + } + } + } + ] + }, "event/leijichongzhi/PtlOpen/ReqOpen": { "type": "Interface", "properties": [ @@ -15182,6 +15274,13 @@ export const serviceProto: ServiceProto = { "type": "Literal", "literal": "pobinglibao" } + }, + { + "id": 38, + "type": { + "type": "Literal", + "literal": "leichonglibao" + } } ] }, From e0a624adba9ecd108fed3d123688101d0de812ca Mon Sep 17 00:00:00 2001 From: chenkai Date: Fri, 22 Dec 2023 12:11:20 +0800 Subject: [PATCH 57/90] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E9=A2=86?= =?UTF-8?q?=E5=8F=96=E6=97=A5=E5=BF=97=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/payForDiamond/ApiCanReceive.ts | 14 ++++---- src/api_s2c/event/payForDiamond/ApiReceive.ts | 34 +++++++------------ .../event/payForDiamond/PtlCanReceive.ts | 1 + .../event/payForDiamond/PtlReceive.ts | 1 + src/shared/protocols/serviceProto.ts | 17 ++++++++++ 5 files changed, 40 insertions(+), 27 deletions(-) diff --git a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts index a39596f..addccf7 100644 --- a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts @@ -8,19 +8,20 @@ export async function playerCanReceive(call: ApiCall) { if (!activityInfo) { return call.error('No such activity'); } - const remaining = typeof activityInfo.data['remaining'] === 'number'? activityInfo.data['remaining'] : activityInfo.data['totalmoney']; + const remaining = activityInfo.data['totalmoney']; + const showOffList = activityInfo.data['showOffList'] || []; const zeroTime = PublicShared.getToDayZeroTime(); const dayPayInfo = await G.mongodb.collection('dayPay').findOne({ uid: call.uid, time: zeroTime }); if (!dayPayInfo || !dayPayInfo.payNum) { return { - payNum: 0, remaining, result: false, activityInfo + payNum: 0, remaining, result: false, activityInfo, showOffList }; } const payNum = dayPayInfo.payNum; // 玩家充值未达标或者奖池余额耗尽则不能领取 if (payNum < activityInfo.data['price'] || remaining <= 0) { return { - payNum, remaining, result: false, activityInfo + payNum, remaining, result: false, activityInfo, showOffList } } // 检查玩家今日是否已经领取 @@ -28,18 +29,19 @@ export async function playerCanReceive(call: ApiCall) { if (playerActivityInfo) { if (playerActivityInfo[zeroTime]?.length) { return { - payNum, remaining, result: false, activityInfo + payNum, remaining, result: false, activityInfo, showOffList }; } } return { - payNum, remaining, result: true, activityInfo + payNum, remaining, result: true, activityInfo, showOffList }; } export default async function (call: ApiCall) { const canReceiveResult = await playerCanReceive(call); if (canReceiveResult) { - call.succ(canReceiveResult); + const { payNum, remaining, result, showOffList } = canReceiveResult; + call.succ({ payNum, remaining, result, showOffList }); } } \ No newline at end of file diff --git a/src/api_s2c/event/payForDiamond/ApiReceive.ts b/src/api_s2c/event/payForDiamond/ApiReceive.ts index cb45b06..768fed2 100644 --- a/src/api_s2c/event/payForDiamond/ApiReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiReceive.ts @@ -62,31 +62,31 @@ export default async function (call: ApiCall) { if (!canReceiveResult.result) { return call.succ({ amount: 0, - timesRemaining: 0 + timesRemaining: 0, + showOff: false }); } const activityData = canReceiveResult.activityInfo.data; - const remaining = typeof activityData['remaining'] === 'number'? activityData['remaining'] : activityData['totalmoney']; + const remaining = activityData['totalmoney']; const { group, maxAmount } = randomWithWeight(activityData['groupConf']['base']['arr']); const gotAmount = calcDiamondGot(remaining, group, maxAmount); // 减去余额 const filter = { hdid: call.req.activityId, - $or: [ - {'data.remaining': { $exists: false }}, - {$expr: {$gte: [ `$data.remaining - ${gotAmount}`, 0 ]}}, - ], + $expr: {$gte: [ `$data.totalmoney - ${gotAmount}`, 0 ]}, }; const updateDoc = { - $set: { 'data.remaining': `$data.remaining - ${gotAmount}` } + $inc: { 'data.totalmoney': -1 * Math.abs(gotAmount) } } const updateResult = await G.mongodb.collection('hdinfo').updateOne(filter, updateDoc); // 更新成功 if (updateResult.modifiedCount) { + const showOff = gotAmount >= activityData['groupConf']['base']['loglimit']; // 请求返回 call.succ({ amount: gotAmount, - timesRemaining: 0 + timesRemaining: 0, + showOff, }); // 添加玩家领取记录 const zeroTime = PublicShared.getToDayZeroTime(); @@ -95,19 +95,11 @@ export default async function (call: ApiCall) { G.mongodb.cEvent('payForDiamond').updateOne({ uid: call.uid }, { $set: setObj }); + // 记录玩家日志. 仅保留最近 10 条 + if (showOff) { + G.mongodb.collection('hdinfo').updateOne({ hdid: call.req.activityId, }, { $push: { 'data.showOffList': { $each: [{ name: call.conn.gud.name, gotAmount }], $slice: -10 }}}); + } } - // 发送炫耀 - if (gotAmount >= activityData['groupConf']['base']['loglimit']) { - ChatFun.newMsg({ - type: 'local', - msg: G.gc.pmd.get_hero_star5_pmd, - time: G.time, - sender: 'system', - otherData: { - pmd: true, - args: [gotAmount] - } - }); - } + } } \ No newline at end of file diff --git a/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts b/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts index 8d905ec..e7c8b13 100644 --- a/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts +++ b/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts @@ -6,4 +6,5 @@ export type ResCanReceive = { payNum: number; remaining?: number; result: boolean; + showOffList: any[]; }; \ No newline at end of file diff --git a/src/shared/protocols/event/payForDiamond/PtlReceive.ts b/src/shared/protocols/event/payForDiamond/PtlReceive.ts index beb4bf8..6fe6681 100644 --- a/src/shared/protocols/event/payForDiamond/PtlReceive.ts +++ b/src/shared/protocols/event/payForDiamond/PtlReceive.ts @@ -5,4 +5,5 @@ export type ReqReceive = { export type ResReceive = { amount: number, timesRemaining: number; + showOff: boolean; }; diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 5bef3a2..db94cdb 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -10141,6 +10141,16 @@ export const serviceProto: ServiceProto = { "type": { "type": "Boolean" } + }, + { + "id": 3, + "name": "showOffList", + "type": { + "type": "Array", + "elementType": { + "type": "Any" + } + } } ] }, @@ -10172,6 +10182,13 @@ export const serviceProto: ServiceProto = { "type": { "type": "Number" } + }, + { + "id": 2, + "name": "showOff", + "type": { + "type": "Boolean" + } } ] }, From 06062716efa7b25ec3b98c93b94434da60ff8091 Mon Sep 17 00:00:00 2001 From: chenkai Date: Fri, 22 Dec 2023 13:40:13 +0800 Subject: [PATCH 58/90] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E9=A2=86?= =?UTF-8?q?=E5=8F=96=E6=97=B6=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/payForDiamond/ApiReceive.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api_s2c/event/payForDiamond/ApiReceive.ts b/src/api_s2c/event/payForDiamond/ApiReceive.ts index 768fed2..3ceedf5 100644 --- a/src/api_s2c/event/payForDiamond/ApiReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiReceive.ts @@ -73,7 +73,7 @@ export default async function (call: ApiCall) { // 减去余额 const filter = { hdid: call.req.activityId, - $expr: {$gte: [ `$data.totalmoney - ${gotAmount}`, 0 ]}, + $expr: { $gte: ['$data.totalmoney', gotAmount ]}, }; const updateDoc = { $inc: { 'data.totalmoney': -1 * Math.abs(gotAmount) } From c5817b4acff09ecc2fda7f2ba7ab95cadbc6becb Mon Sep 17 00:00:00 2001 From: chenkai Date: Fri, 22 Dec 2023 13:57:02 +0800 Subject: [PATCH 59/90] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E7=8E=A9?= =?UTF-8?q?=E5=AE=B6=E9=A2=86=E5=8F=96=E8=AE=B0=E5=BD=95=E7=9A=84=20upsert?= =?UTF-8?q?=20=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/payForDiamond/ApiReceive.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api_s2c/event/payForDiamond/ApiReceive.ts b/src/api_s2c/event/payForDiamond/ApiReceive.ts index 3ceedf5..74d0170 100644 --- a/src/api_s2c/event/payForDiamond/ApiReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiReceive.ts @@ -94,7 +94,7 @@ export default async function (call: ApiCall) { setObj[zeroTime] = gotAmount; G.mongodb.cEvent('payForDiamond').updateOne({ uid: call.uid }, { $set: setObj - }); + }, {upsert: true}); // 记录玩家日志. 仅保留最近 10 条 if (showOff) { G.mongodb.collection('hdinfo').updateOne({ hdid: call.req.activityId, }, { $push: { 'data.showOffList': { $each: [{ name: call.conn.gud.name, gotAmount }], $slice: -10 }}}); From 86910e7ad7534b262772265a2ef61ec1fe5251e8 Mon Sep 17 00:00:00 2001 From: chenkai Date: Fri, 22 Dec 2023 14:05:15 +0800 Subject: [PATCH 60/90] =?UTF-8?q?debug:=20=E6=B7=BB=E5=8A=A0=E7=8E=A9?= =?UTF-8?q?=E5=AE=B6=E9=A2=86=E5=8F=96=E8=AE=B0=E5=BD=95=E7=9A=84=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/payForDiamond/ApiReceive.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/api_s2c/event/payForDiamond/ApiReceive.ts b/src/api_s2c/event/payForDiamond/ApiReceive.ts index 74d0170..0bcaab3 100644 --- a/src/api_s2c/event/payForDiamond/ApiReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiReceive.ts @@ -92,12 +92,13 @@ export default async function (call: ApiCall) { const zeroTime = PublicShared.getToDayZeroTime(); const setObj = {}; setObj[zeroTime] = gotAmount; - G.mongodb.cEvent('payForDiamond').updateOne({ uid: call.uid }, { + const updatecEventResult = await G.mongodb.cEvent('payForDiamond').updateOne({ uid: call.uid }, { $set: setObj }, {upsert: true}); + console.log('updatecEventResult', JSON.stringify(updatecEventResult)); // 记录玩家日志. 仅保留最近 10 条 if (showOff) { - G.mongodb.collection('hdinfo').updateOne({ hdid: call.req.activityId, }, { $push: { 'data.showOffList': { $each: [{ name: call.conn.gud.name, gotAmount }], $slice: -10 }}}); + await G.mongodb.collection('hdinfo').updateOne({ hdid: call.req.activityId, }, { $push: { 'data.showOffList': { $each: [{ name: call.conn.gud.name, gotAmount }], $slice: -10 }}}); } } From 6526d386c4f8b7b10c075140b9ee21e3f6be8467 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 22 Dec 2023 14:33:43 +0800 Subject: [PATCH 61/90] =?UTF-8?q?feat:=20=E7=B4=AF=E5=85=85=E7=A4=BC?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/leichonglibao/ApiOpen.ts | 2 +- src/api_s2c/event/leichonglibao/ApiReceive.ts | 16 ++++++++++++++-- src/globalListener.ts | 4 +++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/api_s2c/event/leichonglibao/ApiOpen.ts b/src/api_s2c/event/leichonglibao/ApiOpen.ts index 78d89e5..b820d52 100644 --- a/src/api_s2c/event/leichonglibao/ApiOpen.ts +++ b/src/api_s2c/event/leichonglibao/ApiOpen.ts @@ -12,7 +12,7 @@ export default async function (call: ApiCall) { // 每天open红点 G.mongodb.cEvent(`leichonglibao${call.req.hdid}`).updateOne( - {type: `leichonglibao${call.req.hdid}`, uid: call.uid}, {$set: change} + {type: `leichonglibao${call.req.hdid}`, uid: call.uid}, {$set: change}, {upsert: true} ) let temp = Object.assign((data || {}), change) as ResOpen & { opentime } diff --git a/src/api_s2c/event/leichonglibao/ApiReceive.ts b/src/api_s2c/event/leichonglibao/ApiReceive.ts index aa58d3f..2ce441f 100644 --- a/src/api_s2c/event/leichonglibao/ApiReceive.ts +++ b/src/api_s2c/event/leichonglibao/ApiReceive.ts @@ -42,6 +42,11 @@ export default async function (call: ApiCall) { _prize.push(hddata.dlz[i][call.req.select[i] || "1"]) } + // 修改领取标识 + await G.mongodb.cEvent(`leichonglibao${call.req.hdid}`).updateOne( + {type: `leichonglibao${call.req.hdid}`, uid: call.uid}, {$set: {sc: true}} + ) + PlayerFun.sendPrize(call, _prize) call.succ({prize: _prize}) } @@ -71,14 +76,21 @@ export async function LeiChongLiBaoBuyGift(call: ApiCall, payId: string) { {type: `leichonglibao${hdid}`, uid: call.uid} ) - if (mydata.buy.includes(gift.payId)) { + if (mydata && mydata.buy.includes(gift.payId)) { console.log(call.uid, "购买累充礼包 重复购买", payId); return } + let update; + if (mydata) { + update = {$push: {buy: payId}} + } else { + update = {$set: {opentime: G.time, sc: false, buy: [payId]}} + } + PlayerFun.sendPrize(call, gift.prize) G.mongodb.cEvent(`leichonglibao${hdid}`).updateOne( - {uid: call.uid, type: `leichonglibao${hdid}`}, {"$push": {buy: payId}} + {uid: call.uid, type: `leichonglibao${hdid}`}, update ) } diff --git a/src/globalListener.ts b/src/globalListener.ts index f4ada40..6a5bec8 100644 --- a/src/globalListener.ts +++ b/src/globalListener.ts @@ -18,6 +18,7 @@ import { setGud } from './public/gud'; import {checkResetBuyLog} from "./api_s2c/event/zhoumolibao/ApiOpen"; import {Christmasfun} from "./api_s2c/event/christmas/fun"; import {PushGiftFun} from "./public/pushgift"; +import {LeiChongLiBaoBuyGift} from "./api_s2c/event/leichonglibao/ApiReceive"; export type gEventType = { /**玩家断开连接 */ @@ -201,7 +202,8 @@ export function addListener() { { $inc: { payNum: conf.money } }, { upsert: true } ); - PushGiftFun.buy(player.uid, payId) // 推送礼包 + await PushGiftFun.buy(player.uid, payId) // 推送礼包 + await LeiChongLiBaoBuyGift(call, payId) // 累充礼包 }); G.on("FIRST_LOGIN_EVERY_DAY", (gud, lastTime, curTime) => { From 2a492a891936048ca3ae5fb9f41d42bfddeed386 Mon Sep 17 00:00:00 2001 From: chenkai Date: Fri, 22 Dec 2023 14:59:33 +0800 Subject: [PATCH 62/90] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=8E=A9?= =?UTF-8?q?=E5=AE=B6=E5=8F=AF=E4=BB=A5=E9=87=8D=E5=A4=8D=E9=A2=86=E5=8F=96?= =?UTF-8?q?=E7=9A=84=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/payForDiamond/ApiCanReceive.ts | 11 ++++++----- src/api_s2c/event/payForDiamond/ApiReceive.ts | 3 +-- src/json/pmd.json5 | 4 +--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts index addccf7..77f79fc 100644 --- a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts @@ -2,6 +2,7 @@ import { ApiCall } from "tsrpc"; import { HuoDongFun } from "../../../public/huodongfun"; import { ReqCanReceive, ResCanReceive } from '../../../shared/protocols/event/payForDiamond/PtlCanReceive'; import { PublicShared } from "../../../shared/public/public"; +import { ActionLog } from "../../../public/actionLog/actionLog"; export async function playerCanReceive(call: ApiCall) { const activityInfo = await HuoDongFun.getHdidInfo(call, call.req.activityId); @@ -11,13 +12,13 @@ export async function playerCanReceive(call: ApiCall) { const remaining = activityInfo.data['totalmoney']; const showOffList = activityInfo.data['showOffList'] || []; const zeroTime = PublicShared.getToDayZeroTime(); - const dayPayInfo = await G.mongodb.collection('dayPay').findOne({ uid: call.uid, time: zeroTime }); - if (!dayPayInfo || !dayPayInfo.payNum) { + const vipScore = await ActionLog.getDayLog(call.uid, 'pay'); + if (!vipScore) { return { payNum: 0, remaining, result: false, activityInfo, showOffList }; } - const payNum = dayPayInfo.payNum; + const payNum = vipScore; // 玩家充值未达标或者奖池余额耗尽则不能领取 if (payNum < activityInfo.data['price'] || remaining <= 0) { return { @@ -25,9 +26,9 @@ export async function playerCanReceive(call: ApiCall) { } } // 检查玩家今日是否已经领取 - const playerActivityInfo = G.mongodb.cEvent('payForDiamond').findOne({ uid: call.uid }); + const playerActivityInfo = await G.mongodb.cEvent('payForDiamond').findOne({ uid: call.uid, type: 'payForDiamond' }); if (playerActivityInfo) { - if (playerActivityInfo[zeroTime]?.length) { + if (playerActivityInfo[zeroTime]) { return { payNum, remaining, result: false, activityInfo, showOffList }; diff --git a/src/api_s2c/event/payForDiamond/ApiReceive.ts b/src/api_s2c/event/payForDiamond/ApiReceive.ts index 0bcaab3..315e517 100644 --- a/src/api_s2c/event/payForDiamond/ApiReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiReceive.ts @@ -92,10 +92,9 @@ export default async function (call: ApiCall) { const zeroTime = PublicShared.getToDayZeroTime(); const setObj = {}; setObj[zeroTime] = gotAmount; - const updatecEventResult = await G.mongodb.cEvent('payForDiamond').updateOne({ uid: call.uid }, { + await G.mongodb.cEvent('payForDiamond').updateOne({ uid: call.uid, type: 'payForDiamond' }, { $set: setObj }, {upsert: true}); - console.log('updatecEventResult', JSON.stringify(updatecEventResult)); // 记录玩家日志. 仅保留最近 10 条 if (showOff) { await G.mongodb.collection('hdinfo').updateOne({ hdid: call.req.activityId, }, { $push: { 'data.showOffList': { $each: [{ name: call.conn.gud.name, gotAmount }], $slice: -10 }}}); diff --git a/src/json/pmd.json5 b/src/json/pmd.json5 index bd2ec62..2e0db1c 100644 --- a/src/json/pmd.json5 +++ b/src/json/pmd.json5 @@ -14,7 +14,5 @@ //黑帮争霸争霸赛第二名 hbzb_pmd2: 'intr_pmd_hbzb2', //黑帮争霸争霸赛第三名 - hbzb_pmd3: 'intr_pmd_hbzb3', - // 充值抢钻石 - 抢到大量钻石 - pay_for_diamond: 'intr_pmd_pfd' + hbzb_pmd3: 'intr_pmd_hbzb3' } \ No newline at end of file From 6b80b07cfe7af284415486fa0bcec9c74430f616 Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 22 Dec 2023 15:01:23 +0800 Subject: [PATCH 63/90] json --- src/json/attr.json | 12 +- src/json/dixiaheishi.json5 | 8 +- src/json/g123item.json | 714 +++++++++++++++++++++++++++++++++++++ src/json/huodong.json5 | 21 +- src/json/openCond.json | 13 + src/json/pay.json | 14 +- src/json/shop.json | 4 +- src/json/shopItem.json | 58 ++- src/json/shopcom.json | 2 +- 9 files changed, 814 insertions(+), 32 deletions(-) diff --git a/src/json/attr.json b/src/json/attr.json index 371283d..27694ad 100644 --- a/src/json/attr.json +++ b/src/json/attr.json @@ -122,11 +122,21 @@ "shengdanBullet": { "id": "shengdanBullet", "name": "intr_attr_name_14", - "undefined": "圣诞子弹", + "undefined": "圣诞打靶币", "colour": 5, "icon": "icon_chegaipq", "sicon": "icon_chegaipq", "describe": "intr_attr_describe_14", "advancedEffects": "ani_xiangzikuang" + }, + "jingxuanbi": { + "id": "jingxuanbi", + "name": "intr_attr_name_15", + "undefined": "每日精选兑换币", + "colour": 4, + "icon": "icon_chegaipq", + "sicon": "icon_chegaipq", + "describe": "intr_attr_describe_15", + "advancedEffects": "" } } \ No newline at end of file diff --git a/src/json/dixiaheishi.json5 b/src/json/dixiaheishi.json5 index 83751f3..97b7c29 100644 --- a/src/json/dixiaheishi.json5 +++ b/src/json/dixiaheishi.json5 @@ -33,10 +33,10 @@ }, //136礼包 '136Gift': [ - { payId: '136Gift1', prize: [] }, + { payId: '136Gift1', prize: [], bonus: [{"a": "attr", "t": "jingxuanbi", "n": 10}] }, { prize: [{"a": "attr", "t": "rmbmoney", "n": 10},{"a": "item", "t": "12", "n": 10},{"a": "attr", "t": "jinbi", "n": 10000}] }, - { payId: '136Gift2', prize: [] }, - { payId: '136Gift3', prize: [] }, - { payId: '136Gift4', prize: [] }, + { payId: '136Gift2', prize: [], bonus: [{"a": "attr", "t": "jingxuanbi", "n": 10}] }, + { payId: '136Gift3', prize: [], bonus: [{"a": "attr", "t": "jingxuanbi", "n": 10}] }, + { payId: '136Gift4', prize: [], bonus: [{"a": "attr", "t": "jingxuanbi", "n": 10}] }, ], } \ No newline at end of file diff --git a/src/json/g123item.json b/src/json/g123item.json index 4716111..0a5e360 100644 --- a/src/json/g123item.json +++ b/src/json/g123item.json @@ -2582,6 +2582,90 @@ "rarity": 4 } }, + "item^634": { + "itemId": "item^634", + "name": "紫橙干部碎片随机箱", + "i18nKey": "intr_item_name_634", + "detailI18nKey": "intr_item_describe_634", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 5 + } + }, + "item^635": { + "itemId": "item^635", + "name": "紫橙装备碎片随机箱", + "i18nKey": "intr_item_name_635", + "detailI18nKey": "intr_item_describe_635", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 120, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 5 + } + }, + "item^636": { + "itemId": "item^636", + "name": "紫橙红干部碎片随机箱", + "i18nKey": "intr_item_name_636", + "detailI18nKey": "intr_item_describe_636", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 244, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 5 + } + }, + "item^637": { + "itemId": "item^637", + "name": "超级红色干部自选箱", + "i18nKey": "intr_item_name_637", + "detailI18nKey": "intr_item_describe_637", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 30000, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 6 + } + }, "item^5001": { "itemId": "item^5001", "name": "莱薇碎片", @@ -6845,6 +6929,489 @@ "rarity": 2 } }, + "item^50001": { + "itemId": "item^50001", + "name": "火力覆盖", + "i18nKey": "playerheadFrame_name_3", + "detailI18nKey": "intr_item_describe_50001", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "item^50002": { + "itemId": "item^50002", + "name": "双枪", + "i18nKey": "playerheadFrame_name_4", + "detailI18nKey": "intr_item_describe_50002", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "item^50003": { + "itemId": "item^50003", + "name": "武装炫耀", + "i18nKey": "playerheadFrame_name_6", + "detailI18nKey": "intr_item_describe_50003", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "item^50004": { + "itemId": "item^50004", + "name": "血海", + "i18nKey": "playerheadFrame_name_7", + "detailI18nKey": "intr_item_describe_50004", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "item^50005": { + "itemId": "item^50005", + "name": "破笼而出", + "i18nKey": "playerheadFrame_name_8", + "detailI18nKey": "intr_item_describe_50005", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "item^50006": { + "itemId": "item^50006", + "name": "擂台", + "i18nKey": "playerheadFrame_name_9", + "detailI18nKey": "intr_item_describe_50006", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "item^50007": { + "itemId": "item^50007", + "name": "破土而出", + "i18nKey": "playerheadFrame_name_10", + "detailI18nKey": "intr_item_describe_50007", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "item^50008": { + "itemId": "item^50008", + "name": "赠礼", + "i18nKey": "playerheadFrame_name_11", + "detailI18nKey": "intr_item_describe_50008", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "item^50009": { + "itemId": "item^50009", + "name": "圣诞氛围", + "i18nKey": "playerheadFrame_name_23", + "detailI18nKey": "intr_item_describe_50009", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "item^50010": { + "itemId": "item^50010", + "name": "披星戴月", + "i18nKey": "playerheadFrame_name_24", + "detailI18nKey": "intr_item_describe_50010", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "item^50101": { + "itemId": "item^50101", + "name": "冰天雪地", + "i18nKey": "playerChatFrame_name_6", + "detailI18nKey": "intr_item_describe_50101", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "item^50102": { + "itemId": "item^50102", + "name": "海浪奔涌", + "i18nKey": "playerChatFrame_name_7", + "detailI18nKey": "intr_item_describe_50102", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "item^50103": { + "itemId": "item^50103", + "name": "名扬四海", + "i18nKey": "playerheadFrame_name_15", + "detailI18nKey": "intr_item_describe_50103", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "item^50104": { + "itemId": "item^50104", + "name": "圣诞快乐", + "i18nKey": "playerChatFrame_name_8", + "detailI18nKey": "intr_item_describe_50104", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "item^50201": { + "itemId": "item^50201", + "name": "招贤纳士", + "i18nKey": "playerheadFrame_name_16", + "detailI18nKey": "intr_item_describe_50201", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "item^50202": { + "itemId": "item^50202", + "name": "势如破竹", + "i18nKey": "playerheadFrame_name_17", + "detailI18nKey": "intr_item_describe_50202", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "item^50203": { + "itemId": "item^50203", + "name": "被甲执兵", + "i18nKey": "playerheadFrame_name_18", + "detailI18nKey": "intr_item_describe_50203", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "item^50204": { + "itemId": "item^50204", + "name": "锋芒毕露", + "i18nKey": "playerheadFrame_name_19", + "detailI18nKey": "intr_item_describe_50204", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "item^50205": { + "itemId": "item^50205", + "name": "所向披靡", + "i18nKey": "playerheadFrame_name_20", + "detailI18nKey": "intr_item_describe_50205", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "item^50206": { + "itemId": "item^50206", + "name": "传世藏品", + "i18nKey": "playerheadFrame_name_21", + "detailI18nKey": "intr_item_describe_50206", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "item^50207": { + "itemId": "item^50207", + "name": "金戈铁马", + "i18nKey": "playerheadFrame_name_22", + "detailI18nKey": "intr_item_describe_50207", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "item^50301": { + "itemId": "item^50301", + "name": "圣诞庆典：男", + "i18nKey": "playerModel_name_3", + "detailI18nKey": "intr_item_describe_50301", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 5 + } + }, + "item^50302": { + "itemId": "item^50302", + "name": "圣诞庆典：女", + "i18nKey": "playerModel_name_4", + "detailI18nKey": "intr_item_describe_50302", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 5 + } + }, "equip^1001": { "itemId": "equip^1001", "name": "棉布头盔", @@ -10015,5 +10582,152 @@ "sellMaxCp": 500, "rarity": 3 } + }, + "attr^nexp": { + "itemId": "attr^nexp", + "name": "主角经验", + "i18nKey": "intr_attr_name_3", + "detailI18nKey": "intr_attr_describe_3", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "attr", + "typeName": "货币", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "attr^rongyu": { + "itemId": "attr^rongyu", + "name": "荣誉勋章", + "i18nKey": "intr_attr_name_4", + "detailI18nKey": "intr_attr_describe_4", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "attr", + "typeName": "货币", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "attr^payExp": { + "itemId": "attr^payExp", + "name": "VIP经验", + "i18nKey": "intr_attr_name_5", + "detailI18nKey": "intr_attr_describe_5", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "attr", + "typeName": "货币", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 5 + } + }, + "attr^guijinshu": { + "itemId": "attr^guijinshu", + "name": "贵金属", + "i18nKey": "intr_attr_name_6", + "detailI18nKey": "intr_attr_describe_6", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "attr", + "typeName": "货币", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 3 + } + }, + "attr^shengdanExp": { + "itemId": "attr^shengdanExp", + "name": "圣诞战令经验", + "i18nKey": "intr_attr_name_13", + "detailI18nKey": "intr_attr_describe_13", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "attr", + "typeName": "货币", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 5 + } + }, + "attr^shengdanBullet": { + "itemId": "attr^shengdanBullet", + "name": "圣诞打靶币", + "i18nKey": "intr_attr_name_14", + "detailI18nKey": "intr_attr_describe_14", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "attr", + "typeName": "货币", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 5 + } + }, + "attr^jingxuanbi": { + "itemId": "attr^jingxuanbi", + "name": "每日精选兑换币", + "i18nKey": "intr_attr_name_15", + "detailI18nKey": "intr_attr_describe_15", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "attr", + "typeName": "货币", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } } } \ No newline at end of file diff --git a/src/json/huodong.json5 b/src/json/huodong.json5 index c049895..5caa64d 100644 --- a/src/json/huodong.json5 +++ b/src/json/huodong.json5 @@ -3978,7 +3978,7 @@ "hdid" : 11000, // 唯一活动id 消费竞赛 "htype" : 11, // 后端唯一识别标识 "stype" : 1100, // 前端唯一识别标识（看前端需要是否修改） - "ttype" : 0, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动 + "ttype" : 4, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动 "stime" : 0, // 活动开始天数 "rtime" : 30, // 活动显示结束天数 "etime" : 30, // 活动实际结束 @@ -4044,7 +4044,7 @@ "hdid" : 12000, // 唯一活动id 累计购买礼包 "htype" : 12, // 后端唯一识别标识 "stype" : 1200, // 前端唯一识别标识（看前端需要是否修改） - "ttype" : 0, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动 + "ttype" : 4, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动 "stime" : 0, // 活动开始天数 "rtime" : 30, // 活动显示结束天数 "etime" : 30, // 活动实际结束 @@ -4052,16 +4052,11 @@ "icon": "icon_ljlibao", "showtime" : "仅供参考，会复写正确值", // 自选礼包，如果存在多个活动，计费点不要设置一样；如果是一样，可能会存在付费一次，购买多次。 "data" : { - //活动文本描述 - intr: "ljlibaotips_1", - intr2: "ljlibaotips_2", //礼包 gift: [ { id: '1', - - name: 'ljlibaotips_3', - need:[], + need:[], free: false, payId: 'ljlibao_1', //返利比 @@ -4077,7 +4072,6 @@ }, { id: '2', - name: 'ljlibaotips_4', need:[], free: false, payId: 'ljlibao_2', @@ -4093,7 +4087,6 @@ }, { id: '3', - name: 'ljlibaotips_5', need:[], free: false, payId: 'ljlibao_3', @@ -4109,7 +4102,6 @@ }, { id: '4', - name: 'ljlibaotips_6', need:[], free: false, payId: 'ljlibao_4', @@ -4130,7 +4122,6 @@ }, { id: '5', - name: 'ljlibaotips_7', need:[], free: false, payId: 'ljlibao_5', @@ -4151,7 +4142,6 @@ }, { id: '6', - name: 'ljlibaotips_8', need:[], free: false, payId: 'ljlibao_6', @@ -4172,7 +4162,6 @@ }, { id: '7', - name: 'ljlibaotips_9', need:[], free: false, payId: 'ljlibao_7', @@ -4243,10 +4232,10 @@ } }, { - "hdid" : 13000, // 唯一活动id 累计购买礼包 + "hdid" : 13000, // 唯一活动id 充值分红包 "htype" : 13, // 后端唯一识别标识 "stype" : 1300, // 前端唯一识别标识（看前端需要是否修改） - "ttype" : 0, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动 + "ttype" : 4, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动 "stime" : 0, // 活动开始天数 "rtime" : 30, // 活动显示结束天数 "etime" : 30, // 活动实际结束 diff --git a/src/json/openCond.json b/src/json/openCond.json index ef4f726..06d9d8c 100644 --- a/src/json/openCond.json +++ b/src/json/openCond.json @@ -1365,5 +1365,18 @@ "display": { "lv": 15 } + }, + "leigoulibao": { + "name": "leigoulibao", + "undefined": "累购礼包", + "and": { + "lv": 15 + }, + "or": {}, + "time": 0, + "tips": "openCond_tips_96", + "display": { + "lv": 15 + } } } \ No newline at end of file diff --git a/src/json/pay.json b/src/json/pay.json index c40b1d1..4f7b61b 100644 --- a/src/json/pay.json +++ b/src/json/pay.json @@ -4119,7 +4119,7 @@ "name": "pay_name_djlb_2", "undefined": "枪油补充包", "time": 86400, - "buys": 0, + "buys": 3, "needVip": 0, "front": {}, "currency": "CNY" @@ -4145,7 +4145,7 @@ "name": "pay_name_djlb_1", "undefined": "能量饮料补充包", "time": 86400, - "buys": 0, + "buys": 2, "needVip": 0, "front": {}, "currency": "CNY" @@ -4171,7 +4171,7 @@ "name": "pay_name_djlb_12", "undefined": "弹壳补充包", "time": 86400, - "buys": 0, + "buys": 3, "needVip": 0, "front": {}, "currency": "CNY" @@ -4197,7 +4197,7 @@ "name": "pay_name_djlb_18", "undefined": "装备蓝图补充包", "time": 86400, - "buys": 0, + "buys": 3, "needVip": 0, "front": {}, "currency": "CNY" @@ -4217,7 +4217,7 @@ "name": "pay_name_mingwang_2", "undefined": "名望礼包_68元", "time": 86400, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -4237,7 +4237,7 @@ "name": "pay_name_mingwang_3", "undefined": "名望礼包_648元", "time": 86400, - "buys": 0, + "buys": 2, "needVip": 0, "front": {}, "currency": "CNY" @@ -4257,7 +4257,7 @@ "name": "pay_name_mingwang_4", "undefined": "名望礼包_128元", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" diff --git a/src/json/shop.json b/src/json/shop.json index 9893e4e..0d42272 100644 --- a/src/json/shop.json +++ b/src/json/shop.json @@ -511,7 +511,9 @@ "freeRefreshInterval": 0, "freeRefreshNum": 0, "shopItems": [ - 10001 + 10001, + 10002, + 10003 ], "showItem": [ { diff --git a/src/json/shopItem.json b/src/json/shopItem.json index 46da62c..4ab0808 100644 --- a/src/json/shopItem.json +++ b/src/json/shopItem.json @@ -6281,8 +6281,8 @@ "openDay": 1, "buyNeed": [ { - "a": "item", - "t": "15", + "a": "attr", + "t": "jingxuanbi", "n": 2800 } ], @@ -6296,6 +6296,60 @@ "vipAddbuyNum": [] } ], + "10002": [ + { + "id": 10002, + "a": "item", + "t": 1, + "n": 10000, + "p": 1, + "colour": 4, + "buyNum": -1, + "openDay": 1, + "buyNeed": [ + { + "a": "attr", + "t": "jingxuanbi", + "n": 1000 + } + ], + "sale": 10, + "needVip": 0, + "needZCCG": 0, + "lv": [ + 1, + 9999 + ], + "vipAddbuyNum": [] + } + ], + "10003": [ + { + "id": 10003, + "a": "item", + "t": 2, + "n": 10000, + "p": 1, + "colour": 4, + "buyNum": -1, + "openDay": 1, + "buyNeed": [ + { + "a": "attr", + "t": "jingxuanbi", + "n": 1500 + } + ], + "sale": 10, + "needVip": 0, + "needZCCG": 0, + "lv": [ + 1, + 9999 + ], + "vipAddbuyNum": [] + } + ], "120001": [ { "id": 120001, diff --git a/src/json/shopcom.json b/src/json/shopcom.json index b5157f4..6b1ab41 100644 --- a/src/json/shopcom.json +++ b/src/json/shopcom.json @@ -211,7 +211,7 @@ "cost": [ { "a": "attr", - "t": "rmbmoney", + "t": "jingxuanbi", "n": 1 } ] From 791dbc547298944bdc84f235b703ad0941dd556e Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 22 Dec 2023 16:00:23 +0800 Subject: [PATCH 64/90] =?UTF-8?q?fix:=20=E5=BC=82=E6=AD=A5=E6=9F=A5?= =?UTF-8?q?=E5=BA=93=E6=94=B9=E4=B8=BA=E5=90=8C=E6=AD=A5=E6=8F=92=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/public/pushgift.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/public/pushgift.ts b/src/public/pushgift.ts index 72fcfde..964b980 100644 --- a/src/public/pushgift.ts +++ b/src/public/pushgift.ts @@ -134,7 +134,7 @@ export class PushGiftFun { static async addGift(uid: string, giftid: string, ext_data: { [key: string]: any }) { let conf = G.gc.tuisonglibao[giftid]; // 更新礼包 - G.mongodb.collection("pushgift").updateOne({ + await G.mongodb.collection("pushgift").updateOne({ uid: uid, id: giftid }, { $set: { From 753dd8decb63204f9ca592e0f6e70aaa2c355274 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 22 Dec 2023 16:06:57 +0800 Subject: [PATCH 65/90] =?UTF-8?q?fix:=20=E5=BC=82=E6=AD=A5=E6=9F=A5?= =?UTF-8?q?=E5=BA=93=E6=94=B9=E4=B8=BA=E5=90=8C=E6=AD=A5=E6=8F=92=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/pushgift/ApiOpen.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/api_s2c/pushgift/ApiOpen.ts b/src/api_s2c/pushgift/ApiOpen.ts index 58d85b2..399fb72 100644 --- a/src/api_s2c/pushgift/ApiOpen.ts +++ b/src/api_s2c/pushgift/ApiOpen.ts @@ -20,6 +20,7 @@ function chkBuyNum(gift_id: string, gift_info: Gift) { let conf = G.gc.tuisonglibao[gift_id]; for (let i = 0; i < conf.payId.length; i++) { let pay = G.gc.pay[conf.payId[i]]; + let buy = gift_info.buy.map(i => i != 0); if (pay.buys > 0 && gift_info.buy[i] < pay.buys) { return true } From 36b15af077c1482a5d8b7cd56f7ff24f95103c74 Mon Sep 17 00:00:00 2001 From: chenkai Date: Fri, 22 Dec 2023 16:34:54 +0800 Subject: [PATCH 66/90] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=20price=20?= =?UTF-8?q?=E5=9B=9E=E5=8F=82=E8=A1=A8=E7=A4=BA=E9=A2=86=E5=8F=96=E9=97=A8?= =?UTF-8?q?=E6=A7=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/payForDiamond/ApiCanReceive.ts | 15 ++++++++------- .../event/payForDiamond/PtlCanReceive.ts | 1 + src/shared/protocols/serviceProto.ts | 7 +++++++ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts index 77f79fc..feb4f1a 100644 --- a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts @@ -13,16 +13,17 @@ export async function playerCanReceive(call: ApiCall) { const showOffList = activityInfo.data['showOffList'] || []; const zeroTime = PublicShared.getToDayZeroTime(); const vipScore = await ActionLog.getDayLog(call.uid, 'pay'); + const price = activityInfo.data['price']; if (!vipScore) { return { - payNum: 0, remaining, result: false, activityInfo, showOffList + payNum: 0, remaining, result: false, activityInfo, showOffList, price }; } const payNum = vipScore; // 玩家充值未达标或者奖池余额耗尽则不能领取 - if (payNum < activityInfo.data['price'] || remaining <= 0) { + if (payNum < price || remaining <= 0) { return { - payNum, remaining, result: false, activityInfo, showOffList + payNum, remaining, result: false, activityInfo, showOffList, price } } // 检查玩家今日是否已经领取 @@ -30,19 +31,19 @@ export async function playerCanReceive(call: ApiCall) { if (playerActivityInfo) { if (playerActivityInfo[zeroTime]) { return { - payNum, remaining, result: false, activityInfo, showOffList + payNum, remaining, result: false, activityInfo, showOffList, price }; } } return { - payNum, remaining, result: true, activityInfo, showOffList + payNum, remaining, result: true, activityInfo, showOffList, price }; } export default async function (call: ApiCall) { const canReceiveResult = await playerCanReceive(call); if (canReceiveResult) { - const { payNum, remaining, result, showOffList } = canReceiveResult; - call.succ({ payNum, remaining, result, showOffList }); + const { payNum, remaining, result, showOffList, price } = canReceiveResult; + call.succ({ payNum, remaining, result, showOffList, price }); } } \ No newline at end of file diff --git a/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts b/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts index e7c8b13..1683937 100644 --- a/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts +++ b/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts @@ -6,5 +6,6 @@ export type ResCanReceive = { payNum: number; remaining?: number; result: boolean; + price: number; showOffList: any[]; }; \ No newline at end of file diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index db94cdb..5c1f8cc 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -10144,6 +10144,13 @@ export const serviceProto: ServiceProto = { }, { "id": 3, + "name": "price", + "type": { + "type": "Number" + } + }, + { + "id": 4, "name": "showOffList", "type": { "type": "Array", From c3ba3934d4ee4520b8d7d7f5b67606b5801d625a Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 22 Dec 2023 16:49:21 +0800 Subject: [PATCH 67/90] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E7=AB=9E=E8=B5=9B?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8=E5=8F=91=E5=A5=96=EF=BC=8C=E6=AF=8F?= =?UTF-8?q?=E5=A4=A90=E7=82=B95=E5=88=86=E6=A3=80=E6=B5=8B=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=20=E7=BB=93=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/xiaofeijingsai/ApiOpen.ts | 6 ++--- .../scheduler/scheduler_xiaofeijingsai.ts | 25 ++++++++++--------- src/setMongodb.ts | 4 +-- src/setStartAfther.ts | 2 ++ 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts b/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts index 940eec1..4fa2459 100644 --- a/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts +++ b/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts @@ -38,7 +38,7 @@ export default async function (call: ApiCall) { rankList = rankList.map(i => ({...i, player: users.find(v => v.uid == i._id) || {}})) // 活动结束前半小时，缓存过期时间改为10秒 - let exTime = (G.time + 1800) > _hd.etime ? 10 : 180 + let exTime = (G.time + 1800) > _hd.etime ? 10 : 120 G.ioredis.setex(`rank:xiaofeijingsai`, exTime, JSON.stringify(rankList)); @@ -60,7 +60,7 @@ export function sortRankList(rank, list) { if (list[k]?.total >= i.need[0].n) { rankList.push({...list[k - ccc], rank: k}) } else { - rankList.push({_id: 'system', total: 0, rank: k, player: {}}) + rankList.push({_id: 'system', total: i.need[0].n, rank: k, player: {}}) ccc += 1 } } @@ -87,5 +87,5 @@ async function getMyData(call, rankList, _hd?) { myCut = {_id: myUser.uid, total: 0} } - return {player: myUser, ...myCut, rank: -1} + return {player: myUser, ...myCut, total: R.negate(myCut.total), rank: -1} } \ No newline at end of file diff --git a/src/public/scheduler/scheduler_xiaofeijingsai.ts b/src/public/scheduler/scheduler_xiaofeijingsai.ts index fb50c51..5901064 100644 --- a/src/public/scheduler/scheduler_xiaofeijingsai.ts +++ b/src/public/scheduler/scheduler_xiaofeijingsai.ts @@ -7,16 +7,19 @@ import {HuoDongFun} from "../huodongfun"; import {EmailFun} from "../email"; import {sortRankList} from "../../api_s2c/event/xiaofeijingsai/ApiOpen"; - -export class SchedulerXiaofeijingsaiLocalCtor extends Scheduler { +/** + * 消费竞赛发奖定时器 + * 每天0点5分检测活动结束 + */ +export class Scheduler_xfjs_Local_Ctor extends Scheduler { id: schedulerType = 'xiaofeijingsai_local_ctor'; time = 300; - name = '消费竞赛定时器发奖'; + name = '消费竞赛发奖定时器'; type: 'day' | 'week' = 'day'; // todo 测试 // get nextTime() { - // return G.time + 60; + // return G.time + 30; // } async read() { @@ -29,7 +32,7 @@ export class SchedulerXiaofeijingsaiLocalCtor extends Scheduler { htype: 11, ttype: 0, etime: {$lt: G.time, $gt: 99999999}, - isSendPrize: {$or: [{$exists: false}, {$eq: false}]}, + $or: [{isSendPrize: {$exists: false}}, {isSendPrize: false}], }).sort({etime: -1}).limit(1).toArray())[0] if (!_hd) return @@ -48,21 +51,19 @@ export class SchedulerXiaofeijingsaiLocalCtor extends Scheduler { R.forEach(i => { let users = R.slice(i.rank[0] - 1, i.rank[1])(ranklist) - users.map(v=>{ + users.map(v => { + if (v._id == 'system') return EmailFun.addEmail({ uid: v._id, type: 'system', - title: 'email.titel', - content: 'email.content', + title: _hd.data.mailTitle, + content: _hd.data.mailDes, prize: i.prize, - // contentInsertArr: [conf.ph[0] + index] + contentInsertArr: [v.rank + 1] }); }) })(_hd.data.rank) await G.mongodb.collection('hdinfo').findOneAndUpdate({hdid: _hd.hdid}, {$set: {isSendPrize: true}}) - - console.log(_hd) - } } diff --git a/src/setMongodb.ts b/src/setMongodb.ts index fe89db9..ec7356a 100644 --- a/src/setMongodb.ts +++ b/src/setMongodb.ts @@ -505,7 +505,7 @@ export async function setDbIndexes() { index.key, option ); - console.log('创建索引成功', coll, index); + // console.log('创建索引成功', coll, index); } catch (error) { if (error.codeName == 'IndexKeySpecsConflict') { //当相同索引存在，但是配置(如：unique expireAfterSeconds)不同时，会收到这个报错 @@ -519,7 +519,7 @@ export async function setDbIndexes() { index.key, option ); - console.log('创建索引成功', coll, index); + // console.log('创建索引成功', coll, index); } catch (error) { console.log('创建索引失败==>', coll, index, error.message); } diff --git a/src/setStartAfther.ts b/src/setStartAfther.ts index 52648c7..2497190 100644 --- a/src/setStartAfther.ts +++ b/src/setStartAfther.ts @@ -27,6 +27,7 @@ import { clusterRunOnce } from './clusterUtils'; import { addListener } from './globalListener'; import { SchedulerManage } from './public/scheduler/scheduler'; import {CrossEmailPull} from "./public/scheduler/scheduler_cross_email_pull"; +import {Scheduler_xfjs_Local_Ctor} from "./public/scheduler/scheduler_xiaofeijingsai"; export async function startAfter() { //事件监听和定时器初始化 @@ -70,6 +71,7 @@ export async function startAfter() { new Scheduler_hbzb_zbs_local_prize().init(); new Scheduler_hbzb_zbs_local_ready().init(); new SchedulerKbzzAutoApply().init(); + new Scheduler_xfjs_Local_Ctor().init(); new SchedulerSlzdClean().init(); new SchedulerSlzdPrize().init(); From eed6dd1b8f6fce61727bb80651b0f707deb40f25 Mon Sep 17 00:00:00 2001 From: chenkai Date: Fri, 22 Dec 2023 17:06:19 +0800 Subject: [PATCH 68/90] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E7=BA=A2?= =?UTF-8?q?=E7=82=B9=E5=8F=8A=E7=8E=A9=E5=AE=B6=E5=8F=91=E5=A5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/payForDiamond/ApiReceive.ts | 2 ++ src/api_s2c/hongdian/ApiGet.ts | 7 ++++++- src/shared/protocols/hongdian/PtlGet.ts | 3 ++- src/shared/protocols/serviceProto.ts | 7 +++++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/api_s2c/event/payForDiamond/ApiReceive.ts b/src/api_s2c/event/payForDiamond/ApiReceive.ts index 315e517..62c51fd 100644 --- a/src/api_s2c/event/payForDiamond/ApiReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiReceive.ts @@ -3,6 +3,7 @@ import { ReqReceive, ResReceive } from '../../../shared/protocols/event/payForDi import { playerCanReceive } from './ApiCanReceive'; import { PublicShared } from "../../../shared/public/public"; import { ChatFun } from "../../../public/chat"; +import { PlayerFun } from "../../../public/player"; type diamondWeightGroup = { weight: number; @@ -82,6 +83,7 @@ export default async function (call: ApiCall) { // 更新成功 if (updateResult.modifiedCount) { const showOff = gotAmount >= activityData['groupConf']['base']['loglimit']; + await PlayerFun.sendPrize(call, [{ 'a': 'attr', 't': 'rmbmoney', 'n': gotAmount }]); // 请求返回 call.succ({ amount: gotAmount, diff --git a/src/api_s2c/hongdian/ApiGet.ts b/src/api_s2c/hongdian/ApiGet.ts index ce0c8d4..8572c81 100644 --- a/src/api_s2c/hongdian/ApiGet.ts +++ b/src/api_s2c/hongdian/ApiGet.ts @@ -15,11 +15,12 @@ import {md_redPoint} from '../gongyu/mingdao/ApiOpen'; import {HongDianFun, HuoDongHongDianFun} from "./fun"; import {FunWeiXiuChang} from "../../public/weixiuchang"; import {getShouChongRedPoint} from "../event/shouchong/ApiReceive"; +import { playerCanReceive } from '../event/payForDiamond/ApiCanReceive'; const defaultKeys: hongdianKey[] = ['jiuba', 'jiaotang', 'shouchong', 'clslhd', 'dixiaqianzhuanghd', 'gonghuihd', 'hbzbhd', 'jjchd', 'taskhd', 'xstaskhd', 'lingzhulaixihd', 'dxlthd', 'wzcjhd', 'slzdhd', 'qjzzdhd', 'kuangdonghd', 'qiandaohd', 'kaifukuanghuanhd', 'jijinhd', 'zhuishalinghd', 'yibaichouhd', 'huobanzhaomuhd', 'qirileichonghd', 'jierihd', 'kbzzhd', 'wzryhd', 'yuedujijin', 'mingdao', 'patahd', - 'heishihd', 'huodonghd', 'renown', 'weixiuchang', 'kaifujingsai', 'zhoumolibao']; + 'heishihd', 'huodonghd', 'renown', 'weixiuchang', 'kaifujingsai', 'zhoumolibao', 'payForDiamond']; export default async function (call: ApiCall) { @@ -163,6 +164,10 @@ export default async function (call: ApiCall) { case 'zhoumolibao': res[key] = await HongDianFun.zhoumolibao(call); break; + case 'payForDiamond': + const receiveResult = await playerCanReceive(call); + res[key] = { show: receiveResult && receiveResult.result }; + break; } } } diff --git a/src/shared/protocols/hongdian/PtlGet.ts b/src/shared/protocols/hongdian/PtlGet.ts index e09f771..7189cf6 100644 --- a/src/shared/protocols/hongdian/PtlGet.ts +++ b/src/shared/protocols/hongdian/PtlGet.ts @@ -51,7 +51,8 @@ export type hongdianKey = | 'heishiMrjx' | 'weixiuchang' | 'kaifujingsai' - | 'zhoumolibao'; + | 'zhoumolibao' + | 'payForDiamond'; export type hongdianVal = { diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 5c1f8cc..fa32088 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -14969,6 +14969,13 @@ export const serviceProto: ServiceProto = { "type": "Literal", "literal": "zhoumolibao" } + }, + { + "id": 37, + "type": { + "type": "Literal", + "literal": "payForDiamond" + } } ] }, From acbf8a6ec64c766b9d9942ce57fc60ce1f19dcdf Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 22 Dec 2023 17:57:50 +0800 Subject: [PATCH 69/90] json --- src/json/attr.json | 4 +- src/json/dixiaheishi.json5 | 2 +- src/json/pay.json | 75 +++++++---- src/json/shop.json | 12 +- src/json/shopItem.json | 270 +++++++++++++++++++++++++++++++++++++ src/json/shopcom.json | 2 +- 6 files changed, 333 insertions(+), 32 deletions(-) diff --git a/src/json/attr.json b/src/json/attr.json index 27694ad..d9f5ad4 100644 --- a/src/json/attr.json +++ b/src/json/attr.json @@ -134,8 +134,8 @@ "name": "intr_attr_name_15", "undefined": "每日精选兑换币", "colour": 4, - "icon": "icon_chegaipq", - "sicon": "icon_chegaipq", + "icon": "icon_hspj", + "sicon": "icon_hspj", "describe": "intr_attr_describe_15", "advancedEffects": "" } diff --git a/src/json/dixiaheishi.json5 b/src/json/dixiaheishi.json5 index 97b7c29..5182b4d 100644 --- a/src/json/dixiaheishi.json5 +++ b/src/json/dixiaheishi.json5 @@ -33,7 +33,7 @@ }, //136礼包 '136Gift': [ - { payId: '136Gift1', prize: [], bonus: [{"a": "attr", "t": "jingxuanbi", "n": 10}] }, + { payId: '136Gift1', prize: [], bonus: [{"a": "attr", "t": "jingxuanbi", "n": 10}] , discount: 60}, { prize: [{"a": "attr", "t": "rmbmoney", "n": 10},{"a": "item", "t": "12", "n": 10},{"a": "attr", "t": "jinbi", "n": 10000}] }, { payId: '136Gift2', prize: [], bonus: [{"a": "attr", "t": "jingxuanbi", "n": 10}] }, { payId: '136Gift3', prize: [], bonus: [{"a": "attr", "t": "jingxuanbi", "n": 10}] }, diff --git a/src/json/pay.json b/src/json/pay.json index 4f7b61b..238a4a4 100644 --- a/src/json/pay.json +++ b/src/json/pay.json @@ -933,7 +933,7 @@ }, { "a": "hero", - "t": "4006", + "t": "4013", "n": 1 }, { @@ -975,7 +975,7 @@ { "a": "item", "t": "4", - "n": 100 + "n": 10 } ], "firstPayPrize": [], @@ -2537,6 +2537,11 @@ "a": "item", "t": "14", "n": 50 + }, + { + "a": "attr", + "t": "jingxuanbi", + "n": 10 } ], "firstPayPrize": [], @@ -2568,6 +2573,11 @@ "a": "item", "t": "12", "n": 100 + }, + { + "a": "attr", + "t": "jingxuanbi", + "n": 10 } ], "firstPayPrize": [], @@ -2604,6 +2614,11 @@ "a": "item", "t": "600", "n": 1 + }, + { + "a": "attr", + "t": "jingxuanbi", + "n": 10 } ], "firstPayPrize": [], @@ -2640,6 +2655,11 @@ "a": "item", "t": "600", "n": 2 + }, + { + "a": "attr", + "t": "jingxuanbi", + "n": 10 } ], "firstPayPrize": [], @@ -2669,6 +2689,7 @@ "buys": 0, "needVip": 0, "front": {}, + "fanLiBi": 300, "currency": "CNY" }, "xianshizhaomu_gift_1": { @@ -4433,7 +4454,7 @@ "name": "pay_name_guanqialibao_1", "undefined": "关卡礼包_6", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -4469,7 +4490,7 @@ "name": "pay_name_guanqialibao_2", "undefined": "关卡礼包_30", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -4505,7 +4526,7 @@ "name": "pay_name_guanqialibao_3", "undefined": "关卡礼包_68", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -4541,7 +4562,7 @@ "name": "pay_name_guanqialibao_4", "undefined": "关卡礼包_68", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -4582,7 +4603,7 @@ "name": "pay_name_daojulibao_1", "undefined": "专属润滑剂不足_30", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -4623,7 +4644,7 @@ "name": "pay_name_daojulibao_2", "undefined": "专属润滑剂不足_68", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -4664,7 +4685,7 @@ "name": "pay_name_daojulibao_3", "undefined": "专属润滑剂不足_128", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -4705,7 +4726,7 @@ "name": "pay_name_daojulibao_4", "undefined": "配件零件不足_30", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -4746,7 +4767,7 @@ "name": "pay_name_daojulibao_5", "undefined": "配件零件不足_68", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -4787,7 +4808,7 @@ "name": "pay_name_daojulibao_6", "undefined": "配件零件不足_128", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -4828,7 +4849,7 @@ "name": "pay_name_daojulibao_7", "undefined": "装备蓝图不足_30", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -4869,7 +4890,7 @@ "name": "pay_name_daojulibao_8", "undefined": "装备蓝图不足_68", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -4910,7 +4931,7 @@ "name": "pay_name_daojulibao_9", "undefined": "装备蓝图不足_128", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -4951,7 +4972,7 @@ "name": "pay_name_daojulibao_10", "undefined": "调校合金不足_30", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -4992,7 +5013,7 @@ "name": "pay_name_daojulibao_11", "undefined": "调校合金不足_68", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -5033,7 +5054,7 @@ "name": "pay_name_daojulibao_12", "undefined": "调校合金不足_128", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -5064,7 +5085,7 @@ "name": "pay_name_zhanbailibao_1", "undefined": "战败礼包_68", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -5095,7 +5116,7 @@ "name": "pay_name_zhanbailibao_2", "undefined": "战败礼包_68", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -5126,7 +5147,7 @@ "name": "pay_name_zhanbailibao_3", "undefined": "战败礼包_68", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -5157,7 +5178,7 @@ "name": "pay_name_choukalibao_1", "undefined": "抽卡礼包_68", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -5188,7 +5209,7 @@ "name": "pay_name_choukalibao_2", "undefined": "抽卡礼包_68", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -5219,7 +5240,7 @@ "name": "pay_name_choukalibao_3", "undefined": "抽卡礼包_68", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -5239,7 +5260,7 @@ "name": "pay_name_shouchong_1", "undefined": "首充礼包_6", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -5259,7 +5280,7 @@ "name": "pay_name_shouchong_2", "undefined": "首充礼包_30", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" @@ -5279,7 +5300,7 @@ "name": "pay_name_shouchong_3", "undefined": "首充礼包_98", "time": -1, - "buys": 0, + "buys": 1, "needVip": 0, "front": {}, "currency": "CNY" diff --git a/src/json/shop.json b/src/json/shop.json index 0d42272..82e2e4b 100644 --- a/src/json/shop.json +++ b/src/json/shop.json @@ -513,7 +513,17 @@ "shopItems": [ 10001, 10002, - 10003 + 10003, + 10004, + 10005, + 10006, + 10007, + 10008, + 10009, + 10010, + 10011, + 10012, + 10013 ], "showItem": [ { diff --git a/src/json/shopItem.json b/src/json/shopItem.json index 4ab0808..0be2709 100644 --- a/src/json/shopItem.json +++ b/src/json/shopItem.json @@ -6350,6 +6350,276 @@ "vipAddbuyNum": [] } ], + "10004": [ + { + "id": 10004, + "a": "item", + "t": 4, + "n": 10, + "p": 1, + "colour": 4, + "buyNum": -1, + "openDay": 1, + "buyNeed": [ + { + "a": "attr", + "t": "jingxuanbi", + "n": 2800 + } + ], + "sale": 10, + "needVip": 0, + "needZCCG": 0, + "lv": [ + 1, + 9999 + ], + "vipAddbuyNum": [] + } + ], + "10005": [ + { + "id": 10005, + "a": "item", + "t": 4, + "n": 10, + "p": 1, + "colour": 4, + "buyNum": -1, + "openDay": 1, + "buyNeed": [ + { + "a": "attr", + "t": "jingxuanbi", + "n": 2800 + } + ], + "sale": 10, + "needVip": 0, + "needZCCG": 0, + "lv": [ + 1, + 9999 + ], + "vipAddbuyNum": [] + } + ], + "10006": [ + { + "id": 10006, + "a": "item", + "t": 4, + "n": 10, + "p": 1, + "colour": 4, + "buyNum": -1, + "openDay": 1, + "buyNeed": [ + { + "a": "attr", + "t": "jingxuanbi", + "n": 2800 + } + ], + "sale": 10, + "needVip": 0, + "needZCCG": 0, + "lv": [ + 1, + 9999 + ], + "vipAddbuyNum": [] + } + ], + "10007": [ + { + "id": 10007, + "a": "item", + "t": 4, + "n": 10, + "p": 1, + "colour": 4, + "buyNum": -1, + "openDay": 1, + "buyNeed": [ + { + "a": "attr", + "t": "jingxuanbi", + "n": 2800 + } + ], + "sale": 10, + "needVip": 0, + "needZCCG": 0, + "lv": [ + 1, + 9999 + ], + "vipAddbuyNum": [] + } + ], + "10008": [ + { + "id": 10008, + "a": "item", + "t": 4, + "n": 10, + "p": 1, + "colour": 4, + "buyNum": -1, + "openDay": 1, + "buyNeed": [ + { + "a": "attr", + "t": "jingxuanbi", + "n": 2800 + } + ], + "sale": 10, + "needVip": 0, + "needZCCG": 0, + "lv": [ + 1, + 9999 + ], + "vipAddbuyNum": [] + } + ], + "10009": [ + { + "id": 10009, + "a": "item", + "t": 4, + "n": 10, + "p": 1, + "colour": 4, + "buyNum": -1, + "openDay": 1, + "buyNeed": [ + { + "a": "attr", + "t": "jingxuanbi", + "n": 2800 + } + ], + "sale": 10, + "needVip": 0, + "needZCCG": 0, + "lv": [ + 1, + 9999 + ], + "vipAddbuyNum": [] + } + ], + "10010": [ + { + "id": 10010, + "a": "item", + "t": 4, + "n": 10, + "p": 1, + "colour": 4, + "buyNum": -1, + "openDay": 1, + "buyNeed": [ + { + "a": "attr", + "t": "jingxuanbi", + "n": 2800 + } + ], + "sale": 10, + "needVip": 0, + "needZCCG": 0, + "lv": [ + 1, + 9999 + ], + "vipAddbuyNum": [] + } + ], + "10011": [ + { + "id": 10011, + "a": "item", + "t": 4, + "n": 10, + "p": 1, + "colour": 4, + "buyNum": -1, + "openDay": 1, + "buyNeed": [ + { + "a": "attr", + "t": "jingxuanbi", + "n": 2800 + } + ], + "sale": 10, + "needVip": 0, + "needZCCG": 0, + "lv": [ + 1, + 9999 + ], + "vipAddbuyNum": [] + } + ], + "10012": [ + { + "id": 10012, + "a": "item", + "t": 4, + "n": 10, + "p": 1, + "colour": 4, + "buyNum": -1, + "openDay": 1, + "buyNeed": [ + { + "a": "attr", + "t": "jingxuanbi", + "n": 2800 + } + ], + "sale": 10, + "needVip": 0, + "needZCCG": 0, + "lv": [ + 1, + 9999 + ], + "vipAddbuyNum": [] + } + ], + "10013": [ + { + "id": 10013, + "a": "item", + "t": 4, + "n": 10, + "p": 1, + "colour": 4, + "buyNum": -1, + "openDay": 1, + "buyNeed": [ + { + "a": "attr", + "t": "jingxuanbi", + "n": 2800 + } + ], + "sale": 10, + "needVip": 0, + "needZCCG": 0, + "lv": [ + 1, + 9999 + ], + "vipAddbuyNum": [] + } + ], "120001": [ { "id": 120001, diff --git a/src/json/shopcom.json b/src/json/shopcom.json index 6b1ab41..8dfb51c 100644 --- a/src/json/shopcom.json +++ b/src/json/shopcom.json @@ -203,7 +203,7 @@ "id": 11, "shopId": 13, "shopType": 12, - "title": "wsw_wz_dhsd", + "title": "wsw_wz_mrjxdh", "undefined": "兑换商店", "openCond": "shop_13", "des": "intr_shop_des_13", From 4c9ad23bc1ff961fe3a96f40c960547cb1144445 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 22 Dec 2023 18:04:56 +0800 Subject: [PATCH 70/90] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/pushgift/ApiItemNoEnough.ts | 9 + .../protocols/pushgift/PtlItemNoEnough.ts | 7 + src/shared/protocols/serviceProto.ts | 197 +++++++++++------- 3 files changed, 135 insertions(+), 78 deletions(-) create mode 100644 src/api_s2c/pushgift/ApiItemNoEnough.ts create mode 100644 src/shared/protocols/pushgift/PtlItemNoEnough.ts diff --git a/src/api_s2c/pushgift/ApiItemNoEnough.ts b/src/api_s2c/pushgift/ApiItemNoEnough.ts new file mode 100644 index 0000000..7f7087a --- /dev/null +++ b/src/api_s2c/pushgift/ApiItemNoEnough.ts @@ -0,0 +1,9 @@ +import {ApiCall} from "tsrpc"; +import {ReqItemNoEnough, ResItemNoEnough} from "../../shared/protocols/pushgift/PtlItemNoEnough"; +import {PushGiftFun} from "../../public/pushgift"; + +export default async function (call: ApiCall) { + // 物品不足 前端拦截的 通知后端 检测推送礼包 + PushGiftFun.chkItemGift(call.uid, {a: call.req.need.a, t: call.req.need.t, n: 0}) + call.succ({}) +} \ No newline at end of file diff --git a/src/shared/protocols/pushgift/PtlItemNoEnough.ts b/src/shared/protocols/pushgift/PtlItemNoEnough.ts new file mode 100644 index 0000000..7ab7ec4 --- /dev/null +++ b/src/shared/protocols/pushgift/PtlItemNoEnough.ts @@ -0,0 +1,7 @@ +import {Gift} from "../../../module/collection_pushgift"; + +export type ReqItemNoEnough = { + need: { a: string, t: string } +} + +export type ResItemNoEnough = {} diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 218afc9..e114348 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -265,6 +265,7 @@ import { ReqBingo, ResBingo } from './PtlBingo'; import { ReqFightTest, ResFightTest } from './PtlFightTest'; import { ReqSyncBtn, ResSyncBtn } from './PtlSyncBtn'; import { ReqTest, ResTest } from './PtlTest'; +import { ReqItemNoEnough, ResItemNoEnough } from './pushgift/PtlItemNoEnough'; import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } from './pushgift/PtlOpen'; import { ReqFight as ReqFight_9, ResFight as ResFight_9 } from './qjzzd/PtlFight'; import { ReqOpen as ReqOpen_49, ResOpen as ResOpen_49 } from './qjzzd/PtlOpen'; @@ -1295,6 +1296,10 @@ export interface ServiceType { req: ReqTest, res: ResTest }, + "pushgift/ItemNoEnough": { + req: ReqItemNoEnough, + res: ResItemNoEnough + }, "pushgift/Open": { req: ReqOpen_48, res: ResOpen_48 @@ -3085,126 +3090,131 @@ export const serviceProto: ServiceProto = { }, { "id": 266, - "name": "pushgift/Open", + "name": "pushgift/ItemNoEnough", "type": "api" }, { "id": 267, - "name": "qjzzd/Fight", + "name": "pushgift/Open", "type": "api" }, { "id": 268, - "name": "qjzzd/Open", + "name": "qjzzd/Fight", "type": "api" }, { "id": 269, - "name": "rank/Open", + "name": "qjzzd/Open", "type": "api" }, { "id": 270, - "name": "shiwu/Concise", + "name": "rank/Open", "type": "api" }, { "id": 271, - "name": "shiwu/Extract", + "name": "shiwu/Concise", "type": "api" }, { "id": 272, - "name": "shiwu/GetList", + "name": "shiwu/Extract", "type": "api" }, { "id": 273, - "name": "shiwu/LvUp", + "name": "shiwu/GetList", "type": "api" }, { "id": 274, - "name": "shiwu/Recast", + "name": "shiwu/LvUp", "type": "api" }, { "id": 275, - "name": "shiwu/TakeOff", + "name": "shiwu/Recast", "type": "api" }, { "id": 276, - "name": "shiwu/Wear", + "name": "shiwu/TakeOff", "type": "api" }, { "id": 277, - "name": "shootGame/Open", + "name": "shiwu/Wear", "type": "api" }, { "id": 278, - "name": "shootGame/Rec", + "name": "shootGame/Open", "type": "api" }, { "id": 279, - "name": "shop/Buy", + "name": "shootGame/Rec", "type": "api" }, { "id": 280, - "name": "shop/Open", + "name": "shop/Buy", "type": "api" }, { "id": 281, - "name": "shop/Refresh", + "name": "shop/Open", "type": "api" }, { "id": 282, - "name": "sign/GetBoxPrize", + "name": "shop/Refresh", "type": "api" }, { "id": 283, - "name": "sign/GetPrize", + "name": "sign/GetBoxPrize", "type": "api" }, { "id": 284, - "name": "sign/Open", + "name": "sign/GetPrize", "type": "api" }, { "id": 285, - "name": "slzd/Aim", + "name": "sign/Open", "type": "api" }, { "id": 286, - "name": "slzd/BuyNum", + "name": "slzd/Aim", "type": "api" }, { "id": 287, - "name": "slzd/Fight", + "name": "slzd/BuyNum", "type": "api" }, { "id": 288, - "name": "slzd/FightLog", + "name": "slzd/Fight", "type": "api" }, { "id": 289, - "name": "slzd/MyRank", + "name": "slzd/FightLog", "type": "api" }, { "id": 290, + "name": "slzd/MyRank", + "type": "api" + }, + { + "id": 291, "name": "slzd/Open", "type": "api", "conf": { @@ -3214,77 +3224,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 291, + "id": 292, "name": "slzd/OpenFort", "type": "api" }, { - "id": 292, + "id": 293, "name": "slzd/Rec", "type": "api" }, { - "id": 293, + "id": 294, "name": "slzd/Refresh", "type": "api" }, { - "id": 294, + "id": 295, "name": "slzd/Slot", "type": "api" }, { - "id": 295, + "id": 296, "name": "tanxian/Event", "type": "api" }, { - "id": 296, + "id": 297, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 297, + "id": 298, "name": "tanxian/Fight", "type": "api" }, { - "id": 298, + "id": 299, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 299, + "id": 300, "name": "tanxian/Open", "type": "api" }, { - "id": 300, + "id": 301, "name": "tanxian/Receive", "type": "api" }, { - "id": 301, + "id": 302, "name": "task/AllFinsh", "type": "api" }, { - "id": 302, + "id": 303, "name": "task/Finsh", "type": "api" }, { - "id": 303, + "id": 304, "name": "task/Open", "type": "api" }, { - "id": 304, + "id": 305, "name": "user/CDKEY", "type": "api" }, { - "id": 305, + "id": 306, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3292,197 +3302,197 @@ export const serviceProto: ServiceProto = { } }, { - "id": 306, + "id": 307, "name": "user/ChangeName", "type": "api" }, { - "id": 307, + "id": 308, "name": "user/Fight", "type": "api" }, { - "id": 308, + "id": 309, "name": "user/GetInfo", "type": "api" }, { - "id": 309, + "id": 310, "name": "user/InfoOpen", "type": "api" }, { - "id": 310, + "id": 311, "name": "user/Login", "type": "api" }, { - "id": 311, + "id": 312, "name": "user/Ping", "type": "api" }, { - "id": 312, + "id": 313, "name": "user/Renown", "type": "api" }, { - "id": 313, + "id": 314, "name": "user/RenownBuy", "type": "api" }, { - "id": 314, + "id": 315, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 315, + "id": 316, "name": "user/RenownOpen", "type": "api" }, { - "id": 316, + "id": 317, "name": "user/Tujian", "type": "api" }, { - "id": 317, + "id": 318, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 318, + "id": 319, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 319, + "id": 320, "name": "weixiuchang/Open", "type": "api" }, { - "id": 320, + "id": 321, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 321, + "id": 322, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 322, + "id": 323, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 323, + "id": 324, "name": "wzry/BaoMing", "type": "api" }, { - "id": 324, + "id": 325, "name": "wzry/catFightLog", "type": "api" }, { - "id": 325, + "id": 326, "name": "wzry/CatGroup", "type": "api" }, { - "id": 326, + "id": 327, "name": "wzry/DldFight", "type": "api" }, { - "id": 327, + "id": 328, "name": "wzry/DldRefre", "type": "api" }, { - "id": 328, + "id": 329, "name": "wzry/JingCai", "type": "api" }, { - "id": 329, + "id": 330, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 330, + "id": 331, "name": "wzry/Open", "type": "api" }, { - "id": 331, + "id": 332, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 332, + "id": 333, "name": "wzry/Wzzd", "type": "api" }, { - "id": 333, + "id": 334, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 334, + "id": 335, "name": "xstask/AllGet", "type": "api" }, { - "id": 335, + "id": 336, "name": "xstask/Get", "type": "api" }, { - "id": 336, + "id": 337, "name": "xstask/LvUp", "type": "api" }, { - "id": 337, + "id": 338, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 338, + "id": 339, "name": "xstask/Open", "type": "api" }, { - "id": 339, + "id": 340, "name": "xstask/Receive", "type": "api" }, { - "id": 340, + "id": 341, "name": "xstask/Refresh", "type": "api" }, { - "id": 341, + "id": 342, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 342, + "id": 343, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 343, + "id": 344, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 344, + "id": 345, "name": "zhanqianbushu/Up", "type": "api" } @@ -19029,6 +19039,37 @@ export const serviceProto: ServiceProto = { "PtlTest/ResTest": { "type": "Any" }, + "pushgift/PtlItemNoEnough/ReqItemNoEnough": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "need", + "type": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "a", + "type": { + "type": "String" + } + }, + { + "id": 1, + "name": "t", + "type": { + "type": "String" + } + } + ] + } + } + ] + }, + "pushgift/PtlItemNoEnough/ResItemNoEnough": { + "type": "Interface" + }, "pushgift/PtlOpen/ReqOpen": { "type": "Interface" }, From 7f60477a869bcb3def13df5b2a92e6a4fdf491cb Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 22 Dec 2023 18:18:10 +0800 Subject: [PATCH 71/90] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=86=85=E6=89=93?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/user/ApiDot.ts | 10 ++++++++++ src/gameLog.ts | 26 ++++++++++++++++++++++++++ src/shared/protocols/user/PtlDot.ts | 8 ++++++++ 3 files changed, 44 insertions(+) create mode 100644 src/api_s2c/user/ApiDot.ts create mode 100644 src/shared/protocols/user/PtlDot.ts diff --git a/src/api_s2c/user/ApiDot.ts b/src/api_s2c/user/ApiDot.ts new file mode 100644 index 0000000..bf42370 --- /dev/null +++ b/src/api_s2c/user/ApiDot.ts @@ -0,0 +1,10 @@ +import {ApiCall} from "tsrpc"; +import {ReqDot, ResDot} from "../../shared/protocols/user/PtlDot"; +import {addGameDot} from "../../gameLog"; + +export default async function (call: ApiCall) { + + addGameDot(call.uid, call.req.type, call.req.data) + + call.succ({}); +} \ No newline at end of file diff --git a/src/gameLog.ts b/src/gameLog.ts index 7f70f2c..65e62be 100644 --- a/src/gameLog.ts +++ b/src/gameLog.ts @@ -43,4 +43,30 @@ export async function addGameLog(uid:string, type:string, req:any, data:any){ }catch(e){ console.error('addGameLog',e); } +} + +/** + * 玩家游戏内打点 + * @param uid 玩家uid + * @param type 日志类型 + * @param data 日志内容 + */ + +export async function addGameDot(uid:string, type:string, data?:any){ + try{ + if(!logDB){ + await connGameLogDB(); + } + let log = { + uid, + type, + data + } + //事件时间 + log['cTime'] = Math.floor(Date.now()/1000); + + logDB.collection('gameDot').insertOne(log); + }catch(e){ + console.error('addGameLog',e); + } } \ No newline at end of file diff --git a/src/shared/protocols/user/PtlDot.ts b/src/shared/protocols/user/PtlDot.ts new file mode 100644 index 0000000..d81ccd0 --- /dev/null +++ b/src/shared/protocols/user/PtlDot.ts @@ -0,0 +1,8 @@ +export interface ReqDot { + type: string, + data?: any +} + +export interface ResDot { + +} From 40774138d2694b9eabe89cf938cc03f9310bf7c0 Mon Sep 17 00:00:00 2001 From: chenkai Date: Fri, 22 Dec 2023 18:27:46 +0800 Subject: [PATCH 72/90] =?UTF-8?q?fix:=20=E5=B0=86=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E8=B7=A8=E6=9C=8D=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/payForDiamond/ApiCanReceive.ts | 14 +++- src/api_s2c/event/payForDiamond/ApiReceive.ts | 84 +++++++++++-------- src/global.ts | 2 + src/ioredis.ts | 5 +- .../event/payForDiamond/PtlReceive.ts | 4 +- src/shared/protocols/serviceProto.ts | 6 +- 6 files changed, 72 insertions(+), 43 deletions(-) diff --git a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts index feb4f1a..e356c2f 100644 --- a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts @@ -4,13 +4,21 @@ import { ReqCanReceive, ResCanReceive } from '../../../shared/protocols/event/pa import { PublicShared } from "../../../shared/public/public"; import { ActionLog } from "../../../public/actionLog/actionLog"; +const hasGotKeyPrefix = 'payForDiamond:hasGot:'; // 已领取额度 +const showOffListKeyPrefix = 'payForDiamond:ShowOff:'; // 需要炫耀的玩家列表。 其中需要包含信息：玩家区服, 玩家玩家名称, 领到的数量 + export async function playerCanReceive(call: ApiCall) { - const activityInfo = await HuoDongFun.getHdidInfo(call, call.req.activityId); + const activityId = call.req.activityId; + const activityInfo = await HuoDongFun.getHdidInfo(call, activityId); if (!activityInfo) { return call.error('No such activity'); } - const remaining = activityInfo.data['totalmoney']; - const showOffList = activityInfo.data['showOffList'] || []; + const hasReceivedKey = hasGotKeyPrefix + activityId; + const hasReceivedStr = await G.iorediscross.get(hasReceivedKey); + const hasReceived = hasReceivedStr? parseInt(hasReceivedStr) : 0; + const remaining = activityInfo.data['totalmoney'] - hasReceived; + const showOffResult = await G.iorediscross.lrange(showOffListKeyPrefix + activityId, 0, -1); + const showOffList = showOffResult.map(result => JSON.parse(result)); const zeroTime = PublicShared.getToDayZeroTime(); const vipScore = await ActionLog.getDayLog(call.uid, 'pay'); const price = activityInfo.data['price']; diff --git a/src/api_s2c/event/payForDiamond/ApiReceive.ts b/src/api_s2c/event/payForDiamond/ApiReceive.ts index 62c51fd..3343409 100644 --- a/src/api_s2c/event/payForDiamond/ApiReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiReceive.ts @@ -2,7 +2,6 @@ import { ApiCall } from "tsrpc"; import { ReqReceive, ResReceive } from '../../../shared/protocols/event/payForDiamond/PtlReceive'; import { playerCanReceive } from './ApiCanReceive'; import { PublicShared } from "../../../shared/public/public"; -import { ChatFun } from "../../../public/chat"; import { PlayerFun } from "../../../public/player"; type diamondWeightGroup = { @@ -10,6 +9,9 @@ type diamondWeightGroup = { numrange: [ min: number, max: number]; }; +const hasGotKeyPrefix = 'payForDiamond:hasGot:'; // 已领取额度 +const hasGotLockKey = "payForDiamond:lock"; // 更新锁, TTL 1s +const showOffListKeyPrefix = 'payForDiamond:ShowOff:'; // 需要炫耀的玩家列表。 其中需要包含信息：玩家区服, 玩家玩家名称, 领到的数量 /** * @param groups 各分组及其权重 */ @@ -59,7 +61,7 @@ function calcDiamondGot(remaining: number, group: diamondWeightGroup, maxAmount: export default async function (call: ApiCall) { const canReceiveResult = await playerCanReceive(call); - if (canReceiveResult) { + if (canReceiveResult) { // 该值不存在的情况已被函数直接返回 error, 无需再处理 if (!canReceiveResult.result) { return call.succ({ amount: 0, @@ -68,40 +70,52 @@ export default async function (call: ApiCall) { }); } const activityData = canReceiveResult.activityInfo.data; - const remaining = activityData['totalmoney']; - const { group, maxAmount } = randomWithWeight(activityData['groupConf']['base']['arr']); - const gotAmount = calcDiamondGot(remaining, group, maxAmount); - // 减去余额 - const filter = { - hdid: call.req.activityId, - $expr: { $gte: ['$data.totalmoney', gotAmount ]}, - }; - const updateDoc = { - $inc: { 'data.totalmoney': -1 * Math.abs(gotAmount) } - } - const updateResult = await G.mongodb.collection('hdinfo').updateOne(filter, updateDoc); - // 更新成功 - if (updateResult.modifiedCount) { - const showOff = gotAmount >= activityData['groupConf']['base']['loglimit']; - await PlayerFun.sendPrize(call, [{ 'a': 'attr', 't': 'rmbmoney', 'n': gotAmount }]); - // 请求返回 - call.succ({ - amount: gotAmount, - timesRemaining: 0, - showOff, - }); - // 添加玩家领取记录 - const zeroTime = PublicShared.getToDayZeroTime(); - const setObj = {}; - setObj[zeroTime] = gotAmount; - await G.mongodb.cEvent('payForDiamond').updateOne({ uid: call.uid, type: 'payForDiamond' }, { - $set: setObj - }, {upsert: true}); - // 记录玩家日志. 仅保留最近 10 条 - if (showOff) { - await G.mongodb.collection('hdinfo').updateOne({ hdid: call.req.activityId, }, { $push: { 'data.showOffList': { $each: [{ name: call.conn.gud.name, gotAmount }], $slice: -10 }}}); + // 更新 redis 领取记录之前先加锁, 防止多领 + const lockResult = await G.iorediscross.setnx(hasGotLockKey, 1); + if (lockResult) { + await G.iorediscross.expire(hasGotLockKey, 1); // 设置 ttl 避免死锁 + const activityId = call.req.activityId; + const hasReceivedKey = hasGotKeyPrefix + activityId; + const hasReceivedStr = await G.iorediscross.get(hasReceivedKey); + const hasReceived = hasReceivedStr? parseInt(hasReceivedStr) : 0; + const remaining = activityData['totalmoney'] - hasReceived; + if (remaining <= 0) { + return call.succ({ + amount: 0 + }); + } else { + const { group, maxAmount } = randomWithWeight(activityData['groupConf']['base']['arr']); + const gotAmount = calcDiamondGot(remaining, group, maxAmount); + await G.iorediscross.incrby(hasReceivedKey, -1 * Math.abs(gotAmount)); // 添加已领取的额度 + await G.iorediscross.del(); // 移除锁 + await PlayerFun.sendPrize(call, [{ 'a': 'attr', 't': 'rmbmoney', 'n': gotAmount }]); + const showOff = gotAmount >= activityData['groupConf']['base']['loglimit']; + call.succ({ // 领取核心逻辑完成, 请求可以返回了 + amount: gotAmount, + timesRemaining: 0, + showOff, + }); + // 添加玩家领取记录 + const zeroTime = PublicShared.getToDayZeroTime(); + const setObj = {}; + setObj[zeroTime] = gotAmount; + await G.mongodb.cEvent('payForDiamond').updateOne({ uid: call.uid, type: 'payForDiamond' }, { + $set: setObj + }, {upsert: true}); + // 炫耀 + if (showOff) { + const msg = JSON.stringify({ + name: call.conn.gud.name, gotAmount, serverID: call.conn.gud.sid + }); + const showOffListKey = showOffListKeyPrefix + activityId; + await G.iorediscross.lpush(showOffListKey, msg); + await G.ioredis.ltrim(showOffListKey, 0, 49); // 限制列表保存 50 条消息, 避免无限增长 + } } + } else { + return call.succ({ + amount: 0 + }); } - } } \ No newline at end of file diff --git a/src/global.ts b/src/global.ts index 30fa869..e8e35a5 100644 --- a/src/global.ts +++ b/src/global.ts @@ -92,6 +92,8 @@ class _G { redis: redisJsonFun; /**ioredis连接对象 */ ioredis: Redis; + /** 跨服 ioredis 连接对象 */ + iorediscross: Redis; /**mongodb连接对象 */ mongodb: _mongodb; /**crossmongodb连接对象 */ diff --git a/src/ioredis.ts b/src/ioredis.ts index a304d58..00d7f52 100644 --- a/src/ioredis.ts +++ b/src/ioredis.ts @@ -16,4 +16,7 @@ export async function initIORedis() { G.ioredis = new Redis(G.argv.serverType == 'cross' ? G.config.crossRedisUrl : G.config.redisUrl,{ keyPrefix: preKey, }); -} \ No newline at end of file + G.iorediscross = new Redis(G.config.crossRedisUrl,{ + keyPrefix: "cross_", + }); +} diff --git a/src/shared/protocols/event/payForDiamond/PtlReceive.ts b/src/shared/protocols/event/payForDiamond/PtlReceive.ts index 6fe6681..cbcda79 100644 --- a/src/shared/protocols/event/payForDiamond/PtlReceive.ts +++ b/src/shared/protocols/event/payForDiamond/PtlReceive.ts @@ -4,6 +4,6 @@ export type ReqReceive = { export type ResReceive = { amount: number, - timesRemaining: number; - showOff: boolean; + timesRemaining?: number; + showOff?: boolean; }; diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index fa32088..2a66905 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -10188,14 +10188,16 @@ export const serviceProto: ServiceProto = { "name": "timesRemaining", "type": { "type": "Number" - } + }, + "optional": true }, { "id": 2, "name": "showOff", "type": { "type": "Boolean" - } + }, + "optional": true } ] }, From 02dccd18a782288bfb81eed92fadc63df38d92ca Mon Sep 17 00:00:00 2001 From: chenkai Date: Fri, 22 Dec 2023 19:00:11 +0800 Subject: [PATCH 73/90] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BB=86?= =?UTF-8?q?=E8=8A=82=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/payForDiamond/ApiCanReceive.ts | 22 ++++++++++++++----- src/api_s2c/event/payForDiamond/ApiReceive.ts | 4 ++-- src/api_s2c/hongdian/ApiGet.ts | 2 +- .../event/payForDiamond/PtlCanReceive.ts | 2 +- src/shared/protocols/serviceProto.ts | 3 ++- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts index e356c2f..8a4a0a5 100644 --- a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts @@ -3,16 +3,28 @@ import { HuoDongFun } from "../../../public/huodongfun"; import { ReqCanReceive, ResCanReceive } from '../../../shared/protocols/event/payForDiamond/PtlCanReceive'; import { PublicShared } from "../../../shared/public/public"; import { ActionLog } from "../../../public/actionLog/actionLog"; +import { WithId, OptionalId } from "mongodb"; +import { ReqAddHuoDong } from "../../../monopoly/protocols/PtlAddHuoDong"; const hasGotKeyPrefix = 'payForDiamond:hasGot:'; // 已领取额度 const showOffListKeyPrefix = 'payForDiamond:ShowOff:'; // 需要炫耀的玩家列表。 其中需要包含信息：玩家区服, 玩家玩家名称, 领到的数量 -export async function playerCanReceive(call: ApiCall) { - const activityId = call.req.activityId; - const activityInfo = await HuoDongFun.getHdidInfo(call, activityId); - if (!activityInfo) { - return call.error('No such activity'); +export async function playerCanReceive(call: ApiCall, callError : boolean = true) { + let activityId = call.req.activityId; + let activityInfo: WithId>; + if (!activityId) { + activityInfo = (await HuoDongFun.gethdList(call, 13))[0]; + } else { + activityInfo = await HuoDongFun.getHdidInfo(call, activityId); } + if (!activityInfo && callError) { + if (callError) { + return call.error('', { code: -1, message: lng.huodong_open_1 }); + } else { + return { result: false }; + } + } + activityId = activityInfo.hdid; const hasReceivedKey = hasGotKeyPrefix + activityId; const hasReceivedStr = await G.iorediscross.get(hasReceivedKey); const hasReceived = hasReceivedStr? parseInt(hasReceivedStr) : 0; diff --git a/src/api_s2c/event/payForDiamond/ApiReceive.ts b/src/api_s2c/event/payForDiamond/ApiReceive.ts index 3343409..6165737 100644 --- a/src/api_s2c/event/payForDiamond/ApiReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiReceive.ts @@ -86,8 +86,8 @@ export default async function (call: ApiCall) { } else { const { group, maxAmount } = randomWithWeight(activityData['groupConf']['base']['arr']); const gotAmount = calcDiamondGot(remaining, group, maxAmount); - await G.iorediscross.incrby(hasReceivedKey, -1 * Math.abs(gotAmount)); // 添加已领取的额度 - await G.iorediscross.del(); // 移除锁 + await G.iorediscross.incrby(hasReceivedKey, Math.abs(gotAmount)); // 添加已领取的额度 + await G.iorediscross.del(hasGotLockKey); // 移除锁 await PlayerFun.sendPrize(call, [{ 'a': 'attr', 't': 'rmbmoney', 'n': gotAmount }]); const showOff = gotAmount >= activityData['groupConf']['base']['loglimit']; call.succ({ // 领取核心逻辑完成, 请求可以返回了 diff --git a/src/api_s2c/hongdian/ApiGet.ts b/src/api_s2c/hongdian/ApiGet.ts index 8572c81..4d36f30 100644 --- a/src/api_s2c/hongdian/ApiGet.ts +++ b/src/api_s2c/hongdian/ApiGet.ts @@ -165,7 +165,7 @@ export default async function (call: ApiCall) { res[key] = await HongDianFun.zhoumolibao(call); break; case 'payForDiamond': - const receiveResult = await playerCanReceive(call); + const receiveResult = await playerCanReceive(call, false); res[key] = { show: receiveResult && receiveResult.result }; break; } diff --git a/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts b/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts index 1683937..cd0b089 100644 --- a/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts +++ b/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts @@ -1,5 +1,5 @@ export type ReqCanReceive = { - activityId: number; + activityId?: number; }; export type ResCanReceive = { diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 2a66905..8b3c4a8 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -10113,7 +10113,8 @@ export const serviceProto: ServiceProto = { "name": "activityId", "type": { "type": "Number" - } + }, + "optional": true } ] }, From 7eb34f872db3e5eaceec9ebeae25f3c523b93703 Mon Sep 17 00:00:00 2001 From: chenkai Date: Fri, 22 Dec 2023 19:26:18 +0800 Subject: [PATCH 74/90] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=8F=AF?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E7=BA=A2=E5=8C=85=E7=9A=84=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/payForDiamond/ApiCanReceive.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts index 8a4a0a5..9ef1d5c 100644 --- a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts @@ -17,7 +17,7 @@ export async function playerCanReceive(call: ApiCall, callError : boolean = true } else { activityInfo = await HuoDongFun.getHdidInfo(call, activityId); } - if (!activityInfo && callError) { + if (!activityInfo) { if (callError) { return call.error('', { code: -1, message: lng.huodong_open_1 }); } else { From d00cb7895e0f0744e0ee26f1cf85ecbf3be811fc Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 22 Dec 2023 19:47:15 +0800 Subject: [PATCH 75/90] json --- src/json/exchangeRate.json | 82 +++++++++++++++ src/json/pay.json | 43 ++------ src/json/shop.json | 8 +- src/json/shopItem.json | 210 +++++-------------------------------- src/json/tuisonglibao.json | 4 +- 5 files changed, 115 insertions(+), 232 deletions(-) diff --git a/src/json/exchangeRate.json b/src/json/exchangeRate.json index e084734..f242dcd 100644 --- a/src/json/exchangeRate.json +++ b/src/json/exchangeRate.json @@ -122,6 +122,88 @@ "ARS": 110, "MOP": 8.99 }, + "8": { + "CNY": 8, + "JPY": 160, + "USD": 1.49, + "AUD": 2.09, + "GBP": 1.09, + "CAD": 1.99, + "TWD": 40, + "EUR": 1.29, + "CHF": 1.49, + "CZK": 31, + "DKK": 9.09, + "HKD": 12, + "HUF": 470, + "NOK": 12.49, + "NZD": 2.09, + "PLN": 5.49, + "SEK": 12.99, + "SGD": 1.89, + "THB": 46.99, + "PHP": 72.99, + "MXN": 30.99, + "ILS": 4.79, + "RUB": 107.99, + "KRW": 1710, + "VND": 33600, + "IDR": 20900, + "CLP": 1150, + "MYR": 6.09, + "BRL": 7.49, + "AED": 5.49, + "BDT": 121.99, + "PEN": 5.99, + "RON": 6.09, + "SAR": 5.49, + "INR": 106.99, + "ISK": 190, + "BGN": 2.49, + "ARS": 320, + "MOP": 11.99 + }, + "10": { + "CNY": 10, + "JPY": 200, + "USD": 1.79, + "AUD": 2.69, + "GBP": 1.49, + "CAD": 2.39, + "TWD": 50, + "EUR": 1.59, + "CHF": 1.79, + "CZK": 38, + "DKK": 11.49, + "HKD": 14, + "HUF": 580, + "NOK": 15.99, + "NZD": 2.69, + "PLN": 6.99, + "SEK": 16.09, + "SGD": 2.29, + "THB": 58.99, + "PHP": 90.99, + "MXN": 38.99, + "ILS": 6.09, + "RUB": 134.99, + "KRW": 2130, + "VND": 41900, + "IDR": 26100, + "CLP": 1430, + "MYR": 7.49, + "BRL": 9.49, + "AED": 6.49, + "BDT": 152.99, + "PEN": 7.49, + "RON": 7.49, + "SAR": 6.99, + "INR": 133.99, + "ISK": 230, + "BGN": 3.09, + "ARS": 400, + "MOP": 14.99 + }, "12": { "CNY": 12, "JPY": 240, diff --git a/src/json/pay.json b/src/json/pay.json index 238a4a4..9f69845 100644 --- a/src/json/pay.json +++ b/src/json/pay.json @@ -2522,37 +2522,6 @@ "fanLiBi": 200, "currency": "CNY" }, - "136Gift1": { - "id": "136Gift1", - "money": 60, - "payExp": [ - { - "a": "attr", - "t": "payExp", - "n": 600 - } - ], - "prize": [ - { - "a": "item", - "t": "14", - "n": 50 - }, - { - "a": "attr", - "t": "jingxuanbi", - "n": 10 - } - ], - "firstPayPrize": [], - "name": "pay_name_136Gift2", - "undefined": "136礼包打包购买", - "time": 604800, - "buys": 0, - "needVip": 0, - "front": {}, - "currency": "CNY" - }, "136Gift2": { "id": "136Gift2", "money": 1, @@ -2577,7 +2546,7 @@ { "a": "attr", "t": "jingxuanbi", - "n": 10 + "n": 2 } ], "firstPayPrize": [], @@ -2618,7 +2587,7 @@ { "a": "attr", "t": "jingxuanbi", - "n": 10 + "n": 6 } ], "firstPayPrize": [], @@ -2659,7 +2628,7 @@ { "a": "attr", "t": "jingxuanbi", - "n": 10 + "n": 12 } ], "firstPayPrize": [], @@ -2673,12 +2642,12 @@ }, "136GiftAll": { "id": "136GiftAll", - "money": 60, + "money": 8, "payExp": [ { "a": "attr", "t": "payExp", - "n": 600 + "n": 80 } ], "prize": [], @@ -2689,7 +2658,7 @@ "buys": 0, "needVip": 0, "front": {}, - "fanLiBi": 300, + "fanLiBi": 20, "currency": "CNY" }, "xianshizhaomu_gift_1": { diff --git a/src/json/shop.json b/src/json/shop.json index 82e2e4b..4e0b020 100644 --- a/src/json/shop.json +++ b/src/json/shop.json @@ -517,13 +517,7 @@ 10004, 10005, 10006, - 10007, - 10008, - 10009, - 10010, - 10011, - 10012, - 10013 + 10007 ], "showItem": [ { diff --git a/src/json/shopItem.json b/src/json/shopItem.json index 0be2709..30f2204 100644 --- a/src/json/shopItem.json +++ b/src/json/shopItem.json @@ -6273,8 +6273,8 @@ { "id": 10001, "a": "item", - "t": 4, - "n": 10, + "t": 615, + "n": 1, "p": 1, "colour": 4, "buyNum": -1, @@ -6283,7 +6283,7 @@ { "a": "attr", "t": "jingxuanbi", - "n": 2800 + "n": 200 } ], "sale": 10, @@ -6300,8 +6300,8 @@ { "id": 10002, "a": "item", - "t": 1, - "n": 10000, + "t": 605, + "n": 1, "p": 1, "colour": 4, "buyNum": -1, @@ -6310,7 +6310,7 @@ { "a": "attr", "t": "jingxuanbi", - "n": 1000 + "n": 60 } ], "sale": 10, @@ -6327,17 +6327,17 @@ { "id": 10003, "a": "item", - "t": 2, - "n": 10000, + "t": 4, + "n": 10, "p": 1, - "colour": 4, + "colour": 5, "buyNum": -1, "openDay": 1, "buyNeed": [ { "a": "attr", "t": "jingxuanbi", - "n": 1500 + "n": 270 } ], "sale": 10, @@ -6354,8 +6354,8 @@ { "id": 10004, "a": "item", - "t": 4, - "n": 10, + "t": 12, + "n": 200, "p": 1, "colour": 4, "buyNum": -1, @@ -6364,7 +6364,7 @@ { "a": "attr", "t": "jingxuanbi", - "n": 2800 + "n": 20 } ], "sale": 10, @@ -6381,17 +6381,17 @@ { "id": 10005, "a": "item", - "t": 4, + "t": 20, "n": 10, "p": 1, - "colour": 4, + "colour": 5, "buyNum": -1, "openDay": 1, "buyNeed": [ { "a": "attr", "t": "jingxuanbi", - "n": 2800 + "n": 20 } ], "sale": 10, @@ -6408,17 +6408,17 @@ { "id": 10006, "a": "item", - "t": 4, + "t": 23, "n": 10, "p": 1, - "colour": 4, + "colour": 3, "buyNum": -1, "openDay": 1, "buyNeed": [ { "a": "attr", "t": "jingxuanbi", - "n": 2800 + "n": 20 } ], "sale": 10, @@ -6434,180 +6434,18 @@ "10007": [ { "id": 10007, - "a": "item", - "t": 4, - "n": 10, + "a": "attr", + "t": "jinbi", + "n": 100, "p": 1, - "colour": 4, + "colour": 3, "buyNum": -1, "openDay": 1, "buyNeed": [ { "a": "attr", "t": "jingxuanbi", - "n": 2800 - } - ], - "sale": 10, - "needVip": 0, - "needZCCG": 0, - "lv": [ - 1, - 9999 - ], - "vipAddbuyNum": [] - } - ], - "10008": [ - { - "id": 10008, - "a": "item", - "t": 4, - "n": 10, - "p": 1, - "colour": 4, - "buyNum": -1, - "openDay": 1, - "buyNeed": [ - { - "a": "attr", - "t": "jingxuanbi", - "n": 2800 - } - ], - "sale": 10, - "needVip": 0, - "needZCCG": 0, - "lv": [ - 1, - 9999 - ], - "vipAddbuyNum": [] - } - ], - "10009": [ - { - "id": 10009, - "a": "item", - "t": 4, - "n": 10, - "p": 1, - "colour": 4, - "buyNum": -1, - "openDay": 1, - "buyNeed": [ - { - "a": "attr", - "t": "jingxuanbi", - "n": 2800 - } - ], - "sale": 10, - "needVip": 0, - "needZCCG": 0, - "lv": [ - 1, - 9999 - ], - "vipAddbuyNum": [] - } - ], - "10010": [ - { - "id": 10010, - "a": "item", - "t": 4, - "n": 10, - "p": 1, - "colour": 4, - "buyNum": -1, - "openDay": 1, - "buyNeed": [ - { - "a": "attr", - "t": "jingxuanbi", - "n": 2800 - } - ], - "sale": 10, - "needVip": 0, - "needZCCG": 0, - "lv": [ - 1, - 9999 - ], - "vipAddbuyNum": [] - } - ], - "10011": [ - { - "id": 10011, - "a": "item", - "t": 4, - "n": 10, - "p": 1, - "colour": 4, - "buyNum": -1, - "openDay": 1, - "buyNeed": [ - { - "a": "attr", - "t": "jingxuanbi", - "n": 2800 - } - ], - "sale": 10, - "needVip": 0, - "needZCCG": 0, - "lv": [ - 1, - 9999 - ], - "vipAddbuyNum": [] - } - ], - "10012": [ - { - "id": 10012, - "a": "item", - "t": 4, - "n": 10, - "p": 1, - "colour": 4, - "buyNum": -1, - "openDay": 1, - "buyNeed": [ - { - "a": "attr", - "t": "jingxuanbi", - "n": 2800 - } - ], - "sale": 10, - "needVip": 0, - "needZCCG": 0, - "lv": [ - 1, - 9999 - ], - "vipAddbuyNum": [] - } - ], - "10013": [ - { - "id": 10013, - "a": "item", - "t": 4, - "n": 10, - "p": 1, - "colour": 4, - "buyNum": -1, - "openDay": 1, - "buyNeed": [ - { - "a": "attr", - "t": "jingxuanbi", - "n": 2800 + "n": 10 } ], "sale": 10, diff --git a/src/json/tuisonglibao.json b/src/json/tuisonglibao.json index e46aeef..6bf57cd 100644 --- a/src/json/tuisonglibao.json +++ b/src/json/tuisonglibao.json @@ -8,7 +8,7 @@ ], "payId": [ "guanqialibao_1", - "guanqialibao_3" + "guanqialibao_2" ], "time": 3600, "displayCD": 3600, @@ -23,7 +23,7 @@ ], "payId": [ "guanqialibao_1", - "guanqialibao_3" + "guanqialibao_2" ], "time": 3600, "displayCD": 3600, From bcca0ebbab8f43799f5d2d1bcaa329a6216a3658 Mon Sep 17 00:00:00 2001 From: chenkai Date: Fri, 22 Dec 2023 20:13:18 +0800 Subject: [PATCH 76/90] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9C=80?= =?UTF-8?q?=E5=A4=A7=E6=80=BB=E9=A2=9D=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/payForDiamond/ApiReceive.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api_s2c/event/payForDiamond/ApiReceive.ts b/src/api_s2c/event/payForDiamond/ApiReceive.ts index 6165737..32cc9cb 100644 --- a/src/api_s2c/event/payForDiamond/ApiReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiReceive.ts @@ -23,7 +23,7 @@ function randomWithWeight(groups: diamondWeightGroup[]) { if (!maxAmount) { maxAmount = group.numrange[1]; } else { - maxAmount = Math.min(maxAmount, group.numrange[1]); + maxAmount = Math.max(maxAmount, group.numrange[1]); } } const randomValue = Math.random() * totalWeights; // 随机值落在[0, totalWeights) 之间 From 7fc9b0564fa881ed689d8b226af5161a5eb6d05e Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 22 Dec 2023 20:26:25 +0800 Subject: [PATCH 77/90] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E5=85=8D=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/136Gift/ApiRec.ts | 45 ++++++++++++----------------- 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/src/api_s2c/event/136Gift/ApiRec.ts b/src/api_s2c/event/136Gift/ApiRec.ts index 09592bd..6979750 100644 --- a/src/api_s2c/event/136Gift/ApiRec.ts +++ b/src/api_s2c/event/136Gift/ApiRec.ts @@ -1,41 +1,34 @@ -import { ApiCall } from "tsrpc"; -import { PayFun } from '../../../public/pay'; -import { PlayerFun } from '../../../public/player'; -import { ReqRec, ResRec } from "../../../shared/protocols/event/136Gift/PtlRec"; -import { prizeType } from '../../../shared/protocols/type'; -import { PublicShared } from '../../../shared/public/public'; -import { HongDianChange } from "../../hongdian/fun"; +import {ApiCall} from "tsrpc"; +import {PayFun} from '../../../public/pay'; +import {PlayerFun} from '../../../public/player'; +import {ReqRec, ResRec} from "../../../shared/protocols/event/136Gift/PtlRec"; +import {prizeType} from '../../../shared/protocols/type'; +import {PublicShared} from '../../../shared/public/public'; +import {HongDianChange} from "../../hongdian/fun"; +/** + * 黑市每日礼包改版，此接口只领取免费礼包 + * @param call + */ export default async function (call: ApiCall) { let conf = G.gc.dixiaheishi['136Gift'][call.req.index]; - let buyLog = await PayFun.getPayLog(call.uid, G.gc.dixiaheishi['136Gift'][0].payId); - let buy60 = buyLog.slice(-1)[0]?.eTime >= G.time; - if (!conf) return call.error('', { code: -1 }); - if (!buy60 && conf.payId) return call.error('', { code: -2 }); + if (!conf || conf.payId) return call.error('', {code: -1}); + // if (!buy60 && conf.payId) return call.error('', { code: -2 }); let prize: prizeType[] = []; let pushIndex: number[] = []; - let db = await G.mongodb.cEvent('136Gift').findOne({ uid: call.uid, type: '136Gift' }); + let db = await G.mongodb.cEvent('136Gift').findOne({uid: call.uid, type: '136Gift'}); - if (call.req.index == 0) { - G.gc.dixiaheishi['136Gift'].forEach((c, i) => { - if (i == 0 || !c.payId || db.recIndex.includes(i)) return; - pushIndex.push(i); - prize.push(...G.gc.pay[c.payId].prize); - }); - if (pushIndex.length < 1) return call.error('', { code: -4 }); - } else { - if (db.recIndex.includes(call.req.index)) return call.error('', { code: -3 }); - prize.push(...(conf.payId ? G.gc.pay[conf.payId].prize : conf.prize)); - pushIndex.push(call.req.index); - } + if (db.recIndex.includes(call.req.index)) return call.error('', {code: -3}); + prize.push(...(conf.payId ? G.gc.pay[conf.payId].prize : conf.prize)); + pushIndex.push(call.req.index); prize = PublicShared.mergePrize(prize); await PlayerFun.sendPrize(call, prize); G.mongodb.cEvent('136Gift').updateOne( - { uid: call.uid, type: '136Gift' }, - { $push: { recIndex: { $each: pushIndex } } } + {uid: call.uid, type: '136Gift'}, + {$push: {recIndex: {$each: pushIndex}}} ); // HongDianChange.sendChangeKey(call.uid, ['heishihd', 'heishiMrjx']) From 30a02fbd36ed4d00efa8e0b14e0e52a58bcb8f0c Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 22 Dec 2023 20:33:34 +0800 Subject: [PATCH 78/90] json --- src/json/dixiaheishi.json5 | 1 - src/json/tuisonglibao.json | 99 +++++++++++++++++++++++++------------- 2 files changed, 66 insertions(+), 34 deletions(-) diff --git a/src/json/dixiaheishi.json5 b/src/json/dixiaheishi.json5 index 5182b4d..c8c23fd 100644 --- a/src/json/dixiaheishi.json5 +++ b/src/json/dixiaheishi.json5 @@ -33,7 +33,6 @@ }, //136礼包 '136Gift': [ - { payId: '136Gift1', prize: [], bonus: [{"a": "attr", "t": "jingxuanbi", "n": 10}] , discount: 60}, { prize: [{"a": "attr", "t": "rmbmoney", "n": 10},{"a": "item", "t": "12", "n": 10},{"a": "attr", "t": "jinbi", "n": 10000}] }, { payId: '136Gift2', prize: [], bonus: [{"a": "attr", "t": "jingxuanbi", "n": 10}] }, { payId: '136Gift3', prize: [], bonus: [{"a": "attr", "t": "jingxuanbi", "n": 10}] }, diff --git a/src/json/tuisonglibao.json b/src/json/tuisonglibao.json index 6bf57cd..248dece 100644 --- a/src/json/tuisonglibao.json +++ b/src/json/tuisonglibao.json @@ -12,7 +12,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "djlb" }, "2": { "id": 2, @@ -27,7 +28,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "djlb" }, "3": { "id": 3, @@ -43,7 +45,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "djlb" }, "4": { "id": 4, @@ -59,7 +62,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "djlb" }, "5": { "id": 5, @@ -75,7 +79,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "djlb" }, "6": { "id": 6, @@ -91,7 +96,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "djlb" }, "7": { "id": 7, @@ -107,7 +113,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "djlb" }, "8": { "id": 8, @@ -123,7 +130,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "djlb" }, "9": { "id": 9, @@ -139,7 +147,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "djlb" }, "10": { "id": 10, @@ -155,7 +164,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "djlb" }, "11": { "id": 11, @@ -171,7 +181,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "djlb" }, "12": { "id": 12, @@ -187,7 +198,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "djlb" }, "13": { "id": 13, @@ -203,7 +215,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "djlb" }, "14": { "id": 14, @@ -219,7 +232,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "djlb" }, "15": { "id": 15, @@ -235,7 +249,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "djlb" }, "16": { "id": 16, @@ -251,7 +266,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "djlb" }, "17": { "id": 17, @@ -267,7 +283,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "djlb" }, "18": { "id": 18, @@ -283,7 +300,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "djlb" }, "101": { "id": 101, @@ -302,7 +320,8 @@ ], "time": 3600, "displayCD": 86400, - "scale": 3000 + "scale": 3000, + "icon": "sclb" }, "102": { "id": 102, @@ -321,7 +340,8 @@ ], "time": 3600, "displayCD": 86400, - "scale": 3000 + "scale": 3000, + "icon": "sclb" }, "103": { "id": 103, @@ -340,7 +360,8 @@ ], "time": 3600, "displayCD": 86400, - "scale": 3000 + "scale": 3000, + "icon": "sclb" }, "104": { "id": 104, @@ -359,7 +380,8 @@ ], "time": 3600, "displayCD": 86400, - "scale": 3000 + "scale": 3000, + "icon": "sclb" }, "401": { "id": 401, @@ -373,7 +395,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "gkts" }, "402": { "id": 402, @@ -387,7 +410,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "gkts" }, "403": { "id": 403, @@ -402,7 +426,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "gkts" }, "404": { "id": 404, @@ -417,7 +442,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "gkts" }, "405": { "id": 405, @@ -432,7 +458,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "gkts" }, "406": { "id": 406, @@ -447,7 +474,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "gkts" }, "407": { "id": 407, @@ -462,7 +490,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "gkts" }, "408": { "id": 408, @@ -477,7 +506,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "gkts" }, "409": { "id": 409, @@ -492,7 +522,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "gkts" }, "410": { "id": 410, @@ -507,7 +538,8 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "gkts" }, "411": { "id": 411, @@ -522,6 +554,7 @@ ], "time": 3600, "displayCD": 3600, - "scale": 3000 + "scale": 3000, + "icon": "gkts" } } \ No newline at end of file From df641aa69fc4bb4caddacb22064084332f0377bb Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Thu, 14 Dec 2023 20:57:15 +0800 Subject: [PATCH 79/90] =?UTF-8?q?feat:=201.=E6=8E=A8=E9=80=81=E7=A4=BC?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit ef90c131f344f05b780a2d6835453cdef7581539) --- src/globalListener.ts | 2 ++ src/public/pushgift.ts | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/globalListener.ts b/src/globalListener.ts index 9300f46..bd10c64 100644 --- a/src/globalListener.ts +++ b/src/globalListener.ts @@ -17,6 +17,7 @@ import { PublicShared } from './shared/public/public'; import { setGud } from './public/gud'; import {checkResetBuyLog} from "./api_s2c/event/zhoumolibao/ApiOpen"; import {Christmasfun} from "./api_s2c/event/christmas/fun"; +import {PushGiftFun} from "./public/pushgift"; export type gEventType = { /**玩家断开连接 */ @@ -194,6 +195,7 @@ export function addListener() { { $inc: { payNum: conf.money } }, { upsert: true } ); + PushGiftFun.buy(player.uid, payId) // 推送礼包 }); G.on("FIRST_LOGIN_EVERY_DAY", (gud, lastTime, curTime) => { diff --git a/src/public/pushgift.ts b/src/public/pushgift.ts index 964b980..c9a7779 100644 --- a/src/public/pushgift.ts +++ b/src/public/pushgift.ts @@ -152,4 +152,22 @@ export class PushGiftFun { // 推送客户端消息 G.server.sendMsgByUid(uid, "msg_s2c/PushGiftChange", 1); } + + static async buy(uid: string, payId: string) { + // 购买礼包 + let gift; + for (let gift_id in G.gc.tuisonglibao) { + gift = G.gc.tuisonglibao[gift_id]; + if (gift.payId.includes(payId)) break; + } + let index = gift.payId.indexOf(payId); + let info = await G.mongodb.collection("pushgift").findOne({ + uid: uid, id: gift.id.toString() + }) + if (info.passTime >= G.time) { + G.mongodb.collection("pushgift").updateOne({ + uid: uid, id: gift.id.toString() + }, {$inc: {[`buy.${index}`]: 1}}) + } + } } \ No newline at end of file From 58ba7b489d7340b190567057a9977f6ed4bd386f Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 15 Dec 2023 10:30:37 +0800 Subject: [PATCH 80/90] =?UTF-8?q?feat:=201.=E6=8E=A8=E9=80=81=E7=A4=BC?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit e99b5dad155cd87e3c2c0c5acb1522a2aa4a7695) --- src/public/fight.ts | 2 +- src/public/pushgift.ts | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/public/fight.ts b/src/public/fight.ts index c13c029..c2388b5 100644 --- a/src/public/fight.ts +++ b/src/public/fight.ts @@ -118,7 +118,7 @@ export class FightFun { // 主线 爬塔 战败触发推送礼包 if (result.winSide != 0 && ["tanxian", "pata"].includes(type)) { - PushGiftFun.chkLoseGift(data[0].player.uid) + PushGiftFun.chkLoseGift(call.uid) } return result } diff --git a/src/public/pushgift.ts b/src/public/pushgift.ts index c9a7779..63edb43 100644 --- a/src/public/pushgift.ts +++ b/src/public/pushgift.ts @@ -54,7 +54,7 @@ export class PushGiftFun { let gift_ids = []; for (let id in G.gc.tuisonglibao) { let conf = G.gc.tuisonglibao[id]; - if (conf.type == PushGiftType.LevelGift && conf.num[0] == lv) { + if (conf.type == PushGiftType.LvGift && conf.num[0] == lv) { gift_ids.push(id); } } @@ -157,17 +157,23 @@ export class PushGiftFun { // 购买礼包 let gift; for (let gift_id in G.gc.tuisonglibao) { - gift = G.gc.tuisonglibao[gift_id]; - if (gift.payId.includes(payId)) break; + let temp = G.gc.tuisonglibao[gift_id]; + if (temp.payId.includes(payId)) { + gift = temp; + break + } } + if (!gift) return; let index = gift.payId.indexOf(payId); let info = await G.mongodb.collection("pushgift").findOne({ uid: uid, id: gift.id.toString() }) if (info.passTime >= G.time) { - G.mongodb.collection("pushgift").updateOne({ + await G.mongodb.collection("pushgift").updateOne({ uid: uid, id: gift.id.toString() }, {$inc: {[`buy.${index}`]: 1}}) + // 推送客户端消息 + G.server.sendMsgByUid(uid, "msg_s2c/PushGiftChange", 1); } } } \ No newline at end of file From ae8da996aedebfbd1828fa060d6dd990f5532ca2 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 22 Dec 2023 16:00:23 +0800 Subject: [PATCH 81/90] =?UTF-8?q?fix:=20=E6=8E=A8=E9=80=81=E7=A4=BC?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/public/pushgift.ts | 4 ++-- src/shared/protocols/msg_s2c/MsgPushGiftChange.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/public/pushgift.ts b/src/public/pushgift.ts index 63edb43..0e50409 100644 --- a/src/public/pushgift.ts +++ b/src/public/pushgift.ts @@ -150,7 +150,7 @@ export class PushGiftFun { return {payId: i, val: []} })) // 推送客户端消息 - G.server.sendMsgByUid(uid, "msg_s2c/PushGiftChange", 1); + G.server.sendMsgByUid(uid, "msg_s2c/PushGiftChange", conf.id); } static async buy(uid: string, payId: string) { @@ -173,7 +173,7 @@ export class PushGiftFun { uid: uid, id: gift.id.toString() }, {$inc: {[`buy.${index}`]: 1}}) // 推送客户端消息 - G.server.sendMsgByUid(uid, "msg_s2c/PushGiftChange", 1); + G.server.sendMsgByUid(uid, "msg_s2c/PushGiftChange", gift.id); } } } \ No newline at end of file diff --git a/src/shared/protocols/msg_s2c/MsgPushGiftChange.ts b/src/shared/protocols/msg_s2c/MsgPushGiftChange.ts index 4c04b9b..ccd1837 100644 --- a/src/shared/protocols/msg_s2c/MsgPushGiftChange.ts +++ b/src/shared/protocols/msg_s2c/MsgPushGiftChange.ts @@ -1 +1 @@ -export type MsgPushGiftChange = 1; +export type MsgPushGiftChange = number; From 5a7c645e0f96afaceb7001717dd1a7a75d438e0a Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 22 Dec 2023 20:39:14 +0800 Subject: [PATCH 82/90] =?UTF-8?q?fix:=20=E6=8E=A8=E9=80=81=E7=A4=BC?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/protocols/serviceProto.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index e114348..466dad2 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -17962,8 +17962,7 @@ export const serviceProto: ServiceProto = { } }, "msg_s2c/MsgPushGiftChange/MsgPushGiftChange": { - "type": "Literal", - "literal": 1 + "type": "Number" }, "msg_s2c/MsgSendGift/MsgSendGift": { "type": "Interface", From 4a6a40403d33639e1ae161e731e03063f3dc2516 Mon Sep 17 00:00:00 2001 From: chenkai Date: Fri, 22 Dec 2023 20:47:52 +0800 Subject: [PATCH 83/90] =?UTF-8?q?fix:=20canReceive=20=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=8E=A9=E5=AE=B6=E9=A2=86=E5=8F=96=E5=88=B0?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/payForDiamond/ApiCanReceive.ts | 6 +++--- src/module/collection_event.ts | 2 +- src/shared/protocols/event/payForDiamond/PtlCanReceive.ts | 1 + src/shared/protocols/serviceProto.ts | 8 ++++++++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts index 9ef1d5c..5d16d02 100644 --- a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts @@ -51,7 +51,7 @@ export async function playerCanReceive(call: ApiCall, callError : boolean = true if (playerActivityInfo) { if (playerActivityInfo[zeroTime]) { return { - payNum, remaining, result: false, activityInfo, showOffList, price + payNum, remaining, result: false, activityInfo, showOffList, price, gotAmount: playerActivityInfo[zeroTime] }; } } @@ -63,7 +63,7 @@ export async function playerCanReceive(call: ApiCall, callError : boolean = true export default async function (call: ApiCall) { const canReceiveResult = await playerCanReceive(call); if (canReceiveResult) { - const { payNum, remaining, result, showOffList, price } = canReceiveResult; - call.succ({ payNum, remaining, result, showOffList, price }); + const { payNum, remaining, result, showOffList, price, gotAmount } = canReceiveResult; + call.succ({ payNum, remaining, result, showOffList, price, gotAmount }); } } \ No newline at end of file diff --git a/src/module/collection_event.ts b/src/module/collection_event.ts index 901d3f9..97bec9d 100644 --- a/src/module/collection_event.ts +++ b/src/module/collection_event.ts @@ -52,7 +52,7 @@ export type eventType = { kaifujingsai: ResOpenKaifujingsai; zhoumolibao: ResOpenZhoumolibao & { refreshTime: number; }; payForDiamond: { - [time: number]: number[] + [time: number]: number } } & { [k: `${number}jijin`]: ResOpenYuedujijin; diff --git a/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts b/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts index cd0b089..2560773 100644 --- a/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts +++ b/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts @@ -8,4 +8,5 @@ export type ResCanReceive = { result: boolean; price: number; showOffList: any[]; + gotAmount?: number; }; \ No newline at end of file diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 8b3c4a8..c99c096 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -10159,6 +10159,14 @@ export const serviceProto: ServiceProto = { "type": "Any" } } + }, + { + "id": 5, + "name": "gotAmount", + "type": { + "type": "Number" + }, + "optional": true } ] }, From 287db2568607b15942c6127d5e581891cd0c1c41 Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 22 Dec 2023 20:59:18 +0800 Subject: [PATCH 84/90] json --- src/json/shopItem.json | 2 +- src/json/tuisonglibao.json | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/json/shopItem.json b/src/json/shopItem.json index 30f2204..54db666 100644 --- a/src/json/shopItem.json +++ b/src/json/shopItem.json @@ -6436,7 +6436,7 @@ "id": 10007, "a": "attr", "t": "jinbi", - "n": 100, + "n": 1000000, "p": 1, "colour": 3, "buyNum": -1, diff --git a/src/json/tuisonglibao.json b/src/json/tuisonglibao.json index 248dece..00be077 100644 --- a/src/json/tuisonglibao.json +++ b/src/json/tuisonglibao.json @@ -545,6 +545,38 @@ "id": 411, "type": 5, "typeName": "tuisonglibao_name_1", + "num": [ + 76 + ], + "payId": [ + "lv76_1", + "lv76_2" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3000, + "icon": "gkts" + }, + "412": { + "id": 412, + "type": 5, + "typeName": "tuisonglibao_name_1", + "num": [ + 79 + ], + "payId": [ + "lv79_1", + "lv79_2" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3000, + "icon": "gkts" + }, + "413": { + "id": 413, + "type": 5, + "typeName": "tuisonglibao_name_1", "num": [ 82 ], From c304a6d8cc9535748c688fa7397386a708a6c97e Mon Sep 17 00:00:00 2001 From: chenkai Date: Fri, 22 Dec 2023 21:23:13 +0800 Subject: [PATCH 85/90] =?UTF-8?q?fix:=20=E5=B7=B2=E9=A2=86=E5=8F=96?= =?UTF-8?q?=E7=9A=84=E7=8E=A9=E5=AE=B6=E6=B7=BB=E5=8A=A0gotAmount=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/payForDiamond/ApiCanReceive.ts | 6 +++--- src/shared/protocols/event/payForDiamond/PtlCanReceive.ts | 2 +- src/shared/protocols/serviceProto.ts | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts index 5d16d02..77e0fa9 100644 --- a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts @@ -36,14 +36,14 @@ export async function playerCanReceive(call: ApiCall, callError : boolean = true const price = activityInfo.data['price']; if (!vipScore) { return { - payNum: 0, remaining, result: false, activityInfo, showOffList, price + payNum: 0, remaining, result: false, activityInfo, showOffList, price, gotAmount: 0 }; } const payNum = vipScore; // 玩家充值未达标或者奖池余额耗尽则不能领取 if (payNum < price || remaining <= 0) { return { - payNum, remaining, result: false, activityInfo, showOffList, price + payNum, remaining, result: false, activityInfo, showOffList, price, gotAmount: 0 } } // 检查玩家今日是否已经领取 @@ -56,7 +56,7 @@ export async function playerCanReceive(call: ApiCall, callError : boolean = true } } return { - payNum, remaining, result: true, activityInfo, showOffList, price + payNum, remaining, result: true, activityInfo, showOffList, price, gotAmount: 0 }; } diff --git a/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts b/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts index 2560773..99ec132 100644 --- a/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts +++ b/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts @@ -8,5 +8,5 @@ export type ResCanReceive = { result: boolean; price: number; showOffList: any[]; - gotAmount?: number; + gotAmount: number; }; \ No newline at end of file diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index c99c096..945d070 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -10165,8 +10165,7 @@ export const serviceProto: ServiceProto = { "name": "gotAmount", "type": { "type": "Number" - }, - "optional": true + } } ] }, From 2c3219918ab73616731ec626924cd0c15ef2950b Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 22 Dec 2023 21:57:22 +0800 Subject: [PATCH 86/90] json --- src/json/pay.json | 123 ++++++++++++++++++++++++++--------------- src/json/shopItem.json | 48 ++++++++-------- 2 files changed, 101 insertions(+), 70 deletions(-) diff --git a/src/json/pay.json b/src/json/pay.json index 9f69845..f5ff9a4 100644 --- a/src/json/pay.json +++ b/src/json/pay.json @@ -2522,6 +2522,37 @@ "fanLiBi": 200, "currency": "CNY" }, + "136Gift1": { + "id": "136Gift1", + "money": 60, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 600 + } + ], + "prize": [ + { + "a": "item", + "t": "14", + "n": 50 + }, + { + "a": "attr", + "t": "jingxuanbi", + "n": 10 + } + ], + "firstPayPrize": [], + "name": "pay_name_136Gift2", + "undefined": "136礼包打包购买", + "time": 604800, + "buys": 0, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, "136Gift2": { "id": "136Gift2", "money": 1, @@ -2546,7 +2577,7 @@ { "a": "attr", "t": "jingxuanbi", - "n": 2 + "n": 1 } ], "firstPayPrize": [], @@ -2560,47 +2591,6 @@ }, "136Gift3": { "id": "136Gift3", - "money": 3, - "payExp": [ - { - "a": "attr", - "t": "payExp", - "n": 30 - } - ], - "prize": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 60 - }, - { - "a": "item", - "t": "12", - "n": 100 - }, - { - "a": "item", - "t": "600", - "n": 1 - }, - { - "a": "attr", - "t": "jingxuanbi", - "n": 6 - } - ], - "firstPayPrize": [], - "name": "pay_name_136Gift4", - "undefined": "3元礼包", - "time": 86400, - "buys": 0, - "needVip": 0, - "front": {}, - "currency": "CNY" - }, - "136Gift4": { - "id": "136Gift4", "money": 6, "payExp": [ { @@ -2628,7 +2618,48 @@ { "a": "attr", "t": "jingxuanbi", - "n": 12 + "n": 3 + } + ], + "firstPayPrize": [], + "name": "pay_name_136Gift4", + "undefined": "3元礼包", + "time": 86400, + "buys": 0, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "136Gift4": { + "id": "136Gift4", + "money": 12, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 120 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 240 + }, + { + "a": "item", + "t": "12", + "n": 500 + }, + { + "a": "item", + "t": "600", + "n": 3 + }, + { + "a": "attr", + "t": "jingxuanbi", + "n": 8 } ], "firstPayPrize": [], @@ -2642,12 +2673,12 @@ }, "136GiftAll": { "id": "136GiftAll", - "money": 8, + "money": 18, "payExp": [ { "a": "attr", "t": "payExp", - "n": 80 + "n": 180 } ], "prize": [], @@ -2658,7 +2689,7 @@ "buys": 0, "needVip": 0, "front": {}, - "fanLiBi": 20, + "fanLiBi": 900, "currency": "CNY" }, "xianshizhaomu_gift_1": { diff --git a/src/json/shopItem.json b/src/json/shopItem.json index 54db666..42ead51 100644 --- a/src/json/shopItem.json +++ b/src/json/shopItem.json @@ -6273,17 +6273,17 @@ { "id": 10001, "a": "item", - "t": 615, + "t": 617, "n": 1, "p": 1, - "colour": 4, + "colour": 6, "buyNum": -1, "openDay": 1, "buyNeed": [ { "a": "attr", "t": "jingxuanbi", - "n": 200 + "n": 150 } ], "sale": 10, @@ -6300,10 +6300,10 @@ { "id": 10002, "a": "item", - "t": 605, + "t": 627, "n": 1, "p": 1, - "colour": 4, + "colour": 5, "buyNum": -1, "openDay": 1, "buyNeed": [ @@ -6327,8 +6327,8 @@ { "id": 10003, "a": "item", - "t": 4, - "n": 10, + "t": 605, + "n": 1, "p": 1, "colour": 5, "buyNum": -1, @@ -6337,7 +6337,7 @@ { "a": "attr", "t": "jingxuanbi", - "n": 270 + "n": 18 } ], "sale": 10, @@ -6354,17 +6354,17 @@ { "id": 10004, "a": "item", - "t": 12, - "n": 200, + "t": 24, + "n": 2, "p": 1, - "colour": 4, + "colour": 5, "buyNum": -1, "openDay": 1, "buyNeed": [ { "a": "attr", "t": "jingxuanbi", - "n": 20 + "n": 6 } ], "sale": 10, @@ -6381,17 +6381,17 @@ { "id": 10005, "a": "item", - "t": 20, - "n": 10, + "t": 12, + "n": 200, "p": 1, - "colour": 5, + "colour": 4, "buyNum": -1, "openDay": 1, "buyNeed": [ { "a": "attr", "t": "jingxuanbi", - "n": 20 + "n": 6 } ], "sale": 10, @@ -6407,9 +6407,9 @@ "10006": [ { "id": 10006, - "a": "item", - "t": 23, - "n": 10, + "a": "attr", + "t": "jinbi", + "n": 1000000, "p": 1, "colour": 3, "buyNum": -1, @@ -6418,7 +6418,7 @@ { "a": "attr", "t": "jingxuanbi", - "n": 20 + "n": 3 } ], "sale": 10, @@ -6434,9 +6434,9 @@ "10007": [ { "id": 10007, - "a": "attr", - "t": "jinbi", - "n": 1000000, + "a": "item", + "t": 1, + "n": 500000, "p": 1, "colour": 3, "buyNum": -1, @@ -6445,7 +6445,7 @@ { "a": "attr", "t": "jingxuanbi", - "n": 10 + "n": 5 } ], "sale": 10, From 62d954c743c125380eedf5bbe7eb4e3fc9e0a2bc Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 22 Dec 2023 22:20:56 +0800 Subject: [PATCH 87/90] =?UTF-8?q?fix:=20=E6=8E=A8=E9=80=81=E7=A4=BC?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../protocols/pushgift/PtlItemNoEnough.ts | 2 - src/shared/protocols/serviceProto.ts | 265 +++++++++++------- 2 files changed, 158 insertions(+), 109 deletions(-) diff --git a/src/shared/protocols/pushgift/PtlItemNoEnough.ts b/src/shared/protocols/pushgift/PtlItemNoEnough.ts index 7ab7ec4..9b7625e 100644 --- a/src/shared/protocols/pushgift/PtlItemNoEnough.ts +++ b/src/shared/protocols/pushgift/PtlItemNoEnough.ts @@ -1,5 +1,3 @@ -import {Gift} from "../../../module/collection_pushgift"; - export type ReqItemNoEnough = { need: { a: string, t: string } } diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 62ac7ca..05765ae 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -236,6 +236,7 @@ import { MsgPayResult } from './msg_s2c/MsgPayResult'; import { MsgPeijianChange } from './msg_s2c/MsgPeijianChange'; import { MsgPlayerChange } from './msg_s2c/MsgPlayerChange'; import { MsgPrivate } from './msg_s2c/MsgPrivate'; +import { MsgPushGiftChange } from './msg_s2c/MsgPushGiftChange'; import { MsgSendGift } from './msg_s2c/MsgSendGift'; import { MsgShiwuChange } from './msg_s2c/MsgShiwuChange'; import { MsgTaskChange } from './msg_s2c/MsgTaskChange'; @@ -263,6 +264,7 @@ import { ReqBingo, ResBingo } from './PtlBingo'; import { ReqFightTest, ResFightTest } from './PtlFightTest'; import { ReqSyncBtn, ResSyncBtn } from './PtlSyncBtn'; import { ReqTest, ResTest } from './PtlTest'; +import { ReqItemNoEnough, ResItemNoEnough } from './pushgift/PtlItemNoEnough'; import { ReqFight as ReqFight_9, ResFight as ResFight_9 } from './qjzzd/PtlFight'; import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } from './qjzzd/PtlOpen'; import { ReqOpen as ReqOpen_49, ResOpen as ResOpen_49 } from './rank/PtlOpen'; @@ -1288,6 +1290,10 @@ export interface ServiceType { req: ReqTest, res: ResTest }, + "pushgift/ItemNoEnough": { + req: ReqItemNoEnough, + res: ResItemNoEnough + }, "qjzzd/Fight": { req: ReqFight_9, res: ResFight_9 @@ -1626,6 +1632,7 @@ export interface ServiceType { "msg_s2c/PeijianChange": MsgPeijianChange, "msg_s2c/PlayerChange": MsgPlayerChange, "msg_s2c/Private": MsgPrivate, + "msg_s2c/PushGiftChange": MsgPushGiftChange, "msg_s2c/SendGift": MsgSendGift, "msg_s2c/ShiwuChange": MsgShiwuChange, "msg_s2c/TaskChange": MsgTaskChange, @@ -2922,91 +2929,96 @@ export const serviceProto: ServiceProto = { }, { "id": 237, - "name": "msg_s2c/SendGift", + "name": "msg_s2c/PushGiftChange", "type": "msg" }, { "id": 238, - "name": "msg_s2c/ShiwuChange", + "name": "msg_s2c/SendGift", "type": "msg" }, { "id": 239, - "name": "msg_s2c/TaskChange", + "name": "msg_s2c/ShiwuChange", "type": "msg" }, { "id": 240, - "name": "msg_s2c/Xianshilibao", + "name": "msg_s2c/TaskChange", "type": "msg" }, { "id": 241, + "name": "msg_s2c/Xianshilibao", + "type": "msg" + }, + { + "id": 242, "name": "pata/Fight", "type": "api" }, { - "id": 242, + "id": 243, "name": "pata/GetPrize", "type": "api" }, { - "id": 243, + "id": 244, "name": "pata/Open", "type": "api" }, { - "id": 244, + "id": 245, "name": "pata/SaoDang", "type": "api" }, { - "id": 245, + "id": 246, "name": "pay/GetList", "type": "api" }, { - "id": 246, + "id": 247, "name": "peijian/GetList", "type": "api" }, { - "id": 247, + "id": 248, "name": "peijian/JingLian", "type": "api" }, { - "id": 248, + "id": 249, "name": "peijian/JinJie", "type": "api" }, { - "id": 249, + "id": 250, "name": "peijian/LvUp", "type": "api" }, { - "id": 250, + "id": 251, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 251, + "id": 252, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 252, + "id": 253, "name": "peijian/Reset", "type": "api" }, { - "id": 253, + "id": 254, "name": "peijian/Rm", "type": "api" }, { - "id": 254, + "id": 255, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3014,32 +3026,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 255, + "id": 256, "name": "peijian/UnLock", "type": "api" }, { - "id": 256, + "id": 257, "name": "peijian/Wear", "type": "api" }, { - "id": 257, + "id": 258, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 258, + "id": 259, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 259, + "id": 260, "name": "peijiancangku/Open", "type": "api" }, { - "id": 260, + "id": 261, "name": "Bingo", "type": "api", "conf": { @@ -3047,137 +3059,142 @@ export const serviceProto: ServiceProto = { } }, { - "id": 261, + "id": 262, "name": "FightTest", "type": "api" }, { - "id": 262, + "id": 263, "name": "SyncBtn", "type": "api" }, { - "id": 263, + "id": 264, "name": "Test", "type": "api" }, - { - "id": 264, - "name": "qjzzd/Fight", - "type": "api" - }, { "id": 265, - "name": "qjzzd/Open", + "name": "pushgift/ItemNoEnough", "type": "api" }, { "id": 266, - "name": "rank/Open", + "name": "qjzzd/Fight", "type": "api" }, { "id": 267, - "name": "shiwu/Concise", + "name": "qjzzd/Open", "type": "api" }, { "id": 268, - "name": "shiwu/Extract", + "name": "rank/Open", "type": "api" }, { "id": 269, - "name": "shiwu/GetList", + "name": "shiwu/Concise", "type": "api" }, { "id": 270, - "name": "shiwu/LvUp", + "name": "shiwu/Extract", "type": "api" }, { "id": 271, - "name": "shiwu/Recast", + "name": "shiwu/GetList", "type": "api" }, { "id": 272, - "name": "shiwu/TakeOff", + "name": "shiwu/LvUp", "type": "api" }, { "id": 273, - "name": "shiwu/Wear", + "name": "shiwu/Recast", "type": "api" }, { "id": 274, - "name": "shootGame/Open", + "name": "shiwu/TakeOff", "type": "api" }, { "id": 275, - "name": "shootGame/Rec", + "name": "shiwu/Wear", "type": "api" }, { "id": 276, - "name": "shop/Buy", + "name": "shootGame/Open", "type": "api" }, { "id": 277, - "name": "shop/Open", + "name": "shootGame/Rec", "type": "api" }, { "id": 278, - "name": "shop/Refresh", + "name": "shop/Buy", "type": "api" }, { "id": 279, - "name": "sign/GetBoxPrize", + "name": "shop/Open", "type": "api" }, { "id": 280, - "name": "sign/GetPrize", + "name": "shop/Refresh", "type": "api" }, { "id": 281, - "name": "sign/Open", + "name": "sign/GetBoxPrize", "type": "api" }, { "id": 282, - "name": "slzd/Aim", + "name": "sign/GetPrize", "type": "api" }, { "id": 283, - "name": "slzd/BuyNum", + "name": "sign/Open", "type": "api" }, { "id": 284, - "name": "slzd/Fight", + "name": "slzd/Aim", "type": "api" }, { "id": 285, - "name": "slzd/FightLog", + "name": "slzd/BuyNum", "type": "api" }, { "id": 286, - "name": "slzd/MyRank", + "name": "slzd/Fight", "type": "api" }, { "id": 287, + "name": "slzd/FightLog", + "type": "api" + }, + { + "id": 288, + "name": "slzd/MyRank", + "type": "api" + }, + { + "id": 289, "name": "slzd/Open", "type": "api", "conf": { @@ -3187,77 +3204,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 288, + "id": 290, "name": "slzd/OpenFort", "type": "api" }, { - "id": 289, + "id": 291, "name": "slzd/Rec", "type": "api" }, { - "id": 290, + "id": 292, "name": "slzd/Refresh", "type": "api" }, { - "id": 291, + "id": 293, "name": "slzd/Slot", "type": "api" }, { - "id": 292, + "id": 294, "name": "tanxian/Event", "type": "api" }, { - "id": 293, + "id": 295, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 294, + "id": 296, "name": "tanxian/Fight", "type": "api" }, { - "id": 295, + "id": 297, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 296, + "id": 298, "name": "tanxian/Open", "type": "api" }, { - "id": 297, + "id": 299, "name": "tanxian/Receive", "type": "api" }, { - "id": 298, + "id": 300, "name": "task/AllFinsh", "type": "api" }, { - "id": 299, + "id": 301, "name": "task/Finsh", "type": "api" }, { - "id": 300, + "id": 302, "name": "task/Open", "type": "api" }, { - "id": 301, + "id": 303, "name": "user/CDKEY", "type": "api" }, { - "id": 302, + "id": 304, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3265,197 +3282,197 @@ export const serviceProto: ServiceProto = { } }, { - "id": 303, + "id": 305, "name": "user/ChangeName", "type": "api" }, { - "id": 304, + "id": 306, "name": "user/Fight", "type": "api" }, { - "id": 305, + "id": 307, "name": "user/GetInfo", "type": "api" }, { - "id": 306, + "id": 308, "name": "user/InfoOpen", "type": "api" }, { - "id": 307, + "id": 309, "name": "user/Login", "type": "api" }, { - "id": 308, + "id": 310, "name": "user/Ping", "type": "api" }, { - "id": 309, + "id": 311, "name": "user/Renown", "type": "api" }, { - "id": 310, + "id": 312, "name": "user/RenownBuy", "type": "api" }, { - "id": 311, + "id": 313, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 312, + "id": 314, "name": "user/RenownOpen", "type": "api" }, { - "id": 313, + "id": 315, "name": "user/Tujian", "type": "api" }, { - "id": 314, + "id": 316, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 315, + "id": 317, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 316, + "id": 318, "name": "weixiuchang/Open", "type": "api" }, { - "id": 317, + "id": 319, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 318, + "id": 320, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 319, + "id": 321, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 320, + "id": 322, "name": "wzry/BaoMing", "type": "api" }, { - "id": 321, + "id": 323, "name": "wzry/catFightLog", "type": "api" }, { - "id": 322, + "id": 324, "name": "wzry/CatGroup", "type": "api" }, { - "id": 323, + "id": 325, "name": "wzry/DldFight", "type": "api" }, { - "id": 324, + "id": 326, "name": "wzry/DldRefre", "type": "api" }, { - "id": 325, + "id": 327, "name": "wzry/JingCai", "type": "api" }, { - "id": 326, + "id": 328, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 327, + "id": 329, "name": "wzry/Open", "type": "api" }, { - "id": 328, + "id": 330, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 329, + "id": 331, "name": "wzry/Wzzd", "type": "api" }, { - "id": 330, + "id": 332, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 331, + "id": 333, "name": "xstask/AllGet", "type": "api" }, { - "id": 332, + "id": 334, "name": "xstask/Get", "type": "api" }, { - "id": 333, + "id": 335, "name": "xstask/LvUp", "type": "api" }, { - "id": 334, + "id": 336, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 335, + "id": 337, "name": "xstask/Open", "type": "api" }, { - "id": 336, + "id": 338, "name": "xstask/Receive", "type": "api" }, { - "id": 337, + "id": 339, "name": "xstask/Refresh", "type": "api" }, { - "id": 338, + "id": 340, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 339, + "id": 341, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 340, + "id": 342, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 341, + "id": 343, "name": "zhanqianbushu/Up", "type": "api" } @@ -17934,6 +17951,9 @@ export const serviceProto: ServiceProto = { } } }, + "msg_s2c/MsgPushGiftChange/MsgPushGiftChange": { + "type": "Number" + }, "msg_s2c/MsgSendGift/MsgSendGift": { "type": "Interface", "indexSignature": { @@ -19015,6 +19035,37 @@ export const serviceProto: ServiceProto = { "PtlTest/ResTest": { "type": "Any" }, + "pushgift/PtlItemNoEnough/ReqItemNoEnough": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "need", + "type": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "a", + "type": { + "type": "String" + } + }, + { + "id": 1, + "name": "t", + "type": { + "type": "String" + } + } + ] + } + } + ] + }, + "pushgift/PtlItemNoEnough/ResItemNoEnough": { + "type": "Interface" + }, "qjzzd/PtlFight/ReqFight": { "type": "Interface" }, From 4d3377fc3ccd1d6e5b6a53d7fb6d94cec9db21b0 Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 22 Dec 2023 22:54:36 +0800 Subject: [PATCH 88/90] json --- src/json/tuisonglibao.json | 62 +++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/src/json/tuisonglibao.json b/src/json/tuisonglibao.json index 00be077..cdc0822 100644 --- a/src/json/tuisonglibao.json +++ b/src/json/tuisonglibao.json @@ -13,7 +13,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "djlb" + "icon": "gkts" }, "2": { "id": 2, @@ -29,7 +29,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "djlb" + "icon": "gkts" }, "3": { "id": 3, @@ -46,7 +46,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "djlb" + "icon": "gkts" }, "4": { "id": 4, @@ -63,7 +63,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "djlb" + "icon": "gkts" }, "5": { "id": 5, @@ -80,7 +80,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "djlb" + "icon": "gkts" }, "6": { "id": 6, @@ -97,7 +97,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "djlb" + "icon": "gkts" }, "7": { "id": 7, @@ -114,7 +114,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "djlb" + "icon": "gkts" }, "8": { "id": 8, @@ -131,7 +131,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "djlb" + "icon": "gkts" }, "9": { "id": 9, @@ -148,7 +148,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "djlb" + "icon": "gkts" }, "10": { "id": 10, @@ -165,7 +165,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "djlb" + "icon": "gkts" }, "11": { "id": 11, @@ -182,7 +182,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "djlb" + "icon": "gkts" }, "12": { "id": 12, @@ -199,7 +199,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "djlb" + "icon": "gkts" }, "13": { "id": 13, @@ -216,7 +216,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "djlb" + "icon": "gkts" }, "14": { "id": 14, @@ -233,7 +233,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "djlb" + "icon": "gkts" }, "15": { "id": 15, @@ -250,7 +250,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "djlb" + "icon": "gkts" }, "16": { "id": 16, @@ -267,7 +267,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "djlb" + "icon": "gkts" }, "17": { "id": 17, @@ -284,7 +284,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "djlb" + "icon": "gkts" }, "18": { "id": 18, @@ -301,7 +301,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "djlb" + "icon": "gkts" }, "101": { "id": 101, @@ -396,7 +396,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "gkts" + "icon": "djlb" }, "402": { "id": 402, @@ -411,7 +411,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "gkts" + "icon": "djlb" }, "403": { "id": 403, @@ -427,7 +427,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "gkts" + "icon": "djlb" }, "404": { "id": 404, @@ -443,7 +443,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "gkts" + "icon": "djlb" }, "405": { "id": 405, @@ -459,7 +459,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "gkts" + "icon": "djlb" }, "406": { "id": 406, @@ -475,7 +475,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "gkts" + "icon": "djlb" }, "407": { "id": 407, @@ -491,7 +491,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "gkts" + "icon": "djlb" }, "408": { "id": 408, @@ -507,7 +507,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "gkts" + "icon": "djlb" }, "409": { "id": 409, @@ -523,7 +523,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "gkts" + "icon": "djlb" }, "410": { "id": 410, @@ -539,7 +539,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "gkts" + "icon": "djlb" }, "411": { "id": 411, @@ -555,7 +555,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "gkts" + "icon": "djlb" }, "412": { "id": 412, @@ -571,7 +571,7 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "gkts" + "icon": "djlb" }, "413": { "id": 413, @@ -587,6 +587,6 @@ "time": 3600, "displayCD": 3600, "scale": 3000, - "icon": "gkts" + "icon": "djlb" } } \ No newline at end of file From 34b3f844184dc63e239d8a84013354b6bbac5fe4 Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 22 Dec 2023 22:58:49 +0800 Subject: [PATCH 89/90] proto --- src/shared/protocols/serviceProto.ts | 369 +++++++++++++++++---------- 1 file changed, 236 insertions(+), 133 deletions(-) diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index fa0d54f..2afc7e8 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -271,6 +271,7 @@ import { ReqBingo, ResBingo } from './PtlBingo'; import { ReqFightTest, ResFightTest } from './PtlFightTest'; import { ReqSyncBtn, ResSyncBtn } from './PtlSyncBtn'; import { ReqTest, ResTest } from './PtlTest'; +import { ReqItemNoEnough, ResItemNoEnough } from './pushgift/PtlItemNoEnough'; import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './pushgift/PtlOpen'; import { ReqFight as ReqFight_9, ResFight as ResFight_9 } from './qjzzd/PtlFight'; import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './qjzzd/PtlOpen'; @@ -312,6 +313,7 @@ import { ReqOpen as ReqOpen_59, ResOpen as ResOpen_59 } from './task/PtlOpen'; import { ReqCDKEY, ResCDKEY } from './user/PtlCDKEY'; import { ReqChangeInfo, ResChangeInfo } from './user/PtlChangeInfo'; import { ReqChangeName, ResChangeName } from './user/PtlChangeName'; +import { ReqDot, ResDot } from './user/PtlDot'; import { ReqFight as ReqFight_12, ResFight as ResFight_12 } from './user/PtlFight'; import { ReqGetInfo, ResGetInfo } from './user/PtlGetInfo'; import { ReqInfoOpen, ResInfoOpen } from './user/PtlInfoOpen'; @@ -1325,6 +1327,10 @@ export interface ServiceType { req: ReqTest, res: ResTest }, + "pushgift/ItemNoEnough": { + req: ReqItemNoEnough, + res: ResItemNoEnough + }, "pushgift/Open": { req: ReqOpen_51, res: ResOpen_51 @@ -1489,6 +1495,10 @@ export interface ServiceType { req: ReqChangeName, res: ResChangeName }, + "user/Dot": { + req: ReqDot, + res: ResDot + }, "user/Fight": { req: ReqFight_12, res: ResFight_12 @@ -3145,126 +3155,131 @@ export const serviceProto: ServiceProto = { }, { "id": 272, - "name": "pushgift/Open", + "name": "pushgift/ItemNoEnough", "type": "api" }, { "id": 273, - "name": "qjzzd/Fight", + "name": "pushgift/Open", "type": "api" }, { "id": 274, - "name": "qjzzd/Open", + "name": "qjzzd/Fight", "type": "api" }, { "id": 275, - "name": "rank/Open", + "name": "qjzzd/Open", "type": "api" }, { "id": 276, - "name": "shiwu/Concise", + "name": "rank/Open", "type": "api" }, { "id": 277, - "name": "shiwu/Extract", + "name": "shiwu/Concise", "type": "api" }, { "id": 278, - "name": "shiwu/GetList", + "name": "shiwu/Extract", "type": "api" }, { "id": 279, - "name": "shiwu/LvUp", + "name": "shiwu/GetList", "type": "api" }, { "id": 280, - "name": "shiwu/Recast", + "name": "shiwu/LvUp", "type": "api" }, { "id": 281, - "name": "shiwu/TakeOff", + "name": "shiwu/Recast", "type": "api" }, { "id": 282, - "name": "shiwu/Wear", + "name": "shiwu/TakeOff", "type": "api" }, { "id": 283, - "name": "shootGame/Open", + "name": "shiwu/Wear", "type": "api" }, { "id": 284, - "name": "shootGame/Rec", + "name": "shootGame/Open", "type": "api" }, { "id": 285, - "name": "shop/Buy", + "name": "shootGame/Rec", "type": "api" }, { "id": 286, - "name": "shop/Open", + "name": "shop/Buy", "type": "api" }, { "id": 287, - "name": "shop/Refresh", + "name": "shop/Open", "type": "api" }, { "id": 288, - "name": "sign/GetBoxPrize", + "name": "shop/Refresh", "type": "api" }, { "id": 289, - "name": "sign/GetPrize", + "name": "sign/GetBoxPrize", "type": "api" }, { "id": 290, - "name": "sign/Open", + "name": "sign/GetPrize", "type": "api" }, { "id": 291, - "name": "slzd/Aim", + "name": "sign/Open", "type": "api" }, { "id": 292, - "name": "slzd/BuyNum", + "name": "slzd/Aim", "type": "api" }, { "id": 293, - "name": "slzd/Fight", + "name": "slzd/BuyNum", "type": "api" }, { "id": 294, - "name": "slzd/FightLog", + "name": "slzd/Fight", "type": "api" }, { "id": 295, - "name": "slzd/MyRank", + "name": "slzd/FightLog", "type": "api" }, { "id": 296, + "name": "slzd/MyRank", + "type": "api" + }, + { + "id": 297, "name": "slzd/Open", "type": "api", "conf": { @@ -3274,77 +3289,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 297, + "id": 298, "name": "slzd/OpenFort", "type": "api" }, { - "id": 298, + "id": 299, "name": "slzd/Rec", "type": "api" }, { - "id": 299, + "id": 300, "name": "slzd/Refresh", "type": "api" }, { - "id": 300, + "id": 301, "name": "slzd/Slot", "type": "api" }, { - "id": 301, + "id": 302, "name": "tanxian/Event", "type": "api" }, { - "id": 302, + "id": 303, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 303, + "id": 304, "name": "tanxian/Fight", "type": "api" }, { - "id": 304, + "id": 305, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 305, + "id": 306, "name": "tanxian/Open", "type": "api" }, { - "id": 306, + "id": 307, "name": "tanxian/Receive", "type": "api" }, { - "id": 307, + "id": 308, "name": "task/AllFinsh", "type": "api" }, { - "id": 308, + "id": 309, "name": "task/Finsh", "type": "api" }, { - "id": 309, + "id": 310, "name": "task/Open", "type": "api" }, { - "id": 310, + "id": 311, "name": "user/CDKEY", "type": "api" }, { - "id": 311, + "id": 312, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3352,197 +3367,202 @@ export const serviceProto: ServiceProto = { } }, { - "id": 312, + "id": 313, "name": "user/ChangeName", "type": "api" }, - { - "id": 313, - "name": "user/Fight", - "type": "api" - }, { "id": 314, - "name": "user/GetInfo", + "name": "user/Dot", "type": "api" }, { "id": 315, - "name": "user/InfoOpen", + "name": "user/Fight", "type": "api" }, { "id": 316, - "name": "user/Login", + "name": "user/GetInfo", "type": "api" }, { "id": 317, - "name": "user/Ping", + "name": "user/InfoOpen", "type": "api" }, { "id": 318, - "name": "user/Renown", + "name": "user/Login", "type": "api" }, { "id": 319, - "name": "user/RenownBuy", + "name": "user/Ping", "type": "api" }, { "id": 320, - "name": "user/RenownGetPrize", + "name": "user/Renown", "type": "api" }, { "id": 321, - "name": "user/RenownOpen", + "name": "user/RenownBuy", "type": "api" }, { "id": 322, - "name": "user/Tujian", + "name": "user/RenownGetPrize", "type": "api" }, { "id": 323, - "name": "weixiuchang/Decompose", + "name": "user/RenownOpen", "type": "api" }, { "id": 324, - "name": "weixiuchang/Exchange", + "name": "user/Tujian", "type": "api" }, { "id": 325, - "name": "weixiuchang/Open", + "name": "weixiuchang/Decompose", "type": "api" }, { "id": 326, - "name": "weixiuchang/UpLv", + "name": "weixiuchang/Exchange", "type": "api" }, { "id": 327, - "name": "weixiuchang/UpStar", + "name": "weixiuchang/Open", "type": "api" }, { "id": 328, - "name": "wzry/AutoBaoMing", + "name": "weixiuchang/UpLv", "type": "api" }, { "id": 329, - "name": "wzry/BaoMing", + "name": "weixiuchang/UpStar", "type": "api" }, { "id": 330, - "name": "wzry/catFightLog", + "name": "wzry/AutoBaoMing", "type": "api" }, { "id": 331, - "name": "wzry/CatGroup", + "name": "wzry/BaoMing", "type": "api" }, { "id": 332, - "name": "wzry/DldFight", + "name": "wzry/catFightLog", "type": "api" }, { "id": 333, - "name": "wzry/DldRefre", + "name": "wzry/CatGroup", "type": "api" }, { "id": 334, - "name": "wzry/JingCai", + "name": "wzry/DldFight", "type": "api" }, { "id": 335, - "name": "wzry/JingCaiOpen", + "name": "wzry/DldRefre", "type": "api" }, { "id": 336, - "name": "wzry/Open", + "name": "wzry/JingCai", "type": "api" }, { "id": 337, - "name": "wzry/UpdateFight", + "name": "wzry/JingCaiOpen", "type": "api" }, { "id": 338, - "name": "wzry/Wzzd", + "name": "wzry/Open", "type": "api" }, { "id": 339, - "name": "wzry/ZuanShiOpen", + "name": "wzry/UpdateFight", "type": "api" }, { "id": 340, - "name": "xstask/AllGet", + "name": "wzry/Wzzd", "type": "api" }, { "id": 341, - "name": "xstask/Get", + "name": "wzry/ZuanShiOpen", "type": "api" }, { "id": 342, - "name": "xstask/LvUp", + "name": "xstask/AllGet", "type": "api" }, { "id": 343, - "name": "xstask/OnekeyReceive", + "name": "xstask/Get", "type": "api" }, { "id": 344, - "name": "xstask/Open", + "name": "xstask/LvUp", "type": "api" }, { "id": 345, - "name": "xstask/Receive", + "name": "xstask/OnekeyReceive", "type": "api" }, { "id": 346, - "name": "xstask/Refresh", + "name": "xstask/Open", "type": "api" }, { "id": 347, - "name": "yongbingzhuzhan/Handle", + "name": "xstask/Receive", "type": "api" }, { "id": 348, - "name": "zhanqianbushu/ChangePos", + "name": "xstask/Refresh", "type": "api" }, { "id": 349, - "name": "zhanqianbushu/Select", + "name": "yongbingzhuzhan/Handle", "type": "api" }, { "id": 350, + "name": "zhanqianbushu/ChangePos", + "type": "api" + }, + { + "id": 351, + "name": "zhanqianbushu/Select", + "type": "api" + }, + { + "id": 352, "name": "zhanqianbushu/Up", "type": "api" } @@ -10298,7 +10318,8 @@ export const serviceProto: ServiceProto = { "name": "activityId", "type": { "type": "Number" - } + }, + "optional": true } ] }, @@ -10326,6 +10347,30 @@ export const serviceProto: ServiceProto = { "type": { "type": "Boolean" } + }, + { + "id": 3, + "name": "price", + "type": { + "type": "Number" + } + }, + { + "id": 4, + "name": "showOffList", + "type": { + "type": "Array", + "elementType": { + "type": "Any" + } + } + }, + { + "id": 5, + "name": "gotAmount", + "type": { + "type": "Number" + } } ] }, @@ -10356,7 +10401,16 @@ export const serviceProto: ServiceProto = { "name": "timesRemaining", "type": { "type": "Number" - } + }, + "optional": true + }, + { + "id": 2, + "name": "showOff", + "type": { + "type": "Boolean" + }, + "optional": true } ] }, @@ -10876,30 +10930,8 @@ export const serviceProto: ServiceProto = { "type": { "type": "Array", "elementType": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "_id", - "type": { - "type": "String" - } - }, - { - "id": 1, - "name": "total", - "type": { - "type": "Number" - } - }, - { - "id": 2, - "name": "player", - "type": { - "type": "Any" - } - } - ] + "type": "Reference", + "target": "event/xiaofeijingsai/PtlOpen/data" } } }, @@ -10907,30 +10939,41 @@ export const serviceProto: ServiceProto = { "id": 1, "name": "myData", "type": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "_id", - "type": { - "type": "String" - } - }, - { - "id": 1, - "name": "total", - "type": { - "type": "Number" - } - }, - { - "id": 2, - "name": "player", - "type": { - "type": "Any" - } - } - ] + "type": "Reference", + "target": "event/xiaofeijingsai/PtlOpen/data" + } + } + ] + }, + "event/xiaofeijingsai/PtlOpen/data": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "_id", + "type": { + "type": "String" + } + }, + { + "id": 1, + "name": "total", + "type": { + "type": "Number" + } + }, + { + "id": 2, + "name": "rank", + "type": { + "type": "Number" + } + }, + { + "id": 3, + "name": "player", + "type": { + "type": "Any" } } ] @@ -15277,6 +15320,13 @@ export const serviceProto: ServiceProto = { }, { "id": 38, + "type": { + "type": "Literal", + "literal": "payForDiamond" + } + }, + { + "id": 39, "type": { "type": "Literal", "literal": "leichonglibao" @@ -18315,8 +18365,7 @@ export const serviceProto: ServiceProto = { } }, "msg_s2c/MsgPushGiftChange/MsgPushGiftChange": { - "type": "Literal", - "literal": 1 + "type": "Number" }, "msg_s2c/MsgSendGift/MsgSendGift": { "type": "Interface", @@ -19399,6 +19448,37 @@ export const serviceProto: ServiceProto = { "PtlTest/ResTest": { "type": "Any" }, + "pushgift/PtlItemNoEnough/ReqItemNoEnough": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "need", + "type": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "a", + "type": { + "type": "String" + } + }, + { + "id": 1, + "name": "t", + "type": { + "type": "String" + } + } + ] + } + } + ] + }, + "pushgift/PtlItemNoEnough/ResItemNoEnough": { + "type": "Interface" + }, "pushgift/PtlOpen/ReqOpen": { "type": "Interface" }, @@ -21363,6 +21443,29 @@ export const serviceProto: ServiceProto = { "user/PtlChangeName/ResChangeName": { "type": "Interface" }, + "user/PtlDot/ReqDot": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "type", + "type": { + "type": "String" + } + }, + { + "id": 1, + "name": "data", + "type": { + "type": "Any" + }, + "optional": true + } + ] + }, + "user/PtlDot/ResDot": { + "type": "Interface" + }, "user/PtlFight/ReqFight": { "type": "Interface", "properties": [ From a242d6a66acb029aa218e6fc4512602d81e84434 Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 22 Dec 2023 23:33:02 +0800 Subject: [PATCH 90/90] =?UTF-8?q?fix:=20json=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/json/pay.json | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/src/json/pay.json b/src/json/pay.json index f5ff9a4..367e17d 100644 --- a/src/json/pay.json +++ b/src/json/pay.json @@ -2522,37 +2522,6 @@ "fanLiBi": 200, "currency": "CNY" }, - "136Gift1": { - "id": "136Gift1", - "money": 60, - "payExp": [ - { - "a": "attr", - "t": "payExp", - "n": 600 - } - ], - "prize": [ - { - "a": "item", - "t": "14", - "n": 50 - }, - { - "a": "attr", - "t": "jingxuanbi", - "n": 10 - } - ], - "firstPayPrize": [], - "name": "pay_name_136Gift2", - "undefined": "136礼包打包购买", - "time": 604800, - "buys": 0, - "needVip": 0, - "front": {}, - "currency": "CNY" - }, "136Gift2": { "id": "136Gift2", "money": 1, @@ -2689,7 +2658,7 @@ "buys": 0, "needVip": 0, "front": {}, - "fanLiBi": 900, + "fanLiBi": 950, "currency": "CNY" }, "xianshizhaomu_gift_1": {