From d8f8aaa8d1b6c281d6d4c339d91d1c9f959f85b1 Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 14 Dec 2023 13:48:47 +0800 Subject: [PATCH 01/80] 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 64f3f75b77eae1a1b6cc073e2bfb9f0df2ae7248 Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 14 Dec 2023 13:51:24 +0800 Subject: [PATCH 02/80] 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 ae56d03f727e59003027e80558cfbf93412b821c Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 14 Dec 2023 13:52:41 +0800 Subject: [PATCH 03/80] 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 49cb5d6f814fef17d9cd05461dd05748adcf0ad4 Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 14 Dec 2023 14:01:18 +0800 Subject: [PATCH 04/80] 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 0ebe169f50de38de65527c8f544d52cb379a8f68 Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 14 Dec 2023 15:34:32 +0800 Subject: [PATCH 05/80] =?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 02798b1c1dc9fe2f9d9d4b239cee0381d7453af6 Mon Sep 17 00:00:00 2001 From: ciniao <4041990@qq.com> Date: Thu, 14 Dec 2023 16:07:36 +0800 Subject: [PATCH 06/80] =?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 901484252dfd839cd0076c02b432360ee9910b6f Mon Sep 17 00:00:00 2001 From: yushunrui <364203175@qq.com> Date: Sat, 16 Dec 2023 15:49:22 +0800 Subject: [PATCH 07/80] =?UTF-8?q?=E8=BF=BD=E6=9D=80=E4=BB=A4=E7=BB=8F?= =?UTF-8?q?=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/zhanling/ApiBuyLv.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api_s2c/event/zhanling/ApiBuyLv.ts b/src/api_s2c/event/zhanling/ApiBuyLv.ts index f0485da..589b44e 100644 --- a/src/api_s2c/event/zhanling/ApiBuyLv.ts +++ b/src/api_s2c/event/zhanling/ApiBuyLv.ts @@ -20,7 +20,7 @@ export default async function (call: ApiCall) { let change: ResBuyLv['change'] = {}; change.lv = data.lv + lv; - change.exp = G.gc.zhanling.lv[change.lv]; + change.exp = data.exp + 1000 G.mongodb.cEvent('zhanling').updateOne( { uid: call.uid, type: 'zhanling' }, From ab8404ef62600e7aafb51a5ebe7462ce513f615e Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 14 Dec 2023 17:01:39 +0800 Subject: [PATCH 08/80] =?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 39cb12ac9aa040d344d4353ffc426c7ef2a12e04 Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 14 Dec 2023 17:16:36 +0800 Subject: [PATCH 09/80] =?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 39362ea6abba852f3990f8520f55f277ab3605d3 Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 14 Dec 2023 17:53:52 +0800 Subject: [PATCH 10/80] =?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 5d9ece056e9c440276659c17784c9dcfd29bc3cb Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Thu, 14 Dec 2023 18:16:56 +0800 Subject: [PATCH 11/80] =?UTF-8?q?feat:=201.=E6=8E=A8=E9=80=81=E7=A4=BC?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/jiuba/ApiLottery.ts | 5 + src/api_s2c/pushgift/ApiOpen.ts | 29 +++ src/jsonType.ts | 19 ++ src/module/collection_pushgift.ts | 13 ++ src/module/mongodb.ts | 2 + src/public/fight.ts | 20 +- src/public/player.ts | 64 +++-- src/public/pushgift.ts | 155 +++++++++++++ .../protocols/msg_s2c/MsgPushGiftChange.ts | 1 + src/shared/protocols/pushgift/PltOpen.ts | 5 + src/shared/protocols/serviceProto.ts | 219 +++++++++--------- 11 files changed, 404 insertions(+), 128 deletions(-) create mode 100644 src/api_s2c/pushgift/ApiOpen.ts create mode 100644 src/module/collection_pushgift.ts create mode 100644 src/public/pushgift.ts create mode 100644 src/shared/protocols/msg_s2c/MsgPushGiftChange.ts create mode 100644 src/shared/protocols/pushgift/PltOpen.ts diff --git a/src/api_s2c/jiuba/ApiLottery.ts b/src/api_s2c/jiuba/ApiLottery.ts index 968cd79..89266e0 100644 --- a/src/api_s2c/jiuba/ApiLottery.ts +++ b/src/api_s2c/jiuba/ApiLottery.ts @@ -9,6 +9,7 @@ import {ReqLottery, ResLottery} from "../../shared/protocols/jiuba/PtlLottery"; import {PublicShared} from '../../shared/public/public'; import {HongDianChange} from '../hongdian/fun'; import {RankKfjs} from "../../public/rank/rank_kfjs"; +import {PushGiftFun} from "../../public/pushgift"; export default async function (call: ApiCall) { @@ -142,4 +143,8 @@ export default async function (call: ApiCall) { valArr: [await rankKfjs.getRankScore(call.uid) + call.req.type] }); + // 十连抽推送礼包 + if (call.req.type == 10) { + PushGiftFun.chkRecruitGift(call.uid) + } } \ No newline at end of file diff --git a/src/api_s2c/pushgift/ApiOpen.ts b/src/api_s2c/pushgift/ApiOpen.ts new file mode 100644 index 0000000..4e4daab --- /dev/null +++ b/src/api_s2c/pushgift/ApiOpen.ts @@ -0,0 +1,29 @@ +import {ApiCall} from "tsrpc"; +import {ReqOpen, ResOpen} from "../../shared/protocols/pushgift/PltOpen"; +import {PushGiftFun} from "../../public/pushgift"; +import {Gift} from "../../module/collection_pushgift"; + +export default async function (call: ApiCall) { + let res: ResOpen = {gifts: []}; + + // 过滤过期的礼包 和购买完毕的礼包 + (await PushGiftFun.getGift(call.uid)).forEach((gift) => { + if (gift.passTime > G.time && chkBuyNum(gift.id, gift)) { + res.gifts.push(gift) + } + }) + + call.succ(res) +} + +function chkBuyNum(gift_id: string, gift_info: Gift) { + let conf = G.gc.tuisonglibao[gift_id]; + for (let i = 0; i < conf.payId.length; i++) { + let pay = G.gc.pay[conf.payId[i]]; + if (pay.buys > 0 && gift_info.buy[i] < pay.buys) { + return true + } + } + + return false +} \ No newline at end of file diff --git a/src/jsonType.ts b/src/jsonType.ts index 8f8eb88..3b8f547 100644 --- a/src/jsonType.ts +++ b/src/jsonType.ts @@ -1773,6 +1773,24 @@ type gc_yuyuemail = { 'prize': { "a": string, "t": string, "n": number, [x: string]: any }[] }; +type gc_push_gift = { + [k: string]: { + /**礼包id*/ + id: number + /**礼包类型*/ + type: number + /**礼包参数*/ + num: any[] + /**购买id*/ + payId: string[] + /**持续时间*/ + time: number + /**冷却时间*/ + displayCD: number + /**显示返利比*/ + scale: number + } +} type gcType = { [key: string]: any @@ -1922,6 +1940,7 @@ type gcType = { kfcb_content: gc_kfcb_content kfcb_prize: gc_kfcb_prize yuyuemail: gc_yuyuemail + tuisonglibao: gc_push_gift } diff --git a/src/module/collection_pushgift.ts b/src/module/collection_pushgift.ts new file mode 100644 index 0000000..9d08246 --- /dev/null +++ b/src/module/collection_pushgift.ts @@ -0,0 +1,13 @@ +import {ObjectId} from "mongodb"; +import {ResOpen} from "../shared/protocols/pushgift/PltOpen"; + +export type Gift = { + id: string + uid: string + buy: number[] + ctime: number + passTime: number + ext_data: { [key: string]: any } +} + +export type CollectionPushGift = Gift & { _id: ObjectId }; \ No newline at end of file diff --git a/src/module/mongodb.ts b/src/module/mongodb.ts index f912ad7..5d8c8ac 100644 --- a/src/module/mongodb.ts +++ b/src/module/mongodb.ts @@ -59,6 +59,7 @@ import {CollectionPlayerBehavior} from "./collection_player_behavior"; import {CollectionRmbuse} from "./collection_rmbuse"; import {CollectionFightLog} from "./collection_fightLog"; import {CollectionShop} from "./collection_shop"; +import {CollectionPushGift} from "./collection_pushgift"; export type MongodbCollections = { user: CollectionUser; @@ -131,4 +132,5 @@ export type MongodbCollections = { rmbuse: CollectionRmbuse fightLog: CollectionFightLog shop: CollectionShop + pushgift:CollectionPushGift }; \ No newline at end of file diff --git a/src/public/fight.ts b/src/public/fight.ts index 6194a0a..a74ccad 100644 --- a/src/public/fight.ts +++ b/src/public/fight.ts @@ -9,6 +9,7 @@ import {HeroFun} from './hero'; import {UserFun} from './user'; import {re} from "mathjs"; import {getGud} from './gud'; +import {PushGiftFun} from "./pushgift"; type fightType = 'tanxian' | 'pata' | 'jjc' | 'gbtx' | 'qjzzd' | 'meirishilian' | 'wzrycross'; @@ -59,9 +60,16 @@ export class FightFun { /**挑战竞技场 */ static async fightJJc(call: ApiCall, rankInfo: rankInfo) { - if (rankInfo.player.uid.indexOf('npc_') != -1) return await this.fightNpc(call, G.gc.jjc_npc[rankInfo.player.uid].npcId, 'jjc', await this.getPlayerFightData(call.conn.uid)); - return this.fight([await this.getPlayerFightData(call.conn.uid), await this.getPlayerFightData(rankInfo.player.uid)]); + + let result = this.fight([await this.getPlayerFightData(call.conn.uid), await this.getPlayerFightData(rankInfo.player.uid)]); + + // 竞技场 战败触发推送礼包 + if (result.winSide != 0) { + PushGiftFun.chkLoseGift(call.uid) + } + + return result } /**挑战npc */ @@ -79,7 +87,13 @@ export class FightFun { let npc = formatNpcData(npcId); - return this.fight([my, npc], 30, 'pve'); + let result = this.fight([my, npc], 30, 'pve'); + + // 主线 爬塔 战败触发推送礼包 + if (result.winSide != 0 && ["tanxian", "pata"].includes(type)) { + PushGiftFun.chkLoseGift(data[0].player.uid) + } + return result } /** diff --git a/src/public/player.ts b/src/public/player.ts index 7c38a1c..f5dac4e 100644 --- a/src/public/player.ts +++ b/src/public/player.ts @@ -14,9 +14,10 @@ import {PublicShared} from '../shared/public/public'; import {HeroFun} from './hero'; import {ShiwuFun} from './shiwu'; import {UserFun} from './user'; -import { getItemByItemId, getItemNum } from './item'; -import { getGud, setGud } from './gud'; +import {getItemByItemId, getItemNum} from './item'; +import {getGud, setGud} from './gud'; import {addGameLog} from "../gameLog"; +import {PushGiftFun} from "./pushgift"; export type call = { @@ -35,7 +36,7 @@ export type call = { }; service: { name: string }; addEventMsg: ApiCall['addEventMsg']; - req: { } + req: {} }; export class PlayerFun { @@ -66,6 +67,8 @@ export class PlayerFun { if (has < atn.n) { if (err) { + // 消耗不足 触发推送礼包 + PushGiftFun.chkItemGift(call.uid, atn) throw new TsrpcError('', {code: -104, atn: atn}); } else { return {isOk: false, atn: atn}; @@ -143,15 +146,15 @@ export class PlayerFun { shiwu.length > 0 && this.addShiwu(call, shiwu), peijian.length > 0 && this.addPeijian(call, peijian) ]); - + return prizeList; }; //attr里的指定字段的值，不能小于0 - static fixAttrLteZero(t:string, val:number){ - if(['jinbi','rmbmoney','payExp','nexp'].includes(t) && val < 0){ + static fixAttrLteZero(t: string, val: number) { + if (['jinbi', 'rmbmoney', 'payExp', 'nexp'].includes(t) && val < 0) { return 0 - }else{ + } else { return val; } } @@ -189,6 +192,16 @@ export class PlayerFun { // 修改属性应在相关奖励领取之前，否则奖励内获取的用户数据是旧数据 // await this.changeAttr(call.conn.uid, change); call.addEventMsg('msg_s2c/PlayerChange', change); + + // 等级改变 触发推送礼包 + if (change["lv"]) { + PushGiftFun.chkLvGift(call.uid, change["lv"]) + } + // 关卡改变 触发推送礼包 + if (change["mapId"]) { + PushGiftFun.chkLevelGift(call.uid, change["mapId"]) + } + } static async changeAttrLog(uid: string, change, atn, before) { @@ -207,9 +220,9 @@ export class PlayerFun { static async changeAttr(uid: string, change: Partial) { //for (let k in change) { - //G.redis.set('user', uid, k as any, change[k]); + //G.redis.set('user', uid, k as any, change[k]); //} - setGud(uid,change); + setGud(uid, change); G.mongodb.collection('user').updateOne({uid: uid}, {$set: change}); @@ -290,7 +303,11 @@ export class PlayerFun { G.mongodb.collection('item').updateOne(upObj.filter, upObj.update, upObj.options); call.addEventMsg('msg_s2c/ItemChange', atn.t, data); - addGameLog(call.uid, "_itemChange", {"additem":1}, {"filter": upObj.filter, "update": upObj.update, "options": upObj.options}) + addGameLog(call.uid, "_itemChange", {"additem": 1}, { + "filter": upObj.filter, + "update": upObj.update, + "options": upObj.options + }) } else { if (item.num + atn.n <= 0) { await Promise.all([ @@ -302,13 +319,13 @@ export class PlayerFun { //await G.redis.del('item', call.uid, atn.t); //await G.mongodb.collection('item').deleteOne({uid: call.uid, itemId: atn.t}); call.addEventMsg('msg_s2c/ItemChange', atn.t, {num: 0}); - addGameLog(call.uid, "_itemChange",{"delitem":1}, {"itemId": atn.t}) + addGameLog(call.uid, "_itemChange", {"delitem": 1}, {"itemId": atn.t}) } else { await Promise.all([ ////去掉item Redis相关 //G.redis.set('item', call.uid, atn.t, 'lastTime', upObj.update.$set.lastTime), //G.redis.numIncrBy('item', call.uid, atn.t, 'num', atn.n), - + G.mongodb.collection('item').updateOne(upObj.filter, upObj.update, upObj.options) ]); // await G.redis.set('item', call.uid, atn.t, 'lastTime', upObj.update.$set.lastTime); @@ -318,7 +335,12 @@ export class PlayerFun { num: item.num + atn.n, lastTime: upObj.update.$set.lastTime }); - addGameLog(call.uid, "_itemChange",{"attritem":1}, {"filter": upObj.filter, "update": upObj.update, "options": upObj.options,newNum:item.num + atn.n}) + addGameLog(call.uid, "_itemChange", {"attritem": 1}, { + "filter": upObj.filter, + "update": upObj.update, + "options": upObj.options, + newNum: item.num + atn.n + }) } } } @@ -344,7 +366,7 @@ export class PlayerFun { }).reduce((a, b) => a.concat(b)); let result = await G.mongodb.collection('equip').insertMany(insertData); - addGameLog(call.uid, "_addEquip",{}, insertData) + addGameLog(call.uid, "_addEquip", {}, insertData) insertData.forEach((v, key) => { let id = result.insertedIds[key].toHexString(); @@ -391,7 +413,7 @@ export class PlayerFun { G.mongodb.collection('equip').deleteOne({uid: call.uid, _id: new ObjectId(_id)}); call.addEventMsg('msg_s2c/EquipChange', _id, {num: 0}); - addGameLog(call.uid, "_cutEquip",{}, {_id:_id}) + addGameLog(call.uid, "_cutEquip", {}, {_id: _id}) } } @@ -419,7 +441,7 @@ export class PlayerFun { }); let result = await G.mongodb.collection('hero').insertMany(insertData); - addGameLog(call.uid, "_addHero",{}, insertData) + addGameLog(call.uid, "_addHero", {}, insertData) for (let key = 0; key < insertData.length; key++) { let v = insertData[key] @@ -474,7 +496,7 @@ export class PlayerFun { G.redis.del('hero', call.uid, _id); G.mongodb.collection('hero').deleteOne({uid: call.uid, _id: new ObjectId(_id)}); call.addEventMsg('msg_s2c/HeroChange', _id, {num: 0}); - addGameLog(call.uid, "_cutHero",{}, {_id:_id}) + addGameLog(call.uid, "_cutHero", {}, {_id: _id}) } } @@ -505,7 +527,7 @@ export class PlayerFun { }).reduce((a, b) => a.concat(b)); let result = await G.mongodb.collection('shiwu').insertMany(insertData); - addGameLog(call.uid, "_addShiWu",{}, insertData) + addGameLog(call.uid, "_addShiWu", {}, insertData) insertData.forEach((v, key) => { let id = result.insertedIds[key].toHexString(); @@ -537,7 +559,7 @@ export class PlayerFun { // G.redis.del('shiwu', call.uid, _id); G.mongodb.collection('shiwu').deleteOne({uid: call.uid, _id: new ObjectId(_id)}); call.addEventMsg('msg_s2c/ShiwuChange', _id, {num: 0}); - addGameLog(call.uid, "_cutShiwu",{}, {_id:_id}) + addGameLog(call.uid, "_cutShiwu", {}, {_id: _id}) } } @@ -559,7 +581,7 @@ export class PlayerFun { }).reduce((a, b) => a.concat(b)); let result = await G.mongodb.collection('peijian').insertMany(insertData); - addGameLog(call.uid, "_addPeiJian",{}, insertData) + addGameLog(call.uid, "_addPeiJian", {}, insertData) insertData.forEach((v, key) => { let {_id, uid, ...ops} = v; @@ -600,7 +622,7 @@ export class PlayerFun { G.redis.del('peijian', call.uid, _id); G.mongodb.collection('peijian').deleteOne({uid: call.uid, _id: new ObjectId(_id)}); call.addEventMsg('msg_s2c/PeijianChange', _id, {num: 0}); - addGameLog(call.uid, "_cutPeijian",{}, {_id:_id}) + addGameLog(call.uid, "_cutPeijian", {}, {_id: _id}) } } diff --git a/src/public/pushgift.ts b/src/public/pushgift.ts new file mode 100644 index 0000000..72fcfde --- /dev/null +++ b/src/public/pushgift.ts @@ -0,0 +1,155 @@ +import {PayFun} from "./pay"; + +const PushGiftType = { + LevelGift: 1, // 关卡推送 + ItemGift: 2, // 道具推送 + LoseGift: 3, // 战败推送 + RecruitGift: 4, // 十连推送 + LvGift: 5, // 等级推送 +} + +export class PushGiftFun { + + static async getGift(uid: string) { + // 查询所有礼包 + return (await G.mongodb.collection("pushgift").find({ + uid: uid + }).toArray()).map((i) => { + let {_id, ...gift} = i; + return gift + }) + } + + static async chkItemGift(uid: string, atn: atn) { + let gift_ids = []; + for (let id in G.gc.tuisonglibao) { + let conf = G.gc.tuisonglibao[id]; + if (conf.type == PushGiftType.ItemGift && conf.num[0].a == atn.a && conf.num[0].t == atn.t) { + gift_ids.push(id); + } + } + if (gift_ids.length <= 0) { + return + } else { + this.pushGift(uid, gift_ids) + } + } + + static async chkLevelGift(uid: string, level: number) { + let gift_ids = []; + for (let id in G.gc.tuisonglibao) { + let conf = G.gc.tuisonglibao[id]; + if (conf.type == PushGiftType.LevelGift && conf.num[0] == level) { + gift_ids.push(id); + } + } + if (gift_ids.length <= 0) { + return + } else { + this.pushGift(uid, gift_ids) + } + } + + static async chkLvGift(uid: string, lv: number) { + let gift_ids = []; + for (let id in G.gc.tuisonglibao) { + let conf = G.gc.tuisonglibao[id]; + if (conf.type == PushGiftType.LevelGift && conf.num[0] == lv) { + gift_ids.push(id); + } + } + if (gift_ids.length <= 0) { + return + } else { + this.pushGift(uid, gift_ids) + } + } + + static async chkLoseGift(uid: string) { + let gift_ids = []; + for (let id in G.gc.tuisonglibao) { + let conf = G.gc.tuisonglibao[id]; + if (conf.type == PushGiftType.LoseGift) { + gift_ids.push(id); + } + } + if (gift_ids.length <= 0) { + return + } else { + this.pushGift(uid, gift_ids) + } + } + + static async chkRecruitGift(uid: string) { + let gift_ids = []; + for (let id in G.gc.tuisonglibao) { + let conf = G.gc.tuisonglibao[id]; + if (conf.type == PushGiftType.RecruitGift) { + gift_ids.push(id); + } + } + if (gift_ids.length <= 0) { + return + } else { + this.pushGift(uid, gift_ids) + } + } + + static async pushGift(uid: string, gift_ids: string[]) { + let gifts = {}; + (await this.getGift(uid)).forEach(i => gifts[i.id] = i) + for (let gift_id of gift_ids) { + let conf = G.gc.tuisonglibao[gift_id]; + if (gifts[gift_id] && conf.displayCD > 0 && gifts[gift_id].ctime + conf.displayCD > G.time) { + continue + } + if (conf.type == PushGiftType.RecruitGift) { + if (gifts[gift_id]) { + if (gift_ids[gift_id].ext_data.num + 1 >= conf.num[0]) { + this.addGift(uid, gift_id, {num: 0}) + } else { + G.mongodb.collection("pushgift").updateOne({ + uid: uid, id: gift_id + }, {"$inc": {"ext_data.num": 1}}) + } + } else { + // 招募礼包不存在 初始化数据 记录招募次数 + G.mongodb.collection("pushgift").updateOne({ + uid: uid, id: gift_id + }, { + $set: { + ctime: 0, + passTime: 0, + ext_data: {num: 1}, + buy: conf.payId.map(() => 0), + } + }, {upsert: true}) + } + } else { + this.addGift(uid, gift_id, {}) + } + } + } + + static async addGift(uid: string, giftid: string, ext_data: { [key: string]: any }) { + let conf = G.gc.tuisonglibao[giftid]; + // 更新礼包 + G.mongodb.collection("pushgift").updateOne({ + uid: uid, id: giftid + }, { + $set: { + ctime: G.time, + ext_data: ext_data, + passTime: G.time + conf.time, + buy: conf.payId.map(() => 0), + } + }, {upsert: true}) + + // 删除购买记录 + PayFun.delPayLog(uid, ...conf.payId.map(i => { + return {payId: i, val: []} + })) + // 推送客户端消息 + G.server.sendMsgByUid(uid, "msg_s2c/PushGiftChange", 1); + } +} \ No newline at end of file diff --git a/src/shared/protocols/msg_s2c/MsgPushGiftChange.ts b/src/shared/protocols/msg_s2c/MsgPushGiftChange.ts new file mode 100644 index 0000000..4c04b9b --- /dev/null +++ b/src/shared/protocols/msg_s2c/MsgPushGiftChange.ts @@ -0,0 +1 @@ +export type MsgPushGiftChange = 1; diff --git a/src/shared/protocols/pushgift/PltOpen.ts b/src/shared/protocols/pushgift/PltOpen.ts new file mode 100644 index 0000000..829c306 --- /dev/null +++ b/src/shared/protocols/pushgift/PltOpen.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 c7e31ea..a0f5597 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'; @@ -1631,6 +1632,7 @@ export interface ServiceType { "msg_s2c/PeijianChange": MsgPeijianChange, "msg_s2c/PlayerChange": MsgPlayerChange, "msg_s2c/Private": MsgPrivate, + "msg_s2c/PushGiftChange": MsgPushGiftChange, "msg_s2c/SendGift": MsgSendGift, "msg_s2c/ShiwuChange": MsgShiwuChange, "msg_s2c/TaskChange": MsgTaskChange, @@ -2932,91 +2934,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": { @@ -3024,32 +3031,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": { @@ -3057,137 +3064,137 @@ 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": "qjzzd/Fight", "type": "api" }, { - "id": 266, + "id": 267, "name": "qjzzd/Open", "type": "api" }, { - "id": 267, + "id": 268, "name": "rank/Open", "type": "api" }, { - "id": 268, + "id": 269, "name": "shiwu/Concise", "type": "api" }, { - "id": 269, + "id": 270, "name": "shiwu/Extract", "type": "api" }, { - "id": 270, + "id": 271, "name": "shiwu/GetList", "type": "api" }, { - "id": 271, + "id": 272, "name": "shiwu/LvUp", "type": "api" }, { - "id": 272, + "id": 273, "name": "shiwu/Recast", "type": "api" }, { - "id": 273, + "id": 274, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 274, + "id": 275, "name": "shiwu/Wear", "type": "api" }, { - "id": 275, + "id": 276, "name": "shootGame/Open", "type": "api" }, { - "id": 276, + "id": 277, "name": "shootGame/Rec", "type": "api" }, { - "id": 277, + "id": 278, "name": "shop/Buy", "type": "api" }, { - "id": 278, + "id": 279, "name": "shop/Open", "type": "api" }, { - "id": 279, + "id": 280, "name": "shop/Refresh", "type": "api" }, { - "id": 280, + "id": 281, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 281, + "id": 282, "name": "sign/GetPrize", "type": "api" }, { - "id": 282, + "id": 283, "name": "sign/Open", "type": "api" }, { - "id": 283, + "id": 284, "name": "slzd/Aim", "type": "api" }, { - "id": 284, + "id": 285, "name": "slzd/BuyNum", "type": "api" }, { - "id": 285, + "id": 286, "name": "slzd/Fight", "type": "api" }, { - "id": 286, + "id": 287, "name": "slzd/FightLog", "type": "api" }, { - "id": 287, + "id": 288, "name": "slzd/MyRank", "type": "api" }, { - "id": 288, + "id": 289, "name": "slzd/Open", "type": "api", "conf": { @@ -3197,77 +3204,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 +3282,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" } @@ -17920,6 +17927,10 @@ export const serviceProto: ServiceProto = { } } }, + "msg_s2c/MsgPushGiftChange/MsgPushGiftChange": { + "type": "Literal", + "literal": 1 + }, "msg_s2c/MsgSendGift/MsgSendGift": { "type": "Interface", "indexSignature": { From dcea0461839d506eb217845492285a17bcc4efb6 Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 14 Dec 2023 18:20:14 +0800 Subject: [PATCH 12/80] =?UTF-8?q?=E5=86=85=E7=BD=91linux=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E4=B8=80=E9=94=AE=E6=9B=B4=E6=96=B0=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oneKeyStartPm2.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 oneKeyStartPm2.sh diff --git a/oneKeyStartPm2.sh b/oneKeyStartPm2.sh new file mode 100644 index 0000000..63e4079 --- /dev/null +++ b/oneKeyStartPm2.sh @@ -0,0 +1,10 @@ + +git fetch --all && git reset --hard origin/dev && git pull + +npm run build_linux + +cp src/config.json dist/ + +pm2 del heijiao_msg_s0 + +pm2 start dist/js_pm2.config.js \ No newline at end of file From e9a2c50696034641f7b27abe05c2049639e29e9d Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 14 Dec 2023 18:20:37 +0800 Subject: [PATCH 13/80] =?UTF-8?q?=E5=86=85=E7=BD=91linux=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E4=B8=80=E9=94=AE=E6=9B=B4=E6=96=B0=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oneKeyStartPm2.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/oneKeyStartPm2.sh b/oneKeyStartPm2.sh index 63e4079..464ceca 100644 --- a/oneKeyStartPm2.sh +++ b/oneKeyStartPm2.sh @@ -7,4 +7,6 @@ cp src/config.json dist/ pm2 del heijiao_msg_s0 -pm2 start dist/js_pm2.config.js \ No newline at end of file +pm2 start dist/js_pm2.config.js + +pm2 save \ No newline at end of file From 8bc84b5816e318e1981e9746e8577ac91689fe05 Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 14 Dec 2023 18:28:58 +0800 Subject: [PATCH 14/80] =?UTF-8?q?=E5=86=85=E7=BD=91linux=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E4=B8=80=E9=94=AE=E6=9B=B4=E6=96=B0=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oneKeyStartPm2.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oneKeyStartPm2.sh b/oneKeyStartPm2.sh index 464ceca..65c5bd9 100644 --- a/oneKeyStartPm2.sh +++ b/oneKeyStartPm2.sh @@ -7,6 +7,6 @@ cp src/config.json dist/ pm2 del heijiao_msg_s0 -pm2 start dist/js_pm2.config.js +cd dist && pm2 start js_pm2.config.js pm2 save \ No newline at end of file From 5fabfb2c5ab8ca756f0f58a902bdfb89ce29c3fe Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 14 Dec 2023 18:52:17 +0800 Subject: [PATCH 15/80] =?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 a0f5597..c984c1b 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -14894,6 +14894,13 @@ export const serviceProto: ServiceProto = { "type": "Literal", "literal": "kaifujingsai" } + }, + { + "id": 36, + "type": { + "type": "Literal", + "literal": "zhoumolibao" + } } ] }, From dc50b71b01c244995d55071ac66f07794db45c2e Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 14 Dec 2023 19:42:03 +0800 Subject: [PATCH 16/80] proto --- src/api_s2c/pushgift/ApiOpen.ts | 2 +- src/module/collection_pushgift.ts | 2 +- .../pushgift/{PltOpen.ts => PtlOpen.ts} | 0 src/shared/protocols/serviceProto.ts | 305 +++++++++++------- 4 files changed, 197 insertions(+), 112 deletions(-) rename src/shared/protocols/pushgift/{PltOpen.ts => PtlOpen.ts} (100%) diff --git a/src/api_s2c/pushgift/ApiOpen.ts b/src/api_s2c/pushgift/ApiOpen.ts index 4e4daab..58d85b2 100644 --- a/src/api_s2c/pushgift/ApiOpen.ts +++ b/src/api_s2c/pushgift/ApiOpen.ts @@ -1,5 +1,5 @@ import {ApiCall} from "tsrpc"; -import {ReqOpen, ResOpen} from "../../shared/protocols/pushgift/PltOpen"; +import {ReqOpen, ResOpen} from "../../shared/protocols/pushgift/PtlOpen"; import {PushGiftFun} from "../../public/pushgift"; import {Gift} from "../../module/collection_pushgift"; diff --git a/src/module/collection_pushgift.ts b/src/module/collection_pushgift.ts index 9d08246..c62fff0 100644 --- a/src/module/collection_pushgift.ts +++ b/src/module/collection_pushgift.ts @@ -1,5 +1,5 @@ import {ObjectId} from "mongodb"; -import {ResOpen} from "../shared/protocols/pushgift/PltOpen"; +import {ResOpen} from "../shared/protocols/pushgift/PtlOpen"; export type Gift = { id: string diff --git a/src/shared/protocols/pushgift/PltOpen.ts b/src/shared/protocols/pushgift/PtlOpen.ts similarity index 100% rename from src/shared/protocols/pushgift/PltOpen.ts rename to src/shared/protocols/pushgift/PtlOpen.ts diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index a0a7e9f..218afc9 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -265,9 +265,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'; @@ -275,20 +276,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'; @@ -297,11 +298,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'; @@ -317,7 +318,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'; @@ -328,7 +329,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'; @@ -336,7 +337,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'; @@ -1294,18 +1295,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 @@ -1335,8 +1340,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, @@ -1347,8 +1352,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, @@ -1363,8 +1368,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, @@ -1387,8 +1392,8 @@ export interface ServiceType { res: ResMyRank }, "slzd/Open": { - req: ReqOpen_53, - res: ResOpen_53 + req: ReqOpen_54, + res: ResOpen_54 }, "slzd/OpenFort": { req: ReqOpenFort, @@ -1423,8 +1428,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, @@ -1439,8 +1444,8 @@ export interface ServiceType { res: ResFinsh }, "task/Open": { - req: ReqOpen_55, - res: ResOpen_55 + req: ReqOpen_56, + res: ResOpen_56 }, "user/CDKEY": { req: ReqCDKEY, @@ -1503,8 +1508,8 @@ export interface ServiceType { res: ResExchange }, "weixiuchang/Open": { - req: ReqOpen_56, - res: ResOpen_56 + req: ReqOpen_57, + res: ResOpen_57 }, "weixiuchang/UpLv": { req: ReqUpLv, @@ -1547,8 +1552,8 @@ export interface ServiceType { res: ResJingCaiOpen }, "wzry/Open": { - req: ReqOpen_57, - res: ResOpen_57 + req: ReqOpen_58, + res: ResOpen_58 }, "wzry/UpdateFight": { req: ReqUpdateFight, @@ -1579,8 +1584,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, @@ -3080,121 +3085,126 @@ export const serviceProto: ServiceProto = { }, { "id": 266, - "name": "qjzzd/Fight", + "name": "pushgift/Open", "type": "api" }, { "id": 267, - "name": "qjzzd/Open", + "name": "qjzzd/Fight", "type": "api" }, { "id": 268, - "name": "rank/Open", + "name": "qjzzd/Open", "type": "api" }, { "id": 269, - "name": "shiwu/Concise", + "name": "rank/Open", "type": "api" }, { "id": 270, - "name": "shiwu/Extract", + "name": "shiwu/Concise", "type": "api" }, { "id": 271, - "name": "shiwu/GetList", + "name": "shiwu/Extract", "type": "api" }, { "id": 272, - "name": "shiwu/LvUp", + "name": "shiwu/GetList", "type": "api" }, { "id": 273, - "name": "shiwu/Recast", + "name": "shiwu/LvUp", "type": "api" }, { "id": 274, - "name": "shiwu/TakeOff", + "name": "shiwu/Recast", "type": "api" }, { "id": 275, - "name": "shiwu/Wear", + "name": "shiwu/TakeOff", "type": "api" }, { "id": 276, - "name": "shootGame/Open", + "name": "shiwu/Wear", "type": "api" }, { "id": 277, - "name": "shootGame/Rec", + "name": "shootGame/Open", "type": "api" }, { "id": 278, - "name": "shop/Buy", + "name": "shootGame/Rec", "type": "api" }, { "id": 279, - "name": "shop/Open", + "name": "shop/Buy", "type": "api" }, { "id": 280, - "name": "shop/Refresh", + "name": "shop/Open", "type": "api" }, { "id": 281, - "name": "sign/GetBoxPrize", + "name": "shop/Refresh", "type": "api" }, { "id": 282, - "name": "sign/GetPrize", + "name": "sign/GetBoxPrize", "type": "api" }, { "id": 283, - "name": "sign/Open", + "name": "sign/GetPrize", "type": "api" }, { "id": 284, - "name": "slzd/Aim", + "name": "sign/Open", "type": "api" }, { "id": 285, - "name": "slzd/BuyNum", + "name": "slzd/Aim", "type": "api" }, { "id": 286, - "name": "slzd/Fight", + "name": "slzd/BuyNum", "type": "api" }, { "id": 287, - "name": "slzd/FightLog", + "name": "slzd/Fight", "type": "api" }, { "id": 288, - "name": "slzd/MyRank", + "name": "slzd/FightLog", "type": "api" }, { "id": 289, + "name": "slzd/MyRank", + "type": "api" + }, + { + "id": 290, "name": "slzd/Open", "type": "api", "conf": { @@ -3204,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": { @@ -3282,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" } @@ -19019,6 +19029,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 582ac4f7e3aeb59dcc8fad86eb99868b07ab5baf Mon Sep 17 00:00:00 2001 From: yushunrui <364203175@qq.com> Date: Sat, 16 Dec 2023 19:05:37 +0800 Subject: [PATCH 17/80] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9C=A3=E8=AF=9E?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/christmas/ApiGame.ts | 19 +++-- src/api_s2c/event/christmas/ApiLiBao.ts | 7 +- src/api_s2c/event/christmas/ApiOpen.ts | 1 + src/api_s2c/event/christmas/ApiQianDao.ts | 2 +- src/api_s2c/event/christmas/ApiZhanLingRec.ts | 6 +- src/api_s2c/event/christmas/fun.ts | 43 +++++++++-- src/globalListener.ts | 13 ++-- src/localConfig.ts | 6 +- src/public/pay.ts | 2 +- .../protocols/event/christmas/PtlOpen.ts | 4 +- .../protocols/event/christmas/huodong.json | 73 +++++++++++++------ src/shared/protocols/serviceProto.ts | 23 ++++-- 12 files changed, 139 insertions(+), 60 deletions(-) diff --git a/src/api_s2c/event/christmas/ApiGame.ts b/src/api_s2c/event/christmas/ApiGame.ts index e3cd097..25486ab 100644 --- a/src/api_s2c/event/christmas/ApiGame.ts +++ b/src/api_s2c/event/christmas/ApiGame.ts @@ -8,17 +8,24 @@ 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 freenum = initCon[call.req.hdid].data.gamefree 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) + // 判断是否有免费配置 + if (_mydata.gamenum >= freenum) { + // 判断消耗是否满足 + await PlayerFun.checkNeedIsMeet(call, need); + // 扣除消耗 + await PlayerFun.cutNeed(call, need); + } + let _setData = {} _mydata["val"] += addval - _setData["val"] = _mydata["val"] - await Christmasfun.setMyData(call.uid, call.req.hdid, { $set: _setData }) + _mydata["gamenum"] += 1 + _setData["val"] = _mydata.val + _setData["game"] = _mydata["gamenum"] + await Christmasfun.setMyData(call.uid, call.req.hdid, { $set: _setData}) let changedata = { mydata: _mydata} // 推送红点 HongDianChange.sendChangeKey(call.uid, ['huodonghd']); diff --git a/src/api_s2c/event/christmas/ApiLiBao.ts b/src/api_s2c/event/christmas/ApiLiBao.ts index 0c5163c..ad070db 100644 --- a/src/api_s2c/event/christmas/ApiLiBao.ts +++ b/src/api_s2c/event/christmas/ApiLiBao.ts @@ -22,13 +22,14 @@ export default async function (call: ApiCall) { // 判断是否能购买 return call.error('', { code: -3, message: globalThis.lng.yangchengmubiao_2 }) } - const _select = _mydata.select[lbid] || {} - if (Object.keys(_select).length >= _con.dlz.length) { + let _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 + let _prize: atn[] = _con.basep + for (let key in _select) { _prize.push(_con.dlz[parseInt(key)][_select[key]]) } diff --git a/src/api_s2c/event/christmas/ApiOpen.ts b/src/api_s2c/event/christmas/ApiOpen.ts index 9fb038b..7473002 100644 --- a/src/api_s2c/event/christmas/ApiOpen.ts +++ b/src/api_s2c/event/christmas/ApiOpen.ts @@ -9,6 +9,7 @@ export default async function (call: ApiCall) { // 无此活动 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); diff --git a/src/api_s2c/event/christmas/ApiQianDao.ts b/src/api_s2c/event/christmas/ApiQianDao.ts index 41f5742..5eb2830 100644 --- a/src/api_s2c/event/christmas/ApiQianDao.ts +++ b/src/api_s2c/event/christmas/ApiQianDao.ts @@ -17,7 +17,7 @@ export default async function (call: ApiCall) { for(let i = 0; i < _diff; i++) { if (_mydata.qiandao.includes(i)) continue _mydata.qiandao.push(i) - _prize.push(_con[i]) + _prize = _prize.concat(_con[i]) } if (!_prize){ diff --git a/src/api_s2c/event/christmas/ApiZhanLingRec.ts b/src/api_s2c/event/christmas/ApiZhanLingRec.ts index 66bc07f..42a460f 100644 --- a/src/api_s2c/event/christmas/ApiZhanLingRec.ts +++ b/src/api_s2c/event/christmas/ApiZhanLingRec.ts @@ -20,12 +20,14 @@ export default async function (call: ApiCall) { if (!_mydata.pt.includes(index)){ // 如果普通奖励没有领取 - _prize.push(_con.pt) + + _prize = _prize.concat(_con.pt) _mydata.pt.push(index) } if (_mydata.pay && !_mydata.gj.includes(index)){ // 如果普通奖励没有领取 - _prize.push(_con.gj) + _prize = _prize.concat(_con.gj) + _mydata.gj.push(index) } if (!_prize) { diff --git a/src/api_s2c/event/christmas/fun.ts b/src/api_s2c/event/christmas/fun.ts index 6d37072..c516ca2 100644 --- a/src/api_s2c/event/christmas/fun.ts +++ b/src/api_s2c/event/christmas/fun.ts @@ -1,11 +1,12 @@ import { strict } from 'assert'; -import { ApiCall } from 'tsrpc'; +import {ApiCall, BaseConnection} 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'; - +import {player} from '../../../shared/protocols/user/type'; +import {PlayerFun} from "../../../public/player"; export class Christmasfun { /**配置 */ @@ -61,6 +62,7 @@ export class Christmasfun { taskval: await this.getTaskVal(call, hdid), taskfinish: [], refresh: G.time, + gamenum: 0, pt: [], gj: [], pay: false, @@ -114,20 +116,49 @@ export class Christmasfun { return mydata } + static async payChristmas(payid, call: ApiCall) { + let _hd = await HuoDongFun.gethdList(call, 8) + for (let index = 0; index < _hd.length; index++) { + const hdinfo = _hd[index]; + const _hdid = hdinfo.hdid + if (payid == hdinfo.data.zlpayid){ + let _mydata = await Christmasfun.getMyData(call, _hdid) + if (_mydata.pay) continue + await this.setMyData(call.uid, _hdid, { $set: { pay: true} }) + let _prize = hdinfo.data.zlpayprize + await PlayerFun.sendPrize(call, _prize); + } + else{ + const libaos = hdinfo.data.libao + for (let index = 0; index < Object.keys(libaos).length; index++){ + const lbid = Object.keys(libaos)[index]; + let _tmp = libaos[lbid] + if (_tmp['payid'] != payid) continue + let _mydata = await Christmasfun.getMyData(call, _hdid) + let _buyNum = _mydata.libao[lbid] || 0 + if (_buyNum >= _tmp["buynum"]) continue + _mydata.libao[lbid] = _buyNum + 1 + this.setMyData(call.uid, _hdid, { $set: { libao: _mydata.libao} }) + break + + } + } + } + } + + /**设置任务 */ 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 = { + let _setData= { $inc: {}, $set: {} } @@ -165,4 +196,4 @@ export class Christmasfun { -} \ No newline at end of file +} diff --git a/src/globalListener.ts b/src/globalListener.ts index 1db7530..9300f46 100644 --- a/src/globalListener.ts +++ b/src/globalListener.ts @@ -16,6 +16,7 @@ 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"; +import {Christmasfun} from "./api_s2c/event/christmas/fun"; export type gEventType = { /**玩家断开连接 */ @@ -23,7 +24,7 @@ export type gEventType = { /**玩家修改名字 */ PLAYER_CHANGE_NAME: (gud: player, name: string) => void; /**玩家充值 */ - PLAYER_PAY: (gud: player, payId: string, type: 'user' | 'system') => void; + PLAYER_PAY: (gud: player, payId: string, type: 'user' | 'system', call) => void; /**玩家发生api调用 */ API_CALL: (node: { call: ApiCall, return: ApiReturn; }) => void; /**玩家每日首次登陆 */ @@ -166,13 +167,14 @@ export function addListener() { } }); - G.on('PLAYER_PAY', async (player, payId, payArgs) => { + G.on('PLAYER_PAY', async (player, payId, payArgs,call) => { let conf: any = await PayFun.getConf(payId, payArgs); ActionLog.addDayLog(player.uid, { key: 'pay', val: conf.payExp[0].n }); ActionLog.addRetainLog(player.uid, { key: 'pay', val: conf.payExp[0].n }); if (payId == G.gc.zhanling.payId) payZhanLing(player); - + //圣诞节活动充值 + Christmasfun.payChristmas(payId, call); let payEmailConf = G.gc.payEmail[payId] as _gcType['payEmail']['caifutequan']; if (payEmailConf?.length > 0) { let sendEmailConfs = payEmailConf; @@ -202,18 +204,17 @@ 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) + checkResetBuyLog(call); + }); G.on('API_CALL', node => { diff --git a/src/localConfig.ts b/src/localConfig.ts index 5a384b7..cfb411f 100644 --- a/src/localConfig.ts +++ b/src/localConfig.ts @@ -5,7 +5,7 @@ export default { /**是否开发模式 */ debug: true, /**消息服socket端口*/ - msgPort: 7778, + msgPort: 7785, /**http端口 msg服专用*/ // httpPort: 7779, /**跨服socket端口 */ @@ -13,7 +13,7 @@ export default { /**跨服 ws url */ corssWsUrl: "ws://10.0.1.20:10003", /**服务器id */ - serverId: 0, + serverId: 1001, /**redis url */ redisUrl: 'redis://:lyMaple525458@10.0.1.20:6379/0', /**mongodb url */ @@ -27,7 +27,7 @@ export default { /**服务器时间 */ time: '', /**开服时间 */ - openTime: '2022-10-10 1:0:0', + openTime: '2023-12-11 1:0:0', /**项目名称 */ projectName: 'heijiao', /**加密key */ diff --git a/src/public/pay.ts b/src/public/pay.ts index 8c48aa5..665a3cd 100644 --- a/src/public/pay.ts +++ b/src/public/pay.ts @@ -271,7 +271,7 @@ export class PayFun { } }); - G.emit('PLAYER_PAY', player, payId, payArgs); + G.emit('PLAYER_PAY', player, payId, payArgs, call); G.emit("Class_task_116", 'Class_task_116', call, 1, 0); } 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/serviceProto.ts b/src/shared/protocols/serviceProto.ts index c984c1b..a0a7e9f 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -8642,6 +8642,13 @@ export const serviceProto: ServiceProto = { }, { "id": 5, + "name": "gamenum", + "type": { + "type": "Number" + } + }, + { + "id": 6, "name": "pt", "type": { "type": "Array", @@ -8651,7 +8658,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 6, + "id": 7, "name": "gj", "type": { "type": "Array", @@ -8661,14 +8668,14 @@ export const serviceProto: ServiceProto = { } }, { - "id": 7, + "id": 8, "name": "pay", "type": { "type": "Boolean" } }, { - "id": 8, + "id": 9, "name": "libao", "type": { "type": "Interface", @@ -8681,7 +8688,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 9, + "id": 10, "name": "select", "type": { "type": "Interface", @@ -8700,24 +8707,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" From 96f8b26ce8934e1b5873bb51dfe2b01a8ea1e4cc Mon Sep 17 00:00:00 2001 From: yushunrui <364203175@qq.com> Date: Sat, 16 Dec 2023 19:31:48 +0800 Subject: [PATCH 18/80] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=A3=E8=AF=9E?= =?UTF-8?q?=E5=B0=8F=E6=B8=B8=E6=88=8F=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/christmas/fun.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/api_s2c/event/christmas/fun.ts b/src/api_s2c/event/christmas/fun.ts index c516ca2..327422c 100644 --- a/src/api_s2c/event/christmas/fun.ts +++ b/src/api_s2c/event/christmas/fun.ts @@ -112,7 +112,8 @@ export class Christmasfun { 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 } }) + mydata.gamenum = 0 + await this.setMyData(call.uid, hdid, { $set: { refresh: mydata.refresh, taskfinish: mydata.taskfinish, taskval: mydata.taskval, gamenum: mydata.gamenum} }) return mydata } From 5a3f489691e88ed790d3c740332c8f0056829ee6 Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 14 Dec 2023 19:42:03 +0800 Subject: [PATCH 19/80] proto --- src/api_s2c/pushgift/ApiOpen.ts | 2 +- src/module/collection_pushgift.ts | 2 +- .../pushgift/{PltOpen.ts => PtlOpen.ts} | 0 src/shared/protocols/serviceProto.ts | 305 +++++++++++------- 4 files changed, 197 insertions(+), 112 deletions(-) rename src/shared/protocols/pushgift/{PltOpen.ts => PtlOpen.ts} (100%) diff --git a/src/api_s2c/pushgift/ApiOpen.ts b/src/api_s2c/pushgift/ApiOpen.ts index 4e4daab..58d85b2 100644 --- a/src/api_s2c/pushgift/ApiOpen.ts +++ b/src/api_s2c/pushgift/ApiOpen.ts @@ -1,5 +1,5 @@ import {ApiCall} from "tsrpc"; -import {ReqOpen, ResOpen} from "../../shared/protocols/pushgift/PltOpen"; +import {ReqOpen, ResOpen} from "../../shared/protocols/pushgift/PtlOpen"; import {PushGiftFun} from "../../public/pushgift"; import {Gift} from "../../module/collection_pushgift"; diff --git a/src/module/collection_pushgift.ts b/src/module/collection_pushgift.ts index 9d08246..c62fff0 100644 --- a/src/module/collection_pushgift.ts +++ b/src/module/collection_pushgift.ts @@ -1,5 +1,5 @@ import {ObjectId} from "mongodb"; -import {ResOpen} from "../shared/protocols/pushgift/PltOpen"; +import {ResOpen} from "../shared/protocols/pushgift/PtlOpen"; export type Gift = { id: string diff --git a/src/shared/protocols/pushgift/PltOpen.ts b/src/shared/protocols/pushgift/PtlOpen.ts similarity index 100% rename from src/shared/protocols/pushgift/PltOpen.ts rename to src/shared/protocols/pushgift/PtlOpen.ts diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index a0f5597..9d8baf2 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -265,9 +265,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'; @@ -275,20 +276,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'; @@ -297,11 +298,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'; @@ -317,7 +318,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'; @@ -328,7 +329,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'; @@ -336,7 +337,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'; @@ -1294,18 +1295,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 @@ -1335,8 +1340,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, @@ -1347,8 +1352,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, @@ -1363,8 +1368,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, @@ -1387,8 +1392,8 @@ export interface ServiceType { res: ResMyRank }, "slzd/Open": { - req: ReqOpen_53, - res: ResOpen_53 + req: ReqOpen_54, + res: ResOpen_54 }, "slzd/OpenFort": { req: ReqOpenFort, @@ -1423,8 +1428,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, @@ -1439,8 +1444,8 @@ export interface ServiceType { res: ResFinsh }, "task/Open": { - req: ReqOpen_55, - res: ResOpen_55 + req: ReqOpen_56, + res: ResOpen_56 }, "user/CDKEY": { req: ReqCDKEY, @@ -1503,8 +1508,8 @@ export interface ServiceType { res: ResExchange }, "weixiuchang/Open": { - req: ReqOpen_56, - res: ResOpen_56 + req: ReqOpen_57, + res: ResOpen_57 }, "weixiuchang/UpLv": { req: ReqUpLv, @@ -1547,8 +1552,8 @@ export interface ServiceType { res: ResJingCaiOpen }, "wzry/Open": { - req: ReqOpen_57, - res: ResOpen_57 + req: ReqOpen_58, + res: ResOpen_58 }, "wzry/UpdateFight": { req: ReqUpdateFight, @@ -1579,8 +1584,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, @@ -3080,121 +3085,126 @@ export const serviceProto: ServiceProto = { }, { "id": 266, - "name": "qjzzd/Fight", + "name": "pushgift/Open", "type": "api" }, { "id": 267, - "name": "qjzzd/Open", + "name": "qjzzd/Fight", "type": "api" }, { "id": 268, - "name": "rank/Open", + "name": "qjzzd/Open", "type": "api" }, { "id": 269, - "name": "shiwu/Concise", + "name": "rank/Open", "type": "api" }, { "id": 270, - "name": "shiwu/Extract", + "name": "shiwu/Concise", "type": "api" }, { "id": 271, - "name": "shiwu/GetList", + "name": "shiwu/Extract", "type": "api" }, { "id": 272, - "name": "shiwu/LvUp", + "name": "shiwu/GetList", "type": "api" }, { "id": 273, - "name": "shiwu/Recast", + "name": "shiwu/LvUp", "type": "api" }, { "id": 274, - "name": "shiwu/TakeOff", + "name": "shiwu/Recast", "type": "api" }, { "id": 275, - "name": "shiwu/Wear", + "name": "shiwu/TakeOff", "type": "api" }, { "id": 276, - "name": "shootGame/Open", + "name": "shiwu/Wear", "type": "api" }, { "id": 277, - "name": "shootGame/Rec", + "name": "shootGame/Open", "type": "api" }, { "id": 278, - "name": "shop/Buy", + "name": "shootGame/Rec", "type": "api" }, { "id": 279, - "name": "shop/Open", + "name": "shop/Buy", "type": "api" }, { "id": 280, - "name": "shop/Refresh", + "name": "shop/Open", "type": "api" }, { "id": 281, - "name": "sign/GetBoxPrize", + "name": "shop/Refresh", "type": "api" }, { "id": 282, - "name": "sign/GetPrize", + "name": "sign/GetBoxPrize", "type": "api" }, { "id": 283, - "name": "sign/Open", + "name": "sign/GetPrize", "type": "api" }, { "id": 284, - "name": "slzd/Aim", + "name": "sign/Open", "type": "api" }, { "id": 285, - "name": "slzd/BuyNum", + "name": "slzd/Aim", "type": "api" }, { "id": 286, - "name": "slzd/Fight", + "name": "slzd/BuyNum", "type": "api" }, { "id": 287, - "name": "slzd/FightLog", + "name": "slzd/Fight", "type": "api" }, { "id": 288, - "name": "slzd/MyRank", + "name": "slzd/FightLog", "type": "api" }, { "id": 289, + "name": "slzd/MyRank", + "type": "api" + }, + { + "id": 290, "name": "slzd/Open", "type": "api", "conf": { @@ -3204,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": { @@ -3282,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" } @@ -19005,6 +19015,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 0304c78991f8f74a09fb40d46bad17270979ef98 Mon Sep 17 00:00:00 2001 From: ciniao <4041990@qq.com> Date: Thu, 14 Dec 2023 20:42:22 +0800 Subject: [PATCH 20/80] =?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 ef90c131f344f05b780a2d6835453cdef7581539 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Thu, 14 Dec 2023 20:57:15 +0800 Subject: [PATCH 21/80] =?UTF-8?q?feat:=201.=E6=8E=A8=E9=80=81=E7=A4=BC?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/globalListener.ts | 2 ++ src/public/pushgift.ts | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/globalListener.ts b/src/globalListener.ts index 9300f46..bd10c64 100644 --- a/src/globalListener.ts +++ b/src/globalListener.ts @@ -17,6 +17,7 @@ import { PublicShared } from './shared/public/public'; import { setGud } from './public/gud'; import {checkResetBuyLog} from "./api_s2c/event/zhoumolibao/ApiOpen"; import {Christmasfun} from "./api_s2c/event/christmas/fun"; +import {PushGiftFun} from "./public/pushgift"; export type gEventType = { /**玩家断开连接 */ @@ -194,6 +195,7 @@ export function addListener() { { $inc: { payNum: conf.money } }, { upsert: true } ); + PushGiftFun.buy(player.uid, payId) // 推送礼包 }); G.on("FIRST_LOGIN_EVERY_DAY", (gud, lastTime, curTime) => { diff --git a/src/public/pushgift.ts b/src/public/pushgift.ts index 72fcfde..e003088 100644 --- a/src/public/pushgift.ts +++ b/src/public/pushgift.ts @@ -152,4 +152,22 @@ export class PushGiftFun { // 推送客户端消息 G.server.sendMsgByUid(uid, "msg_s2c/PushGiftChange", 1); } + + static async buy(uid: string, payId: string) { + // 购买礼包 + let gift; + for (let gift_id in G.gc.tuisonglibao) { + gift = G.gc.tuisonglibao[gift_id]; + if (gift.payId.includes(payId)) break; + } + let index = gift.payId.indexOf(payId); + let info = await G.mongodb.collection("pushgift").findOne({ + uid: uid, id: gift.id.toString() + }) + if (info.passTime >= G.time) { + G.mongodb.collection("pushgift").updateOne({ + uid: uid, id: gift.id.toString() + }, {$inc: {[`buy.${index}`]: 1}}) + } + } } \ No newline at end of file From 0fc409b0dc2f3e694a965caabb01351167dc33bd Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 09:55:18 +0800 Subject: [PATCH 22/80] 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 e99b5dad155cd87e3c2c0c5acb1522a2aa4a7695 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 15 Dec 2023 10:30:37 +0800 Subject: [PATCH 23/80] =?UTF-8?q?feat:=201.=E6=8E=A8=E9=80=81=E7=A4=BC?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/public/fight.ts | 2 +- src/public/pushgift.ts | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/public/fight.ts b/src/public/fight.ts index c13c029..c2388b5 100644 --- a/src/public/fight.ts +++ b/src/public/fight.ts @@ -118,7 +118,7 @@ export class FightFun { // 主线 爬塔 战败触发推送礼包 if (result.winSide != 0 && ["tanxian", "pata"].includes(type)) { - PushGiftFun.chkLoseGift(data[0].player.uid) + PushGiftFun.chkLoseGift(call.uid) } return result } diff --git a/src/public/pushgift.ts b/src/public/pushgift.ts index e003088..22fb397 100644 --- a/src/public/pushgift.ts +++ b/src/public/pushgift.ts @@ -54,7 +54,7 @@ export class PushGiftFun { let gift_ids = []; for (let id in G.gc.tuisonglibao) { let conf = G.gc.tuisonglibao[id]; - if (conf.type == PushGiftType.LevelGift && conf.num[0] == lv) { + if (conf.type == PushGiftType.LvGift && conf.num[0] == lv) { gift_ids.push(id); } } @@ -157,17 +157,23 @@ export class PushGiftFun { // 购买礼包 let gift; for (let gift_id in G.gc.tuisonglibao) { - gift = G.gc.tuisonglibao[gift_id]; - if (gift.payId.includes(payId)) break; + let temp = G.gc.tuisonglibao[gift_id]; + if (temp.payId.includes(payId)) { + gift = temp; + break + } } + if (!gift) return; let index = gift.payId.indexOf(payId); let info = await G.mongodb.collection("pushgift").findOne({ uid: uid, id: gift.id.toString() }) if (info.passTime >= G.time) { - G.mongodb.collection("pushgift").updateOne({ + await G.mongodb.collection("pushgift").updateOne({ uid: uid, id: gift.id.toString() }, {$inc: {[`buy.${index}`]: 1}}) + // 推送客户端消息 + G.server.sendMsgByUid(uid, "msg_s2c/PushGiftChange", 1); } } } \ No newline at end of file From e35e950e11b61c1beadc27453cc332691a21d7fd Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 15 Dec 2023 11:01:56 +0800 Subject: [PATCH 24/80] =?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 44e4190..6924efa 100644 --- a/src/public/taskclass.ts +++ b/src/public/taskclass.ts @@ -12,6 +12,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 = {} /** @@ -333,22 +334,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 f6248d1294a67ca942e070e7b7c42b4ee78652ef Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 11:12:04 +0800 Subject: [PATCH 25/80] 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 9d5b69edc2fe92a15190de0892e15b4bcf3c8d0f Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 15 Dec 2023 10:30:37 +0800 Subject: [PATCH 26/80] 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 0b806429ab3bca3ffdcb0caa91638e58b03d1192 Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 12:01:38 +0800 Subject: [PATCH 27/80] 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 665a3cd..35c6225 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 865bfb9943dd0b99f8c1e6b256ac0d134c6ea455 Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 12:17:58 +0800 Subject: [PATCH 28/80] 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 35c6225..bcda345 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 29/80] 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 30/80] =?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 4fc0da4a702ae4fdf94363da1ff6f0b7a36c716f Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 15 Dec 2023 15:14:12 +0800 Subject: [PATCH 31/80] =?UTF-8?q?fix:=20=E9=A6=96=E5=85=85=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=B8=8E=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/shouchong/ApiOpen.ts | 17 +- src/api_s2c/event/shouchong/ApiReceive.ts | 56 ----- src/patch_reset_shouchong.ts | 200 ++++++++++++++++++ src/path_shop_redis2db.ts | 30 --- .../protocols/event/shouchong/PtlOpen.ts | 5 +- .../protocols/event/shouchong/PtlReceive.ts | 13 -- 6 files changed, 211 insertions(+), 110 deletions(-) delete mode 100644 src/api_s2c/event/shouchong/ApiReceive.ts create mode 100644 src/patch_reset_shouchong.ts delete mode 100644 src/path_shop_redis2db.ts delete mode 100644 src/shared/protocols/event/shouchong/PtlReceive.ts diff --git a/src/api_s2c/event/shouchong/ApiOpen.ts b/src/api_s2c/event/shouchong/ApiOpen.ts index 010d12f..a93d02c 100644 --- a/src/api_s2c/event/shouchong/ApiOpen.ts +++ b/src/api_s2c/event/shouchong/ApiOpen.ts @@ -1,11 +1,14 @@ -import { ApiCall } from "tsrpc"; -import { ReqOpen, ResOpen } from "../../../shared/protocols/event/shouchong/PtlOpen"; +import {ApiCall} from "tsrpc"; +import {ReqOpen, ResOpen} from "../../../shared/protocols/event/shouchong/PtlOpen"; +import {PayFun} from "../../../public/pay"; export default async function (call: ApiCall) { - let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' }); + let payIds = []; + for (let k in G.gc.shouchong) { + payIds.push(G.gc.shouchong[k].payid) + } - call.succ({ - payNum: call.conn.gud.payExp / 10, - receive: Object.fromEntries(Object.keys(G.gc.shouchong).map(k => [k, data?.receive?.[k] || []])) - }); + let pays = await PayFun.getPayLogs(call.uid, payIds) + + call.succ({payIds: Object.keys(pays)}); } \ No newline at end of file diff --git a/src/api_s2c/event/shouchong/ApiReceive.ts b/src/api_s2c/event/shouchong/ApiReceive.ts deleted file mode 100644 index 6e29d12..0000000 --- a/src/api_s2c/event/shouchong/ApiReceive.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { ApiCall } from "tsrpc"; -import { PlayerFun } from '../../../public/player'; -import { ReqReceive, ResReceive } from "../../../shared/protocols/event/shouchong/PtlReceive"; -import { PublicShared } from '../../../shared/public/public'; -import { HongDianChange } from "../../hongdian/fun"; - -export default async function (call: ApiCall) { - - let conf = G.gc.shouchong[call.req.k]; - - if (!conf) return call.error(globalThis.lng.pata_getprize_1); - - let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' }); - - let recArr = data?.receive?.[call.req.k] || []; - - if (call.conn.gud.payExp < conf.paynum) return call.error(globalThis.lng.event_kfkh_9); - - if (recArr.length >= conf.prize.length) return call.error(globalThis.lng.event_kfkh_3); - - if (recArr.slice(-1)[0] && PublicShared.getToDayZeroTime() < recArr.slice(-1)[0]) return call.error(globalThis.lng.event_kfkh_10); - - await PlayerFun.sendPrize(call, conf.prize[recArr.length]); - await G.mongodb.cEvent('shouchong').updateOne( - { uid: call.uid, type: 'shouchong' }, - { $push: G.mongodb.createTreeObj({ key: 'receive', k: call.req.k, val: G.time }) }, - { upsert: true } - ); - - let recLen = data != null ? Object.values(data.receive).map(arr => arr.length).reduce((a, b) => a + b) + 1 : 1; - let allLen = Object.values(G.gc.shouchong).map(conf => conf.prize.length as number).reduce((a, b) => a + b); - if (data && recLen >= allLen) { - G.mongodb.collection('syncBtns').updateOne({ uid: call.uid }, { $set: { 'shouchong.active': false } }, { upsert: true }); - } - HongDianChange.sendChangeKey(call.uid, ['shouchong']) - - call.succ({ - prize: conf.prize[recArr.length] - }); -} - -export async function getShouChongRedPoint(call: ApiCall) { - let res = { show: false }; - let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' }); - - for (let [id, conf] of Object.entries(G.gc.shouchong)) { - let rec = data?.receive?.[id] || []; - if (call.conn.gud.payExp / 10 < conf.paynum || rec.length >= conf.prize.length) continue; - if (rec.length == 0 || rec.slice(-1)[0] < PublicShared.getToDayZeroTime(G.time)) { - res = { show: true }; - break; - } - } - - return res; -} \ No newline at end of file diff --git a/src/patch_reset_shouchong.ts b/src/patch_reset_shouchong.ts new file mode 100644 index 0000000..4f08542 --- /dev/null +++ b/src/patch_reset_shouchong.ts @@ -0,0 +1,200 @@ +import {ctor} from './global'; +import {initMongoDB} from './setMongodb'; +import {EmailFun} from "./public/email"; + +const shouchong = { + "shouchong1": { + "paynum": 6, + "cartoon": { + "hero": 5001 + }, + "prize": [ + [ + { + "a": "hero", + "t": "5001", + "n": 1 + }, + { + "a": "attr", + "t": "jinbi", + "n": 100000 + } + ], + [ + { + "a": "item", + "t": "12", + "n": 200 + }, + { + "a": "attr", + "t": "jinbi", + "n": 200000 + } + ], + [ + { + "a": "item", + "t": "12", + "n": 200 + }, + { + "a": "attr", + "t": "jinbi", + "n": 300000 + } + ] + ] + }, + "shouchong2": { + "paynum": 30, + "cartoon": { + "img": 5001 + }, + "prize": [ + [ + { + "a": "equip", + "t": "1009", + "n": 1 + }, + { + "a": "equip", + "t": "2009", + "n": 1 + } + ], + [ + { + "a": "equip", + "t": "3009", + "n": 1 + }, + { + "a": "item", + "t": "2", + "n": 1000 + } + ], + [ + { + "a": "equip", + "t": "4009", + "n": 1 + }, + { + "a": "item", + "t": "2", + "n": 1000 + } + ] + ] + }, + "shouchong3": { + "paynum": 98, + "cartoon": { + "hero": 5002 + }, + "prize": [ + [ + { + "a": "hero", + "t": "5002", + "n": 1 + }, + { + "a": "item", + "t": "4", + "n": 10 + } + ], + [ + { + "a": "equip", + "t": "1010", + "n": 1 + }, + { + "a": "item", + "t": "2", + "n": 2000 + } + ], + [ + { + "a": "equip", + "t": "3010", + "n": 1 + }, + { + "a": "item", + "t": "2", + "n": 2000 + } + ] + ] + } +} + +async function start() { + //连接mongodb + await initMongoDB(); + let users = await G.mongodb.collection("user").find({}, { + projection: {uid: 1, payExp: 1} + }).toArray() + + for (let i = 0; i < users.length; i++) { + let user = users[i]; + let data = await G.mongodb.cEvent("shouchong").findOne({uid: user.uid}); + + let send_prize = []; + for (let key in shouchong) { + // 充值不足 + if (user.payExp < shouchong[key]["paynum"] * 10) { + continue + } + + // 奖励已经领取完毕 + if (data && data.receive[key] && data.receive[key].length >= shouchong[key]["prize"].length) { + continue + } + + // 补发未领取奖励 + for (let i = 0; i < shouchong[key]["prize"].length; i++) { + if (data.receive[key][i]) { + continue + } + data.receive[key][i] = G.time; + send_prize.concat(shouchong[key]["prize"][i]); + } + } + if (send_prize.length <= 0) continue; + + let title = "首充未领取奖励补发"; + let content = "首充未领取奖励补发"; + + // 设置奖励发放记录 + await G.mongodb.cEvent("shouchong").updateOne({ + uid: user.uid + }, {"$set": {receive: data.receive}}); + + // 发放邮件 + await EmailFun.addEmail({ + uid: user.uid, + type: "system", + title: title, + content: content, + prize: send_prize, + }) + } +} + +//定义全局变量 +ctor(); +//启动服务 +start().then(() => { + process.exit() +}); + + diff --git a/src/path_shop_redis2db.ts b/src/path_shop_redis2db.ts deleted file mode 100644 index ab437f2..0000000 --- a/src/path_shop_redis2db.ts +++ /dev/null @@ -1,30 +0,0 @@ -import {ctor} from './global'; -import {initMongoDB} from './setMongodb'; -import {initRedis} from './setRedis'; - -async function start() { - //连接mongodb - await initMongoDB(); - //连接redis - await initRedis(); - - let shopdata = await G.redis.get("shop") - - for (let uid in shopdata) { - for (let shopId in shopdata[uid]) { - - await G.mongodb.collection("shop").updateOne( - {uid: uid.slice(1), shopId: shopId.slice(1)}, - {$set: shopdata[uid][shopId]}, {upsert: true} - ) - console.log(`玩家${uid.slice(1)}商店${shopId.slice(1)}数据写入成功！！`) - } - } -} - -//定义全局变量 -ctor(); -//启动服务 -start().then(() => {process.exit()}); - - diff --git a/src/shared/protocols/event/shouchong/PtlOpen.ts b/src/shared/protocols/event/shouchong/PtlOpen.ts index cad5f93..36c207e 100644 --- a/src/shared/protocols/event/shouchong/PtlOpen.ts +++ b/src/shared/protocols/event/shouchong/PtlOpen.ts @@ -8,8 +8,5 @@ export type ReqOpen = { }; export type ResOpen = { - payNum: number; - receive: { - [k: string]: number[]; - }; + payIds: string[]; }; \ No newline at end of file diff --git a/src/shared/protocols/event/shouchong/PtlReceive.ts b/src/shared/protocols/event/shouchong/PtlReceive.ts deleted file mode 100644 index 45af650..0000000 --- a/src/shared/protocols/event/shouchong/PtlReceive.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { prizeType } from '../../type'; - - -/** - * 领取 - */ -export type ReqReceive = { - k: string; -}; - -export type ResReceive = { - prize: prizeType[]; -}; \ No newline at end of file From 14d691604e12259deeea4ad4b9649f9b85490d04 Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 16:47:34 +0800 Subject: [PATCH 32/80] 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" } } } From 11c1c0b2c2a815f26812523740097c83196df76a Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 17:01:32 +0800 Subject: [PATCH 33/80] fix bug --- src/api_s2c/hongdian/ApiGet.ts | 3 +- src/shared/protocols/serviceProto.ts | 619 ++++++++++++--------------- 2 files changed, 285 insertions(+), 337 deletions(-) diff --git a/src/api_s2c/hongdian/ApiGet.ts b/src/api_s2c/hongdian/ApiGet.ts index 57898d1..ab0c3cf 100644 --- a/src/api_s2c/hongdian/ApiGet.ts +++ b/src/api_s2c/hongdian/ApiGet.ts @@ -11,7 +11,6 @@ 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"; @@ -37,7 +36,7 @@ export default async function (call: ApiCall) { res[key] = {show: (!db || toDayZeroTime >= db.freeTime) ? true : false}; break; case 'shouchong': - res[key] = await getShouChongRedPoint(call); + // res[key] = await getShouChongRedPoint(call); break; case 'dixiaqianzhuanghd': res[key] = await DiXiaQianZhuangFun.getHongDian(call); 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" } } } From d0600046092f246f3314dc77486cdcc9b2739f86 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 15 Dec 2023 17:42:20 +0800 Subject: [PATCH 34/80] =?UTF-8?q?fix:=20=E5=8D=81=E4=BA=94=E5=A4=A9?= =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E5=85=85=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/shiwuleichong/ApiOpen.ts | 64 +- src/api_s2c/event/shiwuleichong/ApiRec.ts | 26 - src/api_s2c/hongdian/fun.ts | 40 +- src/jsonType.ts | 2 +- .../protocols/event/shiwuleichong/PtlOpen.ts | 14 +- .../protocols/event/shiwuleichong/PtlRec.ts | 13 - src/shared/protocols/serviceProto.ts | 644 ++++++++---------- 7 files changed, 353 insertions(+), 450 deletions(-) delete mode 100644 src/api_s2c/event/shiwuleichong/ApiRec.ts delete mode 100644 src/shared/protocols/event/shiwuleichong/PtlRec.ts diff --git a/src/api_s2c/event/shiwuleichong/ApiOpen.ts b/src/api_s2c/event/shiwuleichong/ApiOpen.ts index 63aa21d..5763d97 100644 --- a/src/api_s2c/event/shiwuleichong/ApiOpen.ts +++ b/src/api_s2c/event/shiwuleichong/ApiOpen.ts @@ -1,41 +1,43 @@ -import { UpdateFilter } from 'mongodb'; -import { ApiCall } from "tsrpc"; -import { CollectionEvent } from '../../../module/collection_event'; -import { PayFun } from '../../../public/pay'; -import { ReqOpen, ResOpen } from "../../../shared/protocols/event/shiwuleichong/PtlOpen"; -import { PublicShared } from '../../../shared/public/public'; +import {ApiCall} from "tsrpc"; +import {ReqOpen, ResOpen} from "../../../shared/protocols/event/shiwuleichong/PtlOpen"; +import {PayFun} from "../../../public/pay"; +import {PublicShared} from "../../../shared/public/public"; + export default async function (call: ApiCall) { - let db = await G.mongodb.cEvent('15leichong').findOne({ uid: call.uid, type: '15leichong' }); - let update: UpdateFilter>; - let sTime = PublicShared.getToDayZeroTime(G.time); + let payids = G.gc.shiwuleichong.tasks.map( + (i) => i.payid + ); - if (!db) { - update = { - $set: { index: 0, sTime: sTime, recIndex: [] } - }; - } else { - if (db.sTime + G.gc.shiwuleichong.data[db.index].time < G.time) { - - db.sTime = sTime; - db.index = G.gc.shiwuleichong.data[db.index + 1] == undefined ? db.index : db.index + 1; - db.recIndex = []; - - update = { - $set: { index: db.index, sTime: db.sTime, recIndex: [] } - }; + let day: number = 1; + let _zt = PublicShared.getToDayZeroTime(); + let pays = await PayFun.getPayLogs(call.uid, payids); + for (; day <= G.gc.shiwuleichong.tasks.length; day++) { + let pay = pays[G.gc.shiwuleichong.tasks[day].payid]; + if (!pay) { + break } else { - sTime = db.sTime; + if (pay.slice(-1)[0].time >= _zt) { + break + } } } - - update && G.mongodb.cEvent('15leichong').updateOne({ uid: call.uid, type: '15leichong' }, update, { upsert: true }); - let index = db?.index || 0; + // 如果是最后一天奖励 并且 充值订单隔天了 + if ( + day == G.gc.shiwuleichong.tasks.length && + pays[G.gc.shiwuleichong.tasks[day - 1].payid] && + pays[G.gc.shiwuleichong.tasks[day - 1].payid].slice(-1)[0].time < _zt + ) { + // 重置所有订单 + await PayFun.delPayLog(call.uid, ...payids.map(i => { + return {payId: i, val: []} + })) + day = 1; + pays = {}; + } call.succ({ - index: index, - sTime: sTime, - recIndex: db?.recIndex || [], - payDay: await PayFun.getPayDaysBuyPayNum(call.uid, sTime, sTime + G.gc.shiwuleichong.data[index].time, G.gc.shiwuleichong.dayPayNeed) + day: day, + payIds: Object.keys(pays) }); } \ No newline at end of file diff --git a/src/api_s2c/event/shiwuleichong/ApiRec.ts b/src/api_s2c/event/shiwuleichong/ApiRec.ts deleted file mode 100644 index f9cf51e..0000000 --- a/src/api_s2c/event/shiwuleichong/ApiRec.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { ApiCall } from "tsrpc"; -import { PayFun } from '../../../public/pay'; -import { PlayerFun } from '../../../public/player'; -import { ReqRec, ResRec } from "../../../shared/protocols/event/shiwuleichong/PtlRec"; - -export default async function (call: ApiCall) { - let db = await G.mongodb.cEvent('15leichong').findOne({ uid: call.uid, type: '15leichong' }); - let confArr = G.gc.shiwuleichong.data[db.index]; - - if (!confArr.tasks[call.req.index]) return call.error('', { code: -1 }); - if (db.recIndex.includes(call.req.index)) return call.error('', { code: -2 }); - - let payDay = await PayFun.getPayDaysBuyPayNum(call.uid, db.sTime, db.sTime + confArr.time, G.gc.shiwuleichong.dayPayNeed); - if (payDay < confArr.tasks[call.req.index].total) return call.error('', { code: -3 }); - - await PlayerFun.sendPrize(call, confArr.tasks[call.req.index].prize); - - G.mongodb.cEvent('15leichong').updateOne( - { uid: call.uid, type: '15leichong' }, - { $push: { recIndex: call.req.index } } - ); - - call.succ({ - prize: confArr.tasks[call.req.index].prize - }); -} \ No newline at end of file diff --git a/src/api_s2c/hongdian/fun.ts b/src/api_s2c/hongdian/fun.ts index 867eb16..4b58691 100644 --- a/src/api_s2c/hongdian/fun.ts +++ b/src/api_s2c/hongdian/fun.ts @@ -877,7 +877,7 @@ export class HuoDongHongDianFun { } }; _res.val.meirijingxuan = await this.heiShiHongDian(call) - _res.val.jitianhaoli = await this.heiShiLCHongDian(call) + // _res.val.jitianhaoli = await this.heiShiLCHongDian(call) _res.val.niudanji = await this.heiShiNiuDanJi(call) Object.values(_res.val).forEach(x => _res.show = _res.show || x.show) return _res @@ -913,25 +913,25 @@ export class HuoDongHongDianFun { } /**黑市 积天豪礼 */ - static async heiShiLCHongDian(call: ApiCall): Promise { - let _res: hongdianVal = { - show: false - }; - let db = await G.mongodb.cEvent('15leichong').findOne({uid: call.uid, type: '15leichong'}); - - if (!db) return _res; - - let _con = G.gc.shiwuleichong.data[db.index]; - let payDay = await PayFun.getPayDaysBuyPayNum(call.uid, db.sTime, db.sTime + _con.time, G.gc.shiwuleichong.dayPayNeed); - for (let index = 0; index < _con.tasks.length; index++) { - const element = _con.tasks[index]; - if (db.recIndex.includes(index)) continue; - if (payDay < element.total) continue; - _res.show = true; - break; - } - return _res; - } + // static async heiShiLCHongDian(call: ApiCall): Promise { + // let _res: hongdianVal = { + // show: false + // }; + // let db = await G.mongodb.cEvent('15leichong').findOne({uid: call.uid, type: '15leichong'}); + // + // if (!db) return _res; + // + // let _con = G.gc.shiwuleichong.data[db.index]; + // let payDay = await PayFun.getPayDaysBuyPayNum(call.uid, db.sTime, db.sTime + _con.time, G.gc.shiwuleichong.dayPayNeed); + // for (let index = 0; index < _con.tasks.length; index++) { + // const element = _con.tasks[index]; + // if (db.recIndex.includes(index)) continue; + // if (payDay < element.total) continue; + // _res.show = true; + // break; + // } + // return _res; + // } /**黑市 扭蛋机 */ static async heiShiNiuDanJi(call: ApiCall): Promise { diff --git a/src/jsonType.ts b/src/jsonType.ts index 3b8f547..8788f60 100644 --- a/src/jsonType.ts +++ b/src/jsonType.ts @@ -1179,7 +1179,7 @@ type gc_shiwucom = { }, "comment": { "jichu_colour": string, "fujia_colour": string, "fujianum_colour": string, "putongxilian": string, "gaojixilian": string, "hero_zhuanshu": string, "buff_zhuanshu": string, "skill_zhuanshu": string, "chongzhuneed": string, "chongzhurate": string, "tilianhuobi": string, [x: string]: any }, [x: string]: any } -type gc_shiwuleichong = { "dayPayNeed": number, "data": { "time": number, "tasks": { "total": number, "prize": { "a": string, "t": string, "n": number, [x: string]: any }[], [x: string]: any }[], [x: string]: any }[], [x: string]: any } +type gc_shiwuleichong = { tasks: { day: number, payid: string }[] } type gc_shoot = { [key: string]: { "name": string, "num": number, "speed": number, "cartridge": number, "time": number, "prize": { [key: string]: { "describe": string, "hit": number, "content": { "a": string, "t": string, "n": number, [x: string]: any }[], [x: string]: any } }, [x: string]: any } } diff --git a/src/shared/protocols/event/shiwuleichong/PtlOpen.ts b/src/shared/protocols/event/shiwuleichong/PtlOpen.ts index 5988d1b..baf05a9 100644 --- a/src/shared/protocols/event/shiwuleichong/PtlOpen.ts +++ b/src/shared/protocols/event/shiwuleichong/PtlOpen.ts @@ -1,18 +1,10 @@ - /** * 进入15天累充 */ -export type ReqOpen = { - -}; +export type ReqOpen = {}; export type ResOpen = { /**礼包组 取G.gc.shiwuleichong[index] */ - index: number; - /**开始时间 倒计时显示 sTime+G.gc.shiwuleichong[index].time */ - sTime: number; - /**已领取的奖励下标 */ - recIndex: number[]; - /**已充值的天数 */ - payDay: number; + day: number; + payIds: string[]; }; \ No newline at end of file diff --git a/src/shared/protocols/event/shiwuleichong/PtlRec.ts b/src/shared/protocols/event/shiwuleichong/PtlRec.ts deleted file mode 100644 index 0bf0af1..0000000 --- a/src/shared/protocols/event/shiwuleichong/PtlRec.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { prizeType } from '../../type'; - - -/** - * 领取15天累充奖励 - */ -export type ReqRec = { - index: number; -}; - -export type ResRec = { - prize: prizeType[]; -}; \ No newline at end of file diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 218afc9..42ce9dd 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -73,23 +73,22 @@ import { ReqRec as ReqRec_6, ResRec as ResRec_6 } from './event/qirichongzhi/Ptl import { ReqOpen as ReqOpen_17, ResOpen as ResOpen_17 } from './event/qiridenglu/PtlOpen'; import { ReqRecPrize as ReqRecPrize_1, ResRecPrize as ResRecPrize_1 } from './event/qiridenglu/PtlRecPrize'; import { ReqOpen as ReqOpen_18, ResOpen as ResOpen_18 } from './event/shiwuleichong/PtlOpen'; -import { 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'; import { ReqOpen as ReqOpen_20, ResOpen as ResOpen_20 } from './event/xianshizhaomu/PtlOpen'; -import { ReqRec as ReqRec_8, ResRec as ResRec_8 } from './event/xianshizhaomu/PtlRec'; +import { ReqRec as ReqRec_7, ResRec as ResRec_7 } from './event/xianshizhaomu/PtlRec'; import { ReqOpen as ReqOpen_21, ResOpen as ResOpen_21 } from './event/xinshoulibao/PtlOpen'; import { ReqBuy as ReqBuy_2, ResBuy as ResBuy_2 } from './event/yangchengmubiao/PtlBuy'; import { ReqOpen as ReqOpen_22, ResOpen as ResOpen_22 } from './event/yangchengmubiao/PtlOpen'; -import { ReqRec as ReqRec_9, ResRec as ResRec_9 } from './event/yangchengmubiao/PtlRec'; +import { ReqRec as ReqRec_8, ResRec as ResRec_8 } from './event/yangchengmubiao/PtlRec'; import { ReqOpen as ReqOpen_23, ResOpen as ResOpen_23 } from './event/yibaichou/PtlOpen'; -import { ReqRec as ReqRec_10, ResRec as ResRec_10 } from './event/yibaichou/PtlRec'; +import { ReqRec as ReqRec_9, ResRec as ResRec_9 } from './event/yibaichou/PtlRec'; import { ReqRecAll, ResRecAll } from './event/yibaichou/PtlRecAll'; import { ReqOpen as ReqOpen_24, ResOpen as ResOpen_24 } from './event/yuedujijin/PtlOpen'; -import { ReqRec as ReqRec_11, ResRec as ResRec_11 } from './event/yuedujijin/PtlRec'; +import { ReqRec as ReqRec_10, ResRec as ResRec_10 } from './event/yuedujijin/PtlRec'; import { ReqBuyLv, ResBuyLv } from './event/zhanling/PtlBuyLv'; import { ReqOpen as ReqOpen_25, ResOpen as ResOpen_25 } from './event/zhanling/PtlOpen'; import { ReqRecPrize as ReqRecPrize_2, ResRecPrize as ResRecPrize_2 } from './event/zhanling/PtlRecPrize'; @@ -157,7 +156,7 @@ import { ReqBuyNum as ReqBuyNum_1, ResBuyNum as ResBuyNum_1 } from './hbzb/jfs/P 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 { ReqRec as ReqRec_12, ResRec as ResRec_12 } from './hbzb/jfs/PtlRec'; +import { ReqRec as ReqRec_11, ResRec as ResRec_11 } from './hbzb/jfs/PtlRec'; import { ReqRefresh as ReqRefresh_2, ResRefresh as ResRefresh_2 } from './hbzb/jfs/PtlRefresh'; import { ReqGetStatus, ResGetStatus } from './hbzb/PtlGetStatus'; import { ReqBuyNum as ReqBuyNum_2, ResBuyNum as ResBuyNum_2 } from './hbzb/zbs/PtlBuyNum'; @@ -171,7 +170,7 @@ import { ReqGetList as ReqGetList_3, ResGetList as ResGetList_3 } from './hero/P import { ReqJinJie, ResJinJie } from './hero/PtlJinJie'; import { ReqLvUp as ReqLvUp_1, ResLvUp as ResLvUp_1 } from './hero/PtlLvUp'; import { ReqPotency, ResPotency } from './hero/PtlPotency'; -import { ReqRec as ReqRec_13, ResRec as ResRec_13 } from './hero/PtlRec'; +import { ReqRec as ReqRec_12, ResRec as ResRec_12 } from './hero/PtlRec'; import { ReqReset as ReqReset_2, ResReset as ResReset_2 } from './hero/PtlReset'; import { ReqTalent, ResTalent } from './hero/PtlTalent'; import { ReqWeaponUp, ResWeaponUp } from './hero/PtlWeaponUp'; @@ -277,7 +276,7 @@ import { ReqRecast, ResRecast } from './shiwu/PtlRecast'; import { ReqTakeOff as ReqTakeOff_2, ResTakeOff as ResTakeOff_2 } from './shiwu/PtlTakeOff'; import { ReqWear as ReqWear_2, ResWear as ResWear_2 } from './shiwu/PtlWear'; import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './shootGame/PtlOpen'; -import { ReqRec as ReqRec_14, ResRec as ResRec_14 } from './shootGame/PtlRec'; +import { ReqRec as ReqRec_13, ResRec as ResRec_13 } from './shootGame/PtlRec'; import { ReqBuy as ReqBuy_6, ResBuy as ResBuy_6 } from './shop/PtlBuy'; import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './shop/PtlOpen'; import { ReqRefresh as ReqRefresh_6, ResRefresh as ResRefresh_6 } from './shop/PtlRefresh'; @@ -291,7 +290,7 @@ import { ReqFightLog as ReqFightLog_2, ResFightLog as ResFightLog_2 } from './sl import { ReqMyRank, ResMyRank } from './slzd/PtlMyRank'; 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 { ReqRec as ReqRec_14, ResRec as ResRec_14 } from './slzd/PtlRec'; import { ReqRefresh as ReqRefresh_7, ResRefresh as ResRefresh_7 } from './slzd/PtlRefresh'; import { ReqSlot, ResSlot } from './slzd/PtlSlot'; import { ReqEvent, ResEvent } from './tanxian/PtlEvent'; @@ -643,10 +642,6 @@ export interface ServiceType { req: ReqOpen_18, res: ResOpen_18 }, - "event/shiwuleichong/Rec": { - req: ReqRec_7, - res: ResRec_7 - }, "event/shouchong/Open": { req: ReqOpen_19, res: ResOpen_19 @@ -672,8 +667,8 @@ export interface ServiceType { res: ResOpen_20 }, "event/xianshizhaomu/Rec": { - req: ReqRec_8, - res: ResRec_8 + req: ReqRec_7, + res: ResRec_7 }, "event/xinshoulibao/Open": { req: ReqOpen_21, @@ -688,16 +683,16 @@ export interface ServiceType { res: ResOpen_22 }, "event/yangchengmubiao/Rec": { - req: ReqRec_9, - res: ResRec_9 + req: ReqRec_8, + res: ResRec_8 }, "event/yibaichou/Open": { req: ReqOpen_23, res: ResOpen_23 }, "event/yibaichou/Rec": { - req: ReqRec_10, - res: ResRec_10 + req: ReqRec_9, + res: ResRec_9 }, "event/yibaichou/RecAll": { req: ReqRecAll, @@ -708,8 +703,8 @@ export interface ServiceType { res: ResOpen_24 }, "event/yuedujijin/Rec": { - req: ReqRec_11, - res: ResRec_11 + req: ReqRec_10, + res: ResRec_10 }, "event/zhanling/BuyLv": { req: ReqBuyLv, @@ -980,8 +975,8 @@ export interface ServiceType { res: ResOpen_36 }, "hbzb/jfs/Rec": { - req: ReqRec_12, - res: ResRec_12 + req: ReqRec_11, + res: ResRec_11 }, "hbzb/jfs/Refresh": { req: ReqRefresh_2, @@ -1036,8 +1031,8 @@ export interface ServiceType { res: ResPotency }, "hero/Rec": { - req: ReqRec_13, - res: ResRec_13 + req: ReqRec_12, + res: ResRec_12 }, "hero/Reset": { req: ReqReset_2, @@ -1344,8 +1339,8 @@ export interface ServiceType { res: ResOpen_51 }, "shootGame/Rec": { - req: ReqRec_14, - res: ResRec_14 + req: ReqRec_13, + res: ResRec_13 }, "shop/Buy": { req: ReqBuy_6, @@ -1400,8 +1395,8 @@ export interface ServiceType { res: ResOpenFort }, "slzd/Rec": { - req: ReqRec_15, - res: ResRec_15 + req: ReqRec_14, + res: ResRec_14 }, "slzd/Refresh": { req: ReqRefresh_7, @@ -2019,81 +2014,76 @@ export const serviceProto: ServiceProto = { }, { "id": 74, - "name": "event/shiwuleichong/Rec", - "type": "api" - }, - { - "id": 75, "name": "event/shouchong/Open", "type": "api" }, { - "id": 76, + "id": 75, "name": "event/shouchong/Receive", "type": "api" }, { - "id": 77, + "id": 76, "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" } @@ -10264,60 +10254,18 @@ export const serviceProto: ServiceProto = { "properties": [ { "id": 0, - "name": "index", + "name": "day", "type": { "type": "Number" } }, { "id": 1, - "name": "sTime", - "type": { - "type": "Number" - } - }, - { - "id": 2, - "name": "recIndex", + "name": "payIds", "type": { "type": "Array", "elementType": { - "type": "Number" - } - } - }, - { - "id": 3, - "name": "payDay", - "type": { - "type": "Number" - } - } - ] - }, - "event/shiwuleichong/PtlRec/ReqRec": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "index", - "type": { - "type": "Number" - } - } - ] - }, - "event/shiwuleichong/PtlRec/ResRec": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "prize", - "type": { - "type": "Array", - "elementType": { - "type": "Reference", - "target": "type/prizeType" + "type": "String" } } } From a6fb04ce581fc461ec08fb2f09a2bd73991ec9ab Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 15 Dec 2023 18:01:05 +0800 Subject: [PATCH 35/80] =?UTF-8?q?fix:=20=E9=A6=96=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/shouchong/ApiOpen.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api_s2c/event/shouchong/ApiOpen.ts b/src/api_s2c/event/shouchong/ApiOpen.ts index a93d02c..a6e69d3 100644 --- a/src/api_s2c/event/shouchong/ApiOpen.ts +++ b/src/api_s2c/event/shouchong/ApiOpen.ts @@ -10,5 +10,5 @@ export default async function (call: ApiCall) { let pays = await PayFun.getPayLogs(call.uid, payIds) - call.succ({payIds: Object.keys(pays)}); + call.succ({payIds: Object.keys(pays).filter((i) => pays[i].length > 0)}); } \ No newline at end of file From 00f829c48cfa07f4e42d63b3b9c855d74c87351c Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 15 Dec 2023 18:26:25 +0800 Subject: [PATCH 36/80] =?UTF-8?q?fix:=20=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/protocols/serviceProto.ts | 642 ++++++++++++--------------- 1 file changed, 295 insertions(+), 347 deletions(-) diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 48d5f56..2329b0e 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -73,22 +73,21 @@ import { ReqRec as ReqRec_6, ResRec as ResRec_6 } from './event/qirichongzhi/Ptl import { ReqOpen as ReqOpen_17, ResOpen as ResOpen_17 } from './event/qiridenglu/PtlOpen'; import { ReqRecPrize as ReqRecPrize_1, ResRecPrize as ResRecPrize_1 } from './event/qiridenglu/PtlRecPrize'; import { ReqOpen as ReqOpen_18, ResOpen as ResOpen_18 } from './event/shiwuleichong/PtlOpen'; -import { 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 { ReqBuy as ReqBuy_1, ResBuy as ResBuy_1 } from './event/xianshizhaomu/PtlBuy'; import { ReqDuihuan, ResDuihuan } from './event/xianshizhaomu/PtlDuihuan'; import { ReqLottery as ReqLottery_1, ResLottery as ResLottery_1 } from './event/xianshizhaomu/PtlLottery'; import { ReqOpen as ReqOpen_20, ResOpen as ResOpen_20 } from './event/xianshizhaomu/PtlOpen'; -import { ReqRec as ReqRec_8, ResRec as ResRec_8 } from './event/xianshizhaomu/PtlRec'; +import { ReqRec as ReqRec_7, ResRec as ResRec_7 } from './event/xianshizhaomu/PtlRec'; import { ReqOpen as ReqOpen_21, ResOpen as ResOpen_21 } from './event/xinshoulibao/PtlOpen'; import { ReqBuy as ReqBuy_2, ResBuy as ResBuy_2 } from './event/yangchengmubiao/PtlBuy'; import { ReqOpen as ReqOpen_22, ResOpen as ResOpen_22 } from './event/yangchengmubiao/PtlOpen'; -import { ReqRec as ReqRec_9, ResRec as ResRec_9 } from './event/yangchengmubiao/PtlRec'; +import { ReqRec as ReqRec_8, ResRec as ResRec_8 } from './event/yangchengmubiao/PtlRec'; import { ReqOpen as ReqOpen_23, ResOpen as ResOpen_23 } from './event/yibaichou/PtlOpen'; -import { ReqRec as ReqRec_10, ResRec as ResRec_10 } from './event/yibaichou/PtlRec'; +import { ReqRec as ReqRec_9, ResRec as ResRec_9 } from './event/yibaichou/PtlRec'; import { ReqRecAll, ResRecAll } from './event/yibaichou/PtlRecAll'; import { ReqOpen as ReqOpen_24, ResOpen as ResOpen_24 } from './event/yuedujijin/PtlOpen'; -import { ReqRec as ReqRec_11, ResRec as ResRec_11 } from './event/yuedujijin/PtlRec'; +import { ReqRec as ReqRec_10, ResRec as ResRec_10 } from './event/yuedujijin/PtlRec'; import { ReqBuyLv, ResBuyLv } from './event/zhanling/PtlBuyLv'; import { ReqOpen as ReqOpen_25, ResOpen as ResOpen_25 } from './event/zhanling/PtlOpen'; import { ReqRecPrize as ReqRecPrize_2, ResRecPrize as ResRecPrize_2 } from './event/zhanling/PtlRecPrize'; @@ -156,7 +155,7 @@ import { ReqBuyNum as ReqBuyNum_1, ResBuyNum as ResBuyNum_1 } from './hbzb/jfs/P 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 { ReqRec as ReqRec_12, ResRec as ResRec_12 } from './hbzb/jfs/PtlRec'; +import { ReqRec as ReqRec_11, ResRec as ResRec_11 } from './hbzb/jfs/PtlRec'; import { ReqRefresh as ReqRefresh_2, ResRefresh as ResRefresh_2 } from './hbzb/jfs/PtlRefresh'; import { ReqGetStatus, ResGetStatus } from './hbzb/PtlGetStatus'; import { ReqBuyNum as ReqBuyNum_2, ResBuyNum as ResBuyNum_2 } from './hbzb/zbs/PtlBuyNum'; @@ -170,7 +169,7 @@ import { ReqGetList as ReqGetList_3, ResGetList as ResGetList_3 } from './hero/P import { ReqJinJie, ResJinJie } from './hero/PtlJinJie'; import { ReqLvUp as ReqLvUp_1, ResLvUp as ResLvUp_1 } from './hero/PtlLvUp'; import { ReqPotency, ResPotency } from './hero/PtlPotency'; -import { ReqRec as ReqRec_13, ResRec as ResRec_13 } from './hero/PtlRec'; +import { ReqRec as ReqRec_12, ResRec as ResRec_12 } from './hero/PtlRec'; import { ReqReset as ReqReset_2, ResReset as ResReset_2 } from './hero/PtlReset'; import { ReqTalent, ResTalent } from './hero/PtlTalent'; import { ReqWeaponUp, ResWeaponUp } from './hero/PtlWeaponUp'; @@ -276,7 +275,7 @@ import { ReqRecast, ResRecast } from './shiwu/PtlRecast'; import { ReqTakeOff as ReqTakeOff_2, ResTakeOff as ResTakeOff_2 } from './shiwu/PtlTakeOff'; import { ReqWear as ReqWear_2, ResWear as ResWear_2 } from './shiwu/PtlWear'; import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './shootGame/PtlOpen'; -import { ReqRec as ReqRec_14, ResRec as ResRec_14 } from './shootGame/PtlRec'; +import { ReqRec as ReqRec_13, ResRec as ResRec_13 } from './shootGame/PtlRec'; import { ReqBuy as ReqBuy_6, ResBuy as ResBuy_6 } from './shop/PtlBuy'; import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './shop/PtlOpen'; import { ReqRefresh as ReqRefresh_6, ResRefresh as ResRefresh_6 } from './shop/PtlRefresh'; @@ -290,7 +289,7 @@ import { ReqFightLog as ReqFightLog_2, ResFightLog as ResFightLog_2 } from './sl import { ReqMyRank, ResMyRank } from './slzd/PtlMyRank'; 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 { ReqRec as ReqRec_14, ResRec as ResRec_14 } from './slzd/PtlRec'; import { ReqRefresh as ReqRefresh_7, ResRefresh as ResRefresh_7 } from './slzd/PtlRefresh'; import { ReqSlot, ResSlot } from './slzd/PtlSlot'; import { ReqEvent, ResEvent } from './tanxian/PtlEvent'; @@ -642,10 +641,6 @@ export interface ServiceType { req: ReqOpen_18, res: ResOpen_18 }, - "event/shiwuleichong/Rec": { - req: ReqRec_7, - res: ResRec_7 - }, "event/shouchong/Open": { req: ReqOpen_19, res: ResOpen_19 @@ -667,8 +662,8 @@ export interface ServiceType { res: ResOpen_20 }, "event/xianshizhaomu/Rec": { - req: ReqRec_8, - res: ResRec_8 + req: ReqRec_7, + res: ResRec_7 }, "event/xinshoulibao/Open": { req: ReqOpen_21, @@ -683,16 +678,16 @@ export interface ServiceType { res: ResOpen_22 }, "event/yangchengmubiao/Rec": { - req: ReqRec_9, - res: ResRec_9 + req: ReqRec_8, + res: ResRec_8 }, "event/yibaichou/Open": { req: ReqOpen_23, res: ResOpen_23 }, "event/yibaichou/Rec": { - req: ReqRec_10, - res: ResRec_10 + req: ReqRec_9, + res: ResRec_9 }, "event/yibaichou/RecAll": { req: ReqRecAll, @@ -703,8 +698,8 @@ export interface ServiceType { res: ResOpen_24 }, "event/yuedujijin/Rec": { - req: ReqRec_11, - res: ResRec_11 + req: ReqRec_10, + res: ResRec_10 }, "event/zhanling/BuyLv": { req: ReqBuyLv, @@ -975,8 +970,8 @@ export interface ServiceType { res: ResOpen_36 }, "hbzb/jfs/Rec": { - req: ReqRec_12, - res: ResRec_12 + req: ReqRec_11, + res: ResRec_11 }, "hbzb/jfs/Refresh": { req: ReqRefresh_2, @@ -1031,8 +1026,8 @@ export interface ServiceType { res: ResPotency }, "hero/Rec": { - req: ReqRec_13, - res: ResRec_13 + req: ReqRec_12, + res: ResRec_12 }, "hero/Reset": { req: ReqReset_2, @@ -1339,8 +1334,8 @@ export interface ServiceType { res: ResOpen_51 }, "shootGame/Rec": { - req: ReqRec_14, - res: ResRec_14 + req: ReqRec_13, + res: ResRec_13 }, "shop/Buy": { req: ReqBuy_6, @@ -1395,8 +1390,8 @@ export interface ServiceType { res: ResOpenFort }, "slzd/Rec": { - req: ReqRec_15, - res: ResRec_15 + req: ReqRec_14, + res: ResRec_14 }, "slzd/Refresh": { req: ReqRefresh_7, @@ -2014,76 +2009,71 @@ export const serviceProto: ServiceProto = { }, { "id": 74, - "name": "event/shiwuleichong/Rec", - "type": "api" - }, - { - "id": 75, "name": "event/shouchong/Open", "type": "api" }, { - "id": 76, + "id": 75, "name": "event/xianshizhaomu/Buy", "type": "api" }, { - "id": 77, + "id": 76, "name": "event/xianshizhaomu/Duihuan", "type": "api" }, { - "id": 78, + "id": 77, "name": "event/xianshizhaomu/Lottery", "type": "api" }, { - "id": 79, + "id": 78, "name": "event/xianshizhaomu/Open", "type": "api" }, { - "id": 80, + "id": 79, "name": "event/xianshizhaomu/Rec", "type": "api" }, { - "id": 81, + "id": 80, "name": "event/xinshoulibao/Open", "type": "api" }, { - "id": 82, + "id": 81, "name": "event/yangchengmubiao/Buy", "type": "api" }, { - "id": 83, + "id": 82, "name": "event/yangchengmubiao/Open", "type": "api" }, { - "id": 84, + "id": 83, "name": "event/yangchengmubiao/Rec", "type": "api" }, { - "id": 85, + "id": 84, "name": "event/yibaichou/Open", "type": "api" }, { - "id": 86, + "id": 85, "name": "event/yibaichou/Rec", "type": "api" }, { - "id": 87, + "id": 86, "name": "event/yibaichou/RecAll", "type": "api" }, { - "id": 88, + "id": 87, "name": "event/yuedujijin/Open", "type": "api", "conf": { @@ -2091,157 +2081,157 @@ export const serviceProto: ServiceProto = { } }, { - "id": 89, + "id": 88, "name": "event/yuedujijin/Rec", "type": "api" }, { - "id": 90, + "id": 89, "name": "event/zhanling/BuyLv", "type": "api" }, { - "id": 91, + "id": 90, "name": "event/zhanling/Open", "type": "api" }, { - "id": 92, + "id": 91, "name": "event/zhanling/RecPrize", "type": "api" }, { - "id": 93, + "id": 92, "name": "event/zhanling/RecTask", "type": "api" }, { - "id": 94, + "id": 93, "name": "event/zhoulibao/Open", "type": "api" }, { - "id": 95, + "id": 94, "name": "event/zhoumolibao/Open", "type": "api" }, { - "id": 96, + "id": 95, "name": "event/zhoumolibao/Receive", "type": "api" }, { - "id": 97, + "id": 96, "name": "event/zixuanlibao/Buy", "type": "api" }, { - "id": 98, + "id": 97, "name": "event/zixuanlibao/Open", "type": "api" }, { - "id": 99, + "id": 98, "name": "eventlist/hdGetList", "type": "api" }, { - "id": 100, + "id": 99, "name": "friend/Apply", "type": "api" }, { - "id": 101, + "id": 100, "name": "friend/Del", "type": "api" }, { - "id": 102, + "id": 101, "name": "friend/Gift", "type": "api" }, { - "id": 103, + "id": 102, "name": "friend/List", "type": "api" }, { - "id": 104, + "id": 103, "name": "friend/Open", "type": "api" }, { - "id": 105, + "id": 104, "name": "friend/Respond", "type": "api" }, { - "id": 106, + "id": 105, "name": "friend/RmBlackList", "type": "api" }, { - "id": 107, + "id": 106, "name": "friend/Search", "type": "api" }, { - "id": 108, + "id": 107, "name": "ganbutexun/Challenge", "type": "api" }, { - "id": 109, + "id": 108, "name": "ganbutexun/Open", "type": "api" }, { - "id": 110, + "id": 109, "name": "ganhai/Fast", "type": "api" }, { - "id": 111, + "id": 110, "name": "ganhai/Fight", "type": "api" }, { - "id": 112, + "id": 111, "name": "ganhai/Log", "type": "api" }, { - "id": 113, + "id": 112, "name": "ganhai/Open", "type": "api" }, { - "id": 114, + "id": 113, "name": "ganhai/Refresh", "type": "api" }, { - "id": 115, + "id": 114, "name": "ganhai/RefreshShip", "type": "api" }, { - "id": 116, + "id": 115, "name": "ganhai/Select", "type": "api" }, { - "id": 117, + "id": 116, "name": "gmapi/Gift", "type": "api" }, { - "id": 118, + "id": 117, "name": "gmapi/Post", "type": "api" }, { - "id": 119, + "id": 118, "name": "gonghui/Apply", "type": "api", "conf": { @@ -2251,7 +2241,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 120, + "id": 119, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2261,7 +2251,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 121, + "id": 120, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2271,7 +2261,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 122, + "id": 121, "name": "gonghui/Change", "type": "api", "conf": { @@ -2281,12 +2271,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 123, + "id": 122, "name": "gonghui/Create", "type": "api" }, { - "id": 124, + "id": 123, "name": "gonghui/Dissolve", "type": "api", "conf": { @@ -2296,7 +2286,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 125, + "id": 124, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2306,12 +2296,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 126, + "id": 125, "name": "gonghui/FbBuyNum", "type": "api" }, { - "id": 127, + "id": 126, "name": "gonghui/FbFight", "type": "api", "conf": { @@ -2321,7 +2311,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 128, + "id": 127, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2331,17 +2321,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 129, + "id": 128, "name": "gonghui/GetList", "type": "api" }, { - "id": 130, + "id": 129, "name": "gonghui/Join", "type": "api" }, { - "id": 131, + "id": 130, "name": "gonghui/Jx", "type": "api", "conf": { @@ -2351,7 +2341,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 132, + "id": 131, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2361,7 +2351,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 133, + "id": 132, "name": "gonghui/List", "type": "api", "conf": { @@ -2371,7 +2361,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 134, + "id": 133, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2381,7 +2371,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 135, + "id": 134, "name": "gonghui/Open", "type": "api", "conf": { @@ -2391,7 +2381,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 136, + "id": 135, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2401,7 +2391,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 137, + "id": 136, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2411,7 +2401,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 138, + "id": 137, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2421,7 +2411,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 139, + "id": 138, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2431,137 +2421,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 140, + "id": 139, "name": "gonghuibaozang/Lottery", "type": "api" }, { - "id": 141, + "id": 140, "name": "gonghuibaozang/Open", "type": "api" }, { - "id": 142, + "id": 141, "name": "gonglukuangbiao/Buy", "type": "api" }, { - "id": 143, + "id": 142, "name": "gonglukuangbiao/Fight", "type": "api" }, { - "id": 144, + "id": 143, "name": "gonglukuangbiao/Open", "type": "api" }, { - "id": 145, + "id": 144, "name": "gonglukuangbiao/Refresh", "type": "api" }, { - "id": 146, + "id": 145, "name": "gongyu/mingdao/Active", "type": "api" }, { - "id": 147, + "id": 146, "name": "gongyu/mingdao/Open", "type": "api" }, { - "id": 148, + "id": 147, "name": "gongyu/mingdao/RecPrize", "type": "api" }, { - "id": 149, + "id": 148, "name": "gongyu/mingdao/Repair", "type": "api" }, { - "id": 150, + "id": 149, "name": "gongyu/xunlianjihua/Reset", "type": "api" }, { - "id": 151, + "id": 150, "name": "gongyu/xunlianjihua/UpSkill", "type": "api" }, { - "id": 152, + "id": 151, "name": "gongyu/zuozhanjihua/SetSkill", "type": "api" }, { - "id": 153, + "id": 152, "name": "hbzb/jfs/BuyNum", "type": "api" }, { - "id": 154, + "id": 153, "name": "hbzb/jfs/Fight", "type": "api" }, { - "id": 155, + "id": 154, "name": "hbzb/jfs/GetLog", "type": "api" }, { - "id": 156, + "id": 155, "name": "hbzb/jfs/Open", "type": "api" }, { - "id": 157, + "id": 156, "name": "hbzb/jfs/Rec", "type": "api" }, { - "id": 158, + "id": 157, "name": "hbzb/jfs/Refresh", "type": "api" }, { - "id": 159, + "id": 158, "name": "hbzb/GetStatus", "type": "api" }, { - "id": 160, + "id": 159, "name": "hbzb/zbs/BuyNum", "type": "api" }, { - "id": 161, + "id": 160, "name": "hbzb/zbs/Fight", "type": "api" }, { - "id": 162, + "id": 161, "name": "hbzb/zbs/GetLog", "type": "api" }, { - "id": 163, + "id": 162, "name": "hbzb/zbs/Open", "type": "api" }, { - "id": 164, + "id": 163, "name": "hbzb/zbs/Refresh", "type": "api" }, { - "id": 165, + "id": 164, "name": "hero/Awake", "type": "api" }, { - "id": 166, + "id": 165, "name": "hero/ChangePos", "type": "api", "conf": { @@ -2569,17 +2559,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 167, + "id": 166, "name": "hero/GetList", "type": "api" }, { - "id": 168, + "id": 167, "name": "hero/JinJie", "type": "api" }, { - "id": 169, + "id": 168, "name": "hero/LvUp", "type": "api", "conf": { @@ -2587,32 +2577,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 170, + "id": 169, "name": "hero/Potency", "type": "api" }, { - "id": 171, + "id": 170, "name": "hero/Rec", "type": "api" }, { - "id": 172, + "id": 171, "name": "hero/Reset", "type": "api" }, { - "id": 173, + "id": 172, "name": "hero/Talent", "type": "api" }, { - "id": 174, + "id": 173, "name": "hero/WeaponUp", "type": "api" }, { - "id": 175, + "id": 174, "name": "hongdian/Get", "type": "api", "conf": { @@ -2620,117 +2610,117 @@ export const serviceProto: ServiceProto = { } }, { - "id": 176, + "id": 175, "name": "item/GetList", "type": "api" }, { - "id": 177, + "id": 176, "name": "item/Use", "type": "api" }, { - "id": 178, + "id": 177, "name": "jiaotang/Lottery", "type": "api" }, { - "id": 179, + "id": 178, "name": "jiaotang/Open", "type": "api" }, { - "id": 180, + "id": 179, "name": "jiuba/Lottery", "type": "api" }, { - "id": 181, + "id": 180, "name": "jiuba/Open", "type": "api" }, { - "id": 182, + "id": 181, "name": "jjc/BuyFightNum", "type": "api" }, { - "id": 183, + "id": 182, "name": "jjc/Fight", "type": "api" }, { - "id": 184, + "id": 183, "name": "jjc/FightLog", "type": "api" }, { - "id": 185, + "id": 184, "name": "jjc/Open", "type": "api" }, { - "id": 186, + "id": 185, "name": "jjc/Receive", "type": "api" }, { - "id": 187, + "id": 186, "name": "jjc/Refresh", "type": "api" }, { - "id": 188, + "id": 187, "name": "kaifujingsai/Open", "type": "api" }, { - "id": 189, + "id": 188, "name": "kaifujingsai/Receive", "type": "api" }, { - "id": 190, + "id": 189, "name": "kbzz/Apply", "type": "api" }, { - "id": 191, + "id": 190, "name": "kbzz/AutoApply", "type": "api" }, { - "id": 192, + "id": 191, "name": "kbzz/BuyNum", "type": "api" }, { - "id": 193, + "id": 192, "name": "kbzz/Fight", "type": "api" }, { - "id": 194, + "id": 193, "name": "kbzz/FightLog", "type": "api" }, { - "id": 195, + "id": 194, "name": "kbzz/GroupState", "type": "api" }, { - "id": 196, + "id": 195, "name": "kbzz/Open", "type": "api" }, { - "id": 197, + "id": 196, "name": "kbzz/RecPrize", "type": "api" }, { - "id": 198, + "id": 197, "name": "kbzz/Refresh", "type": "api", "conf": { @@ -2738,287 +2728,287 @@ export const serviceProto: ServiceProto = { } }, { - "id": 199, + "id": 198, "name": "kuangdong/AddPkNum", "type": "api" }, { - "id": 200, + "id": 199, "name": "kuangdong/GetPrize", "type": "api" }, { - "id": 201, + "id": 200, "name": "kuangdong/KdInfo", "type": "api" }, { - "id": 202, + "id": 201, "name": "kuangdong/Log", "type": "api" }, { - "id": 203, + "id": 202, "name": "kuangdong/Open", "type": "api" }, { - "id": 204, + "id": 203, "name": "kuangdong/YanShi", "type": "api" }, { - "id": 205, + "id": 204, "name": "kuangdong/ZhanLing", "type": "api" }, { - "id": 206, + "id": 205, "name": "lingzhulaixi/Open", "type": "api" }, { - "id": 207, + "id": 206, "name": "lingzhulaixi/PkBoss", "type": "api" }, { - "id": 208, + "id": 207, "name": "lingzhulaixi/PkRank", "type": "api" }, { - "id": 209, + "id": 208, "name": "lingzhulaixi/SaoDang", "type": "api" }, { - "id": 210, + "id": 209, "name": "meirishilian/Buy", "type": "api" }, { - "id": 211, + "id": 210, "name": "meirishilian/Fight", "type": "api" }, { - "id": 212, + "id": 211, "name": "meirishilian/Open", "type": "api" }, { - "id": 213, + "id": 212, "name": "msg_c2s/BindUid", "type": "msg" }, { - "id": 214, + "id": 213, "name": "msg_c2s/Pay", "type": "msg" }, { - "id": 215, + "id": 214, "name": "msg_c2s/Sync", "type": "msg" }, { - "id": 216, + "id": 215, "name": "msg_s2c/Chat", "type": "msg" }, { - "id": 217, + "id": 216, "name": "msg_s2c/ChatHelp", "type": "msg" }, { - "id": 218, + "id": 217, "name": "msg_s2c/Collection", "type": "msg" }, { - "id": 219, + "id": 218, "name": "msg_s2c/Email", "type": "msg" }, { - "id": 220, + "id": 219, "name": "msg_s2c/EmailDel", "type": "msg" }, { - "id": 221, + "id": 220, "name": "msg_s2c/EquipChange", "type": "msg" }, { - "id": 222, + "id": 221, "name": "msg_s2c/Friend", "type": "msg" }, { - "id": 223, + "id": 222, "name": "msg_s2c/GhChange", "type": "msg" }, { - "id": 224, + "id": 223, "name": "msg_s2c/GongHuiBaoZang", "type": "msg" }, { - "id": 225, + "id": 224, "name": "msg_s2c/HeroChange", "type": "msg" }, { - "id": 226, + "id": 225, "name": "msg_s2c/HongDianChange", "type": "msg" }, { - "id": 227, + "id": 226, "name": "msg_s2c/ItemChange", "type": "msg" }, { - "id": 228, + "id": 227, "name": "msg_s2c/LoginQueue", "type": "msg" }, { - "id": 229, + "id": 228, "name": "msg_s2c/LshdChange", "type": "msg" }, { - "id": 230, + "id": 229, "name": "msg_s2c/NewDay", "type": "msg" }, { - "id": 231, + "id": 230, "name": "msg_s2c/OtherLogin", "type": "msg" }, { - "id": 232, + "id": 231, "name": "msg_s2c/PayChange", "type": "msg" }, { - "id": 233, + "id": 232, "name": "msg_s2c/PayResult", "type": "msg" }, { - "id": 234, + "id": 233, "name": "msg_s2c/PeijianChange", "type": "msg" }, { - "id": 235, + "id": 234, "name": "msg_s2c/PlayerChange", "type": "msg" }, { - "id": 236, + "id": 235, "name": "msg_s2c/Private", "type": "msg" }, { - "id": 237, + "id": 236, "name": "msg_s2c/PushGiftChange", "type": "msg" }, { - "id": 238, + "id": 237, "name": "msg_s2c/SendGift", "type": "msg" }, { - "id": 239, + "id": 238, "name": "msg_s2c/ShiwuChange", "type": "msg" }, { - "id": 240, + "id": 239, "name": "msg_s2c/TaskChange", "type": "msg" }, { - "id": 241, + "id": 240, "name": "msg_s2c/Xianshilibao", "type": "msg" }, { - "id": 242, + "id": 241, "name": "pata/Fight", "type": "api" }, { - "id": 243, + "id": 242, "name": "pata/GetPrize", "type": "api" }, { - "id": 244, + "id": 243, "name": "pata/Open", "type": "api" }, { - "id": 245, + "id": 244, "name": "pata/SaoDang", "type": "api" }, { - "id": 246, + "id": 245, "name": "pay/GetList", "type": "api" }, { - "id": 247, + "id": 246, "name": "peijian/GetList", "type": "api" }, { - "id": 248, + "id": 247, "name": "peijian/JingLian", "type": "api" }, { - "id": 249, + "id": 248, "name": "peijian/JinJie", "type": "api" }, { - "id": 250, + "id": 249, "name": "peijian/LvUp", "type": "api" }, { - "id": 251, + "id": 250, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 252, + "id": 251, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 253, + "id": 252, "name": "peijian/Reset", "type": "api" }, { - "id": 254, + "id": 253, "name": "peijian/Rm", "type": "api" }, { - "id": 255, + "id": 254, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3026,32 +3016,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 256, + "id": 255, "name": "peijian/UnLock", "type": "api" }, { - "id": 257, + "id": 256, "name": "peijian/Wear", "type": "api" }, { - "id": 258, + "id": 257, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 259, + "id": 258, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 260, + "id": 259, "name": "peijiancangku/Open", "type": "api" }, { - "id": 261, + "id": 260, "name": "Bingo", "type": "api", "conf": { @@ -3059,142 +3049,142 @@ export const serviceProto: ServiceProto = { } }, { - "id": 262, + "id": 261, "name": "FightTest", "type": "api" }, { - "id": 263, + "id": 262, "name": "SyncBtn", "type": "api" }, { - "id": 264, + "id": 263, "name": "Test", "type": "api" }, { - "id": 265, + "id": 264, "name": "pushgift/Open", "type": "api" }, { - "id": 266, + "id": 265, "name": "qjzzd/Fight", "type": "api" }, { - "id": 267, + "id": 266, "name": "qjzzd/Open", "type": "api" }, { - "id": 268, + "id": 267, "name": "rank/Open", "type": "api" }, { - "id": 269, + "id": 268, "name": "shiwu/Concise", "type": "api" }, { - "id": 270, + "id": 269, "name": "shiwu/Extract", "type": "api" }, { - "id": 271, + "id": 270, "name": "shiwu/GetList", "type": "api" }, { - "id": 272, + "id": 271, "name": "shiwu/LvUp", "type": "api" }, { - "id": 273, + "id": 272, "name": "shiwu/Recast", "type": "api" }, { - "id": 274, + "id": 273, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 275, + "id": 274, "name": "shiwu/Wear", "type": "api" }, { - "id": 276, + "id": 275, "name": "shootGame/Open", "type": "api" }, { - "id": 277, + "id": 276, "name": "shootGame/Rec", "type": "api" }, { - "id": 278, + "id": 277, "name": "shop/Buy", "type": "api" }, { - "id": 279, + "id": 278, "name": "shop/Open", "type": "api" }, { - "id": 280, + "id": 279, "name": "shop/Refresh", "type": "api" }, { - "id": 281, + "id": 280, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 282, + "id": 281, "name": "sign/GetPrize", "type": "api" }, { - "id": 283, + "id": 282, "name": "sign/Open", "type": "api" }, { - "id": 284, + "id": 283, "name": "slzd/Aim", "type": "api" }, { - "id": 285, + "id": 284, "name": "slzd/BuyNum", "type": "api" }, { - "id": 286, + "id": 285, "name": "slzd/Fight", "type": "api" }, { - "id": 287, + "id": 286, "name": "slzd/FightLog", "type": "api" }, { - "id": 288, + "id": 287, "name": "slzd/MyRank", "type": "api" }, { - "id": 289, + "id": 288, "name": "slzd/Open", "type": "api", "conf": { @@ -3204,77 +3194,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 290, + "id": 289, "name": "slzd/OpenFort", "type": "api" }, { - "id": 291, + "id": 290, "name": "slzd/Rec", "type": "api" }, { - "id": 292, + "id": 291, "name": "slzd/Refresh", "type": "api" }, { - "id": 293, + "id": 292, "name": "slzd/Slot", "type": "api" }, { - "id": 294, + "id": 293, "name": "tanxian/Event", "type": "api" }, { - "id": 295, + "id": 294, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 296, + "id": 295, "name": "tanxian/Fight", "type": "api" }, { - "id": 297, + "id": 296, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 298, + "id": 297, "name": "tanxian/Open", "type": "api" }, { - "id": 299, + "id": 298, "name": "tanxian/Receive", "type": "api" }, { - "id": 300, + "id": 299, "name": "task/AllFinsh", "type": "api" }, { - "id": 301, + "id": 300, "name": "task/Finsh", "type": "api" }, { - "id": 302, + "id": 301, "name": "task/Open", "type": "api" }, { - "id": 303, + "id": 302, "name": "user/CDKEY", "type": "api" }, { - "id": 304, + "id": 303, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3282,197 +3272,197 @@ export const serviceProto: ServiceProto = { } }, { - "id": 305, + "id": 304, "name": "user/ChangeName", "type": "api" }, { - "id": 306, + "id": 305, "name": "user/Fight", "type": "api" }, { - "id": 307, + "id": 306, "name": "user/GetInfo", "type": "api" }, { - "id": 308, + "id": 307, "name": "user/InfoOpen", "type": "api" }, { - "id": 309, + "id": 308, "name": "user/Login", "type": "api" }, { - "id": 310, + "id": 309, "name": "user/Ping", "type": "api" }, { - "id": 311, + "id": 310, "name": "user/Renown", "type": "api" }, { - "id": 312, + "id": 311, "name": "user/RenownBuy", "type": "api" }, { - "id": 313, + "id": 312, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 314, + "id": 313, "name": "user/RenownOpen", "type": "api" }, { - "id": 315, + "id": 314, "name": "user/Tujian", "type": "api" }, { - "id": 316, + "id": 315, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 317, + "id": 316, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 318, + "id": 317, "name": "weixiuchang/Open", "type": "api" }, { - "id": 319, + "id": 318, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 320, + "id": 319, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 321, + "id": 320, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 322, + "id": 321, "name": "wzry/BaoMing", "type": "api" }, { - "id": 323, + "id": 322, "name": "wzry/catFightLog", "type": "api" }, { - "id": 324, + "id": 323, "name": "wzry/CatGroup", "type": "api" }, { - "id": 325, + "id": 324, "name": "wzry/DldFight", "type": "api" }, { - "id": 326, + "id": 325, "name": "wzry/DldRefre", "type": "api" }, { - "id": 327, + "id": 326, "name": "wzry/JingCai", "type": "api" }, { - "id": 328, + "id": 327, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 329, + "id": 328, "name": "wzry/Open", "type": "api" }, { - "id": 330, + "id": 329, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 331, + "id": 330, "name": "wzry/Wzzd", "type": "api" }, { - "id": 332, + "id": 331, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 333, + "id": 332, "name": "xstask/AllGet", "type": "api" }, { - "id": 334, + "id": 333, "name": "xstask/Get", "type": "api" }, { - "id": 335, + "id": 334, "name": "xstask/LvUp", "type": "api" }, { - "id": 336, + "id": 335, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 337, + "id": 336, "name": "xstask/Open", "type": "api" }, { - "id": 338, + "id": 337, "name": "xstask/Receive", "type": "api" }, { - "id": 339, + "id": 338, "name": "xstask/Refresh", "type": "api" }, { - "id": 340, + "id": 339, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 341, + "id": 340, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 342, + "id": 341, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 343, + "id": 342, "name": "zhanqianbushu/Up", "type": "api" } @@ -10254,60 +10244,18 @@ export const serviceProto: ServiceProto = { "properties": [ { "id": 0, - "name": "index", + "name": "day", "type": { "type": "Number" } }, { "id": 1, - "name": "sTime", - "type": { - "type": "Number" - } - }, - { - "id": 2, - "name": "recIndex", + "name": "payIds", "type": { "type": "Array", "elementType": { - "type": "Number" - } - } - }, - { - "id": 3, - "name": "payDay", - "type": { - "type": "Number" - } - } - ] - }, - "event/shiwuleichong/PtlRec/ReqRec": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "index", - "type": { - "type": "Number" - } - } - ] - }, - "event/shiwuleichong/PtlRec/ResRec": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "prize", - "type": { - "type": "Array", - "elementType": { - "type": "Reference", - "target": "type/prizeType" + "type": "String" } } } From 14ab1d45b8dca428e85be99403d4ed62162b5789 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 15 Dec 2023 18:27:57 +0800 Subject: [PATCH 37/80] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=85=85=E5=80=BC=E5=BE=97payid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/shiwuleichong/ApiOpen.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api_s2c/event/shiwuleichong/ApiOpen.ts b/src/api_s2c/event/shiwuleichong/ApiOpen.ts index 5763d97..7954da3 100644 --- a/src/api_s2c/event/shiwuleichong/ApiOpen.ts +++ b/src/api_s2c/event/shiwuleichong/ApiOpen.ts @@ -38,6 +38,6 @@ export default async function (call: ApiCall) { call.succ({ day: day, - payIds: Object.keys(pays) + payIds: Object.keys(pays).filter((i) => pays[i].length > 0) }); } \ No newline at end of file From 7e775e90e1e5c6b87f61985e264b3978cbfbf2e4 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 15 Dec 2023 20:06:20 +0800 Subject: [PATCH 38/80] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=83=85?= =?UTF-8?q?=E6=8A=A5=E7=89=B9=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/xstask/ApiAllGet.ts | 32 +++++++++++++++++++++----------- src/api_s2c/xstask/ApiGet.ts | 31 ++++++++++++++++++++----------- src/api_s2c/xstask/ApiOpen.ts | 2 +- 3 files changed, 42 insertions(+), 23 deletions(-) diff --git a/src/api_s2c/xstask/ApiAllGet.ts b/src/api_s2c/xstask/ApiAllGet.ts index f41ac3c..d89d696 100644 --- a/src/api_s2c/xstask/ApiAllGet.ts +++ b/src/api_s2c/xstask/ApiAllGet.ts @@ -1,15 +1,17 @@ -import { ApiCall } from "tsrpc"; -import { PlayerFun } from '../../public/player'; -import { XstaskFun } from '../../public/xstask'; -import { ReqAllGet, ResAllGet } from "../../shared/protocols/xstask/PtlAllGet"; -import { HongDianChange } from "../hongdian/fun"; -import { PublicShared } from "../../shared/public/public"; +import {ApiCall} from "tsrpc"; +import {PlayerFun} from '../../public/player'; +import {XstaskFun} from '../../public/xstask'; +import {ReqAllGet, ResAllGet} from "../../shared/protocols/xstask/PtlAllGet"; +import {HongDianChange} from "../hongdian/fun"; +import {PublicShared} from "../../shared/public/public"; +import {TeQuanFun} from "../../public/tequan"; export default async function (call: ApiCall) { const taskList = JSON.parse(JSON.stringify(await XstaskFun.getAllTask(call.uid))); let taskInfo = await XstaskFun.getInfo(call.uid); - let prizeArr:atn[] = [] - for(let task of taskList) { + let tequan = await TeQuanFun.getXsTaskNum(call); + let prizeArr: atn[] = [] + for (let task of taskList) { const taskConf = G.gc.xstask[task?.taskId]; if (!task) continue; if (task.receiveData == undefined) continue; @@ -23,12 +25,12 @@ export default async function (call: ApiCall) { // } continue } - let change: Parameters[1] = { $inc: {} }; + let change: Parameters[1] = {$inc: {}}; change.$inc[`finishNum.${taskConf.colour}`] = 1; // 比对派遣时间，如果小于当日0点，则更新新任务，否则该变领取状态为true - if(task.receiveData.time < PublicShared.getToDayZeroTime()) { + if (task.receiveData.time < PublicShared.getToDayZeroTime()) { // 更新任务 - let newTask = XstaskFun.randomTasks(taskInfo?.lv, 1) + let newTask = XstaskFun.randomTasks(taskInfo?.lv, 1) XstaskFun.updateTask(call.uid, task._id, newTask[0].taskId) } else { // 更新领取状态 @@ -38,6 +40,14 @@ export default async function (call: ApiCall) { XstaskFun.changeInfo(call.uid, change); await PlayerFun.sendPrize(call, taskConf.prize); HongDianChange.sendChangeKey(call.uid, ['xstaskhd', 'huodonghd']); + + if (!tequan) { + prizeArr.push(...taskConf.prize) + } else { + for (let i = 0; i < 3; i++) { + prizeArr.push(...taskConf.prize) + } + } prizeArr.push(...taskConf.prize) } call.succ({ diff --git a/src/api_s2c/xstask/ApiGet.ts b/src/api_s2c/xstask/ApiGet.ts index 62a5b1b..878052d 100644 --- a/src/api_s2c/xstask/ApiGet.ts +++ b/src/api_s2c/xstask/ApiGet.ts @@ -1,9 +1,10 @@ -import { ApiCall } from "tsrpc"; -import { PlayerFun } from '../../public/player'; -import { XstaskFun } from '../../public/xstask'; -import { ReqGet, ResGet } from "../../shared/protocols/xstask/PtlGet"; -import { HongDianChange } from "../hongdian/fun"; -import { PublicShared } from '../../shared/public/public'; +import {ApiCall} from "tsrpc"; +import {PlayerFun} from '../../public/player'; +import {XstaskFun} from '../../public/xstask'; +import {ReqGet, ResGet} from "../../shared/protocols/xstask/PtlGet"; +import {HongDianChange} from "../hongdian/fun"; +import {PublicShared} from '../../shared/public/public'; +import {TeQuanFun} from "../../public/tequan"; export default async function (call: ApiCall) { @@ -23,24 +24,32 @@ export default async function (call: ApiCall) { } } - let change: Parameters[1] = { $inc: {} }; + let change: Parameters[1] = {$inc: {}}; change.$inc[`finishNum.${taskConf.colour}`] = 1; // 比对派遣时间，如果小于当日0点，则更新新任务，否则该变领取状态为true - if(task.receiveData.time < PublicShared.getToDayZeroTime()) { + if (task.receiveData.time < PublicShared.getToDayZeroTime()) { // 更新任务 - let newTask = XstaskFun.randomTasks(taskInfo?.lv, 1) + let newTask = XstaskFun.randomTasks(taskInfo?.lv, 1) XstaskFun.updateTask(call.uid, call.req._id, newTask[0].taskId) } else { // 更新领取状态 XstaskFun.finishTask(call.uid, call.req._id) } // XstaskFun.delTask(call.uid, call.req._id); + let send_prize = []; XstaskFun.changeInfo(call.uid, change); - await PlayerFun.sendPrize(call, taskConf.prize); + if (!await TeQuanFun.getXsTaskNum(call)) { + send_prize = taskConf.prize; + } else { + for (let i = 0; i < 3; i++) { + send_prize = send_prize.concat(taskConf.prize) + } + } + await PlayerFun.sendPrize(call, send_prize); HongDianChange.sendChangeKey(call.uid, ['xstaskhd', 'huodonghd']); call.succ({ taskList: await XstaskFun.getAllTask(call.uid), - prize: taskConf.prize + prize: send_prize }); } \ No newline at end of file diff --git a/src/api_s2c/xstask/ApiOpen.ts b/src/api_s2c/xstask/ApiOpen.ts index 4261a4c..3a65a5d 100644 --- a/src/api_s2c/xstask/ApiOpen.ts +++ b/src/api_s2c/xstask/ApiOpen.ts @@ -36,7 +36,7 @@ export default async function (call: ApiCall) { XstaskFun.delTasks(call.uid, delTask.map(task => task._id)); } - needAddTask += await TeQuanFun.getXsTaskNum(call); + // needAddTask += await TeQuanFun.getXsTaskNum(call); needAddTask && await XstaskFun.addTasks(call.uid, XstaskFun.randomTasks(taskInfo?.lv || changeInfo.lv, needAddTask)); let { _id, uid, type, ...info } = taskInfo || changeInfo as typeof taskInfo; From 2f87f25a8d608be7db743b0d65cda42af503cbdc Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 20:20:46 +0800 Subject: [PATCH 39/80] fix bug --- oneKeyStartPm2.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oneKeyStartPm2.sh b/oneKeyStartPm2.sh index 65c5bd9..8360d35 100644 --- a/oneKeyStartPm2.sh +++ b/oneKeyStartPm2.sh @@ -1,5 +1,5 @@ -git fetch --all && git reset --hard origin/dev && git pull +git fetch origin dev && git reset --hard origin/dev && git pull npm run build_linux From 404bb9a7e574532a772017693d91d16813b70216 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 15 Dec 2023 21:11:31 +0800 Subject: [PATCH 40/80] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BC=99?= =?UTF-8?q?=E4=BC=B4=E6=8B=9B=E5=8B=9F=E7=9A=84=E5=A5=96=E5=8A=B1=E9=A2=86?= =?UTF-8?q?=E5=8F=96=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/huobanzhaomu/ApiRec.ts | 37 +++++++++++++++--------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/src/api_s2c/event/huobanzhaomu/ApiRec.ts b/src/api_s2c/event/huobanzhaomu/ApiRec.ts index 3b8cd45..0c1dfba 100644 --- a/src/api_s2c/event/huobanzhaomu/ApiRec.ts +++ b/src/api_s2c/event/huobanzhaomu/ApiRec.ts @@ -1,27 +1,38 @@ -import { ApiCall } from "tsrpc"; -import { PlayerFun } from '../../../public/player'; -import { ReqRec, ResRec } from "../../../shared/protocols/event/huobanzhaomu/PtlRec"; -import { HongDianChange } from "../../hongdian/fun"; +import {ApiCall} from "tsrpc"; +import {PlayerFun} from '../../../public/player'; +import {ReqRec, ResRec} from "../../../shared/protocols/event/huobanzhaomu/PtlRec"; +import {HongDianChange} from "../../hongdian/fun"; +import {PayFun} from "../../../public/pay"; export default async function (call: ApiCall) { let conf = G.gc.huobanzhaomu[call.req.index]; - if (!conf) return call.error('', { code: -1 }); - if (conf.gudKey && call.conn.gud[conf.gudKey] < conf.total) return call.error('', { code: -2 }); + if (!conf) return call.error('', {code: -1}); + if (conf.gudKey && call.conn.gud[conf.gudKey] < conf.total) return call.error('', {code: -2}); - let db = await G.mongodb.cEvent('huobanzhaomu').findOne({ uid: call.uid, type: 'huobanzhaomu' }); - if (db?.rec.includes(call.req.index)) return call.error('', { code: -3 }); - if (!conf.gudKey && (db?.rec?.length || 0) < G.gc.huobanzhaomu.length - 1) return call.error('', { code: -4 }); + let db = await G.mongodb.cEvent('huobanzhaomu').findOne({uid: call.uid, type: 'huobanzhaomu'}); + if (db?.rec.includes(call.req.index)) return call.error('', {code: -3}); + + if (conf.gudKey == "chaozhiyueka") { + let logs = await PayFun.getPayLog(call.uid, "chaozhiyueka"); + if (!logs || logs.slice(-1)[0].eTime < G.time) { + return call.error('', {code: -4}); + } + } else { + if (!conf.gudKey && (db?.rec?.length || 0) < G.gc.huobanzhaomu.length - 1) { + return call.error('', {code: -4}); + } + } await PlayerFun.sendPrize(call, conf.prize); if (db?.rec?.length + 1 >= G.gc.huobanzhaomu.length) { - G.mongodb.collection('syncBtns').updateOne({ uid: call.uid }, { $set: { 'huobanzhaomu.active': false } }, { upsert: true }); + G.mongodb.collection('syncBtns').updateOne({uid: call.uid}, {$set: {'huobanzhaomu.active': false}}, {upsert: true}); } G.mongodb.cEvent('huobanzhaomu').updateOne( - { uid: call.uid, type: 'huobanzhaomu' }, - { $push: { rec: call.req.index } }, - { upsert: true } + {uid: call.uid, type: 'huobanzhaomu'}, + {$push: {rec: call.req.index}}, + {upsert: true} ); HongDianChange.sendChangeKey(call.uid, ['huobanzhaomuhd']) From 2dcb2f208241b796167aa08a3097ab592f834c7e Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 21:15:42 +0800 Subject: [PATCH 41/80] cehua json --- src/json/pay.json | 462 ++++++----------------------------- src/json/skill_afteratk.json | 8 +- src/json/skill_buff.json | 4 +- src/json/xianshilibao.json5 | 2 + 4 files changed, 86 insertions(+), 390 deletions(-) diff --git a/src/json/pay.json b/src/json/pay.json index cc8e283..adac64c 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": [], @@ -910,6 +905,78 @@ "front": {}, "currency": "CNY" }, + "lv15": { + "id": "lv15", + "money": 1, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 10 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 10 + }, + { + "a": "hero", + "t": "4005", + "n": 1 + }, + { + "a": "item", + "t": "12", + "n": 100 + } + ], + "firstPayPrize": [], + "name": "pay_name_lv15", + "undefined": "等级推送礼包15", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "lv25": { + "id": "lv25", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 600 + }, + { + "a": "item", + "t": "1", + "n": 5000000 + }, + { + "a": "item", + "t": "4", + "n": 100 + } + ], + "firstPayPrize": [], + "name": "pay_name_lv25", + "undefined": "等级推送礼包25", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, "lv30": { "id": "lv30", "money": 6, @@ -3728,378 +3795,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..287a4dc 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 }, @@ -1020,7 +1020,7 @@ "side": 4, "randnum": 1, "order": "rand", - "limit": 3, + "limit": 2, "data": { "pro": 1.14 }, @@ -1202,7 +1202,7 @@ "order": "rand", "limit": 6, "data": { - "pro": 0.13 + "pro": 0.11 }, "chkdata": {}, "ext": {}, @@ -1217,7 +1217,7 @@ "order": "rand", "limit": 6, "data": { - "pro": 0.13 + "pro": 0.11 }, "chkdata": {}, "ext": {}, diff --git a/src/json/skill_buff.json b/src/json/skill_buff.json index 5c3cdb0..e7c9168 100644 --- a/src/json/skill_buff.json +++ b/src/json/skill_buff.json @@ -739,7 +739,7 @@ "sxleixing": "zhongdu", "buff_type": 2, "xiaoguocanshu": { - "pro": 0.18, + "pro": 0.15, "type": "hp" }, "round": 2, @@ -759,7 +759,7 @@ "sxleixing": "zhongdu", "buff_type": 2, "xiaoguocanshu": { - "pro": 0.18, + "pro": 0.15, "type": "hp" }, "round": 2, diff --git a/src/json/xianshilibao.json5 b/src/json/xianshilibao.json5 index b6d644f..ec5afc3 100644 --- a/src/json/xianshilibao.json5 +++ b/src/json/xianshilibao.json5 @@ -1,4 +1,6 @@ { + lv15: { payId: 'lv15', time: 3600, scale: 3000}, + lv25: { payId: 'lv25', time: 3600, scale: 3000}, lv31: { payId: 'lv30', time: 3600, scale: 3300}, lv45: { payId: 'lv40', time: 3600, scale: 3300 }, lv50: { payId: 'lv55', time: 3600, scale: 2000 }, From 510663289329c2e8155eaaee9a6bd61ef784d8a4 Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 22:31:48 +0800 Subject: [PATCH 42/80] cehua json --- src/json/pay.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/json/pay.json b/src/json/pay.json index adac64c..a638cb7 100644 --- a/src/json/pay.json +++ b/src/json/pay.json @@ -907,7 +907,7 @@ }, "lv15": { "id": "lv15", - "money": 1, + "money": 0.5, "payExp": [ { "a": "attr", @@ -965,7 +965,7 @@ { "a": "item", "t": "4", - "n": 100 + "n": 10 } ], "firstPayPrize": [], From 192ee578dccd77ba950b7cd5acb88e944f402f94 Mon Sep 17 00:00:00 2001 From: yushunrui <364203175@qq.com> Date: Mon, 18 Dec 2023 11:23:13 +0800 Subject: [PATCH 43/80] =?UTF-8?q?=E5=9C=A3=E8=AF=9E=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E8=BF=98=E5=8E=9F=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/christmas/ApiSelect.ts | 36 +++++++++++++++++++++-- src/api_s2c/event/christmas/ApiTaskRec.ts | 34 +++++++++++++++++++-- src/api_s2c/event/zhanling/ApiBuyLv.ts | 2 +- src/public/taskclass.ts | 3 ++ 4 files changed, 70 insertions(+), 5 deletions(-) diff --git a/src/api_s2c/event/christmas/ApiSelect.ts b/src/api_s2c/event/christmas/ApiSelect.ts index 612618c..6680a9a 100644 --- a/src/api_s2c/event/christmas/ApiSelect.ts +++ b/src/api_s2c/event/christmas/ApiSelect.ts @@ -1,7 +1,39 @@ 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) { - // TODO - call.error('API Not Implemented'); + 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); } \ 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 389e095..1227d85 100644 --- a/src/api_s2c/event/christmas/ApiTaskRec.ts +++ b/src/api_s2c/event/christmas/ApiTaskRec.ts @@ -1,7 +1,37 @@ 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) { - // TODO - call.error('API Not Implemented'); + 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); + + } \ No newline at end of file diff --git a/src/api_s2c/event/zhanling/ApiBuyLv.ts b/src/api_s2c/event/zhanling/ApiBuyLv.ts index 589b44e..10e9e60 100644 --- a/src/api_s2c/event/zhanling/ApiBuyLv.ts +++ b/src/api_s2c/event/zhanling/ApiBuyLv.ts @@ -20,7 +20,7 @@ export default async function (call: ApiCall) { let change: ResBuyLv['change'] = {}; change.lv = data.lv + lv; - change.exp = data.exp + 1000 + change.exp = data.exp + 1000; G.mongodb.cEvent('zhanling').updateOne( { uid: call.uid, type: 'zhanling' }, diff --git a/src/public/taskclass.ts b/src/public/taskclass.ts index 06cc127..b1f2abf 100644 --- a/src/public/taskclass.ts +++ b/src/public/taskclass.ts @@ -1,5 +1,6 @@ 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,6 +74,8 @@ 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 3cbc09345a11abc2e6894a3698398971be2fa63c Mon Sep 17 00:00:00 2001 From: dy Date: Mon, 18 Dec 2023 11:37:23 +0800 Subject: [PATCH 44/80] =?UTF-8?q?=E7=AD=96=E5=88=92JSON=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/json/choujiang.json5 | 2 +- src/json/huobanzhaomu.json5 | 4 +- src/json/huodong.json5 | 176 +++++++- src/json/item.json | 51 ++- src/json/jijin.json | 414 +++++++++--------- src/json/pay.json | 812 ++++++++++++++++++++++++++++++++++- src/json/shiwuleichong.json5 | 59 +-- src/json/shouchong.json | 3 + src/json/tuisonglibao.json | 257 +++++++++++ src/json/yuedujijin.json5 | 96 ++--- 10 files changed, 1561 insertions(+), 313 deletions(-) create mode 100644 src/json/tuisonglibao.json diff --git a/src/json/choujiang.json5 b/src/json/choujiang.json5 index b6a5dd9..a884162 100644 --- a/src/json/choujiang.json5 +++ b/src/json/choujiang.json5 @@ -154,7 +154,7 @@ }, "jiubabaodi": { "numbd": { - "50": [10011], + "30": [10011], "250": [10012], "550": [10011], "1000": [10011], diff --git a/src/json/huobanzhaomu.json5 b/src/json/huobanzhaomu.json5 index b41ad31..cc2c9c2 100644 --- a/src/json/huobanzhaomu.json5 +++ b/src/json/huobanzhaomu.json5 @@ -12,10 +12,10 @@ { total: 1, gudKey: 'payExp', - prize: [{a: 'hero', t: '4005', n: 1}] + prize: [{a: 'item', t: '4', n: 10}] }, { total: 1, - prize: [{a: 'hero', t: '4002', n: 1}] + prize: [{a: 'hero', t: '4012', n: 1}] } ] \ No newline at end of file diff --git a/src/json/huodong.json5 b/src/json/huodong.json5 index cb3f380..d09b2bf 100644 --- a/src/json/huodong.json5 +++ b/src/json/huodong.json5 @@ -3276,6 +3276,134 @@ } }, { + "hdid" : 8000, // 唯一活动id 圣诞活动 + "htype" : 8, + "stype" : 800, + "ttype" : 4, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动 + "stime" : 60, + "rtime" : 90, + "etime" : 90, + "name" : "sdhd_tips_1", + "icon" : "icon_xfdj", + "showtime" : "根据玩家注册时间，游戏返回时复写", + "data" : { + //任务 + "task" : { + "1": { + "pval" : 1, + "stype" : "", + "cond": [], + "prize" : [ + { + "a" : "item", + "t" : "1", + "n" : 500000 + } + ], + "des" : "intr_cszl_des_1" + }, + "2": { + "pval" : 1, + "stype" : "101", + "cond": [], + "prize" : [ + { + "a" : "item", + "t" : "1", + "n" : 500000 + } + ], + "des" : "intr_cszl_des_1" + }, + "3": { + "pval" : 2, + "stype" : "101", + "cond": [], + "prize" : [ + { + "a" : "item", + "t" : "1", + "n" : 500000 + } + ], + "des" : "intr_cszl_des_1" + } + }, + //玩游戏需要消耗 + "gameneed": [{"a": "attr", "t":"jinbi", "n": 1}], + //玩游戏拿分 + "game": [0,1,2,3,4,5], + //战令 + "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}] + } + ], + "zlpayid":"ycmb_1_1", + //活动礼包 + "libao": { + "1": { + "payid": "", + "buynum": 2, + "basep": [{"a": "attr", "t":"rmbmoney", "n": 1}], + "des" : "intr_cszl_des_1", + "dlz": [ + { + "1": {"a": "attr", "t":"rmbmoney", "n": 1}, + "2": {"a": "attr", "t":"rmbmoney", "n": 2}, + "3": {"a": "attr", "t":"rmbmoney", "n": 3} + }, + { + "1": {"a": "attr", "t":"rmbmoney", "n": 1}, + "2": {"a": "attr", "t":"rmbmoney", "n": 2}, + "3": {"a": "attr", "t":"rmbmoney", "n": 3} + } + ] + }, + "2": { + "payid": "ycmb_1_2", + "buynum": 2, + "basep": [{"a": "attr", "t":"rmbmoney", "n": 2}], + "des" : "intr_cszl_des_2", + "dlz": [ + { + "1": {"a": "attr", "t":"rmbmoney", "n": 1}, + "2": {"a": "attr", "t":"rmbmoney", "n": 2}, + "3": {"a": "attr", "t":"rmbmoney", "n": 3} + }, + { + "1": {"a": "attr", "t":"rmbmoney", "n": 1}, + "2": {"a": "attr", "t":"rmbmoney", "n": 2}, + "3": {"a": "attr", "t":"rmbmoney", "n": 3} + } + ] + } + }, + //签到奖励 + "qiandao": [ + [{"a": "attr", "t":"jinbi", "n": 1}], + [{"a": "attr", "t":"jinbi", "n": 1}], + [{"a": "attr", "t":"jinbi", "n": 1}], + [{"a": "attr", "t":"jinbi", "n": 1}], + [{"a": "attr", "t":"jinbi", "n": 1}], + [{"a": "attr", "t":"jinbi", "n": 1}], + [{"a": "attr", "t":"jinbi", "n": 1}] + ] + } + }, + { "hdid" : 9000, // 唯一活动id 周末礼包 "htype" : 9, // 后端唯一识别标识 "stype" : 900, // 前端唯一识别标识（看前端需要是否修改） @@ -3330,6 +3458,52 @@ } ] } + }, + { + "hdid" : 10000, // 唯一活动id 超值好礼 + "htype" : 10, // 后端唯一识别标识 + "stype" : 1000, // 前端唯一识别标识（看前端需要是否修改） + "ttype" : 0, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动 + "stime" : 0, // 活动开始天数 + "rtime" : 30, // 活动显示结束天数 + "etime" : 30, // 活动实际结束 + "name": "czlibao", + "icon": "icon_czlibao", + "showtime" : "仅供参考，会复写正确值", // 自选礼包，如果存在多个活动，计费点不要设置一样；如果是一样，可能会存在付费一次，购买多次。 + "data" : { + //活动文本描述 + intr: "czlbtips_1", + intr: "czlbtips_2", + //礼包 + gift: [ + { + id: '1', + name: 'czlbtips_4', + need: [], + free: false, + payId: 'czlb_1', + buyNum: 1, + prize: [{'a': 'item', 't': '13', 'n': 600},{'a': 'item', 't': '13', 'n': 600},{'a': 'item', 't': '13', 'n': 600}] + }, + { + id: '2', + name: 'czlbtips_5', + need: [], + free: false, + payId: 'czlb_2', + buyNum: 1, + prize: [{'a': 'item', 't': '13', 'n': 600},{'a': 'item', 't': '13', 'n': 600},{'a': 'item', 't': '13', 'n': 600}] + }, + { + id: '3', + name: 'czlbtips_6', + need: [], + free: false, + payId: 'czlb_3', + buyNum: 1, + prize: [{'a': 'item', 't': '13', 'n': 600},{'a': 'item', 't': '13', 'n': 600},{'a': 'item', 't': '13', 'n': 600}] + } + ] + } } - ] \ No newline at end of file diff --git a/src/json/item.json b/src/json/item.json index 49030ba..6fd94b2 100644 --- a/src/json/item.json +++ b/src/json/item.json @@ -116,7 +116,7 @@ "6": { "id": 6, "name": "intr_item_name_6", - "undefined": "每次进行干部特训需要消耗1个特训指南", + "undefined": "用于干部特训，消耗特训指南挑战成功后可获得干部碎片", "type": 1, "sort": 1, "colour": 4, @@ -155,7 +155,7 @@ "9": { "id": 9, "name": "intr_item_name_9", - "undefined": "润滑剂，用于专属武器升星", + "undefined": "稀有材料，可用于专属武器升星", "type": 1, "sort": 1, "colour": 4, @@ -464,7 +464,7 @@ "24": { "id": 24, "name": "intr_item_name_24", - "undefined": "使用后直接快速探险2小时", + "undefined": "用于主线探险，使用后直接获得快速探险2小时的收益", "type": 2, "sort": 1, "colour": 5, @@ -1204,7 +1204,7 @@ "607": { "id": 607, "name": "intr_item_name_607", - "undefined": "使用后可以自选艾达，加尔西亚，葛丽特中一个干部的碎片", + "undefined": "使用后可以自选艾达，加尔西亚，葛丽特，达奇，汉塞尔中一个干部的碎片", "type": 2, "sort": 1, "colour": 5, @@ -2072,6 +2072,49 @@ "payId": "", "advancedEffects": "ani_xiangzikuang" }, + "637": { + "id": 637, + "name": "intr_item_name_637", + "type": 2, + "sort": 1, + "colour": 6, + "way": [], + "go": "", + "icon": "icon_heroBox_3", + "sicon": "icon_heroBox_3", + "describe": "intr_item_describe_637", + "useNeed": [], + "usePrize": [], + "selecPrize": [ + { + "a": "hero", + "t": "5001", + "n": 1 + }, + { + "a": "hero", + "t": "5002", + "n": 1 + }, + { + "a": "hero", + "t": "5003", + "n": 1 + }, + { + "a": "hero", + "t": "5004", + "n": 1 + }, + { + "a": "hero", + "t": "5005", + "n": 1 + } + ], + "payId": "", + "advancedEffects": "ani_xiangzihong" + }, "1001": { "id": 1001, "name": "intr_item_name_1001", diff --git a/src/json/jijin.json b/src/json/jijin.json index bfbcf9e..760af32 100644 --- a/src/json/jijin.json +++ b/src/json/jijin.json @@ -1,5 +1,41 @@ { "dengjijijin": [ + { + "type": "dengjijijin", + "total": 10, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 300 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 8000 + } + ] + }, + { + "type": "dengjijijin", + "total": 15, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 300 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2000 + } + ] + }, { "type": "dengjijijin", "total": 20, @@ -14,7 +50,7 @@ { "a": "attr", "t": "rmbmoney", - "n": 1700 + "n": 2000 } ] }, @@ -32,7 +68,7 @@ { "a": "attr", "t": "rmbmoney", - "n": 1700 + "n": 2000 } ] }, @@ -50,7 +86,7 @@ { "a": "attr", "t": "rmbmoney", - "n": 1700 + "n": 2000 } ] }, @@ -68,7 +104,7 @@ { "a": "attr", "t": "rmbmoney", - "n": 1700 + "n": 2000 } ] }, @@ -86,7 +122,7 @@ { "a": "attr", "t": "rmbmoney", - "n": 1700 + "n": 2000 } ] }, @@ -104,43 +140,7 @@ { "a": "attr", "t": "rmbmoney", - "n": 1700 - } - ] - }, - { - "type": "dengjijijin", - "total": 50, - "pt": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 300 - } - ], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 1700 - } - ] - }, - { - "type": "dengjijijin", - "total": 55, - "pt": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 300 - } - ], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 1700 + "n": 2000 } ] } @@ -148,104 +148,104 @@ "guanqiajijin": [ { "type": "guanqiajijin", - "total": 30, + "total": 10, "pt": [], "tq": [ { - "a": "attr", - "t": "rmbmoney", - "n": 2000 + "a": "item", + "t": "1", + "n": 3000000 } ], "des": "guanqiajijin_des_1" }, { "type": "guanqiajijin", - "total": 50, + "total": 20, "pt": [], "tq": [ { - "a": "attr", - "t": "rmbmoney", - "n": 2000 + "a": "item", + "t": "1", + "n": 3000000 } ], "des": "guanqiajijin_des_2" }, { "type": "guanqiajijin", - "total": 70, + "total": 40, "pt": [], "tq": [ { - "a": "attr", - "t": "rmbmoney", - "n": 2000 + "a": "item", + "t": "1", + "n": 3000000 } ], "des": "guanqiajijin_des_3" }, { "type": "guanqiajijin", - "total": 90, + "total": 60, "pt": [], "tq": [ { - "a": "attr", - "t": "rmbmoney", - "n": 2000 + "a": "item", + "t": "1", + "n": 3000000 } ], "des": "guanqiajijin_des_4" }, { "type": "guanqiajijin", - "total": 110, + "total": 80, "pt": [], "tq": [ { - "a": "attr", - "t": "rmbmoney", - "n": 2000 + "a": "item", + "t": "1", + "n": 3000000 } ], "des": "guanqiajijin_des_5" }, { "type": "guanqiajijin", - "total": 150, + "total": 100, "pt": [], "tq": [ { - "a": "attr", - "t": "rmbmoney", - "n": 2000 + "a": "item", + "t": "1", + "n": 3000000 } ], "des": "guanqiajijin_des_6" }, { "type": "guanqiajijin", - "total": 180, + "total": 120, "pt": [], "tq": [ { - "a": "attr", - "t": "rmbmoney", - "n": 2000 + "a": "item", + "t": "1", + "n": 3000000 } ], "des": "guanqiajijin_des_7" }, { "type": "guanqiajijin", - "total": 250, + "total": 140, "pt": [], "tq": [ { - "a": "attr", - "t": "rmbmoney", - "n": 2000 + "a": "item", + "t": "1", + "n": 3000000 } ], "des": "guanqiajijin_des_8" @@ -254,37 +254,37 @@ "dayjijin": [ { "type": "dayjijin", - "total": 5, + "total": 10, "pt": [ { - "a": "item", - "t": "23", - "n": 20000 - } - ], - "tq": [ - { - "a": "item", - "t": "4", - "n": 5 - } - ] - }, - { - "type": "dayjijin", - "total": 15, - "pt": [ - { - "a": "item", - "t": "2", + "a": "attr", + "t": "rmbmoney", "n": 200 } ], "tq": [ { "a": "item", - "t": "2", - "n": 2000 + "t": "4", + "n": 10 + } + ] + }, + { + "type": "dayjijin", + "total": 20, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 200 + } + ], + "tq": [ + { + "a": "item", + "t": "4", + "n": 10 } ] }, @@ -292,35 +292,53 @@ "type": "dayjijin", "total": 30, "pt": [ - { - "a": "item", - "t": "23", - "n": 20000 - } - ], - "tq": [ { "a": "attr", "t": "rmbmoney", - "n": 888 - } - ] - }, - { - "type": "dayjijin", - "total": 45, - "pt": [ - { - "a": "item", - "t": "2", "n": 200 } ], "tq": [ { "a": "item", - "t": "615", - "n": 1 + "t": "4", + "n": 10 + } + ] + }, + { + "type": "dayjijin", + "total": 40, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 200 + } + ], + "tq": [ + { + "a": "item", + "t": "4", + "n": 10 + } + ] + }, + { + "type": "dayjijin", + "total": 50, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 200 + } + ], + "tq": [ + { + "a": "item", + "t": "4", + "n": 10 } ] }, @@ -329,34 +347,52 @@ "total": 60, "pt": [ { - "a": "item", - "t": "23", - "n": 20000 + "a": "attr", + "t": "rmbmoney", + "n": 200 } ], "tq": [ { "a": "item", "t": "4", - "n": 5 + "n": 10 } ] }, { "type": "dayjijin", - "total": 75, + "total": 70, "pt": [ { - "a": "item", - "t": "2", - "n": 300 + "a": "attr", + "t": "rmbmoney", + "n": 200 } ], "tq": [ { "a": "item", - "t": "2", - "n": 2000 + "t": "4", + "n": 10 + } + ] + }, + { + "type": "dayjijin", + "total": 80, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 200 + } + ], + "tq": [ + { + "a": "item", + "t": "4", + "n": 10 } ] }, @@ -365,34 +401,52 @@ "total": 90, "pt": [ { - "a": "item", - "t": "23", - "n": 20000 + "a": "attr", + "t": "rmbmoney", + "n": 200 } ], "tq": [ { - "a": "attr", - "t": "rmbmoney", - "n": 888 + "a": "item", + "t": "4", + "n": 10 } ] }, { "type": "dayjijin", - "total": 105, + "total": 100, "pt": [ { - "a": "item", - "t": "2", - "n": 300 + "a": "attr", + "t": "rmbmoney", + "n": 200 } ], "tq": [ { "a": "item", - "t": "615", - "n": 1 + "t": "4", + "n": 10 + } + ] + }, + { + "type": "dayjijin", + "total": 110, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 200 + } + ], + "tq": [ + { + "a": "item", + "t": "4", + "n": 10 } ] }, @@ -401,106 +455,52 @@ "total": 120, "pt": [ { - "a": "item", - "t": "23", - "n": 20000 + "a": "attr", + "t": "rmbmoney", + "n": 200 } ], "tq": [ { "a": "item", "t": "4", - "n": 5 + "n": 10 } ] }, { "type": "dayjijin", - "total": 135, + "total": 130, "pt": [ - { - "a": "item", - "t": "2", - "n": 400 - } - ], - "tq": [ - { - "a": "item", - "t": "2", - "n": 2000 - } - ] - }, - { - "type": "dayjijin", - "total": 150, - "pt": [ - { - "a": "item", - "t": "23", - "n": 20000 - } - ], - "tq": [ { "a": "attr", "t": "rmbmoney", - "n": 888 - } - ] - }, - { - "type": "dayjijin", - "total": 165, - "pt": [ - { - "a": "item", - "t": "2", - "n": 400 - } - ], - "tq": [ - { - "a": "item", - "t": "615", - "n": 1 - } - ] - }, - { - "type": "dayjijin", - "total": 180, - "pt": [ - { - "a": "item", - "t": "23", - "n": 20000 + "n": 200 } ], "tq": [ { "a": "item", "t": "4", - "n": 5 + "n": 10 } ] }, { "type": "dayjijin", - "total": 200, + "total": 140, "pt": [ { - "a": "item", - "t": "2", - "n": 500 + "a": "attr", + "t": "rmbmoney", + "n": 200 } ], "tq": [ { - "a": "attr", - "t": "rmbmoney", - "n": 1888 + "a": "item", + "t": "4", + "n": 10 } ] } diff --git a/src/json/pay.json b/src/json/pay.json index a638cb7..cce56c1 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": [], @@ -965,7 +970,7 @@ { "a": "item", "t": "4", - "n": 10 + "n": 100 } ], "firstPayPrize": [], @@ -3795,5 +3800,798 @@ "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" + }, + "shouchong_1": { + "id": "shouchong_1", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_shouchong_1", + "undefined": "首充礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "shouchong_2": { + "id": "shouchong_2", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_shouchong_2", + "undefined": "首充礼包_30", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "shouchong_3": { + "id": "shouchong_3", + "money": 98, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 980 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_shouchong_3", + "undefined": "首充礼包_98", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_1": { + "id": "jitianlibao_1", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": "[{a: 'attr', t: 'jinbi', n: 200000},{a: 'item', t: '1', n: 100000},{a: 'item', t: '4', n: 5}]", + "firstPayPrize": [], + "name": "pay_name_jitianlibao_1", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_2": { + "id": "jitianlibao_2", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": "[{a: 'attr', t: 'jinbi', n: 400000},{a: 'item', t: '1', n: 200000},{a: 'item', t: '607', n: 20}]", + "firstPayPrize": [], + "name": "pay_name_jitianlibao_2", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_3": { + "id": "jitianlibao_3", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": "[{a: 'attr', t: 'jinbi', n: 600000},{a: 'item', t: '1', n: 300000},{a: 'item', t: '4', n: 10}]", + "firstPayPrize": [], + "name": "pay_name_jitianlibao_3", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_4": { + "id": "jitianlibao_4", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": "[{a: 'attr', t: 'jinbi', n: 800000},{a: 'item', t: '1', n: 400000},{a: 'item', t: '12', n: 500}]", + "firstPayPrize": [], + "name": "pay_name_jitianlibao_4", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_5": { + "id": "jitianlibao_5", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": "[{a: 'attr', t: 'jinbi', n: 1000000},{a: 'item', t: '1', n: 500000},{a: 'item', t: '12', n: 500}]", + "firstPayPrize": [], + "name": "pay_name_jitianlibao_5", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_6": { + "id": "jitianlibao_6", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": "[{a: 'attr', t: 'jinbi', n: 1200000},{a: 'item', t: '1', n: 600000},{a: 'item', t: '12', n: 500}]", + "firstPayPrize": [], + "name": "pay_name_jitianlibao_6", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_7": { + "id": "jitianlibao_7", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": "[{a: 'attr', t: 'jinbi', n: 1400000},{a: 'item', t: '1', n: 700000},{a: 'item', t: '600', n: 20}]", + "firstPayPrize": [], + "name": "pay_name_jitianlibao_7", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_8": { + "id": "jitianlibao_8", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": "[{a: 'attr', t: 'jinbi', n: 1600000},{a: 'item', t: '1', n: 800000},{a: 'item', t: '12', n: 500}]", + "firstPayPrize": [], + "name": "pay_name_jitianlibao_8", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_9": { + "id": "jitianlibao_9", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": "[{a: 'attr', t: 'jinbi', n: 1800000},{a: 'item', t: '1', n: 900000},{a: 'item', t: '4', n: 10}]", + "firstPayPrize": [], + "name": "pay_name_jitianlibao_9", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_10": { + "id": "jitianlibao_10", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": "[{a: 'attr', t: 'jinbi', n: 2000000},{a: 'item', t: '1', n: 1000000},{a: 'item', t: '12', n: 500}]", + "firstPayPrize": [], + "name": "pay_name_jitianlibao_10", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_11": { + "id": "jitianlibao_11", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": "[{a: 'attr', t: 'jinbi', n: 2200000},{a: 'item', t: '1', n: 1100000},{a: 'item', t: '12', n: 500}]", + "firstPayPrize": [], + "name": "pay_name_jitianlibao_11", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_12": { + "id": "jitianlibao_12", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": "[{a: 'attr', t: 'jinbi', n: 2400000},{a: 'item', t: '1', n: 1200000},{a: 'item', t: '4', n: 10}]", + "firstPayPrize": [], + "name": "pay_name_jitianlibao_12", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_13": { + "id": "jitianlibao_13", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": "[{a: 'attr', t: 'jinbi', n: 2600000},{a: 'item', t: '1', n: 1300000},{a: 'item', t: '12', n: 500}]", + "firstPayPrize": [], + "name": "pay_name_jitianlibao_13", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_14": { + "id": "jitianlibao_14", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": "[{a: 'attr', t: 'jinbi', n: 2800000},{a: 'item', t: '1', n: 1400000},{a: 'item', t: '12', n: 500}]", + "firstPayPrize": [], + "name": "pay_name_jitianlibao_14", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_15": { + "id": "jitianlibao_15", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": "[{a: 'attr', t: 'jinbi', n: 3000000},{a: 'item', t: '1', n: 1500000},{a: 'item', t: '600', n: 20}]", + "firstPayPrize": [], + "name": "pay_name_jitianlibao_15", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "czlb_1": { + "id": "czlb_1", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_czlb_1", + "undefined": "超值好礼_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "czlb_2": { + "id": "czlb_2", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_czlb_2", + "undefined": "超值好礼_30", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "czlb_3": { + "id": "czlb_3", + "money": 68, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 680 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_czlb_3", + "undefined": "超值好礼_68", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "undefined": {} } \ No newline at end of file diff --git a/src/json/shiwuleichong.json5 b/src/json/shiwuleichong.json5 index 7897c0a..5a0392f 100644 --- a/src/json/shiwuleichong.json5 +++ b/src/json/shiwuleichong.json5 @@ -1,46 +1,19 @@ { - //每日充值要求 - dayPayNeed: 6, - data: [ - { - time: 1296000, - tasks: [ - { total: 1, prize: [{a: 'attr', t: 'jinbi', n: 20000},{a: 'item', t: '1', n: 100000},{a: 'item', t: '4', n: 5}] }, - { total: 2, prize: [{a: 'attr', t: 'jinbi', n: 40000},{a: 'item', t: '1', n: 200000},{a: 'item', t: '12', n: 200}] }, - { total: 3, prize: [{a: 'attr', t: 'jinbi', n: 60000},{a: 'item', t: '1', n: 300000},{a: 'item', t: '4', n: 10}] }, - { total: 4, prize: [{a: 'attr', t: 'jinbi', n: 80000},{a: 'item', t: '1', n: 400000},{a: 'item', t: '12', n: 200}] }, - { total: 5, prize: [{a: 'attr', t: 'jinbi', n: 100000},{a: 'item', t: '1', n: 500000},{a: 'item', t: '12', n: 200}] }, - { total: 6, prize: [{a: 'attr', t: 'jinbi', n: 120000},{a: 'item', t: '1', n: 600000},{a: 'item', t: '607', n: 20}] }, - { total: 7, prize: [{a: 'attr', t: 'jinbi', n: 140000},{a: 'item', t: '1', n: 700000},{a: 'item', t: '12', n: 200}] }, - { total: 8, prize: [{a: 'attr', t: 'jinbi', n: 160000},{a: 'item', t: '1', n: 800000},{a: 'item', t: '12', n: 200}] }, - { total: 9, prize: [{a: 'attr', t: 'jinbi', n: 180000},{a: 'item', t: '1', n: 900000},{a: 'item', t: '4', n: 10}] }, - { total: 10, prize: [{a: 'attr', t: 'jinbi', n: 200000},{a: 'item', t: '1', n: 1000000},{a: 'item', t: '12', n: 200}] }, - { total: 11, prize: [{a: 'attr', t: 'jinbi', n: 220000},{a: 'item', t: '1', n: 1100000},{a: 'item', t: '12', n: 200}] }, - { total: 12, prize: [{a: 'attr', t: 'jinbi', n: 240000},{a: 'item', t: '1', n: 1200000},{a: 'item', t: '4', n: 10}] }, - { total: 13, prize: [{a: 'attr', t: 'jinbi', n: 260000},{a: 'item', t: '1', n: 1300000},{a: 'item', t: '12', n: 200}] }, - { total: 14, prize: [{a: 'attr', t: 'jinbi', n: 280000},{a: 'item', t: '1', n: 1400000},{a: 'item', t: '12', n: 200}] }, - { total: 15, prize: [{a: 'attr', t: 'jinbi', n: 300000},{a: 'item', t: '1', n: 1500000},{a: 'item', t: '600', n: 20}] } - ] - }, - { - time: 1296000, - tasks: [ - { total: 1, prize: [{a: 'attr', t: 'jinbi', n: 20000},{a: 'item', t: '1', n: 100000},{a: 'item', t: '4', n: 5}] }, - { total: 2, prize: [{a: 'attr', t: 'jinbi', n: 40000},{a: 'item', t: '1', n: 200000},{a: 'item', t: '12', n: 200}] }, - { total: 3, prize: [{a: 'attr', t: 'jinbi', n: 60000},{a: 'item', t: '1', n: 300000},{a: 'item', t: '4', n: 10}] }, - { total: 4, prize: [{a: 'attr', t: 'jinbi', n: 80000},{a: 'item', t: '1', n: 400000},{a: 'item', t: '12', n: 200}] }, - { total: 5, prize: [{a: 'attr', t: 'jinbi', n: 100000},{a: 'item', t: '1', n: 500000},{a: 'item', t: '12', n: 200}] }, - { total: 6, prize: [{a: 'attr', t: 'jinbi', n: 120000},{a: 'item', t: '1', n: 600000},{a: 'item', t: '607', n: 20}] }, - { total: 7, prize: [{a: 'attr', t: 'jinbi', n: 140000},{a: 'item', t: '1', n: 700000},{a: 'item', t: '12', n: 200}] }, - { total: 8, prize: [{a: 'attr', t: 'jinbi', n: 160000},{a: 'item', t: '1', n: 800000},{a: 'item', t: '12', n: 200}] }, - { total: 9, prize: [{a: 'attr', t: 'jinbi', n: 180000},{a: 'item', t: '1', n: 900000},{a: 'item', t: '4', n: 10}] }, - { total: 10, prize: [{a: 'attr', t: 'jinbi', n: 200000},{a: 'item', t: '1', n: 1000000},{a: 'item', t: '12', n: 200}] }, - { total: 11, prize: [{a: 'attr', t: 'jinbi', n: 220000},{a: 'item', t: '1', n: 1100000},{a: 'item', t: '12', n: 200}] }, - { total: 12, prize: [{a: 'attr', t: 'jinbi', n: 240000},{a: 'item', t: '1', n: 1200000},{a: 'item', t: '4', n: 10}] }, - { total: 13, prize: [{a: 'attr', t: 'jinbi', n: 260000},{a: 'item', t: '1', n: 1300000},{a: 'item', t: '12', n: 200}] }, - { total: 14, prize: [{a: 'attr', t: 'jinbi', n: 280000},{a: 'item', t: '1', n: 1400000},{a: 'item', t: '12', n: 200}] }, - { total: 15, prize: [{a: 'attr', t: 'jinbi', n: 300000},{a: 'item', t: '1', n: 1500000},{a: 'item', t: '600', n: 20}] } - ] - } + tasks: [ + { day: 1, payid:"jitianlibao_1" }, + { day: 2, payid:"jitianlibao_2" }, + { day: 3, payid:"jitianlibao_3" }, + { day: 4, payid:"jitianlibao_4" }, + { day: 5, payid:"jitianlibao_5" }, + { day: 6, payid:"jitianlibao_6" }, + { day: 7, payid:"jitianlibao_7" }, + { day: 8, payid:"jitianlibao_8" }, + { day: 9, payid:"jitianlibao_9" }, + { day: 10, payid:"jitianlibao_10" }, + { day: 11, payid:"jitianlibao_11" }, + { day: 12, payid:"jitianlibao_12" }, + { day: 13, payid:"jitianlibao_13" }, + { day: 14, payid:"jitianlibao_14" }, + { day: 15, payid:"jitianlibao_15" } ] } \ No newline at end of file diff --git a/src/json/shouchong.json b/src/json/shouchong.json index 10a0c4c..915846b 100644 --- a/src/json/shouchong.json +++ b/src/json/shouchong.json @@ -1,6 +1,7 @@ { "shouchong1": { "paynum": 6, + "payid":"shouchong_1", "cartoon": { "hero": 5001 }, @@ -45,6 +46,7 @@ }, "shouchong2": { "paynum": 30, + "payid":"shouchong_2", "cartoon": { "img": 5001 }, @@ -89,6 +91,7 @@ }, "shouchong3": { "paynum": 98, + "payid":"shouchong_3", "cartoon": { "hero": 5002 }, diff --git a/src/json/tuisonglibao.json b/src/json/tuisonglibao.json new file mode 100644 index 0000000..737dbc1 --- /dev/null +++ b/src/json/tuisonglibao.json @@ -0,0 +1,257 @@ +{ + "1": { + "id": 1, + "type": 1, + "num": [ + 5 + ], + "payId": [ + "guanqialibao_1", + "guanqialibao_2", + "guanqialibao_3" + ], + "time": 3600, + "displayCD": 7200, + "scale": 500 + }, + "2": { + "id": 2, + "type": 1, + "num": [ + 10 + ], + "payId": [ + "guanqialibao_1", + "guanqialibao_2" + ], + "time": 3600, + "displayCD": 7200, + "scale": 501 + }, + "3": { + "id": 3, + "type": 1, + "num": [ + 20 + ], + "payId": [ + "guanqialibao_1", + "guanqialibao_3" + ], + "time": 3600, + "displayCD": 7200, + "scale": 502 + }, + "4": { + "id": 4, + "type": 2, + "num": [ + { + "a": "item", + "t": "1" + } + ], + "payId": [ + "daojulibao_1", + "daojulibao_2" + ], + "time": 3600, + "displayCD": 7200, + "scale": 503 + }, + "5": { + "id": 5, + "type": 2, + "num": [ + { + "a": "item", + "t": "2" + } + ], + "payId": [ + "daojulibao_1", + "daojulibao_3" + ], + "time": 3600, + "displayCD": 7200, + "scale": 504 + }, + "6": { + "id": 6, + "type": 2, + "num": [ + { + "a": "attr", + "t": "jinbi" + } + ], + "payId": [ + "daojulibao_1", + "daojulibao_2", + "daojulibao_3" + ], + "time": 3600, + "displayCD": 7200, + "scale": 505 + }, + "7": { + "id": 7, + "type": 3, + "num": [ + 1 + ], + "payId": [ + "zhanbailibao_1", + "zhanbailibao_2", + "zhanbailibao_3" + ], + "time": 3600, + "displayCD": 7200, + "scale": 506 + }, + "8": { + "id": 8, + "type": 4, + "num": [ + 3 + ], + "payId": [ + "choukalibao_1", + "choukalibao_2", + "choukalibao_3" + ], + "time": 3600, + "displayCD": 7200, + "scale": 507 + }, + "9": { + "id": 9, + "type": 5, + "num": [ + 31 + ], + "payId": [ + "lv30" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3300 + }, + "10": { + "id": 10, + "type": 5, + "num": [ + 45 + ], + "payId": [ + "lv40" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3300 + }, + "11": { + "id": 11, + "type": 5, + "num": [ + 50 + ], + "payId": [ + "lv55" + ], + "time": 3600, + "displayCD": 3600, + "scale": 2000 + }, + "12": { + "id": 12, + "type": 5, + "num": [ + 53 + ], + "payId": [ + "lv58" + ], + "time": 3600, + "displayCD": 3600, + "scale": 2000 + }, + "13": { + "id": 13, + "type": 5, + "num": [ + 56 + ], + "payId": [ + "lv60" + ], + "time": 3600, + "displayCD": 3600, + "scale": 2000 + }, + "14": { + "id": 14, + "type": 5, + "num": [ + 60 + ], + "payId": [ + "lv63" + ], + "time": 3600, + "displayCD": 3600, + "scale": 2000 + }, + "15": { + "id": 15, + "type": 5, + "num": [ + 63 + ], + "payId": [ + "lv66" + ], + "time": 3600, + "displayCD": 3600, + "scale": 2000 + }, + "16": { + "id": 16, + "type": 5, + "num": [ + 66 + ], + "payId": [ + "lv69" + ], + "time": 3600, + "displayCD": 3600, + "scale": 1800 + }, + "17": { + "id": 17, + "type": 5, + "num": [ + 68 + ], + "payId": [ + "lv72" + ], + "time": 3600, + "displayCD": 3600, + "scale": 1800 + }, + "18": { + "id": 18, + "type": 5, + "num": [ + 70 + ], + "payId": [ + "lv75" + ], + "time": 3600, + "displayCD": 3600, + "scale": 1800 + } +} \ No newline at end of file diff --git a/src/json/yuedujijin.json5 b/src/json/yuedujijin.json5 index 947cbec..52e466d 100644 --- a/src/json/yuedujijin.json5 +++ b/src/json/yuedujijin.json5 @@ -2,35 +2,35 @@ { payId: '128jijin', prize: [ + {a:'item',t:'4',n:50}, + {a:'item',t:'617',n:1}, + {a:'attr',t:'rmbmoney',n:1000}, + {a:'item',t:'9',n:1000}, + {a:'attr',t:'rmbmoney',n:300}, + {a:'attr',t:'rmbmoney',n:300}, + {a:'item',t:'9',n:1000}, + {a:'item',t:'4',n:10}, + {a:'attr',t:'rmbmoney',n:500}, + {a:'attr',t:'rmbmoney',n:300}, + {a:'item',t:'9',n:1000}, {a:'item',t:'4',n:10}, {a:'attr',t:'rmbmoney',n:300}, + {a:'item',t:'9',n:1000}, + {a:'attr',t:'rmbmoney',n:300}, + {a:'attr',t:'rmbmoney',n:300}, + {a:'item',t:'9',n:3000}, + {a:'attr',t:'rmbmoney',n:300}, + {a:'attr',t:'rmbmoney',n:300}, + {a:'item',t:'9',n:3000}, + {a:'attr',t:'rmbmoney',n:500}, {a:'attr',t:'rmbmoney',n:300}, {a:'item',t:'9',n:2000}, {a:'attr',t:'rmbmoney',n:300}, {a:'attr',t:'rmbmoney',n:300}, - {a:'item',t:'609',n:1}, - {a:'item',t:'4',n:10}, - {a:'attr',t:'rmbmoney',n:500}, - {a:'attr',t:'rmbmoney',n:300}, - {a:'item',t:'18',n:300}, - {a:'attr',t:'rmbmoney',n:300}, - {a:'attr',t:'rmbmoney',n:300}, - {a:'item',t:'6',n:20}, - {a:'attr',t:'rmbmoney',n:300}, - {a:'attr',t:'rmbmoney',n:300}, {a:'item',t:'9',n:3000}, {a:'attr',t:'rmbmoney',n:300}, - {a:'attr',t:'rmbmoney',n:300}, - {a:'item',t:'4',n:10}, {a:'attr',t:'rmbmoney',n:500}, - {a:'attr',t:'rmbmoney',n:300}, - {a:'item',t:'20',n:200}, - {a:'attr',t:'rmbmoney',n:300}, - {a:'attr',t:'rmbmoney',n:300}, - {a:'item',t:'9',n:3000}, - {a:'attr',t:'rmbmoney',n:300}, - {a:'attr',t:'rmbmoney',n:300}, - {a:'attr',t:'rmbmoney',n:1000}, + {a:'attr',t:'rmbmoney',n:500}, {a:'item',t:'628',n:1}, ], //奖励总价值X钻 @@ -43,36 +43,36 @@ { payId: '328jijin', prize: [ - {a:'item',t:'4',n:30}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'item',t:'10',n:300}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'item',t:'628',n:1}, - {a:'item',t:'4',n:20}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'item',t:'628',n:1}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'item',t:'628',n:1}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'item',t:'628',n:1}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'item',t:'4',n:20}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'attr',t:'rmbmoney',n:800}, + {a:'item',t:'611',n:1}, + {a:'item',t:'617',n:2}, + {a:'attr',t:'rmbmoney',n:2000}, {a:'item',t:'10',n:400}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'attr',t:'rmbmoney',n:800}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'item',t:'10',n:400}, + {a:'item',t:'4',n:20}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'item',t:'10',n:400}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'item',t:'10',n:400}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'item',t:'10',n:400}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'item',t:'4',n:20}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'item',t:'10',n:400}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'item',t:'10',n:400}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'attr',t:'rmbmoney',n:2000}, {a:'item',t:'10',n:400}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'attr',t:'rmbmoney',n:1500}, - {a:'item',t:'617',n:1}, ], //奖励总价值X钻 num1: 70080, From 5679361eab608f16b92e1d913950edac45094db6 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Mon, 18 Dec 2023 13:48:43 +0800 Subject: [PATCH 45/80] =?UTF-8?q?fix:=20=E7=A7=AF=E5=A4=A9=E5=A5=BD?= =?UTF-8?q?=E7=A4=BCbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/shiwuleichong/ApiOpen.ts | 31 +++++++++++----------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/api_s2c/event/shiwuleichong/ApiOpen.ts b/src/api_s2c/event/shiwuleichong/ApiOpen.ts index 7954da3..de01636 100644 --- a/src/api_s2c/event/shiwuleichong/ApiOpen.ts +++ b/src/api_s2c/event/shiwuleichong/ApiOpen.ts @@ -13,28 +13,27 @@ export default async function (call: ApiCall) { let _zt = PublicShared.getToDayZeroTime(); let pays = await PayFun.getPayLogs(call.uid, payids); for (; day <= G.gc.shiwuleichong.tasks.length; day++) { - let pay = pays[G.gc.shiwuleichong.tasks[day].payid]; - if (!pay) { + let pay = pays[G.gc.shiwuleichong.tasks[day - 1].payid]; + if (!pay || pay.length == 0) { break } else { - if (pay.slice(-1)[0].time >= _zt) { + // 如果是最后一天奖励 + if (day >= G.gc.shiwuleichong.tasks.length) { + // 充值订单隔天了 + if (pay.slice(-1)[0].time < _zt) { + // 重置所有订单 + await PayFun.delPayLog(call.uid, ...payids.map(i => { + return {payId: i, val: []} + })) + day = 1; + pays = {}; + } + break; + } else if (pay.slice(-1)[0].time >= _zt) { break } } } - // 如果是最后一天奖励 并且 充值订单隔天了 - if ( - day == G.gc.shiwuleichong.tasks.length && - pays[G.gc.shiwuleichong.tasks[day - 1].payid] && - pays[G.gc.shiwuleichong.tasks[day - 1].payid].slice(-1)[0].time < _zt - ) { - // 重置所有订单 - await PayFun.delPayLog(call.uid, ...payids.map(i => { - return {payId: i, val: []} - })) - day = 1; - pays = {}; - } call.succ({ day: day, From 6809bdc2b344c6d2317de720e469cd015cb659de Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Mon, 18 Dec 2023 14:29:31 +0800 Subject: [PATCH 46/80] =?UTF-8?q?fix:=20=E7=A7=AF=E5=A4=A9=E5=A5=BD?= =?UTF-8?q?=E7=A4=BCbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/path_20231215.ts | 649 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 649 insertions(+) create mode 100644 src/path_20231215.ts diff --git a/src/path_20231215.ts b/src/path_20231215.ts new file mode 100644 index 0000000..3775b04 --- /dev/null +++ b/src/path_20231215.ts @@ -0,0 +1,649 @@ +import {ctor} from '../../../heijiao/server/src/global'; +import {initMongoDB} from '../../../heijiao/server/src/setMongodb'; +import {EmailFun} from "../../../heijiao/server/src/public/email"; + + +// 首冲 +async function shouChongReSet() { + let shouchong = { + "shouchong1": { + "paynum": 6, + "cartoon": { + "hero": 5001 + }, + "prize": [ + [ + { + "a": "hero", + "t": "5001", + "n": 1 + }, + { + "a": "attr", + "t": "jinbi", + "n": 100000 + } + ], + [ + { + "a": "item", + "t": "12", + "n": 200 + }, + { + "a": "attr", + "t": "jinbi", + "n": 200000 + } + ], + [ + { + "a": "item", + "t": "12", + "n": 200 + }, + { + "a": "attr", + "t": "jinbi", + "n": 300000 + } + ] + ] + }, + "shouchong2": { + "paynum": 30, + "cartoon": { + "img": 5001 + }, + "prize": [ + [ + { + "a": "equip", + "t": "1009", + "n": 1 + }, + { + "a": "equip", + "t": "2009", + "n": 1 + } + ], + [ + { + "a": "equip", + "t": "3009", + "n": 1 + }, + { + "a": "item", + "t": "2", + "n": 1000 + } + ], + [ + { + "a": "equip", + "t": "4009", + "n": 1 + }, + { + "a": "item", + "t": "2", + "n": 1000 + } + ] + ] + }, + "shouchong3": { + "paynum": 98, + "cartoon": { + "hero": 5002 + }, + "prize": [ + [ + { + "a": "hero", + "t": "5002", + "n": 1 + }, + { + "a": "item", + "t": "4", + "n": 10 + } + ], + [ + { + "a": "equip", + "t": "1010", + "n": 1 + }, + { + "a": "item", + "t": "2", + "n": 2000 + } + ], + [ + { + "a": "equip", + "t": "3010", + "n": 1 + }, + { + "a": "item", + "t": "2", + "n": 2000 + } + ] + ] + } + }; + let users = await G.mongodb.collection("user").find({}, { + projection: {uid: 1, payExp: 1} + }).toArray(); + + for (let i = 0; i < users.length; i++) { + let user = users[i]; + let data = await G.mongodb.cEvent("shouchong").findOne({uid: user.uid}); + + let send_prize = []; + for (let key in shouchong) { + // 充值不足 + if (user.payExp < shouchong[key]["paynum"] * 10) { + continue + } + + // 奖励已经领取完毕 + if (data && data.receive[key] && data.receive[key].length >= shouchong[key]["prize"].length) { + continue + } + + // 补发未领取奖励 + for (let i = 0; i < shouchong[key]["prize"].length; i++) { + if (data.receive[key][i]) { + continue + } + data.receive[key][i] = G.time; + send_prize.concat(shouchong[key]["prize"][i]); + } + } + if (send_prize.length <= 0) continue; + + let title = "首充未领取奖励补发"; + let content = "首充未领取奖励补发"; + + // 发放邮件 + await EmailFun.addEmail({ + uid: user.uid, + type: "system", + title: title, + content: content, + prize: send_prize, + }); + // 设置奖励发放记录 + await G.mongodb.cEvent("shouchong").updateOne({ + uid: user.uid + }, {"$set": {receive: data.receive, patch: 1}}); + } +} + + +/*超值月卡、至尊月卡、永久卡的线上玩家脚本 +线上已购买超值月卡的玩家，脚本补发：招募卡*30 +线上已购买至尊月卡的玩家，脚本补发：钻石*10000 +线上已购买永久卡的玩家，脚本补发：汉塞尔*1，能量饮料*500w +* */ +async function yuekaSendPrize() { + let w = { + key: {$in: ["chaozhiyueka", "zhizunyueka", "zhongshenka"]}, + del_time: {$exists: false} + }; + let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + users.forEach(user => { + let uid = user.uid; + let proId = user.key; + if (!uid2Prize[uid]) uid2Prize[uid] = []; + + switch (proId) { + case "chaozhiyueka": + uid2Prize[uid].push({a: "item", t: "4", n: 30}); + break; + case "zhizunyueka": + uid2Prize[uid].push({a: "attr", t: "rmbmoney", n: 10000}) + break; + case "zhongshenka": + uid2Prize[uid].push({a: "item", t: "1", n: 5000000}) + uid2Prize[uid].push({a: "hero", t: "4012", n: 1}) + break; + } + }); + + let title = "月卡奖励发放"; + let content = "月卡奖励发放"; + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await EmailFun.addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + }); + + // 处理重复执行 + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} + ) + } +} + + +/*特权礼包脚本需求 +1、特权内容：已购买特权的玩家，特权效果更新 +2、已购买情报特权的玩家，脚本补发：钻石*680，顶级紫色套装*1 +3、已购买快速特权的玩家，脚本补发：钻石*300，快速探险券*30 +4、已购买财富特权的玩家，脚本补发：钻石*300，美金*1000万 +5、已购买酒馆特权的玩家，脚本补发：钻石*680，招募卡*10 +* */ +async function tequanLiBaoSendPrize() { + let w = { + key: {$in: ["qingbaotequan", "zuozhantequan", "caifutequan", "jiubatequan"]}, + del_time: {$exists: false} + }; + let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + users.forEach(user => { + let uid = user.uid; + let proId = user.key; + + if (!uid2Prize[uid]) uid2Prize[uid] = []; + switch (proId) { + case "qingbaotequan": + uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 680}); + uid2Prize[uid].push({"a": "item", "t": "609", "n": 1}); + break; + case "zuozhantequan": + uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 300}); + uid2Prize[uid].push({"a": "item", "t": "24", "n": 30}); + break; + case "caifutequan": + uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 300}) + uid2Prize[uid].push({"a": "attr", "t": "jinbi", "n": 10000000}) + break; + case "jiubatequan": + uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 680}); + uid2Prize[uid].push({"a": "item", "t": "4", "n": 10}); + break; + } + }); + + let title = "特权奖励发放"; + let content = "特权奖励发放"; + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await EmailFun.addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + }); + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} + ) + } +} + + +/* +刷新所有玩家各档位VIP礼包到未购买状态 +* */ +async function resetVipLiBao() { + let w = {"type": "chongzhi"}; + await G.mongodb.collection("playerInfo").updateMany(w, {"giftBy": {}}); +} + + +/* +人才计划调整 +1、线上已有该活动的玩家，保留次数进度；达到新加档位可领取的奖励则直接领取 +2、线上已购买该活动328计费点的玩家，每次购买记录补发招募卡*20,； +3、线上已购买该活动648计费点的玩家，每次购买记录补发招募卡*40,； +* */ +async function rcjhReSet() { + let proId328 = ["ycmb_1_5", "ycmb_2_4", "ycmb_3_5", "ycmb_4_5", "ycmb_5_5"]; + let proId648 = ["ycmb_1_6", "ycmb_2_5", "ycmb_3_6", "ycmb_4_6", "ycmb_5_6"]; + let w = { + key: {$in: [].concat(proId328, proId648)}, + del_time: {$exists: false} + }; + let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + users.forEach(user => { + let uid = user.uid; + let proId = user.key; + + if (!uid2Prize[uid]) { + uid2Prize[uid] = [] + } + if (proId328.includes(proId)) { + uid2Prize[uid].push({"a": "item", "t": "4", "n": 20}) + } else if (proId648.includes(proId)) { + uid2Prize[uid].push({"a": "item", "t": "4", "n": 40}) + } + }); + + let title = "人才计划奖励发放"; + let content = "人才计划奖励发放"; + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await EmailFun.addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + }); + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} + ) + } +} + + +/*等级基金调整 +1、已购买等级基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； +2、未购买的玩家活动刷新到新版本； +3、刷新等级基金到未购买状态； +* */ +async function dengjiJiJinReSet() { + let w = {key: "dengjijijin", del_time: {$exists: false}} + // 激活了的玩家 + let _payList = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + let title = "等级基金未领取奖励发放"; + let content = "等级基金未领取奖励发放"; + let prizeList = G.gc.jijin["dengjijijin"]; + let _users = await G.mongodb.cEvent("dengjijijin").find( + {"uid": {"$in": _payList.map(pay => pay.uid)}} + ).toArray() + + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + _users.forEach((user) => { + let uid = user.uid; + let idx2Type2Bool = user.rec; + if (!uid2Prize[uid]) uid2Prize[uid] = []; + + // 没领的全发 + prizeList.forEach((con, idx) => { + // 普通奖励没领 + if (!idx2Type2Bool[idx]?.pt) { + uid2Prize[uid].push(...con.pt) + } + // 高级奖励没领 + if (!idx2Type2Bool[idx]?.tq) { + uid2Prize[uid].push(...con.pt) + } + }); + }) + + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await EmailFun.addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + }); + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} + ) + // 基金数据清除 + await G.mongodb.collection("event").updateMany( + {type: "dengjijijin", uid: uid}, {"$set": {uid: `${uid}_patch_del`}} + ); + } +} + + +/*关卡基金调整 +1、已购买关卡基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； +2、未购买的玩家活动刷新到新版本； +3、刷新关卡基金到未购买状态； +* */ +async function guanqiaJiJinReSet() { + let w = {key: "guanqiajijin"}; + // 激活了的玩家 + let _payList = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + let title = "关卡基金未领取奖励发放"; + let content = "关卡基金未领取奖励发放"; + let prizeList = G.gc.jijin["guanqiajijin"]; + + // 没激活不处理 + let _users = await G.mongodb.cEvent("guanqiajijin").find( + { + "uid": {"$in": _payList.map(pay => pay.uid)} + }, + {projection: {_id: 0}} + ).toArray(); + + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + _users.forEach(user => { + let uid = user.uid; + let idx2Type2Bool = user.rec; + if (!uid2Prize[uid]) uid2Prize[uid] = []; + + // 没领的全发 + prizeList.forEach((con, idx) => { + // 普通奖励没领 + if (!idx2Type2Bool[idx]?.pt) { + uid2Prize[uid].push(...con.pt) + } + // 高级奖励没领 + if (!idx2Type2Bool[idx]?.tq) { + uid2Prize[uid].push(...con.tq) + } + }); + }) + + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await EmailFun.addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + }); + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} + ) + // 基金数据清除 + await G.mongodb.collection("event").updateMany( + {type: "guanqiajijin", uid: uid}, {"$set": {uid: `${uid}_patch_del`}} + ); + } +} + + +/*通行证基金调整 +1、已购买通行证基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； +2、未购买的玩家活动刷新到新版本； +3、刷新通行证基金到未购买状态； +* */ +async function dayjiJiJinReSet() { + let w = {key: "dayjijin"}; + + // 激活了的玩家 + let _payList = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + let title = "通行证基金未领取奖励发放"; + let content = "通行证基金未领取奖励发放"; + let prizeList = G.gc.jijin["dayjijin"]; + // 没激活不处理 + let _users = await G.mongodb.cEvent("dayjijin").find( + {uid: {$in: _payList.map(pay => pay.uid)}} + ).toArray(); + + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + _users.forEach(user => { + let uid = user.uid; + let idx2Type2Bool = user.rec; + if (!uid2Prize[uid]) uid2Prize[uid] = []; + + // 没领的全发 + prizeList.forEach((con, idx) => { + // 普通奖励没领 + if (!idx2Type2Bool[idx]?.pt) { + uid2Prize[uid].push(...con.pt) + } + // 高级奖励没领 + if (!idx2Type2Bool[idx]?.tq) { + uid2Prize[uid].push(...con.tq) + } + }); + }) + + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await EmailFun.addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + }); + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} + ) + // 基金数据清除 + await G.mongodb.collection("event").updateMany( + {type: "dayjijin", uid: uid}, {"$set": {uid: `${uid}_patch_del`}} + ); + } +} + +/*月基金调整 +1、已购买128、328月基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； +2、未购买的玩家活动刷新到新版本； +3、刷新月基金到未购买状态； +* */ +async function yueJiJinReSet() { + let proIdList = [ + "128jijin", + "328jijin", + ]; + let w = {key: {$in: proIdList}}; + // 激活了的玩家 + let _payList = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + // 没激活不处理 + let _users = await G.mongodb.collection("event").find( + { + "type": {"$in": proIdList}, + "uid": {"$in": _payList.map(pay => pay.uid)} + } + ).toArray(); + + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + let prizeList128 = G.gc.yuedujijin.find(v => v.payId == "128jijin"); + let prizeList328 = G.gc.yuedujijin.find(v => v.payId == "328jijin"); + _users.forEach(user => { + let uid = user.uid; + let gotarr = user.rec; + if (!uid2Prize[uid]) uid2Prize[uid] = []; + + let prizeList = user.type == "128jijin" ? prizeList128.prize : prizeList328.prize; + // 没领的全发 + prizeList.forEach((onePrize, idx) => { + // 领过了 + if (gotarr.includes(idx)) { + return + } + uid2Prize[uid].push(onePrize) + }); + }) + + let title = "月度基金未领取奖励发放"; + let content = "月度基金未领取奖励发放"; + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await EmailFun.addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + }); + + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} + ) + // 基金数据清除 + await G.mongodb.collection("event").updateMany( + {type: {$in: proIdList}, uid: uid}, {"$set": {uid: `${uid}_patch_del`}} + ); + } +} + +async function start() { + //连接mongodb + await initMongoDB(); + + // 首冲调整 + await shouChongReSet(); + // 超值月卡、至尊月卡、永久卡的线上玩家脚本 + await yuekaSendPrize(); + // 特权礼包脚本需求 + await tequanLiBaoSendPrize(); + // 刷新所有玩家各档位VIP礼包到未购买状态 + await resetVipLiBao(); + // 人才计划调整 + await rcjhReSet(); + // 等级基金调整 + await dengjiJiJinReSet(); + // 关卡基金调整 + await guanqiaJiJinReSet(); + // 通行证基金调整 + await dayjiJiJinReSet(); + // 月基金调整 + await yueJiJinReSet(); +} + +//定义全局变量 +ctor(); +//启动服务 +start().then(() => { + process.exit() +}); + + From 954c2e8d2e67010127c042ddaa6b89d880b94664 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Mon, 18 Dec 2023 14:38:26 +0800 Subject: [PATCH 47/80] =?UTF-8?q?fix:=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/path_20231215.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/path_20231215.ts b/src/path_20231215.ts index 3775b04..5520e73 100644 --- a/src/path_20231215.ts +++ b/src/path_20231215.ts @@ -1,7 +1,6 @@ -import {ctor} from '../../../heijiao/server/src/global'; -import {initMongoDB} from '../../../heijiao/server/src/setMongodb'; -import {EmailFun} from "../../../heijiao/server/src/public/email"; - +import {ctor} from "./global"; +import {EmailFun} from "./public/email"; +import {initMongoDB} from "./setMongodb"; // 首冲 async function shouChongReSet() { From 7474b4583ffdaa8152a3832d70e1e718758d62ec Mon Sep 17 00:00:00 2001 From: dy Date: Mon, 18 Dec 2023 14:46:36 +0800 Subject: [PATCH 48/80] json --- src/json/herogrow_ewai.json | 62 ++++++ src/json/huodong.json5 | 27 ++- src/json/pay.json | 354 +++++++++++++++++++++++++++++++++-- src/json/skill_afteratk.json | 8 +- src/json/skill_buff.json | 4 +- 5 files changed, 423 insertions(+), 32 deletions(-) create mode 100644 src/json/herogrow_ewai.json diff --git a/src/json/herogrow_ewai.json b/src/json/herogrow_ewai.json new file mode 100644 index 0000000..791c542 --- /dev/null +++ b/src/json/herogrow_ewai.json @@ -0,0 +1,62 @@ +{ + "1": { + "id": 1, + "jieji": 0, + "ewai_buff": 0 + }, + "2": { + "id": 2, + "jieji": 1, + "ewai_buff": 0 + }, + "3": { + "id": 3, + "jieji": 2, + "ewai_buff": 0 + }, + "4": { + "id": 4, + "jieji": 3, + "ewai_buff": 0 + }, + "5": { + "id": 5, + "jieji": 4, + "ewai_buff": 0.4 + }, + "6": { + "id": 6, + "jieji": 5, + "ewai_buff": 0.5 + }, + "7": { + "id": 7, + "jieji": 6, + "ewai_buff": 0.6 + }, + "8": { + "id": 8, + "jieji": 7, + "ewai_buff": 0.8 + }, + "9": { + "id": 9, + "jieji": 8, + "ewai_buff": 1 + }, + "10": { + "id": 10, + "jieji": 9, + "ewai_buff": 1.2 + }, + "11": { + "id": 11, + "jieji": 10, + "ewai_buff": 1.4 + }, + "12": { + "id": 12, + "jieji": 11, + "ewai_buff": 1.8 + } +} \ No newline at end of file diff --git a/src/json/huodong.json5 b/src/json/huodong.json5 index d09b2bf..df17ba9 100644 --- a/src/json/huodong.json5 +++ b/src/json/huodong.json5 @@ -3332,17 +3332,17 @@ //玩游戏需要消耗 "gameneed": [{"a": "attr", "t":"jinbi", "n": 1}], //玩游戏拿分 - "game": [0,1,2,3,4,5], + "game": [5,10,20,30,50], //战令 "zhanling":[ { - "val": 1, - "pt": [{"a": "attr", "t":"jinbi", "n": 1}], - "gj": [{"a": "attr", "t":"jinbi", "n": 1}] + "val": 2500, + "pt": [{"a": "item", "t":"1", "n": 200000}], + "gj": [{"a": "item", "t":"50101", "n": 1},{"a": "item", "t":"1", "n": 500000}] }, { "val": 2, - "pt": [{"a": "attr", "t":"jinbi", "n": 1}], + "pt": [{"a": "attr", "t":"rmbmoney", "n": 500}], "gj": [{"a": "attr", "t":"jinbi", "n": 1}] }, { @@ -3351,6 +3351,7 @@ "gj": [{"a": "attr", "t":"jinbi", "n": 1}] } ], + //战令PayID "zlpayid":"ycmb_1_1", //活动礼包 "libao": { @@ -3475,6 +3476,7 @@ intr: "czlbtips_1", intr: "czlbtips_2", //礼包 + //礼包 gift: [ { id: '1', @@ -3483,7 +3485,10 @@ free: false, payId: 'czlb_1', buyNum: 1, - prize: [{'a': 'item', 't': '13', 'n': 600},{'a': 'item', 't': '13', 'n': 600},{'a': 'item', 't': '13', 'n': 600}] + prize:{"1":[{'a': 'item', 't': '13', 'n': 600}], + "2":[{'a': 'item', 't': '13', 'n': 600}], + "3":[{'a': 'item', 't': '13', 'n': 600}] + } }, { id: '2', @@ -3492,7 +3497,10 @@ free: false, payId: 'czlb_2', buyNum: 1, - prize: [{'a': 'item', 't': '13', 'n': 600},{'a': 'item', 't': '13', 'n': 600},{'a': 'item', 't': '13', 'n': 600}] + prize: {"1":[{'a': 'item', 't': '13', 'n': 600}], + "2":[{'a': 'item', 't': '13', 'n': 600}], + "3":[{'a': 'item', 't': '13', 'n': 600}] + } }, { id: '3', @@ -3501,7 +3509,10 @@ free: false, payId: 'czlb_3', buyNum: 1, - prize: [{'a': 'item', 't': '13', 'n': 600},{'a': 'item', 't': '13', 'n': 600},{'a': 'item', 't': '13', 'n': 600}] + prize: {"1":[{'a': 'item', 't': '13', 'n': 600}], + "2":[{'a': 'item', 't': '13', 'n': 600}], + "3":[{'a': 'item', 't': '13', 'n': 600}] + } } ] } diff --git a/src/json/pay.json b/src/json/pay.json index cce56c1..7a8595f 100644 --- a/src/json/pay.json +++ b/src/json/pay.json @@ -4183,7 +4183,33 @@ "n": 60 } ], - "prize": [], + "prize": [ + { + "a": "hero", + "t": "4002", + "n": 1 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 120 + }, + { + "a": "item", + "t": "12", + "n": 500 + }, + { + "a": "item", + "t": "1", + "n": 50000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 100000 + } + ], "firstPayPrize": [], "name": "pay_name_shouchong_1", "undefined": "首充礼包_6", @@ -4203,7 +4229,33 @@ "n": 300 } ], - "prize": [], + "prize": [ + { + "a": "hero", + "t": "5001", + "n": 1 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 600 + }, + { + "a": "item", + "t": "12", + "n": 1500 + }, + { + "a": "item", + "t": "1", + "n": 300000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 300000 + } + ], "firstPayPrize": [], "name": "pay_name_shouchong_2", "undefined": "首充礼包_30", @@ -4223,7 +4275,33 @@ "n": 980 } ], - "prize": [], + "prize": [ + { + "a": "hero", + "t": "5001", + "n": 1 + }, + { + "a": "equip", + "t": "1009", + "n": 1 + }, + { + "a": "equip", + "t": "2009", + "n": 1 + }, + { + "a": "equip", + "t": "3009", + "n": 1 + }, + { + "a": "equip", + "t": "4009", + "n": 1 + } + ], "firstPayPrize": [], "name": "pay_name_shouchong_3", "undefined": "首充礼包_98", @@ -4243,7 +4321,23 @@ "n": 60 } ], - "prize": "[{a: 'attr', t: 'jinbi', n: 200000},{a: 'item', t: '1', n: 100000},{a: 'item', t: '4', n: 5}]", + "prize": [ + { + "a": "item", + "t": "4", + "n": 5 + }, + { + "a": "item", + "t": "1", + "n": 100000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 200000 + } + ], "firstPayPrize": [], "name": "pay_name_jitianlibao_1", "undefined": "积天礼包_6", @@ -4263,7 +4357,23 @@ "n": 60 } ], - "prize": "[{a: 'attr', t: 'jinbi', n: 400000},{a: 'item', t: '1', n: 200000},{a: 'item', t: '607', n: 20}]", + "prize": [ + { + "a": "item", + "t": "607", + "n": 20 + }, + { + "a": "item", + "t": "1", + "n": 200000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 400000 + } + ], "firstPayPrize": [], "name": "pay_name_jitianlibao_2", "undefined": "积天礼包_6", @@ -4283,7 +4393,23 @@ "n": 60 } ], - "prize": "[{a: 'attr', t: 'jinbi', n: 600000},{a: 'item', t: '1', n: 300000},{a: 'item', t: '4', n: 10}]", + "prize": [ + { + "a": "item", + "t": "4", + "n": 10 + }, + { + "a": "item", + "t": "1", + "n": 300000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 600000 + } + ], "firstPayPrize": [], "name": "pay_name_jitianlibao_3", "undefined": "积天礼包_6", @@ -4303,7 +4429,23 @@ "n": 60 } ], - "prize": "[{a: 'attr', t: 'jinbi', n: 800000},{a: 'item', t: '1', n: 400000},{a: 'item', t: '12', n: 500}]", + "prize": [ + { + "a": "item", + "t": "12", + "n": 500 + }, + { + "a": "item", + "t": "1", + "n": 400000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 800000 + } + ], "firstPayPrize": [], "name": "pay_name_jitianlibao_4", "undefined": "积天礼包_6", @@ -4323,7 +4465,23 @@ "n": 60 } ], - "prize": "[{a: 'attr', t: 'jinbi', n: 1000000},{a: 'item', t: '1', n: 500000},{a: 'item', t: '12', n: 500}]", + "prize": [ + { + "a": "item", + "t": "12", + "n": 500 + }, + { + "a": "item", + "t": "1", + "n": 500000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 1000000 + } + ], "firstPayPrize": [], "name": "pay_name_jitianlibao_5", "undefined": "积天礼包_6", @@ -4343,7 +4501,23 @@ "n": 60 } ], - "prize": "[{a: 'attr', t: 'jinbi', n: 1200000},{a: 'item', t: '1', n: 600000},{a: 'item', t: '12', n: 500}]", + "prize": [ + { + "a": "item", + "t": "12", + "n": 500 + }, + { + "a": "item", + "t": "1", + "n": 600000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 1200000 + } + ], "firstPayPrize": [], "name": "pay_name_jitianlibao_6", "undefined": "积天礼包_6", @@ -4363,7 +4537,23 @@ "n": 60 } ], - "prize": "[{a: 'attr', t: 'jinbi', n: 1400000},{a: 'item', t: '1', n: 700000},{a: 'item', t: '600', n: 20}]", + "prize": [ + { + "a": "item", + "t": "600", + "n": 20 + }, + { + "a": "item", + "t": "1", + "n": 700000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 1400000 + } + ], "firstPayPrize": [], "name": "pay_name_jitianlibao_7", "undefined": "积天礼包_6", @@ -4383,7 +4573,23 @@ "n": 60 } ], - "prize": "[{a: 'attr', t: 'jinbi', n: 1600000},{a: 'item', t: '1', n: 800000},{a: 'item', t: '12', n: 500}]", + "prize": [ + { + "a": "item", + "t": "12", + "n": 500 + }, + { + "a": "item", + "t": "1", + "n": 800000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 1600000 + } + ], "firstPayPrize": [], "name": "pay_name_jitianlibao_8", "undefined": "积天礼包_6", @@ -4403,7 +4609,23 @@ "n": 60 } ], - "prize": "[{a: 'attr', t: 'jinbi', n: 1800000},{a: 'item', t: '1', n: 900000},{a: 'item', t: '4', n: 10}]", + "prize": [ + { + "a": "item", + "t": "4", + "n": 10 + }, + { + "a": "item", + "t": "1", + "n": 900000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 1800000 + } + ], "firstPayPrize": [], "name": "pay_name_jitianlibao_9", "undefined": "积天礼包_6", @@ -4423,7 +4645,23 @@ "n": 60 } ], - "prize": "[{a: 'attr', t: 'jinbi', n: 2000000},{a: 'item', t: '1', n: 1000000},{a: 'item', t: '12', n: 500}]", + "prize": [ + { + "a": "item", + "t": "12", + "n": 500 + }, + { + "a": "item", + "t": "1", + "n": 1000000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 2000000 + } + ], "firstPayPrize": [], "name": "pay_name_jitianlibao_10", "undefined": "积天礼包_6", @@ -4443,7 +4681,23 @@ "n": 60 } ], - "prize": "[{a: 'attr', t: 'jinbi', n: 2200000},{a: 'item', t: '1', n: 1100000},{a: 'item', t: '12', n: 500}]", + "prize": [ + { + "a": "item", + "t": "12", + "n": 500 + }, + { + "a": "item", + "t": "1", + "n": 1100000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 2200000 + } + ], "firstPayPrize": [], "name": "pay_name_jitianlibao_11", "undefined": "积天礼包_6", @@ -4463,7 +4717,23 @@ "n": 60 } ], - "prize": "[{a: 'attr', t: 'jinbi', n: 2400000},{a: 'item', t: '1', n: 1200000},{a: 'item', t: '4', n: 10}]", + "prize": [ + { + "a": "item", + "t": "4", + "n": 10 + }, + { + "a": "item", + "t": "1", + "n": 1200000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 2400000 + } + ], "firstPayPrize": [], "name": "pay_name_jitianlibao_12", "undefined": "积天礼包_6", @@ -4483,7 +4753,23 @@ "n": 60 } ], - "prize": "[{a: 'attr', t: 'jinbi', n: 2600000},{a: 'item', t: '1', n: 1300000},{a: 'item', t: '12', n: 500}]", + "prize": [ + { + "a": "item", + "t": "12", + "n": 500 + }, + { + "a": "item", + "t": "1", + "n": 1300000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 2600000 + } + ], "firstPayPrize": [], "name": "pay_name_jitianlibao_13", "undefined": "积天礼包_6", @@ -4503,7 +4789,23 @@ "n": 60 } ], - "prize": "[{a: 'attr', t: 'jinbi', n: 2800000},{a: 'item', t: '1', n: 1400000},{a: 'item', t: '12', n: 500}]", + "prize": [ + { + "a": "item", + "t": "12", + "n": 500 + }, + { + "a": "item", + "t": "1", + "n": 1400000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 2800000 + } + ], "firstPayPrize": [], "name": "pay_name_jitianlibao_14", "undefined": "积天礼包_6", @@ -4523,7 +4825,23 @@ "n": 60 } ], - "prize": "[{a: 'attr', t: 'jinbi', n: 3000000},{a: 'item', t: '1', n: 1500000},{a: 'item', t: '600', n: 20}]", + "prize": [ + { + "a": "item", + "t": "600", + "n": 20 + }, + { + "a": "item", + "t": "1", + "n": 1500000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 3000000 + } + ], "firstPayPrize": [], "name": "pay_name_jitianlibao_15", "undefined": "积天礼包_6", diff --git a/src/json/skill_afteratk.json b/src/json/skill_afteratk.json index 287a4dc..39523ee 100644 --- a/src/json/skill_afteratk.json +++ b/src/json/skill_afteratk.json @@ -1011,7 +1011,7 @@ "mofa": 0, "islong": 0 }, - "describe": "普通攻击替换为随机攻击3个目标，造成基础伤害95%的物理伤害" + "describe": "普通攻击替换为随机攻击2个目标，造成基础伤害95%的物理伤害" }, "4002201": { "skillid": 4002201, @@ -1029,7 +1029,7 @@ "mofa": 0, "islong": 0 }, - "describe": "普通攻击替换为随机攻击3个目标，造成基础伤害114%的物理伤害" + "describe": "普通攻击替换为随机攻击2个目标，造成基础伤害114%的物理伤害" }, "4003200": { "skillid": 4003200, @@ -1202,7 +1202,7 @@ "order": "rand", "limit": 6, "data": { - "pro": 0.11 + "pro": 0.13 }, "chkdata": {}, "ext": {}, @@ -1217,7 +1217,7 @@ "order": "rand", "limit": 6, "data": { - "pro": 0.11 + "pro": 0.13 }, "chkdata": {}, "ext": {}, diff --git a/src/json/skill_buff.json b/src/json/skill_buff.json index e7c9168..5c3cdb0 100644 --- a/src/json/skill_buff.json +++ b/src/json/skill_buff.json @@ -739,7 +739,7 @@ "sxleixing": "zhongdu", "buff_type": 2, "xiaoguocanshu": { - "pro": 0.15, + "pro": 0.18, "type": "hp" }, "round": 2, @@ -759,7 +759,7 @@ "sxleixing": "zhongdu", "buff_type": 2, "xiaoguocanshu": { - "pro": 0.15, + "pro": 0.18, "type": "hp" }, "round": 2, From 30de992a6263004d30055e83ee1e2b270057774e Mon Sep 17 00:00:00 2001 From: yushunrui <364203175@qq.com> Date: Mon, 18 Dec 2023 14:58:41 +0800 Subject: [PATCH 49/80] =?UTF-8?q?=E5=9C=A3=E8=AF=9E=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=82=E6=AD=A5=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/ApiSyncBtn.ts | 15 ++++++++++++++- src/shared/protocols/PtlSyncBtn.ts | 2 +- src/shared/protocols/serviceProto.ts | 7 +++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/api_s2c/ApiSyncBtn.ts b/src/api_s2c/ApiSyncBtn.ts index 2d74769..68065df 100644 --- a/src/api_s2c/ApiSyncBtn.ts +++ b/src/api_s2c/ApiSyncBtn.ts @@ -3,6 +3,7 @@ import {EventFun} from '../public/event/event'; import {PayFun} from '../public/pay'; import {ReqSyncBtn, ResSyncBtn, syncBtnKeys} from "../shared/protocols/PtlSyncBtn"; import {PublicShared} from '../shared/public/public'; +import {HuoDongFun} from "../public/huodongfun"; const defaultKeys: syncBtnKeys[] = [ 'huobanzhaomu', 'yibaichou', 'shouchong', @@ -10,7 +11,8 @@ const defaultKeys: syncBtnKeys[] = [ 'zhanling', 'xianshilibao', 'xianshizhaomu', - 'G123Gift' + 'G123Gift', + 'christmas', // 'kaifukuanghuan', // 'qiridenglu', @@ -36,6 +38,17 @@ export default async function (call: ApiCall) { change[key] = data[key]; } break; + case 'christmas': + //领完消失 + if (!data[key]) { + let _hdList = await HuoDongFun.gethdList(call, 8) + if (_hdList) { + // 无此活动 + data[key] = {active: true}; + change[key] = data[key]; + } + } + break; case 'dayjijin': case 'dengjijijin': case 'guanqiajijin': diff --git a/src/shared/protocols/PtlSyncBtn.ts b/src/shared/protocols/PtlSyncBtn.ts index b5385dc..04f1524 100644 --- a/src/shared/protocols/PtlSyncBtn.ts +++ b/src/shared/protocols/PtlSyncBtn.ts @@ -30,4 +30,4 @@ export type defaultSyncBtn = { export type syncBtnKeys = 'shouchong' | 'kaifukuanghuan' | jijinType | 'zhanling' | 'qiridenglu' | 'xianshilibao' | 'yibaichou' | 'huobanzhaomu' | 'xianshizhaomu' | 'leijichongzhi' | 'xinshoulibao' | 'jierihuodong' | 'yuedujijin' | 'zixuanlibao' | 'diaoluoduihuan' | 'chuanshuozhilu' - | 'yangchengmubiao' | 'G123Gift' \ No newline at end of file + | 'yangchengmubiao' | 'G123Gift' | 'christmas' \ No newline at end of file diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 2329b0e..63d417a 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -18826,6 +18826,13 @@ export const serviceProto: ServiceProto = { "type": "Literal", "literal": "G123Gift" } + }, + { + "id": 18, + "type": { + "type": "Literal", + "literal": "christmas" + } } ] }, From 25a8e15ed39c4303ad83011515bb079bd7715e9e Mon Sep 17 00:00:00 2001 From: yushunrui <364203175@qq.com> Date: Mon, 18 Dec 2023 15:29:48 +0800 Subject: [PATCH 50/80] =?UTF-8?q?task=E5=A2=9E=E5=8A=A0=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8B=EF=BC=8C154=E6=98=AF?= =?UTF-8?q?=E5=9C=A3=E8=AF=9E=E5=B0=8F=E6=B8=B8=E6=88=8F=E6=8C=91=E6=88=98?= =?UTF-8?q?=20155=E6=98=AF=E6=AF=8F=E6=97=A5=E4=BB=BB=E5=8A=A1=E6=9C=80?= =?UTF-8?q?=E7=BB=88=E5=AE=9D=E7=AE=B1=E5=A5=96=E5=8A=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/christmas/ApiGame.ts | 2 ++ src/api_s2c/task/ApiAllFinsh.ts | 6 ++++++ src/api_s2c/task/ApiFinsh.ts | 5 +++++ src/globalListener.ts | 4 ++++ src/public/taskclass.ts | 18 ++++++++++++++++++ 5 files changed, 35 insertions(+) diff --git a/src/api_s2c/event/christmas/ApiGame.ts b/src/api_s2c/event/christmas/ApiGame.ts index 25486ab..20b51d0 100644 --- a/src/api_s2c/event/christmas/ApiGame.ts +++ b/src/api_s2c/event/christmas/ApiGame.ts @@ -26,6 +26,8 @@ export default async function (call: ApiCall) { _setData["val"] = _mydata.val _setData["game"] = _mydata["gamenum"] await Christmasfun.setMyData(call.uid, call.req.hdid, { $set: _setData}) + // 监听任务 + G.emit("Class_task_154", 'Class_task_154', call, 1, 0); let changedata = { mydata: _mydata} // 推送红点 HongDianChange.sendChangeKey(call.uid, ['huodonghd']); diff --git a/src/api_s2c/task/ApiAllFinsh.ts b/src/api_s2c/task/ApiAllFinsh.ts index eee896d..f3e29a8 100644 --- a/src/api_s2c/task/ApiAllFinsh.ts +++ b/src/api_s2c/task/ApiAllFinsh.ts @@ -42,6 +42,12 @@ export default async function (call: ApiCall) { // 设置数据 await TaskFun.setTask(call.uid, { type: _type, taskid: { $in: _finishTaks } }, { finish: 1 }) let prize = await PlayerFun.sendPrize(call, _prize) + // 是否是每日任务奖励最终宝箱 + if (_type == 4 && 25 in _finishTaks){ + // 监听任务 + G.emit("Class_task_155", 'Class_task_155', call, 1, 0); + } + let data = { finishtask: _finishTaks, diff --git a/src/api_s2c/task/ApiFinsh.ts b/src/api_s2c/task/ApiFinsh.ts index 1a7a4bc..aebc8b1 100644 --- a/src/api_s2c/task/ApiFinsh.ts +++ b/src/api_s2c/task/ApiFinsh.ts @@ -44,6 +44,11 @@ export default async function (call: ApiCall) { } // 设置数据 await TaskFun.setTask(call.uid, {taskid: taskid}, {finish: 1}) + // 是否是每日任务奖励最终宝箱 + if (_task["type"] == 4 && 25 == taskid){ + // 监听任务 + G.emit("Class_task_155", 'Class_task_155', call, 1, 0); + } let _prize = await PlayerFun.sendPrize(call, _con["prize"]) _task["finish"] = 1 diff --git a/src/globalListener.ts b/src/globalListener.ts index bd10c64..a5a750f 100644 --- a/src/globalListener.ts +++ b/src/globalListener.ts @@ -140,6 +140,10 @@ export type gEventType = { Class_task_152: (eventname, call, val, chkVal) => void; /**合成x次装备 */ Class_task_153: (eventname, call, val, chkVal) => void; + /**参与圣诞活动小游戏 */ + Class_task_154: (eventname, call, val, chkVal) => void; + /**每日任务宝箱领取 */ + Class_task_155: (eventname, call, val, chkVal) => void; }; export function addListener() { diff --git a/src/public/taskclass.ts b/src/public/taskclass.ts index b1f2abf..5266c85 100644 --- a/src/public/taskclass.ts +++ b/src/public/taskclass.ts @@ -766,6 +766,24 @@ export module manager { return call.conn.gud?.helpHeros?.length || 0; } } + // 第56个任务 完成圣诞活动小游戏 + export class Class_task_154 extends BaseClass { + stype = 154 + isinc = 1 + + async initVal(call: ApiCall, con) { + return 1; + } + } + // 第57个任务 领取每日任务最终宝箱 + export class Class_task_155 extends BaseClass { + stype = 155 + isinc = 0 + + async initVal(call: ApiCall, con) { + return 1; + } + } } From 9882a2809086465c6722e9450f035ce56765800d Mon Sep 17 00:00:00 2001 From: yushunrui <364203175@qq.com> Date: Mon, 18 Dec 2023 16:16:11 +0800 Subject: [PATCH 51/80] =?UTF-8?q?fix:=E5=A4=84=E7=90=86=E5=9C=A3=E8=AF=9E?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=85=8D=E8=B4=B9=E6=AC=A1=E6=95=B0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/christmas/ApiGame.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api_s2c/event/christmas/ApiGame.ts b/src/api_s2c/event/christmas/ApiGame.ts index 20b51d0..a475f62 100644 --- a/src/api_s2c/event/christmas/ApiGame.ts +++ b/src/api_s2c/event/christmas/ApiGame.ts @@ -24,7 +24,7 @@ export default async function (call: ApiCall) { _mydata["val"] += addval _mydata["gamenum"] += 1 _setData["val"] = _mydata.val - _setData["game"] = _mydata["gamenum"] + _setData["gamenum"] = _mydata["gamenum"] await Christmasfun.setMyData(call.uid, call.req.hdid, { $set: _setData}) // 监听任务 G.emit("Class_task_154", 'Class_task_154', call, 1, 0); From d84173b67e4d15bad940170f020c8605ac1667f8 Mon Sep 17 00:00:00 2001 From: dy Date: Mon, 18 Dec 2023 16:49:54 +0800 Subject: [PATCH 52/80] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E6=94=B9=E7=89=88=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E8=B4=AD=E4=B9=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/public/pay.ts | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/src/public/pay.ts b/src/public/pay.ts index bcda345..fa6b609 100644 --- a/src/public/pay.ts +++ b/src/public/pay.ts @@ -149,6 +149,12 @@ export class PayFun { needVip: 0, front: {} } + } else if (payId == '136GiftAll') { + // 136礼包一键购买，加入所有礼包奖励 + conf = { + ...conf, + prize: R.compose(R.flatten(), R.map(i => i.prize), R.filter(i => i.id.indexOf('136Gift') != -1), R.values())(G.gc.pay) + } } return conf } @@ -225,7 +231,7 @@ export class PayFun { prize.push(...conf.prize) } - let isReplaceConf = await this.checkBuysAfterPay(uid, payId, conf, payArgs) + let isReplaceConf = await this.checkBuysAfterPay(uid, payId, conf, payArgs, player) if (isReplaceConf) { let prizePayId = `zuanshi_${conf.money}` payArgs.toPrizePayId = prizePayId @@ -314,8 +320,9 @@ export class PayFun { * @param payId * @param conf * @param payArgs + * @param player */ - static async checkBuysAfterPay(uid, payId, conf, payArgs) { + static async checkBuysAfterPay(uid, payId, conf, payArgs, player) { if (payId == 'G123SendGift') { let giftInfo = await G.mongodb.collection('giftLog').findOne({popup_id: payArgs.popup_id}); if (giftInfo.purchaseLimitAmount && giftInfo.buyNumber >= giftInfo.purchaseLimitAmount && number(giftInfo.price) > 0) { @@ -327,6 +334,12 @@ export class PayFun { buyLog = buyLog.filter(v => v.time >= PublicShared.getToDayZeroTime(G.time)); } if (conf.buys > 0 && buyLog.length >= conf.buys) return true; + //针对周末礼包的单独处理 + if (payId.indexOf('wkdlibao') != -1) { + let call = this.getCall(player) + let conf = await zmlbGetConf(call, {payId}) + if (buyLog.length && buyLog.length >= conf.buyNum) return true + } } return false } @@ -376,10 +389,20 @@ export class PayFun { 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}); + //针对每日礼包的单独处理 + let zeroTime = PublicShared.getToDayZeroTime(G.time) + if (payId.indexOf('136Gift') != -1 && payId != '136GiftAll') { + let buyLog136 = await this.getPayLog(player.uid, '136GiftAll'); + buyLog136 = buyLog136.filter(v => v.time >= zeroTime); + if (buyLog136.length) return G.server.sendMsgByUid(player.uid, 'msg_s2c/PayResult', {code: -1}); } + if (payId.indexOf('136Gift') != -1 && payId == '136GiftAll') { + let ids = R.compose(R.map(i => i.id), R.filter(i => i.id.indexOf('136Gift') != -1 && i.id != '136GiftAll'), R.values())(G.gc.pay) + let buyLog136 = await this.getPayLogs(player.uid, ids); + let buyLog136list = R.compose(R.filter(v => v.time >= zeroTime), R.flatten(), R.values())(buyLog136) + if (buyLog136list.length) return G.server.sendMsgByUid(player.uid, 'msg_s2c/PayResult', {code: -1}); + } + //针对周末礼包的单独处理 if (payId.indexOf('wkdlibao') != -1) { let call = this.getCall(player) let conf = await zmlbGetConf(call, {payId}) From 76794921fbd08d46050e738c37970ac6a1082cf6 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Mon, 18 Dec 2023 18:34:41 +0800 Subject: [PATCH 53/80] =?UTF-8?q?fix:=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/path_20231215.ts | 1547 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 1384 insertions(+), 163 deletions(-) diff --git a/src/path_20231215.ts b/src/path_20231215.ts index 5520e73..6c9f3e7 100644 --- a/src/path_20231215.ts +++ b/src/path_20231215.ts @@ -1,8 +1,24 @@ import {ctor} from "./global"; import {EmailFun} from "./public/email"; import {initMongoDB} from "./setMongodb"; +import {yangchengmubiao} from "./shared/protocols/event/yangchengmubiao/PtlOpen"; -// 首冲 +/** + * 标题：首充优化 + * 日語:初回チャージ仕様改善 + * 繁體:首儲機制改善 + * 韓国語: 초회 충전 시스템 개선 + * 英語: First Top-Up optimization + * + * 內文：这是您的补偿，请查收！ + * 日語:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + * 繁體中文:這是您的補償內容，煩請查收! + * 韓国語:투자 시스템 개선으로 인한 보상을 보내드립니다. + * 英語: Please find attached a few items as a compensation for the wait during our adjustments. + * + * 线上玩家脚本 + * 1、已激活首充档位且没领完3天奖励的玩家，邮件补发剩下的奖励 + * 2、重置所有玩家首充活动到新版本状态*/ async function shouChongReSet() { let shouchong = { "shouchong1": { @@ -169,8 +185,21 @@ async function shouChongReSet() { } if (send_prize.length <= 0) continue; - let title = "首充未领取奖励补发"; - let content = "首充未领取奖励补发"; + let title = "首充优化"; + let content = "这是您的补偿，请查收！"; + + let lngTitle = { + en: "First Top-Up optimization", + ja: "初回チャージ仕様改善", + ko: "초회 충전 시스템 개선", + tw: "首儲機制改善" + }; + let lngContent = { + en: "Please find attached a few items as a compensation for the wait during our adjustments.", + ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", + tw: "這是您的補償內容，煩請查收!" + }; // 发放邮件 await EmailFun.addEmail({ @@ -179,23 +208,39 @@ async function shouChongReSet() { title: title, content: content, prize: send_prize, + lngTitle: lngTitle, + lngContent: lngContent, }); // 设置奖励发放记录 await G.mongodb.cEvent("shouchong").updateOne({ uid: user.uid }, {"$set": {receive: data.receive, patch: 1}}); + + console.log(`玩家${user.uid}首充奖励补发完成...`); } } -/*超值月卡、至尊月卡、永久卡的线上玩家脚本 -线上已购买超值月卡的玩家，脚本补发：招募卡*30 -线上已购买至尊月卡的玩家，脚本补发：钻石*10000 -线上已购买永久卡的玩家，脚本补发：汉塞尔*1，能量饮料*500w -* */ -async function yuekaSendPrize() { +/** + * "zhizunyueka" + 标题：至尊月卡优化 + 日語:豪華月パス仕様改善 + 繁體:至尊月卡改善 + 韓国語:고급 월간 패스 시스템 개선 + 英語: Luxurious Monthly Pass optimization + + 邮件内容：这是您的首充优化补偿，请查收！ + 日語:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + 繁體中文:這是您的補償內容，煩請查收! + 韓国語:투자 시스템 개선으로 인한 보상을 보내드립니다. + 英語: Please find attached a few items as a compensation for the wait during our adjustments. + + 线上玩家脚本： + 线上已购买至尊月卡的玩家，脚本补发：钻石*10000 + **/ +async function zhizunyueka() { let w = { - key: {$in: ["chaozhiyueka", "zhizunyueka", "zhongshenka"]}, + key: "zhizunyueka", del_time: {$exists: false} }; let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( @@ -206,25 +251,25 @@ async function yuekaSendPrize() { let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; users.forEach(user => { let uid = user.uid; - let proId = user.key; if (!uid2Prize[uid]) uid2Prize[uid] = []; - - switch (proId) { - case "chaozhiyueka": - uid2Prize[uid].push({a: "item", t: "4", n: 30}); - break; - case "zhizunyueka": - uid2Prize[uid].push({a: "attr", t: "rmbmoney", n: 10000}) - break; - case "zhongshenka": - uid2Prize[uid].push({a: "item", t: "1", n: 5000000}) - uid2Prize[uid].push({a: "hero", t: "4012", n: 1}) - break; - } + uid2Prize[uid].push({a: "attr", t: "rmbmoney", n: 10000}); }); - let title = "月卡奖励发放"; - let content = "月卡奖励发放"; + let title = "至尊月卡优化"; + let content = "这是您的首充优化补偿，请查收！"; + let lngTitle = { + en: "Luxurious Monthly Pass optimization", + ja: "豪華月パス仕様改善", + ko: "고급 월간 패스 시스템 개선", + tw: "至尊月卡改善" + }; + let lngContent = { + en: "Please find attached a few items as a compensation for the wait during our adjustments.", + ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", + tw: "這是您的補償內容，煩請查收!" + }; + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { // 发放邮件 await EmailFun.addEmail({ @@ -233,26 +278,39 @@ async function yuekaSendPrize() { title: title, content: content, prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, }); // 处理重复执行 await G.mongodb.collection("payLogNew").updateMany( Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} ) + + console.log(`玩家${uid}至尊月卡奖励补发完成...`); } } +/** + * "chaozhiyueka" + 标题 超值月卡优化 + ja:お得月パス仕様改善 + tw:超值月卡改善 + ko:월간 패스 시스템 개선 + en: Value Monthly Pass optimization -/*特权礼包脚本需求 -1、特权内容：已购买特权的玩家，特权效果更新 -2、已购买情报特权的玩家，脚本补发：钻石*680，顶级紫色套装*1 -3、已购买快速特权的玩家，脚本补发：钻石*300，快速探险券*30 -4、已购买财富特权的玩家，脚本补发：钻石*300，美金*1000万 -5、已购买酒馆特权的玩家，脚本补发：钻石*680，招募卡*10 -* */ -async function tequanLiBaoSendPrize() { + 內文： + 这是您的补偿，请查收！ + ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + tw:這是您的補償內容，煩請查收! + ko:투자 시스템 개선으로 인한 보상을 보내드립니다. + en: Please find attached a few items as a compensation for the wait during our adjustments. + + 线上已购买超值月卡的玩家，脚本补发：招募卡*30 + **/ +async function chaozhiyueka() { let w = { - key: {$in: ["qingbaotequan", "zuozhantequan", "caifutequan", "jiubatequan"]}, + key: "chaozhiyueka", del_time: {$exists: false} }; let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( @@ -263,31 +321,25 @@ async function tequanLiBaoSendPrize() { let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; users.forEach(user => { let uid = user.uid; - let proId = user.key; - if (!uid2Prize[uid]) uid2Prize[uid] = []; - switch (proId) { - case "qingbaotequan": - uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 680}); - uid2Prize[uid].push({"a": "item", "t": "609", "n": 1}); - break; - case "zuozhantequan": - uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 300}); - uid2Prize[uid].push({"a": "item", "t": "24", "n": 30}); - break; - case "caifutequan": - uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 300}) - uid2Prize[uid].push({"a": "attr", "t": "jinbi", "n": 10000000}) - break; - case "jiubatequan": - uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 680}); - uid2Prize[uid].push({"a": "item", "t": "4", "n": 10}); - break; - } + uid2Prize[uid].push({a: "item", t: "4", n: 30}); }); - let title = "特权奖励发放"; - let content = "特权奖励发放"; + let title = "超值月卡优化"; + let content = "这是您的补偿，请查收！"; + let lngTitle = { + ja: "お得月パス仕様改善", + tw: "超值月卡改善", + ko: "월간 패스 시스템 개선", + en: "Value Monthly Pass optimization", + }; + let lngContent = { + en: "Please find attached a few items as a compensation for the wait during our adjustments.", + ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", + tw: "這是您的補償內容，煩請查收!" + }; + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { // 发放邮件 await EmailFun.addEmail({ @@ -296,80 +348,502 @@ async function tequanLiBaoSendPrize() { title: title, content: content, prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, }); + + // 处理重复执行 await G.mongodb.collection("payLogNew").updateMany( Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} ) + + console.log(`玩家${uid}超值月卡奖励补发完成...`); + } +} + +/** + * "zhongshenka" + 标题:终身卡优化 + ja:永久パス仕様改善 + tw:永久通行證改善 + ko:영구 패스 시스템 개선 + en: Lifetime Pass optimization + + 內文： 这是您的补偿，请查收！ + ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + tw:這是您的補償內容，煩請查收! + ko:투자 시스템 개선으로 인한 보상을 보내드립니다. + en: Please find attached a few items as a compensation for the wait during our adjustments. + + 线上已购买永久卡的玩家，脚本补发：汉塞尔1，能量饮料500w + **/ +async function zhongshenka() { + let w = { + key: "zhongshenka", + del_time: {$exists: false} + }; + let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + users.forEach(user => { + let uid = user.uid; + if (!uid2Prize[uid]) uid2Prize[uid] = []; + uid2Prize[uid].push({"a": "item", "t": "1", "n": 5000000}) + uid2Prize[uid].push({a: "hero", t: "4012", n: 1}) + }); + + let title = "终身卡优化"; + let content = "这是您的补偿，请查收！"; + let lngTitle = { + ja: "永久パス仕様改善", + tw: "永久通行證改善", + ko: "영구 패스 시스템 개선", + en: "Lifetime Pass optimization", + }; + let lngContent = { + en: "Please find attached a few items as a compensation for the wait during our adjustments.", + ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", + tw: "這是您的補償內容，煩請查收!" + }; + + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await EmailFun.addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, + }); + + // 处理重复执行 + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} + ) + + console.log(`玩家${uid}终身卡奖励补发完成...`); } } -/* -刷新所有玩家各档位VIP礼包到未购买状态 -* */ +/** + "qingbaotequan" + 标题:资讯特权优化 + ja:情報特権仕様改善 + tw:資訊特權改善 + ko:정보 특권 시스템 개선 + en: Intel Benefit optimization + + 內文：这是您的补偿，请查收！ + ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + tw:這是您的補償內容，煩請查收! + ko:투자 시스템 개선으로 인한 보상을 보내드립니다. + en: Please find attached a few items as a compensation for the wait during our adjustments. + + 线上玩家脚本 + 1、特权内容：已购买特权的玩家，特权效果更新，不重置时间 + 2、已购买资讯特权的玩家，脚本补发：钻石*680，顶级紫色套装*1 + * */ +async function qingbaotequan() { + let w = { + key: "qingbaotequan", + patch: {$exists: false}, + del_time: {$exists: false} + }; + let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + users.forEach(user => { + let uid = user.uid; + + if (!uid2Prize[uid]) uid2Prize[uid] = []; + uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 680}); + uid2Prize[uid].push({"a": "item", "t": "609", "n": 1}); + }); + + let title = "资讯特权优化"; + let content = "这是您的补偿，请查收！"; + let lngTitle = { + ja: "情報特権仕様改善", + tw: "資訊特權改善", + ko: "정보 특권 시스템 개선", + en: "Intel Benefit optimization", + }; + let lngContent = { + en: "Please find attached a few items as a compensation for the wait during our adjustments.", + ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", + tw: "這是您的補償內容，煩請查收!" + }; + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await EmailFun.addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, + }); + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1}} + ) + + console.log(`玩家${uid}特权奖励补发完成...`); + } +} + +/** + "zuozhantequan" + 标题:作战特权优化 + ja:作戦特権仕様改善 tw:作戰特權改善 + ko:작전 특권 시스템 개선 + en: Strategy Benefit optimization + + 內文：这是您的补偿，请查收！ + ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + tw:這是您的補償內容，煩請查收! + ko:투자 시스템 개선으로 인한 보상을 보내드립니다. + en: Please find attached a few items as a compensation for the wait during our adjustments. + + 线上玩家脚本 + 1、特权内容：已购买特权的玩家，特权效果更新，不重置时间 + 2、已购买快速特权的玩家，脚本补发：钻石300，快速探险券30 + * */ +async function zuozhantequan() { + let w = { + key: "zuozhantequan", + patch: {$exists: false}, + del_time: {$exists: false} + }; + let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + users.forEach(user => { + let uid = user.uid; + + if (!uid2Prize[uid]) uid2Prize[uid] = []; + uid2Prize[uid].push({"a": "item", "t": "24", "n": 30}); + uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 300}); + }); + + let title = "作战特权优化"; + let content = "这是您的补偿，请查收！"; + let lngTitle = { + ja: "情報特権仕様改善", + tw: "資訊特權改善", + ko: "정보 특권 시스템 개선", + en: "Intel Benefit optimization", + }; + let lngContent = { + en: "Please find attached a few items as a compensation for the wait during our adjustments.", + ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", + tw: "這是您的補償內容，煩請查收!" + }; + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await EmailFun.addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, + }); + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1}} + ) + + console.log(`玩家${uid}特权奖励补发完成...`); + } +} + +/** + "caifutequan" + 标题:资产特权优化 + ja:資産特権仕様改善 + tw:資産特權改善 + ko:자산 특권 시스템 개선 + en: Asset Benefit optimization + + 內文：这是您的补偿，请查收！ + ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + tw:這是您的補償內容，煩請查收! + ko:투자 시스템 개선으로 인한 보상을 보내드립니다. + en: Please find attached a few items as a compensation for the wait during our adjustments. + + 线上玩家脚本 + 1、特权内容：已购买特权的玩家，特权效果更新，不重置时间 + 2、已购买资产特权的玩家，脚本补发：钻石*300，美金*1000万 + * */ +async function caifutequan() { + let w = { + key: "caifutequan", + patch: {$exists: false}, + del_time: {$exists: false} + }; + let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + users.forEach(user => { + let uid = user.uid; + + if (!uid2Prize[uid]) uid2Prize[uid] = []; + uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 300}) + uid2Prize[uid].push({"a": "attr", "t": "jinbi", "n": 10000000}) + }); + + let title = "资产特权优化"; + let content = "这是您的补偿，请查收！"; + let lngTitle = { + ja: "資産特権仕様改善", + tw: "資産特權改善", + ko: "자산 특권 시스템 개선", + en: "Asset Benefit optimization", + }; + let lngContent = { + en: "Please find attached a few items as a compensation for the wait during our adjustments.", + ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", + tw: "這是您的補償內容，煩請查收!" + }; + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await EmailFun.addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, + }); + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1}} + ) + + console.log(`玩家${uid}资产特权奖励补发完成...`); + } +} + +/** + "jiubatequan" + 标题:抽奖特权优化 + ja:ガチャ特権仕様改善 + tw:抽獎特權改善 + ko:모집 특권 시스템 개선 + en: Gacha Benefit optimization + + 內文：这是您的补偿，请查收！ + ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + tw:這是您的補償內容，煩請查收! + ko:투자 시스템 개선으로 인한 보상을 보내드립니다. + en: Please find attached a few items as a compensation for the wait during our adjustments. + + 线上玩家脚本 + 1、特权内容：已购买特权的玩家，特权效果更新，不重置时间 + 2、已购买抽奖特权的玩家，脚本补发：钻石*680，招募卡*10 + * */ +async function jiubatequan() { + let w = { + key: "jiubatequan", + patch: {$exists: false}, + del_time: {$exists: false} + }; + let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + users.forEach(user => { + let uid = user.uid; + + if (!uid2Prize[uid]) uid2Prize[uid] = []; + uid2Prize[uid].push({"a": "item", "t": "4", "n": 10}); + uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 680}); + }); + + let title = "抽奖特权优化"; + let content = "这是您的补偿，请查收！"; + let lngTitle = { + ja: "ガチャ特権仕様改善", + tw: "抽獎特權改善", + ko: "모집 특권 시스템 개선", + en: "Gacha Benefit optimization", + }; + let lngContent = { + en: "Please find attached a few items as a compensation for the wait during our adjustments.", + ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", + tw: "這是您的補償內容，煩請查收!" + }; + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await EmailFun.addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, + }); + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1}} + ) + + console.log(`玩家${uid}抽奖特权奖励补发完成...`); + } +} + +/** + 不需要给玩家发送邮件 + + 线上玩家脚本 + 刷新所有玩家各档位VIP礼包到未购买状态 + **/ async function resetVipLiBao() { let w = {"type": "chongzhi"}; await G.mongodb.collection("playerInfo").updateMany(w, {"giftBy": {}}); } -/* -人才计划调整 -1、线上已有该活动的玩家，保留次数进度；达到新加档位可领取的奖励则直接领取 -2、线上已购买该活动328计费点的玩家，每次购买记录补发招募卡*20,； -3、线上已购买该活动648计费点的玩家，每次购买记录补发招募卡*40,； -* */ +/** + 人才计划调整 + 1、线上已有该活动的玩家，保留次数进度；达到新加档位可领取的奖励则直接领取 + **/ async function rcjhReSet() { - let proId328 = ["ycmb_1_5", "ycmb_2_4", "ycmb_3_5", "ycmb_4_5", "ycmb_5_5"]; - let proId648 = ["ycmb_1_6", "ycmb_2_5", "ycmb_3_6", "ycmb_4_6", "ycmb_5_6"]; - let w = { - key: {$in: [].concat(proId328, proId648)}, - del_time: {$exists: false} + const hdid = [100, 101]; + const task = { + '2001': { + 'prize': [{'a': 'item', 't': '4', 'n': 5}, {'a': 'item', 't': '626', 'n': 10}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 50, + 'cond': [], + 'stype': 118 + }, + '2002': { + 'prize': [{'a': 'item', 't': '4', 'n': 5}, {'a': 'item', 't': '626', 'n': 10}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 100, + 'cond': [], + 'stype': 118 + }, + '2003': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '626', 'n': 20}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 200, + 'cond': [], + 'stype': 118 + }, + '2004': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 20}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 250, + 'cond': [], + 'stype': 118 + }, + '2005': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 20}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 300, + 'cond': [], + 'stype': 118 + }, + '2006': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 400, + 'cond': [], + 'stype': 118 + }, + '2007': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 500, + 'cond': [], + 'stype': 118 + } }; - let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( - // 过滤没有结束时间 或者 有结束时间 但是没有过期的 - (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) - ); - - - let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; - users.forEach(user => { - let uid = user.uid; - let proId = user.key; - - if (!uid2Prize[uid]) { - uid2Prize[uid] = [] - } - if (proId328.includes(proId)) { - uid2Prize[uid].push({"a": "item", "t": "4", "n": 20}) - } else if (proId648.includes(proId)) { - uid2Prize[uid].push({"a": "item", "t": "4", "n": 40}) - } - }); - - let title = "人才计划奖励发放"; - let content = "人才计划奖励发放"; - for (const [uid, sendPrize] of Object.entries(uid2Prize)) { - // 发放邮件 - await EmailFun.addEmail({ - uid: uid, - type: "system", - title: title, - content: content, - prize: sendPrize, + // 中间插入了2004 所以之前的任务id一次往后顺延 + const change = {2004: 2005, 2005: 2006, 2006: 2007}; + // 刷新活动配置 + await G.mongodb.collection("hdinfo").updateOne({hdid: {$in: hdid}}, { + "$set": {'data.tasklist.2': task} + }) + let datas: yangchengmubiao[] = []; + // 刷新玩家领取记录 + datas.concat(await G.mongodb.cEvent(`yangchengmubiao${hdid[0]}`).find().toArray()); + datas.concat(await G.mongodb.cEvent(`yangchengmubiao${hdid[1]}`).find().toArray()); + for (let i = 0; i < datas.length; i++) { + let data = datas[i]; + let finished = data.finishid["2"].map((task) => { + return change[task] ? change[task] : task }); - await G.mongodb.collection("payLogNew").updateMany( - Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} + let maxtaskval = Math.max(...Object.values(data.taskval)); + let taskval = Object.assign(Object.keys(task).map((taskid) => { + return {taskid: maxtaskval} + })); + await G.mongodb.collection("event").updateOne( + {uid: data.uid, type: data.type}, {$set: {taskval: taskval, "finishid.2": finished}} ) + console.log(`修复玩家${data.uid}人才计划数据完成...`); } } -/*等级基金调整 -1、已购买等级基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； -2、未购买的玩家活动刷新到新版本； -3、刷新等级基金到未购买状态； -* */ +/** + * 标题：等级基金优化 + * ja:レベル投資仕様改善 + * tw:等級基金改善 + * ko:레벨 투자 시스템 개선 + * en: Level Investment optimization + + * 內文： + * 这是您的补偿，请查收！ + * ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + * tw:這是您的補償內容，煩請查收! + * ko:투자 시스템 개선으로 인한 보상을 보내드립니다. + * en: Please find attached a few items as a compensation for the wait during our adjustments. + + * 线上玩家脚本 + * 1、已购买等级基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； + * 2、未购买的玩家活动刷新到新版本； + * 3、刷新等级基金到未购买状态； + */ async function dengjiJiJinReSet() { let w = {key: "dengjijijin", del_time: {$exists: false}} // 激活了的玩家 @@ -378,9 +852,152 @@ async function dengjiJiJinReSet() { (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) ); - let title = "等级基金未领取奖励发放"; - let content = "等级基金未领取奖励发放"; - let prizeList = G.gc.jijin["dengjijijin"]; + const prizeList = [ + { + "type": "dengjijijin", + "total": 20, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 300 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 1700 + } + ] + }, + { + "type": "dengjijijin", + "total": 25, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 300 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 1700 + } + ] + }, + { + "type": "dengjijijin", + "total": 30, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 300 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 1700 + } + ] + }, + { + "type": "dengjijijin", + "total": 35, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 300 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 1700 + } + ] + }, + { + "type": "dengjijijin", + "total": 40, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 300 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 1700 + } + ] + }, + { + "type": "dengjijijin", + "total": 45, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 300 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 1700 + } + ] + }, + { + "type": "dengjijijin", + "total": 50, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 300 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 1700 + } + ] + }, + { + "type": "dengjijijin", + "total": 55, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 300 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 1700 + } + ] + } + ]; let _users = await G.mongodb.cEvent("dengjijijin").find( {"uid": {"$in": _payList.map(pay => pay.uid)}} ).toArray() @@ -404,6 +1021,20 @@ async function dengjiJiJinReSet() { }); }) + let title = "等级基金优化"; + let content = "这是您的补偿，请查收！"; + let lngTitle = { + ja: "レベル投資仕様改善", + tw: "等級基金改善", + ko: "레벨 투자 시스템 개선", + en: "Level Investment optimization", + }; + let lngContent = { + en: "Please find attached a few items as a compensation for the wait during our adjustments.", + ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", + tw: "這是您的補償內容，煩請查收!" + }; for (const [uid, sendPrize] of Object.entries(uid2Prize)) { // 发放邮件 await EmailFun.addEmail({ @@ -412,6 +1043,8 @@ async function dengjiJiJinReSet() { title: title, content: content, prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, }); await G.mongodb.collection("payLogNew").updateMany( Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} @@ -420,15 +1053,29 @@ async function dengjiJiJinReSet() { await G.mongodb.collection("event").updateMany( {type: "dengjijijin", uid: uid}, {"$set": {uid: `${uid}_patch_del`}} ); + console.log(`玩家${uid}等级基金奖补发完成...`); } } -/*关卡基金调整 -1、已购买关卡基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； -2、未购买的玩家活动刷新到新版本； -3、刷新关卡基金到未购买状态； -* */ +/** + * 标题：关卡基金优化 + * ja:ステージ投資仕様改善 + * tw:關卡基金改善 + * ko:스테이지 투자 시스템 개선 + * en: Stage Investment optimization + * + * 內文：这是您的补偿，请查收！ + * ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + * tw:這是您的補償內容，煩請查收! + * ko:투자 시스템 개선으로 인한 보상을 보내드립니다. + * en: Please find attached a few items as a compensation for the wait during our adjustments. + + * 线上玩家脚本 + * 1、已购买关卡基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； + * 2、未购买的玩家活动刷新到新版本； + * 3、刷新关卡基金到未购买状态； + * */ async function guanqiaJiJinReSet() { let w = {key: "guanqiajijin"}; // 激活了的玩家 @@ -437,9 +1084,112 @@ async function guanqiaJiJinReSet() { (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) ); - let title = "关卡基金未领取奖励发放"; - let content = "关卡基金未领取奖励发放"; - let prizeList = G.gc.jijin["guanqiajijin"]; + const prizeList = [ + { + "type": "guanqiajijin", + "total": 30, + "pt": [], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2000 + } + ], + "des": "guanqiajijin_des_1" + }, + { + "type": "guanqiajijin", + "total": 50, + "pt": [], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2000 + } + ], + "des": "guanqiajijin_des_2" + }, + { + "type": "guanqiajijin", + "total": 70, + "pt": [], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2000 + } + ], + "des": "guanqiajijin_des_3" + }, + { + "type": "guanqiajijin", + "total": 90, + "pt": [], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2000 + } + ], + "des": "guanqiajijin_des_4" + }, + { + "type": "guanqiajijin", + "total": 110, + "pt": [], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2000 + } + ], + "des": "guanqiajijin_des_5" + }, + { + "type": "guanqiajijin", + "total": 150, + "pt": [], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2000 + } + ], + "des": "guanqiajijin_des_6" + }, + { + "type": "guanqiajijin", + "total": 180, + "pt": [], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2000 + } + ], + "des": "guanqiajijin_des_7" + }, + { + "type": "guanqiajijin", + "total": 250, + "pt": [], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2000 + } + ], + "des": "guanqiajijin_des_8" + } + ]; // 没激活不处理 let _users = await G.mongodb.cEvent("guanqiajijin").find( @@ -468,6 +1218,20 @@ async function guanqiaJiJinReSet() { }); }) + let title = "关卡基金优化"; + let content = "这是您的补偿，请查收！"; + let lngTitle = { + ja: "ステージ投資仕様改善", + tw: "關卡基金改善", + ko: "스테이지 투자 시스템 개선", + en: "Stage Investment optimization", + }; + let lngContent = { + en: "Please find attached a few items as a compensation for the wait during our adjustments.", + ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", + tw: "這是您的補償內容，煩請查收!" + }; for (const [uid, sendPrize] of Object.entries(uid2Prize)) { // 发放邮件 await EmailFun.addEmail({ @@ -476,6 +1240,8 @@ async function guanqiaJiJinReSet() { title: title, content: content, prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, }); await G.mongodb.collection("payLogNew").updateMany( Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} @@ -484,15 +1250,29 @@ async function guanqiaJiJinReSet() { await G.mongodb.collection("event").updateMany( {type: "guanqiajijin", uid: uid}, {"$set": {uid: `${uid}_patch_del`}} ); + console.log(`玩家${uid}关卡基金奖补发完成...`); } } -/*通行证基金调整 -1、已购买通行证基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； -2、未购买的玩家活动刷新到新版本； -3、刷新通行证基金到未购买状态； -* */ +/** + * 标题：特别通行证优化 + * ja:特別通行証仕様改善 + * tw:特別通行證改善 + * ko:특별 통행증 시스템 개선 + * en: Special Permit optimization + + * 內文：这是您的补偿，请查收！ + * ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + * tw:這是您的補償內容，煩請查收! + * ko:투자 시스템 개선으로 인한 보상을 보내드립니다. + * en: Please find attached a few items as a compensation for the wait during our adjustments. + + * 线上玩家脚本 + * 1、已购买通行证基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； + * 2、未购买的玩家活动刷新到新版本； + * 3、刷新通行证基金到未购买状态； + * */ async function dayjiJiJinReSet() { let w = {key: "dayjijin"}; @@ -502,9 +1282,260 @@ async function dayjiJiJinReSet() { (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) ); - let title = "通行证基金未领取奖励发放"; - let content = "通行证基金未领取奖励发放"; - let prizeList = G.gc.jijin["dayjijin"]; + const prizeList = [ + { + "type": "dayjijin", + "total": 5, + "pt": [ + { + "a": "item", + "t": "23", + "n": 20000 + } + ], + "tq": [ + { + "a": "item", + "t": "4", + "n": 5 + } + ] + }, + { + "type": "dayjijin", + "total": 15, + "pt": [ + { + "a": "item", + "t": "2", + "n": 200 + } + ], + "tq": [ + { + "a": "item", + "t": "2", + "n": 2000 + } + ] + }, + { + "type": "dayjijin", + "total": 30, + "pt": [ + { + "a": "item", + "t": "23", + "n": 20000 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 888 + } + ] + }, + { + "type": "dayjijin", + "total": 45, + "pt": [ + { + "a": "item", + "t": "2", + "n": 200 + } + ], + "tq": [ + { + "a": "item", + "t": "615", + "n": 1 + } + ] + }, + { + "type": "dayjijin", + "total": 60, + "pt": [ + { + "a": "item", + "t": "23", + "n": 20000 + } + ], + "tq": [ + { + "a": "item", + "t": "4", + "n": 5 + } + ] + }, + { + "type": "dayjijin", + "total": 75, + "pt": [ + { + "a": "item", + "t": "2", + "n": 300 + } + ], + "tq": [ + { + "a": "item", + "t": "2", + "n": 2000 + } + ] + }, + { + "type": "dayjijin", + "total": 90, + "pt": [ + { + "a": "item", + "t": "23", + "n": 20000 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 888 + } + ] + }, + { + "type": "dayjijin", + "total": 105, + "pt": [ + { + "a": "item", + "t": "2", + "n": 300 + } + ], + "tq": [ + { + "a": "item", + "t": "615", + "n": 1 + } + ] + }, + { + "type": "dayjijin", + "total": 120, + "pt": [ + { + "a": "item", + "t": "23", + "n": 20000 + } + ], + "tq": [ + { + "a": "item", + "t": "4", + "n": 5 + } + ] + }, + { + "type": "dayjijin", + "total": 135, + "pt": [ + { + "a": "item", + "t": "2", + "n": 400 + } + ], + "tq": [ + { + "a": "item", + "t": "2", + "n": 2000 + } + ] + }, + { + "type": "dayjijin", + "total": 150, + "pt": [ + { + "a": "item", + "t": "23", + "n": 20000 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 888 + } + ] + }, + { + "type": "dayjijin", + "total": 165, + "pt": [ + { + "a": "item", + "t": "2", + "n": 400 + } + ], + "tq": [ + { + "a": "item", + "t": "615", + "n": 1 + } + ] + }, + { + "type": "dayjijin", + "total": 180, + "pt": [ + { + "a": "item", + "t": "23", + "n": 20000 + } + ], + "tq": [ + { + "a": "item", + "t": "4", + "n": 5 + } + ] + }, + { + "type": "dayjijin", + "total": 200, + "pt": [ + { + "a": "item", + "t": "2", + "n": 500 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 1888 + } + ] + } + ]; // 没激活不处理 let _users = await G.mongodb.cEvent("dayjijin").find( {uid: {$in: _payList.map(pay => pay.uid)}} @@ -529,6 +1560,20 @@ async function dayjiJiJinReSet() { }); }) + let title = "特别通行证优化"; + let content = "这是您的补偿，请查收！"; + let lngTitle = { + ja: "特別通行証仕様改善", + tw: "特別通行證改善", + ko: "특별 통행증 시스템 개선", + en: "Special Permit optimization", + }; + let lngContent = { + en: "Please find attached a few items as a compensation for the wait during our adjustments.", + ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", + tw: "這是您的補償內容，煩請查收!" + }; for (const [uid, sendPrize] of Object.entries(uid2Prize)) { // 发放邮件 await EmailFun.addEmail({ @@ -537,6 +1582,8 @@ async function dayjiJiJinReSet() { title: title, content: content, prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, }); await G.mongodb.collection("payLogNew").updateMany( Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} @@ -545,20 +1592,31 @@ async function dayjiJiJinReSet() { await G.mongodb.collection("event").updateMany( {type: "dayjijin", uid: uid}, {"$set": {uid: `${uid}_patch_del`}} ); + + console.log(`玩家${uid}通行证基金奖补发完成...`); } } -/*月基金调整 -1、已购买128、328月基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； -2、未购买的玩家活动刷新到新版本； -3、刷新月基金到未购买状态； -* */ -async function yueJiJinReSet() { - let proIdList = [ - "128jijin", - "328jijin", - ]; - let w = {key: {$in: proIdList}}; +/** + * 标题:特价基金优化 + * ja:特価投資仕様改善 + * tw:特價基金改善 + * ko:특가 투자 시스템 개선 + * en: Value Investment optimization + + * 內文：这是您的补偿，请查收！ + * ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + * tw:這是您的補償內容，煩請查收! + * ko:투자 시스템 개선으로 인한 보상을 보내드립니다. + * en: Please find attached a few items as a compensation for the wait during our adjustments. + + * 线上玩家脚本 + * 1、已购买特价基金128的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； + * 2、未购买的玩家活动刷新到新版本； + * 3、刷新月基金到未购买状态； + * */ +async function yue128JiJinReSet() { + let w = {key: "128jijin"}; // 激活了的玩家 let _payList = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( // 过滤没有结束时间 或者 有结束时间 但是没有过期的 @@ -566,22 +1624,51 @@ async function yueJiJinReSet() { ); // 没激活不处理 - let _users = await G.mongodb.collection("event").find( + let _users = await G.mongodb.cEvent(`${128}jijin`).find( { - "type": {"$in": proIdList}, "uid": {"$in": _payList.map(pay => pay.uid)} } ).toArray(); + const prizeList = [ + {a: 'item', t: '4', n: 10}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'item', t: '9', n: 2000}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'item', t: '609', n: 1}, + {a: 'item', t: '4', n: 10}, + {a: 'attr', t: 'rmbmoney', n: 500}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'item', t: '18', n: 300}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'item', t: '6', n: 20}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'item', t: '9', n: 3000}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'item', t: '4', n: 10}, + {a: 'attr', t: 'rmbmoney', n: 500}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'item', t: '20', n: 200}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'item', t: '9', n: 3000}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'attr', t: 'rmbmoney', n: 300}, + {a: 'attr', t: 'rmbmoney', n: 1000}, + {a: 'item', t: '628', n: 1}, + ]; let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; - let prizeList128 = G.gc.yuedujijin.find(v => v.payId == "128jijin"); - let prizeList328 = G.gc.yuedujijin.find(v => v.payId == "328jijin"); + _users.forEach(user => { let uid = user.uid; let gotarr = user.rec; if (!uid2Prize[uid]) uid2Prize[uid] = []; - let prizeList = user.type == "128jijin" ? prizeList128.prize : prizeList328.prize; // 没领的全发 prizeList.forEach((onePrize, idx) => { // 领过了 @@ -592,8 +1679,20 @@ async function yueJiJinReSet() { }); }) - let title = "月度基金未领取奖励发放"; - let content = "月度基金未领取奖励发放"; + let title = "特价基金优化"; + let content = "这是您的补偿，请查收！"; + let lngTitle = { + ja: "特価投資仕様改善", + tw: "特價基金改善", + ko: "특가 투자 시스템 개선", + en: "Value Investment optimization", + }; + let lngContent = { + en: "Please find attached a few items as a compensation for the wait during our adjustments.", + ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", + tw: "這是您的補償內容，煩請查收!" + }; for (const [uid, sendPrize] of Object.entries(uid2Prize)) { // 发放邮件 await EmailFun.addEmail({ @@ -602,15 +1701,139 @@ async function yueJiJinReSet() { title: title, content: content, prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, }); await G.mongodb.collection("payLogNew").updateMany( Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} ) // 基金数据清除 - await G.mongodb.collection("event").updateMany( - {type: {$in: proIdList}, uid: uid}, {"$set": {uid: `${uid}_patch_del`}} + await G.mongodb.cEvent(`${128}jijin`).updateMany( + {uid: uid}, {"$set": {uid: `${uid}_patch_del`}} ); + + console.log(`玩家${uid}月度128基金奖补发完成...`); + } +} + +/** + * 标题：特别基金优化 + * ja:特別投資仕様改善 + * tw:特別基金改善 + * ko:특별 투자 시스템 개선 + * en: Special Investment optimization + + * 內文：这是您的补偿，请查收！ + * ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 + * tw:這是您的補償內容，煩請查收! + * ko:투자 시스템 개선으로 인한 보상을 보내드립니다. + * en: Please find attached a few items as a compensation for the wait during our adjustments. + + * 线上玩家脚本 + * 1、已购买特别基金328的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； + * 2、未购买的玩家活动刷新到新版本； + * 3、刷新月基金到未购买状态； + * */ +async function yue328JiJinReSet() { + let w = {key: "328jijin"}; + // 激活了的玩家 + let _payList = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + // 没激活不处理 + let _users = await G.mongodb.cEvent(`${328}jijin`).find( + { + "uid": {"$in": _payList.map(pay => pay.uid)} + } + ).toArray(); + + const prizeList = [ + {a: 'item', t: '4', n: 30}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'item', t: '10', n: 300}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'item', t: '628', n: 1}, + {a: 'item', t: '4', n: 20}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'item', t: '628', n: 1}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'item', t: '628', n: 1}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'item', t: '628', n: 1}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'item', t: '4', n: 20}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'item', t: '10', n: 400}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'item', t: '10', n: 400}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'attr', t: 'rmbmoney', n: 800}, + {a: 'attr', t: 'rmbmoney', n: 1500}, + {a: 'item', t: '617', n: 1}, + ]; + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + + _users.forEach(user => { + let uid = user.uid; + let gotarr = user.rec; + if (!uid2Prize[uid]) uid2Prize[uid] = []; + + // 没领的全发 + prizeList.forEach((onePrize, idx) => { + // 领过了 + if (gotarr.includes(idx)) { + return + } + uid2Prize[uid].push(onePrize) + }); + }) + + let title = "特别基金优化"; + let content = "这是您的补偿，请查收！"; + let lngTitle = { + ja: "特別投資仕様改善", + tw: "特別基金改善", + ko: "특별 투자 시스템 개선", + en: "Special Investment optimization", + }; + let lngContent = { + en: "Please find attached a few items as a compensation for the wait during our adjustments.", + ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", + ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", + tw: "這是您的補償內容，煩請查收!" + }; + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await EmailFun.addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, + lngTitle: lngTitle, + lngContent: lngContent, + }); + + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} + ) + // 基金数据清除 + await G.mongodb.cEvent(`${328}jijin`).updateMany( + {uid: uid}, {"$set": {uid: `${uid}_patch_del`}} + ); + + console.log(`玩家${uid}月度128基金奖补发完成...`); } } @@ -618,31 +1841,29 @@ async function start() { //连接mongodb await initMongoDB(); - // 首冲调整 await shouChongReSet(); - // 超值月卡、至尊月卡、永久卡的线上玩家脚本 - await yuekaSendPrize(); - // 特权礼包脚本需求 - await tequanLiBaoSendPrize(); - // 刷新所有玩家各档位VIP礼包到未购买状态 + await zhizunyueka(); + await chaozhiyueka(); + await zhongshenka(); + await qingbaotequan(); + await zuozhantequan(); + await caifutequan(); + await jiubatequan(); await resetVipLiBao(); - // 人才计划调整 await rcjhReSet(); - // 等级基金调整 await dengjiJiJinReSet(); - // 关卡基金调整 await guanqiaJiJinReSet(); - // 通行证基金调整 await dayjiJiJinReSet(); - // 月基金调整 - await yueJiJinReSet(); + await yue128JiJinReSet(); + await yue328JiJinReSet(); } -//定义全局变量 ctor(); -//启动服务 start().then(() => { - process.exit() + setInterval(() => { + console.log(new Date().format("MM-dd hh:mm:ss")); + }, 1000) + console.log("逻辑执行完成...等待退出！！！"); }); From 9523f7c00d92915736fd0230bd44b0aa46b65b2a Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Mon, 18 Dec 2023 13:48:43 +0800 Subject: [PATCH 54/80] =?UTF-8?q?fix:=20=E7=A7=AF=E5=A4=A9=E5=A5=BD?= =?UTF-8?q?=E7=A4=BCbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/shiwuleichong/ApiOpen.ts | 31 +++++++++++----------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/api_s2c/event/shiwuleichong/ApiOpen.ts b/src/api_s2c/event/shiwuleichong/ApiOpen.ts index 7954da3..de01636 100644 --- a/src/api_s2c/event/shiwuleichong/ApiOpen.ts +++ b/src/api_s2c/event/shiwuleichong/ApiOpen.ts @@ -13,28 +13,27 @@ export default async function (call: ApiCall) { let _zt = PublicShared.getToDayZeroTime(); let pays = await PayFun.getPayLogs(call.uid, payids); for (; day <= G.gc.shiwuleichong.tasks.length; day++) { - let pay = pays[G.gc.shiwuleichong.tasks[day].payid]; - if (!pay) { + let pay = pays[G.gc.shiwuleichong.tasks[day - 1].payid]; + if (!pay || pay.length == 0) { break } else { - if (pay.slice(-1)[0].time >= _zt) { + // 如果是最后一天奖励 + if (day >= G.gc.shiwuleichong.tasks.length) { + // 充值订单隔天了 + if (pay.slice(-1)[0].time < _zt) { + // 重置所有订单 + await PayFun.delPayLog(call.uid, ...payids.map(i => { + return {payId: i, val: []} + })) + day = 1; + pays = {}; + } + break; + } else if (pay.slice(-1)[0].time >= _zt) { break } } } - // 如果是最后一天奖励 并且 充值订单隔天了 - if ( - day == G.gc.shiwuleichong.tasks.length && - pays[G.gc.shiwuleichong.tasks[day - 1].payid] && - pays[G.gc.shiwuleichong.tasks[day - 1].payid].slice(-1)[0].time < _zt - ) { - // 重置所有订单 - await PayFun.delPayLog(call.uid, ...payids.map(i => { - return {payId: i, val: []} - })) - day = 1; - pays = {}; - } call.succ({ day: day, From 9f744b7cee3981aade4365c943e8389cda32eda9 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Mon, 18 Dec 2023 20:04:35 +0800 Subject: [PATCH 55/80] =?UTF-8?q?Revert=20"fix:=E8=84=9A=E6=9C=AC"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 76794921fbd08d46050e738c37970ac6a1082cf6. --- src/path_20231215.ts | 1547 +++++------------------------------------- 1 file changed, 163 insertions(+), 1384 deletions(-) diff --git a/src/path_20231215.ts b/src/path_20231215.ts index 6c9f3e7..5520e73 100644 --- a/src/path_20231215.ts +++ b/src/path_20231215.ts @@ -1,24 +1,8 @@ import {ctor} from "./global"; import {EmailFun} from "./public/email"; import {initMongoDB} from "./setMongodb"; -import {yangchengmubiao} from "./shared/protocols/event/yangchengmubiao/PtlOpen"; -/** - * 标题：首充优化 - * 日語:初回チャージ仕様改善 - * 繁體:首儲機制改善 - * 韓国語: 초회 충전 시스템 개선 - * 英語: First Top-Up optimization - * - * 內文：这是您的补偿，请查收！ - * 日語:仕様改善に伴う補填を発送させていただきました。ご確認ください。 - * 繁體中文:這是您的補償內容，煩請查收! - * 韓国語:투자 시스템 개선으로 인한 보상을 보내드립니다. - * 英語: Please find attached a few items as a compensation for the wait during our adjustments. - * - * 线上玩家脚本 - * 1、已激活首充档位且没领完3天奖励的玩家，邮件补发剩下的奖励 - * 2、重置所有玩家首充活动到新版本状态*/ +// 首冲 async function shouChongReSet() { let shouchong = { "shouchong1": { @@ -185,21 +169,8 @@ async function shouChongReSet() { } if (send_prize.length <= 0) continue; - let title = "首充优化"; - let content = "这是您的补偿，请查收！"; - - let lngTitle = { - en: "First Top-Up optimization", - ja: "初回チャージ仕様改善", - ko: "초회 충전 시스템 개선", - tw: "首儲機制改善" - }; - let lngContent = { - en: "Please find attached a few items as a compensation for the wait during our adjustments.", - ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", - ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", - tw: "這是您的補償內容，煩請查收!" - }; + let title = "首充未领取奖励补发"; + let content = "首充未领取奖励补发"; // 发放邮件 await EmailFun.addEmail({ @@ -208,39 +179,23 @@ async function shouChongReSet() { title: title, content: content, prize: send_prize, - lngTitle: lngTitle, - lngContent: lngContent, }); // 设置奖励发放记录 await G.mongodb.cEvent("shouchong").updateOne({ uid: user.uid }, {"$set": {receive: data.receive, patch: 1}}); - - console.log(`玩家${user.uid}首充奖励补发完成...`); } } -/** - * "zhizunyueka" - 标题：至尊月卡优化 - 日語:豪華月パス仕様改善 - 繁體:至尊月卡改善 - 韓国語:고급 월간 패스 시스템 개선 - 英語: Luxurious Monthly Pass optimization - - 邮件内容：这是您的首充优化补偿，请查收！ - 日語:仕様改善に伴う補填を発送させていただきました。ご確認ください。 - 繁體中文:這是您的補償內容，煩請查收! - 韓国語:투자 시스템 개선으로 인한 보상을 보내드립니다. - 英語: Please find attached a few items as a compensation for the wait during our adjustments. - - 线上玩家脚本： - 线上已购买至尊月卡的玩家，脚本补发：钻石*10000 - **/ -async function zhizunyueka() { +/*超值月卡、至尊月卡、永久卡的线上玩家脚本 +线上已购买超值月卡的玩家，脚本补发：招募卡*30 +线上已购买至尊月卡的玩家，脚本补发：钻石*10000 +线上已购买永久卡的玩家，脚本补发：汉塞尔*1，能量饮料*500w +* */ +async function yuekaSendPrize() { let w = { - key: "zhizunyueka", + key: {$in: ["chaozhiyueka", "zhizunyueka", "zhongshenka"]}, del_time: {$exists: false} }; let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( @@ -251,25 +206,25 @@ async function zhizunyueka() { let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; users.forEach(user => { let uid = user.uid; + let proId = user.key; if (!uid2Prize[uid]) uid2Prize[uid] = []; - uid2Prize[uid].push({a: "attr", t: "rmbmoney", n: 10000}); + + switch (proId) { + case "chaozhiyueka": + uid2Prize[uid].push({a: "item", t: "4", n: 30}); + break; + case "zhizunyueka": + uid2Prize[uid].push({a: "attr", t: "rmbmoney", n: 10000}) + break; + case "zhongshenka": + uid2Prize[uid].push({a: "item", t: "1", n: 5000000}) + uid2Prize[uid].push({a: "hero", t: "4012", n: 1}) + break; + } }); - let title = "至尊月卡优化"; - let content = "这是您的首充优化补偿，请查收！"; - let lngTitle = { - en: "Luxurious Monthly Pass optimization", - ja: "豪華月パス仕様改善", - ko: "고급 월간 패스 시스템 개선", - tw: "至尊月卡改善" - }; - let lngContent = { - en: "Please find attached a few items as a compensation for the wait during our adjustments.", - ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", - ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", - tw: "這是您的補償內容，煩請查收!" - }; - + let title = "月卡奖励发放"; + let content = "月卡奖励发放"; for (const [uid, sendPrize] of Object.entries(uid2Prize)) { // 发放邮件 await EmailFun.addEmail({ @@ -278,39 +233,26 @@ async function zhizunyueka() { title: title, content: content, prize: sendPrize, - lngTitle: lngTitle, - lngContent: lngContent, }); // 处理重复执行 await G.mongodb.collection("payLogNew").updateMany( Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} ) - - console.log(`玩家${uid}至尊月卡奖励补发完成...`); } } -/** - * "chaozhiyueka" - 标题 超值月卡优化 - ja:お得月パス仕様改善 - tw:超值月卡改善 - ko:월간 패스 시스템 개선 - en: Value Monthly Pass optimization - 內文： - 这是您的补偿，请查收！ - ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 - tw:這是您的補償內容，煩請查收! - ko:투자 시스템 개선으로 인한 보상을 보내드립니다. - en: Please find attached a few items as a compensation for the wait during our adjustments. - - 线上已购买超值月卡的玩家，脚本补发：招募卡*30 - **/ -async function chaozhiyueka() { +/*特权礼包脚本需求 +1、特权内容：已购买特权的玩家，特权效果更新 +2、已购买情报特权的玩家，脚本补发：钻石*680，顶级紫色套装*1 +3、已购买快速特权的玩家，脚本补发：钻石*300，快速探险券*30 +4、已购买财富特权的玩家，脚本补发：钻石*300，美金*1000万 +5、已购买酒馆特权的玩家，脚本补发：钻石*680，招募卡*10 +* */ +async function tequanLiBaoSendPrize() { let w = { - key: "chaozhiyueka", + key: {$in: ["qingbaotequan", "zuozhantequan", "caifutequan", "jiubatequan"]}, del_time: {$exists: false} }; let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( @@ -321,25 +263,31 @@ async function chaozhiyueka() { let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; users.forEach(user => { let uid = user.uid; + let proId = user.key; + if (!uid2Prize[uid]) uid2Prize[uid] = []; - uid2Prize[uid].push({a: "item", t: "4", n: 30}); + switch (proId) { + case "qingbaotequan": + uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 680}); + uid2Prize[uid].push({"a": "item", "t": "609", "n": 1}); + break; + case "zuozhantequan": + uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 300}); + uid2Prize[uid].push({"a": "item", "t": "24", "n": 30}); + break; + case "caifutequan": + uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 300}) + uid2Prize[uid].push({"a": "attr", "t": "jinbi", "n": 10000000}) + break; + case "jiubatequan": + uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 680}); + uid2Prize[uid].push({"a": "item", "t": "4", "n": 10}); + break; + } }); - let title = "超值月卡优化"; - let content = "这是您的补偿，请查收！"; - let lngTitle = { - ja: "お得月パス仕様改善", - tw: "超值月卡改善", - ko: "월간 패스 시스템 개선", - en: "Value Monthly Pass optimization", - }; - let lngContent = { - en: "Please find attached a few items as a compensation for the wait during our adjustments.", - ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", - ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", - tw: "這是您的補償內容，煩請查收!" - }; - + let title = "特权奖励发放"; + let content = "特权奖励发放"; for (const [uid, sendPrize] of Object.entries(uid2Prize)) { // 发放邮件 await EmailFun.addEmail({ @@ -348,502 +296,80 @@ async function chaozhiyueka() { title: title, content: content, prize: sendPrize, - lngTitle: lngTitle, - lngContent: lngContent, }); - - // 处理重复执行 await G.mongodb.collection("payLogNew").updateMany( Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} ) - - console.log(`玩家${uid}超值月卡奖励补发完成...`); - } -} - -/** - * "zhongshenka" - 标题:终身卡优化 - ja:永久パス仕様改善 - tw:永久通行證改善 - ko:영구 패스 시스템 개선 - en: Lifetime Pass optimization - - 內文： 这是您的补偿，请查收！ - ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 - tw:這是您的補償內容，煩請查收! - ko:투자 시스템 개선으로 인한 보상을 보내드립니다. - en: Please find attached a few items as a compensation for the wait during our adjustments. - - 线上已购买永久卡的玩家，脚本补发：汉塞尔1，能量饮料500w - **/ -async function zhongshenka() { - let w = { - key: "zhongshenka", - del_time: {$exists: false} - }; - let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( - // 过滤没有结束时间 或者 有结束时间 但是没有过期的 - (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) - ); - - let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; - users.forEach(user => { - let uid = user.uid; - if (!uid2Prize[uid]) uid2Prize[uid] = []; - uid2Prize[uid].push({"a": "item", "t": "1", "n": 5000000}) - uid2Prize[uid].push({a: "hero", t: "4012", n: 1}) - }); - - let title = "终身卡优化"; - let content = "这是您的补偿，请查收！"; - let lngTitle = { - ja: "永久パス仕様改善", - tw: "永久通行證改善", - ko: "영구 패스 시스템 개선", - en: "Lifetime Pass optimization", - }; - let lngContent = { - en: "Please find attached a few items as a compensation for the wait during our adjustments.", - ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", - ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", - tw: "這是您的補償內容，煩請查收!" - }; - - for (const [uid, sendPrize] of Object.entries(uid2Prize)) { - // 发放邮件 - await EmailFun.addEmail({ - uid: uid, - type: "system", - title: title, - content: content, - prize: sendPrize, - lngTitle: lngTitle, - lngContent: lngContent, - }); - - // 处理重复执行 - await G.mongodb.collection("payLogNew").updateMany( - Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} - ) - - console.log(`玩家${uid}终身卡奖励补发完成...`); } } -/** - "qingbaotequan" - 标题:资讯特权优化 - ja:情報特権仕様改善 - tw:資訊特權改善 - ko:정보 특권 시스템 개선 - en: Intel Benefit optimization - - 內文：这是您的补偿，请查收！ - ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 - tw:這是您的補償內容，煩請查收! - ko:투자 시스템 개선으로 인한 보상을 보내드립니다. - en: Please find attached a few items as a compensation for the wait during our adjustments. - - 线上玩家脚本 - 1、特权内容：已购买特权的玩家，特权效果更新，不重置时间 - 2、已购买资讯特权的玩家，脚本补发：钻石*680，顶级紫色套装*1 - * */ -async function qingbaotequan() { - let w = { - key: "qingbaotequan", - patch: {$exists: false}, - del_time: {$exists: false} - }; - let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( - // 过滤没有结束时间 或者 有结束时间 但是没有过期的 - (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) - ); - - let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; - users.forEach(user => { - let uid = user.uid; - - if (!uid2Prize[uid]) uid2Prize[uid] = []; - uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 680}); - uid2Prize[uid].push({"a": "item", "t": "609", "n": 1}); - }); - - let title = "资讯特权优化"; - let content = "这是您的补偿，请查收！"; - let lngTitle = { - ja: "情報特権仕様改善", - tw: "資訊特權改善", - ko: "정보 특권 시스템 개선", - en: "Intel Benefit optimization", - }; - let lngContent = { - en: "Please find attached a few items as a compensation for the wait during our adjustments.", - ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", - ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", - tw: "這是您的補償內容，煩請查收!" - }; - for (const [uid, sendPrize] of Object.entries(uid2Prize)) { - // 发放邮件 - await EmailFun.addEmail({ - uid: uid, - type: "system", - title: title, - content: content, - prize: sendPrize, - lngTitle: lngTitle, - lngContent: lngContent, - }); - await G.mongodb.collection("payLogNew").updateMany( - Object.assign({uid: uid}, w), {$set: {patch: 1}} - ) - - console.log(`玩家${uid}特权奖励补发完成...`); - } -} - -/** - "zuozhantequan" - 标题:作战特权优化 - ja:作戦特権仕様改善 tw:作戰特權改善 - ko:작전 특권 시스템 개선 - en: Strategy Benefit optimization - - 內文：这是您的补偿，请查收！ - ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 - tw:這是您的補償內容，煩請查收! - ko:투자 시스템 개선으로 인한 보상을 보내드립니다. - en: Please find attached a few items as a compensation for the wait during our adjustments. - - 线上玩家脚本 - 1、特权内容：已购买特权的玩家，特权效果更新，不重置时间 - 2、已购买快速特权的玩家，脚本补发：钻石300，快速探险券30 - * */ -async function zuozhantequan() { - let w = { - key: "zuozhantequan", - patch: {$exists: false}, - del_time: {$exists: false} - }; - let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( - // 过滤没有结束时间 或者 有结束时间 但是没有过期的 - (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) - ); - - let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; - users.forEach(user => { - let uid = user.uid; - - if (!uid2Prize[uid]) uid2Prize[uid] = []; - uid2Prize[uid].push({"a": "item", "t": "24", "n": 30}); - uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 300}); - }); - - let title = "作战特权优化"; - let content = "这是您的补偿，请查收！"; - let lngTitle = { - ja: "情報特権仕様改善", - tw: "資訊特權改善", - ko: "정보 특권 시스템 개선", - en: "Intel Benefit optimization", - }; - let lngContent = { - en: "Please find attached a few items as a compensation for the wait during our adjustments.", - ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", - ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", - tw: "這是您的補償內容，煩請查收!" - }; - for (const [uid, sendPrize] of Object.entries(uid2Prize)) { - // 发放邮件 - await EmailFun.addEmail({ - uid: uid, - type: "system", - title: title, - content: content, - prize: sendPrize, - lngTitle: lngTitle, - lngContent: lngContent, - }); - await G.mongodb.collection("payLogNew").updateMany( - Object.assign({uid: uid}, w), {$set: {patch: 1}} - ) - - console.log(`玩家${uid}特权奖励补发完成...`); - } -} - -/** - "caifutequan" - 标题:资产特权优化 - ja:資産特権仕様改善 - tw:資産特權改善 - ko:자산 특권 시스템 개선 - en: Asset Benefit optimization - - 內文：这是您的补偿，请查收！ - ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 - tw:這是您的補償內容，煩請查收! - ko:투자 시스템 개선으로 인한 보상을 보내드립니다. - en: Please find attached a few items as a compensation for the wait during our adjustments. - - 线上玩家脚本 - 1、特权内容：已购买特权的玩家，特权效果更新，不重置时间 - 2、已购买资产特权的玩家，脚本补发：钻石*300，美金*1000万 - * */ -async function caifutequan() { - let w = { - key: "caifutequan", - patch: {$exists: false}, - del_time: {$exists: false} - }; - let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( - // 过滤没有结束时间 或者 有结束时间 但是没有过期的 - (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) - ); - - let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; - users.forEach(user => { - let uid = user.uid; - - if (!uid2Prize[uid]) uid2Prize[uid] = []; - uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 300}) - uid2Prize[uid].push({"a": "attr", "t": "jinbi", "n": 10000000}) - }); - - let title = "资产特权优化"; - let content = "这是您的补偿，请查收！"; - let lngTitle = { - ja: "資産特権仕様改善", - tw: "資産特權改善", - ko: "자산 특권 시스템 개선", - en: "Asset Benefit optimization", - }; - let lngContent = { - en: "Please find attached a few items as a compensation for the wait during our adjustments.", - ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", - ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", - tw: "這是您的補償內容，煩請查收!" - }; - for (const [uid, sendPrize] of Object.entries(uid2Prize)) { - // 发放邮件 - await EmailFun.addEmail({ - uid: uid, - type: "system", - title: title, - content: content, - prize: sendPrize, - lngTitle: lngTitle, - lngContent: lngContent, - }); - await G.mongodb.collection("payLogNew").updateMany( - Object.assign({uid: uid}, w), {$set: {patch: 1}} - ) - - console.log(`玩家${uid}资产特权奖励补发完成...`); - } -} - -/** - "jiubatequan" - 标题:抽奖特权优化 - ja:ガチャ特権仕様改善 - tw:抽獎特權改善 - ko:모집 특권 시스템 개선 - en: Gacha Benefit optimization - - 內文：这是您的补偿，请查收！ - ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 - tw:這是您的補償內容，煩請查收! - ko:투자 시스템 개선으로 인한 보상을 보내드립니다. - en: Please find attached a few items as a compensation for the wait during our adjustments. - - 线上玩家脚本 - 1、特权内容：已购买特权的玩家，特权效果更新，不重置时间 - 2、已购买抽奖特权的玩家，脚本补发：钻石*680，招募卡*10 - * */ -async function jiubatequan() { - let w = { - key: "jiubatequan", - patch: {$exists: false}, - del_time: {$exists: false} - }; - let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( - // 过滤没有结束时间 或者 有结束时间 但是没有过期的 - (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) - ); - - let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; - users.forEach(user => { - let uid = user.uid; - - if (!uid2Prize[uid]) uid2Prize[uid] = []; - uid2Prize[uid].push({"a": "item", "t": "4", "n": 10}); - uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 680}); - }); - - let title = "抽奖特权优化"; - let content = "这是您的补偿，请查收！"; - let lngTitle = { - ja: "ガチャ特権仕様改善", - tw: "抽獎特權改善", - ko: "모집 특권 시스템 개선", - en: "Gacha Benefit optimization", - }; - let lngContent = { - en: "Please find attached a few items as a compensation for the wait during our adjustments.", - ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", - ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", - tw: "這是您的補償內容，煩請查收!" - }; - for (const [uid, sendPrize] of Object.entries(uid2Prize)) { - // 发放邮件 - await EmailFun.addEmail({ - uid: uid, - type: "system", - title: title, - content: content, - prize: sendPrize, - lngTitle: lngTitle, - lngContent: lngContent, - }); - await G.mongodb.collection("payLogNew").updateMany( - Object.assign({uid: uid}, w), {$set: {patch: 1}} - ) - - console.log(`玩家${uid}抽奖特权奖励补发完成...`); - } -} - -/** - 不需要给玩家发送邮件 - - 线上玩家脚本 - 刷新所有玩家各档位VIP礼包到未购买状态 - **/ +/* +刷新所有玩家各档位VIP礼包到未购买状态 +* */ async function resetVipLiBao() { let w = {"type": "chongzhi"}; await G.mongodb.collection("playerInfo").updateMany(w, {"giftBy": {}}); } -/** - 人才计划调整 - 1、线上已有该活动的玩家，保留次数进度；达到新加档位可领取的奖励则直接领取 - **/ +/* +人才计划调整 +1、线上已有该活动的玩家，保留次数进度；达到新加档位可领取的奖励则直接领取 +2、线上已购买该活动328计费点的玩家，每次购买记录补发招募卡*20,； +3、线上已购买该活动648计费点的玩家，每次购买记录补发招募卡*40,； +* */ async function rcjhReSet() { - const hdid = [100, 101]; - const task = { - '2001': { - 'prize': [{'a': 'item', 't': '4', 'n': 5}, {'a': 'item', 't': '626', 'n': 10}], - 'tujing': '', - 'title': 'intr_yczm_day_des_2', - 'type': 2, - 'pval': 50, - 'cond': [], - 'stype': 118 - }, - '2002': { - 'prize': [{'a': 'item', 't': '4', 'n': 5}, {'a': 'item', 't': '626', 'n': 10}], - 'tujing': '', - 'title': 'intr_yczm_day_des_2', - 'type': 2, - 'pval': 100, - 'cond': [], - 'stype': 118 - }, - '2003': { - 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '626', 'n': 20}], - 'tujing': '', - 'title': 'intr_yczm_day_des_2', - 'type': 2, - 'pval': 200, - 'cond': [], - 'stype': 118 - }, - '2004': { - 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 20}], - 'tujing': '', - 'title': 'intr_yczm_day_des_2', - 'type': 2, - 'pval': 250, - 'cond': [], - 'stype': 118 - }, - '2005': { - 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 20}], - 'tujing': '', - 'title': 'intr_yczm_day_des_2', - 'type': 2, - 'pval': 300, - 'cond': [], - 'stype': 118 - }, - '2006': { - 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}], - 'tujing': '', - 'title': 'intr_yczm_day_des_2', - 'type': 2, - 'pval': 400, - 'cond': [], - 'stype': 118 - }, - '2007': { - 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}], - 'tujing': '', - 'title': 'intr_yczm_day_des_2', - 'type': 2, - 'pval': 500, - 'cond': [], - 'stype': 118 - } + let proId328 = ["ycmb_1_5", "ycmb_2_4", "ycmb_3_5", "ycmb_4_5", "ycmb_5_5"]; + let proId648 = ["ycmb_1_6", "ycmb_2_5", "ycmb_3_6", "ycmb_4_6", "ycmb_5_6"]; + let w = { + key: {$in: [].concat(proId328, proId648)}, + del_time: {$exists: false} }; - // 中间插入了2004 所以之前的任务id一次往后顺延 - const change = {2004: 2005, 2005: 2006, 2006: 2007}; - // 刷新活动配置 - await G.mongodb.collection("hdinfo").updateOne({hdid: {$in: hdid}}, { - "$set": {'data.tasklist.2': task} - }) - let datas: yangchengmubiao[] = []; - // 刷新玩家领取记录 - datas.concat(await G.mongodb.cEvent(`yangchengmubiao${hdid[0]}`).find().toArray()); - datas.concat(await G.mongodb.cEvent(`yangchengmubiao${hdid[1]}`).find().toArray()); - for (let i = 0; i < datas.length; i++) { - let data = datas[i]; - let finished = data.finishid["2"].map((task) => { - return change[task] ? change[task] : task + let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( + // 过滤没有结束时间 或者 有结束时间 但是没有过期的 + (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) + ); + + + let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; + users.forEach(user => { + let uid = user.uid; + let proId = user.key; + + if (!uid2Prize[uid]) { + uid2Prize[uid] = [] + } + if (proId328.includes(proId)) { + uid2Prize[uid].push({"a": "item", "t": "4", "n": 20}) + } else if (proId648.includes(proId)) { + uid2Prize[uid].push({"a": "item", "t": "4", "n": 40}) + } + }); + + let title = "人才计划奖励发放"; + let content = "人才计划奖励发放"; + for (const [uid, sendPrize] of Object.entries(uid2Prize)) { + // 发放邮件 + await EmailFun.addEmail({ + uid: uid, + type: "system", + title: title, + content: content, + prize: sendPrize, }); - let maxtaskval = Math.max(...Object.values(data.taskval)); - let taskval = Object.assign(Object.keys(task).map((taskid) => { - return {taskid: maxtaskval} - })); - await G.mongodb.collection("event").updateOne( - {uid: data.uid, type: data.type}, {$set: {taskval: taskval, "finishid.2": finished}} + await G.mongodb.collection("payLogNew").updateMany( + Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} ) - console.log(`修复玩家${data.uid}人才计划数据完成...`); } } -/** - * 标题：等级基金优化 - * ja:レベル投資仕様改善 - * tw:等級基金改善 - * ko:레벨 투자 시스템 개선 - * en: Level Investment optimization - - * 內文： - * 这是您的补偿，请查收！ - * ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 - * tw:這是您的補償內容，煩請查收! - * ko:투자 시스템 개선으로 인한 보상을 보내드립니다. - * en: Please find attached a few items as a compensation for the wait during our adjustments. - - * 线上玩家脚本 - * 1、已购买等级基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； - * 2、未购买的玩家活动刷新到新版本； - * 3、刷新等级基金到未购买状态； - */ +/*等级基金调整 +1、已购买等级基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； +2、未购买的玩家活动刷新到新版本； +3、刷新等级基金到未购买状态； +* */ async function dengjiJiJinReSet() { let w = {key: "dengjijijin", del_time: {$exists: false}} // 激活了的玩家 @@ -852,152 +378,9 @@ async function dengjiJiJinReSet() { (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) ); - const prizeList = [ - { - "type": "dengjijijin", - "total": 20, - "pt": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 300 - } - ], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 1700 - } - ] - }, - { - "type": "dengjijijin", - "total": 25, - "pt": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 300 - } - ], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 1700 - } - ] - }, - { - "type": "dengjijijin", - "total": 30, - "pt": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 300 - } - ], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 1700 - } - ] - }, - { - "type": "dengjijijin", - "total": 35, - "pt": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 300 - } - ], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 1700 - } - ] - }, - { - "type": "dengjijijin", - "total": 40, - "pt": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 300 - } - ], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 1700 - } - ] - }, - { - "type": "dengjijijin", - "total": 45, - "pt": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 300 - } - ], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 1700 - } - ] - }, - { - "type": "dengjijijin", - "total": 50, - "pt": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 300 - } - ], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 1700 - } - ] - }, - { - "type": "dengjijijin", - "total": 55, - "pt": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 300 - } - ], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 1700 - } - ] - } - ]; + let title = "等级基金未领取奖励发放"; + let content = "等级基金未领取奖励发放"; + let prizeList = G.gc.jijin["dengjijijin"]; let _users = await G.mongodb.cEvent("dengjijijin").find( {"uid": {"$in": _payList.map(pay => pay.uid)}} ).toArray() @@ -1021,20 +404,6 @@ async function dengjiJiJinReSet() { }); }) - let title = "等级基金优化"; - let content = "这是您的补偿，请查收！"; - let lngTitle = { - ja: "レベル投資仕様改善", - tw: "等級基金改善", - ko: "레벨 투자 시스템 개선", - en: "Level Investment optimization", - }; - let lngContent = { - en: "Please find attached a few items as a compensation for the wait during our adjustments.", - ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", - ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", - tw: "這是您的補償內容，煩請查收!" - }; for (const [uid, sendPrize] of Object.entries(uid2Prize)) { // 发放邮件 await EmailFun.addEmail({ @@ -1043,8 +412,6 @@ async function dengjiJiJinReSet() { title: title, content: content, prize: sendPrize, - lngTitle: lngTitle, - lngContent: lngContent, }); await G.mongodb.collection("payLogNew").updateMany( Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} @@ -1053,29 +420,15 @@ async function dengjiJiJinReSet() { await G.mongodb.collection("event").updateMany( {type: "dengjijijin", uid: uid}, {"$set": {uid: `${uid}_patch_del`}} ); - console.log(`玩家${uid}等级基金奖补发完成...`); } } -/** - * 标题：关卡基金优化 - * ja:ステージ投資仕様改善 - * tw:關卡基金改善 - * ko:스테이지 투자 시스템 개선 - * en: Stage Investment optimization - * - * 內文：这是您的补偿，请查收！ - * ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 - * tw:這是您的補償內容，煩請查收! - * ko:투자 시스템 개선으로 인한 보상을 보내드립니다. - * en: Please find attached a few items as a compensation for the wait during our adjustments. - - * 线上玩家脚本 - * 1、已购买关卡基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； - * 2、未购买的玩家活动刷新到新版本； - * 3、刷新关卡基金到未购买状态； - * */ +/*关卡基金调整 +1、已购买关卡基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； +2、未购买的玩家活动刷新到新版本； +3、刷新关卡基金到未购买状态； +* */ async function guanqiaJiJinReSet() { let w = {key: "guanqiajijin"}; // 激活了的玩家 @@ -1084,112 +437,9 @@ async function guanqiaJiJinReSet() { (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) ); - const prizeList = [ - { - "type": "guanqiajijin", - "total": 30, - "pt": [], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 2000 - } - ], - "des": "guanqiajijin_des_1" - }, - { - "type": "guanqiajijin", - "total": 50, - "pt": [], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 2000 - } - ], - "des": "guanqiajijin_des_2" - }, - { - "type": "guanqiajijin", - "total": 70, - "pt": [], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 2000 - } - ], - "des": "guanqiajijin_des_3" - }, - { - "type": "guanqiajijin", - "total": 90, - "pt": [], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 2000 - } - ], - "des": "guanqiajijin_des_4" - }, - { - "type": "guanqiajijin", - "total": 110, - "pt": [], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 2000 - } - ], - "des": "guanqiajijin_des_5" - }, - { - "type": "guanqiajijin", - "total": 150, - "pt": [], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 2000 - } - ], - "des": "guanqiajijin_des_6" - }, - { - "type": "guanqiajijin", - "total": 180, - "pt": [], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 2000 - } - ], - "des": "guanqiajijin_des_7" - }, - { - "type": "guanqiajijin", - "total": 250, - "pt": [], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 2000 - } - ], - "des": "guanqiajijin_des_8" - } - ]; + let title = "关卡基金未领取奖励发放"; + let content = "关卡基金未领取奖励发放"; + let prizeList = G.gc.jijin["guanqiajijin"]; // 没激活不处理 let _users = await G.mongodb.cEvent("guanqiajijin").find( @@ -1218,20 +468,6 @@ async function guanqiaJiJinReSet() { }); }) - let title = "关卡基金优化"; - let content = "这是您的补偿，请查收！"; - let lngTitle = { - ja: "ステージ投資仕様改善", - tw: "關卡基金改善", - ko: "스테이지 투자 시스템 개선", - en: "Stage Investment optimization", - }; - let lngContent = { - en: "Please find attached a few items as a compensation for the wait during our adjustments.", - ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", - ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", - tw: "這是您的補償內容，煩請查收!" - }; for (const [uid, sendPrize] of Object.entries(uid2Prize)) { // 发放邮件 await EmailFun.addEmail({ @@ -1240,8 +476,6 @@ async function guanqiaJiJinReSet() { title: title, content: content, prize: sendPrize, - lngTitle: lngTitle, - lngContent: lngContent, }); await G.mongodb.collection("payLogNew").updateMany( Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} @@ -1250,29 +484,15 @@ async function guanqiaJiJinReSet() { await G.mongodb.collection("event").updateMany( {type: "guanqiajijin", uid: uid}, {"$set": {uid: `${uid}_patch_del`}} ); - console.log(`玩家${uid}关卡基金奖补发完成...`); } } -/** - * 标题：特别通行证优化 - * ja:特別通行証仕様改善 - * tw:特別通行證改善 - * ko:특별 통행증 시스템 개선 - * en: Special Permit optimization - - * 內文：这是您的补偿，请查收！ - * ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 - * tw:這是您的補償內容，煩請查收! - * ko:투자 시스템 개선으로 인한 보상을 보내드립니다. - * en: Please find attached a few items as a compensation for the wait during our adjustments. - - * 线上玩家脚本 - * 1、已购买通行证基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； - * 2、未购买的玩家活动刷新到新版本； - * 3、刷新通行证基金到未购买状态； - * */ +/*通行证基金调整 +1、已购买通行证基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； +2、未购买的玩家活动刷新到新版本； +3、刷新通行证基金到未购买状态； +* */ async function dayjiJiJinReSet() { let w = {key: "dayjijin"}; @@ -1282,260 +502,9 @@ async function dayjiJiJinReSet() { (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) ); - const prizeList = [ - { - "type": "dayjijin", - "total": 5, - "pt": [ - { - "a": "item", - "t": "23", - "n": 20000 - } - ], - "tq": [ - { - "a": "item", - "t": "4", - "n": 5 - } - ] - }, - { - "type": "dayjijin", - "total": 15, - "pt": [ - { - "a": "item", - "t": "2", - "n": 200 - } - ], - "tq": [ - { - "a": "item", - "t": "2", - "n": 2000 - } - ] - }, - { - "type": "dayjijin", - "total": 30, - "pt": [ - { - "a": "item", - "t": "23", - "n": 20000 - } - ], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 888 - } - ] - }, - { - "type": "dayjijin", - "total": 45, - "pt": [ - { - "a": "item", - "t": "2", - "n": 200 - } - ], - "tq": [ - { - "a": "item", - "t": "615", - "n": 1 - } - ] - }, - { - "type": "dayjijin", - "total": 60, - "pt": [ - { - "a": "item", - "t": "23", - "n": 20000 - } - ], - "tq": [ - { - "a": "item", - "t": "4", - "n": 5 - } - ] - }, - { - "type": "dayjijin", - "total": 75, - "pt": [ - { - "a": "item", - "t": "2", - "n": 300 - } - ], - "tq": [ - { - "a": "item", - "t": "2", - "n": 2000 - } - ] - }, - { - "type": "dayjijin", - "total": 90, - "pt": [ - { - "a": "item", - "t": "23", - "n": 20000 - } - ], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 888 - } - ] - }, - { - "type": "dayjijin", - "total": 105, - "pt": [ - { - "a": "item", - "t": "2", - "n": 300 - } - ], - "tq": [ - { - "a": "item", - "t": "615", - "n": 1 - } - ] - }, - { - "type": "dayjijin", - "total": 120, - "pt": [ - { - "a": "item", - "t": "23", - "n": 20000 - } - ], - "tq": [ - { - "a": "item", - "t": "4", - "n": 5 - } - ] - }, - { - "type": "dayjijin", - "total": 135, - "pt": [ - { - "a": "item", - "t": "2", - "n": 400 - } - ], - "tq": [ - { - "a": "item", - "t": "2", - "n": 2000 - } - ] - }, - { - "type": "dayjijin", - "total": 150, - "pt": [ - { - "a": "item", - "t": "23", - "n": 20000 - } - ], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 888 - } - ] - }, - { - "type": "dayjijin", - "total": 165, - "pt": [ - { - "a": "item", - "t": "2", - "n": 400 - } - ], - "tq": [ - { - "a": "item", - "t": "615", - "n": 1 - } - ] - }, - { - "type": "dayjijin", - "total": 180, - "pt": [ - { - "a": "item", - "t": "23", - "n": 20000 - } - ], - "tq": [ - { - "a": "item", - "t": "4", - "n": 5 - } - ] - }, - { - "type": "dayjijin", - "total": 200, - "pt": [ - { - "a": "item", - "t": "2", - "n": 500 - } - ], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 1888 - } - ] - } - ]; + let title = "通行证基金未领取奖励发放"; + let content = "通行证基金未领取奖励发放"; + let prizeList = G.gc.jijin["dayjijin"]; // 没激活不处理 let _users = await G.mongodb.cEvent("dayjijin").find( {uid: {$in: _payList.map(pay => pay.uid)}} @@ -1560,20 +529,6 @@ async function dayjiJiJinReSet() { }); }) - let title = "特别通行证优化"; - let content = "这是您的补偿，请查收！"; - let lngTitle = { - ja: "特別通行証仕様改善", - tw: "特別通行證改善", - ko: "특별 통행증 시스템 개선", - en: "Special Permit optimization", - }; - let lngContent = { - en: "Please find attached a few items as a compensation for the wait during our adjustments.", - ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", - ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", - tw: "這是您的補償內容，煩請查收!" - }; for (const [uid, sendPrize] of Object.entries(uid2Prize)) { // 发放邮件 await EmailFun.addEmail({ @@ -1582,8 +537,6 @@ async function dayjiJiJinReSet() { title: title, content: content, prize: sendPrize, - lngTitle: lngTitle, - lngContent: lngContent, }); await G.mongodb.collection("payLogNew").updateMany( Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} @@ -1592,31 +545,20 @@ async function dayjiJiJinReSet() { await G.mongodb.collection("event").updateMany( {type: "dayjijin", uid: uid}, {"$set": {uid: `${uid}_patch_del`}} ); - - console.log(`玩家${uid}通行证基金奖补发完成...`); } } -/** - * 标题:特价基金优化 - * ja:特価投資仕様改善 - * tw:特價基金改善 - * ko:특가 투자 시스템 개선 - * en: Value Investment optimization - - * 內文：这是您的补偿，请查收！ - * ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 - * tw:這是您的補償內容，煩請查收! - * ko:투자 시스템 개선으로 인한 보상을 보내드립니다. - * en: Please find attached a few items as a compensation for the wait during our adjustments. - - * 线上玩家脚本 - * 1、已购买特价基金128的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； - * 2、未购买的玩家活动刷新到新版本； - * 3、刷新月基金到未购买状态； - * */ -async function yue128JiJinReSet() { - let w = {key: "128jijin"}; +/*月基金调整 +1、已购买128、328月基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； +2、未购买的玩家活动刷新到新版本； +3、刷新月基金到未购买状态； +* */ +async function yueJiJinReSet() { + let proIdList = [ + "128jijin", + "328jijin", + ]; + let w = {key: {$in: proIdList}}; // 激活了的玩家 let _payList = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( // 过滤没有结束时间 或者 有结束时间 但是没有过期的 @@ -1624,51 +566,22 @@ async function yue128JiJinReSet() { ); // 没激活不处理 - let _users = await G.mongodb.cEvent(`${128}jijin`).find( + let _users = await G.mongodb.collection("event").find( { + "type": {"$in": proIdList}, "uid": {"$in": _payList.map(pay => pay.uid)} } ).toArray(); - const prizeList = [ - {a: 'item', t: '4', n: 10}, - {a: 'attr', t: 'rmbmoney', n: 300}, - {a: 'attr', t: 'rmbmoney', n: 300}, - {a: 'item', t: '9', n: 2000}, - {a: 'attr', t: 'rmbmoney', n: 300}, - {a: 'attr', t: 'rmbmoney', n: 300}, - {a: 'item', t: '609', n: 1}, - {a: 'item', t: '4', n: 10}, - {a: 'attr', t: 'rmbmoney', n: 500}, - {a: 'attr', t: 'rmbmoney', n: 300}, - {a: 'item', t: '18', n: 300}, - {a: 'attr', t: 'rmbmoney', n: 300}, - {a: 'attr', t: 'rmbmoney', n: 300}, - {a: 'item', t: '6', n: 20}, - {a: 'attr', t: 'rmbmoney', n: 300}, - {a: 'attr', t: 'rmbmoney', n: 300}, - {a: 'item', t: '9', n: 3000}, - {a: 'attr', t: 'rmbmoney', n: 300}, - {a: 'attr', t: 'rmbmoney', n: 300}, - {a: 'item', t: '4', n: 10}, - {a: 'attr', t: 'rmbmoney', n: 500}, - {a: 'attr', t: 'rmbmoney', n: 300}, - {a: 'item', t: '20', n: 200}, - {a: 'attr', t: 'rmbmoney', n: 300}, - {a: 'attr', t: 'rmbmoney', n: 300}, - {a: 'item', t: '9', n: 3000}, - {a: 'attr', t: 'rmbmoney', n: 300}, - {a: 'attr', t: 'rmbmoney', n: 300}, - {a: 'attr', t: 'rmbmoney', n: 1000}, - {a: 'item', t: '628', n: 1}, - ]; let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; - + let prizeList128 = G.gc.yuedujijin.find(v => v.payId == "128jijin"); + let prizeList328 = G.gc.yuedujijin.find(v => v.payId == "328jijin"); _users.forEach(user => { let uid = user.uid; let gotarr = user.rec; if (!uid2Prize[uid]) uid2Prize[uid] = []; + let prizeList = user.type == "128jijin" ? prizeList128.prize : prizeList328.prize; // 没领的全发 prizeList.forEach((onePrize, idx) => { // 领过了 @@ -1679,20 +592,8 @@ async function yue128JiJinReSet() { }); }) - let title = "特价基金优化"; - let content = "这是您的补偿，请查收！"; - let lngTitle = { - ja: "特価投資仕様改善", - tw: "特價基金改善", - ko: "특가 투자 시스템 개선", - en: "Value Investment optimization", - }; - let lngContent = { - en: "Please find attached a few items as a compensation for the wait during our adjustments.", - ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", - ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", - tw: "這是您的補償內容，煩請查收!" - }; + let title = "月度基金未领取奖励发放"; + let content = "月度基金未领取奖励发放"; for (const [uid, sendPrize] of Object.entries(uid2Prize)) { // 发放邮件 await EmailFun.addEmail({ @@ -1701,139 +602,15 @@ async function yue128JiJinReSet() { title: title, content: content, prize: sendPrize, - lngTitle: lngTitle, - lngContent: lngContent, }); await G.mongodb.collection("payLogNew").updateMany( Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} ) // 基金数据清除 - await G.mongodb.cEvent(`${128}jijin`).updateMany( - {uid: uid}, {"$set": {uid: `${uid}_patch_del`}} + await G.mongodb.collection("event").updateMany( + {type: {$in: proIdList}, uid: uid}, {"$set": {uid: `${uid}_patch_del`}} ); - - console.log(`玩家${uid}月度128基金奖补发完成...`); - } -} - -/** - * 标题：特别基金优化 - * ja:特別投資仕様改善 - * tw:特別基金改善 - * ko:특별 투자 시스템 개선 - * en: Special Investment optimization - - * 內文：这是您的补偿，请查收！ - * ja:仕様改善に伴う補填を発送させていただきました。ご確認ください。 - * tw:這是您的補償內容，煩請查收! - * ko:투자 시스템 개선으로 인한 보상을 보내드립니다. - * en: Please find attached a few items as a compensation for the wait during our adjustments. - - * 线上玩家脚本 - * 1、已购买特别基金328的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； - * 2、未购买的玩家活动刷新到新版本； - * 3、刷新月基金到未购买状态； - * */ -async function yue328JiJinReSet() { - let w = {key: "328jijin"}; - // 激活了的玩家 - let _payList = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( - // 过滤没有结束时间 或者 有结束时间 但是没有过期的 - (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) - ); - - // 没激活不处理 - let _users = await G.mongodb.cEvent(`${328}jijin`).find( - { - "uid": {"$in": _payList.map(pay => pay.uid)} - } - ).toArray(); - - const prizeList = [ - {a: 'item', t: '4', n: 30}, - {a: 'attr', t: 'rmbmoney', n: 800}, - {a: 'attr', t: 'rmbmoney', n: 800}, - {a: 'item', t: '10', n: 300}, - {a: 'attr', t: 'rmbmoney', n: 800}, - {a: 'attr', t: 'rmbmoney', n: 800}, - {a: 'item', t: '628', n: 1}, - {a: 'item', t: '4', n: 20}, - {a: 'attr', t: 'rmbmoney', n: 800}, - {a: 'attr', t: 'rmbmoney', n: 800}, - {a: 'item', t: '628', n: 1}, - {a: 'attr', t: 'rmbmoney', n: 800}, - {a: 'attr', t: 'rmbmoney', n: 800}, - {a: 'item', t: '628', n: 1}, - {a: 'attr', t: 'rmbmoney', n: 800}, - {a: 'attr', t: 'rmbmoney', n: 800}, - {a: 'item', t: '628', n: 1}, - {a: 'attr', t: 'rmbmoney', n: 800}, - {a: 'attr', t: 'rmbmoney', n: 800}, - {a: 'item', t: '4', n: 20}, - {a: 'attr', t: 'rmbmoney', n: 800}, - {a: 'attr', t: 'rmbmoney', n: 800}, - {a: 'item', t: '10', n: 400}, - {a: 'attr', t: 'rmbmoney', n: 800}, - {a: 'attr', t: 'rmbmoney', n: 800}, - {a: 'item', t: '10', n: 400}, - {a: 'attr', t: 'rmbmoney', n: 800}, - {a: 'attr', t: 'rmbmoney', n: 800}, - {a: 'attr', t: 'rmbmoney', n: 1500}, - {a: 'item', t: '617', n: 1}, - ]; - let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; - - _users.forEach(user => { - let uid = user.uid; - let gotarr = user.rec; - if (!uid2Prize[uid]) uid2Prize[uid] = []; - - // 没领的全发 - prizeList.forEach((onePrize, idx) => { - // 领过了 - if (gotarr.includes(idx)) { - return - } - uid2Prize[uid].push(onePrize) - }); - }) - - let title = "特别基金优化"; - let content = "这是您的补偿，请查收！"; - let lngTitle = { - ja: "特別投資仕様改善", - tw: "特別基金改善", - ko: "특별 투자 시스템 개선", - en: "Special Investment optimization", - }; - let lngContent = { - en: "Please find attached a few items as a compensation for the wait during our adjustments.", - ja: "仕様改善に伴う補填を発送させていただきました。ご確認ください。", - ko: "투자 시스템 개선으로 인한 보상을 보내드립니다.", - tw: "這是您的補償內容，煩請查收!" - }; - for (const [uid, sendPrize] of Object.entries(uid2Prize)) { - // 发放邮件 - await EmailFun.addEmail({ - uid: uid, - type: "system", - title: title, - content: content, - prize: sendPrize, - lngTitle: lngTitle, - lngContent: lngContent, - }); - - await G.mongodb.collection("payLogNew").updateMany( - Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} - ) - // 基金数据清除 - await G.mongodb.cEvent(`${328}jijin`).updateMany( - {uid: uid}, {"$set": {uid: `${uid}_patch_del`}} - ); - - console.log(`玩家${uid}月度128基金奖补发完成...`); } } @@ -1841,29 +618,31 @@ async function start() { //连接mongodb await initMongoDB(); + // 首冲调整 await shouChongReSet(); - await zhizunyueka(); - await chaozhiyueka(); - await zhongshenka(); - await qingbaotequan(); - await zuozhantequan(); - await caifutequan(); - await jiubatequan(); + // 超值月卡、至尊月卡、永久卡的线上玩家脚本 + await yuekaSendPrize(); + // 特权礼包脚本需求 + await tequanLiBaoSendPrize(); + // 刷新所有玩家各档位VIP礼包到未购买状态 await resetVipLiBao(); + // 人才计划调整 await rcjhReSet(); + // 等级基金调整 await dengjiJiJinReSet(); + // 关卡基金调整 await guanqiaJiJinReSet(); + // 通行证基金调整 await dayjiJiJinReSet(); - await yue128JiJinReSet(); - await yue328JiJinReSet(); + // 月基金调整 + await yueJiJinReSet(); } +//定义全局变量 ctor(); +//启动服务 start().then(() => { - setInterval(() => { - console.log(new Date().format("MM-dd hh:mm:ss")); - }, 1000) - console.log("逻辑执行完成...等待退出！！！"); + process.exit() }); From e89d7a91c1847eb3d0e9faf88d66729be10564b5 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Mon, 18 Dec 2023 20:04:41 +0800 Subject: [PATCH 56/80] =?UTF-8?q?Revert=20"fix:=E8=84=9A=E6=9C=AC"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 954c2e8d2e67010127c042ddaa6b89d880b94664. --- src/path_20231215.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/path_20231215.ts b/src/path_20231215.ts index 5520e73..3775b04 100644 --- a/src/path_20231215.ts +++ b/src/path_20231215.ts @@ -1,6 +1,7 @@ -import {ctor} from "./global"; -import {EmailFun} from "./public/email"; -import {initMongoDB} from "./setMongodb"; +import {ctor} from '../../../heijiao/server/src/global'; +import {initMongoDB} from '../../../heijiao/server/src/setMongodb'; +import {EmailFun} from "../../../heijiao/server/src/public/email"; + // 首冲 async function shouChongReSet() { From c8751956ef906068903650c1520ee31784d9bf39 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Mon, 18 Dec 2023 20:04:48 +0800 Subject: [PATCH 57/80] Revert "fix:" This reverts commit 5679361eab608f16b92e1d913950edac45094db6. --- src/api_s2c/event/shiwuleichong/ApiOpen.ts | 31 +++++++++++----------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/api_s2c/event/shiwuleichong/ApiOpen.ts b/src/api_s2c/event/shiwuleichong/ApiOpen.ts index de01636..7954da3 100644 --- a/src/api_s2c/event/shiwuleichong/ApiOpen.ts +++ b/src/api_s2c/event/shiwuleichong/ApiOpen.ts @@ -13,27 +13,28 @@ export default async function (call: ApiCall) { let _zt = PublicShared.getToDayZeroTime(); let pays = await PayFun.getPayLogs(call.uid, payids); for (; day <= G.gc.shiwuleichong.tasks.length; day++) { - let pay = pays[G.gc.shiwuleichong.tasks[day - 1].payid]; - if (!pay || pay.length == 0) { + let pay = pays[G.gc.shiwuleichong.tasks[day].payid]; + if (!pay) { break } else { - // 如果是最后一天奖励 - if (day >= G.gc.shiwuleichong.tasks.length) { - // 充值订单隔天了 - if (pay.slice(-1)[0].time < _zt) { - // 重置所有订单 - await PayFun.delPayLog(call.uid, ...payids.map(i => { - return {payId: i, val: []} - })) - day = 1; - pays = {}; - } - break; - } else if (pay.slice(-1)[0].time >= _zt) { + if (pay.slice(-1)[0].time >= _zt) { break } } } + // 如果是最后一天奖励 并且 充值订单隔天了 + if ( + day == G.gc.shiwuleichong.tasks.length && + pays[G.gc.shiwuleichong.tasks[day - 1].payid] && + pays[G.gc.shiwuleichong.tasks[day - 1].payid].slice(-1)[0].time < _zt + ) { + // 重置所有订单 + await PayFun.delPayLog(call.uid, ...payids.map(i => { + return {payId: i, val: []} + })) + day = 1; + pays = {}; + } call.succ({ day: day, From 28e4aca1f2b353c71eae545d6e409e3f3c0b6d43 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Mon, 18 Dec 2023 20:04:52 +0800 Subject: [PATCH 58/80] Revert "fix:" This reverts commit 404bb9a7e574532a772017693d91d16813b70216. --- src/api_s2c/event/huobanzhaomu/ApiRec.ts | 37 +++++++++--------------- 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/src/api_s2c/event/huobanzhaomu/ApiRec.ts b/src/api_s2c/event/huobanzhaomu/ApiRec.ts index 0c1dfba..3b8cd45 100644 --- a/src/api_s2c/event/huobanzhaomu/ApiRec.ts +++ b/src/api_s2c/event/huobanzhaomu/ApiRec.ts @@ -1,38 +1,27 @@ -import {ApiCall} from "tsrpc"; -import {PlayerFun} from '../../../public/player'; -import {ReqRec, ResRec} from "../../../shared/protocols/event/huobanzhaomu/PtlRec"; -import {HongDianChange} from "../../hongdian/fun"; -import {PayFun} from "../../../public/pay"; +import { ApiCall } from "tsrpc"; +import { PlayerFun } from '../../../public/player'; +import { ReqRec, ResRec } from "../../../shared/protocols/event/huobanzhaomu/PtlRec"; +import { HongDianChange } from "../../hongdian/fun"; export default async function (call: ApiCall) { let conf = G.gc.huobanzhaomu[call.req.index]; - if (!conf) return call.error('', {code: -1}); - if (conf.gudKey && call.conn.gud[conf.gudKey] < conf.total) return call.error('', {code: -2}); + if (!conf) return call.error('', { code: -1 }); + if (conf.gudKey && call.conn.gud[conf.gudKey] < conf.total) return call.error('', { code: -2 }); - let db = await G.mongodb.cEvent('huobanzhaomu').findOne({uid: call.uid, type: 'huobanzhaomu'}); - if (db?.rec.includes(call.req.index)) return call.error('', {code: -3}); - - if (conf.gudKey == "chaozhiyueka") { - let logs = await PayFun.getPayLog(call.uid, "chaozhiyueka"); - if (!logs || logs.slice(-1)[0].eTime < G.time) { - return call.error('', {code: -4}); - } - } else { - if (!conf.gudKey && (db?.rec?.length || 0) < G.gc.huobanzhaomu.length - 1) { - return call.error('', {code: -4}); - } - } + let db = await G.mongodb.cEvent('huobanzhaomu').findOne({ uid: call.uid, type: 'huobanzhaomu' }); + if (db?.rec.includes(call.req.index)) return call.error('', { code: -3 }); + if (!conf.gudKey && (db?.rec?.length || 0) < G.gc.huobanzhaomu.length - 1) return call.error('', { code: -4 }); await PlayerFun.sendPrize(call, conf.prize); if (db?.rec?.length + 1 >= G.gc.huobanzhaomu.length) { - G.mongodb.collection('syncBtns').updateOne({uid: call.uid}, {$set: {'huobanzhaomu.active': false}}, {upsert: true}); + G.mongodb.collection('syncBtns').updateOne({ uid: call.uid }, { $set: { 'huobanzhaomu.active': false } }, { upsert: true }); } G.mongodb.cEvent('huobanzhaomu').updateOne( - {uid: call.uid, type: 'huobanzhaomu'}, - {$push: {rec: call.req.index}}, - {upsert: true} + { uid: call.uid, type: 'huobanzhaomu' }, + { $push: { rec: call.req.index } }, + { upsert: true } ); HongDianChange.sendChangeKey(call.uid, ['huobanzhaomuhd']) From e57fad35d88108962d5d1df745cb541bc2eaa0e8 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Mon, 18 Dec 2023 20:05:26 +0800 Subject: [PATCH 59/80] Revert "fix:" This reverts commit 7e775e90e1e5c6b87f61985e264b3978cbfbf2e4. --- src/api_s2c/xstask/ApiAllGet.ts | 32 +++++++++++--------------------- src/api_s2c/xstask/ApiGet.ts | 31 +++++++++++-------------------- src/api_s2c/xstask/ApiOpen.ts | 2 +- 3 files changed, 23 insertions(+), 42 deletions(-) diff --git a/src/api_s2c/xstask/ApiAllGet.ts b/src/api_s2c/xstask/ApiAllGet.ts index d89d696..f41ac3c 100644 --- a/src/api_s2c/xstask/ApiAllGet.ts +++ b/src/api_s2c/xstask/ApiAllGet.ts @@ -1,17 +1,15 @@ -import {ApiCall} from "tsrpc"; -import {PlayerFun} from '../../public/player'; -import {XstaskFun} from '../../public/xstask'; -import {ReqAllGet, ResAllGet} from "../../shared/protocols/xstask/PtlAllGet"; -import {HongDianChange} from "../hongdian/fun"; -import {PublicShared} from "../../shared/public/public"; -import {TeQuanFun} from "../../public/tequan"; +import { ApiCall } from "tsrpc"; +import { PlayerFun } from '../../public/player'; +import { XstaskFun } from '../../public/xstask'; +import { ReqAllGet, ResAllGet } from "../../shared/protocols/xstask/PtlAllGet"; +import { HongDianChange } from "../hongdian/fun"; +import { PublicShared } from "../../shared/public/public"; export default async function (call: ApiCall) { const taskList = JSON.parse(JSON.stringify(await XstaskFun.getAllTask(call.uid))); let taskInfo = await XstaskFun.getInfo(call.uid); - let tequan = await TeQuanFun.getXsTaskNum(call); - let prizeArr: atn[] = [] - for (let task of taskList) { + let prizeArr:atn[] = [] + for(let task of taskList) { const taskConf = G.gc.xstask[task?.taskId]; if (!task) continue; if (task.receiveData == undefined) continue; @@ -25,12 +23,12 @@ export default async function (call: ApiCall) { // } continue } - let change: Parameters[1] = {$inc: {}}; + let change: Parameters[1] = { $inc: {} }; change.$inc[`finishNum.${taskConf.colour}`] = 1; // 比对派遣时间，如果小于当日0点，则更新新任务，否则该变领取状态为true - if (task.receiveData.time < PublicShared.getToDayZeroTime()) { + if(task.receiveData.time < PublicShared.getToDayZeroTime()) { // 更新任务 - let newTask = XstaskFun.randomTasks(taskInfo?.lv, 1) + let newTask = XstaskFun.randomTasks(taskInfo?.lv, 1) XstaskFun.updateTask(call.uid, task._id, newTask[0].taskId) } else { // 更新领取状态 @@ -40,14 +38,6 @@ export default async function (call: ApiCall) { XstaskFun.changeInfo(call.uid, change); await PlayerFun.sendPrize(call, taskConf.prize); HongDianChange.sendChangeKey(call.uid, ['xstaskhd', 'huodonghd']); - - if (!tequan) { - prizeArr.push(...taskConf.prize) - } else { - for (let i = 0; i < 3; i++) { - prizeArr.push(...taskConf.prize) - } - } prizeArr.push(...taskConf.prize) } call.succ({ diff --git a/src/api_s2c/xstask/ApiGet.ts b/src/api_s2c/xstask/ApiGet.ts index 878052d..62a5b1b 100644 --- a/src/api_s2c/xstask/ApiGet.ts +++ b/src/api_s2c/xstask/ApiGet.ts @@ -1,10 +1,9 @@ -import {ApiCall} from "tsrpc"; -import {PlayerFun} from '../../public/player'; -import {XstaskFun} from '../../public/xstask'; -import {ReqGet, ResGet} from "../../shared/protocols/xstask/PtlGet"; -import {HongDianChange} from "../hongdian/fun"; -import {PublicShared} from '../../shared/public/public'; -import {TeQuanFun} from "../../public/tequan"; +import { ApiCall } from "tsrpc"; +import { PlayerFun } from '../../public/player'; +import { XstaskFun } from '../../public/xstask'; +import { ReqGet, ResGet } from "../../shared/protocols/xstask/PtlGet"; +import { HongDianChange } from "../hongdian/fun"; +import { PublicShared } from '../../shared/public/public'; export default async function (call: ApiCall) { @@ -24,32 +23,24 @@ export default async function (call: ApiCall) { } } - let change: Parameters[1] = {$inc: {}}; + let change: Parameters[1] = { $inc: {} }; change.$inc[`finishNum.${taskConf.colour}`] = 1; // 比对派遣时间，如果小于当日0点，则更新新任务，否则该变领取状态为true - if (task.receiveData.time < PublicShared.getToDayZeroTime()) { + if(task.receiveData.time < PublicShared.getToDayZeroTime()) { // 更新任务 - let newTask = XstaskFun.randomTasks(taskInfo?.lv, 1) + let newTask = XstaskFun.randomTasks(taskInfo?.lv, 1) XstaskFun.updateTask(call.uid, call.req._id, newTask[0].taskId) } else { // 更新领取状态 XstaskFun.finishTask(call.uid, call.req._id) } // XstaskFun.delTask(call.uid, call.req._id); - let send_prize = []; XstaskFun.changeInfo(call.uid, change); - if (!await TeQuanFun.getXsTaskNum(call)) { - send_prize = taskConf.prize; - } else { - for (let i = 0; i < 3; i++) { - send_prize = send_prize.concat(taskConf.prize) - } - } - await PlayerFun.sendPrize(call, send_prize); + await PlayerFun.sendPrize(call, taskConf.prize); HongDianChange.sendChangeKey(call.uid, ['xstaskhd', 'huodonghd']); call.succ({ taskList: await XstaskFun.getAllTask(call.uid), - prize: send_prize + prize: taskConf.prize }); } \ No newline at end of file diff --git a/src/api_s2c/xstask/ApiOpen.ts b/src/api_s2c/xstask/ApiOpen.ts index 3a65a5d..4261a4c 100644 --- a/src/api_s2c/xstask/ApiOpen.ts +++ b/src/api_s2c/xstask/ApiOpen.ts @@ -36,7 +36,7 @@ export default async function (call: ApiCall) { XstaskFun.delTasks(call.uid, delTask.map(task => task._id)); } - // needAddTask += await TeQuanFun.getXsTaskNum(call); + needAddTask += await TeQuanFun.getXsTaskNum(call); needAddTask && await XstaskFun.addTasks(call.uid, XstaskFun.randomTasks(taskInfo?.lv || changeInfo.lv, needAddTask)); let { _id, uid, type, ...info } = taskInfo || changeInfo as typeof taskInfo; From b2c0d754a1eaf652fb5535329775b0bea51f177c Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Mon, 18 Dec 2023 20:05:32 +0800 Subject: [PATCH 60/80] Revert "fix:" This reverts commit 14ab1d45b8dca428e85be99403d4ed62162b5789. --- src/api_s2c/event/shiwuleichong/ApiOpen.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api_s2c/event/shiwuleichong/ApiOpen.ts b/src/api_s2c/event/shiwuleichong/ApiOpen.ts index 7954da3..5763d97 100644 --- a/src/api_s2c/event/shiwuleichong/ApiOpen.ts +++ b/src/api_s2c/event/shiwuleichong/ApiOpen.ts @@ -38,6 +38,6 @@ export default async function (call: ApiCall) { call.succ({ day: day, - payIds: Object.keys(pays).filter((i) => pays[i].length > 0) + payIds: Object.keys(pays) }); } \ No newline at end of file From 10c54fce473b0dd0571926187a51557ca6c7947a Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Mon, 18 Dec 2023 20:05:40 +0800 Subject: [PATCH 61/80] Revert "fix:" This reverts commit 00f829c48cfa07f4e42d63b3b9c855d74c87351c. --- src/shared/protocols/serviceProto.ts | 642 +++++++++++++++------------ 1 file changed, 347 insertions(+), 295 deletions(-) diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 63d417a..24b5ff6 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -73,21 +73,22 @@ import { ReqRec as ReqRec_6, ResRec as ResRec_6 } from './event/qirichongzhi/Ptl import { ReqOpen as ReqOpen_17, ResOpen as ResOpen_17 } from './event/qiridenglu/PtlOpen'; import { ReqRecPrize as ReqRecPrize_1, ResRecPrize as ResRecPrize_1 } from './event/qiridenglu/PtlRecPrize'; import { ReqOpen as ReqOpen_18, ResOpen as ResOpen_18 } from './event/shiwuleichong/PtlOpen'; +import { 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 { ReqBuy as ReqBuy_1, ResBuy as ResBuy_1 } from './event/xianshizhaomu/PtlBuy'; import { ReqDuihuan, ResDuihuan } from './event/xianshizhaomu/PtlDuihuan'; import { ReqLottery as ReqLottery_1, ResLottery as ResLottery_1 } from './event/xianshizhaomu/PtlLottery'; import { ReqOpen as ReqOpen_20, ResOpen as ResOpen_20 } from './event/xianshizhaomu/PtlOpen'; -import { ReqRec as ReqRec_7, ResRec as ResRec_7 } from './event/xianshizhaomu/PtlRec'; +import { ReqRec as ReqRec_8, ResRec as ResRec_8 } from './event/xianshizhaomu/PtlRec'; import { ReqOpen as ReqOpen_21, ResOpen as ResOpen_21 } from './event/xinshoulibao/PtlOpen'; import { ReqBuy as ReqBuy_2, ResBuy as ResBuy_2 } from './event/yangchengmubiao/PtlBuy'; import { ReqOpen as ReqOpen_22, ResOpen as ResOpen_22 } from './event/yangchengmubiao/PtlOpen'; -import { ReqRec as ReqRec_8, ResRec as ResRec_8 } from './event/yangchengmubiao/PtlRec'; +import { ReqRec as ReqRec_9, ResRec as ResRec_9 } from './event/yangchengmubiao/PtlRec'; import { ReqOpen as ReqOpen_23, ResOpen as ResOpen_23 } from './event/yibaichou/PtlOpen'; -import { ReqRec as ReqRec_9, ResRec as ResRec_9 } from './event/yibaichou/PtlRec'; +import { ReqRec as ReqRec_10, ResRec as ResRec_10 } from './event/yibaichou/PtlRec'; import { ReqRecAll, ResRecAll } from './event/yibaichou/PtlRecAll'; import { ReqOpen as ReqOpen_24, ResOpen as ResOpen_24 } from './event/yuedujijin/PtlOpen'; -import { ReqRec as ReqRec_10, ResRec as ResRec_10 } from './event/yuedujijin/PtlRec'; +import { ReqRec as ReqRec_11, ResRec as ResRec_11 } from './event/yuedujijin/PtlRec'; import { ReqBuyLv, ResBuyLv } from './event/zhanling/PtlBuyLv'; import { ReqOpen as ReqOpen_25, ResOpen as ResOpen_25 } from './event/zhanling/PtlOpen'; import { ReqRecPrize as ReqRecPrize_2, ResRecPrize as ResRecPrize_2 } from './event/zhanling/PtlRecPrize'; @@ -155,7 +156,7 @@ import { ReqBuyNum as ReqBuyNum_1, ResBuyNum as ResBuyNum_1 } from './hbzb/jfs/P 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 { ReqRec as ReqRec_11, ResRec as ResRec_11 } from './hbzb/jfs/PtlRec'; +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'; @@ -169,7 +170,7 @@ import { ReqGetList as ReqGetList_3, ResGetList as ResGetList_3 } from './hero/P import { ReqJinJie, ResJinJie } from './hero/PtlJinJie'; import { ReqLvUp as ReqLvUp_1, ResLvUp as ResLvUp_1 } from './hero/PtlLvUp'; import { ReqPotency, ResPotency } from './hero/PtlPotency'; -import { ReqRec as ReqRec_12, ResRec as ResRec_12 } from './hero/PtlRec'; +import { ReqRec as ReqRec_13, ResRec as ResRec_13 } from './hero/PtlRec'; import { ReqReset as ReqReset_2, ResReset as ResReset_2 } from './hero/PtlReset'; import { ReqTalent, ResTalent } from './hero/PtlTalent'; import { ReqWeaponUp, ResWeaponUp } from './hero/PtlWeaponUp'; @@ -275,7 +276,7 @@ import { ReqRecast, ResRecast } from './shiwu/PtlRecast'; import { ReqTakeOff as ReqTakeOff_2, ResTakeOff as ResTakeOff_2 } from './shiwu/PtlTakeOff'; import { ReqWear as ReqWear_2, ResWear as ResWear_2 } from './shiwu/PtlWear'; import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './shootGame/PtlOpen'; -import { ReqRec as ReqRec_13, ResRec as ResRec_13 } from './shootGame/PtlRec'; +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_52, ResOpen as ResOpen_52 } from './shop/PtlOpen'; import { ReqRefresh as ReqRefresh_6, ResRefresh as ResRefresh_6 } from './shop/PtlRefresh'; @@ -289,7 +290,7 @@ import { ReqFightLog as ReqFightLog_2, ResFightLog as ResFightLog_2 } from './sl import { ReqMyRank, ResMyRank } from './slzd/PtlMyRank'; import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } from './slzd/PtlOpen'; import { ReqOpenFort, ResOpenFort } from './slzd/PtlOpenFort'; -import { ReqRec as ReqRec_14, ResRec as ResRec_14 } from './slzd/PtlRec'; +import { ReqRec as ReqRec_15, ResRec as ResRec_15 } from './slzd/PtlRec'; import { ReqRefresh as ReqRefresh_7, ResRefresh as ResRefresh_7 } from './slzd/PtlRefresh'; import { ReqSlot, ResSlot } from './slzd/PtlSlot'; import { ReqEvent, ResEvent } from './tanxian/PtlEvent'; @@ -641,6 +642,10 @@ export interface ServiceType { req: ReqOpen_18, res: ResOpen_18 }, + "event/shiwuleichong/Rec": { + req: ReqRec_7, + res: ResRec_7 + }, "event/shouchong/Open": { req: ReqOpen_19, res: ResOpen_19 @@ -662,8 +667,8 @@ export interface ServiceType { res: ResOpen_20 }, "event/xianshizhaomu/Rec": { - req: ReqRec_7, - res: ResRec_7 + req: ReqRec_8, + res: ResRec_8 }, "event/xinshoulibao/Open": { req: ReqOpen_21, @@ -678,16 +683,16 @@ export interface ServiceType { res: ResOpen_22 }, "event/yangchengmubiao/Rec": { - req: ReqRec_8, - res: ResRec_8 + req: ReqRec_9, + res: ResRec_9 }, "event/yibaichou/Open": { req: ReqOpen_23, res: ResOpen_23 }, "event/yibaichou/Rec": { - req: ReqRec_9, - res: ResRec_9 + req: ReqRec_10, + res: ResRec_10 }, "event/yibaichou/RecAll": { req: ReqRecAll, @@ -698,8 +703,8 @@ export interface ServiceType { res: ResOpen_24 }, "event/yuedujijin/Rec": { - req: ReqRec_10, - res: ResRec_10 + req: ReqRec_11, + res: ResRec_11 }, "event/zhanling/BuyLv": { req: ReqBuyLv, @@ -970,8 +975,8 @@ export interface ServiceType { res: ResOpen_36 }, "hbzb/jfs/Rec": { - req: ReqRec_11, - res: ResRec_11 + req: ReqRec_12, + res: ResRec_12 }, "hbzb/jfs/Refresh": { req: ReqRefresh_2, @@ -1026,8 +1031,8 @@ export interface ServiceType { res: ResPotency }, "hero/Rec": { - req: ReqRec_12, - res: ResRec_12 + req: ReqRec_13, + res: ResRec_13 }, "hero/Reset": { req: ReqReset_2, @@ -1334,8 +1339,8 @@ export interface ServiceType { res: ResOpen_51 }, "shootGame/Rec": { - req: ReqRec_13, - res: ResRec_13 + req: ReqRec_14, + res: ResRec_14 }, "shop/Buy": { req: ReqBuy_6, @@ -1390,8 +1395,8 @@ export interface ServiceType { res: ResOpenFort }, "slzd/Rec": { - req: ReqRec_14, - res: ResRec_14 + req: ReqRec_15, + res: ResRec_15 }, "slzd/Refresh": { req: ReqRefresh_7, @@ -2009,71 +2014,76 @@ export const serviceProto: ServiceProto = { }, { "id": 74, - "name": "event/shouchong/Open", + "name": "event/shiwuleichong/Rec", "type": "api" }, { "id": 75, - "name": "event/xianshizhaomu/Buy", + "name": "event/shouchong/Open", "type": "api" }, { "id": 76, - "name": "event/xianshizhaomu/Duihuan", + "name": "event/xianshizhaomu/Buy", "type": "api" }, { "id": 77, - "name": "event/xianshizhaomu/Lottery", + "name": "event/xianshizhaomu/Duihuan", "type": "api" }, { "id": 78, - "name": "event/xianshizhaomu/Open", + "name": "event/xianshizhaomu/Lottery", "type": "api" }, { "id": 79, - "name": "event/xianshizhaomu/Rec", + "name": "event/xianshizhaomu/Open", "type": "api" }, { "id": 80, - "name": "event/xinshoulibao/Open", + "name": "event/xianshizhaomu/Rec", "type": "api" }, { "id": 81, - "name": "event/yangchengmubiao/Buy", + "name": "event/xinshoulibao/Open", "type": "api" }, { "id": 82, - "name": "event/yangchengmubiao/Open", + "name": "event/yangchengmubiao/Buy", "type": "api" }, { "id": 83, - "name": "event/yangchengmubiao/Rec", + "name": "event/yangchengmubiao/Open", "type": "api" }, { "id": 84, - "name": "event/yibaichou/Open", + "name": "event/yangchengmubiao/Rec", "type": "api" }, { "id": 85, - "name": "event/yibaichou/Rec", + "name": "event/yibaichou/Open", "type": "api" }, { "id": 86, - "name": "event/yibaichou/RecAll", + "name": "event/yibaichou/Rec", "type": "api" }, { "id": 87, + "name": "event/yibaichou/RecAll", + "type": "api" + }, + { + "id": 88, "name": "event/yuedujijin/Open", "type": "api", "conf": { @@ -2081,157 +2091,157 @@ export const serviceProto: ServiceProto = { } }, { - "id": 88, + "id": 89, "name": "event/yuedujijin/Rec", "type": "api" }, { - "id": 89, + "id": 90, "name": "event/zhanling/BuyLv", "type": "api" }, { - "id": 90, + "id": 91, "name": "event/zhanling/Open", "type": "api" }, { - "id": 91, + "id": 92, "name": "event/zhanling/RecPrize", "type": "api" }, { - "id": 92, + "id": 93, "name": "event/zhanling/RecTask", "type": "api" }, { - "id": 93, + "id": 94, "name": "event/zhoulibao/Open", "type": "api" }, { - "id": 94, + "id": 95, "name": "event/zhoumolibao/Open", "type": "api" }, { - "id": 95, + "id": 96, "name": "event/zhoumolibao/Receive", "type": "api" }, { - "id": 96, + "id": 97, "name": "event/zixuanlibao/Buy", "type": "api" }, { - "id": 97, + "id": 98, "name": "event/zixuanlibao/Open", "type": "api" }, { - "id": 98, + "id": 99, "name": "eventlist/hdGetList", "type": "api" }, { - "id": 99, + "id": 100, "name": "friend/Apply", "type": "api" }, { - "id": 100, + "id": 101, "name": "friend/Del", "type": "api" }, { - "id": 101, + "id": 102, "name": "friend/Gift", "type": "api" }, { - "id": 102, + "id": 103, "name": "friend/List", "type": "api" }, { - "id": 103, + "id": 104, "name": "friend/Open", "type": "api" }, { - "id": 104, + "id": 105, "name": "friend/Respond", "type": "api" }, { - "id": 105, + "id": 106, "name": "friend/RmBlackList", "type": "api" }, { - "id": 106, + "id": 107, "name": "friend/Search", "type": "api" }, { - "id": 107, + "id": 108, "name": "ganbutexun/Challenge", "type": "api" }, { - "id": 108, + "id": 109, "name": "ganbutexun/Open", "type": "api" }, { - "id": 109, + "id": 110, "name": "ganhai/Fast", "type": "api" }, { - "id": 110, + "id": 111, "name": "ganhai/Fight", "type": "api" }, { - "id": 111, + "id": 112, "name": "ganhai/Log", "type": "api" }, { - "id": 112, + "id": 113, "name": "ganhai/Open", "type": "api" }, { - "id": 113, + "id": 114, "name": "ganhai/Refresh", "type": "api" }, { - "id": 114, + "id": 115, "name": "ganhai/RefreshShip", "type": "api" }, { - "id": 115, + "id": 116, "name": "ganhai/Select", "type": "api" }, { - "id": 116, + "id": 117, "name": "gmapi/Gift", "type": "api" }, { - "id": 117, + "id": 118, "name": "gmapi/Post", "type": "api" }, { - "id": 118, + "id": 119, "name": "gonghui/Apply", "type": "api", "conf": { @@ -2241,7 +2251,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 119, + "id": 120, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2251,7 +2261,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 120, + "id": 121, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2261,7 +2271,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 121, + "id": 122, "name": "gonghui/Change", "type": "api", "conf": { @@ -2271,12 +2281,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 122, + "id": 123, "name": "gonghui/Create", "type": "api" }, { - "id": 123, + "id": 124, "name": "gonghui/Dissolve", "type": "api", "conf": { @@ -2286,7 +2296,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 124, + "id": 125, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2296,12 +2306,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 125, + "id": 126, "name": "gonghui/FbBuyNum", "type": "api" }, { - "id": 126, + "id": 127, "name": "gonghui/FbFight", "type": "api", "conf": { @@ -2311,7 +2321,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 127, + "id": 128, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2321,17 +2331,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 128, + "id": 129, "name": "gonghui/GetList", "type": "api" }, { - "id": 129, + "id": 130, "name": "gonghui/Join", "type": "api" }, { - "id": 130, + "id": 131, "name": "gonghui/Jx", "type": "api", "conf": { @@ -2341,7 +2351,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 131, + "id": 132, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2351,7 +2361,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 132, + "id": 133, "name": "gonghui/List", "type": "api", "conf": { @@ -2361,7 +2371,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 133, + "id": 134, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2371,7 +2381,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 134, + "id": 135, "name": "gonghui/Open", "type": "api", "conf": { @@ -2381,7 +2391,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 135, + "id": 136, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2391,7 +2401,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 136, + "id": 137, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2401,7 +2411,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 137, + "id": 138, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2411,7 +2421,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 138, + "id": 139, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2421,137 +2431,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 139, + "id": 140, "name": "gonghuibaozang/Lottery", "type": "api" }, { - "id": 140, + "id": 141, "name": "gonghuibaozang/Open", "type": "api" }, { - "id": 141, + "id": 142, "name": "gonglukuangbiao/Buy", "type": "api" }, { - "id": 142, + "id": 143, "name": "gonglukuangbiao/Fight", "type": "api" }, { - "id": 143, + "id": 144, "name": "gonglukuangbiao/Open", "type": "api" }, { - "id": 144, + "id": 145, "name": "gonglukuangbiao/Refresh", "type": "api" }, { - "id": 145, + "id": 146, "name": "gongyu/mingdao/Active", "type": "api" }, { - "id": 146, + "id": 147, "name": "gongyu/mingdao/Open", "type": "api" }, { - "id": 147, + "id": 148, "name": "gongyu/mingdao/RecPrize", "type": "api" }, { - "id": 148, + "id": 149, "name": "gongyu/mingdao/Repair", "type": "api" }, { - "id": 149, + "id": 150, "name": "gongyu/xunlianjihua/Reset", "type": "api" }, { - "id": 150, + "id": 151, "name": "gongyu/xunlianjihua/UpSkill", "type": "api" }, { - "id": 151, + "id": 152, "name": "gongyu/zuozhanjihua/SetSkill", "type": "api" }, { - "id": 152, + "id": 153, "name": "hbzb/jfs/BuyNum", "type": "api" }, { - "id": 153, + "id": 154, "name": "hbzb/jfs/Fight", "type": "api" }, { - "id": 154, + "id": 155, "name": "hbzb/jfs/GetLog", "type": "api" }, { - "id": 155, + "id": 156, "name": "hbzb/jfs/Open", "type": "api" }, { - "id": 156, + "id": 157, "name": "hbzb/jfs/Rec", "type": "api" }, { - "id": 157, + "id": 158, "name": "hbzb/jfs/Refresh", "type": "api" }, { - "id": 158, + "id": 159, "name": "hbzb/GetStatus", "type": "api" }, { - "id": 159, + "id": 160, "name": "hbzb/zbs/BuyNum", "type": "api" }, { - "id": 160, + "id": 161, "name": "hbzb/zbs/Fight", "type": "api" }, { - "id": 161, + "id": 162, "name": "hbzb/zbs/GetLog", "type": "api" }, { - "id": 162, + "id": 163, "name": "hbzb/zbs/Open", "type": "api" }, { - "id": 163, + "id": 164, "name": "hbzb/zbs/Refresh", "type": "api" }, { - "id": 164, + "id": 165, "name": "hero/Awake", "type": "api" }, { - "id": 165, + "id": 166, "name": "hero/ChangePos", "type": "api", "conf": { @@ -2559,17 +2569,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 166, + "id": 167, "name": "hero/GetList", "type": "api" }, { - "id": 167, + "id": 168, "name": "hero/JinJie", "type": "api" }, { - "id": 168, + "id": 169, "name": "hero/LvUp", "type": "api", "conf": { @@ -2577,32 +2587,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 169, + "id": 170, "name": "hero/Potency", "type": "api" }, { - "id": 170, + "id": 171, "name": "hero/Rec", "type": "api" }, { - "id": 171, + "id": 172, "name": "hero/Reset", "type": "api" }, { - "id": 172, + "id": 173, "name": "hero/Talent", "type": "api" }, { - "id": 173, + "id": 174, "name": "hero/WeaponUp", "type": "api" }, { - "id": 174, + "id": 175, "name": "hongdian/Get", "type": "api", "conf": { @@ -2610,117 +2620,117 @@ export const serviceProto: ServiceProto = { } }, { - "id": 175, + "id": 176, "name": "item/GetList", "type": "api" }, { - "id": 176, + "id": 177, "name": "item/Use", "type": "api" }, { - "id": 177, + "id": 178, "name": "jiaotang/Lottery", "type": "api" }, { - "id": 178, + "id": 179, "name": "jiaotang/Open", "type": "api" }, { - "id": 179, + "id": 180, "name": "jiuba/Lottery", "type": "api" }, { - "id": 180, + "id": 181, "name": "jiuba/Open", "type": "api" }, { - "id": 181, + "id": 182, "name": "jjc/BuyFightNum", "type": "api" }, { - "id": 182, + "id": 183, "name": "jjc/Fight", "type": "api" }, { - "id": 183, + "id": 184, "name": "jjc/FightLog", "type": "api" }, { - "id": 184, + "id": 185, "name": "jjc/Open", "type": "api" }, { - "id": 185, + "id": 186, "name": "jjc/Receive", "type": "api" }, { - "id": 186, + "id": 187, "name": "jjc/Refresh", "type": "api" }, { - "id": 187, + "id": 188, "name": "kaifujingsai/Open", "type": "api" }, { - "id": 188, + "id": 189, "name": "kaifujingsai/Receive", "type": "api" }, { - "id": 189, + "id": 190, "name": "kbzz/Apply", "type": "api" }, { - "id": 190, + "id": 191, "name": "kbzz/AutoApply", "type": "api" }, { - "id": 191, + "id": 192, "name": "kbzz/BuyNum", "type": "api" }, { - "id": 192, + "id": 193, "name": "kbzz/Fight", "type": "api" }, { - "id": 193, + "id": 194, "name": "kbzz/FightLog", "type": "api" }, { - "id": 194, + "id": 195, "name": "kbzz/GroupState", "type": "api" }, { - "id": 195, + "id": 196, "name": "kbzz/Open", "type": "api" }, { - "id": 196, + "id": 197, "name": "kbzz/RecPrize", "type": "api" }, { - "id": 197, + "id": 198, "name": "kbzz/Refresh", "type": "api", "conf": { @@ -2728,287 +2738,287 @@ export const serviceProto: ServiceProto = { } }, { - "id": 198, + "id": 199, "name": "kuangdong/AddPkNum", "type": "api" }, { - "id": 199, + "id": 200, "name": "kuangdong/GetPrize", "type": "api" }, { - "id": 200, + "id": 201, "name": "kuangdong/KdInfo", "type": "api" }, { - "id": 201, + "id": 202, "name": "kuangdong/Log", "type": "api" }, { - "id": 202, + "id": 203, "name": "kuangdong/Open", "type": "api" }, { - "id": 203, + "id": 204, "name": "kuangdong/YanShi", "type": "api" }, { - "id": 204, + "id": 205, "name": "kuangdong/ZhanLing", "type": "api" }, { - "id": 205, + "id": 206, "name": "lingzhulaixi/Open", "type": "api" }, { - "id": 206, + "id": 207, "name": "lingzhulaixi/PkBoss", "type": "api" }, { - "id": 207, + "id": 208, "name": "lingzhulaixi/PkRank", "type": "api" }, { - "id": 208, + "id": 209, "name": "lingzhulaixi/SaoDang", "type": "api" }, { - "id": 209, + "id": 210, "name": "meirishilian/Buy", "type": "api" }, { - "id": 210, + "id": 211, "name": "meirishilian/Fight", "type": "api" }, { - "id": 211, + "id": 212, "name": "meirishilian/Open", "type": "api" }, { - "id": 212, + "id": 213, "name": "msg_c2s/BindUid", "type": "msg" }, { - "id": 213, + "id": 214, "name": "msg_c2s/Pay", "type": "msg" }, { - "id": 214, + "id": 215, "name": "msg_c2s/Sync", "type": "msg" }, { - "id": 215, + "id": 216, "name": "msg_s2c/Chat", "type": "msg" }, { - "id": 216, + "id": 217, "name": "msg_s2c/ChatHelp", "type": "msg" }, { - "id": 217, + "id": 218, "name": "msg_s2c/Collection", "type": "msg" }, { - "id": 218, + "id": 219, "name": "msg_s2c/Email", "type": "msg" }, { - "id": 219, + "id": 220, "name": "msg_s2c/EmailDel", "type": "msg" }, { - "id": 220, + "id": 221, "name": "msg_s2c/EquipChange", "type": "msg" }, { - "id": 221, + "id": 222, "name": "msg_s2c/Friend", "type": "msg" }, { - "id": 222, + "id": 223, "name": "msg_s2c/GhChange", "type": "msg" }, { - "id": 223, + "id": 224, "name": "msg_s2c/GongHuiBaoZang", "type": "msg" }, { - "id": 224, + "id": 225, "name": "msg_s2c/HeroChange", "type": "msg" }, { - "id": 225, + "id": 226, "name": "msg_s2c/HongDianChange", "type": "msg" }, { - "id": 226, + "id": 227, "name": "msg_s2c/ItemChange", "type": "msg" }, { - "id": 227, + "id": 228, "name": "msg_s2c/LoginQueue", "type": "msg" }, { - "id": 228, + "id": 229, "name": "msg_s2c/LshdChange", "type": "msg" }, { - "id": 229, + "id": 230, "name": "msg_s2c/NewDay", "type": "msg" }, { - "id": 230, + "id": 231, "name": "msg_s2c/OtherLogin", "type": "msg" }, { - "id": 231, + "id": 232, "name": "msg_s2c/PayChange", "type": "msg" }, { - "id": 232, + "id": 233, "name": "msg_s2c/PayResult", "type": "msg" }, { - "id": 233, + "id": 234, "name": "msg_s2c/PeijianChange", "type": "msg" }, { - "id": 234, + "id": 235, "name": "msg_s2c/PlayerChange", "type": "msg" }, { - "id": 235, + "id": 236, "name": "msg_s2c/Private", "type": "msg" }, { - "id": 236, + "id": 237, "name": "msg_s2c/PushGiftChange", "type": "msg" }, { - "id": 237, + "id": 238, "name": "msg_s2c/SendGift", "type": "msg" }, { - "id": 238, + "id": 239, "name": "msg_s2c/ShiwuChange", "type": "msg" }, { - "id": 239, + "id": 240, "name": "msg_s2c/TaskChange", "type": "msg" }, { - "id": 240, + "id": 241, "name": "msg_s2c/Xianshilibao", "type": "msg" }, { - "id": 241, + "id": 242, "name": "pata/Fight", "type": "api" }, { - "id": 242, + "id": 243, "name": "pata/GetPrize", "type": "api" }, { - "id": 243, + "id": 244, "name": "pata/Open", "type": "api" }, { - "id": 244, + "id": 245, "name": "pata/SaoDang", "type": "api" }, { - "id": 245, + "id": 246, "name": "pay/GetList", "type": "api" }, { - "id": 246, + "id": 247, "name": "peijian/GetList", "type": "api" }, { - "id": 247, + "id": 248, "name": "peijian/JingLian", "type": "api" }, { - "id": 248, + "id": 249, "name": "peijian/JinJie", "type": "api" }, { - "id": 249, + "id": 250, "name": "peijian/LvUp", "type": "api" }, { - "id": 250, + "id": 251, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 251, + "id": 252, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 252, + "id": 253, "name": "peijian/Reset", "type": "api" }, { - "id": 253, + "id": 254, "name": "peijian/Rm", "type": "api" }, { - "id": 254, + "id": 255, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3016,32 +3026,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 255, + "id": 256, "name": "peijian/UnLock", "type": "api" }, { - "id": 256, + "id": 257, "name": "peijian/Wear", "type": "api" }, { - "id": 257, + "id": 258, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 258, + "id": 259, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 259, + "id": 260, "name": "peijiancangku/Open", "type": "api" }, { - "id": 260, + "id": 261, "name": "Bingo", "type": "api", "conf": { @@ -3049,142 +3059,142 @@ export const serviceProto: ServiceProto = { } }, { - "id": 261, + "id": 262, "name": "FightTest", "type": "api" }, { - "id": 262, + "id": 263, "name": "SyncBtn", "type": "api" }, { - "id": 263, + "id": 264, "name": "Test", "type": "api" }, { - "id": 264, + "id": 265, "name": "pushgift/Open", "type": "api" }, { - "id": 265, + "id": 266, "name": "qjzzd/Fight", "type": "api" }, { - "id": 266, + "id": 267, "name": "qjzzd/Open", "type": "api" }, { - "id": 267, + "id": 268, "name": "rank/Open", "type": "api" }, { - "id": 268, + "id": 269, "name": "shiwu/Concise", "type": "api" }, { - "id": 269, + "id": 270, "name": "shiwu/Extract", "type": "api" }, { - "id": 270, + "id": 271, "name": "shiwu/GetList", "type": "api" }, { - "id": 271, + "id": 272, "name": "shiwu/LvUp", "type": "api" }, { - "id": 272, + "id": 273, "name": "shiwu/Recast", "type": "api" }, { - "id": 273, + "id": 274, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 274, + "id": 275, "name": "shiwu/Wear", "type": "api" }, { - "id": 275, + "id": 276, "name": "shootGame/Open", "type": "api" }, { - "id": 276, + "id": 277, "name": "shootGame/Rec", "type": "api" }, { - "id": 277, + "id": 278, "name": "shop/Buy", "type": "api" }, { - "id": 278, + "id": 279, "name": "shop/Open", "type": "api" }, { - "id": 279, + "id": 280, "name": "shop/Refresh", "type": "api" }, { - "id": 280, + "id": 281, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 281, + "id": 282, "name": "sign/GetPrize", "type": "api" }, { - "id": 282, + "id": 283, "name": "sign/Open", "type": "api" }, { - "id": 283, + "id": 284, "name": "slzd/Aim", "type": "api" }, { - "id": 284, + "id": 285, "name": "slzd/BuyNum", "type": "api" }, { - "id": 285, + "id": 286, "name": "slzd/Fight", "type": "api" }, { - "id": 286, + "id": 287, "name": "slzd/FightLog", "type": "api" }, { - "id": 287, + "id": 288, "name": "slzd/MyRank", "type": "api" }, { - "id": 288, + "id": 289, "name": "slzd/Open", "type": "api", "conf": { @@ -3194,77 +3204,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": { @@ -3272,197 +3282,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" } @@ -10244,18 +10254,60 @@ export const serviceProto: ServiceProto = { "properties": [ { "id": 0, - "name": "day", + "name": "index", "type": { "type": "Number" } }, { "id": 1, - "name": "payIds", + "name": "sTime", + "type": { + "type": "Number" + } + }, + { + "id": 2, + "name": "recIndex", "type": { "type": "Array", "elementType": { - "type": "String" + "type": "Number" + } + } + }, + { + "id": 3, + "name": "payDay", + "type": { + "type": "Number" + } + } + ] + }, + "event/shiwuleichong/PtlRec/ReqRec": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "index", + "type": { + "type": "Number" + } + } + ] + }, + "event/shiwuleichong/PtlRec/ResRec": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "prize", + "type": { + "type": "Array", + "elementType": { + "type": "Reference", + "target": "type/prizeType" } } } From fa7fbbfdd0a066077e7702ffee3646a13ac1f4bf Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Mon, 18 Dec 2023 20:05:46 +0800 Subject: [PATCH 62/80] Revert "fix:" This reverts commit a6fb04ce581fc461ec08fb2f09a2bd73991ec9ab. --- src/api_s2c/event/shouchong/ApiOpen.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api_s2c/event/shouchong/ApiOpen.ts b/src/api_s2c/event/shouchong/ApiOpen.ts index a6e69d3..a93d02c 100644 --- a/src/api_s2c/event/shouchong/ApiOpen.ts +++ b/src/api_s2c/event/shouchong/ApiOpen.ts @@ -10,5 +10,5 @@ export default async function (call: ApiCall) { let pays = await PayFun.getPayLogs(call.uid, payIds) - call.succ({payIds: Object.keys(pays).filter((i) => pays[i].length > 0)}); + call.succ({payIds: Object.keys(pays)}); } \ No newline at end of file From 893008c1e7174bfc2d33d24bd73a1e3056963f8b Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Mon, 18 Dec 2023 20:06:33 +0800 Subject: [PATCH 63/80] Revert "fix:" This reverts commit d0600046092f246f3314dc77486cdcc9b2739f86. --- src/api_s2c/event/shiwuleichong/ApiOpen.ts | 64 +-- src/api_s2c/event/shiwuleichong/ApiRec.ts | 26 + src/api_s2c/hongdian/fun.ts | 40 +- src/jsonType.ts | 2 +- .../protocols/event/shiwuleichong/PtlOpen.ts | 14 +- .../protocols/event/shiwuleichong/PtlRec.ts | 13 + src/shared/protocols/serviceProto.ts | 539 +++++++++--------- 7 files changed, 374 insertions(+), 324 deletions(-) create mode 100644 src/api_s2c/event/shiwuleichong/ApiRec.ts create mode 100644 src/shared/protocols/event/shiwuleichong/PtlRec.ts diff --git a/src/api_s2c/event/shiwuleichong/ApiOpen.ts b/src/api_s2c/event/shiwuleichong/ApiOpen.ts index 5763d97..63aa21d 100644 --- a/src/api_s2c/event/shiwuleichong/ApiOpen.ts +++ b/src/api_s2c/event/shiwuleichong/ApiOpen.ts @@ -1,43 +1,41 @@ -import {ApiCall} from "tsrpc"; -import {ReqOpen, ResOpen} from "../../../shared/protocols/event/shiwuleichong/PtlOpen"; -import {PayFun} from "../../../public/pay"; -import {PublicShared} from "../../../shared/public/public"; - +import { UpdateFilter } from 'mongodb'; +import { ApiCall } from "tsrpc"; +import { CollectionEvent } from '../../../module/collection_event'; +import { PayFun } from '../../../public/pay'; +import { ReqOpen, ResOpen } from "../../../shared/protocols/event/shiwuleichong/PtlOpen"; +import { PublicShared } from '../../../shared/public/public'; export default async function (call: ApiCall) { - let payids = G.gc.shiwuleichong.tasks.map( - (i) => i.payid - ); + let db = await G.mongodb.cEvent('15leichong').findOne({ uid: call.uid, type: '15leichong' }); + let update: UpdateFilter>; + let sTime = PublicShared.getToDayZeroTime(G.time); - let day: number = 1; - let _zt = PublicShared.getToDayZeroTime(); - let pays = await PayFun.getPayLogs(call.uid, payids); - for (; day <= G.gc.shiwuleichong.tasks.length; day++) { - let pay = pays[G.gc.shiwuleichong.tasks[day].payid]; - if (!pay) { - break + if (!db) { + update = { + $set: { index: 0, sTime: sTime, recIndex: [] } + }; + } else { + if (db.sTime + G.gc.shiwuleichong.data[db.index].time < G.time) { + + db.sTime = sTime; + db.index = G.gc.shiwuleichong.data[db.index + 1] == undefined ? db.index : db.index + 1; + db.recIndex = []; + + update = { + $set: { index: db.index, sTime: db.sTime, recIndex: [] } + }; } else { - if (pay.slice(-1)[0].time >= _zt) { - break - } + sTime = db.sTime; } } - // 如果是最后一天奖励 并且 充值订单隔天了 - if ( - day == G.gc.shiwuleichong.tasks.length && - pays[G.gc.shiwuleichong.tasks[day - 1].payid] && - pays[G.gc.shiwuleichong.tasks[day - 1].payid].slice(-1)[0].time < _zt - ) { - // 重置所有订单 - await PayFun.delPayLog(call.uid, ...payids.map(i => { - return {payId: i, val: []} - })) - day = 1; - pays = {}; - } + + update && G.mongodb.cEvent('15leichong').updateOne({ uid: call.uid, type: '15leichong' }, update, { upsert: true }); + let index = db?.index || 0; call.succ({ - day: day, - payIds: Object.keys(pays) + index: index, + sTime: sTime, + recIndex: db?.recIndex || [], + payDay: await PayFun.getPayDaysBuyPayNum(call.uid, sTime, sTime + G.gc.shiwuleichong.data[index].time, G.gc.shiwuleichong.dayPayNeed) }); } \ No newline at end of file diff --git a/src/api_s2c/event/shiwuleichong/ApiRec.ts b/src/api_s2c/event/shiwuleichong/ApiRec.ts new file mode 100644 index 0000000..f9cf51e --- /dev/null +++ b/src/api_s2c/event/shiwuleichong/ApiRec.ts @@ -0,0 +1,26 @@ +import { ApiCall } from "tsrpc"; +import { PayFun } from '../../../public/pay'; +import { PlayerFun } from '../../../public/player'; +import { ReqRec, ResRec } from "../../../shared/protocols/event/shiwuleichong/PtlRec"; + +export default async function (call: ApiCall) { + let db = await G.mongodb.cEvent('15leichong').findOne({ uid: call.uid, type: '15leichong' }); + let confArr = G.gc.shiwuleichong.data[db.index]; + + if (!confArr.tasks[call.req.index]) return call.error('', { code: -1 }); + if (db.recIndex.includes(call.req.index)) return call.error('', { code: -2 }); + + let payDay = await PayFun.getPayDaysBuyPayNum(call.uid, db.sTime, db.sTime + confArr.time, G.gc.shiwuleichong.dayPayNeed); + if (payDay < confArr.tasks[call.req.index].total) return call.error('', { code: -3 }); + + await PlayerFun.sendPrize(call, confArr.tasks[call.req.index].prize); + + G.mongodb.cEvent('15leichong').updateOne( + { uid: call.uid, type: '15leichong' }, + { $push: { recIndex: call.req.index } } + ); + + call.succ({ + prize: confArr.tasks[call.req.index].prize + }); +} \ No newline at end of file diff --git a/src/api_s2c/hongdian/fun.ts b/src/api_s2c/hongdian/fun.ts index 4b58691..867eb16 100644 --- a/src/api_s2c/hongdian/fun.ts +++ b/src/api_s2c/hongdian/fun.ts @@ -877,7 +877,7 @@ export class HuoDongHongDianFun { } }; _res.val.meirijingxuan = await this.heiShiHongDian(call) - // _res.val.jitianhaoli = await this.heiShiLCHongDian(call) + _res.val.jitianhaoli = await this.heiShiLCHongDian(call) _res.val.niudanji = await this.heiShiNiuDanJi(call) Object.values(_res.val).forEach(x => _res.show = _res.show || x.show) return _res @@ -913,25 +913,25 @@ export class HuoDongHongDianFun { } /**黑市 积天豪礼 */ - // static async heiShiLCHongDian(call: ApiCall): Promise { - // let _res: hongdianVal = { - // show: false - // }; - // let db = await G.mongodb.cEvent('15leichong').findOne({uid: call.uid, type: '15leichong'}); - // - // if (!db) return _res; - // - // let _con = G.gc.shiwuleichong.data[db.index]; - // let payDay = await PayFun.getPayDaysBuyPayNum(call.uid, db.sTime, db.sTime + _con.time, G.gc.shiwuleichong.dayPayNeed); - // for (let index = 0; index < _con.tasks.length; index++) { - // const element = _con.tasks[index]; - // if (db.recIndex.includes(index)) continue; - // if (payDay < element.total) continue; - // _res.show = true; - // break; - // } - // return _res; - // } + static async heiShiLCHongDian(call: ApiCall): Promise { + let _res: hongdianVal = { + show: false + }; + let db = await G.mongodb.cEvent('15leichong').findOne({uid: call.uid, type: '15leichong'}); + + if (!db) return _res; + + let _con = G.gc.shiwuleichong.data[db.index]; + let payDay = await PayFun.getPayDaysBuyPayNum(call.uid, db.sTime, db.sTime + _con.time, G.gc.shiwuleichong.dayPayNeed); + for (let index = 0; index < _con.tasks.length; index++) { + const element = _con.tasks[index]; + if (db.recIndex.includes(index)) continue; + if (payDay < element.total) continue; + _res.show = true; + break; + } + return _res; + } /**黑市 扭蛋机 */ static async heiShiNiuDanJi(call: ApiCall): Promise { diff --git a/src/jsonType.ts b/src/jsonType.ts index 8788f60..3b8f547 100644 --- a/src/jsonType.ts +++ b/src/jsonType.ts @@ -1179,7 +1179,7 @@ type gc_shiwucom = { }, "comment": { "jichu_colour": string, "fujia_colour": string, "fujianum_colour": string, "putongxilian": string, "gaojixilian": string, "hero_zhuanshu": string, "buff_zhuanshu": string, "skill_zhuanshu": string, "chongzhuneed": string, "chongzhurate": string, "tilianhuobi": string, [x: string]: any }, [x: string]: any } -type gc_shiwuleichong = { tasks: { day: number, payid: string }[] } +type gc_shiwuleichong = { "dayPayNeed": number, "data": { "time": number, "tasks": { "total": number, "prize": { "a": string, "t": string, "n": number, [x: string]: any }[], [x: string]: any }[], [x: string]: any }[], [x: string]: any } type gc_shoot = { [key: string]: { "name": string, "num": number, "speed": number, "cartridge": number, "time": number, "prize": { [key: string]: { "describe": string, "hit": number, "content": { "a": string, "t": string, "n": number, [x: string]: any }[], [x: string]: any } }, [x: string]: any } } diff --git a/src/shared/protocols/event/shiwuleichong/PtlOpen.ts b/src/shared/protocols/event/shiwuleichong/PtlOpen.ts index baf05a9..5988d1b 100644 --- a/src/shared/protocols/event/shiwuleichong/PtlOpen.ts +++ b/src/shared/protocols/event/shiwuleichong/PtlOpen.ts @@ -1,10 +1,18 @@ + /** * 进入15天累充 */ -export type ReqOpen = {}; +export type ReqOpen = { + +}; export type ResOpen = { /**礼包组 取G.gc.shiwuleichong[index] */ - day: number; - payIds: string[]; + index: number; + /**开始时间 倒计时显示 sTime+G.gc.shiwuleichong[index].time */ + sTime: number; + /**已领取的奖励下标 */ + recIndex: number[]; + /**已充值的天数 */ + payDay: number; }; \ No newline at end of file diff --git a/src/shared/protocols/event/shiwuleichong/PtlRec.ts b/src/shared/protocols/event/shiwuleichong/PtlRec.ts new file mode 100644 index 0000000..0bf0af1 --- /dev/null +++ b/src/shared/protocols/event/shiwuleichong/PtlRec.ts @@ -0,0 +1,13 @@ +import { prizeType } from '../../type'; + + +/** + * 领取15天累充奖励 + */ +export type ReqRec = { + index: number; +}; + +export type ResRec = { + prize: prizeType[]; +}; \ No newline at end of file diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 24b5ff6..49e85ce 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -2024,66 +2024,71 @@ export const serviceProto: ServiceProto = { }, { "id": 76, - "name": "event/xianshizhaomu/Buy", + "name": "event/shouchong/Receive", "type": "api" }, { "id": 77, - "name": "event/xianshizhaomu/Duihuan", + "name": "event/xianshizhaomu/Buy", "type": "api" }, { "id": 78, - "name": "event/xianshizhaomu/Lottery", + "name": "event/xianshizhaomu/Duihuan", "type": "api" }, { "id": 79, - "name": "event/xianshizhaomu/Open", + "name": "event/xianshizhaomu/Lottery", "type": "api" }, { "id": 80, - "name": "event/xianshizhaomu/Rec", + "name": "event/xianshizhaomu/Open", "type": "api" }, { "id": 81, - "name": "event/xinshoulibao/Open", + "name": "event/xianshizhaomu/Rec", "type": "api" }, { "id": 82, - "name": "event/yangchengmubiao/Buy", + "name": "event/xinshoulibao/Open", "type": "api" }, { "id": 83, - "name": "event/yangchengmubiao/Open", + "name": "event/yangchengmubiao/Buy", "type": "api" }, { "id": 84, - "name": "event/yangchengmubiao/Rec", + "name": "event/yangchengmubiao/Open", "type": "api" }, { "id": 85, - "name": "event/yibaichou/Open", + "name": "event/yangchengmubiao/Rec", "type": "api" }, { "id": 86, - "name": "event/yibaichou/Rec", + "name": "event/yibaichou/Open", "type": "api" }, { "id": 87, - "name": "event/yibaichou/RecAll", + "name": "event/yibaichou/Rec", "type": "api" }, { "id": 88, + "name": "event/yibaichou/RecAll", + "type": "api" + }, + { + "id": 89, "name": "event/yuedujijin/Open", "type": "api", "conf": { @@ -2091,157 +2096,157 @@ export const serviceProto: ServiceProto = { } }, { - "id": 89, + "id": 90, "name": "event/yuedujijin/Rec", "type": "api" }, { - "id": 90, + "id": 91, "name": "event/zhanling/BuyLv", "type": "api" }, { - "id": 91, + "id": 92, "name": "event/zhanling/Open", "type": "api" }, { - "id": 92, + "id": 93, "name": "event/zhanling/RecPrize", "type": "api" }, { - "id": 93, + "id": 94, "name": "event/zhanling/RecTask", "type": "api" }, { - "id": 94, + "id": 95, "name": "event/zhoulibao/Open", "type": "api" }, { - "id": 95, + "id": 96, "name": "event/zhoumolibao/Open", "type": "api" }, { - "id": 96, + "id": 97, "name": "event/zhoumolibao/Receive", "type": "api" }, { - "id": 97, + "id": 98, "name": "event/zixuanlibao/Buy", "type": "api" }, { - "id": 98, + "id": 99, "name": "event/zixuanlibao/Open", "type": "api" }, { - "id": 99, + "id": 100, "name": "eventlist/hdGetList", "type": "api" }, { - "id": 100, + "id": 101, "name": "friend/Apply", "type": "api" }, { - "id": 101, + "id": 102, "name": "friend/Del", "type": "api" }, { - "id": 102, + "id": 103, "name": "friend/Gift", "type": "api" }, { - "id": 103, + "id": 104, "name": "friend/List", "type": "api" }, { - "id": 104, + "id": 105, "name": "friend/Open", "type": "api" }, { - "id": 105, + "id": 106, "name": "friend/Respond", "type": "api" }, { - "id": 106, + "id": 107, "name": "friend/RmBlackList", "type": "api" }, { - "id": 107, + "id": 108, "name": "friend/Search", "type": "api" }, { - "id": 108, + "id": 109, "name": "ganbutexun/Challenge", "type": "api" }, { - "id": 109, + "id": 110, "name": "ganbutexun/Open", "type": "api" }, { - "id": 110, + "id": 111, "name": "ganhai/Fast", "type": "api" }, { - "id": 111, + "id": 112, "name": "ganhai/Fight", "type": "api" }, { - "id": 112, + "id": 113, "name": "ganhai/Log", "type": "api" }, { - "id": 113, + "id": 114, "name": "ganhai/Open", "type": "api" }, { - "id": 114, + "id": 115, "name": "ganhai/Refresh", "type": "api" }, { - "id": 115, + "id": 116, "name": "ganhai/RefreshShip", "type": "api" }, { - "id": 116, + "id": 117, "name": "ganhai/Select", "type": "api" }, { - "id": 117, + "id": 118, "name": "gmapi/Gift", "type": "api" }, { - "id": 118, + "id": 119, "name": "gmapi/Post", "type": "api" }, { - "id": 119, + "id": 120, "name": "gonghui/Apply", "type": "api", "conf": { @@ -2251,7 +2256,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 120, + "id": 121, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2261,7 +2266,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 121, + "id": 122, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2271,7 +2276,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 122, + "id": 123, "name": "gonghui/Change", "type": "api", "conf": { @@ -2281,12 +2286,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 123, + "id": 124, "name": "gonghui/Create", "type": "api" }, { - "id": 124, + "id": 125, "name": "gonghui/Dissolve", "type": "api", "conf": { @@ -2296,7 +2301,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 125, + "id": 126, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2306,12 +2311,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 126, + "id": 127, "name": "gonghui/FbBuyNum", "type": "api" }, { - "id": 127, + "id": 128, "name": "gonghui/FbFight", "type": "api", "conf": { @@ -2321,7 +2326,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 128, + "id": 129, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2331,17 +2336,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 129, + "id": 130, "name": "gonghui/GetList", "type": "api" }, { - "id": 130, + "id": 131, "name": "gonghui/Join", "type": "api" }, { - "id": 131, + "id": 132, "name": "gonghui/Jx", "type": "api", "conf": { @@ -2351,7 +2356,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 132, + "id": 133, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2361,7 +2366,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 133, + "id": 134, "name": "gonghui/List", "type": "api", "conf": { @@ -2371,7 +2376,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 134, + "id": 135, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2381,7 +2386,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 135, + "id": 136, "name": "gonghui/Open", "type": "api", "conf": { @@ -2391,7 +2396,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 136, + "id": 137, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2401,7 +2406,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 137, + "id": 138, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2411,7 +2416,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 138, + "id": 139, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2421,7 +2426,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 139, + "id": 140, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2431,137 +2436,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 140, + "id": 141, "name": "gonghuibaozang/Lottery", "type": "api" }, { - "id": 141, + "id": 142, "name": "gonghuibaozang/Open", "type": "api" }, { - "id": 142, + "id": 143, "name": "gonglukuangbiao/Buy", "type": "api" }, { - "id": 143, + "id": 144, "name": "gonglukuangbiao/Fight", "type": "api" }, { - "id": 144, + "id": 145, "name": "gonglukuangbiao/Open", "type": "api" }, { - "id": 145, + "id": 146, "name": "gonglukuangbiao/Refresh", "type": "api" }, { - "id": 146, + "id": 147, "name": "gongyu/mingdao/Active", "type": "api" }, { - "id": 147, + "id": 148, "name": "gongyu/mingdao/Open", "type": "api" }, { - "id": 148, + "id": 149, "name": "gongyu/mingdao/RecPrize", "type": "api" }, { - "id": 149, + "id": 150, "name": "gongyu/mingdao/Repair", "type": "api" }, { - "id": 150, + "id": 151, "name": "gongyu/xunlianjihua/Reset", "type": "api" }, { - "id": 151, + "id": 152, "name": "gongyu/xunlianjihua/UpSkill", "type": "api" }, { - "id": 152, + "id": 153, "name": "gongyu/zuozhanjihua/SetSkill", "type": "api" }, { - "id": 153, + "id": 154, "name": "hbzb/jfs/BuyNum", "type": "api" }, { - "id": 154, + "id": 155, "name": "hbzb/jfs/Fight", "type": "api" }, { - "id": 155, + "id": 156, "name": "hbzb/jfs/GetLog", "type": "api" }, { - "id": 156, + "id": 157, "name": "hbzb/jfs/Open", "type": "api" }, { - "id": 157, + "id": 158, "name": "hbzb/jfs/Rec", "type": "api" }, { - "id": 158, + "id": 159, "name": "hbzb/jfs/Refresh", "type": "api" }, { - "id": 159, + "id": 160, "name": "hbzb/GetStatus", "type": "api" }, { - "id": 160, + "id": 161, "name": "hbzb/zbs/BuyNum", "type": "api" }, { - "id": 161, + "id": 162, "name": "hbzb/zbs/Fight", "type": "api" }, { - "id": 162, + "id": 163, "name": "hbzb/zbs/GetLog", "type": "api" }, { - "id": 163, + "id": 164, "name": "hbzb/zbs/Open", "type": "api" }, { - "id": 164, + "id": 165, "name": "hbzb/zbs/Refresh", "type": "api" }, { - "id": 165, + "id": 166, "name": "hero/Awake", "type": "api" }, { - "id": 166, + "id": 167, "name": "hero/ChangePos", "type": "api", "conf": { @@ -2569,17 +2574,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 167, + "id": 168, "name": "hero/GetList", "type": "api" }, { - "id": 168, + "id": 169, "name": "hero/JinJie", "type": "api" }, { - "id": 169, + "id": 170, "name": "hero/LvUp", "type": "api", "conf": { @@ -2587,32 +2592,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 170, + "id": 171, "name": "hero/Potency", "type": "api" }, { - "id": 171, + "id": 172, "name": "hero/Rec", "type": "api" }, { - "id": 172, + "id": 173, "name": "hero/Reset", "type": "api" }, { - "id": 173, + "id": 174, "name": "hero/Talent", "type": "api" }, { - "id": 174, + "id": 175, "name": "hero/WeaponUp", "type": "api" }, { - "id": 175, + "id": 176, "name": "hongdian/Get", "type": "api", "conf": { @@ -2620,117 +2625,117 @@ export const serviceProto: ServiceProto = { } }, { - "id": 176, + "id": 177, "name": "item/GetList", "type": "api" }, { - "id": 177, + "id": 178, "name": "item/Use", "type": "api" }, { - "id": 178, + "id": 179, "name": "jiaotang/Lottery", "type": "api" }, { - "id": 179, + "id": 180, "name": "jiaotang/Open", "type": "api" }, { - "id": 180, + "id": 181, "name": "jiuba/Lottery", "type": "api" }, { - "id": 181, + "id": 182, "name": "jiuba/Open", "type": "api" }, { - "id": 182, + "id": 183, "name": "jjc/BuyFightNum", "type": "api" }, { - "id": 183, + "id": 184, "name": "jjc/Fight", "type": "api" }, { - "id": 184, + "id": 185, "name": "jjc/FightLog", "type": "api" }, { - "id": 185, + "id": 186, "name": "jjc/Open", "type": "api" }, { - "id": 186, + "id": 187, "name": "jjc/Receive", "type": "api" }, { - "id": 187, + "id": 188, "name": "jjc/Refresh", "type": "api" }, { - "id": 188, + "id": 189, "name": "kaifujingsai/Open", "type": "api" }, { - "id": 189, + "id": 190, "name": "kaifujingsai/Receive", "type": "api" }, { - "id": 190, + "id": 191, "name": "kbzz/Apply", "type": "api" }, { - "id": 191, + "id": 192, "name": "kbzz/AutoApply", "type": "api" }, { - "id": 192, + "id": 193, "name": "kbzz/BuyNum", "type": "api" }, { - "id": 193, + "id": 194, "name": "kbzz/Fight", "type": "api" }, { - "id": 194, + "id": 195, "name": "kbzz/FightLog", "type": "api" }, { - "id": 195, + "id": 196, "name": "kbzz/GroupState", "type": "api" }, { - "id": 196, + "id": 197, "name": "kbzz/Open", "type": "api" }, { - "id": 197, + "id": 198, "name": "kbzz/RecPrize", "type": "api" }, { - "id": 198, + "id": 199, "name": "kbzz/Refresh", "type": "api", "conf": { @@ -2738,287 +2743,287 @@ export const serviceProto: ServiceProto = { } }, { - "id": 199, + "id": 200, "name": "kuangdong/AddPkNum", "type": "api" }, { - "id": 200, + "id": 201, "name": "kuangdong/GetPrize", "type": "api" }, { - "id": 201, + "id": 202, "name": "kuangdong/KdInfo", "type": "api" }, { - "id": 202, + "id": 203, "name": "kuangdong/Log", "type": "api" }, { - "id": 203, + "id": 204, "name": "kuangdong/Open", "type": "api" }, { - "id": 204, + "id": 205, "name": "kuangdong/YanShi", "type": "api" }, { - "id": 205, + "id": 206, "name": "kuangdong/ZhanLing", "type": "api" }, { - "id": 206, + "id": 207, "name": "lingzhulaixi/Open", "type": "api" }, { - "id": 207, + "id": 208, "name": "lingzhulaixi/PkBoss", "type": "api" }, { - "id": 208, + "id": 209, "name": "lingzhulaixi/PkRank", "type": "api" }, { - "id": 209, + "id": 210, "name": "lingzhulaixi/SaoDang", "type": "api" }, { - "id": 210, + "id": 211, "name": "meirishilian/Buy", "type": "api" }, { - "id": 211, + "id": 212, "name": "meirishilian/Fight", "type": "api" }, { - "id": 212, + "id": 213, "name": "meirishilian/Open", "type": "api" }, { - "id": 213, + "id": 214, "name": "msg_c2s/BindUid", "type": "msg" }, { - "id": 214, + "id": 215, "name": "msg_c2s/Pay", "type": "msg" }, { - "id": 215, + "id": 216, "name": "msg_c2s/Sync", "type": "msg" }, { - "id": 216, + "id": 217, "name": "msg_s2c/Chat", "type": "msg" }, { - "id": 217, + "id": 218, "name": "msg_s2c/ChatHelp", "type": "msg" }, { - "id": 218, + "id": 219, "name": "msg_s2c/Collection", "type": "msg" }, { - "id": 219, + "id": 220, "name": "msg_s2c/Email", "type": "msg" }, { - "id": 220, + "id": 221, "name": "msg_s2c/EmailDel", "type": "msg" }, { - "id": 221, + "id": 222, "name": "msg_s2c/EquipChange", "type": "msg" }, { - "id": 222, + "id": 223, "name": "msg_s2c/Friend", "type": "msg" }, { - "id": 223, + "id": 224, "name": "msg_s2c/GhChange", "type": "msg" }, { - "id": 224, + "id": 225, "name": "msg_s2c/GongHuiBaoZang", "type": "msg" }, { - "id": 225, + "id": 226, "name": "msg_s2c/HeroChange", "type": "msg" }, { - "id": 226, + "id": 227, "name": "msg_s2c/HongDianChange", "type": "msg" }, { - "id": 227, + "id": 228, "name": "msg_s2c/ItemChange", "type": "msg" }, { - "id": 228, + "id": 229, "name": "msg_s2c/LoginQueue", "type": "msg" }, { - "id": 229, + "id": 230, "name": "msg_s2c/LshdChange", "type": "msg" }, { - "id": 230, + "id": 231, "name": "msg_s2c/NewDay", "type": "msg" }, { - "id": 231, + "id": 232, "name": "msg_s2c/OtherLogin", "type": "msg" }, { - "id": 232, + "id": 233, "name": "msg_s2c/PayChange", "type": "msg" }, { - "id": 233, + "id": 234, "name": "msg_s2c/PayResult", "type": "msg" }, { - "id": 234, + "id": 235, "name": "msg_s2c/PeijianChange", "type": "msg" }, { - "id": 235, + "id": 236, "name": "msg_s2c/PlayerChange", "type": "msg" }, { - "id": 236, + "id": 237, "name": "msg_s2c/Private", "type": "msg" }, { - "id": 237, + "id": 238, "name": "msg_s2c/PushGiftChange", "type": "msg" }, { - "id": 238, + "id": 239, "name": "msg_s2c/SendGift", "type": "msg" }, { - "id": 239, + "id": 240, "name": "msg_s2c/ShiwuChange", "type": "msg" }, { - "id": 240, + "id": 241, "name": "msg_s2c/TaskChange", "type": "msg" }, { - "id": 241, + "id": 242, "name": "msg_s2c/Xianshilibao", "type": "msg" }, { - "id": 242, + "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": { @@ -3026,32 +3031,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": { @@ -3059,142 +3064,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": { @@ -3204,77 +3209,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": { @@ -3282,197 +3287,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" } From fe898ca42c65ca2d49fb0f53f2134753c7a0deec Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Mon, 18 Dec 2023 20:06:40 +0800 Subject: [PATCH 64/80] Revert "fix:" This reverts commit 4fc0da4a702ae4fdf94363da1ff6f0b7a36c716f. --- src/api_s2c/event/shouchong/ApiOpen.ts | 17 +- src/api_s2c/event/shouchong/ApiReceive.ts | 56 +++++ src/patch_reset_shouchong.ts | 200 ------------------ src/path_shop_redis2db.ts | 30 +++ .../protocols/event/shouchong/PtlOpen.ts | 5 +- .../protocols/event/shouchong/PtlReceive.ts | 13 ++ 6 files changed, 110 insertions(+), 211 deletions(-) create mode 100644 src/api_s2c/event/shouchong/ApiReceive.ts delete mode 100644 src/patch_reset_shouchong.ts create mode 100644 src/path_shop_redis2db.ts create mode 100644 src/shared/protocols/event/shouchong/PtlReceive.ts diff --git a/src/api_s2c/event/shouchong/ApiOpen.ts b/src/api_s2c/event/shouchong/ApiOpen.ts index a93d02c..010d12f 100644 --- a/src/api_s2c/event/shouchong/ApiOpen.ts +++ b/src/api_s2c/event/shouchong/ApiOpen.ts @@ -1,14 +1,11 @@ -import {ApiCall} from "tsrpc"; -import {ReqOpen, ResOpen} from "../../../shared/protocols/event/shouchong/PtlOpen"; -import {PayFun} from "../../../public/pay"; +import { ApiCall } from "tsrpc"; +import { ReqOpen, ResOpen } from "../../../shared/protocols/event/shouchong/PtlOpen"; export default async function (call: ApiCall) { - let payIds = []; - for (let k in G.gc.shouchong) { - payIds.push(G.gc.shouchong[k].payid) - } + let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' }); - let pays = await PayFun.getPayLogs(call.uid, payIds) - - call.succ({payIds: Object.keys(pays)}); + call.succ({ + payNum: call.conn.gud.payExp / 10, + receive: Object.fromEntries(Object.keys(G.gc.shouchong).map(k => [k, data?.receive?.[k] || []])) + }); } \ No newline at end of file diff --git a/src/api_s2c/event/shouchong/ApiReceive.ts b/src/api_s2c/event/shouchong/ApiReceive.ts new file mode 100644 index 0000000..6e29d12 --- /dev/null +++ b/src/api_s2c/event/shouchong/ApiReceive.ts @@ -0,0 +1,56 @@ +import { ApiCall } from "tsrpc"; +import { PlayerFun } from '../../../public/player'; +import { ReqReceive, ResReceive } from "../../../shared/protocols/event/shouchong/PtlReceive"; +import { PublicShared } from '../../../shared/public/public'; +import { HongDianChange } from "../../hongdian/fun"; + +export default async function (call: ApiCall) { + + let conf = G.gc.shouchong[call.req.k]; + + if (!conf) return call.error(globalThis.lng.pata_getprize_1); + + let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' }); + + let recArr = data?.receive?.[call.req.k] || []; + + if (call.conn.gud.payExp < conf.paynum) return call.error(globalThis.lng.event_kfkh_9); + + if (recArr.length >= conf.prize.length) return call.error(globalThis.lng.event_kfkh_3); + + if (recArr.slice(-1)[0] && PublicShared.getToDayZeroTime() < recArr.slice(-1)[0]) return call.error(globalThis.lng.event_kfkh_10); + + await PlayerFun.sendPrize(call, conf.prize[recArr.length]); + await G.mongodb.cEvent('shouchong').updateOne( + { uid: call.uid, type: 'shouchong' }, + { $push: G.mongodb.createTreeObj({ key: 'receive', k: call.req.k, val: G.time }) }, + { upsert: true } + ); + + let recLen = data != null ? Object.values(data.receive).map(arr => arr.length).reduce((a, b) => a + b) + 1 : 1; + let allLen = Object.values(G.gc.shouchong).map(conf => conf.prize.length as number).reduce((a, b) => a + b); + if (data && recLen >= allLen) { + G.mongodb.collection('syncBtns').updateOne({ uid: call.uid }, { $set: { 'shouchong.active': false } }, { upsert: true }); + } + HongDianChange.sendChangeKey(call.uid, ['shouchong']) + + call.succ({ + prize: conf.prize[recArr.length] + }); +} + +export async function getShouChongRedPoint(call: ApiCall) { + let res = { show: false }; + let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' }); + + for (let [id, conf] of Object.entries(G.gc.shouchong)) { + let rec = data?.receive?.[id] || []; + if (call.conn.gud.payExp / 10 < conf.paynum || rec.length >= conf.prize.length) continue; + if (rec.length == 0 || rec.slice(-1)[0] < PublicShared.getToDayZeroTime(G.time)) { + res = { show: true }; + break; + } + } + + return res; +} \ No newline at end of file diff --git a/src/patch_reset_shouchong.ts b/src/patch_reset_shouchong.ts deleted file mode 100644 index 4f08542..0000000 --- a/src/patch_reset_shouchong.ts +++ /dev/null @@ -1,200 +0,0 @@ -import {ctor} from './global'; -import {initMongoDB} from './setMongodb'; -import {EmailFun} from "./public/email"; - -const shouchong = { - "shouchong1": { - "paynum": 6, - "cartoon": { - "hero": 5001 - }, - "prize": [ - [ - { - "a": "hero", - "t": "5001", - "n": 1 - }, - { - "a": "attr", - "t": "jinbi", - "n": 100000 - } - ], - [ - { - "a": "item", - "t": "12", - "n": 200 - }, - { - "a": "attr", - "t": "jinbi", - "n": 200000 - } - ], - [ - { - "a": "item", - "t": "12", - "n": 200 - }, - { - "a": "attr", - "t": "jinbi", - "n": 300000 - } - ] - ] - }, - "shouchong2": { - "paynum": 30, - "cartoon": { - "img": 5001 - }, - "prize": [ - [ - { - "a": "equip", - "t": "1009", - "n": 1 - }, - { - "a": "equip", - "t": "2009", - "n": 1 - } - ], - [ - { - "a": "equip", - "t": "3009", - "n": 1 - }, - { - "a": "item", - "t": "2", - "n": 1000 - } - ], - [ - { - "a": "equip", - "t": "4009", - "n": 1 - }, - { - "a": "item", - "t": "2", - "n": 1000 - } - ] - ] - }, - "shouchong3": { - "paynum": 98, - "cartoon": { - "hero": 5002 - }, - "prize": [ - [ - { - "a": "hero", - "t": "5002", - "n": 1 - }, - { - "a": "item", - "t": "4", - "n": 10 - } - ], - [ - { - "a": "equip", - "t": "1010", - "n": 1 - }, - { - "a": "item", - "t": "2", - "n": 2000 - } - ], - [ - { - "a": "equip", - "t": "3010", - "n": 1 - }, - { - "a": "item", - "t": "2", - "n": 2000 - } - ] - ] - } -} - -async function start() { - //连接mongodb - await initMongoDB(); - let users = await G.mongodb.collection("user").find({}, { - projection: {uid: 1, payExp: 1} - }).toArray() - - for (let i = 0; i < users.length; i++) { - let user = users[i]; - let data = await G.mongodb.cEvent("shouchong").findOne({uid: user.uid}); - - let send_prize = []; - for (let key in shouchong) { - // 充值不足 - if (user.payExp < shouchong[key]["paynum"] * 10) { - continue - } - - // 奖励已经领取完毕 - if (data && data.receive[key] && data.receive[key].length >= shouchong[key]["prize"].length) { - continue - } - - // 补发未领取奖励 - for (let i = 0; i < shouchong[key]["prize"].length; i++) { - if (data.receive[key][i]) { - continue - } - data.receive[key][i] = G.time; - send_prize.concat(shouchong[key]["prize"][i]); - } - } - if (send_prize.length <= 0) continue; - - let title = "首充未领取奖励补发"; - let content = "首充未领取奖励补发"; - - // 设置奖励发放记录 - await G.mongodb.cEvent("shouchong").updateOne({ - uid: user.uid - }, {"$set": {receive: data.receive}}); - - // 发放邮件 - await EmailFun.addEmail({ - uid: user.uid, - type: "system", - title: title, - content: content, - prize: send_prize, - }) - } -} - -//定义全局变量 -ctor(); -//启动服务 -start().then(() => { - process.exit() -}); - - diff --git a/src/path_shop_redis2db.ts b/src/path_shop_redis2db.ts new file mode 100644 index 0000000..ab437f2 --- /dev/null +++ b/src/path_shop_redis2db.ts @@ -0,0 +1,30 @@ +import {ctor} from './global'; +import {initMongoDB} from './setMongodb'; +import {initRedis} from './setRedis'; + +async function start() { + //连接mongodb + await initMongoDB(); + //连接redis + await initRedis(); + + let shopdata = await G.redis.get("shop") + + for (let uid in shopdata) { + for (let shopId in shopdata[uid]) { + + await G.mongodb.collection("shop").updateOne( + {uid: uid.slice(1), shopId: shopId.slice(1)}, + {$set: shopdata[uid][shopId]}, {upsert: true} + ) + console.log(`玩家${uid.slice(1)}商店${shopId.slice(1)}数据写入成功！！`) + } + } +} + +//定义全局变量 +ctor(); +//启动服务 +start().then(() => {process.exit()}); + + diff --git a/src/shared/protocols/event/shouchong/PtlOpen.ts b/src/shared/protocols/event/shouchong/PtlOpen.ts index 36c207e..cad5f93 100644 --- a/src/shared/protocols/event/shouchong/PtlOpen.ts +++ b/src/shared/protocols/event/shouchong/PtlOpen.ts @@ -8,5 +8,8 @@ export type ReqOpen = { }; export type ResOpen = { - payIds: string[]; + payNum: number; + receive: { + [k: string]: number[]; + }; }; \ No newline at end of file diff --git a/src/shared/protocols/event/shouchong/PtlReceive.ts b/src/shared/protocols/event/shouchong/PtlReceive.ts new file mode 100644 index 0000000..45af650 --- /dev/null +++ b/src/shared/protocols/event/shouchong/PtlReceive.ts @@ -0,0 +1,13 @@ +import { prizeType } from '../../type'; + + +/** + * 领取 + */ +export type ReqReceive = { + k: string; +}; + +export type ResReceive = { + prize: prizeType[]; +}; \ No newline at end of file From cddda8288e8286e077945d16d4441046a6ef46c3 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Mon, 18 Dec 2023 20:06:54 +0800 Subject: [PATCH 65/80] Revert "fix bug" This reverts commit 0b18e39dd75e28b086a4bd2c3f5722ca15f4c4ae. --- 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 df17ba9..fee6481 100644 --- a/src/json/huodong.json5 +++ b/src/json/huodong.json5 @@ -3408,7 +3408,7 @@ "hdid" : 9000, // 唯一活动id 周末礼包 "htype" : 9, // 后端唯一识别标识 "stype" : 900, // 前端唯一识别标识（看前端需要是否修改） - "ttype" : 4, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动 + "ttype" : 0, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动 "stime" : 0, // 活动开始天数 "rtime" : 30, // 活动显示结束天数 "etime" : 30, // 活动实际结束 From c282ece109dd987633b3aaf3da67ac226c05938e Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Mon, 18 Dec 2023 20:08:27 +0800 Subject: [PATCH 66/80] Revert "feat:" This reverts commit e99b5dad155cd87e3c2c0c5acb1522a2aa4a7695. --- src/public/fight.ts | 2 +- src/public/pushgift.ts | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/public/fight.ts b/src/public/fight.ts index c2388b5..c13c029 100644 --- a/src/public/fight.ts +++ b/src/public/fight.ts @@ -118,7 +118,7 @@ export class FightFun { // 主线 爬塔 战败触发推送礼包 if (result.winSide != 0 && ["tanxian", "pata"].includes(type)) { - PushGiftFun.chkLoseGift(call.uid) + PushGiftFun.chkLoseGift(data[0].player.uid) } return result } diff --git a/src/public/pushgift.ts b/src/public/pushgift.ts index 22fb397..e003088 100644 --- a/src/public/pushgift.ts +++ b/src/public/pushgift.ts @@ -54,7 +54,7 @@ export class PushGiftFun { let gift_ids = []; for (let id in G.gc.tuisonglibao) { let conf = G.gc.tuisonglibao[id]; - if (conf.type == PushGiftType.LvGift && conf.num[0] == lv) { + if (conf.type == PushGiftType.LevelGift && conf.num[0] == lv) { gift_ids.push(id); } } @@ -157,23 +157,17 @@ export class PushGiftFun { // 购买礼包 let gift; for (let gift_id in G.gc.tuisonglibao) { - let temp = G.gc.tuisonglibao[gift_id]; - if (temp.payId.includes(payId)) { - gift = temp; - break - } + gift = G.gc.tuisonglibao[gift_id]; + if (gift.payId.includes(payId)) break; } - if (!gift) return; let index = gift.payId.indexOf(payId); let info = await G.mongodb.collection("pushgift").findOne({ uid: uid, id: gift.id.toString() }) if (info.passTime >= G.time) { - await G.mongodb.collection("pushgift").updateOne({ + G.mongodb.collection("pushgift").updateOne({ uid: uid, id: gift.id.toString() }, {$inc: {[`buy.${index}`]: 1}}) - // 推送客户端消息 - G.server.sendMsgByUid(uid, "msg_s2c/PushGiftChange", 1); } } } \ No newline at end of file From ce5836be83cfd72acf26a6ef64d8681371257851 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Mon, 18 Dec 2023 20:08:30 +0800 Subject: [PATCH 67/80] Revert "feat:" This reverts commit ef90c131f344f05b780a2d6835453cdef7581539. --- src/globalListener.ts | 2 -- src/public/pushgift.ts | 18 ------------------ 2 files changed, 20 deletions(-) diff --git a/src/globalListener.ts b/src/globalListener.ts index a5a750f..2c3aa37 100644 --- a/src/globalListener.ts +++ b/src/globalListener.ts @@ -17,7 +17,6 @@ import { PublicShared } from './shared/public/public'; import { setGud } from './public/gud'; import {checkResetBuyLog} from "./api_s2c/event/zhoumolibao/ApiOpen"; import {Christmasfun} from "./api_s2c/event/christmas/fun"; -import {PushGiftFun} from "./public/pushgift"; export type gEventType = { /**玩家断开连接 */ @@ -199,7 +198,6 @@ export function addListener() { { $inc: { payNum: conf.money } }, { upsert: true } ); - PushGiftFun.buy(player.uid, payId) // 推送礼包 }); G.on("FIRST_LOGIN_EVERY_DAY", (gud, lastTime, curTime) => { diff --git a/src/public/pushgift.ts b/src/public/pushgift.ts index e003088..72fcfde 100644 --- a/src/public/pushgift.ts +++ b/src/public/pushgift.ts @@ -152,22 +152,4 @@ export class PushGiftFun { // 推送客户端消息 G.server.sendMsgByUid(uid, "msg_s2c/PushGiftChange", 1); } - - static async buy(uid: string, payId: string) { - // 购买礼包 - let gift; - for (let gift_id in G.gc.tuisonglibao) { - gift = G.gc.tuisonglibao[gift_id]; - if (gift.payId.includes(payId)) break; - } - let index = gift.payId.indexOf(payId); - let info = await G.mongodb.collection("pushgift").findOne({ - uid: uid, id: gift.id.toString() - }) - if (info.passTime >= G.time) { - G.mongodb.collection("pushgift").updateOne({ - uid: uid, id: gift.id.toString() - }, {$inc: {[`buy.${index}`]: 1}}) - } - } } \ No newline at end of file From 79fcc6ec85f8ea05843b833623d33c73e655a02a Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Mon, 18 Dec 2023 20:09:56 +0800 Subject: [PATCH 68/80] =?UTF-8?q?Revert=20"feat:=201.=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E7=A4=BC=E5=8C=85"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5d9ece05 --- src/api_s2c/jiuba/ApiLottery.ts | 5 - src/api_s2c/pushgift/ApiOpen.ts | 29 -- src/jsonType.ts | 19 - src/module/collection_pushgift.ts | 13 - src/module/mongodb.ts | 2 - src/public/fight.ts | 20 +- src/public/player.ts | 64 +-- src/public/pushgift.ts | 155 ------ .../protocols/msg_s2c/MsgPushGiftChange.ts | 1 - src/shared/protocols/pushgift/PtlOpen.ts | 5 - src/shared/protocols/serviceProto.ts | 450 ++++++++---------- 11 files changed, 224 insertions(+), 539 deletions(-) delete mode 100644 src/api_s2c/pushgift/ApiOpen.ts delete mode 100644 src/module/collection_pushgift.ts delete mode 100644 src/public/pushgift.ts delete mode 100644 src/shared/protocols/msg_s2c/MsgPushGiftChange.ts delete mode 100644 src/shared/protocols/pushgift/PtlOpen.ts diff --git a/src/api_s2c/jiuba/ApiLottery.ts b/src/api_s2c/jiuba/ApiLottery.ts index 89266e0..968cd79 100644 --- a/src/api_s2c/jiuba/ApiLottery.ts +++ b/src/api_s2c/jiuba/ApiLottery.ts @@ -9,7 +9,6 @@ import {ReqLottery, ResLottery} from "../../shared/protocols/jiuba/PtlLottery"; import {PublicShared} from '../../shared/public/public'; import {HongDianChange} from '../hongdian/fun'; import {RankKfjs} from "../../public/rank/rank_kfjs"; -import {PushGiftFun} from "../../public/pushgift"; export default async function (call: ApiCall) { @@ -143,8 +142,4 @@ export default async function (call: ApiCall) { valArr: [await rankKfjs.getRankScore(call.uid) + call.req.type] }); - // 十连抽推送礼包 - if (call.req.type == 10) { - PushGiftFun.chkRecruitGift(call.uid) - } } \ No newline at end of file diff --git a/src/api_s2c/pushgift/ApiOpen.ts b/src/api_s2c/pushgift/ApiOpen.ts deleted file mode 100644 index 58d85b2..0000000 --- a/src/api_s2c/pushgift/ApiOpen.ts +++ /dev/null @@ -1,29 +0,0 @@ -import {ApiCall} from "tsrpc"; -import {ReqOpen, ResOpen} from "../../shared/protocols/pushgift/PtlOpen"; -import {PushGiftFun} from "../../public/pushgift"; -import {Gift} from "../../module/collection_pushgift"; - -export default async function (call: ApiCall) { - let res: ResOpen = {gifts: []}; - - // 过滤过期的礼包 和购买完毕的礼包 - (await PushGiftFun.getGift(call.uid)).forEach((gift) => { - if (gift.passTime > G.time && chkBuyNum(gift.id, gift)) { - res.gifts.push(gift) - } - }) - - call.succ(res) -} - -function chkBuyNum(gift_id: string, gift_info: Gift) { - let conf = G.gc.tuisonglibao[gift_id]; - for (let i = 0; i < conf.payId.length; i++) { - let pay = G.gc.pay[conf.payId[i]]; - if (pay.buys > 0 && gift_info.buy[i] < pay.buys) { - return true - } - } - - return false -} \ No newline at end of file diff --git a/src/jsonType.ts b/src/jsonType.ts index 3b8f547..8f8eb88 100644 --- a/src/jsonType.ts +++ b/src/jsonType.ts @@ -1773,24 +1773,6 @@ type gc_yuyuemail = { 'prize': { "a": string, "t": string, "n": number, [x: string]: any }[] }; -type gc_push_gift = { - [k: string]: { - /**礼包id*/ - id: number - /**礼包类型*/ - type: number - /**礼包参数*/ - num: any[] - /**购买id*/ - payId: string[] - /**持续时间*/ - time: number - /**冷却时间*/ - displayCD: number - /**显示返利比*/ - scale: number - } -} type gcType = { [key: string]: any @@ -1940,7 +1922,6 @@ type gcType = { kfcb_content: gc_kfcb_content kfcb_prize: gc_kfcb_prize yuyuemail: gc_yuyuemail - tuisonglibao: gc_push_gift } diff --git a/src/module/collection_pushgift.ts b/src/module/collection_pushgift.ts deleted file mode 100644 index c62fff0..0000000 --- a/src/module/collection_pushgift.ts +++ /dev/null @@ -1,13 +0,0 @@ -import {ObjectId} from "mongodb"; -import {ResOpen} from "../shared/protocols/pushgift/PtlOpen"; - -export type Gift = { - id: string - uid: string - buy: number[] - ctime: number - passTime: number - ext_data: { [key: string]: any } -} - -export type CollectionPushGift = Gift & { _id: ObjectId }; \ No newline at end of file diff --git a/src/module/mongodb.ts b/src/module/mongodb.ts index 5d8c8ac..f912ad7 100644 --- a/src/module/mongodb.ts +++ b/src/module/mongodb.ts @@ -59,7 +59,6 @@ import {CollectionPlayerBehavior} from "./collection_player_behavior"; import {CollectionRmbuse} from "./collection_rmbuse"; import {CollectionFightLog} from "./collection_fightLog"; import {CollectionShop} from "./collection_shop"; -import {CollectionPushGift} from "./collection_pushgift"; export type MongodbCollections = { user: CollectionUser; @@ -132,5 +131,4 @@ export type MongodbCollections = { rmbuse: CollectionRmbuse fightLog: CollectionFightLog shop: CollectionShop - pushgift:CollectionPushGift }; \ No newline at end of file diff --git a/src/public/fight.ts b/src/public/fight.ts index c13c029..202369c 100644 --- a/src/public/fight.ts +++ b/src/public/fight.ts @@ -9,7 +9,6 @@ import {HeroFun} from './hero'; import {UserFun} from './user'; import {re, string} from "mathjs"; import {getGud} from './gud'; -import {PushGiftFun} from "./pushgift"; type fightType = 'tanxian' | 'pata' | 'jjc' | 'gbtx' | 'qjzzd' | 'meirishilian' | 'wzrycross'; @@ -87,16 +86,9 @@ export class FightFun { /**挑战竞技场 */ static async fightJJc(call: ApiCall, rankInfo: rankInfo) { + if (rankInfo.player.uid.indexOf('npc_') != -1) return await this.fightNpc(call, G.gc.jjc_npc[rankInfo.player.uid].npcId, 'jjc', await this.getPlayerFightData(call.conn.uid)); - - let result = this.fight([await this.getPlayerFightData(call.conn.uid), await this.getPlayerFightData(rankInfo.player.uid)]); - - // 竞技场 战败触发推送礼包 - if (result.winSide != 0) { - PushGiftFun.chkLoseGift(call.uid) - } - - return result + return this.fight([await this.getPlayerFightData(call.conn.uid), await this.getPlayerFightData(rankInfo.player.uid)]); } /**挑战npc */ @@ -114,13 +106,7 @@ export class FightFun { let npc = formatNpcData(npcId); - let result = this.fight([my, npc], 30, 'pve'); - - // 主线 爬塔 战败触发推送礼包 - if (result.winSide != 0 && ["tanxian", "pata"].includes(type)) { - PushGiftFun.chkLoseGift(data[0].player.uid) - } - return result + return this.fight([my, npc], 30, 'pve'); } /** diff --git a/src/public/player.ts b/src/public/player.ts index 27d8ddc..d8322dd 100644 --- a/src/public/player.ts +++ b/src/public/player.ts @@ -14,10 +14,9 @@ import {PublicShared} from '../shared/public/public'; import {HeroFun} from './hero'; import {ShiwuFun} from './shiwu'; import {UserFun} from './user'; -import {getItemByItemId, getItemNum} from './item'; -import {getGud, setGud} from './gud'; +import { getItemByItemId, getItemNum } from './item'; +import { getGud, setGud } from './gud'; import {addGameLog} from "../gameLog"; -import {PushGiftFun} from "./pushgift"; export type call = { @@ -36,7 +35,7 @@ export type call = { }; service: { name: string }; addEventMsg: ApiCall['addEventMsg']; - req: {} + req: { } }; export class PlayerFun { @@ -67,8 +66,6 @@ export class PlayerFun { if (has < atn.n) { if (err) { - // 消耗不足 触发推送礼包 - PushGiftFun.chkItemGift(call.uid, atn) throw new TsrpcError('', {code: -104, atn: atn}); } else { return {isOk: false, atn: atn}; @@ -146,15 +143,15 @@ export class PlayerFun { shiwu.length > 0 && this.addShiwu(call, shiwu), peijian.length > 0 && this.addPeijian(call, peijian) ]); - + return prizeList; }; //attr里的指定字段的值，不能小于0 - static fixAttrLteZero(t: string, val: number) { - if (['jinbi', 'rmbmoney', 'payExp', 'nexp'].includes(t) && val < 0) { + static fixAttrLteZero(t:string, val:number){ + if(['jinbi','rmbmoney','payExp','nexp'].includes(t) && val < 0){ return 0 - } else { + }else{ return val; } } @@ -192,16 +189,6 @@ export class PlayerFun { // 修改属性应在相关奖励领取之前，否则奖励内获取的用户数据是旧数据 // await this.changeAttr(call.conn.uid, change); call.addEventMsg('msg_s2c/PlayerChange', change); - - // 等级改变 触发推送礼包 - if (change["lv"]) { - PushGiftFun.chkLvGift(call.uid, change["lv"]) - } - // 关卡改变 触发推送礼包 - if (change["mapId"]) { - PushGiftFun.chkLevelGift(call.uid, change["mapId"]) - } - } static async changeAttrLog(uid: string, change, atn, before) { @@ -220,9 +207,9 @@ export class PlayerFun { static async changeAttr(uid: string, change: Partial) { //for (let k in change) { - //G.redis.set('user', uid, k as any, change[k]); + //G.redis.set('user', uid, k as any, change[k]); //} - setGud(uid, change); + setGud(uid,change); G.mongodb.collection('user').updateOne({uid: uid}, {$set: change}); @@ -303,11 +290,7 @@ export class PlayerFun { G.mongodb.collection('item').updateOne(upObj.filter, upObj.update, upObj.options); call.addEventMsg('msg_s2c/ItemChange', atn.t, data); - addGameLog(call.uid, "_itemChange", {"additem": 1}, { - "filter": upObj.filter, - "update": upObj.update, - "options": upObj.options - }) + addGameLog(call.uid, "_itemChange", {"additem":1}, {"filter": upObj.filter, "update": upObj.update, "options": upObj.options}) } else { if (item.num + atn.n <= 0) { await Promise.all([ @@ -319,13 +302,13 @@ export class PlayerFun { //await G.redis.del('item', call.uid, atn.t); //await G.mongodb.collection('item').deleteOne({uid: call.uid, itemId: atn.t}); call.addEventMsg('msg_s2c/ItemChange', atn.t, {num: 0}); - addGameLog(call.uid, "_itemChange", {"delitem": 1}, {"itemId": atn.t}) + addGameLog(call.uid, "_itemChange",{"delitem":1}, {"itemId": atn.t}) } else { await Promise.all([ ////去掉item Redis相关 //G.redis.set('item', call.uid, atn.t, 'lastTime', upObj.update.$set.lastTime), //G.redis.numIncrBy('item', call.uid, atn.t, 'num', atn.n), - + G.mongodb.collection('item').updateOne(upObj.filter, upObj.update, upObj.options) ]); // await G.redis.set('item', call.uid, atn.t, 'lastTime', upObj.update.$set.lastTime); @@ -335,12 +318,7 @@ export class PlayerFun { num: item.num + atn.n, lastTime: upObj.update.$set.lastTime }); - addGameLog(call.uid, "_itemChange", {"attritem": 1}, { - "filter": upObj.filter, - "update": upObj.update, - "options": upObj.options, - newNum: item.num + atn.n - }) + addGameLog(call.uid, "_itemChange",{"attritem":1}, {"filter": upObj.filter, "update": upObj.update, "options": upObj.options,newNum:item.num + atn.n}) } } } @@ -366,7 +344,7 @@ export class PlayerFun { }).reduce((a, b) => a.concat(b)); let result = await G.mongodb.collection('equip').insertMany(insertData); - addGameLog(call.uid, "_addEquip", {}, insertData) + addGameLog(call.uid, "_addEquip",{}, insertData) insertData.forEach((v, key) => { let id = result.insertedIds[key].toHexString(); @@ -413,7 +391,7 @@ export class PlayerFun { G.mongodb.collection('equip').deleteOne({uid: call.uid, _id: new ObjectId(_id)}); call.addEventMsg('msg_s2c/EquipChange', _id, {num: 0}); - addGameLog(call.uid, "_cutEquip", {}, {_id: _id}) + addGameLog(call.uid, "_cutEquip",{}, {_id:_id}) } } @@ -441,7 +419,7 @@ export class PlayerFun { }); let result = await G.mongodb.collection('hero').insertMany(insertData); - addGameLog(call.uid, "_addHero", {}, insertData) + addGameLog(call.uid, "_addHero",{}, insertData) for (let key = 0; key < insertData.length; key++) { let v = insertData[key] @@ -496,7 +474,7 @@ export class PlayerFun { G.redis.del('hero', call.uid, _id); G.mongodb.collection('hero').deleteOne({uid: call.uid, _id: new ObjectId(_id)}); call.addEventMsg('msg_s2c/HeroChange', _id, {num: 0}); - addGameLog(call.uid, "_cutHero", {}, {_id: _id}) + addGameLog(call.uid, "_cutHero",{}, {_id:_id}) } } @@ -527,7 +505,7 @@ export class PlayerFun { }).reduce((a, b) => a.concat(b)); let result = await G.mongodb.collection('shiwu').insertMany(insertData); - addGameLog(call.uid, "_addShiWu", {}, insertData) + addGameLog(call.uid, "_addShiWu",{}, insertData) insertData.forEach((v, key) => { let id = result.insertedIds[key].toHexString(); @@ -559,7 +537,7 @@ export class PlayerFun { // G.redis.del('shiwu', call.uid, _id); G.mongodb.collection('shiwu').deleteOne({uid: call.uid, _id: new ObjectId(_id)}); call.addEventMsg('msg_s2c/ShiwuChange', _id, {num: 0}); - addGameLog(call.uid, "_cutShiwu", {}, {_id: _id}) + addGameLog(call.uid, "_cutShiwu",{}, {_id:_id}) } } @@ -581,7 +559,7 @@ export class PlayerFun { }).reduce((a, b) => a.concat(b)); let result = await G.mongodb.collection('peijian').insertMany(insertData); - addGameLog(call.uid, "_addPeiJian", {}, insertData) + addGameLog(call.uid, "_addPeiJian",{}, insertData) insertData.forEach((v, key) => { let {_id, uid, ...ops} = v; @@ -622,7 +600,7 @@ export class PlayerFun { G.redis.del('peijian', call.uid, _id); G.mongodb.collection('peijian').deleteOne({uid: call.uid, _id: new ObjectId(_id)}); call.addEventMsg('msg_s2c/PeijianChange', _id, {num: 0}); - addGameLog(call.uid, "_cutPeijian", {}, {_id: _id}) + addGameLog(call.uid, "_cutPeijian",{}, {_id:_id}) } } diff --git a/src/public/pushgift.ts b/src/public/pushgift.ts deleted file mode 100644 index 72fcfde..0000000 --- a/src/public/pushgift.ts +++ /dev/null @@ -1,155 +0,0 @@ -import {PayFun} from "./pay"; - -const PushGiftType = { - LevelGift: 1, // 关卡推送 - ItemGift: 2, // 道具推送 - LoseGift: 3, // 战败推送 - RecruitGift: 4, // 十连推送 - LvGift: 5, // 等级推送 -} - -export class PushGiftFun { - - static async getGift(uid: string) { - // 查询所有礼包 - return (await G.mongodb.collection("pushgift").find({ - uid: uid - }).toArray()).map((i) => { - let {_id, ...gift} = i; - return gift - }) - } - - static async chkItemGift(uid: string, atn: atn) { - let gift_ids = []; - for (let id in G.gc.tuisonglibao) { - let conf = G.gc.tuisonglibao[id]; - if (conf.type == PushGiftType.ItemGift && conf.num[0].a == atn.a && conf.num[0].t == atn.t) { - gift_ids.push(id); - } - } - if (gift_ids.length <= 0) { - return - } else { - this.pushGift(uid, gift_ids) - } - } - - static async chkLevelGift(uid: string, level: number) { - let gift_ids = []; - for (let id in G.gc.tuisonglibao) { - let conf = G.gc.tuisonglibao[id]; - if (conf.type == PushGiftType.LevelGift && conf.num[0] == level) { - gift_ids.push(id); - } - } - if (gift_ids.length <= 0) { - return - } else { - this.pushGift(uid, gift_ids) - } - } - - static async chkLvGift(uid: string, lv: number) { - let gift_ids = []; - for (let id in G.gc.tuisonglibao) { - let conf = G.gc.tuisonglibao[id]; - if (conf.type == PushGiftType.LevelGift && conf.num[0] == lv) { - gift_ids.push(id); - } - } - if (gift_ids.length <= 0) { - return - } else { - this.pushGift(uid, gift_ids) - } - } - - static async chkLoseGift(uid: string) { - let gift_ids = []; - for (let id in G.gc.tuisonglibao) { - let conf = G.gc.tuisonglibao[id]; - if (conf.type == PushGiftType.LoseGift) { - gift_ids.push(id); - } - } - if (gift_ids.length <= 0) { - return - } else { - this.pushGift(uid, gift_ids) - } - } - - static async chkRecruitGift(uid: string) { - let gift_ids = []; - for (let id in G.gc.tuisonglibao) { - let conf = G.gc.tuisonglibao[id]; - if (conf.type == PushGiftType.RecruitGift) { - gift_ids.push(id); - } - } - if (gift_ids.length <= 0) { - return - } else { - this.pushGift(uid, gift_ids) - } - } - - static async pushGift(uid: string, gift_ids: string[]) { - let gifts = {}; - (await this.getGift(uid)).forEach(i => gifts[i.id] = i) - for (let gift_id of gift_ids) { - let conf = G.gc.tuisonglibao[gift_id]; - if (gifts[gift_id] && conf.displayCD > 0 && gifts[gift_id].ctime + conf.displayCD > G.time) { - continue - } - if (conf.type == PushGiftType.RecruitGift) { - if (gifts[gift_id]) { - if (gift_ids[gift_id].ext_data.num + 1 >= conf.num[0]) { - this.addGift(uid, gift_id, {num: 0}) - } else { - G.mongodb.collection("pushgift").updateOne({ - uid: uid, id: gift_id - }, {"$inc": {"ext_data.num": 1}}) - } - } else { - // 招募礼包不存在 初始化数据 记录招募次数 - G.mongodb.collection("pushgift").updateOne({ - uid: uid, id: gift_id - }, { - $set: { - ctime: 0, - passTime: 0, - ext_data: {num: 1}, - buy: conf.payId.map(() => 0), - } - }, {upsert: true}) - } - } else { - this.addGift(uid, gift_id, {}) - } - } - } - - static async addGift(uid: string, giftid: string, ext_data: { [key: string]: any }) { - let conf = G.gc.tuisonglibao[giftid]; - // 更新礼包 - G.mongodb.collection("pushgift").updateOne({ - uid: uid, id: giftid - }, { - $set: { - ctime: G.time, - ext_data: ext_data, - passTime: G.time + conf.time, - buy: conf.payId.map(() => 0), - } - }, {upsert: true}) - - // 删除购买记录 - PayFun.delPayLog(uid, ...conf.payId.map(i => { - return {payId: i, val: []} - })) - // 推送客户端消息 - G.server.sendMsgByUid(uid, "msg_s2c/PushGiftChange", 1); - } -} \ No newline at end of file diff --git a/src/shared/protocols/msg_s2c/MsgPushGiftChange.ts b/src/shared/protocols/msg_s2c/MsgPushGiftChange.ts deleted file mode 100644 index 4c04b9b..0000000 --- a/src/shared/protocols/msg_s2c/MsgPushGiftChange.ts +++ /dev/null @@ -1 +0,0 @@ -export type MsgPushGiftChange = 1; diff --git a/src/shared/protocols/pushgift/PtlOpen.ts b/src/shared/protocols/pushgift/PtlOpen.ts deleted file mode 100644 index 829c306..0000000 --- a/src/shared/protocols/pushgift/PtlOpen.ts +++ /dev/null @@ -1,5 +0,0 @@ -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 49e85ce..64b5d9a 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -75,6 +75,7 @@ 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'; @@ -95,7 +96,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_2, ResReceive as ResReceive_2 } from './event/zhoumolibao/PtlReceive'; +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 { ReqhdGetList, ReshdGetList } from './eventlist/PtlhdGetList'; @@ -185,10 +186,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_3, ResReceive as ResReceive_3 } from './jjc/PtlReceive'; +import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } from './jjc/PtlReceive'; import { ReqRefresh as ReqRefresh_4, ResRefresh as ResRefresh_4 } from './jjc/PtlRefresh'; import { ReqOpen as ReqOpen_41, ResOpen as ResOpen_41 } from './kaifujingsai/PtlOpen'; -import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } from './kaifujingsai/PtlReceive'; +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'; @@ -236,7 +237,6 @@ 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'; @@ -264,10 +264,9 @@ 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_49, ResOpen as ResOpen_49 } from './qjzzd/PtlOpen'; -import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } 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'; @@ -275,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_51, ResOpen as ResOpen_51 } 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_52, ResOpen as ResOpen_52 } 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_53, ResOpen as ResOpen_53 } 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_54, ResOpen as ResOpen_54 } 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'; @@ -297,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_55, ResOpen as ResOpen_55 } 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_56, ResOpen as ResOpen_56 } 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'; @@ -317,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_57, ResOpen as ResOpen_57 } 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'; @@ -328,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_58, ResOpen as ResOpen_58 } 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'; @@ -336,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_59, ResOpen as ResOpen_59 } 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'; @@ -650,6 +649,10 @@ 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 @@ -731,8 +734,8 @@ export interface ServiceType { res: ResOpen_27 }, "event/zhoumolibao/Receive": { - req: ReqReceive_2, - res: ResReceive_2 + req: ReqReceive_3, + res: ResReceive_3 }, "event/zixuanlibao/Buy": { req: ReqBuy_3, @@ -1091,8 +1094,8 @@ export interface ServiceType { res: ResOpen_40 }, "jjc/Receive": { - req: ReqReceive_3, - res: ResReceive_3 + req: ReqReceive_4, + res: ResReceive_4 }, "jjc/Refresh": { req: ReqRefresh_4, @@ -1103,8 +1106,8 @@ export interface ServiceType { res: ResOpen_41 }, "kaifujingsai/Receive": { - req: ReqReceive_4, - res: ResReceive_4 + req: ReqReceive_5, + res: ResReceive_5 }, "kbzz/Apply": { req: ReqApply_2, @@ -1290,21 +1293,17 @@ 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_49, - res: ResOpen_49 + req: ReqOpen_48, + res: ResOpen_48 }, "rank/Open": { - req: ReqOpen_50, - res: ResOpen_50 + req: ReqOpen_49, + res: ResOpen_49 }, "shiwu/Concise": { req: ReqConcise, @@ -1335,8 +1334,8 @@ export interface ServiceType { res: ResWear_2 }, "shootGame/Open": { - req: ReqOpen_51, - res: ResOpen_51 + req: ReqOpen_50, + res: ResOpen_50 }, "shootGame/Rec": { req: ReqRec_14, @@ -1347,8 +1346,8 @@ export interface ServiceType { res: ResBuy_6 }, "shop/Open": { - req: ReqOpen_52, - res: ResOpen_52 + req: ReqOpen_51, + res: ResOpen_51 }, "shop/Refresh": { req: ReqRefresh_6, @@ -1363,8 +1362,8 @@ export interface ServiceType { res: ResGetPrize_2 }, "sign/Open": { - req: ReqOpen_53, - res: ResOpen_53 + req: ReqOpen_52, + res: ResOpen_52 }, "slzd/Aim": { req: ReqAim, @@ -1387,8 +1386,8 @@ export interface ServiceType { res: ResMyRank }, "slzd/Open": { - req: ReqOpen_54, - res: ResOpen_54 + req: ReqOpen_53, + res: ResOpen_53 }, "slzd/OpenFort": { req: ReqOpenFort, @@ -1423,12 +1422,12 @@ export interface ServiceType { res: ResGuaJi }, "tanxian/Open": { - req: ReqOpen_55, - res: ResOpen_55 + req: ReqOpen_54, + res: ResOpen_54 }, "tanxian/Receive": { - req: ReqReceive_5, - res: ResReceive_5 + req: ReqReceive_6, + res: ResReceive_6 }, "task/AllFinsh": { req: ReqAllFinsh, @@ -1439,8 +1438,8 @@ export interface ServiceType { res: ResFinsh }, "task/Open": { - req: ReqOpen_56, - res: ResOpen_56 + req: ReqOpen_55, + res: ResOpen_55 }, "user/CDKEY": { req: ReqCDKEY, @@ -1503,8 +1502,8 @@ export interface ServiceType { res: ResExchange }, "weixiuchang/Open": { - req: ReqOpen_57, - res: ResOpen_57 + req: ReqOpen_56, + res: ResOpen_56 }, "weixiuchang/UpLv": { req: ReqUpLv, @@ -1547,8 +1546,8 @@ export interface ServiceType { res: ResJingCaiOpen }, "wzry/Open": { - req: ReqOpen_58, - res: ResOpen_58 + req: ReqOpen_57, + res: ResOpen_57 }, "wzry/UpdateFight": { req: ReqUpdateFight, @@ -1579,12 +1578,12 @@ export interface ServiceType { res: ResOnekeyReceive }, "xstask/Open": { - req: ReqOpen_59, - res: ResOpen_59 + 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, @@ -1632,7 +1631,6 @@ 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, @@ -2934,96 +2932,91 @@ export const serviceProto: ServiceProto = { }, { "id": 238, - "name": "msg_s2c/PushGiftChange", - "type": "msg" - }, - { - "id": 239, "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": { @@ -3031,32 +3024,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": { @@ -3064,142 +3057,137 @@ 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, - "name": "pushgift/Open", - "type": "api" - }, - { - "id": 267, + "id": 265, "name": "qjzzd/Fight", "type": "api" }, { - "id": 268, + "id": 266, "name": "qjzzd/Open", "type": "api" }, { - "id": 269, + "id": 267, "name": "rank/Open", "type": "api" }, { - "id": 270, + "id": 268, "name": "shiwu/Concise", "type": "api" }, { - "id": 271, + "id": 269, "name": "shiwu/Extract", "type": "api" }, { - "id": 272, + "id": 270, "name": "shiwu/GetList", "type": "api" }, { - "id": 273, + "id": 271, "name": "shiwu/LvUp", "type": "api" }, { - "id": 274, + "id": 272, "name": "shiwu/Recast", "type": "api" }, { - "id": 275, + "id": 273, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 276, + "id": 274, "name": "shiwu/Wear", "type": "api" }, { - "id": 277, + "id": 275, "name": "shootGame/Open", "type": "api" }, { - "id": 278, + "id": 276, "name": "shootGame/Rec", "type": "api" }, { - "id": 279, + "id": 277, "name": "shop/Buy", "type": "api" }, { - "id": 280, + "id": 278, "name": "shop/Open", "type": "api" }, { - "id": 281, + "id": 279, "name": "shop/Refresh", "type": "api" }, { - "id": 282, + "id": 280, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 283, + "id": 281, "name": "sign/GetPrize", "type": "api" }, { - "id": 284, + "id": 282, "name": "sign/Open", "type": "api" }, { - "id": 285, + "id": 283, "name": "slzd/Aim", "type": "api" }, { - "id": 286, + "id": 284, "name": "slzd/BuyNum", "type": "api" }, { - "id": 287, + "id": 285, "name": "slzd/Fight", "type": "api" }, { - "id": 288, + "id": 286, "name": "slzd/FightLog", "type": "api" }, { - "id": 289, + "id": 287, "name": "slzd/MyRank", "type": "api" }, { - "id": 290, + "id": 288, "name": "slzd/Open", "type": "api", "conf": { @@ -3209,77 +3197,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 291, + "id": 289, "name": "slzd/OpenFort", "type": "api" }, { - "id": 292, + "id": 290, "name": "slzd/Rec", "type": "api" }, { - "id": 293, + "id": 291, "name": "slzd/Refresh", "type": "api" }, { - "id": 294, + "id": 292, "name": "slzd/Slot", "type": "api" }, { - "id": 295, + "id": 293, "name": "tanxian/Event", "type": "api" }, { - "id": 296, + "id": 294, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 297, + "id": 295, "name": "tanxian/Fight", "type": "api" }, { - "id": 298, + "id": 296, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 299, + "id": 297, "name": "tanxian/Open", "type": "api" }, { - "id": 300, + "id": 298, "name": "tanxian/Receive", "type": "api" }, { - "id": 301, + "id": 299, "name": "task/AllFinsh", "type": "api" }, { - "id": 302, + "id": 300, "name": "task/Finsh", "type": "api" }, { - "id": 303, + "id": 301, "name": "task/Open", "type": "api" }, { - "id": 304, + "id": 302, "name": "user/CDKEY", "type": "api" }, { - "id": 305, + "id": 303, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3287,197 +3275,197 @@ export const serviceProto: ServiceProto = { } }, { - "id": 306, + "id": 304, "name": "user/ChangeName", "type": "api" }, { - "id": 307, + "id": 305, "name": "user/Fight", "type": "api" }, { - "id": 308, + "id": 306, "name": "user/GetInfo", "type": "api" }, { - "id": 309, + "id": 307, "name": "user/InfoOpen", "type": "api" }, { - "id": 310, + "id": 308, "name": "user/Login", "type": "api" }, { - "id": 311, + "id": 309, "name": "user/Ping", "type": "api" }, { - "id": 312, + "id": 310, "name": "user/Renown", "type": "api" }, { - "id": 313, + "id": 311, "name": "user/RenownBuy", "type": "api" }, { - "id": 314, + "id": 312, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 315, + "id": 313, "name": "user/RenownOpen", "type": "api" }, { - "id": 316, + "id": 314, "name": "user/Tujian", "type": "api" }, { - "id": 317, + "id": 315, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 318, + "id": 316, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 319, + "id": 317, "name": "weixiuchang/Open", "type": "api" }, { - "id": 320, + "id": 318, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 321, + "id": 319, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 322, + "id": 320, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 323, + "id": 321, "name": "wzry/BaoMing", "type": "api" }, { - "id": 324, + "id": 322, "name": "wzry/catFightLog", "type": "api" }, { - "id": 325, + "id": 323, "name": "wzry/CatGroup", "type": "api" }, { - "id": 326, + "id": 324, "name": "wzry/DldFight", "type": "api" }, { - "id": 327, + "id": 325, "name": "wzry/DldRefre", "type": "api" }, { - "id": 328, + "id": 326, "name": "wzry/JingCai", "type": "api" }, { - "id": 329, + "id": 327, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 330, + "id": 328, "name": "wzry/Open", "type": "api" }, { - "id": 331, + "id": 329, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 332, + "id": 330, "name": "wzry/Wzzd", "type": "api" }, { - "id": 333, + "id": 331, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 334, + "id": 332, "name": "xstask/AllGet", "type": "api" }, { - "id": 335, + "id": 333, "name": "xstask/Get", "type": "api" }, { - "id": 336, + "id": 334, "name": "xstask/LvUp", "type": "api" }, { - "id": 337, + "id": 335, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 338, + "id": 336, "name": "xstask/Open", "type": "api" }, { - "id": 339, + "id": 337, "name": "xstask/Receive", "type": "api" }, { - "id": 340, + "id": 338, "name": "xstask/Refresh", "type": "api" }, { - "id": 341, + "id": 339, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 342, + "id": 340, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 343, + "id": 341, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 344, + "id": 342, "name": "zhanqianbushu/Up", "type": "api" } @@ -10326,11 +10314,52 @@ export const serviceProto: ServiceProto = { "properties": [ { "id": 0, - "name": "payIds", + "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", "type": { "type": "Array", "elementType": { - "type": "String" + "type": "Reference", + "target": "type/prizeType" } } } @@ -17905,10 +17934,6 @@ export const serviceProto: ServiceProto = { } } }, - "msg_s2c/MsgPushGiftChange/MsgPushGiftChange": { - "type": "Literal", - "literal": 1 - }, "msg_s2c/MsgSendGift/MsgSendGift": { "type": "Interface", "indexSignature": { @@ -18990,81 +19015,6 @@ 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 3b49056a604907b58376656d65ff8340bb1ab978 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Mon, 18 Dec 2023 20:30:22 +0800 Subject: [PATCH 69/80] =?UTF-8?q?fix:=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/path_20231215.ts | 649 ------------------------------------------- 1 file changed, 649 deletions(-) delete mode 100644 src/path_20231215.ts diff --git a/src/path_20231215.ts b/src/path_20231215.ts deleted file mode 100644 index 3775b04..0000000 --- a/src/path_20231215.ts +++ /dev/null @@ -1,649 +0,0 @@ -import {ctor} from '../../../heijiao/server/src/global'; -import {initMongoDB} from '../../../heijiao/server/src/setMongodb'; -import {EmailFun} from "../../../heijiao/server/src/public/email"; - - -// 首冲 -async function shouChongReSet() { - let shouchong = { - "shouchong1": { - "paynum": 6, - "cartoon": { - "hero": 5001 - }, - "prize": [ - [ - { - "a": "hero", - "t": "5001", - "n": 1 - }, - { - "a": "attr", - "t": "jinbi", - "n": 100000 - } - ], - [ - { - "a": "item", - "t": "12", - "n": 200 - }, - { - "a": "attr", - "t": "jinbi", - "n": 200000 - } - ], - [ - { - "a": "item", - "t": "12", - "n": 200 - }, - { - "a": "attr", - "t": "jinbi", - "n": 300000 - } - ] - ] - }, - "shouchong2": { - "paynum": 30, - "cartoon": { - "img": 5001 - }, - "prize": [ - [ - { - "a": "equip", - "t": "1009", - "n": 1 - }, - { - "a": "equip", - "t": "2009", - "n": 1 - } - ], - [ - { - "a": "equip", - "t": "3009", - "n": 1 - }, - { - "a": "item", - "t": "2", - "n": 1000 - } - ], - [ - { - "a": "equip", - "t": "4009", - "n": 1 - }, - { - "a": "item", - "t": "2", - "n": 1000 - } - ] - ] - }, - "shouchong3": { - "paynum": 98, - "cartoon": { - "hero": 5002 - }, - "prize": [ - [ - { - "a": "hero", - "t": "5002", - "n": 1 - }, - { - "a": "item", - "t": "4", - "n": 10 - } - ], - [ - { - "a": "equip", - "t": "1010", - "n": 1 - }, - { - "a": "item", - "t": "2", - "n": 2000 - } - ], - [ - { - "a": "equip", - "t": "3010", - "n": 1 - }, - { - "a": "item", - "t": "2", - "n": 2000 - } - ] - ] - } - }; - let users = await G.mongodb.collection("user").find({}, { - projection: {uid: 1, payExp: 1} - }).toArray(); - - for (let i = 0; i < users.length; i++) { - let user = users[i]; - let data = await G.mongodb.cEvent("shouchong").findOne({uid: user.uid}); - - let send_prize = []; - for (let key in shouchong) { - // 充值不足 - if (user.payExp < shouchong[key]["paynum"] * 10) { - continue - } - - // 奖励已经领取完毕 - if (data && data.receive[key] && data.receive[key].length >= shouchong[key]["prize"].length) { - continue - } - - // 补发未领取奖励 - for (let i = 0; i < shouchong[key]["prize"].length; i++) { - if (data.receive[key][i]) { - continue - } - data.receive[key][i] = G.time; - send_prize.concat(shouchong[key]["prize"][i]); - } - } - if (send_prize.length <= 0) continue; - - let title = "首充未领取奖励补发"; - let content = "首充未领取奖励补发"; - - // 发放邮件 - await EmailFun.addEmail({ - uid: user.uid, - type: "system", - title: title, - content: content, - prize: send_prize, - }); - // 设置奖励发放记录 - await G.mongodb.cEvent("shouchong").updateOne({ - uid: user.uid - }, {"$set": {receive: data.receive, patch: 1}}); - } -} - - -/*超值月卡、至尊月卡、永久卡的线上玩家脚本 -线上已购买超值月卡的玩家，脚本补发：招募卡*30 -线上已购买至尊月卡的玩家，脚本补发：钻石*10000 -线上已购买永久卡的玩家，脚本补发：汉塞尔*1，能量饮料*500w -* */ -async function yuekaSendPrize() { - let w = { - key: {$in: ["chaozhiyueka", "zhizunyueka", "zhongshenka"]}, - del_time: {$exists: false} - }; - let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( - // 过滤没有结束时间 或者 有结束时间 但是没有过期的 - (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) - ); - - let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; - users.forEach(user => { - let uid = user.uid; - let proId = user.key; - if (!uid2Prize[uid]) uid2Prize[uid] = []; - - switch (proId) { - case "chaozhiyueka": - uid2Prize[uid].push({a: "item", t: "4", n: 30}); - break; - case "zhizunyueka": - uid2Prize[uid].push({a: "attr", t: "rmbmoney", n: 10000}) - break; - case "zhongshenka": - uid2Prize[uid].push({a: "item", t: "1", n: 5000000}) - uid2Prize[uid].push({a: "hero", t: "4012", n: 1}) - break; - } - }); - - let title = "月卡奖励发放"; - let content = "月卡奖励发放"; - for (const [uid, sendPrize] of Object.entries(uid2Prize)) { - // 发放邮件 - await EmailFun.addEmail({ - uid: uid, - type: "system", - title: title, - content: content, - prize: sendPrize, - }); - - // 处理重复执行 - await G.mongodb.collection("payLogNew").updateMany( - Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} - ) - } -} - - -/*特权礼包脚本需求 -1、特权内容：已购买特权的玩家，特权效果更新 -2、已购买情报特权的玩家，脚本补发：钻石*680，顶级紫色套装*1 -3、已购买快速特权的玩家，脚本补发：钻石*300，快速探险券*30 -4、已购买财富特权的玩家，脚本补发：钻石*300，美金*1000万 -5、已购买酒馆特权的玩家，脚本补发：钻石*680，招募卡*10 -* */ -async function tequanLiBaoSendPrize() { - let w = { - key: {$in: ["qingbaotequan", "zuozhantequan", "caifutequan", "jiubatequan"]}, - del_time: {$exists: false} - }; - let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( - // 过滤没有结束时间 或者 有结束时间 但是没有过期的 - (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) - ); - - let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; - users.forEach(user => { - let uid = user.uid; - let proId = user.key; - - if (!uid2Prize[uid]) uid2Prize[uid] = []; - switch (proId) { - case "qingbaotequan": - uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 680}); - uid2Prize[uid].push({"a": "item", "t": "609", "n": 1}); - break; - case "zuozhantequan": - uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 300}); - uid2Prize[uid].push({"a": "item", "t": "24", "n": 30}); - break; - case "caifutequan": - uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 300}) - uid2Prize[uid].push({"a": "attr", "t": "jinbi", "n": 10000000}) - break; - case "jiubatequan": - uid2Prize[uid].push({"a": "attr", "t": "rmbmoney", "n": 680}); - uid2Prize[uid].push({"a": "item", "t": "4", "n": 10}); - break; - } - }); - - let title = "特权奖励发放"; - let content = "特权奖励发放"; - for (const [uid, sendPrize] of Object.entries(uid2Prize)) { - // 发放邮件 - await EmailFun.addEmail({ - uid: uid, - type: "system", - title: title, - content: content, - prize: sendPrize, - }); - await G.mongodb.collection("payLogNew").updateMany( - Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} - ) - } -} - - -/* -刷新所有玩家各档位VIP礼包到未购买状态 -* */ -async function resetVipLiBao() { - let w = {"type": "chongzhi"}; - await G.mongodb.collection("playerInfo").updateMany(w, {"giftBy": {}}); -} - - -/* -人才计划调整 -1、线上已有该活动的玩家，保留次数进度；达到新加档位可领取的奖励则直接领取 -2、线上已购买该活动328计费点的玩家，每次购买记录补发招募卡*20,； -3、线上已购买该活动648计费点的玩家，每次购买记录补发招募卡*40,； -* */ -async function rcjhReSet() { - let proId328 = ["ycmb_1_5", "ycmb_2_4", "ycmb_3_5", "ycmb_4_5", "ycmb_5_5"]; - let proId648 = ["ycmb_1_6", "ycmb_2_5", "ycmb_3_6", "ycmb_4_6", "ycmb_5_6"]; - let w = { - key: {$in: [].concat(proId328, proId648)}, - del_time: {$exists: false} - }; - let users = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( - // 过滤没有结束时间 或者 有结束时间 但是没有过期的 - (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) - ); - - - let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; - users.forEach(user => { - let uid = user.uid; - let proId = user.key; - - if (!uid2Prize[uid]) { - uid2Prize[uid] = [] - } - if (proId328.includes(proId)) { - uid2Prize[uid].push({"a": "item", "t": "4", "n": 20}) - } else if (proId648.includes(proId)) { - uid2Prize[uid].push({"a": "item", "t": "4", "n": 40}) - } - }); - - let title = "人才计划奖励发放"; - let content = "人才计划奖励发放"; - for (const [uid, sendPrize] of Object.entries(uid2Prize)) { - // 发放邮件 - await EmailFun.addEmail({ - uid: uid, - type: "system", - title: title, - content: content, - prize: sendPrize, - }); - await G.mongodb.collection("payLogNew").updateMany( - Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} - ) - } -} - - -/*等级基金调整 -1、已购买等级基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； -2、未购买的玩家活动刷新到新版本； -3、刷新等级基金到未购买状态； -* */ -async function dengjiJiJinReSet() { - let w = {key: "dengjijijin", del_time: {$exists: false}} - // 激活了的玩家 - let _payList = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( - // 过滤没有结束时间 或者 有结束时间 但是没有过期的 - (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) - ); - - let title = "等级基金未领取奖励发放"; - let content = "等级基金未领取奖励发放"; - let prizeList = G.gc.jijin["dengjijijin"]; - let _users = await G.mongodb.cEvent("dengjijijin").find( - {"uid": {"$in": _payList.map(pay => pay.uid)}} - ).toArray() - - let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; - _users.forEach((user) => { - let uid = user.uid; - let idx2Type2Bool = user.rec; - if (!uid2Prize[uid]) uid2Prize[uid] = []; - - // 没领的全发 - prizeList.forEach((con, idx) => { - // 普通奖励没领 - if (!idx2Type2Bool[idx]?.pt) { - uid2Prize[uid].push(...con.pt) - } - // 高级奖励没领 - if (!idx2Type2Bool[idx]?.tq) { - uid2Prize[uid].push(...con.pt) - } - }); - }) - - for (const [uid, sendPrize] of Object.entries(uid2Prize)) { - // 发放邮件 - await EmailFun.addEmail({ - uid: uid, - type: "system", - title: title, - content: content, - prize: sendPrize, - }); - await G.mongodb.collection("payLogNew").updateMany( - Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} - ) - // 基金数据清除 - await G.mongodb.collection("event").updateMany( - {type: "dengjijijin", uid: uid}, {"$set": {uid: `${uid}_patch_del`}} - ); - } -} - - -/*关卡基金调整 -1、已购买关卡基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； -2、未购买的玩家活动刷新到新版本； -3、刷新关卡基金到未购买状态； -* */ -async function guanqiaJiJinReSet() { - let w = {key: "guanqiajijin"}; - // 激活了的玩家 - let _payList = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( - // 过滤没有结束时间 或者 有结束时间 但是没有过期的 - (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) - ); - - let title = "关卡基金未领取奖励发放"; - let content = "关卡基金未领取奖励发放"; - let prizeList = G.gc.jijin["guanqiajijin"]; - - // 没激活不处理 - let _users = await G.mongodb.cEvent("guanqiajijin").find( - { - "uid": {"$in": _payList.map(pay => pay.uid)} - }, - {projection: {_id: 0}} - ).toArray(); - - let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; - _users.forEach(user => { - let uid = user.uid; - let idx2Type2Bool = user.rec; - if (!uid2Prize[uid]) uid2Prize[uid] = []; - - // 没领的全发 - prizeList.forEach((con, idx) => { - // 普通奖励没领 - if (!idx2Type2Bool[idx]?.pt) { - uid2Prize[uid].push(...con.pt) - } - // 高级奖励没领 - if (!idx2Type2Bool[idx]?.tq) { - uid2Prize[uid].push(...con.tq) - } - }); - }) - - for (const [uid, sendPrize] of Object.entries(uid2Prize)) { - // 发放邮件 - await EmailFun.addEmail({ - uid: uid, - type: "system", - title: title, - content: content, - prize: sendPrize, - }); - await G.mongodb.collection("payLogNew").updateMany( - Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} - ) - // 基金数据清除 - await G.mongodb.collection("event").updateMany( - {type: "guanqiajijin", uid: uid}, {"$set": {uid: `${uid}_patch_del`}} - ); - } -} - - -/*通行证基金调整 -1、已购买通行证基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； -2、未购买的玩家活动刷新到新版本； -3、刷新通行证基金到未购买状态； -* */ -async function dayjiJiJinReSet() { - let w = {key: "dayjijin"}; - - // 激活了的玩家 - let _payList = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( - // 过滤没有结束时间 或者 有结束时间 但是没有过期的 - (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) - ); - - let title = "通行证基金未领取奖励发放"; - let content = "通行证基金未领取奖励发放"; - let prizeList = G.gc.jijin["dayjijin"]; - // 没激活不处理 - let _users = await G.mongodb.cEvent("dayjijin").find( - {uid: {$in: _payList.map(pay => pay.uid)}} - ).toArray(); - - let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; - _users.forEach(user => { - let uid = user.uid; - let idx2Type2Bool = user.rec; - if (!uid2Prize[uid]) uid2Prize[uid] = []; - - // 没领的全发 - prizeList.forEach((con, idx) => { - // 普通奖励没领 - if (!idx2Type2Bool[idx]?.pt) { - uid2Prize[uid].push(...con.pt) - } - // 高级奖励没领 - if (!idx2Type2Bool[idx]?.tq) { - uid2Prize[uid].push(...con.tq) - } - }); - }) - - for (const [uid, sendPrize] of Object.entries(uid2Prize)) { - // 发放邮件 - await EmailFun.addEmail({ - uid: uid, - type: "system", - title: title, - content: content, - prize: sendPrize, - }); - await G.mongodb.collection("payLogNew").updateMany( - Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} - ) - // 基金数据清除 - await G.mongodb.collection("event").updateMany( - {type: "dayjijin", uid: uid}, {"$set": {uid: `${uid}_patch_del`}} - ); - } -} - -/*月基金调整 -1、已购买128、328月基金的玩家且未领取完成的玩家，剩余奖励邮件一次性补发； -2、未购买的玩家活动刷新到新版本； -3、刷新月基金到未购买状态； -* */ -async function yueJiJinReSet() { - let proIdList = [ - "128jijin", - "328jijin", - ]; - let w = {key: {$in: proIdList}}; - // 激活了的玩家 - let _payList = (await G.mongodb.collection("payLogNew").find(w).toArray()).filter( - // 过滤没有结束时间 或者 有结束时间 但是没有过期的 - (pay) => pay.values?.length > 0 && (!pay.values.slice(-1)[0].eTime || pay.values.slice(-1)[0].eTime > G.time) - ); - - // 没激活不处理 - let _users = await G.mongodb.collection("event").find( - { - "type": {"$in": proIdList}, - "uid": {"$in": _payList.map(pay => pay.uid)} - } - ).toArray(); - - let uid2Prize: { [uid: string]: { a: string, t: string, n: number }[] } = {}; - let prizeList128 = G.gc.yuedujijin.find(v => v.payId == "128jijin"); - let prizeList328 = G.gc.yuedujijin.find(v => v.payId == "328jijin"); - _users.forEach(user => { - let uid = user.uid; - let gotarr = user.rec; - if (!uid2Prize[uid]) uid2Prize[uid] = []; - - let prizeList = user.type == "128jijin" ? prizeList128.prize : prizeList328.prize; - // 没领的全发 - prizeList.forEach((onePrize, idx) => { - // 领过了 - if (gotarr.includes(idx)) { - return - } - uid2Prize[uid].push(onePrize) - }); - }) - - let title = "月度基金未领取奖励发放"; - let content = "月度基金未领取奖励发放"; - for (const [uid, sendPrize] of Object.entries(uid2Prize)) { - // 发放邮件 - await EmailFun.addEmail({ - uid: uid, - type: "system", - title: title, - content: content, - prize: sendPrize, - }); - - await G.mongodb.collection("payLogNew").updateMany( - Object.assign({uid: uid}, w), {$set: {patch: 1, del_time: G.time}} - ) - // 基金数据清除 - await G.mongodb.collection("event").updateMany( - {type: {$in: proIdList}, uid: uid}, {"$set": {uid: `${uid}_patch_del`}} - ); - } -} - -async function start() { - //连接mongodb - await initMongoDB(); - - // 首冲调整 - await shouChongReSet(); - // 超值月卡、至尊月卡、永久卡的线上玩家脚本 - await yuekaSendPrize(); - // 特权礼包脚本需求 - await tequanLiBaoSendPrize(); - // 刷新所有玩家各档位VIP礼包到未购买状态 - await resetVipLiBao(); - // 人才计划调整 - await rcjhReSet(); - // 等级基金调整 - await dengjiJiJinReSet(); - // 关卡基金调整 - await guanqiaJiJinReSet(); - // 通行证基金调整 - await dayjiJiJinReSet(); - // 月基金调整 - await yueJiJinReSet(); -} - -//定义全局变量 -ctor(); -//启动服务 -start().then(() => { - process.exit() -}); - - From 50087cd543049aebb183a206f1e911bef375251a Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 15 Dec 2023 17:42:20 +0800 Subject: [PATCH 70/80] =?UTF-8?q?fix:=20=E5=8D=81=E4=BA=94=E5=A4=A9?= =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E5=85=85=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/shiwuleichong/ApiOpen.ts | 33 +- src/api_s2c/event/shiwuleichong/ApiRec.ts | 26 - src/api_s2c/hongdian/fun.ts | 40 +- src/jsonType.ts | 2 +- src/localConfig.ts | 2 +- .../protocols/event/shiwuleichong/PtlOpen.ts | 14 +- .../protocols/event/shiwuleichong/PtlRec.ts | 13 - src/shared/protocols/serviceProto.ts | 753 +++++++++--------- 8 files changed, 437 insertions(+), 446 deletions(-) delete mode 100644 src/api_s2c/event/shiwuleichong/ApiRec.ts delete mode 100644 src/shared/protocols/event/shiwuleichong/PtlRec.ts diff --git a/src/api_s2c/event/shiwuleichong/ApiOpen.ts b/src/api_s2c/event/shiwuleichong/ApiOpen.ts index de01636..5763d97 100644 --- a/src/api_s2c/event/shiwuleichong/ApiOpen.ts +++ b/src/api_s2c/event/shiwuleichong/ApiOpen.ts @@ -13,30 +13,31 @@ export default async function (call: ApiCall) { let _zt = PublicShared.getToDayZeroTime(); let pays = await PayFun.getPayLogs(call.uid, payids); for (; day <= G.gc.shiwuleichong.tasks.length; day++) { - let pay = pays[G.gc.shiwuleichong.tasks[day - 1].payid]; - if (!pay || pay.length == 0) { + let pay = pays[G.gc.shiwuleichong.tasks[day].payid]; + if (!pay) { break } else { - // 如果是最后一天奖励 - if (day >= G.gc.shiwuleichong.tasks.length) { - // 充值订单隔天了 - if (pay.slice(-1)[0].time < _zt) { - // 重置所有订单 - await PayFun.delPayLog(call.uid, ...payids.map(i => { - return {payId: i, val: []} - })) - day = 1; - pays = {}; - } - break; - } else if (pay.slice(-1)[0].time >= _zt) { + if (pay.slice(-1)[0].time >= _zt) { break } } } + // 如果是最后一天奖励 并且 充值订单隔天了 + if ( + day == G.gc.shiwuleichong.tasks.length && + pays[G.gc.shiwuleichong.tasks[day - 1].payid] && + pays[G.gc.shiwuleichong.tasks[day - 1].payid].slice(-1)[0].time < _zt + ) { + // 重置所有订单 + await PayFun.delPayLog(call.uid, ...payids.map(i => { + return {payId: i, val: []} + })) + day = 1; + pays = {}; + } call.succ({ day: day, - payIds: Object.keys(pays).filter((i) => pays[i].length > 0) + payIds: Object.keys(pays) }); } \ No newline at end of file diff --git a/src/api_s2c/event/shiwuleichong/ApiRec.ts b/src/api_s2c/event/shiwuleichong/ApiRec.ts deleted file mode 100644 index f9cf51e..0000000 --- a/src/api_s2c/event/shiwuleichong/ApiRec.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { ApiCall } from "tsrpc"; -import { PayFun } from '../../../public/pay'; -import { PlayerFun } from '../../../public/player'; -import { ReqRec, ResRec } from "../../../shared/protocols/event/shiwuleichong/PtlRec"; - -export default async function (call: ApiCall) { - let db = await G.mongodb.cEvent('15leichong').findOne({ uid: call.uid, type: '15leichong' }); - let confArr = G.gc.shiwuleichong.data[db.index]; - - if (!confArr.tasks[call.req.index]) return call.error('', { code: -1 }); - if (db.recIndex.includes(call.req.index)) return call.error('', { code: -2 }); - - let payDay = await PayFun.getPayDaysBuyPayNum(call.uid, db.sTime, db.sTime + confArr.time, G.gc.shiwuleichong.dayPayNeed); - if (payDay < confArr.tasks[call.req.index].total) return call.error('', { code: -3 }); - - await PlayerFun.sendPrize(call, confArr.tasks[call.req.index].prize); - - G.mongodb.cEvent('15leichong').updateOne( - { uid: call.uid, type: '15leichong' }, - { $push: { recIndex: call.req.index } } - ); - - call.succ({ - prize: confArr.tasks[call.req.index].prize - }); -} \ No newline at end of file diff --git a/src/api_s2c/hongdian/fun.ts b/src/api_s2c/hongdian/fun.ts index 867eb16..4b58691 100644 --- a/src/api_s2c/hongdian/fun.ts +++ b/src/api_s2c/hongdian/fun.ts @@ -877,7 +877,7 @@ export class HuoDongHongDianFun { } }; _res.val.meirijingxuan = await this.heiShiHongDian(call) - _res.val.jitianhaoli = await this.heiShiLCHongDian(call) + // _res.val.jitianhaoli = await this.heiShiLCHongDian(call) _res.val.niudanji = await this.heiShiNiuDanJi(call) Object.values(_res.val).forEach(x => _res.show = _res.show || x.show) return _res @@ -913,25 +913,25 @@ export class HuoDongHongDianFun { } /**黑市 积天豪礼 */ - static async heiShiLCHongDian(call: ApiCall): Promise { - let _res: hongdianVal = { - show: false - }; - let db = await G.mongodb.cEvent('15leichong').findOne({uid: call.uid, type: '15leichong'}); - - if (!db) return _res; - - let _con = G.gc.shiwuleichong.data[db.index]; - let payDay = await PayFun.getPayDaysBuyPayNum(call.uid, db.sTime, db.sTime + _con.time, G.gc.shiwuleichong.dayPayNeed); - for (let index = 0; index < _con.tasks.length; index++) { - const element = _con.tasks[index]; - if (db.recIndex.includes(index)) continue; - if (payDay < element.total) continue; - _res.show = true; - break; - } - return _res; - } + // static async heiShiLCHongDian(call: ApiCall): Promise { + // let _res: hongdianVal = { + // show: false + // }; + // let db = await G.mongodb.cEvent('15leichong').findOne({uid: call.uid, type: '15leichong'}); + // + // if (!db) return _res; + // + // let _con = G.gc.shiwuleichong.data[db.index]; + // let payDay = await PayFun.getPayDaysBuyPayNum(call.uid, db.sTime, db.sTime + _con.time, G.gc.shiwuleichong.dayPayNeed); + // for (let index = 0; index < _con.tasks.length; index++) { + // const element = _con.tasks[index]; + // if (db.recIndex.includes(index)) continue; + // if (payDay < element.total) continue; + // _res.show = true; + // break; + // } + // return _res; + // } /**黑市 扭蛋机 */ static async heiShiNiuDanJi(call: ApiCall): Promise { diff --git a/src/jsonType.ts b/src/jsonType.ts index 8f8eb88..43654a4 100644 --- a/src/jsonType.ts +++ b/src/jsonType.ts @@ -1179,7 +1179,7 @@ type gc_shiwucom = { }, "comment": { "jichu_colour": string, "fujia_colour": string, "fujianum_colour": string, "putongxilian": string, "gaojixilian": string, "hero_zhuanshu": string, "buff_zhuanshu": string, "skill_zhuanshu": string, "chongzhuneed": string, "chongzhurate": string, "tilianhuobi": string, [x: string]: any }, [x: string]: any } -type gc_shiwuleichong = { "dayPayNeed": number, "data": { "time": number, "tasks": { "total": number, "prize": { "a": string, "t": string, "n": number, [x: string]: any }[], [x: string]: any }[], [x: string]: any }[], [x: string]: any } +type gc_shiwuleichong = { tasks: { day: number, payid: string }[] } type gc_shoot = { [key: string]: { "name": string, "num": number, "speed": number, "cartridge": number, "time": number, "prize": { [key: string]: { "describe": string, "hit": number, "content": { "a": string, "t": string, "n": number, [x: string]: any }[], [x: string]: any } }, [x: string]: any } } diff --git a/src/localConfig.ts b/src/localConfig.ts index cfb411f..5b04b02 100644 --- a/src/localConfig.ts +++ b/src/localConfig.ts @@ -5,7 +5,7 @@ export default { /**是否开发模式 */ debug: true, /**消息服socket端口*/ - msgPort: 7785, + msgPort: 7778, /**http端口 msg服专用*/ // httpPort: 7779, /**跨服socket端口 */ diff --git a/src/shared/protocols/event/shiwuleichong/PtlOpen.ts b/src/shared/protocols/event/shiwuleichong/PtlOpen.ts index 5988d1b..baf05a9 100644 --- a/src/shared/protocols/event/shiwuleichong/PtlOpen.ts +++ b/src/shared/protocols/event/shiwuleichong/PtlOpen.ts @@ -1,18 +1,10 @@ - /** * 进入15天累充 */ -export type ReqOpen = { - -}; +export type ReqOpen = {}; export type ResOpen = { /**礼包组 取G.gc.shiwuleichong[index] */ - index: number; - /**开始时间 倒计时显示 sTime+G.gc.shiwuleichong[index].time */ - sTime: number; - /**已领取的奖励下标 */ - recIndex: number[]; - /**已充值的天数 */ - payDay: number; + day: number; + payIds: string[]; }; \ No newline at end of file diff --git a/src/shared/protocols/event/shiwuleichong/PtlRec.ts b/src/shared/protocols/event/shiwuleichong/PtlRec.ts deleted file mode 100644 index 0bf0af1..0000000 --- a/src/shared/protocols/event/shiwuleichong/PtlRec.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { prizeType } from '../../type'; - - -/** - * 领取15天累充奖励 - */ -export type ReqRec = { - index: number; -}; - -export type ResRec = { - prize: prizeType[]; -}; \ No newline at end of file diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 64b5d9a..42ce9dd 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -73,23 +73,22 @@ import { ReqRec as ReqRec_6, ResRec as ResRec_6 } from './event/qirichongzhi/Ptl import { ReqOpen as ReqOpen_17, ResOpen as ResOpen_17 } from './event/qiridenglu/PtlOpen'; import { ReqRecPrize as ReqRecPrize_1, ResRecPrize as ResRecPrize_1 } from './event/qiridenglu/PtlRecPrize'; import { ReqOpen as ReqOpen_18, ResOpen as ResOpen_18 } from './event/shiwuleichong/PtlOpen'; -import { 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'; import { ReqOpen as ReqOpen_20, ResOpen as ResOpen_20 } from './event/xianshizhaomu/PtlOpen'; -import { ReqRec as ReqRec_8, ResRec as ResRec_8 } from './event/xianshizhaomu/PtlRec'; +import { ReqRec as ReqRec_7, ResRec as ResRec_7 } from './event/xianshizhaomu/PtlRec'; import { ReqOpen as ReqOpen_21, ResOpen as ResOpen_21 } from './event/xinshoulibao/PtlOpen'; import { ReqBuy as ReqBuy_2, ResBuy as ResBuy_2 } from './event/yangchengmubiao/PtlBuy'; import { ReqOpen as ReqOpen_22, ResOpen as ResOpen_22 } from './event/yangchengmubiao/PtlOpen'; -import { ReqRec as ReqRec_9, ResRec as ResRec_9 } from './event/yangchengmubiao/PtlRec'; +import { ReqRec as ReqRec_8, ResRec as ResRec_8 } from './event/yangchengmubiao/PtlRec'; import { ReqOpen as ReqOpen_23, ResOpen as ResOpen_23 } from './event/yibaichou/PtlOpen'; -import { ReqRec as ReqRec_10, ResRec as ResRec_10 } from './event/yibaichou/PtlRec'; +import { ReqRec as ReqRec_9, ResRec as ResRec_9 } from './event/yibaichou/PtlRec'; import { ReqRecAll, ResRecAll } from './event/yibaichou/PtlRecAll'; import { ReqOpen as ReqOpen_24, ResOpen as ResOpen_24 } from './event/yuedujijin/PtlOpen'; -import { ReqRec as ReqRec_11, ResRec as ResRec_11 } from './event/yuedujijin/PtlRec'; +import { ReqRec as ReqRec_10, ResRec as ResRec_10 } from './event/yuedujijin/PtlRec'; import { ReqBuyLv, ResBuyLv } from './event/zhanling/PtlBuyLv'; import { ReqOpen as ReqOpen_25, ResOpen as ResOpen_25 } from './event/zhanling/PtlOpen'; import { ReqRecPrize as ReqRecPrize_2, ResRecPrize as ResRecPrize_2 } from './event/zhanling/PtlRecPrize'; @@ -157,7 +156,7 @@ import { ReqBuyNum as ReqBuyNum_1, ResBuyNum as ResBuyNum_1 } from './hbzb/jfs/P 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 { ReqRec as ReqRec_12, ResRec as ResRec_12 } from './hbzb/jfs/PtlRec'; +import { ReqRec as ReqRec_11, ResRec as ResRec_11 } from './hbzb/jfs/PtlRec'; import { ReqRefresh as ReqRefresh_2, ResRefresh as ResRefresh_2 } from './hbzb/jfs/PtlRefresh'; import { ReqGetStatus, ResGetStatus } from './hbzb/PtlGetStatus'; import { ReqBuyNum as ReqBuyNum_2, ResBuyNum as ResBuyNum_2 } from './hbzb/zbs/PtlBuyNum'; @@ -171,7 +170,7 @@ import { ReqGetList as ReqGetList_3, ResGetList as ResGetList_3 } from './hero/P import { ReqJinJie, ResJinJie } from './hero/PtlJinJie'; import { ReqLvUp as ReqLvUp_1, ResLvUp as ResLvUp_1 } from './hero/PtlLvUp'; import { ReqPotency, ResPotency } from './hero/PtlPotency'; -import { ReqRec as ReqRec_13, ResRec as ResRec_13 } from './hero/PtlRec'; +import { ReqRec as ReqRec_12, ResRec as ResRec_12 } from './hero/PtlRec'; import { ReqReset as ReqReset_2, ResReset as ResReset_2 } from './hero/PtlReset'; import { ReqTalent, ResTalent } from './hero/PtlTalent'; import { ReqWeaponUp, ResWeaponUp } from './hero/PtlWeaponUp'; @@ -237,6 +236,7 @@ import { MsgPayResult } from './msg_s2c/MsgPayResult'; import { MsgPeijianChange } from './msg_s2c/MsgPeijianChange'; import { MsgPlayerChange } from './msg_s2c/MsgPlayerChange'; import { MsgPrivate } from './msg_s2c/MsgPrivate'; +import { MsgPushGiftChange } from './msg_s2c/MsgPushGiftChange'; import { MsgSendGift } from './msg_s2c/MsgSendGift'; import { MsgShiwuChange } from './msg_s2c/MsgShiwuChange'; import { MsgTaskChange } from './msg_s2c/MsgTaskChange'; @@ -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,33 +275,33 @@ 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 { ReqRec as ReqRec_14, ResRec as ResRec_14 } from './shootGame/PtlRec'; +import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './shootGame/PtlOpen'; +import { ReqRec as ReqRec_13, ResRec as ResRec_13 } from './shootGame/PtlRec'; import { ReqBuy as ReqBuy_6, ResBuy as ResBuy_6 } from './shop/PtlBuy'; -import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './shop/PtlOpen'; +import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './shop/PtlOpen'; import { ReqRefresh as ReqRefresh_6, ResRefresh as ResRefresh_6 } from './shop/PtlRefresh'; import { ReqGetBoxPrize, ResGetBoxPrize } from './sign/PtlGetBoxPrize'; import { ReqGetPrize as ReqGetPrize_2, ResGetPrize as ResGetPrize_2 } from './sign/PtlGetPrize'; -import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './sign/PtlOpen'; +import { ReqOpen as ReqOpen_53, ResOpen as ResOpen_53 } from './sign/PtlOpen'; import { ReqAim, ResAim } from './slzd/PtlAim'; import { ReqBuyNum as ReqBuyNum_4, ResBuyNum as ResBuyNum_4 } from './slzd/PtlBuyNum'; import { ReqFight as ReqFight_10, ResFight as ResFight_10 } from './slzd/PtlFight'; import { ReqFightLog as ReqFightLog_2, ResFightLog as ResFightLog_2 } from './slzd/PtlFightLog'; import { ReqMyRank, ResMyRank } from './slzd/PtlMyRank'; -import { ReqOpen as ReqOpen_53, ResOpen as ResOpen_53 } from './slzd/PtlOpen'; +import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } from './slzd/PtlOpen'; import { ReqOpenFort, ResOpenFort } from './slzd/PtlOpenFort'; -import { ReqRec as ReqRec_15, ResRec as ResRec_15 } from './slzd/PtlRec'; +import { ReqRec as ReqRec_14, ResRec as ResRec_14 } from './slzd/PtlRec'; import { ReqRefresh as ReqRefresh_7, ResRefresh as ResRefresh_7 } from './slzd/PtlRefresh'; import { ReqSlot, ResSlot } from './slzd/PtlSlot'; 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'; @@ -641,10 +642,6 @@ export interface ServiceType { req: ReqOpen_18, res: ResOpen_18 }, - "event/shiwuleichong/Rec": { - req: ReqRec_7, - res: ResRec_7 - }, "event/shouchong/Open": { req: ReqOpen_19, res: ResOpen_19 @@ -670,8 +667,8 @@ export interface ServiceType { res: ResOpen_20 }, "event/xianshizhaomu/Rec": { - req: ReqRec_8, - res: ResRec_8 + req: ReqRec_7, + res: ResRec_7 }, "event/xinshoulibao/Open": { req: ReqOpen_21, @@ -686,16 +683,16 @@ export interface ServiceType { res: ResOpen_22 }, "event/yangchengmubiao/Rec": { - req: ReqRec_9, - res: ResRec_9 + req: ReqRec_8, + res: ResRec_8 }, "event/yibaichou/Open": { req: ReqOpen_23, res: ResOpen_23 }, "event/yibaichou/Rec": { - req: ReqRec_10, - res: ResRec_10 + req: ReqRec_9, + res: ResRec_9 }, "event/yibaichou/RecAll": { req: ReqRecAll, @@ -706,8 +703,8 @@ export interface ServiceType { res: ResOpen_24 }, "event/yuedujijin/Rec": { - req: ReqRec_11, - res: ResRec_11 + req: ReqRec_10, + res: ResRec_10 }, "event/zhanling/BuyLv": { req: ReqBuyLv, @@ -978,8 +975,8 @@ export interface ServiceType { res: ResOpen_36 }, "hbzb/jfs/Rec": { - req: ReqRec_12, - res: ResRec_12 + req: ReqRec_11, + res: ResRec_11 }, "hbzb/jfs/Refresh": { req: ReqRefresh_2, @@ -1034,8 +1031,8 @@ export interface ServiceType { res: ResPotency }, "hero/Rec": { - req: ReqRec_13, - res: ResRec_13 + req: ReqRec_12, + res: ResRec_12 }, "hero/Reset": { req: ReqReset_2, @@ -1293,18 +1290,22 @@ export interface ServiceType { req: ReqTest, res: ResTest }, + "pushgift/Open": { + req: ReqOpen_48, + res: ResOpen_48 + }, "qjzzd/Fight": { req: ReqFight_9, res: ResFight_9 }, "qjzzd/Open": { - req: ReqOpen_48, - res: ResOpen_48 - }, - "rank/Open": { req: ReqOpen_49, res: ResOpen_49 }, + "rank/Open": { + req: ReqOpen_50, + res: ResOpen_50 + }, "shiwu/Concise": { req: ReqConcise, res: ResConcise @@ -1334,20 +1335,20 @@ 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, - res: ResRec_14 + req: ReqRec_13, + res: ResRec_13 }, "shop/Buy": { req: ReqBuy_6, res: ResBuy_6 }, "shop/Open": { - req: ReqOpen_51, - res: ResOpen_51 + req: ReqOpen_52, + res: ResOpen_52 }, "shop/Refresh": { req: ReqRefresh_6, @@ -1362,8 +1363,8 @@ export interface ServiceType { res: ResGetPrize_2 }, "sign/Open": { - req: ReqOpen_52, - res: ResOpen_52 + req: ReqOpen_53, + res: ResOpen_53 }, "slzd/Aim": { req: ReqAim, @@ -1386,16 +1387,16 @@ export interface ServiceType { res: ResMyRank }, "slzd/Open": { - req: ReqOpen_53, - res: ResOpen_53 + req: ReqOpen_54, + res: ResOpen_54 }, "slzd/OpenFort": { req: ReqOpenFort, res: ResOpenFort }, "slzd/Rec": { - req: ReqRec_15, - res: ResRec_15 + req: ReqRec_14, + res: ResRec_14 }, "slzd/Refresh": { req: ReqRefresh_7, @@ -1422,8 +1423,8 @@ export interface ServiceType { res: ResGuaJi }, "tanxian/Open": { - req: ReqOpen_54, - res: ResOpen_54 + req: ReqOpen_55, + res: ResOpen_55 }, "tanxian/Receive": { req: ReqReceive_6, @@ -1438,8 +1439,8 @@ export interface ServiceType { res: ResFinsh }, "task/Open": { - req: ReqOpen_55, - res: ResOpen_55 + req: ReqOpen_56, + res: ResOpen_56 }, "user/CDKEY": { req: ReqCDKEY, @@ -1502,8 +1503,8 @@ export interface ServiceType { res: ResExchange }, "weixiuchang/Open": { - req: ReqOpen_56, - res: ResOpen_56 + req: ReqOpen_57, + res: ResOpen_57 }, "weixiuchang/UpLv": { req: ReqUpLv, @@ -1546,8 +1547,8 @@ export interface ServiceType { res: ResJingCaiOpen }, "wzry/Open": { - req: ReqOpen_57, - res: ResOpen_57 + req: ReqOpen_58, + res: ResOpen_58 }, "wzry/UpdateFight": { req: ReqUpdateFight, @@ -1578,8 +1579,8 @@ export interface ServiceType { res: ResOnekeyReceive }, "xstask/Open": { - req: ReqOpen_58, - res: ResOpen_58 + req: ReqOpen_59, + res: ResOpen_59 }, "xstask/Receive": { req: ReqReceive_7, @@ -1631,6 +1632,7 @@ export interface ServiceType { "msg_s2c/PeijianChange": MsgPeijianChange, "msg_s2c/PlayerChange": MsgPlayerChange, "msg_s2c/Private": MsgPrivate, + "msg_s2c/PushGiftChange": MsgPushGiftChange, "msg_s2c/SendGift": MsgSendGift, "msg_s2c/ShiwuChange": MsgShiwuChange, "msg_s2c/TaskChange": MsgTaskChange, @@ -2012,81 +2014,76 @@ export const serviceProto: ServiceProto = { }, { "id": 74, - "name": "event/shiwuleichong/Rec", - "type": "api" - }, - { - "id": 75, "name": "event/shouchong/Open", "type": "api" }, { - "id": 76, + "id": 75, "name": "event/shouchong/Receive", "type": "api" }, { - "id": 77, + "id": 76, "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": { @@ -2094,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": { @@ -2254,7 +2251,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 121, + "id": 120, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2264,7 +2261,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 122, + "id": 121, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2274,7 +2271,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 123, + "id": 122, "name": "gonghui/Change", "type": "api", "conf": { @@ -2284,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": { @@ -2299,7 +2296,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 126, + "id": 125, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2309,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": { @@ -2324,7 +2321,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 129, + "id": 128, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2334,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": { @@ -2354,7 +2351,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 133, + "id": 132, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2364,7 +2361,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 134, + "id": 133, "name": "gonghui/List", "type": "api", "conf": { @@ -2374,7 +2371,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 135, + "id": 134, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2384,7 +2381,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 136, + "id": 135, "name": "gonghui/Open", "type": "api", "conf": { @@ -2394,7 +2391,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 137, + "id": 136, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2404,7 +2401,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 138, + "id": 137, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2414,7 +2411,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 139, + "id": 138, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2424,7 +2421,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 140, + "id": 139, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2434,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": { @@ -2572,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": { @@ -2590,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": { @@ -2623,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": { @@ -2741,195 +2738,200 @@ 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": 237, + "name": "msg_s2c/PushGiftChange", + "type": "msg" + }, { "id": 238, "name": "msg_s2c/SendGift", @@ -3073,121 +3075,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 +3204,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 +3282,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" } @@ -10247,60 +10254,18 @@ export const serviceProto: ServiceProto = { "properties": [ { "id": 0, - "name": "index", + "name": "day", "type": { "type": "Number" } }, { "id": 1, - "name": "sTime", - "type": { - "type": "Number" - } - }, - { - "id": 2, - "name": "recIndex", + "name": "payIds", "type": { "type": "Array", "elementType": { - "type": "Number" - } - } - }, - { - "id": 3, - "name": "payDay", - "type": { - "type": "Number" - } - } - ] - }, - "event/shiwuleichong/PtlRec/ReqRec": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "index", - "type": { - "type": "Number" - } - } - ] - }, - "event/shiwuleichong/PtlRec/ResRec": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "prize", - "type": { - "type": "Array", - "elementType": { - "type": "Reference", - "target": "type/prizeType" + "type": "String" } } } @@ -17934,6 +17899,10 @@ export const serviceProto: ServiceProto = { } } }, + "msg_s2c/MsgPushGiftChange/MsgPushGiftChange": { + "type": "Literal", + "literal": 1 + }, "msg_s2c/MsgSendGift/MsgSendGift": { "type": "Interface", "indexSignature": { @@ -18908,13 +18877,6 @@ export const serviceProto: ServiceProto = { "type": "Literal", "literal": "G123Gift" } - }, - { - "id": 18, - "type": { - "type": "Literal", - "literal": "christmas" - } } ] }, @@ -19015,6 +18977,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 7e063ef72ba6a21ecea60fc47f42b299ef2c6fbb Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 15 Dec 2023 18:26:25 +0800 Subject: [PATCH 71/80] =?UTF-8?q?fix:=20=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 42ce9dd..2329b0e 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -74,7 +74,6 @@ import { ReqOpen as ReqOpen_17, ResOpen as ResOpen_17 } from './event/qiridenglu import { ReqRecPrize as ReqRecPrize_1, ResRecPrize as ResRecPrize_1 } from './event/qiridenglu/PtlRecPrize'; import { ReqOpen as ReqOpen_18, ResOpen as ResOpen_18 } from './event/shiwuleichong/PtlOpen'; import { ReqOpen as ReqOpen_19, ResOpen as ResOpen_19 } from './event/shouchong/PtlOpen'; -import { ReqReceive as ReqReceive_2, ResReceive as ResReceive_2 } from './event/shouchong/PtlReceive'; import { ReqBuy as ReqBuy_1, ResBuy as ResBuy_1 } from './event/xianshizhaomu/PtlBuy'; import { ReqDuihuan, ResDuihuan } from './event/xianshizhaomu/PtlDuihuan'; import { ReqLottery as ReqLottery_1, ResLottery as ResLottery_1 } from './event/xianshizhaomu/PtlLottery'; @@ -95,7 +94,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'; @@ -185,10 +184,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'; @@ -298,7 +297,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'; @@ -337,7 +336,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'; @@ -646,10 +645,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 @@ -731,8 +726,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, @@ -1091,8 +1086,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, @@ -1103,8 +1098,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, @@ -1427,8 +1422,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, @@ -1583,8 +1578,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, @@ -2019,71 +2014,66 @@ export const serviceProto: ServiceProto = { }, { "id": 75, - "name": "event/shouchong/Receive", - "type": "api" - }, - { - "id": 76, "name": "event/xianshizhaomu/Buy", "type": "api" }, { - "id": 77, + "id": 76, "name": "event/xianshizhaomu/Duihuan", "type": "api" }, { - "id": 78, + "id": 77, "name": "event/xianshizhaomu/Lottery", "type": "api" }, { - "id": 79, + "id": 78, "name": "event/xianshizhaomu/Open", "type": "api" }, { - "id": 80, + "id": 79, "name": "event/xianshizhaomu/Rec", "type": "api" }, { - "id": 81, + "id": 80, "name": "event/xinshoulibao/Open", "type": "api" }, { - "id": 82, + "id": 81, "name": "event/yangchengmubiao/Buy", "type": "api" }, { - "id": 83, + "id": 82, "name": "event/yangchengmubiao/Open", "type": "api" }, { - "id": 84, + "id": 83, "name": "event/yangchengmubiao/Rec", "type": "api" }, { - "id": 85, + "id": 84, "name": "event/yibaichou/Open", "type": "api" }, { - "id": 86, + "id": 85, "name": "event/yibaichou/Rec", "type": "api" }, { - "id": 87, + "id": 86, "name": "event/yibaichou/RecAll", "type": "api" }, { - "id": 88, + "id": 87, "name": "event/yuedujijin/Open", "type": "api", "conf": { @@ -2091,157 +2081,157 @@ export const serviceProto: ServiceProto = { } }, { - "id": 89, + "id": 88, "name": "event/yuedujijin/Rec", "type": "api" }, { - "id": 90, + "id": 89, "name": "event/zhanling/BuyLv", "type": "api" }, { - "id": 91, + "id": 90, "name": "event/zhanling/Open", "type": "api" }, { - "id": 92, + "id": 91, "name": "event/zhanling/RecPrize", "type": "api" }, { - "id": 93, + "id": 92, "name": "event/zhanling/RecTask", "type": "api" }, { - "id": 94, + "id": 93, "name": "event/zhoulibao/Open", "type": "api" }, { - "id": 95, + "id": 94, "name": "event/zhoumolibao/Open", "type": "api" }, { - "id": 96, + "id": 95, "name": "event/zhoumolibao/Receive", "type": "api" }, { - "id": 97, + "id": 96, "name": "event/zixuanlibao/Buy", "type": "api" }, { - "id": 98, + "id": 97, "name": "event/zixuanlibao/Open", "type": "api" }, { - "id": 99, + "id": 98, "name": "eventlist/hdGetList", "type": "api" }, { - "id": 100, + "id": 99, "name": "friend/Apply", "type": "api" }, { - "id": 101, + "id": 100, "name": "friend/Del", "type": "api" }, { - "id": 102, + "id": 101, "name": "friend/Gift", "type": "api" }, { - "id": 103, + "id": 102, "name": "friend/List", "type": "api" }, { - "id": 104, + "id": 103, "name": "friend/Open", "type": "api" }, { - "id": 105, + "id": 104, "name": "friend/Respond", "type": "api" }, { - "id": 106, + "id": 105, "name": "friend/RmBlackList", "type": "api" }, { - "id": 107, + "id": 106, "name": "friend/Search", "type": "api" }, { - "id": 108, + "id": 107, "name": "ganbutexun/Challenge", "type": "api" }, { - "id": 109, + "id": 108, "name": "ganbutexun/Open", "type": "api" }, { - "id": 110, + "id": 109, "name": "ganhai/Fast", "type": "api" }, { - "id": 111, + "id": 110, "name": "ganhai/Fight", "type": "api" }, { - "id": 112, + "id": 111, "name": "ganhai/Log", "type": "api" }, { - "id": 113, + "id": 112, "name": "ganhai/Open", "type": "api" }, { - "id": 114, + "id": 113, "name": "ganhai/Refresh", "type": "api" }, { - "id": 115, + "id": 114, "name": "ganhai/RefreshShip", "type": "api" }, { - "id": 116, + "id": 115, "name": "ganhai/Select", "type": "api" }, { - "id": 117, + "id": 116, "name": "gmapi/Gift", "type": "api" }, { - "id": 118, + "id": 117, "name": "gmapi/Post", "type": "api" }, { - "id": 119, + "id": 118, "name": "gonghui/Apply", "type": "api", "conf": { @@ -2251,7 +2241,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 120, + "id": 119, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2261,7 +2251,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 121, + "id": 120, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2271,7 +2261,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 122, + "id": 121, "name": "gonghui/Change", "type": "api", "conf": { @@ -2281,12 +2271,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 123, + "id": 122, "name": "gonghui/Create", "type": "api" }, { - "id": 124, + "id": 123, "name": "gonghui/Dissolve", "type": "api", "conf": { @@ -2296,7 +2286,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 125, + "id": 124, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2306,12 +2296,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 126, + "id": 125, "name": "gonghui/FbBuyNum", "type": "api" }, { - "id": 127, + "id": 126, "name": "gonghui/FbFight", "type": "api", "conf": { @@ -2321,7 +2311,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 128, + "id": 127, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2331,17 +2321,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 129, + "id": 128, "name": "gonghui/GetList", "type": "api" }, { - "id": 130, + "id": 129, "name": "gonghui/Join", "type": "api" }, { - "id": 131, + "id": 130, "name": "gonghui/Jx", "type": "api", "conf": { @@ -2351,7 +2341,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 132, + "id": 131, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2361,7 +2351,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 133, + "id": 132, "name": "gonghui/List", "type": "api", "conf": { @@ -2371,7 +2361,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 134, + "id": 133, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2381,7 +2371,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 135, + "id": 134, "name": "gonghui/Open", "type": "api", "conf": { @@ -2391,7 +2381,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 136, + "id": 135, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2401,7 +2391,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 137, + "id": 136, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2411,7 +2401,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 138, + "id": 137, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2421,7 +2411,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 139, + "id": 138, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2431,137 +2421,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 140, + "id": 139, "name": "gonghuibaozang/Lottery", "type": "api" }, { - "id": 141, + "id": 140, "name": "gonghuibaozang/Open", "type": "api" }, { - "id": 142, + "id": 141, "name": "gonglukuangbiao/Buy", "type": "api" }, { - "id": 143, + "id": 142, "name": "gonglukuangbiao/Fight", "type": "api" }, { - "id": 144, + "id": 143, "name": "gonglukuangbiao/Open", "type": "api" }, { - "id": 145, + "id": 144, "name": "gonglukuangbiao/Refresh", "type": "api" }, { - "id": 146, + "id": 145, "name": "gongyu/mingdao/Active", "type": "api" }, { - "id": 147, + "id": 146, "name": "gongyu/mingdao/Open", "type": "api" }, { - "id": 148, + "id": 147, "name": "gongyu/mingdao/RecPrize", "type": "api" }, { - "id": 149, + "id": 148, "name": "gongyu/mingdao/Repair", "type": "api" }, { - "id": 150, + "id": 149, "name": "gongyu/xunlianjihua/Reset", "type": "api" }, { - "id": 151, + "id": 150, "name": "gongyu/xunlianjihua/UpSkill", "type": "api" }, { - "id": 152, + "id": 151, "name": "gongyu/zuozhanjihua/SetSkill", "type": "api" }, { - "id": 153, + "id": 152, "name": "hbzb/jfs/BuyNum", "type": "api" }, { - "id": 154, + "id": 153, "name": "hbzb/jfs/Fight", "type": "api" }, { - "id": 155, + "id": 154, "name": "hbzb/jfs/GetLog", "type": "api" }, { - "id": 156, + "id": 155, "name": "hbzb/jfs/Open", "type": "api" }, { - "id": 157, + "id": 156, "name": "hbzb/jfs/Rec", "type": "api" }, { - "id": 158, + "id": 157, "name": "hbzb/jfs/Refresh", "type": "api" }, { - "id": 159, + "id": 158, "name": "hbzb/GetStatus", "type": "api" }, { - "id": 160, + "id": 159, "name": "hbzb/zbs/BuyNum", "type": "api" }, { - "id": 161, + "id": 160, "name": "hbzb/zbs/Fight", "type": "api" }, { - "id": 162, + "id": 161, "name": "hbzb/zbs/GetLog", "type": "api" }, { - "id": 163, + "id": 162, "name": "hbzb/zbs/Open", "type": "api" }, { - "id": 164, + "id": 163, "name": "hbzb/zbs/Refresh", "type": "api" }, { - "id": 165, + "id": 164, "name": "hero/Awake", "type": "api" }, { - "id": 166, + "id": 165, "name": "hero/ChangePos", "type": "api", "conf": { @@ -2569,17 +2559,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 167, + "id": 166, "name": "hero/GetList", "type": "api" }, { - "id": 168, + "id": 167, "name": "hero/JinJie", "type": "api" }, { - "id": 169, + "id": 168, "name": "hero/LvUp", "type": "api", "conf": { @@ -2587,32 +2577,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 170, + "id": 169, "name": "hero/Potency", "type": "api" }, { - "id": 171, + "id": 170, "name": "hero/Rec", "type": "api" }, { - "id": 172, + "id": 171, "name": "hero/Reset", "type": "api" }, { - "id": 173, + "id": 172, "name": "hero/Talent", "type": "api" }, { - "id": 174, + "id": 173, "name": "hero/WeaponUp", "type": "api" }, { - "id": 175, + "id": 174, "name": "hongdian/Get", "type": "api", "conf": { @@ -2620,117 +2610,117 @@ export const serviceProto: ServiceProto = { } }, { - "id": 176, + "id": 175, "name": "item/GetList", "type": "api" }, { - "id": 177, + "id": 176, "name": "item/Use", "type": "api" }, { - "id": 178, + "id": 177, "name": "jiaotang/Lottery", "type": "api" }, { - "id": 179, + "id": 178, "name": "jiaotang/Open", "type": "api" }, { - "id": 180, + "id": 179, "name": "jiuba/Lottery", "type": "api" }, { - "id": 181, + "id": 180, "name": "jiuba/Open", "type": "api" }, { - "id": 182, + "id": 181, "name": "jjc/BuyFightNum", "type": "api" }, { - "id": 183, + "id": 182, "name": "jjc/Fight", "type": "api" }, { - "id": 184, + "id": 183, "name": "jjc/FightLog", "type": "api" }, { - "id": 185, + "id": 184, "name": "jjc/Open", "type": "api" }, { - "id": 186, + "id": 185, "name": "jjc/Receive", "type": "api" }, { - "id": 187, + "id": 186, "name": "jjc/Refresh", "type": "api" }, { - "id": 188, + "id": 187, "name": "kaifujingsai/Open", "type": "api" }, { - "id": 189, + "id": 188, "name": "kaifujingsai/Receive", "type": "api" }, { - "id": 190, + "id": 189, "name": "kbzz/Apply", "type": "api" }, { - "id": 191, + "id": 190, "name": "kbzz/AutoApply", "type": "api" }, { - "id": 192, + "id": 191, "name": "kbzz/BuyNum", "type": "api" }, { - "id": 193, + "id": 192, "name": "kbzz/Fight", "type": "api" }, { - "id": 194, + "id": 193, "name": "kbzz/FightLog", "type": "api" }, { - "id": 195, + "id": 194, "name": "kbzz/GroupState", "type": "api" }, { - "id": 196, + "id": 195, "name": "kbzz/Open", "type": "api" }, { - "id": 197, + "id": 196, "name": "kbzz/RecPrize", "type": "api" }, { - "id": 198, + "id": 197, "name": "kbzz/Refresh", "type": "api", "conf": { @@ -2738,287 +2728,287 @@ export const serviceProto: ServiceProto = { } }, { - "id": 199, + "id": 198, "name": "kuangdong/AddPkNum", "type": "api" }, { - "id": 200, + "id": 199, "name": "kuangdong/GetPrize", "type": "api" }, { - "id": 201, + "id": 200, "name": "kuangdong/KdInfo", "type": "api" }, { - "id": 202, + "id": 201, "name": "kuangdong/Log", "type": "api" }, { - "id": 203, + "id": 202, "name": "kuangdong/Open", "type": "api" }, { - "id": 204, + "id": 203, "name": "kuangdong/YanShi", "type": "api" }, { - "id": 205, + "id": 204, "name": "kuangdong/ZhanLing", "type": "api" }, { - "id": 206, + "id": 205, "name": "lingzhulaixi/Open", "type": "api" }, { - "id": 207, + "id": 206, "name": "lingzhulaixi/PkBoss", "type": "api" }, { - "id": 208, + "id": 207, "name": "lingzhulaixi/PkRank", "type": "api" }, { - "id": 209, + "id": 208, "name": "lingzhulaixi/SaoDang", "type": "api" }, { - "id": 210, + "id": 209, "name": "meirishilian/Buy", "type": "api" }, { - "id": 211, + "id": 210, "name": "meirishilian/Fight", "type": "api" }, { - "id": 212, + "id": 211, "name": "meirishilian/Open", "type": "api" }, { - "id": 213, + "id": 212, "name": "msg_c2s/BindUid", "type": "msg" }, { - "id": 214, + "id": 213, "name": "msg_c2s/Pay", "type": "msg" }, { - "id": 215, + "id": 214, "name": "msg_c2s/Sync", "type": "msg" }, { - "id": 216, + "id": 215, "name": "msg_s2c/Chat", "type": "msg" }, { - "id": 217, + "id": 216, "name": "msg_s2c/ChatHelp", "type": "msg" }, { - "id": 218, + "id": 217, "name": "msg_s2c/Collection", "type": "msg" }, { - "id": 219, + "id": 218, "name": "msg_s2c/Email", "type": "msg" }, { - "id": 220, + "id": 219, "name": "msg_s2c/EmailDel", "type": "msg" }, { - "id": 221, + "id": 220, "name": "msg_s2c/EquipChange", "type": "msg" }, { - "id": 222, + "id": 221, "name": "msg_s2c/Friend", "type": "msg" }, { - "id": 223, + "id": 222, "name": "msg_s2c/GhChange", "type": "msg" }, { - "id": 224, + "id": 223, "name": "msg_s2c/GongHuiBaoZang", "type": "msg" }, { - "id": 225, + "id": 224, "name": "msg_s2c/HeroChange", "type": "msg" }, { - "id": 226, + "id": 225, "name": "msg_s2c/HongDianChange", "type": "msg" }, { - "id": 227, + "id": 226, "name": "msg_s2c/ItemChange", "type": "msg" }, { - "id": 228, + "id": 227, "name": "msg_s2c/LoginQueue", "type": "msg" }, { - "id": 229, + "id": 228, "name": "msg_s2c/LshdChange", "type": "msg" }, { - "id": 230, + "id": 229, "name": "msg_s2c/NewDay", "type": "msg" }, { - "id": 231, + "id": 230, "name": "msg_s2c/OtherLogin", "type": "msg" }, { - "id": 232, + "id": 231, "name": "msg_s2c/PayChange", "type": "msg" }, { - "id": 233, + "id": 232, "name": "msg_s2c/PayResult", "type": "msg" }, { - "id": 234, + "id": 233, "name": "msg_s2c/PeijianChange", "type": "msg" }, { - "id": 235, + "id": 234, "name": "msg_s2c/PlayerChange", "type": "msg" }, { - "id": 236, + "id": 235, "name": "msg_s2c/Private", "type": "msg" }, { - "id": 237, + "id": 236, "name": "msg_s2c/PushGiftChange", "type": "msg" }, { - "id": 238, + "id": 237, "name": "msg_s2c/SendGift", "type": "msg" }, { - "id": 239, + "id": 238, "name": "msg_s2c/ShiwuChange", "type": "msg" }, { - "id": 240, + "id": 239, "name": "msg_s2c/TaskChange", "type": "msg" }, { - "id": 241, + "id": 240, "name": "msg_s2c/Xianshilibao", "type": "msg" }, { - "id": 242, + "id": 241, "name": "pata/Fight", "type": "api" }, { - "id": 243, + "id": 242, "name": "pata/GetPrize", "type": "api" }, { - "id": 244, + "id": 243, "name": "pata/Open", "type": "api" }, { - "id": 245, + "id": 244, "name": "pata/SaoDang", "type": "api" }, { - "id": 246, + "id": 245, "name": "pay/GetList", "type": "api" }, { - "id": 247, + "id": 246, "name": "peijian/GetList", "type": "api" }, { - "id": 248, + "id": 247, "name": "peijian/JingLian", "type": "api" }, { - "id": 249, + "id": 248, "name": "peijian/JinJie", "type": "api" }, { - "id": 250, + "id": 249, "name": "peijian/LvUp", "type": "api" }, { - "id": 251, + "id": 250, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 252, + "id": 251, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 253, + "id": 252, "name": "peijian/Reset", "type": "api" }, { - "id": 254, + "id": 253, "name": "peijian/Rm", "type": "api" }, { - "id": 255, + "id": 254, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3026,32 +3016,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 256, + "id": 255, "name": "peijian/UnLock", "type": "api" }, { - "id": 257, + "id": 256, "name": "peijian/Wear", "type": "api" }, { - "id": 258, + "id": 257, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 259, + "id": 258, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 260, + "id": 259, "name": "peijiancangku/Open", "type": "api" }, { - "id": 261, + "id": 260, "name": "Bingo", "type": "api", "conf": { @@ -3059,142 +3049,142 @@ export const serviceProto: ServiceProto = { } }, { - "id": 262, + "id": 261, "name": "FightTest", "type": "api" }, { - "id": 263, + "id": 262, "name": "SyncBtn", "type": "api" }, { - "id": 264, + "id": 263, "name": "Test", "type": "api" }, { - "id": 265, + "id": 264, "name": "pushgift/Open", "type": "api" }, { - "id": 266, + "id": 265, "name": "qjzzd/Fight", "type": "api" }, { - "id": 267, + "id": 266, "name": "qjzzd/Open", "type": "api" }, { - "id": 268, + "id": 267, "name": "rank/Open", "type": "api" }, { - "id": 269, + "id": 268, "name": "shiwu/Concise", "type": "api" }, { - "id": 270, + "id": 269, "name": "shiwu/Extract", "type": "api" }, { - "id": 271, + "id": 270, "name": "shiwu/GetList", "type": "api" }, { - "id": 272, + "id": 271, "name": "shiwu/LvUp", "type": "api" }, { - "id": 273, + "id": 272, "name": "shiwu/Recast", "type": "api" }, { - "id": 274, + "id": 273, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 275, + "id": 274, "name": "shiwu/Wear", "type": "api" }, { - "id": 276, + "id": 275, "name": "shootGame/Open", "type": "api" }, { - "id": 277, + "id": 276, "name": "shootGame/Rec", "type": "api" }, { - "id": 278, + "id": 277, "name": "shop/Buy", "type": "api" }, { - "id": 279, + "id": 278, "name": "shop/Open", "type": "api" }, { - "id": 280, + "id": 279, "name": "shop/Refresh", "type": "api" }, { - "id": 281, + "id": 280, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 282, + "id": 281, "name": "sign/GetPrize", "type": "api" }, { - "id": 283, + "id": 282, "name": "sign/Open", "type": "api" }, { - "id": 284, + "id": 283, "name": "slzd/Aim", "type": "api" }, { - "id": 285, + "id": 284, "name": "slzd/BuyNum", "type": "api" }, { - "id": 286, + "id": 285, "name": "slzd/Fight", "type": "api" }, { - "id": 287, + "id": 286, "name": "slzd/FightLog", "type": "api" }, { - "id": 288, + "id": 287, "name": "slzd/MyRank", "type": "api" }, { - "id": 289, + "id": 288, "name": "slzd/Open", "type": "api", "conf": { @@ -3204,77 +3194,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 290, + "id": 289, "name": "slzd/OpenFort", "type": "api" }, { - "id": 291, + "id": 290, "name": "slzd/Rec", "type": "api" }, { - "id": 292, + "id": 291, "name": "slzd/Refresh", "type": "api" }, { - "id": 293, + "id": 292, "name": "slzd/Slot", "type": "api" }, { - "id": 294, + "id": 293, "name": "tanxian/Event", "type": "api" }, { - "id": 295, + "id": 294, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 296, + "id": 295, "name": "tanxian/Fight", "type": "api" }, { - "id": 297, + "id": 296, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 298, + "id": 297, "name": "tanxian/Open", "type": "api" }, { - "id": 299, + "id": 298, "name": "tanxian/Receive", "type": "api" }, { - "id": 300, + "id": 299, "name": "task/AllFinsh", "type": "api" }, { - "id": 301, + "id": 300, "name": "task/Finsh", "type": "api" }, { - "id": 302, + "id": 301, "name": "task/Open", "type": "api" }, { - "id": 303, + "id": 302, "name": "user/CDKEY", "type": "api" }, { - "id": 304, + "id": 303, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3282,197 +3272,197 @@ export const serviceProto: ServiceProto = { } }, { - "id": 305, + "id": 304, "name": "user/ChangeName", "type": "api" }, { - "id": 306, + "id": 305, "name": "user/Fight", "type": "api" }, { - "id": 307, + "id": 306, "name": "user/GetInfo", "type": "api" }, { - "id": 308, + "id": 307, "name": "user/InfoOpen", "type": "api" }, { - "id": 309, + "id": 308, "name": "user/Login", "type": "api" }, { - "id": 310, + "id": 309, "name": "user/Ping", "type": "api" }, { - "id": 311, + "id": 310, "name": "user/Renown", "type": "api" }, { - "id": 312, + "id": 311, "name": "user/RenownBuy", "type": "api" }, { - "id": 313, + "id": 312, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 314, + "id": 313, "name": "user/RenownOpen", "type": "api" }, { - "id": 315, + "id": 314, "name": "user/Tujian", "type": "api" }, { - "id": 316, + "id": 315, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 317, + "id": 316, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 318, + "id": 317, "name": "weixiuchang/Open", "type": "api" }, { - "id": 319, + "id": 318, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 320, + "id": 319, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 321, + "id": 320, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 322, + "id": 321, "name": "wzry/BaoMing", "type": "api" }, { - "id": 323, + "id": 322, "name": "wzry/catFightLog", "type": "api" }, { - "id": 324, + "id": 323, "name": "wzry/CatGroup", "type": "api" }, { - "id": 325, + "id": 324, "name": "wzry/DldFight", "type": "api" }, { - "id": 326, + "id": 325, "name": "wzry/DldRefre", "type": "api" }, { - "id": 327, + "id": 326, "name": "wzry/JingCai", "type": "api" }, { - "id": 328, + "id": 327, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 329, + "id": 328, "name": "wzry/Open", "type": "api" }, { - "id": 330, + "id": 329, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 331, + "id": 330, "name": "wzry/Wzzd", "type": "api" }, { - "id": 332, + "id": 331, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 333, + "id": 332, "name": "xstask/AllGet", "type": "api" }, { - "id": 334, + "id": 333, "name": "xstask/Get", "type": "api" }, { - "id": 335, + "id": 334, "name": "xstask/LvUp", "type": "api" }, { - "id": 336, + "id": 335, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 337, + "id": 336, "name": "xstask/Open", "type": "api" }, { - "id": 338, + "id": 337, "name": "xstask/Receive", "type": "api" }, { - "id": 339, + "id": 338, "name": "xstask/Refresh", "type": "api" }, { - "id": 340, + "id": 339, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 341, + "id": 340, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 342, + "id": 341, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 343, + "id": 342, "name": "zhanqianbushu/Up", "type": "api" } @@ -10279,52 +10269,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" } } } From 3cce7bbfc7fc18d20541a02737b13ad70a31aa57 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 15 Dec 2023 18:27:57 +0800 Subject: [PATCH 72/80] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=85=85=E5=80=BC=E5=BE=97payid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/shiwuleichong/ApiOpen.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api_s2c/event/shiwuleichong/ApiOpen.ts b/src/api_s2c/event/shiwuleichong/ApiOpen.ts index 5763d97..7954da3 100644 --- a/src/api_s2c/event/shiwuleichong/ApiOpen.ts +++ b/src/api_s2c/event/shiwuleichong/ApiOpen.ts @@ -38,6 +38,6 @@ export default async function (call: ApiCall) { call.succ({ day: day, - payIds: Object.keys(pays) + payIds: Object.keys(pays).filter((i) => pays[i].length > 0) }); } \ No newline at end of file From 0ac5246d5ba36ff3216da95f493fd8671584b1f2 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Mon, 18 Dec 2023 13:48:43 +0800 Subject: [PATCH 73/80] =?UTF-8?q?fix:=20=E7=A7=AF=E5=A4=A9=E5=A5=BD?= =?UTF-8?q?=E7=A4=BCbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/shiwuleichong/ApiOpen.ts | 31 +++++++++++----------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/api_s2c/event/shiwuleichong/ApiOpen.ts b/src/api_s2c/event/shiwuleichong/ApiOpen.ts index 7954da3..de01636 100644 --- a/src/api_s2c/event/shiwuleichong/ApiOpen.ts +++ b/src/api_s2c/event/shiwuleichong/ApiOpen.ts @@ -13,28 +13,27 @@ export default async function (call: ApiCall) { let _zt = PublicShared.getToDayZeroTime(); let pays = await PayFun.getPayLogs(call.uid, payids); for (; day <= G.gc.shiwuleichong.tasks.length; day++) { - let pay = pays[G.gc.shiwuleichong.tasks[day].payid]; - if (!pay) { + let pay = pays[G.gc.shiwuleichong.tasks[day - 1].payid]; + if (!pay || pay.length == 0) { break } else { - if (pay.slice(-1)[0].time >= _zt) { + // 如果是最后一天奖励 + if (day >= G.gc.shiwuleichong.tasks.length) { + // 充值订单隔天了 + if (pay.slice(-1)[0].time < _zt) { + // 重置所有订单 + await PayFun.delPayLog(call.uid, ...payids.map(i => { + return {payId: i, val: []} + })) + day = 1; + pays = {}; + } + break; + } else if (pay.slice(-1)[0].time >= _zt) { break } } } - // 如果是最后一天奖励 并且 充值订单隔天了 - if ( - day == G.gc.shiwuleichong.tasks.length && - pays[G.gc.shiwuleichong.tasks[day - 1].payid] && - pays[G.gc.shiwuleichong.tasks[day - 1].payid].slice(-1)[0].time < _zt - ) { - // 重置所有订单 - await PayFun.delPayLog(call.uid, ...payids.map(i => { - return {payId: i, val: []} - })) - day = 1; - pays = {}; - } call.succ({ day: day, From 91f14c69ceb8e07edf7f60a0b5fe49958bdb2b14 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Mon, 18 Dec 2023 21:31:51 +0800 Subject: [PATCH 74/80] =?UTF-8?q?fix:=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/hongdian/ApiGet.ts | 3 +- src/shared/protocols/serviceProto.ts | 728 +++++++++++++-------------- 2 files changed, 347 insertions(+), 384 deletions(-) diff --git a/src/api_s2c/hongdian/ApiGet.ts b/src/api_s2c/hongdian/ApiGet.ts index ab0c3cf..ce0c8d4 100644 --- a/src/api_s2c/hongdian/ApiGet.ts +++ b/src/api_s2c/hongdian/ApiGet.ts @@ -14,6 +14,7 @@ import {PublicShared} from '../../shared/public/public'; import {md_redPoint} from '../gongyu/mingdao/ApiOpen'; import {HongDianFun, HuoDongHongDianFun} from "./fun"; import {FunWeiXiuChang} from "../../public/weixiuchang"; +import {getShouChongRedPoint} from "../event/shouchong/ApiReceive"; const defaultKeys: hongdianKey[] = ['jiuba', 'jiaotang', 'shouchong', 'clslhd', 'dixiaqianzhuanghd', 'gonghuihd', 'hbzbhd', 'jjchd', 'taskhd', 'xstaskhd', 'lingzhulaixihd', 'dxlthd', 'wzcjhd', 'slzdhd', 'qjzzdhd', 'kuangdonghd', 'qiandaohd', 'kaifukuanghuanhd', 'jijinhd', 'zhuishalinghd', @@ -36,7 +37,7 @@ export default async function (call: ApiCall) { res[key] = {show: (!db || toDayZeroTime >= db.freeTime) ? true : false}; break; case 'shouchong': - // res[key] = await getShouChongRedPoint(call); + res[key] = await getShouChongRedPoint(call); break; case 'dixiaqianzhuanghd': res[key] = await DiXiaQianZhuangFun.getHongDian(call); diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 2329b0e..5c4141b 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -74,6 +74,7 @@ import { ReqOpen as ReqOpen_17, ResOpen as ResOpen_17 } from './event/qiridenglu import { ReqRecPrize as ReqRecPrize_1, ResRecPrize as ResRecPrize_1 } from './event/qiridenglu/PtlRecPrize'; import { ReqOpen as ReqOpen_18, ResOpen as ResOpen_18 } from './event/shiwuleichong/PtlOpen'; import { ReqOpen as ReqOpen_19, ResOpen as ResOpen_19 } from './event/shouchong/PtlOpen'; +import { ReqReceive as ReqReceive_2, ResReceive as ResReceive_2 } from './event/shouchong/PtlReceive'; import { 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'; @@ -94,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_2, ResReceive as ResReceive_2 } from './event/zhoumolibao/PtlReceive'; +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 { ReqhdGetList, ReshdGetList } from './eventlist/PtlhdGetList'; @@ -184,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_3, ResReceive as ResReceive_3 } from './jjc/PtlReceive'; +import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } from './jjc/PtlReceive'; import { ReqRefresh as ReqRefresh_4, ResRefresh as ResRefresh_4 } from './jjc/PtlRefresh'; import { ReqOpen as ReqOpen_41, ResOpen as ResOpen_41 } from './kaifujingsai/PtlOpen'; -import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } from './kaifujingsai/PtlReceive'; +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'; @@ -235,7 +236,6 @@ import { MsgPayResult } from './msg_s2c/MsgPayResult'; import { MsgPeijianChange } from './msg_s2c/MsgPeijianChange'; import { MsgPlayerChange } from './msg_s2c/MsgPlayerChange'; import { MsgPrivate } from './msg_s2c/MsgPrivate'; -import { MsgPushGiftChange } from './msg_s2c/MsgPushGiftChange'; import { MsgSendGift } from './msg_s2c/MsgSendGift'; import { MsgShiwuChange } from './msg_s2c/MsgShiwuChange'; import { MsgTaskChange } from './msg_s2c/MsgTaskChange'; @@ -263,10 +263,9 @@ 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_49, ResOpen as ResOpen_49 } from './qjzzd/PtlOpen'; -import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } 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'; @@ -274,20 +273,20 @@ import { ReqLvUp as ReqLvUp_3, ResLvUp as ResLvUp_3 } from './shiwu/PtlLvUp'; import { ReqRecast, ResRecast } from './shiwu/PtlRecast'; import { ReqTakeOff as ReqTakeOff_2, ResTakeOff as ResTakeOff_2 } from './shiwu/PtlTakeOff'; import { ReqWear as ReqWear_2, ResWear as ResWear_2 } from './shiwu/PtlWear'; -import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './shootGame/PtlOpen'; +import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } from './shootGame/PtlOpen'; import { ReqRec as ReqRec_13, ResRec as ResRec_13 } from './shootGame/PtlRec'; import { ReqBuy as ReqBuy_6, ResBuy as ResBuy_6 } from './shop/PtlBuy'; -import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './shop/PtlOpen'; +import { ReqOpen as ReqOpen_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_53, ResOpen as ResOpen_53 } 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_54, ResOpen as ResOpen_54 } 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_14, ResRec as ResRec_14 } from './slzd/PtlRec'; import { ReqRefresh as ReqRefresh_7, ResRefresh as ResRefresh_7 } from './slzd/PtlRefresh'; @@ -296,11 +295,11 @@ import { ReqEvent, ResEvent } from './tanxian/PtlEvent'; import { ReqFastGuaJi, ResFastGuaJi } from './tanxian/PtlFastGuaJi'; import { ReqFight as ReqFight_11, ResFight as ResFight_11 } from './tanxian/PtlFight'; import { ReqGuaJi, ResGuaJi } from './tanxian/PtlGuaJi'; -import { ReqOpen as ReqOpen_55, ResOpen as ResOpen_55 } from './tanxian/PtlOpen'; -import { ReqReceive as ReqReceive_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_56, ResOpen as ResOpen_56 } 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'; @@ -316,7 +315,7 @@ import { ReqRenownOpen, ResRenownOpen } from './user/PtlRenownOpen'; import { ReqTujian, ResTujian } from './user/PtlTujian'; import { ReqDecompose, ResDecompose } from './weixiuchang/PtlDecompose'; import { ReqExchange, ResExchange } from './weixiuchang/PtlExchange'; -import { ReqOpen as ReqOpen_57, ResOpen as ResOpen_57 } from './weixiuchang/PtlOpen'; +import { ReqOpen as ReqOpen_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'; @@ -327,7 +326,7 @@ import { ReqDldFight, ResDldFight } from './wzry/PtlDldFight'; import { ReqDldRefre, ResDldRefre } from './wzry/PtlDldRefre'; import { ReqJingCai, ResJingCai } from './wzry/PtlJingCai'; import { ReqJingCaiOpen, ResJingCaiOpen } from './wzry/PtlJingCaiOpen'; -import { ReqOpen as ReqOpen_58, ResOpen as ResOpen_58 } from './wzry/PtlOpen'; +import { ReqOpen as ReqOpen_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'; @@ -335,8 +334,8 @@ import { ReqAllGet, ResAllGet } from './xstask/PtlAllGet'; import { ReqGet as ReqGet_3, ResGet as ResGet_3 } from './xstask/PtlGet'; import { ReqLvUp as ReqLvUp_4, ResLvUp as ResLvUp_4 } from './xstask/PtlLvUp'; import { ReqOnekeyReceive, ResOnekeyReceive } from './xstask/PtlOnekeyReceive'; -import { ReqOpen as ReqOpen_59, ResOpen as ResOpen_59 } from './xstask/PtlOpen'; -import { ReqReceive as ReqReceive_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'; @@ -645,6 +644,10 @@ 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 @@ -726,8 +729,8 @@ export interface ServiceType { res: ResOpen_27 }, "event/zhoumolibao/Receive": { - req: ReqReceive_2, - res: ResReceive_2 + req: ReqReceive_3, + res: ResReceive_3 }, "event/zixuanlibao/Buy": { req: ReqBuy_3, @@ -1086,8 +1089,8 @@ export interface ServiceType { res: ResOpen_40 }, "jjc/Receive": { - req: ReqReceive_3, - res: ResReceive_3 + req: ReqReceive_4, + res: ResReceive_4 }, "jjc/Refresh": { req: ReqRefresh_4, @@ -1098,8 +1101,8 @@ export interface ServiceType { res: ResOpen_41 }, "kaifujingsai/Receive": { - req: ReqReceive_4, - res: ResReceive_4 + req: ReqReceive_5, + res: ResReceive_5 }, "kbzz/Apply": { req: ReqApply_2, @@ -1285,21 +1288,17 @@ 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_49, - res: ResOpen_49 + req: ReqOpen_48, + res: ResOpen_48 }, "rank/Open": { - req: ReqOpen_50, - res: ResOpen_50 + req: ReqOpen_49, + res: ResOpen_49 }, "shiwu/Concise": { req: ReqConcise, @@ -1330,8 +1329,8 @@ export interface ServiceType { res: ResWear_2 }, "shootGame/Open": { - req: ReqOpen_51, - res: ResOpen_51 + req: ReqOpen_50, + res: ResOpen_50 }, "shootGame/Rec": { req: ReqRec_13, @@ -1342,8 +1341,8 @@ export interface ServiceType { res: ResBuy_6 }, "shop/Open": { - req: ReqOpen_52, - res: ResOpen_52 + req: ReqOpen_51, + res: ResOpen_51 }, "shop/Refresh": { req: ReqRefresh_6, @@ -1358,8 +1357,8 @@ export interface ServiceType { res: ResGetPrize_2 }, "sign/Open": { - req: ReqOpen_53, - res: ResOpen_53 + req: ReqOpen_52, + res: ResOpen_52 }, "slzd/Aim": { req: ReqAim, @@ -1382,8 +1381,8 @@ export interface ServiceType { res: ResMyRank }, "slzd/Open": { - req: ReqOpen_54, - res: ResOpen_54 + req: ReqOpen_53, + res: ResOpen_53 }, "slzd/OpenFort": { req: ReqOpenFort, @@ -1418,12 +1417,12 @@ export interface ServiceType { res: ResGuaJi }, "tanxian/Open": { - req: ReqOpen_55, - res: ResOpen_55 + req: ReqOpen_54, + res: ResOpen_54 }, "tanxian/Receive": { - req: ReqReceive_5, - res: ResReceive_5 + req: ReqReceive_6, + res: ResReceive_6 }, "task/AllFinsh": { req: ReqAllFinsh, @@ -1434,8 +1433,8 @@ export interface ServiceType { res: ResFinsh }, "task/Open": { - req: ReqOpen_56, - res: ResOpen_56 + req: ReqOpen_55, + res: ResOpen_55 }, "user/CDKEY": { req: ReqCDKEY, @@ -1498,8 +1497,8 @@ export interface ServiceType { res: ResExchange }, "weixiuchang/Open": { - req: ReqOpen_57, - res: ResOpen_57 + req: ReqOpen_56, + res: ResOpen_56 }, "weixiuchang/UpLv": { req: ReqUpLv, @@ -1542,8 +1541,8 @@ export interface ServiceType { res: ResJingCaiOpen }, "wzry/Open": { - req: ReqOpen_58, - res: ResOpen_58 + req: ReqOpen_57, + res: ResOpen_57 }, "wzry/UpdateFight": { req: ReqUpdateFight, @@ -1574,12 +1573,12 @@ export interface ServiceType { res: ResOnekeyReceive }, "xstask/Open": { - req: ReqOpen_59, - res: ResOpen_59 + 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, @@ -1627,7 +1626,6 @@ 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, @@ -2014,66 +2012,71 @@ export const serviceProto: ServiceProto = { }, { "id": 75, - "name": "event/xianshizhaomu/Buy", + "name": "event/shouchong/Receive", "type": "api" }, { "id": 76, - "name": "event/xianshizhaomu/Duihuan", + "name": "event/xianshizhaomu/Buy", "type": "api" }, { "id": 77, - "name": "event/xianshizhaomu/Lottery", + "name": "event/xianshizhaomu/Duihuan", "type": "api" }, { "id": 78, - "name": "event/xianshizhaomu/Open", + "name": "event/xianshizhaomu/Lottery", "type": "api" }, { "id": 79, - "name": "event/xianshizhaomu/Rec", + "name": "event/xianshizhaomu/Open", "type": "api" }, { "id": 80, - "name": "event/xinshoulibao/Open", + "name": "event/xianshizhaomu/Rec", "type": "api" }, { "id": 81, - "name": "event/yangchengmubiao/Buy", + "name": "event/xinshoulibao/Open", "type": "api" }, { "id": 82, - "name": "event/yangchengmubiao/Open", + "name": "event/yangchengmubiao/Buy", "type": "api" }, { "id": 83, - "name": "event/yangchengmubiao/Rec", + "name": "event/yangchengmubiao/Open", "type": "api" }, { "id": 84, - "name": "event/yibaichou/Open", + "name": "event/yangchengmubiao/Rec", "type": "api" }, { "id": 85, - "name": "event/yibaichou/Rec", + "name": "event/yibaichou/Open", "type": "api" }, { "id": 86, - "name": "event/yibaichou/RecAll", + "name": "event/yibaichou/Rec", "type": "api" }, { "id": 87, + "name": "event/yibaichou/RecAll", + "type": "api" + }, + { + "id": 88, "name": "event/yuedujijin/Open", "type": "api", "conf": { @@ -2081,157 +2084,157 @@ export const serviceProto: ServiceProto = { } }, { - "id": 88, + "id": 89, "name": "event/yuedujijin/Rec", "type": "api" }, { - "id": 89, + "id": 90, "name": "event/zhanling/BuyLv", "type": "api" }, { - "id": 90, + "id": 91, "name": "event/zhanling/Open", "type": "api" }, { - "id": 91, + "id": 92, "name": "event/zhanling/RecPrize", "type": "api" }, { - "id": 92, + "id": 93, "name": "event/zhanling/RecTask", "type": "api" }, { - "id": 93, + "id": 94, "name": "event/zhoulibao/Open", "type": "api" }, { - "id": 94, + "id": 95, "name": "event/zhoumolibao/Open", "type": "api" }, { - "id": 95, + "id": 96, "name": "event/zhoumolibao/Receive", "type": "api" }, { - "id": 96, + "id": 97, "name": "event/zixuanlibao/Buy", "type": "api" }, { - "id": 97, + "id": 98, "name": "event/zixuanlibao/Open", "type": "api" }, { - "id": 98, + "id": 99, "name": "eventlist/hdGetList", "type": "api" }, { - "id": 99, + "id": 100, "name": "friend/Apply", "type": "api" }, { - "id": 100, + "id": 101, "name": "friend/Del", "type": "api" }, { - "id": 101, + "id": 102, "name": "friend/Gift", "type": "api" }, { - "id": 102, + "id": 103, "name": "friend/List", "type": "api" }, { - "id": 103, + "id": 104, "name": "friend/Open", "type": "api" }, { - "id": 104, + "id": 105, "name": "friend/Respond", "type": "api" }, { - "id": 105, + "id": 106, "name": "friend/RmBlackList", "type": "api" }, { - "id": 106, + "id": 107, "name": "friend/Search", "type": "api" }, { - "id": 107, + "id": 108, "name": "ganbutexun/Challenge", "type": "api" }, { - "id": 108, + "id": 109, "name": "ganbutexun/Open", "type": "api" }, { - "id": 109, + "id": 110, "name": "ganhai/Fast", "type": "api" }, { - "id": 110, + "id": 111, "name": "ganhai/Fight", "type": "api" }, { - "id": 111, + "id": 112, "name": "ganhai/Log", "type": "api" }, { - "id": 112, + "id": 113, "name": "ganhai/Open", "type": "api" }, { - "id": 113, + "id": 114, "name": "ganhai/Refresh", "type": "api" }, { - "id": 114, + "id": 115, "name": "ganhai/RefreshShip", "type": "api" }, { - "id": 115, + "id": 116, "name": "ganhai/Select", "type": "api" }, { - "id": 116, + "id": 117, "name": "gmapi/Gift", "type": "api" }, { - "id": 117, + "id": 118, "name": "gmapi/Post", "type": "api" }, { - "id": 118, + "id": 119, "name": "gonghui/Apply", "type": "api", "conf": { @@ -2241,7 +2244,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 119, + "id": 120, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2251,7 +2254,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 120, + "id": 121, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2261,7 +2264,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 121, + "id": 122, "name": "gonghui/Change", "type": "api", "conf": { @@ -2271,12 +2274,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 122, + "id": 123, "name": "gonghui/Create", "type": "api" }, { - "id": 123, + "id": 124, "name": "gonghui/Dissolve", "type": "api", "conf": { @@ -2286,7 +2289,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 124, + "id": 125, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2296,12 +2299,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 125, + "id": 126, "name": "gonghui/FbBuyNum", "type": "api" }, { - "id": 126, + "id": 127, "name": "gonghui/FbFight", "type": "api", "conf": { @@ -2311,7 +2314,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 127, + "id": 128, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2321,17 +2324,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 128, + "id": 129, "name": "gonghui/GetList", "type": "api" }, { - "id": 129, + "id": 130, "name": "gonghui/Join", "type": "api" }, { - "id": 130, + "id": 131, "name": "gonghui/Jx", "type": "api", "conf": { @@ -2341,7 +2344,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 131, + "id": 132, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2351,7 +2354,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 132, + "id": 133, "name": "gonghui/List", "type": "api", "conf": { @@ -2361,7 +2364,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 133, + "id": 134, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2371,7 +2374,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 134, + "id": 135, "name": "gonghui/Open", "type": "api", "conf": { @@ -2381,7 +2384,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 135, + "id": 136, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2391,7 +2394,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 136, + "id": 137, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2401,7 +2404,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 137, + "id": 138, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2411,7 +2414,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 138, + "id": 139, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2421,137 +2424,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 139, + "id": 140, "name": "gonghuibaozang/Lottery", "type": "api" }, { - "id": 140, + "id": 141, "name": "gonghuibaozang/Open", "type": "api" }, { - "id": 141, + "id": 142, "name": "gonglukuangbiao/Buy", "type": "api" }, { - "id": 142, + "id": 143, "name": "gonglukuangbiao/Fight", "type": "api" }, { - "id": 143, + "id": 144, "name": "gonglukuangbiao/Open", "type": "api" }, { - "id": 144, + "id": 145, "name": "gonglukuangbiao/Refresh", "type": "api" }, { - "id": 145, + "id": 146, "name": "gongyu/mingdao/Active", "type": "api" }, { - "id": 146, + "id": 147, "name": "gongyu/mingdao/Open", "type": "api" }, { - "id": 147, + "id": 148, "name": "gongyu/mingdao/RecPrize", "type": "api" }, { - "id": 148, + "id": 149, "name": "gongyu/mingdao/Repair", "type": "api" }, { - "id": 149, + "id": 150, "name": "gongyu/xunlianjihua/Reset", "type": "api" }, { - "id": 150, + "id": 151, "name": "gongyu/xunlianjihua/UpSkill", "type": "api" }, { - "id": 151, + "id": 152, "name": "gongyu/zuozhanjihua/SetSkill", "type": "api" }, { - "id": 152, + "id": 153, "name": "hbzb/jfs/BuyNum", "type": "api" }, { - "id": 153, + "id": 154, "name": "hbzb/jfs/Fight", "type": "api" }, { - "id": 154, + "id": 155, "name": "hbzb/jfs/GetLog", "type": "api" }, { - "id": 155, + "id": 156, "name": "hbzb/jfs/Open", "type": "api" }, { - "id": 156, + "id": 157, "name": "hbzb/jfs/Rec", "type": "api" }, { - "id": 157, + "id": 158, "name": "hbzb/jfs/Refresh", "type": "api" }, { - "id": 158, + "id": 159, "name": "hbzb/GetStatus", "type": "api" }, { - "id": 159, + "id": 160, "name": "hbzb/zbs/BuyNum", "type": "api" }, { - "id": 160, + "id": 161, "name": "hbzb/zbs/Fight", "type": "api" }, { - "id": 161, + "id": 162, "name": "hbzb/zbs/GetLog", "type": "api" }, { - "id": 162, + "id": 163, "name": "hbzb/zbs/Open", "type": "api" }, { - "id": 163, + "id": 164, "name": "hbzb/zbs/Refresh", "type": "api" }, { - "id": 164, + "id": 165, "name": "hero/Awake", "type": "api" }, { - "id": 165, + "id": 166, "name": "hero/ChangePos", "type": "api", "conf": { @@ -2559,17 +2562,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 166, + "id": 167, "name": "hero/GetList", "type": "api" }, { - "id": 167, + "id": 168, "name": "hero/JinJie", "type": "api" }, { - "id": 168, + "id": 169, "name": "hero/LvUp", "type": "api", "conf": { @@ -2577,32 +2580,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 169, + "id": 170, "name": "hero/Potency", "type": "api" }, { - "id": 170, + "id": 171, "name": "hero/Rec", "type": "api" }, { - "id": 171, + "id": 172, "name": "hero/Reset", "type": "api" }, { - "id": 172, + "id": 173, "name": "hero/Talent", "type": "api" }, { - "id": 173, + "id": 174, "name": "hero/WeaponUp", "type": "api" }, { - "id": 174, + "id": 175, "name": "hongdian/Get", "type": "api", "conf": { @@ -2610,117 +2613,117 @@ export const serviceProto: ServiceProto = { } }, { - "id": 175, + "id": 176, "name": "item/GetList", "type": "api" }, { - "id": 176, + "id": 177, "name": "item/Use", "type": "api" }, { - "id": 177, + "id": 178, "name": "jiaotang/Lottery", "type": "api" }, { - "id": 178, + "id": 179, "name": "jiaotang/Open", "type": "api" }, { - "id": 179, + "id": 180, "name": "jiuba/Lottery", "type": "api" }, { - "id": 180, + "id": 181, "name": "jiuba/Open", "type": "api" }, { - "id": 181, + "id": 182, "name": "jjc/BuyFightNum", "type": "api" }, { - "id": 182, + "id": 183, "name": "jjc/Fight", "type": "api" }, { - "id": 183, + "id": 184, "name": "jjc/FightLog", "type": "api" }, { - "id": 184, + "id": 185, "name": "jjc/Open", "type": "api" }, { - "id": 185, + "id": 186, "name": "jjc/Receive", "type": "api" }, { - "id": 186, + "id": 187, "name": "jjc/Refresh", "type": "api" }, { - "id": 187, + "id": 188, "name": "kaifujingsai/Open", "type": "api" }, { - "id": 188, + "id": 189, "name": "kaifujingsai/Receive", "type": "api" }, { - "id": 189, + "id": 190, "name": "kbzz/Apply", "type": "api" }, { - "id": 190, + "id": 191, "name": "kbzz/AutoApply", "type": "api" }, { - "id": 191, + "id": 192, "name": "kbzz/BuyNum", "type": "api" }, { - "id": 192, + "id": 193, "name": "kbzz/Fight", "type": "api" }, { - "id": 193, + "id": 194, "name": "kbzz/FightLog", "type": "api" }, { - "id": 194, + "id": 195, "name": "kbzz/GroupState", "type": "api" }, { - "id": 195, + "id": 196, "name": "kbzz/Open", "type": "api" }, { - "id": 196, + "id": 197, "name": "kbzz/RecPrize", "type": "api" }, { - "id": 197, + "id": 198, "name": "kbzz/Refresh", "type": "api", "conf": { @@ -2728,198 +2731,193 @@ export const serviceProto: ServiceProto = { } }, { - "id": 198, + "id": 199, "name": "kuangdong/AddPkNum", "type": "api" }, { - "id": 199, + "id": 200, "name": "kuangdong/GetPrize", "type": "api" }, { - "id": 200, + "id": 201, "name": "kuangdong/KdInfo", "type": "api" }, { - "id": 201, + "id": 202, "name": "kuangdong/Log", "type": "api" }, { - "id": 202, + "id": 203, "name": "kuangdong/Open", "type": "api" }, { - "id": 203, + "id": 204, "name": "kuangdong/YanShi", "type": "api" }, { - "id": 204, + "id": 205, "name": "kuangdong/ZhanLing", "type": "api" }, { - "id": 205, + "id": 206, "name": "lingzhulaixi/Open", "type": "api" }, { - "id": 206, + "id": 207, "name": "lingzhulaixi/PkBoss", "type": "api" }, { - "id": 207, + "id": 208, "name": "lingzhulaixi/PkRank", "type": "api" }, { - "id": 208, + "id": 209, "name": "lingzhulaixi/SaoDang", "type": "api" }, { - "id": 209, + "id": 210, "name": "meirishilian/Buy", "type": "api" }, { - "id": 210, + "id": 211, "name": "meirishilian/Fight", "type": "api" }, { - "id": 211, + "id": 212, "name": "meirishilian/Open", "type": "api" }, { - "id": 212, + "id": 213, "name": "msg_c2s/BindUid", "type": "msg" }, { - "id": 213, + "id": 214, "name": "msg_c2s/Pay", "type": "msg" }, { - "id": 214, + "id": 215, "name": "msg_c2s/Sync", "type": "msg" }, { - "id": 215, + "id": 216, "name": "msg_s2c/Chat", "type": "msg" }, { - "id": 216, + "id": 217, "name": "msg_s2c/ChatHelp", "type": "msg" }, { - "id": 217, + "id": 218, "name": "msg_s2c/Collection", "type": "msg" }, { - "id": 218, + "id": 219, "name": "msg_s2c/Email", "type": "msg" }, { - "id": 219, + "id": 220, "name": "msg_s2c/EmailDel", "type": "msg" }, { - "id": 220, + "id": 221, "name": "msg_s2c/EquipChange", "type": "msg" }, { - "id": 221, + "id": 222, "name": "msg_s2c/Friend", "type": "msg" }, { - "id": 222, + "id": 223, "name": "msg_s2c/GhChange", "type": "msg" }, { - "id": 223, + "id": 224, "name": "msg_s2c/GongHuiBaoZang", "type": "msg" }, { - "id": 224, + "id": 225, "name": "msg_s2c/HeroChange", "type": "msg" }, { - "id": 225, + "id": 226, "name": "msg_s2c/HongDianChange", "type": "msg" }, { - "id": 226, + "id": 227, "name": "msg_s2c/ItemChange", "type": "msg" }, { - "id": 227, + "id": 228, "name": "msg_s2c/LoginQueue", "type": "msg" }, { - "id": 228, + "id": 229, "name": "msg_s2c/LshdChange", "type": "msg" }, { - "id": 229, + "id": 230, "name": "msg_s2c/NewDay", "type": "msg" }, { - "id": 230, + "id": 231, "name": "msg_s2c/OtherLogin", "type": "msg" }, { - "id": 231, + "id": 232, "name": "msg_s2c/PayChange", "type": "msg" }, { - "id": 232, + "id": 233, "name": "msg_s2c/PayResult", "type": "msg" }, { - "id": 233, + "id": 234, "name": "msg_s2c/PeijianChange", "type": "msg" }, { - "id": 234, + "id": 235, "name": "msg_s2c/PlayerChange", "type": "msg" }, - { - "id": 235, - "name": "msg_s2c/Private", - "type": "msg" - }, { "id": 236, - "name": "msg_s2c/PushGiftChange", + "name": "msg_s2c/Private", "type": "msg" }, { @@ -3065,126 +3063,121 @@ export const serviceProto: ServiceProto = { }, { "id": 264, - "name": "pushgift/Open", - "type": "api" - }, - { - "id": 265, "name": "qjzzd/Fight", "type": "api" }, { - "id": 266, + "id": 265, "name": "qjzzd/Open", "type": "api" }, { - "id": 267, + "id": 266, "name": "rank/Open", "type": "api" }, { - "id": 268, + "id": 267, "name": "shiwu/Concise", "type": "api" }, { - "id": 269, + "id": 268, "name": "shiwu/Extract", "type": "api" }, { - "id": 270, + "id": 269, "name": "shiwu/GetList", "type": "api" }, { - "id": 271, + "id": 270, "name": "shiwu/LvUp", "type": "api" }, { - "id": 272, + "id": 271, "name": "shiwu/Recast", "type": "api" }, { - "id": 273, + "id": 272, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 274, + "id": 273, "name": "shiwu/Wear", "type": "api" }, { - "id": 275, + "id": 274, "name": "shootGame/Open", "type": "api" }, { - "id": 276, + "id": 275, "name": "shootGame/Rec", "type": "api" }, { - "id": 277, + "id": 276, "name": "shop/Buy", "type": "api" }, { - "id": 278, + "id": 277, "name": "shop/Open", "type": "api" }, { - "id": 279, + "id": 278, "name": "shop/Refresh", "type": "api" }, { - "id": 280, + "id": 279, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 281, + "id": 280, "name": "sign/GetPrize", "type": "api" }, { - "id": 282, + "id": 281, "name": "sign/Open", "type": "api" }, { - "id": 283, + "id": 282, "name": "slzd/Aim", "type": "api" }, { - "id": 284, + "id": 283, "name": "slzd/BuyNum", "type": "api" }, { - "id": 285, + "id": 284, "name": "slzd/Fight", "type": "api" }, { - "id": 286, + "id": 285, "name": "slzd/FightLog", "type": "api" }, { - "id": 287, + "id": 286, "name": "slzd/MyRank", "type": "api" }, { - "id": 288, + "id": 287, "name": "slzd/Open", "type": "api", "conf": { @@ -3194,77 +3187,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 289, + "id": 288, "name": "slzd/OpenFort", "type": "api" }, { - "id": 290, + "id": 289, "name": "slzd/Rec", "type": "api" }, { - "id": 291, + "id": 290, "name": "slzd/Refresh", "type": "api" }, { - "id": 292, + "id": 291, "name": "slzd/Slot", "type": "api" }, { - "id": 293, + "id": 292, "name": "tanxian/Event", "type": "api" }, { - "id": 294, + "id": 293, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 295, + "id": 294, "name": "tanxian/Fight", "type": "api" }, { - "id": 296, + "id": 295, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 297, + "id": 296, "name": "tanxian/Open", "type": "api" }, { - "id": 298, + "id": 297, "name": "tanxian/Receive", "type": "api" }, { - "id": 299, + "id": 298, "name": "task/AllFinsh", "type": "api" }, { - "id": 300, + "id": 299, "name": "task/Finsh", "type": "api" }, { - "id": 301, + "id": 300, "name": "task/Open", "type": "api" }, { - "id": 302, + "id": 301, "name": "user/CDKEY", "type": "api" }, { - "id": 303, + "id": 302, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3272,197 +3265,197 @@ export const serviceProto: ServiceProto = { } }, { - "id": 304, + "id": 303, "name": "user/ChangeName", "type": "api" }, { - "id": 305, + "id": 304, "name": "user/Fight", "type": "api" }, { - "id": 306, + "id": 305, "name": "user/GetInfo", "type": "api" }, { - "id": 307, + "id": 306, "name": "user/InfoOpen", "type": "api" }, { - "id": 308, + "id": 307, "name": "user/Login", "type": "api" }, { - "id": 309, + "id": 308, "name": "user/Ping", "type": "api" }, { - "id": 310, + "id": 309, "name": "user/Renown", "type": "api" }, { - "id": 311, + "id": 310, "name": "user/RenownBuy", "type": "api" }, { - "id": 312, + "id": 311, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 313, + "id": 312, "name": "user/RenownOpen", "type": "api" }, { - "id": 314, + "id": 313, "name": "user/Tujian", "type": "api" }, { - "id": 315, + "id": 314, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 316, + "id": 315, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 317, + "id": 316, "name": "weixiuchang/Open", "type": "api" }, { - "id": 318, + "id": 317, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 319, + "id": 318, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 320, + "id": 319, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 321, + "id": 320, "name": "wzry/BaoMing", "type": "api" }, { - "id": 322, + "id": 321, "name": "wzry/catFightLog", "type": "api" }, { - "id": 323, + "id": 322, "name": "wzry/CatGroup", "type": "api" }, { - "id": 324, + "id": 323, "name": "wzry/DldFight", "type": "api" }, { - "id": 325, + "id": 324, "name": "wzry/DldRefre", "type": "api" }, { - "id": 326, + "id": 325, "name": "wzry/JingCai", "type": "api" }, { - "id": 327, + "id": 326, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 328, + "id": 327, "name": "wzry/Open", "type": "api" }, { - "id": 329, + "id": 328, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 330, + "id": 329, "name": "wzry/Wzzd", "type": "api" }, { - "id": 331, + "id": 330, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 332, + "id": 331, "name": "xstask/AllGet", "type": "api" }, { - "id": 333, + "id": 332, "name": "xstask/Get", "type": "api" }, { - "id": 334, + "id": 333, "name": "xstask/LvUp", "type": "api" }, { - "id": 335, + "id": 334, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 336, + "id": 335, "name": "xstask/Open", "type": "api" }, { - "id": 337, + "id": 336, "name": "xstask/Receive", "type": "api" }, { - "id": 338, + "id": 337, "name": "xstask/Refresh", "type": "api" }, { - "id": 339, + "id": 338, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 340, + "id": 339, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 341, + "id": 340, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 342, + "id": 341, "name": "zhanqianbushu/Up", "type": "api" } @@ -10269,11 +10262,52 @@ export const serviceProto: ServiceProto = { "properties": [ { "id": 0, - "name": "payIds", + "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", "type": { "type": "Array", "elementType": { - "type": "String" + "type": "Reference", + "target": "type/prizeType" } } } @@ -17848,10 +17882,6 @@ export const serviceProto: ServiceProto = { } } }, - "msg_s2c/MsgPushGiftChange/MsgPushGiftChange": { - "type": "Literal", - "literal": 1 - }, "msg_s2c/MsgSendGift/MsgSendGift": { "type": "Interface", "indexSignature": { @@ -18826,6 +18856,13 @@ export const serviceProto: ServiceProto = { "type": "Literal", "literal": "G123Gift" } + }, + { + "id": 18, + "type": { + "type": "Literal", + "literal": "christmas" + } } ] }, @@ -18926,81 +18963,6 @@ 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 c428d0d2f70bdb4ce26190714540b27ab5ce5cef Mon Sep 17 00:00:00 2001 From: dy Date: Tue, 19 Dec 2023 09:48:43 +0800 Subject: [PATCH 75/80] cehua-json --- src/json/attr.json | 20 + src/json/choujiang.json5 | 2 +- src/json/herogrow.json | 1771 +++++++++++++++++++++++++++------ src/json/herogrow_ewai.json | 62 ++ src/json/huobanzhaomu.json5 | 6 +- src/json/huodong.json5 | 565 ++++++++++- src/json/item.json | 155 ++- src/json/jijin.json | 414 ++++---- src/json/kfcb_content.json | 48 +- src/json/openCond.json | 26 + src/json/pay.json | 1388 +++++++++++++++++++++++++- src/json/payEmail.json5 | 2 +- src/json/playerChatFrame.json | 17 + src/json/playerHead.json | 2 +- src/json/playerHeadFrame.json | 45 +- src/json/playerModel.json | 38 + src/json/shiwuleichong.json5 | 59 +- src/json/shop.json | 31 + src/json/shopItem.json | 25 + src/json/shouchong.json | 3 + src/json/skill_afteratk.json | 8 +- src/json/skill_buff.json | 4 +- src/json/task.json | 20 +- src/json/tuisonglibao.json | 257 +++++ src/json/yuedujijin.json5 | 96 +- 25 files changed, 4385 insertions(+), 679 deletions(-) create mode 100644 src/json/herogrow_ewai.json create mode 100644 src/json/tuisonglibao.json diff --git a/src/json/attr.json b/src/json/attr.json index 16dc0f5..3d3120f 100644 --- a/src/json/attr.json +++ b/src/json/attr.json @@ -108,5 +108,25 @@ "sicon": "icon_heroBox_11", "describe": "tlsd_guess_prize_3", "advancedEffects": "ani_xiangzikuang" + }, + "shengdanExp": { + "id": "shengdanExp", + "name": "intr_attr_name_13", + "undefined": "圣诞战令经验", + "colour": 5, + "icon": "icon_shengdanExp", + "sicon": "icon_shengdanExp", + "describe": "intr_attr_describe_13", + "advancedEffects": "ani_xiangzikuang" + }, + "shengdanBullet": { + "id": "shengdanBullet", + "name": "intr_attr_name_14", + "undefined": "圣诞子弹", + "colour": 5, + "icon": "icon_zuanshi", + "sicon": "icon_zuanshi", + "describe": "intr_attr_describe_14", + "advancedEffects": "ani_xiangzikuang" } } \ No newline at end of file diff --git a/src/json/choujiang.json5 b/src/json/choujiang.json5 index b6a5dd9..a884162 100644 --- a/src/json/choujiang.json5 +++ b/src/json/choujiang.json5 @@ -154,7 +154,7 @@ }, "jiubabaodi": { "numbd": { - "50": [10011], + "30": [10011], "250": [10012], "550": [10011], "1000": [10011], diff --git a/src/json/herogrow.json b/src/json/herogrow.json index 720f6c6..cca1f3c 100644 --- a/src/json/herogrow.json +++ b/src/json/herogrow.json @@ -100,7 +100,11 @@ "atk": 80, "maxdps": 200, "def": 55, - "speed": 5 + "speed": 5, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -132,7 +136,11 @@ "atk": 80, "maxdps": 365, "def": 95, - "speed": 5 + "speed": 5, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -164,7 +172,11 @@ "atk": 80, "maxdps": 550, "def": 145, - "speed": 5 + "speed": 5, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -196,7 +208,11 @@ "atk": 80, "maxdps": 745, "def": 195, - "speed": 5 + "speed": 5, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -323,7 +339,11 @@ "atk": 80, "maxdps": 110, "hp": 1150, - "speed": 5 + "speed": 5, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -355,7 +375,11 @@ "atk": 80, "maxdps": 195, "hp": 1200, - "speed": 5 + "speed": 5, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -387,7 +411,11 @@ "atk": 80, "maxdps": 300, "hp": 2160, - "speed": 5 + "speed": 5, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -419,7 +447,11 @@ "atk": 80, "maxdps": 415, "hp": 3170, - "speed": 5 + "speed": 5, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -546,7 +578,11 @@ "atk": 100, "maxdps": 120, "hp": 1200, - "speed": 10 + "speed": 10, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -578,7 +614,11 @@ "atk": 100, "maxdps": 210, "hp": 2120, - "speed": 10 + "speed": 10, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -610,7 +650,11 @@ "atk": 100, "maxdps": 320, "hp": 3170, - "speed": 10 + "speed": 10, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -642,7 +686,11 @@ "atk": 100, "maxdps": 440, "hp": 4280, - "speed": 10 + "speed": 10, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -766,7 +814,11 @@ "jj_attr": { "atk": 260, "hp": 630, - "speed": 10 + "speed": 10, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -797,7 +849,11 @@ "jj_attr": { "atk": 385, "hp": 1100, - "speed": 10 + "speed": 10, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -828,7 +884,11 @@ "jj_attr": { "atk": 530, "hp": 1650, - "speed": 10 + "speed": 10, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -859,7 +919,11 @@ "jj_attr": { "atk": 680, "hp": 2250, - "speed": 10 + "speed": 10, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -983,7 +1047,11 @@ "jj_attr": { "def": 150, "xixuepro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -1014,7 +1082,11 @@ "jj_attr": { "def": 350, "xixuepro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -1046,7 +1118,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -1078,7 +1154,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -1110,7 +1190,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 33800 + "hp": 33800, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -1142,7 +1226,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 33800 + "hp": 33800, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -1174,7 +1262,11 @@ "def": 3050, "xixuepro": 0.06, "speed": 290, - "hp": 33800 + "hp": 33800, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -1206,7 +1298,11 @@ "def": 3050, "xixuepro": 0.06, "speed": 290, - "hp": 33800 + "hp": 33800, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 1890 @@ -1332,7 +1428,11 @@ "jj_attr": { "atk": 168, "baoshangpro": 0.15, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -1364,7 +1464,11 @@ "atk": 168, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -1396,7 +1500,11 @@ "atk": 613, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -1429,7 +1537,11 @@ "baoshangpro": 0.15, "speed": 20, "hp": 2300, - "xixuepro": 0.3 + "xixuepro": 0.3, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -1463,7 +1575,11 @@ "speed": 20, "hp": 2300, "xixuepro": 0.3, - "def": 2700 + "def": 2700, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -1497,7 +1613,11 @@ "speed": 20, "hp": 2300, "xixuepro": 0.3, - "def": 2700 + "def": 2700, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -1532,7 +1652,11 @@ "hp": 2300, "xixuepro": 0.3, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -1567,7 +1691,11 @@ "hp": 2300, "xixuepro": 0.3, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "atk": 1176 @@ -1693,7 +1821,11 @@ "jj_attr": { "def": 150, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -1724,7 +1856,11 @@ "jj_attr": { "def": 350, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -1756,7 +1892,11 @@ "def": 350, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -1789,7 +1929,11 @@ "undpspro": 0.06, "speed": 20, "hp": 3000, - "longdpsdrop": 0.4 + "longdpsdrop": 0.4, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -1822,7 +1966,11 @@ "undpspro": 0.06, "speed": 20, "hp": 33800, - "longdpsdrop": 0.4 + "longdpsdrop": 0.4, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -1856,7 +2004,11 @@ "speed": 20, "hp": 33800, "longdpsdrop": 0.4, - "neardpsdrop": 0.5 + "neardpsdrop": 0.5, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -1892,7 +2044,11 @@ "longdpsdrop": 0.4, "neardpsdrop": 0.5, "atk": 1680, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -1928,7 +2084,11 @@ "longdpsdrop": 0.4, "neardpsdrop": 0.5, "atk": 1680, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 1890 @@ -2055,7 +2215,11 @@ "atk": 168, "baoshangpro": 0.15, "speed": 20, - "fanshang": 1 + "fanshang": 1, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -2088,7 +2252,11 @@ "baoshangpro": 0.15, "speed": 20, "fanshang": 1, - "hp": 2300 + "hp": 2300, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -2121,7 +2289,11 @@ "baoshangpro": 0.15, "speed": 20, "fanshang": 1, - "hp": 2300 + "hp": 2300, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -2154,7 +2326,11 @@ "baoshangpro": 0.15, "speed": 20, "fanshang": 1, - "hp": 2300 + "hp": 2300, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -2187,7 +2363,11 @@ "baoshangpro": 0.15, "speed": 20, "fanshang": 1, - "hp": 33100 + "hp": 33100, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -2220,7 +2400,11 @@ "baoshangpro": 0.15, "speed": 20, "fanshang": 2, - "hp": 33100 + "hp": 33100, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -2255,7 +2439,11 @@ "hp": 33100, "fanshang": 2, "def": 2700, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -2290,7 +2478,11 @@ "hp": 33100, "fanshang": 2, "def": 2700, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 1890 @@ -2416,7 +2608,11 @@ "jj_attr": { "atk": 168, "baoshangpro": 0.1, - "speed": 15 + "speed": 15, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -2448,7 +2644,11 @@ "atk": 168, "baoshangpro": 0.1, "speed": 15, - "hp": 2000 + "hp": 2000, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -2480,7 +2680,11 @@ "atk": 568, "baoshangpro": 0.1, "speed": 15, - "hp": 2000 + "hp": 2000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -2513,7 +2717,11 @@ "baoshangpro": 0.1, "speed": 15, "hp": 2000, - "magdpsdrop": 4 + "magdpsdrop": 4, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -2546,7 +2754,11 @@ "baoshangpro": 0.1, "speed": 15, "hp": 32800, - "magdpsdrop": 4 + "magdpsdrop": 4, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -2579,7 +2791,11 @@ "baoshangpro": 0.1, "speed": 15, "hp": 32800, - "magdpsdrop": 4 + "magdpsdrop": 4, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -2614,7 +2830,11 @@ "hp": 32800, "magdpsdrop": 4, "def": 2700, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -2649,7 +2869,11 @@ "hp": 32800, "magdpsdrop": 4, "def": 2700, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 21560 @@ -2776,7 +3000,11 @@ "atk": 168, "fanshangpro": 0.06, "speed": 20, - "xixuepro": 0.75 + "xixuepro": 0.75, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -2809,7 +3037,11 @@ "fanshangpro": 0.06, "speed": 20, "xixuepro": 0.75, - "def": 220 + "def": 220, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -2842,7 +3074,11 @@ "fanshangpro": 0.06, "speed": 20, "xixuepro": 0.75, - "def": 200 + "def": 200, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -2876,7 +3112,11 @@ "speed": 20, "xixuepro": 0.75, "def": 200, - "neardpsdrop": 0.4 + "neardpsdrop": 0.4, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -2910,7 +3150,11 @@ "speed": 20, "xixuepro": 0.75, "def": 200, - "neardpsdrop": 0.4 + "neardpsdrop": 0.4, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -2944,7 +3188,11 @@ "speed": 20, "xixuepro": 1, "def": 200, - "neardpsdrop": 0.4 + "neardpsdrop": 0.4, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -2980,7 +3228,11 @@ "def": 200, "neardpsdrop": 0.4, "hp": 30800, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -3016,7 +3268,11 @@ "def": 200, "neardpsdrop": 0.4, "hp": 30800, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "atk": 1175 @@ -3142,7 +3398,11 @@ "jj_attr": { "atk": 168, "xixuepro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -3174,7 +3434,11 @@ "atk": 168, "xixuepro": 0.06, "speed": 20, - "def": 200 + "def": 200, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -3207,7 +3471,11 @@ "xixuepro": 0.06, "speed": 20, "def": 200, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -3240,7 +3508,11 @@ "xixuepro": 0.06, "speed": 20, "def": 200, - "hp": 3000 + "hp": 3000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -3273,7 +3545,11 @@ "xixuepro": 0.06, "speed": 20, "def": 2900, - "hp": 3000 + "hp": 3000, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -3306,7 +3582,11 @@ "xixuepro": 0.06, "speed": 20, "def": 2900, - "hp": 3000 + "hp": 3000, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -3340,7 +3620,11 @@ "speed": 20, "def": 2900, "hp": 33800, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -3374,7 +3658,11 @@ "speed": 20, "def": 2900, "hp": 33800, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 1890 @@ -3500,7 +3788,11 @@ "jj_attr": { "atk": 150, "baoshangpro": 0.1, - "speed": 15 + "speed": 15, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -3532,7 +3824,11 @@ "atk": 150, "baoshangpro": 0.1, "speed": 15, - "hp": 2000 + "hp": 2000, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -3564,7 +3860,11 @@ "atk": 550, "baoshangpro": 0.1, "speed": 15, - "hp": 2000 + "hp": 2000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -3596,7 +3896,11 @@ "atk": 550, "baoshangpro": 0.1, "speed": 15, - "hp": 2000 + "hp": 2000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -3628,7 +3932,11 @@ "atk": 2230, "baoshangpro": 0.1, "speed": 15, - "hp": 2000 + "hp": 2000, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -3660,7 +3968,11 @@ "atk": 2230, "baoshangpro": 0.1, "speed": 15, - "hp": 2000 + "hp": 2000, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -3693,7 +4005,11 @@ "baoshangpro": 0.1, "speed": 15, "hp": 32800, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -3726,7 +4042,11 @@ "baoshangpro": 0.1, "speed": 15, "hp": 32800, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "atk": 1176 @@ -3852,7 +4172,11 @@ "jj_attr": { "def": 150, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -3883,7 +4207,11 @@ "jj_attr": { "def": 350, "undpspro": 0.06, - "speed": 220 + "speed": 220, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -3915,7 +4243,11 @@ "def": 350, "undpspro": 0.06, "speed": 220, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -3948,7 +4280,10 @@ "undpspro": 0.06, "speed": 220, "hp": 3000, - "defpro": 0.5 + "defpro": 0.8, + "atkpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -3982,7 +4317,10 @@ "speed": 220, "hp": 3000, "atk": 1680, - "defpro": 0.5 + "defpro": 1, + "atkpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -4016,7 +4354,10 @@ "speed": 220, "hp": 3000, "atk": 1680, - "defpro": 0.5 + "defpro": 1.2, + "atkpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -4051,7 +4392,10 @@ "hp": 33800, "atk": 1680, "pvpdpsdrop": 0.3, - "defpro": 0.5 + "defpro": 1.4, + "atkpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -4086,7 +4430,10 @@ "hp": 33800, "atk": 1680, "pvpdpsdrop": 0.3, - "defpro": 0.5 + "defpro": 1.8, + "atkpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "atk": 1176 @@ -4212,7 +4559,11 @@ "jj_attr": { "atk": 150, "fanshangpro": 0.05, - "speed": 15 + "speed": 15, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -4244,7 +4595,11 @@ "atk": 150, "fanshangpro": 0.05, "speed": 15, - "def": 200 + "def": 200, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -4276,7 +4631,11 @@ "atk": 550, "fanshangpro": 0.05, "speed": 15, - "def": 200 + "def": 200, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -4308,7 +4667,11 @@ "atk": 550, "fanshangpro": 0.05, "speed": 15, - "def": 200 + "def": 200, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -4340,7 +4703,11 @@ "atk": 2230, "fanshangpro": 0.05, "speed": 15, - "def": 200 + "def": 200, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -4372,7 +4739,11 @@ "atk": 2230, "fanshangpro": 0.05, "speed": 15, - "def": 200 + "def": 200, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -4405,7 +4776,11 @@ "fanshangpro": 0.05, "speed": 15, "def": 2900, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -4438,7 +4813,11 @@ "fanshangpro": 0.05, "speed": 15, "def": 2900, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "atk": 1176 @@ -4564,7 +4943,11 @@ "jj_attr": { "atk": 168, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -4596,7 +4979,11 @@ "atk": 168, "undpspro": 0.06, "speed": 20, - "def": 200 + "def": 200, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -4629,7 +5016,11 @@ "undpspro": 0.06, "speed": 20, "def": 200, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -4662,7 +5053,11 @@ "undpspro": 0.06, "speed": 20, "def": 200, - "hp": 3000 + "hp": 3000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -4695,7 +5090,11 @@ "undpspro": 0.06, "speed": 20, "def": 200, - "hp": 3000 + "hp": 3000, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -4728,7 +5127,11 @@ "undpspro": 0.06, "speed": 20, "def": 200, - "hp": 3000 + "hp": 3000, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -4762,7 +5165,11 @@ "speed": 20, "def": 2900, "hp": 3000, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -4796,7 +5203,11 @@ "speed": 20, "def": 2900, "hp": 3000, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 1890 @@ -4922,7 +5333,11 @@ "jj_attr": { "hp": 1500, "undpspro": 0.05, - "speed": 15 + "speed": 15, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -4954,7 +5369,11 @@ "atk": 220, "hp": 1500, "undpspro": 0.05, - "speed": 15 + "speed": 15, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -4986,7 +5405,11 @@ "atk": 220, "hp": 4500, "undpspro": 0.05, - "speed": 15 + "speed": 15, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -5019,7 +5442,11 @@ "hp": 4500, "undpspro": 0.05, "speed": 15, - "phydpsdrop": 0.3 + "phydpsdrop": 0.3, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -5052,7 +5479,11 @@ "hp": 4500, "undpspro": 0.05, "speed": 15, - "phydpsdrop": 0.3 + "phydpsdrop": 0.3, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -5085,7 +5516,11 @@ "hp": 4500, "undpspro": 0.05, "speed": 15, - "phydpsdrop": 0.3 + "phydpsdrop": 0.3, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -5120,7 +5555,11 @@ "speed": 15, "phydpsdrop": 0.3, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -5155,7 +5594,11 @@ "speed": 15, "phydpsdrop": 0.3, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 1980 @@ -5281,7 +5724,11 @@ "jj_attr": { "def": 150, "xixuepro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -5312,7 +5759,11 @@ "jj_attr": { "def": 350, "xixuepro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -5344,7 +5795,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -5376,7 +5831,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -5408,7 +5867,11 @@ "def": 3050, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -5441,7 +5904,11 @@ "xixuepro": 0.06, "speed": 20, "hp": 3000, - "magdpsdrop": 0.3 + "magdpsdrop": 0.3, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -5476,7 +5943,11 @@ "speed": 20, "hp": 3000, "magdpsdrop": 0.3, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -5511,7 +5982,11 @@ "speed": 20, "hp": 3000, "magdpsdrop": 0.3, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 1980 @@ -5637,7 +6112,11 @@ "jj_attr": { "atk": 150, "fanshangpro": 0.05, - "speed": 15 + "speed": 15, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -5669,7 +6148,11 @@ "atk": 150, "fanshangpro": 0.05, "speed": 15, - "def": 200 + "def": 200, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -5701,7 +6184,11 @@ "atk": 550, "fanshangpro": 0.05, "speed": 15, - "def": 200 + "def": 200, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -5734,7 +6221,11 @@ "fanshangpro": 0.05, "speed": 15, "def": 200, - "neardpsdrop": 0.4 + "neardpsdrop": 0.4, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -5767,7 +6258,11 @@ "fanshangpro": 0.05, "speed": 15, "def": 200, - "neardpsdrop": 0.4 + "neardpsdrop": 0.4, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -5800,7 +6295,11 @@ "fanshangpro": 0.05, "speed": 15, "def": 200, - "neardpsdrop": 0.4 + "neardpsdrop": 0.4, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -5834,7 +6333,11 @@ "speed": 15, "def": 2900, "neardpsdrop": 0.4, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -5868,7 +6371,11 @@ "speed": 15, "def": 2900, "neardpsdrop": 0.4, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "atk": 1176 @@ -5994,7 +6501,11 @@ "jj_attr": { "atk": 168, "baoshangpro": 0.15, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -6026,7 +6537,11 @@ "atk": 168, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -6058,7 +6573,11 @@ "atk": 613, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -6091,7 +6610,11 @@ "baoshangpro": 0.15, "speed": 20, "hp": 2300, - "xixuepro": 0.3 + "xixuepro": 0.3, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -6124,7 +6647,11 @@ "baoshangpro": 0.15, "speed": 20, "hp": 33100, - "xixuepro": 0.3 + "xixuepro": 0.3, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -6157,7 +6684,11 @@ "baoshangpro": 0.15, "speed": 20, "hp": 33100, - "xixuepro": 0.3 + "xixuepro": 0.3, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -6192,7 +6723,11 @@ "hp": 33100, "xixuepro": 0.3, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -6227,7 +6762,11 @@ "hp": 33100, "xixuepro": 0.3, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 21560 @@ -6353,7 +6892,11 @@ "jj_attr": { "atk": 168, "mingzhongpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -6385,7 +6928,11 @@ "atk": 168, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -6417,7 +6964,11 @@ "atk": 613, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -6449,7 +7000,11 @@ "atk": 613, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -6481,7 +7036,11 @@ "atk": 2293, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -6513,7 +7072,11 @@ "atk": 2293, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -6546,7 +7109,11 @@ "mingzhongpro": 0.06, "speed": 20, "hp": 2300, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -6579,7 +7146,11 @@ "mingzhongpro": 0.06, "speed": 20, "hp": 33100, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 21560 @@ -6705,7 +7276,11 @@ "jj_attr": { "atk": 168, "fanshangpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -6737,7 +7312,11 @@ "atk": 168, "fanshangpro": 0.06, "speed": 20, - "def": 220 + "def": 220, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -6769,7 +7348,11 @@ "atk": 613, "fanshangpro": 0.06, "speed": 20, - "def": 220 + "def": 220, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -6801,7 +7384,11 @@ "atk": 1226, "fanshangpro": 0.06, "speed": 20, - "def": 220 + "def": 220, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -6834,7 +7421,11 @@ "fanshangpro": 0.06, "speed": 20, "def": 220, - "hp": 30800 + "hp": 30800, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -6867,7 +7458,11 @@ "fanshangpro": 0.06, "speed": 20, "def": 220, - "hp": 30800 + "hp": 30800, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -6901,7 +7496,11 @@ "speed": 20, "def": 220, "hp": 30800, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -6935,7 +7534,11 @@ "speed": 20, "def": 220, "hp": 30800, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 21560 @@ -7061,7 +7664,11 @@ "jj_attr": { "atk": 168, "mingzhongpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -7093,7 +7700,11 @@ "atk": 168, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -7125,7 +7736,11 @@ "atk": 613, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -7157,7 +7772,11 @@ "atk": 1226, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -7190,7 +7809,11 @@ "mingzhongpro": 0.06, "speed": 20, "hp": 2300, - "def": 2700 + "def": 2700, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -7223,7 +7846,11 @@ "mingzhongpro": 0.06, "speed": 20, "hp": 2300, - "def": 2700 + "def": 2700, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -7257,7 +7884,11 @@ "speed": 20, "hp": 2300, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -7291,7 +7922,11 @@ "speed": 20, "hp": 2300, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 1980 @@ -7417,7 +8052,11 @@ "jj_attr": { "atk": 168, "mingzhongpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -7449,7 +8088,11 @@ "atk": 168, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -7481,7 +8124,11 @@ "atk": 613, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -7513,7 +8160,11 @@ "atk": 613, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -7546,7 +8197,11 @@ "mingzhongpro": 0.06, "speed": 20, "hp": 2300, - "def": 2700 + "def": 2700, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -7579,7 +8234,11 @@ "mingzhongpro": 0.06, "speed": 20, "hp": 2300, - "def": 2700 + "def": 2700, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -7612,7 +8271,11 @@ "mingzhongpro": 0.06, "speed": 20, "hp": 2300, - "def": 2700 + "def": 2700, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -7645,7 +8308,11 @@ "mingzhongpro": 0.06, "speed": 20, "hp": 2300, - "def": 2700 + "def": 2700, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "atk": 1176 @@ -7771,7 +8438,11 @@ "jj_attr": { "atk": 168, "baoshangpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -7803,7 +8474,11 @@ "atk": 168, "baoshangpro": 0.06, "speed": 20, - "def": 220 + "def": 220, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -7835,7 +8510,11 @@ "atk": 613, "baoshangpro": 0.06, "speed": 20, - "def": 220 + "def": 220, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -7867,7 +8546,11 @@ "atk": 613, "baoshangpro": 0.06, "speed": 20, - "def": 220 + "def": 220, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -7899,7 +8582,11 @@ "atk": 2293, "baoshangpro": 0.06, "speed": 20, - "def": 220 + "def": 220, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -7931,7 +8618,11 @@ "atk": 2293, "baoshangpro": 0.06, "speed": 20, - "def": 220 + "def": 220, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -7964,7 +8655,11 @@ "baoshangpro": 0.06, "speed": 20, "def": 2920, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -7997,7 +8692,11 @@ "baoshangpro": 0.06, "speed": 20, "def": 2920, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "atk": 1176 @@ -8123,7 +8822,11 @@ "jj_attr": { "atk": 168, "baoshangpro": 0.15, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -8155,7 +8858,11 @@ "atk": 168, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -8187,7 +8894,11 @@ "atk": 613, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -8219,7 +8930,11 @@ "atk": 613, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -8252,7 +8967,11 @@ "baoshangpro": 0.15, "speed": 20, "hp": 2300, - "def": 2700 + "def": 2700, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -8285,7 +9004,11 @@ "baoshangpro": 0.15, "speed": 20, "hp": 2300, - "def": 2700 + "def": 2700, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -8319,7 +9042,11 @@ "speed": 20, "hp": 2300, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -8353,7 +9080,11 @@ "speed": 20, "hp": 2300, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 21560 @@ -8479,7 +9210,11 @@ "jj_attr": { "def": 150, "xixuepro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -8510,7 +9245,11 @@ "jj_attr": { "def": 350, "xixuepro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -8542,7 +9281,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -8574,7 +9317,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -8606,7 +9353,11 @@ "def": 3050, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -8638,7 +9389,11 @@ "def": 3050, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -8672,7 +9427,11 @@ "xixuepro": 0.06, "speed": 20, "hp": 3000, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -8706,7 +9465,11 @@ "xixuepro": 0.06, "speed": 20, "hp": 3000, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "atk": 1176 @@ -8832,7 +9595,11 @@ "jj_attr": { "def": 150, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -8863,7 +9630,11 @@ "jj_attr": { "def": 350, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -8895,7 +9666,11 @@ "def": 350, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -8927,7 +9702,11 @@ "def": 350, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -8959,7 +9738,11 @@ "def": 3050, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -8991,7 +9774,11 @@ "def": 3050, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -9024,7 +9811,11 @@ "undpspro": 0.06, "speed": 20, "hp": 33800, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -9057,7 +9848,11 @@ "undpspro": 0.06, "speed": 20, "hp": 33800, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 1980 @@ -9183,7 +9978,11 @@ "jj_attr": { "def": 150, "xixuepro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -9214,7 +10013,11 @@ "jj_attr": { "def": 350, "xixuepro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -9246,7 +10049,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -9278,7 +10085,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -9310,7 +10121,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 33800 + "hp": 33800, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -9342,7 +10157,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 33800 + "hp": 33800, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -9375,7 +10194,11 @@ "xixuepro": 0.06, "speed": 20, "hp": 33800, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -9408,7 +10231,11 @@ "xixuepro": 0.06, "speed": 20, "hp": 33800, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 21560 @@ -9534,7 +10361,11 @@ "jj_attr": { "atk": 168, "baoshangpro": 0.15, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -9565,7 +10396,11 @@ "jj_attr": { "atk": 168, "baoshangpro": 0.15, - "speed": 20 + "speed": 20, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -9596,7 +10431,11 @@ "jj_attr": { "atk": 613, "baoshangpro": 0.15, - "speed": 20 + "speed": 20, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -9627,7 +10466,11 @@ "jj_attr": { "atk": 613, "baoshangpro": 0.15, - "speed": 20 + "speed": 20, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -9659,7 +10502,11 @@ "atk": 613, "baoshangpro": 0.15, "speed": 20, - "hp": 30800 + "hp": 30800, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -9691,7 +10538,11 @@ "atk": 613, "baoshangpro": 0.15, "speed": 20, - "hp": 30800 + "hp": 30800, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -9725,7 +10576,11 @@ "speed": 20, "hp": 30800, "def": 2700, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -9759,7 +10614,11 @@ "speed": 20, "hp": 30800, "def": 2700, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 1890 @@ -9885,7 +10744,11 @@ "jj_attr": { "def": 150, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -9916,7 +10779,11 @@ "jj_attr": { "def": 350, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -9948,7 +10815,11 @@ "def": 350, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -9981,7 +10852,11 @@ "undpspro": 0.06, "speed": 20, "hp": 3000, - "xixuepro": 0.5 + "xixuepro": 0.5, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -10015,7 +10890,11 @@ "speed": 20, "hp": 3000, "atk": 1680, - "xixuepro": 0.5 + "xixuepro": 0.5, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -10049,7 +10928,11 @@ "speed": 20, "hp": 3000, "atk": 1680, - "xixuepro": 0.5 + "xixuepro": 0.5, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -10084,7 +10967,11 @@ "hp": 33800, "atk": 1680, "pvpdpspro": 0.3, - "xixuepro": 0.5 + "xixuepro": 0.5, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -10119,7 +11006,11 @@ "hp": 33800, "atk": 1680, "pvpdpspro": 0.3, - "xixuepro": 0.5 + "xixuepro": 0.5, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 1890 @@ -10245,7 +11136,11 @@ "jj_attr": { "atk": 168, "baoshangpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -10277,7 +11172,11 @@ "atk": 168, "baoshangpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -10308,7 +11207,11 @@ "jj_attr": { "atk": 613, "baoshangpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -10339,7 +11242,11 @@ "jj_attr": { "atk": 613, "baoshangpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -10370,7 +11277,11 @@ "jj_attr": { "atk": 2293, "baoshangpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -10401,7 +11312,11 @@ "jj_attr": { "atk": 2293, "baoshangpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -10434,7 +11349,11 @@ "baoshangpro": 0.06, "speed": 20, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -10467,7 +11386,11 @@ "baoshangpro": 0.06, "speed": 20, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "atk": 1176 @@ -10593,7 +11516,11 @@ "jj_attr": { "def": 150, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -10624,7 +11551,11 @@ "jj_attr": { "def": 350, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -10656,7 +11587,11 @@ "def": 350, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -10688,7 +11623,11 @@ "def": 350, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -10721,7 +11660,11 @@ "def": 350, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -10754,7 +11697,11 @@ "def": 350, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -10788,7 +11735,11 @@ "undpspro": 0.06, "speed": 20, "hp": 3000, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -10822,7 +11773,11 @@ "undpspro": 0.06, "speed": 20, "hp": 3000, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 21560 @@ -10948,7 +11903,11 @@ "jj_attr": { "atk": 150, "baoshangpro": 0.1, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -10980,7 +11939,11 @@ "atk": 150, "baoshangpro": 0.1, "speed": 20, - "hp": 2000 + "hp": 2000, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -11012,7 +11975,11 @@ "atk": 550, "baoshangpro": 0.1, "speed": 20, - "hp": 2000 + "hp": 2000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -11044,7 +12011,11 @@ "atk": 550, "baoshangpro": 0.1, "speed": 20, - "hp": 2000 + "hp": 2000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -11076,7 +12047,11 @@ "atk": 2230, "baoshangpro": 0.1, "speed": 20, - "hp": 2000 + "hp": 2000, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -11108,7 +12083,11 @@ "atk": 2230, "baoshangpro": 0.1, "speed": 20, - "hp": 2000 + "hp": 2000, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -11142,7 +12121,11 @@ "speed": 20, "hp": 2000, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -11176,7 +12159,11 @@ "speed": 20, "hp": 2000, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 21560 @@ -11302,7 +12289,11 @@ "jj_attr": { "atk": 168, "mingzhongpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -11334,7 +12325,11 @@ "atk": 168, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -11366,7 +12361,11 @@ "atk": 613, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -11398,7 +12397,11 @@ "atk": 613, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -11430,7 +12433,11 @@ "atk": 613, "mingzhongpro": 0.06, "speed": 20, - "hp": 33100 + "hp": 33100, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -11462,7 +12469,11 @@ "atk": 613, "mingzhongpro": 0.06, "speed": 20, - "hp": 33100 + "hp": 33100, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -11496,7 +12507,11 @@ "speed": 20, "hp": 33100, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -11530,7 +12545,11 @@ "speed": 20, "hp": 33100, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 21560 @@ -11656,7 +12675,11 @@ "jj_attr": { "atk": 168, "baoshangpro": 0.15, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -11688,7 +12711,11 @@ "atk": 168, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -11720,7 +12747,11 @@ "atk": 613, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -11752,7 +12783,11 @@ "atk": 613, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -11784,7 +12819,11 @@ "atk": 2293, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -11816,7 +12855,11 @@ "atk": 2293, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -11850,7 +12893,11 @@ "speed": 20, "hp": 2300, "mingzhongpro": 0.15, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -11884,7 +12931,11 @@ "speed": 20, "hp": 2300, "mingzhongpro": 0.15, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 2700 @@ -12010,7 +13061,11 @@ "jj_attr": { "atk": 168, "undpspro": 0.05, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -12042,7 +13097,11 @@ "atk": 168, "undpspro": 0.05, "speed": 20, - "def": 270 + "def": 270, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -12075,7 +13134,11 @@ "undpspro": 0.05, "speed": 20, "def": 270, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -12108,7 +13171,11 @@ "undpspro": 0.05, "speed": 20, "def": 270, - "hp": 3000 + "hp": 3000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -12141,7 +13208,11 @@ "undpspro": 0.05, "speed": 20, "def": 270, - "hp": 33800 + "hp": 33800, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -12174,7 +13245,11 @@ "undpspro": 0.05, "speed": 20, "def": 270, - "hp": 33800 + "hp": 33800, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -12209,7 +13284,11 @@ "def": 270, "hp": 33800, "shanbipro": 0.2, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -12244,7 +13323,11 @@ "def": 270, "hp": 33800, "shanbipro": 0.2, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 30800 @@ -12370,7 +13453,11 @@ "jj_attr": { "atk": 168, "mingzhongpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -12402,7 +13489,11 @@ "atk": 168, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -12434,7 +13525,11 @@ "atk": 613, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -12466,7 +13561,11 @@ "atk": 613, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -12498,7 +13597,11 @@ "atk": 1848, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -12530,7 +13633,11 @@ "atk": 1848, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -12563,7 +13670,11 @@ "mingzhongpro": 0.06, "speed": 20, "hp": 33100, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -12596,7 +13707,11 @@ "mingzhongpro": 0.06, "speed": 20, "hp": 33100, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 21560 @@ -12722,7 +13837,11 @@ "jj_attr": { "atk": 168, "xixuepro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -12754,7 +13873,11 @@ "atk": 168, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -12786,7 +13909,11 @@ "atk": 613, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -12818,7 +13945,11 @@ "atk": 613, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -12850,7 +13981,11 @@ "atk": 2293, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -12882,7 +14017,11 @@ "atk": 2293, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -12916,7 +14055,11 @@ "speed": 20, "hp": 3000, "def": 2700, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -12950,7 +14093,11 @@ "speed": 20, "hp": 3000, "def": 2700, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 30800 @@ -13076,7 +14223,11 @@ "jj_attr": { "def": 150, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -13107,7 +14258,11 @@ "jj_attr": { "def": 200, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -13139,7 +14294,11 @@ "def": 200, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -13171,7 +14330,11 @@ "def": 200, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -13204,7 +14367,11 @@ "undpspro": 0.06, "speed": 20, "hp": 3000, - "atk": 1680 + "atk": 1680, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -13237,7 +14404,11 @@ "undpspro": 0.06, "speed": 20, "hp": 3000, - "atk": 1680 + "atk": 1680, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -13272,7 +14443,11 @@ "hp": 3000, "atk": 1680, "mingzhongpro": 0.15, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -13307,7 +14482,11 @@ "hp": 3000, "atk": 1680, "mingzhongpro": 0.15, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "atk": 1680 diff --git a/src/json/herogrow_ewai.json b/src/json/herogrow_ewai.json new file mode 100644 index 0000000..0e08149 --- /dev/null +++ b/src/json/herogrow_ewai.json @@ -0,0 +1,62 @@ +{ + "1": { + "id": 1, + "jieji": 0, + "ewai_buff": 0 + }, + "2": { + "id": 2, + "jieji": 1, + "ewai_buff": 0 + }, + "3": { + "id": 3, + "jieji": 2, + "ewai_buff": 0 + }, + "4": { + "id": 4, + "jieji": 3, + "ewai_buff": 0 + }, + "5": { + "id": 5, + "jieji": 4, + "ewai_buff": 40 + }, + "6": { + "id": 6, + "jieji": 5, + "ewai_buff": 50 + }, + "7": { + "id": 7, + "jieji": 6, + "ewai_buff": 60 + }, + "8": { + "id": 8, + "jieji": 7, + "ewai_buff": 80 + }, + "9": { + "id": 9, + "jieji": 8, + "ewai_buff": 100 + }, + "10": { + "id": 10, + "jieji": 9, + "ewai_buff": 120 + }, + "11": { + "id": 11, + "jieji": 10, + "ewai_buff": 140 + }, + "12": { + "id": 12, + "jieji": 11, + "ewai_buff": 180 + } +} \ No newline at end of file diff --git a/src/json/huobanzhaomu.json5 b/src/json/huobanzhaomu.json5 index b41ad31..bc40ef1 100644 --- a/src/json/huobanzhaomu.json5 +++ b/src/json/huobanzhaomu.json5 @@ -7,15 +7,15 @@ { total: 2, gudKey: 'loginDays', - prize: [{a: 'hero', t: '4013', n: 1}] + prize: [{a: 'hero', t: '4004', n: 1}] }, { total: 1, gudKey: 'payExp', - prize: [{a: 'hero', t: '4005', n: 1}] + prize: [{a: 'item', t: '4', n: 10}] }, { total: 1, - prize: [{a: 'hero', t: '4002', n: 1}] + prize: [{a: 'hero', t: '4012', n: 1}] } ] \ No newline at end of file diff --git a/src/json/huodong.json5 b/src/json/huodong.json5 index cb3f380..2fc7624 100644 --- a/src/json/huodong.json5 +++ b/src/json/huodong.json5 @@ -2464,12 +2464,12 @@ 'cond': [], 'stype': 118 }, - '2004': { + '2004': { 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 20}], 'tujing': '', 'title': 'intr_yczm_day_des_2', 'type': 2, - 'pval': 300, + 'pval': 250, 'cond': [], 'stype': 118 }, @@ -2478,12 +2478,21 @@ 'tujing': '', 'title': 'intr_yczm_day_des_2', 'type': 2, - 'pval': 400, + 'pval': 300, 'cond': [], 'stype': 118 }, '2006': { - 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 40}], + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 400, + 'cond': [], + 'stype': 118 + }, + '2007': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}], 'tujing': '', 'title': 'intr_yczm_day_des_2', 'type': 2, @@ -2608,7 +2617,7 @@ 'tujing': '', 'title': 'intr_yczm_day_des_2', 'type': 2, - 'pval': 300, + 'pval': 250, 'cond': [], 'stype': 118 }, @@ -2617,12 +2626,21 @@ 'tujing': '', 'title': 'intr_yczm_day_des_2', 'type': 2, - 'pval': 400, + 'pval': 300, 'cond': [], 'stype': 118 }, '2006': { - 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 40}], + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 400, + 'cond': [], + 'stype': 118 + }, + '2007': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}], 'tujing': '', 'title': 'intr_yczm_day_des_2', 'type': 2, @@ -3276,6 +3294,481 @@ } }, { + "hdid" : 8000, // 唯一活动id 圣诞活动 + "htype" : 8, + "stype" : 800, + "ttype" : 4, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动 + "stime" : 60, + "rtime" : 90, + "etime" : 90, + "name" : "sdhd_tips_1", + "icon" : "icon_xfdj", + "showtime" : "根据玩家注册时间，游戏返回时复写", + "data" : { + //任务 + "task" : { + "1": { + "pval" : 1, + "stype" : "128", + "cond": [], + "prize" : [ + { + "a" : "attr", + "t" : "shengdanExp", + "n" : 100 + }, + { + "a" : "attr", + "t" : "shengdanBullet", + "n" : 2 + }, + { + "a" : "attr", + "t" : "rmbmoney", + "n" : 200 + }, + { + "a" : "item", + "t" : "1", + "n" : 100000 + } + ], + "des" : "intr_cszl_des_1" + }, + "2": { + "pval" : 300, + "stype" : "116", + "cond": [], + "prize" : [ + { + "a" : "attr", + "t" : "shengdanExp", + "n" : 200 + }, + { + "a" : "attr", + "t" : "shengdanBullet", + "n" : 3 + }, + { + "a" : "item", + "t" : "600", + "n" : 5 + }, + { + "a" : "item", + "t" : "1", + "n" : 500000 + } + ], + "des" : "intr_cszl_des_2" + }, + "3": { + "pval" : 1000, + "stype" : "116", + "cond": [], + "prize" : [ + { + "a" : "attr", + "t" : "shengdanExp", + "n" : 300 + }, + { + "a" : "attr", + "t" : "shengdanBullet", + "n" : 5 + }, + { + "a" : "item", + "t" : "600", + "n" : 10 + }, + { + "a" : "item", + "t" : "1", + "n" : 1000000 + } + ], + "des" : "intr_cszl_des_3" + }, + "4": { + "pval" : 2000, + "stype" : "116", + "cond": [], + "prize" : [ + { + "a" : "attr", + "t" : "shengdanExp", + "n" : 150 + }, + { + "a" : "attr", + "t" : "shengdanBullet", + "n" : 2 + }, + { + "a" : "item", + "t" : "6", + "n" : 10 + }, + { + "a" : "item", + "t" : "1", + "n" : 200000 + } + ], + "des" : "intr_cszl_des_4" + }, + "5": { + "pval" : 3, + "stype" : "142", + "cond": [2], + "prize" : [ + { + "a" : "attr", + "t" : "shengdanExp", + "n" : 100 + }, + { + "a" : "attr", + "t" : "shengdanBullet", + "n" : 2 + }, + { + "a" : "item", + "t" : "2", + "n" : 500 + }, + { + "a" : "item", + "t" : "1", + "n" : 200000 + } + ], + "des" : "intr_cszl_des_5" + }, + "6": { + "pval" : 3, + "stype" : "122", + "cond": [], + "prize" : [ + { + "a" : "attr", + "t" : "shengdanExp", + "n" : 200 + }, + { + "a" : "attr", + "t" : "shengdanBullet", + "n" : 2 + }, + { + "a" : "item", + "t" : "12", + "n" : 400 + }, + { + "a" : "item", + "t" : "1", + "n" : 200000 + } + ], + "des" : "intr_cszl_des_6" + }, + "7": { + "pval" : 1, + "stype" : "155", + "cond": [], + "prize" : [ + { + "a" : "attr", + "t" : "shengdanExp", + "n" : 100 + }, + { + "a" : "attr", + "t" : "shengdanBullet", + "n" : 2 + }, + { + "a" : "attr", + "t" : "rmbmoney", + "n" : 200 + }, + { + "a" : "item", + "t" : "1", + "n" : 100000 + } + ], + "des" : "intr_cszl_des_7" + }, + "8": { + "pval" : 1, + "stype" : "127", + "cond": [], + "prize" : [ + { + "a" : "attr", + "t" : "shengdanExp", + "n" : 100 + }, + { + "a" : "attr", + "t" : "shengdanBullet", + "n" : 2 + }, + { + "a" : "item", + "t" : "21", + "n" : 50 + }, + { + "a" : "item", + "t" : "1", + "n" : 100000 + } + ], + "des" : "intr_cszl_des_8" + }, + "9": { + "pval" : 1, + "stype" : "154", + "cond": [], + "prize" : [ + { + "a" : "attr", + "t" : "shengdanExp", + "n" : 100 + }, + { + "a" : "attr", + "t" : "shengdanBullet", + "n" : 2 + }, + { + "a" : "attr", + "t" : "jinbi", + "n" : 100000 + }, + { + "a" : "item", + "t" : "1", + "n" : 100000 + } + ], + "des" : "intr_cszl_des_9" + }, + }, + //玩游戏需要消耗 + "gameneed": [{"a": "attr", "t":"shengdanBullet", "n": 1}], + //玩游戏拿分 + "game": [5,10,20,30,50], + //免费玩游戏次数 + "gamefree": 3, + //战令 + "zhanling":[ + { + "val": 2500, + "pt": [{"a": "item", "t":"1", "n": 200000}], + "gj": [{"a": "item", "t":"50009", "n": 1},{"a": "item", "t":"1", "n": 500000}] + }, + { + "val": 5000, + "pt": [{"a": "attr", "t":"rmbmoney", "n": 500}], + "gj": [{"a": "item", "t":"23", "n": 2000},{"a": "item", "t":"1", "n": 500000}] + }, + { + "val": 7500, + "pt": [{"a": "item", "t":"50104", "n": 1}], + "gj": [{"a": "item", "t":"9", "n": 100},{"a": "item", "t":"10", "n": 800}] + }, + { + "val": 10000, + "pt": [{"a": "item", "t":"4", "n": 10}], + "gj": [{"a": "item", "t":"28", "n": 5000},{"a": "item", "t":"605", "n": 2}] + }, + { + "val": 12500, + "pt": [{"a": "item", "t":"2", "n": 500}], + "gj": [{"a": "item", "t":"9", "n": 150},{"a": "item", "t":"10", "n": 1500}] + }, + { + "val": 15000, + "pt": [{"a": "item", "t":"600", "n": 10}], + "gj": [{"a": "item", "t":"605", "n": 2},{"a": "item", "t":"28", "n": 10000}] + }, + { + "val": 17500, + "pt": [{"a": "item", "t":"600", "n": 10}], + "gj": [{"a": "item", "t":"605", "n": 2},{"a": "item", "t":"28", "n": 20000}] + }, + { + "val": 20000, + "pt": [{"a": "item", "t":"10", "n": 800}], + "gj": [{"a": "item", "t":"600", "n": 20},{"a": "item", "t":"28", "n": 20000}] + }, + { + "val": 22500, + "pt": [{"a": "attr", "t":"rmbmoney", "n": 2000}], + "gj": [{"a": "item", "t":"600", "n": 20},{"a": "item", "t":"28", "n": 20000}] + } + ], + "zlpayid":"ycmb_1_1", + //活动礼包 + "libao": { + "1": { + "payid": "", + "buynum": 1, + "basep": [{"a": "attr", "t":"rmbmoney", "n": 100}], + "des" : "intr_cszl_des_10", + "dlz": [ + { + "1": {"a": "attr", "t":"jinbi", "n": 100000}, + "2": {"a": "item", "t":"1", "n": 50000} + } + ] + }, + "2": { + "payid": "pay_name_sdhd_libao_2", + "buynum": 2, + "basep": [{"a": "attr", "t":"rmbmoney", "n": 120}], + "des" : "intr_cszl_des_11", + "dlz": [ + { + "1": {"a": "item", "t":"2", "n": 400}, + "2": {"a": "item", "t":"12", "n": 200} + }, + { + "1": {"a": "attr", "t":"jinbi", "n": 1000000}, + "2": {"a": "item", "t":"1", "n": 500000} + } + ] + }, + "3": { + "payid": "pay_name_sdhd_libao_3", + "buynum": 2, + "basep": [{"a": "attr", "t":"rmbmoney", "n": 300}], + "des" : "intr_cszl_des_12", + "dlz": [ + { + "1": {"a": "item", "t":"9", "n": 500}, + "2": {"a": "item", "t":"10", "n": 100} + }, + { + "1": {"a": "item", "t":"9", "n": 500}, + "2": {"a": "item", "t":"10", "n": 100} + }, + { + "1": {"a": "item", "t":"9", "n": 500}, + "2": {"a": "item", "t":"10", "n": 100} + } + ] + }, + "4": { + "payid": "pay_name_sdhd_libao_4", + "buynum": 5, + "basep": [{"a": "attr", "t":"rmbmoney", "n": 680}], + "des" : "intr_cszl_des_12", + "dlz": [ + { + "1": {"a": "item", "t":"615", "n": 1}, + "2": {"a": "item", "t":"18", "n": 200} + }, + { + "1": {"a": "item", "t":"615", "n": 1}, + "2": {"a": "item", "t":"18", "n": 200} + }, + { + "1": {"a": "item", "t":"615", "n": 1}, + "2": {"a": "item", "t":"18", "n": 200} + } + ] + }, + "5": { + "payid": "pay_name_sdhd_libao_5", + "buynum": 9, + "basep": [{"a": "attr", "t":"rmbmoney", "n": 1280}], + "des" : "intr_cszl_des_13", + "dlz": [ + { + "1": {"a": "item", "t":"600", "n": 10}, + "2": {"a": "item", "t":"605", "n": 2}, + "3": {"a": "item", "t":"606", "n": 1} + }, + { + "1": {"a": "item", "t":"600", "n": 10}, + "2": {"a": "item", "t":"605", "n": 2}, + "3": {"a": "item", "t":"606", "n": 1} + }, + { + "1": {"a": "item", "t":"1", "n": 5000000}, + "2": {"a": "attr", "t":"jinbi", "n": 10000000} + } + ] + }, + "6": { + "payid": "pay_name_sdhd_libao_6", + "buynum": 9, + "basep": [{"a": "attr", "t":"rmbmoney", "n": 3280}], + "des" : "intr_cszl_des_14", + "dlz": [ + { + "1": {"a": "item", "t":"600", "n": 20}, + "2": {"a": "item", "t":"5002", "n": 10}, + "3": {"a": "item", "t":"5004", "n": 10} + }, + { + "1": {"a": "item", "t":"600", "n": 20}, + "2": {"a": "item", "t":"5002", "n": 10}, + "3": {"a": "item", "t":"5004", "n": 10} + }, + { + "1": {"a": "item", "t":"1", "n": 10000000}, + "2": {"a": "item", "t":"12", "n": 1000}, + "3": {"a": "item", "t":"2", "n": 2000}, + "4": {"a": "item", "t":"18", "n": 500} + } + ] + }, + "7": { + "payid": "pay_name_sdhd_libao_7", + "buynum": 9, + "basep": [{"a": "attr", "t":"rmbmoney", "n": 6480}], + "des" : "intr_cszl_des_14", + "dlz": [ + { + "1": {"a": "item", "t":"600", "n": 30}, + "2": {"a": "item", "t":"5002", "n": 20}, + "3": {"a": "item", "t":"5004", "n": 20} + }, + { + "1": {"a": "item", "t":"600", "n": 30}, + "2": {"a": "item", "t":"5002", "n": 20}, + "3": {"a": "item", "t":"5004", "n": 20} + }, + { + "1": {"a": "item", "t":"605", "n": 4}, + "2": {"a": "item", "t":"606", "n": 2}, + "3": {"a": "item", "t":"18", "n": 1000}, + "4": {"a": "item", "t":"23", "n": 1000000} + } + ] + }, + }, + //签到奖励 + "qiandao": [ + [{"a": "attr", "t":"shengdanExp", "n": 100},{"a": "attr", "t":"shengdanBullet", "n": 1},{"a": "item", "t":"4", "n": 10},{"a": "item", "t":"1", "n": 300000}], + [{"a": "attr", "t":"shengdanExp", "n": 100},{"a": "attr", "t":"shengdanBullet", "n": 1},{"a": "attr", "t":"rmbmoney", "n": 300},{"a": "item", "t":"1", "n": 300000}], + [{"a": "attr", "t":"shengdanExp", "n": 100},{"a": "attr", "t":"shengdanBullet", "n": 1},{"a": "item", "t":"12", "n": 300},{"a": "item", "t":"1", "n": 300000}], + [{"a": "attr", "t":"shengdanExp", "n": 100},{"a": "attr", "t":"shengdanBullet", "n": 1},{"a": "item", "t":"9", "n": 200},{"a": "item", "t":"1", "n": 300000}], + [{"a": "attr", "t":"shengdanExp", "n": 100},{"a": "attr", "t":"shengdanBullet", "n": 1},{"a": "item", "t":"2", "n": 400},{"a": "item", "t":"1", "n": 300000}], + [{"a": "attr", "t":"shengdanExp", "n": 100},{"a": "attr", "t":"shengdanBullet", "n": 1},{"a": "item", "t":"27", "n": 5000},{"a": "item", "t":"1", "n": 300000}], + [{"a": "attr", "t":"shengdanExp", "n": 100},{"a": "attr", "t":"shengdanBullet", "n": 1},{"a": "item", "t":"4", "n": 10},{"a": "item", "t":"1", "n": 300000}], + ] + } + }, + { "hdid" : 9000, // 唯一活动id 周末礼包 "htype" : 9, // 后端唯一识别标识 "stype" : 900, // 前端唯一识别标识（看前端需要是否修改） @@ -3330,6 +3823,62 @@ } ] } + }, + { + "hdid" : 10000, // 唯一活动id 超值好礼 + "htype" : 10, // 后端唯一识别标识 + "stype" : 1000, // 前端唯一识别标识（看前端需要是否修改） + "ttype" : 0, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动 + "stime" : 0, // 活动开始天数 + "rtime" : 30, // 活动显示结束天数 + "etime" : 30, // 活动实际结束 + "name": "czlibao", + "icon": "icon_czlibao", + "showtime" : "仅供参考，会复写正确值", // 自选礼包，如果存在多个活动，计费点不要设置一样；如果是一样，可能会存在付费一次，购买多次。 + "data" : { + //活动文本描述 + intr: "czlbtips_1", + intr: "czlbtips_2", + //礼包 + //礼包 + gift: [ + { + id: '1', + name: 'czlbtips_4', + need: [], + free: false, + payId: 'czlb_1', + buyNum: 1, + prize:{"1":[{'a': 'item', 't': '13', 'n': 600}], + "2":[{'a': 'item', 't': '13', 'n': 600}], + "3":[{'a': 'item', 't': '13', 'n': 600}] + } + }, + { + id: '2', + name: 'czlbtips_5', + need: [], + free: false, + payId: 'czlb_2', + buyNum: 1, + prize: {"1":[{'a': 'item', 't': '13', 'n': 600}], + "2":[{'a': 'item', 't': '13', 'n': 600}], + "3":[{'a': 'item', 't': '13', 'n': 600}] + } + }, + { + id: '3', + name: 'czlbtips_6', + need: [], + free: false, + payId: 'czlb_3', + buyNum: 1, + prize: {"1":[{'a': 'item', 't': '13', 'n': 600}], + "2":[{'a': 'item', 't': '13', 'n': 600}], + "3":[{'a': 'item', 't': '13', 'n': 600}] + } + } + ] + } } - ] \ No newline at end of file diff --git a/src/json/item.json b/src/json/item.json index 49030ba..1802cff 100644 --- a/src/json/item.json +++ b/src/json/item.json @@ -116,7 +116,7 @@ "6": { "id": 6, "name": "intr_item_name_6", - "undefined": "每次进行干部特训需要消耗1个特训指南", + "undefined": "用于干部特训，消耗特训指南挑战成功后可获得干部碎片", "type": 1, "sort": 1, "colour": 4, @@ -155,7 +155,7 @@ "9": { "id": 9, "name": "intr_item_name_9", - "undefined": "润滑剂，用于专属武器升星", + "undefined": "稀有材料，可用于专属武器升星", "type": 1, "sort": 1, "colour": 4, @@ -464,7 +464,7 @@ "24": { "id": 24, "name": "intr_item_name_24", - "undefined": "使用后直接快速探险2小时", + "undefined": "用于主线探险，使用后直接获得快速探险2小时的收益", "type": 2, "sort": 1, "colour": 5, @@ -1204,7 +1204,7 @@ "607": { "id": 607, "name": "intr_item_name_607", - "undefined": "使用后可以自选艾达，加尔西亚，葛丽特中一个干部的碎片", + "undefined": "使用后可以自选艾达，加尔西亚，葛丽特，达奇，汉塞尔中一个干部的碎片", "type": 2, "sort": 1, "colour": 5, @@ -2072,6 +2072,50 @@ "payId": "", "advancedEffects": "ani_xiangzikuang" }, + "637": { + "id": 637, + "name": "intr_item_name_637", + "undefined": "使用后可以选择获得巴拉莱卡、罗贝尔特中的一个干部", + "type": 2, + "sort": 1, + "colour": 6, + "way": [], + "go": "", + "icon": "icon_heroBox_3", + "sicon": "icon_heroBox_3", + "describe": "intr_item_describe_637", + "useNeed": [], + "usePrize": [], + "selecPrize": [ + { + "a": "hero", + "t": "5001", + "n": 1 + }, + { + "a": "hero", + "t": "5002", + "n": 1 + }, + { + "a": "hero", + "t": "5003", + "n": 1 + }, + { + "a": "hero", + "t": "5004", + "n": 1 + }, + { + "a": "hero", + "t": "5005", + "n": 1 + } + ], + "payId": "", + "advancedEffects": "ani_xiangzihong" + }, "1001": { "id": 1001, "name": "intr_item_name_1001", @@ -3950,6 +3994,24 @@ "payId": "", "advancedEffects": "" }, + "50009": { + "id": 50009, + "name": "playerheadFrame_name_23", + "undefined": "使用后解锁头像框“圣诞氛围”", + "type": 7, + "sort": 1, + "colour": 4, + "way": [], + "go": "", + "icon": "txk_028", + "describe": "intr_item_describe_50009", + "diaoluo": 23, + "useNeed": [], + "usePrize": [], + "selecPrize": [], + "payId": "", + "advancedEffects": "" + }, "50101": { "id": 50101, "name": "playerChatFrame_name_6", @@ -4001,7 +4063,26 @@ "useNeed": [], "usePrize": [], "selecPrize": [], - "payId": "" + "payId": "", + "advancedEffects": "" + }, + "50104": { + "id": 50104, + "name": "playerChatFrame_name_8", + "undefined": "使用后解锁聊天框“圣诞快乐”", + "type": 8, + "sort": 1, + "colour": 4, + "way": [], + "go": "", + "icon": "lt_dhk14", + "describe": "intr_item_describe_50104", + "diaoluo": 8, + "useNeed": [], + "usePrize": [], + "selecPrize": [], + "payId": "", + "advancedEffects": "" }, "50201": { "id": 50201, @@ -4011,13 +4092,15 @@ "sort": 1, "colour": 4, "way": [], + "go": "", "icon": "txk_017", "describe": "intr_item_describe_50201", "diaoluo": 16, "useNeed": [], "usePrize": [], "selecPrize": [], - "payId": "" + "payId": "", + "advancedEffects": "" }, "50202": { "id": 50202, @@ -4027,13 +4110,15 @@ "sort": 1, "colour": 4, "way": [], + "go": "", "icon": "txk_011", "describe": "intr_item_describe_50202", "diaoluo": 17, "useNeed": [], "usePrize": [], "selecPrize": [], - "payId": "" + "payId": "", + "advancedEffects": "" }, "50203": { "id": 50203, @@ -4043,13 +4128,15 @@ "sort": 1, "colour": 4, "way": [], + "go": "", "icon": "txk_005", "describe": "intr_item_describe_50203", "diaoluo": 18, "useNeed": [], "usePrize": [], "selecPrize": [], - "payId": "" + "payId": "", + "advancedEffects": "" }, "50204": { "id": 50204, @@ -4059,13 +4146,15 @@ "sort": 1, "colour": 4, "way": [], + "go": "", "icon": "txk_004", "describe": "intr_item_describe_50204", "diaoluo": 19, "useNeed": [], "usePrize": [], "selecPrize": [], - "payId": "" + "payId": "", + "advancedEffects": "" }, "50205": { "id": 50205, @@ -4075,13 +4164,15 @@ "sort": 1, "colour": 4, "way": [], + "go": "", "icon": "txk_024", "describe": "intr_item_describe_50205", "diaoluo": 20, "useNeed": [], "usePrize": [], "selecPrize": [], - "payId": "" + "payId": "", + "advancedEffects": "" }, "50206": { "id": 50206, @@ -4091,13 +4182,15 @@ "sort": 1, "colour": 4, "way": [], + "go": "", "icon": "txk_013", "describe": "intr_item_describe_50206", "diaoluo": 21, "useNeed": [], "usePrize": [], "selecPrize": [], - "payId": "" + "payId": "", + "advancedEffects": "" }, "50207": { "id": 50207, @@ -4107,13 +4200,51 @@ "sort": 1, "colour": 4, "way": [], + "go": "", "icon": "txk_021", "describe": "intr_item_describe_50207", "diaoluo": 22, "useNeed": [], "usePrize": [], "selecPrize": [], - "payId": "" + "payId": "", + "advancedEffects": "" + }, + "50301": { + "id": 50301, + "name": "playerModel_name_3", + "undefined": "使用后解锁主角造型“圣诞庆典：男”", + "type": 6, + "sort": 1, + "colour": 5, + "way": [], + "go": "", + "icon": 100011, + "describe": "intr_item_describe_50208", + "diaoluo": 3, + "useNeed": [], + "usePrize": [], + "selecPrize": [], + "payId": "", + "advancedEffects": "ani_xiangzikuang" + }, + "50302": { + "id": 50302, + "name": "playerModel_name_4", + "undefined": "使用后解锁主角造型“圣诞庆典：女”", + "type": 6, + "sort": 1, + "colour": 5, + "way": [], + "go": "", + "icon": 100021, + "describe": "intr_item_describe_50209", + "diaoluo": 4, + "useNeed": [], + "usePrize": [], + "selecPrize": [], + "payId": "", + "advancedEffects": "ani_xiangzikuang" }, "60101": { "id": 60101, diff --git a/src/json/jijin.json b/src/json/jijin.json index bfbcf9e..760af32 100644 --- a/src/json/jijin.json +++ b/src/json/jijin.json @@ -1,5 +1,41 @@ { "dengjijijin": [ + { + "type": "dengjijijin", + "total": 10, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 300 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 8000 + } + ] + }, + { + "type": "dengjijijin", + "total": 15, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 300 + } + ], + "tq": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 2000 + } + ] + }, { "type": "dengjijijin", "total": 20, @@ -14,7 +50,7 @@ { "a": "attr", "t": "rmbmoney", - "n": 1700 + "n": 2000 } ] }, @@ -32,7 +68,7 @@ { "a": "attr", "t": "rmbmoney", - "n": 1700 + "n": 2000 } ] }, @@ -50,7 +86,7 @@ { "a": "attr", "t": "rmbmoney", - "n": 1700 + "n": 2000 } ] }, @@ -68,7 +104,7 @@ { "a": "attr", "t": "rmbmoney", - "n": 1700 + "n": 2000 } ] }, @@ -86,7 +122,7 @@ { "a": "attr", "t": "rmbmoney", - "n": 1700 + "n": 2000 } ] }, @@ -104,43 +140,7 @@ { "a": "attr", "t": "rmbmoney", - "n": 1700 - } - ] - }, - { - "type": "dengjijijin", - "total": 50, - "pt": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 300 - } - ], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 1700 - } - ] - }, - { - "type": "dengjijijin", - "total": 55, - "pt": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 300 - } - ], - "tq": [ - { - "a": "attr", - "t": "rmbmoney", - "n": 1700 + "n": 2000 } ] } @@ -148,104 +148,104 @@ "guanqiajijin": [ { "type": "guanqiajijin", - "total": 30, + "total": 10, "pt": [], "tq": [ { - "a": "attr", - "t": "rmbmoney", - "n": 2000 + "a": "item", + "t": "1", + "n": 3000000 } ], "des": "guanqiajijin_des_1" }, { "type": "guanqiajijin", - "total": 50, + "total": 20, "pt": [], "tq": [ { - "a": "attr", - "t": "rmbmoney", - "n": 2000 + "a": "item", + "t": "1", + "n": 3000000 } ], "des": "guanqiajijin_des_2" }, { "type": "guanqiajijin", - "total": 70, + "total": 40, "pt": [], "tq": [ { - "a": "attr", - "t": "rmbmoney", - "n": 2000 + "a": "item", + "t": "1", + "n": 3000000 } ], "des": "guanqiajijin_des_3" }, { "type": "guanqiajijin", - "total": 90, + "total": 60, "pt": [], "tq": [ { - "a": "attr", - "t": "rmbmoney", - "n": 2000 + "a": "item", + "t": "1", + "n": 3000000 } ], "des": "guanqiajijin_des_4" }, { "type": "guanqiajijin", - "total": 110, + "total": 80, "pt": [], "tq": [ { - "a": "attr", - "t": "rmbmoney", - "n": 2000 + "a": "item", + "t": "1", + "n": 3000000 } ], "des": "guanqiajijin_des_5" }, { "type": "guanqiajijin", - "total": 150, + "total": 100, "pt": [], "tq": [ { - "a": "attr", - "t": "rmbmoney", - "n": 2000 + "a": "item", + "t": "1", + "n": 3000000 } ], "des": "guanqiajijin_des_6" }, { "type": "guanqiajijin", - "total": 180, + "total": 120, "pt": [], "tq": [ { - "a": "attr", - "t": "rmbmoney", - "n": 2000 + "a": "item", + "t": "1", + "n": 3000000 } ], "des": "guanqiajijin_des_7" }, { "type": "guanqiajijin", - "total": 250, + "total": 140, "pt": [], "tq": [ { - "a": "attr", - "t": "rmbmoney", - "n": 2000 + "a": "item", + "t": "1", + "n": 3000000 } ], "des": "guanqiajijin_des_8" @@ -254,37 +254,37 @@ "dayjijin": [ { "type": "dayjijin", - "total": 5, + "total": 10, "pt": [ { - "a": "item", - "t": "23", - "n": 20000 - } - ], - "tq": [ - { - "a": "item", - "t": "4", - "n": 5 - } - ] - }, - { - "type": "dayjijin", - "total": 15, - "pt": [ - { - "a": "item", - "t": "2", + "a": "attr", + "t": "rmbmoney", "n": 200 } ], "tq": [ { "a": "item", - "t": "2", - "n": 2000 + "t": "4", + "n": 10 + } + ] + }, + { + "type": "dayjijin", + "total": 20, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 200 + } + ], + "tq": [ + { + "a": "item", + "t": "4", + "n": 10 } ] }, @@ -292,35 +292,53 @@ "type": "dayjijin", "total": 30, "pt": [ - { - "a": "item", - "t": "23", - "n": 20000 - } - ], - "tq": [ { "a": "attr", "t": "rmbmoney", - "n": 888 - } - ] - }, - { - "type": "dayjijin", - "total": 45, - "pt": [ - { - "a": "item", - "t": "2", "n": 200 } ], "tq": [ { "a": "item", - "t": "615", - "n": 1 + "t": "4", + "n": 10 + } + ] + }, + { + "type": "dayjijin", + "total": 40, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 200 + } + ], + "tq": [ + { + "a": "item", + "t": "4", + "n": 10 + } + ] + }, + { + "type": "dayjijin", + "total": 50, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 200 + } + ], + "tq": [ + { + "a": "item", + "t": "4", + "n": 10 } ] }, @@ -329,34 +347,52 @@ "total": 60, "pt": [ { - "a": "item", - "t": "23", - "n": 20000 + "a": "attr", + "t": "rmbmoney", + "n": 200 } ], "tq": [ { "a": "item", "t": "4", - "n": 5 + "n": 10 } ] }, { "type": "dayjijin", - "total": 75, + "total": 70, "pt": [ { - "a": "item", - "t": "2", - "n": 300 + "a": "attr", + "t": "rmbmoney", + "n": 200 } ], "tq": [ { "a": "item", - "t": "2", - "n": 2000 + "t": "4", + "n": 10 + } + ] + }, + { + "type": "dayjijin", + "total": 80, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 200 + } + ], + "tq": [ + { + "a": "item", + "t": "4", + "n": 10 } ] }, @@ -365,34 +401,52 @@ "total": 90, "pt": [ { - "a": "item", - "t": "23", - "n": 20000 + "a": "attr", + "t": "rmbmoney", + "n": 200 } ], "tq": [ { - "a": "attr", - "t": "rmbmoney", - "n": 888 + "a": "item", + "t": "4", + "n": 10 } ] }, { "type": "dayjijin", - "total": 105, + "total": 100, "pt": [ { - "a": "item", - "t": "2", - "n": 300 + "a": "attr", + "t": "rmbmoney", + "n": 200 } ], "tq": [ { "a": "item", - "t": "615", - "n": 1 + "t": "4", + "n": 10 + } + ] + }, + { + "type": "dayjijin", + "total": 110, + "pt": [ + { + "a": "attr", + "t": "rmbmoney", + "n": 200 + } + ], + "tq": [ + { + "a": "item", + "t": "4", + "n": 10 } ] }, @@ -401,106 +455,52 @@ "total": 120, "pt": [ { - "a": "item", - "t": "23", - "n": 20000 + "a": "attr", + "t": "rmbmoney", + "n": 200 } ], "tq": [ { "a": "item", "t": "4", - "n": 5 + "n": 10 } ] }, { "type": "dayjijin", - "total": 135, + "total": 130, "pt": [ - { - "a": "item", - "t": "2", - "n": 400 - } - ], - "tq": [ - { - "a": "item", - "t": "2", - "n": 2000 - } - ] - }, - { - "type": "dayjijin", - "total": 150, - "pt": [ - { - "a": "item", - "t": "23", - "n": 20000 - } - ], - "tq": [ { "a": "attr", "t": "rmbmoney", - "n": 888 - } - ] - }, - { - "type": "dayjijin", - "total": 165, - "pt": [ - { - "a": "item", - "t": "2", - "n": 400 - } - ], - "tq": [ - { - "a": "item", - "t": "615", - "n": 1 - } - ] - }, - { - "type": "dayjijin", - "total": 180, - "pt": [ - { - "a": "item", - "t": "23", - "n": 20000 + "n": 200 } ], "tq": [ { "a": "item", "t": "4", - "n": 5 + "n": 10 } ] }, { "type": "dayjijin", - "total": 200, + "total": 140, "pt": [ { - "a": "item", - "t": "2", - "n": 500 + "a": "attr", + "t": "rmbmoney", + "n": 200 } ], "tq": [ { - "a": "attr", - "t": "rmbmoney", - "n": 1888 + "a": "item", + "t": "4", + "n": 10 } ] } diff --git a/src/json/kfcb_content.json b/src/json/kfcb_content.json index ef8bc42..7f6bed4 100644 --- a/src/json/kfcb_content.json +++ b/src/json/kfcb_content.json @@ -10,7 +10,13 @@ 2 ], "content": "kfcb_des_1", - "text": "kfcb_text_1" + "text": "kfcb_text_1", + "payIds": [ + "kfcb_libao_1", + "kfcb_libao_2", + "kfcb_libao_3", + "kfcb_libao_7" + ] }, "2": { "id": 2, @@ -23,7 +29,12 @@ 4 ], "content": "kfcb_des_2", - "text": "kfcb_text_2" + "text": "kfcb_text_2", + "payIds": [ + "kfcb_libao_4", + "kfcb_libao_5", + "kfcb_libao_6" + ] }, "3": { "id": 3, @@ -36,7 +47,11 @@ 6 ], "content": "kfcb_des_3", - "text": "kfcb_text_3" + "text": "kfcb_text_3", + "payIds": [ + "kfcb_libao_1", + "kfcb_libao_2" + ] }, "4": { "id": 4, @@ -49,7 +64,11 @@ 8 ], "content": "kfcb_des_4", - "text": "kfcb_text_4" + "text": "kfcb_text_4", + "payIds": [ + "kfcb_libao_2", + "kfcb_libao_3" + ] }, "5": { "id": 5, @@ -62,7 +81,12 @@ 10 ], "content": "kfcb_des_5", - "text": "kfcb_text_5" + "text": "kfcb_text_5", + "payIds": [ + "kfcb_libao_1", + "kfcb_libao_2", + "kfcb_libao_3" + ] }, "6": { "id": 6, @@ -75,7 +99,12 @@ 12 ], "content": "kfcb_des_6", - "text": "kfcb_text_6" + "text": "kfcb_text_6", + "payIds": [ + "kfcb_libao_1", + "kfcb_libao_2", + "kfcb_libao_3" + ] }, "7": { "id": 7, @@ -88,6 +117,11 @@ 14 ], "content": "kfcb_des_7", - "text": "kfcb_text_7" + "text": "kfcb_text_7", + "payIds": [ + "kfcb_libao_1", + "kfcb_libao_2", + "kfcb_libao_3" + ] } } \ No newline at end of file diff --git a/src/json/openCond.json b/src/json/openCond.json index 0326a27..2478204 100644 --- a/src/json/openCond.json +++ b/src/json/openCond.json @@ -1313,5 +1313,31 @@ "display": { "lv": 15 } + }, + "shengdanhuodong": { + "name": "shengdanhuodong", + "undefined": "圣诞活动", + "and": { + "lv": 15 + }, + "or": {}, + "time": 0, + "tips": "openCond_tips_96", + "display": { + "lv": 15 + } + }, + "yuandanhuodong": { + "name": "yuandanhuodong", + "undefined": "元旦活动", + "and": { + "lv": 15 + }, + "or": {}, + "time": 0, + "tips": "openCond_tips_96", + "display": { + "lv": 15 + } } } \ No newline at end of file diff --git a/src/json/pay.json b/src/json/pay.json index a638cb7..21d98f2 100644 --- a/src/json/pay.json +++ b/src/json/pay.json @@ -305,7 +305,12 @@ { "a": "attr", "t": "rmbmoney", - "n": 680 + "n": 1360 + }, + { + "a": "item", + "t": "609", + "n": 1 } ], "firstPayPrize": [], @@ -331,12 +336,12 @@ { "a": "attr", "t": "rmbmoney", - "n": 300 + "n": 600 }, { "a": "item", "t": "24", - "n": 10 + "n": 30 } ], "firstPayPrize": [], @@ -362,12 +367,12 @@ { "a": "attr", "t": "rmbmoney", - "n": 300 + "n": 600 }, { - "a": "item", - "t": "6", - "n": 20 + "a": "attr", + "t": "jinbi", + "n": 10000000 } ], "firstPayPrize": [], @@ -393,12 +398,12 @@ { "a": "attr", "t": "rmbmoney", - "n": 680 + "n": 1360 }, { "a": "item", "t": "4", - "n": 10 + "n": 20 } ], "firstPayPrize": [], @@ -425,6 +430,11 @@ "a": "attr", "t": "rmbmoney", "n": 980 + }, + { + "a": "hero", + "t": "4012", + "n": 1 } ], "firstPayPrize": [], @@ -455,7 +465,7 @@ { "a": "item", "t": "4", - "n": 5 + "n": 30 } ], "firstPayPrize": [], @@ -481,12 +491,12 @@ { "a": "attr", "t": "rmbmoney", - "n": 980 + "n": 5000 }, { - "a": "item", - "t": "4", - "n": 10 + "a": "attr", + "t": "rmbmoney", + "n": 5000 } ], "firstPayPrize": [], @@ -923,7 +933,7 @@ }, { "a": "hero", - "t": "4005", + "t": "4013", "n": 1 }, { @@ -965,7 +975,7 @@ { "a": "item", "t": "4", - "n": 10 + "n": 100 } ], "firstPayPrize": [], @@ -1020,7 +1030,7 @@ { "a": "attr", "t": "payExp", - "n": 300 + "n": 60 } ], "prize": [ @@ -1200,7 +1210,7 @@ { "a": "attr", "t": "payExp", - "n": 300 + "n": 680 } ], "prize": [ @@ -1236,7 +1246,7 @@ { "a": "attr", "t": "payExp", - "n": 300 + "n": 680 } ], "prize": [ @@ -1272,7 +1282,7 @@ { "a": "attr", "t": "payExp", - "n": 300 + "n": 680 } ], "prize": [ @@ -1308,7 +1318,7 @@ { "a": "attr", "t": "payExp", - "n": 300 + "n": 1280 } ], "prize": [ @@ -1901,7 +1911,7 @@ { "a": "attr", "t": "payExp", - "n": 6480 + "n": 3280 } ], "prize": [ @@ -1985,7 +1995,7 @@ } ], "firstPayPrize": [], - "name": "pay_name_136Gift4", + "name": "pay_name_136Gift3", "undefined": "1元礼包", "time": 86400, "buys": 0, @@ -2057,7 +2067,7 @@ } ], "firstPayPrize": [], - "name": "pay_name_136Gift4", + "name": "pay_name_136Gift6", "undefined": "6元礼包", "time": 86400, "buys": 0, @@ -2065,6 +2075,26 @@ "front": {}, "currency": "CNY" }, + "136GiftAll": { + "id": "136GiftAll", + "money": 60, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 600 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_136Gift2", + "undefined": "每日礼包全买", + "time": 86400, + "buys": 0, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, "xianshizhaomu_gift_1": { "id": "xianshizhaomu_gift_1", "money": 30, @@ -3795,5 +3825,1315 @@ "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" + }, + "shouchong_1": { + "id": "shouchong_1", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "hero", + "t": "4002", + "n": 1 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 120 + }, + { + "a": "item", + "t": "12", + "n": 500 + }, + { + "a": "item", + "t": "1", + "n": 50000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 100000 + } + ], + "firstPayPrize": [], + "name": "pay_name_shouchong_1", + "undefined": "首充礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "shouchong_2": { + "id": "shouchong_2", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [ + { + "a": "hero", + "t": "5001", + "n": 1 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 600 + }, + { + "a": "item", + "t": "12", + "n": 1500 + }, + { + "a": "item", + "t": "1", + "n": 300000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 300000 + } + ], + "firstPayPrize": [], + "name": "pay_name_shouchong_2", + "undefined": "首充礼包_30", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "shouchong_3": { + "id": "shouchong_3", + "money": 98, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 980 + } + ], + "prize": [ + { + "a": "hero", + "t": "5001", + "n": 1 + }, + { + "a": "equip", + "t": "1009", + "n": 1 + }, + { + "a": "equip", + "t": "2009", + "n": 1 + }, + { + "a": "equip", + "t": "3009", + "n": 1 + }, + { + "a": "equip", + "t": "4009", + "n": 1 + } + ], + "firstPayPrize": [], + "name": "pay_name_shouchong_3", + "undefined": "首充礼包_98", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_1": { + "id": "jitianlibao_1", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "item", + "t": "4", + "n": 5 + }, + { + "a": "item", + "t": "1", + "n": 100000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 200000 + } + ], + "firstPayPrize": [], + "name": "pay_name_jitianlibao_1", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_2": { + "id": "jitianlibao_2", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "item", + "t": "607", + "n": 20 + }, + { + "a": "item", + "t": "1", + "n": 200000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 400000 + } + ], + "firstPayPrize": [], + "name": "pay_name_jitianlibao_2", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_3": { + "id": "jitianlibao_3", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "item", + "t": "4", + "n": 10 + }, + { + "a": "item", + "t": "1", + "n": 300000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 600000 + } + ], + "firstPayPrize": [], + "name": "pay_name_jitianlibao_3", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_4": { + "id": "jitianlibao_4", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "item", + "t": "12", + "n": 500 + }, + { + "a": "item", + "t": "1", + "n": 400000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 800000 + } + ], + "firstPayPrize": [], + "name": "pay_name_jitianlibao_4", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_5": { + "id": "jitianlibao_5", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "item", + "t": "12", + "n": 500 + }, + { + "a": "item", + "t": "1", + "n": 500000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 1000000 + } + ], + "firstPayPrize": [], + "name": "pay_name_jitianlibao_5", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_6": { + "id": "jitianlibao_6", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "item", + "t": "12", + "n": 500 + }, + { + "a": "item", + "t": "1", + "n": 600000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 1200000 + } + ], + "firstPayPrize": [], + "name": "pay_name_jitianlibao_6", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_7": { + "id": "jitianlibao_7", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "item", + "t": "600", + "n": 20 + }, + { + "a": "item", + "t": "1", + "n": 700000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 1400000 + } + ], + "firstPayPrize": [], + "name": "pay_name_jitianlibao_7", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_8": { + "id": "jitianlibao_8", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "item", + "t": "12", + "n": 500 + }, + { + "a": "item", + "t": "1", + "n": 800000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 1600000 + } + ], + "firstPayPrize": [], + "name": "pay_name_jitianlibao_8", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_9": { + "id": "jitianlibao_9", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "item", + "t": "4", + "n": 10 + }, + { + "a": "item", + "t": "1", + "n": 900000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 1800000 + } + ], + "firstPayPrize": [], + "name": "pay_name_jitianlibao_9", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_10": { + "id": "jitianlibao_10", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "item", + "t": "12", + "n": 500 + }, + { + "a": "item", + "t": "1", + "n": 1000000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 2000000 + } + ], + "firstPayPrize": [], + "name": "pay_name_jitianlibao_10", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_11": { + "id": "jitianlibao_11", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "item", + "t": "12", + "n": 500 + }, + { + "a": "item", + "t": "1", + "n": 1100000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 2200000 + } + ], + "firstPayPrize": [], + "name": "pay_name_jitianlibao_11", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_12": { + "id": "jitianlibao_12", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "item", + "t": "4", + "n": 10 + }, + { + "a": "item", + "t": "1", + "n": 1200000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 2400000 + } + ], + "firstPayPrize": [], + "name": "pay_name_jitianlibao_12", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_13": { + "id": "jitianlibao_13", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "item", + "t": "12", + "n": 500 + }, + { + "a": "item", + "t": "1", + "n": 1300000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 2600000 + } + ], + "firstPayPrize": [], + "name": "pay_name_jitianlibao_13", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_14": { + "id": "jitianlibao_14", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "item", + "t": "12", + "n": 500 + }, + { + "a": "item", + "t": "1", + "n": 1400000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 2800000 + } + ], + "firstPayPrize": [], + "name": "pay_name_jitianlibao_14", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "jitianlibao_15": { + "id": "jitianlibao_15", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [ + { + "a": "item", + "t": "600", + "n": 20 + }, + { + "a": "item", + "t": "1", + "n": 1500000 + }, + { + "a": "attr", + "t": "jinbi", + "n": 3000000 + } + ], + "firstPayPrize": [], + "name": "pay_name_jitianlibao_15", + "undefined": "积天礼包_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "czlb_1": { + "id": "czlb_1", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_czlb_1", + "undefined": "超值好礼_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "czlb_2": { + "id": "czlb_2", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_czlb_2", + "undefined": "超值好礼_30", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "czlb_3": { + "id": "czlb_3", + "money": 68, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 680 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_czlb_3", + "undefined": "超值好礼_68", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "sdhd_zhanling_1": { + "id": "sdhd_zhanling_1", + "money": 128, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_sdhd_zhanling_1", + "undefined": "圣诞战令_1", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "sdhd_zhanling_2": { + "id": "sdhd_zhanling_2", + "money": 198, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1980 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_sdhd_zhanling_1", + "undefined": "圣诞战令_2", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "sdhd_zhanling_3": { + "id": "sdhd_zhanling_3", + "money": 328, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 3280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_sdhd_zhanling_1", + "undefined": "圣诞战令_3", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "sdhd_libao_1": { + "id": "sdhd_libao_1", + "money": 0.5, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_sdhd_libao_1", + "undefined": "圣诞自选_1", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "sdhd_libao_2": { + "id": "sdhd_libao_2", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_sdhd_libao_2", + "undefined": "圣诞自选_2", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "sdhd_libao_3": { + "id": "sdhd_libao_3", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_sdhd_libao_3", + "undefined": "圣诞自选_3", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "sdhd_libao_4": { + "id": "sdhd_libao_4", + "money": 68, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_sdhd_libao_4", + "undefined": "圣诞自选_4", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "sdhd_libao_5": { + "id": "sdhd_libao_5", + "money": 128, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_sdhd_libao_5", + "undefined": "圣诞自选_5", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "sdhd_libao_6": { + "id": "sdhd_libao_6", + "money": 328, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_sdhd_libao_6", + "undefined": "圣诞自选_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "sdhd_libao_7": { + "id": "sdhd_libao_7", + "money": 648, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_sdhd_libao_7", + "undefined": "圣诞自选_7", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" } } \ No newline at end of file diff --git a/src/json/payEmail.json5 b/src/json/payEmail.json5 index 37ba7b7..6ebe0fc 100644 --- a/src/json/payEmail.json5 +++ b/src/json/payEmail.json5 @@ -26,7 +26,7 @@ day: 7, title: 'title_email_zhongshenka_day7', content: 'intr_email_zhongshenka_day7', - prize: [{ a: 'item', t: '4', n: 10 },{ a: 'item', t: '9', n: 200 }] + prize: [{ a: 'item', t: '4', n: 10 },{ a: 'item', t: '1', n: 5000000 }] } ], chaozhiyueka: [ diff --git a/src/json/playerChatFrame.json b/src/json/playerChatFrame.json index f9a8c1f..2ce6ea9 100644 --- a/src/json/playerChatFrame.json +++ b/src/json/playerChatFrame.json @@ -118,5 +118,22 @@ }, "colour": 3, "ani": "" + }, + "8": { + "id": 8, + "name": "playerChatFrame_name_8", + "img": "lt_dhk14", + "cond": [ + "time", + -1 + ], + "undefined": "圣诞庆典获得", + "intr": "playerChatFrame_des_8", + "sort": 8, + "buff": { + "defpro": 0.01 + }, + "colour": 3, + "ani": "" } } \ No newline at end of file diff --git a/src/json/playerHead.json b/src/json/playerHead.json index cd31c39..04f1367 100644 --- a/src/json/playerHead.json +++ b/src/json/playerHead.json @@ -26,7 +26,7 @@ "intr": "intr_playerinfo_intr_2", "sort": 2, "buff": {}, - "colour": 2, + "colour": 1, "ani": "" }, "1001": { diff --git a/src/json/playerHeadFrame.json b/src/json/playerHeadFrame.json index 2960294..485c541 100644 --- a/src/json/playerHeadFrame.json +++ b/src/json/playerHeadFrame.json @@ -208,7 +208,7 @@ "13": { "id": 13, "name": "playerheadFrame_name_13", - "undefined": "购买战令获得", + "undefined": "购买悬赏令获得，解锁后伤害加成+2%（限时30天）", "img": "txk_002", "cond": [ "time", @@ -216,14 +216,16 @@ ], "intr": "playerheadFrame_des_13", "sort": 13, - "buff": {}, + "buff": { + "dpspro": 0.02 + }, "colour": 4, "ani": "" }, "14": { "id": 14, "name": "playerheadFrame_name_14", - "undefined": "铁笼死斗晋级八强获得", + "undefined": "铁笼死斗晋级八强获得，解锁后防御加成+1%（限时7天）", "img": "txk_003", "cond": [ "time", @@ -231,14 +233,16 @@ ], "intr": "playerheadFrame_des_14", "sort": 14, - "buff": {}, + "buff": { + "defpro": 0.01 + }, "colour": 4, "ani": "" }, "15": { "id": 15, "name": "playerheadFrame_name_15", - "undefined": "购买名望特权礼包获得", + "undefined": "购买名望特权礼包获得，解锁后伤害加成+1%", "img": "txk_020", "cond": [ "time", @@ -255,7 +259,7 @@ "16": { "id": 16, "name": "playerheadFrame_name_16", - "undefined": "开服冲榜活动获得", + "undefined": "开服冲榜活动获得，解锁后攻击加成+1%", "img": "txk_017", "cond": [ "time", @@ -272,7 +276,7 @@ "17": { "id": 17, "name": "playerheadFrame_name_17", - "undefined": "开服冲榜活动获得", + "undefined": "开服冲榜活动获得，解锁后防御加成+1%", "img": "txk_011", "cond": [ "time", @@ -289,7 +293,7 @@ "18": { "id": 18, "name": "playerheadFrame_name_18", - "undefined": "开服冲榜活动获得", + "undefined": "开服冲榜活动获得，解锁后生命加成+1%", "img": "txk_005", "cond": [ "time", @@ -306,7 +310,7 @@ "19": { "id": 19, "name": "playerheadFrame_name_19", - "undefined": "开服冲榜活动获得", + "undefined": "开服冲榜活动获得，解锁后攻击加成+1%", "img": "txk_004", "cond": [ "time", @@ -323,7 +327,7 @@ "20": { "id": 20, "name": "playerheadFrame_name_20", - "undefined": "开服冲榜活动获得", + "undefined": "开服冲榜活动获得，解锁后防御加成+1%", "img": "txk_024", "cond": [ "time", @@ -340,7 +344,7 @@ "21": { "id": 21, "name": "playerheadFrame_name_21", - "undefined": "开服冲榜活动获得", + "undefined": "开服冲榜活动获得，解锁后生命加成+1%", "img": "txk_013", "cond": [ "time", @@ -357,7 +361,7 @@ "22": { "id": 22, "name": "playerheadFrame_name_22", - "undefined": "开服冲榜活动获得", + "undefined": "开服冲榜活动获得，解锁后伤害加成+1%", "img": "txk_021", "cond": [ "time", @@ -370,5 +374,22 @@ }, "colour": 4, "ani": "" + }, + "23": { + "id": 23, + "name": "playerheadFrame_name_23", + "undefined": "圣诞庆典活动获得，解锁后生命加成+1%", + "img": "txk_028", + "cond": [ + "time", + -1 + ], + "intr": "playerheadFrame_des_23", + "sort": 23, + "buff": { + "hppro": 0.01 + }, + "colour": 4, + "ani": "" } } \ No newline at end of file diff --git a/src/json/playerModel.json b/src/json/playerModel.json index fbbf9b8..dcf972b 100644 --- a/src/json/playerModel.json +++ b/src/json/playerModel.json @@ -33,6 +33,44 @@ "colour": 1, "mwSpine": "ani_mingwangnv", "fireHead": "img_lih1" + }, + "3": { + "type": 1, + "id": 3, + "name": "playerModel_name_3", + "head": 100011, + "img": 100011, + "cond": [ + "time", + -1 + ], + "intr": "playerModel_des_3", + "sort": 3, + "buff": { + "defpro": 0.02 + }, + "colour": 5, + "mwSpine": "ani_mingwangnan", + "fireHead": "img_lih21" + }, + "4": { + "type": 1, + "id": 4, + "name": "playerModel_name_4", + "head": 100021, + "img": 100021, + "cond": [ + "time", + -1 + ], + "intr": "playerModel_des_4", + "sort": 4, + "buff": { + "atkpro": 0.02 + }, + "colour": 5, + "mwSpine": "ani_mingwangnv", + "fireHead": "img_lih11" } } } \ No newline at end of file diff --git a/src/json/shiwuleichong.json5 b/src/json/shiwuleichong.json5 index 7897c0a..5a0392f 100644 --- a/src/json/shiwuleichong.json5 +++ b/src/json/shiwuleichong.json5 @@ -1,46 +1,19 @@ { - //每日充值要求 - dayPayNeed: 6, - data: [ - { - time: 1296000, - tasks: [ - { total: 1, prize: [{a: 'attr', t: 'jinbi', n: 20000},{a: 'item', t: '1', n: 100000},{a: 'item', t: '4', n: 5}] }, - { total: 2, prize: [{a: 'attr', t: 'jinbi', n: 40000},{a: 'item', t: '1', n: 200000},{a: 'item', t: '12', n: 200}] }, - { total: 3, prize: [{a: 'attr', t: 'jinbi', n: 60000},{a: 'item', t: '1', n: 300000},{a: 'item', t: '4', n: 10}] }, - { total: 4, prize: [{a: 'attr', t: 'jinbi', n: 80000},{a: 'item', t: '1', n: 400000},{a: 'item', t: '12', n: 200}] }, - { total: 5, prize: [{a: 'attr', t: 'jinbi', n: 100000},{a: 'item', t: '1', n: 500000},{a: 'item', t: '12', n: 200}] }, - { total: 6, prize: [{a: 'attr', t: 'jinbi', n: 120000},{a: 'item', t: '1', n: 600000},{a: 'item', t: '607', n: 20}] }, - { total: 7, prize: [{a: 'attr', t: 'jinbi', n: 140000},{a: 'item', t: '1', n: 700000},{a: 'item', t: '12', n: 200}] }, - { total: 8, prize: [{a: 'attr', t: 'jinbi', n: 160000},{a: 'item', t: '1', n: 800000},{a: 'item', t: '12', n: 200}] }, - { total: 9, prize: [{a: 'attr', t: 'jinbi', n: 180000},{a: 'item', t: '1', n: 900000},{a: 'item', t: '4', n: 10}] }, - { total: 10, prize: [{a: 'attr', t: 'jinbi', n: 200000},{a: 'item', t: '1', n: 1000000},{a: 'item', t: '12', n: 200}] }, - { total: 11, prize: [{a: 'attr', t: 'jinbi', n: 220000},{a: 'item', t: '1', n: 1100000},{a: 'item', t: '12', n: 200}] }, - { total: 12, prize: [{a: 'attr', t: 'jinbi', n: 240000},{a: 'item', t: '1', n: 1200000},{a: 'item', t: '4', n: 10}] }, - { total: 13, prize: [{a: 'attr', t: 'jinbi', n: 260000},{a: 'item', t: '1', n: 1300000},{a: 'item', t: '12', n: 200}] }, - { total: 14, prize: [{a: 'attr', t: 'jinbi', n: 280000},{a: 'item', t: '1', n: 1400000},{a: 'item', t: '12', n: 200}] }, - { total: 15, prize: [{a: 'attr', t: 'jinbi', n: 300000},{a: 'item', t: '1', n: 1500000},{a: 'item', t: '600', n: 20}] } - ] - }, - { - time: 1296000, - tasks: [ - { total: 1, prize: [{a: 'attr', t: 'jinbi', n: 20000},{a: 'item', t: '1', n: 100000},{a: 'item', t: '4', n: 5}] }, - { total: 2, prize: [{a: 'attr', t: 'jinbi', n: 40000},{a: 'item', t: '1', n: 200000},{a: 'item', t: '12', n: 200}] }, - { total: 3, prize: [{a: 'attr', t: 'jinbi', n: 60000},{a: 'item', t: '1', n: 300000},{a: 'item', t: '4', n: 10}] }, - { total: 4, prize: [{a: 'attr', t: 'jinbi', n: 80000},{a: 'item', t: '1', n: 400000},{a: 'item', t: '12', n: 200}] }, - { total: 5, prize: [{a: 'attr', t: 'jinbi', n: 100000},{a: 'item', t: '1', n: 500000},{a: 'item', t: '12', n: 200}] }, - { total: 6, prize: [{a: 'attr', t: 'jinbi', n: 120000},{a: 'item', t: '1', n: 600000},{a: 'item', t: '607', n: 20}] }, - { total: 7, prize: [{a: 'attr', t: 'jinbi', n: 140000},{a: 'item', t: '1', n: 700000},{a: 'item', t: '12', n: 200}] }, - { total: 8, prize: [{a: 'attr', t: 'jinbi', n: 160000},{a: 'item', t: '1', n: 800000},{a: 'item', t: '12', n: 200}] }, - { total: 9, prize: [{a: 'attr', t: 'jinbi', n: 180000},{a: 'item', t: '1', n: 900000},{a: 'item', t: '4', n: 10}] }, - { total: 10, prize: [{a: 'attr', t: 'jinbi', n: 200000},{a: 'item', t: '1', n: 1000000},{a: 'item', t: '12', n: 200}] }, - { total: 11, prize: [{a: 'attr', t: 'jinbi', n: 220000},{a: 'item', t: '1', n: 1100000},{a: 'item', t: '12', n: 200}] }, - { total: 12, prize: [{a: 'attr', t: 'jinbi', n: 240000},{a: 'item', t: '1', n: 1200000},{a: 'item', t: '4', n: 10}] }, - { total: 13, prize: [{a: 'attr', t: 'jinbi', n: 260000},{a: 'item', t: '1', n: 1300000},{a: 'item', t: '12', n: 200}] }, - { total: 14, prize: [{a: 'attr', t: 'jinbi', n: 280000},{a: 'item', t: '1', n: 1400000},{a: 'item', t: '12', n: 200}] }, - { total: 15, prize: [{a: 'attr', t: 'jinbi', n: 300000},{a: 'item', t: '1', n: 1500000},{a: 'item', t: '600', n: 20}] } - ] - } + tasks: [ + { day: 1, payid:"jitianlibao_1" }, + { day: 2, payid:"jitianlibao_2" }, + { day: 3, payid:"jitianlibao_3" }, + { day: 4, payid:"jitianlibao_4" }, + { day: 5, payid:"jitianlibao_5" }, + { day: 6, payid:"jitianlibao_6" }, + { day: 7, payid:"jitianlibao_7" }, + { day: 8, payid:"jitianlibao_8" }, + { day: 9, payid:"jitianlibao_9" }, + { day: 10, payid:"jitianlibao_10" }, + { day: 11, payid:"jitianlibao_11" }, + { day: 12, payid:"jitianlibao_12" }, + { day: 13, payid:"jitianlibao_13" }, + { day: 14, payid:"jitianlibao_14" }, + { day: 15, payid:"jitianlibao_15" } ] } \ No newline at end of file diff --git a/src/json/shop.json b/src/json/shop.json index 6dea8cf..d13cfdf 100644 --- a/src/json/shop.json +++ b/src/json/shop.json @@ -495,5 +495,36 @@ "vip": [], "npcImg": 3011, "npcText": "intr_shopCom_text_10" + }, + "13": { + "id": 13, + "type": 12, + "name": "wsw_wz_dhsd", + "undefined": "兑换商店", + "openCond": [ + "lv", + 15 + ], + "autoRefreshTime": 0, + "recoilRefreshNeed": [], + "recoilRefreshNum": 0, + "freeRefreshInterval": 0, + "freeRefreshNum": 0, + "shopItems": [ + 4001 + ], + "showItem": [ + { + "a": "attr", + "t": "jinbi", + "n": 0 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 0 + } + ], + "vip": [] } } \ No newline at end of file diff --git a/src/json/shopItem.json b/src/json/shopItem.json index 371a482..ec6950d 100644 --- a/src/json/shopItem.json +++ b/src/json/shopItem.json @@ -3918,6 +3918,31 @@ 9999 ], "vipAddbuyNum": [] + }, + { + "id": 4001, + "a": "item", + "t": 4, + "n": 10, + "p": 1, + "colour": 4, + "buyNum": -1, + "openDay": 1, + "buyNeed": [ + { + "a": "item", + "t": "15", + "n": 2800 + } + ], + "sale": 10, + "needVip": 0, + "needZCCG": 0, + "lv": [ + 1, + 9999 + ], + "vipAddbuyNum": [] } ], "4002": [ diff --git a/src/json/shouchong.json b/src/json/shouchong.json index 10a0c4c..915846b 100644 --- a/src/json/shouchong.json +++ b/src/json/shouchong.json @@ -1,6 +1,7 @@ { "shouchong1": { "paynum": 6, + "payid":"shouchong_1", "cartoon": { "hero": 5001 }, @@ -45,6 +46,7 @@ }, "shouchong2": { "paynum": 30, + "payid":"shouchong_2", "cartoon": { "img": 5001 }, @@ -89,6 +91,7 @@ }, "shouchong3": { "paynum": 98, + "payid":"shouchong_3", "cartoon": { "hero": 5002 }, diff --git a/src/json/skill_afteratk.json b/src/json/skill_afteratk.json index 287a4dc..39523ee 100644 --- a/src/json/skill_afteratk.json +++ b/src/json/skill_afteratk.json @@ -1011,7 +1011,7 @@ "mofa": 0, "islong": 0 }, - "describe": "普通攻击替换为随机攻击3个目标，造成基础伤害95%的物理伤害" + "describe": "普通攻击替换为随机攻击2个目标，造成基础伤害95%的物理伤害" }, "4002201": { "skillid": 4002201, @@ -1029,7 +1029,7 @@ "mofa": 0, "islong": 0 }, - "describe": "普通攻击替换为随机攻击3个目标，造成基础伤害114%的物理伤害" + "describe": "普通攻击替换为随机攻击2个目标，造成基础伤害114%的物理伤害" }, "4003200": { "skillid": 4003200, @@ -1202,7 +1202,7 @@ "order": "rand", "limit": 6, "data": { - "pro": 0.11 + "pro": 0.13 }, "chkdata": {}, "ext": {}, @@ -1217,7 +1217,7 @@ "order": "rand", "limit": 6, "data": { - "pro": 0.11 + "pro": 0.13 }, "chkdata": {}, "ext": {}, diff --git a/src/json/skill_buff.json b/src/json/skill_buff.json index e7c9168..5c3cdb0 100644 --- a/src/json/skill_buff.json +++ b/src/json/skill_buff.json @@ -739,7 +739,7 @@ "sxleixing": "zhongdu", "buff_type": 2, "xiaoguocanshu": { - "pro": 0.15, + "pro": 0.18, "type": "hp" }, "round": 2, @@ -759,7 +759,7 @@ "sxleixing": "zhongdu", "buff_type": 2, "xiaoguocanshu": { - "pro": 0.15, + "pro": 0.18, "type": "hp" }, "round": 2, diff --git a/src/json/task.json b/src/json/task.json index a78d34a..c597cec 100644 --- a/src/json/task.json +++ b/src/json/task.json @@ -1202,13 +1202,13 @@ "n": 100000 } ], - "pval": 2, + "pval": 1, "name": "intr_task_name_2007", "intr": "intr_task_intr_2007", "pretask": 2015, "followtask": 2017, "cond": [ - 1 + 2 ], "tiaozhuan": 67, "order": 17, @@ -1467,13 +1467,13 @@ "n": 100000 } ], - "pval": 3, + "pval": 1, "name": "intr_task_name_2016", "intr": "intr_task_intr_2016", "pretask": 2022, "followtask": 2024, "cond": [ - 1 + 3 ], "tiaozhuan": 67, "order": 24, @@ -1619,13 +1619,13 @@ "n": 200000 } ], - "pval": 4, + "pval": 2, "name": "intr_task_name_2016", "intr": "intr_task_intr_2016", "pretask": 2026, "followtask": 2028, "cond": [ - 1 + 2 ], "tiaozhuan": 67, "order": 28, @@ -3016,13 +3016,13 @@ "n": 100000 } ], - "pval": 3, + "pval": 2, "name": "intr_task_name_2016", "intr": "intr_task_intr_2016", "pretask": 2064, "followtask": 2066, "cond": [ - 2 + 3 ], "tiaozhuan": 67, "order": 66, @@ -3350,13 +3350,13 @@ "n": 100000 } ], - "pval": 4, + "pval": 3, "name": "intr_task_name_2016", "intr": "intr_task_intr_2016", "pretask": 2073, "followtask": 2075, "cond": [ - 2 + 3 ], "tiaozhuan": 67, "order": 75, diff --git a/src/json/tuisonglibao.json b/src/json/tuisonglibao.json new file mode 100644 index 0000000..737dbc1 --- /dev/null +++ b/src/json/tuisonglibao.json @@ -0,0 +1,257 @@ +{ + "1": { + "id": 1, + "type": 1, + "num": [ + 5 + ], + "payId": [ + "guanqialibao_1", + "guanqialibao_2", + "guanqialibao_3" + ], + "time": 3600, + "displayCD": 7200, + "scale": 500 + }, + "2": { + "id": 2, + "type": 1, + "num": [ + 10 + ], + "payId": [ + "guanqialibao_1", + "guanqialibao_2" + ], + "time": 3600, + "displayCD": 7200, + "scale": 501 + }, + "3": { + "id": 3, + "type": 1, + "num": [ + 20 + ], + "payId": [ + "guanqialibao_1", + "guanqialibao_3" + ], + "time": 3600, + "displayCD": 7200, + "scale": 502 + }, + "4": { + "id": 4, + "type": 2, + "num": [ + { + "a": "item", + "t": "1" + } + ], + "payId": [ + "daojulibao_1", + "daojulibao_2" + ], + "time": 3600, + "displayCD": 7200, + "scale": 503 + }, + "5": { + "id": 5, + "type": 2, + "num": [ + { + "a": "item", + "t": "2" + } + ], + "payId": [ + "daojulibao_1", + "daojulibao_3" + ], + "time": 3600, + "displayCD": 7200, + "scale": 504 + }, + "6": { + "id": 6, + "type": 2, + "num": [ + { + "a": "attr", + "t": "jinbi" + } + ], + "payId": [ + "daojulibao_1", + "daojulibao_2", + "daojulibao_3" + ], + "time": 3600, + "displayCD": 7200, + "scale": 505 + }, + "7": { + "id": 7, + "type": 3, + "num": [ + 1 + ], + "payId": [ + "zhanbailibao_1", + "zhanbailibao_2", + "zhanbailibao_3" + ], + "time": 3600, + "displayCD": 7200, + "scale": 506 + }, + "8": { + "id": 8, + "type": 4, + "num": [ + 3 + ], + "payId": [ + "choukalibao_1", + "choukalibao_2", + "choukalibao_3" + ], + "time": 3600, + "displayCD": 7200, + "scale": 507 + }, + "9": { + "id": 9, + "type": 5, + "num": [ + 31 + ], + "payId": [ + "lv30" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3300 + }, + "10": { + "id": 10, + "type": 5, + "num": [ + 45 + ], + "payId": [ + "lv40" + ], + "time": 3600, + "displayCD": 3600, + "scale": 3300 + }, + "11": { + "id": 11, + "type": 5, + "num": [ + 50 + ], + "payId": [ + "lv55" + ], + "time": 3600, + "displayCD": 3600, + "scale": 2000 + }, + "12": { + "id": 12, + "type": 5, + "num": [ + 53 + ], + "payId": [ + "lv58" + ], + "time": 3600, + "displayCD": 3600, + "scale": 2000 + }, + "13": { + "id": 13, + "type": 5, + "num": [ + 56 + ], + "payId": [ + "lv60" + ], + "time": 3600, + "displayCD": 3600, + "scale": 2000 + }, + "14": { + "id": 14, + "type": 5, + "num": [ + 60 + ], + "payId": [ + "lv63" + ], + "time": 3600, + "displayCD": 3600, + "scale": 2000 + }, + "15": { + "id": 15, + "type": 5, + "num": [ + 63 + ], + "payId": [ + "lv66" + ], + "time": 3600, + "displayCD": 3600, + "scale": 2000 + }, + "16": { + "id": 16, + "type": 5, + "num": [ + 66 + ], + "payId": [ + "lv69" + ], + "time": 3600, + "displayCD": 3600, + "scale": 1800 + }, + "17": { + "id": 17, + "type": 5, + "num": [ + 68 + ], + "payId": [ + "lv72" + ], + "time": 3600, + "displayCD": 3600, + "scale": 1800 + }, + "18": { + "id": 18, + "type": 5, + "num": [ + 70 + ], + "payId": [ + "lv75" + ], + "time": 3600, + "displayCD": 3600, + "scale": 1800 + } +} \ No newline at end of file diff --git a/src/json/yuedujijin.json5 b/src/json/yuedujijin.json5 index 947cbec..52e466d 100644 --- a/src/json/yuedujijin.json5 +++ b/src/json/yuedujijin.json5 @@ -2,35 +2,35 @@ { payId: '128jijin', prize: [ + {a:'item',t:'4',n:50}, + {a:'item',t:'617',n:1}, + {a:'attr',t:'rmbmoney',n:1000}, + {a:'item',t:'9',n:1000}, + {a:'attr',t:'rmbmoney',n:300}, + {a:'attr',t:'rmbmoney',n:300}, + {a:'item',t:'9',n:1000}, + {a:'item',t:'4',n:10}, + {a:'attr',t:'rmbmoney',n:500}, + {a:'attr',t:'rmbmoney',n:300}, + {a:'item',t:'9',n:1000}, {a:'item',t:'4',n:10}, {a:'attr',t:'rmbmoney',n:300}, + {a:'item',t:'9',n:1000}, + {a:'attr',t:'rmbmoney',n:300}, + {a:'attr',t:'rmbmoney',n:300}, + {a:'item',t:'9',n:3000}, + {a:'attr',t:'rmbmoney',n:300}, + {a:'attr',t:'rmbmoney',n:300}, + {a:'item',t:'9',n:3000}, + {a:'attr',t:'rmbmoney',n:500}, {a:'attr',t:'rmbmoney',n:300}, {a:'item',t:'9',n:2000}, {a:'attr',t:'rmbmoney',n:300}, {a:'attr',t:'rmbmoney',n:300}, - {a:'item',t:'609',n:1}, - {a:'item',t:'4',n:10}, - {a:'attr',t:'rmbmoney',n:500}, - {a:'attr',t:'rmbmoney',n:300}, - {a:'item',t:'18',n:300}, - {a:'attr',t:'rmbmoney',n:300}, - {a:'attr',t:'rmbmoney',n:300}, - {a:'item',t:'6',n:20}, - {a:'attr',t:'rmbmoney',n:300}, - {a:'attr',t:'rmbmoney',n:300}, {a:'item',t:'9',n:3000}, {a:'attr',t:'rmbmoney',n:300}, - {a:'attr',t:'rmbmoney',n:300}, - {a:'item',t:'4',n:10}, {a:'attr',t:'rmbmoney',n:500}, - {a:'attr',t:'rmbmoney',n:300}, - {a:'item',t:'20',n:200}, - {a:'attr',t:'rmbmoney',n:300}, - {a:'attr',t:'rmbmoney',n:300}, - {a:'item',t:'9',n:3000}, - {a:'attr',t:'rmbmoney',n:300}, - {a:'attr',t:'rmbmoney',n:300}, - {a:'attr',t:'rmbmoney',n:1000}, + {a:'attr',t:'rmbmoney',n:500}, {a:'item',t:'628',n:1}, ], //奖励总价值X钻 @@ -43,36 +43,36 @@ { payId: '328jijin', prize: [ - {a:'item',t:'4',n:30}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'item',t:'10',n:300}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'item',t:'628',n:1}, - {a:'item',t:'4',n:20}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'item',t:'628',n:1}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'item',t:'628',n:1}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'item',t:'628',n:1}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'item',t:'4',n:20}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'attr',t:'rmbmoney',n:800}, + {a:'item',t:'611',n:1}, + {a:'item',t:'617',n:2}, + {a:'attr',t:'rmbmoney',n:2000}, {a:'item',t:'10',n:400}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'attr',t:'rmbmoney',n:800}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'item',t:'10',n:400}, + {a:'item',t:'4',n:20}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'item',t:'10',n:400}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'item',t:'10',n:400}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'item',t:'10',n:400}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'item',t:'4',n:20}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'item',t:'10',n:400}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'item',t:'10',n:400}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'attr',t:'rmbmoney',n:2000}, + {a:'attr',t:'rmbmoney',n:2000}, {a:'item',t:'10',n:400}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'attr',t:'rmbmoney',n:800}, - {a:'attr',t:'rmbmoney',n:1500}, - {a:'item',t:'617',n:1}, ], //奖励总价值X钻 num1: 70080, From d4634f729e929c9d55fb538ccd114101e9d8f3d9 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Tue, 19 Dec 2023 10:12:49 +0800 Subject: [PATCH 76/80] =?UTF-8?q?fix:=E8=B7=A8=E6=9C=8D=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/public/scheduler/scheduler_cross_email_pull.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/public/scheduler/scheduler_cross_email_pull.ts b/src/public/scheduler/scheduler_cross_email_pull.ts index 652f36e..71c26da 100644 --- a/src/public/scheduler/scheduler_cross_email_pull.ts +++ b/src/public/scheduler/scheduler_cross_email_pull.ts @@ -20,7 +20,7 @@ export class CrossEmailPull extends Scheduler { async start() { /**同步跨服邮件*/ G.clientCross.callApi("email/GetCrossEmail", {server_id: G.config.serverId + ""}).then((res) => { - if(!res.isSucc)return; + if (!res.isSucc) return; res.res.emails.forEach(async (email) => { if (email.uid != "system") { await EmailFun.addEmail(email) @@ -29,6 +29,9 @@ export class CrossEmailPull extends Scheduler { } await EmailFun.addEmail(email) }) + if (res.res.emails.length > 0) { + G.clientCross.callApi("email/DelCrossEmail", {eids: res.res.emails.map(e => e._id)}) + } }) await this.ctorStartTime() } From 1a703f1ecd9cbae787e826734b2d7d0ffd90c1d3 Mon Sep 17 00:00:00 2001 From: dy Date: Tue, 19 Dec 2023 14:59:28 +0800 Subject: [PATCH 77/80] =?UTF-8?q?=E9=A6=96=E5=85=85=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E7=9B=B4=E8=B4=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/shouchong/ApiOpen.ts | 11 +++-- src/api_s2c/event/shouchong/ApiReceive.ts | 46 ++++++++++--------- src/module/collection_event.ts | 3 ++ .../protocols/event/shouchong/PtlOpen.ts | 4 +- src/shared/protocols/serviceProto.ts | 20 +++++--- 5 files changed, 50 insertions(+), 34 deletions(-) diff --git a/src/api_s2c/event/shouchong/ApiOpen.ts b/src/api_s2c/event/shouchong/ApiOpen.ts index 010d12f..4f6fb4b 100644 --- a/src/api_s2c/event/shouchong/ApiOpen.ts +++ b/src/api_s2c/event/shouchong/ApiOpen.ts @@ -1,11 +1,14 @@ import { ApiCall } from "tsrpc"; import { ReqOpen, ResOpen } from "../../../shared/protocols/event/shouchong/PtlOpen"; +import {PayFun} from "../../../public/pay"; export default async function (call: ApiCall) { - let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' }); + let data = await G.mongodb.cEvent('shouchongzhigou').findOne({uid: call.uid, type: 'shouchongzhigou'}) + + let payIds = R.compose(R.map(i=>i.payid),R.values())(G.gc.shouchong) call.succ({ - payNum: call.conn.gud.payExp / 10, - receive: Object.fromEntries(Object.keys(G.gc.shouchong).map(k => [k, data?.receive?.[k] || []])) - }); + receive: data?.receive || {}, + buyLog: await PayFun.getPayLogs(call.uid, payIds) + }) } \ No newline at end of file diff --git a/src/api_s2c/event/shouchong/ApiReceive.ts b/src/api_s2c/event/shouchong/ApiReceive.ts index 6e29d12..e5debb9 100644 --- a/src/api_s2c/event/shouchong/ApiReceive.ts +++ b/src/api_s2c/event/shouchong/ApiReceive.ts @@ -1,28 +1,31 @@ -import { ApiCall } from "tsrpc"; -import { PlayerFun } from '../../../public/player'; -import { ReqReceive, ResReceive } from "../../../shared/protocols/event/shouchong/PtlReceive"; -import { PublicShared } from '../../../shared/public/public'; -import { HongDianChange } from "../../hongdian/fun"; +import {ApiCall} from "tsrpc"; +import {PlayerFun} from '../../../public/player'; +import {ReqReceive, ResReceive} from "../../../shared/protocols/event/shouchong/PtlReceive"; +import {PublicShared} from '../../../shared/public/public'; +import {HongDianChange} from "../../hongdian/fun"; +import {PayFun} from "../../../public/pay"; export default async function (call: ApiCall) { let conf = G.gc.shouchong[call.req.k]; - if (!conf) return call.error(globalThis.lng.pata_getprize_1); - let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' }); + let payLog = await PayFun.getPayLog(call.uid, conf.payid) + if (!payLog) return call.errorCode(-1) + + let data = await G.mongodb.cEvent('shouchongzhigou').findOne({ uid: call.uid, type: 'shouchongzhigou' }); let recArr = data?.receive?.[call.req.k] || []; - if (call.conn.gud.payExp < conf.paynum) return call.error(globalThis.lng.event_kfkh_9); + // if (call.conn.gud.payExp < conf.paynum) return call.error(globalThis.lng.event_kfkh_9); if (recArr.length >= conf.prize.length) return call.error(globalThis.lng.event_kfkh_3); if (recArr.slice(-1)[0] && PublicShared.getToDayZeroTime() < recArr.slice(-1)[0]) return call.error(globalThis.lng.event_kfkh_10); await PlayerFun.sendPrize(call, conf.prize[recArr.length]); - await G.mongodb.cEvent('shouchong').updateOne( - { uid: call.uid, type: 'shouchong' }, + await G.mongodb.cEvent('shouchongzhigou').updateOne( + { uid: call.uid, type: 'shouchongzhigou' }, { $push: G.mongodb.createTreeObj({ key: 'receive', k: call.req.k, val: G.time }) }, { upsert: true } ); @@ -40,17 +43,16 @@ export default async function (call: ApiCall) { } export async function getShouChongRedPoint(call: ApiCall) { - let res = { show: false }; - let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' }); + // let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' }); + // + // for (let [id, conf] of Object.entries(G.gc.shouchong)) { + // let rec = data?.receive?.[id] || []; + // if (call.conn.gud.payExp / 10 < conf.paynum || rec.length >= conf.prize.length) continue; + // if (rec.length == 0 || rec.slice(-1)[0] < PublicShared.getToDayZeroTime(G.time)) { + // res = { show: true }; + // break; + // } + // } - for (let [id, conf] of Object.entries(G.gc.shouchong)) { - let rec = data?.receive?.[id] || []; - if (call.conn.gud.payExp / 10 < conf.paynum || rec.length >= conf.prize.length) continue; - if (rec.length == 0 || rec.slice(-1)[0] < PublicShared.getToDayZeroTime(G.time)) { - res = { show: true }; - break; - } - } - - return res; + return {show: false}; } \ No newline at end of file diff --git a/src/module/collection_event.ts b/src/module/collection_event.ts index e1eeef3..6681c58 100644 --- a/src/module/collection_event.ts +++ b/src/module/collection_event.ts @@ -26,6 +26,9 @@ export type eventType = { shouchong: { receive: k_v; }; + shouchongzhigou: { + receive: k_v; + }; kaifukuanghuan: Omit; dayjijin: Omit; dengjijijin: Omit; diff --git a/src/shared/protocols/event/shouchong/PtlOpen.ts b/src/shared/protocols/event/shouchong/PtlOpen.ts index cad5f93..d839863 100644 --- a/src/shared/protocols/event/shouchong/PtlOpen.ts +++ b/src/shared/protocols/event/shouchong/PtlOpen.ts @@ -8,8 +8,10 @@ export type ReqOpen = { }; export type ResOpen = { - payNum: number; receive: { [k: string]: number[]; }; + buyLog:{ + [k: string]: any; + } }; \ No newline at end of file diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 5c4141b..c60ab37 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -10262,13 +10262,6 @@ export const serviceProto: ServiceProto = { "properties": [ { "id": 0, - "name": "payNum", - "type": { - "type": "Number" - } - }, - { - "id": 1, "name": "receive", "type": { "type": "Interface", @@ -10282,6 +10275,19 @@ export const serviceProto: ServiceProto = { } } } + }, + { + "id": 1, + "name": "buyLog", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" + } + } + } } ] }, From 6215737571b9ff8e90c1d0a206614ebf86d90e0e Mon Sep 17 00:00:00 2001 From: dy Date: Tue, 19 Dec 2023 15:00:51 +0800 Subject: [PATCH 78/80] cehua-json --- src/json/attr.json | 8 +-- src/json/huobanzhaomu.json5 | 2 +- src/json/huodong.json5 | 130 ++++++++++++++++++++++++++++++++---- src/json/pay.json | 88 ++---------------------- src/json/shouchong.json | 114 +++++++++++++++---------------- 5 files changed, 185 insertions(+), 157 deletions(-) diff --git a/src/json/attr.json b/src/json/attr.json index 3d3120f..371283d 100644 --- a/src/json/attr.json +++ b/src/json/attr.json @@ -114,8 +114,8 @@ "name": "intr_attr_name_13", "undefined": "圣诞战令经验", "colour": 5, - "icon": "icon_shengdanExp", - "sicon": "icon_shengdanExp", + "icon": "icon_sdhd_item_1", + "sicon": "icon_sdhd_item_1", "describe": "intr_attr_describe_13", "advancedEffects": "ani_xiangzikuang" }, @@ -124,8 +124,8 @@ "name": "intr_attr_name_14", "undefined": "圣诞子弹", "colour": 5, - "icon": "icon_zuanshi", - "sicon": "icon_zuanshi", + "icon": "icon_chegaipq", + "sicon": "icon_chegaipq", "describe": "intr_attr_describe_14", "advancedEffects": "ani_xiangzikuang" } diff --git a/src/json/huobanzhaomu.json5 b/src/json/huobanzhaomu.json5 index bc40ef1..fba48fc 100644 --- a/src/json/huobanzhaomu.json5 +++ b/src/json/huobanzhaomu.json5 @@ -7,7 +7,7 @@ { total: 2, gudKey: 'loginDays', - prize: [{a: 'hero', t: '4004', n: 1}] + prize: [{a: 'hero', t: '4005', n: 1}] }, { total: 1, diff --git a/src/json/huodong.json5 b/src/json/huodong.json5 index 2fc7624..9455557 100644 --- a/src/json/huodong.json5 +++ b/src/json/huodong.json5 @@ -3849,10 +3849,27 @@ free: false, payId: 'czlb_1', buyNum: 1, - prize:{"1":[{'a': 'item', 't': '13', 'n': 600}], - "2":[{'a': 'item', 't': '13', 'n': 600}], - "3":[{'a': 'item', 't': '13', 'n': 600}] - } + prize: [ + { + "a": "item", + "t": "13", + "n": 600 + } + ], + "recPrize1": [ + { + "a": "item", + "t": "13", + "n": 600 + } + ], + "recPrize2": [ + { + "a": "item", + "t": "13", + "n": 600 + } + ] }, { id: '2', @@ -3861,10 +3878,27 @@ free: false, payId: 'czlb_2', buyNum: 1, - prize: {"1":[{'a': 'item', 't': '13', 'n': 600}], - "2":[{'a': 'item', 't': '13', 'n': 600}], - "3":[{'a': 'item', 't': '13', 'n': 600}] - } + prize: [ + { + "a": "item", + "t": "13", + "n": 600 + } + ], + "recPrize1": [ + { + "a": "item", + "t": "13", + "n": 600 + } + ], + "recPrize2": [ + { + "a": "item", + "t": "13", + "n": 600 + } + ] }, { id: '3', @@ -3873,10 +3907,82 @@ free: false, payId: 'czlb_3', buyNum: 1, - prize: {"1":[{'a': 'item', 't': '13', 'n': 600}], - "2":[{'a': 'item', 't': '13', 'n': 600}], - "3":[{'a': 'item', 't': '13', 'n': 600}] - } + prize: [ + { + "a": "item", + "t": "13", + "n": 600 + } + ], + "recPrize1": [ + { + "a": "item", + "t": "13", + "n": 600 + } + ], + "recPrize2": [ + { + "a": "item", + "t": "13", + "n": 600 + } + ] + } + ] + } + }, + { + "hdid" : 11000, // 唯一活动id 消费竞赛 + "htype" : 11, // 后端唯一识别标识 + "stype" : 1100, // 前端唯一识别标识（看前端需要是否修改） + "ttype" : 0, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动 + "stime" : 0, // 活动开始天数 + "rtime" : 30, // 活动显示结束天数 + "etime" : 30, // 活动实际结束 + "name": "xfjs", + "icon": "icon_xfjs", + "showtime" : "仅供参考，会复写正确值", // 自选礼包，如果存在多个活动，计费点不要设置一样；如果是一样，可能会存在付费一次，购买多次。 + "data" : { + //活动文本描述 + intr: "xfjstips_1", + intr: "xfjstips_2", + //排名 + rank: [ + { + id: '1', + name: 'xfjstips_3', + rank:[1], + need: [{'a': 'attr', 't': 'rmbmoney', 'n': 20000}], + prize: [{'a': 'item', 't': '13', 'n': 600}] + }, + { + id: '2', + name: 'xfjstips_4', + rank:[2], + need: [{'a': 'attr', 't': 'rmbmoney', 'n': 18000}], + prize: [{'a': 'item', 't': '13', 'n': 600}] + }, + { + id: '3', + name: 'xfjstips_5', + rank:[3], + need: [{'a': 'attr', 't': 'rmbmoney', 'n': 16000}], + prize: [{'a': 'item', 't': '13', 'n': 600}] + }, + { + id: '4', + name: 'xfjstips_6', + rank:[4,10], + need: [{'a': 'attr', 't': 'rmbmoney', 'n': 14000}], + prize: [{'a': 'item', 't': '13', 'n': 600}] + }, + { + id: '5', + name: 'xfjstips_7', + rank:[11,30], + need: [{'a': 'attr', 't': 'rmbmoney', 'n': 12000}], + prize: [{'a': 'item', 't': '13', 'n': 600}] } ] } diff --git a/src/json/pay.json b/src/json/pay.json index 21d98f2..ad781d0 100644 --- a/src/json/pay.json +++ b/src/json/pay.json @@ -933,7 +933,7 @@ }, { "a": "hero", - "t": "4013", + "t": "4006", "n": 1 }, { @@ -4208,33 +4208,7 @@ "n": 60 } ], - "prize": [ - { - "a": "hero", - "t": "4002", - "n": 1 - }, - { - "a": "attr", - "t": "rmbmoney", - "n": 120 - }, - { - "a": "item", - "t": "12", - "n": 500 - }, - { - "a": "item", - "t": "1", - "n": 50000 - }, - { - "a": "attr", - "t": "jinbi", - "n": 100000 - } - ], + "prize": [], "firstPayPrize": [], "name": "pay_name_shouchong_1", "undefined": "首充礼包_6", @@ -4254,33 +4228,7 @@ "n": 300 } ], - "prize": [ - { - "a": "hero", - "t": "5001", - "n": 1 - }, - { - "a": "attr", - "t": "rmbmoney", - "n": 600 - }, - { - "a": "item", - "t": "12", - "n": 1500 - }, - { - "a": "item", - "t": "1", - "n": 300000 - }, - { - "a": "attr", - "t": "jinbi", - "n": 300000 - } - ], + "prize": [], "firstPayPrize": [], "name": "pay_name_shouchong_2", "undefined": "首充礼包_30", @@ -4300,33 +4248,7 @@ "n": 980 } ], - "prize": [ - { - "a": "hero", - "t": "5001", - "n": 1 - }, - { - "a": "equip", - "t": "1009", - "n": 1 - }, - { - "a": "equip", - "t": "2009", - "n": 1 - }, - { - "a": "equip", - "t": "3009", - "n": 1 - }, - { - "a": "equip", - "t": "4009", - "n": 1 - } - ], + "prize": [], "firstPayPrize": [], "name": "pay_name_shouchong_3", "undefined": "首充礼包_98", @@ -4385,7 +4307,7 @@ "prize": [ { "a": "item", - "t": "607", + "t": "626", "n": 20 }, { diff --git a/src/json/shouchong.json b/src/json/shouchong.json index 915846b..1af0532 100644 --- a/src/json/shouchong.json +++ b/src/json/shouchong.json @@ -3,18 +3,30 @@ "paynum": 6, "payid":"shouchong_1", "cartoon": { - "hero": 5001 + "hero": 4013 }, "prize": [ [ { "a": "hero", - "t": "5001", + "t": "4013", "n": 1 }, { "a": "attr", - "t": "jinbi", + "t": "rmbmoney", + "n": 120 + } + ], + [ + { + "a": "item", + "t": "4", + "n": 10 + }, + { + "a": "item", + "t": "1", "n": 100000 } ], @@ -22,24 +34,12 @@ { "a": "item", "t": "12", - "n": 200 + "n": 100 }, { "a": "attr", "t": "jinbi", - "n": 200000 - } - ], - [ - { - "a": "item", - "t": "12", - "n": 200 - }, - { - "a": "attr", - "t": "jinbi", - "n": 300000 + "n": 100000 } ] ] @@ -51,6 +51,18 @@ "img": 5001 }, "prize": [ + [ + { + "a": "hero", + "t": "5001", + "n": 1 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 600 + } + ], [ { "a": "equip", @@ -63,18 +75,6 @@ "n": 1 } ], - [ - { - "a": "equip", - "t": "3009", - "n": 1 - }, - { - "a": "item", - "t": "2", - "n": 1000 - } - ], [ { "a": "equip", @@ -82,9 +82,9 @@ "n": 1 }, { - "a": "item", - "t": "2", - "n": 1000 + "a": "equip", + "t": "3009", + "n": 1 } ] ] @@ -93,43 +93,43 @@ "paynum": 98, "payid":"shouchong_3", "cartoon": { - "hero": 5002 + "hero": 5001 }, "prize": [ [ { "a": "hero", - "t": "5002", + "t": "5001", "n": 1 }, + { + "a": "attr", + "t": "rmbmoney", + "n": 1960 + } + ], + [ + { + "a": "item", + "t": "12", + "n": 3000 + }, + { + "a": "item", + "t": "1", + "n": 3000000 + } + ], + [ { "a": "item", "t": "4", - "n": 10 - } - ], - [ - { - "a": "equip", - "t": "1010", - "n": 1 + "n": 50 }, { - "a": "item", - "t": "2", - "n": 2000 - } - ], - [ - { - "a": "equip", - "t": "3010", - "n": 1 - }, - { - "a": "item", - "t": "2", - "n": 2000 + "a": "attr", + "t": "jinbi", + "n": 5000000 } ] ] From db2286509c6af4a5bfa75b71e59a1f0de1d01ec8 Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 15 Dec 2023 20:06:20 +0800 Subject: [PATCH 79/80] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=83=85?= =?UTF-8?q?=E6=8A=A5=E7=89=B9=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/xstask/ApiAllGet.ts | 32 +++++++++++++++++++++----------- src/api_s2c/xstask/ApiGet.ts | 31 ++++++++++++++++++++----------- src/api_s2c/xstask/ApiOpen.ts | 2 +- 3 files changed, 42 insertions(+), 23 deletions(-) diff --git a/src/api_s2c/xstask/ApiAllGet.ts b/src/api_s2c/xstask/ApiAllGet.ts index f41ac3c..d89d696 100644 --- a/src/api_s2c/xstask/ApiAllGet.ts +++ b/src/api_s2c/xstask/ApiAllGet.ts @@ -1,15 +1,17 @@ -import { ApiCall } from "tsrpc"; -import { PlayerFun } from '../../public/player'; -import { XstaskFun } from '../../public/xstask'; -import { ReqAllGet, ResAllGet } from "../../shared/protocols/xstask/PtlAllGet"; -import { HongDianChange } from "../hongdian/fun"; -import { PublicShared } from "../../shared/public/public"; +import {ApiCall} from "tsrpc"; +import {PlayerFun} from '../../public/player'; +import {XstaskFun} from '../../public/xstask'; +import {ReqAllGet, ResAllGet} from "../../shared/protocols/xstask/PtlAllGet"; +import {HongDianChange} from "../hongdian/fun"; +import {PublicShared} from "../../shared/public/public"; +import {TeQuanFun} from "../../public/tequan"; export default async function (call: ApiCall) { const taskList = JSON.parse(JSON.stringify(await XstaskFun.getAllTask(call.uid))); let taskInfo = await XstaskFun.getInfo(call.uid); - let prizeArr:atn[] = [] - for(let task of taskList) { + let tequan = await TeQuanFun.getXsTaskNum(call); + let prizeArr: atn[] = [] + for (let task of taskList) { const taskConf = G.gc.xstask[task?.taskId]; if (!task) continue; if (task.receiveData == undefined) continue; @@ -23,12 +25,12 @@ export default async function (call: ApiCall) { // } continue } - let change: Parameters[1] = { $inc: {} }; + let change: Parameters[1] = {$inc: {}}; change.$inc[`finishNum.${taskConf.colour}`] = 1; // 比对派遣时间，如果小于当日0点，则更新新任务，否则该变领取状态为true - if(task.receiveData.time < PublicShared.getToDayZeroTime()) { + if (task.receiveData.time < PublicShared.getToDayZeroTime()) { // 更新任务 - let newTask = XstaskFun.randomTasks(taskInfo?.lv, 1) + let newTask = XstaskFun.randomTasks(taskInfo?.lv, 1) XstaskFun.updateTask(call.uid, task._id, newTask[0].taskId) } else { // 更新领取状态 @@ -38,6 +40,14 @@ export default async function (call: ApiCall) { XstaskFun.changeInfo(call.uid, change); await PlayerFun.sendPrize(call, taskConf.prize); HongDianChange.sendChangeKey(call.uid, ['xstaskhd', 'huodonghd']); + + if (!tequan) { + prizeArr.push(...taskConf.prize) + } else { + for (let i = 0; i < 3; i++) { + prizeArr.push(...taskConf.prize) + } + } prizeArr.push(...taskConf.prize) } call.succ({ diff --git a/src/api_s2c/xstask/ApiGet.ts b/src/api_s2c/xstask/ApiGet.ts index 62a5b1b..878052d 100644 --- a/src/api_s2c/xstask/ApiGet.ts +++ b/src/api_s2c/xstask/ApiGet.ts @@ -1,9 +1,10 @@ -import { ApiCall } from "tsrpc"; -import { PlayerFun } from '../../public/player'; -import { XstaskFun } from '../../public/xstask'; -import { ReqGet, ResGet } from "../../shared/protocols/xstask/PtlGet"; -import { HongDianChange } from "../hongdian/fun"; -import { PublicShared } from '../../shared/public/public'; +import {ApiCall} from "tsrpc"; +import {PlayerFun} from '../../public/player'; +import {XstaskFun} from '../../public/xstask'; +import {ReqGet, ResGet} from "../../shared/protocols/xstask/PtlGet"; +import {HongDianChange} from "../hongdian/fun"; +import {PublicShared} from '../../shared/public/public'; +import {TeQuanFun} from "../../public/tequan"; export default async function (call: ApiCall) { @@ -23,24 +24,32 @@ export default async function (call: ApiCall) { } } - let change: Parameters[1] = { $inc: {} }; + let change: Parameters[1] = {$inc: {}}; change.$inc[`finishNum.${taskConf.colour}`] = 1; // 比对派遣时间，如果小于当日0点，则更新新任务，否则该变领取状态为true - if(task.receiveData.time < PublicShared.getToDayZeroTime()) { + if (task.receiveData.time < PublicShared.getToDayZeroTime()) { // 更新任务 - let newTask = XstaskFun.randomTasks(taskInfo?.lv, 1) + let newTask = XstaskFun.randomTasks(taskInfo?.lv, 1) XstaskFun.updateTask(call.uid, call.req._id, newTask[0].taskId) } else { // 更新领取状态 XstaskFun.finishTask(call.uid, call.req._id) } // XstaskFun.delTask(call.uid, call.req._id); + let send_prize = []; XstaskFun.changeInfo(call.uid, change); - await PlayerFun.sendPrize(call, taskConf.prize); + if (!await TeQuanFun.getXsTaskNum(call)) { + send_prize = taskConf.prize; + } else { + for (let i = 0; i < 3; i++) { + send_prize = send_prize.concat(taskConf.prize) + } + } + await PlayerFun.sendPrize(call, send_prize); HongDianChange.sendChangeKey(call.uid, ['xstaskhd', 'huodonghd']); call.succ({ taskList: await XstaskFun.getAllTask(call.uid), - prize: taskConf.prize + prize: send_prize }); } \ No newline at end of file diff --git a/src/api_s2c/xstask/ApiOpen.ts b/src/api_s2c/xstask/ApiOpen.ts index 4261a4c..3a65a5d 100644 --- a/src/api_s2c/xstask/ApiOpen.ts +++ b/src/api_s2c/xstask/ApiOpen.ts @@ -36,7 +36,7 @@ export default async function (call: ApiCall) { XstaskFun.delTasks(call.uid, delTask.map(task => task._id)); } - needAddTask += await TeQuanFun.getXsTaskNum(call); + // needAddTask += await TeQuanFun.getXsTaskNum(call); needAddTask && await XstaskFun.addTasks(call.uid, XstaskFun.randomTasks(taskInfo?.lv || changeInfo.lv, needAddTask)); let { _id, uid, type, ...info } = taskInfo || changeInfo as typeof taskInfo; From 070edf1cb54cd9afb0bf5cad928bbd910c50375e Mon Sep 17 00:00:00 2001 From: xcy <871622040@qq.com> Date: Fri, 15 Dec 2023 21:11:31 +0800 Subject: [PATCH 80/80] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BC=99?= =?UTF-8?q?=E4=BC=B4=E6=8B=9B=E5=8B=9F=E7=9A=84=E5=A5=96=E5=8A=B1=E9=A2=86?= =?UTF-8?q?=E5=8F=96=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/huobanzhaomu/ApiRec.ts | 37 +++++++++++++++--------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/src/api_s2c/event/huobanzhaomu/ApiRec.ts b/src/api_s2c/event/huobanzhaomu/ApiRec.ts index 3b8cd45..0c1dfba 100644 --- a/src/api_s2c/event/huobanzhaomu/ApiRec.ts +++ b/src/api_s2c/event/huobanzhaomu/ApiRec.ts @@ -1,27 +1,38 @@ -import { ApiCall } from "tsrpc"; -import { PlayerFun } from '../../../public/player'; -import { ReqRec, ResRec } from "../../../shared/protocols/event/huobanzhaomu/PtlRec"; -import { HongDianChange } from "../../hongdian/fun"; +import {ApiCall} from "tsrpc"; +import {PlayerFun} from '../../../public/player'; +import {ReqRec, ResRec} from "../../../shared/protocols/event/huobanzhaomu/PtlRec"; +import {HongDianChange} from "../../hongdian/fun"; +import {PayFun} from "../../../public/pay"; export default async function (call: ApiCall) { let conf = G.gc.huobanzhaomu[call.req.index]; - if (!conf) return call.error('', { code: -1 }); - if (conf.gudKey && call.conn.gud[conf.gudKey] < conf.total) return call.error('', { code: -2 }); + if (!conf) return call.error('', {code: -1}); + if (conf.gudKey && call.conn.gud[conf.gudKey] < conf.total) return call.error('', {code: -2}); - let db = await G.mongodb.cEvent('huobanzhaomu').findOne({ uid: call.uid, type: 'huobanzhaomu' }); - if (db?.rec.includes(call.req.index)) return call.error('', { code: -3 }); - if (!conf.gudKey && (db?.rec?.length || 0) < G.gc.huobanzhaomu.length - 1) return call.error('', { code: -4 }); + let db = await G.mongodb.cEvent('huobanzhaomu').findOne({uid: call.uid, type: 'huobanzhaomu'}); + if (db?.rec.includes(call.req.index)) return call.error('', {code: -3}); + + if (conf.gudKey == "chaozhiyueka") { + let logs = await PayFun.getPayLog(call.uid, "chaozhiyueka"); + if (!logs || logs.slice(-1)[0].eTime < G.time) { + return call.error('', {code: -4}); + } + } else { + if (!conf.gudKey && (db?.rec?.length || 0) < G.gc.huobanzhaomu.length - 1) { + return call.error('', {code: -4}); + } + } await PlayerFun.sendPrize(call, conf.prize); if (db?.rec?.length + 1 >= G.gc.huobanzhaomu.length) { - G.mongodb.collection('syncBtns').updateOne({ uid: call.uid }, { $set: { 'huobanzhaomu.active': false } }, { upsert: true }); + G.mongodb.collection('syncBtns').updateOne({uid: call.uid}, {$set: {'huobanzhaomu.active': false}}, {upsert: true}); } G.mongodb.cEvent('huobanzhaomu').updateOne( - { uid: call.uid, type: 'huobanzhaomu' }, - { $push: { rec: call.req.index } }, - { upsert: true } + {uid: call.uid, type: 'huobanzhaomu'}, + {$push: {rec: call.req.index}}, + {upsert: true} ); HongDianChange.sendChangeKey(call.uid, ['huobanzhaomuhd'])