diff --git a/src/api_s2c/event/yuandan/ApiDMRec.ts b/src/api_s2c/event/yuandan/ApiDMRec.ts new file mode 100644 index 0000000..693d595 --- /dev/null +++ b/src/api_s2c/event/yuandan/ApiDMRec.ts @@ -0,0 +1,35 @@ +import {ApiCall} from "tsrpc"; +import {ReqDMRec, ResDMRec} from "../../../shared/protocols/event/yuandan/PtlDMRec"; +import {HuoDongFun} from "../../../public/huodongfun"; +import {PlayerFun} from "../../../public/player"; +import {HongDianChange} from "../../hongdian/fun"; +import {PublicShared} from "../../../shared/public/public"; + +export default async function (call: ApiCall) { + // 查询活动是否存在 + let _hd = (await HuoDongFun.gethdList(call, 14))[0] + if (!_hd) return call.errorCode(-1) + + // 扣除免费次数或相应货币 + let data = await G.mongodb.cEvent(`yuandan${_hd.hdid}`).findOne({uid: call.uid, type: `yuandan${_hd.hdid}`}) + let rec = data?.gameNum + + if (rec && rec >= _hd.data?.gamefree) { + await PlayerFun.checkNeedIsMeet(call, _hd.data.gameneed); + await PlayerFun.cutNeed(call, _hd.data.gameneed); + } + + let prize = [] + if (call.req.id) { + prize = PublicShared.randomDropGroup('1', 1, {'1': _hd.data.game}); + await PlayerFun.sendPrize(call, prize); + } + + await G.mongodb.cEvent(`yuandan${_hd.hdid}`).updateOne({uid: call.uid, type: `yuandan${_hd.hdid}`}, { + $inc: {[`gameNum`]: 1}, + }, {upsert: true}) + + call.succ({prize}) + + HongDianChange.sendChangeKey(call.uid, ['yuandan']); +} diff --git a/src/api_s2c/event/yuandan/ApiDZRec.ts b/src/api_s2c/event/yuandan/ApiDZRec.ts new file mode 100644 index 0000000..a2dd1b8 --- /dev/null +++ b/src/api_s2c/event/yuandan/ApiDZRec.ts @@ -0,0 +1,36 @@ +import {ApiCall} from "tsrpc"; +import {ReqDZRec, ResDZRec} from "../../../shared/protocols/event/yuandan/PtlDZRec"; +import {HuoDongFun} from "../../../public/huodongfun"; +import {PlayerFun} from "../../../public/player"; +import {HongDianChange} from "../../hongdian/fun"; + +export default async function (call: ApiCall) { + // 查询活动是否有当前领奖的免费选项 + let _hd = (await HuoDongFun.gethdList(call, 14))[0] + let gift = _hd?.data?.gift?.find(i => i.free && i.id == call.req.id) + if (!gift) return call.errorCode(-1) + + // 超出限购次数 + let data = await G.mongodb.cEvent(`yuandan${_hd.hdid}`).findOne({uid: call.uid, type: `yuandan${_hd.hdid}`}) + let rec = data?.gift?.[call.req.id] + if (rec && rec >= gift.buynum) return call.errorCode(-2) + + // 奖励不符合，严格判断 + let dlzList = R.flatten(gift.dlz.map(i => R.values(i))) + call.req.dlz.map(i => { + let item = dlzList.find(v => i.a == v.a && i.t == v.t && i.n == v.n) + if (!item) call.errorCode(-4) + }) + + let prize = [...gift.prize, ...call.req.dlz] + + await PlayerFun.sendPrize(call, prize); + + await G.mongodb.cEvent(`yuandan${_hd.hdid}`).updateOne({uid: call.uid, type: `yuandan${_hd.hdid}`}, { + $set: {[`gift.${gift.id}`]: prize}, + }, {upsert: true}) + + call.succ({[gift.id]: prize}) + + HongDianChange.sendChangeKey(call.uid, ['yuandan']); +} diff --git a/src/api_s2c/event/yuandan/ApiExchange.ts b/src/api_s2c/event/yuandan/ApiExchange.ts new file mode 100644 index 0000000..72bbe41 --- /dev/null +++ b/src/api_s2c/event/yuandan/ApiExchange.ts @@ -0,0 +1,29 @@ +import {ApiCall} from "tsrpc"; +import {ReqExchange, ResExchange} from "../../../shared/protocols/event/yuandan/PtlExchange"; +import {HuoDongFun} from "../../../public/huodongfun"; +import {PlayerFun} from "../../../public/player"; +import {HongDianChange} from "../../hongdian/fun"; + +export default async function (call: ApiCall) { + // 礼包不存在 + let _hd = (await HuoDongFun.gethdList(call, 14))[0] + let gift = _hd?.data?.duihuan?.find(i => i.id == call.req.id) + if (!gift) return call.errorCode(-1) + + // 超出限购次数 + let data = await G.mongodb.cEvent(`yuandan${_hd.hdid}`).findOne({uid: call.uid, type: `yuandan${_hd.hdid}`}) + let rec = data?.exchange?.[call.req.id] + if (rec && rec >= gift?.buyNum) return call.errorCode(-2) + + await PlayerFun.checkNeedIsMeet(call, gift.need); + await PlayerFun.cutNeed(call, gift.need) + await PlayerFun.sendPrize(call, gift.prize); + + await G.mongodb.cEvent(`yuandan${_hd.hdid}`).updateOne({uid: call.uid, type: `yuandan${_hd.hdid}`}, { + $inc: {[`exchange.${gift.id}`]: 1}, + }, {upsert: true}) + + call.succ({}) + + HongDianChange.sendChangeKey(call.uid, ['yuandan']); +} diff --git a/src/api_s2c/event/yuandan/ApiOpen.ts b/src/api_s2c/event/yuandan/ApiOpen.ts new file mode 100644 index 0000000..d077d62 --- /dev/null +++ b/src/api_s2c/event/yuandan/ApiOpen.ts @@ -0,0 +1,16 @@ +import {ApiCall} from "tsrpc"; +import {ReqOpen, ResOpen} from "../../../shared/protocols/event/yuandan/PtlOpen"; +import {HuoDongFun} from "../../../public/huodongfun"; +import {PayFun} from "../../../public/pay"; +import {Yuandanfun} from "./fun"; + +export default async function (call: ApiCall) { + let _hd = await Yuandanfun.getCon(call) + + let payIds = _hd.data.gift.filter(i => i.payid).map(i => i.payid) + + call.succ({ + data: await Yuandanfun.getData(call, _hd.hdid), + payLog: await PayFun.getPayLogs(call.uid, payIds) + }) +} \ No newline at end of file diff --git a/src/api_s2c/event/yuandan/ApiTaskRec.ts b/src/api_s2c/event/yuandan/ApiTaskRec.ts new file mode 100644 index 0000000..04e95eb --- /dev/null +++ b/src/api_s2c/event/yuandan/ApiTaskRec.ts @@ -0,0 +1,37 @@ +import { ApiCall } from "tsrpc"; +import { ReqTaskRec, ResTaskRec } from "../../../shared/protocols/event/yuandan/PtlTaskRec"; +import {Yuandanfun, Yuandanfun as Christmasfun} from "./fun"; +import {HongDianChange} from "../../hongdian/fun"; +import {PlayerFun} from "../../../public/player"; + +export default async function (call: ApiCall) { + let _hd = await Christmasfun.getCon(call) + let taskid = call.req.taskid; + let _con = _hd.data.task[taskid]; + if (!_con) { + // 任务id 不存在 + return call.error('', { code: -1, message: globalThis.lng.yangchengmubiao_2 }) + } + let _mydata = await Yuandanfun.getData(call, _hd.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 Yuandanfun.setData(call.uid, _hd.hdid, { $set: _setData }) + let _prize = _con.prize + + await PlayerFun.sendPrize(call, _prize); + let changedata = { data: _mydata, prize: _prize} + // 推送红点 + HongDianChange.sendChangeKey(call.uid, ['huodonghd']); + call.succ(changedata); + + +} \ No newline at end of file diff --git a/src/api_s2c/event/yuandan/ApiZLRec.ts b/src/api_s2c/event/yuandan/ApiZLRec.ts new file mode 100644 index 0000000..4b1340a --- /dev/null +++ b/src/api_s2c/event/yuandan/ApiZLRec.ts @@ -0,0 +1,44 @@ +import {ApiCall} from "tsrpc"; +import {ReqZLRec, ResZLRec} from "../../../shared/protocols/event/yuandan/PtlZLRec"; +import {HuoDongFun} from "../../../public/huodongfun"; +import {PlayerFun} from "../../../public/player"; +import {HongDianChange} from "../../hongdian/fun"; +import {Yuandanfun} from "./fun"; +import {PublicShared} from "../../../shared/public/public"; + +export default async function (call: ApiCall) { + let _hd = await Yuandanfun.getCon(call) + if (!_hd) return call.errorCode(-1) + + // 查询是否存在当前传入id的礼品 + let gift = _hd?.data?.qiandao?.[call.req.id] + if (!gift) return call.errorCode(-2) + + // 奖励已领取 + let data = await G.mongodb.cEvent(`yuandan${_hd.hdid}`).findOne({uid: call.uid, type: `yuandan${_hd.hdid}`}) + let rec = data?.qiandao?.[call.req.id] + if (rec) return call.errorCode(-3) + + if (data && data.qiandaoTime && PublicShared.chkSameDate(data.qiandaoTime, G.time)) { + return call.errorCode(-4) + } + + // 奖励不符合，严格判断 + let dlzList = R.flatten(gift.dlz.map(i => R.values(i))) + call.req.dlz.map(i => { + let item = dlzList.find(v => i.a == v.a && i.t == v.t && i.n == v.n) + if (!item) call.errorCode(-5) + }) + + let prize = [...gift.prize, ...call.req.dlz] + + await PlayerFun.sendPrize(call, prize); + + await G.mongodb.cEvent(`yuandan${_hd.hdid}`).updateOne({uid: call.uid, type: `yuandan${_hd.hdid}`}, { + $set: {[`qiandao.${call.req.id}`]: prize, qiandaoTime: G.time}, + }, {upsert: true}) + + call.succ({[call.req.id]: prize}) + + HongDianChange.sendChangeKey(call.uid, ['yuandan']); +} diff --git a/src/api_s2c/event/yuandan/fun.ts b/src/api_s2c/event/yuandan/fun.ts new file mode 100644 index 0000000..785049d --- /dev/null +++ b/src/api_s2c/event/yuandan/fun.ts @@ -0,0 +1,116 @@ +import {ApiCall} from 'tsrpc'; +import {HuoDongFun} from '../../../public/huodongfun'; +import {christmas} from '../../../shared/protocols/event/christmas/PtlOpen'; +import {PublicShared} from '../../../shared/public/public'; +import {PayFun} from "../../../public/pay"; + +export class Yuandanfun { + /**配置 */ + static async getCon(call: ApiCall) { + return (await HuoDongFun.gethdList(call, 14))[0] + } + + /**获取我的数据 */ + static async getData(call: ApiCall, hdid: number) { + + let data = await G.mongodb.cEvent(`yuandan${hdid}`).findOne({uid: call.uid, type: `yuandan${hdid}`}) + + if (!data || !data.refreshTime || !PublicShared.chkSameDate(data.refreshTime, G.time)) { + // 刷新每日任务 + data = (await G.mongodb.cEvent(`yuandan${hdid}`).findOneAndUpdate({uid: call.uid, type: `yuandan${hdid}`}, { + $set: { + gameNum: 0, + gift: {}, + exchange: {}, + taskfinish: [], + taskval: await this.getTaskVal(call), + qiandaoTime: data?.qiandaoTime || 0, + refreshTime: G.time + }, + }, {upsert: true, returnDocument: 'after'})).value + this.refreshPayLog(call) + } + return data + } + + static async refreshPayLog(call: ApiCall) { + let _hd = await this.getCon(call) + let payIds = _hd?.data?.gift?.filter(i=>i.payId).map(i=>i.payId) + PayFun.delPayLog(call.uid, ...payIds.map(i => { + return {payId: i, val: []} + })) + } + + /**获取所有taskid 及对应的值 */ + static async getTaskVal(call: ApiCall) { + let _initCon = await this.getCon(call) + let _tasks = _initCon.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 (_tmp.stype == "128") { + _res[element] = 1 + } else { + _res[element] = 0 + } + } + return _res + } + + /**设置数据 */ + static async setData(uid: string, hdid: number, set: {}) { + await G.mongodb.cEvent(`yuandan${hdid}`).updateOne( + {uid: uid, type: `yuandan${hdid}`}, + set + ) + } + + /**设置任务 */ + static async setTaskVal(call: ApiCall, stype: number, val: number, chkCall: Function, chkval: number = 0, isinc: number = 0, alchangeVal: Function, arg) { + // 活动过期，不计数 + let _hd = await this.getCon(call) + if (!_hd) return + + // let _mydata = await Christmasfun.getMyData(call, hdid) + let _tasks = _hd.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').updateOne( + {uid: call.uid, type: `yuandan${_hd.hdid}`}, + _setData + ) + } + } + + +} diff --git a/src/api_s2c/hongdian/fun.ts b/src/api_s2c/hongdian/fun.ts index 51fe4c1..d32ee3e 100644 --- a/src/api_s2c/hongdian/fun.ts +++ b/src/api_s2c/hongdian/fun.ts @@ -348,6 +348,10 @@ export class HuoDongHongDianFun { // 检测 htype 10 破冰活动红点 ishd = await this.pobinglibao(call, element) } + if (element.htype == 14) { + // 检测 htype 10 破冰活动红点 + ishd = await this.yuandan(call, element) + } // 此活动有红点 if (ishd.show) { @@ -362,7 +366,7 @@ export class HuoDongHongDianFun { /**破冰礼包红点 */ static async pobinglibao(call: ApiCall, _hd: ReqAddHuoDong): Promise { - let gift = _hd?.data?.gift?.find(i => i.id == call.req.id) + let gift = _hd?.data?.gift?.find(i => i.free == true && !i.payId) if (!gift) return {show: false} let payLog = await PayFun.getPayLog(call.uid, gift.payId) @@ -376,6 +380,25 @@ export class HuoDongHongDianFun { return {show: true} } + /**元旦活动红点 */ + static async yuandan(call: ApiCall, _hd: ReqAddHuoDong): Promise { + + let gift = _hd?.data?.gift?.find(i => i.free && !i.payId) + + // 取奖励列表，判断是否有可领取奖励 + let data = await G.mongodb.cEvent(`yuandan${_hd.hdid}`).findOne({uid: call.uid, type: `yuandan${_hd.hdid}`}) + + if (gift && !data?.gift?.[gift.id]) return {show: true} + + if (data?.gameNum < _hd.data.gamefree) return {show: true} + + if (!PublicShared.chkSameDate(data?.qiandaoTime || 0, G.time)) { + return {show: true} + } + + return {show: false} + } + /**开服狂欢红点 */ static async kfkhHongDian(call: ApiCall) { let _res: hongdianVal = { diff --git a/src/clusterUtils.ts b/src/clusterUtils.ts index 05b3006..de15e84 100644 --- a/src/clusterUtils.ts +++ b/src/clusterUtils.ts @@ -44,10 +44,10 @@ export function clusterPublish(key: string, data: any) { * 在集群的N个进程中，只运行一次，在业务逻辑中也可使用 */ export function clusterRunOnce(fun) { - console.log(`${process.pid}环境变量pm_id===>${process.env.pm_id}`); + // console.log(`${process.pid}环境变量pm_id===>${process.env.pm_id}`); if (process.env.pm_id == null || process.env.pm_id === '0') { //非pm2启动的，或是pm2下启动的第一个进程 - console.log("run clusterRunOnce1 ===>", process.pid) + // console.log("run clusterRunOnce1 ===>", process.pid) fun(); return; } @@ -56,7 +56,7 @@ export function clusterRunOnce(fun) { if (firstPid == process.pid) { //pm2的其中一个进程 - console.log("run clusterRunOnce2 ===>", process.pid) + // console.log("run clusterRunOnce2 ===>", process.pid) fun(); return; } diff --git a/src/json/attr.json b/src/json/attr.json index d9f5ad4..6c07a87 100644 --- a/src/json/attr.json +++ b/src/json/attr.json @@ -138,5 +138,25 @@ "sicon": "icon_hspj", "describe": "intr_attr_describe_15", "advancedEffects": "" + }, + "weiwang": { + "id": "weiwang", + "name": "intr_attr_name_16", + "undefined": "影响力", + "colour": 4, + "icon": "icon_weiwang", + "sicon": "icon_weiwang", + "describe": "intr_attr_describe_16", + "advancedEffects": "" + }, + "yuandanyouxi": { + "id": "yuandanyouxi", + "name": "intr_attr_name_17", + "undefined": "元旦游戏币", + "colour": 5, + "icon": "icon_hspj", + "sicon": "icon_hspj", + "describe": "intr_attr_describe_17", + "advancedEffects": "ani_xiangzikuang" } } \ No newline at end of file diff --git a/src/json/clsl_com.json5 b/src/json/clsl_com.json5 index 0e36ee7..def4d62 100644 --- a/src/json/clsl_com.json5 +++ b/src/json/clsl_com.json5 @@ -39,9 +39,9 @@ ], //段位奖励 danPrize: [ - { star: [49, 49], prize: [{ a: 'item', t: '605', n:3 },{ a: 'item', t: '29', n:10 },{ a: 'item', t: '38', n:3 },{ a: 'item', t: '40', n:1 }] }, - { star: [39, 48], prize: [{ a: 'item', t: '605', n:2 },{ a: 'item', t: '29', n:5 },{ a: 'item', t: '38', n:2 }] }, - { star: [29, 38], prize: [{ a: 'item', t: '606', n:3 },{ a: 'item', t: '29', n:5 },{ a: 'item', t: '38', n:1 }] }, + { star: [49, 49], prize: [{ a: 'item', t: '605', n:3 },{ a: 'item', t: '29', n:10 },{ a: 'item', t: '631', n:3 },{ a: 'item', t: '40', n:1 }] }, + { star: [39, 48], prize: [{ a: 'item', t: '605', n:2 },{ a: 'item', t: '29', n:5 },{ a: 'item', t: '631', n:2 }] }, + { star: [29, 38], prize: [{ a: 'item', t: '606', n:3 },{ a: 'item', t: '29', n:5 },{ a: 'item', t: '631', n:1 }] }, { star: [21, 28], prize: [{ a: 'item', t: '606', n:2 },{ a: 'item', t: '29', n:5 },{ a: 'item', t: '39', n:1000 }] }, { star: [13, 20], prize: [{ a: 'item', t: '606', n:1 },{ a: 'item', t: '29', n:5 },{ a: 'item', t: '39', n:800 }] }, { star: [7, 12], prize: [{ a: 'item', t: '29', n:10 },{ a: 'item', t: '29', n:5 },{ a: 'item', t: '39', n:600 }] }, diff --git a/src/json/g123item.json b/src/json/g123item.json index 0a5e360..670fbf3 100644 --- a/src/json/g123item.json +++ b/src/json/g123item.json @@ -10669,7 +10669,7 @@ }, "attr^shengdanExp": { "itemId": "attr^shengdanExp", - "name": "圣诞战令经验", + "name": "圣诞积分", "i18nKey": "intr_attr_name_13", "detailI18nKey": "intr_attr_describe_13", "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", @@ -10690,7 +10690,7 @@ }, "attr^shengdanBullet": { "itemId": "attr^shengdanBullet", - "name": "圣诞打靶币", + "name": "圣诞喷漆", "i18nKey": "intr_attr_name_14", "detailI18nKey": "intr_attr_describe_14", "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", @@ -10711,7 +10711,7 @@ }, "attr^jingxuanbi": { "itemId": "attr^jingxuanbi", - "name": "每日精选兑换币", + "name": "黑市票券", "i18nKey": "intr_attr_name_15", "detailI18nKey": "intr_attr_describe_15", "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", @@ -10729,5 +10729,47 @@ "sellMaxCp": 500, "rarity": 4 } + }, + "attr^weiwang": { + "itemId": "attr^weiwang", + "name": "影响力", + "i18nKey": "intr_attr_name_16", + "detailI18nKey": "intr_attr_describe_16", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "attr", + "typeName": "货币", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, + "attr^yuandanyouxi": { + "itemId": "attr^yuandanyouxi", + "name": "新年庆典币", + "i18nKey": "intr_attr_name_17", + "detailI18nKey": "intr_attr_describe_17", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "attr", + "typeName": "货币", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 5 + } } } \ No newline at end of file diff --git a/src/json/huodong.json5 b/src/json/huodong.json5 index 5caa64d..c227a78 100644 --- a/src/json/huodong.json5 +++ b/src/json/huodong.json5 @@ -2892,9 +2892,12 @@ free: true, payId: '', buyNum: 1, - prize: [ - [ {a: 'attr', t: 'rmbmoney', n: 30}], - [ {a: 'attr', t: 'jinbi', n: 50000}, {a: 'item', t: '1', n: 50000} ] + prize: [{a: 'attr', t: 'rmbmoney', n: 30}], + dlz: [ + { + "1":{a: 'attr', t: 'jinbi', n: 50000}, + "2":{a: 'item', t: '1', n: 50000} + } ] }, { @@ -2902,43 +2905,69 @@ free: false, payId: 'zixuanlibao6', buyNum: 1, - prize: [ - [ {a: 'attr', t: 'rmbmoney', n: 60} ], - [ {a: 'item', t: '2', n: 60}, {a: 'item', t: '12', n: 50} ], - [ {a: 'item', t: '27', n: 1500}, {a: 'item', t: '1', n: 100000} ] + prize: [{a: 'attr', t: 'rmbmoney', n: 60}], + dlz: [ + { + "1":{a: 'item', t: '2', n: 60}, + "2":{a: 'item', t: '12', n: 50} + }, + { + "1":{a: 'item', t: '27', n: 1500}, + "2":{a: 'item', t: '1', n: 100000} + } ] }, - { + { need: [], free: false, payId: 'zixuanlibao30', buyNum: 2, - prize: [ - [ {a: 'attr', t: 'rmbmoney', n: 300} ], - [ {a: 'item', t: '2', n: 200}, {a: 'item', t: '12', n: 100} ], - [ {a: 'item', t: '27', n: 7000}, {a: 'item', t: '1', n: 200000} ] + prize: [{a: 'attr', t: 'rmbmoney', n: 300}], + dlz: [ + { + "1":{a: 'item', t: '2', n: 200}, + "2":{a: 'item', t: '12', n: 100} + }, + { + "1":{a: 'item', t: '27', n: 7000}, + "2":{a: 'item', t: '1', n: 200000} + } ] }, - { + { need: [], free: false, payId: 'zixuanlibao68', buyNum: 2, - prize: [ - [ {a: 'attr', t: 'rmbmoney', n: 680} ], - [ {a: 'item', t: '18', n: 100}, {a: 'item', t: '21', n: 200}, {a: 'item', t: '9', n: 1000} ], - [ {a: 'item', t: '27', n: 15000}, {a: 'item', t: '1', n: 300000} ] + prize: [{a: 'attr', t: 'rmbmoney', n: 680}], + dlz: [ + { + "1":{a: 'item', t: '18', n: 100}, + "2":{a: 'item', t: '21', n: 200}, + "3":{a: 'item', t: '9', n: 1000} + }, + { + "1":{a: 'item', t: '27', n: 15000}, + "2":{a: 'item', t: '1', n: 300000} + } ] }, - { + { need: [], free: false, payId: 'zixuanlibao128', buyNum: 2, - prize: [ - [ {a: 'attr', t: 'rmbmoney', n: 1280} ], - [ {a: 'item', t: '18', n: 200}, {a: 'item', t: '9', n: 2000}, {a: 'item', t: '10', n: 200} ], - [ {a: 'item', t: '27', n: 20000}, {a: 'item', t: '1', n: 500000} ] + prize: [{a: 'attr', t: 'rmbmoney', n: 1280}], + dlz: [ + { + "1":{a: 'item', t: '18', n: 200}, + "2":{a: 'item', t: '9', n: 2000}, + "3":{a: 'item', t: '10', n: 200} + }, + { + "1":{a: 'item', t: '27', n: 20000}, + "2":{a: 'item', t: '1', n: 500000} + } ] }, { @@ -2946,10 +2975,17 @@ free: false, payId: 'zixuanlibao328', buyNum: 3, - prize: [ - [ {a: 'attr', t: 'rmbmoney', n: 3280} ], - [ {a: 'item', t: '600', n: 20}, {a: 'item', t: '601', n: 20}, {a: 'item', t: '616', n: 40} ], - [ {a: 'item', t: '27', n: 50000}, {a: 'item', t: '1', n: 700000} ] + prize: [{a: 'attr', t: 'rmbmoney', n: 3280}], + dlz: [ + { + "1":{a: 'item', t: '600', n: 20}, + "2":{a: 'item', t: '601', n: 20}, + "3":{a: 'item', t: '616', n: 40} + }, + { + "1":{a: 'item', t: '27', n: 50000}, + "2":{a: 'item', t: '1', n: 700000} + } ] }, { @@ -2957,10 +2993,17 @@ free: false, payId: 'zixuanlibao648', buyNum: 3, - prize: [ - [ {a: 'attr', t: 'rmbmoney', n: 6480} ], - [ {a: 'item', t: '600', n: 40}, {a: 'item', t: '601', n: 40}, {a: 'item', t: '616', n: 80} ], - [ {a: 'item', t: '27', n: 100000}, {a: 'item', t: '1', n: 1000000} ] + prize: [{a: 'attr', t: 'rmbmoney', n: 6480}], + dlz: [ + { + "1":{a: 'item', t: '600', n: 40}, + "2":{a: 'item', t: '601', n: 40}, + "3":{a: 'item', t: '616', n: 80} + }, + { + "1":{a: 'item', t: '27', n: 100000}, + "2":{a: 'item', t: '1', n: 1000000} + } ] } ] @@ -4283,5 +4326,586 @@ } } } - } + }, + { + "hdid" : 14000, // 唯一活动id 元旦活动 + "htype" : 14, + "stype" : 1400, + "ttype" : 4, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动 + "stime" : 60, + "rtime" : 90, + "etime" : 90, + "name" : "xnhd_tips_1", + "icon" : "icon_xfdj", + "showtime" : "根据玩家注册时间，游戏返回时复写", + "data" : { + //任务 + "task" : { + "1": { + "pval" : 1, + "stype" : "128", + "cond": [], + "prize" : [ + { + "a" : "attr", + "t" : "shengdanExp", + "n" : 100 + }, + { + "a" : "attr", + "t" : "shengdanBullet", + "n" : 2 + }, + { + "a" : "attr", + "t" : "rmbmoney", + "n" : 200 + }, + { + "a" : "item", + "t" : "1", + "n" : 100000 + } + ], + "des" : "intr_cszl_des_1" + }, + "2": { + "pval" : 300, + "stype" : "116", + "cond": [], + "prize" : [ + { + "a" : "attr", + "t" : "shengdanExp", + "n" : 200 + }, + { + "a" : "attr", + "t" : "shengdanBullet", + "n" : 3 + }, + { + "a" : "item", + "t" : "600", + "n" : 5 + }, + { + "a" : "item", + "t" : "1", + "n" : 500000 + } + ], + "des" : "intr_cszl_des_2" + }, + "3": { + "pval" : 1000, + "stype" : "116", + "cond": [], + "prize" : [ + { + "a" : "attr", + "t" : "shengdanExp", + "n" : 300 + }, + { + "a" : "attr", + "t" : "shengdanBullet", + "n" : 5 + }, + { + "a" : "item", + "t" : "600", + "n" : 10 + }, + { + "a" : "item", + "t" : "1", + "n" : 1000000 + } + ], + "des" : "intr_cszl_des_3" + }, + "4": { + "pval" : 2000, + "stype" : "116", + "cond": [], + "prize" : [ + { + "a" : "attr", + "t" : "shengdanExp", + "n" : 150 + }, + { + "a" : "attr", + "t" : "shengdanBullet", + "n" : 2 + }, + { + "a" : "item", + "t" : "6", + "n" : 10 + }, + { + "a" : "item", + "t" : "1", + "n" : 200000 + } + ], + "des" : "intr_cszl_des_4" + }, + "5": { + "pval" : 3, + "stype" : "142", + "cond": [2], + "prize" : [ + { + "a" : "attr", + "t" : "shengdanExp", + "n" : 100 + }, + { + "a" : "attr", + "t" : "shengdanBullet", + "n" : 2 + }, + { + "a" : "item", + "t" : "2", + "n" : 500 + }, + { + "a" : "item", + "t" : "1", + "n" : 200000 + } + ], + "des" : "intr_cszl_des_5" + }, + "6": { + "pval" : 3, + "stype" : "122", + "cond": [], + "prize" : [ + { + "a" : "attr", + "t" : "shengdanExp", + "n" : 200 + }, + { + "a" : "attr", + "t" : "shengdanBullet", + "n" : 2 + }, + { + "a" : "item", + "t" : "12", + "n" : 400 + }, + { + "a" : "item", + "t" : "1", + "n" : 200000 + } + ], + "des" : "intr_cszl_des_6" + }, + "7": { + "pval" : 1, + "stype" : "155", + "cond": [], + "prize" : [ + { + "a" : "attr", + "t" : "shengdanExp", + "n" : 100 + }, + { + "a" : "attr", + "t" : "shengdanBullet", + "n" : 2 + }, + { + "a" : "attr", + "t" : "rmbmoney", + "n" : 200 + }, + { + "a" : "item", + "t" : "1", + "n" : 100000 + } + ], + "des" : "intr_cszl_des_7" + }, + "8": { + "pval" : 1, + "stype" : "127", + "cond": [], + "prize" : [ + { + "a" : "attr", + "t" : "shengdanExp", + "n" : 100 + }, + { + "a" : "attr", + "t" : "shengdanBullet", + "n" : 2 + }, + { + "a" : "item", + "t" : "21", + "n" : 50 + }, + { + "a" : "item", + "t" : "1", + "n" : 100000 + } + ], + "des" : "intr_cszl_des_8" + }, + "9": { + "pval" : 1, + "stype" : "154", + "cond": [], + "prize" : [ + { + "a" : "attr", + "t" : "shengdanExp", + "n" : 100 + }, + { + "a" : "attr", + "t" : "shengdanBullet", + "n" : 2 + }, + { + "a" : "attr", + "t" : "jinbi", + "n" : 100000 + }, + { + "a" : "item", + "t" : "1", + "n" : 100000 + } + ], + "des" : "intr_cszl_des_9" + }, + }, + //玩游戏需要消耗 + "gameneed": [{"a": "attr", "t":"yuandanyouxi", "n": 1}], + //游戏奖品池 + "game": [ + {"a": "item", "t":"1", "n": 10000000, "p": 10}, + {"a": "item", "t":"12", "n": 1000, "p": 20}, + {"a": "item", "t":"2", "n": 2000, "p": 30}, + {"a": "item", "t":"18", "n": 100, "p": 50}, + {"a": "item", "t":"18", "n": 200, "p": 40}, + {"a": "item", "t":"18", "n": 300, "p": 100}, + {"a": "item", "t":"18", "n": 400, "p": 15} + + ], + //免费玩游戏次数 + "gamefree": 3, + //钻石兑换 + "duihuan": [ + {id:1, need: [{a: 'attr', t: 'rmbmoney', n: 1000}], prize: [{a: 'item', t: '610', n: 1},{a: 'item', t: '2', n: 500},{a: 'item', t: '1', n: 1000}], buyNum: 2 }, + {id:2, need: [{a: 'attr', t: 'rmbmoney', n: 2000}], prize: [{a: 'item', t: '610', n: 2},{a: 'item', t: '2', n: 600},{a: 'item', t: '1', n: 550}], buyNum: 1 }, + {id:3, need: [{a: 'attr', t: 'rmbmoney', n: 3000}], prize: [{a: 'item', t: '610', n: 3},{a: 'item', t: '2', n: 700},{a: 'item', t: '1', n: 230}], buyNum: 1 }, + {id:4, need: [{a: 'attr', t: 'rmbmoney', n: 4000}], prize: [{a: 'item', t: '610', n: 4},{a: 'item', t: '2', n: 800},{a: 'item', t: '1', n: 690}], buyNum: 3 }, + {id:5, need: [{a: 'attr', t: 'rmbmoney', n: 5000}], prize: [{a: 'item', t: '610', n: 5},{a: 'item', t: '2', n: 900},{a: 'item', t: '1', n: 3300}], buyNum: 5 }, + {id:6, need: [{a: 'attr', t: 'rmbmoney', n: 6000}], prize: [{a: 'item', t: '610', n: 6},{a: 'item', t: '2', n: 1000},{a: 'item', t: '1', n: 130}], buyNum: 6 } + ], + //活动礼包 + "gift": [ + { + "id": 1, + "free": "true", + "payid": "", + "buynum": 1, + //固定奖励 + "prize": [{"a": "attr", "t":"rmbmoney", "n": 100}], + "des" : "intr_cszl_des_10", + //自选池 + "dlz": [ + { + "1": {"a": "attr", "t":"jinbi", "n": 100000}, + "2": {"a": "item", "t":"1", "n": 50000} + } + ] + }, + { + "id": 2, + "free": "false", + "payid": "xnhd_libao_1", + "buynum": 2, + "prize": [{"a": "attr", "t":"rmbmoney", "n": 120}], + "des" : "intr_cszl_des_11", + "dlz": [ + { + "1": {"a": "item", "t":"2", "n": 400}, + "2": {"a": "item", "t":"12", "n": 200} + }, + { + "1": {"a": "attr", "t":"jinbi", "n": 1000000}, + "2": {"a": "item", "t":"1", "n": 500000} + } + ] + }, + { + "id": 3, + "free": "false", + "payid": "xnhd_libao_2", + "buynum": 2, + "prize": [{"a": "attr", "t":"rmbmoney", "n": 300}], + "des" : "intr_cszl_des_12", + "dlz": [ + { + "1": {"a": "item", "t":"9", "n": 500}, + "2": {"a": "item", "t":"10", "n": 100} + }, + { + "1": {"a": "item", "t":"9", "n": 500}, + "2": {"a": "item", "t":"10", "n": 100} + }, + { + "1": {"a": "item", "t":"9", "n": 500}, + "2": {"a": "item", "t":"10", "n": 100} + } + ] + }, + { + "id": 4, + "free": "false", + "payid": "xnhd_libao_3", + "buynum": 5, + "prize": [{"a": "attr", "t":"rmbmoney", "n": 680}], + "des" : "intr_cszl_des_12", + "dlz": [ + { + "1": {"a": "item", "t":"615", "n": 1}, + "2": {"a": "item", "t":"18", "n": 200} + }, + { + "1": {"a": "item", "t":"615", "n": 1}, + "2": {"a": "item", "t":"18", "n": 200} + }, + { + "1": {"a": "item", "t":"615", "n": 1}, + "2": {"a": "item", "t":"18", "n": 200} + } + ] + }, + { + "id": 5, + "free": "false", + "payid": "xnhd_libao_4", + "buynum": 9, + "prize": [{"a": "attr", "t":"rmbmoney", "n": 1280}], + "des" : "intr_cszl_des_13", + "dlz": [ + { + "1": {"a": "item", "t":"600", "n": 10}, + "2": {"a": "item", "t":"605", "n": 2}, + "3": {"a": "item", "t":"606", "n": 1} + }, + { + "1": {"a": "item", "t":"600", "n": 10}, + "2": {"a": "item", "t":"605", "n": 2}, + "3": {"a": "item", "t":"606", "n": 1} + }, + { + "1": {"a": "item", "t":"1", "n": 5000000}, + "2": {"a": "attr", "t":"jinbi", "n": 10000000} + } + ] + }, + { + "id": 6, + "free": "false", + "payid": "xnhd_libao_5", + "buynum": 9, + "prize": [{"a": "attr", "t":"rmbmoney", "n": 3280}], + "des" : "intr_cszl_des_14", + "dlz": [ + { + "1": {"a": "item", "t":"600", "n": 20}, + "2": {"a": "item", "t":"5002", "n": 10}, + "3": {"a": "item", "t":"5004", "n": 10} + }, + { + "1": {"a": "item", "t":"600", "n": 20}, + "2": {"a": "item", "t":"5002", "n": 10}, + "3": {"a": "item", "t":"5004", "n": 10} + }, + { + "1": {"a": "item", "t":"1", "n": 10000000}, + "2": {"a": "item", "t":"12", "n": 1000}, + "3": {"a": "item", "t":"2", "n": 2000}, + "4": {"a": "item", "t":"18", "n": 500} + } + ] + }, + { + "id": 7, + "free": "false", + "payid": "xnhd_libao_6", + "buynum": 9, + "prize": [{"a": "attr", "t":"rmbmoney", "n": 6480}], + "des" : "intr_cszl_des_14", + "dlz": [ + { + "1": {"a": "item", "t":"600", "n": 30}, + "2": {"a": "item", "t":"5002", "n": 20}, + "3": {"a": "item", "t":"5004", "n": 20} + }, + { + "1": {"a": "item", "t":"600", "n": 30}, + "2": {"a": "item", "t":"5002", "n": 20}, + "3": {"a": "item", "t":"5004", "n": 20} + }, + { + "1": {"a": "item", "t":"605", "n": 4}, + "2": {"a": "item", "t":"606", "n": 2}, + "3": {"a": "item", "t":"18", "n": 1000}, + "4": {"a": "item", "t":"23", "n": 1000000} + } + ] + }, + ], + //签到奖励 + "qiandao": [ + { + "1": { + //固定奖励 + "prize": [{"a": "attr", "t":"rmbmoney", "n": 100}], + "des" : "intr_cszl_des_10", + //自选池 + "dlz": [ + { + "1": {"a": "attr", "t":"jinbi", "n": 100000}, + "2": {"a": "item", "t":"1", "n": 50000} + } + ] + }, + "2": { + "prize": [{"a": "attr", "t":"rmbmoney", "n": 120}], + "des" : "intr_cszl_des_11", + "dlz": [ + { + "1": {"a": "item", "t":"2", "n": 400}, + "2": {"a": "item", "t":"12", "n": 200} + }, + { + "1": {"a": "attr", "t":"jinbi", "n": 1000000}, + "2": {"a": "item", "t":"1", "n": 500000} + } + ] + }, + "3": { + "prize": [{"a": "attr", "t":"rmbmoney", "n": 300}], + "des" : "intr_cszl_des_12", + "dlz": [ + { + "1": {"a": "item", "t":"9", "n": 500}, + "2": {"a": "item", "t":"10", "n": 100} + }, + { + "1": {"a": "item", "t":"9", "n": 500}, + "2": {"a": "item", "t":"10", "n": 100} + }, + { + "1": {"a": "item", "t":"9", "n": 500}, + "2": {"a": "item", "t":"10", "n": 100} + } + ] + }, + "4": { + "prize": [{"a": "attr", "t":"rmbmoney", "n": 680}], + "des" : "intr_cszl_des_12", + "dlz": [ + { + "1": {"a": "item", "t":"615", "n": 1}, + "2": {"a": "item", "t":"18", "n": 200} + }, + { + "1": {"a": "item", "t":"615", "n": 1}, + "2": {"a": "item", "t":"18", "n": 200} + }, + { + "1": {"a": "item", "t":"615", "n": 1}, + "2": {"a": "item", "t":"18", "n": 200} + } + ] + }, + "5": { + "prize": [{"a": "attr", "t":"rmbmoney", "n": 1280}], + "des" : "intr_cszl_des_13", + "dlz": [ + { + "1": {"a": "item", "t":"600", "n": 10}, + "2": {"a": "item", "t":"605", "n": 2}, + "3": {"a": "item", "t":"606", "n": 1} + }, + { + "1": {"a": "item", "t":"600", "n": 10}, + "2": {"a": "item", "t":"605", "n": 2}, + "3": {"a": "item", "t":"606", "n": 1} + }, + { + "1": {"a": "item", "t":"1", "n": 5000000}, + "2": {"a": "attr", "t":"jinbi", "n": 10000000} + } + ] + }, + "6": { + "prize": [{"a": "attr", "t":"rmbmoney", "n": 3280}], + "des" : "intr_cszl_des_14", + "dlz": [ + { + "1": {"a": "item", "t":"600", "n": 20}, + "2": {"a": "item", "t":"5002", "n": 10}, + "3": {"a": "item", "t":"5004", "n": 10} + }, + { + "1": {"a": "item", "t":"600", "n": 20}, + "2": {"a": "item", "t":"5002", "n": 10}, + "3": {"a": "item", "t":"5004", "n": 10} + }, + { + "1": {"a": "item", "t":"1", "n": 10000000}, + "2": {"a": "item", "t":"12", "n": 1000}, + "3": {"a": "item", "t":"2", "n": 2000}, + "4": {"a": "item", "t":"18", "n": 500} + } + ] + }, + "7": { + "prize": [{"a": "attr", "t":"rmbmoney", "n": 6480}], + "des" : "intr_cszl_des_14", + "dlz": [ + { + "1": {"a": "item", "t":"600", "n": 30}, + "2": {"a": "item", "t":"5002", "n": 20}, + "3": {"a": "item", "t":"5004", "n": 20} + }, + { + "1": {"a": "item", "t":"600", "n": 30}, + "2": {"a": "item", "t":"5002", "n": 20}, + "3": {"a": "item", "t":"5004", "n": 20} + }, + { + "1": {"a": "item", "t":"605", "n": 4}, + "2": {"a": "item", "t":"606", "n": 2}, + "3": {"a": "item", "t":"18", "n": 1000}, + "4": {"a": "item", "t":"23", "n": 1000000} + } + ] + } + } + ] + } + } ] \ No newline at end of file diff --git a/src/json/item.json b/src/json/item.json index a5551b3..7c757d5 100644 --- a/src/json/item.json +++ b/src/json/item.json @@ -804,7 +804,7 @@ "40": { "id": 40, "name": "intr_item_name_40", - "undefined": "丛林狩猎霸主级玩家的特殊身份标识", + "undefined": "丛林狩猎霸主级玩家的特殊身份标识，使用后持续7天", "type": 7, "sort": 1, "colour": 5, @@ -1230,6 +1230,16 @@ "a": "item", "t": "4013", "n": 1 + }, + { + "a": "item", + "t": "4002", + "n": 1 + }, + { + "a": "item", + "t": "4012", + "n": 1 } ], "payId": "", @@ -2087,30 +2097,15 @@ "useNeed": [], "usePrize": [], "selecPrize": [ - { - "a": "hero", - "t": "5001", - "n": 1 - }, { "a": "hero", "t": "5002", "n": 1 }, - { - "a": "hero", - "t": "5003", - "n": 1 - }, { "a": "hero", "t": "5004", "n": 1 - }, - { - "a": "hero", - "t": "5005", - "n": 1 } ], "payId": "", @@ -4024,6 +4019,7 @@ "50010": { "id": 50010, "name": "playerheadFrame_name_24", + "undefined": "使用后解锁头像框“披星戴月”", "type": 7, "sort": 1, "colour": 4, diff --git a/src/json/openCond.json b/src/json/openCond.json index 06d9d8c..b97e5f0 100644 --- a/src/json/openCond.json +++ b/src/json/openCond.json @@ -1378,5 +1378,18 @@ "display": { "lv": 15 } + }, + "weiwang": { + "name": "weiwang", + "undefined": "威望", + "and": { + "lv": 15 + }, + "or": {}, + "time": 0, + "tips": "openCond_tips_96", + "display": { + "lv": 15 + } } } \ No newline at end of file diff --git a/src/json/pay.json b/src/json/pay.json index 367e17d..b5ce33f 100644 --- a/src/json/pay.json +++ b/src/json/pay.json @@ -630,7 +630,7 @@ { "a": "item", "t": "1", - "n": 1000000 + "n": 2000000 } ], "firstPayPrize": [], @@ -661,7 +661,7 @@ { "a": "item", "t": "1", - "n": 2000000 + "n": 5000000 } ], "firstPayPrize": [], @@ -764,7 +764,7 @@ { "a": "item", "t": "1", - "n": 12000000 + "n": 30000000 } ], "firstPayPrize": [], @@ -6473,5 +6473,205 @@ "needVip": 0, "front": {}, "currency": "CNY" + }, + "xnhd_libao_1": { + "id": "xnhd_libao_1", + "money": 0.5, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 5 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_xnhd_libao_1", + "undefined": "新年活动_1", + "time": -1, + "buys": 0, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "xnhd_libao_2": { + "id": "xnhd_libao_2", + "money": 1, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 10 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_xnhd_libao_2", + "undefined": "新年活动_2", + "time": -1, + "buys": 0, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "xnhd_libao_3": { + "id": "xnhd_libao_3", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 60 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_xnhd_libao_3", + "undefined": "新年活动_3", + "time": -1, + "buys": 0, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "xnhd_libao_4": { + "id": "xnhd_libao_4", + "money": 18, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 180 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_xnhd_libao_4", + "undefined": "新年活动_4", + "time": -1, + "buys": 0, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "xnhd_libao_5": { + "id": "xnhd_libao_5", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 300 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_xnhd_libao_5", + "undefined": "新年活动_5", + "time": -1, + "buys": 0, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "xnhd_libao_6": { + "id": "xnhd_libao_6", + "money": 68, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 680 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_xnhd_libao_6", + "undefined": "新年活动_6", + "time": -1, + "buys": 0, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "xnhd_libao_7": { + "id": "xnhd_libao_7", + "money": 128, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_xnhd_libao_7", + "undefined": "新年活动_7", + "time": -1, + "buys": 0, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "xnhd_libao_8": { + "id": "xnhd_libao_8", + "money": 198, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1980 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_xnhd_libao_8", + "undefined": "新年活动_8", + "time": -1, + "buys": 0, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "xnhd_libao_9": { + "id": "xnhd_libao_9", + "money": 328, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 3280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_xnhd_libao_9", + "undefined": "新年活动_9", + "time": -1, + "buys": 0, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "xnhd_libao_10": { + "id": "xnhd_libao_10", + "money": 648, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 6480 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_xnhd_libao_10", + "undefined": "新年活动_10", + "time": -1, + "buys": 0, + "needVip": 0, + "front": {}, + "currency": "CNY" } } \ No newline at end of file diff --git a/src/module/collection_event.ts b/src/module/collection_event.ts index 6e47a03..7908bf4 100644 --- a/src/module/collection_event.ts +++ b/src/module/collection_event.ts @@ -23,6 +23,7 @@ import {ResOpen as ResOpenKaifujingsai} from '../shared/protocols/kaifujingsai/P import {ResOpen as ResOpenZhoumolibao} from '../shared/protocols/event/zhoumolibao/PtlOpen'; import {ResOpen as ResOpenPobinglibao} from '../shared/protocols/event/pobinglibao/PtlOpen'; import {ResOpen as ResOpenLeiChongLiBao} from '../shared/protocols/event/leichonglibao/PtlOpen'; +import {event as ResOpenYuandan} from '../shared/protocols/event/yuandan/PtlOpen'; export type eventType = { shouchong: { @@ -57,6 +58,7 @@ export type eventType = { payForDiamond: { [time: number]: number } + } & { [k: `${number}jijin`]: ResOpenYuedujijin; [k: `yangchengmubiao${number}`]: yangchengmubiao; @@ -67,6 +69,7 @@ export type eventType = { [k: `leijichongzhi${number}`]: Omit; [k: `qiridenglu${number}`]: Pick; [k: `leichonglibao${number}`]: ResOpenLeiChongLiBao & { opentime: number }; + [k: `yuandan${number}`]: ResOpenYuandan; }; export type CollectionEvent = { diff --git a/src/public/pay.ts b/src/public/pay.ts index fe7e977..ccac582 100644 --- a/src/public/pay.ts +++ b/src/public/pay.ts @@ -250,6 +250,10 @@ export class PayFun { console.log("Christmasfun.payChristmas Error", e); } + /** + * 如果是自选奖励，payArgs里传入自选项，直接发奖 + * 在check里判断拦截自选项的奖励 + */ if (payArgs && payArgs?.htype && payArgs?.selectList) { let selectPrize = await G.ioredis.get(`pay:${payId}:${player.uid}`); if (selectPrize) { diff --git a/src/public/taskclass.ts b/src/public/taskclass.ts index 07c6635..878a7a2 100644 --- a/src/public/taskclass.ts +++ b/src/public/taskclass.ts @@ -13,6 +13,7 @@ import {weixiuchangType} from "../shared/protocols/weixiuchang/type"; import {FunWeiXiuChang} from "./weixiuchang"; import {JJCFun} from "./jjc"; import {getGud} from "./gud"; +import {Yuandanfun} from "../api_s2c/event/yuandan/fun"; let _classNameFunc = {} /** @@ -76,6 +77,8 @@ export module manager { 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) + // 元旦活动任务计数 + Yuandanfun.setTaskVal(call, this.stype, val, this.chkCall, chkval, this.isinc, this.alchangeVal, arg) } // 任务数值， 和检测值，看情况需要上层复写 diff --git a/src/shared/protocols/event/yuandan/PtlDMRec.ts b/src/shared/protocols/event/yuandan/PtlDMRec.ts new file mode 100644 index 0000000..c77a5e9 --- /dev/null +++ b/src/shared/protocols/event/yuandan/PtlDMRec.ts @@ -0,0 +1,12 @@ +import {prizeType} from "../../type"; + +/** + * 元旦达摩领奖 + */ +export type ReqDMRec = { + id: 1 | 0 +} + +export type ResDMRec = { + prize: prizeType[] +} diff --git a/src/shared/protocols/event/yuandan/PtlDZRec.ts b/src/shared/protocols/event/yuandan/PtlDZRec.ts new file mode 100644 index 0000000..5d38184 --- /dev/null +++ b/src/shared/protocols/event/yuandan/PtlDZRec.ts @@ -0,0 +1,11 @@ +/** + * 元旦定制领奖 + */ +export type ReqDZRec = { + id: string + dlz: { a: string, t: string, n: number }[] +} + +export type ResDZRec = { + [k: string]: any; +} diff --git a/src/shared/protocols/event/yuandan/PtlExchange.ts b/src/shared/protocols/event/yuandan/PtlExchange.ts new file mode 100644 index 0000000..25817f1 --- /dev/null +++ b/src/shared/protocols/event/yuandan/PtlExchange.ts @@ -0,0 +1,11 @@ + +/** + * 元旦兑换领奖 + */ +export type ReqExchange = { + id: string +} + +export type ResExchange = { + +} diff --git a/src/shared/protocols/event/yuandan/PtlOpen.ts b/src/shared/protocols/event/yuandan/PtlOpen.ts new file mode 100644 index 0000000..ce008bd --- /dev/null +++ b/src/shared/protocols/event/yuandan/PtlOpen.ts @@ -0,0 +1,22 @@ +/** + * 元旦 + */ +export type ReqOpen = {} + +export type ResOpen = { + data: any + payLog: any + [k: string]: any; +} + +export type event = { + qiandao: { [k: string]: any }; + gift: { [k: string]: any }; + taskfinish: string[]; + taskval: { [k: string]: any } + exchange: { [k: string]: any } + gameNum: number + refreshTime: number; + qiandaoTime: number; + [k: string]: any; +} diff --git a/src/shared/protocols/event/yuandan/PtlTaskRec.ts b/src/shared/protocols/event/yuandan/PtlTaskRec.ts new file mode 100644 index 0000000..437253b --- /dev/null +++ b/src/shared/protocols/event/yuandan/PtlTaskRec.ts @@ -0,0 +1,10 @@ +/** + * 元旦任务领奖 + */ +export type ReqTaskRec = { + taskid: string +} + +export type ResTaskRec = { + [k: string]: any; +} diff --git a/src/shared/protocols/event/yuandan/PtlZLRec.ts b/src/shared/protocols/event/yuandan/PtlZLRec.ts new file mode 100644 index 0000000..a15b7d7 --- /dev/null +++ b/src/shared/protocols/event/yuandan/PtlZLRec.ts @@ -0,0 +1,12 @@ + +/** + * 元旦赠礼领奖 + */ +export type ReqZLRec = { + id: string, + dlz: { a: string, t: string, n: number }[] +} + +export type ResZLRec = { + [k: string]: any; +} diff --git a/src/shared/protocols/event/zhoumolibao/PtlReceive.ts b/src/shared/protocols/event/zhoumolibao/PtlReceive.ts index 72a0c09..9652cb7 100644 --- a/src/shared/protocols/event/zhoumolibao/PtlReceive.ts +++ b/src/shared/protocols/event/zhoumolibao/PtlReceive.ts @@ -1,10 +1,10 @@ /** * 周末礼包领奖 */ -export interface ReqReceive { +export type ReqReceive = { id: string } -export interface ResReceive { +export type ResReceive = { } diff --git a/src/shared/protocols/hongdian/PtlGet.ts b/src/shared/protocols/hongdian/PtlGet.ts index 67ceb0d..2d661c0 100644 --- a/src/shared/protocols/hongdian/PtlGet.ts +++ b/src/shared/protocols/hongdian/PtlGet.ts @@ -54,7 +54,8 @@ export type hongdianKey = | 'zhoumolibao' | 'pobinglibao' | 'payForDiamond' - | 'leichonglibao'; + | 'leichonglibao' + | 'yuandan'; export type hongdianVal = { show?: boolean; // 看功能需要 diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 9961fc1..d24faef 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -94,32 +94,38 @@ import { ReqRec as ReqRec_8, ResRec as ResRec_8 } from './event/yangchengmubiao/ import { ReqOpen as ReqOpen_26, ResOpen as ResOpen_26 } from './event/yibaichou/PtlOpen'; import { ReqRec as ReqRec_9, ResRec as ResRec_9 } from './event/yibaichou/PtlRec'; import { ReqRecAll, ResRecAll } from './event/yibaichou/PtlRecAll'; -import { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } from './event/yuedujijin/PtlOpen'; +import { ReqDMRec, ResDMRec } from './event/yuandan/PtlDMRec'; +import { ReqDZRec, ResDZRec } from './event/yuandan/PtlDZRec'; +import { ReqExchange, ResExchange } from './event/yuandan/PtlExchange'; +import { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } from './event/yuandan/PtlOpen'; +import { ReqTaskRec as ReqTaskRec_1, ResTaskRec as ResTaskRec_1 } from './event/yuandan/PtlTaskRec'; +import { ReqZLRec, ResZLRec } from './event/yuandan/PtlZLRec'; +import { ReqOpen as ReqOpen_28, ResOpen as ResOpen_28 } from './event/yuedujijin/PtlOpen'; import { ReqRec as ReqRec_10, ResRec as ResRec_10 } from './event/yuedujijin/PtlRec'; import { ReqBuyLv, ResBuyLv } from './event/zhanling/PtlBuyLv'; -import { ReqOpen as ReqOpen_28, ResOpen as ResOpen_28 } from './event/zhanling/PtlOpen'; +import { ReqOpen as ReqOpen_29, ResOpen as ResOpen_29 } 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_29, ResOpen as ResOpen_29 } from './event/zhoulibao/PtlOpen'; -import { ReqOpen as ReqOpen_30, ResOpen as ResOpen_30 } from './event/zhoumolibao/PtlOpen'; +import { ReqOpen as ReqOpen_30, ResOpen as ResOpen_30 } from './event/zhoulibao/PtlOpen'; +import { ReqOpen as ReqOpen_31, ResOpen as ResOpen_31 } from './event/zhoumolibao/PtlOpen'; import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } from './event/zhoumolibao/PtlReceive'; import { ReqBuy as ReqBuy_3, ResBuy as ResBuy_3 } from './event/zixuanlibao/PtlBuy'; -import { ReqOpen as ReqOpen_31, ResOpen as ResOpen_31 } from './event/zixuanlibao/PtlOpen'; +import { ReqOpen as ReqOpen_32, ResOpen as ResOpen_32 } from './event/zixuanlibao/PtlOpen'; import { ReqhdGetList, ReshdGetList } from './eventlist/PtlhdGetList'; import { ReqApply, ResApply } from './friend/PtlApply'; import { ReqDel, ResDel } from './friend/PtlDel'; import { ReqGift, ResGift } from './friend/PtlGift'; import { ReqList, ResList } from './friend/PtlList'; -import { ReqOpen as ReqOpen_32, ResOpen as ResOpen_32 } from './friend/PtlOpen'; +import { ReqOpen as ReqOpen_33, ResOpen as ResOpen_33 } from './friend/PtlOpen'; import { ReqRespond, ResRespond } from './friend/PtlRespond'; import { ReqRmBlackList, ResRmBlackList } from './friend/PtlRmBlackList'; import { ReqSearch, ResSearch } from './friend/PtlSearch'; import { ReqChallenge, ResChallenge } from './ganbutexun/PtlChallenge'; -import { ReqOpen as ReqOpen_33, ResOpen as ResOpen_33 } from './ganbutexun/PtlOpen'; +import { ReqOpen as ReqOpen_34, ResOpen as ResOpen_34 } from './ganbutexun/PtlOpen'; import { ReqFast, ResFast } from './ganhai/PtlFast'; import { ReqFight as ReqFight_1, ResFight as ResFight_1 } from './ganhai/PtlFight'; import { ReqLog, ResLog } from './ganhai/PtlLog'; -import { ReqOpen as ReqOpen_34, ResOpen as ResOpen_34 } from './ganhai/PtlOpen'; +import { ReqOpen as ReqOpen_35, ResOpen as ResOpen_35 } from './ganhai/PtlOpen'; import { ReqRefresh, ResRefresh } from './ganhai/PtlRefresh'; import { ReqRefreshShip, ResRefreshShip } from './ganhai/PtlRefreshShip'; import { ReqSelect as ReqSelect_1, ResSelect as ResSelect_1 } from './ganhai/PtlSelect'; @@ -141,19 +147,19 @@ import { ReqJx, ResJx } from './gonghui/PtlJx'; import { ReqJxOpen, ResJxOpen } from './gonghui/PtlJxOpen'; import { ReqList as ReqList_1, ResList as ResList_1 } from './gonghui/PtlList'; import { ReqManage, ResManage } from './gonghui/PtlManage'; -import { ReqOpen as ReqOpen_35, ResOpen as ResOpen_35 } from './gonghui/PtlOpen'; +import { ReqOpen as ReqOpen_36, ResOpen as ResOpen_36 } from './gonghui/PtlOpen'; import { ReqTanHe, ResTanHe } from './gonghui/PtlTanHe'; import { ReqTaskOpen, ResTaskOpen } from './gonghui/PtlTaskOpen'; import { ReqTaskReceive, ResTaskReceive } from './gonghui/PtlTaskReceive'; import { ReqUpWz, ResUpWz } from './gonghui/PtlUpWz'; import { ReqLottery as ReqLottery_2, ResLottery as ResLottery_2 } from './gonghuibaozang/PtlLottery'; -import { ReqOpen as ReqOpen_36, ResOpen as ResOpen_36 } from './gonghuibaozang/PtlOpen'; +import { ReqOpen as ReqOpen_37, ResOpen as ResOpen_37 } from './gonghuibaozang/PtlOpen'; import { ReqBuy as ReqBuy_4, ResBuy as ResBuy_4 } from './gonglukuangbiao/PtlBuy'; import { ReqFight as ReqFight_2, ResFight as ResFight_2 } from './gonglukuangbiao/PtlFight'; -import { ReqOpen as ReqOpen_37, ResOpen as ResOpen_37 } from './gonglukuangbiao/PtlOpen'; +import { ReqOpen as ReqOpen_38, ResOpen as ResOpen_38 } from './gonglukuangbiao/PtlOpen'; import { ReqRefresh as ReqRefresh_1, ResRefresh as ResRefresh_1 } from './gonglukuangbiao/PtlRefresh'; import { ReqActive, ResActive } from './gongyu/mingdao/PtlActive'; -import { ReqOpen as ReqOpen_38, ResOpen as ResOpen_38 } from './gongyu/mingdao/PtlOpen'; +import { ReqOpen as ReqOpen_39, ResOpen as ResOpen_39 } from './gongyu/mingdao/PtlOpen'; import { ReqRecPrize as ReqRecPrize_3, ResRecPrize as ResRecPrize_3 } from './gongyu/mingdao/PtlRecPrize'; import { ReqRepair, ResRepair } from './gongyu/mingdao/PtlRepair'; import { ReqReset as ReqReset_1, ResReset as ResReset_1 } from './gongyu/xunlianjihua/PtlReset'; @@ -162,14 +168,14 @@ import { ReqSetSkill, ResSetSkill } from './gongyu/zuozhanjihua/PtlSetSkill'; import { ReqBuyNum as ReqBuyNum_1, ResBuyNum as ResBuyNum_1 } from './hbzb/jfs/PtlBuyNum'; import { ReqFight as ReqFight_3, ResFight as ResFight_3 } from './hbzb/jfs/PtlFight'; import { ReqGetLog as ReqGetLog_1, ResGetLog as ResGetLog_1 } from './hbzb/jfs/PtlGetLog'; -import { ReqOpen as ReqOpen_39, ResOpen as ResOpen_39 } from './hbzb/jfs/PtlOpen'; +import { ReqOpen as ReqOpen_40, ResOpen as ResOpen_40 } from './hbzb/jfs/PtlOpen'; import { ReqRec as ReqRec_11, ResRec as ResRec_11 } from './hbzb/jfs/PtlRec'; import { ReqRefresh as ReqRefresh_2, ResRefresh as ResRefresh_2 } from './hbzb/jfs/PtlRefresh'; import { ReqGetStatus, ResGetStatus } from './hbzb/PtlGetStatus'; import { ReqBuyNum as ReqBuyNum_2, ResBuyNum as ResBuyNum_2 } from './hbzb/zbs/PtlBuyNum'; import { ReqFight as ReqFight_4, ResFight as ResFight_4 } from './hbzb/zbs/PtlFight'; import { ReqGetLog as ReqGetLog_2, ResGetLog as ResGetLog_2 } from './hbzb/zbs/PtlGetLog'; -import { ReqOpen as ReqOpen_40, ResOpen as ResOpen_40 } from './hbzb/zbs/PtlOpen'; +import { ReqOpen as ReqOpen_41, ResOpen as ResOpen_41 } from './hbzb/zbs/PtlOpen'; import { ReqRefresh as ReqRefresh_3, ResRefresh as ResRefresh_3 } from './hbzb/zbs/PtlRefresh'; import { ReqAwake, ResAwake } from './hero/PtlAwake'; import { ReqChangePos, ResChangePos } from './hero/PtlChangePos'; @@ -185,16 +191,16 @@ import { ReqGet as ReqGet_2, ResGet as ResGet_2 } from './hongdian/PtlGet'; import { ReqGetList as ReqGetList_4, ResGetList as ResGetList_4 } from './item/PtlGetList'; import { ReqUse, ResUse } from './item/PtlUse'; import { ReqLottery as ReqLottery_3, ResLottery as ResLottery_3 } from './jiaotang/PtlLottery'; -import { ReqOpen as ReqOpen_41, ResOpen as ResOpen_41 } from './jiaotang/PtlOpen'; +import { ReqOpen as ReqOpen_42, ResOpen as ResOpen_42 } from './jiaotang/PtlOpen'; import { ReqLottery as ReqLottery_4, ResLottery as ResLottery_4 } from './jiuba/PtlLottery'; -import { ReqOpen as ReqOpen_42, ResOpen as ResOpen_42 } from './jiuba/PtlOpen'; +import { ReqOpen as ReqOpen_43, ResOpen as ResOpen_43 } from './jiuba/PtlOpen'; import { ReqBuyFightNum, ResBuyFightNum } from './jjc/PtlBuyFightNum'; import { ReqFight as ReqFight_5, ResFight as ResFight_5 } from './jjc/PtlFight'; import { ReqFightLog, ResFightLog } from './jjc/PtlFightLog'; -import { ReqOpen as ReqOpen_43, ResOpen as ResOpen_43 } from './jjc/PtlOpen'; +import { ReqOpen as ReqOpen_44, ResOpen as ResOpen_44 } from './jjc/PtlOpen'; import { ReqReceive as ReqReceive_7, ResReceive as ResReceive_7 } from './jjc/PtlReceive'; import { ReqRefresh as ReqRefresh_4, ResRefresh as ResRefresh_4 } from './jjc/PtlRefresh'; -import { ReqOpen as ReqOpen_44, ResOpen as ResOpen_44 } from './kaifujingsai/PtlOpen'; +import { ReqOpen as ReqOpen_45, ResOpen as ResOpen_45 } from './kaifujingsai/PtlOpen'; import { ReqReceive as ReqReceive_8, ResReceive as ResReceive_8 } from './kaifujingsai/PtlReceive'; import { ReqApply as ReqApply_2, ResApply as ResApply_2 } from './kbzz/PtlApply'; import { ReqAutoApply, ResAutoApply } from './kbzz/PtlAutoApply'; @@ -202,23 +208,23 @@ import { ReqBuyNum as ReqBuyNum_3, ResBuyNum as ResBuyNum_3 } from './kbzz/PtlBu import { ReqFight as ReqFight_6, ResFight as ResFight_6 } from './kbzz/PtlFight'; import { ReqFightLog as ReqFightLog_1, ResFightLog as ResFightLog_1 } from './kbzz/PtlFightLog'; import { ReqGroupState, ResGroupState } from './kbzz/PtlGroupState'; -import { ReqOpen as ReqOpen_45, ResOpen as ResOpen_45 } from './kbzz/PtlOpen'; +import { ReqOpen as ReqOpen_46, ResOpen as ResOpen_46 } from './kbzz/PtlOpen'; import { ReqRecPrize as ReqRecPrize_4, ResRecPrize as ResRecPrize_4 } from './kbzz/PtlRecPrize'; import { ReqRefresh as ReqRefresh_5, ResRefresh as ResRefresh_5 } from './kbzz/PtlRefresh'; import { ReqAddPkNum, ResAddPkNum } from './kuangdong/PtlAddPkNum'; import { ReqGetPrize, ResGetPrize } from './kuangdong/PtlGetPrize'; import { ReqKdInfo, ResKdInfo } from './kuangdong/PtlKdInfo'; import { ReqLog as ReqLog_1, ResLog as ResLog_1 } from './kuangdong/PtlLog'; -import { ReqOpen as ReqOpen_46, ResOpen as ResOpen_46 } from './kuangdong/PtlOpen'; +import { ReqOpen as ReqOpen_47, ResOpen as ResOpen_47 } from './kuangdong/PtlOpen'; import { ReqYanShi, ResYanShi } from './kuangdong/PtlYanShi'; import { ReqZhanLing, ResZhanLing } from './kuangdong/PtlZhanLing'; -import { ReqOpen as ReqOpen_47, ResOpen as ResOpen_47 } from './lingzhulaixi/PtlOpen'; +import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } from './lingzhulaixi/PtlOpen'; import { ReqPkBoss, ResPkBoss } from './lingzhulaixi/PtlPkBoss'; import { ReqPkRank, ResPkRank } from './lingzhulaixi/PtlPkRank'; import { ReqSaoDang, ResSaoDang } from './lingzhulaixi/PtlSaoDang'; import { ReqBuy as ReqBuy_5, ResBuy as ResBuy_5 } from './meirishilian/PtlBuy'; import { ReqFight as ReqFight_7, ResFight as ResFight_7 } from './meirishilian/PtlFight'; -import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } from './meirishilian/PtlOpen'; +import { ReqOpen as ReqOpen_49, ResOpen as ResOpen_49 } from './meirishilian/PtlOpen'; import { MsgBindUid } from './msg_c2s/MsgBindUid'; import { MsgPay } from './msg_c2s/MsgPay'; import { MsgSync } from './msg_c2s/MsgSync'; @@ -250,7 +256,7 @@ import { MsgTaskChange } from './msg_s2c/MsgTaskChange'; import { MsgXianshilibao } from './msg_s2c/MsgXianshilibao'; import { ReqFight as ReqFight_8, ResFight as ResFight_8 } from './pata/PtlFight'; import { ReqGetPrize as ReqGetPrize_1, ResGetPrize as ResGetPrize_1 } from './pata/PtlGetPrize'; -import { ReqOpen as ReqOpen_49, ResOpen as ResOpen_49 } from './pata/PtlOpen'; +import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } from './pata/PtlOpen'; import { ReqSaoDang as ReqSaoDang_1, ResSaoDang as ResSaoDang_1 } from './pata/PtlSaoDang'; import { ReqGetList as ReqGetList_5, ResGetList as ResGetList_5 } from './pay/PtlGetList'; import { ReqGetList as ReqGetList_6, ResGetList as ResGetList_6 } from './peijian/PtlGetList'; @@ -266,16 +272,16 @@ import { ReqUnLock, ResUnLock } from './peijian/PtlUnLock'; import { ReqWear as ReqWear_1, ResWear as ResWear_1 } from './peijian/PtlWear'; import { ReqDeal, ResDeal } from './peijiancangku/PtlDeal'; import { ReqJump, ResJump } from './peijiancangku/PtlJump'; -import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } from './peijiancangku/PtlOpen'; +import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './peijiancangku/PtlOpen'; import { ReqBingo, ResBingo } from './PtlBingo'; import { ReqFightTest, ResFightTest } from './PtlFightTest'; import { ReqSyncBtn, ResSyncBtn } from './PtlSyncBtn'; import { ReqTest, ResTest } from './PtlTest'; import { ReqItemNoEnough, ResItemNoEnough } from './pushgift/PtlItemNoEnough'; -import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './pushgift/PtlOpen'; +import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './pushgift/PtlOpen'; import { ReqFight as ReqFight_9, ResFight as ResFight_9 } from './qjzzd/PtlFight'; -import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './qjzzd/PtlOpen'; -import { ReqOpen as ReqOpen_53, ResOpen as ResOpen_53 } from './rank/PtlOpen'; +import { ReqOpen as ReqOpen_53, ResOpen as ResOpen_53 } from './qjzzd/PtlOpen'; +import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } 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'; @@ -283,20 +289,20 @@ import { ReqLvUp as ReqLvUp_3, ResLvUp as ResLvUp_3 } from './shiwu/PtlLvUp'; import { ReqRecast, ResRecast } from './shiwu/PtlRecast'; import { ReqTakeOff as ReqTakeOff_2, ResTakeOff as ResTakeOff_2 } from './shiwu/PtlTakeOff'; import { ReqWear as ReqWear_2, ResWear as ResWear_2 } from './shiwu/PtlWear'; -import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } from './shootGame/PtlOpen'; +import { ReqOpen as ReqOpen_55, ResOpen as ResOpen_55 } 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_55, ResOpen as ResOpen_55 } from './shop/PtlOpen'; +import { ReqOpen as ReqOpen_56, ResOpen as ResOpen_56 } 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_56, ResOpen as ResOpen_56 } from './sign/PtlOpen'; +import { ReqOpen as ReqOpen_57, ResOpen as ResOpen_57 } 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_57, ResOpen as ResOpen_57 } from './slzd/PtlOpen'; +import { ReqOpen as ReqOpen_58, ResOpen as ResOpen_58 } from './slzd/PtlOpen'; import { ReqOpenFort, ResOpenFort } from './slzd/PtlOpenFort'; import { ReqRec as ReqRec_14, ResRec as ResRec_14 } from './slzd/PtlRec'; import { ReqRefresh as ReqRefresh_7, ResRefresh as ResRefresh_7 } from './slzd/PtlRefresh'; @@ -305,11 +311,11 @@ import { ReqEvent, ResEvent } from './tanxian/PtlEvent'; import { ReqFastGuaJi, ResFastGuaJi } from './tanxian/PtlFastGuaJi'; import { ReqFight as ReqFight_11, ResFight as ResFight_11 } from './tanxian/PtlFight'; import { ReqGuaJi, ResGuaJi } from './tanxian/PtlGuaJi'; -import { ReqOpen as ReqOpen_58, ResOpen as ResOpen_58 } from './tanxian/PtlOpen'; +import { ReqOpen as ReqOpen_59, ResOpen as ResOpen_59 } from './tanxian/PtlOpen'; import { ReqReceive as ReqReceive_9, ResReceive as ResReceive_9 } from './tanxian/PtlReceive'; import { ReqAllFinsh, ResAllFinsh } from './task/PtlAllFinsh'; import { ReqFinsh, ResFinsh } from './task/PtlFinsh'; -import { ReqOpen as ReqOpen_59, ResOpen as ResOpen_59 } from './task/PtlOpen'; +import { ReqOpen as ReqOpen_60, ResOpen as ResOpen_60 } from './task/PtlOpen'; import { ReqCDKEY, ResCDKEY } from './user/PtlCDKEY'; import { ReqChangeInfo, ResChangeInfo } from './user/PtlChangeInfo'; import { ReqChangeName, ResChangeName } from './user/PtlChangeName'; @@ -325,8 +331,8 @@ import { ReqRenownGetPrize, ResRenownGetPrize } from './user/PtlRenownGetPrize'; 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_60, ResOpen as ResOpen_60 } from './weixiuchang/PtlOpen'; +import { ReqExchange as ReqExchange_1, ResExchange as ResExchange_1 } from './weixiuchang/PtlExchange'; +import { ReqOpen as ReqOpen_61, ResOpen as ResOpen_61 } from './weixiuchang/PtlOpen'; import { ReqUpLv, ResUpLv } from './weixiuchang/PtlUpLv'; import { ReqUpStar, ResUpStar } from './weixiuchang/PtlUpStar'; import { ReqAutoBaoMing, ResAutoBaoMing } from './wzry/PtlAutoBaoMing'; @@ -337,7 +343,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_61, ResOpen as ResOpen_61 } from './wzry/PtlOpen'; +import { ReqOpen as ReqOpen_62, ResOpen as ResOpen_62 } from './wzry/PtlOpen'; import { ReqUpdateFight, ResUpdateFight } from './wzry/PtlUpdateFight'; import { ReqWzzd, ResWzzd } from './wzry/PtlWzzd'; import { ReqZuanShiOpen, ResZuanShiOpen } from './wzry/PtlZuanShiOpen'; @@ -345,7 +351,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_62, ResOpen as ResOpen_62 } from './xstask/PtlOpen'; +import { ReqOpen as ReqOpen_63, ResOpen as ResOpen_63 } from './xstask/PtlOpen'; import { ReqReceive as ReqReceive_10, ResReceive as ResReceive_10 } from './xstask/PtlReceive'; import { ReqRefresh as ReqRefresh_8, ResRefresh as ResRefresh_8 } from './xstask/PtlRefresh'; import { ReqHandle, ResHandle } from './yongbingzhuzhan/PtlHandle'; @@ -735,10 +741,34 @@ export interface ServiceType { req: ReqRecAll, res: ResRecAll }, - "event/yuedujijin/Open": { + "event/yuandan/DMRec": { + req: ReqDMRec, + res: ResDMRec + }, + "event/yuandan/DZRec": { + req: ReqDZRec, + res: ResDZRec + }, + "event/yuandan/Exchange": { + req: ReqExchange, + res: ResExchange + }, + "event/yuandan/Open": { req: ReqOpen_27, res: ResOpen_27 }, + "event/yuandan/TaskRec": { + req: ReqTaskRec_1, + res: ResTaskRec_1 + }, + "event/yuandan/ZLRec": { + req: ReqZLRec, + res: ResZLRec + }, + "event/yuedujijin/Open": { + req: ReqOpen_28, + res: ResOpen_28 + }, "event/yuedujijin/Rec": { req: ReqRec_10, res: ResRec_10 @@ -748,8 +778,8 @@ export interface ServiceType { res: ResBuyLv }, "event/zhanling/Open": { - req: ReqOpen_28, - res: ResOpen_28 + req: ReqOpen_29, + res: ResOpen_29 }, "event/zhanling/RecPrize": { req: ReqRecPrize_2, @@ -760,13 +790,13 @@ export interface ServiceType { res: ResRecTask }, "event/zhoulibao/Open": { - req: ReqOpen_29, - res: ResOpen_29 - }, - "event/zhoumolibao/Open": { req: ReqOpen_30, res: ResOpen_30 }, + "event/zhoumolibao/Open": { + req: ReqOpen_31, + res: ResOpen_31 + }, "event/zhoumolibao/Receive": { req: ReqReceive_6, res: ResReceive_6 @@ -776,8 +806,8 @@ export interface ServiceType { res: ResBuy_3 }, "event/zixuanlibao/Open": { - req: ReqOpen_31, - res: ResOpen_31 + req: ReqOpen_32, + res: ResOpen_32 }, "eventlist/hdGetList": { req: ReqhdGetList, @@ -800,8 +830,8 @@ export interface ServiceType { res: ResList }, "friend/Open": { - req: ReqOpen_32, - res: ResOpen_32 + req: ReqOpen_33, + res: ResOpen_33 }, "friend/Respond": { req: ReqRespond, @@ -820,8 +850,8 @@ export interface ServiceType { res: ResChallenge }, "ganbutexun/Open": { - req: ReqOpen_33, - res: ResOpen_33 + req: ReqOpen_34, + res: ResOpen_34 }, "ganhai/Fast": { req: ReqFast, @@ -836,8 +866,8 @@ export interface ServiceType { res: ResLog }, "ganhai/Open": { - req: ReqOpen_34, - res: ResOpen_34 + req: ReqOpen_35, + res: ResOpen_35 }, "ganhai/Refresh": { req: ReqRefresh, @@ -924,8 +954,8 @@ export interface ServiceType { res: ResManage }, "gonghui/Open": { - req: ReqOpen_35, - res: ResOpen_35 + req: ReqOpen_36, + res: ResOpen_36 }, "gonghui/TanHe": { req: ReqTanHe, @@ -948,8 +978,8 @@ export interface ServiceType { res: ResLottery_2 }, "gonghuibaozang/Open": { - req: ReqOpen_36, - res: ResOpen_36 + req: ReqOpen_37, + res: ResOpen_37 }, "gonglukuangbiao/Buy": { req: ReqBuy_4, @@ -960,8 +990,8 @@ export interface ServiceType { res: ResFight_2 }, "gonglukuangbiao/Open": { - req: ReqOpen_37, - res: ResOpen_37 + req: ReqOpen_38, + res: ResOpen_38 }, "gonglukuangbiao/Refresh": { req: ReqRefresh_1, @@ -972,8 +1002,8 @@ export interface ServiceType { res: ResActive }, "gongyu/mingdao/Open": { - req: ReqOpen_38, - res: ResOpen_38 + req: ReqOpen_39, + res: ResOpen_39 }, "gongyu/mingdao/RecPrize": { req: ReqRecPrize_3, @@ -1008,8 +1038,8 @@ export interface ServiceType { res: ResGetLog_1 }, "hbzb/jfs/Open": { - req: ReqOpen_39, - res: ResOpen_39 + req: ReqOpen_40, + res: ResOpen_40 }, "hbzb/jfs/Rec": { req: ReqRec_11, @@ -1036,8 +1066,8 @@ export interface ServiceType { res: ResGetLog_2 }, "hbzb/zbs/Open": { - req: ReqOpen_40, - res: ResOpen_40 + req: ReqOpen_41, + res: ResOpen_41 }, "hbzb/zbs/Refresh": { req: ReqRefresh_3, @@ -1100,16 +1130,16 @@ export interface ServiceType { res: ResLottery_3 }, "jiaotang/Open": { - req: ReqOpen_41, - res: ResOpen_41 + req: ReqOpen_42, + res: ResOpen_42 }, "jiuba/Lottery": { req: ReqLottery_4, res: ResLottery_4 }, "jiuba/Open": { - req: ReqOpen_42, - res: ResOpen_42 + req: ReqOpen_43, + res: ResOpen_43 }, "jjc/BuyFightNum": { req: ReqBuyFightNum, @@ -1124,8 +1154,8 @@ export interface ServiceType { res: ResFightLog }, "jjc/Open": { - req: ReqOpen_43, - res: ResOpen_43 + req: ReqOpen_44, + res: ResOpen_44 }, "jjc/Receive": { req: ReqReceive_7, @@ -1136,8 +1166,8 @@ export interface ServiceType { res: ResRefresh_4 }, "kaifujingsai/Open": { - req: ReqOpen_44, - res: ResOpen_44 + req: ReqOpen_45, + res: ResOpen_45 }, "kaifujingsai/Receive": { req: ReqReceive_8, @@ -1168,8 +1198,8 @@ export interface ServiceType { res: ResGroupState }, "kbzz/Open": { - req: ReqOpen_45, - res: ResOpen_45 + req: ReqOpen_46, + res: ResOpen_46 }, "kbzz/RecPrize": { req: ReqRecPrize_4, @@ -1196,8 +1226,8 @@ export interface ServiceType { res: ResLog_1 }, "kuangdong/Open": { - req: ReqOpen_46, - res: ResOpen_46 + req: ReqOpen_47, + res: ResOpen_47 }, "kuangdong/YanShi": { req: ReqYanShi, @@ -1208,8 +1238,8 @@ export interface ServiceType { res: ResZhanLing }, "lingzhulaixi/Open": { - req: ReqOpen_47, - res: ResOpen_47 + req: ReqOpen_48, + res: ResOpen_48 }, "lingzhulaixi/PkBoss": { req: ReqPkBoss, @@ -1232,8 +1262,8 @@ export interface ServiceType { res: ResFight_7 }, "meirishilian/Open": { - req: ReqOpen_48, - res: ResOpen_48 + req: ReqOpen_49, + res: ResOpen_49 }, "pata/Fight": { req: ReqFight_8, @@ -1244,8 +1274,8 @@ export interface ServiceType { res: ResGetPrize_1 }, "pata/Open": { - req: ReqOpen_49, - res: ResOpen_49 + req: ReqOpen_50, + res: ResOpen_50 }, "pata/SaoDang": { req: ReqSaoDang_1, @@ -1308,8 +1338,8 @@ export interface ServiceType { res: ResJump }, "peijiancangku/Open": { - req: ReqOpen_50, - res: ResOpen_50 + req: ReqOpen_51, + res: ResOpen_51 }, "Bingo": { req: ReqBingo, @@ -1332,21 +1362,21 @@ export interface ServiceType { res: ResItemNoEnough }, "pushgift/Open": { - req: ReqOpen_51, - res: ResOpen_51 + req: ReqOpen_52, + res: ResOpen_52 }, "qjzzd/Fight": { req: ReqFight_9, res: ResFight_9 }, "qjzzd/Open": { - req: ReqOpen_52, - res: ResOpen_52 - }, - "rank/Open": { req: ReqOpen_53, res: ResOpen_53 }, + "rank/Open": { + req: ReqOpen_54, + res: ResOpen_54 + }, "shiwu/Concise": { req: ReqConcise, res: ResConcise @@ -1376,8 +1406,8 @@ export interface ServiceType { res: ResWear_2 }, "shootGame/Open": { - req: ReqOpen_54, - res: ResOpen_54 + req: ReqOpen_55, + res: ResOpen_55 }, "shootGame/Rec": { req: ReqRec_13, @@ -1388,8 +1418,8 @@ export interface ServiceType { res: ResBuy_6 }, "shop/Open": { - req: ReqOpen_55, - res: ResOpen_55 + req: ReqOpen_56, + res: ResOpen_56 }, "shop/Refresh": { req: ReqRefresh_6, @@ -1404,8 +1434,8 @@ export interface ServiceType { res: ResGetPrize_2 }, "sign/Open": { - req: ReqOpen_56, - res: ResOpen_56 + req: ReqOpen_57, + res: ResOpen_57 }, "slzd/Aim": { req: ReqAim, @@ -1428,8 +1458,8 @@ export interface ServiceType { res: ResMyRank }, "slzd/Open": { - req: ReqOpen_57, - res: ResOpen_57 + req: ReqOpen_58, + res: ResOpen_58 }, "slzd/OpenFort": { req: ReqOpenFort, @@ -1464,8 +1494,8 @@ export interface ServiceType { res: ResGuaJi }, "tanxian/Open": { - req: ReqOpen_58, - res: ResOpen_58 + req: ReqOpen_59, + res: ResOpen_59 }, "tanxian/Receive": { req: ReqReceive_9, @@ -1480,8 +1510,8 @@ export interface ServiceType { res: ResFinsh }, "task/Open": { - req: ReqOpen_59, - res: ResOpen_59 + req: ReqOpen_60, + res: ResOpen_60 }, "user/CDKEY": { req: ReqCDKEY, @@ -1544,12 +1574,12 @@ export interface ServiceType { res: ResDecompose }, "weixiuchang/Exchange": { - req: ReqExchange, - res: ResExchange + req: ReqExchange_1, + res: ResExchange_1 }, "weixiuchang/Open": { - req: ReqOpen_60, - res: ResOpen_60 + req: ReqOpen_61, + res: ResOpen_61 }, "weixiuchang/UpLv": { req: ReqUpLv, @@ -1592,8 +1622,8 @@ export interface ServiceType { res: ResJingCaiOpen }, "wzry/Open": { - req: ReqOpen_61, - res: ResOpen_61 + req: ReqOpen_62, + res: ResOpen_62 }, "wzry/UpdateFight": { req: ReqUpdateFight, @@ -1624,8 +1654,8 @@ export interface ServiceType { res: ResOnekeyReceive }, "xstask/Open": { - req: ReqOpen_62, - res: ResOpen_62 + req: ReqOpen_63, + res: ResOpen_63 }, "xstask/Receive": { req: ReqReceive_10, @@ -2164,6 +2194,36 @@ export const serviceProto: ServiceProto = { }, { "id": 95, + "name": "event/yuandan/DMRec", + "type": "api" + }, + { + "id": 96, + "name": "event/yuandan/DZRec", + "type": "api" + }, + { + "id": 97, + "name": "event/yuandan/Exchange", + "type": "api" + }, + { + "id": 98, + "name": "event/yuandan/Open", + "type": "api" + }, + { + "id": 99, + "name": "event/yuandan/TaskRec", + "type": "api" + }, + { + "id": 100, + "name": "event/yuandan/ZLRec", + "type": "api" + }, + { + "id": 101, "name": "event/yuedujijin/Open", "type": "api", "conf": { @@ -2171,157 +2231,157 @@ export const serviceProto: ServiceProto = { } }, { - "id": 96, + "id": 102, "name": "event/yuedujijin/Rec", "type": "api" }, { - "id": 97, + "id": 103, "name": "event/zhanling/BuyLv", "type": "api" }, { - "id": 98, + "id": 104, "name": "event/zhanling/Open", "type": "api" }, { - "id": 99, + "id": 105, "name": "event/zhanling/RecPrize", "type": "api" }, { - "id": 100, + "id": 106, "name": "event/zhanling/RecTask", "type": "api" }, { - "id": 101, + "id": 107, "name": "event/zhoulibao/Open", "type": "api" }, { - "id": 102, + "id": 108, "name": "event/zhoumolibao/Open", "type": "api" }, { - "id": 103, + "id": 109, "name": "event/zhoumolibao/Receive", "type": "api" }, { - "id": 104, + "id": 110, "name": "event/zixuanlibao/Buy", "type": "api" }, { - "id": 105, + "id": 111, "name": "event/zixuanlibao/Open", "type": "api" }, { - "id": 106, + "id": 112, "name": "eventlist/hdGetList", "type": "api" }, { - "id": 107, + "id": 113, "name": "friend/Apply", "type": "api" }, { - "id": 108, + "id": 114, "name": "friend/Del", "type": "api" }, { - "id": 109, + "id": 115, "name": "friend/Gift", "type": "api" }, { - "id": 110, + "id": 116, "name": "friend/List", "type": "api" }, { - "id": 111, + "id": 117, "name": "friend/Open", "type": "api" }, { - "id": 112, + "id": 118, "name": "friend/Respond", "type": "api" }, { - "id": 113, + "id": 119, "name": "friend/RmBlackList", "type": "api" }, { - "id": 114, + "id": 120, "name": "friend/Search", "type": "api" }, { - "id": 115, + "id": 121, "name": "ganbutexun/Challenge", "type": "api" }, { - "id": 116, + "id": 122, "name": "ganbutexun/Open", "type": "api" }, { - "id": 117, + "id": 123, "name": "ganhai/Fast", "type": "api" }, { - "id": 118, + "id": 124, "name": "ganhai/Fight", "type": "api" }, { - "id": 119, + "id": 125, "name": "ganhai/Log", "type": "api" }, { - "id": 120, + "id": 126, "name": "ganhai/Open", "type": "api" }, { - "id": 121, + "id": 127, "name": "ganhai/Refresh", "type": "api" }, { - "id": 122, + "id": 128, "name": "ganhai/RefreshShip", "type": "api" }, { - "id": 123, + "id": 129, "name": "ganhai/Select", "type": "api" }, { - "id": 124, + "id": 130, "name": "gmapi/Gift", "type": "api" }, { - "id": 125, + "id": 131, "name": "gmapi/Post", "type": "api" }, { - "id": 126, + "id": 132, "name": "gonghui/Apply", "type": "api", "conf": { @@ -2331,7 +2391,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 127, + "id": 133, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2341,7 +2401,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 128, + "id": 134, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2351,7 +2411,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 129, + "id": 135, "name": "gonghui/Change", "type": "api", "conf": { @@ -2361,12 +2421,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 130, + "id": 136, "name": "gonghui/Create", "type": "api" }, { - "id": 131, + "id": 137, "name": "gonghui/Dissolve", "type": "api", "conf": { @@ -2376,7 +2436,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 132, + "id": 138, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2386,12 +2446,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 133, + "id": 139, "name": "gonghui/FbBuyNum", "type": "api" }, { - "id": 134, + "id": 140, "name": "gonghui/FbFight", "type": "api", "conf": { @@ -2401,7 +2461,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 135, + "id": 141, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2411,17 +2471,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 136, + "id": 142, "name": "gonghui/GetList", "type": "api" }, { - "id": 137, + "id": 143, "name": "gonghui/Join", "type": "api" }, { - "id": 138, + "id": 144, "name": "gonghui/Jx", "type": "api", "conf": { @@ -2431,7 +2491,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 139, + "id": 145, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2441,7 +2501,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 140, + "id": 146, "name": "gonghui/List", "type": "api", "conf": { @@ -2451,7 +2511,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 141, + "id": 147, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2461,7 +2521,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 142, + "id": 148, "name": "gonghui/Open", "type": "api", "conf": { @@ -2471,7 +2531,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 143, + "id": 149, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2481,7 +2541,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 144, + "id": 150, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2491,7 +2551,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 145, + "id": 151, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2501,7 +2561,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 146, + "id": 152, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2511,137 +2571,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 147, + "id": 153, "name": "gonghuibaozang/Lottery", "type": "api" }, { - "id": 148, + "id": 154, "name": "gonghuibaozang/Open", "type": "api" }, { - "id": 149, + "id": 155, "name": "gonglukuangbiao/Buy", "type": "api" }, { - "id": 150, + "id": 156, "name": "gonglukuangbiao/Fight", "type": "api" }, { - "id": 151, + "id": 157, "name": "gonglukuangbiao/Open", "type": "api" }, { - "id": 152, + "id": 158, "name": "gonglukuangbiao/Refresh", "type": "api" }, { - "id": 153, + "id": 159, "name": "gongyu/mingdao/Active", "type": "api" }, { - "id": 154, + "id": 160, "name": "gongyu/mingdao/Open", "type": "api" }, { - "id": 155, + "id": 161, "name": "gongyu/mingdao/RecPrize", "type": "api" }, { - "id": 156, + "id": 162, "name": "gongyu/mingdao/Repair", "type": "api" }, { - "id": 157, + "id": 163, "name": "gongyu/xunlianjihua/Reset", "type": "api" }, { - "id": 158, + "id": 164, "name": "gongyu/xunlianjihua/UpSkill", "type": "api" }, { - "id": 159, + "id": 165, "name": "gongyu/zuozhanjihua/SetSkill", "type": "api" }, { - "id": 160, + "id": 166, "name": "hbzb/jfs/BuyNum", "type": "api" }, { - "id": 161, + "id": 167, "name": "hbzb/jfs/Fight", "type": "api" }, { - "id": 162, + "id": 168, "name": "hbzb/jfs/GetLog", "type": "api" }, { - "id": 163, + "id": 169, "name": "hbzb/jfs/Open", "type": "api" }, { - "id": 164, + "id": 170, "name": "hbzb/jfs/Rec", "type": "api" }, { - "id": 165, + "id": 171, "name": "hbzb/jfs/Refresh", "type": "api" }, { - "id": 166, + "id": 172, "name": "hbzb/GetStatus", "type": "api" }, { - "id": 167, + "id": 173, "name": "hbzb/zbs/BuyNum", "type": "api" }, { - "id": 168, + "id": 174, "name": "hbzb/zbs/Fight", "type": "api" }, { - "id": 169, + "id": 175, "name": "hbzb/zbs/GetLog", "type": "api" }, { - "id": 170, + "id": 176, "name": "hbzb/zbs/Open", "type": "api" }, { - "id": 171, + "id": 177, "name": "hbzb/zbs/Refresh", "type": "api" }, { - "id": 172, + "id": 178, "name": "hero/Awake", "type": "api" }, { - "id": 173, + "id": 179, "name": "hero/ChangePos", "type": "api", "conf": { @@ -2649,17 +2709,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 174, + "id": 180, "name": "hero/GetList", "type": "api" }, { - "id": 175, + "id": 181, "name": "hero/JinJie", "type": "api" }, { - "id": 176, + "id": 182, "name": "hero/LvUp", "type": "api", "conf": { @@ -2667,32 +2727,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 177, + "id": 183, "name": "hero/Potency", "type": "api" }, { - "id": 178, + "id": 184, "name": "hero/Rec", "type": "api" }, { - "id": 179, + "id": 185, "name": "hero/Reset", "type": "api" }, { - "id": 180, + "id": 186, "name": "hero/Talent", "type": "api" }, { - "id": 181, + "id": 187, "name": "hero/WeaponUp", "type": "api" }, { - "id": 182, + "id": 188, "name": "hongdian/Get", "type": "api", "conf": { @@ -2700,117 +2760,117 @@ export const serviceProto: ServiceProto = { } }, { - "id": 183, + "id": 189, "name": "item/GetList", "type": "api" }, { - "id": 184, + "id": 190, "name": "item/Use", "type": "api" }, { - "id": 185, + "id": 191, "name": "jiaotang/Lottery", "type": "api" }, { - "id": 186, + "id": 192, "name": "jiaotang/Open", "type": "api" }, { - "id": 187, + "id": 193, "name": "jiuba/Lottery", "type": "api" }, { - "id": 188, + "id": 194, "name": "jiuba/Open", "type": "api" }, { - "id": 189, + "id": 195, "name": "jjc/BuyFightNum", "type": "api" }, { - "id": 190, + "id": 196, "name": "jjc/Fight", "type": "api" }, { - "id": 191, + "id": 197, "name": "jjc/FightLog", "type": "api" }, { - "id": 192, + "id": 198, "name": "jjc/Open", "type": "api" }, { - "id": 193, + "id": 199, "name": "jjc/Receive", "type": "api" }, { - "id": 194, + "id": 200, "name": "jjc/Refresh", "type": "api" }, { - "id": 195, + "id": 201, "name": "kaifujingsai/Open", "type": "api" }, { - "id": 196, + "id": 202, "name": "kaifujingsai/Receive", "type": "api" }, { - "id": 197, + "id": 203, "name": "kbzz/Apply", "type": "api" }, { - "id": 198, + "id": 204, "name": "kbzz/AutoApply", "type": "api" }, { - "id": 199, + "id": 205, "name": "kbzz/BuyNum", "type": "api" }, { - "id": 200, + "id": 206, "name": "kbzz/Fight", "type": "api" }, { - "id": 201, + "id": 207, "name": "kbzz/FightLog", "type": "api" }, { - "id": 202, + "id": 208, "name": "kbzz/GroupState", "type": "api" }, { - "id": 203, + "id": 209, "name": "kbzz/Open", "type": "api" }, { - "id": 204, + "id": 210, "name": "kbzz/RecPrize", "type": "api" }, { - "id": 205, + "id": 211, "name": "kbzz/Refresh", "type": "api", "conf": { @@ -2818,287 +2878,287 @@ export const serviceProto: ServiceProto = { } }, { - "id": 206, + "id": 212, "name": "kuangdong/AddPkNum", "type": "api" }, { - "id": 207, + "id": 213, "name": "kuangdong/GetPrize", "type": "api" }, { - "id": 208, + "id": 214, "name": "kuangdong/KdInfo", "type": "api" }, { - "id": 209, + "id": 215, "name": "kuangdong/Log", "type": "api" }, { - "id": 210, + "id": 216, "name": "kuangdong/Open", "type": "api" }, { - "id": 211, + "id": 217, "name": "kuangdong/YanShi", "type": "api" }, { - "id": 212, + "id": 218, "name": "kuangdong/ZhanLing", "type": "api" }, { - "id": 213, + "id": 219, "name": "lingzhulaixi/Open", "type": "api" }, { - "id": 214, + "id": 220, "name": "lingzhulaixi/PkBoss", "type": "api" }, { - "id": 215, + "id": 221, "name": "lingzhulaixi/PkRank", "type": "api" }, { - "id": 216, + "id": 222, "name": "lingzhulaixi/SaoDang", "type": "api" }, { - "id": 217, + "id": 223, "name": "meirishilian/Buy", "type": "api" }, { - "id": 218, + "id": 224, "name": "meirishilian/Fight", "type": "api" }, { - "id": 219, + "id": 225, "name": "meirishilian/Open", "type": "api" }, { - "id": 220, + "id": 226, "name": "msg_c2s/BindUid", "type": "msg" }, { - "id": 221, + "id": 227, "name": "msg_c2s/Pay", "type": "msg" }, { - "id": 222, + "id": 228, "name": "msg_c2s/Sync", "type": "msg" }, { - "id": 223, + "id": 229, "name": "msg_s2c/Chat", "type": "msg" }, { - "id": 224, + "id": 230, "name": "msg_s2c/ChatHelp", "type": "msg" }, { - "id": 225, + "id": 231, "name": "msg_s2c/Collection", "type": "msg" }, { - "id": 226, + "id": 232, "name": "msg_s2c/Email", "type": "msg" }, { - "id": 227, + "id": 233, "name": "msg_s2c/EmailDel", "type": "msg" }, { - "id": 228, + "id": 234, "name": "msg_s2c/EquipChange", "type": "msg" }, { - "id": 229, + "id": 235, "name": "msg_s2c/Friend", "type": "msg" }, { - "id": 230, + "id": 236, "name": "msg_s2c/GhChange", "type": "msg" }, { - "id": 231, + "id": 237, "name": "msg_s2c/GongHuiBaoZang", "type": "msg" }, { - "id": 232, + "id": 238, "name": "msg_s2c/HeroChange", "type": "msg" }, { - "id": 233, + "id": 239, "name": "msg_s2c/HongDianChange", "type": "msg" }, { - "id": 234, + "id": 240, "name": "msg_s2c/ItemChange", "type": "msg" }, { - "id": 235, + "id": 241, "name": "msg_s2c/LoginQueue", "type": "msg" }, { - "id": 236, + "id": 242, "name": "msg_s2c/LshdChange", "type": "msg" }, { - "id": 237, + "id": 243, "name": "msg_s2c/NewDay", "type": "msg" }, { - "id": 238, + "id": 244, "name": "msg_s2c/OtherLogin", "type": "msg" }, { - "id": 239, + "id": 245, "name": "msg_s2c/PayChange", "type": "msg" }, { - "id": 240, + "id": 246, "name": "msg_s2c/PayResult", "type": "msg" }, { - "id": 241, + "id": 247, "name": "msg_s2c/PeijianChange", "type": "msg" }, { - "id": 242, + "id": 248, "name": "msg_s2c/PlayerChange", "type": "msg" }, { - "id": 243, + "id": 249, "name": "msg_s2c/Private", "type": "msg" }, { - "id": 244, + "id": 250, "name": "msg_s2c/PushGiftChange", "type": "msg" }, { - "id": 245, + "id": 251, "name": "msg_s2c/SendGift", "type": "msg" }, { - "id": 246, + "id": 252, "name": "msg_s2c/ShiwuChange", "type": "msg" }, { - "id": 247, + "id": 253, "name": "msg_s2c/TaskChange", "type": "msg" }, { - "id": 248, + "id": 254, "name": "msg_s2c/Xianshilibao", "type": "msg" }, { - "id": 249, + "id": 255, "name": "pata/Fight", "type": "api" }, { - "id": 250, + "id": 256, "name": "pata/GetPrize", "type": "api" }, { - "id": 251, + "id": 257, "name": "pata/Open", "type": "api" }, { - "id": 252, + "id": 258, "name": "pata/SaoDang", "type": "api" }, { - "id": 253, + "id": 259, "name": "pay/GetList", "type": "api" }, { - "id": 254, + "id": 260, "name": "peijian/GetList", "type": "api" }, { - "id": 255, + "id": 261, "name": "peijian/JingLian", "type": "api" }, { - "id": 256, + "id": 262, "name": "peijian/JinJie", "type": "api" }, { - "id": 257, + "id": 263, "name": "peijian/LvUp", "type": "api" }, { - "id": 258, + "id": 264, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 259, + "id": 265, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 260, + "id": 266, "name": "peijian/Reset", "type": "api" }, { - "id": 261, + "id": 267, "name": "peijian/Rm", "type": "api" }, { - "id": 262, + "id": 268, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3106,32 +3166,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 263, + "id": 269, "name": "peijian/UnLock", "type": "api" }, { - "id": 264, + "id": 270, "name": "peijian/Wear", "type": "api" }, { - "id": 265, + "id": 271, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 266, + "id": 272, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 267, + "id": 273, "name": "peijiancangku/Open", "type": "api" }, { - "id": 268, + "id": 274, "name": "Bingo", "type": "api", "conf": { @@ -3139,147 +3199,147 @@ export const serviceProto: ServiceProto = { } }, { - "id": 269, + "id": 275, "name": "FightTest", "type": "api" }, { - "id": 270, + "id": 276, "name": "SyncBtn", "type": "api" }, { - "id": 271, + "id": 277, "name": "Test", "type": "api" }, { - "id": 272, + "id": 278, "name": "pushgift/ItemNoEnough", "type": "api" }, { - "id": 273, + "id": 279, "name": "pushgift/Open", "type": "api" }, { - "id": 274, + "id": 280, "name": "qjzzd/Fight", "type": "api" }, { - "id": 275, + "id": 281, "name": "qjzzd/Open", "type": "api" }, { - "id": 276, + "id": 282, "name": "rank/Open", "type": "api" }, { - "id": 277, + "id": 283, "name": "shiwu/Concise", "type": "api" }, { - "id": 278, + "id": 284, "name": "shiwu/Extract", "type": "api" }, { - "id": 279, + "id": 285, "name": "shiwu/GetList", "type": "api" }, { - "id": 280, + "id": 286, "name": "shiwu/LvUp", "type": "api" }, { - "id": 281, + "id": 287, "name": "shiwu/Recast", "type": "api" }, { - "id": 282, + "id": 288, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 283, + "id": 289, "name": "shiwu/Wear", "type": "api" }, { - "id": 284, + "id": 290, "name": "shootGame/Open", "type": "api" }, { - "id": 285, + "id": 291, "name": "shootGame/Rec", "type": "api" }, { - "id": 286, + "id": 292, "name": "shop/Buy", "type": "api" }, { - "id": 287, + "id": 293, "name": "shop/Open", "type": "api" }, { - "id": 288, + "id": 294, "name": "shop/Refresh", "type": "api" }, { - "id": 289, + "id": 295, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 290, + "id": 296, "name": "sign/GetPrize", "type": "api" }, { - "id": 291, + "id": 297, "name": "sign/Open", "type": "api" }, { - "id": 292, + "id": 298, "name": "slzd/Aim", "type": "api" }, { - "id": 293, + "id": 299, "name": "slzd/BuyNum", "type": "api" }, { - "id": 294, + "id": 300, "name": "slzd/Fight", "type": "api" }, { - "id": 295, + "id": 301, "name": "slzd/FightLog", "type": "api" }, { - "id": 296, + "id": 302, "name": "slzd/MyRank", "type": "api" }, { - "id": 297, + "id": 303, "name": "slzd/Open", "type": "api", "conf": { @@ -3289,77 +3349,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 298, + "id": 304, "name": "slzd/OpenFort", "type": "api" }, { - "id": 299, + "id": 305, "name": "slzd/Rec", "type": "api" }, { - "id": 300, + "id": 306, "name": "slzd/Refresh", "type": "api" }, { - "id": 301, + "id": 307, "name": "slzd/Slot", "type": "api" }, { - "id": 302, + "id": 308, "name": "tanxian/Event", "type": "api" }, { - "id": 303, + "id": 309, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 304, + "id": 310, "name": "tanxian/Fight", "type": "api" }, { - "id": 305, + "id": 311, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 306, + "id": 312, "name": "tanxian/Open", "type": "api" }, { - "id": 307, + "id": 313, "name": "tanxian/Receive", "type": "api" }, { - "id": 308, + "id": 314, "name": "task/AllFinsh", "type": "api" }, { - "id": 309, + "id": 315, "name": "task/Finsh", "type": "api" }, { - "id": 310, + "id": 316, "name": "task/Open", "type": "api" }, { - "id": 311, + "id": 317, "name": "user/CDKEY", "type": "api" }, { - "id": 312, + "id": 318, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3367,202 +3427,202 @@ export const serviceProto: ServiceProto = { } }, { - "id": 313, + "id": 319, "name": "user/ChangeName", "type": "api" }, { - "id": 314, + "id": 320, "name": "user/Dot", "type": "api" }, { - "id": 315, + "id": 321, "name": "user/Fight", "type": "api" }, { - "id": 316, + "id": 322, "name": "user/GetInfo", "type": "api" }, { - "id": 317, + "id": 323, "name": "user/InfoOpen", "type": "api" }, { - "id": 318, + "id": 324, "name": "user/Login", "type": "api" }, { - "id": 319, + "id": 325, "name": "user/Ping", "type": "api" }, { - "id": 320, + "id": 326, "name": "user/Renown", "type": "api" }, { - "id": 321, + "id": 327, "name": "user/RenownBuy", "type": "api" }, { - "id": 322, + "id": 328, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 323, + "id": 329, "name": "user/RenownOpen", "type": "api" }, { - "id": 324, + "id": 330, "name": "user/Tujian", "type": "api" }, { - "id": 325, + "id": 331, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 326, + "id": 332, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 327, + "id": 333, "name": "weixiuchang/Open", "type": "api" }, { - "id": 328, + "id": 334, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 329, + "id": 335, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 330, + "id": 336, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 331, + "id": 337, "name": "wzry/BaoMing", "type": "api" }, { - "id": 332, + "id": 338, "name": "wzry/catFightLog", "type": "api" }, { - "id": 333, + "id": 339, "name": "wzry/CatGroup", "type": "api" }, { - "id": 334, + "id": 340, "name": "wzry/DldFight", "type": "api" }, { - "id": 335, + "id": 341, "name": "wzry/DldRefre", "type": "api" }, { - "id": 336, + "id": 342, "name": "wzry/JingCai", "type": "api" }, { - "id": 337, + "id": 343, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 338, + "id": 344, "name": "wzry/Open", "type": "api" }, { - "id": 339, + "id": 345, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 340, + "id": 346, "name": "wzry/Wzzd", "type": "api" }, { - "id": 341, + "id": 347, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 342, + "id": 348, "name": "xstask/AllGet", "type": "api" }, { - "id": 343, + "id": 349, "name": "xstask/Get", "type": "api" }, { - "id": 344, + "id": 350, "name": "xstask/LvUp", "type": "api" }, { - "id": 345, + "id": 351, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 346, + "id": 352, "name": "xstask/Open", "type": "api" }, { - "id": 347, + "id": 353, "name": "xstask/Receive", "type": "api" }, { - "id": 348, + "id": 354, "name": "xstask/Refresh", "type": "api" }, { - "id": 349, + "id": 355, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 350, + "id": 356, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 351, + "id": 357, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 352, + "id": 358, "name": "zhanqianbushu/Up", "type": "api" } @@ -11338,6 +11398,222 @@ export const serviceProto: ServiceProto = { } ] }, + "event/yuandan/PtlDMRec/ReqDMRec": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "id", + "type": { + "type": "Union", + "members": [ + { + "id": 0, + "type": { + "type": "Literal", + "literal": 1 + } + }, + { + "id": 1, + "type": { + "type": "Literal", + "literal": 0 + } + } + ] + } + } + ] + }, + "event/yuandan/PtlDMRec/ResDMRec": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "prize", + "type": { + "type": "Array", + "elementType": { + "type": "Reference", + "target": "type/prizeType" + } + } + } + ] + }, + "event/yuandan/PtlDZRec/ReqDZRec": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "id", + "type": { + "type": "String" + } + }, + { + "id": 1, + "name": "dlz", + "type": { + "type": "Array", + "elementType": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "a", + "type": { + "type": "String" + } + }, + { + "id": 1, + "name": "t", + "type": { + "type": "String" + } + }, + { + "id": 2, + "name": "n", + "type": { + "type": "Number" + } + } + ] + } + } + } + ] + }, + "event/yuandan/PtlDZRec/ResDZRec": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" + } + } + }, + "event/yuandan/PtlExchange/ReqExchange": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "id", + "type": { + "type": "String" + } + } + ] + }, + "event/yuandan/PtlExchange/ResExchange": { + "type": "Interface" + }, + "event/yuandan/PtlOpen/ReqOpen": { + "type": "Interface" + }, + "event/yuandan/PtlOpen/ResOpen": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "data", + "type": { + "type": "Any" + } + }, + { + "id": 1, + "name": "payLog", + "type": { + "type": "Any" + } + } + ], + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" + } + } + }, + "event/yuandan/PtlTaskRec/ReqTaskRec": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "taskid", + "type": { + "type": "String" + } + } + ] + }, + "event/yuandan/PtlTaskRec/ResTaskRec": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" + } + } + }, + "event/yuandan/PtlZLRec/ReqZLRec": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "id", + "type": { + "type": "String" + } + }, + { + "id": 1, + "name": "dlz", + "type": { + "type": "Array", + "elementType": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "a", + "type": { + "type": "String" + } + }, + { + "id": 1, + "name": "t", + "type": { + "type": "String" + } + }, + { + "id": 2, + "name": "n", + "type": { + "type": "Number" + } + } + ] + } + } + } + ] + }, + "event/yuandan/PtlZLRec/ResZLRec": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" + } + } + }, "event/yuedujijin/PtlOpen/ReqOpen": { "type": "Interface", "properties": [ @@ -15332,6 +15608,13 @@ export const serviceProto: ServiceProto = { "type": "Literal", "literal": "leichonglibao" } + }, + { + "id": 40, + "type": { + "type": "Literal", + "literal": "yuandan" + } } ] }, diff --git a/src/shared/public/public.ts b/src/shared/public/public.ts index 02c3aa2..5860b9b 100644 --- a/src/shared/public/public.ts +++ b/src/shared/public/public.ts @@ -73,6 +73,7 @@ export class PublicShared { * 随机掉落组 * @param id 掉落组id * @param num 随机次数 + * @param conf */ static randomDropGroup(id: string | number, num = 1, conf = G.gc.diaoluo): prizeType[] { let prize = [];