From 4ba9b9f504db0f32a927341f84932dc5fe3f0d48 Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 14 Dec 2023 13:48:47 +0800 Subject: [PATCH 01/29] init --- src/api_s2c/event/zhoumolibao/ApiOpen.ts | 20 - src/api_s2c/event/zhoumolibao/ApiReceive.ts | 25 - src/api_s2c/weixiuchang/ApiDazao.ts | 23 - src/api_s2c/weixiuchang/ApiZuzhuang.ts | 29 - src/gameLog.ts | 2 +- src/module/collection_event.ts | 4 +- src/public/huodongfun.ts | 1 - src/setMongodb.ts | 77 +- .../protocols/event/zhoumolibao/PtlOpen.ts | 16 - .../protocols/event/zhoumolibao/PtlReceive.ts | 10 - src/shared/protocols/serviceProto.ts | 885 +++++++----------- src/shared/protocols/weixiuchang/PtlDazao.ts | 9 - .../protocols/weixiuchang/PtlZuzhuang.ts | 11 - 13 files changed, 354 insertions(+), 758 deletions(-) delete mode 100644 src/api_s2c/event/zhoumolibao/ApiOpen.ts delete mode 100644 src/api_s2c/event/zhoumolibao/ApiReceive.ts delete mode 100644 src/api_s2c/weixiuchang/ApiDazao.ts delete mode 100644 src/api_s2c/weixiuchang/ApiZuzhuang.ts delete mode 100644 src/shared/protocols/event/zhoumolibao/PtlOpen.ts delete mode 100644 src/shared/protocols/event/zhoumolibao/PtlReceive.ts delete mode 100644 src/shared/protocols/weixiuchang/PtlDazao.ts delete mode 100644 src/shared/protocols/weixiuchang/PtlZuzhuang.ts diff --git a/src/api_s2c/event/zhoumolibao/ApiOpen.ts b/src/api_s2c/event/zhoumolibao/ApiOpen.ts deleted file mode 100644 index 0f52475..0000000 --- a/src/api_s2c/event/zhoumolibao/ApiOpen.ts +++ /dev/null @@ -1,20 +0,0 @@ -import {ApiCall} from "tsrpc"; -import {ReqOpen, ResOpen} from "../../../shared/protocols/event/zhoumolibao/PtlOpen"; -import {PayFun} from "../../../public/pay"; -import {HuoDongFun} from "../../../public/huodongfun"; - - -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, 9))[0] - - let payIds = _hd?.data?.gift?.filter(i => i.payId)?.map(i => i.payId) - - call.succ({ - record: data?.record || {}, - buyLog: await PayFun.getPayLogs(call.uid, payIds) - }) - -} diff --git a/src/api_s2c/event/zhoumolibao/ApiReceive.ts b/src/api_s2c/event/zhoumolibao/ApiReceive.ts deleted file mode 100644 index b7bc39b..0000000 --- a/src/api_s2c/event/zhoumolibao/ApiReceive.ts +++ /dev/null @@ -1,25 +0,0 @@ -import {ApiCall} from "tsrpc"; -import {ReqReceive, ResReceive} from "../../../shared/protocols/event/zhoumolibao/PtlReceive"; -import {HuoDongFun} from "../../../public/huodongfun"; -import {PlayerFun} from "../../../public/player"; - -export default async function (call: ApiCall) { - // 查询活动是否有当前领奖的免费选项 - let _hd = (await HuoDongFun.gethdList(call, 9))[0] - let gift = _hd?.data?.gift?.find(i => i.free && i.id == call.req.id) - if (!gift) return call.errorCode(-1) - - // 取奖励列表，判断是否有可领取奖励 - let data = await G.mongodb.cEvent('zhoumolibao').findOne({uid: call.uid, type: 'zhoumolibao'}) - let rec = data.record[call.req.id] - if (rec && rec >= gift?.buyNum) return call.errorCode(-2) - - await PlayerFun.sendPrize(call, gift.prize); - - await G.mongodb.cEvent('zhoumolibao').updateOne({uid: call.uid, type: 'zhoumolibao'}, { - $inc: {[`record.${gift.id}`]: 1} - },{ upsert: true }) - - call.succ({}) - -} diff --git a/src/api_s2c/weixiuchang/ApiDazao.ts b/src/api_s2c/weixiuchang/ApiDazao.ts deleted file mode 100644 index 942aa97..0000000 --- a/src/api_s2c/weixiuchang/ApiDazao.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ApiCall } from "tsrpc"; -import { ReqDazao, ResDazao } from "../../shared/protocols/weixiuchang/PtlDazao"; -import { PlayerFun } from "../../public/player"; -import { PublicShared } from '../../shared/public/public'; - -export default async function (call: ApiCall) { - let [id, num] = [call.req.id, call.req.num]; - - let dzConf = G.gc.weixiuchang_dz[id]; - if (!dzConf) { - return call.error(globalThis.lng.weixiuchang_1); - } - let need = [].concat(dzConf.item).map(v => { return { ...v, n: v.n * num }; }); - await PlayerFun.checkNeedIsMeet(call, need); - let prize = []; - for (let i = 0; i < num; i++) { - prize = prize.concat(PublicShared.randomDropGroup(PublicShared.randomNum(0, 1) < dzConf.success ? dzConf.target : dzConf.lose)); - } - prize = PublicShared.mergePrize(prize); - await PlayerFun.cutNeed(call, need); - await PlayerFun.addItem(call, prize); - call.succ({ prize: prize }); -} \ No newline at end of file diff --git a/src/api_s2c/weixiuchang/ApiZuzhuang.ts b/src/api_s2c/weixiuchang/ApiZuzhuang.ts deleted file mode 100644 index f7e250a..0000000 --- a/src/api_s2c/weixiuchang/ApiZuzhuang.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { ApiCall } from "tsrpc"; -import { ReqZuzhuang, ResZuzhuang } from "../../shared/protocols/weixiuchang/PtlZuzhuang"; -import { PlayerFun } from "../../public/player"; - -export default async function (call: ApiCall) { - let data = call.conn.gud.wxcLv; - let conf = G.gc.weixiuchang_zz[data.lv + 1]; - let req = call.req; - let newdata = { ...data }; - - if (req.type == 'sx') { - // 安装零部件 - if (data.ids.length == conf.need.length) return call.error('', { code: -1, message: globalThis.lng.shiwu_6 }); - if (typeof req.idx != 'number') return call.error('', { code: -2, message: globalThis.lng.shiwu_6 }); - if (data.ids.includes(req.idx)) return call.error('', { code: -3, message: globalThis.lng.weixiuchang_2 }); - let need = req.cutneed == 0 ? [conf.need[req.idx]] : [].concat(conf.need2[req.idx] || conf.need2[0]).map(v => { return { ...v, n: v.n * conf.need[req.idx].n }; }); - let isMeet = await PlayerFun.checkNeedIsMeet(call, need); - if (!isMeet.isOk) return call.error('', { code: -4, message: '材料不足' }); - await PlayerFun.cutNeed(call, need); - newdata.ids.push(req.idx); - } else { - // 升星 or 进阶 - if (data.ids.length != conf.need.length) return call.error('', { code: -1, message: globalThis.lng.shiwu_6 }); - newdata.ids.length = 0; - newdata.lv += 1; - } - await PlayerFun.addAttr(call, { wxcLv: newdata }); - call.succ({}); -} \ No newline at end of file diff --git a/src/gameLog.ts b/src/gameLog.ts index 04e8c09..ef10a87 100644 --- a/src/gameLog.ts +++ b/src/gameLog.ts @@ -9,7 +9,7 @@ async function connGameLogDB() { }else{ logDBUrl = "mongodb://root:lyMaple525458@10.0.1.20:27017/heijiao_gamelog?authSource=admin"; } - let client = await MongoClient.connect(logDBUrl,{maxPoolSize:10}); + let client = await MongoClient.connect(logDBUrl); logDB = client.db(`gameLog${G.config.serverId}`); return logDB; } diff --git a/src/module/collection_event.ts b/src/module/collection_event.ts index adb648b..2aec166 100644 --- a/src/module/collection_event.ts +++ b/src/module/collection_event.ts @@ -20,7 +20,6 @@ import {ResOpen as ResOpenZhanLing} from '../shared/protocols/event/zhanling/Ptl import {ResOpen as ResOpenZhoulibao} from '../shared/protocols/event/zhoulibao/PtlOpen'; 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'; export type eventType = { shouchong: { @@ -46,8 +45,7 @@ export type eventType = { xianshizhaomu: ResOpenXianshizhaomu & { refreshTime: number; }; qirichongzhi: Omit; jierihuodong: Omit & { refreshTime: number; }; - kaifujingsai: ResOpenKaifujingsai; - zhoumolibao: ResOpenZhoumolibao; + kaifujingsai: ResOpenKaifujingsai } & { [k: `${number}jijin`]: ResOpenYuedujijin; [k: `yangchengmubiao${number}`]: yangchengmubiao; diff --git a/src/public/huodongfun.ts b/src/public/huodongfun.ts index 99ed2a1..3c925ee 100644 --- a/src/public/huodongfun.ts +++ b/src/public/huodongfun.ts @@ -37,7 +37,6 @@ export class HuoDongFun { let openTime = PublicShared.getToDayZeroTime(G.openTime) let _sDay = Number((G.time - openTime) / 86400) - // ttype为0 根据开服时间计算，ttype为1，根据用户注册时间计算 let _where = { $or: [ { diff --git a/src/setMongodb.ts b/src/setMongodb.ts index 8ab7e8b..c73abc3 100644 --- a/src/setMongodb.ts +++ b/src/setMongodb.ts @@ -5,7 +5,6 @@ import { IndexDescription, IndexSpecification, MongoClient, - MongoClientOptions, ObjectId, OptionalId } from 'mongodb'; @@ -17,7 +16,6 @@ import {MongodbCollections} from './module/mongodb'; import {HuoDongFun} from './public/huodongfun'; import {zbsGroup} from './api_s2c/hbzb/zbs/fun'; import {clusterRunOnce} from './clusterUtils'; -import { PublicShared } from './shared/public/public'; const indexs: Partial<{ [k in keyof MongodbCollections]: IndexDescription[] }> = { item: [ @@ -351,37 +349,9 @@ const indexs: Partial<{ [k in keyof MongodbCollections]: IndexDescription[] }> = }; const crossIndexs: Partial<{ [k in keyof MongodbCollections]: IndexDescription[] }> = { - email: [ - { - key: {sid: 1} - }, - { - key: {uid: 1} - } - ], - fightLog: [ - { - key: {uid: 1, type: 1} - }, - { - key: {uid: 1} - }, - { - key: {ttl: 1}, expireAfterSeconds: 7 * 24 * 3600 - } - ], hbzb_user_cross: [ { key: {uid: 1}, unique: true - }, - { - key: {jifen: 1} - }, - { - key: {rank: 1} - }, - { - key: {zbsgroup: 1} } ], hbzb_user_zbs: [ @@ -407,52 +377,13 @@ const crossIndexs: Partial<{ [k in keyof MongodbCollections]: IndexDescription[] rankList: [ { key: {type: 1, idKey: 1}, unique: true - }, - { - key: {valArr: -1} - }, - ], - wzry_fight: [ - { - key: {jifen: 1} - }, - { - key: {uid: 1} - }, - { - key: {zkey: 1} - }, - ], - wzry_user_cross: [ - { - key: {jifen: 1} - }, - { - key: {uid: 1} - }, - { - key: {zkey: 1} - }, + } ] }; export async function initMongoDB() { - //mongodb连接数说明：https://blog.csdn.net/for_cxc/article/details/116859714 - //可结合查看：node_modules\mongodb\lib\connection_string.js - //maxPoolSize默认值：100 - - let option:MongoClientOptions; - //跨服只有1个，直接采用默认配置就行 - if(G.argv.serverType != 'cross'){ - if(PublicShared.getOpenServerDay() > 3){ - option = { - maxPoolSize: 10 - } - } - } - console.log('connect mongodb ......'); - let client = await MongoClient.connect(G.argv.serverType == 'cross' ? G.config.crossMongodbUrl : G.config.mongodbUrl, option); + let client = await MongoClient.connect(G.argv.serverType == 'cross' ? G.config.crossMongodbUrl : G.config.mongodbUrl); G.mongodb = new _mongodb(client.db(G.config.dbName || '')); console.log('connect mongodb succ'); @@ -460,9 +391,7 @@ export async function initMongoDB() { if (G.argv.serverType != 'cross') { console.log('connect crossmongodb ......'); //本服里，维持住跟跨服数据库的链接 - let crossClient = await MongoClient.connect(G.config.crossMongodbUrl,{ - maxPoolSize:10 - }); + let crossClient = await MongoClient.connect(G.config.crossMongodbUrl); G.crossmongodb = new _mongodb(crossClient.db(G.config.corssDBName || "")); console.log('connect crossmongodb succ'); } diff --git a/src/shared/protocols/event/zhoumolibao/PtlOpen.ts b/src/shared/protocols/event/zhoumolibao/PtlOpen.ts deleted file mode 100644 index d2afe16..0000000 --- a/src/shared/protocols/event/zhoumolibao/PtlOpen.ts +++ /dev/null @@ -1,16 +0,0 @@ - -/** - * 周末礼包 - */ -export type ReqOpen = { - -}; - -export type ResOpen = { - record:{ - [k: string]: number; - } - buyLog:{ - [k: string]: number; - } -}; \ No newline at end of file diff --git a/src/shared/protocols/event/zhoumolibao/PtlReceive.ts b/src/shared/protocols/event/zhoumolibao/PtlReceive.ts deleted file mode 100644 index 72a0c09..0000000 --- a/src/shared/protocols/event/zhoumolibao/PtlReceive.ts +++ /dev/null @@ -1,10 +0,0 @@ -/** - * 周末礼包领奖 - */ -export interface ReqReceive { - id: string -} - -export interface ResReceive { - -} diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 4e1478c..a08f532 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -95,25 +95,23 @@ import { ReqOpen as ReqOpen_25, ResOpen as ResOpen_25 } from './event/zhanling/P 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 { 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_27, ResOpen as ResOpen_27 } 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_28, ResOpen as ResOpen_28 } 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_29, ResOpen as ResOpen_29 } 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_30, ResOpen as ResOpen_30 } 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'; @@ -135,19 +133,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_31, ResOpen as ResOpen_31 } 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_32, ResOpen as ResOpen_32 } 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_33, ResOpen as ResOpen_33 } 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_34, ResOpen as ResOpen_34 } 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'; @@ -156,14 +154,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_35, ResOpen as ResOpen_35 } from './hbzb/jfs/PtlOpen'; import { ReqRec as ReqRec_12, ResRec as ResRec_12 } 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_36, ResOpen as ResOpen_36 } 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'; @@ -179,40 +177,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_37, ResOpen as ResOpen_37 } 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_38, ResOpen as ResOpen_38 } 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_39, ResOpen as ResOpen_39 } from './jjc/PtlOpen'; +import { ReqReceive as ReqReceive_3, ResReceive as ResReceive_3 } 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_40, ResOpen as ResOpen_40 } from './kaifujingsai/PtlOpen'; +import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } 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_41, ResOpen as ResOpen_41 } 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_42, ResOpen as ResOpen_42 } 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_43, ResOpen as ResOpen_43 } 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_44, ResOpen as ResOpen_44 } from './meirishilian/PtlOpen'; import { MsgBindUid } from './msg_c2s/MsgBindUid'; import { MsgPay } from './msg_c2s/MsgPay'; import { MsgSync } from './msg_c2s/MsgSync'; @@ -243,7 +241,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_45, ResOpen as ResOpen_45 } 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,14 +257,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_46, ResOpen as ResOpen_46 } 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_47, ResOpen as ResOpen_47 } from './qjzzd/PtlOpen'; +import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } 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'; @@ -274,20 +272,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_49, ResOpen as ResOpen_49 } from './shootGame/PtlOpen'; import { ReqRec as ReqRec_14, ResRec as ResRec_14 } 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_50, ResOpen as ResOpen_50 } 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_51, ResOpen as ResOpen_51 } 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_52, ResOpen as ResOpen_52 } from './slzd/PtlOpen'; import { ReqOpenFort, ResOpenFort } from './slzd/PtlOpenFort'; import { ReqRec as ReqRec_15, ResRec as ResRec_15 } from './slzd/PtlRec'; import { ReqRefresh as ReqRefresh_7, ResRefresh as ResRefresh_7 } from './slzd/PtlRefresh'; @@ -296,11 +294,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_53, ResOpen as ResOpen_53 } from './tanxian/PtlOpen'; +import { ReqReceive as ReqReceive_5, ResReceive as ResReceive_5 } 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_54, ResOpen as ResOpen_54 } from './task/PtlOpen'; import { ReqCDKEY, ResCDKEY } from './user/PtlCDKEY'; import { ReqChangeInfo, ResChangeInfo } from './user/PtlChangeInfo'; import { ReqChangeName, ResChangeName } from './user/PtlChangeName'; @@ -314,13 +312,11 @@ import { ReqRenownBuy, ResRenownBuy } from './user/PtlRenownBuy'; import { ReqRenownGetPrize, ResRenownGetPrize } from './user/PtlRenownGetPrize'; import { ReqRenownOpen, ResRenownOpen } from './user/PtlRenownOpen'; import { ReqTujian, ResTujian } from './user/PtlTujian'; -import { ReqDazao, ResDazao } from './weixiuchang/PtlDazao'; 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_55, ResOpen as ResOpen_55 } from './weixiuchang/PtlOpen'; import { ReqUpLv, ResUpLv } from './weixiuchang/PtlUpLv'; import { ReqUpStar, ResUpStar } from './weixiuchang/PtlUpStar'; -import { ReqZuzhuang, ResZuzhuang } from './weixiuchang/PtlZuzhuang'; import { ReqAutoBaoMing, ResAutoBaoMing } from './wzry/PtlAutoBaoMing'; import { ReqBaoMing, ResBaoMing } from './wzry/PtlBaoMing'; import { ReqcatFightLog, RescatFightLog } from './wzry/PtlcatFightLog'; @@ -329,7 +325,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_56, ResOpen as ResOpen_56 } from './wzry/PtlOpen'; import { ReqUpdateFight, ResUpdateFight } from './wzry/PtlUpdateFight'; import { ReqWzzd, ResWzzd } from './wzry/PtlWzzd'; import { ReqZuanShiOpen, ResZuanShiOpen } from './wzry/PtlZuanShiOpen'; @@ -337,8 +333,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_57, ResOpen as ResOpen_57 } from './xstask/PtlOpen'; +import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } 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'; @@ -731,21 +727,13 @@ export interface ServiceType { req: ReqOpen_26, res: ResOpen_26 }, - "event/zhoumolibao/Open": { - req: ReqOpen_27, - res: ResOpen_27 - }, - "event/zhoumolibao/Receive": { - req: ReqReceive_3, - res: ResReceive_3 - }, "event/zixuanlibao/Buy": { req: ReqBuy_3, res: ResBuy_3 }, "event/zixuanlibao/Open": { - req: ReqOpen_28, - res: ResOpen_28 + req: ReqOpen_27, + res: ResOpen_27 }, "eventlist/hdGetList": { req: ReqhdGetList, @@ -768,8 +756,8 @@ export interface ServiceType { res: ResList }, "friend/Open": { - req: ReqOpen_29, - res: ResOpen_29 + req: ReqOpen_28, + res: ResOpen_28 }, "friend/Respond": { req: ReqRespond, @@ -788,8 +776,8 @@ export interface ServiceType { res: ResChallenge }, "ganbutexun/Open": { - req: ReqOpen_30, - res: ResOpen_30 + req: ReqOpen_29, + res: ResOpen_29 }, "ganhai/Fast": { req: ReqFast, @@ -804,8 +792,8 @@ export interface ServiceType { res: ResLog }, "ganhai/Open": { - req: ReqOpen_31, - res: ResOpen_31 + req: ReqOpen_30, + res: ResOpen_30 }, "ganhai/Refresh": { req: ReqRefresh, @@ -892,8 +880,8 @@ export interface ServiceType { res: ResManage }, "gonghui/Open": { - req: ReqOpen_32, - res: ResOpen_32 + req: ReqOpen_31, + res: ResOpen_31 }, "gonghui/TanHe": { req: ReqTanHe, @@ -916,8 +904,8 @@ export interface ServiceType { res: ResLottery_2 }, "gonghuibaozang/Open": { - req: ReqOpen_33, - res: ResOpen_33 + req: ReqOpen_32, + res: ResOpen_32 }, "gonglukuangbiao/Buy": { req: ReqBuy_4, @@ -928,8 +916,8 @@ export interface ServiceType { res: ResFight_2 }, "gonglukuangbiao/Open": { - req: ReqOpen_34, - res: ResOpen_34 + req: ReqOpen_33, + res: ResOpen_33 }, "gonglukuangbiao/Refresh": { req: ReqRefresh_1, @@ -940,8 +928,8 @@ export interface ServiceType { res: ResActive }, "gongyu/mingdao/Open": { - req: ReqOpen_35, - res: ResOpen_35 + req: ReqOpen_34, + res: ResOpen_34 }, "gongyu/mingdao/RecPrize": { req: ReqRecPrize_3, @@ -976,8 +964,8 @@ export interface ServiceType { res: ResGetLog_1 }, "hbzb/jfs/Open": { - req: ReqOpen_36, - res: ResOpen_36 + req: ReqOpen_35, + res: ResOpen_35 }, "hbzb/jfs/Rec": { req: ReqRec_12, @@ -1004,8 +992,8 @@ export interface ServiceType { res: ResGetLog_2 }, "hbzb/zbs/Open": { - req: ReqOpen_37, - res: ResOpen_37 + req: ReqOpen_36, + res: ResOpen_36 }, "hbzb/zbs/Refresh": { req: ReqRefresh_3, @@ -1068,16 +1056,16 @@ export interface ServiceType { res: ResLottery_3 }, "jiaotang/Open": { - req: ReqOpen_38, - res: ResOpen_38 + req: ReqOpen_37, + res: ResOpen_37 }, "jiuba/Lottery": { req: ReqLottery_4, res: ResLottery_4 }, "jiuba/Open": { - req: ReqOpen_39, - res: ResOpen_39 + req: ReqOpen_38, + res: ResOpen_38 }, "jjc/BuyFightNum": { req: ReqBuyFightNum, @@ -1092,24 +1080,24 @@ export interface ServiceType { res: ResFightLog }, "jjc/Open": { - req: ReqOpen_40, - res: ResOpen_40 + req: ReqOpen_39, + res: ResOpen_39 }, "jjc/Receive": { - req: ReqReceive_4, - res: ResReceive_4 + req: ReqReceive_3, + res: ResReceive_3 }, "jjc/Refresh": { req: ReqRefresh_4, res: ResRefresh_4 }, "kaifujingsai/Open": { - req: ReqOpen_41, - res: ResOpen_41 + req: ReqOpen_40, + res: ResOpen_40 }, "kaifujingsai/Receive": { - req: ReqReceive_5, - res: ResReceive_5 + req: ReqReceive_4, + res: ResReceive_4 }, "kbzz/Apply": { req: ReqApply_2, @@ -1136,8 +1124,8 @@ export interface ServiceType { res: ResGroupState }, "kbzz/Open": { - req: ReqOpen_42, - res: ResOpen_42 + req: ReqOpen_41, + res: ResOpen_41 }, "kbzz/RecPrize": { req: ReqRecPrize_4, @@ -1164,8 +1152,8 @@ export interface ServiceType { res: ResLog_1 }, "kuangdong/Open": { - req: ReqOpen_43, - res: ResOpen_43 + req: ReqOpen_42, + res: ResOpen_42 }, "kuangdong/YanShi": { req: ReqYanShi, @@ -1176,8 +1164,8 @@ export interface ServiceType { res: ResZhanLing }, "lingzhulaixi/Open": { - req: ReqOpen_44, - res: ResOpen_44 + req: ReqOpen_43, + res: ResOpen_43 }, "lingzhulaixi/PkBoss": { req: ReqPkBoss, @@ -1200,8 +1188,8 @@ export interface ServiceType { res: ResFight_7 }, "meirishilian/Open": { - req: ReqOpen_45, - res: ResOpen_45 + req: ReqOpen_44, + res: ResOpen_44 }, "pata/Fight": { req: ReqFight_8, @@ -1212,8 +1200,8 @@ export interface ServiceType { res: ResGetPrize_1 }, "pata/Open": { - req: ReqOpen_46, - res: ResOpen_46 + req: ReqOpen_45, + res: ResOpen_45 }, "pata/SaoDang": { req: ReqSaoDang_1, @@ -1276,8 +1264,8 @@ export interface ServiceType { res: ResJump }, "peijiancangku/Open": { - req: ReqOpen_47, - res: ResOpen_47 + req: ReqOpen_46, + res: ResOpen_46 }, "Bingo": { req: ReqBingo, @@ -1300,12 +1288,12 @@ export interface ServiceType { res: ResFight_9 }, "qjzzd/Open": { - req: ReqOpen_48, - res: ResOpen_48 + req: ReqOpen_47, + res: ResOpen_47 }, "rank/Open": { - req: ReqOpen_49, - res: ResOpen_49 + req: ReqOpen_48, + res: ResOpen_48 }, "shiwu/Concise": { req: ReqConcise, @@ -1336,8 +1324,8 @@ export interface ServiceType { res: ResWear_2 }, "shootGame/Open": { - req: ReqOpen_50, - res: ResOpen_50 + req: ReqOpen_49, + res: ResOpen_49 }, "shootGame/Rec": { req: ReqRec_14, @@ -1348,8 +1336,8 @@ export interface ServiceType { res: ResBuy_6 }, "shop/Open": { - req: ReqOpen_51, - res: ResOpen_51 + req: ReqOpen_50, + res: ResOpen_50 }, "shop/Refresh": { req: ReqRefresh_6, @@ -1364,8 +1352,8 @@ export interface ServiceType { res: ResGetPrize_2 }, "sign/Open": { - req: ReqOpen_52, - res: ResOpen_52 + req: ReqOpen_51, + res: ResOpen_51 }, "slzd/Aim": { req: ReqAim, @@ -1388,8 +1376,8 @@ export interface ServiceType { res: ResMyRank }, "slzd/Open": { - req: ReqOpen_53, - res: ResOpen_53 + req: ReqOpen_52, + res: ResOpen_52 }, "slzd/OpenFort": { req: ReqOpenFort, @@ -1424,12 +1412,12 @@ export interface ServiceType { res: ResGuaJi }, "tanxian/Open": { - req: ReqOpen_54, - res: ResOpen_54 + req: ReqOpen_53, + res: ResOpen_53 }, "tanxian/Receive": { - req: ReqReceive_6, - res: ResReceive_6 + req: ReqReceive_5, + res: ResReceive_5 }, "task/AllFinsh": { req: ReqAllFinsh, @@ -1440,8 +1428,8 @@ export interface ServiceType { res: ResFinsh }, "task/Open": { - req: ReqOpen_55, - res: ResOpen_55 + req: ReqOpen_54, + res: ResOpen_54 }, "user/CDKEY": { req: ReqCDKEY, @@ -1495,10 +1483,6 @@ export interface ServiceType { req: ReqTujian, res: ResTujian }, - "weixiuchang/Dazao": { - req: ReqDazao, - res: ResDazao - }, "weixiuchang/Decompose": { req: ReqDecompose, res: ResDecompose @@ -1508,8 +1492,8 @@ export interface ServiceType { res: ResExchange }, "weixiuchang/Open": { - req: ReqOpen_56, - res: ResOpen_56 + req: ReqOpen_55, + res: ResOpen_55 }, "weixiuchang/UpLv": { req: ReqUpLv, @@ -1519,10 +1503,6 @@ export interface ServiceType { req: ReqUpStar, res: ResUpStar }, - "weixiuchang/Zuzhuang": { - req: ReqZuzhuang, - res: ResZuzhuang - }, "wzry/AutoBaoMing": { req: ReqAutoBaoMing, res: ResAutoBaoMing @@ -1556,8 +1536,8 @@ export interface ServiceType { res: ResJingCaiOpen }, "wzry/Open": { - req: ReqOpen_57, - res: ResOpen_57 + req: ReqOpen_56, + res: ResOpen_56 }, "wzry/UpdateFight": { req: ReqUpdateFight, @@ -1588,12 +1568,12 @@ export interface ServiceType { res: ResOnekeyReceive }, "xstask/Open": { - req: ReqOpen_58, - res: ResOpen_58 + req: ReqOpen_57, + res: ResOpen_57 }, "xstask/Receive": { - req: ReqReceive_7, - res: ResReceive_7 + req: ReqReceive_6, + res: ResReceive_6 }, "xstask/Refresh": { req: ReqRefresh_8, @@ -2135,126 +2115,116 @@ export const serviceProto: ServiceProto = { }, { "id": 96, - "name": "event/zhoumolibao/Open", - "type": "api" - }, - { - "id": 97, - "name": "event/zhoumolibao/Receive", - "type": "api" - }, - { - "id": 98, "name": "event/zixuanlibao/Buy", "type": "api" }, { - "id": 99, + "id": 97, "name": "event/zixuanlibao/Open", "type": "api" }, { - "id": 100, + "id": 98, "name": "eventlist/hdGetList", "type": "api" }, { - "id": 101, + "id": 99, "name": "friend/Apply", "type": "api" }, { - "id": 102, + "id": 100, "name": "friend/Del", "type": "api" }, { - "id": 103, + "id": 101, "name": "friend/Gift", "type": "api" }, { - "id": 104, + "id": 102, "name": "friend/List", "type": "api" }, { - "id": 105, + "id": 103, "name": "friend/Open", "type": "api" }, { - "id": 106, + "id": 104, "name": "friend/Respond", "type": "api" }, { - "id": 107, + "id": 105, "name": "friend/RmBlackList", "type": "api" }, { - "id": 108, + "id": 106, "name": "friend/Search", "type": "api" }, { - "id": 109, + "id": 107, "name": "ganbutexun/Challenge", "type": "api" }, { - "id": 110, + "id": 108, "name": "ganbutexun/Open", "type": "api" }, { - "id": 111, + "id": 109, "name": "ganhai/Fast", "type": "api" }, { - "id": 112, + "id": 110, "name": "ganhai/Fight", "type": "api" }, { - "id": 113, + "id": 111, "name": "ganhai/Log", "type": "api" }, { - "id": 114, + "id": 112, "name": "ganhai/Open", "type": "api" }, { - "id": 115, + "id": 113, "name": "ganhai/Refresh", "type": "api" }, { - "id": 116, + "id": 114, "name": "ganhai/RefreshShip", "type": "api" }, { - "id": 117, + "id": 115, "name": "ganhai/Select", "type": "api" }, { - "id": 118, + "id": 116, "name": "gmapi/Gift", "type": "api" }, { - "id": 119, + "id": 117, "name": "gmapi/Post", "type": "api" }, { - "id": 120, + "id": 118, "name": "gonghui/Apply", "type": "api", "conf": { @@ -2264,7 +2234,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 121, + "id": 119, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2274,7 +2244,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 122, + "id": 120, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2284,7 +2254,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 123, + "id": 121, "name": "gonghui/Change", "type": "api", "conf": { @@ -2294,12 +2264,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 124, + "id": 122, "name": "gonghui/Create", "type": "api" }, { - "id": 125, + "id": 123, "name": "gonghui/Dissolve", "type": "api", "conf": { @@ -2309,7 +2279,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 126, + "id": 124, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2319,12 +2289,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 127, + "id": 125, "name": "gonghui/FbBuyNum", "type": "api" }, { - "id": 128, + "id": 126, "name": "gonghui/FbFight", "type": "api", "conf": { @@ -2334,7 +2304,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 129, + "id": 127, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2344,17 +2314,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 130, + "id": 128, "name": "gonghui/GetList", "type": "api" }, { - "id": 131, + "id": 129, "name": "gonghui/Join", "type": "api" }, { - "id": 132, + "id": 130, "name": "gonghui/Jx", "type": "api", "conf": { @@ -2364,7 +2334,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 133, + "id": 131, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2374,7 +2344,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 134, + "id": 132, "name": "gonghui/List", "type": "api", "conf": { @@ -2384,7 +2354,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 135, + "id": 133, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2394,7 +2364,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 136, + "id": 134, "name": "gonghui/Open", "type": "api", "conf": { @@ -2404,7 +2374,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 137, + "id": 135, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2414,7 +2384,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 138, + "id": 136, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2424,7 +2394,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 139, + "id": 137, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2434,7 +2404,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 140, + "id": 138, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2444,137 +2414,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 141, + "id": 139, "name": "gonghuibaozang/Lottery", "type": "api" }, { - "id": 142, + "id": 140, "name": "gonghuibaozang/Open", "type": "api" }, { - "id": 143, + "id": 141, "name": "gonglukuangbiao/Buy", "type": "api" }, { - "id": 144, + "id": 142, "name": "gonglukuangbiao/Fight", "type": "api" }, { - "id": 145, + "id": 143, "name": "gonglukuangbiao/Open", "type": "api" }, { - "id": 146, + "id": 144, "name": "gonglukuangbiao/Refresh", "type": "api" }, { - "id": 147, + "id": 145, "name": "gongyu/mingdao/Active", "type": "api" }, { - "id": 148, + "id": 146, "name": "gongyu/mingdao/Open", "type": "api" }, { - "id": 149, + "id": 147, "name": "gongyu/mingdao/RecPrize", "type": "api" }, { - "id": 150, + "id": 148, "name": "gongyu/mingdao/Repair", "type": "api" }, { - "id": 151, + "id": 149, "name": "gongyu/xunlianjihua/Reset", "type": "api" }, { - "id": 152, + "id": 150, "name": "gongyu/xunlianjihua/UpSkill", "type": "api" }, { - "id": 153, + "id": 151, "name": "gongyu/zuozhanjihua/SetSkill", "type": "api" }, { - "id": 154, + "id": 152, "name": "hbzb/jfs/BuyNum", "type": "api" }, { - "id": 155, + "id": 153, "name": "hbzb/jfs/Fight", "type": "api" }, { - "id": 156, + "id": 154, "name": "hbzb/jfs/GetLog", "type": "api" }, { - "id": 157, + "id": 155, "name": "hbzb/jfs/Open", "type": "api" }, { - "id": 158, + "id": 156, "name": "hbzb/jfs/Rec", "type": "api" }, { - "id": 159, + "id": 157, "name": "hbzb/jfs/Refresh", "type": "api" }, { - "id": 160, + "id": 158, "name": "hbzb/GetStatus", "type": "api" }, { - "id": 161, + "id": 159, "name": "hbzb/zbs/BuyNum", "type": "api" }, { - "id": 162, + "id": 160, "name": "hbzb/zbs/Fight", "type": "api" }, { - "id": 163, + "id": 161, "name": "hbzb/zbs/GetLog", "type": "api" }, { - "id": 164, + "id": 162, "name": "hbzb/zbs/Open", "type": "api" }, { - "id": 165, + "id": 163, "name": "hbzb/zbs/Refresh", "type": "api" }, { - "id": 166, + "id": 164, "name": "hero/Awake", "type": "api" }, { - "id": 167, + "id": 165, "name": "hero/ChangePos", "type": "api", "conf": { @@ -2582,17 +2552,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 168, + "id": 166, "name": "hero/GetList", "type": "api" }, { - "id": 169, + "id": 167, "name": "hero/JinJie", "type": "api" }, { - "id": 170, + "id": 168, "name": "hero/LvUp", "type": "api", "conf": { @@ -2600,32 +2570,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 171, + "id": 169, "name": "hero/Potency", "type": "api" }, { - "id": 172, + "id": 170, "name": "hero/Rec", "type": "api" }, { - "id": 173, + "id": 171, "name": "hero/Reset", "type": "api" }, { - "id": 174, + "id": 172, "name": "hero/Talent", "type": "api" }, { - "id": 175, + "id": 173, "name": "hero/WeaponUp", "type": "api" }, { - "id": 176, + "id": 174, "name": "hongdian/Get", "type": "api", "conf": { @@ -2633,117 +2603,117 @@ export const serviceProto: ServiceProto = { } }, { - "id": 177, + "id": 175, "name": "item/GetList", "type": "api" }, { - "id": 178, + "id": 176, "name": "item/Use", "type": "api" }, { - "id": 179, + "id": 177, "name": "jiaotang/Lottery", "type": "api" }, { - "id": 180, + "id": 178, "name": "jiaotang/Open", "type": "api" }, { - "id": 181, + "id": 179, "name": "jiuba/Lottery", "type": "api" }, { - "id": 182, + "id": 180, "name": "jiuba/Open", "type": "api" }, { - "id": 183, + "id": 181, "name": "jjc/BuyFightNum", "type": "api" }, { - "id": 184, + "id": 182, "name": "jjc/Fight", "type": "api" }, { - "id": 185, + "id": 183, "name": "jjc/FightLog", "type": "api" }, { - "id": 186, + "id": 184, "name": "jjc/Open", "type": "api" }, { - "id": 187, + "id": 185, "name": "jjc/Receive", "type": "api" }, { - "id": 188, + "id": 186, "name": "jjc/Refresh", "type": "api" }, { - "id": 189, + "id": 187, "name": "kaifujingsai/Open", "type": "api" }, { - "id": 190, + "id": 188, "name": "kaifujingsai/Receive", "type": "api" }, { - "id": 191, + "id": 189, "name": "kbzz/Apply", "type": "api" }, { - "id": 192, + "id": 190, "name": "kbzz/AutoApply", "type": "api" }, { - "id": 193, + "id": 191, "name": "kbzz/BuyNum", "type": "api" }, { - "id": 194, + "id": 192, "name": "kbzz/Fight", "type": "api" }, { - "id": 195, + "id": 193, "name": "kbzz/FightLog", "type": "api" }, { - "id": 196, + "id": 194, "name": "kbzz/GroupState", "type": "api" }, { - "id": 197, + "id": 195, "name": "kbzz/Open", "type": "api" }, { - "id": 198, + "id": 196, "name": "kbzz/RecPrize", "type": "api" }, { - "id": 199, + "id": 197, "name": "kbzz/Refresh", "type": "api", "conf": { @@ -2751,282 +2721,282 @@ export const serviceProto: ServiceProto = { } }, { - "id": 200, + "id": 198, "name": "kuangdong/AddPkNum", "type": "api" }, { - "id": 201, + "id": 199, "name": "kuangdong/GetPrize", "type": "api" }, { - "id": 202, + "id": 200, "name": "kuangdong/KdInfo", "type": "api" }, { - "id": 203, + "id": 201, "name": "kuangdong/Log", "type": "api" }, { - "id": 204, + "id": 202, "name": "kuangdong/Open", "type": "api" }, { - "id": 205, + "id": 203, "name": "kuangdong/YanShi", "type": "api" }, { - "id": 206, + "id": 204, "name": "kuangdong/ZhanLing", "type": "api" }, { - "id": 207, + "id": 205, "name": "lingzhulaixi/Open", "type": "api" }, { - "id": 208, + "id": 206, "name": "lingzhulaixi/PkBoss", "type": "api" }, { - "id": 209, + "id": 207, "name": "lingzhulaixi/PkRank", "type": "api" }, { - "id": 210, + "id": 208, "name": "lingzhulaixi/SaoDang", "type": "api" }, { - "id": 211, + "id": 209, "name": "meirishilian/Buy", "type": "api" }, { - "id": 212, + "id": 210, "name": "meirishilian/Fight", "type": "api" }, { - "id": 213, + "id": 211, "name": "meirishilian/Open", "type": "api" }, { - "id": 214, + "id": 212, "name": "msg_c2s/BindUid", "type": "msg" }, { - "id": 215, + "id": 213, "name": "msg_c2s/Pay", "type": "msg" }, { - "id": 216, + "id": 214, "name": "msg_c2s/Sync", "type": "msg" }, { - "id": 217, + "id": 215, "name": "msg_s2c/Chat", "type": "msg" }, { - "id": 218, + "id": 216, "name": "msg_s2c/ChatHelp", "type": "msg" }, { - "id": 219, + "id": 217, "name": "msg_s2c/Collection", "type": "msg" }, { - "id": 220, + "id": 218, "name": "msg_s2c/Email", "type": "msg" }, { - "id": 221, + "id": 219, "name": "msg_s2c/EmailDel", "type": "msg" }, { - "id": 222, + "id": 220, "name": "msg_s2c/EquipChange", "type": "msg" }, { - "id": 223, + "id": 221, "name": "msg_s2c/Friend", "type": "msg" }, { - "id": 224, + "id": 222, "name": "msg_s2c/GhChange", "type": "msg" }, { - "id": 225, + "id": 223, "name": "msg_s2c/GongHuiBaoZang", "type": "msg" }, { - "id": 226, + "id": 224, "name": "msg_s2c/HeroChange", "type": "msg" }, { - "id": 227, + "id": 225, "name": "msg_s2c/HongDianChange", "type": "msg" }, { - "id": 228, + "id": 226, "name": "msg_s2c/ItemChange", "type": "msg" }, { - "id": 229, + "id": 227, "name": "msg_s2c/LoginQueue", "type": "msg" }, { - "id": 230, + "id": 228, "name": "msg_s2c/LshdChange", "type": "msg" }, { - "id": 231, + "id": 229, "name": "msg_s2c/NewDay", "type": "msg" }, { - "id": 232, + "id": 230, "name": "msg_s2c/OtherLogin", "type": "msg" }, { - "id": 233, + "id": 231, "name": "msg_s2c/PayChange", "type": "msg" }, { - "id": 234, + "id": 232, "name": "msg_s2c/PayResult", "type": "msg" }, { - "id": 235, + "id": 233, "name": "msg_s2c/PeijianChange", "type": "msg" }, { - "id": 236, + "id": 234, "name": "msg_s2c/PlayerChange", "type": "msg" }, { - "id": 237, + "id": 235, "name": "msg_s2c/Private", "type": "msg" }, { - "id": 238, + "id": 236, "name": "msg_s2c/SendGift", "type": "msg" }, { - "id": 239, + "id": 237, "name": "msg_s2c/ShiwuChange", "type": "msg" }, { - "id": 240, + "id": 238, "name": "msg_s2c/TaskChange", "type": "msg" }, { - "id": 241, + "id": 239, "name": "msg_s2c/Xianshilibao", "type": "msg" }, { - "id": 242, + "id": 240, "name": "pata/Fight", "type": "api" }, { - "id": 243, + "id": 241, "name": "pata/GetPrize", "type": "api" }, { - "id": 244, + "id": 242, "name": "pata/Open", "type": "api" }, { - "id": 245, + "id": 243, "name": "pata/SaoDang", "type": "api" }, { - "id": 246, + "id": 244, "name": "pay/GetList", "type": "api" }, { - "id": 247, + "id": 245, "name": "peijian/GetList", "type": "api" }, { - "id": 248, + "id": 246, "name": "peijian/JingLian", "type": "api" }, { - "id": 249, + "id": 247, "name": "peijian/JinJie", "type": "api" }, { - "id": 250, + "id": 248, "name": "peijian/LvUp", "type": "api" }, { - "id": 251, + "id": 249, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 252, + "id": 250, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 253, + "id": 251, "name": "peijian/Reset", "type": "api" }, { - "id": 254, + "id": 252, "name": "peijian/Rm", "type": "api" }, { - "id": 255, + "id": 253, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3034,32 +3004,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 256, + "id": 254, "name": "peijian/UnLock", "type": "api" }, { - "id": 257, + "id": 255, "name": "peijian/Wear", "type": "api" }, { - "id": 258, + "id": 256, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 259, + "id": 257, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 260, + "id": 258, "name": "peijiancangku/Open", "type": "api" }, { - "id": 261, + "id": 259, "name": "Bingo", "type": "api", "conf": { @@ -3067,137 +3037,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 262, + "id": 260, "name": "FightTest", "type": "api" }, { - "id": 263, + "id": 261, "name": "SyncBtn", "type": "api" }, { - "id": 264, + "id": 262, "name": "Test", "type": "api" }, { - "id": 265, + "id": 263, "name": "qjzzd/Fight", "type": "api" }, { - "id": 266, + "id": 264, "name": "qjzzd/Open", "type": "api" }, { - "id": 267, + "id": 265, "name": "rank/Open", "type": "api" }, { - "id": 268, + "id": 266, "name": "shiwu/Concise", "type": "api" }, { - "id": 269, + "id": 267, "name": "shiwu/Extract", "type": "api" }, { - "id": 270, + "id": 268, "name": "shiwu/GetList", "type": "api" }, { - "id": 271, + "id": 269, "name": "shiwu/LvUp", "type": "api" }, { - "id": 272, + "id": 270, "name": "shiwu/Recast", "type": "api" }, { - "id": 273, + "id": 271, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 274, + "id": 272, "name": "shiwu/Wear", "type": "api" }, { - "id": 275, + "id": 273, "name": "shootGame/Open", "type": "api" }, { - "id": 276, + "id": 274, "name": "shootGame/Rec", "type": "api" }, { - "id": 277, + "id": 275, "name": "shop/Buy", "type": "api" }, { - "id": 278, + "id": 276, "name": "shop/Open", "type": "api" }, { - "id": 279, + "id": 277, "name": "shop/Refresh", "type": "api" }, { - "id": 280, + "id": 278, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 281, + "id": 279, "name": "sign/GetPrize", "type": "api" }, { - "id": 282, + "id": 280, "name": "sign/Open", "type": "api" }, { - "id": 283, + "id": 281, "name": "slzd/Aim", "type": "api" }, { - "id": 284, + "id": 282, "name": "slzd/BuyNum", "type": "api" }, { - "id": 285, + "id": 283, "name": "slzd/Fight", "type": "api" }, { - "id": 286, + "id": 284, "name": "slzd/FightLog", "type": "api" }, { - "id": 287, + "id": 285, "name": "slzd/MyRank", "type": "api" }, { - "id": 288, + "id": 286, "name": "slzd/Open", "type": "api", "conf": { @@ -3207,77 +3177,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 289, + "id": 287, "name": "slzd/OpenFort", "type": "api" }, { - "id": 290, + "id": 288, "name": "slzd/Rec", "type": "api" }, { - "id": 291, + "id": 289, "name": "slzd/Refresh", "type": "api" }, { - "id": 292, + "id": 290, "name": "slzd/Slot", "type": "api" }, { - "id": 293, + "id": 291, "name": "tanxian/Event", "type": "api" }, { - "id": 294, + "id": 292, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 295, + "id": 293, "name": "tanxian/Fight", "type": "api" }, { - "id": 296, + "id": 294, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 297, + "id": 295, "name": "tanxian/Open", "type": "api" }, { - "id": 298, + "id": 296, "name": "tanxian/Receive", "type": "api" }, { - "id": 299, + "id": 297, "name": "task/AllFinsh", "type": "api" }, { - "id": 300, + "id": 298, "name": "task/Finsh", "type": "api" }, { - "id": 301, + "id": 299, "name": "task/Open", "type": "api" }, { - "id": 302, + "id": 300, "name": "user/CDKEY", "type": "api" }, { - "id": 303, + "id": 301, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3285,207 +3255,197 @@ export const serviceProto: ServiceProto = { } }, { - "id": 304, + "id": 302, "name": "user/ChangeName", "type": "api" }, { - "id": 305, + "id": 303, "name": "user/Fight", "type": "api" }, { - "id": 306, + "id": 304, "name": "user/GetInfo", "type": "api" }, { - "id": 307, + "id": 305, "name": "user/InfoOpen", "type": "api" }, { - "id": 308, + "id": 306, "name": "user/Login", "type": "api" }, { - "id": 309, + "id": 307, "name": "user/Ping", "type": "api" }, { - "id": 310, + "id": 308, "name": "user/Renown", "type": "api" }, { - "id": 311, + "id": 309, "name": "user/RenownBuy", "type": "api" }, { - "id": 312, + "id": 310, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 313, + "id": 311, "name": "user/RenownOpen", "type": "api" }, { - "id": 314, + "id": 312, "name": "user/Tujian", "type": "api" }, { - "id": 315, - "name": "weixiuchang/Dazao", - "type": "api" - }, - { - "id": 316, + "id": 313, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 317, + "id": 314, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 318, + "id": 315, "name": "weixiuchang/Open", "type": "api" }, { - "id": 319, + "id": 316, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 320, + "id": 317, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 321, - "name": "weixiuchang/Zuzhuang", - "type": "api" - }, - { - "id": 322, + "id": 318, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 323, + "id": 319, "name": "wzry/BaoMing", "type": "api" }, { - "id": 324, + "id": 320, "name": "wzry/catFightLog", "type": "api" }, { - "id": 325, + "id": 321, "name": "wzry/CatGroup", "type": "api" }, { - "id": 326, + "id": 322, "name": "wzry/DldFight", "type": "api" }, { - "id": 327, + "id": 323, "name": "wzry/DldRefre", "type": "api" }, { - "id": 328, + "id": 324, "name": "wzry/JingCai", "type": "api" }, { - "id": 329, + "id": 325, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 330, + "id": 326, "name": "wzry/Open", "type": "api" }, { - "id": 331, + "id": 327, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 332, + "id": 328, "name": "wzry/Wzzd", "type": "api" }, { - "id": 333, + "id": 329, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 334, + "id": 330, "name": "xstask/AllGet", "type": "api" }, { - "id": 335, + "id": 331, "name": "xstask/Get", "type": "api" }, { - "id": 336, + "id": 332, "name": "xstask/LvUp", "type": "api" }, { - "id": 337, + "id": 333, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 338, + "id": 334, "name": "xstask/Open", "type": "api" }, { - "id": 339, + "id": 335, "name": "xstask/Receive", "type": "api" }, { - "id": 340, + "id": 336, "name": "xstask/Refresh", "type": "api" }, { - "id": 341, + "id": 337, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 342, + "id": 338, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 343, + "id": 339, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 344, + "id": 340, "name": "zhanqianbushu/Up", "type": "api" } @@ -11231,55 +11191,6 @@ export const serviceProto: ServiceProto = { } ] }, - "event/zhoumolibao/PtlOpen/ReqOpen": { - "type": "Interface" - }, - "event/zhoumolibao/PtlOpen/ResOpen": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "record", - "type": { - "type": "Interface", - "indexSignature": { - "keyType": "String", - "type": { - "type": "Number" - } - } - } - }, - { - "id": 1, - "name": "buyLog", - "type": { - "type": "Interface", - "indexSignature": { - "keyType": "String", - "type": { - "type": "Number" - } - } - } - } - ] - }, - "event/zhoumolibao/PtlReceive/ReqReceive": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "id", - "type": { - "type": "String" - } - } - ] - }, - "event/zhoumolibao/PtlReceive/ResReceive": { - "type": "Interface" - }, "event/zixuanlibao/PtlBuy/ReqBuy": { "type": "Interface", "properties": [ @@ -21158,41 +21069,6 @@ export const serviceProto: ServiceProto = { "user/PtlTujian/ResTujian": { "type": "Interface" }, - "weixiuchang/PtlDazao/ReqDazao": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "id", - "type": { - "type": "Number" - } - }, - { - "id": 1, - "name": "num", - "type": { - "type": "Number" - } - } - ] - }, - "weixiuchang/PtlDazao/ResDazao": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "prize", - "type": { - "type": "Array", - "elementType": { - "type": "Reference", - "target": "type/prizeType" - } - } - } - ] - }, "weixiuchang/PtlDecompose/ReqDecompose": { "type": "Interface", "properties": [ @@ -21375,69 +21251,6 @@ export const serviceProto: ServiceProto = { } ] }, - "weixiuchang/PtlZuzhuang/ReqZuzhuang": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "type", - "type": { - "type": "Union", - "members": [ - { - "id": 0, - "type": { - "type": "Literal", - "literal": "sx" - } - }, - { - "id": 1, - "type": { - "type": "Literal", - "literal": "jj" - } - } - ] - } - }, - { - "id": 1, - "name": "cutneed", - "type": { - "type": "Union", - "members": [ - { - "id": 0, - "type": { - "type": "Literal", - "literal": 0 - } - }, - { - "id": 1, - "type": { - "type": "Literal", - "literal": 1 - } - } - ] - }, - "optional": true - }, - { - "id": 2, - "name": "idx", - "type": { - "type": "Number" - }, - "optional": true - } - ] - }, - "weixiuchang/PtlZuzhuang/ResZuzhuang": { - "type": "Interface" - }, "wzry/PtlAutoBaoMing/ReqAutoBaoMing": { "type": "Interface", "properties": [ diff --git a/src/shared/protocols/weixiuchang/PtlDazao.ts b/src/shared/protocols/weixiuchang/PtlDazao.ts deleted file mode 100644 index f283ff6..0000000 --- a/src/shared/protocols/weixiuchang/PtlDazao.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { prizeType } from "../type"; - -export type ReqDazao = { - id: number, - num: number -} -export type ResDazao = { - prize: prizeType[]; -} \ No newline at end of file diff --git a/src/shared/protocols/weixiuchang/PtlZuzhuang.ts b/src/shared/protocols/weixiuchang/PtlZuzhuang.ts deleted file mode 100644 index 8734399..0000000 --- a/src/shared/protocols/weixiuchang/PtlZuzhuang.ts +++ /dev/null @@ -1,11 +0,0 @@ -export type ReqZuzhuang = { - /**sx:安装零部件 jj:进阶or升星 */ - type: 'sx' | 'jj'; - /**0 材料消耗 1 购买消耗 */ - cutneed?: 0 | 1; - idx?: number; -}; - -export type ResZuzhuang = { - -}; From a189f77303f1459d1fe61300dae0ce0be441cd07 Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 14 Dec 2023 13:51:24 +0800 Subject: [PATCH 02/29] init --- src/api_s2c/event/zhoumolibao/ApiOpen.ts | 20 +++++ src/api_s2c/event/zhoumolibao/ApiReceive.ts | 25 ++++++ src/gameLog.ts | 2 +- src/module/collection_event.ts | 4 +- src/public/huodongfun.ts | 1 + src/setMongodb.ts | 77 ++++++++++++++++++- .../protocols/event/zhoumolibao/PtlOpen.ts | 16 ++++ .../protocols/event/zhoumolibao/PtlReceive.ts | 10 +++ 8 files changed, 150 insertions(+), 5 deletions(-) create mode 100644 src/api_s2c/event/zhoumolibao/ApiOpen.ts create mode 100644 src/api_s2c/event/zhoumolibao/ApiReceive.ts create mode 100644 src/shared/protocols/event/zhoumolibao/PtlOpen.ts create mode 100644 src/shared/protocols/event/zhoumolibao/PtlReceive.ts diff --git a/src/api_s2c/event/zhoumolibao/ApiOpen.ts b/src/api_s2c/event/zhoumolibao/ApiOpen.ts new file mode 100644 index 0000000..0f52475 --- /dev/null +++ b/src/api_s2c/event/zhoumolibao/ApiOpen.ts @@ -0,0 +1,20 @@ +import {ApiCall} from "tsrpc"; +import {ReqOpen, ResOpen} from "../../../shared/protocols/event/zhoumolibao/PtlOpen"; +import {PayFun} from "../../../public/pay"; +import {HuoDongFun} from "../../../public/huodongfun"; + + +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, 9))[0] + + let payIds = _hd?.data?.gift?.filter(i => i.payId)?.map(i => i.payId) + + call.succ({ + record: data?.record || {}, + buyLog: await PayFun.getPayLogs(call.uid, payIds) + }) + +} diff --git a/src/api_s2c/event/zhoumolibao/ApiReceive.ts b/src/api_s2c/event/zhoumolibao/ApiReceive.ts new file mode 100644 index 0000000..b7bc39b --- /dev/null +++ b/src/api_s2c/event/zhoumolibao/ApiReceive.ts @@ -0,0 +1,25 @@ +import {ApiCall} from "tsrpc"; +import {ReqReceive, ResReceive} from "../../../shared/protocols/event/zhoumolibao/PtlReceive"; +import {HuoDongFun} from "../../../public/huodongfun"; +import {PlayerFun} from "../../../public/player"; + +export default async function (call: ApiCall) { + // 查询活动是否有当前领奖的免费选项 + let _hd = (await HuoDongFun.gethdList(call, 9))[0] + let gift = _hd?.data?.gift?.find(i => i.free && i.id == call.req.id) + if (!gift) return call.errorCode(-1) + + // 取奖励列表，判断是否有可领取奖励 + let data = await G.mongodb.cEvent('zhoumolibao').findOne({uid: call.uid, type: 'zhoumolibao'}) + let rec = data.record[call.req.id] + if (rec && rec >= gift?.buyNum) return call.errorCode(-2) + + await PlayerFun.sendPrize(call, gift.prize); + + await G.mongodb.cEvent('zhoumolibao').updateOne({uid: call.uid, type: 'zhoumolibao'}, { + $inc: {[`record.${gift.id}`]: 1} + },{ upsert: true }) + + call.succ({}) + +} diff --git a/src/gameLog.ts b/src/gameLog.ts index ef10a87..04e8c09 100644 --- a/src/gameLog.ts +++ b/src/gameLog.ts @@ -9,7 +9,7 @@ async function connGameLogDB() { }else{ logDBUrl = "mongodb://root:lyMaple525458@10.0.1.20:27017/heijiao_gamelog?authSource=admin"; } - let client = await MongoClient.connect(logDBUrl); + let client = await MongoClient.connect(logDBUrl,{maxPoolSize:10}); logDB = client.db(`gameLog${G.config.serverId}`); return logDB; } diff --git a/src/module/collection_event.ts b/src/module/collection_event.ts index 2aec166..adb648b 100644 --- a/src/module/collection_event.ts +++ b/src/module/collection_event.ts @@ -20,6 +20,7 @@ import {ResOpen as ResOpenZhanLing} from '../shared/protocols/event/zhanling/Ptl import {ResOpen as ResOpenZhoulibao} from '../shared/protocols/event/zhoulibao/PtlOpen'; 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'; export type eventType = { shouchong: { @@ -45,7 +46,8 @@ export type eventType = { xianshizhaomu: ResOpenXianshizhaomu & { refreshTime: number; }; qirichongzhi: Omit; jierihuodong: Omit & { refreshTime: number; }; - kaifujingsai: ResOpenKaifujingsai + kaifujingsai: ResOpenKaifujingsai; + zhoumolibao: ResOpenZhoumolibao; } & { [k: `${number}jijin`]: ResOpenYuedujijin; [k: `yangchengmubiao${number}`]: yangchengmubiao; diff --git a/src/public/huodongfun.ts b/src/public/huodongfun.ts index 3c925ee..99ed2a1 100644 --- a/src/public/huodongfun.ts +++ b/src/public/huodongfun.ts @@ -37,6 +37,7 @@ export class HuoDongFun { let openTime = PublicShared.getToDayZeroTime(G.openTime) let _sDay = Number((G.time - openTime) / 86400) + // ttype为0 根据开服时间计算，ttype为1，根据用户注册时间计算 let _where = { $or: [ { diff --git a/src/setMongodb.ts b/src/setMongodb.ts index c73abc3..8ab7e8b 100644 --- a/src/setMongodb.ts +++ b/src/setMongodb.ts @@ -5,6 +5,7 @@ import { IndexDescription, IndexSpecification, MongoClient, + MongoClientOptions, ObjectId, OptionalId } from 'mongodb'; @@ -16,6 +17,7 @@ import {MongodbCollections} from './module/mongodb'; import {HuoDongFun} from './public/huodongfun'; import {zbsGroup} from './api_s2c/hbzb/zbs/fun'; import {clusterRunOnce} from './clusterUtils'; +import { PublicShared } from './shared/public/public'; const indexs: Partial<{ [k in keyof MongodbCollections]: IndexDescription[] }> = { item: [ @@ -349,9 +351,37 @@ const indexs: Partial<{ [k in keyof MongodbCollections]: IndexDescription[] }> = }; const crossIndexs: Partial<{ [k in keyof MongodbCollections]: IndexDescription[] }> = { + email: [ + { + key: {sid: 1} + }, + { + key: {uid: 1} + } + ], + fightLog: [ + { + key: {uid: 1, type: 1} + }, + { + key: {uid: 1} + }, + { + key: {ttl: 1}, expireAfterSeconds: 7 * 24 * 3600 + } + ], hbzb_user_cross: [ { key: {uid: 1}, unique: true + }, + { + key: {jifen: 1} + }, + { + key: {rank: 1} + }, + { + key: {zbsgroup: 1} } ], hbzb_user_zbs: [ @@ -377,13 +407,52 @@ const crossIndexs: Partial<{ [k in keyof MongodbCollections]: IndexDescription[] rankList: [ { key: {type: 1, idKey: 1}, unique: true - } + }, + { + key: {valArr: -1} + }, + ], + wzry_fight: [ + { + key: {jifen: 1} + }, + { + key: {uid: 1} + }, + { + key: {zkey: 1} + }, + ], + wzry_user_cross: [ + { + key: {jifen: 1} + }, + { + key: {uid: 1} + }, + { + key: {zkey: 1} + }, ] }; export async function initMongoDB() { + //mongodb连接数说明：https://blog.csdn.net/for_cxc/article/details/116859714 + //可结合查看：node_modules\mongodb\lib\connection_string.js + //maxPoolSize默认值：100 + + let option:MongoClientOptions; + //跨服只有1个，直接采用默认配置就行 + if(G.argv.serverType != 'cross'){ + if(PublicShared.getOpenServerDay() > 3){ + option = { + maxPoolSize: 10 + } + } + } + console.log('connect mongodb ......'); - let client = await MongoClient.connect(G.argv.serverType == 'cross' ? G.config.crossMongodbUrl : G.config.mongodbUrl); + let client = await MongoClient.connect(G.argv.serverType == 'cross' ? G.config.crossMongodbUrl : G.config.mongodbUrl, option); G.mongodb = new _mongodb(client.db(G.config.dbName || '')); console.log('connect mongodb succ'); @@ -391,7 +460,9 @@ export async function initMongoDB() { if (G.argv.serverType != 'cross') { console.log('connect crossmongodb ......'); //本服里，维持住跟跨服数据库的链接 - let crossClient = await MongoClient.connect(G.config.crossMongodbUrl); + let crossClient = await MongoClient.connect(G.config.crossMongodbUrl,{ + maxPoolSize:10 + }); G.crossmongodb = new _mongodb(crossClient.db(G.config.corssDBName || "")); console.log('connect crossmongodb succ'); } diff --git a/src/shared/protocols/event/zhoumolibao/PtlOpen.ts b/src/shared/protocols/event/zhoumolibao/PtlOpen.ts new file mode 100644 index 0000000..d2afe16 --- /dev/null +++ b/src/shared/protocols/event/zhoumolibao/PtlOpen.ts @@ -0,0 +1,16 @@ + +/** + * 周末礼包 + */ +export type ReqOpen = { + +}; + +export type ResOpen = { + record:{ + [k: string]: number; + } + buyLog:{ + [k: string]: number; + } +}; \ No newline at end of file diff --git a/src/shared/protocols/event/zhoumolibao/PtlReceive.ts b/src/shared/protocols/event/zhoumolibao/PtlReceive.ts new file mode 100644 index 0000000..72a0c09 --- /dev/null +++ b/src/shared/protocols/event/zhoumolibao/PtlReceive.ts @@ -0,0 +1,10 @@ +/** + * 周末礼包领奖 + */ +export interface ReqReceive { + id: string +} + +export interface ResReceive { + +} From 66918ab2479c5321ccae7aeb566a099d4e4efc93 Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 10:26:08 +0800 Subject: [PATCH 03/29] proto --- src/shared/protocols/serviceProto.ts | 767 +++++++++++++++------------ 1 file changed, 418 insertions(+), 349 deletions(-) diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index a08f532..f06e602 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -95,23 +95,25 @@ import { ReqOpen as ReqOpen_25, ResOpen as ResOpen_25 } from './event/zhanling/P 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 { ReqBuy as ReqBuy_3, ResBuy as ResBuy_3 } from './event/zixuanlibao/PtlBuy'; -import { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } from './event/zixuanlibao/PtlOpen'; +import { ReqOpen as ReqOpen_28, ResOpen as ResOpen_28 } 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_28, ResOpen as ResOpen_28 } from './friend/PtlOpen'; +import { ReqOpen as ReqOpen_29, ResOpen as ResOpen_29 } 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_29, ResOpen as ResOpen_29 } from './ganbutexun/PtlOpen'; +import { ReqOpen as ReqOpen_30, ResOpen as ResOpen_30 } 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_30, ResOpen as ResOpen_30 } from './ganhai/PtlOpen'; +import { ReqOpen as ReqOpen_31, ResOpen as ResOpen_31 } 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'; @@ -133,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_31, ResOpen as ResOpen_31 } from './gonghui/PtlOpen'; +import { ReqOpen as ReqOpen_32, ResOpen as ResOpen_32 } 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_32, ResOpen as ResOpen_32 } from './gonghuibaozang/PtlOpen'; +import { ReqOpen as ReqOpen_33, ResOpen as ResOpen_33 } 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_33, ResOpen as ResOpen_33 } from './gonglukuangbiao/PtlOpen'; +import { ReqOpen as ReqOpen_34, ResOpen as ResOpen_34 } 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_34, ResOpen as ResOpen_34 } from './gongyu/mingdao/PtlOpen'; +import { ReqOpen as ReqOpen_35, ResOpen as ResOpen_35 } 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'; @@ -154,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_35, ResOpen as ResOpen_35 } from './hbzb/jfs/PtlOpen'; +import { ReqOpen as ReqOpen_36, ResOpen as ResOpen_36 } from './hbzb/jfs/PtlOpen'; import { ReqRec as ReqRec_12, ResRec as ResRec_12 } 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_36, ResOpen as ResOpen_36 } from './hbzb/zbs/PtlOpen'; +import { ReqOpen as ReqOpen_37, ResOpen as ResOpen_37 } 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'; @@ -177,40 +179,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_37, ResOpen as ResOpen_37 } from './jiaotang/PtlOpen'; +import { ReqOpen as ReqOpen_38, ResOpen as ResOpen_38 } from './jiaotang/PtlOpen'; import { ReqLottery as ReqLottery_4, ResLottery as ResLottery_4 } from './jiuba/PtlLottery'; -import { ReqOpen as ReqOpen_38, ResOpen as ResOpen_38 } from './jiuba/PtlOpen'; +import { ReqOpen as ReqOpen_39, ResOpen as ResOpen_39 } 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_39, ResOpen as ResOpen_39 } from './jjc/PtlOpen'; -import { ReqReceive as ReqReceive_3, ResReceive as ResReceive_3 } from './jjc/PtlReceive'; +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 { ReqRefresh as ReqRefresh_4, ResRefresh as ResRefresh_4 } from './jjc/PtlRefresh'; -import { ReqOpen as ReqOpen_40, ResOpen as ResOpen_40 } from './kaifujingsai/PtlOpen'; -import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } from './kaifujingsai/PtlReceive'; +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 { 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_41, ResOpen as ResOpen_41 } from './kbzz/PtlOpen'; +import { ReqOpen as ReqOpen_42, ResOpen as ResOpen_42 } 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_42, ResOpen as ResOpen_42 } from './kuangdong/PtlOpen'; +import { ReqOpen as ReqOpen_43, ResOpen as ResOpen_43 } from './kuangdong/PtlOpen'; import { ReqYanShi, ResYanShi } from './kuangdong/PtlYanShi'; import { ReqZhanLing, ResZhanLing } from './kuangdong/PtlZhanLing'; -import { ReqOpen as ReqOpen_43, ResOpen as ResOpen_43 } from './lingzhulaixi/PtlOpen'; +import { ReqOpen as ReqOpen_44, ResOpen as ResOpen_44 } 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_44, ResOpen as ResOpen_44 } from './meirishilian/PtlOpen'; +import { ReqOpen as ReqOpen_45, ResOpen as ResOpen_45 } from './meirishilian/PtlOpen'; import { MsgBindUid } from './msg_c2s/MsgBindUid'; import { MsgPay } from './msg_c2s/MsgPay'; import { MsgSync } from './msg_c2s/MsgSync'; @@ -241,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_45, ResOpen as ResOpen_45 } from './pata/PtlOpen'; +import { ReqOpen as ReqOpen_46, ResOpen as ResOpen_46 } 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'; @@ -257,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_46, ResOpen as ResOpen_46 } from './peijiancangku/PtlOpen'; +import { ReqOpen as ReqOpen_47, ResOpen as ResOpen_47 } 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_47, ResOpen as ResOpen_47 } from './qjzzd/PtlOpen'; -import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } from './rank/PtlOpen'; +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 { ReqConcise, ResConcise } from './shiwu/PtlConcise'; import { ReqExtract, ResExtract } from './shiwu/PtlExtract'; import { ReqGetList as ReqGetList_7, ResGetList as ResGetList_7 } from './shiwu/PtlGetList'; @@ -272,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_49, ResOpen as ResOpen_49 } from './shootGame/PtlOpen'; +import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } from './shootGame/PtlOpen'; import { ReqRec as ReqRec_14, ResRec as ResRec_14 } from './shootGame/PtlRec'; import { ReqBuy as ReqBuy_6, ResBuy as ResBuy_6 } from './shop/PtlBuy'; -import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } from './shop/PtlOpen'; +import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } 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_51, ResOpen as ResOpen_51 } from './sign/PtlOpen'; +import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } 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_52, ResOpen as ResOpen_52 } from './slzd/PtlOpen'; +import { ReqOpen as ReqOpen_53, ResOpen as ResOpen_53 } from './slzd/PtlOpen'; import { ReqOpenFort, ResOpenFort } from './slzd/PtlOpenFort'; import { ReqRec as ReqRec_15, ResRec as ResRec_15 } from './slzd/PtlRec'; import { ReqRefresh as ReqRefresh_7, ResRefresh as ResRefresh_7 } from './slzd/PtlRefresh'; @@ -294,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_53, ResOpen as ResOpen_53 } from './tanxian/PtlOpen'; -import { ReqReceive as ReqReceive_5, ResReceive as ResReceive_5 } from './tanxian/PtlReceive'; +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 { ReqAllFinsh, ResAllFinsh } from './task/PtlAllFinsh'; import { ReqFinsh, ResFinsh } from './task/PtlFinsh'; -import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } from './task/PtlOpen'; +import { ReqOpen as ReqOpen_55, ResOpen as ResOpen_55 } from './task/PtlOpen'; import { ReqCDKEY, ResCDKEY } from './user/PtlCDKEY'; import { ReqChangeInfo, ResChangeInfo } from './user/PtlChangeInfo'; import { ReqChangeName, ResChangeName } from './user/PtlChangeName'; @@ -314,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_55, ResOpen as ResOpen_55 } from './weixiuchang/PtlOpen'; +import { ReqOpen as ReqOpen_56, ResOpen as ResOpen_56 } from './weixiuchang/PtlOpen'; import { ReqUpLv, ResUpLv } from './weixiuchang/PtlUpLv'; import { ReqUpStar, ResUpStar } from './weixiuchang/PtlUpStar'; import { ReqAutoBaoMing, ResAutoBaoMing } from './wzry/PtlAutoBaoMing'; @@ -325,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_56, ResOpen as ResOpen_56 } from './wzry/PtlOpen'; +import { ReqOpen as ReqOpen_57, ResOpen as ResOpen_57 } from './wzry/PtlOpen'; import { ReqUpdateFight, ResUpdateFight } from './wzry/PtlUpdateFight'; import { ReqWzzd, ResWzzd } from './wzry/PtlWzzd'; import { ReqZuanShiOpen, ResZuanShiOpen } from './wzry/PtlZuanShiOpen'; @@ -333,8 +335,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_57, ResOpen as ResOpen_57 } from './xstask/PtlOpen'; -import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } from './xstask/PtlReceive'; +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 { 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'; @@ -727,13 +729,21 @@ export interface ServiceType { req: ReqOpen_26, res: ResOpen_26 }, + "event/zhoumolibao/Open": { + req: ReqOpen_27, + res: ResOpen_27 + }, + "event/zhoumolibao/Receive": { + req: ReqReceive_3, + res: ResReceive_3 + }, "event/zixuanlibao/Buy": { req: ReqBuy_3, res: ResBuy_3 }, "event/zixuanlibao/Open": { - req: ReqOpen_27, - res: ResOpen_27 + req: ReqOpen_28, + res: ResOpen_28 }, "eventlist/hdGetList": { req: ReqhdGetList, @@ -756,8 +766,8 @@ export interface ServiceType { res: ResList }, "friend/Open": { - req: ReqOpen_28, - res: ResOpen_28 + req: ReqOpen_29, + res: ResOpen_29 }, "friend/Respond": { req: ReqRespond, @@ -776,8 +786,8 @@ export interface ServiceType { res: ResChallenge }, "ganbutexun/Open": { - req: ReqOpen_29, - res: ResOpen_29 + req: ReqOpen_30, + res: ResOpen_30 }, "ganhai/Fast": { req: ReqFast, @@ -792,8 +802,8 @@ export interface ServiceType { res: ResLog }, "ganhai/Open": { - req: ReqOpen_30, - res: ResOpen_30 + req: ReqOpen_31, + res: ResOpen_31 }, "ganhai/Refresh": { req: ReqRefresh, @@ -880,8 +890,8 @@ export interface ServiceType { res: ResManage }, "gonghui/Open": { - req: ReqOpen_31, - res: ResOpen_31 + req: ReqOpen_32, + res: ResOpen_32 }, "gonghui/TanHe": { req: ReqTanHe, @@ -904,8 +914,8 @@ export interface ServiceType { res: ResLottery_2 }, "gonghuibaozang/Open": { - req: ReqOpen_32, - res: ResOpen_32 + req: ReqOpen_33, + res: ResOpen_33 }, "gonglukuangbiao/Buy": { req: ReqBuy_4, @@ -916,8 +926,8 @@ export interface ServiceType { res: ResFight_2 }, "gonglukuangbiao/Open": { - req: ReqOpen_33, - res: ResOpen_33 + req: ReqOpen_34, + res: ResOpen_34 }, "gonglukuangbiao/Refresh": { req: ReqRefresh_1, @@ -928,8 +938,8 @@ export interface ServiceType { res: ResActive }, "gongyu/mingdao/Open": { - req: ReqOpen_34, - res: ResOpen_34 + req: ReqOpen_35, + res: ResOpen_35 }, "gongyu/mingdao/RecPrize": { req: ReqRecPrize_3, @@ -964,8 +974,8 @@ export interface ServiceType { res: ResGetLog_1 }, "hbzb/jfs/Open": { - req: ReqOpen_35, - res: ResOpen_35 + req: ReqOpen_36, + res: ResOpen_36 }, "hbzb/jfs/Rec": { req: ReqRec_12, @@ -992,8 +1002,8 @@ export interface ServiceType { res: ResGetLog_2 }, "hbzb/zbs/Open": { - req: ReqOpen_36, - res: ResOpen_36 + req: ReqOpen_37, + res: ResOpen_37 }, "hbzb/zbs/Refresh": { req: ReqRefresh_3, @@ -1056,16 +1066,16 @@ export interface ServiceType { res: ResLottery_3 }, "jiaotang/Open": { - req: ReqOpen_37, - res: ResOpen_37 + req: ReqOpen_38, + res: ResOpen_38 }, "jiuba/Lottery": { req: ReqLottery_4, res: ResLottery_4 }, "jiuba/Open": { - req: ReqOpen_38, - res: ResOpen_38 + req: ReqOpen_39, + res: ResOpen_39 }, "jjc/BuyFightNum": { req: ReqBuyFightNum, @@ -1080,24 +1090,24 @@ export interface ServiceType { res: ResFightLog }, "jjc/Open": { - req: ReqOpen_39, - res: ResOpen_39 + req: ReqOpen_40, + res: ResOpen_40 }, "jjc/Receive": { - req: ReqReceive_3, - res: ResReceive_3 + req: ReqReceive_4, + res: ResReceive_4 }, "jjc/Refresh": { req: ReqRefresh_4, res: ResRefresh_4 }, "kaifujingsai/Open": { - req: ReqOpen_40, - res: ResOpen_40 + req: ReqOpen_41, + res: ResOpen_41 }, "kaifujingsai/Receive": { - req: ReqReceive_4, - res: ResReceive_4 + req: ReqReceive_5, + res: ResReceive_5 }, "kbzz/Apply": { req: ReqApply_2, @@ -1124,8 +1134,8 @@ export interface ServiceType { res: ResGroupState }, "kbzz/Open": { - req: ReqOpen_41, - res: ResOpen_41 + req: ReqOpen_42, + res: ResOpen_42 }, "kbzz/RecPrize": { req: ReqRecPrize_4, @@ -1152,8 +1162,8 @@ export interface ServiceType { res: ResLog_1 }, "kuangdong/Open": { - req: ReqOpen_42, - res: ResOpen_42 + req: ReqOpen_43, + res: ResOpen_43 }, "kuangdong/YanShi": { req: ReqYanShi, @@ -1164,8 +1174,8 @@ export interface ServiceType { res: ResZhanLing }, "lingzhulaixi/Open": { - req: ReqOpen_43, - res: ResOpen_43 + req: ReqOpen_44, + res: ResOpen_44 }, "lingzhulaixi/PkBoss": { req: ReqPkBoss, @@ -1188,8 +1198,8 @@ export interface ServiceType { res: ResFight_7 }, "meirishilian/Open": { - req: ReqOpen_44, - res: ResOpen_44 + req: ReqOpen_45, + res: ResOpen_45 }, "pata/Fight": { req: ReqFight_8, @@ -1200,8 +1210,8 @@ export interface ServiceType { res: ResGetPrize_1 }, "pata/Open": { - req: ReqOpen_45, - res: ResOpen_45 + req: ReqOpen_46, + res: ResOpen_46 }, "pata/SaoDang": { req: ReqSaoDang_1, @@ -1264,8 +1274,8 @@ export interface ServiceType { res: ResJump }, "peijiancangku/Open": { - req: ReqOpen_46, - res: ResOpen_46 + req: ReqOpen_47, + res: ResOpen_47 }, "Bingo": { req: ReqBingo, @@ -1288,13 +1298,13 @@ export interface ServiceType { res: ResFight_9 }, "qjzzd/Open": { - req: ReqOpen_47, - res: ResOpen_47 - }, - "rank/Open": { req: ReqOpen_48, res: ResOpen_48 }, + "rank/Open": { + req: ReqOpen_49, + res: ResOpen_49 + }, "shiwu/Concise": { req: ReqConcise, res: ResConcise @@ -1324,8 +1334,8 @@ export interface ServiceType { res: ResWear_2 }, "shootGame/Open": { - req: ReqOpen_49, - res: ResOpen_49 + req: ReqOpen_50, + res: ResOpen_50 }, "shootGame/Rec": { req: ReqRec_14, @@ -1336,8 +1346,8 @@ export interface ServiceType { res: ResBuy_6 }, "shop/Open": { - req: ReqOpen_50, - res: ResOpen_50 + req: ReqOpen_51, + res: ResOpen_51 }, "shop/Refresh": { req: ReqRefresh_6, @@ -1352,8 +1362,8 @@ export interface ServiceType { res: ResGetPrize_2 }, "sign/Open": { - req: ReqOpen_51, - res: ResOpen_51 + req: ReqOpen_52, + res: ResOpen_52 }, "slzd/Aim": { req: ReqAim, @@ -1376,8 +1386,8 @@ export interface ServiceType { res: ResMyRank }, "slzd/Open": { - req: ReqOpen_52, - res: ResOpen_52 + req: ReqOpen_53, + res: ResOpen_53 }, "slzd/OpenFort": { req: ReqOpenFort, @@ -1412,12 +1422,12 @@ export interface ServiceType { res: ResGuaJi }, "tanxian/Open": { - req: ReqOpen_53, - res: ResOpen_53 + req: ReqOpen_54, + res: ResOpen_54 }, "tanxian/Receive": { - req: ReqReceive_5, - res: ResReceive_5 + req: ReqReceive_6, + res: ResReceive_6 }, "task/AllFinsh": { req: ReqAllFinsh, @@ -1428,8 +1438,8 @@ export interface ServiceType { res: ResFinsh }, "task/Open": { - req: ReqOpen_54, - res: ResOpen_54 + req: ReqOpen_55, + res: ResOpen_55 }, "user/CDKEY": { req: ReqCDKEY, @@ -1492,8 +1502,8 @@ export interface ServiceType { res: ResExchange }, "weixiuchang/Open": { - req: ReqOpen_55, - res: ResOpen_55 + req: ReqOpen_56, + res: ResOpen_56 }, "weixiuchang/UpLv": { req: ReqUpLv, @@ -1536,8 +1546,8 @@ export interface ServiceType { res: ResJingCaiOpen }, "wzry/Open": { - req: ReqOpen_56, - res: ResOpen_56 + req: ReqOpen_57, + res: ResOpen_57 }, "wzry/UpdateFight": { req: ReqUpdateFight, @@ -1568,12 +1578,12 @@ export interface ServiceType { res: ResOnekeyReceive }, "xstask/Open": { - req: ReqOpen_57, - res: ResOpen_57 + req: ReqOpen_58, + res: ResOpen_58 }, "xstask/Receive": { - req: ReqReceive_6, - res: ResReceive_6 + req: ReqReceive_7, + res: ResReceive_7 }, "xstask/Refresh": { req: ReqRefresh_8, @@ -2115,116 +2125,126 @@ export const serviceProto: ServiceProto = { }, { "id": 96, - "name": "event/zixuanlibao/Buy", + "name": "event/zhoumolibao/Open", "type": "api" }, { "id": 97, - "name": "event/zixuanlibao/Open", + "name": "event/zhoumolibao/Receive", "type": "api" }, { "id": 98, - "name": "eventlist/hdGetList", + "name": "event/zixuanlibao/Buy", "type": "api" }, { "id": 99, - "name": "friend/Apply", + "name": "event/zixuanlibao/Open", "type": "api" }, { "id": 100, - "name": "friend/Del", + "name": "eventlist/hdGetList", "type": "api" }, { "id": 101, - "name": "friend/Gift", + "name": "friend/Apply", "type": "api" }, { "id": 102, - "name": "friend/List", + "name": "friend/Del", "type": "api" }, { "id": 103, - "name": "friend/Open", + "name": "friend/Gift", "type": "api" }, { "id": 104, - "name": "friend/Respond", + "name": "friend/List", "type": "api" }, { "id": 105, - "name": "friend/RmBlackList", + "name": "friend/Open", "type": "api" }, { "id": 106, - "name": "friend/Search", + "name": "friend/Respond", "type": "api" }, { "id": 107, - "name": "ganbutexun/Challenge", + "name": "friend/RmBlackList", "type": "api" }, { "id": 108, - "name": "ganbutexun/Open", + "name": "friend/Search", "type": "api" }, { "id": 109, - "name": "ganhai/Fast", + "name": "ganbutexun/Challenge", "type": "api" }, { "id": 110, - "name": "ganhai/Fight", + "name": "ganbutexun/Open", "type": "api" }, { "id": 111, - "name": "ganhai/Log", + "name": "ganhai/Fast", "type": "api" }, { "id": 112, - "name": "ganhai/Open", + "name": "ganhai/Fight", "type": "api" }, { "id": 113, - "name": "ganhai/Refresh", + "name": "ganhai/Log", "type": "api" }, { "id": 114, - "name": "ganhai/RefreshShip", + "name": "ganhai/Open", "type": "api" }, { "id": 115, - "name": "ganhai/Select", + "name": "ganhai/Refresh", "type": "api" }, { "id": 116, - "name": "gmapi/Gift", + "name": "ganhai/RefreshShip", "type": "api" }, { "id": 117, - "name": "gmapi/Post", + "name": "ganhai/Select", "type": "api" }, { "id": 118, + "name": "gmapi/Gift", + "type": "api" + }, + { + "id": 119, + "name": "gmapi/Post", + "type": "api" + }, + { + "id": 120, "name": "gonghui/Apply", "type": "api", "conf": { @@ -2234,7 +2254,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 119, + "id": 121, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2244,7 +2264,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 120, + "id": 122, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2254,7 +2274,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 121, + "id": 123, "name": "gonghui/Change", "type": "api", "conf": { @@ -2264,12 +2284,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 122, + "id": 124, "name": "gonghui/Create", "type": "api" }, { - "id": 123, + "id": 125, "name": "gonghui/Dissolve", "type": "api", "conf": { @@ -2279,7 +2299,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 124, + "id": 126, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2289,12 +2309,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 125, + "id": 127, "name": "gonghui/FbBuyNum", "type": "api" }, { - "id": 126, + "id": 128, "name": "gonghui/FbFight", "type": "api", "conf": { @@ -2304,7 +2324,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 127, + "id": 129, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2314,17 +2334,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 128, + "id": 130, "name": "gonghui/GetList", "type": "api" }, { - "id": 129, + "id": 131, "name": "gonghui/Join", "type": "api" }, { - "id": 130, + "id": 132, "name": "gonghui/Jx", "type": "api", "conf": { @@ -2334,7 +2354,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 131, + "id": 133, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2344,7 +2364,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 132, + "id": 134, "name": "gonghui/List", "type": "api", "conf": { @@ -2354,7 +2374,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 133, + "id": 135, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2364,7 +2384,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 134, + "id": 136, "name": "gonghui/Open", "type": "api", "conf": { @@ -2374,7 +2394,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 135, + "id": 137, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2384,7 +2404,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 136, + "id": 138, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2394,7 +2414,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 137, + "id": 139, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2404,7 +2424,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 138, + "id": 140, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2414,137 +2434,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 139, + "id": 141, "name": "gonghuibaozang/Lottery", "type": "api" }, { - "id": 140, + "id": 142, "name": "gonghuibaozang/Open", "type": "api" }, { - "id": 141, + "id": 143, "name": "gonglukuangbiao/Buy", "type": "api" }, { - "id": 142, + "id": 144, "name": "gonglukuangbiao/Fight", "type": "api" }, { - "id": 143, + "id": 145, "name": "gonglukuangbiao/Open", "type": "api" }, { - "id": 144, + "id": 146, "name": "gonglukuangbiao/Refresh", "type": "api" }, { - "id": 145, + "id": 147, "name": "gongyu/mingdao/Active", "type": "api" }, { - "id": 146, + "id": 148, "name": "gongyu/mingdao/Open", "type": "api" }, { - "id": 147, + "id": 149, "name": "gongyu/mingdao/RecPrize", "type": "api" }, { - "id": 148, + "id": 150, "name": "gongyu/mingdao/Repair", "type": "api" }, { - "id": 149, + "id": 151, "name": "gongyu/xunlianjihua/Reset", "type": "api" }, { - "id": 150, + "id": 152, "name": "gongyu/xunlianjihua/UpSkill", "type": "api" }, { - "id": 151, + "id": 153, "name": "gongyu/zuozhanjihua/SetSkill", "type": "api" }, { - "id": 152, + "id": 154, "name": "hbzb/jfs/BuyNum", "type": "api" }, { - "id": 153, + "id": 155, "name": "hbzb/jfs/Fight", "type": "api" }, { - "id": 154, + "id": 156, "name": "hbzb/jfs/GetLog", "type": "api" }, { - "id": 155, + "id": 157, "name": "hbzb/jfs/Open", "type": "api" }, { - "id": 156, + "id": 158, "name": "hbzb/jfs/Rec", "type": "api" }, { - "id": 157, + "id": 159, "name": "hbzb/jfs/Refresh", "type": "api" }, { - "id": 158, + "id": 160, "name": "hbzb/GetStatus", "type": "api" }, { - "id": 159, + "id": 161, "name": "hbzb/zbs/BuyNum", "type": "api" }, { - "id": 160, + "id": 162, "name": "hbzb/zbs/Fight", "type": "api" }, { - "id": 161, + "id": 163, "name": "hbzb/zbs/GetLog", "type": "api" }, { - "id": 162, + "id": 164, "name": "hbzb/zbs/Open", "type": "api" }, { - "id": 163, + "id": 165, "name": "hbzb/zbs/Refresh", "type": "api" }, { - "id": 164, + "id": 166, "name": "hero/Awake", "type": "api" }, { - "id": 165, + "id": 167, "name": "hero/ChangePos", "type": "api", "conf": { @@ -2552,17 +2572,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 166, + "id": 168, "name": "hero/GetList", "type": "api" }, { - "id": 167, + "id": 169, "name": "hero/JinJie", "type": "api" }, { - "id": 168, + "id": 170, "name": "hero/LvUp", "type": "api", "conf": { @@ -2570,32 +2590,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 169, + "id": 171, "name": "hero/Potency", "type": "api" }, { - "id": 170, + "id": 172, "name": "hero/Rec", "type": "api" }, { - "id": 171, + "id": 173, "name": "hero/Reset", "type": "api" }, { - "id": 172, + "id": 174, "name": "hero/Talent", "type": "api" }, { - "id": 173, + "id": 175, "name": "hero/WeaponUp", "type": "api" }, { - "id": 174, + "id": 176, "name": "hongdian/Get", "type": "api", "conf": { @@ -2603,117 +2623,117 @@ export const serviceProto: ServiceProto = { } }, { - "id": 175, + "id": 177, "name": "item/GetList", "type": "api" }, { - "id": 176, + "id": 178, "name": "item/Use", "type": "api" }, { - "id": 177, + "id": 179, "name": "jiaotang/Lottery", "type": "api" }, { - "id": 178, + "id": 180, "name": "jiaotang/Open", "type": "api" }, { - "id": 179, + "id": 181, "name": "jiuba/Lottery", "type": "api" }, { - "id": 180, + "id": 182, "name": "jiuba/Open", "type": "api" }, { - "id": 181, + "id": 183, "name": "jjc/BuyFightNum", "type": "api" }, { - "id": 182, + "id": 184, "name": "jjc/Fight", "type": "api" }, { - "id": 183, + "id": 185, "name": "jjc/FightLog", "type": "api" }, { - "id": 184, + "id": 186, "name": "jjc/Open", "type": "api" }, { - "id": 185, + "id": 187, "name": "jjc/Receive", "type": "api" }, { - "id": 186, + "id": 188, "name": "jjc/Refresh", "type": "api" }, { - "id": 187, + "id": 189, "name": "kaifujingsai/Open", "type": "api" }, { - "id": 188, + "id": 190, "name": "kaifujingsai/Receive", "type": "api" }, { - "id": 189, + "id": 191, "name": "kbzz/Apply", "type": "api" }, { - "id": 190, + "id": 192, "name": "kbzz/AutoApply", "type": "api" }, { - "id": 191, + "id": 193, "name": "kbzz/BuyNum", "type": "api" }, { - "id": 192, + "id": 194, "name": "kbzz/Fight", "type": "api" }, { - "id": 193, + "id": 195, "name": "kbzz/FightLog", "type": "api" }, { - "id": 194, + "id": 196, "name": "kbzz/GroupState", "type": "api" }, { - "id": 195, + "id": 197, "name": "kbzz/Open", "type": "api" }, { - "id": 196, + "id": 198, "name": "kbzz/RecPrize", "type": "api" }, { - "id": 197, + "id": 199, "name": "kbzz/Refresh", "type": "api", "conf": { @@ -2721,282 +2741,282 @@ export const serviceProto: ServiceProto = { } }, { - "id": 198, + "id": 200, "name": "kuangdong/AddPkNum", "type": "api" }, { - "id": 199, + "id": 201, "name": "kuangdong/GetPrize", "type": "api" }, { - "id": 200, + "id": 202, "name": "kuangdong/KdInfo", "type": "api" }, { - "id": 201, + "id": 203, "name": "kuangdong/Log", "type": "api" }, { - "id": 202, + "id": 204, "name": "kuangdong/Open", "type": "api" }, { - "id": 203, + "id": 205, "name": "kuangdong/YanShi", "type": "api" }, { - "id": 204, + "id": 206, "name": "kuangdong/ZhanLing", "type": "api" }, { - "id": 205, + "id": 207, "name": "lingzhulaixi/Open", "type": "api" }, { - "id": 206, + "id": 208, "name": "lingzhulaixi/PkBoss", "type": "api" }, { - "id": 207, + "id": 209, "name": "lingzhulaixi/PkRank", "type": "api" }, { - "id": 208, + "id": 210, "name": "lingzhulaixi/SaoDang", "type": "api" }, { - "id": 209, + "id": 211, "name": "meirishilian/Buy", "type": "api" }, { - "id": 210, + "id": 212, "name": "meirishilian/Fight", "type": "api" }, { - "id": 211, + "id": 213, "name": "meirishilian/Open", "type": "api" }, { - "id": 212, + "id": 214, "name": "msg_c2s/BindUid", "type": "msg" }, { - "id": 213, + "id": 215, "name": "msg_c2s/Pay", "type": "msg" }, { - "id": 214, + "id": 216, "name": "msg_c2s/Sync", "type": "msg" }, { - "id": 215, + "id": 217, "name": "msg_s2c/Chat", "type": "msg" }, { - "id": 216, + "id": 218, "name": "msg_s2c/ChatHelp", "type": "msg" }, { - "id": 217, + "id": 219, "name": "msg_s2c/Collection", "type": "msg" }, { - "id": 218, + "id": 220, "name": "msg_s2c/Email", "type": "msg" }, { - "id": 219, + "id": 221, "name": "msg_s2c/EmailDel", "type": "msg" }, { - "id": 220, + "id": 222, "name": "msg_s2c/EquipChange", "type": "msg" }, { - "id": 221, + "id": 223, "name": "msg_s2c/Friend", "type": "msg" }, { - "id": 222, + "id": 224, "name": "msg_s2c/GhChange", "type": "msg" }, { - "id": 223, + "id": 225, "name": "msg_s2c/GongHuiBaoZang", "type": "msg" }, { - "id": 224, + "id": 226, "name": "msg_s2c/HeroChange", "type": "msg" }, { - "id": 225, + "id": 227, "name": "msg_s2c/HongDianChange", "type": "msg" }, { - "id": 226, + "id": 228, "name": "msg_s2c/ItemChange", "type": "msg" }, { - "id": 227, + "id": 229, "name": "msg_s2c/LoginQueue", "type": "msg" }, { - "id": 228, + "id": 230, "name": "msg_s2c/LshdChange", "type": "msg" }, { - "id": 229, + "id": 231, "name": "msg_s2c/NewDay", "type": "msg" }, { - "id": 230, + "id": 232, "name": "msg_s2c/OtherLogin", "type": "msg" }, { - "id": 231, + "id": 233, "name": "msg_s2c/PayChange", "type": "msg" }, { - "id": 232, + "id": 234, "name": "msg_s2c/PayResult", "type": "msg" }, { - "id": 233, + "id": 235, "name": "msg_s2c/PeijianChange", "type": "msg" }, { - "id": 234, + "id": 236, "name": "msg_s2c/PlayerChange", "type": "msg" }, { - "id": 235, + "id": 237, "name": "msg_s2c/Private", "type": "msg" }, { - "id": 236, + "id": 238, "name": "msg_s2c/SendGift", "type": "msg" }, { - "id": 237, + "id": 239, "name": "msg_s2c/ShiwuChange", "type": "msg" }, { - "id": 238, + "id": 240, "name": "msg_s2c/TaskChange", "type": "msg" }, { - "id": 239, + "id": 241, "name": "msg_s2c/Xianshilibao", "type": "msg" }, { - "id": 240, + "id": 242, "name": "pata/Fight", "type": "api" }, { - "id": 241, + "id": 243, "name": "pata/GetPrize", "type": "api" }, { - "id": 242, + "id": 244, "name": "pata/Open", "type": "api" }, { - "id": 243, + "id": 245, "name": "pata/SaoDang", "type": "api" }, { - "id": 244, + "id": 246, "name": "pay/GetList", "type": "api" }, { - "id": 245, + "id": 247, "name": "peijian/GetList", "type": "api" }, { - "id": 246, + "id": 248, "name": "peijian/JingLian", "type": "api" }, { - "id": 247, + "id": 249, "name": "peijian/JinJie", "type": "api" }, { - "id": 248, + "id": 250, "name": "peijian/LvUp", "type": "api" }, { - "id": 249, + "id": 251, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 250, + "id": 252, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 251, + "id": 253, "name": "peijian/Reset", "type": "api" }, { - "id": 252, + "id": 254, "name": "peijian/Rm", "type": "api" }, { - "id": 253, + "id": 255, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3004,32 +3024,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 254, + "id": 256, "name": "peijian/UnLock", "type": "api" }, { - "id": 255, + "id": 257, "name": "peijian/Wear", "type": "api" }, { - "id": 256, + "id": 258, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 257, + "id": 259, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 258, + "id": 260, "name": "peijiancangku/Open", "type": "api" }, { - "id": 259, + "id": 261, "name": "Bingo", "type": "api", "conf": { @@ -3037,137 +3057,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 260, + "id": 262, "name": "FightTest", "type": "api" }, { - "id": 261, + "id": 263, "name": "SyncBtn", "type": "api" }, { - "id": 262, + "id": 264, "name": "Test", "type": "api" }, { - "id": 263, + "id": 265, "name": "qjzzd/Fight", "type": "api" }, { - "id": 264, + "id": 266, "name": "qjzzd/Open", "type": "api" }, { - "id": 265, + "id": 267, "name": "rank/Open", "type": "api" }, { - "id": 266, + "id": 268, "name": "shiwu/Concise", "type": "api" }, { - "id": 267, + "id": 269, "name": "shiwu/Extract", "type": "api" }, { - "id": 268, + "id": 270, "name": "shiwu/GetList", "type": "api" }, { - "id": 269, + "id": 271, "name": "shiwu/LvUp", "type": "api" }, { - "id": 270, + "id": 272, "name": "shiwu/Recast", "type": "api" }, { - "id": 271, + "id": 273, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 272, + "id": 274, "name": "shiwu/Wear", "type": "api" }, { - "id": 273, + "id": 275, "name": "shootGame/Open", "type": "api" }, { - "id": 274, + "id": 276, "name": "shootGame/Rec", "type": "api" }, { - "id": 275, + "id": 277, "name": "shop/Buy", "type": "api" }, { - "id": 276, + "id": 278, "name": "shop/Open", "type": "api" }, { - "id": 277, + "id": 279, "name": "shop/Refresh", "type": "api" }, { - "id": 278, + "id": 280, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 279, + "id": 281, "name": "sign/GetPrize", "type": "api" }, { - "id": 280, + "id": 282, "name": "sign/Open", "type": "api" }, { - "id": 281, + "id": 283, "name": "slzd/Aim", "type": "api" }, { - "id": 282, + "id": 284, "name": "slzd/BuyNum", "type": "api" }, { - "id": 283, + "id": 285, "name": "slzd/Fight", "type": "api" }, { - "id": 284, + "id": 286, "name": "slzd/FightLog", "type": "api" }, { - "id": 285, + "id": 287, "name": "slzd/MyRank", "type": "api" }, { - "id": 286, + "id": 288, "name": "slzd/Open", "type": "api", "conf": { @@ -3177,77 +3197,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 287, + "id": 289, "name": "slzd/OpenFort", "type": "api" }, { - "id": 288, + "id": 290, "name": "slzd/Rec", "type": "api" }, { - "id": 289, + "id": 291, "name": "slzd/Refresh", "type": "api" }, { - "id": 290, + "id": 292, "name": "slzd/Slot", "type": "api" }, { - "id": 291, + "id": 293, "name": "tanxian/Event", "type": "api" }, { - "id": 292, + "id": 294, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 293, + "id": 295, "name": "tanxian/Fight", "type": "api" }, { - "id": 294, + "id": 296, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 295, + "id": 297, "name": "tanxian/Open", "type": "api" }, { - "id": 296, + "id": 298, "name": "tanxian/Receive", "type": "api" }, { - "id": 297, + "id": 299, "name": "task/AllFinsh", "type": "api" }, { - "id": 298, + "id": 300, "name": "task/Finsh", "type": "api" }, { - "id": 299, + "id": 301, "name": "task/Open", "type": "api" }, { - "id": 300, + "id": 302, "name": "user/CDKEY", "type": "api" }, { - "id": 301, + "id": 303, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3255,197 +3275,197 @@ export const serviceProto: ServiceProto = { } }, { - "id": 302, + "id": 304, "name": "user/ChangeName", "type": "api" }, { - "id": 303, + "id": 305, "name": "user/Fight", "type": "api" }, { - "id": 304, + "id": 306, "name": "user/GetInfo", "type": "api" }, { - "id": 305, + "id": 307, "name": "user/InfoOpen", "type": "api" }, { - "id": 306, + "id": 308, "name": "user/Login", "type": "api" }, { - "id": 307, + "id": 309, "name": "user/Ping", "type": "api" }, { - "id": 308, + "id": 310, "name": "user/Renown", "type": "api" }, { - "id": 309, + "id": 311, "name": "user/RenownBuy", "type": "api" }, { - "id": 310, + "id": 312, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 311, + "id": 313, "name": "user/RenownOpen", "type": "api" }, { - "id": 312, + "id": 314, "name": "user/Tujian", "type": "api" }, { - "id": 313, + "id": 315, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 314, + "id": 316, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 315, + "id": 317, "name": "weixiuchang/Open", "type": "api" }, { - "id": 316, + "id": 318, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 317, + "id": 319, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 318, + "id": 320, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 319, + "id": 321, "name": "wzry/BaoMing", "type": "api" }, { - "id": 320, + "id": 322, "name": "wzry/catFightLog", "type": "api" }, { - "id": 321, + "id": 323, "name": "wzry/CatGroup", "type": "api" }, { - "id": 322, + "id": 324, "name": "wzry/DldFight", "type": "api" }, { - "id": 323, + "id": 325, "name": "wzry/DldRefre", "type": "api" }, { - "id": 324, + "id": 326, "name": "wzry/JingCai", "type": "api" }, { - "id": 325, + "id": 327, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 326, + "id": 328, "name": "wzry/Open", "type": "api" }, { - "id": 327, + "id": 329, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 328, + "id": 330, "name": "wzry/Wzzd", "type": "api" }, { - "id": 329, + "id": 331, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 330, + "id": 332, "name": "xstask/AllGet", "type": "api" }, { - "id": 331, + "id": 333, "name": "xstask/Get", "type": "api" }, { - "id": 332, + "id": 334, "name": "xstask/LvUp", "type": "api" }, { - "id": 333, + "id": 335, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 334, + "id": 336, "name": "xstask/Open", "type": "api" }, { - "id": 335, + "id": 337, "name": "xstask/Receive", "type": "api" }, { - "id": 336, + "id": 338, "name": "xstask/Refresh", "type": "api" }, { - "id": 337, + "id": 339, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 338, + "id": 340, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 339, + "id": 341, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 340, + "id": 342, "name": "zhanqianbushu/Up", "type": "api" } @@ -11191,6 +11211,55 @@ export const serviceProto: ServiceProto = { } ] }, + "event/zhoumolibao/PtlOpen/ReqOpen": { + "type": "Interface" + }, + "event/zhoumolibao/PtlOpen/ResOpen": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "record", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Number" + } + } + } + }, + { + "id": 1, + "name": "buyLog", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Number" + } + } + } + } + ] + }, + "event/zhoumolibao/PtlReceive/ReqReceive": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "id", + "type": { + "type": "String" + } + } + ] + }, + "event/zhoumolibao/PtlReceive/ResReceive": { + "type": "Interface" + }, "event/zixuanlibao/PtlBuy/ReqBuy": { "type": "Interface", "properties": [ From afb925bc402eb611e712f7e9ff1ae9d7901bc48d Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 14 Dec 2023 14:01:18 +0800 Subject: [PATCH 04/29] proto --- src/shared/protocols/event/zhoumolibao/PtlOpen.ts | 4 ++-- src/shared/protocols/serviceProto.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/shared/protocols/event/zhoumolibao/PtlOpen.ts b/src/shared/protocols/event/zhoumolibao/PtlOpen.ts index d2afe16..a6b1132 100644 --- a/src/shared/protocols/event/zhoumolibao/PtlOpen.ts +++ b/src/shared/protocols/event/zhoumolibao/PtlOpen.ts @@ -8,9 +8,9 @@ export type ReqOpen = { export type ResOpen = { record:{ - [k: string]: number; + [k: string]: any; } buyLog:{ - [k: string]: number; + [k: string]: any; } }; \ No newline at end of file diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index f06e602..c7e31ea 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -11225,7 +11225,7 @@ export const serviceProto: ServiceProto = { "indexSignature": { "keyType": "String", "type": { - "type": "Number" + "type": "Any" } } } @@ -11238,7 +11238,7 @@ export const serviceProto: ServiceProto = { "indexSignature": { "keyType": "String", "type": { - "type": "Number" + "type": "Any" } } } From 6aadb030c5eae4b8a27ea6b2022dbf053030f9d9 Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 14 Dec 2023 15:34:32 +0800 Subject: [PATCH 05/29] =?UTF-8?q?=E5=91=A8=E6=9C=AB=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/zhoumolibao/ApiOpen.ts | 23 +++++++++++++++++++++ src/api_s2c/event/zhoumolibao/ApiReceive.ts | 6 +++--- src/module/collection_event.ts | 2 +- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/api_s2c/event/zhoumolibao/ApiOpen.ts b/src/api_s2c/event/zhoumolibao/ApiOpen.ts index 0f52475..bb4a2f6 100644 --- a/src/api_s2c/event/zhoumolibao/ApiOpen.ts +++ b/src/api_s2c/event/zhoumolibao/ApiOpen.ts @@ -2,6 +2,7 @@ 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) { @@ -18,3 +19,25 @@ export default async function (call: ApiCall) { }) } + +export async function checkResetBuyLog(call: ApiCall) { + let zeroTime = PublicShared.getToDayZeroTime() + + + let data = await G.mongodb.cEvent('zhoumolibao').findOne({uid: call.uid, type: 'zhoumolibao'}) + if (data.refreshTime && data.refreshTime > zeroTime) return + + G.mongodb.cEvent(`zhoumolibao`).updateOne( + {uid: call.uid, type: `zhoumolibao`}, + {$set: {record: {}}}, + {upsert: true} + ) + + let _hd = (await HuoDongFun.gethdList(call, 9))[0] + let payIds = _hd?.data?.gift?.filter(i => i.payId)?.map(i => i.payId) + let payLogs = await PayFun.getPayLogs(call.uid, payIds) + let payLogLength = R.values(payLogs).filter(i => i.time < zeroTime).length + if (payLogLength) { + PayFun.delPayLog(call.uid, payIds.map(i => ({payId: i}))) + } +} \ No newline at end of file diff --git a/src/api_s2c/event/zhoumolibao/ApiReceive.ts b/src/api_s2c/event/zhoumolibao/ApiReceive.ts index b7bc39b..3a295e4 100644 --- a/src/api_s2c/event/zhoumolibao/ApiReceive.ts +++ b/src/api_s2c/event/zhoumolibao/ApiReceive.ts @@ -11,13 +11,13 @@ export default async function (call: ApiCall) { // 取奖励列表，判断是否有可领取奖励 let data = await G.mongodb.cEvent('zhoumolibao').findOne({uid: call.uid, type: 'zhoumolibao'}) - let rec = data.record[call.req.id] - if (rec && rec >= gift?.buyNum) return call.errorCode(-2) + let rec = data?.record?.[call.req.id] + // if (rec && rec >= gift?.buyNum) return call.errorCode(-2) await PlayerFun.sendPrize(call, gift.prize); await G.mongodb.cEvent('zhoumolibao').updateOne({uid: call.uid, type: 'zhoumolibao'}, { - $inc: {[`record.${gift.id}`]: 1} + $inc: {[`record.${gift.id}`]: 1}, },{ upsert: true }) call.succ({}) diff --git a/src/module/collection_event.ts b/src/module/collection_event.ts index adb648b..e1eeef3 100644 --- a/src/module/collection_event.ts +++ b/src/module/collection_event.ts @@ -47,7 +47,7 @@ export type eventType = { qirichongzhi: Omit; jierihuodong: Omit & { refreshTime: number; }; kaifujingsai: ResOpenKaifujingsai; - zhoumolibao: ResOpenZhoumolibao; + zhoumolibao: ResOpenZhoumolibao & { refreshTime: number; } } & { [k: `${number}jijin`]: ResOpenYuedujijin; [k: `yangchengmubiao${number}`]: yangchengmubiao; From 1d02f22df834224c6a56d0089331030f542b48b1 Mon Sep 17 00:00:00 2001 From: ciniao <4041990@qq.com> Date: Thu, 14 Dec 2023 16:07:36 +0800 Subject: [PATCH 06/29] =?UTF-8?q?fix=E8=AF=AD=E8=A8=80=E5=8C=85=E4=B8=BAnu?= =?UTF-8?q?ll?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/setWs.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/setWs.ts b/src/setWs.ts index 801cff4..3a97c54 100644 --- a/src/setWs.ts +++ b/src/setWs.ts @@ -121,7 +121,7 @@ function setWs(server: WsServer) { //判断是否登录 if (!['user/Ping', 'user/Login'].includes(call.service.name) && !call.conn.uid) { - call.error(globalThis.lng.qingxiandenglu); + call.error("qingxiandenglu"); return null; } From 61827c52d49d7105bd28c328d96fe95b4a37960a Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 14 Dec 2023 17:01:39 +0800 Subject: [PATCH 07/29] =?UTF-8?q?=E5=91=A8=E6=9C=AB=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/zhoumolibao/ApiOpen.ts | 32 ++++++++++++++------- src/api_s2c/event/zhoumolibao/ApiReceive.ts | 2 +- src/globalListener.ts | 6 +++- src/public/pay.ts | 8 +++++- 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/src/api_s2c/event/zhoumolibao/ApiOpen.ts b/src/api_s2c/event/zhoumolibao/ApiOpen.ts index bb4a2f6..2a5bdbd 100644 --- a/src/api_s2c/event/zhoumolibao/ApiOpen.ts +++ b/src/api_s2c/event/zhoumolibao/ApiOpen.ts @@ -12,6 +12,8 @@ export default async function (call: ApiCall) { let _hd = (await HuoDongFun.gethdList(call, 9))[0] let payIds = _hd?.data?.gift?.filter(i => i.payId)?.map(i => i.payId) + await checkResetBuyLog(call) + await getConf(call) call.succ({ record: data?.record || {}, @@ -20,24 +22,32 @@ export default async function (call: ApiCall) { } -export async function checkResetBuyLog(call: ApiCall) { +export async function getConf(call, args?: { id?: string; payId?: string }) { + let _hd = (await HuoDongFun.gethdList(call, 9))[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) return + if (data.refreshTime && data.refreshTime <= zeroTime) { + G.mongodb.cEvent(`zhoumolibao`).updateOne( + {uid: call.uid, type: `zhoumolibao`}, + {$set: {record: {}}}, + {upsert: true} + ) + } - G.mongodb.cEvent(`zhoumolibao`).updateOne( - {uid: call.uid, type: `zhoumolibao`}, - {$set: {record: {}}}, - {upsert: true} - ) + let gifts = await getConf(call) - let _hd = (await HuoDongFun.gethdList(call, 9))[0] - let payIds = _hd?.data?.gift?.filter(i => i.payId)?.map(i => i.payId) + let payIds = gifts.filter(i => i.payId)?.map(i => i.payId) let payLogs = await PayFun.getPayLogs(call.uid, payIds) let payLogLength = R.values(payLogs).filter(i => i.time < zeroTime).length if (payLogLength) { - PayFun.delPayLog(call.uid, payIds.map(i => ({payId: i}))) + PayFun.delPayLog(call.uid, payIds.map(i => ({payId: i, val: []}))) } } \ No newline at end of file diff --git a/src/api_s2c/event/zhoumolibao/ApiReceive.ts b/src/api_s2c/event/zhoumolibao/ApiReceive.ts index 3a295e4..5a7c528 100644 --- a/src/api_s2c/event/zhoumolibao/ApiReceive.ts +++ b/src/api_s2c/event/zhoumolibao/ApiReceive.ts @@ -12,7 +12,7 @@ export default async function (call: ApiCall) { // 取奖励列表，判断是否有可领取奖励 let data = await G.mongodb.cEvent('zhoumolibao').findOne({uid: call.uid, type: 'zhoumolibao'}) let rec = data?.record?.[call.req.id] - // if (rec && rec >= gift?.buyNum) return call.errorCode(-2) + if (rec && rec >= gift?.buyNum) return call.errorCode(-2) await PlayerFun.sendPrize(call, gift.prize); diff --git a/src/globalListener.ts b/src/globalListener.ts index 4c51904..1db7530 100644 --- a/src/globalListener.ts +++ b/src/globalListener.ts @@ -15,6 +15,7 @@ import { ZhanLingTasks } from './public/zhanling'; import { player } from './shared/protocols/user/type'; import { PublicShared } from './shared/public/public'; import { setGud } from './public/gud'; +import {checkResetBuyLog} from "./api_s2c/event/zhoumolibao/ApiOpen"; export type gEventType = { /**玩家断开连接 */ @@ -201,15 +202,18 @@ export function addListener() { ActionLog.addRetainLog(gud.uid, { key: 'login_day', val: 1 }); ZhanLingTasks.clearLog(gud.uid, 'day'); PayFun.checkGiftDayEmail(gud, lastTime, curTime); + reissuePrize(gud, lastTime, curTime); addDay(gud); // 任务累计登录天数 let call = PayFun.getCall(gud); + G.emit("Class_task_135", 'Class_task_135', call, 1, 0); // 七日登录活动计数 qiRiDengLuAddDay(call); - + // 周末礼包检测刷新 + checkResetBuyLog(call) }); G.on('API_CALL', node => { diff --git a/src/public/pay.ts b/src/public/pay.ts index d7adaeb..aab3b30 100644 --- a/src/public/pay.ts +++ b/src/public/pay.ts @@ -9,6 +9,7 @@ import {HuoDongFun} from './huodongfun'; import {call, PlayerFun} from './player'; import {number} from "mathjs"; import {getGud} from './gud'; +import {getConf as zmlbGetConf} from '../api_s2c/event/zhoumolibao/ApiOpen'; async function checkPayIsActive(payId: string, logs: payLog[], payArgs) { let conf: any = await this.getConf(payId, payArgs); @@ -367,7 +368,12 @@ export class PayFun { buyLog = await this.getPayLog(player.uid, '136Gift1'); if (buyLog.slice(-1)[0]?.eTime > G.time) return G.server.sendMsgByUid(player.uid, 'msg_s2c/PayResult', {code: -3}); } - + if (payId.indexOf('wkdlibao') != -1) { + let call = this.getCall(player) + let conf = await zmlbGetConf(call, {payId}) + buyLog = await this.getPayLog(player.uid, payId); + if (buyLog.length && buyLog.length >= conf.buyNum) return G.server.sendMsgByUid(player.uid, 'msg_s2c/PayResult', {code: -1}); + } } if (G.config.debug) { From 4f6297fc7a3cbb1e133c8212b906da9fdbf18375 Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 14 Dec 2023 17:16:36 +0800 Subject: [PATCH 08/29] =?UTF-8?q?=E5=91=A8=E6=9C=AB=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E8=A1=A5=E9=92=BB=E7=9F=B3=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/zhoumolibao/ApiReceive.ts | 1 - src/public/pay.ts | 24 ++++++++++++++------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/api_s2c/event/zhoumolibao/ApiReceive.ts b/src/api_s2c/event/zhoumolibao/ApiReceive.ts index 5a7c528..f9ded9e 100644 --- a/src/api_s2c/event/zhoumolibao/ApiReceive.ts +++ b/src/api_s2c/event/zhoumolibao/ApiReceive.ts @@ -21,5 +21,4 @@ export default async function (call: ApiCall) { },{ upsert: true }) call.succ({}) - } diff --git a/src/public/pay.ts b/src/public/pay.ts index aab3b30..dc5bda5 100644 --- a/src/public/pay.ts +++ b/src/public/pay.ts @@ -177,13 +177,6 @@ export class PayFun { let conf: any = await this.getConf(payId, payArgs); - let isReplaceConf = await this.checkBuysAfterPay(uid, payId, conf, payArgs) - if (isReplaceConf) { - let prizePayId = `zuanshi_${conf.money}` - payArgs.toPrizePayId = prizePayId - conf = this.replacePrizeToChongzhi(prizePayId, conf) - } - let prize = [...conf.prize]; //let player = await G.redis.get('user', uid); let player = await getGud(uid); @@ -226,6 +219,22 @@ export class PayFun { } }); } + + if (payId.indexOf('wkdlibao') != -1) { + let call = this.getCall(player) + let conf = await zmlbGetConf(call, {payId}) + prize.push(...conf.prize) + } + + let isReplaceConf = await this.checkBuysAfterPay(uid, payId, conf, payArgs) + if (isReplaceConf) { + let prizePayId = `zuanshi_${conf.money}` + payArgs.toPrizePayId = prizePayId + conf = this.replacePrizeToChongzhi(prizePayId, conf) + prize = [...conf.prize] + } + + await PlayerFun.sendPrize(call, prize); await PlayerFun.addAttr(call, conf.payExp); if (payId == 'G123SendGift') { @@ -371,7 +380,6 @@ export class PayFun { if (payId.indexOf('wkdlibao') != -1) { let call = this.getCall(player) let conf = await zmlbGetConf(call, {payId}) - buyLog = await this.getPayLog(player.uid, payId); if (buyLog.length && buyLog.length >= conf.buyNum) return G.server.sendMsgByUid(player.uid, 'msg_s2c/PayResult', {code: -1}); } } From 79f17aa48ff75dd35b990e7d4819a262285582e7 Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 14 Dec 2023 17:53:52 +0800 Subject: [PATCH 09/29] =?UTF-8?q?=E5=91=A8=E6=9C=AB=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/zhoumolibao/ApiOpen.ts | 2 -- src/public/pay.ts | 8 ++++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/api_s2c/event/zhoumolibao/ApiOpen.ts b/src/api_s2c/event/zhoumolibao/ApiOpen.ts index 2a5bdbd..7bed3a6 100644 --- a/src/api_s2c/event/zhoumolibao/ApiOpen.ts +++ b/src/api_s2c/event/zhoumolibao/ApiOpen.ts @@ -12,8 +12,6 @@ export default async function (call: ApiCall) { let _hd = (await HuoDongFun.gethdList(call, 9))[0] let payIds = _hd?.data?.gift?.filter(i => i.payId)?.map(i => i.payId) - await checkResetBuyLog(call) - await getConf(call) call.succ({ record: data?.record || {}, diff --git a/src/public/pay.ts b/src/public/pay.ts index dc5bda5..8c48aa5 100644 --- a/src/public/pay.ts +++ b/src/public/pay.ts @@ -99,7 +99,7 @@ export class PayFun { }).toArray(); if (payIds?.length) { - return Object.fromEntries(payIds.map(id => [id, logs[id] || []])); + return Object.fromEntries(payIds.map(id => [id, logs.find(i => i.key == id)?.values || []])); } let allLogs = {} logs.map(i => allLogs[i.key] = i.values) @@ -372,7 +372,11 @@ export class PayFun { } if (conf.buys > 0 && buyLog.length >= conf.buys) return G.server.sendMsgByUid(player.uid, 'msg_s2c/PayResult', {code: -1}); - if (conf.time != -1 && buyLog.slice(-1)[0]?.eTime > G.time && conf.buys == 0) return G.server.sendMsgByUid(player.uid, 'msg_s2c/PayResult', {code: -2}); + + // todo 没看懂这个判断针对什么支付，不支持周末礼包这个类型的限购，所以加上判断：payId.indexOf('wkdlibao') == -1 + if (conf.time != -1 && buyLog.slice(-1)[0]?.eTime > G.time && conf.buys == 0 && payId.indexOf('wkdlibao') == -1) { + return G.server.sendMsgByUid(player.uid, 'msg_s2c/PayResult', {code: -2}); + } if (payId.indexOf('136Gift') != -1 && payId != '136Gift1') { buyLog = await this.getPayLog(player.uid, '136Gift1'); if (buyLog.slice(-1)[0]?.eTime > G.time) return G.server.sendMsgByUid(player.uid, 'msg_s2c/PayResult', {code: -3}); From 8b15048d0fcf6bee25b1681d62dbce5ab6a6c834 Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 14 Dec 2023 18:52:17 +0800 Subject: [PATCH 10/29] =?UTF-8?q?=E5=91=A8=E6=9C=AB=E7=A4=BC=E5=8C=85?= =?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/event/zhoumolibao/ApiReceive.ts | 5 ++- src/api_s2c/hongdian/ApiGet.ts | 45 +++++++++++--------- src/api_s2c/hongdian/fun.ts | 29 +++++++++---- src/shared/protocols/hongdian/PtlGet.ts | 47 ++++++++++++++++++--- src/shared/protocols/serviceProto.ts | 7 +++ 5 files changed, 97 insertions(+), 36 deletions(-) diff --git a/src/api_s2c/event/zhoumolibao/ApiReceive.ts b/src/api_s2c/event/zhoumolibao/ApiReceive.ts index f9ded9e..895443e 100644 --- a/src/api_s2c/event/zhoumolibao/ApiReceive.ts +++ b/src/api_s2c/event/zhoumolibao/ApiReceive.ts @@ -2,6 +2,7 @@ import {ApiCall} from "tsrpc"; import {ReqReceive, ResReceive} from "../../../shared/protocols/event/zhoumolibao/PtlReceive"; import {HuoDongFun} from "../../../public/huodongfun"; import {PlayerFun} from "../../../public/player"; +import {HongDianChange} from "../../hongdian/fun"; export default async function (call: ApiCall) { // 查询活动是否有当前领奖的免费选项 @@ -18,7 +19,9 @@ export default async function (call: ApiCall) { await G.mongodb.cEvent('zhoumolibao').updateOne({uid: call.uid, type: 'zhoumolibao'}, { $inc: {[`record.${gift.id}`]: 1}, - },{ upsert: true }) + }, {upsert: true}) call.succ({}) + + HongDianChange.sendChangeKey(call.uid, ['zhoumolibao']); } diff --git a/src/api_s2c/hongdian/ApiGet.ts b/src/api_s2c/hongdian/ApiGet.ts index efdbe0e..57898d1 100644 --- a/src/api_s2c/hongdian/ApiGet.ts +++ b/src/api_s2c/hongdian/ApiGet.ts @@ -1,25 +1,25 @@ -import { ApiCall } from "tsrpc"; -import { DiXiaQianZhuangFun } from "../../public/dixiaqianzhuang"; -import { DxltFun } from "../../public/dxlt"; -import { GongHuiFun } from "../../public/gonghui/gonghui"; -import { JJCFun } from "../../public/jjc"; -import { KuangDongfun } from "../../public/kuangdong"; -import { LingZhuLaiXifun } from "../../public/lingzhulaixi"; -import { SignFun } from "../../public/sign"; -import { TaskFun } from "../../public/task"; -import { WangZheRongYaofun } from "../../public/wzry"; -import { XstaskFun } from "../../public/xstask"; -import { ReqGet, ResGet, hongdianKey } from "../../shared/protocols/hongdian/PtlGet"; -import { PublicShared } from '../../shared/public/public'; -import { getShouChongRedPoint } from '../event/shouchong/ApiReceive'; -import { md_redPoint } from '../gongyu/mingdao/ApiOpen'; -import { HongDianFun, HuoDongHongDianFun } from "./fun"; -import { FunWeiXiuChang } from "../../public/weixiuchang"; +import {ApiCall} from "tsrpc"; +import {DiXiaQianZhuangFun} from "../../public/dixiaqianzhuang"; +import {DxltFun} from "../../public/dxlt"; +import {GongHuiFun} from "../../public/gonghui/gonghui"; +import {JJCFun} from "../../public/jjc"; +import {KuangDongfun} from "../../public/kuangdong"; +import {LingZhuLaiXifun} from "../../public/lingzhulaixi"; +import {SignFun} from "../../public/sign"; +import {TaskFun} from "../../public/task"; +import {WangZheRongYaofun} from "../../public/wzry"; +import {XstaskFun} from "../../public/xstask"; +import {ReqGet, ResGet, hongdianKey} from "../../shared/protocols/hongdian/PtlGet"; +import {PublicShared} from '../../shared/public/public'; +import {getShouChongRedPoint} from '../event/shouchong/ApiReceive'; +import {md_redPoint} from '../gongyu/mingdao/ApiOpen'; +import {HongDianFun, HuoDongHongDianFun} from "./fun"; +import {FunWeiXiuChang} from "../../public/weixiuchang"; 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']; + 'heishihd', 'huodonghd', 'renown', 'weixiuchang', 'kaifujingsai', 'zhoumolibao']; export default async function (call: ApiCall) { @@ -28,13 +28,13 @@ export default async function (call: ApiCall) { let toDayZeroTime = PublicShared.getToDayZeroTime(); //正常跑完引导的等级 - if(call.conn.gud.lv >= 7){ + if (call.conn.gud.lv >= 7) { for (let key of keys) { switch (key) { case 'jiuba': case 'jiaotang': - let db = await G.mongodb.collection('playerInfo', key).findOne({ uid: call.uid, type: key }); - res[key] = { show: (!db || toDayZeroTime >= db.freeTime) ? true : false }; + let db = await G.mongodb.collection('playerInfo', key).findOne({uid: call.uid, type: key}); + res[key] = {show: (!db || toDayZeroTime >= db.freeTime) ? true : false}; break; case 'shouchong': res[key] = await getShouChongRedPoint(call); @@ -160,6 +160,9 @@ export default async function (call: ApiCall) { case 'kaifujingsai': res[key] = await HongDianFun.kaifujingsai(call); break; + case 'zhoumolibao': + res[key] = await HongDianFun.zhoumolibao(call); + break; } } } diff --git a/src/api_s2c/hongdian/fun.ts b/src/api_s2c/hongdian/fun.ts index cfd992e..867eb16 100644 --- a/src/api_s2c/hongdian/fun.ts +++ b/src/api_s2c/hongdian/fun.ts @@ -20,7 +20,7 @@ import {PlayerFun} from "../../public/player"; import kfjsFun from "../../public/kaifujingsai"; import {RankKfjs} from "../../public/rank/rank_kfjs"; import {ShopFun} from "../../public/shop"; -import { Christmasfun } from '../event/christmas/fun'; +import {Christmasfun} from '../event/christmas/fun'; export class HongDianFun { /**黑榜争霸红点 */ @@ -301,6 +301,18 @@ export class HongDianFun { return {show: true, val: canGet} } + /**周末礼包 */ + static async zhoumolibao(call: ApiCall): Promise { + let _hd = (await HuoDongFun.gethdList(call, 9))[0] + let gift = _hd?.data?.gift?.find(i => i.free) + if (!gift) return {show: false} + + let data = await G.mongodb.cEvent('zhoumolibao').findOne({uid: call.uid, type: 'zhoumolibao'}) + let rec = data?.record?.[gift.id] + if (rec && rec >= gift?.buyNum) return {show: false} + return {show: true} + } + } @@ -708,10 +720,11 @@ export class HuoDongHongDianFun { if (_buyNum < _tmp.buynum) { _res.show = true; return _res; - }} + } + } let _diff = PublicShared.getDiff(stime) // 循环判断是否有可以领取的 - for(let i = 0; i < _diff; i++) { + for (let i = 0; i < _diff; i++) { if (_mydata.qiandao.includes(i)) continue _res.show = true; return _res; @@ -724,15 +737,15 @@ export class HuoDongHongDianFun { return _res; } let zhanling = _hdCon.zhanling - for (let indexzhanling = 0; indexzhanling < zhanling.length; indexzhanling++){ - if (!_mydata.pt.includes(indexzhanling)){ + for (let indexzhanling = 0; indexzhanling < zhanling.length; indexzhanling++) { + if (!_mydata.pt.includes(indexzhanling)) { _res.show = true; return _res; } - if (_mydata.pay && !_mydata.gj.includes(indexzhanling)){ - _res.show = true; + if (_mydata.pay && !_mydata.gj.includes(indexzhanling)) { + _res.show = true; return _res; - } + } } return _res; diff --git a/src/shared/protocols/hongdian/PtlGet.ts b/src/shared/protocols/hongdian/PtlGet.ts index 0265b2c..e09f771 100644 --- a/src/shared/protocols/hongdian/PtlGet.ts +++ b/src/shared/protocols/hongdian/PtlGet.ts @@ -1,5 +1,3 @@ - - /** * 获取红点 */ @@ -13,10 +11,47 @@ export const conf = { timeIntervalLimit: 0 }; -export type hongdianKey = 'jiuba' | 'jiaotang' | 'shouchong' | 'dixiaqianzhuanghd' | 'taskhd' | 'xstaskhd' | 'gonghuihd' | 'jjchd' | 'hbzbhd' | - 'clslhd' | 'lingzhulaixihd' | 'dxlthd' | 'wzcjhd' | 'slzdhd' | 'qjzzdhd' | 'kuangdonghd' | 'qiandaohd' | 'kaifukuanghuanhd' | 'jijinhd' | 'zhuishalinghd' | - 'yibaichouhd' | 'huobanzhaomuhd' | 'qirileichonghd' | 'jierihd' | 'kbzzhd' | 'wzryhd' | 'yuedujijin' | 'patahd' | - 'mingdao' | 'heishihd' |'jitianhaoli'| 'huodonghd' | 'renown' | 'heishiMrjx' | 'weixiuchang' | 'kaifujingsai'; +export type hongdianKey = + 'jiuba' + | 'jiaotang' + | 'shouchong' + | 'dixiaqianzhuanghd' + | 'taskhd' + | 'xstaskhd' + | 'gonghuihd' + | 'jjchd' + | 'hbzbhd' + | + 'clslhd' + | 'lingzhulaixihd' + | 'dxlthd' + | 'wzcjhd' + | 'slzdhd' + | 'qjzzdhd' + | 'kuangdonghd' + | 'qiandaohd' + | 'kaifukuanghuanhd' + | 'jijinhd' + | 'zhuishalinghd' + | + 'yibaichouhd' + | 'huobanzhaomuhd' + | 'qirileichonghd' + | 'jierihd' + | 'kbzzhd' + | 'wzryhd' + | 'yuedujijin' + | 'patahd' + | + 'mingdao' + | 'heishihd' + | 'jitianhaoli' + | 'huodonghd' + | 'renown' + | 'heishiMrjx' + | 'weixiuchang' + | 'kaifujingsai' + | 'zhoumolibao'; export type hongdianVal = { diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index c7e31ea..2a772fe 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -14887,6 +14887,13 @@ export const serviceProto: ServiceProto = { "type": "Literal", "literal": "kaifujingsai" } + }, + { + "id": 36, + "type": { + "type": "Literal", + "literal": "zhoumolibao" + } } ] }, From 938d881ce3c4f313b00ef69e8321f7b8e723af1f Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 09:55:18 +0800 Subject: [PATCH 11/29] fix bug --- src/api_s2c/event/zhoumolibao/ApiOpen.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/api_s2c/event/zhoumolibao/ApiOpen.ts b/src/api_s2c/event/zhoumolibao/ApiOpen.ts index 7bed3a6..ebbcce3 100644 --- a/src/api_s2c/event/zhoumolibao/ApiOpen.ts +++ b/src/api_s2c/event/zhoumolibao/ApiOpen.ts @@ -17,7 +17,6 @@ export default async function (call: ApiCall) { record: data?.record || {}, buyLog: await PayFun.getPayLogs(call.uid, payIds) }) - } export async function getConf(call, args?: { id?: string; payId?: string }) { @@ -32,7 +31,7 @@ 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) { + if (data?.refreshTime <= zeroTime) { G.mongodb.cEvent(`zhoumolibao`).updateOne( {uid: call.uid, type: `zhoumolibao`}, {$set: {record: {}}}, From eee802594db83fae4ebfb40645b564e0b9386aa6 Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 14 Dec 2023 19:42:03 +0800 Subject: [PATCH 12/29] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/module/collection_pushgift.ts | 13 + src/shared/protocols/pushgift/PtlOpen.ts | 5 + src/shared/protocols/serviceProto.ts | 305 +++++++++++++++-------- 3 files changed, 213 insertions(+), 110 deletions(-) create mode 100644 src/module/collection_pushgift.ts create mode 100644 src/shared/protocols/pushgift/PtlOpen.ts 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/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[] } diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 2a772fe..6ce1b25 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -264,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'; @@ -274,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_14, ResRec as ResRec_14 } 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_15, ResRec as ResRec_15 } from './slzd/PtlRec'; import { ReqRefresh as ReqRefresh_7, ResRefresh as ResRefresh_7 } from './slzd/PtlRefresh'; @@ -296,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'; @@ -316,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'; @@ -327,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'; @@ -335,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'; @@ -1293,18 +1294,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 @@ -1334,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_14, @@ -1346,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, @@ -1362,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, @@ -1386,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, @@ -1422,8 +1427,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, @@ -1438,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, @@ -1502,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, @@ -1546,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, @@ -1578,8 +1583,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, @@ -3073,121 +3078,126 @@ export const serviceProto: ServiceProto = { }, { "id": 265, - "name": "qjzzd/Fight", + "name": "pushgift/Open", "type": "api" }, { "id": 266, - "name": "qjzzd/Open", + "name": "qjzzd/Fight", "type": "api" }, { "id": 267, - "name": "rank/Open", + "name": "qjzzd/Open", "type": "api" }, { "id": 268, - "name": "shiwu/Concise", + "name": "rank/Open", "type": "api" }, { "id": 269, - "name": "shiwu/Extract", + "name": "shiwu/Concise", "type": "api" }, { "id": 270, - "name": "shiwu/GetList", + "name": "shiwu/Extract", "type": "api" }, { "id": 271, - "name": "shiwu/LvUp", + "name": "shiwu/GetList", "type": "api" }, { "id": 272, - "name": "shiwu/Recast", + "name": "shiwu/LvUp", "type": "api" }, { "id": 273, - "name": "shiwu/TakeOff", + "name": "shiwu/Recast", "type": "api" }, { "id": 274, - "name": "shiwu/Wear", + "name": "shiwu/TakeOff", "type": "api" }, { "id": 275, - "name": "shootGame/Open", + "name": "shiwu/Wear", "type": "api" }, { "id": 276, - "name": "shootGame/Rec", + "name": "shootGame/Open", "type": "api" }, { "id": 277, - "name": "shop/Buy", + "name": "shootGame/Rec", "type": "api" }, { "id": 278, - "name": "shop/Open", + "name": "shop/Buy", "type": "api" }, { "id": 279, - "name": "shop/Refresh", + "name": "shop/Open", "type": "api" }, { "id": 280, - "name": "sign/GetBoxPrize", + "name": "shop/Refresh", "type": "api" }, { "id": 281, - "name": "sign/GetPrize", + "name": "sign/GetBoxPrize", "type": "api" }, { "id": 282, - "name": "sign/Open", + "name": "sign/GetPrize", "type": "api" }, { "id": 283, - "name": "slzd/Aim", + "name": "sign/Open", "type": "api" }, { "id": 284, - "name": "slzd/BuyNum", + "name": "slzd/Aim", "type": "api" }, { "id": 285, - "name": "slzd/Fight", + "name": "slzd/BuyNum", "type": "api" }, { "id": 286, - "name": "slzd/FightLog", + "name": "slzd/Fight", "type": "api" }, { "id": 287, - "name": "slzd/MyRank", + "name": "slzd/FightLog", "type": "api" }, { "id": 288, + "name": "slzd/MyRank", + "type": "api" + }, + { + "id": 289, "name": "slzd/Open", "type": "api", "conf": { @@ -3197,77 +3207,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 289, + "id": 290, "name": "slzd/OpenFort", "type": "api" }, { - "id": 290, + "id": 291, "name": "slzd/Rec", "type": "api" }, { - "id": 291, + "id": 292, "name": "slzd/Refresh", "type": "api" }, { - "id": 292, + "id": 293, "name": "slzd/Slot", "type": "api" }, { - "id": 293, + "id": 294, "name": "tanxian/Event", "type": "api" }, { - "id": 294, + "id": 295, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 295, + "id": 296, "name": "tanxian/Fight", "type": "api" }, { - "id": 296, + "id": 297, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 297, + "id": 298, "name": "tanxian/Open", "type": "api" }, { - "id": 298, + "id": 299, "name": "tanxian/Receive", "type": "api" }, { - "id": 299, + "id": 300, "name": "task/AllFinsh", "type": "api" }, { - "id": 300, + "id": 301, "name": "task/Finsh", "type": "api" }, { - "id": 301, + "id": 302, "name": "task/Open", "type": "api" }, { - "id": 302, + "id": 303, "name": "user/CDKEY", "type": "api" }, { - "id": 303, + "id": 304, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3275,197 +3285,197 @@ export const serviceProto: ServiceProto = { } }, { - "id": 304, + "id": 305, "name": "user/ChangeName", "type": "api" }, { - "id": 305, + "id": 306, "name": "user/Fight", "type": "api" }, { - "id": 306, + "id": 307, "name": "user/GetInfo", "type": "api" }, { - "id": 307, + "id": 308, "name": "user/InfoOpen", "type": "api" }, { - "id": 308, + "id": 309, "name": "user/Login", "type": "api" }, { - "id": 309, + "id": 310, "name": "user/Ping", "type": "api" }, { - "id": 310, + "id": 311, "name": "user/Renown", "type": "api" }, { - "id": 311, + "id": 312, "name": "user/RenownBuy", "type": "api" }, { - "id": 312, + "id": 313, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 313, + "id": 314, "name": "user/RenownOpen", "type": "api" }, { - "id": 314, + "id": 315, "name": "user/Tujian", "type": "api" }, { - "id": 315, + "id": 316, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 316, + "id": 317, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 317, + "id": 318, "name": "weixiuchang/Open", "type": "api" }, { - "id": 318, + "id": 319, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 319, + "id": 320, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 320, + "id": 321, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 321, + "id": 322, "name": "wzry/BaoMing", "type": "api" }, { - "id": 322, + "id": 323, "name": "wzry/catFightLog", "type": "api" }, { - "id": 323, + "id": 324, "name": "wzry/CatGroup", "type": "api" }, { - "id": 324, + "id": 325, "name": "wzry/DldFight", "type": "api" }, { - "id": 325, + "id": 326, "name": "wzry/DldRefre", "type": "api" }, { - "id": 326, + "id": 327, "name": "wzry/JingCai", "type": "api" }, { - "id": 327, + "id": 328, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 328, + "id": 329, "name": "wzry/Open", "type": "api" }, { - "id": 329, + "id": 330, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 330, + "id": 331, "name": "wzry/Wzzd", "type": "api" }, { - "id": 331, + "id": 332, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 332, + "id": 333, "name": "xstask/AllGet", "type": "api" }, { - "id": 333, + "id": 334, "name": "xstask/Get", "type": "api" }, { - "id": 334, + "id": 335, "name": "xstask/LvUp", "type": "api" }, { - "id": 335, + "id": 336, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 336, + "id": 337, "name": "xstask/Open", "type": "api" }, { - "id": 337, + "id": 338, "name": "xstask/Receive", "type": "api" }, { - "id": 338, + "id": 339, "name": "xstask/Refresh", "type": "api" }, { - "id": 339, + "id": 340, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 340, + "id": 341, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 341, + "id": 342, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 342, + "id": 343, "name": "zhanqianbushu/Up", "type": "api" } @@ -19001,6 +19011,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 24c2efdfa2de690c614f58909b18bac777375eb2 Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 10:37:29 +0800 Subject: [PATCH 13/29] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../protocols/event/christmas/PtlOpen.ts | 4 +- .../protocols/event/christmas/huodong.json | 73 ++++-- .../protocols/msg_s2c/MsgPushGiftChange.ts | 1 + src/shared/protocols/serviceProto.ts | 244 ++++++++++-------- 4 files changed, 185 insertions(+), 137 deletions(-) create mode 100644 src/shared/protocols/msg_s2c/MsgPushGiftChange.ts diff --git a/src/shared/protocols/event/christmas/PtlOpen.ts b/src/shared/protocols/event/christmas/PtlOpen.ts index f0129c6..1dc8168 100644 --- a/src/shared/protocols/event/christmas/PtlOpen.ts +++ b/src/shared/protocols/event/christmas/PtlOpen.ts @@ -23,6 +23,8 @@ export type christmas = { taskval: { [id: string]: number } /**任务领取标识 */ taskfinish: string[] + /**小游戏挑战次数 */ + gamenum: number /**普通战令奖励集合 奖励id */ pt: number[] /**高级战令奖励集合 奖励id */ @@ -36,7 +38,7 @@ export type christmas = { /**装扮值 */ val: number /**签到标识 */ - qiandao:string[], + qiandao:number[], /**刷新时间 */ refresh: number } \ No newline at end of file diff --git a/src/shared/protocols/event/christmas/huodong.json b/src/shared/protocols/event/christmas/huodong.json index 2f9d42e..cea9f66 100644 --- a/src/shared/protocols/event/christmas/huodong.json +++ b/src/shared/protocols/event/christmas/huodong.json @@ -2,11 +2,11 @@ "hdid" : 91029302193, "htype" : 8, "stype" : 800, - "ttype" : 1, - "stime" : 60, - "rtime" : 90, - "etime" : 90, - "name" : "xinfupeiyang", + "ttype" : 0, + "stime" : 1702396800, + "rtime" : 1703088000, + "etime" : 1703088000, + "name" : "christmas", "icon" : "icon_xfdj", "showtime" : "根据玩家注册时间，游戏返回时复写", "data" : { @@ -52,24 +52,51 @@ } }, "gameneed": [{"a": "attr", "t":"jinbi", "n": 1}], - "game": [0,1,2,3,4,5], - "zhanling":[ - { - "val": 1, - "pt": [{"a": "attr", "t":"jinbi", "n": 1}], - "gj": [{"a": "attr", "t":"jinbi", "n": 1}] - }, - { - "val": 2, - "pt": [{"a": "attr", "t":"jinbi", "n": 1}], - "gj": [{"a": "attr", "t":"jinbi", "n": 1}] - }, - { - "val": 3, - "pt": [{"a": "attr", "t":"jinbi", "n": 1}], - "gj": [{"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": { 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/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 6ce1b25..218afc9 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -237,6 +237,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'; @@ -1636,6 +1637,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, @@ -2937,91 +2939,96 @@ export const serviceProto: ServiceProto = { }, { "id": 238, - "name": "msg_s2c/SendGift", + "name": "msg_s2c/PushGiftChange", "type": "msg" }, { "id": 239, - "name": "msg_s2c/ShiwuChange", + "name": "msg_s2c/SendGift", "type": "msg" }, { "id": 240, - "name": "msg_s2c/TaskChange", + "name": "msg_s2c/ShiwuChange", "type": "msg" }, { "id": 241, - "name": "msg_s2c/Xianshilibao", + "name": "msg_s2c/TaskChange", "type": "msg" }, { "id": 242, + "name": "msg_s2c/Xianshilibao", + "type": "msg" + }, + { + "id": 243, "name": "pata/Fight", "type": "api" }, { - "id": 243, + "id": 244, "name": "pata/GetPrize", "type": "api" }, { - "id": 244, + "id": 245, "name": "pata/Open", "type": "api" }, { - "id": 245, + "id": 246, "name": "pata/SaoDang", "type": "api" }, { - "id": 246, + "id": 247, "name": "pay/GetList", "type": "api" }, { - "id": 247, + "id": 248, "name": "peijian/GetList", "type": "api" }, { - "id": 248, + "id": 249, "name": "peijian/JingLian", "type": "api" }, { - "id": 249, + "id": 250, "name": "peijian/JinJie", "type": "api" }, { - "id": 250, + "id": 251, "name": "peijian/LvUp", "type": "api" }, { - "id": 251, + "id": 252, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 252, + "id": 253, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 253, + "id": 254, "name": "peijian/Reset", "type": "api" }, { - "id": 254, + "id": 255, "name": "peijian/Rm", "type": "api" }, { - "id": 255, + "id": 256, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3029,32 +3036,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 256, + "id": 257, "name": "peijian/UnLock", "type": "api" }, { - "id": 257, + "id": 258, "name": "peijian/Wear", "type": "api" }, { - "id": 258, + "id": 259, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 259, + "id": 260, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 260, + "id": 261, "name": "peijiancangku/Open", "type": "api" }, { - "id": 261, + "id": 262, "name": "Bingo", "type": "api", "conf": { @@ -3062,142 +3069,142 @@ export const serviceProto: ServiceProto = { } }, { - "id": 262, + "id": 263, "name": "FightTest", "type": "api" }, { - "id": 263, + "id": 264, "name": "SyncBtn", "type": "api" }, { - "id": 264, + "id": 265, "name": "Test", "type": "api" }, { - "id": 265, + "id": 266, "name": "pushgift/Open", "type": "api" }, { - "id": 266, + "id": 267, "name": "qjzzd/Fight", "type": "api" }, { - "id": 267, + "id": 268, "name": "qjzzd/Open", "type": "api" }, { - "id": 268, + "id": 269, "name": "rank/Open", "type": "api" }, { - "id": 269, + "id": 270, "name": "shiwu/Concise", "type": "api" }, { - "id": 270, + "id": 271, "name": "shiwu/Extract", "type": "api" }, { - "id": 271, + "id": 272, "name": "shiwu/GetList", "type": "api" }, { - "id": 272, + "id": 273, "name": "shiwu/LvUp", "type": "api" }, { - "id": 273, + "id": 274, "name": "shiwu/Recast", "type": "api" }, { - "id": 274, + "id": 275, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 275, + "id": 276, "name": "shiwu/Wear", "type": "api" }, { - "id": 276, + "id": 277, "name": "shootGame/Open", "type": "api" }, { - "id": 277, + "id": 278, "name": "shootGame/Rec", "type": "api" }, { - "id": 278, + "id": 279, "name": "shop/Buy", "type": "api" }, { - "id": 279, + "id": 280, "name": "shop/Open", "type": "api" }, { - "id": 280, + "id": 281, "name": "shop/Refresh", "type": "api" }, { - "id": 281, + "id": 282, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 282, + "id": 283, "name": "sign/GetPrize", "type": "api" }, { - "id": 283, + "id": 284, "name": "sign/Open", "type": "api" }, { - "id": 284, + "id": 285, "name": "slzd/Aim", "type": "api" }, { - "id": 285, + "id": 286, "name": "slzd/BuyNum", "type": "api" }, { - "id": 286, + "id": 287, "name": "slzd/Fight", "type": "api" }, { - "id": 287, + "id": 288, "name": "slzd/FightLog", "type": "api" }, { - "id": 288, + "id": 289, "name": "slzd/MyRank", "type": "api" }, { - "id": 289, + "id": 290, "name": "slzd/Open", "type": "api", "conf": { @@ -3207,77 +3214,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 290, + "id": 291, "name": "slzd/OpenFort", "type": "api" }, { - "id": 291, + "id": 292, "name": "slzd/Rec", "type": "api" }, { - "id": 292, + "id": 293, "name": "slzd/Refresh", "type": "api" }, { - "id": 293, + "id": 294, "name": "slzd/Slot", "type": "api" }, { - "id": 294, + "id": 295, "name": "tanxian/Event", "type": "api" }, { - "id": 295, + "id": 296, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 296, + "id": 297, "name": "tanxian/Fight", "type": "api" }, { - "id": 297, + "id": 298, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 298, + "id": 299, "name": "tanxian/Open", "type": "api" }, { - "id": 299, + "id": 300, "name": "tanxian/Receive", "type": "api" }, { - "id": 300, + "id": 301, "name": "task/AllFinsh", "type": "api" }, { - "id": 301, + "id": 302, "name": "task/Finsh", "type": "api" }, { - "id": 302, + "id": 303, "name": "task/Open", "type": "api" }, { - "id": 303, + "id": 304, "name": "user/CDKEY", "type": "api" }, { - "id": 304, + "id": 305, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3285,197 +3292,197 @@ export const serviceProto: ServiceProto = { } }, { - "id": 305, + "id": 306, "name": "user/ChangeName", "type": "api" }, { - "id": 306, + "id": 307, "name": "user/Fight", "type": "api" }, { - "id": 307, + "id": 308, "name": "user/GetInfo", "type": "api" }, { - "id": 308, + "id": 309, "name": "user/InfoOpen", "type": "api" }, { - "id": 309, + "id": 310, "name": "user/Login", "type": "api" }, { - "id": 310, + "id": 311, "name": "user/Ping", "type": "api" }, { - "id": 311, + "id": 312, "name": "user/Renown", "type": "api" }, { - "id": 312, + "id": 313, "name": "user/RenownBuy", "type": "api" }, { - "id": 313, + "id": 314, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 314, + "id": 315, "name": "user/RenownOpen", "type": "api" }, { - "id": 315, + "id": 316, "name": "user/Tujian", "type": "api" }, { - "id": 316, + "id": 317, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 317, + "id": 318, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 318, + "id": 319, "name": "weixiuchang/Open", "type": "api" }, { - "id": 319, + "id": 320, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 320, + "id": 321, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 321, + "id": 322, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 322, + "id": 323, "name": "wzry/BaoMing", "type": "api" }, { - "id": 323, + "id": 324, "name": "wzry/catFightLog", "type": "api" }, { - "id": 324, + "id": 325, "name": "wzry/CatGroup", "type": "api" }, { - "id": 325, + "id": 326, "name": "wzry/DldFight", "type": "api" }, { - "id": 326, + "id": 327, "name": "wzry/DldRefre", "type": "api" }, { - "id": 327, + "id": 328, "name": "wzry/JingCai", "type": "api" }, { - "id": 328, + "id": 329, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 329, + "id": 330, "name": "wzry/Open", "type": "api" }, { - "id": 330, + "id": 331, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 331, + "id": 332, "name": "wzry/Wzzd", "type": "api" }, { - "id": 332, + "id": 333, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 333, + "id": 334, "name": "xstask/AllGet", "type": "api" }, { - "id": 334, + "id": 335, "name": "xstask/Get", "type": "api" }, { - "id": 335, + "id": 336, "name": "xstask/LvUp", "type": "api" }, { - "id": 336, + "id": 337, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 337, + "id": 338, "name": "xstask/Open", "type": "api" }, { - "id": 338, + "id": 339, "name": "xstask/Receive", "type": "api" }, { - "id": 339, + "id": 340, "name": "xstask/Refresh", "type": "api" }, { - "id": 340, + "id": 341, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 341, + "id": 342, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 342, + "id": 343, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 343, + "id": 344, "name": "zhanqianbushu/Up", "type": "api" } @@ -8645,6 +8652,13 @@ export const serviceProto: ServiceProto = { }, { "id": 5, + "name": "gamenum", + "type": { + "type": "Number" + } + }, + { + "id": 6, "name": "pt", "type": { "type": "Array", @@ -8654,7 +8668,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 6, + "id": 7, "name": "gj", "type": { "type": "Array", @@ -8664,14 +8678,14 @@ export const serviceProto: ServiceProto = { } }, { - "id": 7, + "id": 8, "name": "pay", "type": { "type": "Boolean" } }, { - "id": 8, + "id": 9, "name": "libao", "type": { "type": "Interface", @@ -8684,7 +8698,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 9, + "id": 10, "name": "select", "type": { "type": "Interface", @@ -8703,24 +8717,24 @@ export const serviceProto: ServiceProto = { } }, { - "id": 10, + "id": 11, "name": "val", "type": { "type": "Number" } }, { - "id": 11, + "id": 12, "name": "qiandao", "type": { "type": "Array", "elementType": { - "type": "String" + "type": "Number" } } }, { - "id": 12, + "id": 13, "name": "refresh", "type": { "type": "Number" @@ -17937,6 +17951,10 @@ export const serviceProto: ServiceProto = { } } }, + "msg_s2c/MsgPushGiftChange/MsgPushGiftChange": { + "type": "Literal", + "literal": 1 + }, "msg_s2c/MsgSendGift/MsgSendGift": { "type": "Interface", "indexSignature": { From 9f151f182b5e140e6563d5a982b80c96ee4be207 Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 10:46:47 +0800 Subject: [PATCH 14/29] =?UTF-8?q?=E5=90=88=E5=B9=B6,=E6=9A=82=E6=97=B6?= =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=85=B6=E4=BB=96=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/christmas/ApiLiBao.ts | 43 +---- src/api_s2c/event/christmas/ApiOpen.ts | 17 +- src/api_s2c/event/christmas/ApiQianDao.ts | 35 +--- src/api_s2c/event/christmas/ApiSelect.ts | 36 +--- src/api_s2c/event/christmas/ApiTaskRec.ts | 34 +--- src/api_s2c/event/christmas/ApiZhanLingRec.ts | 43 +---- src/api_s2c/event/christmas/fun.ts | 168 ------------------ src/api_s2c/hongdian/fun.ts | 63 ------- src/api_s2c/pushgift/ApiOpen.ts | 7 + src/public/taskclass.ts | 3 - 10 files changed, 21 insertions(+), 428 deletions(-) delete mode 100644 src/api_s2c/event/christmas/fun.ts create mode 100644 src/api_s2c/pushgift/ApiOpen.ts diff --git a/src/api_s2c/event/christmas/ApiLiBao.ts b/src/api_s2c/event/christmas/ApiLiBao.ts index 0c5163c..a949ded 100644 --- a/src/api_s2c/event/christmas/ApiLiBao.ts +++ b/src/api_s2c/event/christmas/ApiLiBao.ts @@ -1,46 +1,7 @@ import { ApiCall } from "tsrpc"; import { ReqLiBao, ResLiBao } from "../../../shared/protocols/event/christmas/PtlLiBao"; -import {Christmasfun} from "./fun"; -import {PlayerFun} from "../../../public/player"; -import {HongDianChange} from "../../hongdian/fun"; export default async function (call: ApiCall) { - let initCon = await Christmasfun.getCon(call) - let lbid = call.req.lbid; - let _con = initCon[call.req.hdid].data.libao[call.req.lbid]; - if (!_con) { - // 礼包id 不存在 - return call.error('', { code: -1, message: globalThis.lng.yangchengmubiao_2 }) - } - if (_con.payid) { - // 判断是否能购买 - return call.error('', { code: -2, message: globalThis.lng.yangchengmubiao_2 }) - } - let _mydata = await Christmasfun.getMyData(call, call.req.hdid) - let _buyNum = _mydata.libao[lbid] || 0 - if (_buyNum >= _con.buynum) { - // 判断是否能购买 - return call.error('', { code: -3, message: globalThis.lng.yangchengmubiao_2 }) - } - const _select = _mydata.select[lbid] || {} - if (Object.keys(_select).length >= _con.dlz.length) { - // 判断是否选择奖励了 - return call.error('', { code: -3, message: globalThis.lng.yangchengmubiao_2 }) - } - - let _prize: atn[] = _con.prize - for (let key in _select) { - _prize.push(_con.dlz[parseInt(key)][_select[key]]) - } - - let _setData = {} - _mydata.libao[lbid] = _buyNum + 1 - _setData["libao"] = _mydata.libao - await Christmasfun.setMyData(call.uid, call.req.hdid, { $set: _setData }) - - await PlayerFun.sendPrize(call, _prize); - let changedata = { mydata: _mydata, prize: _prize} - // 推送红点 - HongDianChange.sendChangeKey(call.uid, ['huodonghd']); - call.succ(changedata); + // TODO + call.error('API Not Implemented'); } \ No newline at end of file diff --git a/src/api_s2c/event/christmas/ApiOpen.ts b/src/api_s2c/event/christmas/ApiOpen.ts index 9fb038b..28cc25e 100644 --- a/src/api_s2c/event/christmas/ApiOpen.ts +++ b/src/api_s2c/event/christmas/ApiOpen.ts @@ -1,16 +1,7 @@ import { ApiCall } from "tsrpc"; -import { HuoDongFun } from "../../../public/huodongfun"; -import { ReqOpen, ResOpen } from "../../../shared/protocols/event/yangchengmubiao/PtlOpen"; -import { Christmasfun } from "./fun"; +import { ReqOpen, ResOpen } from "../../../shared/protocols/event/christmas/PtlOpen"; export default async function (call: ApiCall) { - let _hdinfo = await HuoDongFun.getHdidInfo(call, call.req.hdid) - if (!_hdinfo || Object.keys(_hdinfo).length <= 0) { - // 无此活动 - return call.error('', { code: -1, message: globalThis.lng.huodong_open_1 }) - } - let _mydata = await Christmasfun.getMyData(call, call.req.hdid) - let changedata = { mydata: _mydata, hdinfo: _hdinfo } - call.succ(changedata); -} - + // TODO + call.error('API Not Implemented'); +} \ No newline at end of file diff --git a/src/api_s2c/event/christmas/ApiQianDao.ts b/src/api_s2c/event/christmas/ApiQianDao.ts index 41f5742..afd6929 100644 --- a/src/api_s2c/event/christmas/ApiQianDao.ts +++ b/src/api_s2c/event/christmas/ApiQianDao.ts @@ -1,38 +1,7 @@ import { ApiCall } from "tsrpc"; import { ReqQianDao, ResQianDao } from "../../../shared/protocols/event/christmas/PtlQianDao"; -import {Christmasfun} from "./fun"; -import {PublicShared} from "../../../shared/public/public"; -import {PlayerFun} from "../../../public/player"; -import {HongDianChange} from "../../hongdian/fun"; export default async function (call: ApiCall) { - let initCon = await Christmasfun.getCon(call) - let _con = initCon[call.req.hdid].data.qiandao; - let _stime = initCon[call.req.hdid].stime - let _diff = PublicShared.getDiff(_stime) - - let _mydata = await Christmasfun.getMyData(call, call.req.hdid) - // 循环判断是否有可以领取的 - let _prize = [] - for(let i = 0; i < _diff; i++) { - if (_mydata.qiandao.includes(i)) continue - _mydata.qiandao.push(i) - _prize.push(_con[i]) - } - - if (!_prize){ - // 没有奖励可以领取 - return call.error('', { code: -1, message: globalThis.lng.yangchengmubiao_2 }) - } - - - let _setData = {} - _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} - // 推送红点 - HongDianChange.sendChangeKey(call.uid, ['huodonghd']); - call.succ(changedata); + // TODO + call.error('API Not Implemented'); } \ No newline at end of file diff --git a/src/api_s2c/event/christmas/ApiSelect.ts b/src/api_s2c/event/christmas/ApiSelect.ts index 6680a9a..612618c 100644 --- a/src/api_s2c/event/christmas/ApiSelect.ts +++ b/src/api_s2c/event/christmas/ApiSelect.ts @@ -1,39 +1,7 @@ import { ApiCall } from "tsrpc"; import { ReqSelect, ResSelect } from "../../../shared/protocols/event/christmas/PtlSelect"; -import {Christmasfun} from "./fun"; -import {HongDianChange} from "../../hongdian/fun"; export default async function (call: ApiCall) { - let initCon = await Christmasfun.getCon(call) - let index = call.req.index; - let pid = call.req.pid; - let lbid = call.req.lbid; - let _con = initCon[call.req.hdid].data.libao[lbid]; - if (!_con) { - // 礼包id 不存在 - return call.error('', { code: -1, message: globalThis.lng.yangchengmubiao_2 }) - } - if (index >= _con.dlz.length){ - // 礼包id 不存在 - return call.error('', { code: -2, message: globalThis.lng.yangchengmubiao_2 }) - } - if (index >= _con.dlz.length){ - // 礼包id 不存在 - return call.error('', { code: -3, message: globalThis.lng.yangchengmubiao_2 }) - } - if (!_con.dlz[index][pid]){ - // 礼包id 不存在 - return call.error('', { code: -4, message: globalThis.lng.yangchengmubiao_2 }) - } - let _mydata = await Christmasfun.getMyData(call, call.req.hdid) - let lb_select = _mydata.select[lbid] || {} - lb_select[index.toString()] = pid - _mydata.select[lbid] = lb_select - let _setData = {} - _setData["select"] = _mydata.select - await Christmasfun.setMyData(call.uid, call.req.hdid, { $set: _setData }) - let changedata = { mydata: _mydata} - // 推送红点 - HongDianChange.sendChangeKey(call.uid, ['huodonghd']); - call.succ(changedata); + // TODO + call.error('API Not Implemented'); } \ No newline at end of file diff --git a/src/api_s2c/event/christmas/ApiTaskRec.ts b/src/api_s2c/event/christmas/ApiTaskRec.ts index 1227d85..389e095 100644 --- a/src/api_s2c/event/christmas/ApiTaskRec.ts +++ b/src/api_s2c/event/christmas/ApiTaskRec.ts @@ -1,37 +1,7 @@ import { ApiCall } from "tsrpc"; import { ReqTaskRec, ResTaskRec } from "../../../shared/protocols/event/christmas/PtlTaskRec"; -import {Christmasfun} from "./fun"; -import {HongDianChange} from "../../hongdian/fun"; -import {PlayerFun} from "../../../public/player"; export default async function (call: ApiCall) { - let initCon = await Christmasfun.getCon(call) - let taskid = call.req.taskid; - let _con = initCon[call.req.hdid].data.task[taskid]; - if (!_con) { - // 任务id 不存在 - return call.error('', { code: -1, message: globalThis.lng.yangchengmubiao_2 }) - } - let _mydata = await Christmasfun.getMyData(call, call.req.hdid) - if (_mydata.taskval[taskid] < _con.pval) { - // 任务未完成 - return call.error('', { code: -2, message: globalThis.lng.yangchengmubiao_3 }) - } - if (_mydata.taskfinish.includes(taskid)) { - // 任务已领取 - return call.error('', { code: -3, message: globalThis.lng.yangchengmubiao_4 }) - } - _mydata.taskfinish.push(taskid) - - let _setData = {} - _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} - // 推送红点 - HongDianChange.sendChangeKey(call.uid, ['huodonghd']); - call.succ(changedata); - - + // TODO + call.error('API Not Implemented'); } \ No newline at end of file diff --git a/src/api_s2c/event/christmas/ApiZhanLingRec.ts b/src/api_s2c/event/christmas/ApiZhanLingRec.ts index 66bc07f..2905992 100644 --- a/src/api_s2c/event/christmas/ApiZhanLingRec.ts +++ b/src/api_s2c/event/christmas/ApiZhanLingRec.ts @@ -1,46 +1,7 @@ import { ApiCall } from "tsrpc"; import { ReqZhanLingRec, ResZhanLingRec } from "../../../shared/protocols/event/christmas/PtlZhanLingRec"; -import {Christmasfun} from "./fun"; -import {PlayerFun} from "../../../public/player"; -import {HongDianChange} from "../../hongdian/fun"; export default async function (call: ApiCall) { - let initCon = await Christmasfun.getCon(call) - let index = call.req.index; - let _con = initCon[call.req.hdid].data.zhanling[index]; - if (!_con) { - // 礼包id 不存在 - return call.error('', { code: -1, message: globalThis.lng.yangchengmubiao_2 }) - } - let _mydata = await Christmasfun.getMyData(call, call.req.hdid) - if (_mydata.val < _con.val) { - return call.error('', { code: -1, message: globalThis.lng.yangchengmubiao_2 }) - } - let _prize = [] - - if (!_mydata.pt.includes(index)){ - // 如果普通奖励没有领取 - _prize.push(_con.pt) - _mydata.pt.push(index) - } - if (_mydata.pay && !_mydata.gj.includes(index)){ - // 如果普通奖励没有领取 - _prize.push(_con.gj) - _mydata.gj.push(index) - } - if (!_prize) { - // 没有奖励可以领取 - return call.error('', { code: -1, message: globalThis.lng.yangchengmubiao_2 }) - } - let _setData = {} - _setData["gj"] = _mydata.gj - _setData["pt"] = _mydata.pt - await Christmasfun.setMyData(call.uid, call.req.hdid, { $set: _setData }) - - await PlayerFun.sendPrize(call, _prize); - let changedata = { mydata: _mydata, prize: _prize} - // 推送红点 - HongDianChange.sendChangeKey(call.uid, ['huodonghd']); - call.succ(changedata); - + // TODO + call.error('API Not Implemented'); } \ No newline at end of file diff --git a/src/api_s2c/event/christmas/fun.ts b/src/api_s2c/event/christmas/fun.ts deleted file mode 100644 index 6d37072..0000000 --- a/src/api_s2c/event/christmas/fun.ts +++ /dev/null @@ -1,168 +0,0 @@ -import { strict } from 'assert'; -import { ApiCall } from 'tsrpc'; -import { ReqAddHuoDong } from '../../../monopoly/protocols/PtlAddHuoDong'; -import { HuoDongFun } from '../../../public/huodongfun'; -import { TaskFun } from '../../../public/task'; -import { christmas } from '../../../shared/protocols/event/christmas/PtlOpen'; -import { PublicShared } from '../../../shared/public/public'; - - -export class Christmasfun { - /**配置 */ - static async getCon(call: ApiCall) { - let _con: { [id: string]: ReqAddHuoDong } = {} - let _hd = await HuoDongFun.gethdList(call, 8) - for (let index = 0; index < _hd.length; index++) { - const element = _hd[index]; - if (element && element._id) delete element._id - _con[element.hdid] = element - } - return _con - } - /**获取所有符合时间的活动 */ - static async gethdids(call: ApiCall) { - let _hdids = [] - let _hd = await HuoDongFun.gethdList(call, 8) - for (let index = 0; index < _hd.length; index++) { - const element = _hd[index]; - _hdids.push(element.hdid) - } - return _hdids - } - - /**获取我的数据 */ - static async getMyData(call: ApiCall, hdid: number) { - let db: any = await G.mongodb.cEvent(`christmas${hdid}`).findOne({ uid: call.uid, type: `christmas${hdid}`, hdid: hdid }); - if (!db) { - db = await this.initData(call, hdid) - await G.mongodb.cEvent(`christmas${hdid}`).updateOne( - { uid: call.uid, type: `christmas${hdid}`, hdid: hdid }, - { $set: db }, - { upsert: true } - ) - } - let { _id, ..._myData } = db - if (!PublicShared.chkSameDate(_myData.refresh, G.time)) { - // 刷新每日任务 - _myData = await this.refreTask(call, _myData, hdid) - - } - return _myData - } - - /**初始数据 */ - static async initData(call: ApiCall, hdid: number) { - let _initCon = await this.getCon(call) - let _con = _initCon[hdid] - let _r: christmas = { - type: `christmas${hdid}`, - uid: call.uid, - hdid: hdid, - taskval: await this.getTaskVal(call, hdid), - taskfinish: [], - refresh: G.time, - pt: [], - gj: [], - pay: false, - select:{}, - val: 0, - qiandao: [], - libao:{} - } - return _r - } - - /**设置数据 */ - static async setMyData(uid: string, hdid: number, set: {}) { - await G.mongodb.cEvent(`christmas${hdid}`).updateOne( - { uid: uid, type: `christmas${hdid}`, hdid: hdid }, - set - ) - } - - /**获取所有taskid 及对应的值 */ - static async getTaskVal(call: ApiCall, hdid: number) { - let _initCon = await this.getCon(call) - let _tasks = _initCon[hdid].data.task - let _res = {} - for (let index = 0; index < Object.keys(_tasks).length; index++) { - const element = Object.keys(_tasks)[index]; - let _tmp = _tasks[element] - _tmp["id"] = element - // 每日登录直接完成 - if (element == "1"){ - _res[element] = 1 - } - else{ - _res[element] = 0 - } - - - } - return _res - } - - /**刷新每日任务 */ - static async refreTask(call: ApiCall, mydata: christmas, hdid: number) { - let _initCon = await this.getCon(call) - let _con = _initCon[hdid].data.task - if (!_con) return mydata - mydata.taskfinish = [] - mydata.taskval = await this.getTaskVal(call, hdid) - mydata.refresh = G.time - await this.setMyData(call.uid, hdid, { $set: { refresh: mydata.refresh, taskfinish: mydata.taskfinish, taskval: mydata.taskval } }) - return mydata - } - - /**设置任务 */ - static async setTaskVal(call: ApiCall, stype: number, val: number, chkCall: Function, chkval: number = 0, isinc: number = 0, alchangeVal: Function, arg) { - let hdids = await this.gethdids(call) - if (hdids.length <= 0) return // 活动过期，不计数 - let _initCon = await this.getCon(call) - - - - for (let index = 0; index < hdids.length; index++) { - const hdid = hdids[index]; - let _mydata = await Christmasfun.getMyData(call, hdid) - let _tasks = _initCon[hdid].data.task - - let _setData = { - $inc: {}, - $set: {} - } - let isset = 0 - for (let indextask = 0; indextask < Object.keys(_tasks).length; indextask++) { - const ele = Object.keys(_tasks)[indextask]; - // 具体任务配置 - let _taskCon = _tasks[ele] - if (_taskCon.stype != stype) continue - - let _pval = _taskCon.pval - // 不符合任务要求 - if (!(await chkCall(_taskCon["cond"], chkval, arg))) continue - - // 根据需求改写 - val = await alchangeVal(call, _taskCon, val, arg) - - isset = 1 - if (isinc == 1) { // 累加 - _setData["$inc"][`taskval.${ele}`] = val - } else { - _setData["$set"][`taskval.${ele}`] = val - } - } - - // 设置任务 - if (isset == 1) { - await G.mongodb.collection('event').updateMany( - { uid: call.uid, type: { $regex: "christmas" }, hdid: parseInt(hdid) }, - _setData - ) - } - } - } - - - -} \ No newline at end of file diff --git a/src/api_s2c/hongdian/fun.ts b/src/api_s2c/hongdian/fun.ts index 867eb16..0f482a6 100644 --- a/src/api_s2c/hongdian/fun.ts +++ b/src/api_s2c/hongdian/fun.ts @@ -20,7 +20,6 @@ import {PlayerFun} from "../../public/player"; import kfjsFun from "../../public/kaifujingsai"; import {RankKfjs} from "../../public/rank/rank_kfjs"; import {ShopFun} from "../../public/shop"; -import {Christmasfun} from '../event/christmas/fun'; export class HongDianFun { /**黑榜争霸红点 */ @@ -690,68 +689,6 @@ export class HuoDongHongDianFun { return _res; } - /**圣诞节活动红点 */ - static async christmasHongDian(call: ApiCall, hdCon: ReqAddHuoDong) { - let _res: hongdianVal = { - show: false, - }; - - let _hdCon = hdCon.data; - let stime = hdCon.stime - let _mydata = await Christmasfun.getMyData(call, hdCon.hdid); - let _tasks = hdCon.data.task; // 所有任务 taskid 为key - - 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)) { - // 任务完成且没有领取 - _res.show = true; - return _res; - } - } - - let libaos = _hdCon.libao - for (let indexlibao = 0; indexlibao < Object.keys(libaos).length; indexlibao++) { - const elementlibao = Object.keys(libaos)[indexlibao]; - let _tmp = _tasks[elementlibao]; - if (_tmp.payid) continue - let _buyNum = _mydata.libao[elementlibao] || 0 - if (_buyNum < _tmp.buynum) { - _res.show = true; - return _res; - } - } - let _diff = PublicShared.getDiff(stime) - // 循环判断是否有可以领取的 - for (let i = 0; i < _diff; i++) { - if (_mydata.qiandao.includes(i)) continue - _res.show = true; - return _res; - } - let need = _hdCon.gameneed; - // 判断消耗是否满足 - let meet = await PlayerFun.checkNeedIsMeet(call, need, false); - if (meet.isOk == true) { - _res.show = true; - return _res; - } - let zhanling = _hdCon.zhanling - for (let indexzhanling = 0; indexzhanling < zhanling.length; indexzhanling++) { - if (!_mydata.pt.includes(indexzhanling)) { - _res.show = true; - return _res; - } - if (_mydata.pay && !_mydata.gj.includes(indexzhanling)) { - _res.show = true; - return _res; - } - } - - return _res; - } - - /**养成目标红点 */ static async yangchengmubiaoHongDian(call: ApiCall, hdCon: ReqAddHuoDong) { let _res: hongdianVal = { diff --git a/src/api_s2c/pushgift/ApiOpen.ts b/src/api_s2c/pushgift/ApiOpen.ts new file mode 100644 index 0000000..9f785ce --- /dev/null +++ b/src/api_s2c/pushgift/ApiOpen.ts @@ -0,0 +1,7 @@ +import { ApiCall } from "tsrpc"; +import { ReqOpen, ResOpen } from "../../shared/protocols/pushgift/PtlOpen"; + +export default async function (call: ApiCall) { + // TODO + call.error('API Not Implemented'); +} \ No newline at end of file diff --git a/src/public/taskclass.ts b/src/public/taskclass.ts index 44e4190..448c055 100644 --- a/src/public/taskclass.ts +++ b/src/public/taskclass.ts @@ -1,6 +1,5 @@ import {ApiCall} from "tsrpc" import {YangChengMuBiaofun} from "../api_s2c/event/yangchengmubiao/fun" -import {Christmasfun} from "../api_s2c/event/christmas/fun" // import { YangChengMuBiaofun } from "../api_s2c/event/yangchengmubiao/fun" import {Wjjl} from "../module/collection_wjjl" import {PublicShared} from "../shared/public/public" @@ -73,8 +72,6 @@ export module manager { TaskFun.setTaskVal(call, this.stype, val, this.chkCall, chkval, this.isinc, this.alchangeVal, arg) // 养成目标任务计数 YangChengMuBiaofun.setTaskVal(call, this.stype, val, this.chkCall, chkval, this.isinc, this.alchangeVal, arg) - // 圣诞任务计数 - Christmasfun.setTaskVal(call, this.stype, val, this.chkCall, chkval, this.isinc, this.alchangeVal, arg) } // 任务数值， 和检测值，看情况需要上层复写 From 1d4a34c266b1c4b58c175e3e70e9191fbd20dc96 Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 10:46:53 +0800 Subject: [PATCH 15/29] =?UTF-8?q?=E5=90=88=E5=B9=B6,=E6=9A=82=E6=97=B6?= =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=85=B6=E4=BB=96=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/christmas/ApiGame.ts | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/src/api_s2c/event/christmas/ApiGame.ts b/src/api_s2c/event/christmas/ApiGame.ts index e3cd097..07e2400 100644 --- a/src/api_s2c/event/christmas/ApiGame.ts +++ b/src/api_s2c/event/christmas/ApiGame.ts @@ -1,26 +1,7 @@ import { ApiCall } from "tsrpc"; import { ReqGame, ResGame } from "../../../shared/protocols/event/christmas/PtlGame"; -import { HongDianChange } from "../../hongdian/fun"; -import { Christmasfun } from "./fun"; -import {PlayerFun} from "../../../public/player"; - export default async function (call: ApiCall) { - let initCon = await Christmasfun.getCon(call) - let need = initCon[call.req.hdid].data.gameneed; - let addval = initCon[call.req.hdid].data.game[call.req.index]; - // 判断消耗是否满足 - await PlayerFun.checkNeedIsMeet(call, need); - // 扣除消耗 - await PlayerFun.cutNeed(call, need); - - let _mydata = await Christmasfun.getMyData(call, call.req.hdid) - let _setData = {} - _mydata["val"] += addval - _setData["val"] = _mydata["val"] - await Christmasfun.setMyData(call.uid, call.req.hdid, { $set: _setData }) - let changedata = { mydata: _mydata} - // 推送红点 - HongDianChange.sendChangeKey(call.uid, ['huodonghd']); - call.succ(changedata); + // TODO + call.error('API Not Implemented'); } \ No newline at end of file From b524f2a847cddd02425da7c53f1a36e1c832f2fc Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 15 Dec 2023 11:01:56 +0800 Subject: [PATCH 16/29] =?UTF-8?q?fix:=20=E4=B8=BB=E7=BA=BF=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1vip=E7=BB=8F=E9=AA=8C=E8=AE=A1=E6=95=B0=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=B8=BA=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E8=AF=BB=E5=8F=96gud=E7=9A=84payexp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/public/taskclass.ts | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/public/taskclass.ts b/src/public/taskclass.ts index 448c055..06cc127 100644 --- a/src/public/taskclass.ts +++ b/src/public/taskclass.ts @@ -11,6 +11,7 @@ import {PataFun} from "./pata"; import {weixiuchangType} from "../shared/protocols/weixiuchang/type"; import {FunWeiXiuChang} from "./weixiuchang"; import {JJCFun} from "./jjc"; +import {getGud} from "./gud"; let _classNameFunc = {} /** @@ -330,22 +331,22 @@ export module manager { isinc = 0 async initVal(call: ApiCall, con) { - let _val = 0 + // let _val = 0 // 成就任务走计数 - if (con.type == 3) { - _val = await PayFun.getPayDaysAllPayNum(call.uid, await PublicShared.getToDayZeroTime(G.openTime), G.time) * 10 - } - return _val + // if (con.type == 3) { + // _val = await PayFun.getPayDaysAllPayNum(call.uid, await PublicShared.getToDayZeroTime(G.openTime), G.time) * 10 + // } + return (await getGud(call.uid)).payExp } async alchangeVal(call: ApiCall, con, val: number, arg) { - val = 0 - let _where = {taskid: con.id, stype: con.stype} - let _task = await TaskFun.getUserTaksList(call.uid, _where) - if (_task[0]) { - val = await PayFun.getPayDaysAllPayNum(call.uid, await PublicShared.getToDayZeroTime(_task[0].retime), G.time) * 10 - } - return val + // val = 0 + // let _where = {taskid: con.id, stype: con.stype} + // let _task = await TaskFun.getUserTaksList(call.uid, _where) + // if (_task[0]) { + // val = await PayFun.getPayDaysAllPayNum(call.uid, await PublicShared.getToDayZeroTime(_task[0].retime), G.time) * 10 + // } + return (await getGud(call.uid)).payExp } } From fe8a68a6ebfeae718bf6892c29f5e6efaa7239e8 Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 11:12:04 +0800 Subject: [PATCH 17/29] fix bug --- src/api_s2c/event/zhoumolibao/ApiOpen.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api_s2c/event/zhoumolibao/ApiOpen.ts b/src/api_s2c/event/zhoumolibao/ApiOpen.ts index ebbcce3..87bcca0 100644 --- a/src/api_s2c/event/zhoumolibao/ApiOpen.ts +++ b/src/api_s2c/event/zhoumolibao/ApiOpen.ts @@ -6,7 +6,6 @@ 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, 9))[0] @@ -17,6 +16,7 @@ export default async function (call: ApiCall) { record: data?.record || {}, buyLog: await PayFun.getPayLogs(call.uid, payIds) }) + checkResetBuyLog(call) } export async function getConf(call, args?: { id?: string; payId?: string }) { @@ -31,10 +31,10 @@ 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 <= zeroTime) { + if (!data?.refreshTime || data?.refreshTime < zeroTime) { G.mongodb.cEvent(`zhoumolibao`).updateOne( {uid: call.uid, type: `zhoumolibao`}, - {$set: {record: {}}}, + {$set: {record: {}, refreshTime: G.time}}, {upsert: true} ) } @@ -43,7 +43,7 @@ export async function checkResetBuyLog(call) { let payIds = gifts.filter(i => i.payId)?.map(i => i.payId) let payLogs = await PayFun.getPayLogs(call.uid, payIds) - let payLogLength = R.values(payLogs).filter(i => i.time < zeroTime).length + 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: []}))) } From 0b18e39dd75e28b086a4bd2c3f5722ca15f4c4ae Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 15 Dec 2023 10:30:37 +0800 Subject: [PATCH 18/29] fix bug --- src/json/huodong.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/json/huodong.json5 b/src/json/huodong.json5 index bfae001..cb3f380 100644 --- a/src/json/huodong.json5 +++ b/src/json/huodong.json5 @@ -3279,7 +3279,7 @@ "hdid" : 9000, // 唯一活动id 周末礼包 "htype" : 9, // 后端唯一识别标识 "stype" : 900, // 前端唯一识别标识（看前端需要是否修改） - "ttype" : 0, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动 + "ttype" : 4, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动 "stime" : 0, // 活动开始天数 "rtime" : 30, // 活动显示结束天数 "etime" : 30, // 活动实际结束 From afd0eb93de24f98ed310cd6f651d8be5318712ac Mon Sep 17 00:00:00 2001 From: ciniao <4041990@qq.com> Date: Thu, 14 Dec 2023 20:42:22 +0800 Subject: [PATCH 19/29] =?UTF-8?q?=E6=88=98=E6=96=97=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/public/fight.ts | 31 ++++++++++++- src/shared/fightControl/Player.ts | 18 ++++++++ src/shared/fightControl/Role.ts | 20 ++++++++ src/shared/fightControl/fightBuff/buffBase.ts | 31 ++++++++----- src/shared/fightControl/fightCntrol.ts | 26 ++++++++++- .../passiveSkill/passiveSkillBase.ts | 46 +++++++++++-------- src/shared/fightControl/skill/skillBase.ts | 5 ++ 7 files changed, 142 insertions(+), 35 deletions(-) diff --git a/src/public/fight.ts b/src/public/fight.ts index 6194a0a..202369c 100644 --- a/src/public/fight.ts +++ b/src/public/fight.ts @@ -7,15 +7,42 @@ import {HeroShared} from '../shared/public/hero'; import {PlayerShared} from '../shared/public/player'; import {HeroFun} from './hero'; import {UserFun} from './user'; -import {re} from "mathjs"; +import {re, string} from "mathjs"; import {getGud} from './gud'; type fightType = 'tanxian' | 'pata' | 'jjc' | 'gbtx' | 'qjzzd' | 'meirishilian' | 'wzrycross'; + +let fights:{[key:string]:FightControl} = { + +}; +function clearFights (){ + //定时清理战斗 + setInterval(()=>{ + let now = Date.now(); + for (let key in fights){ + if (now - fights[key].startTime > 30000){ + console.log("清理战斗",key); + try{ + fights[key].release(); + }catch(e){ + console.error(e); + } + delete fights[key]; + } + } + },5000); +} +clearFights(); + export class FightFun { + static fightIndex:number = 0; static fight(data: joinFightData[], maxRoundNums = 30, fightType: "pvp" | "pve" = 'pvp') { - return new FightControl(data, maxRoundNums, fightType).getResult(); + this.fightIndex++; + fights[this.fightIndex] = new FightControl(data, maxRoundNums, fightType); + + return fights[this.fightIndex].getResult(); } /**获取玩家数据 */ diff --git a/src/shared/fightControl/Player.ts b/src/shared/fightControl/Player.ts index ed5e2db..3b62232 100644 --- a/src/shared/fightControl/Player.ts +++ b/src/shared/fightControl/Player.ts @@ -5,6 +5,7 @@ import * as BuffClass from './fightBuff/buffExtends'; import { FightControl } from "./fightCntrol"; import { getSkillConf, randNumber, randomSkill } from "./fightFun"; import { buffDataType, dpsinfoType, joinFightData, modifyHpType, roleDataType } from "./fightType"; +import { PassiveSkillBase } from "./passiveSkill/passiveSkillBase"; import { runPassiveSkillBase } from "./passiveSkill/runPassiveSkill"; import { SkillBase } from "./skill/skillBase"; @@ -24,6 +25,23 @@ export class Player { get lockHp() { return false; } get rolePlayer() { return this } + release(){ + for(let buffid in this.buffs){ + this.buffs[buffid].release(); + } + for(let passiveid in this.passiveSkills){ + this.passiveSkills[passiveid].release(); + } + this.curAtkSkill?.release(); + this.curAtkSkill = null; + this.skillTargets = null; + this.lastSkillTargets = null; + this.lastSkillId = null; + this.lastHitMe = null; + this.buffs = null; + this.passiveSkills = null; + } + skillIdx = 0; skillLv = 1; hudunzhi = 0; diff --git a/src/shared/fightControl/Role.ts b/src/shared/fightControl/Role.ts index f875593..faabbcc 100644 --- a/src/shared/fightControl/Role.ts +++ b/src/shared/fightControl/Role.ts @@ -20,6 +20,7 @@ import { import {runPassiveSkillBase} from "./passiveSkill/runPassiveSkill"; import {SkillBase} from "./skill/skillBase"; import { PublicShared } from "../public/public"; +import { PassiveSkillBase } from "./passiveSkill/passiveSkillBase"; export class Role { rid: string; @@ -37,6 +38,23 @@ export class Role { hudunzhi = 0; addpkNum = 0; + release(){ + for(let buffid in this.buffs){ + this.buffs[buffid].release(); + } + for(let passiveid in this.passiveSkills){ + this.passiveSkills[passiveid].release(); + } + this.curAtkSkill?.release(); + this.curAtkSkill = null; + this.skillTargets = null; + this.lastSkillTargets = null; + this.lastSkillId = null; + this._lastHitMe = null; + this.buffs = null; + this.passiveSkills = null; + } + get skillId() { let heroId = this.roleData.heroId; let jieji = this.roleData.jieji || 0; @@ -102,6 +120,8 @@ export class Role { // fromRole行动的角色 // skillConf 使用的技能 // toRole 目标 + //上一个指针release + this.curAtkSkill?.release(); this.curAtkSkill = this.runSkillClass(); this.bloodReturn(); this.debug(() => { diff --git a/src/shared/fightControl/fightBuff/buffBase.ts b/src/shared/fightControl/fightBuff/buffBase.ts index 002d298..5bfcf71 100644 --- a/src/shared/fightControl/fightBuff/buffBase.ts +++ b/src/shared/fightControl/fightBuff/buffBase.ts @@ -17,6 +17,13 @@ export class BuffBase { this._BuffId = 'BuffId_' + idx; this.startRound = this.role.fightControl.roundNums; } + + release(){ + this.clear('release'); + this.altAttr = null; + this.role = null; + } + start() { let skillConf = this.data.skillConf; this.remainingRounds = skillConf.round; @@ -119,17 +126,19 @@ export class BuffBase { buffType = Object.keys(this.data.skillConf.xiaoguocanshu).join(','); } // 字符串以逗号分隔转换为数组 - let buffTypeArr = buffType.split(',') - buffTypeArr.forEach(buffTypeStr => { - this.role.fightControl.record({ - act: 'delBuff', - fromRole: this.role.rid, - skillId: this.data.buffid, - buffType: buffTypeStr, - buffId: this._BuffId, - why: when - }); - }) + if(when != "release"){ + let buffTypeArr = buffType.split(',') + buffTypeArr.forEach(buffTypeStr => { + this.role.fightControl.record({ + act: 'delBuff', + fromRole: this.role.rid, + skillId: this.data.buffid, + buffType: buffTypeStr, + buffId: this._BuffId, + why: when + }); + }) + } this.willClear(); // this.role.fightControl.event.emit('fight_buffClear', this.data); let buffid = this.data.buffid; diff --git a/src/shared/fightControl/fightCntrol.ts b/src/shared/fightControl/fightCntrol.ts index d2ba892..4db74c9 100644 --- a/src/shared/fightControl/fightCntrol.ts +++ b/src/shared/fightControl/fightCntrol.ts @@ -6,9 +6,10 @@ import { Player } from "./Player"; import { Role } from "./Role"; export class FightControl { - //所有战斗成员 + startTime: number = Date.now(); + //所有战斗成员，包含双方的所有“伙伴” fightRoles: k_v = {}; - + //所有战斗对象，包含了双方的“伙伴”和“主角” fightRolesArr: FightObj[] = []; fightOver = false; roundNums = 0; @@ -18,6 +19,7 @@ export class FightControl { initial: joinFightData[]; winSide: number; totalDamage = { "0": 0, "1": 0 }; + //战斗统计 fightStatistics: { [k: string]: { [k: string]: number; }; } = {}; player_0: FightObj = null; player_1: FightObj = null; @@ -29,6 +31,26 @@ export class FightControl { this.startTurnRound(); } + /** + * 释放内存资源 + */ + release(){ + this.fightRolesArr.map( obj =>{ + obj?.release(); + }); + this.fightRoles = null; + this.fightRolesArr = null; + this.recordData = null; + this.event.removeAllListeners(); + this.event = null; + this.initial = null; + this.fightStatistics = null; + this.player_0 = null; + this.player_1 = null; + this.recordSkillDps = null; + this.DATA = null; + } + initControl() { // this.event.setMaxListeners(1000); } diff --git a/src/shared/fightControl/passiveSkill/passiveSkillBase.ts b/src/shared/fightControl/passiveSkill/passiveSkillBase.ts index ad15ed7..f0b37e4 100644 --- a/src/shared/fightControl/passiveSkill/passiveSkillBase.ts +++ b/src/shared/fightControl/passiveSkill/passiveSkillBase.ts @@ -103,6 +103,11 @@ export class PassiveSkillBase { this._passiveId = 'passiveSkill_' + idx; this.skillConf = this.skillInfo.skillConf; } + release(){ + this.clear('release'); + this.skillConf = null; + this._timers = null; + } start() { this._initEvent(); @@ -112,10 +117,10 @@ export class PassiveSkillBase { _initEvent() { let _when = this.skillConf.chkdata.when; let toRole = this.skillInfo.toRole; - if (_when == 'ontime') { - //定时触发 或者 频率触发 - this._whenOntime(); - } else { + // if (_when == 'ontime') { + // //定时触发 或者 频率触发 + // this._whenOntime(); + // } else { this._checkFunc = (emitData) => { toRole.debug(() => { console.log('### passiveskill checkEmit', 'fightEvent_' + _when, this.skillConf.skillid); @@ -123,7 +128,7 @@ export class PassiveSkillBase { this.checkEmit(emitData); }; toRole.fightControl.event.on('fightEvent_' + _when, this._checkFunc.bind(this), this); - } + //} } checkEmit(emitData: EmitDataType) { @@ -161,21 +166,22 @@ export class PassiveSkillBase { this.remainingRounds--; } - _whenOntime() { - let time = this.skillConf.chkdata.time; - if (!time) return; - this._timers.push(setTimeout(() => { - this.doAtk(); - }, time)); - } + //不能也不应该有这样的逻辑，这是个回合制游戏！ + // _whenOntime() { + // let time = this.skillConf.chkdata.time; + // if (!time) return; + // this._timers.push(setTimeout(() => { + // this.doAtk(); + // }, time)); + // } - _doNextOntime() { - let pinlvtime = this.skillConf.chkdata.pinlvtime; - if (!pinlvtime) return; - this._timers.push(setTimeout(() => { - this.doAtk(); - }, pinlvtime)); - } + // _doNextOntime() { + // let pinlvtime = this.skillConf.chkdata.pinlvtime; + // if (!pinlvtime) return; + // this._timers.push(setTimeout(() => { + // this.doAtk(); + // }, pinlvtime)); + // } /** 清除执行次数限制的被动 */ _clearOnceSkill() { @@ -188,7 +194,7 @@ export class PassiveSkillBase { doAtk(emitData?: EmitDataType) { this._triggerCount++; this._clearOnceSkill(); - this._doNextOntime(); + //this._doNextOntime(); } clear(why: string) { diff --git a/src/shared/fightControl/skill/skillBase.ts b/src/shared/fightControl/skill/skillBase.ts index 98faa71..deb8f00 100644 --- a/src/shared/fightControl/skill/skillBase.ts +++ b/src/shared/fightControl/skill/skillBase.ts @@ -11,6 +11,11 @@ export class SkillBase { this.checkAtk(); } + release(){ + this.clear(); + this.toRole = null; + } + onRoleClear(why?: string) { } From b39d0055ef353d4657a58061584f5f69f9d2c418 Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 12:01:38 +0800 Subject: [PATCH 20/29] fix bug --- src/public/pay.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/public/pay.ts b/src/public/pay.ts index 8c48aa5..ef43757 100644 --- a/src/public/pay.ts +++ b/src/public/pay.ts @@ -61,10 +61,13 @@ export class PayFun { {$set: {del_time: G.time}}, {upsert: true} ); - }) - G.mongodb.collection('payLogNew').insertMany(args.map(i => ({key: i.payId, uid: uid, values: i.val}))); + G.mongodb.collection('payLogNew').insertMany(args.filter(v => v.payId && v.val).map(i => ({ + key: i.payId, + uid: uid, + values: i.val + }))); G.server.sendMsgByUid(uid, 'msg_s2c/PayChange', Object.fromEntries(args.map(a => [a.payId, a.val]))); } From 87820f669a7b5d5d1502de479a3150efb12e89ad Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 12:17:58 +0800 Subject: [PATCH 21/29] fix bug --- src/api_s2c/event/zhoumolibao/ApiOpen.ts | 3 +-- src/public/pay.ts | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/api_s2c/event/zhoumolibao/ApiOpen.ts b/src/api_s2c/event/zhoumolibao/ApiOpen.ts index 87bcca0..2401e66 100644 --- a/src/api_s2c/event/zhoumolibao/ApiOpen.ts +++ b/src/api_s2c/event/zhoumolibao/ApiOpen.ts @@ -16,7 +16,6 @@ export default async function (call: ApiCall) { record: data?.record || {}, buyLog: await PayFun.getPayLogs(call.uid, payIds) }) - checkResetBuyLog(call) } export async function getConf(call, args?: { id?: string; payId?: string }) { @@ -45,6 +44,6 @@ export async function checkResetBuyLog(call) { 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: []}))) + PayFun.delPayLog(call.uid, ...payIds.map(i => ({payId: i, val: []}))) } } \ No newline at end of file diff --git a/src/public/pay.ts b/src/public/pay.ts index ef43757..9a72587 100644 --- a/src/public/pay.ts +++ b/src/public/pay.ts @@ -63,11 +63,7 @@ export class PayFun { ); }) - G.mongodb.collection('payLogNew').insertMany(args.filter(v => v.payId && v.val).map(i => ({ - key: i.payId, - uid: uid, - values: i.val - }))); + G.mongodb.collection('payLogNew').insertMany(args.map(i => ({key: i.payId, uid: uid, values: i.val}))); G.server.sendMsgByUid(uid, 'msg_s2c/PayChange', Object.fromEntries(args.map(a => [a.payId, a.val]))); } From 28d01f586a325117d14eee1c8727181090f18d17 Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 14:28:42 +0800 Subject: [PATCH 22/29] cehua json --- src/json/pay.json | 398 ++++++++++++++++++++++++++++++++++- src/json/skill_afteratk.json | 16 +- src/json/skill_buff.json | 8 +- 3 files changed, 403 insertions(+), 19 deletions(-) diff --git a/src/json/pay.json b/src/json/pay.json index 2129268..cc8e283 100644 --- a/src/json/pay.json +++ b/src/json/pay.json @@ -425,6 +425,11 @@ "a": "attr", "t": "rmbmoney", "n": 980 + }, + { + "a": "hero", + "t": "4012", + "n": 1 } ], "firstPayPrize": [], @@ -455,7 +460,7 @@ { "a": "item", "t": "4", - "n": 5 + "n": 30 } ], "firstPayPrize": [], @@ -481,12 +486,12 @@ { "a": "attr", "t": "rmbmoney", - "n": 980 + "n": 5000 }, { - "a": "item", - "t": "4", - "n": 10 + "a": "attr", + "t": "rmbmoney", + "n": 5000 } ], "firstPayPrize": [], @@ -3587,7 +3592,13 @@ "wkdlibao_1": { "id": "wkdlibao_1", "money": 1, - "payExp": "[{\"a\": \"attr\", \"t\": \"payExp\", \"n\":10]", + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 10 + } + ], "prize": [], "firstPayPrize": [], "name": "pay_name_wkdlibao_1", @@ -3717,5 +3728,378 @@ "needVip": 0, "front": {}, "currency": "CNY" - } + }, + "guanqialibao_1": { + "id": "guanqialibao_1", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 50 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 600 + } + ], + "firstPayPrize": [], + "name": "pay_name_guanqialibao_1", + "undefined": "关卡礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "guanqialibao_2": { + "id": "guanqialibao_2", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 100 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 1360 + } + ], + "firstPayPrize": [], + "name": "pay_name_guanqialibao_2", + "undefined": "关卡礼包_30", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "guanqialibao_3": { + "id": "guanqialibao_3", + "money": 68, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 680 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 200 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 2560 + } + ], + "firstPayPrize": [], + "name": "pay_name_guanqialibao_3", + "undefined": "关卡礼包_68", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "daojulibao_1": { + "id": "daojulibao_1", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 50 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 700 + } + ], + "firstPayPrize": [], + "name": "pay_name_daojulibao_1", + "undefined": "道具礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "daojulibao_2": { + "id": "daojulibao_2", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 100 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 1260 + } + ], + "firstPayPrize": [], + "name": "pay_name_daojulibao_2", + "undefined": "道具礼包_30", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "daojulibao_3": { + "id": "daojulibao_3", + "money": 68, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 680 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 200 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 2660 + } + ], + "firstPayPrize": [], + "name": "pay_name_daojulibao_3", + "undefined": "道具礼包_68", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "zhanbailibao_1": { + "id": "zhanbailibao_1", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 200 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 2660 + } + ], + "firstPayPrize": [], + "name": "pay_name_zhanbailibao_1", + "undefined": "战败礼包_68", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "zhanbailibao_2": { + "id": "zhanbailibao_2", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 200 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 2660 + } + ], + "firstPayPrize": [], + "name": "pay_name_zhanbailibao_2", + "undefined": "战败礼包_68", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "zhanbailibao_3": { + "id": "zhanbailibao_3", + "money": 68, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 680 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 200 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 2660 + } + ], + "firstPayPrize": [], + "name": "pay_name_zhanbailibao_3", + "undefined": "战败礼包_68", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "choukalibao_1": { + "id": "choukalibao_1", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 200 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 2660 + } + ], + "firstPayPrize": [], + "name": "pay_name_choukalibao_1", + "undefined": "抽卡礼包_68", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "choukalibao_2": { + "id": "choukalibao_2", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 200 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 2660 + } + ], + "firstPayPrize": [], + "name": "pay_name_choukalibao_2", + "undefined": "抽卡礼包_68", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "choukalibao_3": { + "id": "choukalibao_3", + "money": 68, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 680 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 200 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 2660 + } + ], + "firstPayPrize": [], + "name": "pay_name_choukalibao_3", + "undefined": "抽卡礼包_68", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "undefined": {} } \ No newline at end of file diff --git a/src/json/skill_afteratk.json b/src/json/skill_afteratk.json index 630f4c5..ee79b07 100644 --- a/src/json/skill_afteratk.json +++ b/src/json/skill_afteratk.json @@ -1002,7 +1002,7 @@ "side": 4, "randnum": 1, "order": "rand", - "limit": 2, + "limit": 3, "data": { "pro": 0.95 }, @@ -1011,7 +1011,7 @@ "mofa": 0, "islong": 0 }, - "describe": "普通攻击替换为随机攻击2个目标，造成基础伤害95%的物理伤害" + "describe": "普通攻击替换为随机攻击3个目标，造成基础伤害95%的物理伤害" }, "4002201": { "skillid": 4002201, @@ -1020,7 +1020,7 @@ "side": 4, "randnum": 1, "order": "rand", - "limit": 2, + "limit": 3, "data": { "pro": 1.14 }, @@ -1029,7 +1029,7 @@ "mofa": 0, "islong": 0 }, - "describe": "普通攻击替换为随机攻击2个目标，造成基础伤害114%的物理伤害" + "describe": "普通攻击替换为随机攻击3个目标，造成基础伤害114%的物理伤害" }, "4003200": { "skillid": 4003200, @@ -1202,11 +1202,11 @@ "order": "rand", "limit": 6, "data": { - "pro": 0.11 + "pro": 0.13 }, "chkdata": {}, "ext": {}, - "describe": "每次行动前，50%几率恢复己方所有成员11%的最大生命值" + "describe": "每次行动前，50%几率恢复己方所有成员13%的最大生命值" }, "4005203": { "skillid": 4005203, @@ -1217,11 +1217,11 @@ "order": "rand", "limit": 6, "data": { - "pro": 0.11 + "pro": 0.13 }, "chkdata": {}, "ext": {}, - "describe": "每次行动前，75%几率恢复己方所有成员11%的最大生命值" + "describe": "每次行动前，75%几率恢复己方所有成员13%的最大生命值" }, "4006200": { "skillid": 4006200, diff --git a/src/json/skill_buff.json b/src/json/skill_buff.json index 57be4e5..5c3cdb0 100644 --- a/src/json/skill_buff.json +++ b/src/json/skill_buff.json @@ -739,14 +739,14 @@ "sxleixing": "zhongdu", "buff_type": 2, "xiaoguocanshu": { - "pro": 0.15, + "pro": 0.18, "type": "hp" }, "round": 2, "group": 4012300, "jiejiaxiaoguo": "retime", "diejiacengshu": 1, - "describe": "行动时，有18%概率使敌方随机4个目标中毒（每回合降低15%当前生命，对部分强力生物效果降低），持续2回合（技能）" + "describe": "行动时，有18%概率使敌方随机4个目标中毒（每回合降低18%当前生命，对部分强力生物效果降低），持续2回合（技能）" }, "4012301": { "skillid": 4012301, @@ -759,14 +759,14 @@ "sxleixing": "zhongdu", "buff_type": 2, "xiaoguocanshu": { - "pro": 0.15, + "pro": 0.18, "type": "hp" }, "round": 2, "group": 4012301, "jiejiaxiaoguo": "retime", "diejiacengshu": 1, - "describe": "行动时，有25%概率使敌方随机4个目标中毒（每回合降低15%当前生命，对部分强力生物效果降低），持续2回合（技能）" + "describe": "行动时，有25%概率使敌方随机4个目标中毒（每回合降低18%当前生命，对部分强力生物效果降低），持续2回合（技能）" }, "4012302": { "skillid": 4012302, From 5bebf3660090609751073057ed73a117eabf2f4f Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 14:28:42 +0800 Subject: [PATCH 23/29] cehua json --- src/json/pay.json | 398 ++++++++++++++++++++++++++++++++++- src/json/skill_afteratk.json | 16 +- src/json/skill_buff.json | 8 +- 3 files changed, 403 insertions(+), 19 deletions(-) diff --git a/src/json/pay.json b/src/json/pay.json index 2129268..cc8e283 100644 --- a/src/json/pay.json +++ b/src/json/pay.json @@ -425,6 +425,11 @@ "a": "attr", "t": "rmbmoney", "n": 980 + }, + { + "a": "hero", + "t": "4012", + "n": 1 } ], "firstPayPrize": [], @@ -455,7 +460,7 @@ { "a": "item", "t": "4", - "n": 5 + "n": 30 } ], "firstPayPrize": [], @@ -481,12 +486,12 @@ { "a": "attr", "t": "rmbmoney", - "n": 980 + "n": 5000 }, { - "a": "item", - "t": "4", - "n": 10 + "a": "attr", + "t": "rmbmoney", + "n": 5000 } ], "firstPayPrize": [], @@ -3587,7 +3592,13 @@ "wkdlibao_1": { "id": "wkdlibao_1", "money": 1, - "payExp": "[{\"a\": \"attr\", \"t\": \"payExp\", \"n\":10]", + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 10 + } + ], "prize": [], "firstPayPrize": [], "name": "pay_name_wkdlibao_1", @@ -3717,5 +3728,378 @@ "needVip": 0, "front": {}, "currency": "CNY" - } + }, + "guanqialibao_1": { + "id": "guanqialibao_1", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 50 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 600 + } + ], + "firstPayPrize": [], + "name": "pay_name_guanqialibao_1", + "undefined": "关卡礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "guanqialibao_2": { + "id": "guanqialibao_2", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 100 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 1360 + } + ], + "firstPayPrize": [], + "name": "pay_name_guanqialibao_2", + "undefined": "关卡礼包_30", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "guanqialibao_3": { + "id": "guanqialibao_3", + "money": 68, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 680 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 200 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 2560 + } + ], + "firstPayPrize": [], + "name": "pay_name_guanqialibao_3", + "undefined": "关卡礼包_68", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "daojulibao_1": { + "id": "daojulibao_1", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 50 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 700 + } + ], + "firstPayPrize": [], + "name": "pay_name_daojulibao_1", + "undefined": "道具礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "daojulibao_2": { + "id": "daojulibao_2", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 100 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 1260 + } + ], + "firstPayPrize": [], + "name": "pay_name_daojulibao_2", + "undefined": "道具礼包_30", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "daojulibao_3": { + "id": "daojulibao_3", + "money": 68, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 680 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 200 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 2660 + } + ], + "firstPayPrize": [], + "name": "pay_name_daojulibao_3", + "undefined": "道具礼包_68", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "zhanbailibao_1": { + "id": "zhanbailibao_1", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 200 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 2660 + } + ], + "firstPayPrize": [], + "name": "pay_name_zhanbailibao_1", + "undefined": "战败礼包_68", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "zhanbailibao_2": { + "id": "zhanbailibao_2", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 200 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 2660 + } + ], + "firstPayPrize": [], + "name": "pay_name_zhanbailibao_2", + "undefined": "战败礼包_68", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "zhanbailibao_3": { + "id": "zhanbailibao_3", + "money": 68, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 680 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 200 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 2660 + } + ], + "firstPayPrize": [], + "name": "pay_name_zhanbailibao_3", + "undefined": "战败礼包_68", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "choukalibao_1": { + "id": "choukalibao_1", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 200 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 2660 + } + ], + "firstPayPrize": [], + "name": "pay_name_choukalibao_1", + "undefined": "抽卡礼包_68", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "choukalibao_2": { + "id": "choukalibao_2", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 200 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 2660 + } + ], + "firstPayPrize": [], + "name": "pay_name_choukalibao_2", + "undefined": "抽卡礼包_68", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "choukalibao_3": { + "id": "choukalibao_3", + "money": 68, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 680 + } + ], + "prize": [ + { + "a": "item", + "t": "49", + "n": 200 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 2660 + } + ], + "firstPayPrize": [], + "name": "pay_name_choukalibao_3", + "undefined": "抽卡礼包_68", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "undefined": {} } \ No newline at end of file diff --git a/src/json/skill_afteratk.json b/src/json/skill_afteratk.json index 630f4c5..ee79b07 100644 --- a/src/json/skill_afteratk.json +++ b/src/json/skill_afteratk.json @@ -1002,7 +1002,7 @@ "side": 4, "randnum": 1, "order": "rand", - "limit": 2, + "limit": 3, "data": { "pro": 0.95 }, @@ -1011,7 +1011,7 @@ "mofa": 0, "islong": 0 }, - "describe": "普通攻击替换为随机攻击2个目标，造成基础伤害95%的物理伤害" + "describe": "普通攻击替换为随机攻击3个目标，造成基础伤害95%的物理伤害" }, "4002201": { "skillid": 4002201, @@ -1020,7 +1020,7 @@ "side": 4, "randnum": 1, "order": "rand", - "limit": 2, + "limit": 3, "data": { "pro": 1.14 }, @@ -1029,7 +1029,7 @@ "mofa": 0, "islong": 0 }, - "describe": "普通攻击替换为随机攻击2个目标，造成基础伤害114%的物理伤害" + "describe": "普通攻击替换为随机攻击3个目标，造成基础伤害114%的物理伤害" }, "4003200": { "skillid": 4003200, @@ -1202,11 +1202,11 @@ "order": "rand", "limit": 6, "data": { - "pro": 0.11 + "pro": 0.13 }, "chkdata": {}, "ext": {}, - "describe": "每次行动前，50%几率恢复己方所有成员11%的最大生命值" + "describe": "每次行动前，50%几率恢复己方所有成员13%的最大生命值" }, "4005203": { "skillid": 4005203, @@ -1217,11 +1217,11 @@ "order": "rand", "limit": 6, "data": { - "pro": 0.11 + "pro": 0.13 }, "chkdata": {}, "ext": {}, - "describe": "每次行动前，75%几率恢复己方所有成员11%的最大生命值" + "describe": "每次行动前，75%几率恢复己方所有成员13%的最大生命值" }, "4006200": { "skillid": 4006200, diff --git a/src/json/skill_buff.json b/src/json/skill_buff.json index 57be4e5..5c3cdb0 100644 --- a/src/json/skill_buff.json +++ b/src/json/skill_buff.json @@ -739,14 +739,14 @@ "sxleixing": "zhongdu", "buff_type": 2, "xiaoguocanshu": { - "pro": 0.15, + "pro": 0.18, "type": "hp" }, "round": 2, "group": 4012300, "jiejiaxiaoguo": "retime", "diejiacengshu": 1, - "describe": "行动时，有18%概率使敌方随机4个目标中毒（每回合降低15%当前生命，对部分强力生物效果降低），持续2回合（技能）" + "describe": "行动时，有18%概率使敌方随机4个目标中毒（每回合降低18%当前生命，对部分强力生物效果降低），持续2回合（技能）" }, "4012301": { "skillid": 4012301, @@ -759,14 +759,14 @@ "sxleixing": "zhongdu", "buff_type": 2, "xiaoguocanshu": { - "pro": 0.15, + "pro": 0.18, "type": "hp" }, "round": 2, "group": 4012301, "jiejiaxiaoguo": "retime", "diejiacengshu": 1, - "describe": "行动时，有25%概率使敌方随机4个目标中毒（每回合降低15%当前生命，对部分强力生物效果降低），持续2回合（技能）" + "describe": "行动时，有25%概率使敌方随机4个目标中毒（每回合降低18%当前生命，对部分强力生物效果降低），持续2回合（技能）" }, "4012302": { "skillid": 4012302, From f07b1fc0b782032ba106c8eaf0fd77cea97d1522 Mon Sep 17 00:00:00 2001 From: ciniao <4041990@qq.com> Date: Fri, 15 Dec 2023 14:41:10 +0800 Subject: [PATCH 24/29] =?UTF-8?q?mdb=E7=A9=BA=E9=97=B2=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gameLog.ts | 5 ++++- src/setMongodb.ts | 20 +++++++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/gameLog.ts b/src/gameLog.ts index 04e8c09..7f70f2c 100644 --- a/src/gameLog.ts +++ b/src/gameLog.ts @@ -9,7 +9,10 @@ async function connGameLogDB() { }else{ logDBUrl = "mongodb://root:lyMaple525458@10.0.1.20:27017/heijiao_gamelog?authSource=admin"; } - let client = await MongoClient.connect(logDBUrl,{maxPoolSize:10}); + let client = await MongoClient.connect(logDBUrl,{ + maxPoolSize:10, + maxIdleTimeMS: 5*60*1000 + }); logDB = client.db(`gameLog${G.config.serverId}`); return logDB; } diff --git a/src/setMongodb.ts b/src/setMongodb.ts index 8ab7e8b..b157290 100644 --- a/src/setMongodb.ts +++ b/src/setMongodb.ts @@ -441,13 +441,22 @@ export async function initMongoDB() { //可结合查看：node_modules\mongodb\lib\connection_string.js //maxPoolSize默认值：100 - let option:MongoClientOptions; + /** + * MongoDB连接池具有多个参数，用于控制连接池的行为和性能。下面是一些常用的连接池参数及其作用： + * maxPoolSize：连接池的最大连接数。默认值为100。该参数决定了连接池中可以同时存在的最大连接数，超过这个数量后，新的连接请求会被阻塞。 + * minPoolSize：连接池的最小连接数。默认值为0。该参数决定了连接池中保持的最小连接数，当连接数少于这个数量时，连接池会自动创建新的连接实例。 + * maxIdleTimeMS：连接的最大空闲时间（毫秒）。默认值为0，表示连接不会被强制断开。该参数决定了连接在空闲一定时间后是否被断开，以释放服务器资源。 + * waitQueueTimeoutMS：连接请求的等待时间（毫秒）。默认值为0，表示无限等待。当连接池达到最大连接数时，新的连接请求会被放入等待队列中，该参数决定了连接请求在队列中的最长等待时间。 + */ + + let option:MongoClientOptions = { + //空闲5分钟后关闭 + maxIdleTimeMS: 5*60*1000 + }; //跨服只有1个，直接采用默认配置就行 if(G.argv.serverType != 'cross'){ if(PublicShared.getOpenServerDay() > 3){ - option = { - maxPoolSize: 10 - } + option.maxPoolSize=10; } } @@ -461,7 +470,8 @@ export async function initMongoDB() { console.log('connect crossmongodb ......'); //本服里，维持住跟跨服数据库的链接 let crossClient = await MongoClient.connect(G.config.crossMongodbUrl,{ - maxPoolSize:10 + maxPoolSize:10, + maxIdleTimeMS: 5*60*1000 }); G.crossmongodb = new _mongodb(crossClient.db(G.config.corssDBName || "")); console.log('connect crossmongodb succ'); From 461803f4d385f05898026476cc170927c2d0a2e0 Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 15:09:29 +0800 Subject: [PATCH 25/29] Revert "cehua json" This reverts commit 5bebf3660090609751073057ed73a117eabf2f4f. --- src/json/pay.json | 398 +---------------------------------- src/json/skill_afteratk.json | 16 +- src/json/skill_buff.json | 8 +- 3 files changed, 19 insertions(+), 403 deletions(-) diff --git a/src/json/pay.json b/src/json/pay.json index cc8e283..2129268 100644 --- a/src/json/pay.json +++ b/src/json/pay.json @@ -425,11 +425,6 @@ "a": "attr", "t": "rmbmoney", "n": 980 - }, - { - "a": "hero", - "t": "4012", - "n": 1 } ], "firstPayPrize": [], @@ -460,7 +455,7 @@ { "a": "item", "t": "4", - "n": 30 + "n": 5 } ], "firstPayPrize": [], @@ -486,12 +481,12 @@ { "a": "attr", "t": "rmbmoney", - "n": 5000 + "n": 980 }, { - "a": "attr", - "t": "rmbmoney", - "n": 5000 + "a": "item", + "t": "4", + "n": 10 } ], "firstPayPrize": [], @@ -3592,13 +3587,7 @@ "wkdlibao_1": { "id": "wkdlibao_1", "money": 1, - "payExp": [ - { - "a": "attr", - "t": "payExp", - "n": 10 - } - ], + "payExp": "[{\"a\": \"attr\", \"t\": \"payExp\", \"n\":10]", "prize": [], "firstPayPrize": [], "name": "pay_name_wkdlibao_1", @@ -3728,378 +3717,5 @@ "needVip": 0, "front": {}, "currency": "CNY" - }, - "guanqialibao_1": { - "id": "guanqialibao_1", - "money": 6, - "payExp": [ - { - "a": "attr", - "t": "payExp", - "n": 60 - } - ], - "prize": [ - { - "a": "item", - "t": "49", - "n": 50 - }, - { - "a": "attr", - "t": "rmbmoney", - "n": 600 - } - ], - "firstPayPrize": [], - "name": "pay_name_guanqialibao_1", - "undefined": "关卡礼包_6", - "time": -1, - "buys": 1, - "needVip": 0, - "front": {}, - "currency": "CNY" - }, - "guanqialibao_2": { - "id": "guanqialibao_2", - "money": 30, - "payExp": [ - { - "a": "attr", - "t": "payExp", - "n": 300 - } - ], - "prize": [ - { - "a": "item", - "t": "49", - "n": 100 - }, - { - "a": "attr", - "t": "rmbmoney", - "n": 1360 - } - ], - "firstPayPrize": [], - "name": "pay_name_guanqialibao_2", - "undefined": "关卡礼包_30", - "time": -1, - "buys": 1, - "needVip": 0, - "front": {}, - "currency": "CNY" - }, - "guanqialibao_3": { - "id": "guanqialibao_3", - "money": 68, - "payExp": [ - { - "a": "attr", - "t": "payExp", - "n": 680 - } - ], - "prize": [ - { - "a": "item", - "t": "49", - "n": 200 - }, - { - "a": "attr", - "t": "rmbmoney", - "n": 2560 - } - ], - "firstPayPrize": [], - "name": "pay_name_guanqialibao_3", - "undefined": "关卡礼包_68", - "time": -1, - "buys": 1, - "needVip": 0, - "front": {}, - "currency": "CNY" - }, - "daojulibao_1": { - "id": "daojulibao_1", - "money": 6, - "payExp": [ - { - "a": "attr", - "t": "payExp", - "n": 60 - } - ], - "prize": [ - { - "a": "item", - "t": "49", - "n": 50 - }, - { - "a": "attr", - "t": "rmbmoney", - "n": 700 - } - ], - "firstPayPrize": [], - "name": "pay_name_daojulibao_1", - "undefined": "道具礼包_6", - "time": -1, - "buys": 1, - "needVip": 0, - "front": {}, - "currency": "CNY" - }, - "daojulibao_2": { - "id": "daojulibao_2", - "money": 30, - "payExp": [ - { - "a": "attr", - "t": "payExp", - "n": 300 - } - ], - "prize": [ - { - "a": "item", - "t": "49", - "n": 100 - }, - { - "a": "attr", - "t": "rmbmoney", - "n": 1260 - } - ], - "firstPayPrize": [], - "name": "pay_name_daojulibao_2", - "undefined": "道具礼包_30", - "time": -1, - "buys": 1, - "needVip": 0, - "front": {}, - "currency": "CNY" - }, - "daojulibao_3": { - "id": "daojulibao_3", - "money": 68, - "payExp": [ - { - "a": "attr", - "t": "payExp", - "n": 680 - } - ], - "prize": [ - { - "a": "item", - "t": "49", - "n": 200 - }, - { - "a": "attr", - "t": "rmbmoney", - "n": 2660 - } - ], - "firstPayPrize": [], - "name": "pay_name_daojulibao_3", - "undefined": "道具礼包_68", - "time": -1, - "buys": 1, - "needVip": 0, - "front": {}, - "currency": "CNY" - }, - "zhanbailibao_1": { - "id": "zhanbailibao_1", - "money": 6, - "payExp": [ - { - "a": "attr", - "t": "payExp", - "n": 60 - } - ], - "prize": [ - { - "a": "item", - "t": "49", - "n": 200 - }, - { - "a": "attr", - "t": "rmbmoney", - "n": 2660 - } - ], - "firstPayPrize": [], - "name": "pay_name_zhanbailibao_1", - "undefined": "战败礼包_68", - "time": -1, - "buys": 1, - "needVip": 0, - "front": {}, - "currency": "CNY" - }, - "zhanbailibao_2": { - "id": "zhanbailibao_2", - "money": 30, - "payExp": [ - { - "a": "attr", - "t": "payExp", - "n": 300 - } - ], - "prize": [ - { - "a": "item", - "t": "49", - "n": 200 - }, - { - "a": "attr", - "t": "rmbmoney", - "n": 2660 - } - ], - "firstPayPrize": [], - "name": "pay_name_zhanbailibao_2", - "undefined": "战败礼包_68", - "time": -1, - "buys": 1, - "needVip": 0, - "front": {}, - "currency": "CNY" - }, - "zhanbailibao_3": { - "id": "zhanbailibao_3", - "money": 68, - "payExp": [ - { - "a": "attr", - "t": "payExp", - "n": 680 - } - ], - "prize": [ - { - "a": "item", - "t": "49", - "n": 200 - }, - { - "a": "attr", - "t": "rmbmoney", - "n": 2660 - } - ], - "firstPayPrize": [], - "name": "pay_name_zhanbailibao_3", - "undefined": "战败礼包_68", - "time": -1, - "buys": 1, - "needVip": 0, - "front": {}, - "currency": "CNY" - }, - "choukalibao_1": { - "id": "choukalibao_1", - "money": 6, - "payExp": [ - { - "a": "attr", - "t": "payExp", - "n": 60 - } - ], - "prize": [ - { - "a": "item", - "t": "49", - "n": 200 - }, - { - "a": "attr", - "t": "rmbmoney", - "n": 2660 - } - ], - "firstPayPrize": [], - "name": "pay_name_choukalibao_1", - "undefined": "抽卡礼包_68", - "time": -1, - "buys": 1, - "needVip": 0, - "front": {}, - "currency": "CNY" - }, - "choukalibao_2": { - "id": "choukalibao_2", - "money": 30, - "payExp": [ - { - "a": "attr", - "t": "payExp", - "n": 300 - } - ], - "prize": [ - { - "a": "item", - "t": "49", - "n": 200 - }, - { - "a": "attr", - "t": "rmbmoney", - "n": 2660 - } - ], - "firstPayPrize": [], - "name": "pay_name_choukalibao_2", - "undefined": "抽卡礼包_68", - "time": -1, - "buys": 1, - "needVip": 0, - "front": {}, - "currency": "CNY" - }, - "choukalibao_3": { - "id": "choukalibao_3", - "money": 68, - "payExp": [ - { - "a": "attr", - "t": "payExp", - "n": 680 - } - ], - "prize": [ - { - "a": "item", - "t": "49", - "n": 200 - }, - { - "a": "attr", - "t": "rmbmoney", - "n": 2660 - } - ], - "firstPayPrize": [], - "name": "pay_name_choukalibao_3", - "undefined": "抽卡礼包_68", - "time": -1, - "buys": 1, - "needVip": 0, - "front": {}, - "currency": "CNY" - }, - "undefined": {} + } } \ No newline at end of file diff --git a/src/json/skill_afteratk.json b/src/json/skill_afteratk.json index ee79b07..630f4c5 100644 --- a/src/json/skill_afteratk.json +++ b/src/json/skill_afteratk.json @@ -1002,7 +1002,7 @@ "side": 4, "randnum": 1, "order": "rand", - "limit": 3, + "limit": 2, "data": { "pro": 0.95 }, @@ -1011,7 +1011,7 @@ "mofa": 0, "islong": 0 }, - "describe": "普通攻击替换为随机攻击3个目标，造成基础伤害95%的物理伤害" + "describe": "普通攻击替换为随机攻击2个目标，造成基础伤害95%的物理伤害" }, "4002201": { "skillid": 4002201, @@ -1020,7 +1020,7 @@ "side": 4, "randnum": 1, "order": "rand", - "limit": 3, + "limit": 2, "data": { "pro": 1.14 }, @@ -1029,7 +1029,7 @@ "mofa": 0, "islong": 0 }, - "describe": "普通攻击替换为随机攻击3个目标，造成基础伤害114%的物理伤害" + "describe": "普通攻击替换为随机攻击2个目标，造成基础伤害114%的物理伤害" }, "4003200": { "skillid": 4003200, @@ -1202,11 +1202,11 @@ "order": "rand", "limit": 6, "data": { - "pro": 0.13 + "pro": 0.11 }, "chkdata": {}, "ext": {}, - "describe": "每次行动前，50%几率恢复己方所有成员13%的最大生命值" + "describe": "每次行动前，50%几率恢复己方所有成员11%的最大生命值" }, "4005203": { "skillid": 4005203, @@ -1217,11 +1217,11 @@ "order": "rand", "limit": 6, "data": { - "pro": 0.13 + "pro": 0.11 }, "chkdata": {}, "ext": {}, - "describe": "每次行动前，75%几率恢复己方所有成员13%的最大生命值" + "describe": "每次行动前，75%几率恢复己方所有成员11%的最大生命值" }, "4006200": { "skillid": 4006200, diff --git a/src/json/skill_buff.json b/src/json/skill_buff.json index 5c3cdb0..57be4e5 100644 --- a/src/json/skill_buff.json +++ b/src/json/skill_buff.json @@ -739,14 +739,14 @@ "sxleixing": "zhongdu", "buff_type": 2, "xiaoguocanshu": { - "pro": 0.18, + "pro": 0.15, "type": "hp" }, "round": 2, "group": 4012300, "jiejiaxiaoguo": "retime", "diejiacengshu": 1, - "describe": "行动时，有18%概率使敌方随机4个目标中毒（每回合降低18%当前生命，对部分强力生物效果降低），持续2回合（技能）" + "describe": "行动时，有18%概率使敌方随机4个目标中毒（每回合降低15%当前生命，对部分强力生物效果降低），持续2回合（技能）" }, "4012301": { "skillid": 4012301, @@ -759,14 +759,14 @@ "sxleixing": "zhongdu", "buff_type": 2, "xiaoguocanshu": { - "pro": 0.18, + "pro": 0.15, "type": "hp" }, "round": 2, "group": 4012301, "jiejiaxiaoguo": "retime", "diejiacengshu": 1, - "describe": "行动时，有25%概率使敌方随机4个目标中毒（每回合降低18%当前生命，对部分强力生物效果降低），持续2回合（技能）" + "describe": "行动时，有25%概率使敌方随机4个目标中毒（每回合降低15%当前生命，对部分强力生物效果降低），持续2回合（技能）" }, "4012302": { "skillid": 4012302, From c3b6f8d9882b25530d78aeccc3656029515f9ef5 Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 15:10:05 +0800 Subject: [PATCH 26/29] cehua json --- src/json/pay.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/json/pay.json b/src/json/pay.json index 2129268..cf69fd2 100644 --- a/src/json/pay.json +++ b/src/json/pay.json @@ -3587,7 +3587,13 @@ "wkdlibao_1": { "id": "wkdlibao_1", "money": 1, - "payExp": "[{\"a\": \"attr\", \"t\": \"payExp\", \"n\":10]", + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 10 + } + ], "prize": [], "firstPayPrize": [], "name": "pay_name_wkdlibao_1", From 934097ec167437696e04699d78cd76d5ccc781cd Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 15:14:37 +0800 Subject: [PATCH 27/29] cehua json --- src/json/skill_afteratk.json | 8 ++++---- src/json/skill_buff.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/json/skill_afteratk.json b/src/json/skill_afteratk.json index 630f4c5..287a4dc 100644 --- a/src/json/skill_afteratk.json +++ b/src/json/skill_afteratk.json @@ -1011,7 +1011,7 @@ "mofa": 0, "islong": 0 }, - "describe": "普通攻击替换为随机攻击2个目标，造成基础伤害95%的物理伤害" + "describe": "普通攻击替换为随机攻击3个目标，造成基础伤害95%的物理伤害" }, "4002201": { "skillid": 4002201, @@ -1029,7 +1029,7 @@ "mofa": 0, "islong": 0 }, - "describe": "普通攻击替换为随机攻击2个目标，造成基础伤害114%的物理伤害" + "describe": "普通攻击替换为随机攻击3个目标，造成基础伤害114%的物理伤害" }, "4003200": { "skillid": 4003200, @@ -1206,7 +1206,7 @@ }, "chkdata": {}, "ext": {}, - "describe": "每次行动前，50%几率恢复己方所有成员11%的最大生命值" + "describe": "每次行动前，50%几率恢复己方所有成员13%的最大生命值" }, "4005203": { "skillid": 4005203, @@ -1221,7 +1221,7 @@ }, "chkdata": {}, "ext": {}, - "describe": "每次行动前，75%几率恢复己方所有成员11%的最大生命值" + "describe": "每次行动前，75%几率恢复己方所有成员13%的最大生命值" }, "4006200": { "skillid": 4006200, diff --git a/src/json/skill_buff.json b/src/json/skill_buff.json index 57be4e5..e7c9168 100644 --- a/src/json/skill_buff.json +++ b/src/json/skill_buff.json @@ -746,7 +746,7 @@ "group": 4012300, "jiejiaxiaoguo": "retime", "diejiacengshu": 1, - "describe": "行动时，有18%概率使敌方随机4个目标中毒（每回合降低15%当前生命，对部分强力生物效果降低），持续2回合（技能）" + "describe": "行动时，有18%概率使敌方随机4个目标中毒（每回合降低18%当前生命，对部分强力生物效果降低），持续2回合（技能）" }, "4012301": { "skillid": 4012301, @@ -766,7 +766,7 @@ "group": 4012301, "jiejiaxiaoguo": "retime", "diejiacengshu": 1, - "describe": "行动时，有25%概率使敌方随机4个目标中毒（每回合降低15%当前生命，对部分强力生物效果降低），持续2回合（技能）" + "describe": "行动时，有25%概率使敌方随机4个目标中毒（每回合降低18%当前生命，对部分强力生物效果降低），持续2回合（技能）" }, "4012302": { "skillid": 4012302, From 8d3b2178fc1765f59406157a19f6183ef3a09c12 Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 16:41:31 +0800 Subject: [PATCH 28/29] fix kuangdong --- src/api_s2c/kuangdong/ApiYanShi.ts | 22 ++++++++++++++-------- src/public/kuangdong.ts | 1 - 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/api_s2c/kuangdong/ApiYanShi.ts b/src/api_s2c/kuangdong/ApiYanShi.ts index f80c861..b19effd 100644 --- a/src/api_s2c/kuangdong/ApiYanShi.ts +++ b/src/api_s2c/kuangdong/ApiYanShi.ts @@ -1,24 +1,24 @@ -import { ApiCall } from "tsrpc"; -import { KuangDongfun } from "../../public/kuangdong"; -import { PlayerFun } from "../../public/player"; -import { ReqYanShi, ResYanShi } from "../../shared/protocols/kuangdong/PtlYanShi"; +import {ApiCall} from "tsrpc"; +import {KuangDongfun} from "../../public/kuangdong"; +import {PlayerFun} from "../../public/player"; +import {ReqYanShi, ResYanShi} from "../../shared/protocols/kuangdong/PtlYanShi"; export default async function (call: ApiCall) { let hdid = call.req.hdid let kdInfo = await KuangDongfun.getKaiCaiInfo(hdid) if (!kdInfo) { - return call.error('', { code: -1, message: globalThis.lng.kudangdong_1 }) + return call.error('', {code: -1, message: globalThis.lng.kudangdong_1}) } // 不是自己占领的 if (kdInfo.uid != call.uid) { - return call.error('', { code: -2, message: globalThis.lng.kudangdong_8 }) + return call.error('', {code: -2, message: globalThis.lng.kudangdong_8}) } // 已经延时 if (kdInfo.yanshi != 0) { - return call.error('', { code: -2, message: globalThis.lng.kudangdong_10 }) + return call.error('', {code: -2, message: globalThis.lng.kudangdong_10}) } // @ts-ignore @@ -30,7 +30,13 @@ export default async function (call: ApiCall) { _need && await PlayerFun.cutNeed(call, _need); kdInfo.yanshi = 8 * 3600 - await KuangDongfun.setminingZhanLing(call.uid, hdid, { $set: { yanshi: kdInfo.yanshi } }) + + // 如果调用这个方法，会upsert，在没有查到数据的情况下， + // 会插入空数据，全服玩家的查询列表接口都会报错 + // await KuangDongfun.setminingZhanLing(call.uid, hdid, { $set: { yanshi: kdInfo.yanshi } }) + await G.mongodb.collection('kuangdong').updateOne({uid: call.uid, hdid: hdid}, + {$set: {yanshi: kdInfo.yanshi}}); + kdInfo._id = kdInfo._id.toString() let changeData = { kdinfo: kdInfo diff --git a/src/public/kuangdong.ts b/src/public/kuangdong.ts index fe73d02..942759d 100644 --- a/src/public/kuangdong.ts +++ b/src/public/kuangdong.ts @@ -81,7 +81,6 @@ export class KuangDongfun { upsert: true } ); - } /**获取所有矿洞信息 */ From 14d691604e12259deeea4ad4b9649f9b85490d04 Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 16:47:34 +0800 Subject: [PATCH 29/29] proto --- src/shared/protocols/serviceProto.ts | 619 ++++++++++++--------------- 1 file changed, 284 insertions(+), 335 deletions(-) diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 218afc9..48d5f56 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -75,7 +75,6 @@ import { ReqRecPrize as ReqRecPrize_1, ResRecPrize as ResRecPrize_1 } from './ev import { ReqOpen as ReqOpen_18, ResOpen as ResOpen_18 } from './event/shiwuleichong/PtlOpen'; import { ReqRec as ReqRec_7, ResRec as ResRec_7 } from './event/shiwuleichong/PtlRec'; 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 { 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'; @@ -96,7 +95,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_2, ResReceive as ResReceive_2 } 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'; @@ -186,10 +185,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_3, ResReceive as ResReceive_3 } 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_4, ResReceive as ResReceive_4 } 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'; @@ -299,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_55, ResOpen as ResOpen_55 } from './tanxian/PtlOpen'; -import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } from './tanxian/PtlReceive'; +import { ReqReceive as ReqReceive_5, ResReceive as ResReceive_5 } 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'; @@ -338,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_59, ResOpen as ResOpen_59 } from './xstask/PtlOpen'; -import { ReqReceive as ReqReceive_7, ResReceive as ResReceive_7 } from './xstask/PtlReceive'; +import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } 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'; @@ -651,10 +650,6 @@ export interface ServiceType { req: ReqOpen_19, res: ResOpen_19 }, - "event/shouchong/Receive": { - req: ReqReceive_2, - res: ResReceive_2 - }, "event/xianshizhaomu/Buy": { req: ReqBuy_1, res: ResBuy_1 @@ -736,8 +731,8 @@ export interface ServiceType { res: ResOpen_27 }, "event/zhoumolibao/Receive": { - req: ReqReceive_3, - res: ResReceive_3 + req: ReqReceive_2, + res: ResReceive_2 }, "event/zixuanlibao/Buy": { req: ReqBuy_3, @@ -1096,8 +1091,8 @@ export interface ServiceType { res: ResOpen_40 }, "jjc/Receive": { - req: ReqReceive_4, - res: ResReceive_4 + req: ReqReceive_3, + res: ResReceive_3 }, "jjc/Refresh": { req: ReqRefresh_4, @@ -1108,8 +1103,8 @@ export interface ServiceType { res: ResOpen_41 }, "kaifujingsai/Receive": { - req: ReqReceive_5, - res: ResReceive_5 + req: ReqReceive_4, + res: ResReceive_4 }, "kbzz/Apply": { req: ReqApply_2, @@ -1432,8 +1427,8 @@ export interface ServiceType { res: ResOpen_55 }, "tanxian/Receive": { - req: ReqReceive_6, - res: ResReceive_6 + req: ReqReceive_5, + res: ResReceive_5 }, "task/AllFinsh": { req: ReqAllFinsh, @@ -1588,8 +1583,8 @@ export interface ServiceType { res: ResOpen_59 }, "xstask/Receive": { - req: ReqReceive_7, - res: ResReceive_7 + req: ReqReceive_6, + res: ResReceive_6 }, "xstask/Refresh": { req: ReqRefresh_8, @@ -2029,71 +2024,66 @@ export const serviceProto: ServiceProto = { }, { "id": 76, - "name": "event/shouchong/Receive", - "type": "api" - }, - { - "id": 77, "name": "event/xianshizhaomu/Buy", "type": "api" }, { - "id": 78, + "id": 77, "name": "event/xianshizhaomu/Duihuan", "type": "api" }, { - "id": 79, + "id": 78, "name": "event/xianshizhaomu/Lottery", "type": "api" }, { - "id": 80, + "id": 79, "name": "event/xianshizhaomu/Open", "type": "api" }, { - "id": 81, + "id": 80, "name": "event/xianshizhaomu/Rec", "type": "api" }, { - "id": 82, + "id": 81, "name": "event/xinshoulibao/Open", "type": "api" }, { - "id": 83, + "id": 82, "name": "event/yangchengmubiao/Buy", "type": "api" }, { - "id": 84, + "id": 83, "name": "event/yangchengmubiao/Open", "type": "api" }, { - "id": 85, + "id": 84, "name": "event/yangchengmubiao/Rec", "type": "api" }, { - "id": 86, + "id": 85, "name": "event/yibaichou/Open", "type": "api" }, { - "id": 87, + "id": 86, "name": "event/yibaichou/Rec", "type": "api" }, { - "id": 88, + "id": 87, "name": "event/yibaichou/RecAll", "type": "api" }, { - "id": 89, + "id": 88, "name": "event/yuedujijin/Open", "type": "api", "conf": { @@ -2101,157 +2091,157 @@ export const serviceProto: ServiceProto = { } }, { - "id": 90, + "id": 89, "name": "event/yuedujijin/Rec", "type": "api" }, { - "id": 91, + "id": 90, "name": "event/zhanling/BuyLv", "type": "api" }, { - "id": 92, + "id": 91, "name": "event/zhanling/Open", "type": "api" }, { - "id": 93, + "id": 92, "name": "event/zhanling/RecPrize", "type": "api" }, { - "id": 94, + "id": 93, "name": "event/zhanling/RecTask", "type": "api" }, { - "id": 95, + "id": 94, "name": "event/zhoulibao/Open", "type": "api" }, { - "id": 96, + "id": 95, "name": "event/zhoumolibao/Open", "type": "api" }, { - "id": 97, + "id": 96, "name": "event/zhoumolibao/Receive", "type": "api" }, { - "id": 98, + "id": 97, "name": "event/zixuanlibao/Buy", "type": "api" }, { - "id": 99, + "id": 98, "name": "event/zixuanlibao/Open", "type": "api" }, { - "id": 100, + "id": 99, "name": "eventlist/hdGetList", "type": "api" }, { - "id": 101, + "id": 100, "name": "friend/Apply", "type": "api" }, { - "id": 102, + "id": 101, "name": "friend/Del", "type": "api" }, { - "id": 103, + "id": 102, "name": "friend/Gift", "type": "api" }, { - "id": 104, + "id": 103, "name": "friend/List", "type": "api" }, { - "id": 105, + "id": 104, "name": "friend/Open", "type": "api" }, { - "id": 106, + "id": 105, "name": "friend/Respond", "type": "api" }, { - "id": 107, + "id": 106, "name": "friend/RmBlackList", "type": "api" }, { - "id": 108, + "id": 107, "name": "friend/Search", "type": "api" }, { - "id": 109, + "id": 108, "name": "ganbutexun/Challenge", "type": "api" }, { - "id": 110, + "id": 109, "name": "ganbutexun/Open", "type": "api" }, { - "id": 111, + "id": 110, "name": "ganhai/Fast", "type": "api" }, { - "id": 112, + "id": 111, "name": "ganhai/Fight", "type": "api" }, { - "id": 113, + "id": 112, "name": "ganhai/Log", "type": "api" }, { - "id": 114, + "id": 113, "name": "ganhai/Open", "type": "api" }, { - "id": 115, + "id": 114, "name": "ganhai/Refresh", "type": "api" }, { - "id": 116, + "id": 115, "name": "ganhai/RefreshShip", "type": "api" }, { - "id": 117, + "id": 116, "name": "ganhai/Select", "type": "api" }, { - "id": 118, + "id": 117, "name": "gmapi/Gift", "type": "api" }, { - "id": 119, + "id": 118, "name": "gmapi/Post", "type": "api" }, { - "id": 120, + "id": 119, "name": "gonghui/Apply", "type": "api", "conf": { @@ -2261,7 +2251,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 121, + "id": 120, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2271,7 +2261,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 122, + "id": 121, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2281,7 +2271,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 123, + "id": 122, "name": "gonghui/Change", "type": "api", "conf": { @@ -2291,12 +2281,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 124, + "id": 123, "name": "gonghui/Create", "type": "api" }, { - "id": 125, + "id": 124, "name": "gonghui/Dissolve", "type": "api", "conf": { @@ -2306,7 +2296,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 126, + "id": 125, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2316,12 +2306,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 127, + "id": 126, "name": "gonghui/FbBuyNum", "type": "api" }, { - "id": 128, + "id": 127, "name": "gonghui/FbFight", "type": "api", "conf": { @@ -2331,7 +2321,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 129, + "id": 128, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2341,17 +2331,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 130, + "id": 129, "name": "gonghui/GetList", "type": "api" }, { - "id": 131, + "id": 130, "name": "gonghui/Join", "type": "api" }, { - "id": 132, + "id": 131, "name": "gonghui/Jx", "type": "api", "conf": { @@ -2361,7 +2351,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 133, + "id": 132, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2371,7 +2361,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 134, + "id": 133, "name": "gonghui/List", "type": "api", "conf": { @@ -2381,7 +2371,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 135, + "id": 134, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2391,7 +2381,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 136, + "id": 135, "name": "gonghui/Open", "type": "api", "conf": { @@ -2401,7 +2391,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 137, + "id": 136, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2411,7 +2401,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 138, + "id": 137, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2421,7 +2411,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 139, + "id": 138, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2431,7 +2421,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 140, + "id": 139, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2441,137 +2431,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 141, + "id": 140, "name": "gonghuibaozang/Lottery", "type": "api" }, { - "id": 142, + "id": 141, "name": "gonghuibaozang/Open", "type": "api" }, { - "id": 143, + "id": 142, "name": "gonglukuangbiao/Buy", "type": "api" }, { - "id": 144, + "id": 143, "name": "gonglukuangbiao/Fight", "type": "api" }, { - "id": 145, + "id": 144, "name": "gonglukuangbiao/Open", "type": "api" }, { - "id": 146, + "id": 145, "name": "gonglukuangbiao/Refresh", "type": "api" }, { - "id": 147, + "id": 146, "name": "gongyu/mingdao/Active", "type": "api" }, { - "id": 148, + "id": 147, "name": "gongyu/mingdao/Open", "type": "api" }, { - "id": 149, + "id": 148, "name": "gongyu/mingdao/RecPrize", "type": "api" }, { - "id": 150, + "id": 149, "name": "gongyu/mingdao/Repair", "type": "api" }, { - "id": 151, + "id": 150, "name": "gongyu/xunlianjihua/Reset", "type": "api" }, { - "id": 152, + "id": 151, "name": "gongyu/xunlianjihua/UpSkill", "type": "api" }, { - "id": 153, + "id": 152, "name": "gongyu/zuozhanjihua/SetSkill", "type": "api" }, { - "id": 154, + "id": 153, "name": "hbzb/jfs/BuyNum", "type": "api" }, { - "id": 155, + "id": 154, "name": "hbzb/jfs/Fight", "type": "api" }, { - "id": 156, + "id": 155, "name": "hbzb/jfs/GetLog", "type": "api" }, { - "id": 157, + "id": 156, "name": "hbzb/jfs/Open", "type": "api" }, { - "id": 158, + "id": 157, "name": "hbzb/jfs/Rec", "type": "api" }, { - "id": 159, + "id": 158, "name": "hbzb/jfs/Refresh", "type": "api" }, { - "id": 160, + "id": 159, "name": "hbzb/GetStatus", "type": "api" }, { - "id": 161, + "id": 160, "name": "hbzb/zbs/BuyNum", "type": "api" }, { - "id": 162, + "id": 161, "name": "hbzb/zbs/Fight", "type": "api" }, { - "id": 163, + "id": 162, "name": "hbzb/zbs/GetLog", "type": "api" }, { - "id": 164, + "id": 163, "name": "hbzb/zbs/Open", "type": "api" }, { - "id": 165, + "id": 164, "name": "hbzb/zbs/Refresh", "type": "api" }, { - "id": 166, + "id": 165, "name": "hero/Awake", "type": "api" }, { - "id": 167, + "id": 166, "name": "hero/ChangePos", "type": "api", "conf": { @@ -2579,17 +2569,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 168, + "id": 167, "name": "hero/GetList", "type": "api" }, { - "id": 169, + "id": 168, "name": "hero/JinJie", "type": "api" }, { - "id": 170, + "id": 169, "name": "hero/LvUp", "type": "api", "conf": { @@ -2597,32 +2587,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 171, + "id": 170, "name": "hero/Potency", "type": "api" }, { - "id": 172, + "id": 171, "name": "hero/Rec", "type": "api" }, { - "id": 173, + "id": 172, "name": "hero/Reset", "type": "api" }, { - "id": 174, + "id": 173, "name": "hero/Talent", "type": "api" }, { - "id": 175, + "id": 174, "name": "hero/WeaponUp", "type": "api" }, { - "id": 176, + "id": 175, "name": "hongdian/Get", "type": "api", "conf": { @@ -2630,117 +2620,117 @@ export const serviceProto: ServiceProto = { } }, { - "id": 177, + "id": 176, "name": "item/GetList", "type": "api" }, { - "id": 178, + "id": 177, "name": "item/Use", "type": "api" }, { - "id": 179, + "id": 178, "name": "jiaotang/Lottery", "type": "api" }, { - "id": 180, + "id": 179, "name": "jiaotang/Open", "type": "api" }, { - "id": 181, + "id": 180, "name": "jiuba/Lottery", "type": "api" }, { - "id": 182, + "id": 181, "name": "jiuba/Open", "type": "api" }, { - "id": 183, + "id": 182, "name": "jjc/BuyFightNum", "type": "api" }, { - "id": 184, + "id": 183, "name": "jjc/Fight", "type": "api" }, { - "id": 185, + "id": 184, "name": "jjc/FightLog", "type": "api" }, { - "id": 186, + "id": 185, "name": "jjc/Open", "type": "api" }, { - "id": 187, + "id": 186, "name": "jjc/Receive", "type": "api" }, { - "id": 188, + "id": 187, "name": "jjc/Refresh", "type": "api" }, { - "id": 189, + "id": 188, "name": "kaifujingsai/Open", "type": "api" }, { - "id": 190, + "id": 189, "name": "kaifujingsai/Receive", "type": "api" }, { - "id": 191, + "id": 190, "name": "kbzz/Apply", "type": "api" }, { - "id": 192, + "id": 191, "name": "kbzz/AutoApply", "type": "api" }, { - "id": 193, + "id": 192, "name": "kbzz/BuyNum", "type": "api" }, { - "id": 194, + "id": 193, "name": "kbzz/Fight", "type": "api" }, { - "id": 195, + "id": 194, "name": "kbzz/FightLog", "type": "api" }, { - "id": 196, + "id": 195, "name": "kbzz/GroupState", "type": "api" }, { - "id": 197, + "id": 196, "name": "kbzz/Open", "type": "api" }, { - "id": 198, + "id": 197, "name": "kbzz/RecPrize", "type": "api" }, { - "id": 199, + "id": 198, "name": "kbzz/Refresh", "type": "api", "conf": { @@ -2748,287 +2738,287 @@ export const serviceProto: ServiceProto = { } }, { - "id": 200, + "id": 199, "name": "kuangdong/AddPkNum", "type": "api" }, { - "id": 201, + "id": 200, "name": "kuangdong/GetPrize", "type": "api" }, { - "id": 202, + "id": 201, "name": "kuangdong/KdInfo", "type": "api" }, { - "id": 203, + "id": 202, "name": "kuangdong/Log", "type": "api" }, { - "id": 204, + "id": 203, "name": "kuangdong/Open", "type": "api" }, { - "id": 205, + "id": 204, "name": "kuangdong/YanShi", "type": "api" }, { - "id": 206, + "id": 205, "name": "kuangdong/ZhanLing", "type": "api" }, { - "id": 207, + "id": 206, "name": "lingzhulaixi/Open", "type": "api" }, { - "id": 208, + "id": 207, "name": "lingzhulaixi/PkBoss", "type": "api" }, { - "id": 209, + "id": 208, "name": "lingzhulaixi/PkRank", "type": "api" }, { - "id": 210, + "id": 209, "name": "lingzhulaixi/SaoDang", "type": "api" }, { - "id": 211, + "id": 210, "name": "meirishilian/Buy", "type": "api" }, { - "id": 212, + "id": 211, "name": "meirishilian/Fight", "type": "api" }, { - "id": 213, + "id": 212, "name": "meirishilian/Open", "type": "api" }, { - "id": 214, + "id": 213, "name": "msg_c2s/BindUid", "type": "msg" }, { - "id": 215, + "id": 214, "name": "msg_c2s/Pay", "type": "msg" }, { - "id": 216, + "id": 215, "name": "msg_c2s/Sync", "type": "msg" }, { - "id": 217, + "id": 216, "name": "msg_s2c/Chat", "type": "msg" }, { - "id": 218, + "id": 217, "name": "msg_s2c/ChatHelp", "type": "msg" }, { - "id": 219, + "id": 218, "name": "msg_s2c/Collection", "type": "msg" }, { - "id": 220, + "id": 219, "name": "msg_s2c/Email", "type": "msg" }, { - "id": 221, + "id": 220, "name": "msg_s2c/EmailDel", "type": "msg" }, { - "id": 222, + "id": 221, "name": "msg_s2c/EquipChange", "type": "msg" }, { - "id": 223, + "id": 222, "name": "msg_s2c/Friend", "type": "msg" }, { - "id": 224, + "id": 223, "name": "msg_s2c/GhChange", "type": "msg" }, { - "id": 225, + "id": 224, "name": "msg_s2c/GongHuiBaoZang", "type": "msg" }, { - "id": 226, + "id": 225, "name": "msg_s2c/HeroChange", "type": "msg" }, { - "id": 227, + "id": 226, "name": "msg_s2c/HongDianChange", "type": "msg" }, { - "id": 228, + "id": 227, "name": "msg_s2c/ItemChange", "type": "msg" }, { - "id": 229, + "id": 228, "name": "msg_s2c/LoginQueue", "type": "msg" }, { - "id": 230, + "id": 229, "name": "msg_s2c/LshdChange", "type": "msg" }, { - "id": 231, + "id": 230, "name": "msg_s2c/NewDay", "type": "msg" }, { - "id": 232, + "id": 231, "name": "msg_s2c/OtherLogin", "type": "msg" }, { - "id": 233, + "id": 232, "name": "msg_s2c/PayChange", "type": "msg" }, { - "id": 234, + "id": 233, "name": "msg_s2c/PayResult", "type": "msg" }, { - "id": 235, + "id": 234, "name": "msg_s2c/PeijianChange", "type": "msg" }, { - "id": 236, + "id": 235, "name": "msg_s2c/PlayerChange", "type": "msg" }, { - "id": 237, + "id": 236, "name": "msg_s2c/Private", "type": "msg" }, { - "id": 238, + "id": 237, "name": "msg_s2c/PushGiftChange", "type": "msg" }, { - "id": 239, + "id": 238, "name": "msg_s2c/SendGift", "type": "msg" }, { - "id": 240, + "id": 239, "name": "msg_s2c/ShiwuChange", "type": "msg" }, { - "id": 241, + "id": 240, "name": "msg_s2c/TaskChange", "type": "msg" }, { - "id": 242, + "id": 241, "name": "msg_s2c/Xianshilibao", "type": "msg" }, { - "id": 243, + "id": 242, "name": "pata/Fight", "type": "api" }, { - "id": 244, + "id": 243, "name": "pata/GetPrize", "type": "api" }, { - "id": 245, + "id": 244, "name": "pata/Open", "type": "api" }, { - "id": 246, + "id": 245, "name": "pata/SaoDang", "type": "api" }, { - "id": 247, + "id": 246, "name": "pay/GetList", "type": "api" }, { - "id": 248, + "id": 247, "name": "peijian/GetList", "type": "api" }, { - "id": 249, + "id": 248, "name": "peijian/JingLian", "type": "api" }, { - "id": 250, + "id": 249, "name": "peijian/JinJie", "type": "api" }, { - "id": 251, + "id": 250, "name": "peijian/LvUp", "type": "api" }, { - "id": 252, + "id": 251, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 253, + "id": 252, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 254, + "id": 253, "name": "peijian/Reset", "type": "api" }, { - "id": 255, + "id": 254, "name": "peijian/Rm", "type": "api" }, { - "id": 256, + "id": 255, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3036,32 +3026,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 257, + "id": 256, "name": "peijian/UnLock", "type": "api" }, { - "id": 258, + "id": 257, "name": "peijian/Wear", "type": "api" }, { - "id": 259, + "id": 258, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 260, + "id": 259, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 261, + "id": 260, "name": "peijiancangku/Open", "type": "api" }, { - "id": 262, + "id": 261, "name": "Bingo", "type": "api", "conf": { @@ -3069,142 +3059,142 @@ export const serviceProto: ServiceProto = { } }, { - "id": 263, + "id": 262, "name": "FightTest", "type": "api" }, { - "id": 264, + "id": 263, "name": "SyncBtn", "type": "api" }, { - "id": 265, + "id": 264, "name": "Test", "type": "api" }, { - "id": 266, + "id": 265, "name": "pushgift/Open", "type": "api" }, { - "id": 267, + "id": 266, "name": "qjzzd/Fight", "type": "api" }, { - "id": 268, + "id": 267, "name": "qjzzd/Open", "type": "api" }, { - "id": 269, + "id": 268, "name": "rank/Open", "type": "api" }, { - "id": 270, + "id": 269, "name": "shiwu/Concise", "type": "api" }, { - "id": 271, + "id": 270, "name": "shiwu/Extract", "type": "api" }, { - "id": 272, + "id": 271, "name": "shiwu/GetList", "type": "api" }, { - "id": 273, + "id": 272, "name": "shiwu/LvUp", "type": "api" }, { - "id": 274, + "id": 273, "name": "shiwu/Recast", "type": "api" }, { - "id": 275, + "id": 274, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 276, + "id": 275, "name": "shiwu/Wear", "type": "api" }, { - "id": 277, + "id": 276, "name": "shootGame/Open", "type": "api" }, { - "id": 278, + "id": 277, "name": "shootGame/Rec", "type": "api" }, { - "id": 279, + "id": 278, "name": "shop/Buy", "type": "api" }, { - "id": 280, + "id": 279, "name": "shop/Open", "type": "api" }, { - "id": 281, + "id": 280, "name": "shop/Refresh", "type": "api" }, { - "id": 282, + "id": 281, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 283, + "id": 282, "name": "sign/GetPrize", "type": "api" }, { - "id": 284, + "id": 283, "name": "sign/Open", "type": "api" }, { - "id": 285, + "id": 284, "name": "slzd/Aim", "type": "api" }, { - "id": 286, + "id": 285, "name": "slzd/BuyNum", "type": "api" }, { - "id": 287, + "id": 286, "name": "slzd/Fight", "type": "api" }, { - "id": 288, + "id": 287, "name": "slzd/FightLog", "type": "api" }, { - "id": 289, + "id": 288, "name": "slzd/MyRank", "type": "api" }, { - "id": 290, + "id": 289, "name": "slzd/Open", "type": "api", "conf": { @@ -3214,77 +3204,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 291, + "id": 290, "name": "slzd/OpenFort", "type": "api" }, { - "id": 292, + "id": 291, "name": "slzd/Rec", "type": "api" }, { - "id": 293, + "id": 292, "name": "slzd/Refresh", "type": "api" }, { - "id": 294, + "id": 293, "name": "slzd/Slot", "type": "api" }, { - "id": 295, + "id": 294, "name": "tanxian/Event", "type": "api" }, { - "id": 296, + "id": 295, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 297, + "id": 296, "name": "tanxian/Fight", "type": "api" }, { - "id": 298, + "id": 297, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 299, + "id": 298, "name": "tanxian/Open", "type": "api" }, { - "id": 300, + "id": 299, "name": "tanxian/Receive", "type": "api" }, { - "id": 301, + "id": 300, "name": "task/AllFinsh", "type": "api" }, { - "id": 302, + "id": 301, "name": "task/Finsh", "type": "api" }, { - "id": 303, + "id": 302, "name": "task/Open", "type": "api" }, { - "id": 304, + "id": 303, "name": "user/CDKEY", "type": "api" }, { - "id": 305, + "id": 304, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3292,197 +3282,197 @@ export const serviceProto: ServiceProto = { } }, { - "id": 306, + "id": 305, "name": "user/ChangeName", "type": "api" }, { - "id": 307, + "id": 306, "name": "user/Fight", "type": "api" }, { - "id": 308, + "id": 307, "name": "user/GetInfo", "type": "api" }, { - "id": 309, + "id": 308, "name": "user/InfoOpen", "type": "api" }, { - "id": 310, + "id": 309, "name": "user/Login", "type": "api" }, { - "id": 311, + "id": 310, "name": "user/Ping", "type": "api" }, { - "id": 312, + "id": 311, "name": "user/Renown", "type": "api" }, { - "id": 313, + "id": 312, "name": "user/RenownBuy", "type": "api" }, { - "id": 314, + "id": 313, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 315, + "id": 314, "name": "user/RenownOpen", "type": "api" }, { - "id": 316, + "id": 315, "name": "user/Tujian", "type": "api" }, { - "id": 317, + "id": 316, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 318, + "id": 317, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 319, + "id": 318, "name": "weixiuchang/Open", "type": "api" }, { - "id": 320, + "id": 319, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 321, + "id": 320, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 322, + "id": 321, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 323, + "id": 322, "name": "wzry/BaoMing", "type": "api" }, { - "id": 324, + "id": 323, "name": "wzry/catFightLog", "type": "api" }, { - "id": 325, + "id": 324, "name": "wzry/CatGroup", "type": "api" }, { - "id": 326, + "id": 325, "name": "wzry/DldFight", "type": "api" }, { - "id": 327, + "id": 326, "name": "wzry/DldRefre", "type": "api" }, { - "id": 328, + "id": 327, "name": "wzry/JingCai", "type": "api" }, { - "id": 329, + "id": 328, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 330, + "id": 329, "name": "wzry/Open", "type": "api" }, { - "id": 331, + "id": 330, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 332, + "id": 331, "name": "wzry/Wzzd", "type": "api" }, { - "id": 333, + "id": 332, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 334, + "id": 333, "name": "xstask/AllGet", "type": "api" }, { - "id": 335, + "id": 334, "name": "xstask/Get", "type": "api" }, { - "id": 336, + "id": 335, "name": "xstask/LvUp", "type": "api" }, { - "id": 337, + "id": 336, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 338, + "id": 337, "name": "xstask/Open", "type": "api" }, { - "id": 339, + "id": 338, "name": "xstask/Receive", "type": "api" }, { - "id": 340, + "id": 339, "name": "xstask/Refresh", "type": "api" }, { - "id": 341, + "id": 340, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 342, + "id": 341, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 343, + "id": 342, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 344, + "id": 343, "name": "zhanqianbushu/Up", "type": "api" } @@ -10331,52 +10321,11 @@ export const serviceProto: ServiceProto = { "properties": [ { "id": 0, - "name": "payNum", - "type": { - "type": "Number" - } - }, - { - "id": 1, - "name": "receive", - "type": { - "type": "Interface", - "indexSignature": { - "keyType": "String", - "type": { - "type": "Array", - "elementType": { - "type": "Number" - } - } - } - } - } - ] - }, - "event/shouchong/PtlReceive/ReqReceive": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "k", - "type": { - "type": "String" - } - } - ] - }, - "event/shouchong/PtlReceive/ResReceive": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "prize", + "name": "payIds", "type": { "type": "Array", "elementType": { - "type": "Reference", - "target": "type/prizeType" + "type": "String" } } }