diff --git a/oneKeyStartPm2.sh b/oneKeyStartPm2.sh new file mode 100644 index 0000000..8360d35 --- /dev/null +++ b/oneKeyStartPm2.sh @@ -0,0 +1,12 @@ + +git fetch origin dev && git reset --hard origin/dev && git pull + +npm run build_linux + +cp src/config.json dist/ + +pm2 del heijiao_msg_s0 + +cd dist && pm2 start js_pm2.config.js + +pm2 save \ No newline at end of file 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/api_s2c/event/christmas/ApiGame.ts b/src/api_s2c/event/christmas/ApiGame.ts index 07e2400..a475f62 100644 --- a/src/api_s2c/event/christmas/ApiGame.ts +++ b/src/api_s2c/event/christmas/ApiGame.ts @@ -1,7 +1,35 @@ import { ApiCall } from "tsrpc"; import { ReqGame, ResGame } from "../../../shared/protocols/event/christmas/PtlGame"; +import { HongDianChange } from "../../hongdian/fun"; +import { Christmasfun } from "./fun"; +import {PlayerFun} from "../../../public/player"; + export default async function (call: ApiCall) { - // TODO - call.error('API Not Implemented'); + 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]; + + 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 + _mydata["gamenum"] += 1 + _setData["val"] = _mydata.val + _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); + 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/ApiLiBao.ts b/src/api_s2c/event/christmas/ApiLiBao.ts index a949ded..ad070db 100644 --- a/src/api_s2c/event/christmas/ApiLiBao.ts +++ b/src/api_s2c/event/christmas/ApiLiBao.ts @@ -1,7 +1,47 @@ import { ApiCall } from "tsrpc"; import { ReqLiBao, ResLiBao } from "../../../shared/protocols/event/christmas/PtlLiBao"; +import {Christmasfun} from "./fun"; +import {PlayerFun} from "../../../public/player"; +import {HongDianChange} from "../../hongdian/fun"; export default async function (call: ApiCall) { - // TODO - call.error('API Not Implemented'); + let initCon = await Christmasfun.getCon(call) + let lbid = call.req.lbid; + let _con = initCon[call.req.hdid].data.libao[call.req.lbid]; + if (!_con) { + // 礼包id 不存在 + return call.error('', { code: -1, message: globalThis.lng.yangchengmubiao_2 }) + } + if (_con.payid) { + // 判断是否能购买 + return call.error('', { code: -2, message: globalThis.lng.yangchengmubiao_2 }) + } + let _mydata = await Christmasfun.getMyData(call, call.req.hdid) + let _buyNum = _mydata.libao[lbid] || 0 + if (_buyNum >= _con.buynum) { + // 判断是否能购买 + return call.error('', { code: -3, message: globalThis.lng.yangchengmubiao_2 }) + } + 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.basep + + for (let key in _select) { + _prize.push(_con.dlz[parseInt(key)][_select[key]]) + } + + let _setData = {} + _mydata.libao[lbid] = _buyNum + 1 + _setData["libao"] = _mydata.libao + await Christmasfun.setMyData(call.uid, call.req.hdid, { $set: _setData }) + + await PlayerFun.sendPrize(call, _prize); + let changedata = { mydata: _mydata, prize: _prize} + // 推送红点 + HongDianChange.sendChangeKey(call.uid, ['huodonghd']); + call.succ(changedata); } \ No newline at end of file diff --git a/src/api_s2c/event/christmas/ApiOpen.ts b/src/api_s2c/event/christmas/ApiOpen.ts index 28cc25e..7473002 100644 --- a/src/api_s2c/event/christmas/ApiOpen.ts +++ b/src/api_s2c/event/christmas/ApiOpen.ts @@ -1,7 +1,17 @@ import { ApiCall } from "tsrpc"; -import { ReqOpen, ResOpen } from "../../../shared/protocols/event/christmas/PtlOpen"; +import { HuoDongFun } from "../../../public/huodongfun"; +import { ReqOpen, ResOpen } from "../../../shared/protocols/event/yangchengmubiao/PtlOpen"; +import { Christmasfun } from "./fun"; export default async function (call: ApiCall) { - // TODO - call.error('API Not Implemented'); -} \ No newline at end of file + let _hdinfo = await HuoDongFun.getHdidInfo(call, call.req.hdid) + if (!_hdinfo || Object.keys(_hdinfo).length <= 0) { + // 无此活动 + return call.error('', { code: -1, message: globalThis.lng.huodong_open_1 }) + } + + let _mydata = await Christmasfun.getMyData(call, call.req.hdid) + let changedata = { mydata: _mydata, hdinfo: _hdinfo } + call.succ(changedata); +} + diff --git a/src/api_s2c/event/christmas/ApiQianDao.ts b/src/api_s2c/event/christmas/ApiQianDao.ts index afd6929..5eb2830 100644 --- a/src/api_s2c/event/christmas/ApiQianDao.ts +++ b/src/api_s2c/event/christmas/ApiQianDao.ts @@ -1,7 +1,38 @@ import { ApiCall } from "tsrpc"; import { ReqQianDao, ResQianDao } from "../../../shared/protocols/event/christmas/PtlQianDao"; +import {Christmasfun} from "./fun"; +import {PublicShared} from "../../../shared/public/public"; +import {PlayerFun} from "../../../public/player"; +import {HongDianChange} from "../../hongdian/fun"; export default async function (call: ApiCall) { - // TODO - call.error('API Not Implemented'); + let initCon = await Christmasfun.getCon(call) + let _con = initCon[call.req.hdid].data.qiandao; + let _stime = initCon[call.req.hdid].stime + let _diff = PublicShared.getDiff(_stime) + + let _mydata = await Christmasfun.getMyData(call, call.req.hdid) + // 循环判断是否有可以领取的 + let _prize = [] + for(let i = 0; i < _diff; i++) { + if (_mydata.qiandao.includes(i)) continue + _mydata.qiandao.push(i) + _prize = _prize.concat(_con[i]) + } + + if (!_prize){ + // 没有奖励可以领取 + return call.error('', { code: -1, message: globalThis.lng.yangchengmubiao_2 }) + } + + + let _setData = {} + _setData["qiandao"] = _mydata.qiandao + await Christmasfun.setMyData(call.uid, call.req.hdid, { $set: _setData }) + + await PlayerFun.sendPrize(call, _prize); + let changedata = { mydata: _mydata, prize: _prize} + // 推送红点 + HongDianChange.sendChangeKey(call.uid, ['huodonghd']); + call.succ(changedata); } \ No newline at end of file diff --git a/src/api_s2c/event/christmas/ApiSelect.ts b/src/api_s2c/event/christmas/ApiSelect.ts index 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/christmas/ApiZhanLingRec.ts b/src/api_s2c/event/christmas/ApiZhanLingRec.ts index 2905992..42a460f 100644 --- a/src/api_s2c/event/christmas/ApiZhanLingRec.ts +++ b/src/api_s2c/event/christmas/ApiZhanLingRec.ts @@ -1,7 +1,48 @@ import { ApiCall } from "tsrpc"; import { ReqZhanLingRec, ResZhanLingRec } from "../../../shared/protocols/event/christmas/PtlZhanLingRec"; +import {Christmasfun} from "./fun"; +import {PlayerFun} from "../../../public/player"; +import {HongDianChange} from "../../hongdian/fun"; export default async function (call: ApiCall) { - // TODO - call.error('API Not Implemented'); + let initCon = await Christmasfun.getCon(call) + let index = call.req.index; + let _con = initCon[call.req.hdid].data.zhanling[index]; + if (!_con) { + // 礼包id 不存在 + return call.error('', { code: -1, message: globalThis.lng.yangchengmubiao_2 }) + } + let _mydata = await Christmasfun.getMyData(call, call.req.hdid) + if (_mydata.val < _con.val) { + return call.error('', { code: -1, message: globalThis.lng.yangchengmubiao_2 }) + } + let _prize = [] + + if (!_mydata.pt.includes(index)){ + // 如果普通奖励没有领取 + + _prize = _prize.concat(_con.pt) + _mydata.pt.push(index) + } + if (_mydata.pay && !_mydata.gj.includes(index)){ + // 如果普通奖励没有领取 + _prize = _prize.concat(_con.gj) + + _mydata.gj.push(index) + } + if (!_prize) { + // 没有奖励可以领取 + return call.error('', { code: -1, message: globalThis.lng.yangchengmubiao_2 }) + } + let _setData = {} + _setData["gj"] = _mydata.gj + _setData["pt"] = _mydata.pt + await Christmasfun.setMyData(call.uid, call.req.hdid, { $set: _setData }) + + await PlayerFun.sendPrize(call, _prize); + let changedata = { mydata: _mydata, prize: _prize} + // 推送红点 + HongDianChange.sendChangeKey(call.uid, ['huodonghd']); + call.succ(changedata); + } \ No newline at end of file diff --git a/src/api_s2c/event/christmas/fun.ts b/src/api_s2c/event/christmas/fun.ts new file mode 100644 index 0000000..327422c --- /dev/null +++ b/src/api_s2c/event/christmas/fun.ts @@ -0,0 +1,200 @@ +import { strict } from 'assert'; +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 { + /**配置 */ + static async getCon(call: ApiCall) { + let _con: { [id: string]: ReqAddHuoDong } = {} + let _hd = await HuoDongFun.gethdList(call, 8) + for (let index = 0; index < _hd.length; index++) { + const element = _hd[index]; + if (element && element._id) delete element._id + _con[element.hdid] = element + } + return _con + } + /**获取所有符合时间的活动 */ + static async gethdids(call: ApiCall) { + let _hdids = [] + let _hd = await HuoDongFun.gethdList(call, 8) + for (let index = 0; index < _hd.length; index++) { + const element = _hd[index]; + _hdids.push(element.hdid) + } + return _hdids + } + + /**获取我的数据 */ + static async getMyData(call: ApiCall, hdid: number) { + let db: any = await G.mongodb.cEvent(`christmas${hdid}`).findOne({ uid: call.uid, type: `christmas${hdid}`, hdid: hdid }); + if (!db) { + db = await this.initData(call, hdid) + await G.mongodb.cEvent(`christmas${hdid}`).updateOne( + { uid: call.uid, type: `christmas${hdid}`, hdid: hdid }, + { $set: db }, + { upsert: true } + ) + } + let { _id, ..._myData } = db + if (!PublicShared.chkSameDate(_myData.refresh, G.time)) { + // 刷新每日任务 + _myData = await this.refreTask(call, _myData, hdid) + + } + return _myData + } + + /**初始数据 */ + static async initData(call: ApiCall, hdid: number) { + let _initCon = await this.getCon(call) + let _con = _initCon[hdid] + let _r: christmas = { + type: `christmas${hdid}`, + uid: call.uid, + hdid: hdid, + taskval: await this.getTaskVal(call, hdid), + taskfinish: [], + refresh: G.time, + gamenum: 0, + pt: [], + gj: [], + pay: false, + select:{}, + val: 0, + qiandao: [], + libao:{} + } + return _r + } + + /**设置数据 */ + static async setMyData(uid: string, hdid: number, set: {}) { + await G.mongodb.cEvent(`christmas${hdid}`).updateOne( + { uid: uid, type: `christmas${hdid}`, hdid: hdid }, + set + ) + } + + /**获取所有taskid 及对应的值 */ + static async getTaskVal(call: ApiCall, hdid: number) { + let _initCon = await this.getCon(call) + let _tasks = _initCon[hdid].data.task + let _res = {} + for (let index = 0; index < Object.keys(_tasks).length; index++) { + const element = Object.keys(_tasks)[index]; + let _tmp = _tasks[element] + _tmp["id"] = element + // 每日登录直接完成 + if (element == "1"){ + _res[element] = 1 + } + else{ + _res[element] = 0 + } + + + } + return _res + } + + /**刷新每日任务 */ + static async refreTask(call: ApiCall, mydata: christmas, hdid: number) { + let _initCon = await this.getCon(call) + let _con = _initCon[hdid].data.task + if (!_con) return mydata + mydata.taskfinish = [] + mydata.taskval = await this.getTaskVal(call, hdid) + mydata.refresh = G.time + mydata.gamenum = 0 + await this.setMyData(call.uid, hdid, { $set: { refresh: mydata.refresh, taskfinish: mydata.taskfinish, taskval: mydata.taskval, gamenum: mydata.gamenum} }) + 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= { + $inc: {}, + $set: {} + } + let isset = 0 + for (let indextask = 0; indextask < Object.keys(_tasks).length; indextask++) { + const ele = Object.keys(_tasks)[indextask]; + // 具体任务配置 + let _taskCon = _tasks[ele] + if (_taskCon.stype != stype) continue + + let _pval = _taskCon.pval + // 不符合任务要求 + if (!(await chkCall(_taskCon["cond"], chkval, arg))) continue + + // 根据需求改写 + val = await alchangeVal(call, _taskCon, val, arg) + + isset = 1 + if (isinc == 1) { // 累加 + _setData["$inc"][`taskval.${ele}`] = val + } else { + _setData["$set"][`taskval.${ele}`] = val + } + } + + // 设置任务 + if (isset == 1) { + await G.mongodb.collection('event').updateMany( + { uid: call.uid, type: { $regex: "christmas" }, hdid: parseInt(hdid) }, + _setData + ) + } + } + } + + + +} diff --git a/src/api_s2c/event/shiwuleichong/ApiOpen.ts b/src/api_s2c/event/shiwuleichong/ApiOpen.ts index 63aa21d..de01636 100644 --- a/src/api_s2c/event/shiwuleichong/ApiOpen.ts +++ b/src/api_s2c/event/shiwuleichong/ApiOpen.ts @@ -1,41 +1,42 @@ -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 - 1].payid]; + if (!pay || pay.length == 0) { + break } else { - sTime = db.sTime; + // 如果是最后一天奖励 + 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 + } } } - update && G.mongodb.cEvent('15leichong').updateOne({ uid: call.uid, type: '15leichong' }, update, { upsert: true }); - let index = db?.index || 0; - 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).filter((i) => pays[i].length > 0) }); } \ 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/event/zhanling/ApiBuyLv.ts b/src/api_s2c/event/zhanling/ApiBuyLv.ts index f0485da..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 = G.gc.zhanling.lv[change.lv]; + change.exp = data.exp + 1000; G.mongodb.cEvent('zhanling').updateOne( { uid: call.uid, type: 'zhanling' }, diff --git a/src/api_s2c/hongdian/ApiGet.ts b/src/api_s2c/hongdian/ApiGet.ts index 57898d1..ce0c8d4 100644 --- a/src/api_s2c/hongdian/ApiGet.ts +++ b/src/api_s2c/hongdian/ApiGet.ts @@ -11,10 +11,10 @@ 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 {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', diff --git a/src/api_s2c/hongdian/fun.ts b/src/api_s2c/hongdian/fun.ts index 0f482a6..4b58691 100644 --- a/src/api_s2c/hongdian/fun.ts +++ b/src/api_s2c/hongdian/fun.ts @@ -20,6 +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'; export class HongDianFun { /**黑榜争霸红点 */ @@ -689,6 +690,68 @@ export class HuoDongHongDianFun { return _res; } + /**圣诞节活动红点 */ + static async christmasHongDian(call: ApiCall, hdCon: ReqAddHuoDong) { + let _res: hongdianVal = { + show: false, + }; + + let _hdCon = hdCon.data; + let stime = hdCon.stime + let _mydata = await Christmasfun.getMyData(call, hdCon.hdid); + let _tasks = hdCon.data.task; // 所有任务 taskid 为key + + for (let indextask = 0; indextask < Object.keys(_tasks).length; indextask++) { + const elementtask = Object.keys(_tasks)[indextask]; + let _tmp = _tasks[elementtask]; + if (_tmp.pval <= (_mydata.taskval[elementtask] || 0) && !_mydata.taskfinsih.includes(elementtask)) { + // 任务完成且没有领取 + _res.show = true; + return _res; + } + } + + let libaos = _hdCon.libao + for (let indexlibao = 0; indexlibao < Object.keys(libaos).length; indexlibao++) { + const elementlibao = Object.keys(libaos)[indexlibao]; + let _tmp = _tasks[elementlibao]; + if (_tmp.payid) continue + let _buyNum = _mydata.libao[elementlibao] || 0 + if (_buyNum < _tmp.buynum) { + _res.show = true; + return _res; + } + } + let _diff = PublicShared.getDiff(stime) + // 循环判断是否有可以领取的 + for (let i = 0; i < _diff; i++) { + if (_mydata.qiandao.includes(i)) continue + _res.show = true; + return _res; + } + let need = _hdCon.gameneed; + // 判断消耗是否满足 + let meet = await PlayerFun.checkNeedIsMeet(call, need, false); + if (meet.isOk == true) { + _res.show = true; + return _res; + } + let zhanling = _hdCon.zhanling + for (let indexzhanling = 0; indexzhanling < zhanling.length; indexzhanling++) { + if (!_mydata.pt.includes(indexzhanling)) { + _res.show = true; + return _res; + } + if (_mydata.pay && !_mydata.gj.includes(indexzhanling)) { + _res.show = true; + return _res; + } + } + + return _res; + } + + /**养成目标红点 */ static async yangchengmubiaoHongDian(call: ApiCall, hdCon: ReqAddHuoDong) { let _res: hongdianVal = { @@ -814,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 @@ -850,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/api_s2c/pushgift/ApiOpen.ts b/src/api_s2c/pushgift/ApiOpen.ts deleted file mode 100644 index 9f785ce..0000000 --- a/src/api_s2c/pushgift/ApiOpen.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { ApiCall } from "tsrpc"; -import { ReqOpen, ResOpen } from "../../shared/protocols/pushgift/PtlOpen"; - -export default async function (call: ApiCall) { - // TODO - call.error('API Not Implemented'); -} \ No newline at end of file diff --git a/src/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/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/globalListener.ts b/src/globalListener.ts index 1db7530..2c3aa37 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; /**玩家每日首次登陆 */ @@ -138,6 +139,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() { @@ -166,13 +171,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 +208,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/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 5a384b7..5b04b02 100644 --- a/src/localConfig.ts +++ b/src/localConfig.ts @@ -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/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/public/pay.ts b/src/public/pay.ts index cd9014e..43a0e58 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 @@ -270,7 +276,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); } @@ -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}) diff --git a/src/public/taskclass.ts b/src/public/taskclass.ts index 06cc127..5266c85 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) } // 任务数值， 和检测值，看情况需要上层复写 @@ -763,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; + } + } } diff --git a/src/setMongodb.ts b/src/setMongodb.ts index 2e1c47a..a3df1cc 100644 --- a/src/setMongodb.ts +++ b/src/setMongodb.ts @@ -443,13 +443,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; } } @@ -463,7 +472,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'); 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/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/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 218afc9..5c4141b 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,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'; @@ -265,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'; @@ -276,33 +273,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_51, ResOpen as ResOpen_51 } from './shootGame/PtlOpen'; -import { ReqRec as ReqRec_14, ResRec as ResRec_14 } from './shootGame/PtlRec'; +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_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_55, ResOpen as ResOpen_55 } from './tanxian/PtlOpen'; +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'; @@ -318,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'; @@ -329,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'; @@ -337,7 +334,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_59, ResOpen as ResOpen_59 } from './xstask/PtlOpen'; +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'; @@ -643,10 +640,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 +665,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 +681,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 +701,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 +973,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 +1029,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, @@ -1295,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, @@ -1340,20 +1329,20 @@ 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, - res: ResRec_14 + req: ReqRec_13, + res: ResRec_13 }, "shop/Buy": { req: ReqBuy_6, res: ResBuy_6 }, "shop/Open": { - req: ReqOpen_52, - res: ResOpen_52 + req: ReqOpen_51, + res: ResOpen_51 }, "shop/Refresh": { req: ReqRefresh_6, @@ -1368,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, @@ -1392,16 +1381,16 @@ export interface ServiceType { res: ResMyRank }, "slzd/Open": { - req: ReqOpen_54, - res: ResOpen_54 + req: ReqOpen_53, + res: ResOpen_53 }, "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, @@ -1428,8 +1417,8 @@ export interface ServiceType { res: ResGuaJi }, "tanxian/Open": { - req: ReqOpen_55, - res: ResOpen_55 + req: ReqOpen_54, + res: ResOpen_54 }, "tanxian/Receive": { req: ReqReceive_6, @@ -1444,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, @@ -1508,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, @@ -1552,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, @@ -1584,8 +1573,8 @@ export interface ServiceType { res: ResOnekeyReceive }, "xstask/Open": { - req: ReqOpen_59, - res: ResOpen_59 + req: ReqOpen_58, + res: ResOpen_58 }, "xstask/Receive": { req: ReqReceive_7, @@ -1637,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, @@ -2019,81 +2007,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 +2084,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 +2244,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 121, + "id": 120, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2271,7 +2254,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 122, + "id": 121, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2281,7 +2264,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 123, + "id": 122, "name": "gonghui/Change", "type": "api", "conf": { @@ -2291,12 +2274,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 +2289,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 126, + "id": 125, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2316,12 +2299,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 +2314,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 129, + "id": 128, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2341,17 +2324,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 +2344,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 133, + "id": 132, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2371,7 +2354,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 134, + "id": 133, "name": "gonghui/List", "type": "api", "conf": { @@ -2381,7 +2364,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 135, + "id": 134, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2391,7 +2374,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 136, + "id": 135, "name": "gonghui/Open", "type": "api", "conf": { @@ -2401,7 +2384,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 137, + "id": 136, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2411,7 +2394,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 138, + "id": 137, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2421,7 +2404,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 139, + "id": 138, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2431,7 +2414,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 140, + "id": 139, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2441,137 +2424,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 +2562,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 +2580,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 +2613,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 +2731,282 @@ 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, - "name": "msg_s2c/PushGiftChange", - "type": "msg" - }, - { - "id": 239, + "id": 237, "name": "msg_s2c/SendGift", "type": "msg" }, { - "id": 240, + "id": 238, "name": "msg_s2c/ShiwuChange", "type": "msg" }, { - "id": 241, + "id": 239, "name": "msg_s2c/TaskChange", "type": "msg" }, { - "id": 242, + "id": 240, "name": "msg_s2c/Xianshilibao", "type": "msg" }, { - "id": 243, + "id": 241, "name": "pata/Fight", "type": "api" }, { - "id": 244, + "id": 242, "name": "pata/GetPrize", "type": "api" }, { - "id": 245, + "id": 243, "name": "pata/Open", "type": "api" }, { - "id": 246, + "id": 244, "name": "pata/SaoDang", "type": "api" }, { - "id": 247, + "id": 245, "name": "pay/GetList", "type": "api" }, { - "id": 248, + "id": 246, "name": "peijian/GetList", "type": "api" }, { - "id": 249, + "id": 247, "name": "peijian/JingLian", "type": "api" }, { - "id": 250, + "id": 248, "name": "peijian/JinJie", "type": "api" }, { - "id": 251, + "id": 249, "name": "peijian/LvUp", "type": "api" }, { - "id": 252, + "id": 250, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 253, + "id": 251, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 254, + "id": 252, "name": "peijian/Reset", "type": "api" }, { - "id": 255, + "id": 253, "name": "peijian/Rm", "type": "api" }, { - "id": 256, + "id": 254, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3036,32 +3014,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 257, + "id": 255, "name": "peijian/UnLock", "type": "api" }, { - "id": 258, + "id": 256, "name": "peijian/Wear", "type": "api" }, { - "id": 259, + "id": 257, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 260, + "id": 258, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 261, + "id": 259, "name": "peijiancangku/Open", "type": "api" }, { - "id": 262, + "id": 260, "name": "Bingo", "type": "api", "conf": { @@ -3069,142 +3047,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 263, + "id": 261, "name": "FightTest", "type": "api" }, { - "id": 264, + "id": 262, "name": "SyncBtn", "type": "api" }, { - "id": 265, + "id": 263, "name": "Test", "type": "api" }, { - "id": 266, - "name": "pushgift/Open", - "type": "api" - }, - { - "id": 267, + "id": 264, "name": "qjzzd/Fight", "type": "api" }, { - "id": 268, + "id": 265, "name": "qjzzd/Open", "type": "api" }, { - "id": 269, + "id": 266, "name": "rank/Open", "type": "api" }, { - "id": 270, + "id": 267, "name": "shiwu/Concise", "type": "api" }, { - "id": 271, + "id": 268, "name": "shiwu/Extract", "type": "api" }, { - "id": 272, + "id": 269, "name": "shiwu/GetList", "type": "api" }, { - "id": 273, + "id": 270, "name": "shiwu/LvUp", "type": "api" }, { - "id": 274, + "id": 271, "name": "shiwu/Recast", "type": "api" }, { - "id": 275, + "id": 272, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 276, + "id": 273, "name": "shiwu/Wear", "type": "api" }, { - "id": 277, + "id": 274, "name": "shootGame/Open", "type": "api" }, { - "id": 278, + "id": 275, "name": "shootGame/Rec", "type": "api" }, { - "id": 279, + "id": 276, "name": "shop/Buy", "type": "api" }, { - "id": 280, + "id": 277, "name": "shop/Open", "type": "api" }, { - "id": 281, + "id": 278, "name": "shop/Refresh", "type": "api" }, { - "id": 282, + "id": 279, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 283, + "id": 280, "name": "sign/GetPrize", "type": "api" }, { - "id": 284, + "id": 281, "name": "sign/Open", "type": "api" }, { - "id": 285, + "id": 282, "name": "slzd/Aim", "type": "api" }, { - "id": 286, + "id": 283, "name": "slzd/BuyNum", "type": "api" }, { - "id": 287, + "id": 284, "name": "slzd/Fight", "type": "api" }, { - "id": 288, + "id": 285, "name": "slzd/FightLog", "type": "api" }, { - "id": 289, + "id": 286, "name": "slzd/MyRank", "type": "api" }, { - "id": 290, + "id": 287, "name": "slzd/Open", "type": "api", "conf": { @@ -3214,77 +3187,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 291, + "id": 288, "name": "slzd/OpenFort", "type": "api" }, { - "id": 292, + "id": 289, "name": "slzd/Rec", "type": "api" }, { - "id": 293, + "id": 290, "name": "slzd/Refresh", "type": "api" }, { - "id": 294, + "id": 291, "name": "slzd/Slot", "type": "api" }, { - "id": 295, + "id": 292, "name": "tanxian/Event", "type": "api" }, { - "id": 296, + "id": 293, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 297, + "id": 294, "name": "tanxian/Fight", "type": "api" }, { - "id": 298, + "id": 295, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 299, + "id": 296, "name": "tanxian/Open", "type": "api" }, { - "id": 300, + "id": 297, "name": "tanxian/Receive", "type": "api" }, { - "id": 301, + "id": 298, "name": "task/AllFinsh", "type": "api" }, { - "id": 302, + "id": 299, "name": "task/Finsh", "type": "api" }, { - "id": 303, + "id": 300, "name": "task/Open", "type": "api" }, { - "id": 304, + "id": 301, "name": "user/CDKEY", "type": "api" }, { - "id": 305, + "id": 302, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3292,197 +3265,197 @@ export const serviceProto: ServiceProto = { } }, { - "id": 306, + "id": 303, "name": "user/ChangeName", "type": "api" }, { - "id": 307, + "id": 304, "name": "user/Fight", "type": "api" }, { - "id": 308, + "id": 305, "name": "user/GetInfo", "type": "api" }, { - "id": 309, + "id": 306, "name": "user/InfoOpen", "type": "api" }, { - "id": 310, + "id": 307, "name": "user/Login", "type": "api" }, { - "id": 311, + "id": 308, "name": "user/Ping", "type": "api" }, { - "id": 312, + "id": 309, "name": "user/Renown", "type": "api" }, { - "id": 313, + "id": 310, "name": "user/RenownBuy", "type": "api" }, { - "id": 314, + "id": 311, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 315, + "id": 312, "name": "user/RenownOpen", "type": "api" }, { - "id": 316, + "id": 313, "name": "user/Tujian", "type": "api" }, { - "id": 317, + "id": 314, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 318, + "id": 315, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 319, + "id": 316, "name": "weixiuchang/Open", "type": "api" }, { - "id": 320, + "id": 317, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 321, + "id": 318, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 322, + "id": 319, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 323, + "id": 320, "name": "wzry/BaoMing", "type": "api" }, { - "id": 324, + "id": 321, "name": "wzry/catFightLog", "type": "api" }, { - "id": 325, + "id": 322, "name": "wzry/CatGroup", "type": "api" }, { - "id": 326, + "id": 323, "name": "wzry/DldFight", "type": "api" }, { - "id": 327, + "id": 324, "name": "wzry/DldRefre", "type": "api" }, { - "id": 328, + "id": 325, "name": "wzry/JingCai", "type": "api" }, { - "id": 329, + "id": 326, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 330, + "id": 327, "name": "wzry/Open", "type": "api" }, { - "id": 331, + "id": 328, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 332, + "id": 329, "name": "wzry/Wzzd", "type": "api" }, { - "id": 333, + "id": 330, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 334, + "id": 331, "name": "xstask/AllGet", "type": "api" }, { - "id": 335, + "id": 332, "name": "xstask/Get", "type": "api" }, { - "id": 336, + "id": 333, "name": "xstask/LvUp", "type": "api" }, { - "id": 337, + "id": 334, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 338, + "id": 335, "name": "xstask/Open", "type": "api" }, { - "id": 339, + "id": 336, "name": "xstask/Receive", "type": "api" }, { - "id": 340, + "id": 337, "name": "xstask/Refresh", "type": "api" }, { - "id": 341, + "id": 338, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 342, + "id": 339, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 343, + "id": 340, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 344, + "id": 341, "name": "zhanqianbushu/Up", "type": "api" } @@ -10264,60 +10237,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" } } } @@ -17951,10 +17882,6 @@ export const serviceProto: ServiceProto = { } } }, - "msg_s2c/MsgPushGiftChange/MsgPushGiftChange": { - "type": "Literal", - "literal": 1 - }, "msg_s2c/MsgSendGift/MsgSendGift": { "type": "Interface", "indexSignature": { @@ -18929,6 +18856,13 @@ export const serviceProto: ServiceProto = { "type": "Literal", "literal": "G123Gift" } + }, + { + "id": 18, + "type": { + "type": "Literal", + "literal": "christmas" + } } ] }, @@ -19029,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" },