diff --git a/src/api_s2c/event/christmas/ApiSelect.ts b/src/api_s2c/event/christmas/ApiSelect.ts index 6680a9a..612618c 100644 --- a/src/api_s2c/event/christmas/ApiSelect.ts +++ b/src/api_s2c/event/christmas/ApiSelect.ts @@ -1,39 +1,7 @@ import { ApiCall } from "tsrpc"; import { ReqSelect, ResSelect } from "../../../shared/protocols/event/christmas/PtlSelect"; -import {Christmasfun} from "./fun"; -import {HongDianChange} from "../../hongdian/fun"; export default async function (call: ApiCall) { - let initCon = await Christmasfun.getCon(call) - let index = call.req.index; - let pid = call.req.pid; - let lbid = call.req.lbid; - let _con = initCon[call.req.hdid].data.libao[lbid]; - if (!_con) { - // 礼包id 不存在 - return call.error('', { code: -1, message: globalThis.lng.yangchengmubiao_2 }) - } - if (index >= _con.dlz.length){ - // 礼包id 不存在 - return call.error('', { code: -2, message: globalThis.lng.yangchengmubiao_2 }) - } - if (index >= _con.dlz.length){ - // 礼包id 不存在 - return call.error('', { code: -3, message: globalThis.lng.yangchengmubiao_2 }) - } - if (!_con.dlz[index][pid]){ - // 礼包id 不存在 - return call.error('', { code: -4, message: globalThis.lng.yangchengmubiao_2 }) - } - let _mydata = await Christmasfun.getMyData(call, call.req.hdid) - let lb_select = _mydata.select[lbid] || {} - lb_select[index.toString()] = pid - _mydata.select[lbid] = lb_select - let _setData = {} - _setData["select"] = _mydata.select - await Christmasfun.setMyData(call.uid, call.req.hdid, { $set: _setData }) - let changedata = { mydata: _mydata} - // 推送红点 - HongDianChange.sendChangeKey(call.uid, ['huodonghd']); - call.succ(changedata); + // TODO + call.error('API Not Implemented'); } \ No newline at end of file diff --git a/src/api_s2c/event/christmas/ApiTaskRec.ts b/src/api_s2c/event/christmas/ApiTaskRec.ts index 1227d85..389e095 100644 --- a/src/api_s2c/event/christmas/ApiTaskRec.ts +++ b/src/api_s2c/event/christmas/ApiTaskRec.ts @@ -1,37 +1,7 @@ import { ApiCall } from "tsrpc"; import { ReqTaskRec, ResTaskRec } from "../../../shared/protocols/event/christmas/PtlTaskRec"; -import {Christmasfun} from "./fun"; -import {HongDianChange} from "../../hongdian/fun"; -import {PlayerFun} from "../../../public/player"; export default async function (call: ApiCall) { - let initCon = await Christmasfun.getCon(call) - let taskid = call.req.taskid; - let _con = initCon[call.req.hdid].data.task[taskid]; - if (!_con) { - // 任务id 不存在 - return call.error('', { code: -1, message: globalThis.lng.yangchengmubiao_2 }) - } - let _mydata = await Christmasfun.getMyData(call, call.req.hdid) - if (_mydata.taskval[taskid] < _con.pval) { - // 任务未完成 - return call.error('', { code: -2, message: globalThis.lng.yangchengmubiao_3 }) - } - if (_mydata.taskfinish.includes(taskid)) { - // 任务已领取 - return call.error('', { code: -3, message: globalThis.lng.yangchengmubiao_4 }) - } - _mydata.taskfinish.push(taskid) - - let _setData = {} - _setData["taskfinish"] = _mydata.taskfinish - await Christmasfun.setMyData(call.uid, call.req.hdid, { $set: _setData }) - let _prize = _con.prize - await PlayerFun.sendPrize(call, _prize); - let changedata = { mydata: _mydata, prize: _prize} - // 推送红点 - HongDianChange.sendChangeKey(call.uid, ['huodonghd']); - call.succ(changedata); - - + // TODO + call.error('API Not Implemented'); } \ No newline at end of file diff --git a/src/api_s2c/event/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/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/api_s2c/kuangdong/ApiYanShi.ts b/src/api_s2c/kuangdong/ApiYanShi.ts index f80c861..b19effd 100644 --- a/src/api_s2c/kuangdong/ApiYanShi.ts +++ b/src/api_s2c/kuangdong/ApiYanShi.ts @@ -1,24 +1,24 @@ -import { ApiCall } from "tsrpc"; -import { KuangDongfun } from "../../public/kuangdong"; -import { PlayerFun } from "../../public/player"; -import { ReqYanShi, ResYanShi } from "../../shared/protocols/kuangdong/PtlYanShi"; +import {ApiCall} from "tsrpc"; +import {KuangDongfun} from "../../public/kuangdong"; +import {PlayerFun} from "../../public/player"; +import {ReqYanShi, ResYanShi} from "../../shared/protocols/kuangdong/PtlYanShi"; export default async function (call: ApiCall) { let hdid = call.req.hdid let kdInfo = await KuangDongfun.getKaiCaiInfo(hdid) if (!kdInfo) { - return call.error('', { code: -1, message: globalThis.lng.kudangdong_1 }) + return call.error('', {code: -1, message: globalThis.lng.kudangdong_1}) } // 不是自己占领的 if (kdInfo.uid != call.uid) { - return call.error('', { code: -2, message: globalThis.lng.kudangdong_8 }) + return call.error('', {code: -2, message: globalThis.lng.kudangdong_8}) } // 已经延时 if (kdInfo.yanshi != 0) { - return call.error('', { code: -2, message: globalThis.lng.kudangdong_10 }) + return call.error('', {code: -2, message: globalThis.lng.kudangdong_10}) } // @ts-ignore @@ -30,7 +30,13 @@ export default async function (call: ApiCall) { _need && await PlayerFun.cutNeed(call, _need); kdInfo.yanshi = 8 * 3600 - await KuangDongfun.setminingZhanLing(call.uid, hdid, { $set: { yanshi: kdInfo.yanshi } }) + + // 如果调用这个方法，会upsert，在没有查到数据的情况下， + // 会插入空数据，全服玩家的查询列表接口都会报错 + // await KuangDongfun.setminingZhanLing(call.uid, hdid, { $set: { yanshi: kdInfo.yanshi } }) + await G.mongodb.collection('kuangdong').updateOne({uid: call.uid, hdid: hdid}, + {$set: {yanshi: kdInfo.yanshi}}); + kdInfo._id = kdInfo._id.toString() let changeData = { kdinfo: kdInfo diff --git a/src/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/public/kuangdong.ts b/src/public/kuangdong.ts index fe73d02..942759d 100644 --- a/src/public/kuangdong.ts +++ b/src/public/kuangdong.ts @@ -81,7 +81,6 @@ export class KuangDongfun { upsert: true } ); - } /**获取所有矿洞信息 */ diff --git a/src/public/taskclass.ts b/src/public/taskclass.ts index 6924efa..06cc127 100644 --- a/src/public/taskclass.ts +++ b/src/public/taskclass.ts @@ -1,6 +1,5 @@ import {ApiCall} from "tsrpc" import {YangChengMuBiaofun} from "../api_s2c/event/yangchengmubiao/fun" -import {Christmasfun} from "../api_s2c/event/christmas/fun" // import { YangChengMuBiaofun } from "../api_s2c/event/yangchengmubiao/fun" import {Wjjl} from "../module/collection_wjjl" import {PublicShared} from "../shared/public/public" @@ -74,8 +73,6 @@ export module manager { TaskFun.setTaskVal(call, this.stype, val, this.chkCall, chkval, this.isinc, this.alchangeVal, arg) // 养成目标任务计数 YangChengMuBiaofun.setTaskVal(call, this.stype, val, this.chkCall, chkval, this.isinc, this.alchangeVal, arg) - // 圣诞任务计数 - Christmasfun.setTaskVal(call, this.stype, val, this.chkCall, chkval, this.isinc, this.alchangeVal, arg) } // 任务数值， 和检测值，看情况需要上层复写 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 diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 42ce9dd..48d5f56 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -73,29 +73,29 @@ 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_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'; 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'; @@ -156,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'; @@ -170,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'; @@ -185,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'; @@ -276,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'; @@ -290,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'; @@ -298,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'; @@ -337,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'; @@ -642,14 +642,14 @@ 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 }, - "event/shouchong/Receive": { - req: ReqReceive_2, - res: ResReceive_2 - }, "event/xianshizhaomu/Buy": { req: ReqBuy_1, res: ResBuy_1 @@ -667,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, @@ -683,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, @@ -703,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, @@ -731,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, @@ -975,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, @@ -1031,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, @@ -1091,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, @@ -1103,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, @@ -1339,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, @@ -1395,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, @@ -1427,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, @@ -1583,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, @@ -2014,12 +2014,12 @@ export const serviceProto: ServiceProto = { }, { "id": 74, - "name": "event/shouchong/Open", + "name": "event/shiwuleichong/Rec", "type": "api" }, { "id": 75, - "name": "event/shouchong/Receive", + "name": "event/shouchong/Open", "type": "api" }, { @@ -10254,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" } } } @@ -10279,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" } } }