From 00804fa8c1a45022d9409bf45fc21a315b6c06df Mon Sep 17 00:00:00 2001 From: dy Date: Mon, 25 Dec 2023 13:48:18 +0800 Subject: [PATCH 01/37] =?UTF-8?q?init=20=E5=85=83=E6=97=A6=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/yuandan/ApiDMOpen.ts | 16 + src/api_s2c/event/yuandan/ApiDMRec.ts | 27 + src/api_s2c/event/yuandan/ApiDZOpen.ts | 17 + src/api_s2c/event/yuandan/ApiDZRec.ts | 27 + src/api_s2c/event/yuandan/ApiExchange.ts | 28 + src/api_s2c/event/yuandan/ApiExchangeOpen.ts | 10 + src/api_s2c/event/yuandan/ApiTaskFinish.ts | 40 + src/api_s2c/event/yuandan/ApiTaskOpen.ts | 0 src/api_s2c/event/yuandan/ApiZLOpen.ts | 16 + src/api_s2c/event/yuandan/ApiZLRec.ts | 27 + src/api_s2c/event/yuandan/fun.ts | 214 +++++ src/clusterUtils.ts | 6 +- src/module/collection_event.ts | 6 + src/public/pay.ts | 15 +- .../protocols/event/yuandan/PtlDMOpen.ts | 13 + .../protocols/event/yuandan/PtlDMRec.ts | 11 + .../protocols/event/yuandan/PtlDZOpen.ts | 16 + .../protocols/event/yuandan/PtlDZRec.ts | 10 + .../protocols/event/yuandan/PtlExchange.ts | 11 + .../event/yuandan/PtlExchangeOpen.ts | 12 + .../protocols/event/yuandan/PtlZLOpen.ts | 13 + .../protocols/event/yuandan/PtlZLRec.ts | 11 + .../protocols/event/zhoumolibao/PtlReceive.ts | 4 +- src/shared/protocols/hongdian/PtlGet.ts | 3 +- src/shared/protocols/serviceProto.ts | 764 ++++++++++++------ 25 files changed, 1048 insertions(+), 269 deletions(-) create mode 100644 src/api_s2c/event/yuandan/ApiDMOpen.ts create mode 100644 src/api_s2c/event/yuandan/ApiDMRec.ts create mode 100644 src/api_s2c/event/yuandan/ApiDZOpen.ts create mode 100644 src/api_s2c/event/yuandan/ApiDZRec.ts create mode 100644 src/api_s2c/event/yuandan/ApiExchange.ts create mode 100644 src/api_s2c/event/yuandan/ApiExchangeOpen.ts create mode 100644 src/api_s2c/event/yuandan/ApiTaskFinish.ts create mode 100644 src/api_s2c/event/yuandan/ApiTaskOpen.ts create mode 100644 src/api_s2c/event/yuandan/ApiZLOpen.ts create mode 100644 src/api_s2c/event/yuandan/ApiZLRec.ts create mode 100644 src/api_s2c/event/yuandan/fun.ts create mode 100644 src/shared/protocols/event/yuandan/PtlDMOpen.ts create mode 100644 src/shared/protocols/event/yuandan/PtlDMRec.ts create mode 100644 src/shared/protocols/event/yuandan/PtlDZOpen.ts create mode 100644 src/shared/protocols/event/yuandan/PtlDZRec.ts create mode 100644 src/shared/protocols/event/yuandan/PtlExchange.ts create mode 100644 src/shared/protocols/event/yuandan/PtlExchangeOpen.ts create mode 100644 src/shared/protocols/event/yuandan/PtlZLOpen.ts create mode 100644 src/shared/protocols/event/yuandan/PtlZLRec.ts diff --git a/src/api_s2c/event/yuandan/ApiDMOpen.ts b/src/api_s2c/event/yuandan/ApiDMOpen.ts new file mode 100644 index 0000000..c0c659a --- /dev/null +++ b/src/api_s2c/event/yuandan/ApiDMOpen.ts @@ -0,0 +1,16 @@ +import {ApiCall} from "tsrpc"; +import {ReqDMOpen, ResDMOpen} from "../../../shared/protocols/event/yuandan/PtlDMOpen"; +import {HuoDongFun} from "../../../public/huodongfun"; +import {PayFun} from "../../../public/pay"; + +export default async function (call: ApiCall) { + let data = await G.mongodb.cEvent('yuandandamo').findOne({uid: call.uid, type: 'yuandandamo'}) + + let _hd = (await HuoDongFun.gethdList(call, 14))[0] + + let payIds = _hd?.data?.gift?.filter(i => i.payId)?.map(i => i.payId) + + call.succ({ + record: data?.record || {} + }) +} \ No newline at end of file diff --git a/src/api_s2c/event/yuandan/ApiDMRec.ts b/src/api_s2c/event/yuandan/ApiDMRec.ts new file mode 100644 index 0000000..d850556 --- /dev/null +++ b/src/api_s2c/event/yuandan/ApiDMRec.ts @@ -0,0 +1,27 @@ +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"; + +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('yuandandamo').findOne({uid: call.uid, type: 'yuandandamo'}) + let rec = data?.record?.[call.req.id] + if (rec && rec >= gift?.buyNum) return call.errorCode(-2) + + await PlayerFun.sendPrize(call, gift.prize); + + await G.mongodb.cEvent('yuandandamo').updateOne({uid: call.uid, type: 'yuandandamo'}, { + $inc: {[`record.${gift.id}`]: 1}, + }, {upsert: true}) + + call.succ({}) + + HongDianChange.sendChangeKey(call.uid, ['yuandan']); +} diff --git a/src/api_s2c/event/yuandan/ApiDZOpen.ts b/src/api_s2c/event/yuandan/ApiDZOpen.ts new file mode 100644 index 0000000..ae9a55a --- /dev/null +++ b/src/api_s2c/event/yuandan/ApiDZOpen.ts @@ -0,0 +1,17 @@ +import {ApiCall} from "tsrpc"; +import {ReqDZOpen, ResDZOpen} from "../../../shared/protocols/event/yuandan/PtlDZOpen"; +import {HuoDongFun} from "../../../public/huodongfun"; +import {PayFun} from "../../../public/pay"; + +export default async function (call: ApiCall) { + let data = await G.mongodb.cEvent('yuandandingzhi').findOne({uid: call.uid, type: 'yuandandingzhi'}) + + let _hd = (await HuoDongFun.gethdList(call, 14))[0] + + let payIds = _hd?.data?.gift?.filter(i => i.payId)?.map(i => i.payId) + + call.succ({ + record: data?.record || {}, + buyLog: await PayFun.getPayLogs(call.uid, payIds) + }) +} \ No newline at end of file diff --git a/src/api_s2c/event/yuandan/ApiDZRec.ts b/src/api_s2c/event/yuandan/ApiDZRec.ts new file mode 100644 index 0000000..9374b56 --- /dev/null +++ b/src/api_s2c/event/yuandan/ApiDZRec.ts @@ -0,0 +1,27 @@ +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('yuandandingzhi').findOne({uid: call.uid, type: 'yuandandingzhi'}) + let rec = data?.record?.[call.req.id] + if (rec && rec >= gift?.buyNum) return call.errorCode(-2) + + await PlayerFun.sendPrize(call, gift.prize); + + await G.mongodb.cEvent('yuandandingzhi').updateOne({uid: call.uid, type: 'yuandandingzhi'}, { + $inc: {[`record.${gift.id}`]: 1}, + }, {upsert: true}) + + call.succ({}) + + 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..1724dcd --- /dev/null +++ b/src/api_s2c/event/yuandan/ApiExchange.ts @@ -0,0 +1,28 @@ +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?.gift?.find(i => i.free && i.id == call.req.id) + if (!gift) return call.errorCode(-1) + + // 取奖励列表，判断是否有可领取奖励 + let data = await G.mongodb.cEvent('yuandanduihuan').findOne({uid: call.uid, type: 'yuandanduihuan'}) + let rec = data?.record?.[call.req.id] + if (rec && rec >= gift?.buyNum) return call.errorCode(-2) + + await PlayerFun.sendPrize(call, gift.prize); + await PlayerFun.cutNeed(call, gift.prize) + + await G.mongodb.cEvent('yuandanduihuan').updateOne({uid: call.uid, type: 'yuandanduihuan'}, { + $inc: {[`record.${gift.id}`]: 1}, + }, {upsert: true}) + + call.succ({}) + + HongDianChange.sendChangeKey(call.uid, ['yuandan']); +} diff --git a/src/api_s2c/event/yuandan/ApiExchangeOpen.ts b/src/api_s2c/event/yuandan/ApiExchangeOpen.ts new file mode 100644 index 0000000..36910a4 --- /dev/null +++ b/src/api_s2c/event/yuandan/ApiExchangeOpen.ts @@ -0,0 +1,10 @@ +import {ApiCall} from "tsrpc"; +import {ReqExchangeOpen, ResExchangeOpen} from "../../../shared/protocols/event/yuandan/PtlExchangeOpen"; + +export default async function (call: ApiCall) { + let data = await G.mongodb.cEvent('yuandanduihuan').findOne({uid: call.uid, type: 'yuandanduihuan'}) + + call.succ({ + record: data?.record || {}, + }) +} \ No newline at end of file diff --git a/src/api_s2c/event/yuandan/ApiTaskFinish.ts b/src/api_s2c/event/yuandan/ApiTaskFinish.ts new file mode 100644 index 0000000..d0af2c9 --- /dev/null +++ b/src/api_s2c/event/yuandan/ApiTaskFinish.ts @@ -0,0 +1,40 @@ +import { ApiCall } from "tsrpc"; +import { ReqTaskRec, ResTaskRec } from "../../../shared/protocols/event/christmas/PtlTaskRec"; +import {Christmasfun} from "./fun"; +import {HongDianChange} from "../../hongdian/fun"; +import {PlayerFun} from "../../../public/player"; + +export default async function (call: ApiCall) { + let initCon = await Christmasfun.getCon(call) + let taskid = call.req.taskid; + let _con = initCon[call.req.hdid].data.task[taskid]; + if (!_con) { + // 任务id 不存在 + return call.error('', { code: -1, message: globalThis.lng.yangchengmubiao_2 }) + } + let _mydata = await Christmasfun.getMyData(call, call.req.hdid) + if (_mydata.taskval[taskid] < _con.pval) { + // 任务未完成 + return call.error('', { code: -2, message: globalThis.lng.yangchengmubiao_3 }) + } + if (_mydata.taskfinish.includes(taskid)) { + // 任务已领取 + return call.error('', { code: -3, message: globalThis.lng.yangchengmubiao_4 }) + } + _mydata.taskfinish.push(taskid) + let _addval = _con.addval + let _setData = {} + _mydata["val"] += _addval + _setData["val"] = _mydata.val + _setData["taskfinish"] = _mydata.taskfinish + await Christmasfun.setMyData(call.uid, call.req.hdid, { $set: _setData }) + let _prize = _con.prize + + await PlayerFun.sendPrize(call, _prize); + let changedata = { mydata: _mydata, prize: _prize} + // 推送红点 + HongDianChange.sendChangeKey(call.uid, ['huodonghd']); + call.succ(changedata); + + +} \ No newline at end of file diff --git a/src/api_s2c/event/yuandan/ApiTaskOpen.ts b/src/api_s2c/event/yuandan/ApiTaskOpen.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/api_s2c/event/yuandan/ApiZLOpen.ts b/src/api_s2c/event/yuandan/ApiZLOpen.ts new file mode 100644 index 0000000..ebbdc52 --- /dev/null +++ b/src/api_s2c/event/yuandan/ApiZLOpen.ts @@ -0,0 +1,16 @@ +import {ApiCall} from "tsrpc"; +import {ReqZLOpen, ResZLOpen} from "../../../shared/protocols/event/yuandan/PtlZLOpen"; +import {HuoDongFun} from "../../../public/huodongfun"; +import {PayFun} from "../../../public/pay"; + +export default async function (call: ApiCall) { + let data = await G.mongodb.cEvent('yuandanzengli').findOne({uid: call.uid, type: 'yuandanzengli'}) + + let _hd = (await HuoDongFun.gethdList(call, 14))[0] + + let payIds = _hd?.data?.gift?.filter(i => i.payId)?.map(i => i.payId) + + call.succ({ + record: data?.record || {}, + }) +} \ 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..27624bd --- /dev/null +++ b/src/api_s2c/event/yuandan/ApiZLRec.ts @@ -0,0 +1,27 @@ +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"; + +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('yuandandamo').findOne({uid: call.uid, type: 'yuandandamo'}) + let rec = data?.record?.[call.req.id] + if (rec && rec >= gift?.buyNum) return call.errorCode(-2) + + await PlayerFun.sendPrize(call, gift.prize); + + await G.mongodb.cEvent('yuandandamo').updateOne({uid: call.uid, type: 'yuandandamo'}, { + $inc: {[`record.${gift.id}`]: 1}, + }, {upsert: true}) + + call.succ({}) + + 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..7ac4168 --- /dev/null +++ b/src/api_s2c/event/yuandan/fun.ts @@ -0,0 +1,214 @@ +import {ApiCall} from 'tsrpc'; +import {ReqAddHuoDong} from '../../../monopoly/protocols/PtlAddHuoDong'; +import {HuoDongFun} from '../../../public/huodongfun'; +import {christmas} from '../../../shared/protocols/event/christmas/PtlOpen'; +import {PublicShared} from '../../../shared/public/public'; +import {PlayerFun} from "../../../public/player"; + +export class Yuandanfun { + /**配置 */ + static async getCon(call: ApiCall) { + let _con: { [id: string]: ReqAddHuoDong } = {} + let _hd = await HuoDongFun.gethdList(call, 8) + for (let index = 0; index < _hd.length; index++) { + const element = _hd[index]; + if (element && element._id) delete element._id + _con[element.hdid] = element + } + return _con + } + + /**获取所有符合时间的活动 */ + static async gethdids(call: ApiCall) { + let _hdids = [] + let _hd = await HuoDongFun.gethdList(call, 8) + for (let index = 0; index < _hd.length; index++) { + const element = _hd[index]; + _hdids.push(element.hdid) + } + return _hdids + } + + /**获取我的数据 */ + static async getMyData(call: ApiCall, hdid: number) { + let db: any = await G.mongodb.cEvent(`christmas${hdid}`).findOne({ + uid: call.uid, + type: `christmas${hdid}`, + hdid: hdid + }); + if (!db) { + db = await this.initData(call, hdid) + await G.mongodb.cEvent(`christmas${hdid}`).updateOne( + {uid: call.uid, type: `christmas${hdid}`, hdid: hdid}, + {$set: db}, + {upsert: true} + ) + } + let {_id, ..._myData} = db + if (!PublicShared.chkSameDate(_myData.refresh, G.time)) { + // 刷新每日任务 + _myData = await this.refreTask(call, _myData, hdid) + + } + return _myData + } + + /**初始数据 */ + static async initData(call: ApiCall, hdid: number) { + let _initCon = await this.getCon(call) + let _con = _initCon[hdid] + let _r: christmas = { + type: `christmas${hdid}`, + uid: call.uid, + hdid: hdid, + taskval: await this.getTaskVal(call, hdid), + taskfinish: [], + refresh: G.time, + gamenum: 0, + pt: [], + gj: [], + pay: false, + select: {}, + val: 0, + qiandao: [], + libao: {} + } + return _r + } + + /**设置数据 */ + static async setMyData(uid: string, hdid: number, set: {}) { + await G.mongodb.cEvent(`christmas${hdid}`).updateOne( + {uid: uid, type: `christmas${hdid}`, hdid: hdid}, + set + ) + } + + /**获取所有taskid 及对应的值 */ + static async getTaskVal(call: ApiCall, hdid: number) { + let _initCon = await this.getCon(call) + let _tasks = _initCon[hdid].data.task + let _res = {} + for (let index = 0; index < Object.keys(_tasks).length; index++) { + const element = Object.keys(_tasks)[index]; + let _tmp = _tasks[element] + _tmp["id"] = element + // 每日登录直接完成 + if (element == "1") { + _res[element] = 1 + } else { + _res[element] = 0 + } + + + } + return _res + } + + /**刷新每日任务 */ + static async refreTask(call: ApiCall, mydata: christmas, hdid: number) { + let _initCon = await this.getCon(call) + let _con = _initCon[hdid].data.task + if (!_con) return mydata + mydata.taskfinish = [] + mydata.taskval = await this.getTaskVal(call, hdid) + mydata.refresh = G.time + mydata.gamenum = 0 + mydata.libao = {} + await this.setMyData(call.uid, hdid, { + $set: { + refresh: mydata.refresh, + taskfinish: mydata.taskfinish, + taskval: mydata.taskval, + gamenum: mydata.gamenum, + libao: mydata.libao + } + }) + return mydata + } + + static async payChristmas(payid, call: any) { + let _hd = await HuoDongFun.gethdList(call, 8) + for (let index = 0; index < _hd.length; index++) { + const hdinfo = _hd[index]; + const _hdid = hdinfo.hdid + if (payid == hdinfo.data.zlpayid) { + let _mydata = await Yuandanfun.getMyData(call, _hdid) + if (_mydata.pay) continue + await this.setMyData(call.uid, _hdid, {$set: {pay: true}}) + // let _prize = hdinfo.data.zlpayprize + // await PlayerFun.sendPrize(call, _prize); + } else { + const libaos = hdinfo.data.libao + for (let index = 0; index < Object.keys(libaos).length; index++) { + const lbid = Object.keys(libaos)[index]; + let _tmp = libaos[lbid] + if (_tmp['payid'] != payid) continue + let _mydata = await Yuandanfun.getMyData(call, _hdid) + let _buyNum = _mydata.libao[lbid] || 0 + if (_buyNum >= _tmp["buynum"]) continue + _mydata.libao[lbid] = _buyNum + 1 + this.setMyData(call.uid, _hdid, {$set: {libao: _mydata.libao}}) + let _select = _mydata.select[lbid] || {} + let _prize: atn[] = _tmp["basep"] + for (let key in _select) { + _prize.push(_tmp["dlz"][parseInt(key)][_select[key]]) + } + await PlayerFun.sendPrize(call, _prize); + break + + } + } + } + } + + + /**设置任务 */ + static async setTaskVal(call: ApiCall, stype: number, val: number, chkCall: Function, chkval: number = 0, isinc: number = 0, alchangeVal: Function, arg) { + let hdids = await this.gethdids(call) + if (hdids.length <= 0) return // 活动过期，不计数 + let _initCon = await this.getCon(call) + + for (let index = 0; index < hdids.length; index++) { + const hdid = hdids[index]; + // let _mydata = await Christmasfun.getMyData(call, hdid) + let _tasks = _initCon[hdid].data.task + + let _setData = { + $inc: {}, + $set: {} + } + let isset = 0 + for (let indextask = 0; indextask < Object.keys(_tasks).length; indextask++) { + const ele = Object.keys(_tasks)[indextask]; + // 具体任务配置 + let _taskCon = _tasks[ele] + if (_taskCon.stype != stype) continue + + let _pval = _taskCon.pval + // 不符合任务要求 + if (!(await chkCall(_taskCon["cond"], chkval, arg))) continue + + // 根据需求改写 + val = await alchangeVal(call, _taskCon, val, arg) + + isset = 1 + if (isinc == 1) { // 累加 + _setData["$inc"][`taskval.${ele}`] = val + } else { + _setData["$set"][`taskval.${ele}`] = val + } + } + + // 设置任务 + if (isset == 1) { + await G.mongodb.collection('event').updateMany( + {uid: call.uid, type: {$regex: "christmas"}, hdid: parseInt(hdid)}, + _setData + ) + } + } + } + + +} diff --git a/src/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/module/collection_event.ts b/src/module/collection_event.ts index 6e47a03..3e1418a 100644 --- a/src/module/collection_event.ts +++ b/src/module/collection_event.ts @@ -57,6 +57,11 @@ export type eventType = { payForDiamond: { [time: number]: number } + yuandandingzhi: ResOpenZhoumolibao & { refreshTime: number; }; + yuandanduihuan: ResOpenZhoumolibao & { refreshTime: number; }; + yuandandamo: ResOpenZhoumolibao & { refreshTime: number; }; + yuandanzengli: ResOpenZhoumolibao & { refreshTime: number; }; + } & { [k: `${number}jijin`]: ResOpenYuedujijin; [k: `yangchengmubiao${number}`]: yangchengmubiao; @@ -67,6 +72,7 @@ export type eventType = { [k: `leijichongzhi${number}`]: Omit; [k: `qiridenglu${number}`]: Pick; [k: `leichonglibao${number}`]: ResOpenLeiChongLiBao & { opentime: number }; + [k: `yuandan${number}`]: christmas; }; export type CollectionEvent = { diff --git a/src/public/pay.ts b/src/public/pay.ts index b1302b5..884798a 100644 --- a/src/public/pay.ts +++ b/src/public/pay.ts @@ -233,12 +233,21 @@ export class PayFun { prize.push(...conf.prize) } //圣诞节活动充值 - try{ + try { await Christmasfun.payChristmas(payId, call); - }catch (e) { - console.log("Christmasfun.payChristmas Error",e); + } catch (e) { + console.log("Christmasfun.payChristmas Error", e); } + /** + * 如果是自选奖励，payArgs里传入自选项，直接发奖 + * 在check里判断拦截自选项的奖励 + */ + if (payArgs.selectPrize) { + prize.push(...payArgs.selectPrize) + } + + let isReplaceConf = await this.checkBuysAfterPay(uid, payId, conf, payArgs, player) if (isReplaceConf) { let prizePayId = `zuanshi_${conf.money}` diff --git a/src/shared/protocols/event/yuandan/PtlDMOpen.ts b/src/shared/protocols/event/yuandan/PtlDMOpen.ts new file mode 100644 index 0000000..0724ba5 --- /dev/null +++ b/src/shared/protocols/event/yuandan/PtlDMOpen.ts @@ -0,0 +1,13 @@ + +/** + * 元旦达摩 + */ +export type ReqDMOpen = { + +}; + +export type ResDMOpen = { + record:{ + [k: string]: any; + } +}; \ No newline at end of file diff --git a/src/shared/protocols/event/yuandan/PtlDMRec.ts b/src/shared/protocols/event/yuandan/PtlDMRec.ts new file mode 100644 index 0000000..5aa6964 --- /dev/null +++ b/src/shared/protocols/event/yuandan/PtlDMRec.ts @@ -0,0 +1,11 @@ + +/** + * 元旦达摩领奖 + */ +export type ReqDMRec = { + id: string +} + +export type ResDMRec = { + +} diff --git a/src/shared/protocols/event/yuandan/PtlDZOpen.ts b/src/shared/protocols/event/yuandan/PtlDZOpen.ts new file mode 100644 index 0000000..ef0f7b2 --- /dev/null +++ b/src/shared/protocols/event/yuandan/PtlDZOpen.ts @@ -0,0 +1,16 @@ + +/** + * 元旦定制 + */ +export type ReqDZOpen = { + +}; + +export type ResDZOpen = { + record:{ + [k: string]: any; + } + buyLog:{ + [k: string]: any; + } +}; \ No newline at end of file diff --git a/src/shared/protocols/event/yuandan/PtlDZRec.ts b/src/shared/protocols/event/yuandan/PtlDZRec.ts new file mode 100644 index 0000000..1942987 --- /dev/null +++ b/src/shared/protocols/event/yuandan/PtlDZRec.ts @@ -0,0 +1,10 @@ +/** + * 元旦定制领奖 + */ +export type ReqDZRec = { + id: string +} + +export type ResDZRec = { + +} 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/PtlExchangeOpen.ts b/src/shared/protocols/event/yuandan/PtlExchangeOpen.ts new file mode 100644 index 0000000..ca3afad --- /dev/null +++ b/src/shared/protocols/event/yuandan/PtlExchangeOpen.ts @@ -0,0 +1,12 @@ +/** + * 元旦兑换 + */ +export type ReqExchangeOpen = { + +} + +export type ResExchangeOpen = { + record:{ + [k: string]: any; + } +} diff --git a/src/shared/protocols/event/yuandan/PtlZLOpen.ts b/src/shared/protocols/event/yuandan/PtlZLOpen.ts new file mode 100644 index 0000000..f8e1829 --- /dev/null +++ b/src/shared/protocols/event/yuandan/PtlZLOpen.ts @@ -0,0 +1,13 @@ + +/** + * 元旦赠礼 + */ +export type ReqZLOpen = { + +}; + +export type ResZLOpen = { + record:{ + [k: string]: any; + } +}; \ No newline at end of file diff --git a/src/shared/protocols/event/yuandan/PtlZLRec.ts b/src/shared/protocols/event/yuandan/PtlZLRec.ts new file mode 100644 index 0000000..3152d3a --- /dev/null +++ b/src/shared/protocols/event/yuandan/PtlZLRec.ts @@ -0,0 +1,11 @@ + +/** + * 元旦赠礼领奖 + */ +export type ReqZLRec = { + id: string +} + +export type ResZLRec = { + +} 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 2afc7e8..9d4a22e 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -94,6 +94,14 @@ 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 { ReqDMOpen, ResDMOpen } from './event/yuandan/PtlDMOpen'; +import { ReqDMRec, ResDMRec } from './event/yuandan/PtlDMRec'; +import { ReqDZOpen, ResDZOpen } from './event/yuandan/PtlDZOpen'; +import { ReqDZRec, ResDZRec } from './event/yuandan/PtlDZRec'; +import { ReqExchange, ResExchange } from './event/yuandan/PtlExchange'; +import { ReqExchangeOpen, ResExchangeOpen } from './event/yuandan/PtlExchangeOpen'; +import { ReqZLOpen, ResZLOpen } from './event/yuandan/PtlZLOpen'; +import { ReqZLRec, ResZLRec } from './event/yuandan/PtlZLRec'; import { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } from './event/yuedujijin/PtlOpen'; import { ReqRec as ReqRec_10, ResRec as ResRec_10 } from './event/yuedujijin/PtlRec'; import { ReqBuyLv, ResBuyLv } from './event/zhanling/PtlBuyLv'; @@ -325,7 +333,7 @@ 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 { ReqExchange as ReqExchange_1, ResExchange as ResExchange_1 } from './weixiuchang/PtlExchange'; import { ReqOpen as ReqOpen_60, ResOpen as ResOpen_60 } from './weixiuchang/PtlOpen'; import { ReqUpLv, ResUpLv } from './weixiuchang/PtlUpLv'; import { ReqUpStar, ResUpStar } from './weixiuchang/PtlUpStar'; @@ -735,6 +743,38 @@ export interface ServiceType { req: ReqRecAll, res: ResRecAll }, + "event/yuandan/DMOpen": { + req: ReqDMOpen, + res: ResDMOpen + }, + "event/yuandan/DMRec": { + req: ReqDMRec, + res: ResDMRec + }, + "event/yuandan/DZOpen": { + req: ReqDZOpen, + res: ResDZOpen + }, + "event/yuandan/DZRec": { + req: ReqDZRec, + res: ResDZRec + }, + "event/yuandan/Exchange": { + req: ReqExchange, + res: ResExchange + }, + "event/yuandan/ExchangeOpen": { + req: ReqExchangeOpen, + res: ResExchangeOpen + }, + "event/yuandan/ZLOpen": { + req: ReqZLOpen, + res: ResZLOpen + }, + "event/yuandan/ZLRec": { + req: ReqZLRec, + res: ResZLRec + }, "event/yuedujijin/Open": { req: ReqOpen_27, res: ResOpen_27 @@ -1544,8 +1584,8 @@ export interface ServiceType { res: ResDecompose }, "weixiuchang/Exchange": { - req: ReqExchange, - res: ResExchange + req: ReqExchange_1, + res: ResExchange_1 }, "weixiuchang/Open": { req: ReqOpen_60, @@ -2164,6 +2204,46 @@ export const serviceProto: ServiceProto = { }, { "id": 95, + "name": "event/yuandan/DMOpen", + "type": "api" + }, + { + "id": 96, + "name": "event/yuandan/DMRec", + "type": "api" + }, + { + "id": 97, + "name": "event/yuandan/DZOpen", + "type": "api" + }, + { + "id": 98, + "name": "event/yuandan/DZRec", + "type": "api" + }, + { + "id": 99, + "name": "event/yuandan/Exchange", + "type": "api" + }, + { + "id": 100, + "name": "event/yuandan/ExchangeOpen", + "type": "api" + }, + { + "id": 101, + "name": "event/yuandan/ZLOpen", + "type": "api" + }, + { + "id": 102, + "name": "event/yuandan/ZLRec", + "type": "api" + }, + { + "id": 103, "name": "event/yuedujijin/Open", "type": "api", "conf": { @@ -2171,157 +2251,157 @@ export const serviceProto: ServiceProto = { } }, { - "id": 96, + "id": 104, "name": "event/yuedujijin/Rec", "type": "api" }, { - "id": 97, + "id": 105, "name": "event/zhanling/BuyLv", "type": "api" }, { - "id": 98, + "id": 106, "name": "event/zhanling/Open", "type": "api" }, { - "id": 99, + "id": 107, "name": "event/zhanling/RecPrize", "type": "api" }, { - "id": 100, + "id": 108, "name": "event/zhanling/RecTask", "type": "api" }, { - "id": 101, + "id": 109, "name": "event/zhoulibao/Open", "type": "api" }, { - "id": 102, + "id": 110, "name": "event/zhoumolibao/Open", "type": "api" }, { - "id": 103, + "id": 111, "name": "event/zhoumolibao/Receive", "type": "api" }, { - "id": 104, + "id": 112, "name": "event/zixuanlibao/Buy", "type": "api" }, { - "id": 105, + "id": 113, "name": "event/zixuanlibao/Open", "type": "api" }, { - "id": 106, + "id": 114, "name": "eventlist/hdGetList", "type": "api" }, { - "id": 107, + "id": 115, "name": "friend/Apply", "type": "api" }, { - "id": 108, + "id": 116, "name": "friend/Del", "type": "api" }, { - "id": 109, + "id": 117, "name": "friend/Gift", "type": "api" }, { - "id": 110, + "id": 118, "name": "friend/List", "type": "api" }, { - "id": 111, + "id": 119, "name": "friend/Open", "type": "api" }, { - "id": 112, + "id": 120, "name": "friend/Respond", "type": "api" }, { - "id": 113, + "id": 121, "name": "friend/RmBlackList", "type": "api" }, { - "id": 114, + "id": 122, "name": "friend/Search", "type": "api" }, { - "id": 115, + "id": 123, "name": "ganbutexun/Challenge", "type": "api" }, { - "id": 116, + "id": 124, "name": "ganbutexun/Open", "type": "api" }, { - "id": 117, + "id": 125, "name": "ganhai/Fast", "type": "api" }, { - "id": 118, + "id": 126, "name": "ganhai/Fight", "type": "api" }, { - "id": 119, + "id": 127, "name": "ganhai/Log", "type": "api" }, { - "id": 120, + "id": 128, "name": "ganhai/Open", "type": "api" }, { - "id": 121, + "id": 129, "name": "ganhai/Refresh", "type": "api" }, { - "id": 122, + "id": 130, "name": "ganhai/RefreshShip", "type": "api" }, { - "id": 123, + "id": 131, "name": "ganhai/Select", "type": "api" }, { - "id": 124, + "id": 132, "name": "gmapi/Gift", "type": "api" }, { - "id": 125, + "id": 133, "name": "gmapi/Post", "type": "api" }, { - "id": 126, + "id": 134, "name": "gonghui/Apply", "type": "api", "conf": { @@ -2331,7 +2411,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 127, + "id": 135, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2341,7 +2421,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 128, + "id": 136, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2351,7 +2431,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 129, + "id": 137, "name": "gonghui/Change", "type": "api", "conf": { @@ -2361,12 +2441,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 130, + "id": 138, "name": "gonghui/Create", "type": "api" }, { - "id": 131, + "id": 139, "name": "gonghui/Dissolve", "type": "api", "conf": { @@ -2376,7 +2456,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 132, + "id": 140, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2386,12 +2466,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 133, + "id": 141, "name": "gonghui/FbBuyNum", "type": "api" }, { - "id": 134, + "id": 142, "name": "gonghui/FbFight", "type": "api", "conf": { @@ -2401,7 +2481,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 135, + "id": 143, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2411,17 +2491,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 136, + "id": 144, "name": "gonghui/GetList", "type": "api" }, { - "id": 137, + "id": 145, "name": "gonghui/Join", "type": "api" }, { - "id": 138, + "id": 146, "name": "gonghui/Jx", "type": "api", "conf": { @@ -2431,7 +2511,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 139, + "id": 147, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2441,7 +2521,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 140, + "id": 148, "name": "gonghui/List", "type": "api", "conf": { @@ -2451,7 +2531,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 141, + "id": 149, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2461,7 +2541,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 142, + "id": 150, "name": "gonghui/Open", "type": "api", "conf": { @@ -2471,7 +2551,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 143, + "id": 151, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2481,7 +2561,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 144, + "id": 152, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2491,7 +2571,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 145, + "id": 153, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2501,7 +2581,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 146, + "id": 154, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2511,137 +2591,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 147, + "id": 155, "name": "gonghuibaozang/Lottery", "type": "api" }, { - "id": 148, + "id": 156, "name": "gonghuibaozang/Open", "type": "api" }, { - "id": 149, + "id": 157, "name": "gonglukuangbiao/Buy", "type": "api" }, { - "id": 150, + "id": 158, "name": "gonglukuangbiao/Fight", "type": "api" }, { - "id": 151, + "id": 159, "name": "gonglukuangbiao/Open", "type": "api" }, { - "id": 152, + "id": 160, "name": "gonglukuangbiao/Refresh", "type": "api" }, { - "id": 153, + "id": 161, "name": "gongyu/mingdao/Active", "type": "api" }, { - "id": 154, + "id": 162, "name": "gongyu/mingdao/Open", "type": "api" }, { - "id": 155, + "id": 163, "name": "gongyu/mingdao/RecPrize", "type": "api" }, { - "id": 156, + "id": 164, "name": "gongyu/mingdao/Repair", "type": "api" }, { - "id": 157, + "id": 165, "name": "gongyu/xunlianjihua/Reset", "type": "api" }, { - "id": 158, + "id": 166, "name": "gongyu/xunlianjihua/UpSkill", "type": "api" }, { - "id": 159, + "id": 167, "name": "gongyu/zuozhanjihua/SetSkill", "type": "api" }, { - "id": 160, + "id": 168, "name": "hbzb/jfs/BuyNum", "type": "api" }, { - "id": 161, + "id": 169, "name": "hbzb/jfs/Fight", "type": "api" }, { - "id": 162, + "id": 170, "name": "hbzb/jfs/GetLog", "type": "api" }, { - "id": 163, + "id": 171, "name": "hbzb/jfs/Open", "type": "api" }, { - "id": 164, + "id": 172, "name": "hbzb/jfs/Rec", "type": "api" }, { - "id": 165, + "id": 173, "name": "hbzb/jfs/Refresh", "type": "api" }, { - "id": 166, + "id": 174, "name": "hbzb/GetStatus", "type": "api" }, { - "id": 167, + "id": 175, "name": "hbzb/zbs/BuyNum", "type": "api" }, { - "id": 168, + "id": 176, "name": "hbzb/zbs/Fight", "type": "api" }, { - "id": 169, + "id": 177, "name": "hbzb/zbs/GetLog", "type": "api" }, { - "id": 170, + "id": 178, "name": "hbzb/zbs/Open", "type": "api" }, { - "id": 171, + "id": 179, "name": "hbzb/zbs/Refresh", "type": "api" }, { - "id": 172, + "id": 180, "name": "hero/Awake", "type": "api" }, { - "id": 173, + "id": 181, "name": "hero/ChangePos", "type": "api", "conf": { @@ -2649,17 +2729,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 174, + "id": 182, "name": "hero/GetList", "type": "api" }, { - "id": 175, + "id": 183, "name": "hero/JinJie", "type": "api" }, { - "id": 176, + "id": 184, "name": "hero/LvUp", "type": "api", "conf": { @@ -2667,32 +2747,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 177, + "id": 185, "name": "hero/Potency", "type": "api" }, { - "id": 178, + "id": 186, "name": "hero/Rec", "type": "api" }, { - "id": 179, + "id": 187, "name": "hero/Reset", "type": "api" }, { - "id": 180, + "id": 188, "name": "hero/Talent", "type": "api" }, { - "id": 181, + "id": 189, "name": "hero/WeaponUp", "type": "api" }, { - "id": 182, + "id": 190, "name": "hongdian/Get", "type": "api", "conf": { @@ -2700,117 +2780,117 @@ export const serviceProto: ServiceProto = { } }, { - "id": 183, + "id": 191, "name": "item/GetList", "type": "api" }, { - "id": 184, + "id": 192, "name": "item/Use", "type": "api" }, { - "id": 185, + "id": 193, "name": "jiaotang/Lottery", "type": "api" }, { - "id": 186, + "id": 194, "name": "jiaotang/Open", "type": "api" }, { - "id": 187, + "id": 195, "name": "jiuba/Lottery", "type": "api" }, { - "id": 188, + "id": 196, "name": "jiuba/Open", "type": "api" }, { - "id": 189, + "id": 197, "name": "jjc/BuyFightNum", "type": "api" }, { - "id": 190, + "id": 198, "name": "jjc/Fight", "type": "api" }, { - "id": 191, + "id": 199, "name": "jjc/FightLog", "type": "api" }, { - "id": 192, + "id": 200, "name": "jjc/Open", "type": "api" }, { - "id": 193, + "id": 201, "name": "jjc/Receive", "type": "api" }, { - "id": 194, + "id": 202, "name": "jjc/Refresh", "type": "api" }, { - "id": 195, + "id": 203, "name": "kaifujingsai/Open", "type": "api" }, { - "id": 196, + "id": 204, "name": "kaifujingsai/Receive", "type": "api" }, { - "id": 197, + "id": 205, "name": "kbzz/Apply", "type": "api" }, { - "id": 198, + "id": 206, "name": "kbzz/AutoApply", "type": "api" }, { - "id": 199, + "id": 207, "name": "kbzz/BuyNum", "type": "api" }, { - "id": 200, + "id": 208, "name": "kbzz/Fight", "type": "api" }, { - "id": 201, + "id": 209, "name": "kbzz/FightLog", "type": "api" }, { - "id": 202, + "id": 210, "name": "kbzz/GroupState", "type": "api" }, { - "id": 203, + "id": 211, "name": "kbzz/Open", "type": "api" }, { - "id": 204, + "id": 212, "name": "kbzz/RecPrize", "type": "api" }, { - "id": 205, + "id": 213, "name": "kbzz/Refresh", "type": "api", "conf": { @@ -2818,287 +2898,287 @@ export const serviceProto: ServiceProto = { } }, { - "id": 206, + "id": 214, "name": "kuangdong/AddPkNum", "type": "api" }, { - "id": 207, + "id": 215, "name": "kuangdong/GetPrize", "type": "api" }, { - "id": 208, + "id": 216, "name": "kuangdong/KdInfo", "type": "api" }, { - "id": 209, + "id": 217, "name": "kuangdong/Log", "type": "api" }, { - "id": 210, + "id": 218, "name": "kuangdong/Open", "type": "api" }, { - "id": 211, + "id": 219, "name": "kuangdong/YanShi", "type": "api" }, { - "id": 212, + "id": 220, "name": "kuangdong/ZhanLing", "type": "api" }, { - "id": 213, + "id": 221, "name": "lingzhulaixi/Open", "type": "api" }, { - "id": 214, + "id": 222, "name": "lingzhulaixi/PkBoss", "type": "api" }, { - "id": 215, + "id": 223, "name": "lingzhulaixi/PkRank", "type": "api" }, { - "id": 216, + "id": 224, "name": "lingzhulaixi/SaoDang", "type": "api" }, { - "id": 217, + "id": 225, "name": "meirishilian/Buy", "type": "api" }, { - "id": 218, + "id": 226, "name": "meirishilian/Fight", "type": "api" }, { - "id": 219, + "id": 227, "name": "meirishilian/Open", "type": "api" }, { - "id": 220, + "id": 228, "name": "msg_c2s/BindUid", "type": "msg" }, { - "id": 221, + "id": 229, "name": "msg_c2s/Pay", "type": "msg" }, { - "id": 222, + "id": 230, "name": "msg_c2s/Sync", "type": "msg" }, { - "id": 223, + "id": 231, "name": "msg_s2c/Chat", "type": "msg" }, { - "id": 224, + "id": 232, "name": "msg_s2c/ChatHelp", "type": "msg" }, { - "id": 225, + "id": 233, "name": "msg_s2c/Collection", "type": "msg" }, { - "id": 226, + "id": 234, "name": "msg_s2c/Email", "type": "msg" }, { - "id": 227, + "id": 235, "name": "msg_s2c/EmailDel", "type": "msg" }, { - "id": 228, + "id": 236, "name": "msg_s2c/EquipChange", "type": "msg" }, { - "id": 229, + "id": 237, "name": "msg_s2c/Friend", "type": "msg" }, { - "id": 230, + "id": 238, "name": "msg_s2c/GhChange", "type": "msg" }, { - "id": 231, + "id": 239, "name": "msg_s2c/GongHuiBaoZang", "type": "msg" }, { - "id": 232, + "id": 240, "name": "msg_s2c/HeroChange", "type": "msg" }, { - "id": 233, + "id": 241, "name": "msg_s2c/HongDianChange", "type": "msg" }, { - "id": 234, + "id": 242, "name": "msg_s2c/ItemChange", "type": "msg" }, { - "id": 235, + "id": 243, "name": "msg_s2c/LoginQueue", "type": "msg" }, { - "id": 236, + "id": 244, "name": "msg_s2c/LshdChange", "type": "msg" }, { - "id": 237, + "id": 245, "name": "msg_s2c/NewDay", "type": "msg" }, { - "id": 238, + "id": 246, "name": "msg_s2c/OtherLogin", "type": "msg" }, { - "id": 239, + "id": 247, "name": "msg_s2c/PayChange", "type": "msg" }, { - "id": 240, + "id": 248, "name": "msg_s2c/PayResult", "type": "msg" }, { - "id": 241, + "id": 249, "name": "msg_s2c/PeijianChange", "type": "msg" }, { - "id": 242, + "id": 250, "name": "msg_s2c/PlayerChange", "type": "msg" }, { - "id": 243, + "id": 251, "name": "msg_s2c/Private", "type": "msg" }, { - "id": 244, + "id": 252, "name": "msg_s2c/PushGiftChange", "type": "msg" }, { - "id": 245, + "id": 253, "name": "msg_s2c/SendGift", "type": "msg" }, { - "id": 246, + "id": 254, "name": "msg_s2c/ShiwuChange", "type": "msg" }, { - "id": 247, + "id": 255, "name": "msg_s2c/TaskChange", "type": "msg" }, { - "id": 248, + "id": 256, "name": "msg_s2c/Xianshilibao", "type": "msg" }, { - "id": 249, + "id": 257, "name": "pata/Fight", "type": "api" }, { - "id": 250, + "id": 258, "name": "pata/GetPrize", "type": "api" }, { - "id": 251, + "id": 259, "name": "pata/Open", "type": "api" }, { - "id": 252, + "id": 260, "name": "pata/SaoDang", "type": "api" }, { - "id": 253, + "id": 261, "name": "pay/GetList", "type": "api" }, { - "id": 254, + "id": 262, "name": "peijian/GetList", "type": "api" }, { - "id": 255, + "id": 263, "name": "peijian/JingLian", "type": "api" }, { - "id": 256, + "id": 264, "name": "peijian/JinJie", "type": "api" }, { - "id": 257, + "id": 265, "name": "peijian/LvUp", "type": "api" }, { - "id": 258, + "id": 266, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 259, + "id": 267, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 260, + "id": 268, "name": "peijian/Reset", "type": "api" }, { - "id": 261, + "id": 269, "name": "peijian/Rm", "type": "api" }, { - "id": 262, + "id": 270, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3106,32 +3186,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 263, + "id": 271, "name": "peijian/UnLock", "type": "api" }, { - "id": 264, + "id": 272, "name": "peijian/Wear", "type": "api" }, { - "id": 265, + "id": 273, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 266, + "id": 274, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 267, + "id": 275, "name": "peijiancangku/Open", "type": "api" }, { - "id": 268, + "id": 276, "name": "Bingo", "type": "api", "conf": { @@ -3139,147 +3219,147 @@ export const serviceProto: ServiceProto = { } }, { - "id": 269, + "id": 277, "name": "FightTest", "type": "api" }, { - "id": 270, + "id": 278, "name": "SyncBtn", "type": "api" }, { - "id": 271, + "id": 279, "name": "Test", "type": "api" }, { - "id": 272, + "id": 280, "name": "pushgift/ItemNoEnough", "type": "api" }, { - "id": 273, + "id": 281, "name": "pushgift/Open", "type": "api" }, { - "id": 274, + "id": 282, "name": "qjzzd/Fight", "type": "api" }, { - "id": 275, + "id": 283, "name": "qjzzd/Open", "type": "api" }, { - "id": 276, + "id": 284, "name": "rank/Open", "type": "api" }, { - "id": 277, + "id": 285, "name": "shiwu/Concise", "type": "api" }, { - "id": 278, + "id": 286, "name": "shiwu/Extract", "type": "api" }, { - "id": 279, + "id": 287, "name": "shiwu/GetList", "type": "api" }, { - "id": 280, + "id": 288, "name": "shiwu/LvUp", "type": "api" }, { - "id": 281, + "id": 289, "name": "shiwu/Recast", "type": "api" }, { - "id": 282, + "id": 290, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 283, + "id": 291, "name": "shiwu/Wear", "type": "api" }, { - "id": 284, + "id": 292, "name": "shootGame/Open", "type": "api" }, { - "id": 285, + "id": 293, "name": "shootGame/Rec", "type": "api" }, { - "id": 286, + "id": 294, "name": "shop/Buy", "type": "api" }, { - "id": 287, + "id": 295, "name": "shop/Open", "type": "api" }, { - "id": 288, + "id": 296, "name": "shop/Refresh", "type": "api" }, { - "id": 289, + "id": 297, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 290, + "id": 298, "name": "sign/GetPrize", "type": "api" }, { - "id": 291, + "id": 299, "name": "sign/Open", "type": "api" }, { - "id": 292, + "id": 300, "name": "slzd/Aim", "type": "api" }, { - "id": 293, + "id": 301, "name": "slzd/BuyNum", "type": "api" }, { - "id": 294, + "id": 302, "name": "slzd/Fight", "type": "api" }, { - "id": 295, + "id": 303, "name": "slzd/FightLog", "type": "api" }, { - "id": 296, + "id": 304, "name": "slzd/MyRank", "type": "api" }, { - "id": 297, + "id": 305, "name": "slzd/Open", "type": "api", "conf": { @@ -3289,77 +3369,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 298, + "id": 306, "name": "slzd/OpenFort", "type": "api" }, { - "id": 299, + "id": 307, "name": "slzd/Rec", "type": "api" }, { - "id": 300, + "id": 308, "name": "slzd/Refresh", "type": "api" }, { - "id": 301, + "id": 309, "name": "slzd/Slot", "type": "api" }, { - "id": 302, + "id": 310, "name": "tanxian/Event", "type": "api" }, { - "id": 303, + "id": 311, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 304, + "id": 312, "name": "tanxian/Fight", "type": "api" }, { - "id": 305, + "id": 313, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 306, + "id": 314, "name": "tanxian/Open", "type": "api" }, { - "id": 307, + "id": 315, "name": "tanxian/Receive", "type": "api" }, { - "id": 308, + "id": 316, "name": "task/AllFinsh", "type": "api" }, { - "id": 309, + "id": 317, "name": "task/Finsh", "type": "api" }, { - "id": 310, + "id": 318, "name": "task/Open", "type": "api" }, { - "id": 311, + "id": 319, "name": "user/CDKEY", "type": "api" }, { - "id": 312, + "id": 320, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3367,202 +3447,202 @@ export const serviceProto: ServiceProto = { } }, { - "id": 313, + "id": 321, "name": "user/ChangeName", "type": "api" }, { - "id": 314, + "id": 322, "name": "user/Dot", "type": "api" }, { - "id": 315, + "id": 323, "name": "user/Fight", "type": "api" }, { - "id": 316, + "id": 324, "name": "user/GetInfo", "type": "api" }, { - "id": 317, + "id": 325, "name": "user/InfoOpen", "type": "api" }, { - "id": 318, + "id": 326, "name": "user/Login", "type": "api" }, { - "id": 319, + "id": 327, "name": "user/Ping", "type": "api" }, { - "id": 320, + "id": 328, "name": "user/Renown", "type": "api" }, { - "id": 321, + "id": 329, "name": "user/RenownBuy", "type": "api" }, { - "id": 322, + "id": 330, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 323, + "id": 331, "name": "user/RenownOpen", "type": "api" }, { - "id": 324, + "id": 332, "name": "user/Tujian", "type": "api" }, { - "id": 325, + "id": 333, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 326, + "id": 334, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 327, + "id": 335, "name": "weixiuchang/Open", "type": "api" }, { - "id": 328, + "id": 336, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 329, + "id": 337, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 330, + "id": 338, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 331, + "id": 339, "name": "wzry/BaoMing", "type": "api" }, { - "id": 332, + "id": 340, "name": "wzry/catFightLog", "type": "api" }, { - "id": 333, + "id": 341, "name": "wzry/CatGroup", "type": "api" }, { - "id": 334, + "id": 342, "name": "wzry/DldFight", "type": "api" }, { - "id": 335, + "id": 343, "name": "wzry/DldRefre", "type": "api" }, { - "id": 336, + "id": 344, "name": "wzry/JingCai", "type": "api" }, { - "id": 337, + "id": 345, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 338, + "id": 346, "name": "wzry/Open", "type": "api" }, { - "id": 339, + "id": 347, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 340, + "id": 348, "name": "wzry/Wzzd", "type": "api" }, { - "id": 341, + "id": 349, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 342, + "id": 350, "name": "xstask/AllGet", "type": "api" }, { - "id": 343, + "id": 351, "name": "xstask/Get", "type": "api" }, { - "id": 344, + "id": 352, "name": "xstask/LvUp", "type": "api" }, { - "id": 345, + "id": 353, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 346, + "id": 354, "name": "xstask/Open", "type": "api" }, { - "id": 347, + "id": 355, "name": "xstask/Receive", "type": "api" }, { - "id": 348, + "id": 356, "name": "xstask/Refresh", "type": "api" }, { - "id": 349, + "id": 357, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 350, + "id": 358, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 351, + "id": 359, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 352, + "id": 360, "name": "zhanqianbushu/Up", "type": "api" } @@ -11338,6 +11418,163 @@ export const serviceProto: ServiceProto = { } ] }, + "event/yuandan/PtlDMOpen/ReqDMOpen": { + "type": "Interface" + }, + "event/yuandan/PtlDMOpen/ResDMOpen": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "record", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" + } + } + } + } + ] + }, + "event/yuandan/PtlDMRec/ReqDMRec": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "id", + "type": { + "type": "String" + } + } + ] + }, + "event/yuandan/PtlDMRec/ResDMRec": { + "type": "Interface" + }, + "event/yuandan/PtlDZOpen/ReqDZOpen": { + "type": "Interface" + }, + "event/yuandan/PtlDZOpen/ResDZOpen": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "record", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" + } + } + } + }, + { + "id": 1, + "name": "buyLog", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" + } + } + } + } + ] + }, + "event/yuandan/PtlDZRec/ReqDZRec": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "id", + "type": { + "type": "String" + } + } + ] + }, + "event/yuandan/PtlDZRec/ResDZRec": { + "type": "Interface" + }, + "event/yuandan/PtlExchange/ReqExchange": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "id", + "type": { + "type": "String" + } + } + ] + }, + "event/yuandan/PtlExchange/ResExchange": { + "type": "Interface" + }, + "event/yuandan/PtlExchangeOpen/ReqExchangeOpen": { + "type": "Interface" + }, + "event/yuandan/PtlExchangeOpen/ResExchangeOpen": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "record", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" + } + } + } + } + ] + }, + "event/yuandan/PtlZLOpen/ReqZLOpen": { + "type": "Interface" + }, + "event/yuandan/PtlZLOpen/ResZLOpen": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "record", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" + } + } + } + } + ] + }, + "event/yuandan/PtlZLRec/ReqZLRec": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "id", + "type": { + "type": "String" + } + } + ] + }, + "event/yuandan/PtlZLRec/ResZLRec": { + "type": "Interface" + }, "event/yuedujijin/PtlOpen/ReqOpen": { "type": "Interface", "properties": [ @@ -15331,6 +15568,13 @@ export const serviceProto: ServiceProto = { "type": "Literal", "literal": "leichonglibao" } + }, + { + "id": 40, + "type": { + "type": "Literal", + "literal": "yuandan" + } } ] }, From cba4f4563d1aced1ebe6869d394544818f6af9fe Mon Sep 17 00:00:00 2001 From: dy Date: Mon, 25 Dec 2023 14:00:30 +0800 Subject: [PATCH 02/37] json --- src/json/attr.json | 20 ++ src/json/dixiaheishi.json5 | 1 + src/json/huodong.json5 | 569 ++++++++++++++++++++++++++++++++++++- src/json/openCond.json | 13 + src/json/shop.json | 12 + 5 files changed, 614 insertions(+), 1 deletion(-) diff --git a/src/json/attr.json b/src/json/attr.json index d9f5ad4..0c99340 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/dixiaheishi.json5 b/src/json/dixiaheishi.json5 index c8c23fd..97b7c29 100644 --- a/src/json/dixiaheishi.json5 +++ b/src/json/dixiaheishi.json5 @@ -33,6 +33,7 @@ }, //136礼包 '136Gift': [ + { payId: '136Gift1', prize: [], bonus: [{"a": "attr", "t": "jingxuanbi", "n": 10}] }, { prize: [{"a": "attr", "t": "rmbmoney", "n": 10},{"a": "item", "t": "12", "n": 10},{"a": "attr", "t": "jinbi", "n": 10000}] }, { payId: '136Gift2', prize: [], bonus: [{"a": "attr", "t": "jingxuanbi", "n": 10}] }, { payId: '136Gift3', prize: [], bonus: [{"a": "attr", "t": "jingxuanbi", "n": 10}] }, diff --git a/src/json/huodong.json5 b/src/json/huodong.json5 index 5caa64d..417fc76 100644 --- a/src/json/huodong.json5 +++ b/src/json/huodong.json5 @@ -4283,5 +4283,572 @@ } } } - } + }, + { + "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": [ + { 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 }, + { 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 }, + { 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 }, + { 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 }, + { 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 }, + { 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 } + ], + //活动礼包 + "libao": { + "1": { + "payid": "", + "buynum": 1, + //固定奖励 + "basep": [{"a": "attr", "t":"rmbmoney", "n": 100}], + "des" : "intr_cszl_des_10", + //自选池 + "dlz": [ + { + "1": {"a": "attr", "t":"jinbi", "n": 100000}, + "2": {"a": "item", "t":"1", "n": 50000} + } + ] + }, + "2": { + "payid": "pay_name_sdhd_libao_2", + "buynum": 2, + "basep": [{"a": "attr", "t":"rmbmoney", "n": 120}], + "des" : "intr_cszl_des_11", + "dlz": [ + { + "1": {"a": "item", "t":"2", "n": 400}, + "2": {"a": "item", "t":"12", "n": 200} + }, + { + "1": {"a": "attr", "t":"jinbi", "n": 1000000}, + "2": {"a": "item", "t":"1", "n": 500000} + } + ] + }, + "3": { + "payid": "pay_name_sdhd_libao_3", + "buynum": 2, + "basep": [{"a": "attr", "t":"rmbmoney", "n": 300}], + "des" : "intr_cszl_des_12", + "dlz": [ + { + "1": {"a": "item", "t":"9", "n": 500}, + "2": {"a": "item", "t":"10", "n": 100} + }, + { + "1": {"a": "item", "t":"9", "n": 500}, + "2": {"a": "item", "t":"10", "n": 100} + }, + { + "1": {"a": "item", "t":"9", "n": 500}, + "2": {"a": "item", "t":"10", "n": 100} + } + ] + }, + "4": { + "payid": "pay_name_sdhd_libao_4", + "buynum": 5, + "basep": [{"a": "attr", "t":"rmbmoney", "n": 680}], + "des" : "intr_cszl_des_12", + "dlz": [ + { + "1": {"a": "item", "t":"615", "n": 1}, + "2": {"a": "item", "t":"18", "n": 200} + }, + { + "1": {"a": "item", "t":"615", "n": 1}, + "2": {"a": "item", "t":"18", "n": 200} + }, + { + "1": {"a": "item", "t":"615", "n": 1}, + "2": {"a": "item", "t":"18", "n": 200} + } + ] + }, + "5": { + "payid": "pay_name_sdhd_libao_5", + "buynum": 9, + "basep": [{"a": "attr", "t":"rmbmoney", "n": 1280}], + "des" : "intr_cszl_des_13", + "dlz": [ + { + "1": {"a": "item", "t":"600", "n": 10}, + "2": {"a": "item", "t":"605", "n": 2}, + "3": {"a": "item", "t":"606", "n": 1} + }, + { + "1": {"a": "item", "t":"600", "n": 10}, + "2": {"a": "item", "t":"605", "n": 2}, + "3": {"a": "item", "t":"606", "n": 1} + }, + { + "1": {"a": "item", "t":"1", "n": 5000000}, + "2": {"a": "attr", "t":"jinbi", "n": 10000000} + } + ] + }, + "6": { + "payid": "pay_name_sdhd_libao_6", + "buynum": 9, + "basep": [{"a": "attr", "t":"rmbmoney", "n": 3280}], + "des" : "intr_cszl_des_14", + "dlz": [ + { + "1": {"a": "item", "t":"600", "n": 20}, + "2": {"a": "item", "t":"5002", "n": 10}, + "3": {"a": "item", "t":"5004", "n": 10} + }, + { + "1": {"a": "item", "t":"600", "n": 20}, + "2": {"a": "item", "t":"5002", "n": 10}, + "3": {"a": "item", "t":"5004", "n": 10} + }, + { + "1": {"a": "item", "t":"1", "n": 10000000}, + "2": {"a": "item", "t":"12", "n": 1000}, + "3": {"a": "item", "t":"2", "n": 2000}, + "4": {"a": "item", "t":"18", "n": 500} + } + ] + }, + "7": { + "payid": "pay_name_sdhd_libao_7", + "buynum": 9, + "basep": [{"a": "attr", "t":"rmbmoney", "n": 6480}], + "des" : "intr_cszl_des_14", + "dlz": [ + { + "1": {"a": "item", "t":"600", "n": 30}, + "2": {"a": "item", "t":"5002", "n": 20}, + "3": {"a": "item", "t":"5004", "n": 20} + }, + { + "1": {"a": "item", "t":"600", "n": 30}, + "2": {"a": "item", "t":"5002", "n": 20}, + "3": {"a": "item", "t":"5004", "n": 20} + }, + { + "1": {"a": "item", "t":"605", "n": 4}, + "2": {"a": "item", "t":"606", "n": 2}, + "3": {"a": "item", "t":"18", "n": 1000}, + "4": {"a": "item", "t":"23", "n": 1000000} + } + ] + }, + }, + //签到奖励 + "qiandao": [ + { + "1": { + //固定奖励 + "basep": [{"a": "attr", "t":"rmbmoney", "n": 100}], + "des" : "intr_cszl_des_10", + //自选池 + "dlz": [ + { + "1": {"a": "attr", "t":"jinbi", "n": 100000}, + "2": {"a": "item", "t":"1", "n": 50000} + } + ] + }, + "2": { + "basep": [{"a": "attr", "t":"rmbmoney", "n": 120}], + "des" : "intr_cszl_des_11", + "dlz": [ + { + "1": {"a": "item", "t":"2", "n": 400}, + "2": {"a": "item", "t":"12", "n": 200} + }, + { + "1": {"a": "attr", "t":"jinbi", "n": 1000000}, + "2": {"a": "item", "t":"1", "n": 500000} + } + ] + }, + "3": { + "basep": [{"a": "attr", "t":"rmbmoney", "n": 300}], + "des" : "intr_cszl_des_12", + "dlz": [ + { + "1": {"a": "item", "t":"9", "n": 500}, + "2": {"a": "item", "t":"10", "n": 100} + }, + { + "1": {"a": "item", "t":"9", "n": 500}, + "2": {"a": "item", "t":"10", "n": 100} + }, + { + "1": {"a": "item", "t":"9", "n": 500}, + "2": {"a": "item", "t":"10", "n": 100} + } + ] + }, + "4": { + "basep": [{"a": "attr", "t":"rmbmoney", "n": 680}], + "des" : "intr_cszl_des_12", + "dlz": [ + { + "1": {"a": "item", "t":"615", "n": 1}, + "2": {"a": "item", "t":"18", "n": 200} + }, + { + "1": {"a": "item", "t":"615", "n": 1}, + "2": {"a": "item", "t":"18", "n": 200} + }, + { + "1": {"a": "item", "t":"615", "n": 1}, + "2": {"a": "item", "t":"18", "n": 200} + } + ] + }, + "5": { + "basep": [{"a": "attr", "t":"rmbmoney", "n": 1280}], + "des" : "intr_cszl_des_13", + "dlz": [ + { + "1": {"a": "item", "t":"600", "n": 10}, + "2": {"a": "item", "t":"605", "n": 2}, + "3": {"a": "item", "t":"606", "n": 1} + }, + { + "1": {"a": "item", "t":"600", "n": 10}, + "2": {"a": "item", "t":"605", "n": 2}, + "3": {"a": "item", "t":"606", "n": 1} + }, + { + "1": {"a": "item", "t":"1", "n": 5000000}, + "2": {"a": "attr", "t":"jinbi", "n": 10000000} + } + ] + }, + "6": { + "basep": [{"a": "attr", "t":"rmbmoney", "n": 3280}], + "des" : "intr_cszl_des_14", + "dlz": [ + { + "1": {"a": "item", "t":"600", "n": 20}, + "2": {"a": "item", "t":"5002", "n": 10}, + "3": {"a": "item", "t":"5004", "n": 10} + }, + { + "1": {"a": "item", "t":"600", "n": 20}, + "2": {"a": "item", "t":"5002", "n": 10}, + "3": {"a": "item", "t":"5004", "n": 10} + }, + { + "1": {"a": "item", "t":"1", "n": 10000000}, + "2": {"a": "item", "t":"12", "n": 1000}, + "3": {"a": "item", "t":"2", "n": 2000}, + "4": {"a": "item", "t":"18", "n": 500} + } + ] + }, + "7": { + "basep": [{"a": "attr", "t":"rmbmoney", "n": 6480}], + "des" : "intr_cszl_des_14", + "dlz": [ + { + "1": {"a": "item", "t":"600", "n": 30}, + "2": {"a": "item", "t":"5002", "n": 20}, + "3": {"a": "item", "t":"5004", "n": 20} + }, + { + "1": {"a": "item", "t":"600", "n": 30}, + "2": {"a": "item", "t":"5002", "n": 20}, + "3": {"a": "item", "t":"5004", "n": 20} + }, + { + "1": {"a": "item", "t":"605", "n": 4}, + "2": {"a": "item", "t":"606", "n": 2}, + "3": {"a": "item", "t":"18", "n": 1000}, + "4": {"a": "item", "t":"23", "n": 1000000} + } + ] + } + } + ] + } + } ] \ No newline at end of file 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/shop.json b/src/json/shop.json index 4e0b020..c27331a 100644 --- a/src/json/shop.json +++ b/src/json/shop.json @@ -2,6 +2,7 @@ "1": { "id": 1, "type": 1, + "version": 1, "name": "wsw_wz_zhsd", "undefined": "杂货店", "openCond": [ @@ -46,6 +47,7 @@ "2": { "id": 2, "type": 5, + "version": 1, "name": "wsw_wz_slsd", "undefined": "势力商店", "openCond": [ @@ -84,6 +86,7 @@ "3": { "id": 3, "type": 6, + "version": 1, "name": "wsw_wz_zzsd", "undefined": "战争商店", "openCond": [ @@ -125,6 +128,7 @@ "4": { "id": 4, "type": 7, + "version": 1, "name": "wsw_wz_spsd", "undefined": "饰品商店", "openCond": [ @@ -169,6 +173,7 @@ "5": { "id": 5, "type": 2, + "version": 1, "name": "intr_shop_name_5", "undefined": "杂货", "openCond": [ @@ -208,6 +213,7 @@ "6": { "id": 6, "type": 2, + "version": 1, "name": "intr_shop_name_6", "undefined": "紫装", "openCond": [ @@ -264,6 +270,7 @@ "8": { "id": 8, "type": 3, + "version": 1, "name": "wsw_wz_rcsc", "undefined": "人才市场", "openCond": [ @@ -327,6 +334,7 @@ "9": { "id": 9, "type": 4, + "version": 1, "name": "wsw_wz_pjsd", "undefined": "配件商店", "openCond": [ @@ -384,6 +392,7 @@ "10": { "id": 10, "type": 8, + "version": 1, "name": "wsw_wz_rysd", "undefined": "荣誉商店", "openCond": [ @@ -427,6 +436,7 @@ "11": { "id": 11, "type": 9, + "version": 1, "name": "wsw_wz_jgsd", "undefined": "军功商店", "openCond": [ @@ -468,6 +478,7 @@ "12": { "id": 12, "type": 11, + "version": 1, "name": "wsw_wz_ltsd", "undefined": "擂台商店", "openCond": [ @@ -499,6 +510,7 @@ "13": { "id": 13, "type": 12, + "version": 1, "name": "wsw_wz_mrjxdh", "undefined": "每日精选兑换商店", "openCond": [ From 1d6143794c5d2483d1f38ef26ff0b2fa6bd45723 Mon Sep 17 00:00:00 2001 From: dy Date: Mon, 25 Dec 2023 17:13:59 +0800 Subject: [PATCH 03/37] =?UTF-8?q?=E5=85=83=E6=97=A6=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/yuandan/{ApiDMOpen.ts => ApiOpen.ts} | 9 +++------ src/api_s2c/event/yuandan/fun.ts | 11 +++-------- src/shared/protocols/event/yuandan/PtlDMOpen.ts | 2 +- src/shared/protocols/serviceProto.ts | 2 +- 4 files changed, 8 insertions(+), 16 deletions(-) rename src/api_s2c/event/yuandan/{ApiDMOpen.ts => ApiOpen.ts} (54%) diff --git a/src/api_s2c/event/yuandan/ApiDMOpen.ts b/src/api_s2c/event/yuandan/ApiOpen.ts similarity index 54% rename from src/api_s2c/event/yuandan/ApiDMOpen.ts rename to src/api_s2c/event/yuandan/ApiOpen.ts index c0c659a..a22e2cc 100644 --- a/src/api_s2c/event/yuandan/ApiDMOpen.ts +++ b/src/api_s2c/event/yuandan/ApiOpen.ts @@ -2,15 +2,12 @@ import {ApiCall} from "tsrpc"; import {ReqDMOpen, ResDMOpen} from "../../../shared/protocols/event/yuandan/PtlDMOpen"; import {HuoDongFun} from "../../../public/huodongfun"; import {PayFun} from "../../../public/pay"; +import {Yuandanfun} from "./fun"; export default async function (call: ApiCall) { - let data = await G.mongodb.cEvent('yuandandamo').findOne({uid: call.uid, type: 'yuandandamo'}) - - let _hd = (await HuoDongFun.gethdList(call, 14))[0] - - let payIds = _hd?.data?.gift?.filter(i => i.payId)?.map(i => i.payId) + let _hd = await Yuandanfun.getCon(call) call.succ({ - record: data?.record || {} + data: (await G.mongodb.cEvent(`yuandan${_hd.hdid}`).findOne({uid: call.uid, type: 'yuandandamo'})) || {} }) } \ No newline at end of file diff --git a/src/api_s2c/event/yuandan/fun.ts b/src/api_s2c/event/yuandan/fun.ts index 7ac4168..7612211 100644 --- a/src/api_s2c/event/yuandan/fun.ts +++ b/src/api_s2c/event/yuandan/fun.ts @@ -8,14 +8,9 @@ import {PlayerFun} from "../../../public/player"; export class Yuandanfun { /**配置 */ static async getCon(call: ApiCall) { - let _con: { [id: string]: ReqAddHuoDong } = {} - let _hd = await HuoDongFun.gethdList(call, 8) - for (let index = 0; index < _hd.length; index++) { - const element = _hd[index]; - if (element && element._id) delete element._id - _con[element.hdid] = element - } - return _con + let _hd = (await HuoDongFun.gethdList(call, 14))[0] + if (!_hd) return call.errorCode(-1) + return _hd } /**获取所有符合时间的活动 */ diff --git a/src/shared/protocols/event/yuandan/PtlDMOpen.ts b/src/shared/protocols/event/yuandan/PtlDMOpen.ts index 0724ba5..d4f06ef 100644 --- a/src/shared/protocols/event/yuandan/PtlDMOpen.ts +++ b/src/shared/protocols/event/yuandan/PtlDMOpen.ts @@ -7,7 +7,7 @@ export type ReqDMOpen = { }; export type ResDMOpen = { - record:{ + data:{ [k: string]: any; } }; \ No newline at end of file diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 9d4a22e..e6a6bff 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -11426,7 +11426,7 @@ export const serviceProto: ServiceProto = { "properties": [ { "id": 0, - "name": "record", + "name": "myData", "type": { "type": "Interface", "indexSignature": { From 5486c2adf7a4a3651879283531b2c528609aea52 Mon Sep 17 00:00:00 2001 From: dy Date: Mon, 25 Dec 2023 18:03:15 +0800 Subject: [PATCH 04/37] json --- src/json/attr.json | 2 +- src/json/clsl_com.json5 | 6 +- src/json/dixiaheishi.json5 | 1 - src/json/g123item.json | 48 +- src/json/huodong.json5 | 88 ++- src/json/item.json | 28 +- src/json/pay.json | 206 ++++++- .../protocols/event/yuandan/PtlDMOpen.ts | 13 - src/shared/protocols/serviceProto.ts | 559 +++++++++--------- 9 files changed, 587 insertions(+), 364 deletions(-) delete mode 100644 src/shared/protocols/event/yuandan/PtlDMOpen.ts diff --git a/src/json/attr.json b/src/json/attr.json index 0c99340..6c07a87 100644 --- a/src/json/attr.json +++ b/src/json/attr.json @@ -142,7 +142,7 @@ "weiwang": { "id": "weiwang", "name": "intr_attr_name_16", - "undefined": "威望", + "undefined": "影响力", "colour": 4, "icon": "icon_weiwang", "sicon": "icon_weiwang", 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/dixiaheishi.json5 b/src/json/dixiaheishi.json5 index 97b7c29..c8c23fd 100644 --- a/src/json/dixiaheishi.json5 +++ b/src/json/dixiaheishi.json5 @@ -33,7 +33,6 @@ }, //136礼包 '136Gift': [ - { payId: '136Gift1', prize: [], bonus: [{"a": "attr", "t": "jingxuanbi", "n": 10}] }, { prize: [{"a": "attr", "t": "rmbmoney", "n": 10},{"a": "item", "t": "12", "n": 10},{"a": "attr", "t": "jinbi", "n": 10000}] }, { payId: '136Gift2', prize: [], bonus: [{"a": "attr", "t": "jingxuanbi", "n": 10}] }, { payId: '136Gift3', prize: [], bonus: [{"a": "attr", "t": "jingxuanbi", "n": 10}] }, 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 417fc76..b004311 100644 --- a/src/json/huodong.json5 +++ b/src/json/huodong.json5 @@ -485,7 +485,12 @@ free: false, payId: 'ycmb_5_1', buyNum: 1, - prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 60},{'a': 'item', 't': '21', 'n': 200} ] + dlz: [ + { + "1": {'a': 'attr', 't': 'rmbmoney', 'n': 60}, + "2": {'a': 'item', 't': '21', 'n': 200} + } + ] }, { index: 2, @@ -493,7 +498,12 @@ free: false, payId: 'ycmb_5_2', buyNum: 2, - prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 300},{'a': 'item', 't': '21', 'n': 600} ] + dlz: [ + { + "1":{'a': 'attr', 't': 'rmbmoney', 'n': 300}, + "2":{'a': 'item', 't': '21', 'n': 600} + } + ] }, { index: 3, @@ -501,7 +511,12 @@ free: false, payId: 'ycmb_5_3', buyNum: 2, - prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 680},{'a': 'item', 't': '21', 'n': 1500} ] + dlz: [ + { + "1":{'a': 'attr', 't': 'rmbmoney', 'n': 680}, + "2":{'a': 'item', 't': '21', 'n': 1500} + } + ] }, { index: 4, @@ -509,7 +524,12 @@ free: false, payId: 'ycmb_5_4', buyNum: 2, - prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 1280},{'a': 'item', 't': '21', 'n': 2500} ] + dlz: [ + { + "1":{'a': 'attr', 't': 'rmbmoney', 'n': 1280}, + "2":{'a': 'item', 't': '21', 'n': 2500} + } + ] }, { index: 5, @@ -517,7 +537,12 @@ free: false, payId: 'ycmb_5_5', buyNum: 3, - prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 3280},{'a': 'item', 't': '21', 'n': 6000} ] + dlz: [ + { + "1":{'a': 'attr', 't': 'rmbmoney', 'n': 3280}, + "2":{'a': 'item', 't': '21', 'n': 6000} + } + ] }, { index: 6, @@ -525,7 +550,12 @@ free: false, payId: 'ycmb_5_6', buyNum: 3, - prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 6480},{'a': 'item', 't': '21', 'n': 12000} ] + dlz: [ + { + "1":{'a': 'attr', 't': 'rmbmoney', 'n': 6480}, + "2":{'a': 'item', 't': '21', 'n': 12000} + } + ] } ], //任务相关 type 1 每日任务（每天刷新） 2 活动任务（轮数） 3 每日登录 4-一次性任务 任务hdid一定要唯一 @@ -4576,12 +4606,12 @@ { 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 } ], //活动礼包 - "libao": { - "1": { + "gift": [ + { "payid": "", "buynum": 1, //固定奖励 - "basep": [{"a": "attr", "t":"rmbmoney", "n": 100}], + "prize": [{"a": "attr", "t":"rmbmoney", "n": 100}], "des" : "intr_cszl_des_10", //自选池 "dlz": [ @@ -4591,10 +4621,10 @@ } ] }, - "2": { + { "payid": "pay_name_sdhd_libao_2", "buynum": 2, - "basep": [{"a": "attr", "t":"rmbmoney", "n": 120}], + "prize": [{"a": "attr", "t":"rmbmoney", "n": 120}], "des" : "intr_cszl_des_11", "dlz": [ { @@ -4607,10 +4637,10 @@ } ] }, - "3": { + { "payid": "pay_name_sdhd_libao_3", "buynum": 2, - "basep": [{"a": "attr", "t":"rmbmoney", "n": 300}], + "prize": [{"a": "attr", "t":"rmbmoney", "n": 300}], "des" : "intr_cszl_des_12", "dlz": [ { @@ -4627,10 +4657,10 @@ } ] }, - "4": { + { "payid": "pay_name_sdhd_libao_4", "buynum": 5, - "basep": [{"a": "attr", "t":"rmbmoney", "n": 680}], + "prize": [{"a": "attr", "t":"rmbmoney", "n": 680}], "des" : "intr_cszl_des_12", "dlz": [ { @@ -4647,10 +4677,10 @@ } ] }, - "5": { + { "payid": "pay_name_sdhd_libao_5", "buynum": 9, - "basep": [{"a": "attr", "t":"rmbmoney", "n": 1280}], + "prize": [{"a": "attr", "t":"rmbmoney", "n": 1280}], "des" : "intr_cszl_des_13", "dlz": [ { @@ -4669,10 +4699,10 @@ } ] }, - "6": { + { "payid": "pay_name_sdhd_libao_6", "buynum": 9, - "basep": [{"a": "attr", "t":"rmbmoney", "n": 3280}], + "prize": [{"a": "attr", "t":"rmbmoney", "n": 3280}], "des" : "intr_cszl_des_14", "dlz": [ { @@ -4693,10 +4723,10 @@ } ] }, - "7": { + { "payid": "pay_name_sdhd_libao_7", "buynum": 9, - "basep": [{"a": "attr", "t":"rmbmoney", "n": 6480}], + "prize": [{"a": "attr", "t":"rmbmoney", "n": 6480}], "des" : "intr_cszl_des_14", "dlz": [ { @@ -4717,13 +4747,13 @@ } ] }, - }, + ], //签到奖励 "qiandao": [ { "1": { //固定奖励 - "basep": [{"a": "attr", "t":"rmbmoney", "n": 100}], + "prize": [{"a": "attr", "t":"rmbmoney", "n": 100}], "des" : "intr_cszl_des_10", //自选池 "dlz": [ @@ -4734,7 +4764,7 @@ ] }, "2": { - "basep": [{"a": "attr", "t":"rmbmoney", "n": 120}], + "prize": [{"a": "attr", "t":"rmbmoney", "n": 120}], "des" : "intr_cszl_des_11", "dlz": [ { @@ -4748,7 +4778,7 @@ ] }, "3": { - "basep": [{"a": "attr", "t":"rmbmoney", "n": 300}], + "prize": [{"a": "attr", "t":"rmbmoney", "n": 300}], "des" : "intr_cszl_des_12", "dlz": [ { @@ -4766,7 +4796,7 @@ ] }, "4": { - "basep": [{"a": "attr", "t":"rmbmoney", "n": 680}], + "prize": [{"a": "attr", "t":"rmbmoney", "n": 680}], "des" : "intr_cszl_des_12", "dlz": [ { @@ -4784,7 +4814,7 @@ ] }, "5": { - "basep": [{"a": "attr", "t":"rmbmoney", "n": 1280}], + "prize": [{"a": "attr", "t":"rmbmoney", "n": 1280}], "des" : "intr_cszl_des_13", "dlz": [ { @@ -4804,7 +4834,7 @@ ] }, "6": { - "basep": [{"a": "attr", "t":"rmbmoney", "n": 3280}], + "prize": [{"a": "attr", "t":"rmbmoney", "n": 3280}], "des" : "intr_cszl_des_14", "dlz": [ { @@ -4826,7 +4856,7 @@ ] }, "7": { - "basep": [{"a": "attr", "t":"rmbmoney", "n": 6480}], + "prize": [{"a": "attr", "t":"rmbmoney", "n": 6480}], "des" : "intr_cszl_des_14", "dlz": [ { 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/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/shared/protocols/event/yuandan/PtlDMOpen.ts b/src/shared/protocols/event/yuandan/PtlDMOpen.ts deleted file mode 100644 index d4f06ef..0000000 --- a/src/shared/protocols/event/yuandan/PtlDMOpen.ts +++ /dev/null @@ -1,13 +0,0 @@ - -/** - * 元旦达摩 - */ -export type ReqDMOpen = { - -}; - -export type ResDMOpen = { - data:{ - [k: string]: any; - } -}; \ No newline at end of file diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index e6a6bff..a9f23a3 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -94,7 +94,6 @@ 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 { ReqDMOpen, ResDMOpen } from './event/yuandan/PtlDMOpen'; import { ReqDMRec, ResDMRec } from './event/yuandan/PtlDMRec'; import { ReqDZOpen, ResDZOpen } from './event/yuandan/PtlDZOpen'; import { ReqDZRec, ResDZRec } from './event/yuandan/PtlDZRec'; @@ -743,10 +742,6 @@ export interface ServiceType { req: ReqRecAll, res: ResRecAll }, - "event/yuandan/DMOpen": { - req: ReqDMOpen, - res: ResDMOpen - }, "event/yuandan/DMRec": { req: ReqDMRec, res: ResDMRec @@ -2204,46 +2199,41 @@ export const serviceProto: ServiceProto = { }, { "id": 95, - "name": "event/yuandan/DMOpen", - "type": "api" - }, - { - "id": 96, "name": "event/yuandan/DMRec", "type": "api" }, { - "id": 97, + "id": 96, "name": "event/yuandan/DZOpen", "type": "api" }, { - "id": 98, + "id": 97, "name": "event/yuandan/DZRec", "type": "api" }, { - "id": 99, + "id": 98, "name": "event/yuandan/Exchange", "type": "api" }, { - "id": 100, + "id": 99, "name": "event/yuandan/ExchangeOpen", "type": "api" }, { - "id": 101, + "id": 100, "name": "event/yuandan/ZLOpen", "type": "api" }, { - "id": 102, + "id": 101, "name": "event/yuandan/ZLRec", "type": "api" }, { - "id": 103, + "id": 102, "name": "event/yuedujijin/Open", "type": "api", "conf": { @@ -2251,157 +2241,157 @@ export const serviceProto: ServiceProto = { } }, { - "id": 104, + "id": 103, "name": "event/yuedujijin/Rec", "type": "api" }, { - "id": 105, + "id": 104, "name": "event/zhanling/BuyLv", "type": "api" }, { - "id": 106, + "id": 105, "name": "event/zhanling/Open", "type": "api" }, { - "id": 107, + "id": 106, "name": "event/zhanling/RecPrize", "type": "api" }, { - "id": 108, + "id": 107, "name": "event/zhanling/RecTask", "type": "api" }, { - "id": 109, + "id": 108, "name": "event/zhoulibao/Open", "type": "api" }, { - "id": 110, + "id": 109, "name": "event/zhoumolibao/Open", "type": "api" }, { - "id": 111, + "id": 110, "name": "event/zhoumolibao/Receive", "type": "api" }, { - "id": 112, + "id": 111, "name": "event/zixuanlibao/Buy", "type": "api" }, { - "id": 113, + "id": 112, "name": "event/zixuanlibao/Open", "type": "api" }, { - "id": 114, + "id": 113, "name": "eventlist/hdGetList", "type": "api" }, { - "id": 115, + "id": 114, "name": "friend/Apply", "type": "api" }, { - "id": 116, + "id": 115, "name": "friend/Del", "type": "api" }, { - "id": 117, + "id": 116, "name": "friend/Gift", "type": "api" }, { - "id": 118, + "id": 117, "name": "friend/List", "type": "api" }, { - "id": 119, + "id": 118, "name": "friend/Open", "type": "api" }, { - "id": 120, + "id": 119, "name": "friend/Respond", "type": "api" }, { - "id": 121, + "id": 120, "name": "friend/RmBlackList", "type": "api" }, { - "id": 122, + "id": 121, "name": "friend/Search", "type": "api" }, { - "id": 123, + "id": 122, "name": "ganbutexun/Challenge", "type": "api" }, { - "id": 124, + "id": 123, "name": "ganbutexun/Open", "type": "api" }, { - "id": 125, + "id": 124, "name": "ganhai/Fast", "type": "api" }, { - "id": 126, + "id": 125, "name": "ganhai/Fight", "type": "api" }, { - "id": 127, + "id": 126, "name": "ganhai/Log", "type": "api" }, { - "id": 128, + "id": 127, "name": "ganhai/Open", "type": "api" }, { - "id": 129, + "id": 128, "name": "ganhai/Refresh", "type": "api" }, { - "id": 130, + "id": 129, "name": "ganhai/RefreshShip", "type": "api" }, { - "id": 131, + "id": 130, "name": "ganhai/Select", "type": "api" }, { - "id": 132, + "id": 131, "name": "gmapi/Gift", "type": "api" }, { - "id": 133, + "id": 132, "name": "gmapi/Post", "type": "api" }, { - "id": 134, + "id": 133, "name": "gonghui/Apply", "type": "api", "conf": { @@ -2411,7 +2401,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 135, + "id": 134, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2421,7 +2411,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 136, + "id": 135, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2431,7 +2421,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 137, + "id": 136, "name": "gonghui/Change", "type": "api", "conf": { @@ -2441,12 +2431,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 138, + "id": 137, "name": "gonghui/Create", "type": "api" }, { - "id": 139, + "id": 138, "name": "gonghui/Dissolve", "type": "api", "conf": { @@ -2456,7 +2446,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 140, + "id": 139, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2466,12 +2456,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 141, + "id": 140, "name": "gonghui/FbBuyNum", "type": "api" }, { - "id": 142, + "id": 141, "name": "gonghui/FbFight", "type": "api", "conf": { @@ -2481,7 +2471,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 143, + "id": 142, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2491,17 +2481,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 144, + "id": 143, "name": "gonghui/GetList", "type": "api" }, { - "id": 145, + "id": 144, "name": "gonghui/Join", "type": "api" }, { - "id": 146, + "id": 145, "name": "gonghui/Jx", "type": "api", "conf": { @@ -2511,7 +2501,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 147, + "id": 146, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2521,7 +2511,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 148, + "id": 147, "name": "gonghui/List", "type": "api", "conf": { @@ -2531,7 +2521,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 149, + "id": 148, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2541,7 +2531,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 150, + "id": 149, "name": "gonghui/Open", "type": "api", "conf": { @@ -2551,7 +2541,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 151, + "id": 150, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2561,7 +2551,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 152, + "id": 151, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2571,7 +2561,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 153, + "id": 152, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2581,7 +2571,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 154, + "id": 153, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2591,137 +2581,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 155, + "id": 154, "name": "gonghuibaozang/Lottery", "type": "api" }, { - "id": 156, + "id": 155, "name": "gonghuibaozang/Open", "type": "api" }, { - "id": 157, + "id": 156, "name": "gonglukuangbiao/Buy", "type": "api" }, { - "id": 158, + "id": 157, "name": "gonglukuangbiao/Fight", "type": "api" }, { - "id": 159, + "id": 158, "name": "gonglukuangbiao/Open", "type": "api" }, { - "id": 160, + "id": 159, "name": "gonglukuangbiao/Refresh", "type": "api" }, { - "id": 161, + "id": 160, "name": "gongyu/mingdao/Active", "type": "api" }, { - "id": 162, + "id": 161, "name": "gongyu/mingdao/Open", "type": "api" }, { - "id": 163, + "id": 162, "name": "gongyu/mingdao/RecPrize", "type": "api" }, { - "id": 164, + "id": 163, "name": "gongyu/mingdao/Repair", "type": "api" }, { - "id": 165, + "id": 164, "name": "gongyu/xunlianjihua/Reset", "type": "api" }, { - "id": 166, + "id": 165, "name": "gongyu/xunlianjihua/UpSkill", "type": "api" }, { - "id": 167, + "id": 166, "name": "gongyu/zuozhanjihua/SetSkill", "type": "api" }, { - "id": 168, + "id": 167, "name": "hbzb/jfs/BuyNum", "type": "api" }, { - "id": 169, + "id": 168, "name": "hbzb/jfs/Fight", "type": "api" }, { - "id": 170, + "id": 169, "name": "hbzb/jfs/GetLog", "type": "api" }, { - "id": 171, + "id": 170, "name": "hbzb/jfs/Open", "type": "api" }, { - "id": 172, + "id": 171, "name": "hbzb/jfs/Rec", "type": "api" }, { - "id": 173, + "id": 172, "name": "hbzb/jfs/Refresh", "type": "api" }, { - "id": 174, + "id": 173, "name": "hbzb/GetStatus", "type": "api" }, { - "id": 175, + "id": 174, "name": "hbzb/zbs/BuyNum", "type": "api" }, { - "id": 176, + "id": 175, "name": "hbzb/zbs/Fight", "type": "api" }, { - "id": 177, + "id": 176, "name": "hbzb/zbs/GetLog", "type": "api" }, { - "id": 178, + "id": 177, "name": "hbzb/zbs/Open", "type": "api" }, { - "id": 179, + "id": 178, "name": "hbzb/zbs/Refresh", "type": "api" }, { - "id": 180, + "id": 179, "name": "hero/Awake", "type": "api" }, { - "id": 181, + "id": 180, "name": "hero/ChangePos", "type": "api", "conf": { @@ -2729,17 +2719,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 182, + "id": 181, "name": "hero/GetList", "type": "api" }, { - "id": 183, + "id": 182, "name": "hero/JinJie", "type": "api" }, { - "id": 184, + "id": 183, "name": "hero/LvUp", "type": "api", "conf": { @@ -2747,32 +2737,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 185, + "id": 184, "name": "hero/Potency", "type": "api" }, { - "id": 186, + "id": 185, "name": "hero/Rec", "type": "api" }, { - "id": 187, + "id": 186, "name": "hero/Reset", "type": "api" }, { - "id": 188, + "id": 187, "name": "hero/Talent", "type": "api" }, { - "id": 189, + "id": 188, "name": "hero/WeaponUp", "type": "api" }, { - "id": 190, + "id": 189, "name": "hongdian/Get", "type": "api", "conf": { @@ -2780,117 +2770,117 @@ export const serviceProto: ServiceProto = { } }, { - "id": 191, + "id": 190, "name": "item/GetList", "type": "api" }, { - "id": 192, + "id": 191, "name": "item/Use", "type": "api" }, { - "id": 193, + "id": 192, "name": "jiaotang/Lottery", "type": "api" }, { - "id": 194, + "id": 193, "name": "jiaotang/Open", "type": "api" }, { - "id": 195, + "id": 194, "name": "jiuba/Lottery", "type": "api" }, { - "id": 196, + "id": 195, "name": "jiuba/Open", "type": "api" }, { - "id": 197, + "id": 196, "name": "jjc/BuyFightNum", "type": "api" }, { - "id": 198, + "id": 197, "name": "jjc/Fight", "type": "api" }, { - "id": 199, + "id": 198, "name": "jjc/FightLog", "type": "api" }, { - "id": 200, + "id": 199, "name": "jjc/Open", "type": "api" }, { - "id": 201, + "id": 200, "name": "jjc/Receive", "type": "api" }, { - "id": 202, + "id": 201, "name": "jjc/Refresh", "type": "api" }, { - "id": 203, + "id": 202, "name": "kaifujingsai/Open", "type": "api" }, { - "id": 204, + "id": 203, "name": "kaifujingsai/Receive", "type": "api" }, { - "id": 205, + "id": 204, "name": "kbzz/Apply", "type": "api" }, { - "id": 206, + "id": 205, "name": "kbzz/AutoApply", "type": "api" }, { - "id": 207, + "id": 206, "name": "kbzz/BuyNum", "type": "api" }, { - "id": 208, + "id": 207, "name": "kbzz/Fight", "type": "api" }, { - "id": 209, + "id": 208, "name": "kbzz/FightLog", "type": "api" }, { - "id": 210, + "id": 209, "name": "kbzz/GroupState", "type": "api" }, { - "id": 211, + "id": 210, "name": "kbzz/Open", "type": "api" }, { - "id": 212, + "id": 211, "name": "kbzz/RecPrize", "type": "api" }, { - "id": 213, + "id": 212, "name": "kbzz/Refresh", "type": "api", "conf": { @@ -2898,287 +2888,287 @@ export const serviceProto: ServiceProto = { } }, { - "id": 214, + "id": 213, "name": "kuangdong/AddPkNum", "type": "api" }, { - "id": 215, + "id": 214, "name": "kuangdong/GetPrize", "type": "api" }, { - "id": 216, + "id": 215, "name": "kuangdong/KdInfo", "type": "api" }, { - "id": 217, + "id": 216, "name": "kuangdong/Log", "type": "api" }, { - "id": 218, + "id": 217, "name": "kuangdong/Open", "type": "api" }, { - "id": 219, + "id": 218, "name": "kuangdong/YanShi", "type": "api" }, { - "id": 220, + "id": 219, "name": "kuangdong/ZhanLing", "type": "api" }, { - "id": 221, + "id": 220, "name": "lingzhulaixi/Open", "type": "api" }, { - "id": 222, + "id": 221, "name": "lingzhulaixi/PkBoss", "type": "api" }, { - "id": 223, + "id": 222, "name": "lingzhulaixi/PkRank", "type": "api" }, { - "id": 224, + "id": 223, "name": "lingzhulaixi/SaoDang", "type": "api" }, { - "id": 225, + "id": 224, "name": "meirishilian/Buy", "type": "api" }, { - "id": 226, + "id": 225, "name": "meirishilian/Fight", "type": "api" }, { - "id": 227, + "id": 226, "name": "meirishilian/Open", "type": "api" }, { - "id": 228, + "id": 227, "name": "msg_c2s/BindUid", "type": "msg" }, { - "id": 229, + "id": 228, "name": "msg_c2s/Pay", "type": "msg" }, { - "id": 230, + "id": 229, "name": "msg_c2s/Sync", "type": "msg" }, { - "id": 231, + "id": 230, "name": "msg_s2c/Chat", "type": "msg" }, { - "id": 232, + "id": 231, "name": "msg_s2c/ChatHelp", "type": "msg" }, { - "id": 233, + "id": 232, "name": "msg_s2c/Collection", "type": "msg" }, { - "id": 234, + "id": 233, "name": "msg_s2c/Email", "type": "msg" }, { - "id": 235, + "id": 234, "name": "msg_s2c/EmailDel", "type": "msg" }, { - "id": 236, + "id": 235, "name": "msg_s2c/EquipChange", "type": "msg" }, { - "id": 237, + "id": 236, "name": "msg_s2c/Friend", "type": "msg" }, { - "id": 238, + "id": 237, "name": "msg_s2c/GhChange", "type": "msg" }, { - "id": 239, + "id": 238, "name": "msg_s2c/GongHuiBaoZang", "type": "msg" }, { - "id": 240, + "id": 239, "name": "msg_s2c/HeroChange", "type": "msg" }, { - "id": 241, + "id": 240, "name": "msg_s2c/HongDianChange", "type": "msg" }, { - "id": 242, + "id": 241, "name": "msg_s2c/ItemChange", "type": "msg" }, { - "id": 243, + "id": 242, "name": "msg_s2c/LoginQueue", "type": "msg" }, { - "id": 244, + "id": 243, "name": "msg_s2c/LshdChange", "type": "msg" }, { - "id": 245, + "id": 244, "name": "msg_s2c/NewDay", "type": "msg" }, { - "id": 246, + "id": 245, "name": "msg_s2c/OtherLogin", "type": "msg" }, { - "id": 247, + "id": 246, "name": "msg_s2c/PayChange", "type": "msg" }, { - "id": 248, + "id": 247, "name": "msg_s2c/PayResult", "type": "msg" }, { - "id": 249, + "id": 248, "name": "msg_s2c/PeijianChange", "type": "msg" }, { - "id": 250, + "id": 249, "name": "msg_s2c/PlayerChange", "type": "msg" }, { - "id": 251, + "id": 250, "name": "msg_s2c/Private", "type": "msg" }, { - "id": 252, + "id": 251, "name": "msg_s2c/PushGiftChange", "type": "msg" }, { - "id": 253, + "id": 252, "name": "msg_s2c/SendGift", "type": "msg" }, { - "id": 254, + "id": 253, "name": "msg_s2c/ShiwuChange", "type": "msg" }, { - "id": 255, + "id": 254, "name": "msg_s2c/TaskChange", "type": "msg" }, { - "id": 256, + "id": 255, "name": "msg_s2c/Xianshilibao", "type": "msg" }, { - "id": 257, + "id": 256, "name": "pata/Fight", "type": "api" }, { - "id": 258, + "id": 257, "name": "pata/GetPrize", "type": "api" }, { - "id": 259, + "id": 258, "name": "pata/Open", "type": "api" }, { - "id": 260, + "id": 259, "name": "pata/SaoDang", "type": "api" }, { - "id": 261, + "id": 260, "name": "pay/GetList", "type": "api" }, { - "id": 262, + "id": 261, "name": "peijian/GetList", "type": "api" }, { - "id": 263, + "id": 262, "name": "peijian/JingLian", "type": "api" }, { - "id": 264, + "id": 263, "name": "peijian/JinJie", "type": "api" }, { - "id": 265, + "id": 264, "name": "peijian/LvUp", "type": "api" }, { - "id": 266, + "id": 265, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 267, + "id": 266, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 268, + "id": 267, "name": "peijian/Reset", "type": "api" }, { - "id": 269, + "id": 268, "name": "peijian/Rm", "type": "api" }, { - "id": 270, + "id": 269, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3186,32 +3176,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 271, + "id": 270, "name": "peijian/UnLock", "type": "api" }, { - "id": 272, + "id": 271, "name": "peijian/Wear", "type": "api" }, { - "id": 273, + "id": 272, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 274, + "id": 273, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 275, + "id": 274, "name": "peijiancangku/Open", "type": "api" }, { - "id": 276, + "id": 275, "name": "Bingo", "type": "api", "conf": { @@ -3219,147 +3209,147 @@ export const serviceProto: ServiceProto = { } }, { - "id": 277, + "id": 276, "name": "FightTest", "type": "api" }, { - "id": 278, + "id": 277, "name": "SyncBtn", "type": "api" }, { - "id": 279, + "id": 278, "name": "Test", "type": "api" }, { - "id": 280, + "id": 279, "name": "pushgift/ItemNoEnough", "type": "api" }, { - "id": 281, + "id": 280, "name": "pushgift/Open", "type": "api" }, { - "id": 282, + "id": 281, "name": "qjzzd/Fight", "type": "api" }, { - "id": 283, + "id": 282, "name": "qjzzd/Open", "type": "api" }, { - "id": 284, + "id": 283, "name": "rank/Open", "type": "api" }, { - "id": 285, + "id": 284, "name": "shiwu/Concise", "type": "api" }, { - "id": 286, + "id": 285, "name": "shiwu/Extract", "type": "api" }, { - "id": 287, + "id": 286, "name": "shiwu/GetList", "type": "api" }, { - "id": 288, + "id": 287, "name": "shiwu/LvUp", "type": "api" }, { - "id": 289, + "id": 288, "name": "shiwu/Recast", "type": "api" }, { - "id": 290, + "id": 289, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 291, + "id": 290, "name": "shiwu/Wear", "type": "api" }, { - "id": 292, + "id": 291, "name": "shootGame/Open", "type": "api" }, { - "id": 293, + "id": 292, "name": "shootGame/Rec", "type": "api" }, { - "id": 294, + "id": 293, "name": "shop/Buy", "type": "api" }, { - "id": 295, + "id": 294, "name": "shop/Open", "type": "api" }, { - "id": 296, + "id": 295, "name": "shop/Refresh", "type": "api" }, { - "id": 297, + "id": 296, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 298, + "id": 297, "name": "sign/GetPrize", "type": "api" }, { - "id": 299, + "id": 298, "name": "sign/Open", "type": "api" }, { - "id": 300, + "id": 299, "name": "slzd/Aim", "type": "api" }, { - "id": 301, + "id": 300, "name": "slzd/BuyNum", "type": "api" }, { - "id": 302, + "id": 301, "name": "slzd/Fight", "type": "api" }, { - "id": 303, + "id": 302, "name": "slzd/FightLog", "type": "api" }, { - "id": 304, + "id": 303, "name": "slzd/MyRank", "type": "api" }, { - "id": 305, + "id": 304, "name": "slzd/Open", "type": "api", "conf": { @@ -3369,77 +3359,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 306, + "id": 305, "name": "slzd/OpenFort", "type": "api" }, { - "id": 307, + "id": 306, "name": "slzd/Rec", "type": "api" }, { - "id": 308, + "id": 307, "name": "slzd/Refresh", "type": "api" }, { - "id": 309, + "id": 308, "name": "slzd/Slot", "type": "api" }, { - "id": 310, + "id": 309, "name": "tanxian/Event", "type": "api" }, { - "id": 311, + "id": 310, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 312, + "id": 311, "name": "tanxian/Fight", "type": "api" }, { - "id": 313, + "id": 312, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 314, + "id": 313, "name": "tanxian/Open", "type": "api" }, { - "id": 315, + "id": 314, "name": "tanxian/Receive", "type": "api" }, { - "id": 316, + "id": 315, "name": "task/AllFinsh", "type": "api" }, { - "id": 317, + "id": 316, "name": "task/Finsh", "type": "api" }, { - "id": 318, + "id": 317, "name": "task/Open", "type": "api" }, { - "id": 319, + "id": 318, "name": "user/CDKEY", "type": "api" }, { - "id": 320, + "id": 319, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3447,202 +3437,202 @@ export const serviceProto: ServiceProto = { } }, { - "id": 321, + "id": 320, "name": "user/ChangeName", "type": "api" }, { - "id": 322, + "id": 321, "name": "user/Dot", "type": "api" }, { - "id": 323, + "id": 322, "name": "user/Fight", "type": "api" }, { - "id": 324, + "id": 323, "name": "user/GetInfo", "type": "api" }, { - "id": 325, + "id": 324, "name": "user/InfoOpen", "type": "api" }, { - "id": 326, + "id": 325, "name": "user/Login", "type": "api" }, { - "id": 327, + "id": 326, "name": "user/Ping", "type": "api" }, { - "id": 328, + "id": 327, "name": "user/Renown", "type": "api" }, { - "id": 329, + "id": 328, "name": "user/RenownBuy", "type": "api" }, { - "id": 330, + "id": 329, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 331, + "id": 330, "name": "user/RenownOpen", "type": "api" }, { - "id": 332, + "id": 331, "name": "user/Tujian", "type": "api" }, { - "id": 333, + "id": 332, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 334, + "id": 333, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 335, + "id": 334, "name": "weixiuchang/Open", "type": "api" }, { - "id": 336, + "id": 335, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 337, + "id": 336, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 338, + "id": 337, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 339, + "id": 338, "name": "wzry/BaoMing", "type": "api" }, { - "id": 340, + "id": 339, "name": "wzry/catFightLog", "type": "api" }, { - "id": 341, + "id": 340, "name": "wzry/CatGroup", "type": "api" }, { - "id": 342, + "id": 341, "name": "wzry/DldFight", "type": "api" }, { - "id": 343, + "id": 342, "name": "wzry/DldRefre", "type": "api" }, { - "id": 344, + "id": 343, "name": "wzry/JingCai", "type": "api" }, { - "id": 345, + "id": 344, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 346, + "id": 345, "name": "wzry/Open", "type": "api" }, { - "id": 347, + "id": 346, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 348, + "id": 347, "name": "wzry/Wzzd", "type": "api" }, { - "id": 349, + "id": 348, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 350, + "id": 349, "name": "xstask/AllGet", "type": "api" }, { - "id": 351, + "id": 350, "name": "xstask/Get", "type": "api" }, { - "id": 352, + "id": 351, "name": "xstask/LvUp", "type": "api" }, { - "id": 353, + "id": 352, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 354, + "id": 353, "name": "xstask/Open", "type": "api" }, { - "id": 355, + "id": 354, "name": "xstask/Receive", "type": "api" }, { - "id": 356, + "id": 355, "name": "xstask/Refresh", "type": "api" }, { - "id": 357, + "id": 356, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 358, + "id": 357, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 359, + "id": 358, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 360, + "id": 359, "name": "zhanqianbushu/Up", "type": "api" } @@ -11418,27 +11408,6 @@ export const serviceProto: ServiceProto = { } ] }, - "event/yuandan/PtlDMOpen/ReqDMOpen": { - "type": "Interface" - }, - "event/yuandan/PtlDMOpen/ResDMOpen": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "myData", - "type": { - "type": "Interface", - "indexSignature": { - "keyType": "String", - "type": { - "type": "Any" - } - } - } - } - ] - }, "event/yuandan/PtlDMRec/ReqDMRec": { "type": "Interface", "properties": [ From d5ef0b3187f715a12424cf0b55213c44eca2c8a5 Mon Sep 17 00:00:00 2001 From: dy Date: Tue, 26 Dec 2023 09:40:15 +0800 Subject: [PATCH 05/37] yuandan --- src/api_s2c/event/yuandan/ApiOpen.ts | 4 ++-- src/shared/protocols/event/yuandan/PtlOpen.ts | 11 +++++++++++ src/shared/protocols/serviceProto.ts | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 src/shared/protocols/event/yuandan/PtlOpen.ts diff --git a/src/api_s2c/event/yuandan/ApiOpen.ts b/src/api_s2c/event/yuandan/ApiOpen.ts index a22e2cc..3125332 100644 --- a/src/api_s2c/event/yuandan/ApiOpen.ts +++ b/src/api_s2c/event/yuandan/ApiOpen.ts @@ -1,10 +1,10 @@ import {ApiCall} from "tsrpc"; -import {ReqDMOpen, ResDMOpen} from "../../../shared/protocols/event/yuandan/PtlDMOpen"; +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) { +export default async function (call: ApiCall) { let _hd = await Yuandanfun.getCon(call) call.succ({ diff --git a/src/shared/protocols/event/yuandan/PtlOpen.ts b/src/shared/protocols/event/yuandan/PtlOpen.ts new file mode 100644 index 0000000..59e1de9 --- /dev/null +++ b/src/shared/protocols/event/yuandan/PtlOpen.ts @@ -0,0 +1,11 @@ + +/** + * 元旦 + */ +export type ReqOpen = { + id: string +} + +export type ResOpen = { + +} diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index a9f23a3..d0ea1d1 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -94,7 +94,7 @@ 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 { ReqDMRec, ResDMRec } from './event/yuandan/PtlDMRec'; +import { ReqDMRec, ResDMRec } from './event/yuandan/PtlOpen'; import { ReqDZOpen, ResDZOpen } from './event/yuandan/PtlDZOpen'; import { ReqDZRec, ResDZRec } from './event/yuandan/PtlDZRec'; import { ReqExchange, ResExchange } from './event/yuandan/PtlExchange'; From fd035faf86c6d5c5ea202bdaf8053f39defa2ec3 Mon Sep 17 00:00:00 2001 From: dy Date: Tue, 26 Dec 2023 14:04:19 +0800 Subject: [PATCH 06/37] =?UTF-8?q?=E5=85=83=E6=97=A6=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/yuandan/ApiDMRec.ts | 26 +- src/api_s2c/event/yuandan/ApiDZOpen.ts | 17 -- src/api_s2c/event/yuandan/ApiDZRec.ts | 10 +- src/api_s2c/event/yuandan/ApiExchange.ts | 13 +- src/api_s2c/event/yuandan/ApiExchangeOpen.ts | 10 - src/api_s2c/event/yuandan/ApiOpen.ts | 4 +- src/api_s2c/event/yuandan/ApiTaskFinish.ts | 14 +- src/api_s2c/event/yuandan/ApiTaskOpen.ts | 0 src/api_s2c/event/yuandan/ApiZLOpen.ts | 16 -- src/api_s2c/event/yuandan/ApiZLRec.ts | 27 +- src/api_s2c/event/yuandan/fun.ts | 248 ++++++----------- src/module/collection_event.ts | 7 +- src/public/taskclass.ts | 3 + .../protocols/event/yuandan/PtlDMRec.ts | 8 +- .../protocols/event/yuandan/PtlDZOpen.ts | 16 -- .../event/yuandan/PtlExchangeOpen.ts | 12 - src/shared/protocols/event/yuandan/PtlOpen.ts | 3 +- .../protocols/event/yuandan/PtlTaskRec.ts | 10 + .../protocols/event/yuandan/PtlZLOpen.ts | 13 - .../protocols/event/yuandan/PtlZLRec.ts | 3 +- src/shared/protocols/serviceProto.ts | 262 +++++++++--------- 21 files changed, 298 insertions(+), 424 deletions(-) delete mode 100644 src/api_s2c/event/yuandan/ApiDZOpen.ts delete mode 100644 src/api_s2c/event/yuandan/ApiExchangeOpen.ts delete mode 100644 src/api_s2c/event/yuandan/ApiTaskOpen.ts delete mode 100644 src/api_s2c/event/yuandan/ApiZLOpen.ts delete mode 100644 src/shared/protocols/event/yuandan/PtlDZOpen.ts delete mode 100644 src/shared/protocols/event/yuandan/PtlExchangeOpen.ts create mode 100644 src/shared/protocols/event/yuandan/PtlTaskRec.ts delete mode 100644 src/shared/protocols/event/yuandan/PtlZLOpen.ts diff --git a/src/api_s2c/event/yuandan/ApiDMRec.ts b/src/api_s2c/event/yuandan/ApiDMRec.ts index d850556..aa64623 100644 --- a/src/api_s2c/event/yuandan/ApiDMRec.ts +++ b/src/api_s2c/event/yuandan/ApiDMRec.ts @@ -5,20 +5,28 @@ 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) + if (!_hd) return call.errorCode(-1) + + // 校验当前领取奖励 + let toPrize = call.req.prize + let prize = _hd.data.game.find(i => i.a == toPrize.a && i.t == toPrize.t && i.n == toPrize.n) + if (!prize) return call.errorCode(-2) // 取奖励列表，判断是否有可领取奖励 - let data = await G.mongodb.cEvent('yuandandamo').findOne({uid: call.uid, type: 'yuandandamo'}) - let rec = data?.record?.[call.req.id] - if (rec && rec >= gift?.buyNum) return call.errorCode(-2) + let data = await G.mongodb.cEvent(`yuandan${_hd.hdid}`).findOne({uid: call.uid, type: `yuandan${_hd.hdid}`}) + let rec = data?.gameNum - await PlayerFun.sendPrize(call, gift.prize); + if (rec && rec >= _hd.data?.gamefree) { + await PlayerFun.checkNeedIsMeet(call, _hd.data.gameneed); + await PlayerFun.cutNeed(call, _hd.data.gameneed); + } - await G.mongodb.cEvent('yuandandamo').updateOne({uid: call.uid, type: 'yuandandamo'}, { - $inc: {[`record.${gift.id}`]: 1}, + 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({}) diff --git a/src/api_s2c/event/yuandan/ApiDZOpen.ts b/src/api_s2c/event/yuandan/ApiDZOpen.ts deleted file mode 100644 index ae9a55a..0000000 --- a/src/api_s2c/event/yuandan/ApiDZOpen.ts +++ /dev/null @@ -1,17 +0,0 @@ -import {ApiCall} from "tsrpc"; -import {ReqDZOpen, ResDZOpen} from "../../../shared/protocols/event/yuandan/PtlDZOpen"; -import {HuoDongFun} from "../../../public/huodongfun"; -import {PayFun} from "../../../public/pay"; - -export default async function (call: ApiCall) { - let data = await G.mongodb.cEvent('yuandandingzhi').findOne({uid: call.uid, type: 'yuandandingzhi'}) - - let _hd = (await HuoDongFun.gethdList(call, 14))[0] - - let payIds = _hd?.data?.gift?.filter(i => i.payId)?.map(i => i.payId) - - call.succ({ - record: data?.record || {}, - buyLog: await PayFun.getPayLogs(call.uid, payIds) - }) -} \ No newline at end of file diff --git a/src/api_s2c/event/yuandan/ApiDZRec.ts b/src/api_s2c/event/yuandan/ApiDZRec.ts index 9374b56..ce3f3f2 100644 --- a/src/api_s2c/event/yuandan/ApiDZRec.ts +++ b/src/api_s2c/event/yuandan/ApiDZRec.ts @@ -11,14 +11,14 @@ export default async function (call: ApiCall) { if (!gift) return call.errorCode(-1) // 取奖励列表，判断是否有可领取奖励 - let data = await G.mongodb.cEvent('yuandandingzhi').findOne({uid: call.uid, type: 'yuandandingzhi'}) - let rec = data?.record?.[call.req.id] - if (rec && rec >= gift?.buyNum) return call.errorCode(-2) + 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) await PlayerFun.sendPrize(call, gift.prize); - await G.mongodb.cEvent('yuandandingzhi').updateOne({uid: call.uid, type: 'yuandandingzhi'}, { - $inc: {[`record.${gift.id}`]: 1}, + await G.mongodb.cEvent(`yuandan${_hd.hdid}`).updateOne({uid: call.uid, type: `yuandan${_hd.hdid}`}, { + $inc: {[`gift.${gift.id}`]: 1}, }, {upsert: true}) call.succ({}) diff --git a/src/api_s2c/event/yuandan/ApiExchange.ts b/src/api_s2c/event/yuandan/ApiExchange.ts index 1724dcd..a3285db 100644 --- a/src/api_s2c/event/yuandan/ApiExchange.ts +++ b/src/api_s2c/event/yuandan/ApiExchange.ts @@ -7,19 +7,20 @@ 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) + let gift = _hd?.data?.duihuan?.find(i => i.id == call.req.id) if (!gift) return call.errorCode(-1) // 取奖励列表，判断是否有可领取奖励 - let data = await G.mongodb.cEvent('yuandanduihuan').findOne({uid: call.uid, type: 'yuandanduihuan'}) - let rec = data?.record?.[call.req.id] + 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 PlayerFun.cutNeed(call, gift.prize) - await G.mongodb.cEvent('yuandanduihuan').updateOne({uid: call.uid, type: 'yuandanduihuan'}, { - $inc: {[`record.${gift.id}`]: 1}, + await G.mongodb.cEvent(`yuandan${_hd.hdid}`).updateOne({uid: call.uid, type: `yuandan${_hd.hdid}`}, { + $inc: {[`exchange.${gift.id}`]: 1}, }, {upsert: true}) call.succ({}) diff --git a/src/api_s2c/event/yuandan/ApiExchangeOpen.ts b/src/api_s2c/event/yuandan/ApiExchangeOpen.ts deleted file mode 100644 index 36910a4..0000000 --- a/src/api_s2c/event/yuandan/ApiExchangeOpen.ts +++ /dev/null @@ -1,10 +0,0 @@ -import {ApiCall} from "tsrpc"; -import {ReqExchangeOpen, ResExchangeOpen} from "../../../shared/protocols/event/yuandan/PtlExchangeOpen"; - -export default async function (call: ApiCall) { - let data = await G.mongodb.cEvent('yuandanduihuan').findOne({uid: call.uid, type: 'yuandanduihuan'}) - - call.succ({ - record: data?.record || {}, - }) -} \ No newline at end of file diff --git a/src/api_s2c/event/yuandan/ApiOpen.ts b/src/api_s2c/event/yuandan/ApiOpen.ts index 3125332..ea6aa7b 100644 --- a/src/api_s2c/event/yuandan/ApiOpen.ts +++ b/src/api_s2c/event/yuandan/ApiOpen.ts @@ -7,7 +7,5 @@ import {Yuandanfun} from "./fun"; export default async function (call: ApiCall) { let _hd = await Yuandanfun.getCon(call) - call.succ({ - data: (await G.mongodb.cEvent(`yuandan${_hd.hdid}`).findOne({uid: call.uid, type: 'yuandandamo'})) || {} - }) + call.succ((await G.mongodb.cEvent(`yuandan${_hd.hdid}`).findOne({uid: call.uid, type: `yuandan${_hd.hdid}`})) || {}) } \ No newline at end of file diff --git a/src/api_s2c/event/yuandan/ApiTaskFinish.ts b/src/api_s2c/event/yuandan/ApiTaskFinish.ts index d0af2c9..14dd38d 100644 --- a/src/api_s2c/event/yuandan/ApiTaskFinish.ts +++ b/src/api_s2c/event/yuandan/ApiTaskFinish.ts @@ -1,18 +1,18 @@ import { ApiCall } from "tsrpc"; -import { ReqTaskRec, ResTaskRec } from "../../../shared/protocols/event/christmas/PtlTaskRec"; -import {Christmasfun} from "./fun"; +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 initCon = await Christmasfun.getCon(call) + let _hd = await Christmasfun.getCon(call) let taskid = call.req.taskid; - let _con = initCon[call.req.hdid].data.task[taskid]; + let _con = _hd.data.task[taskid]; if (!_con) { // 任务id 不存在 return call.error('', { code: -1, message: globalThis.lng.yangchengmubiao_2 }) } - let _mydata = await Christmasfun.getMyData(call, call.req.hdid) + let _mydata = await Yuandanfun.getData(call, _hd.hdid) if (_mydata.taskval[taskid] < _con.pval) { // 任务未完成 return call.error('', { code: -2, message: globalThis.lng.yangchengmubiao_3 }) @@ -27,11 +27,11 @@ export default async function (call: ApiCall) { _mydata["val"] += _addval _setData["val"] = _mydata.val _setData["taskfinish"] = _mydata.taskfinish - await Christmasfun.setMyData(call.uid, call.req.hdid, { $set: _setData }) + await Yuandanfun.setData(call.uid, _hd.hdid, { $set: _setData }) let _prize = _con.prize await PlayerFun.sendPrize(call, _prize); - let changedata = { mydata: _mydata, prize: _prize} + let changedata = { data: _mydata, prize: _prize} // 推送红点 HongDianChange.sendChangeKey(call.uid, ['huodonghd']); call.succ(changedata); diff --git a/src/api_s2c/event/yuandan/ApiTaskOpen.ts b/src/api_s2c/event/yuandan/ApiTaskOpen.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/api_s2c/event/yuandan/ApiZLOpen.ts b/src/api_s2c/event/yuandan/ApiZLOpen.ts deleted file mode 100644 index ebbdc52..0000000 --- a/src/api_s2c/event/yuandan/ApiZLOpen.ts +++ /dev/null @@ -1,16 +0,0 @@ -import {ApiCall} from "tsrpc"; -import {ReqZLOpen, ResZLOpen} from "../../../shared/protocols/event/yuandan/PtlZLOpen"; -import {HuoDongFun} from "../../../public/huodongfun"; -import {PayFun} from "../../../public/pay"; - -export default async function (call: ApiCall) { - let data = await G.mongodb.cEvent('yuandanzengli').findOne({uid: call.uid, type: 'yuandanzengli'}) - - let _hd = (await HuoDongFun.gethdList(call, 14))[0] - - let payIds = _hd?.data?.gift?.filter(i => i.payId)?.map(i => i.payId) - - call.succ({ - record: data?.record || {}, - }) -} \ No newline at end of file diff --git a/src/api_s2c/event/yuandan/ApiZLRec.ts b/src/api_s2c/event/yuandan/ApiZLRec.ts index 27624bd..46f3b47 100644 --- a/src/api_s2c/event/yuandan/ApiZLRec.ts +++ b/src/api_s2c/event/yuandan/ApiZLRec.ts @@ -3,22 +3,27 @@ import {ReqZLRec, ResZLRec} from "../../../shared/protocols/event/yuandan/PtlZLR import {HuoDongFun} from "../../../public/huodongfun"; import {PlayerFun} from "../../../public/player"; import {HongDianChange} from "../../hongdian/fun"; +import {Yuandanfun} from "./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 _hd = await Yuandanfun.getCon(call) + if (!_hd) return call.errorCode(-1) - // 取奖励列表，判断是否有可领取奖励 - let data = await G.mongodb.cEvent('yuandandamo').findOne({uid: call.uid, type: 'yuandandamo'}) - let rec = data?.record?.[call.req.id] - if (rec && rec >= gift?.buyNum) return call.errorCode(-2) + // 查询是否存在当前传入id的礼品 + let gift = _hd?.data?.qiandao?.[call.req.id] + if (!gift) return call.errorCode(-2) - await PlayerFun.sendPrize(call, gift.prize); + // 奖励已领取 + 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) - await G.mongodb.cEvent('yuandandamo').updateOne({uid: call.uid, type: 'yuandandamo'}, { - $inc: {[`record.${gift.id}`]: 1}, + let prize = [gift.prize, ...gift.dlz.map((v, i) => v[call.req.dlz[i]])] + + await PlayerFun.sendPrize(call, prize); + + await G.mongodb.cEvent(`yuandan${_hd.hdid}`).updateOne({uid: call.uid, type: `yuandan${_hd.hdid}`}, { + $inc: {[`qiandao.${call.req.id}`]: prize}, }, {upsert: true}) call.succ({}) diff --git a/src/api_s2c/event/yuandan/fun.ts b/src/api_s2c/event/yuandan/fun.ts index 7612211..7c9174d 100644 --- a/src/api_s2c/event/yuandan/fun.ts +++ b/src/api_s2c/event/yuandan/fun.ts @@ -1,82 +1,32 @@ import {ApiCall} from 'tsrpc'; -import {ReqAddHuoDong} from '../../../monopoly/protocols/PtlAddHuoDong'; import {HuoDongFun} from '../../../public/huodongfun'; import {christmas} from '../../../shared/protocols/event/christmas/PtlOpen'; import {PublicShared} from '../../../shared/public/public'; -import {PlayerFun} from "../../../public/player"; export class Yuandanfun { /**配置 */ static async getCon(call: ApiCall) { - let _hd = (await HuoDongFun.gethdList(call, 14))[0] - if (!_hd) return call.errorCode(-1) - return _hd - } - - /**获取所有符合时间的活动 */ - static async gethdids(call: ApiCall) { - let _hdids = [] - let _hd = await HuoDongFun.gethdList(call, 8) - for (let index = 0; index < _hd.length; index++) { - const element = _hd[index]; - _hdids.push(element.hdid) - } - return _hdids + return (await HuoDongFun.gethdList(call, 14))[0] } /**获取我的数据 */ - static async getMyData(call: ApiCall, hdid: number) { - let db: any = await G.mongodb.cEvent(`christmas${hdid}`).findOne({ - uid: call.uid, - type: `christmas${hdid}`, - hdid: hdid - }); - if (!db) { - db = await this.initData(call, hdid) - await G.mongodb.cEvent(`christmas${hdid}`).updateOne( - {uid: call.uid, type: `christmas${hdid}`, hdid: hdid}, - {$set: db}, - {upsert: true} - ) - } - let {_id, ..._myData} = db - if (!PublicShared.chkSameDate(_myData.refresh, G.time)) { + 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)) { // 刷新每日任务 - _myData = await this.refreTask(call, _myData, hdid) - + data = (await G.mongodb.cEvent(`yuandan${hdid}`).findOneAndUpdate({uid: call.uid, type: `yuandan${hdid}`}, { + $set: { + gameNum: 0, + gift: {}, + exchange: {}, + taskfinish: data?.taskfinish || [], + taskval: await this.getTaskVal(call, hdid), + }, + }, {upsert: true, returnDocument: 'after'})).value } - return _myData - } - - /**初始数据 */ - static async initData(call: ApiCall, hdid: number) { - let _initCon = await this.getCon(call) - let _con = _initCon[hdid] - let _r: christmas = { - type: `christmas${hdid}`, - uid: call.uid, - hdid: hdid, - taskval: await this.getTaskVal(call, hdid), - taskfinish: [], - refresh: G.time, - gamenum: 0, - pt: [], - gj: [], - pay: false, - select: {}, - val: 0, - qiandao: [], - libao: {} - } - return _r - } - - /**设置数据 */ - static async setMyData(uid: string, hdid: number, set: {}) { - await G.mongodb.cEvent(`christmas${hdid}`).updateOne( - {uid: uid, type: `christmas${hdid}`, hdid: hdid}, - set - ) + return data } /**获取所有taskid 及对应的值 */ @@ -94,114 +44,92 @@ export class Yuandanfun { } else { _res[element] = 0 } - - } return _res } - /**刷新每日任务 */ - static async refreTask(call: ApiCall, mydata: christmas, hdid: number) { - let _initCon = await this.getCon(call) - let _con = _initCon[hdid].data.task - if (!_con) return mydata - mydata.taskfinish = [] - mydata.taskval = await this.getTaskVal(call, hdid) - mydata.refresh = G.time - mydata.gamenum = 0 - mydata.libao = {} - await this.setMyData(call.uid, hdid, { - $set: { - refresh: mydata.refresh, - taskfinish: mydata.taskfinish, - taskval: mydata.taskval, - gamenum: mydata.gamenum, - libao: mydata.libao - } - }) - return mydata + /**设置数据 */ + static async setData(uid: string, hdid: number, set: {}) { + await G.mongodb.cEvent(`christmas${hdid}`).updateOne( + {uid: uid, type: `christmas${hdid}`}, + set + ) } - static async payChristmas(payid, call: any) { - let _hd = await HuoDongFun.gethdList(call, 8) - for (let index = 0; index < _hd.length; index++) { - const hdinfo = _hd[index]; - const _hdid = hdinfo.hdid - if (payid == hdinfo.data.zlpayid) { - let _mydata = await Yuandanfun.getMyData(call, _hdid) - if (_mydata.pay) continue - await this.setMyData(call.uid, _hdid, {$set: {pay: true}}) - // let _prize = hdinfo.data.zlpayprize - // await PlayerFun.sendPrize(call, _prize); - } else { - const libaos = hdinfo.data.libao - for (let index = 0; index < Object.keys(libaos).length; index++) { - const lbid = Object.keys(libaos)[index]; - let _tmp = libaos[lbid] - if (_tmp['payid'] != payid) continue - let _mydata = await Yuandanfun.getMyData(call, _hdid) - let _buyNum = _mydata.libao[lbid] || 0 - if (_buyNum >= _tmp["buynum"]) continue - _mydata.libao[lbid] = _buyNum + 1 - this.setMyData(call.uid, _hdid, {$set: {libao: _mydata.libao}}) - let _select = _mydata.select[lbid] || {} - let _prize: atn[] = _tmp["basep"] - for (let key in _select) { - _prize.push(_tmp["dlz"][parseInt(key)][_select[key]]) - } - await PlayerFun.sendPrize(call, _prize); - break - - } - } - } - } + // /**刷新每日任务 */ + // static async refreTask(call: ApiCall, mydata, hdid: number) { + // let _initCon = await this.getCon(call) + // let _con = _initCon[hdid].data.task + // if (!_con) return mydata + // mydata.taskfinish = [] + // mydata.taskval = await this.getTaskVal(call, hdid) + // mydata.refresh = G.time + // mydata.gamenum = 0 + // mydata.libao = {} + // + // (await G.mongodb.cEvent(`yuandan${hdid}`).findOneAndUpdate({uid: call.uid, type: `yuandan${hdid}`}, { + // $set: { + // gameNum: 0, + // gift: {}, + // exchange: {}, + // }, + // }, {upsert: true, returnDocument: 'after'})).value + // + // await this.setMyData(call.uid, hdid, { + // $set: { + // refreshTime: mydata.refreshTime, + // taskfinish: mydata.taskfinish, + // taskval: mydata.taskval, + // gamenum: mydata.gamenum, + // libao: mydata.libao + // } + // }) + // return mydata + // } /**设置任务 */ static async setTaskVal(call: ApiCall, stype: number, val: number, chkCall: Function, chkval: number = 0, isinc: number = 0, alchangeVal: Function, arg) { - let hdids = await this.gethdids(call) - if (hdids.length <= 0) return // 活动过期，不计数 - let _initCon = await this.getCon(call) + // let hdids = await this.gethdids(call) + // if (hdids.length <= 0) return // 活动过期，不计数 + let _hd = await this.getCon(call) + if (!_hd) return - for (let index = 0; index < hdids.length; index++) { - const hdid = hdids[index]; - // let _mydata = await Christmasfun.getMyData(call, hdid) - let _tasks = _initCon[hdid].data.task + // let _mydata = await Christmasfun.getMyData(call, hdid) + let _tasks = _hd.data.task - let _setData = { - $inc: {}, - $set: {} + 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 } - let isset = 0 - for (let indextask = 0; indextask < Object.keys(_tasks).length; indextask++) { - const ele = Object.keys(_tasks)[indextask]; - // 具体任务配置 - let _taskCon = _tasks[ele] - if (_taskCon.stype != stype) continue + } - let _pval = _taskCon.pval - // 不符合任务要求 - if (!(await chkCall(_taskCon["cond"], chkval, arg))) continue - - // 根据需求改写 - val = await alchangeVal(call, _taskCon, val, arg) - - isset = 1 - if (isinc == 1) { // 累加 - _setData["$inc"][`taskval.${ele}`] = val - } else { - _setData["$set"][`taskval.${ele}`] = val - } - } - - // 设置任务 - if (isset == 1) { - await G.mongodb.collection('event').updateMany( - {uid: call.uid, type: {$regex: "christmas"}, hdid: parseInt(hdid)}, - _setData - ) - } + // 设置任务 + if (isset == 1) { + await G.mongodb.collection('event').updateMany( + {uid: call.uid, type: {$regex: "yuandan"}, hdid: parseInt(_hd.hdid)}, + _setData + ) } } diff --git a/src/module/collection_event.ts b/src/module/collection_event.ts index 3e1418a..5a42bd6 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 {ResOpen as ResOpenYuandan} from '../shared/protocols/event/yuandan/PtlOpen'; export type eventType = { shouchong: { @@ -57,10 +58,6 @@ export type eventType = { payForDiamond: { [time: number]: number } - yuandandingzhi: ResOpenZhoumolibao & { refreshTime: number; }; - yuandanduihuan: ResOpenZhoumolibao & { refreshTime: number; }; - yuandandamo: ResOpenZhoumolibao & { refreshTime: number; }; - yuandanzengli: ResOpenZhoumolibao & { refreshTime: number; }; } & { [k: `${number}jijin`]: ResOpenYuedujijin; @@ -72,7 +69,7 @@ export type eventType = { [k: `leijichongzhi${number}`]: Omit; [k: `qiridenglu${number}`]: Pick; [k: `leichonglibao${number}`]: ResOpenLeiChongLiBao & { opentime: number }; - [k: `yuandan${number}`]: christmas; + [k: `yuandan${number}`]: ResOpenYuandan; }; export type CollectionEvent = { diff --git a/src/public/taskclass.ts b/src/public/taskclass.ts index 5bf3f67..4b01c25 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 index 5aa6964..4bcd355 100644 --- a/src/shared/protocols/event/yuandan/PtlDMRec.ts +++ b/src/shared/protocols/event/yuandan/PtlDMRec.ts @@ -1,11 +1,9 @@ - /** * 元旦达摩领奖 */ export type ReqDMRec = { - id: string + id: string, + prize: { a: string, t: string, n: number } } -export type ResDMRec = { - -} +export type ResDMRec = {} diff --git a/src/shared/protocols/event/yuandan/PtlDZOpen.ts b/src/shared/protocols/event/yuandan/PtlDZOpen.ts deleted file mode 100644 index ef0f7b2..0000000 --- a/src/shared/protocols/event/yuandan/PtlDZOpen.ts +++ /dev/null @@ -1,16 +0,0 @@ - -/** - * 元旦定制 - */ -export type ReqDZOpen = { - -}; - -export type ResDZOpen = { - record:{ - [k: string]: any; - } - buyLog:{ - [k: string]: any; - } -}; \ No newline at end of file diff --git a/src/shared/protocols/event/yuandan/PtlExchangeOpen.ts b/src/shared/protocols/event/yuandan/PtlExchangeOpen.ts deleted file mode 100644 index ca3afad..0000000 --- a/src/shared/protocols/event/yuandan/PtlExchangeOpen.ts +++ /dev/null @@ -1,12 +0,0 @@ -/** - * 元旦兑换 - */ -export type ReqExchangeOpen = { - -} - -export type ResExchangeOpen = { - record:{ - [k: string]: any; - } -} diff --git a/src/shared/protocols/event/yuandan/PtlOpen.ts b/src/shared/protocols/event/yuandan/PtlOpen.ts index 59e1de9..294e1a5 100644 --- a/src/shared/protocols/event/yuandan/PtlOpen.ts +++ b/src/shared/protocols/event/yuandan/PtlOpen.ts @@ -1,4 +1,3 @@ - /** * 元旦 */ @@ -7,5 +6,5 @@ export type ReqOpen = { } export type ResOpen = { - + [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/PtlZLOpen.ts b/src/shared/protocols/event/yuandan/PtlZLOpen.ts deleted file mode 100644 index f8e1829..0000000 --- a/src/shared/protocols/event/yuandan/PtlZLOpen.ts +++ /dev/null @@ -1,13 +0,0 @@ - -/** - * 元旦赠礼 - */ -export type ReqZLOpen = { - -}; - -export type ResZLOpen = { - record:{ - [k: string]: any; - } -}; \ No newline at end of file diff --git a/src/shared/protocols/event/yuandan/PtlZLRec.ts b/src/shared/protocols/event/yuandan/PtlZLRec.ts index 3152d3a..6e2d21f 100644 --- a/src/shared/protocols/event/yuandan/PtlZLRec.ts +++ b/src/shared/protocols/event/yuandan/PtlZLRec.ts @@ -3,7 +3,8 @@ * 元旦赠礼领奖 */ export type ReqZLRec = { - id: string + id: string, + dlz: string[] } export type ResZLRec = { diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index d0ea1d1..9ef6cbf 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -94,39 +94,39 @@ 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 { ReqDMRec, ResDMRec } from './event/yuandan/PtlOpen'; +import { ReqDMRec, ResDMRec } from './event/yuandan/PtlDMRec'; import { ReqDZOpen, ResDZOpen } from './event/yuandan/PtlDZOpen'; import { ReqDZRec, ResDZRec } from './event/yuandan/PtlDZRec'; import { ReqExchange, ResExchange } from './event/yuandan/PtlExchange'; import { ReqExchangeOpen, ResExchangeOpen } from './event/yuandan/PtlExchangeOpen'; -import { ReqZLOpen, ResZLOpen } from './event/yuandan/PtlZLOpen'; +import { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } from './event/yuandan/PtlOpen'; import { ReqZLRec, ResZLRec } from './event/yuandan/PtlZLRec'; -import { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } from './event/yuedujijin/PtlOpen'; +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'; @@ -148,19 +148,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'; @@ -169,14 +169,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'; @@ -192,16 +192,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'; @@ -209,23 +209,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'; @@ -257,7 +257,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'; @@ -273,16 +273,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'; @@ -290,20 +290,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'; @@ -312,11 +312,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'; @@ -333,7 +333,7 @@ import { ReqRenownOpen, ResRenownOpen } from './user/PtlRenownOpen'; import { ReqTujian, ResTujian } from './user/PtlTujian'; import { ReqDecompose, ResDecompose } from './weixiuchang/PtlDecompose'; import { ReqExchange as ReqExchange_1, ResExchange as ResExchange_1 } from './weixiuchang/PtlExchange'; -import { ReqOpen as ReqOpen_60, ResOpen as ResOpen_60 } from './weixiuchang/PtlOpen'; +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'; @@ -344,7 +344,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'; @@ -352,7 +352,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'; @@ -762,17 +762,17 @@ export interface ServiceType { req: ReqExchangeOpen, res: ResExchangeOpen }, - "event/yuandan/ZLOpen": { - req: ReqZLOpen, - res: ResZLOpen + "event/yuandan/Open": { + req: ReqOpen_27, + res: ResOpen_27 }, "event/yuandan/ZLRec": { req: ReqZLRec, res: ResZLRec }, "event/yuedujijin/Open": { - req: ReqOpen_27, - res: ResOpen_27 + req: ReqOpen_28, + res: ResOpen_28 }, "event/yuedujijin/Rec": { req: ReqRec_10, @@ -783,8 +783,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, @@ -795,13 +795,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 @@ -811,8 +811,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, @@ -835,8 +835,8 @@ export interface ServiceType { res: ResList }, "friend/Open": { - req: ReqOpen_32, - res: ResOpen_32 + req: ReqOpen_33, + res: ResOpen_33 }, "friend/Respond": { req: ReqRespond, @@ -855,8 +855,8 @@ export interface ServiceType { res: ResChallenge }, "ganbutexun/Open": { - req: ReqOpen_33, - res: ResOpen_33 + req: ReqOpen_34, + res: ResOpen_34 }, "ganhai/Fast": { req: ReqFast, @@ -871,8 +871,8 @@ export interface ServiceType { res: ResLog }, "ganhai/Open": { - req: ReqOpen_34, - res: ResOpen_34 + req: ReqOpen_35, + res: ResOpen_35 }, "ganhai/Refresh": { req: ReqRefresh, @@ -959,8 +959,8 @@ export interface ServiceType { res: ResManage }, "gonghui/Open": { - req: ReqOpen_35, - res: ResOpen_35 + req: ReqOpen_36, + res: ResOpen_36 }, "gonghui/TanHe": { req: ReqTanHe, @@ -983,8 +983,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, @@ -995,8 +995,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, @@ -1007,8 +1007,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, @@ -1043,8 +1043,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, @@ -1071,8 +1071,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, @@ -1135,16 +1135,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, @@ -1159,8 +1159,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, @@ -1171,8 +1171,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, @@ -1203,8 +1203,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, @@ -1231,8 +1231,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, @@ -1243,8 +1243,8 @@ export interface ServiceType { res: ResZhanLing }, "lingzhulaixi/Open": { - req: ReqOpen_47, - res: ResOpen_47 + req: ReqOpen_48, + res: ResOpen_48 }, "lingzhulaixi/PkBoss": { req: ReqPkBoss, @@ -1267,8 +1267,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, @@ -1279,8 +1279,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, @@ -1343,8 +1343,8 @@ export interface ServiceType { res: ResJump }, "peijiancangku/Open": { - req: ReqOpen_50, - res: ResOpen_50 + req: ReqOpen_51, + res: ResOpen_51 }, "Bingo": { req: ReqBingo, @@ -1367,21 +1367,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 @@ -1411,8 +1411,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, @@ -1423,8 +1423,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, @@ -1439,8 +1439,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, @@ -1463,8 +1463,8 @@ export interface ServiceType { res: ResMyRank }, "slzd/Open": { - req: ReqOpen_57, - res: ResOpen_57 + req: ReqOpen_58, + res: ResOpen_58 }, "slzd/OpenFort": { req: ReqOpenFort, @@ -1499,8 +1499,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, @@ -1515,8 +1515,8 @@ export interface ServiceType { res: ResFinsh }, "task/Open": { - req: ReqOpen_59, - res: ResOpen_59 + req: ReqOpen_60, + res: ResOpen_60 }, "user/CDKEY": { req: ReqCDKEY, @@ -1583,8 +1583,8 @@ export interface ServiceType { res: ResExchange_1 }, "weixiuchang/Open": { - req: ReqOpen_60, - res: ResOpen_60 + req: ReqOpen_61, + res: ResOpen_61 }, "weixiuchang/UpLv": { req: ReqUpLv, @@ -1627,8 +1627,8 @@ export interface ServiceType { res: ResJingCaiOpen }, "wzry/Open": { - req: ReqOpen_61, - res: ResOpen_61 + req: ReqOpen_62, + res: ResOpen_62 }, "wzry/UpdateFight": { req: ReqUpdateFight, @@ -1659,8 +1659,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, @@ -2224,7 +2224,7 @@ export const serviceProto: ServiceProto = { }, { "id": 100, - "name": "event/yuandan/ZLOpen", + "name": "event/yuandan/Open", "type": "api" }, { @@ -11508,27 +11508,27 @@ export const serviceProto: ServiceProto = { } ] }, - "event/yuandan/PtlZLOpen/ReqZLOpen": { - "type": "Interface" - }, - "event/yuandan/PtlZLOpen/ResZLOpen": { + "event/yuandan/PtlOpen/ReqOpen": { "type": "Interface", "properties": [ { "id": 0, - "name": "record", + "name": "id", "type": { - "type": "Interface", - "indexSignature": { - "keyType": "String", - "type": { - "type": "Any" - } - } + "type": "String" } } ] }, + "event/yuandan/PtlOpen/ResOpen": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" + } + } + }, "event/yuandan/PtlZLRec/ReqZLRec": { "type": "Interface", "properties": [ @@ -11538,6 +11538,16 @@ export const serviceProto: ServiceProto = { "type": { "type": "String" } + }, + { + "id": 1, + "name": "dlz", + "type": { + "type": "Array", + "elementType": { + "type": "String" + } + } } ] }, From 9b6d29ddf20eb7be6046fafd5e71263cfa2f82b2 Mon Sep 17 00:00:00 2001 From: dy Date: Tue, 26 Dec 2023 14:30:10 +0800 Subject: [PATCH 07/37] =?UTF-8?q?=E5=85=83=E6=97=A6=E6=B4=BB=E5=8A=A8,?= =?UTF-8?q?=E5=A8=83=E5=A8=83=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/yuandan/ApiDMRec.ts | 4 ++-- src/api_s2c/event/yuandan/{ApiTaskFinish.ts => ApiTaskRec.ts} | 0 src/shared/protocols/event/yuandan/PtlDMRec.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/api_s2c/event/yuandan/{ApiTaskFinish.ts => ApiTaskRec.ts} (100%) diff --git a/src/api_s2c/event/yuandan/ApiDMRec.ts b/src/api_s2c/event/yuandan/ApiDMRec.ts index aa64623..859b784 100644 --- a/src/api_s2c/event/yuandan/ApiDMRec.ts +++ b/src/api_s2c/event/yuandan/ApiDMRec.ts @@ -12,7 +12,7 @@ export default async function (call: ApiCall) { // 校验当前领取奖励 let toPrize = call.req.prize let prize = _hd.data.game.find(i => i.a == toPrize.a && i.t == toPrize.t && i.n == toPrize.n) - if (!prize) return call.errorCode(-2) + if (toPrize && !prize) return call.errorCode(-2) // 取奖励列表，判断是否有可领取奖励 let data = await G.mongodb.cEvent(`yuandan${_hd.hdid}`).findOne({uid: call.uid, type: `yuandan${_hd.hdid}`}) @@ -23,7 +23,7 @@ export default async function (call: ApiCall) { await PlayerFun.cutNeed(call, _hd.data.gameneed); } - await PlayerFun.sendPrize(call, prize); + await PlayerFun.sendPrize(call, prize || []); await G.mongodb.cEvent(`yuandan${_hd.hdid}`).updateOne({uid: call.uid, type: `yuandan${_hd.hdid}`}, { $inc: {[`gameNum`]: 1}, diff --git a/src/api_s2c/event/yuandan/ApiTaskFinish.ts b/src/api_s2c/event/yuandan/ApiTaskRec.ts similarity index 100% rename from src/api_s2c/event/yuandan/ApiTaskFinish.ts rename to src/api_s2c/event/yuandan/ApiTaskRec.ts diff --git a/src/shared/protocols/event/yuandan/PtlDMRec.ts b/src/shared/protocols/event/yuandan/PtlDMRec.ts index 4bcd355..c0a01c1 100644 --- a/src/shared/protocols/event/yuandan/PtlDMRec.ts +++ b/src/shared/protocols/event/yuandan/PtlDMRec.ts @@ -3,7 +3,7 @@ */ export type ReqDMRec = { id: string, - prize: { a: string, t: string, n: number } + prize: { a: string, t: string, n: number } | null } export type ResDMRec = {} From 1e90b96c6cee927008023b5005286937fe12f542 Mon Sep 17 00:00:00 2001 From: dy Date: Tue, 26 Dec 2023 15:07:00 +0800 Subject: [PATCH 08/37] huodong json --- src/json/huodong.json5 | 185 +++++++++++++++++++++++------------------ 1 file changed, 106 insertions(+), 79 deletions(-) diff --git a/src/json/huodong.json5 b/src/json/huodong.json5 index b004311..c227a78 100644 --- a/src/json/huodong.json5 +++ b/src/json/huodong.json5 @@ -485,12 +485,7 @@ free: false, payId: 'ycmb_5_1', buyNum: 1, - dlz: [ - { - "1": {'a': 'attr', 't': 'rmbmoney', 'n': 60}, - "2": {'a': 'item', 't': '21', 'n': 200} - } - ] + prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 60},{'a': 'item', 't': '21', 'n': 200} ] }, { index: 2, @@ -498,12 +493,7 @@ free: false, payId: 'ycmb_5_2', buyNum: 2, - dlz: [ - { - "1":{'a': 'attr', 't': 'rmbmoney', 'n': 300}, - "2":{'a': 'item', 't': '21', 'n': 600} - } - ] + prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 300},{'a': 'item', 't': '21', 'n': 600} ] }, { index: 3, @@ -511,12 +501,7 @@ free: false, payId: 'ycmb_5_3', buyNum: 2, - dlz: [ - { - "1":{'a': 'attr', 't': 'rmbmoney', 'n': 680}, - "2":{'a': 'item', 't': '21', 'n': 1500} - } - ] + prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 680},{'a': 'item', 't': '21', 'n': 1500} ] }, { index: 4, @@ -524,12 +509,7 @@ free: false, payId: 'ycmb_5_4', buyNum: 2, - dlz: [ - { - "1":{'a': 'attr', 't': 'rmbmoney', 'n': 1280}, - "2":{'a': 'item', 't': '21', 'n': 2500} - } - ] + prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 1280},{'a': 'item', 't': '21', 'n': 2500} ] }, { index: 5, @@ -537,12 +517,7 @@ free: false, payId: 'ycmb_5_5', buyNum: 3, - dlz: [ - { - "1":{'a': 'attr', 't': 'rmbmoney', 'n': 3280}, - "2":{'a': 'item', 't': '21', 'n': 6000} - } - ] + prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 3280},{'a': 'item', 't': '21', 'n': 6000} ] }, { index: 6, @@ -550,12 +525,7 @@ free: false, payId: 'ycmb_5_6', buyNum: 3, - dlz: [ - { - "1":{'a': 'attr', 't': 'rmbmoney', 'n': 6480}, - "2":{'a': 'item', 't': '21', 'n': 12000} - } - ] + prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 6480},{'a': 'item', 't': '21', 'n': 12000} ] } ], //任务相关 type 1 每日任务（每天刷新） 2 活动任务（轮数） 3 每日登录 4-一次性任务 任务hdid一定要唯一 @@ -2922,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} + } ] }, { @@ -2932,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} + } ] }, { @@ -2976,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} + } ] }, { @@ -2987,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} + } ] } ] @@ -4598,17 +4611,19 @@ "gamefree": 3, //钻石兑换 "duihuan": [ - { 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 }, - { 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 }, - { 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 }, - { 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 }, - { 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 }, - { 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 } + {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": [ { - "payid": "", + "id": 1, + "free": "true", + "payid": "", "buynum": 1, //固定奖励 "prize": [{"a": "attr", "t":"rmbmoney", "n": 100}], @@ -4622,7 +4637,9 @@ ] }, { - "payid": "pay_name_sdhd_libao_2", + "id": 2, + "free": "false", + "payid": "xnhd_libao_1", "buynum": 2, "prize": [{"a": "attr", "t":"rmbmoney", "n": 120}], "des" : "intr_cszl_des_11", @@ -4638,7 +4655,9 @@ ] }, { - "payid": "pay_name_sdhd_libao_3", + "id": 3, + "free": "false", + "payid": "xnhd_libao_2", "buynum": 2, "prize": [{"a": "attr", "t":"rmbmoney", "n": 300}], "des" : "intr_cszl_des_12", @@ -4658,7 +4677,9 @@ ] }, { - "payid": "pay_name_sdhd_libao_4", + "id": 4, + "free": "false", + "payid": "xnhd_libao_3", "buynum": 5, "prize": [{"a": "attr", "t":"rmbmoney", "n": 680}], "des" : "intr_cszl_des_12", @@ -4678,7 +4699,9 @@ ] }, { - "payid": "pay_name_sdhd_libao_5", + "id": 5, + "free": "false", + "payid": "xnhd_libao_4", "buynum": 9, "prize": [{"a": "attr", "t":"rmbmoney", "n": 1280}], "des" : "intr_cszl_des_13", @@ -4700,7 +4723,9 @@ ] }, { - "payid": "pay_name_sdhd_libao_6", + "id": 6, + "free": "false", + "payid": "xnhd_libao_5", "buynum": 9, "prize": [{"a": "attr", "t":"rmbmoney", "n": 3280}], "des" : "intr_cszl_des_14", @@ -4724,7 +4749,9 @@ ] }, { - "payid": "pay_name_sdhd_libao_7", + "id": 7, + "free": "false", + "payid": "xnhd_libao_6", "buynum": 9, "prize": [{"a": "attr", "t":"rmbmoney", "n": 6480}], "des" : "intr_cszl_des_14", From 72ff17ba0b9221bd911aff3f8826630cc09ff31b Mon Sep 17 00:00:00 2001 From: dy Date: Tue, 26 Dec 2023 15:26:58 +0800 Subject: [PATCH 09/37] =?UTF-8?q?=E5=85=83=E6=97=A6=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/yuandan/ApiOpen.ts | 7 +- src/api_s2c/event/yuandan/fun.ts | 40 +- src/shared/protocols/event/yuandan/PtlOpen.ts | 1 - src/shared/protocols/serviceProto.ts | 660 +++++++++--------- 4 files changed, 336 insertions(+), 372 deletions(-) diff --git a/src/api_s2c/event/yuandan/ApiOpen.ts b/src/api_s2c/event/yuandan/ApiOpen.ts index ea6aa7b..d077d62 100644 --- a/src/api_s2c/event/yuandan/ApiOpen.ts +++ b/src/api_s2c/event/yuandan/ApiOpen.ts @@ -7,5 +7,10 @@ import {Yuandanfun} from "./fun"; export default async function (call: ApiCall) { let _hd = await Yuandanfun.getCon(call) - call.succ((await G.mongodb.cEvent(`yuandan${_hd.hdid}`).findOne({uid: call.uid, type: `yuandan${_hd.hdid}`})) || {}) + 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/fun.ts b/src/api_s2c/event/yuandan/fun.ts index 7c9174d..20a4c68 100644 --- a/src/api_s2c/event/yuandan/fun.ts +++ b/src/api_s2c/event/yuandan/fun.ts @@ -21,8 +21,8 @@ export class Yuandanfun { gameNum: 0, gift: {}, exchange: {}, - taskfinish: data?.taskfinish || [], - taskval: await this.getTaskVal(call, hdid), + taskfinish: [], + taskval: await this.getTaskVal(call), }, }, {upsert: true, returnDocument: 'after'})).value } @@ -30,9 +30,9 @@ export class Yuandanfun { } /**获取所有taskid 及对应的值 */ - static async getTaskVal(call: ApiCall, hdid: number) { + static async getTaskVal(call: ApiCall) { let _initCon = await this.getCon(call) - let _tasks = _initCon[hdid].data.task + let _tasks = _initCon.data.task let _res = {} for (let index = 0; index < Object.keys(_tasks).length; index++) { const element = Object.keys(_tasks)[index]; @@ -56,38 +56,6 @@ export class Yuandanfun { ) } - // /**刷新每日任务 */ - // static async refreTask(call: ApiCall, mydata, hdid: number) { - // let _initCon = await this.getCon(call) - // let _con = _initCon[hdid].data.task - // if (!_con) return mydata - // mydata.taskfinish = [] - // mydata.taskval = await this.getTaskVal(call, hdid) - // mydata.refresh = G.time - // mydata.gamenum = 0 - // mydata.libao = {} - // - // (await G.mongodb.cEvent(`yuandan${hdid}`).findOneAndUpdate({uid: call.uid, type: `yuandan${hdid}`}, { - // $set: { - // gameNum: 0, - // gift: {}, - // exchange: {}, - // }, - // }, {upsert: true, returnDocument: 'after'})).value - // - // await this.setMyData(call.uid, hdid, { - // $set: { - // refreshTime: mydata.refreshTime, - // taskfinish: mydata.taskfinish, - // taskval: mydata.taskval, - // gamenum: mydata.gamenum, - // libao: mydata.libao - // } - // }) - // return mydata - // } - - /**设置任务 */ static async setTaskVal(call: ApiCall, stype: number, val: number, chkCall: Function, chkval: number = 0, isinc: number = 0, alchangeVal: Function, arg) { // let hdids = await this.gethdids(call) diff --git a/src/shared/protocols/event/yuandan/PtlOpen.ts b/src/shared/protocols/event/yuandan/PtlOpen.ts index 294e1a5..2940c39 100644 --- a/src/shared/protocols/event/yuandan/PtlOpen.ts +++ b/src/shared/protocols/event/yuandan/PtlOpen.ts @@ -2,7 +2,6 @@ * 元旦 */ export type ReqOpen = { - id: string } export type ResOpen = { diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 9ef6cbf..cb14595 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -95,11 +95,10 @@ import { ReqOpen as ReqOpen_26, ResOpen as ResOpen_26 } from './event/yibaichou/ import { ReqRec as ReqRec_9, ResRec as ResRec_9 } from './event/yibaichou/PtlRec'; import { ReqRecAll, ResRecAll } from './event/yibaichou/PtlRecAll'; import { ReqDMRec, ResDMRec } from './event/yuandan/PtlDMRec'; -import { ReqDZOpen, ResDZOpen } from './event/yuandan/PtlDZOpen'; import { ReqDZRec, ResDZRec } from './event/yuandan/PtlDZRec'; import { ReqExchange, ResExchange } from './event/yuandan/PtlExchange'; -import { ReqExchangeOpen, ResExchangeOpen } from './event/yuandan/PtlExchangeOpen'; 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'; @@ -746,10 +745,6 @@ export interface ServiceType { req: ReqDMRec, res: ResDMRec }, - "event/yuandan/DZOpen": { - req: ReqDZOpen, - res: ResDZOpen - }, "event/yuandan/DZRec": { req: ReqDZRec, res: ResDZRec @@ -758,14 +753,14 @@ export interface ServiceType { req: ReqExchange, res: ResExchange }, - "event/yuandan/ExchangeOpen": { - req: ReqExchangeOpen, - res: ResExchangeOpen - }, "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 @@ -2204,36 +2199,31 @@ export const serviceProto: ServiceProto = { }, { "id": 96, - "name": "event/yuandan/DZOpen", - "type": "api" - }, - { - "id": 97, "name": "event/yuandan/DZRec", "type": "api" }, { - "id": 98, + "id": 97, "name": "event/yuandan/Exchange", "type": "api" }, { - "id": 99, - "name": "event/yuandan/ExchangeOpen", - "type": "api" - }, - { - "id": 100, + "id": 98, "name": "event/yuandan/Open", "type": "api" }, { - "id": 101, + "id": 99, + "name": "event/yuandan/TaskRec", + "type": "api" + }, + { + "id": 100, "name": "event/yuandan/ZLRec", "type": "api" }, { - "id": 102, + "id": 101, "name": "event/yuedujijin/Open", "type": "api", "conf": { @@ -2241,157 +2231,157 @@ export const serviceProto: ServiceProto = { } }, { - "id": 103, + "id": 102, "name": "event/yuedujijin/Rec", "type": "api" }, { - "id": 104, + "id": 103, "name": "event/zhanling/BuyLv", "type": "api" }, { - "id": 105, + "id": 104, "name": "event/zhanling/Open", "type": "api" }, { - "id": 106, + "id": 105, "name": "event/zhanling/RecPrize", "type": "api" }, { - "id": 107, + "id": 106, "name": "event/zhanling/RecTask", "type": "api" }, { - "id": 108, + "id": 107, "name": "event/zhoulibao/Open", "type": "api" }, { - "id": 109, + "id": 108, "name": "event/zhoumolibao/Open", "type": "api" }, { - "id": 110, + "id": 109, "name": "event/zhoumolibao/Receive", "type": "api" }, { - "id": 111, + "id": 110, "name": "event/zixuanlibao/Buy", "type": "api" }, { - "id": 112, + "id": 111, "name": "event/zixuanlibao/Open", "type": "api" }, { - "id": 113, + "id": 112, "name": "eventlist/hdGetList", "type": "api" }, { - "id": 114, + "id": 113, "name": "friend/Apply", "type": "api" }, { - "id": 115, + "id": 114, "name": "friend/Del", "type": "api" }, { - "id": 116, + "id": 115, "name": "friend/Gift", "type": "api" }, { - "id": 117, + "id": 116, "name": "friend/List", "type": "api" }, { - "id": 118, + "id": 117, "name": "friend/Open", "type": "api" }, { - "id": 119, + "id": 118, "name": "friend/Respond", "type": "api" }, { - "id": 120, + "id": 119, "name": "friend/RmBlackList", "type": "api" }, { - "id": 121, + "id": 120, "name": "friend/Search", "type": "api" }, { - "id": 122, + "id": 121, "name": "ganbutexun/Challenge", "type": "api" }, { - "id": 123, + "id": 122, "name": "ganbutexun/Open", "type": "api" }, { - "id": 124, + "id": 123, "name": "ganhai/Fast", "type": "api" }, { - "id": 125, + "id": 124, "name": "ganhai/Fight", "type": "api" }, { - "id": 126, + "id": 125, "name": "ganhai/Log", "type": "api" }, { - "id": 127, + "id": 126, "name": "ganhai/Open", "type": "api" }, { - "id": 128, + "id": 127, "name": "ganhai/Refresh", "type": "api" }, { - "id": 129, + "id": 128, "name": "ganhai/RefreshShip", "type": "api" }, { - "id": 130, + "id": 129, "name": "ganhai/Select", "type": "api" }, { - "id": 131, + "id": 130, "name": "gmapi/Gift", "type": "api" }, { - "id": 132, + "id": 131, "name": "gmapi/Post", "type": "api" }, { - "id": 133, + "id": 132, "name": "gonghui/Apply", "type": "api", "conf": { @@ -2401,7 +2391,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 134, + "id": 133, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2411,7 +2401,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 135, + "id": 134, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2421,7 +2411,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 136, + "id": 135, "name": "gonghui/Change", "type": "api", "conf": { @@ -2431,12 +2421,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 137, + "id": 136, "name": "gonghui/Create", "type": "api" }, { - "id": 138, + "id": 137, "name": "gonghui/Dissolve", "type": "api", "conf": { @@ -2446,7 +2436,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 139, + "id": 138, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2456,12 +2446,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 140, + "id": 139, "name": "gonghui/FbBuyNum", "type": "api" }, { - "id": 141, + "id": 140, "name": "gonghui/FbFight", "type": "api", "conf": { @@ -2471,7 +2461,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 142, + "id": 141, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2481,17 +2471,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 143, + "id": 142, "name": "gonghui/GetList", "type": "api" }, { - "id": 144, + "id": 143, "name": "gonghui/Join", "type": "api" }, { - "id": 145, + "id": 144, "name": "gonghui/Jx", "type": "api", "conf": { @@ -2501,7 +2491,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 146, + "id": 145, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2511,7 +2501,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 147, + "id": 146, "name": "gonghui/List", "type": "api", "conf": { @@ -2521,7 +2511,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 148, + "id": 147, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2531,7 +2521,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 149, + "id": 148, "name": "gonghui/Open", "type": "api", "conf": { @@ -2541,7 +2531,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 150, + "id": 149, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2551,7 +2541,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 151, + "id": 150, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2561,7 +2551,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 152, + "id": 151, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2571,7 +2561,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 153, + "id": 152, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2581,137 +2571,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 154, + "id": 153, "name": "gonghuibaozang/Lottery", "type": "api" }, { - "id": 155, + "id": 154, "name": "gonghuibaozang/Open", "type": "api" }, { - "id": 156, + "id": 155, "name": "gonglukuangbiao/Buy", "type": "api" }, { - "id": 157, + "id": 156, "name": "gonglukuangbiao/Fight", "type": "api" }, { - "id": 158, + "id": 157, "name": "gonglukuangbiao/Open", "type": "api" }, { - "id": 159, + "id": 158, "name": "gonglukuangbiao/Refresh", "type": "api" }, { - "id": 160, + "id": 159, "name": "gongyu/mingdao/Active", "type": "api" }, { - "id": 161, + "id": 160, "name": "gongyu/mingdao/Open", "type": "api" }, { - "id": 162, + "id": 161, "name": "gongyu/mingdao/RecPrize", "type": "api" }, { - "id": 163, + "id": 162, "name": "gongyu/mingdao/Repair", "type": "api" }, { - "id": 164, + "id": 163, "name": "gongyu/xunlianjihua/Reset", "type": "api" }, { - "id": 165, + "id": 164, "name": "gongyu/xunlianjihua/UpSkill", "type": "api" }, { - "id": 166, + "id": 165, "name": "gongyu/zuozhanjihua/SetSkill", "type": "api" }, { - "id": 167, + "id": 166, "name": "hbzb/jfs/BuyNum", "type": "api" }, { - "id": 168, + "id": 167, "name": "hbzb/jfs/Fight", "type": "api" }, { - "id": 169, + "id": 168, "name": "hbzb/jfs/GetLog", "type": "api" }, { - "id": 170, + "id": 169, "name": "hbzb/jfs/Open", "type": "api" }, { - "id": 171, + "id": 170, "name": "hbzb/jfs/Rec", "type": "api" }, { - "id": 172, + "id": 171, "name": "hbzb/jfs/Refresh", "type": "api" }, { - "id": 173, + "id": 172, "name": "hbzb/GetStatus", "type": "api" }, { - "id": 174, + "id": 173, "name": "hbzb/zbs/BuyNum", "type": "api" }, { - "id": 175, + "id": 174, "name": "hbzb/zbs/Fight", "type": "api" }, { - "id": 176, + "id": 175, "name": "hbzb/zbs/GetLog", "type": "api" }, { - "id": 177, + "id": 176, "name": "hbzb/zbs/Open", "type": "api" }, { - "id": 178, + "id": 177, "name": "hbzb/zbs/Refresh", "type": "api" }, { - "id": 179, + "id": 178, "name": "hero/Awake", "type": "api" }, { - "id": 180, + "id": 179, "name": "hero/ChangePos", "type": "api", "conf": { @@ -2719,17 +2709,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 181, + "id": 180, "name": "hero/GetList", "type": "api" }, { - "id": 182, + "id": 181, "name": "hero/JinJie", "type": "api" }, { - "id": 183, + "id": 182, "name": "hero/LvUp", "type": "api", "conf": { @@ -2737,32 +2727,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 184, + "id": 183, "name": "hero/Potency", "type": "api" }, { - "id": 185, + "id": 184, "name": "hero/Rec", "type": "api" }, { - "id": 186, + "id": 185, "name": "hero/Reset", "type": "api" }, { - "id": 187, + "id": 186, "name": "hero/Talent", "type": "api" }, { - "id": 188, + "id": 187, "name": "hero/WeaponUp", "type": "api" }, { - "id": 189, + "id": 188, "name": "hongdian/Get", "type": "api", "conf": { @@ -2770,117 +2760,117 @@ export const serviceProto: ServiceProto = { } }, { - "id": 190, + "id": 189, "name": "item/GetList", "type": "api" }, { - "id": 191, + "id": 190, "name": "item/Use", "type": "api" }, { - "id": 192, + "id": 191, "name": "jiaotang/Lottery", "type": "api" }, { - "id": 193, + "id": 192, "name": "jiaotang/Open", "type": "api" }, { - "id": 194, + "id": 193, "name": "jiuba/Lottery", "type": "api" }, { - "id": 195, + "id": 194, "name": "jiuba/Open", "type": "api" }, { - "id": 196, + "id": 195, "name": "jjc/BuyFightNum", "type": "api" }, { - "id": 197, + "id": 196, "name": "jjc/Fight", "type": "api" }, { - "id": 198, + "id": 197, "name": "jjc/FightLog", "type": "api" }, { - "id": 199, + "id": 198, "name": "jjc/Open", "type": "api" }, { - "id": 200, + "id": 199, "name": "jjc/Receive", "type": "api" }, { - "id": 201, + "id": 200, "name": "jjc/Refresh", "type": "api" }, { - "id": 202, + "id": 201, "name": "kaifujingsai/Open", "type": "api" }, { - "id": 203, + "id": 202, "name": "kaifujingsai/Receive", "type": "api" }, { - "id": 204, + "id": 203, "name": "kbzz/Apply", "type": "api" }, { - "id": 205, + "id": 204, "name": "kbzz/AutoApply", "type": "api" }, { - "id": 206, + "id": 205, "name": "kbzz/BuyNum", "type": "api" }, { - "id": 207, + "id": 206, "name": "kbzz/Fight", "type": "api" }, { - "id": 208, + "id": 207, "name": "kbzz/FightLog", "type": "api" }, { - "id": 209, + "id": 208, "name": "kbzz/GroupState", "type": "api" }, { - "id": 210, + "id": 209, "name": "kbzz/Open", "type": "api" }, { - "id": 211, + "id": 210, "name": "kbzz/RecPrize", "type": "api" }, { - "id": 212, + "id": 211, "name": "kbzz/Refresh", "type": "api", "conf": { @@ -2888,287 +2878,287 @@ export const serviceProto: ServiceProto = { } }, { - "id": 213, + "id": 212, "name": "kuangdong/AddPkNum", "type": "api" }, { - "id": 214, + "id": 213, "name": "kuangdong/GetPrize", "type": "api" }, { - "id": 215, + "id": 214, "name": "kuangdong/KdInfo", "type": "api" }, { - "id": 216, + "id": 215, "name": "kuangdong/Log", "type": "api" }, { - "id": 217, + "id": 216, "name": "kuangdong/Open", "type": "api" }, { - "id": 218, + "id": 217, "name": "kuangdong/YanShi", "type": "api" }, { - "id": 219, + "id": 218, "name": "kuangdong/ZhanLing", "type": "api" }, { - "id": 220, + "id": 219, "name": "lingzhulaixi/Open", "type": "api" }, { - "id": 221, + "id": 220, "name": "lingzhulaixi/PkBoss", "type": "api" }, { - "id": 222, + "id": 221, "name": "lingzhulaixi/PkRank", "type": "api" }, { - "id": 223, + "id": 222, "name": "lingzhulaixi/SaoDang", "type": "api" }, { - "id": 224, + "id": 223, "name": "meirishilian/Buy", "type": "api" }, { - "id": 225, + "id": 224, "name": "meirishilian/Fight", "type": "api" }, { - "id": 226, + "id": 225, "name": "meirishilian/Open", "type": "api" }, { - "id": 227, + "id": 226, "name": "msg_c2s/BindUid", "type": "msg" }, { - "id": 228, + "id": 227, "name": "msg_c2s/Pay", "type": "msg" }, { - "id": 229, + "id": 228, "name": "msg_c2s/Sync", "type": "msg" }, { - "id": 230, + "id": 229, "name": "msg_s2c/Chat", "type": "msg" }, { - "id": 231, + "id": 230, "name": "msg_s2c/ChatHelp", "type": "msg" }, { - "id": 232, + "id": 231, "name": "msg_s2c/Collection", "type": "msg" }, { - "id": 233, + "id": 232, "name": "msg_s2c/Email", "type": "msg" }, { - "id": 234, + "id": 233, "name": "msg_s2c/EmailDel", "type": "msg" }, { - "id": 235, + "id": 234, "name": "msg_s2c/EquipChange", "type": "msg" }, { - "id": 236, + "id": 235, "name": "msg_s2c/Friend", "type": "msg" }, { - "id": 237, + "id": 236, "name": "msg_s2c/GhChange", "type": "msg" }, { - "id": 238, + "id": 237, "name": "msg_s2c/GongHuiBaoZang", "type": "msg" }, { - "id": 239, + "id": 238, "name": "msg_s2c/HeroChange", "type": "msg" }, { - "id": 240, + "id": 239, "name": "msg_s2c/HongDianChange", "type": "msg" }, { - "id": 241, + "id": 240, "name": "msg_s2c/ItemChange", "type": "msg" }, { - "id": 242, + "id": 241, "name": "msg_s2c/LoginQueue", "type": "msg" }, { - "id": 243, + "id": 242, "name": "msg_s2c/LshdChange", "type": "msg" }, { - "id": 244, + "id": 243, "name": "msg_s2c/NewDay", "type": "msg" }, { - "id": 245, + "id": 244, "name": "msg_s2c/OtherLogin", "type": "msg" }, { - "id": 246, + "id": 245, "name": "msg_s2c/PayChange", "type": "msg" }, { - "id": 247, + "id": 246, "name": "msg_s2c/PayResult", "type": "msg" }, { - "id": 248, + "id": 247, "name": "msg_s2c/PeijianChange", "type": "msg" }, { - "id": 249, + "id": 248, "name": "msg_s2c/PlayerChange", "type": "msg" }, { - "id": 250, + "id": 249, "name": "msg_s2c/Private", "type": "msg" }, { - "id": 251, + "id": 250, "name": "msg_s2c/PushGiftChange", "type": "msg" }, { - "id": 252, + "id": 251, "name": "msg_s2c/SendGift", "type": "msg" }, { - "id": 253, + "id": 252, "name": "msg_s2c/ShiwuChange", "type": "msg" }, { - "id": 254, + "id": 253, "name": "msg_s2c/TaskChange", "type": "msg" }, { - "id": 255, + "id": 254, "name": "msg_s2c/Xianshilibao", "type": "msg" }, { - "id": 256, + "id": 255, "name": "pata/Fight", "type": "api" }, { - "id": 257, + "id": 256, "name": "pata/GetPrize", "type": "api" }, { - "id": 258, + "id": 257, "name": "pata/Open", "type": "api" }, { - "id": 259, + "id": 258, "name": "pata/SaoDang", "type": "api" }, { - "id": 260, + "id": 259, "name": "pay/GetList", "type": "api" }, { - "id": 261, + "id": 260, "name": "peijian/GetList", "type": "api" }, { - "id": 262, + "id": 261, "name": "peijian/JingLian", "type": "api" }, { - "id": 263, + "id": 262, "name": "peijian/JinJie", "type": "api" }, { - "id": 264, + "id": 263, "name": "peijian/LvUp", "type": "api" }, { - "id": 265, + "id": 264, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 266, + "id": 265, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 267, + "id": 266, "name": "peijian/Reset", "type": "api" }, { - "id": 268, + "id": 267, "name": "peijian/Rm", "type": "api" }, { - "id": 269, + "id": 268, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3176,32 +3166,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 270, + "id": 269, "name": "peijian/UnLock", "type": "api" }, { - "id": 271, + "id": 270, "name": "peijian/Wear", "type": "api" }, { - "id": 272, + "id": 271, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 273, + "id": 272, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 274, + "id": 273, "name": "peijiancangku/Open", "type": "api" }, { - "id": 275, + "id": 274, "name": "Bingo", "type": "api", "conf": { @@ -3209,147 +3199,147 @@ export const serviceProto: ServiceProto = { } }, { - "id": 276, + "id": 275, "name": "FightTest", "type": "api" }, { - "id": 277, + "id": 276, "name": "SyncBtn", "type": "api" }, { - "id": 278, + "id": 277, "name": "Test", "type": "api" }, { - "id": 279, + "id": 278, "name": "pushgift/ItemNoEnough", "type": "api" }, { - "id": 280, + "id": 279, "name": "pushgift/Open", "type": "api" }, { - "id": 281, + "id": 280, "name": "qjzzd/Fight", "type": "api" }, { - "id": 282, + "id": 281, "name": "qjzzd/Open", "type": "api" }, { - "id": 283, + "id": 282, "name": "rank/Open", "type": "api" }, { - "id": 284, + "id": 283, "name": "shiwu/Concise", "type": "api" }, { - "id": 285, + "id": 284, "name": "shiwu/Extract", "type": "api" }, { - "id": 286, + "id": 285, "name": "shiwu/GetList", "type": "api" }, { - "id": 287, + "id": 286, "name": "shiwu/LvUp", "type": "api" }, { - "id": 288, + "id": 287, "name": "shiwu/Recast", "type": "api" }, { - "id": 289, + "id": 288, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 290, + "id": 289, "name": "shiwu/Wear", "type": "api" }, { - "id": 291, + "id": 290, "name": "shootGame/Open", "type": "api" }, { - "id": 292, + "id": 291, "name": "shootGame/Rec", "type": "api" }, { - "id": 293, + "id": 292, "name": "shop/Buy", "type": "api" }, { - "id": 294, + "id": 293, "name": "shop/Open", "type": "api" }, { - "id": 295, + "id": 294, "name": "shop/Refresh", "type": "api" }, { - "id": 296, + "id": 295, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 297, + "id": 296, "name": "sign/GetPrize", "type": "api" }, { - "id": 298, + "id": 297, "name": "sign/Open", "type": "api" }, { - "id": 299, + "id": 298, "name": "slzd/Aim", "type": "api" }, { - "id": 300, + "id": 299, "name": "slzd/BuyNum", "type": "api" }, { - "id": 301, + "id": 300, "name": "slzd/Fight", "type": "api" }, { - "id": 302, + "id": 301, "name": "slzd/FightLog", "type": "api" }, { - "id": 303, + "id": 302, "name": "slzd/MyRank", "type": "api" }, { - "id": 304, + "id": 303, "name": "slzd/Open", "type": "api", "conf": { @@ -3359,77 +3349,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 305, + "id": 304, "name": "slzd/OpenFort", "type": "api" }, { - "id": 306, + "id": 305, "name": "slzd/Rec", "type": "api" }, { - "id": 307, + "id": 306, "name": "slzd/Refresh", "type": "api" }, { - "id": 308, + "id": 307, "name": "slzd/Slot", "type": "api" }, { - "id": 309, + "id": 308, "name": "tanxian/Event", "type": "api" }, { - "id": 310, + "id": 309, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 311, + "id": 310, "name": "tanxian/Fight", "type": "api" }, { - "id": 312, + "id": 311, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 313, + "id": 312, "name": "tanxian/Open", "type": "api" }, { - "id": 314, + "id": 313, "name": "tanxian/Receive", "type": "api" }, { - "id": 315, + "id": 314, "name": "task/AllFinsh", "type": "api" }, { - "id": 316, + "id": 315, "name": "task/Finsh", "type": "api" }, { - "id": 317, + "id": 316, "name": "task/Open", "type": "api" }, { - "id": 318, + "id": 317, "name": "user/CDKEY", "type": "api" }, { - "id": 319, + "id": 318, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3437,202 +3427,202 @@ export const serviceProto: ServiceProto = { } }, { - "id": 320, + "id": 319, "name": "user/ChangeName", "type": "api" }, { - "id": 321, + "id": 320, "name": "user/Dot", "type": "api" }, { - "id": 322, + "id": 321, "name": "user/Fight", "type": "api" }, { - "id": 323, + "id": 322, "name": "user/GetInfo", "type": "api" }, { - "id": 324, + "id": 323, "name": "user/InfoOpen", "type": "api" }, { - "id": 325, + "id": 324, "name": "user/Login", "type": "api" }, { - "id": 326, + "id": 325, "name": "user/Ping", "type": "api" }, { - "id": 327, + "id": 326, "name": "user/Renown", "type": "api" }, { - "id": 328, + "id": 327, "name": "user/RenownBuy", "type": "api" }, { - "id": 329, + "id": 328, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 330, + "id": 329, "name": "user/RenownOpen", "type": "api" }, { - "id": 331, + "id": 330, "name": "user/Tujian", "type": "api" }, { - "id": 332, + "id": 331, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 333, + "id": 332, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 334, + "id": 333, "name": "weixiuchang/Open", "type": "api" }, { - "id": 335, + "id": 334, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 336, + "id": 335, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 337, + "id": 336, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 338, + "id": 337, "name": "wzry/BaoMing", "type": "api" }, { - "id": 339, + "id": 338, "name": "wzry/catFightLog", "type": "api" }, { - "id": 340, + "id": 339, "name": "wzry/CatGroup", "type": "api" }, { - "id": 341, + "id": 340, "name": "wzry/DldFight", "type": "api" }, { - "id": 342, + "id": 341, "name": "wzry/DldRefre", "type": "api" }, { - "id": 343, + "id": 342, "name": "wzry/JingCai", "type": "api" }, { - "id": 344, + "id": 343, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 345, + "id": 344, "name": "wzry/Open", "type": "api" }, { - "id": 346, + "id": 345, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 347, + "id": 346, "name": "wzry/Wzzd", "type": "api" }, { - "id": 348, + "id": 347, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 349, + "id": 348, "name": "xstask/AllGet", "type": "api" }, { - "id": 350, + "id": 349, "name": "xstask/Get", "type": "api" }, { - "id": 351, + "id": 350, "name": "xstask/LvUp", "type": "api" }, { - "id": 352, + "id": 351, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 353, + "id": 352, "name": "xstask/Open", "type": "api" }, { - "id": 354, + "id": 353, "name": "xstask/Receive", "type": "api" }, { - "id": 355, + "id": 354, "name": "xstask/Refresh", "type": "api" }, { - "id": 356, + "id": 355, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 357, + "id": 356, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 358, + "id": 357, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 359, + "id": 358, "name": "zhanqianbushu/Up", "type": "api" } @@ -11417,46 +11407,57 @@ export const serviceProto: ServiceProto = { "type": { "type": "String" } + }, + { + "id": 1, + "name": "prize", + "type": { + "type": "Union", + "members": [ + { + "id": 0, + "type": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "a", + "type": { + "type": "String" + } + }, + { + "id": 1, + "name": "t", + "type": { + "type": "String" + } + }, + { + "id": 2, + "name": "n", + "type": { + "type": "Number" + } + } + ] + } + }, + { + "id": 1, + "type": { + "type": "Literal", + "literal": null + } + } + ] + } } ] }, "event/yuandan/PtlDMRec/ResDMRec": { "type": "Interface" }, - "event/yuandan/PtlDZOpen/ReqDZOpen": { - "type": "Interface" - }, - "event/yuandan/PtlDZOpen/ResDZOpen": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "record", - "type": { - "type": "Interface", - "indexSignature": { - "keyType": "String", - "type": { - "type": "Any" - } - } - } - }, - { - "id": 1, - "name": "buyLog", - "type": { - "type": "Interface", - "indexSignature": { - "keyType": "String", - "type": { - "type": "Any" - } - } - } - } - ] - }, "event/yuandan/PtlDZRec/ReqDZRec": { "type": "Interface", "properties": [ @@ -11487,40 +11488,31 @@ export const serviceProto: ServiceProto = { "event/yuandan/PtlExchange/ResExchange": { "type": "Interface" }, - "event/yuandan/PtlExchangeOpen/ReqExchangeOpen": { + "event/yuandan/PtlOpen/ReqOpen": { "type": "Interface" }, - "event/yuandan/PtlExchangeOpen/ResExchangeOpen": { + "event/yuandan/PtlOpen/ResOpen": { "type": "Interface", - "properties": [ - { - "id": 0, - "name": "record", - "type": { - "type": "Interface", - "indexSignature": { - "keyType": "String", - "type": { - "type": "Any" - } - } - } + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" } - ] + } }, - "event/yuandan/PtlOpen/ReqOpen": { + "event/yuandan/PtlTaskRec/ReqTaskRec": { "type": "Interface", "properties": [ { "id": 0, - "name": "id", + "name": "taskid", "type": { "type": "String" } } ] }, - "event/yuandan/PtlOpen/ResOpen": { + "event/yuandan/PtlTaskRec/ResTaskRec": { "type": "Interface", "indexSignature": { "keyType": "String", From bfc9ff369c361b97321e7f098870300ac102f2db Mon Sep 17 00:00:00 2001 From: dy Date: Tue, 26 Dec 2023 16:20:59 +0800 Subject: [PATCH 10/37] =?UTF-8?q?fix=E5=85=83=E6=97=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/yuandan/ApiDMRec.ts | 2 +- .../protocols/event/yuandan/PtlDMRec.ts | 1 - .../protocols/event/yuandan/PtlZLRec.ts | 2 +- src/shared/protocols/serviceProto.ts | 32 ++++++++++++++----- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/src/api_s2c/event/yuandan/ApiDMRec.ts b/src/api_s2c/event/yuandan/ApiDMRec.ts index 859b784..bcbec2f 100644 --- a/src/api_s2c/event/yuandan/ApiDMRec.ts +++ b/src/api_s2c/event/yuandan/ApiDMRec.ts @@ -23,7 +23,7 @@ export default async function (call: ApiCall) { await PlayerFun.cutNeed(call, _hd.data.gameneed); } - await PlayerFun.sendPrize(call, prize || []); + await PlayerFun.sendPrize(call, prize ? [prize] : []); await G.mongodb.cEvent(`yuandan${_hd.hdid}`).updateOne({uid: call.uid, type: `yuandan${_hd.hdid}`}, { $inc: {[`gameNum`]: 1}, diff --git a/src/shared/protocols/event/yuandan/PtlDMRec.ts b/src/shared/protocols/event/yuandan/PtlDMRec.ts index c0a01c1..cd4111e 100644 --- a/src/shared/protocols/event/yuandan/PtlDMRec.ts +++ b/src/shared/protocols/event/yuandan/PtlDMRec.ts @@ -2,7 +2,6 @@ * 元旦达摩领奖 */ export type ReqDMRec = { - id: string, prize: { a: string, t: string, n: number } | null } diff --git a/src/shared/protocols/event/yuandan/PtlZLRec.ts b/src/shared/protocols/event/yuandan/PtlZLRec.ts index 6e2d21f..ef83032 100644 --- a/src/shared/protocols/event/yuandan/PtlZLRec.ts +++ b/src/shared/protocols/event/yuandan/PtlZLRec.ts @@ -4,7 +4,7 @@ */ export type ReqZLRec = { id: string, - dlz: string[] + dlz: { a: string, t: string, n: number }[] } export type ResZLRec = { diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index cb14595..41a4fae 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -11403,13 +11403,6 @@ export const serviceProto: ServiceProto = { "properties": [ { "id": 0, - "name": "id", - "type": { - "type": "String" - } - }, - { - "id": 1, "name": "prize", "type": { "type": "Union", @@ -11537,7 +11530,30 @@ export const serviceProto: ServiceProto = { "type": { "type": "Array", "elementType": { - "type": "String" + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "a", + "type": { + "type": "String" + } + }, + { + "id": 1, + "name": "t", + "type": { + "type": "String" + } + }, + { + "id": 2, + "name": "n", + "type": { + "type": "Number" + } + } + ] } } } From ae0a5c688280d2b0678ffccf630a7c5b87252e03 Mon Sep 17 00:00:00 2001 From: dy Date: Tue, 26 Dec 2023 16:33:31 +0800 Subject: [PATCH 11/37] =?UTF-8?q?fix=E5=85=83=E6=97=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/yuandan/ApiZLRec.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/api_s2c/event/yuandan/ApiZLRec.ts b/src/api_s2c/event/yuandan/ApiZLRec.ts index 46f3b47..240a590 100644 --- a/src/api_s2c/event/yuandan/ApiZLRec.ts +++ b/src/api_s2c/event/yuandan/ApiZLRec.ts @@ -18,7 +18,14 @@ export default async function (call: ApiCall) { let rec = data?.qiandao?.[call.req.id] if (rec) return call.errorCode(-3) - let prize = [gift.prize, ...gift.dlz.map((v, i) => v[call.req.dlz[i]])] + // 奖励不符合，严格判断 + 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); From 5fa9d088d99310207e019e9ab0ed48de33cf9724 Mon Sep 17 00:00:00 2001 From: dy Date: Tue, 26 Dec 2023 16:48:20 +0800 Subject: [PATCH 12/37] cehua json --- src/json/attr.json | 20 + src/json/clsl_com.json5 | 6 +- src/json/clsl_dan.json | 100 +- src/json/g123item.json | 48 +- src/json/guideConfig.json | 2 +- src/json/huodong.json5 | 693 ++++- src/json/item.json | 30 +- src/json/npc.json | 450 +++ src/json/openCond.json | 13 + src/json/pay.json | 206 +- src/json/peijian.json | 34 +- src/json/peijian_lv.json | 792 +++--- src/json/renown_chanchu.json | 5002 ++++++++++++++++++++++++++++++++++ src/json/renown_level.json | 362 +++ src/json/shop.json | 12 + 15 files changed, 7248 insertions(+), 522 deletions(-) create mode 100644 src/json/renown_chanchu.json create mode 100644 src/json/renown_level.json 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/clsl_dan.json b/src/json/clsl_dan.json index 6978a0d..cf565d0 100644 --- a/src/json/clsl_dan.json +++ b/src/json/clsl_dan.json @@ -18,7 +18,7 @@ "n": 100 } ], - "npc": 30 + "npc": 60001 }, "1": { "allStar": 1, @@ -39,7 +39,7 @@ "n": 100 } ], - "npc": 30 + "npc": 60002 }, "2": { "allStar": 2, @@ -60,7 +60,7 @@ "n": 100 } ], - "npc": 30 + "npc": 60003 }, "3": { "allStar": 3, @@ -81,7 +81,7 @@ "n": 100 } ], - "npc": 30 + "npc": 60004 }, "4": { "allStar": 4, @@ -102,7 +102,7 @@ "n": 100 } ], - "npc": 31 + "npc": 60005 }, "5": { "allStar": 5, @@ -123,7 +123,7 @@ "n": 100 } ], - "npc": 31 + "npc": 60006 }, "6": { "allStar": 6, @@ -144,7 +144,7 @@ "n": 100 } ], - "npc": 31 + "npc": 60007 }, "7": { "allStar": 7, @@ -165,7 +165,7 @@ "n": 100 } ], - "npc": 31 + "npc": 60008 }, "8": { "allStar": 8, @@ -186,7 +186,7 @@ "n": 100 } ], - "npc": 32 + "npc": 60009 }, "9": { "allStar": 9, @@ -207,7 +207,7 @@ "n": 100 } ], - "npc": 32 + "npc": 60010 }, "10": { "allStar": 10, @@ -228,7 +228,7 @@ "n": 100 } ], - "npc": 32 + "npc": 60011 }, "11": { "allStar": 11, @@ -249,7 +249,7 @@ "n": 100 } ], - "npc": 32 + "npc": 60012 }, "12": { "allStar": 12, @@ -270,7 +270,7 @@ "n": 100 } ], - "npc": 33 + "npc": 60013 }, "13": { "allStar": 13, @@ -291,7 +291,7 @@ "n": 100 } ], - "npc": 33 + "npc": 60014 }, "14": { "allStar": 14, @@ -312,7 +312,7 @@ "n": 100 } ], - "npc": 33 + "npc": 60015 }, "15": { "allStar": 15, @@ -333,7 +333,7 @@ "n": 100 } ], - "npc": 33 + "npc": 60016 }, "16": { "allStar": 16, @@ -354,7 +354,7 @@ "n": 100 } ], - "npc": 34 + "npc": 60017 }, "17": { "allStar": 17, @@ -375,7 +375,7 @@ "n": 100 } ], - "npc": 34 + "npc": 60018 }, "18": { "allStar": 18, @@ -396,7 +396,7 @@ "n": 100 } ], - "npc": 34 + "npc": 60019 }, "19": { "allStar": 19, @@ -417,7 +417,7 @@ "n": 100 } ], - "npc": 34 + "npc": 60020 }, "20": { "allStar": 20, @@ -438,7 +438,7 @@ "n": 100 } ], - "npc": 35 + "npc": 60021 }, "21": { "allStar": 21, @@ -459,7 +459,7 @@ "n": 100 } ], - "npc": 35 + "npc": 60022 }, "22": { "allStar": 22, @@ -480,7 +480,7 @@ "n": 100 } ], - "npc": 35 + "npc": 60023 }, "23": { "allStar": 23, @@ -501,7 +501,7 @@ "n": 100 } ], - "npc": 35 + "npc": 60024 }, "24": { "allStar": 24, @@ -522,7 +522,7 @@ "n": 100 } ], - "npc": 36 + "npc": 60025 }, "25": { "allStar": 25, @@ -543,7 +543,7 @@ "n": 100 } ], - "npc": 36 + "npc": 60026 }, "26": { "allStar": 26, @@ -564,7 +564,7 @@ "n": 100 } ], - "npc": 36 + "npc": 60027 }, "27": { "allStar": 27, @@ -585,7 +585,7 @@ "n": 100 } ], - "npc": 36 + "npc": 60028 }, "28": { "allStar": 28, @@ -606,7 +606,7 @@ "n": 100 } ], - "npc": 37 + "npc": 60029 }, "29": { "allStar": 29, @@ -627,7 +627,7 @@ "n": 100 } ], - "npc": 37 + "npc": 60030 }, "30": { "allStar": 30, @@ -648,7 +648,7 @@ "n": 100 } ], - "npc": 37 + "npc": 60031 }, "31": { "allStar": 31, @@ -669,7 +669,7 @@ "n": 100 } ], - "npc": 37 + "npc": 60032 }, "32": { "allStar": 32, @@ -690,7 +690,7 @@ "n": 100 } ], - "npc": 38 + "npc": 60033 }, "33": { "allStar": 33, @@ -711,7 +711,7 @@ "n": 100 } ], - "npc": 38 + "npc": 60034 }, "34": { "allStar": 34, @@ -732,7 +732,7 @@ "n": 100 } ], - "npc": 38 + "npc": 60035 }, "35": { "allStar": 35, @@ -753,7 +753,7 @@ "n": 100 } ], - "npc": 38 + "npc": 60036 }, "36": { "allStar": 36, @@ -774,7 +774,7 @@ "n": 100 } ], - "npc": 39 + "npc": 60037 }, "37": { "allStar": 37, @@ -795,7 +795,7 @@ "n": 100 } ], - "npc": 39 + "npc": 60038 }, "38": { "allStar": 38, @@ -816,7 +816,7 @@ "n": 100 } ], - "npc": 39 + "npc": 60039 }, "39": { "allStar": 39, @@ -837,7 +837,7 @@ "n": 100 } ], - "npc": 39 + "npc": 60040 }, "40": { "allStar": 40, @@ -858,7 +858,7 @@ "n": 100 } ], - "npc": 40 + "npc": 60041 }, "41": { "allStar": 41, @@ -879,7 +879,7 @@ "n": 100 } ], - "npc": 40 + "npc": 60042 }, "42": { "allStar": 42, @@ -900,7 +900,7 @@ "n": 100 } ], - "npc": 40 + "npc": 60043 }, "43": { "allStar": 43, @@ -921,7 +921,7 @@ "n": 100 } ], - "npc": 40 + "npc": 60044 }, "44": { "allStar": 44, @@ -942,7 +942,7 @@ "n": 100 } ], - "npc": 41 + "npc": 60045 }, "45": { "allStar": 45, @@ -963,7 +963,7 @@ "n": 100 } ], - "npc": 41 + "npc": 60046 }, "46": { "allStar": 46, @@ -984,7 +984,7 @@ "n": 100 } ], - "npc": 41 + "npc": 60047 }, "47": { "allStar": 47, @@ -1005,7 +1005,7 @@ "n": 100 } ], - "npc": 41 + "npc": 60048 }, "48": { "allStar": 48, @@ -1026,7 +1026,7 @@ "n": 100 } ], - "npc": 41 + "npc": 60049 }, "49": { "allStar": 49, @@ -1047,6 +1047,6 @@ "n": 100 } ], - "npc": 42 + "npc": 60050 } } \ No newline at end of file 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/guideConfig.json b/src/json/guideConfig.json index 2f94f67..ef9af2d 100644 --- a/src/json/guideConfig.json +++ b/src/json/guideConfig.json @@ -1413,7 +1413,7 @@ "triggerType": "openCond", "typeId": "dixialeitai_paiqian", "Type": "finger", - "path": "Canvas/draw/uiRoot/uiView_dixialeitai_paiqian/dixialeitai_paiqian/ScrollView/view/content/list/item/ItemClass", + "path": "Canvas/draw/uiRoot/uiView_dixialeitai_paiqian/dixialeitai_paiqian/dxlt_txdb/ScrollView/view/content/list/item/ItemClass", "undefined": "点击第一个干部", "initiative": 1, "location": 1, diff --git a/src/json/huodong.json5 b/src/json/huodong.json5 index 5caa64d..158a5cb 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,593 @@ } } } - } + }, + { + "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": [], + "tiaozhuan": 4, + "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": [], + "tiaozhuan": 5, + "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": [], + "tiaozhuan": 2, + "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": [], + "tiaozhuan": 1, + "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], + "tiaozhuan": 6, + "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": [], + "tiaozhuan": 7, + "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": [], + "tiaozhuan": 8, + "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": [], + "tiaozhuan": 10, + "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": [], + "tiaozhuan": 11, + "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..ece3438 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": "", @@ -2890,7 +2885,6 @@ "sort": 3, "colour": 6, "way": [ - 9, 75 ], "go": "", @@ -2934,7 +2928,6 @@ "sort": 3, "colour": 6, "way": [ - 9, 75 ], "go": "", @@ -4024,6 +4017,7 @@ "50010": { "id": 50010, "name": "playerheadFrame_name_24", + "undefined": "使用后解锁头像框“披星戴月”", "type": 7, "sort": 1, "colour": 4, diff --git a/src/json/npc.json b/src/json/npc.json index 0a08b54..bd65555 100644 --- a/src/json/npc.json +++ b/src/json/npc.json @@ -62197,5 +62197,455 @@ "isboss": 0, "ghname": "npc_ghname_4", "npcname": "slzd_npc_name_5" + }, + "60001": { + "npcId": 60001, + "attr": {}, + "npclist": "4011_50_90073#5001_50_90070#3001_50_90074#3006_50_90070#3011_50_90073#4001_50_90070", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_5", + "npcname": "jjc_npc_name_5" + }, + "60002": { + "npcId": 60002, + "attr": {}, + "npclist": "4012_50_90073#5002_50_90070#3002_50_90074#3007_50_90070#3012_50_90073#4002_50_90070", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_6", + "npcname": "jjc_npc_name_6" + }, + "60003": { + "npcId": 60003, + "attr": {}, + "npclist": "4012_51_90073#5003_51_90070#3003_51_90074#3008_51_90070#3013_51_90073#4003_51_90070", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_1", + "npcname": "jjc_npc_name_1" + }, + "60004": { + "npcId": 60004, + "attr": {}, + "npclist": "4014_51_90073#5004_51_90070#3004_51_90074#3009_51_90070#3014_51_90073#4004_51_90070", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_2", + "npcname": "jjc_npc_name_2" + }, + "60005": { + "npcId": 60005, + "attr": {}, + "npclist": "4015_52_90073#5005_52_90070#3005_52_90074#3010_52_90070#3015_52_90073#4005_52_90070", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_3", + "npcname": "jjc_npc_name_3" + }, + "60006": { + "npcId": 60006, + "attr": {}, + "npclist": "5001_51_90073#3001_51_90070#3006_51_90074#3011_51_90070#4013_51_90073#4006_51_90070", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_4", + "npcname": "jjc_npc_name_4" + }, + "60007": { + "npcId": 60007, + "attr": {}, + "npclist": "5002_53_90073#3002_53_90070#3007_53_90074#3012_53_90070#4002_53_90073#4007_53_90070", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_5", + "npcname": "jjc_npc_name_5" + }, + "60008": { + "npcId": 60008, + "attr": {}, + "npclist": "5003_53_90073#3003_53_90070#3008_53_90074#3013_53_90070#4003_53_90071#4008_53_90072", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_6", + "npcname": "jjc_npc_name_6" + }, + "60009": { + "npcId": 60009, + "attr": {}, + "npclist": "5004_53_90073#3004_53_90070#3009_53_90074#3014_53_90070#4004_53_90071#4009_53_90072", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_1", + "npcname": "jjc_npc_name_1" + }, + "60010": { + "npcId": 60010, + "attr": {}, + "npclist": "5005_54_90073#3005_54_90070#3010_54_90074#3015_54_90070#4005_54_90071#4010_54_90072", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_2", + "npcname": "jjc_npc_name_2" + }, + "60011": { + "npcId": 60011, + "attr": {}, + "npclist": "3001_54_90072#3006_54_90071#3011_54_90076#4001_54_90077#4006_54_90077#4011_54_90077", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_3", + "npcname": "jjc_npc_name_3" + }, + "60012": { + "npcId": 60012, + "attr": {}, + "npclist": "3002_54_90072#3007_54_90071#3012_54_90076#4002_54_90077#4007_54_90077#4012_54_90077", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_4", + "npcname": "jjc_npc_name_4" + }, + "60013": { + "npcId": 60013, + "attr": {}, + "npclist": "3003_54_90072#3008_54_90071#3013_54_90076#4003_54_90077#4008_54_90077#4012_54_90077", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_5", + "npcname": "jjc_npc_name_5" + }, + "60014": { + "npcId": 60014, + "attr": {}, + "npclist": "3004_55_90072#3009_55_90071#3014_55_90076#4004_55_90077#4009_55_90077#4014_55_90077", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_6", + "npcname": "jjc_npc_name_6" + }, + "60015": { + "npcId": 60015, + "attr": {}, + "npclist": "3005_55_90072#3010_55_90071#3015_55_90076#4004_55_90077#4010_55_90077#4015_55_90077", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_1", + "npcname": "jjc_npc_name_1" + }, + "60016": { + "npcId": 60016, + "attr": {}, + "npclist": "3006_55_90072#3011_55_90071#4001_55_90076#4006_55_90077#4011_55_90077#5001_55_90077", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_2", + "npcname": "jjc_npc_name_2" + }, + "60017": { + "npcId": 60017, + "attr": {}, + "npclist": "3007_55_90072#3012_55_90071#4002_55_90076#4007_55_90077#4012_55_90077#5002_55_90077", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_3", + "npcname": "jjc_npc_name_3" + }, + "60018": { + "npcId": 60018, + "attr": {}, + "npclist": "3008_55_90072#3013_55_90071#4003_55_90076#4008_55_90077#4012_55_90077#5003_55_90077", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_4", + "npcname": "jjc_npc_name_4" + }, + "60019": { + "npcId": 60019, + "attr": {}, + "npclist": "3009_55_90072#3014_55_90071#4004_55_90076#4009_55_90077#4014_55_90077#5004_55_90077", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_5", + "npcname": "jjc_npc_name_5" + }, + "60020": { + "npcId": 60020, + "attr": {}, + "npclist": "3010_55_90072#3015_55_90071#4005_55_90076#4010_55_90077#4015_55_90077#5005_55_90077", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_6", + "npcname": "jjc_npc_name_6" + }, + "60021": { + "npcId": 60021, + "attr": {}, + "npclist": "3011_56_90072#4001_56_90071#4006_56_90076#4011_56_90077#5001_56_90077#3001_56_90077", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_1", + "npcname": "jjc_npc_name_1" + }, + "60022": { + "npcId": 60022, + "attr": {}, + "npclist": "3012_56_90072#4002_56_90071#4007_56_90076#4012_56_90077#5002_56_90077#3002_56_90077", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_2", + "npcname": "jjc_npc_name_2" + }, + "60023": { + "npcId": 60023, + "attr": {}, + "npclist": "3013_56_90072#4003_56_90071#4008_56_90076#4012_56_90077#5003_56_90077#3003_56_90077", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_3", + "npcname": "jjc_npc_name_3" + }, + "60024": { + "npcId": 60024, + "attr": {}, + "npclist": "3014_56_90072#4004_56_90071#4009_56_90076#4014_56_90077#5004_56_90077#3004_56_90077", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_4", + "npcname": "jjc_npc_name_4" + }, + "60025": { + "npcId": 60025, + "attr": {}, + "npclist": "3015_55_90072#4005_55_90071#4010_55_90076#4015_55_90077#5005_55_90077#3005_55_90077", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_5", + "npcname": "jjc_npc_name_5" + }, + "60026": { + "npcId": 60026, + "attr": {}, + "npclist": "4001_55_90072#4006_55_90071#4011_55_90076#5001_55_90077#3001_55_90077#3006_55_90077", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_6", + "npcname": "jjc_npc_name_6" + }, + "60027": { + "npcId": 60027, + "attr": {}, + "npclist": "4002_57_90072#4007_57_90071#4012_57_90076#5002_57_90077#3002_57_90078#3007_57_90078", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_1", + "npcname": "jjc_npc_name_1" + }, + "60028": { + "npcId": 60028, + "attr": {}, + "npclist": "4003_57_90072#4008_57_90071#4012_57_90076#5003_57_90077#3003_57_90078#3008_57_90078", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_2", + "npcname": "jjc_npc_name_2" + }, + "60029": { + "npcId": 60029, + "attr": {}, + "npclist": "4004_57_90072#4009_57_90071#4014_57_90076#5004_57_90077#3004_57_90078#3009_57_90078", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_3", + "npcname": "jjc_npc_name_3" + }, + "60030": { + "npcId": 60030, + "attr": {}, + "npclist": "4005_57_90072#4010_57_90071#4015_57_90076#5005_57_90077#3005_57_90078#3010_57_90078", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_4", + "npcname": "jjc_npc_name_4" + }, + "60031": { + "npcId": 60031, + "attr": {}, + "npclist": "4006_57_90072#4011_57_90071#5001_57_90076#3001_57_90077#3006_57_90078#3011_57_90078", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_5", + "npcname": "jjc_npc_name_5" + }, + "60032": { + "npcId": 60032, + "attr": {}, + "npclist": "4007_57_90072#4012_57_90071#5002_57_90076#3002_57_90077#3007_57_90078#3012_57_90078", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_6", + "npcname": "jjc_npc_name_6" + }, + "60033": { + "npcId": 60033, + "attr": {}, + "npclist": "4008_57_90072#4012_57_90071#5003_57_90076#3003_57_90077#3008_57_90078#3013_57_90078", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_1", + "npcname": "jjc_npc_name_1" + }, + "60034": { + "npcId": 60034, + "attr": {}, + "npclist": "4009_58_90072#4014_58_90071#5004_58_90076#3004_58_90077#3009_58_90078#3014_58_90078", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_2", + "npcname": "jjc_npc_name_2" + }, + "60035": { + "npcId": 60035, + "attr": {}, + "npclist": "4010_58_90072#4015_58_90071#5005_58_90076#3005_58_90077#3010_58_90078#3015_58_90078", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_3", + "npcname": "jjc_npc_name_3" + }, + "60036": { + "npcId": 60036, + "attr": {}, + "npclist": "4011_58_90072#5001_58_90071#3001_58_90076#3006_58_90077#3011_58_90078#4001_58_90078", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_4", + "npcname": "jjc_npc_name_4" + }, + "60037": { + "npcId": 60037, + "attr": {}, + "npclist": "4012_58_90072#5002_58_90071#3002_58_90076#3007_58_90077#3012_58_90078#4002_58_90078", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_5", + "npcname": "jjc_npc_name_5" + }, + "60038": { + "npcId": 60038, + "attr": {}, + "npclist": "4012_58_90072#5003_58_90071#3003_58_90076#3008_58_90077#3013_58_90078#4003_58_90078", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_6", + "npcname": "jjc_npc_name_6" + }, + "60039": { + "npcId": 60039, + "attr": {}, + "npclist": "4014_58_90072#5004_58_90071#3004_58_90076#3009_58_90077#3014_58_90078#4004_58_90078", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_1", + "npcname": "jjc_npc_name_1" + }, + "60040": { + "npcId": 60040, + "attr": {}, + "npclist": "4015_59_90072#5005_59_90071#3005_59_90076#3010_59_90077#3015_59_90078#4005_59_90078", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_2", + "npcname": "jjc_npc_name_2" + }, + "60041": { + "npcId": 60041, + "attr": {}, + "npclist": "5001_59_90072#3001_59_90071#3006_59_90076#3011_59_90077#4001_59_90078#4006_59_90078", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_3", + "npcname": "jjc_npc_name_3" + }, + "60042": { + "npcId": 60042, + "attr": {}, + "npclist": "5002_59_90072#3002_59_90071#3007_59_90076#3012_59_90077#4002_59_90078#4007_59_90078", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_4", + "npcname": "jjc_npc_name_4" + }, + "60043": { + "npcId": 60043, + "attr": {}, + "npclist": "5003_59_90072#3003_59_90071#3008_59_90076#3013_59_90077#4003_59_90079#4008_59_90079", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_5", + "npcname": "jjc_npc_name_5" + }, + "60044": { + "npcId": 60044, + "attr": {}, + "npclist": "5004_59_90072#3004_59_90071#3009_59_90076#3014_59_90077#4004_59_90079#4009_59_90079", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_6", + "npcname": "jjc_npc_name_6" + }, + "60045": { + "npcId": 60045, + "attr": {}, + "npclist": "5005_59_90072#3005_59_90071#3010_59_90076#3015_59_90077#4005_59_90079#4010_59_90079", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_1", + "npcname": "jjc_npc_name_1" + }, + "60046": { + "npcId": 60046, + "attr": {}, + "npclist": "3001_60_90072#3006_60_90071#3011_60_90076#4001_60_90077#4006_60_90079#4011_60_90079", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_2", + "npcname": "jjc_npc_name_2" + }, + "60047": { + "npcId": 60047, + "attr": {}, + "npclist": "3002_60_90072#3007_60_90071#3012_60_90076#4002_60_90077#4007_60_90079#4012_60_90079", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_3", + "npcname": "jjc_npc_name_3" + }, + "60048": { + "npcId": 60048, + "attr": {}, + "npclist": "3003_60_90072#3008_60_90071#3013_60_90076#4003_60_90077#4008_60_90079#4012_60_90079", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_4", + "npcname": "jjc_npc_name_4" + }, + "60049": { + "npcId": 60049, + "attr": {}, + "npclist": "3004_60_90072#3009_60_90071#3014_60_90076#4004_60_90077#4009_60_90079#4014_60_90079", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_5", + "npcname": "jjc_npc_name_5" + }, + "60050": { + "npcId": 60050, + "attr": {}, + "npclist": "3005_63_90072#3010_63_90071#3015_63_90076#4005_63_90077#4010_63_90079#4015_63_90079", + "npcLv": [], + "isboss": 0, + "ghname": "npc_ghname_6", + "npcname": "jjc_npc_name_6" } } \ No newline at end of file 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/json/peijian.json b/src/json/peijian.json index abd3408..70c71dd 100644 --- a/src/json/peijian.json +++ b/src/json/peijian.json @@ -241,7 +241,7 @@ "conversion": [], "buff": [ "baoshangpro", - 0.6 + 0.006 ], "suit": 0, "rmPrize": [ @@ -403,7 +403,7 @@ "conversion": [], "buff": [ "baoshangpro", - 1.2 + 0.012 ], "suit": 0, "rmPrize": [ @@ -590,7 +590,7 @@ "conversion": [], "buff": [ "baoshangpro", - 1.8 + 0.018 ], "suit": 1, "rmPrize": [ @@ -782,7 +782,7 @@ "conversion": [], "buff": [ "baoshangpro", - 1.8 + 0.018 ], "suit": 2, "rmPrize": [ @@ -974,7 +974,7 @@ "conversion": [], "buff": [ "baoshangpro", - 1.8 + 0.018 ], "suit": 3, "rmPrize": [ @@ -1166,7 +1166,7 @@ "conversion": [], "buff": [ "baoshangpro", - 1.8 + 0.018 ], "suit": 4, "rmPrize": [ @@ -1358,7 +1358,7 @@ "conversion": [], "buff": [ "baoshangpro", - 1.8 + 0.018 ], "suit": 5, "rmPrize": [ @@ -1550,7 +1550,7 @@ "conversion": [], "buff": [ "baoshangpro", - 1.8 + 0.018 ], "suit": 6, "rmPrize": [ @@ -1742,7 +1742,7 @@ "conversion": [], "buff": [ "baoshangpro", - 1.8 + 0.018 ], "suit": 7, "rmPrize": [ @@ -1934,7 +1934,7 @@ "conversion": [], "buff": [ "baoshangpro", - 1.8 + 0.018 ], "suit": 8, "rmPrize": [ @@ -2126,7 +2126,7 @@ "conversion": [], "buff": [ "baoshangpro", - 3 + 0.03 ], "suit": 1, "rmPrize": [ @@ -2318,7 +2318,7 @@ "conversion": [], "buff": [ "baoshangpro", - 3 + 0.03 ], "suit": 2, "rmPrize": [ @@ -2510,7 +2510,7 @@ "conversion": [], "buff": [ "baoshangpro", - 3 + 0.03 ], "suit": 3, "rmPrize": [ @@ -2702,7 +2702,7 @@ "conversion": [], "buff": [ "baoshangpro", - 3 + 0.03 ], "suit": 4, "rmPrize": [ @@ -2894,7 +2894,7 @@ "conversion": [], "buff": [ "baoshangpro", - 3 + 0.03 ], "suit": 5, "rmPrize": [ @@ -3086,7 +3086,7 @@ "conversion": [], "buff": [ "baoshangpro", - 3 + 0.03 ], "suit": 6, "rmPrize": [ @@ -3278,7 +3278,7 @@ "conversion": [], "buff": [ "baoshangpro", - 3 + 0.03 ], "suit": 7, "rmPrize": [ diff --git a/src/json/peijian_lv.json b/src/json/peijian_lv.json index 0d0047b..6c79bfd 100644 --- a/src/json/peijian_lv.json +++ b/src/json/peijian_lv.json @@ -21,7 +21,7 @@ "hp": 600, "mindps": 39, "maxdps": 42, - "baoshangpro": 0.8 + "baoshangpro": 0.008 } }, "3": { @@ -45,7 +45,7 @@ "hp": 900, "mindps": 52, "maxdps": 56, - "baoshangpro": 1 + "baoshangpro": 0.01 } }, "4": { @@ -69,7 +69,7 @@ "hp": 1200, "mindps": 65, "maxdps": 70, - "baoshangpro": 1.2 + "baoshangpro": 0.012 } }, "5": { @@ -93,7 +93,7 @@ "hp": 1500, "mindps": 78, "maxdps": 84, - "baoshangpro": 1.4 + "baoshangpro": 0.014 } }, "6": { @@ -117,7 +117,7 @@ "hp": 1800, "mindps": 91, "maxdps": 98, - "baoshangpro": 1.6 + "baoshangpro": 0.016 } }, "7": { @@ -141,7 +141,7 @@ "hp": 2100, "mindps": 104, "maxdps": 112, - "baoshangpro": 1.8 + "baoshangpro": 0.018 } }, "8": { @@ -165,7 +165,7 @@ "hp": 2400, "mindps": 117, "maxdps": 126, - "baoshangpro": 2 + "baoshangpro": 0.02 } }, "9": { @@ -189,7 +189,7 @@ "hp": 2700, "mindps": 130, "maxdps": 140, - "baoshangpro": 2.2 + "baoshangpro": 0.022 } }, "10": { @@ -213,7 +213,7 @@ "hp": 3000, "mindps": 143, "maxdps": 154, - "baoshangpro": 2.4 + "baoshangpro": 0.024 } }, "11": { @@ -237,7 +237,7 @@ "hp": 3300, "mindps": 156, "maxdps": 168, - "baoshangpro": 2.6 + "baoshangpro": 0.026 } }, "12": { @@ -261,7 +261,7 @@ "hp": 3600, "mindps": 169, "maxdps": 182, - "baoshangpro": 2.8 + "baoshangpro": 0.028 } }, "13": { @@ -285,7 +285,7 @@ "hp": 3900, "mindps": 182, "maxdps": 196, - "baoshangpro": 3 + "baoshangpro": 0.03 } }, "14": { @@ -309,7 +309,7 @@ "hp": 4200, "mindps": 195, "maxdps": 210, - "baoshangpro": 3.2 + "baoshangpro": 0.032 } }, "15": { @@ -333,7 +333,7 @@ "hp": 4500, "mindps": 208, "maxdps": 224, - "baoshangpro": 3.4 + "baoshangpro": 0.034 } }, "16": { @@ -357,7 +357,7 @@ "hp": 4800, "mindps": 221, "maxdps": 238, - "baoshangpro": 3.6 + "baoshangpro": 0.036 } }, "17": { @@ -381,7 +381,7 @@ "hp": 5100, "mindps": 234, "maxdps": 252, - "baoshangpro": 3.8 + "baoshangpro": 0.038 } }, "18": { @@ -405,7 +405,7 @@ "hp": 5400, "mindps": 247, "maxdps": 266, - "baoshangpro": 4 + "baoshangpro": 0.04 } }, "19": { @@ -429,7 +429,7 @@ "hp": 5700, "mindps": 260, "maxdps": 280, - "baoshangpro": 4.2 + "baoshangpro": 0.042 } }, "20": { @@ -453,7 +453,7 @@ "hp": 6000, "mindps": 273, "maxdps": 294, - "baoshangpro": 4.4 + "baoshangpro": 0.044 } }, "21": { @@ -477,7 +477,7 @@ "hp": 6300, "mindps": 286, "maxdps": 308, - "baoshangpro": 4.6 + "baoshangpro": 0.046 } }, "22": { @@ -501,7 +501,7 @@ "hp": 6600, "mindps": 299, "maxdps": 322, - "baoshangpro": 4.8 + "baoshangpro": 0.048 } }, "23": { @@ -525,7 +525,7 @@ "hp": 6900, "mindps": 312, "maxdps": 336, - "baoshangpro": 5 + "baoshangpro": 0.05 } }, "24": { @@ -549,7 +549,7 @@ "hp": 7200, "mindps": 325, "maxdps": 350, - "baoshangpro": 5.2 + "baoshangpro": 0.052 } }, "25": { @@ -573,7 +573,7 @@ "hp": 7500, "mindps": 338, "maxdps": 364, - "baoshangpro": 5.4 + "baoshangpro": 0.054 } }, "26": { @@ -597,7 +597,7 @@ "hp": 7800, "mindps": 351, "maxdps": 378, - "baoshangpro": 5.6 + "baoshangpro": 0.056 } }, "27": { @@ -621,7 +621,7 @@ "hp": 8100, "mindps": 364, "maxdps": 392, - "baoshangpro": 5.8 + "baoshangpro": 0.058 } }, "28": { @@ -645,7 +645,7 @@ "hp": 8400, "mindps": 377, "maxdps": 406, - "baoshangpro": 6 + "baoshangpro": 0.06 } }, "29": { @@ -669,7 +669,7 @@ "hp": 8700, "mindps": 390, "maxdps": 420, - "baoshangpro": 6.2 + "baoshangpro": 0.062 } }, "30": { @@ -693,7 +693,7 @@ "hp": 9000, "mindps": 403, "maxdps": 434, - "baoshangpro": 6.4 + "baoshangpro": 0.064 } }, "31": { @@ -717,7 +717,7 @@ "hp": 9300, "mindps": 416, "maxdps": 448, - "baoshangpro": 6.6 + "baoshangpro": 0.066 } }, "32": { @@ -741,7 +741,7 @@ "hp": 9600, "mindps": 429, "maxdps": 462, - "baoshangpro": 6.8 + "baoshangpro": 0.068 } }, "33": { @@ -765,7 +765,7 @@ "hp": 9900, "mindps": 442, "maxdps": 476, - "baoshangpro": 7 + "baoshangpro": 0.07 } }, "34": { @@ -789,7 +789,7 @@ "hp": 10200, "mindps": 455, "maxdps": 490, - "baoshangpro": 7.2 + "baoshangpro": 0.072 } }, "35": { @@ -813,7 +813,7 @@ "hp": 10500, "mindps": 468, "maxdps": 504, - "baoshangpro": 7.4 + "baoshangpro": 0.074 } }, "36": { @@ -837,7 +837,7 @@ "hp": 10800, "mindps": 481, "maxdps": 518, - "baoshangpro": 7.6 + "baoshangpro": 0.076 } }, "37": { @@ -861,7 +861,7 @@ "hp": 11100, "mindps": 494, "maxdps": 532, - "baoshangpro": 7.8 + "baoshangpro": 0.078 } }, "38": { @@ -885,7 +885,7 @@ "hp": 11400, "mindps": 507, "maxdps": 546, - "baoshangpro": 8 + "baoshangpro": 0.08 } }, "39": { @@ -909,7 +909,7 @@ "hp": 11700, "mindps": 520, "maxdps": 560, - "baoshangpro": 8.2 + "baoshangpro": 0.082 } }, "40": { @@ -933,7 +933,7 @@ "hp": 12000, "mindps": 533, "maxdps": 574, - "baoshangpro": 8.4 + "baoshangpro": 0.084 } }, "41": { @@ -957,7 +957,7 @@ "hp": 12300, "mindps": 546, "maxdps": 588, - "baoshangpro": 8.6 + "baoshangpro": 0.086 } }, "42": { @@ -981,7 +981,7 @@ "hp": 12600, "mindps": 559, "maxdps": 602, - "baoshangpro": 8.8 + "baoshangpro": 0.088 } }, "43": { @@ -1005,7 +1005,7 @@ "hp": 12900, "mindps": 572, "maxdps": 616, - "baoshangpro": 9 + "baoshangpro": 0.09 } }, "44": { @@ -1029,7 +1029,7 @@ "hp": 13200, "mindps": 585, "maxdps": 630, - "baoshangpro": 9.2 + "baoshangpro": 0.092 } }, "45": { @@ -1053,7 +1053,7 @@ "hp": 13500, "mindps": 598, "maxdps": 644, - "baoshangpro": 9.4 + "baoshangpro": 0.094 } }, "46": { @@ -1077,7 +1077,7 @@ "hp": 13800, "mindps": 611, "maxdps": 658, - "baoshangpro": 9.6 + "baoshangpro": 0.096 } }, "47": { @@ -1101,7 +1101,7 @@ "hp": 14100, "mindps": 624, "maxdps": 672, - "baoshangpro": 9.8 + "baoshangpro": 0.098 } }, "48": { @@ -1125,7 +1125,7 @@ "hp": 14400, "mindps": 637, "maxdps": 686, - "baoshangpro": 10 + "baoshangpro": 0.1 } }, "49": { @@ -1149,7 +1149,7 @@ "hp": 14700, "mindps": 650, "maxdps": 700, - "baoshangpro": 10.2 + "baoshangpro": 0.102 } }, "50": { @@ -1173,7 +1173,7 @@ "hp": 15000, "mindps": 663, "maxdps": 714, - "baoshangpro": 10.4 + "baoshangpro": 0.104 } }, "51": { @@ -1197,7 +1197,7 @@ "hp": 15300, "mindps": 676, "maxdps": 728, - "baoshangpro": 10.6 + "baoshangpro": 0.106 } }, "52": { @@ -1221,7 +1221,7 @@ "hp": 15600, "mindps": 689, "maxdps": 742, - "baoshangpro": 10.8 + "baoshangpro": 0.108 } }, "53": { @@ -1245,7 +1245,7 @@ "hp": 15900, "mindps": 702, "maxdps": 756, - "baoshangpro": 11 + "baoshangpro": 0.11 } }, "54": { @@ -1269,7 +1269,7 @@ "hp": 16200, "mindps": 715, "maxdps": 770, - "baoshangpro": 11.2 + "baoshangpro": 0.112 } }, "55": { @@ -1293,7 +1293,7 @@ "hp": 16500, "mindps": 728, "maxdps": 784, - "baoshangpro": 11.4 + "baoshangpro": 0.114 } }, "56": { @@ -1317,7 +1317,7 @@ "hp": 16800, "mindps": 741, "maxdps": 798, - "baoshangpro": 11.6 + "baoshangpro": 0.116 } }, "57": { @@ -1341,7 +1341,7 @@ "hp": 17100, "mindps": 754, "maxdps": 812, - "baoshangpro": 11.8 + "baoshangpro": 0.118 } }, "58": { @@ -1365,7 +1365,7 @@ "hp": 17400, "mindps": 767, "maxdps": 826, - "baoshangpro": 12 + "baoshangpro": 0.12 } }, "59": { @@ -1389,7 +1389,7 @@ "hp": 17700, "mindps": 780, "maxdps": 840, - "baoshangpro": 12.2 + "baoshangpro": 0.122 } }, "60": { @@ -1413,7 +1413,7 @@ "hp": 18000, "mindps": 793, "maxdps": 854, - "baoshangpro": 12.4 + "baoshangpro": 0.124 } }, "61": { @@ -1437,7 +1437,7 @@ "hp": 18300, "mindps": 806, "maxdps": 868, - "baoshangpro": 12.6 + "baoshangpro": 0.126 } }, "62": { @@ -1461,7 +1461,7 @@ "hp": 18600, "mindps": 819, "maxdps": 882, - "baoshangpro": 12.8 + "baoshangpro": 0.128 } }, "63": { @@ -1485,7 +1485,7 @@ "hp": 18900, "mindps": 832, "maxdps": 896, - "baoshangpro": 13 + "baoshangpro": 0.13 } }, "64": { @@ -1509,7 +1509,7 @@ "hp": 19200, "mindps": 845, "maxdps": 910, - "baoshangpro": 13.2 + "baoshangpro": 0.132 } }, "65": { @@ -1533,7 +1533,7 @@ "hp": 19500, "mindps": 858, "maxdps": 924, - "baoshangpro": 13.4 + "baoshangpro": 0.134 } }, "66": { @@ -1557,7 +1557,7 @@ "hp": 19800, "mindps": 871, "maxdps": 938, - "baoshangpro": 13.6 + "baoshangpro": 0.136 } }, "67": { @@ -1581,7 +1581,7 @@ "hp": 20100, "mindps": 884, "maxdps": 952, - "baoshangpro": 13.8 + "baoshangpro": 0.138 } }, "68": { @@ -1605,7 +1605,7 @@ "hp": 20400, "mindps": 897, "maxdps": 966, - "baoshangpro": 14 + "baoshangpro": 0.14 } }, "69": { @@ -1629,7 +1629,7 @@ "hp": 20700, "mindps": 910, "maxdps": 980, - "baoshangpro": 14.2 + "baoshangpro": 0.142 } }, "70": { @@ -1653,7 +1653,7 @@ "hp": 21000, "mindps": 923, "maxdps": 994, - "baoshangpro": 14.4 + "baoshangpro": 0.144 } }, "71": { @@ -1677,7 +1677,7 @@ "hp": 21300, "mindps": 936, "maxdps": 1008, - "baoshangpro": 14.6 + "baoshangpro": 0.146 } }, "72": { @@ -1701,7 +1701,7 @@ "hp": 21600, "mindps": 949, "maxdps": 1022, - "baoshangpro": 14.8 + "baoshangpro": 0.148 } }, "73": { @@ -1725,7 +1725,7 @@ "hp": 21900, "mindps": 962, "maxdps": 1036, - "baoshangpro": 15 + "baoshangpro": 0.15 } }, "74": { @@ -1749,7 +1749,7 @@ "hp": 22200, "mindps": 975, "maxdps": 1050, - "baoshangpro": 15.2 + "baoshangpro": 0.152 } }, "75": { @@ -1773,7 +1773,7 @@ "hp": 22500, "mindps": 988, "maxdps": 1064, - "baoshangpro": 15.4 + "baoshangpro": 0.154 } }, "76": { @@ -1797,7 +1797,7 @@ "hp": 22800, "mindps": 1001, "maxdps": 1078, - "baoshangpro": 15.6 + "baoshangpro": 0.156 } }, "77": { @@ -1821,7 +1821,7 @@ "hp": 23100, "mindps": 1014, "maxdps": 1092, - "baoshangpro": 15.8 + "baoshangpro": 0.158 } }, "78": { @@ -1845,7 +1845,7 @@ "hp": 23400, "mindps": 1027, "maxdps": 1106, - "baoshangpro": 16 + "baoshangpro": 0.16 } }, "79": { @@ -1869,7 +1869,7 @@ "hp": 23700, "mindps": 1040, "maxdps": 1120, - "baoshangpro": 16.2 + "baoshangpro": 0.162 } }, "80": { @@ -1893,7 +1893,7 @@ "hp": 24000, "mindps": 1053, "maxdps": 1134, - "baoshangpro": 16.4 + "baoshangpro": 0.164 } }, "81": { @@ -1917,7 +1917,7 @@ "hp": 24300, "mindps": 1066, "maxdps": 1148, - "baoshangpro": 16.6 + "baoshangpro": 0.166 } }, "82": { @@ -1941,7 +1941,7 @@ "hp": 24600, "mindps": 1079, "maxdps": 1162, - "baoshangpro": 16.8 + "baoshangpro": 0.168 } }, "83": { @@ -1965,7 +1965,7 @@ "hp": 24900, "mindps": 1092, "maxdps": 1176, - "baoshangpro": 17 + "baoshangpro": 0.17 } }, "84": { @@ -1989,7 +1989,7 @@ "hp": 25200, "mindps": 1105, "maxdps": 1190, - "baoshangpro": 17.2 + "baoshangpro": 0.172 } }, "85": { @@ -2013,7 +2013,7 @@ "hp": 25500, "mindps": 1118, "maxdps": 1204, - "baoshangpro": 17.4 + "baoshangpro": 0.174 } }, "86": { @@ -2037,7 +2037,7 @@ "hp": 25800, "mindps": 1131, "maxdps": 1218, - "baoshangpro": 17.6 + "baoshangpro": 0.176 } }, "87": { @@ -2061,7 +2061,7 @@ "hp": 26100, "mindps": 1144, "maxdps": 1232, - "baoshangpro": 17.8 + "baoshangpro": 0.178 } }, "88": { @@ -2085,7 +2085,7 @@ "hp": 26400, "mindps": 1157, "maxdps": 1246, - "baoshangpro": 18 + "baoshangpro": 0.18 } }, "89": { @@ -2109,7 +2109,7 @@ "hp": 26700, "mindps": 1170, "maxdps": 1260, - "baoshangpro": 18.2 + "baoshangpro": 0.182 } }, "90": { @@ -2133,7 +2133,7 @@ "hp": 27000, "mindps": 1183, "maxdps": 1274, - "baoshangpro": 18.4 + "baoshangpro": 0.184 } }, "91": { @@ -2157,7 +2157,7 @@ "hp": 27300, "mindps": 1196, "maxdps": 1288, - "baoshangpro": 18.6 + "baoshangpro": 0.186 } }, "92": { @@ -2181,7 +2181,7 @@ "hp": 27600, "mindps": 1209, "maxdps": 1302, - "baoshangpro": 18.8 + "baoshangpro": 0.188 } }, "93": { @@ -2205,7 +2205,7 @@ "hp": 27900, "mindps": 1222, "maxdps": 1316, - "baoshangpro": 19 + "baoshangpro": 0.19 } }, "94": { @@ -2229,7 +2229,7 @@ "hp": 28200, "mindps": 1235, "maxdps": 1330, - "baoshangpro": 19.2 + "baoshangpro": 0.192 } }, "95": { @@ -2253,7 +2253,7 @@ "hp": 28500, "mindps": 1248, "maxdps": 1344, - "baoshangpro": 19.4 + "baoshangpro": 0.194 } }, "96": { @@ -2277,7 +2277,7 @@ "hp": 28800, "mindps": 1261, "maxdps": 1358, - "baoshangpro": 19.6 + "baoshangpro": 0.196 } }, "97": { @@ -2301,7 +2301,7 @@ "hp": 29100, "mindps": 1274, "maxdps": 1372, - "baoshangpro": 19.8 + "baoshangpro": 0.198 } }, "98": { @@ -2325,7 +2325,7 @@ "hp": 29400, "mindps": 1287, "maxdps": 1386, - "baoshangpro": 20 + "baoshangpro": 0.2 } }, "99": { @@ -2349,7 +2349,7 @@ "hp": 29700, "mindps": 1300, "maxdps": 1400, - "baoshangpro": 20.2 + "baoshangpro": 0.202 } }, "100": { @@ -2373,7 +2373,7 @@ "hp": 30000, "mindps": 1313, "maxdps": 1414, - "baoshangpro": 20.4 + "baoshangpro": 0.204 } } }, @@ -2399,7 +2399,7 @@ "hp": 1200, "mindps": 78, "maxdps": 84, - "baoshangpro": 1.6 + "baoshangpro": 0.016 } }, "3": { @@ -2423,7 +2423,7 @@ "hp": 1800, "mindps": 104, "maxdps": 112, - "baoshangpro": 2 + "baoshangpro": 0.02 } }, "4": { @@ -2447,7 +2447,7 @@ "hp": 2400, "mindps": 130, "maxdps": 140, - "baoshangpro": 2.4 + "baoshangpro": 0.024 } }, "5": { @@ -2471,7 +2471,7 @@ "hp": 3000, "mindps": 156, "maxdps": 168, - "baoshangpro": 2.8 + "baoshangpro": 0.028 } }, "6": { @@ -2495,7 +2495,7 @@ "hp": 3600, "mindps": 182, "maxdps": 196, - "baoshangpro": 3.2 + "baoshangpro": 0.032 } }, "7": { @@ -2519,7 +2519,7 @@ "hp": 4200, "mindps": 208, "maxdps": 224, - "baoshangpro": 3.6 + "baoshangpro": 0.036 } }, "8": { @@ -2543,7 +2543,7 @@ "hp": 4800, "mindps": 234, "maxdps": 252, - "baoshangpro": 4 + "baoshangpro": 0.04 } }, "9": { @@ -2567,7 +2567,7 @@ "hp": 5400, "mindps": 260, "maxdps": 280, - "baoshangpro": 4.4 + "baoshangpro": 0.044 } }, "10": { @@ -2591,7 +2591,7 @@ "hp": 6000, "mindps": 286, "maxdps": 308, - "baoshangpro": 4.8 + "baoshangpro": 0.048 } }, "11": { @@ -2615,7 +2615,7 @@ "hp": 6600, "mindps": 312, "maxdps": 336, - "baoshangpro": 5.2 + "baoshangpro": 0.052 } }, "12": { @@ -2639,7 +2639,7 @@ "hp": 7200, "mindps": 338, "maxdps": 364, - "baoshangpro": 5.6 + "baoshangpro": 0.056 } }, "13": { @@ -2663,7 +2663,7 @@ "hp": 7800, "mindps": 364, "maxdps": 392, - "baoshangpro": 6 + "baoshangpro": 0.06 } }, "14": { @@ -2687,7 +2687,7 @@ "hp": 8400, "mindps": 390, "maxdps": 420, - "baoshangpro": 6.4 + "baoshangpro": 0.064 } }, "15": { @@ -2711,7 +2711,7 @@ "hp": 9000, "mindps": 416, "maxdps": 448, - "baoshangpro": 6.8 + "baoshangpro": 0.068 } }, "16": { @@ -2735,7 +2735,7 @@ "hp": 9600, "mindps": 442, "maxdps": 476, - "baoshangpro": 7.2 + "baoshangpro": 0.072 } }, "17": { @@ -2759,7 +2759,7 @@ "hp": 10200, "mindps": 468, "maxdps": 504, - "baoshangpro": 7.6 + "baoshangpro": 0.076 } }, "18": { @@ -2783,7 +2783,7 @@ "hp": 10800, "mindps": 494, "maxdps": 532, - "baoshangpro": 8 + "baoshangpro": 0.08 } }, "19": { @@ -2807,7 +2807,7 @@ "hp": 11400, "mindps": 520, "maxdps": 560, - "baoshangpro": 8.4 + "baoshangpro": 0.084 } }, "20": { @@ -2831,7 +2831,7 @@ "hp": 12000, "mindps": 546, "maxdps": 588, - "baoshangpro": 8.8 + "baoshangpro": 0.088 } }, "21": { @@ -2855,7 +2855,7 @@ "hp": 12600, "mindps": 572, "maxdps": 616, - "baoshangpro": 9.2 + "baoshangpro": 0.092 } }, "22": { @@ -2879,7 +2879,7 @@ "hp": 13200, "mindps": 598, "maxdps": 644, - "baoshangpro": 9.6 + "baoshangpro": 0.096 } }, "23": { @@ -2903,7 +2903,7 @@ "hp": 13800, "mindps": 624, "maxdps": 672, - "baoshangpro": 10 + "baoshangpro": 0.1 } }, "24": { @@ -2927,7 +2927,7 @@ "hp": 14400, "mindps": 650, "maxdps": 700, - "baoshangpro": 10.4 + "baoshangpro": 0.104 } }, "25": { @@ -2951,7 +2951,7 @@ "hp": 15000, "mindps": 676, "maxdps": 728, - "baoshangpro": 10.8 + "baoshangpro": 0.108 } }, "26": { @@ -2975,7 +2975,7 @@ "hp": 15600, "mindps": 702, "maxdps": 756, - "baoshangpro": 11.2 + "baoshangpro": 0.112 } }, "27": { @@ -2999,7 +2999,7 @@ "hp": 16200, "mindps": 728, "maxdps": 784, - "baoshangpro": 11.6 + "baoshangpro": 0.116 } }, "28": { @@ -3023,7 +3023,7 @@ "hp": 16800, "mindps": 754, "maxdps": 812, - "baoshangpro": 12 + "baoshangpro": 0.12 } }, "29": { @@ -3047,7 +3047,7 @@ "hp": 17400, "mindps": 780, "maxdps": 840, - "baoshangpro": 12.4 + "baoshangpro": 0.124 } }, "30": { @@ -3071,7 +3071,7 @@ "hp": 18000, "mindps": 806, "maxdps": 868, - "baoshangpro": 12.8 + "baoshangpro": 0.128 } }, "31": { @@ -3095,7 +3095,7 @@ "hp": 18600, "mindps": 832, "maxdps": 896, - "baoshangpro": 13.2 + "baoshangpro": 0.132 } }, "32": { @@ -3119,7 +3119,7 @@ "hp": 19200, "mindps": 858, "maxdps": 924, - "baoshangpro": 13.6 + "baoshangpro": 0.136 } }, "33": { @@ -3143,7 +3143,7 @@ "hp": 19800, "mindps": 884, "maxdps": 952, - "baoshangpro": 14 + "baoshangpro": 0.14 } }, "34": { @@ -3167,7 +3167,7 @@ "hp": 20400, "mindps": 910, "maxdps": 980, - "baoshangpro": 14.4 + "baoshangpro": 0.144 } }, "35": { @@ -3191,7 +3191,7 @@ "hp": 21000, "mindps": 936, "maxdps": 1008, - "baoshangpro": 14.8 + "baoshangpro": 0.148 } }, "36": { @@ -3215,7 +3215,7 @@ "hp": 21600, "mindps": 962, "maxdps": 1036, - "baoshangpro": 15.2 + "baoshangpro": 0.152 } }, "37": { @@ -3239,7 +3239,7 @@ "hp": 22200, "mindps": 988, "maxdps": 1064, - "baoshangpro": 15.6 + "baoshangpro": 0.156 } }, "38": { @@ -3263,7 +3263,7 @@ "hp": 22800, "mindps": 1014, "maxdps": 1092, - "baoshangpro": 16 + "baoshangpro": 0.16 } }, "39": { @@ -3287,7 +3287,7 @@ "hp": 23400, "mindps": 1040, "maxdps": 1120, - "baoshangpro": 16.4 + "baoshangpro": 0.164 } }, "40": { @@ -3311,7 +3311,7 @@ "hp": 24000, "mindps": 1066, "maxdps": 1148, - "baoshangpro": 16.8 + "baoshangpro": 0.168 } }, "41": { @@ -3335,7 +3335,7 @@ "hp": 24600, "mindps": 1092, "maxdps": 1176, - "baoshangpro": 17.2 + "baoshangpro": 0.172 } }, "42": { @@ -3359,7 +3359,7 @@ "hp": 25200, "mindps": 1118, "maxdps": 1204, - "baoshangpro": 17.6 + "baoshangpro": 0.176 } }, "43": { @@ -3383,7 +3383,7 @@ "hp": 25800, "mindps": 1144, "maxdps": 1232, - "baoshangpro": 18 + "baoshangpro": 0.18 } }, "44": { @@ -3407,7 +3407,7 @@ "hp": 26400, "mindps": 1170, "maxdps": 1260, - "baoshangpro": 18.4 + "baoshangpro": 0.184 } }, "45": { @@ -3431,7 +3431,7 @@ "hp": 27000, "mindps": 1196, "maxdps": 1288, - "baoshangpro": 18.8 + "baoshangpro": 0.188 } }, "46": { @@ -3455,7 +3455,7 @@ "hp": 27600, "mindps": 1222, "maxdps": 1316, - "baoshangpro": 19.2 + "baoshangpro": 0.192 } }, "47": { @@ -3479,7 +3479,7 @@ "hp": 28200, "mindps": 1248, "maxdps": 1344, - "baoshangpro": 19.6 + "baoshangpro": 0.196 } }, "48": { @@ -3503,7 +3503,7 @@ "hp": 28800, "mindps": 1274, "maxdps": 1372, - "baoshangpro": 20 + "baoshangpro": 0.2 } }, "49": { @@ -3527,7 +3527,7 @@ "hp": 29400, "mindps": 1300, "maxdps": 1400, - "baoshangpro": 20.4 + "baoshangpro": 0.204 } }, "50": { @@ -3551,7 +3551,7 @@ "hp": 30000, "mindps": 1326, "maxdps": 1428, - "baoshangpro": 20.8 + "baoshangpro": 0.208 } }, "51": { @@ -3575,7 +3575,7 @@ "hp": 30600, "mindps": 1352, "maxdps": 1456, - "baoshangpro": 21.2 + "baoshangpro": 0.212 } }, "52": { @@ -3599,7 +3599,7 @@ "hp": 31200, "mindps": 1378, "maxdps": 1484, - "baoshangpro": 21.6 + "baoshangpro": 0.216 } }, "53": { @@ -3623,7 +3623,7 @@ "hp": 31800, "mindps": 1404, "maxdps": 1512, - "baoshangpro": 22 + "baoshangpro": 0.22 } }, "54": { @@ -3647,7 +3647,7 @@ "hp": 32400, "mindps": 1430, "maxdps": 1540, - "baoshangpro": 22.4 + "baoshangpro": 0.224 } }, "55": { @@ -3671,7 +3671,7 @@ "hp": 33000, "mindps": 1456, "maxdps": 1568, - "baoshangpro": 22.8 + "baoshangpro": 0.228 } }, "56": { @@ -3695,7 +3695,7 @@ "hp": 33600, "mindps": 1482, "maxdps": 1596, - "baoshangpro": 23.2 + "baoshangpro": 0.232 } }, "57": { @@ -3719,7 +3719,7 @@ "hp": 34200, "mindps": 1508, "maxdps": 1624, - "baoshangpro": 23.6 + "baoshangpro": 0.236 } }, "58": { @@ -3743,7 +3743,7 @@ "hp": 34800, "mindps": 1534, "maxdps": 1652, - "baoshangpro": 24 + "baoshangpro": 0.24 } }, "59": { @@ -3767,7 +3767,7 @@ "hp": 35400, "mindps": 1560, "maxdps": 1680, - "baoshangpro": 24.4 + "baoshangpro": 0.244 } }, "60": { @@ -3791,7 +3791,7 @@ "hp": 36000, "mindps": 1586, "maxdps": 1708, - "baoshangpro": 24.8 + "baoshangpro": 0.248 } }, "61": { @@ -3815,7 +3815,7 @@ "hp": 36600, "mindps": 1612, "maxdps": 1736, - "baoshangpro": 25.2 + "baoshangpro": 0.252 } }, "62": { @@ -3839,7 +3839,7 @@ "hp": 37200, "mindps": 1638, "maxdps": 1764, - "baoshangpro": 25.6 + "baoshangpro": 0.256 } }, "63": { @@ -3863,7 +3863,7 @@ "hp": 37800, "mindps": 1664, "maxdps": 1792, - "baoshangpro": 26 + "baoshangpro": 0.26 } }, "64": { @@ -3887,7 +3887,7 @@ "hp": 38400, "mindps": 1690, "maxdps": 1820, - "baoshangpro": 26.4 + "baoshangpro": 0.264 } }, "65": { @@ -3911,7 +3911,7 @@ "hp": 39000, "mindps": 1716, "maxdps": 1848, - "baoshangpro": 26.8 + "baoshangpro": 0.268 } }, "66": { @@ -3935,7 +3935,7 @@ "hp": 39600, "mindps": 1742, "maxdps": 1876, - "baoshangpro": 27.2 + "baoshangpro": 0.272 } }, "67": { @@ -3959,7 +3959,7 @@ "hp": 40200, "mindps": 1768, "maxdps": 1904, - "baoshangpro": 27.6 + "baoshangpro": 0.276 } }, "68": { @@ -3983,7 +3983,7 @@ "hp": 40800, "mindps": 1794, "maxdps": 1932, - "baoshangpro": 28 + "baoshangpro": 0.28 } }, "69": { @@ -4007,7 +4007,7 @@ "hp": 41400, "mindps": 1820, "maxdps": 1960, - "baoshangpro": 28.4 + "baoshangpro": 0.284 } }, "70": { @@ -4031,7 +4031,7 @@ "hp": 42000, "mindps": 1846, "maxdps": 1988, - "baoshangpro": 28.8 + "baoshangpro": 0.288 } }, "71": { @@ -4055,7 +4055,7 @@ "hp": 42600, "mindps": 1872, "maxdps": 2016, - "baoshangpro": 29.2 + "baoshangpro": 0.292 } }, "72": { @@ -4079,7 +4079,7 @@ "hp": 43200, "mindps": 1898, "maxdps": 2044, - "baoshangpro": 29.6 + "baoshangpro": 0.296 } }, "73": { @@ -4103,7 +4103,7 @@ "hp": 43800, "mindps": 1924, "maxdps": 2072, - "baoshangpro": 30 + "baoshangpro": 0.3 } }, "74": { @@ -4127,7 +4127,7 @@ "hp": 44400, "mindps": 1950, "maxdps": 2100, - "baoshangpro": 30.4 + "baoshangpro": 0.304 } }, "75": { @@ -4151,7 +4151,7 @@ "hp": 45000, "mindps": 1976, "maxdps": 2128, - "baoshangpro": 30.8 + "baoshangpro": 0.308 } }, "76": { @@ -4175,7 +4175,7 @@ "hp": 45600, "mindps": 2002, "maxdps": 2156, - "baoshangpro": 31.2 + "baoshangpro": 0.312 } }, "77": { @@ -4199,7 +4199,7 @@ "hp": 46200, "mindps": 2028, "maxdps": 2184, - "baoshangpro": 31.6 + "baoshangpro": 0.316 } }, "78": { @@ -4223,7 +4223,7 @@ "hp": 46800, "mindps": 2054, "maxdps": 2212, - "baoshangpro": 32 + "baoshangpro": 0.32 } }, "79": { @@ -4247,7 +4247,7 @@ "hp": 47400, "mindps": 2080, "maxdps": 2240, - "baoshangpro": 32.4 + "baoshangpro": 0.324 } }, "80": { @@ -4271,7 +4271,7 @@ "hp": 48000, "mindps": 2106, "maxdps": 2268, - "baoshangpro": 32.8 + "baoshangpro": 0.328 } }, "81": { @@ -4295,7 +4295,7 @@ "hp": 48600, "mindps": 2132, "maxdps": 2296, - "baoshangpro": 33.2 + "baoshangpro": 0.332 } }, "82": { @@ -4319,7 +4319,7 @@ "hp": 49200, "mindps": 2158, "maxdps": 2324, - "baoshangpro": 33.6 + "baoshangpro": 0.336 } }, "83": { @@ -4343,7 +4343,7 @@ "hp": 49800, "mindps": 2184, "maxdps": 2352, - "baoshangpro": 34 + "baoshangpro": 0.34 } }, "84": { @@ -4367,7 +4367,7 @@ "hp": 50400, "mindps": 2210, "maxdps": 2380, - "baoshangpro": 34.4 + "baoshangpro": 0.344 } }, "85": { @@ -4391,7 +4391,7 @@ "hp": 51000, "mindps": 2236, "maxdps": 2408, - "baoshangpro": 34.8 + "baoshangpro": 0.348 } }, "86": { @@ -4415,7 +4415,7 @@ "hp": 51600, "mindps": 2262, "maxdps": 2436, - "baoshangpro": 35.2 + "baoshangpro": 0.352 } }, "87": { @@ -4439,7 +4439,7 @@ "hp": 52200, "mindps": 2288, "maxdps": 2464, - "baoshangpro": 35.6 + "baoshangpro": 0.356 } }, "88": { @@ -4463,7 +4463,7 @@ "hp": 52800, "mindps": 2314, "maxdps": 2492, - "baoshangpro": 36 + "baoshangpro": 0.36 } }, "89": { @@ -4487,7 +4487,7 @@ "hp": 53400, "mindps": 2340, "maxdps": 2520, - "baoshangpro": 36.4 + "baoshangpro": 0.364 } }, "90": { @@ -4511,7 +4511,7 @@ "hp": 54000, "mindps": 2366, "maxdps": 2548, - "baoshangpro": 36.8 + "baoshangpro": 0.368 } }, "91": { @@ -4535,7 +4535,7 @@ "hp": 54600, "mindps": 2392, "maxdps": 2576, - "baoshangpro": 37.2 + "baoshangpro": 0.372 } }, "92": { @@ -4559,7 +4559,7 @@ "hp": 55200, "mindps": 2418, "maxdps": 2604, - "baoshangpro": 37.6 + "baoshangpro": 0.376 } }, "93": { @@ -4583,7 +4583,7 @@ "hp": 55800, "mindps": 2444, "maxdps": 2632, - "baoshangpro": 38 + "baoshangpro": 0.38 } }, "94": { @@ -4607,7 +4607,7 @@ "hp": 56400, "mindps": 2470, "maxdps": 2660, - "baoshangpro": 38.4 + "baoshangpro": 0.384 } }, "95": { @@ -4631,7 +4631,7 @@ "hp": 57000, "mindps": 2496, "maxdps": 2688, - "baoshangpro": 38.8 + "baoshangpro": 0.388 } }, "96": { @@ -4655,7 +4655,7 @@ "hp": 57600, "mindps": 2522, "maxdps": 2716, - "baoshangpro": 39.2 + "baoshangpro": 0.392 } }, "97": { @@ -4679,7 +4679,7 @@ "hp": 58200, "mindps": 2548, "maxdps": 2744, - "baoshangpro": 39.6 + "baoshangpro": 0.396 } }, "98": { @@ -4703,7 +4703,7 @@ "hp": 58800, "mindps": 2574, "maxdps": 2772, - "baoshangpro": 40 + "baoshangpro": 0.4 } }, "99": { @@ -4727,7 +4727,7 @@ "hp": 59400, "mindps": 2600, "maxdps": 2800, - "baoshangpro": 40.4 + "baoshangpro": 0.404 } }, "100": { @@ -4751,7 +4751,7 @@ "hp": 60000, "mindps": 2626, "maxdps": 2828, - "baoshangpro": 40.8 + "baoshangpro": 0.408 } } }, @@ -4777,7 +4777,7 @@ "hp": 1800, "mindps": 117, "maxdps": 126, - "baoshangpro": 2.4 + "baoshangpro": 0.024 } }, "3": { @@ -4801,7 +4801,7 @@ "hp": 2700, "mindps": 156, "maxdps": 168, - "baoshangpro": 3 + "baoshangpro": 0.03 } }, "4": { @@ -4825,7 +4825,7 @@ "hp": 3600, "mindps": 195, "maxdps": 210, - "baoshangpro": 3.6 + "baoshangpro": 0.036 } }, "5": { @@ -4849,7 +4849,7 @@ "hp": 4500, "mindps": 234, "maxdps": 252, - "baoshangpro": 4.2 + "baoshangpro": 0.042 } }, "6": { @@ -4873,7 +4873,7 @@ "hp": 5400, "mindps": 273, "maxdps": 294, - "baoshangpro": 4.8 + "baoshangpro": 0.048 } }, "7": { @@ -4897,7 +4897,7 @@ "hp": 6300, "mindps": 312, "maxdps": 336, - "baoshangpro": 5.4 + "baoshangpro": 0.054 } }, "8": { @@ -4921,7 +4921,7 @@ "hp": 7200, "mindps": 351, "maxdps": 378, - "baoshangpro": 6 + "baoshangpro": 0.06 } }, "9": { @@ -4945,7 +4945,7 @@ "hp": 8100, "mindps": 390, "maxdps": 420, - "baoshangpro": 6.6 + "baoshangpro": 0.066 } }, "10": { @@ -4969,7 +4969,7 @@ "hp": 9000, "mindps": 429, "maxdps": 462, - "baoshangpro": 7.2 + "baoshangpro": 0.072 } }, "11": { @@ -4993,7 +4993,7 @@ "hp": 9900, "mindps": 468, "maxdps": 504, - "baoshangpro": 7.8 + "baoshangpro": 0.078 } }, "12": { @@ -5017,7 +5017,7 @@ "hp": 10800, "mindps": 507, "maxdps": 546, - "baoshangpro": 8.4 + "baoshangpro": 0.084 } }, "13": { @@ -5041,7 +5041,7 @@ "hp": 11700, "mindps": 546, "maxdps": 588, - "baoshangpro": 9 + "baoshangpro": 0.09 } }, "14": { @@ -5065,7 +5065,7 @@ "hp": 12600, "mindps": 585, "maxdps": 630, - "baoshangpro": 9.6 + "baoshangpro": 0.096 } }, "15": { @@ -5089,7 +5089,7 @@ "hp": 13500, "mindps": 624, "maxdps": 672, - "baoshangpro": 10.2 + "baoshangpro": 0.102 } }, "16": { @@ -5113,7 +5113,7 @@ "hp": 14400, "mindps": 663, "maxdps": 714, - "baoshangpro": 10.8 + "baoshangpro": 0.108 } }, "17": { @@ -5137,7 +5137,7 @@ "hp": 15300, "mindps": 702, "maxdps": 756, - "baoshangpro": 11.4 + "baoshangpro": 0.114 } }, "18": { @@ -5161,7 +5161,7 @@ "hp": 16200, "mindps": 741, "maxdps": 798, - "baoshangpro": 12 + "baoshangpro": 0.12 } }, "19": { @@ -5185,7 +5185,7 @@ "hp": 17100, "mindps": 780, "maxdps": 840, - "baoshangpro": 12.6 + "baoshangpro": 0.126 } }, "20": { @@ -5209,7 +5209,7 @@ "hp": 18000, "mindps": 819, "maxdps": 882, - "baoshangpro": 13.2 + "baoshangpro": 0.132 } }, "21": { @@ -5233,7 +5233,7 @@ "hp": 18900, "mindps": 858, "maxdps": 924, - "baoshangpro": 13.8 + "baoshangpro": 0.138 } }, "22": { @@ -5257,7 +5257,7 @@ "hp": 19800, "mindps": 897, "maxdps": 966, - "baoshangpro": 14.4 + "baoshangpro": 0.144 } }, "23": { @@ -5281,7 +5281,7 @@ "hp": 20700, "mindps": 936, "maxdps": 1008, - "baoshangpro": 15 + "baoshangpro": 0.15 } }, "24": { @@ -5305,7 +5305,7 @@ "hp": 21600, "mindps": 975, "maxdps": 1050, - "baoshangpro": 15.6 + "baoshangpro": 0.156 } }, "25": { @@ -5329,7 +5329,7 @@ "hp": 22500, "mindps": 1014, "maxdps": 1092, - "baoshangpro": 16.2 + "baoshangpro": 0.162 } }, "26": { @@ -5353,7 +5353,7 @@ "hp": 23400, "mindps": 1053, "maxdps": 1134, - "baoshangpro": 16.8 + "baoshangpro": 0.168 } }, "27": { @@ -5377,7 +5377,7 @@ "hp": 24300, "mindps": 1092, "maxdps": 1176, - "baoshangpro": 17.4 + "baoshangpro": 0.174 } }, "28": { @@ -5401,7 +5401,7 @@ "hp": 25200, "mindps": 1131, "maxdps": 1218, - "baoshangpro": 18 + "baoshangpro": 0.18 } }, "29": { @@ -5425,7 +5425,7 @@ "hp": 26100, "mindps": 1170, "maxdps": 1260, - "baoshangpro": 18.6 + "baoshangpro": 0.186 } }, "30": { @@ -5449,7 +5449,7 @@ "hp": 27000, "mindps": 1209, "maxdps": 1302, - "baoshangpro": 19.2 + "baoshangpro": 0.192 } }, "31": { @@ -5473,7 +5473,7 @@ "hp": 27900, "mindps": 1248, "maxdps": 1344, - "baoshangpro": 19.8 + "baoshangpro": 0.198 } }, "32": { @@ -5497,7 +5497,7 @@ "hp": 28800, "mindps": 1287, "maxdps": 1386, - "baoshangpro": 20.4 + "baoshangpro": 0.204 } }, "33": { @@ -5521,7 +5521,7 @@ "hp": 29700, "mindps": 1326, "maxdps": 1428, - "baoshangpro": 21 + "baoshangpro": 0.21 } }, "34": { @@ -5545,7 +5545,7 @@ "hp": 30600, "mindps": 1365, "maxdps": 1470, - "baoshangpro": 21.6 + "baoshangpro": 0.216 } }, "35": { @@ -5569,7 +5569,7 @@ "hp": 31500, "mindps": 1404, "maxdps": 1512, - "baoshangpro": 22.2 + "baoshangpro": 0.222 } }, "36": { @@ -5593,7 +5593,7 @@ "hp": 32400, "mindps": 1443, "maxdps": 1554, - "baoshangpro": 22.8 + "baoshangpro": 0.228 } }, "37": { @@ -5617,7 +5617,7 @@ "hp": 33300, "mindps": 1482, "maxdps": 1596, - "baoshangpro": 23.4 + "baoshangpro": 0.234 } }, "38": { @@ -5641,7 +5641,7 @@ "hp": 34200, "mindps": 1521, "maxdps": 1638, - "baoshangpro": 24 + "baoshangpro": 0.24 } }, "39": { @@ -5665,7 +5665,7 @@ "hp": 35100, "mindps": 1560, "maxdps": 1680, - "baoshangpro": 24.6 + "baoshangpro": 0.246 } }, "40": { @@ -5689,7 +5689,7 @@ "hp": 36000, "mindps": 1599, "maxdps": 1722, - "baoshangpro": 25.2 + "baoshangpro": 0.252 } }, "41": { @@ -5713,7 +5713,7 @@ "hp": 36900, "mindps": 1638, "maxdps": 1764, - "baoshangpro": 25.8 + "baoshangpro": 0.258 } }, "42": { @@ -5737,7 +5737,7 @@ "hp": 37800, "mindps": 1677, "maxdps": 1806, - "baoshangpro": 26.4 + "baoshangpro": 0.264 } }, "43": { @@ -5761,7 +5761,7 @@ "hp": 38700, "mindps": 1716, "maxdps": 1848, - "baoshangpro": 27 + "baoshangpro": 0.27 } }, "44": { @@ -5785,7 +5785,7 @@ "hp": 39600, "mindps": 1755, "maxdps": 1890, - "baoshangpro": 27.6 + "baoshangpro": 0.276 } }, "45": { @@ -5809,7 +5809,7 @@ "hp": 40500, "mindps": 1794, "maxdps": 1932, - "baoshangpro": 28.2 + "baoshangpro": 0.282 } }, "46": { @@ -5833,7 +5833,7 @@ "hp": 41400, "mindps": 1833, "maxdps": 1974, - "baoshangpro": 28.8 + "baoshangpro": 0.288 } }, "47": { @@ -5857,7 +5857,7 @@ "hp": 42300, "mindps": 1872, "maxdps": 2016, - "baoshangpro": 29.4 + "baoshangpro": 0.294 } }, "48": { @@ -5881,7 +5881,7 @@ "hp": 43200, "mindps": 1911, "maxdps": 2058, - "baoshangpro": 30 + "baoshangpro": 0.3 } }, "49": { @@ -5905,7 +5905,7 @@ "hp": 44100, "mindps": 1950, "maxdps": 2100, - "baoshangpro": 30.6 + "baoshangpro": 0.306 } }, "50": { @@ -5929,7 +5929,7 @@ "hp": 45000, "mindps": 1989, "maxdps": 2142, - "baoshangpro": 31.2 + "baoshangpro": 0.312 } }, "51": { @@ -5953,7 +5953,7 @@ "hp": 45900, "mindps": 2028, "maxdps": 2184, - "baoshangpro": 31.8 + "baoshangpro": 0.318 } }, "52": { @@ -5977,7 +5977,7 @@ "hp": 46800, "mindps": 2067, "maxdps": 2226, - "baoshangpro": 32.4 + "baoshangpro": 0.324 } }, "53": { @@ -6001,7 +6001,7 @@ "hp": 47700, "mindps": 2106, "maxdps": 2268, - "baoshangpro": 33 + "baoshangpro": 0.33 } }, "54": { @@ -6025,7 +6025,7 @@ "hp": 48600, "mindps": 2145, "maxdps": 2310, - "baoshangpro": 33.6 + "baoshangpro": 0.336 } }, "55": { @@ -6049,7 +6049,7 @@ "hp": 49500, "mindps": 2184, "maxdps": 2352, - "baoshangpro": 34.2 + "baoshangpro": 0.342 } }, "56": { @@ -6073,7 +6073,7 @@ "hp": 50400, "mindps": 2223, "maxdps": 2394, - "baoshangpro": 34.8 + "baoshangpro": 0.348 } }, "57": { @@ -6097,7 +6097,7 @@ "hp": 51300, "mindps": 2262, "maxdps": 2436, - "baoshangpro": 35.4 + "baoshangpro": 0.354 } }, "58": { @@ -6121,7 +6121,7 @@ "hp": 52200, "mindps": 2301, "maxdps": 2478, - "baoshangpro": 36 + "baoshangpro": 0.36 } }, "59": { @@ -6145,7 +6145,7 @@ "hp": 53100, "mindps": 2340, "maxdps": 2520, - "baoshangpro": 36.6 + "baoshangpro": 0.366 } }, "60": { @@ -6169,7 +6169,7 @@ "hp": 54000, "mindps": 2379, "maxdps": 2562, - "baoshangpro": 37.2 + "baoshangpro": 0.372 } }, "61": { @@ -6193,7 +6193,7 @@ "hp": 54900, "mindps": 2418, "maxdps": 2604, - "baoshangpro": 37.8 + "baoshangpro": 0.378 } }, "62": { @@ -6217,7 +6217,7 @@ "hp": 55800, "mindps": 2457, "maxdps": 2646, - "baoshangpro": 38.4 + "baoshangpro": 0.384 } }, "63": { @@ -6241,7 +6241,7 @@ "hp": 56700, "mindps": 2496, "maxdps": 2688, - "baoshangpro": 39 + "baoshangpro": 0.39 } }, "64": { @@ -6265,7 +6265,7 @@ "hp": 57600, "mindps": 2535, "maxdps": 2730, - "baoshangpro": 39.6 + "baoshangpro": 0.396 } }, "65": { @@ -6289,7 +6289,7 @@ "hp": 58500, "mindps": 2574, "maxdps": 2772, - "baoshangpro": 40.2 + "baoshangpro": 0.402 } }, "66": { @@ -6313,7 +6313,7 @@ "hp": 59400, "mindps": 2613, "maxdps": 2814, - "baoshangpro": 40.8 + "baoshangpro": 0.408 } }, "67": { @@ -6337,7 +6337,7 @@ "hp": 60300, "mindps": 2652, "maxdps": 2856, - "baoshangpro": 41.4 + "baoshangpro": 0.414 } }, "68": { @@ -6361,7 +6361,7 @@ "hp": 61200, "mindps": 2691, "maxdps": 2898, - "baoshangpro": 42 + "baoshangpro": 0.42 } }, "69": { @@ -6385,7 +6385,7 @@ "hp": 62100, "mindps": 2730, "maxdps": 2940, - "baoshangpro": 42.6 + "baoshangpro": 0.426 } }, "70": { @@ -6409,7 +6409,7 @@ "hp": 63000, "mindps": 2769, "maxdps": 2982, - "baoshangpro": 43.2 + "baoshangpro": 0.432 } }, "71": { @@ -6433,7 +6433,7 @@ "hp": 63900, "mindps": 2808, "maxdps": 3024, - "baoshangpro": 43.8 + "baoshangpro": 0.438 } }, "72": { @@ -6457,7 +6457,7 @@ "hp": 64800, "mindps": 2847, "maxdps": 3066, - "baoshangpro": 44.4 + "baoshangpro": 0.444 } }, "73": { @@ -6481,7 +6481,7 @@ "hp": 65700, "mindps": 2886, "maxdps": 3108, - "baoshangpro": 45 + "baoshangpro": 0.45 } }, "74": { @@ -6505,7 +6505,7 @@ "hp": 66600, "mindps": 2925, "maxdps": 3150, - "baoshangpro": 45.6 + "baoshangpro": 0.456 } }, "75": { @@ -6529,7 +6529,7 @@ "hp": 67500, "mindps": 2964, "maxdps": 3192, - "baoshangpro": 46.2 + "baoshangpro": 0.462 } }, "76": { @@ -6553,7 +6553,7 @@ "hp": 68400, "mindps": 3003, "maxdps": 3234, - "baoshangpro": 46.8 + "baoshangpro": 0.468 } }, "77": { @@ -6577,7 +6577,7 @@ "hp": 69300, "mindps": 3042, "maxdps": 3276, - "baoshangpro": 47.4 + "baoshangpro": 0.474 } }, "78": { @@ -6601,7 +6601,7 @@ "hp": 70200, "mindps": 3081, "maxdps": 3318, - "baoshangpro": 48 + "baoshangpro": 0.48 } }, "79": { @@ -6625,7 +6625,7 @@ "hp": 71100, "mindps": 3120, "maxdps": 3360, - "baoshangpro": 48.6 + "baoshangpro": 0.486 } }, "80": { @@ -6649,7 +6649,7 @@ "hp": 72000, "mindps": 3159, "maxdps": 3402, - "baoshangpro": 49.2 + "baoshangpro": 0.492 } }, "81": { @@ -6673,7 +6673,7 @@ "hp": 72900, "mindps": 3198, "maxdps": 3444, - "baoshangpro": 49.8 + "baoshangpro": 0.498 } }, "82": { @@ -6697,7 +6697,7 @@ "hp": 73800, "mindps": 3237, "maxdps": 3486, - "baoshangpro": 50.4 + "baoshangpro": 0.504 } }, "83": { @@ -6721,7 +6721,7 @@ "hp": 74700, "mindps": 3276, "maxdps": 3528, - "baoshangpro": 51 + "baoshangpro": 0.51 } }, "84": { @@ -6745,7 +6745,7 @@ "hp": 75600, "mindps": 3315, "maxdps": 3570, - "baoshangpro": 51.6 + "baoshangpro": 0.516 } }, "85": { @@ -6769,7 +6769,7 @@ "hp": 76500, "mindps": 3354, "maxdps": 3612, - "baoshangpro": 52.2 + "baoshangpro": 0.522 } }, "86": { @@ -6793,7 +6793,7 @@ "hp": 77400, "mindps": 3393, "maxdps": 3654, - "baoshangpro": 52.8 + "baoshangpro": 0.528 } }, "87": { @@ -6817,7 +6817,7 @@ "hp": 78300, "mindps": 3432, "maxdps": 3696, - "baoshangpro": 53.4 + "baoshangpro": 0.534 } }, "88": { @@ -6841,7 +6841,7 @@ "hp": 79200, "mindps": 3471, "maxdps": 3738, - "baoshangpro": 54 + "baoshangpro": 0.54 } }, "89": { @@ -6865,7 +6865,7 @@ "hp": 80100, "mindps": 3510, "maxdps": 3780, - "baoshangpro": 54.6 + "baoshangpro": 0.546 } }, "90": { @@ -6889,7 +6889,7 @@ "hp": 81000, "mindps": 3549, "maxdps": 3822, - "baoshangpro": 55.2 + "baoshangpro": 0.552 } }, "91": { @@ -6913,7 +6913,7 @@ "hp": 81900, "mindps": 3588, "maxdps": 3864, - "baoshangpro": 55.8 + "baoshangpro": 0.558 } }, "92": { @@ -6937,7 +6937,7 @@ "hp": 82800, "mindps": 3627, "maxdps": 3906, - "baoshangpro": 56.4 + "baoshangpro": 0.564 } }, "93": { @@ -6961,7 +6961,7 @@ "hp": 83700, "mindps": 3666, "maxdps": 3948, - "baoshangpro": 57 + "baoshangpro": 0.57 } }, "94": { @@ -6985,7 +6985,7 @@ "hp": 84600, "mindps": 3705, "maxdps": 3990, - "baoshangpro": 57.6 + "baoshangpro": 0.576 } }, "95": { @@ -7009,7 +7009,7 @@ "hp": 85500, "mindps": 3744, "maxdps": 4032, - "baoshangpro": 58.2 + "baoshangpro": 0.582 } }, "96": { @@ -7033,7 +7033,7 @@ "hp": 86400, "mindps": 3783, "maxdps": 4074, - "baoshangpro": 58.8 + "baoshangpro": 0.588 } }, "97": { @@ -7057,7 +7057,7 @@ "hp": 87300, "mindps": 3822, "maxdps": 4116, - "baoshangpro": 59.4 + "baoshangpro": 0.594 } }, "98": { @@ -7081,7 +7081,7 @@ "hp": 88200, "mindps": 3861, "maxdps": 4158, - "baoshangpro": 60 + "baoshangpro": 0.6 } }, "99": { @@ -7105,7 +7105,7 @@ "hp": 89100, "mindps": 3900, "maxdps": 4200, - "baoshangpro": 60.6 + "baoshangpro": 0.606 } }, "100": { @@ -7129,7 +7129,7 @@ "hp": 90000, "mindps": 3939, "maxdps": 4242, - "baoshangpro": 61.2 + "baoshangpro": 0.612 } } }, @@ -7155,7 +7155,7 @@ "hp": 3000, "mindps": 195, "maxdps": 210, - "baoshangpro": 4 + "baoshangpro": 0.04 } }, "3": { @@ -7179,7 +7179,7 @@ "hp": 4500, "mindps": 260, "maxdps": 280, - "baoshangpro": 5 + "baoshangpro": 0.05 } }, "4": { @@ -7203,7 +7203,7 @@ "hp": 6000, "mindps": 325, "maxdps": 350, - "baoshangpro": 6 + "baoshangpro": 0.06 } }, "5": { @@ -7227,7 +7227,7 @@ "hp": 7500, "mindps": 390, "maxdps": 420, - "baoshangpro": 7 + "baoshangpro": 0.07 } }, "6": { @@ -7251,7 +7251,7 @@ "hp": 9000, "mindps": 455, "maxdps": 490, - "baoshangpro": 8 + "baoshangpro": 0.08 } }, "7": { @@ -7275,7 +7275,7 @@ "hp": 10500, "mindps": 520, "maxdps": 560, - "baoshangpro": 9 + "baoshangpro": 0.09 } }, "8": { @@ -7299,7 +7299,7 @@ "hp": 12000, "mindps": 585, "maxdps": 630, - "baoshangpro": 10 + "baoshangpro": 0.1 } }, "9": { @@ -7323,7 +7323,7 @@ "hp": 13500, "mindps": 650, "maxdps": 700, - "baoshangpro": 11 + "baoshangpro": 0.11 } }, "10": { @@ -7347,7 +7347,7 @@ "hp": 15000, "mindps": 715, "maxdps": 770, - "baoshangpro": 12 + "baoshangpro": 0.12 } }, "11": { @@ -7371,7 +7371,7 @@ "hp": 16500, "mindps": 780, "maxdps": 840, - "baoshangpro": 13 + "baoshangpro": 0.13 } }, "12": { @@ -7395,7 +7395,7 @@ "hp": 18000, "mindps": 845, "maxdps": 910, - "baoshangpro": 14 + "baoshangpro": 0.14 } }, "13": { @@ -7419,7 +7419,7 @@ "hp": 19500, "mindps": 910, "maxdps": 980, - "baoshangpro": 15 + "baoshangpro": 0.15 } }, "14": { @@ -7443,7 +7443,7 @@ "hp": 21000, "mindps": 975, "maxdps": 1050, - "baoshangpro": 16 + "baoshangpro": 0.16 } }, "15": { @@ -7467,7 +7467,7 @@ "hp": 22500, "mindps": 1040, "maxdps": 1120, - "baoshangpro": 17 + "baoshangpro": 0.17 } }, "16": { @@ -7491,7 +7491,7 @@ "hp": 24000, "mindps": 1105, "maxdps": 1190, - "baoshangpro": 18 + "baoshangpro": 0.18 } }, "17": { @@ -7515,7 +7515,7 @@ "hp": 25500, "mindps": 1170, "maxdps": 1260, - "baoshangpro": 19 + "baoshangpro": 0.19 } }, "18": { @@ -7539,7 +7539,7 @@ "hp": 27000, "mindps": 1235, "maxdps": 1330, - "baoshangpro": 20 + "baoshangpro": 0.2 } }, "19": { @@ -7563,7 +7563,7 @@ "hp": 28500, "mindps": 1300, "maxdps": 1400, - "baoshangpro": 21 + "baoshangpro": 0.21 } }, "20": { @@ -7587,7 +7587,7 @@ "hp": 30000, "mindps": 1365, "maxdps": 1470, - "baoshangpro": 22 + "baoshangpro": 0.22 } }, "21": { @@ -7611,7 +7611,7 @@ "hp": 31500, "mindps": 1430, "maxdps": 1540, - "baoshangpro": 23 + "baoshangpro": 0.23 } }, "22": { @@ -7635,7 +7635,7 @@ "hp": 33000, "mindps": 1495, "maxdps": 1610, - "baoshangpro": 24 + "baoshangpro": 0.24 } }, "23": { @@ -7659,7 +7659,7 @@ "hp": 34500, "mindps": 1560, "maxdps": 1680, - "baoshangpro": 25 + "baoshangpro": 0.25 } }, "24": { @@ -7683,7 +7683,7 @@ "hp": 36000, "mindps": 1625, "maxdps": 1750, - "baoshangpro": 26 + "baoshangpro": 0.26 } }, "25": { @@ -7707,7 +7707,7 @@ "hp": 37500, "mindps": 1690, "maxdps": 1820, - "baoshangpro": 27 + "baoshangpro": 0.27 } }, "26": { @@ -7731,7 +7731,7 @@ "hp": 39000, "mindps": 1755, "maxdps": 1890, - "baoshangpro": 28 + "baoshangpro": 0.28 } }, "27": { @@ -7755,7 +7755,7 @@ "hp": 40500, "mindps": 1820, "maxdps": 1960, - "baoshangpro": 29 + "baoshangpro": 0.29 } }, "28": { @@ -7779,7 +7779,7 @@ "hp": 42000, "mindps": 1885, "maxdps": 2030, - "baoshangpro": 30 + "baoshangpro": 0.3 } }, "29": { @@ -7803,7 +7803,7 @@ "hp": 43500, "mindps": 1950, "maxdps": 2100, - "baoshangpro": 31 + "baoshangpro": 0.31 } }, "30": { @@ -7827,7 +7827,7 @@ "hp": 45000, "mindps": 2015, "maxdps": 2170, - "baoshangpro": 32 + "baoshangpro": 0.32 } }, "31": { @@ -7851,7 +7851,7 @@ "hp": 46500, "mindps": 2080, "maxdps": 2240, - "baoshangpro": 33 + "baoshangpro": 0.33 } }, "32": { @@ -7875,7 +7875,7 @@ "hp": 48000, "mindps": 2145, "maxdps": 2310, - "baoshangpro": 34 + "baoshangpro": 0.34 } }, "33": { @@ -7899,7 +7899,7 @@ "hp": 49500, "mindps": 2210, "maxdps": 2380, - "baoshangpro": 35 + "baoshangpro": 0.35 } }, "34": { @@ -7923,7 +7923,7 @@ "hp": 51000, "mindps": 2275, "maxdps": 2450, - "baoshangpro": 36 + "baoshangpro": 0.36 } }, "35": { @@ -7947,7 +7947,7 @@ "hp": 52500, "mindps": 2340, "maxdps": 2520, - "baoshangpro": 37 + "baoshangpro": 0.37 } }, "36": { @@ -7971,7 +7971,7 @@ "hp": 54000, "mindps": 2405, "maxdps": 2590, - "baoshangpro": 38 + "baoshangpro": 0.38 } }, "37": { @@ -7995,7 +7995,7 @@ "hp": 55500, "mindps": 2470, "maxdps": 2660, - "baoshangpro": 39 + "baoshangpro": 0.39 } }, "38": { @@ -8019,7 +8019,7 @@ "hp": 57000, "mindps": 2535, "maxdps": 2730, - "baoshangpro": 40 + "baoshangpro": 0.4 } }, "39": { @@ -8043,7 +8043,7 @@ "hp": 58500, "mindps": 2600, "maxdps": 2800, - "baoshangpro": 41 + "baoshangpro": 0.41 } }, "40": { @@ -8067,7 +8067,7 @@ "hp": 60000, "mindps": 2665, "maxdps": 2870, - "baoshangpro": 42 + "baoshangpro": 0.42 } }, "41": { @@ -8091,7 +8091,7 @@ "hp": 61500, "mindps": 2730, "maxdps": 2940, - "baoshangpro": 43 + "baoshangpro": 0.43 } }, "42": { @@ -8115,7 +8115,7 @@ "hp": 63000, "mindps": 2795, "maxdps": 3010, - "baoshangpro": 44 + "baoshangpro": 0.44 } }, "43": { @@ -8139,7 +8139,7 @@ "hp": 64500, "mindps": 2860, "maxdps": 3080, - "baoshangpro": 45 + "baoshangpro": 0.45 } }, "44": { @@ -8163,7 +8163,7 @@ "hp": 66000, "mindps": 2925, "maxdps": 3150, - "baoshangpro": 46 + "baoshangpro": 0.46 } }, "45": { @@ -8187,7 +8187,7 @@ "hp": 67500, "mindps": 2990, "maxdps": 3220, - "baoshangpro": 47 + "baoshangpro": 0.47 } }, "46": { @@ -8211,7 +8211,7 @@ "hp": 69000, "mindps": 3055, "maxdps": 3290, - "baoshangpro": 48 + "baoshangpro": 0.48 } }, "47": { @@ -8235,7 +8235,7 @@ "hp": 70500, "mindps": 3120, "maxdps": 3360, - "baoshangpro": 49 + "baoshangpro": 0.49 } }, "48": { @@ -8259,7 +8259,7 @@ "hp": 72000, "mindps": 3185, "maxdps": 3430, - "baoshangpro": 50 + "baoshangpro": 0.5 } }, "49": { @@ -8283,7 +8283,7 @@ "hp": 73500, "mindps": 3250, "maxdps": 3500, - "baoshangpro": 51 + "baoshangpro": 0.51 } }, "50": { @@ -8307,7 +8307,7 @@ "hp": 75000, "mindps": 3315, "maxdps": 3570, - "baoshangpro": 52 + "baoshangpro": 0.52 } }, "51": { @@ -8331,7 +8331,7 @@ "hp": 76500, "mindps": 3380, "maxdps": 3640, - "baoshangpro": 53 + "baoshangpro": 0.53 } }, "52": { @@ -8355,7 +8355,7 @@ "hp": 78000, "mindps": 3445, "maxdps": 3710, - "baoshangpro": 54 + "baoshangpro": 0.54 } }, "53": { @@ -8379,7 +8379,7 @@ "hp": 79500, "mindps": 3510, "maxdps": 3780, - "baoshangpro": 55 + "baoshangpro": 0.55 } }, "54": { @@ -8403,7 +8403,7 @@ "hp": 81000, "mindps": 3575, "maxdps": 3850, - "baoshangpro": 56 + "baoshangpro": 0.56 } }, "55": { @@ -8427,7 +8427,7 @@ "hp": 82500, "mindps": 3640, "maxdps": 3920, - "baoshangpro": 57 + "baoshangpro": 0.57 } }, "56": { @@ -8451,7 +8451,7 @@ "hp": 84000, "mindps": 3705, "maxdps": 3990, - "baoshangpro": 58 + "baoshangpro": 0.58 } }, "57": { @@ -8475,7 +8475,7 @@ "hp": 85500, "mindps": 3770, "maxdps": 4060, - "baoshangpro": 59 + "baoshangpro": 0.59 } }, "58": { @@ -8499,7 +8499,7 @@ "hp": 87000, "mindps": 3835, "maxdps": 4130, - "baoshangpro": 60 + "baoshangpro": 0.6 } }, "59": { @@ -8523,7 +8523,7 @@ "hp": 88500, "mindps": 3900, "maxdps": 4200, - "baoshangpro": 61 + "baoshangpro": 0.61 } }, "60": { @@ -8547,7 +8547,7 @@ "hp": 90000, "mindps": 3965, "maxdps": 4270, - "baoshangpro": 62 + "baoshangpro": 0.62 } }, "61": { @@ -8571,7 +8571,7 @@ "hp": 91500, "mindps": 4030, "maxdps": 4340, - "baoshangpro": 63 + "baoshangpro": 0.63 } }, "62": { @@ -8595,7 +8595,7 @@ "hp": 93000, "mindps": 4095, "maxdps": 4410, - "baoshangpro": 64 + "baoshangpro": 0.64 } }, "63": { @@ -8619,7 +8619,7 @@ "hp": 94500, "mindps": 4160, "maxdps": 4480, - "baoshangpro": 65 + "baoshangpro": 0.65 } }, "64": { @@ -8643,7 +8643,7 @@ "hp": 96000, "mindps": 4225, "maxdps": 4550, - "baoshangpro": 66 + "baoshangpro": 0.66 } }, "65": { @@ -8667,7 +8667,7 @@ "hp": 97500, "mindps": 4290, "maxdps": 4620, - "baoshangpro": 67 + "baoshangpro": 0.67 } }, "66": { @@ -8691,7 +8691,7 @@ "hp": 99000, "mindps": 4355, "maxdps": 4690, - "baoshangpro": 68 + "baoshangpro": 0.68 } }, "67": { @@ -8715,7 +8715,7 @@ "hp": 100500, "mindps": 4420, "maxdps": 4760, - "baoshangpro": 69 + "baoshangpro": 0.69 } }, "68": { @@ -8739,7 +8739,7 @@ "hp": 102000, "mindps": 4485, "maxdps": 4830, - "baoshangpro": 70 + "baoshangpro": 0.7 } }, "69": { @@ -8763,7 +8763,7 @@ "hp": 103500, "mindps": 4550, "maxdps": 4900, - "baoshangpro": 71 + "baoshangpro": 0.71 } }, "70": { @@ -8787,7 +8787,7 @@ "hp": 105000, "mindps": 4615, "maxdps": 4970, - "baoshangpro": 72 + "baoshangpro": 0.72 } }, "71": { @@ -8811,7 +8811,7 @@ "hp": 106500, "mindps": 4680, "maxdps": 5040, - "baoshangpro": 73 + "baoshangpro": 0.73 } }, "72": { @@ -8835,7 +8835,7 @@ "hp": 108000, "mindps": 4745, "maxdps": 5110, - "baoshangpro": 74 + "baoshangpro": 0.74 } }, "73": { @@ -8859,7 +8859,7 @@ "hp": 109500, "mindps": 4810, "maxdps": 5180, - "baoshangpro": 75 + "baoshangpro": 0.75 } }, "74": { @@ -8883,7 +8883,7 @@ "hp": 111000, "mindps": 4875, "maxdps": 5250, - "baoshangpro": 76 + "baoshangpro": 0.76 } }, "75": { @@ -8907,7 +8907,7 @@ "hp": 112500, "mindps": 4940, "maxdps": 5320, - "baoshangpro": 77 + "baoshangpro": 0.77 } }, "76": { @@ -8931,7 +8931,7 @@ "hp": 114000, "mindps": 5005, "maxdps": 5390, - "baoshangpro": 78 + "baoshangpro": 0.78 } }, "77": { @@ -8955,7 +8955,7 @@ "hp": 115500, "mindps": 5070, "maxdps": 5460, - "baoshangpro": 79 + "baoshangpro": 0.79 } }, "78": { @@ -8979,7 +8979,7 @@ "hp": 117000, "mindps": 5135, "maxdps": 5530, - "baoshangpro": 80 + "baoshangpro": 0.8 } }, "79": { @@ -9003,7 +9003,7 @@ "hp": 118500, "mindps": 5200, "maxdps": 5600, - "baoshangpro": 81 + "baoshangpro": 0.81 } }, "80": { @@ -9027,7 +9027,7 @@ "hp": 120000, "mindps": 5265, "maxdps": 5670, - "baoshangpro": 82 + "baoshangpro": 0.82 } }, "81": { @@ -9051,7 +9051,7 @@ "hp": 121500, "mindps": 5330, "maxdps": 5740, - "baoshangpro": 83 + "baoshangpro": 0.83 } }, "82": { @@ -9075,7 +9075,7 @@ "hp": 123000, "mindps": 5395, "maxdps": 5810, - "baoshangpro": 84 + "baoshangpro": 0.84 } }, "83": { @@ -9099,7 +9099,7 @@ "hp": 124500, "mindps": 5460, "maxdps": 5880, - "baoshangpro": 85 + "baoshangpro": 0.85 } }, "84": { @@ -9123,7 +9123,7 @@ "hp": 126000, "mindps": 5525, "maxdps": 5950, - "baoshangpro": 86 + "baoshangpro": 0.86 } }, "85": { @@ -9147,7 +9147,7 @@ "hp": 127500, "mindps": 5590, "maxdps": 6020, - "baoshangpro": 87 + "baoshangpro": 0.87 } }, "86": { @@ -9171,7 +9171,7 @@ "hp": 129000, "mindps": 5655, "maxdps": 6090, - "baoshangpro": 88 + "baoshangpro": 0.88 } }, "87": { @@ -9195,7 +9195,7 @@ "hp": 130500, "mindps": 5720, "maxdps": 6160, - "baoshangpro": 89 + "baoshangpro": 0.89 } }, "88": { @@ -9219,7 +9219,7 @@ "hp": 132000, "mindps": 5785, "maxdps": 6230, - "baoshangpro": 90 + "baoshangpro": 0.9 } }, "89": { @@ -9243,7 +9243,7 @@ "hp": 133500, "mindps": 5850, "maxdps": 6300, - "baoshangpro": 91 + "baoshangpro": 0.91 } }, "90": { @@ -9267,7 +9267,7 @@ "hp": 135000, "mindps": 5915, "maxdps": 6370, - "baoshangpro": 92 + "baoshangpro": 0.92 } }, "91": { @@ -9291,7 +9291,7 @@ "hp": 136500, "mindps": 5980, "maxdps": 6440, - "baoshangpro": 93 + "baoshangpro": 0.93 } }, "92": { @@ -9315,7 +9315,7 @@ "hp": 138000, "mindps": 6045, "maxdps": 6510, - "baoshangpro": 94 + "baoshangpro": 0.94 } }, "93": { @@ -9339,7 +9339,7 @@ "hp": 139500, "mindps": 6110, "maxdps": 6580, - "baoshangpro": 95 + "baoshangpro": 0.95 } }, "94": { @@ -9363,7 +9363,7 @@ "hp": 141000, "mindps": 6175, "maxdps": 6650, - "baoshangpro": 96 + "baoshangpro": 0.96 } }, "95": { @@ -9387,7 +9387,7 @@ "hp": 142500, "mindps": 6240, "maxdps": 6720, - "baoshangpro": 97 + "baoshangpro": 0.97 } }, "96": { @@ -9411,7 +9411,7 @@ "hp": 144000, "mindps": 6305, "maxdps": 6790, - "baoshangpro": 98 + "baoshangpro": 0.98 } }, "97": { @@ -9435,7 +9435,7 @@ "hp": 145500, "mindps": 6370, "maxdps": 6860, - "baoshangpro": 99 + "baoshangpro": 0.99 } }, "98": { @@ -9459,7 +9459,7 @@ "hp": 147000, "mindps": 6435, "maxdps": 6930, - "baoshangpro": 100 + "baoshangpro": 1 } }, "99": { @@ -9483,7 +9483,7 @@ "hp": 148500, "mindps": 6500, "maxdps": 7000, - "baoshangpro": 101 + "baoshangpro": 1.01 } }, "100": { @@ -9507,7 +9507,7 @@ "hp": 150000, "mindps": 6565, "maxdps": 7070, - "baoshangpro": 102 + "baoshangpro": 1.02 } } } diff --git a/src/json/renown_chanchu.json b/src/json/renown_chanchu.json new file mode 100644 index 0000000..84706b2 --- /dev/null +++ b/src/json/renown_chanchu.json @@ -0,0 +1,5002 @@ +{ + "1": { + "id": 1, + "mapid": 1, + "renownpro": 0.2099999999999999 + }, + "2": { + "id": 2, + "mapid": 2, + "renownpro": 0.2099999999999999 + }, + "3": { + "id": 3, + "mapid": 3, + "renownpro": 0.2099999999999999 + }, + "4": { + "id": 4, + "mapid": 4, + "renownpro": 0.2099999999999999 + }, + "5": { + "id": 5, + "mapid": 5, + "renownpro": 0.21999999999999992 + }, + "6": { + "id": 6, + "mapid": 6, + "renownpro": 0.21999999999999992 + }, + "7": { + "id": 7, + "mapid": 7, + "renownpro": 0.21999999999999992 + }, + "8": { + "id": 8, + "mapid": 8, + "renownpro": 0.21999999999999992 + }, + "9": { + "id": 9, + "mapid": 9, + "renownpro": 0.21999999999999992 + }, + "10": { + "id": 10, + "mapid": 10, + "renownpro": 0.22999999999999993 + }, + "11": { + "id": 11, + "mapid": 11, + "renownpro": 0.22999999999999993 + }, + "12": { + "id": 12, + "mapid": 12, + "renownpro": 0.22999999999999993 + }, + "13": { + "id": 13, + "mapid": 13, + "renownpro": 0.22999999999999993 + }, + "14": { + "id": 14, + "mapid": 14, + "renownpro": 0.22999999999999993 + }, + "15": { + "id": 15, + "mapid": 15, + "renownpro": 0.23999999999999994 + }, + "16": { + "id": 16, + "mapid": 16, + "renownpro": 0.23999999999999994 + }, + "17": { + "id": 17, + "mapid": 17, + "renownpro": 0.23999999999999994 + }, + "18": { + "id": 18, + "mapid": 18, + "renownpro": 0.23999999999999994 + }, + "19": { + "id": 19, + "mapid": 19, + "renownpro": 0.23999999999999994 + }, + "20": { + "id": 20, + "mapid": 20, + "renownpro": 0.24999999999999994 + }, + "21": { + "id": 21, + "mapid": 21, + "renownpro": 0.24999999999999994 + }, + "22": { + "id": 22, + "mapid": 22, + "renownpro": 0.24999999999999994 + }, + "23": { + "id": 23, + "mapid": 23, + "renownpro": 0.24999999999999994 + }, + "24": { + "id": 24, + "mapid": 24, + "renownpro": 0.24999999999999994 + }, + "25": { + "id": 25, + "mapid": 25, + "renownpro": 0.25999999999999995 + }, + "26": { + "id": 26, + "mapid": 26, + "renownpro": 0.25999999999999995 + }, + "27": { + "id": 27, + "mapid": 27, + "renownpro": 0.25999999999999995 + }, + "28": { + "id": 28, + "mapid": 28, + "renownpro": 0.25999999999999995 + }, + "29": { + "id": 29, + "mapid": 29, + "renownpro": 0.25999999999999995 + }, + "30": { + "id": 30, + "mapid": 30, + "renownpro": 0.26999999999999996 + }, + "31": { + "id": 31, + "mapid": 31, + "renownpro": 0.26999999999999996 + }, + "32": { + "id": 32, + "mapid": 32, + "renownpro": 0.26999999999999996 + }, + "33": { + "id": 33, + "mapid": 33, + "renownpro": 0.26999999999999996 + }, + "34": { + "id": 34, + "mapid": 34, + "renownpro": 0.26999999999999996 + }, + "35": { + "id": 35, + "mapid": 35, + "renownpro": 0.27999999999999997 + }, + "36": { + "id": 36, + "mapid": 36, + "renownpro": 0.27999999999999997 + }, + "37": { + "id": 37, + "mapid": 37, + "renownpro": 0.27999999999999997 + }, + "38": { + "id": 38, + "mapid": 38, + "renownpro": 0.27999999999999997 + }, + "39": { + "id": 39, + "mapid": 39, + "renownpro": 0.27999999999999997 + }, + "40": { + "id": 40, + "mapid": 40, + "renownpro": 0.29 + }, + "41": { + "id": 41, + "mapid": 41, + "renownpro": 0.29 + }, + "42": { + "id": 42, + "mapid": 42, + "renownpro": 0.29 + }, + "43": { + "id": 43, + "mapid": 43, + "renownpro": 0.29 + }, + "44": { + "id": 44, + "mapid": 44, + "renownpro": 0.29 + }, + "45": { + "id": 45, + "mapid": 45, + "renownpro": 0.3 + }, + "46": { + "id": 46, + "mapid": 46, + "renownpro": 0.3 + }, + "47": { + "id": 47, + "mapid": 47, + "renownpro": 0.3 + }, + "48": { + "id": 48, + "mapid": 48, + "renownpro": 0.3 + }, + "49": { + "id": 49, + "mapid": 49, + "renownpro": 0.3 + }, + "50": { + "id": 50, + "mapid": 50, + "renownpro": 0.31 + }, + "51": { + "id": 51, + "mapid": 51, + "renownpro": 0.31 + }, + "52": { + "id": 52, + "mapid": 52, + "renownpro": 0.31 + }, + "53": { + "id": 53, + "mapid": 53, + "renownpro": 0.31 + }, + "54": { + "id": 54, + "mapid": 54, + "renownpro": 0.31 + }, + "55": { + "id": 55, + "mapid": 55, + "renownpro": 0.32 + }, + "56": { + "id": 56, + "mapid": 56, + "renownpro": 0.32 + }, + "57": { + "id": 57, + "mapid": 57, + "renownpro": 0.32 + }, + "58": { + "id": 58, + "mapid": 58, + "renownpro": 0.32 + }, + "59": { + "id": 59, + "mapid": 59, + "renownpro": 0.32 + }, + "60": { + "id": 60, + "mapid": 60, + "renownpro": 0.33 + }, + "61": { + "id": 61, + "mapid": 61, + "renownpro": 0.33 + }, + "62": { + "id": 62, + "mapid": 62, + "renownpro": 0.33 + }, + "63": { + "id": 63, + "mapid": 63, + "renownpro": 0.33 + }, + "64": { + "id": 64, + "mapid": 64, + "renownpro": 0.33 + }, + "65": { + "id": 65, + "mapid": 65, + "renownpro": 0.33 + }, + "66": { + "id": 66, + "mapid": 66, + "renownpro": 0.33 + }, + "67": { + "id": 67, + "mapid": 67, + "renownpro": 0.33 + }, + "68": { + "id": 68, + "mapid": 68, + "renownpro": 0.33 + }, + "69": { + "id": 69, + "mapid": 69, + "renownpro": 0.33 + }, + "70": { + "id": 70, + "mapid": 70, + "renownpro": 0.34 + }, + "71": { + "id": 71, + "mapid": 71, + "renownpro": 0.34 + }, + "72": { + "id": 72, + "mapid": 72, + "renownpro": 0.34 + }, + "73": { + "id": 73, + "mapid": 73, + "renownpro": 0.34 + }, + "74": { + "id": 74, + "mapid": 74, + "renownpro": 0.34 + }, + "75": { + "id": 75, + "mapid": 75, + "renownpro": 0.34 + }, + "76": { + "id": 76, + "mapid": 76, + "renownpro": 0.34 + }, + "77": { + "id": 77, + "mapid": 77, + "renownpro": 0.34 + }, + "78": { + "id": 78, + "mapid": 78, + "renownpro": 0.34 + }, + "79": { + "id": 79, + "mapid": 79, + "renownpro": 0.34 + }, + "80": { + "id": 80, + "mapid": 80, + "renownpro": 0.35 + }, + "81": { + "id": 81, + "mapid": 81, + "renownpro": 0.35 + }, + "82": { + "id": 82, + "mapid": 82, + "renownpro": 0.35 + }, + "83": { + "id": 83, + "mapid": 83, + "renownpro": 0.35 + }, + "84": { + "id": 84, + "mapid": 84, + "renownpro": 0.35 + }, + "85": { + "id": 85, + "mapid": 85, + "renownpro": 0.35 + }, + "86": { + "id": 86, + "mapid": 86, + "renownpro": 0.35 + }, + "87": { + "id": 87, + "mapid": 87, + "renownpro": 0.35 + }, + "88": { + "id": 88, + "mapid": 88, + "renownpro": 0.35 + }, + "89": { + "id": 89, + "mapid": 89, + "renownpro": 0.35 + }, + "90": { + "id": 90, + "mapid": 90, + "renownpro": 0.36 + }, + "91": { + "id": 91, + "mapid": 91, + "renownpro": 0.36 + }, + "92": { + "id": 92, + "mapid": 92, + "renownpro": 0.36 + }, + "93": { + "id": 93, + "mapid": 93, + "renownpro": 0.36 + }, + "94": { + "id": 94, + "mapid": 94, + "renownpro": 0.36 + }, + "95": { + "id": 95, + "mapid": 95, + "renownpro": 0.36 + }, + "96": { + "id": 96, + "mapid": 96, + "renownpro": 0.36 + }, + "97": { + "id": 97, + "mapid": 97, + "renownpro": 0.36 + }, + "98": { + "id": 98, + "mapid": 98, + "renownpro": 0.36 + }, + "99": { + "id": 99, + "mapid": 99, + "renownpro": 0.36 + }, + "100": { + "id": 100, + "mapid": 100, + "renownpro": 0.37 + }, + "101": { + "id": 101, + "mapid": 101, + "renownpro": 0.37 + }, + "102": { + "id": 102, + "mapid": 102, + "renownpro": 0.37 + }, + "103": { + "id": 103, + "mapid": 103, + "renownpro": 0.37 + }, + "104": { + "id": 104, + "mapid": 104, + "renownpro": 0.37 + }, + "105": { + "id": 105, + "mapid": 105, + "renownpro": 0.37 + }, + "106": { + "id": 106, + "mapid": 106, + "renownpro": 0.37 + }, + "107": { + "id": 107, + "mapid": 107, + "renownpro": 0.37 + }, + "108": { + "id": 108, + "mapid": 108, + "renownpro": 0.37 + }, + "109": { + "id": 109, + "mapid": 109, + "renownpro": 0.37 + }, + "110": { + "id": 110, + "mapid": 110, + "renownpro": 0.38 + }, + "111": { + "id": 111, + "mapid": 111, + "renownpro": 0.38 + }, + "112": { + "id": 112, + "mapid": 112, + "renownpro": 0.38 + }, + "113": { + "id": 113, + "mapid": 113, + "renownpro": 0.38 + }, + "114": { + "id": 114, + "mapid": 114, + "renownpro": 0.38 + }, + "115": { + "id": 115, + "mapid": 115, + "renownpro": 0.38 + }, + "116": { + "id": 116, + "mapid": 116, + "renownpro": 0.38 + }, + "117": { + "id": 117, + "mapid": 117, + "renownpro": 0.38 + }, + "118": { + "id": 118, + "mapid": 118, + "renownpro": 0.38 + }, + "119": { + "id": 119, + "mapid": 119, + "renownpro": 0.38 + }, + "120": { + "id": 120, + "mapid": 120, + "renownpro": 0.33 + }, + "121": { + "id": 121, + "mapid": 121, + "renownpro": 0.35 + }, + "122": { + "id": 122, + "mapid": 122, + "renownpro": 0.37 + }, + "123": { + "id": 123, + "mapid": 123, + "renownpro": 0.39 + }, + "124": { + "id": 124, + "mapid": 124, + "renownpro": 0.41 + }, + "125": { + "id": 125, + "mapid": 125, + "renownpro": 0.43 + }, + "126": { + "id": 126, + "mapid": 126, + "renownpro": 0.45 + }, + "127": { + "id": 127, + "mapid": 127, + "renownpro": 0.47 + }, + "128": { + "id": 128, + "mapid": 128, + "renownpro": 0.49 + }, + "129": { + "id": 129, + "mapid": 129, + "renownpro": 0.51 + }, + "130": { + "id": 130, + "mapid": 130, + "renownpro": 0.53 + }, + "131": { + "id": 131, + "mapid": 131, + "renownpro": 0.55 + }, + "132": { + "id": 132, + "mapid": 132, + "renownpro": 0.57 + }, + "133": { + "id": 133, + "mapid": 133, + "renownpro": 0.59 + }, + "134": { + "id": 134, + "mapid": 134, + "renownpro": 0.62 + }, + "135": { + "id": 135, + "mapid": 135, + "renownpro": 0.65 + }, + "136": { + "id": 136, + "mapid": 136, + "renownpro": 0.68 + }, + "137": { + "id": 137, + "mapid": 137, + "renownpro": 0.709999999999999 + }, + "138": { + "id": 138, + "mapid": 138, + "renownpro": 0.739999999999999 + }, + "139": { + "id": 139, + "mapid": 139, + "renownpro": 0.769999999999999 + }, + "140": { + "id": 140, + "mapid": 140, + "renownpro": 0.79 + }, + "141": { + "id": 141, + "mapid": 141, + "renownpro": 0.82 + }, + "142": { + "id": 142, + "mapid": 142, + "renownpro": 0.85 + }, + "143": { + "id": 143, + "mapid": 143, + "renownpro": 0.88 + }, + "144": { + "id": 144, + "mapid": 144, + "renownpro": 0.91 + }, + "145": { + "id": 145, + "mapid": 145, + "renownpro": 0.94 + }, + "146": { + "id": 146, + "mapid": 146, + "renownpro": 0.97 + }, + "147": { + "id": 147, + "mapid": 147, + "renownpro": 1 + }, + "148": { + "id": 148, + "mapid": 148, + "renownpro": 1.03 + }, + "149": { + "id": 149, + "mapid": 149, + "renownpro": 1.07 + }, + "150": { + "id": 150, + "mapid": 150, + "renownpro": 1.11 + }, + "151": { + "id": 151, + "mapid": 151, + "renownpro": 1.16 + }, + "152": { + "id": 152, + "mapid": 152, + "renownpro": 1.21 + }, + "153": { + "id": 153, + "mapid": 153, + "renownpro": 1.26 + }, + "154": { + "id": 154, + "mapid": 154, + "renownpro": 1.31 + }, + "155": { + "id": 155, + "mapid": 155, + "renownpro": 1.36 + }, + "156": { + "id": 156, + "mapid": 156, + "renownpro": 1.41 + }, + "157": { + "id": 157, + "mapid": 157, + "renownpro": 1.46 + }, + "158": { + "id": 158, + "mapid": 158, + "renownpro": 1.51 + }, + "159": { + "id": 159, + "mapid": 159, + "renownpro": 1.56 + }, + "160": { + "id": 160, + "mapid": 160, + "renownpro": 1.59 + }, + "161": { + "id": 161, + "mapid": 161, + "renownpro": 1.64 + }, + "162": { + "id": 162, + "mapid": 162, + "renownpro": 1.69 + }, + "163": { + "id": 163, + "mapid": 163, + "renownpro": 1.74 + }, + "164": { + "id": 164, + "mapid": 164, + "renownpro": 1.79 + }, + "165": { + "id": 165, + "mapid": 165, + "renownpro": 1.84 + }, + "166": { + "id": 166, + "mapid": 166, + "renownpro": 1.89 + }, + "167": { + "id": 167, + "mapid": 167, + "renownpro": 1.94 + }, + "168": { + "id": 168, + "mapid": 168, + "renownpro": 1.99 + }, + "169": { + "id": 169, + "mapid": 169, + "renownpro": 2.04 + }, + "170": { + "id": 170, + "mapid": 170, + "renownpro": 2.09 + }, + "171": { + "id": 171, + "mapid": 171, + "renownpro": 2.17 + }, + "172": { + "id": 172, + "mapid": 172, + "renownpro": 2.25 + }, + "173": { + "id": 173, + "mapid": 173, + "renownpro": 2.33 + }, + "174": { + "id": 174, + "mapid": 174, + "renownpro": 2.41 + }, + "175": { + "id": 175, + "mapid": 175, + "renownpro": 2.49 + }, + "176": { + "id": 176, + "mapid": 176, + "renownpro": 2.57 + }, + "177": { + "id": 177, + "mapid": 177, + "renownpro": 2.65 + }, + "178": { + "id": 178, + "mapid": 178, + "renownpro": 2.73 + }, + "179": { + "id": 179, + "mapid": 179, + "renownpro": 2.81 + }, + "180": { + "id": 180, + "mapid": 180, + "renownpro": 2.83 + }, + "181": { + "id": 181, + "mapid": 181, + "renownpro": 2.95 + }, + "182": { + "id": 182, + "mapid": 182, + "renownpro": 3.07 + }, + "183": { + "id": 183, + "mapid": 183, + "renownpro": 3.19 + }, + "184": { + "id": 184, + "mapid": 184, + "renownpro": 3.31 + }, + "185": { + "id": 185, + "mapid": 185, + "renownpro": 3.43 + }, + "186": { + "id": 186, + "mapid": 186, + "renownpro": 3.55 + }, + "187": { + "id": 187, + "mapid": 187, + "renownpro": 3.67 + }, + "188": { + "id": 188, + "mapid": 188, + "renownpro": 3.79 + }, + "189": { + "id": 189, + "mapid": 189, + "renownpro": 3.91 + }, + "190": { + "id": 190, + "mapid": 190, + "renownpro": 4.03 + }, + "191": { + "id": 191, + "mapid": 191, + "renownpro": 4.12 + }, + "192": { + "id": 192, + "mapid": 192, + "renownpro": 4.21 + }, + "193": { + "id": 193, + "mapid": 193, + "renownpro": 4.30000000000001 + }, + "194": { + "id": 194, + "mapid": 194, + "renownpro": 4.39000000000001 + }, + "195": { + "id": 195, + "mapid": 195, + "renownpro": 4.48000000000001 + }, + "196": { + "id": 196, + "mapid": 196, + "renownpro": 4.57000000000001 + }, + "197": { + "id": 197, + "mapid": 197, + "renownpro": 4.66000000000002 + }, + "198": { + "id": 198, + "mapid": 198, + "renownpro": 4.75000000000002 + }, + "199": { + "id": 199, + "mapid": 199, + "renownpro": 4.84000000000002 + }, + "200": { + "id": 200, + "mapid": 200, + "renownpro": 4.98 + }, + "201": { + "id": 201, + "mapid": 201, + "renownpro": 5.13 + }, + "202": { + "id": 202, + "mapid": 202, + "renownpro": 5.26 + }, + "203": { + "id": 203, + "mapid": 203, + "renownpro": 5.39 + }, + "204": { + "id": 204, + "mapid": 204, + "renownpro": 5.52 + }, + "205": { + "id": 205, + "mapid": 205, + "renownpro": 5.65 + }, + "206": { + "id": 206, + "mapid": 206, + "renownpro": 5.78 + }, + "207": { + "id": 207, + "mapid": 207, + "renownpro": 5.91 + }, + "208": { + "id": 208, + "mapid": 208, + "renownpro": 6.04 + }, + "209": { + "id": 209, + "mapid": 209, + "renownpro": 6.17 + }, + "210": { + "id": 210, + "mapid": 210, + "renownpro": 6.3 + }, + "211": { + "id": 211, + "mapid": 211, + "renownpro": 6.45 + }, + "212": { + "id": 212, + "mapid": 212, + "renownpro": 6.6 + }, + "213": { + "id": 213, + "mapid": 213, + "renownpro": 6.75 + }, + "214": { + "id": 214, + "mapid": 214, + "renownpro": 6.9 + }, + "215": { + "id": 215, + "mapid": 215, + "renownpro": 7.05000000000001 + }, + "216": { + "id": 216, + "mapid": 216, + "renownpro": 7.20000000000001 + }, + "217": { + "id": 217, + "mapid": 217, + "renownpro": 7.35000000000001 + }, + "218": { + "id": 218, + "mapid": 218, + "renownpro": 7.50000000000001 + }, + "219": { + "id": 219, + "mapid": 219, + "renownpro": 7.65000000000001 + }, + "220": { + "id": 220, + "mapid": 220, + "renownpro": 7.69 + }, + "221": { + "id": 221, + "mapid": 221, + "renownpro": 7.85 + }, + "222": { + "id": 222, + "mapid": 222, + "renownpro": 8.01 + }, + "223": { + "id": 223, + "mapid": 223, + "renownpro": 8.17 + }, + "224": { + "id": 224, + "mapid": 224, + "renownpro": 8.33 + }, + "225": { + "id": 225, + "mapid": 225, + "renownpro": 8.49 + }, + "226": { + "id": 226, + "mapid": 226, + "renownpro": 8.65 + }, + "227": { + "id": 227, + "mapid": 227, + "renownpro": 8.81 + }, + "228": { + "id": 228, + "mapid": 228, + "renownpro": 8.97 + }, + "229": { + "id": 229, + "mapid": 229, + "renownpro": 9.13 + }, + "230": { + "id": 230, + "mapid": 230, + "renownpro": 9.29 + }, + "231": { + "id": 231, + "mapid": 231, + "renownpro": 9.46 + }, + "232": { + "id": 232, + "mapid": 232, + "renownpro": 9.63 + }, + "233": { + "id": 233, + "mapid": 233, + "renownpro": 9.8 + }, + "234": { + "id": 234, + "mapid": 234, + "renownpro": 9.97 + }, + "235": { + "id": 235, + "mapid": 235, + "renownpro": 10.14 + }, + "236": { + "id": 236, + "mapid": 236, + "renownpro": 10.31 + }, + "237": { + "id": 237, + "mapid": 237, + "renownpro": 10.48 + }, + "238": { + "id": 238, + "mapid": 238, + "renownpro": 10.65 + }, + "239": { + "id": 239, + "mapid": 239, + "renownpro": 10.82 + }, + "240": { + "id": 240, + "mapid": 240, + "renownpro": 10.94 + }, + "241": { + "id": 241, + "mapid": 241, + "renownpro": 11.09 + }, + "242": { + "id": 242, + "mapid": 242, + "renownpro": 11.24 + }, + "243": { + "id": 243, + "mapid": 243, + "renownpro": 11.39 + }, + "244": { + "id": 244, + "mapid": 244, + "renownpro": 11.54 + }, + "245": { + "id": 245, + "mapid": 245, + "renownpro": 11.69 + }, + "246": { + "id": 246, + "mapid": 246, + "renownpro": 11.84 + }, + "247": { + "id": 247, + "mapid": 247, + "renownpro": 11.99 + }, + "248": { + "id": 248, + "mapid": 248, + "renownpro": 12.14 + }, + "249": { + "id": 249, + "mapid": 249, + "renownpro": 12.29 + }, + "250": { + "id": 250, + "mapid": 250, + "renownpro": 12.44 + }, + "251": { + "id": 251, + "mapid": 251, + "renownpro": 12.59 + }, + "252": { + "id": 252, + "mapid": 252, + "renownpro": 12.74 + }, + "253": { + "id": 253, + "mapid": 253, + "renownpro": 12.89 + }, + "254": { + "id": 254, + "mapid": 254, + "renownpro": 13.04 + }, + "255": { + "id": 255, + "mapid": 255, + "renownpro": 13.19 + }, + "256": { + "id": 256, + "mapid": 256, + "renownpro": 13.34 + }, + "257": { + "id": 257, + "mapid": 257, + "renownpro": 13.49 + }, + "258": { + "id": 258, + "mapid": 258, + "renownpro": 13.64 + }, + "259": { + "id": 259, + "mapid": 259, + "renownpro": 13.79 + }, + "260": { + "id": 260, + "mapid": 260, + "renownpro": 13.94 + }, + "261": { + "id": 261, + "mapid": 261, + "renownpro": 14.09 + }, + "262": { + "id": 262, + "mapid": 262, + "renownpro": 14.24 + }, + "263": { + "id": 263, + "mapid": 263, + "renownpro": 14.39 + }, + "264": { + "id": 264, + "mapid": 264, + "renownpro": 14.54 + }, + "265": { + "id": 265, + "mapid": 265, + "renownpro": 14.69 + }, + "266": { + "id": 266, + "mapid": 266, + "renownpro": 14.84 + }, + "267": { + "id": 267, + "mapid": 267, + "renownpro": 14.99 + }, + "268": { + "id": 268, + "mapid": 268, + "renownpro": 15.14 + }, + "269": { + "id": 269, + "mapid": 269, + "renownpro": 15.29 + }, + "270": { + "id": 270, + "mapid": 270, + "renownpro": 15.44 + }, + "271": { + "id": 271, + "mapid": 271, + "renownpro": 15.59 + }, + "272": { + "id": 272, + "mapid": 272, + "renownpro": 15.74 + }, + "273": { + "id": 273, + "mapid": 273, + "renownpro": 15.89 + }, + "274": { + "id": 274, + "mapid": 274, + "renownpro": 16.04 + }, + "275": { + "id": 275, + "mapid": 275, + "renownpro": 16.19 + }, + "276": { + "id": 276, + "mapid": 276, + "renownpro": 16.34 + }, + "277": { + "id": 277, + "mapid": 277, + "renownpro": 16.49 + }, + "278": { + "id": 278, + "mapid": 278, + "renownpro": 16.64 + }, + "279": { + "id": 279, + "mapid": 279, + "renownpro": 16.79 + }, + "280": { + "id": 280, + "mapid": 280, + "renownpro": 16.94 + }, + "281": { + "id": 281, + "mapid": 281, + "renownpro": 17.09 + }, + "282": { + "id": 282, + "mapid": 282, + "renownpro": 17.24 + }, + "283": { + "id": 283, + "mapid": 283, + "renownpro": 17.39 + }, + "284": { + "id": 284, + "mapid": 284, + "renownpro": 17.54 + }, + "285": { + "id": 285, + "mapid": 285, + "renownpro": 17.69 + }, + "286": { + "id": 286, + "mapid": 286, + "renownpro": 17.84 + }, + "287": { + "id": 287, + "mapid": 287, + "renownpro": 17.99 + }, + "288": { + "id": 288, + "mapid": 288, + "renownpro": 18.14 + }, + "289": { + "id": 289, + "mapid": 289, + "renownpro": 18.29 + }, + "290": { + "id": 290, + "mapid": 290, + "renownpro": 18.45 + }, + "291": { + "id": 291, + "mapid": 291, + "renownpro": 18.61 + }, + "292": { + "id": 292, + "mapid": 292, + "renownpro": 18.77 + }, + "293": { + "id": 293, + "mapid": 293, + "renownpro": 18.9299999999999 + }, + "294": { + "id": 294, + "mapid": 294, + "renownpro": 19.0899999999999 + }, + "295": { + "id": 295, + "mapid": 295, + "renownpro": 19.2499999999999 + }, + "296": { + "id": 296, + "mapid": 296, + "renownpro": 19.4099999999999 + }, + "297": { + "id": 297, + "mapid": 297, + "renownpro": 19.5699999999999 + }, + "298": { + "id": 298, + "mapid": 298, + "renownpro": 19.7299999999999 + }, + "299": { + "id": 299, + "mapid": 299, + "renownpro": 19.8899999999998 + }, + "300": { + "id": 300, + "mapid": 300, + "renownpro": 20.31 + }, + "301": { + "id": 301, + "mapid": 301, + "renownpro": 20.35 + }, + "302": { + "id": 302, + "mapid": 302, + "renownpro": 20.39 + }, + "303": { + "id": 303, + "mapid": 303, + "renownpro": 20.43 + }, + "304": { + "id": 304, + "mapid": 304, + "renownpro": 20.47 + }, + "305": { + "id": 305, + "mapid": 305, + "renownpro": 20.51 + }, + "306": { + "id": 306, + "mapid": 306, + "renownpro": 20.55 + }, + "307": { + "id": 307, + "mapid": 307, + "renownpro": 20.59 + }, + "308": { + "id": 308, + "mapid": 308, + "renownpro": 20.63 + }, + "309": { + "id": 309, + "mapid": 309, + "renownpro": 20.67 + }, + "310": { + "id": 310, + "mapid": 310, + "renownpro": 20.71 + }, + "311": { + "id": 311, + "mapid": 311, + "renownpro": 20.75 + }, + "312": { + "id": 312, + "mapid": 312, + "renownpro": 20.79 + }, + "313": { + "id": 313, + "mapid": 313, + "renownpro": 20.83 + }, + "314": { + "id": 314, + "mapid": 314, + "renownpro": 20.87 + }, + "315": { + "id": 315, + "mapid": 315, + "renownpro": 20.91 + }, + "316": { + "id": 316, + "mapid": 316, + "renownpro": 20.95 + }, + "317": { + "id": 317, + "mapid": 317, + "renownpro": 20.99 + }, + "318": { + "id": 318, + "mapid": 318, + "renownpro": 21.03 + }, + "319": { + "id": 319, + "mapid": 319, + "renownpro": 21.07 + }, + "320": { + "id": 320, + "mapid": 320, + "renownpro": 21.11 + }, + "321": { + "id": 321, + "mapid": 321, + "renownpro": 21.15 + }, + "322": { + "id": 322, + "mapid": 322, + "renownpro": 21.19 + }, + "323": { + "id": 323, + "mapid": 323, + "renownpro": 21.23 + }, + "324": { + "id": 324, + "mapid": 324, + "renownpro": 21.27 + }, + "325": { + "id": 325, + "mapid": 325, + "renownpro": 21.31 + }, + "326": { + "id": 326, + "mapid": 326, + "renownpro": 21.35 + }, + "327": { + "id": 327, + "mapid": 327, + "renownpro": 21.39 + }, + "328": { + "id": 328, + "mapid": 328, + "renownpro": 21.43 + }, + "329": { + "id": 329, + "mapid": 329, + "renownpro": 21.47 + }, + "330": { + "id": 330, + "mapid": 330, + "renownpro": 21.51 + }, + "331": { + "id": 331, + "mapid": 331, + "renownpro": 21.55 + }, + "332": { + "id": 332, + "mapid": 332, + "renownpro": 21.59 + }, + "333": { + "id": 333, + "mapid": 333, + "renownpro": 21.63 + }, + "334": { + "id": 334, + "mapid": 334, + "renownpro": 21.67 + }, + "335": { + "id": 335, + "mapid": 335, + "renownpro": 21.71 + }, + "336": { + "id": 336, + "mapid": 336, + "renownpro": 21.75 + }, + "337": { + "id": 337, + "mapid": 337, + "renownpro": 21.79 + }, + "338": { + "id": 338, + "mapid": 338, + "renownpro": 21.83 + }, + "339": { + "id": 339, + "mapid": 339, + "renownpro": 21.87 + }, + "340": { + "id": 340, + "mapid": 340, + "renownpro": 21.91 + }, + "341": { + "id": 341, + "mapid": 341, + "renownpro": 21.95 + }, + "342": { + "id": 342, + "mapid": 342, + "renownpro": 21.99 + }, + "343": { + "id": 343, + "mapid": 343, + "renownpro": 22.03 + }, + "344": { + "id": 344, + "mapid": 344, + "renownpro": 22.07 + }, + "345": { + "id": 345, + "mapid": 345, + "renownpro": 22.11 + }, + "346": { + "id": 346, + "mapid": 346, + "renownpro": 22.15 + }, + "347": { + "id": 347, + "mapid": 347, + "renownpro": 22.19 + }, + "348": { + "id": 348, + "mapid": 348, + "renownpro": 22.23 + }, + "349": { + "id": 349, + "mapid": 349, + "renownpro": 22.27 + }, + "350": { + "id": 350, + "mapid": 350, + "renownpro": 22.31 + }, + "351": { + "id": 351, + "mapid": 351, + "renownpro": 22.35 + }, + "352": { + "id": 352, + "mapid": 352, + "renownpro": 22.39 + }, + "353": { + "id": 353, + "mapid": 353, + "renownpro": 22.43 + }, + "354": { + "id": 354, + "mapid": 354, + "renownpro": 22.47 + }, + "355": { + "id": 355, + "mapid": 355, + "renownpro": 22.51 + }, + "356": { + "id": 356, + "mapid": 356, + "renownpro": 22.55 + }, + "357": { + "id": 357, + "mapid": 357, + "renownpro": 22.59 + }, + "358": { + "id": 358, + "mapid": 358, + "renownpro": 22.63 + }, + "359": { + "id": 359, + "mapid": 359, + "renownpro": 22.67 + }, + "360": { + "id": 360, + "mapid": 360, + "renownpro": 22.71 + }, + "361": { + "id": 361, + "mapid": 361, + "renownpro": 22.75 + }, + "362": { + "id": 362, + "mapid": 362, + "renownpro": 22.7899999999999 + }, + "363": { + "id": 363, + "mapid": 363, + "renownpro": 22.8299999999999 + }, + "364": { + "id": 364, + "mapid": 364, + "renownpro": 22.8699999999999 + }, + "365": { + "id": 365, + "mapid": 365, + "renownpro": 22.9099999999999 + }, + "366": { + "id": 366, + "mapid": 366, + "renownpro": 22.9499999999999 + }, + "367": { + "id": 367, + "mapid": 367, + "renownpro": 22.9899999999999 + }, + "368": { + "id": 368, + "mapid": 368, + "renownpro": 23.0299999999999 + }, + "369": { + "id": 369, + "mapid": 369, + "renownpro": 23.0699999999999 + }, + "370": { + "id": 370, + "mapid": 370, + "renownpro": 23.1099999999999 + }, + "371": { + "id": 371, + "mapid": 371, + "renownpro": 23.1499999999999 + }, + "372": { + "id": 372, + "mapid": 372, + "renownpro": 23.1899999999999 + }, + "373": { + "id": 373, + "mapid": 373, + "renownpro": 23.2299999999999 + }, + "374": { + "id": 374, + "mapid": 374, + "renownpro": 23.2699999999999 + }, + "375": { + "id": 375, + "mapid": 375, + "renownpro": 23.3099999999999 + }, + "376": { + "id": 376, + "mapid": 376, + "renownpro": 23.3499999999999 + }, + "377": { + "id": 377, + "mapid": 377, + "renownpro": 23.3899999999999 + }, + "378": { + "id": 378, + "mapid": 378, + "renownpro": 23.4299999999999 + }, + "379": { + "id": 379, + "mapid": 379, + "renownpro": 23.4699999999999 + }, + "380": { + "id": 380, + "mapid": 380, + "renownpro": 23.5099999999999 + }, + "381": { + "id": 381, + "mapid": 381, + "renownpro": 23.5499999999999 + }, + "382": { + "id": 382, + "mapid": 382, + "renownpro": 23.5899999999999 + }, + "383": { + "id": 383, + "mapid": 383, + "renownpro": 23.6299999999999 + }, + "384": { + "id": 384, + "mapid": 384, + "renownpro": 23.6699999999999 + }, + "385": { + "id": 385, + "mapid": 385, + "renownpro": 23.7099999999999 + }, + "386": { + "id": 386, + "mapid": 386, + "renownpro": 23.7499999999999 + }, + "387": { + "id": 387, + "mapid": 387, + "renownpro": 23.7899999999999 + }, + "388": { + "id": 388, + "mapid": 388, + "renownpro": 23.8299999999999 + }, + "389": { + "id": 389, + "mapid": 389, + "renownpro": 23.8699999999999 + }, + "390": { + "id": 390, + "mapid": 390, + "renownpro": 23.9099999999999 + }, + "391": { + "id": 391, + "mapid": 391, + "renownpro": 23.9499999999999 + }, + "392": { + "id": 392, + "mapid": 392, + "renownpro": 23.9899999999999 + }, + "393": { + "id": 393, + "mapid": 393, + "renownpro": 24.0299999999999 + }, + "394": { + "id": 394, + "mapid": 394, + "renownpro": 24.0699999999999 + }, + "395": { + "id": 395, + "mapid": 395, + "renownpro": 24.1099999999999 + }, + "396": { + "id": 396, + "mapid": 396, + "renownpro": 24.1499999999999 + }, + "397": { + "id": 397, + "mapid": 397, + "renownpro": 24.1899999999999 + }, + "398": { + "id": 398, + "mapid": 398, + "renownpro": 24.2299999999999 + }, + "399": { + "id": 399, + "mapid": 399, + "renownpro": 24.2699999999999 + }, + "400": { + "id": 400, + "mapid": 400, + "renownpro": 24.3099999999999 + }, + "401": { + "id": 401, + "mapid": 401, + "renownpro": 24.3499999999999 + }, + "402": { + "id": 402, + "mapid": 402, + "renownpro": 24.3899999999999 + }, + "403": { + "id": 403, + "mapid": 403, + "renownpro": 24.4299999999999 + }, + "404": { + "id": 404, + "mapid": 404, + "renownpro": 24.4699999999999 + }, + "405": { + "id": 405, + "mapid": 405, + "renownpro": 24.5099999999999 + }, + "406": { + "id": 406, + "mapid": 406, + "renownpro": 24.5499999999999 + }, + "407": { + "id": 407, + "mapid": 407, + "renownpro": 24.5899999999999 + }, + "408": { + "id": 408, + "mapid": 408, + "renownpro": 24.6299999999999 + }, + "409": { + "id": 409, + "mapid": 409, + "renownpro": 24.6699999999999 + }, + "410": { + "id": 410, + "mapid": 410, + "renownpro": 24.7099999999999 + }, + "411": { + "id": 411, + "mapid": 411, + "renownpro": 24.7499999999999 + }, + "412": { + "id": 412, + "mapid": 412, + "renownpro": 24.7899999999999 + }, + "413": { + "id": 413, + "mapid": 413, + "renownpro": 24.8299999999999 + }, + "414": { + "id": 414, + "mapid": 414, + "renownpro": 24.8699999999999 + }, + "415": { + "id": 415, + "mapid": 415, + "renownpro": 24.9099999999999 + }, + "416": { + "id": 416, + "mapid": 416, + "renownpro": 24.9499999999999 + }, + "417": { + "id": 417, + "mapid": 417, + "renownpro": 24.9899999999999 + }, + "418": { + "id": 418, + "mapid": 418, + "renownpro": 25.0299999999999 + }, + "419": { + "id": 419, + "mapid": 419, + "renownpro": 25.0699999999999 + }, + "420": { + "id": 420, + "mapid": 420, + "renownpro": 25.1099999999999 + }, + "421": { + "id": 421, + "mapid": 421, + "renownpro": 25.1499999999999 + }, + "422": { + "id": 422, + "mapid": 422, + "renownpro": 25.1899999999999 + }, + "423": { + "id": 423, + "mapid": 423, + "renownpro": 25.2299999999999 + }, + "424": { + "id": 424, + "mapid": 424, + "renownpro": 25.2699999999999 + }, + "425": { + "id": 425, + "mapid": 425, + "renownpro": 25.3099999999999 + }, + "426": { + "id": 426, + "mapid": 426, + "renownpro": 25.3499999999999 + }, + "427": { + "id": 427, + "mapid": 427, + "renownpro": 25.3899999999999 + }, + "428": { + "id": 428, + "mapid": 428, + "renownpro": 25.4299999999999 + }, + "429": { + "id": 429, + "mapid": 429, + "renownpro": 25.4699999999999 + }, + "430": { + "id": 430, + "mapid": 430, + "renownpro": 25.5099999999999 + }, + "431": { + "id": 431, + "mapid": 431, + "renownpro": 25.5499999999999 + }, + "432": { + "id": 432, + "mapid": 432, + "renownpro": 25.5899999999999 + }, + "433": { + "id": 433, + "mapid": 433, + "renownpro": 25.6299999999999 + }, + "434": { + "id": 434, + "mapid": 434, + "renownpro": 25.6699999999999 + }, + "435": { + "id": 435, + "mapid": 435, + "renownpro": 25.7099999999999 + }, + "436": { + "id": 436, + "mapid": 436, + "renownpro": 25.7499999999999 + }, + "437": { + "id": 437, + "mapid": 437, + "renownpro": 25.7899999999999 + }, + "438": { + "id": 438, + "mapid": 438, + "renownpro": 25.8299999999999 + }, + "439": { + "id": 439, + "mapid": 439, + "renownpro": 25.8699999999999 + }, + "440": { + "id": 440, + "mapid": 440, + "renownpro": 25.9099999999999 + }, + "441": { + "id": 441, + "mapid": 441, + "renownpro": 25.9499999999999 + }, + "442": { + "id": 442, + "mapid": 442, + "renownpro": 25.9899999999999 + }, + "443": { + "id": 443, + "mapid": 443, + "renownpro": 26.0299999999999 + }, + "444": { + "id": 444, + "mapid": 444, + "renownpro": 26.0699999999999 + }, + "445": { + "id": 445, + "mapid": 445, + "renownpro": 26.1099999999999 + }, + "446": { + "id": 446, + "mapid": 446, + "renownpro": 26.1499999999999 + }, + "447": { + "id": 447, + "mapid": 447, + "renownpro": 26.1899999999999 + }, + "448": { + "id": 448, + "mapid": 448, + "renownpro": 26.2299999999999 + }, + "449": { + "id": 449, + "mapid": 449, + "renownpro": 26.2699999999999 + }, + "450": { + "id": 450, + "mapid": 450, + "renownpro": 26.3099999999999 + }, + "451": { + "id": 451, + "mapid": 451, + "renownpro": 26.3499999999999 + }, + "452": { + "id": 452, + "mapid": 452, + "renownpro": 26.3899999999999 + }, + "453": { + "id": 453, + "mapid": 453, + "renownpro": 26.4299999999999 + }, + "454": { + "id": 454, + "mapid": 454, + "renownpro": 26.4699999999999 + }, + "455": { + "id": 455, + "mapid": 455, + "renownpro": 26.5099999999999 + }, + "456": { + "id": 456, + "mapid": 456, + "renownpro": 26.5499999999999 + }, + "457": { + "id": 457, + "mapid": 457, + "renownpro": 26.5899999999999 + }, + "458": { + "id": 458, + "mapid": 458, + "renownpro": 26.6299999999999 + }, + "459": { + "id": 459, + "mapid": 459, + "renownpro": 26.6699999999999 + }, + "460": { + "id": 460, + "mapid": 460, + "renownpro": 26.7099999999999 + }, + "461": { + "id": 461, + "mapid": 461, + "renownpro": 26.7499999999999 + }, + "462": { + "id": 462, + "mapid": 462, + "renownpro": 26.7899999999999 + }, + "463": { + "id": 463, + "mapid": 463, + "renownpro": 26.8299999999999 + }, + "464": { + "id": 464, + "mapid": 464, + "renownpro": 26.8699999999999 + }, + "465": { + "id": 465, + "mapid": 465, + "renownpro": 26.9099999999999 + }, + "466": { + "id": 466, + "mapid": 466, + "renownpro": 26.9499999999999 + }, + "467": { + "id": 467, + "mapid": 467, + "renownpro": 26.9899999999999 + }, + "468": { + "id": 468, + "mapid": 468, + "renownpro": 27.0299999999999 + }, + "469": { + "id": 469, + "mapid": 469, + "renownpro": 27.0699999999999 + }, + "470": { + "id": 470, + "mapid": 470, + "renownpro": 27.1099999999999 + }, + "471": { + "id": 471, + "mapid": 471, + "renownpro": 27.1499999999999 + }, + "472": { + "id": 472, + "mapid": 472, + "renownpro": 27.1899999999999 + }, + "473": { + "id": 473, + "mapid": 473, + "renownpro": 27.2299999999999 + }, + "474": { + "id": 474, + "mapid": 474, + "renownpro": 27.2699999999999 + }, + "475": { + "id": 475, + "mapid": 475, + "renownpro": 27.3099999999999 + }, + "476": { + "id": 476, + "mapid": 476, + "renownpro": 27.3499999999999 + }, + "477": { + "id": 477, + "mapid": 477, + "renownpro": 27.3899999999999 + }, + "478": { + "id": 478, + "mapid": 478, + "renownpro": 27.4299999999999 + }, + "479": { + "id": 479, + "mapid": 479, + "renownpro": 27.4699999999998 + }, + "480": { + "id": 480, + "mapid": 480, + "renownpro": 27.5099999999998 + }, + "481": { + "id": 481, + "mapid": 481, + "renownpro": 27.5499999999998 + }, + "482": { + "id": 482, + "mapid": 482, + "renownpro": 27.5899999999998 + }, + "483": { + "id": 483, + "mapid": 483, + "renownpro": 27.6299999999998 + }, + "484": { + "id": 484, + "mapid": 484, + "renownpro": 27.6699999999998 + }, + "485": { + "id": 485, + "mapid": 485, + "renownpro": 27.7099999999998 + }, + "486": { + "id": 486, + "mapid": 486, + "renownpro": 27.7499999999998 + }, + "487": { + "id": 487, + "mapid": 487, + "renownpro": 27.7899999999998 + }, + "488": { + "id": 488, + "mapid": 488, + "renownpro": 27.8299999999998 + }, + "489": { + "id": 489, + "mapid": 489, + "renownpro": 27.8699999999998 + }, + "490": { + "id": 490, + "mapid": 490, + "renownpro": 27.9099999999998 + }, + "491": { + "id": 491, + "mapid": 491, + "renownpro": 27.9499999999998 + }, + "492": { + "id": 492, + "mapid": 492, + "renownpro": 27.9899999999998 + }, + "493": { + "id": 493, + "mapid": 493, + "renownpro": 28.0299999999998 + }, + "494": { + "id": 494, + "mapid": 494, + "renownpro": 28.0699999999998 + }, + "495": { + "id": 495, + "mapid": 495, + "renownpro": 28.1099999999998 + }, + "496": { + "id": 496, + "mapid": 496, + "renownpro": 28.1499999999998 + }, + "497": { + "id": 497, + "mapid": 497, + "renownpro": 28.1899999999998 + }, + "498": { + "id": 498, + "mapid": 498, + "renownpro": 28.2299999999998 + }, + "499": { + "id": 499, + "mapid": 499, + "renownpro": 28.2699999999998 + }, + "500": { + "id": 500, + "mapid": 500, + "renownpro": 28.3099999999998 + }, + "501": { + "id": 501, + "mapid": 501, + "renownpro": 28.3499999999998 + }, + "502": { + "id": 502, + "mapid": 502, + "renownpro": 28.3899999999998 + }, + "503": { + "id": 503, + "mapid": 503, + "renownpro": 28.4299999999998 + }, + "504": { + "id": 504, + "mapid": 504, + "renownpro": 28.4699999999998 + }, + "505": { + "id": 505, + "mapid": 505, + "renownpro": 28.5099999999998 + }, + "506": { + "id": 506, + "mapid": 506, + "renownpro": 28.5499999999998 + }, + "507": { + "id": 507, + "mapid": 507, + "renownpro": 28.5899999999998 + }, + "508": { + "id": 508, + "mapid": 508, + "renownpro": 28.6299999999998 + }, + "509": { + "id": 509, + "mapid": 509, + "renownpro": 28.6699999999998 + }, + "510": { + "id": 510, + "mapid": 510, + "renownpro": 28.7099999999998 + }, + "511": { + "id": 511, + "mapid": 511, + "renownpro": 28.7499999999998 + }, + "512": { + "id": 512, + "mapid": 512, + "renownpro": 28.7899999999998 + }, + "513": { + "id": 513, + "mapid": 513, + "renownpro": 28.8299999999998 + }, + "514": { + "id": 514, + "mapid": 514, + "renownpro": 28.8699999999998 + }, + "515": { + "id": 515, + "mapid": 515, + "renownpro": 28.9099999999998 + }, + "516": { + "id": 516, + "mapid": 516, + "renownpro": 28.9499999999998 + }, + "517": { + "id": 517, + "mapid": 517, + "renownpro": 28.9899999999998 + }, + "518": { + "id": 518, + "mapid": 518, + "renownpro": 29.0299999999998 + }, + "519": { + "id": 519, + "mapid": 519, + "renownpro": 29.0699999999998 + }, + "520": { + "id": 520, + "mapid": 520, + "renownpro": 29.1099999999998 + }, + "521": { + "id": 521, + "mapid": 521, + "renownpro": 29.1499999999998 + }, + "522": { + "id": 522, + "mapid": 522, + "renownpro": 29.1899999999998 + }, + "523": { + "id": 523, + "mapid": 523, + "renownpro": 29.2299999999998 + }, + "524": { + "id": 524, + "mapid": 524, + "renownpro": 29.2699999999998 + }, + "525": { + "id": 525, + "mapid": 525, + "renownpro": 29.3099999999998 + }, + "526": { + "id": 526, + "mapid": 526, + "renownpro": 29.3499999999998 + }, + "527": { + "id": 527, + "mapid": 527, + "renownpro": 29.3899999999998 + }, + "528": { + "id": 528, + "mapid": 528, + "renownpro": 29.4299999999998 + }, + "529": { + "id": 529, + "mapid": 529, + "renownpro": 29.4699999999998 + }, + "530": { + "id": 530, + "mapid": 530, + "renownpro": 29.5099999999998 + }, + "531": { + "id": 531, + "mapid": 531, + "renownpro": 29.5499999999998 + }, + "532": { + "id": 532, + "mapid": 532, + "renownpro": 29.5899999999998 + }, + "533": { + "id": 533, + "mapid": 533, + "renownpro": 29.6299999999998 + }, + "534": { + "id": 534, + "mapid": 534, + "renownpro": 29.6699999999998 + }, + "535": { + "id": 535, + "mapid": 535, + "renownpro": 29.7099999999998 + }, + "536": { + "id": 536, + "mapid": 536, + "renownpro": 29.7499999999998 + }, + "537": { + "id": 537, + "mapid": 537, + "renownpro": 29.7899999999998 + }, + "538": { + "id": 538, + "mapid": 538, + "renownpro": 29.8299999999998 + }, + "539": { + "id": 539, + "mapid": 539, + "renownpro": 29.8699999999998 + }, + "540": { + "id": 540, + "mapid": 540, + "renownpro": 29.9099999999998 + }, + "541": { + "id": 541, + "mapid": 541, + "renownpro": 29.9499999999998 + }, + "542": { + "id": 542, + "mapid": 542, + "renownpro": 29.9899999999998 + }, + "543": { + "id": 543, + "mapid": 543, + "renownpro": 30.0299999999998 + }, + "544": { + "id": 544, + "mapid": 544, + "renownpro": 30.0699999999998 + }, + "545": { + "id": 545, + "mapid": 545, + "renownpro": 30.1099999999998 + }, + "546": { + "id": 546, + "mapid": 546, + "renownpro": 30.1499999999998 + }, + "547": { + "id": 547, + "mapid": 547, + "renownpro": 30.1899999999998 + }, + "548": { + "id": 548, + "mapid": 548, + "renownpro": 30.2299999999998 + }, + "549": { + "id": 549, + "mapid": 549, + "renownpro": 30.2699999999998 + }, + "550": { + "id": 550, + "mapid": 550, + "renownpro": 30.3099999999998 + }, + "551": { + "id": 551, + "mapid": 551, + "renownpro": 30.3499999999998 + }, + "552": { + "id": 552, + "mapid": 552, + "renownpro": 30.3899999999998 + }, + "553": { + "id": 553, + "mapid": 553, + "renownpro": 30.4299999999998 + }, + "554": { + "id": 554, + "mapid": 554, + "renownpro": 30.4699999999998 + }, + "555": { + "id": 555, + "mapid": 555, + "renownpro": 30.5099999999998 + }, + "556": { + "id": 556, + "mapid": 556, + "renownpro": 30.5499999999998 + }, + "557": { + "id": 557, + "mapid": 557, + "renownpro": 30.5899999999998 + }, + "558": { + "id": 558, + "mapid": 558, + "renownpro": 30.6299999999998 + }, + "559": { + "id": 559, + "mapid": 559, + "renownpro": 30.6699999999998 + }, + "560": { + "id": 560, + "mapid": 560, + "renownpro": 30.7099999999998 + }, + "561": { + "id": 561, + "mapid": 561, + "renownpro": 30.7499999999998 + }, + "562": { + "id": 562, + "mapid": 562, + "renownpro": 30.7899999999998 + }, + "563": { + "id": 563, + "mapid": 563, + "renownpro": 30.8299999999998 + }, + "564": { + "id": 564, + "mapid": 564, + "renownpro": 30.8699999999998 + }, + "565": { + "id": 565, + "mapid": 565, + "renownpro": 30.9099999999998 + }, + "566": { + "id": 566, + "mapid": 566, + "renownpro": 30.9499999999998 + }, + "567": { + "id": 567, + "mapid": 567, + "renownpro": 30.9899999999998 + }, + "568": { + "id": 568, + "mapid": 568, + "renownpro": 31.0299999999998 + }, + "569": { + "id": 569, + "mapid": 569, + "renownpro": 31.0699999999998 + }, + "570": { + "id": 570, + "mapid": 570, + "renownpro": 31.1099999999998 + }, + "571": { + "id": 571, + "mapid": 571, + "renownpro": 31.1499999999998 + }, + "572": { + "id": 572, + "mapid": 572, + "renownpro": 31.1899999999998 + }, + "573": { + "id": 573, + "mapid": 573, + "renownpro": 31.2299999999998 + }, + "574": { + "id": 574, + "mapid": 574, + "renownpro": 31.2699999999998 + }, + "575": { + "id": 575, + "mapid": 575, + "renownpro": 31.3099999999998 + }, + "576": { + "id": 576, + "mapid": 576, + "renownpro": 31.3499999999998 + }, + "577": { + "id": 577, + "mapid": 577, + "renownpro": 31.3899999999998 + }, + "578": { + "id": 578, + "mapid": 578, + "renownpro": 31.4299999999998 + }, + "579": { + "id": 579, + "mapid": 579, + "renownpro": 31.4699999999998 + }, + "580": { + "id": 580, + "mapid": 580, + "renownpro": 31.5099999999998 + }, + "581": { + "id": 581, + "mapid": 581, + "renownpro": 31.5499999999998 + }, + "582": { + "id": 582, + "mapid": 582, + "renownpro": 31.5899999999998 + }, + "583": { + "id": 583, + "mapid": 583, + "renownpro": 31.6299999999998 + }, + "584": { + "id": 584, + "mapid": 584, + "renownpro": 31.6699999999998 + }, + "585": { + "id": 585, + "mapid": 585, + "renownpro": 31.7099999999998 + }, + "586": { + "id": 586, + "mapid": 586, + "renownpro": 31.7499999999998 + }, + "587": { + "id": 587, + "mapid": 587, + "renownpro": 31.7899999999998 + }, + "588": { + "id": 588, + "mapid": 588, + "renownpro": 31.8299999999998 + }, + "589": { + "id": 589, + "mapid": 589, + "renownpro": 31.8699999999998 + }, + "590": { + "id": 590, + "mapid": 590, + "renownpro": 31.9099999999998 + }, + "591": { + "id": 591, + "mapid": 591, + "renownpro": 31.9499999999998 + }, + "592": { + "id": 592, + "mapid": 592, + "renownpro": 31.9899999999998 + }, + "593": { + "id": 593, + "mapid": 593, + "renownpro": 32.0299999999998 + }, + "594": { + "id": 594, + "mapid": 594, + "renownpro": 32.0699999999998 + }, + "595": { + "id": 595, + "mapid": 595, + "renownpro": 32.1099999999998 + }, + "596": { + "id": 596, + "mapid": 596, + "renownpro": 32.1499999999997 + }, + "597": { + "id": 597, + "mapid": 597, + "renownpro": 32.1899999999997 + }, + "598": { + "id": 598, + "mapid": 598, + "renownpro": 32.2299999999997 + }, + "599": { + "id": 599, + "mapid": 599, + "renownpro": 32.2699999999997 + }, + "600": { + "id": 600, + "mapid": 600, + "renownpro": 32.3099999999997 + }, + "601": { + "id": 601, + "mapid": 601, + "renownpro": 32.3499999999997 + }, + "602": { + "id": 602, + "mapid": 602, + "renownpro": 32.3899999999997 + }, + "603": { + "id": 603, + "mapid": 603, + "renownpro": 32.4299999999997 + }, + "604": { + "id": 604, + "mapid": 604, + "renownpro": 32.4699999999997 + }, + "605": { + "id": 605, + "mapid": 605, + "renownpro": 32.5099999999997 + }, + "606": { + "id": 606, + "mapid": 606, + "renownpro": 32.5499999999997 + }, + "607": { + "id": 607, + "mapid": 607, + "renownpro": 32.5899999999997 + }, + "608": { + "id": 608, + "mapid": 608, + "renownpro": 32.6299999999997 + }, + "609": { + "id": 609, + "mapid": 609, + "renownpro": 32.6699999999997 + }, + "610": { + "id": 610, + "mapid": 610, + "renownpro": 32.7099999999997 + }, + "611": { + "id": 611, + "mapid": 611, + "renownpro": 32.7499999999997 + }, + "612": { + "id": 612, + "mapid": 612, + "renownpro": 32.7899999999997 + }, + "613": { + "id": 613, + "mapid": 613, + "renownpro": 32.8299999999997 + }, + "614": { + "id": 614, + "mapid": 614, + "renownpro": 32.8699999999997 + }, + "615": { + "id": 615, + "mapid": 615, + "renownpro": 32.9099999999997 + }, + "616": { + "id": 616, + "mapid": 616, + "renownpro": 32.9499999999997 + }, + "617": { + "id": 617, + "mapid": 617, + "renownpro": 32.9899999999997 + }, + "618": { + "id": 618, + "mapid": 618, + "renownpro": 33.0299999999997 + }, + "619": { + "id": 619, + "mapid": 619, + "renownpro": 33.0699999999997 + }, + "620": { + "id": 620, + "mapid": 620, + "renownpro": 33.1099999999997 + }, + "621": { + "id": 621, + "mapid": 621, + "renownpro": 33.1499999999997 + }, + "622": { + "id": 622, + "mapid": 622, + "renownpro": 33.1899999999997 + }, + "623": { + "id": 623, + "mapid": 623, + "renownpro": 33.2299999999997 + }, + "624": { + "id": 624, + "mapid": 624, + "renownpro": 33.2699999999997 + }, + "625": { + "id": 625, + "mapid": 625, + "renownpro": 33.3099999999997 + }, + "626": { + "id": 626, + "mapid": 626, + "renownpro": 33.3499999999997 + }, + "627": { + "id": 627, + "mapid": 627, + "renownpro": 33.3899999999997 + }, + "628": { + "id": 628, + "mapid": 628, + "renownpro": 33.4299999999997 + }, + "629": { + "id": 629, + "mapid": 629, + "renownpro": 33.4699999999997 + }, + "630": { + "id": 630, + "mapid": 630, + "renownpro": 33.5099999999997 + }, + "631": { + "id": 631, + "mapid": 631, + "renownpro": 33.5499999999997 + }, + "632": { + "id": 632, + "mapid": 632, + "renownpro": 33.5899999999997 + }, + "633": { + "id": 633, + "mapid": 633, + "renownpro": 33.6299999999997 + }, + "634": { + "id": 634, + "mapid": 634, + "renownpro": 33.6699999999997 + }, + "635": { + "id": 635, + "mapid": 635, + "renownpro": 33.7099999999997 + }, + "636": { + "id": 636, + "mapid": 636, + "renownpro": 33.7499999999997 + }, + "637": { + "id": 637, + "mapid": 637, + "renownpro": 33.7899999999997 + }, + "638": { + "id": 638, + "mapid": 638, + "renownpro": 33.8299999999997 + }, + "639": { + "id": 639, + "mapid": 639, + "renownpro": 33.8699999999997 + }, + "640": { + "id": 640, + "mapid": 640, + "renownpro": 33.9099999999997 + }, + "641": { + "id": 641, + "mapid": 641, + "renownpro": 33.9499999999997 + }, + "642": { + "id": 642, + "mapid": 642, + "renownpro": 33.9899999999997 + }, + "643": { + "id": 643, + "mapid": 643, + "renownpro": 34.0299999999997 + }, + "644": { + "id": 644, + "mapid": 644, + "renownpro": 34.0699999999997 + }, + "645": { + "id": 645, + "mapid": 645, + "renownpro": 34.1099999999997 + }, + "646": { + "id": 646, + "mapid": 646, + "renownpro": 34.1499999999997 + }, + "647": { + "id": 647, + "mapid": 647, + "renownpro": 34.1899999999997 + }, + "648": { + "id": 648, + "mapid": 648, + "renownpro": 34.2299999999997 + }, + "649": { + "id": 649, + "mapid": 649, + "renownpro": 34.2699999999997 + }, + "650": { + "id": 650, + "mapid": 650, + "renownpro": 34.3099999999997 + }, + "651": { + "id": 651, + "mapid": 651, + "renownpro": 34.3499999999997 + }, + "652": { + "id": 652, + "mapid": 652, + "renownpro": 34.3899999999997 + }, + "653": { + "id": 653, + "mapid": 653, + "renownpro": 34.4299999999997 + }, + "654": { + "id": 654, + "mapid": 654, + "renownpro": 34.4699999999997 + }, + "655": { + "id": 655, + "mapid": 655, + "renownpro": 34.5099999999997 + }, + "656": { + "id": 656, + "mapid": 656, + "renownpro": 34.5499999999997 + }, + "657": { + "id": 657, + "mapid": 657, + "renownpro": 34.5899999999997 + }, + "658": { + "id": 658, + "mapid": 658, + "renownpro": 34.6299999999997 + }, + "659": { + "id": 659, + "mapid": 659, + "renownpro": 34.6699999999997 + }, + "660": { + "id": 660, + "mapid": 660, + "renownpro": 34.7099999999997 + }, + "661": { + "id": 661, + "mapid": 661, + "renownpro": 34.7499999999997 + }, + "662": { + "id": 662, + "mapid": 662, + "renownpro": 34.7899999999997 + }, + "663": { + "id": 663, + "mapid": 663, + "renownpro": 34.8299999999997 + }, + "664": { + "id": 664, + "mapid": 664, + "renownpro": 34.8699999999997 + }, + "665": { + "id": 665, + "mapid": 665, + "renownpro": 34.9099999999997 + }, + "666": { + "id": 666, + "mapid": 666, + "renownpro": 34.9499999999997 + }, + "667": { + "id": 667, + "mapid": 667, + "renownpro": 34.9899999999997 + }, + "668": { + "id": 668, + "mapid": 668, + "renownpro": 35.0299999999997 + }, + "669": { + "id": 669, + "mapid": 669, + "renownpro": 35.0699999999997 + }, + "670": { + "id": 670, + "mapid": 670, + "renownpro": 35.1099999999997 + }, + "671": { + "id": 671, + "mapid": 671, + "renownpro": 35.1499999999997 + }, + "672": { + "id": 672, + "mapid": 672, + "renownpro": 35.1899999999997 + }, + "673": { + "id": 673, + "mapid": 673, + "renownpro": 35.2299999999997 + }, + "674": { + "id": 674, + "mapid": 674, + "renownpro": 35.2699999999997 + }, + "675": { + "id": 675, + "mapid": 675, + "renownpro": 35.3099999999997 + }, + "676": { + "id": 676, + "mapid": 676, + "renownpro": 35.3499999999997 + }, + "677": { + "id": 677, + "mapid": 677, + "renownpro": 35.3899999999997 + }, + "678": { + "id": 678, + "mapid": 678, + "renownpro": 35.4299999999997 + }, + "679": { + "id": 679, + "mapid": 679, + "renownpro": 35.4699999999997 + }, + "680": { + "id": 680, + "mapid": 680, + "renownpro": 35.5099999999997 + }, + "681": { + "id": 681, + "mapid": 681, + "renownpro": 35.5499999999997 + }, + "682": { + "id": 682, + "mapid": 682, + "renownpro": 35.5899999999997 + }, + "683": { + "id": 683, + "mapid": 683, + "renownpro": 35.6299999999997 + }, + "684": { + "id": 684, + "mapid": 684, + "renownpro": 35.6699999999997 + }, + "685": { + "id": 685, + "mapid": 685, + "renownpro": 35.7099999999997 + }, + "686": { + "id": 686, + "mapid": 686, + "renownpro": 35.7499999999997 + }, + "687": { + "id": 687, + "mapid": 687, + "renownpro": 35.7899999999997 + }, + "688": { + "id": 688, + "mapid": 688, + "renownpro": 35.8299999999997 + }, + "689": { + "id": 689, + "mapid": 689, + "renownpro": 35.8699999999997 + }, + "690": { + "id": 690, + "mapid": 690, + "renownpro": 35.9099999999997 + }, + "691": { + "id": 691, + "mapid": 691, + "renownpro": 35.9499999999997 + }, + "692": { + "id": 692, + "mapid": 692, + "renownpro": 35.9899999999997 + }, + "693": { + "id": 693, + "mapid": 693, + "renownpro": 36.0299999999997 + }, + "694": { + "id": 694, + "mapid": 694, + "renownpro": 36.0699999999997 + }, + "695": { + "id": 695, + "mapid": 695, + "renownpro": 36.1099999999997 + }, + "696": { + "id": 696, + "mapid": 696, + "renownpro": 36.1499999999997 + }, + "697": { + "id": 697, + "mapid": 697, + "renownpro": 36.1899999999997 + }, + "698": { + "id": 698, + "mapid": 698, + "renownpro": 36.2299999999997 + }, + "699": { + "id": 699, + "mapid": 699, + "renownpro": 36.2699999999997 + }, + "700": { + "id": 700, + "mapid": 700, + "renownpro": 36.3099999999997 + }, + "701": { + "id": 701, + "mapid": 701, + "renownpro": 36.3499999999997 + }, + "702": { + "id": 702, + "mapid": 702, + "renownpro": 36.3899999999997 + }, + "703": { + "id": 703, + "mapid": 703, + "renownpro": 36.4299999999997 + }, + "704": { + "id": 704, + "mapid": 704, + "renownpro": 36.4699999999997 + }, + "705": { + "id": 705, + "mapid": 705, + "renownpro": 36.5099999999997 + }, + "706": { + "id": 706, + "mapid": 706, + "renownpro": 36.5499999999997 + }, + "707": { + "id": 707, + "mapid": 707, + "renownpro": 36.5899999999997 + }, + "708": { + "id": 708, + "mapid": 708, + "renownpro": 36.6299999999997 + }, + "709": { + "id": 709, + "mapid": 709, + "renownpro": 36.6699999999997 + }, + "710": { + "id": 710, + "mapid": 710, + "renownpro": 36.7099999999997 + }, + "711": { + "id": 711, + "mapid": 711, + "renownpro": 36.7499999999997 + }, + "712": { + "id": 712, + "mapid": 712, + "renownpro": 36.7899999999997 + }, + "713": { + "id": 713, + "mapid": 713, + "renownpro": 36.8299999999997 + }, + "714": { + "id": 714, + "mapid": 714, + "renownpro": 36.8699999999996 + }, + "715": { + "id": 715, + "mapid": 715, + "renownpro": 36.9099999999996 + }, + "716": { + "id": 716, + "mapid": 716, + "renownpro": 36.9499999999996 + }, + "717": { + "id": 717, + "mapid": 717, + "renownpro": 36.9899999999996 + }, + "718": { + "id": 718, + "mapid": 718, + "renownpro": 37.0299999999996 + }, + "719": { + "id": 719, + "mapid": 719, + "renownpro": 37.0699999999996 + }, + "720": { + "id": 720, + "mapid": 720, + "renownpro": 37.1099999999996 + }, + "721": { + "id": 721, + "mapid": 721, + "renownpro": 37.1499999999996 + }, + "722": { + "id": 722, + "mapid": 722, + "renownpro": 37.1899999999996 + }, + "723": { + "id": 723, + "mapid": 723, + "renownpro": 37.2299999999996 + }, + "724": { + "id": 724, + "mapid": 724, + "renownpro": 37.2699999999996 + }, + "725": { + "id": 725, + "mapid": 725, + "renownpro": 37.3099999999996 + }, + "726": { + "id": 726, + "mapid": 726, + "renownpro": 37.3499999999996 + }, + "727": { + "id": 727, + "mapid": 727, + "renownpro": 37.3899999999996 + }, + "728": { + "id": 728, + "mapid": 728, + "renownpro": 37.4299999999996 + }, + "729": { + "id": 729, + "mapid": 729, + "renownpro": 37.4699999999996 + }, + "730": { + "id": 730, + "mapid": 730, + "renownpro": 37.5099999999996 + }, + "731": { + "id": 731, + "mapid": 731, + "renownpro": 37.5499999999996 + }, + "732": { + "id": 732, + "mapid": 732, + "renownpro": 37.5899999999996 + }, + "733": { + "id": 733, + "mapid": 733, + "renownpro": 37.6299999999996 + }, + "734": { + "id": 734, + "mapid": 734, + "renownpro": 37.6699999999996 + }, + "735": { + "id": 735, + "mapid": 735, + "renownpro": 37.7099999999996 + }, + "736": { + "id": 736, + "mapid": 736, + "renownpro": 37.7499999999996 + }, + "737": { + "id": 737, + "mapid": 737, + "renownpro": 37.7899999999996 + }, + "738": { + "id": 738, + "mapid": 738, + "renownpro": 37.8299999999996 + }, + "739": { + "id": 739, + "mapid": 739, + "renownpro": 37.8699999999996 + }, + "740": { + "id": 740, + "mapid": 740, + "renownpro": 37.9099999999996 + }, + "741": { + "id": 741, + "mapid": 741, + "renownpro": 37.9499999999996 + }, + "742": { + "id": 742, + "mapid": 742, + "renownpro": 37.9899999999996 + }, + "743": { + "id": 743, + "mapid": 743, + "renownpro": 38.0299999999996 + }, + "744": { + "id": 744, + "mapid": 744, + "renownpro": 38.0699999999996 + }, + "745": { + "id": 745, + "mapid": 745, + "renownpro": 38.1099999999996 + }, + "746": { + "id": 746, + "mapid": 746, + "renownpro": 38.1499999999996 + }, + "747": { + "id": 747, + "mapid": 747, + "renownpro": 38.1899999999996 + }, + "748": { + "id": 748, + "mapid": 748, + "renownpro": 38.2299999999996 + }, + "749": { + "id": 749, + "mapid": 749, + "renownpro": 38.2699999999996 + }, + "750": { + "id": 750, + "mapid": 750, + "renownpro": 38.3099999999996 + }, + "751": { + "id": 751, + "mapid": 751, + "renownpro": 38.3499999999996 + }, + "752": { + "id": 752, + "mapid": 752, + "renownpro": 38.3899999999996 + }, + "753": { + "id": 753, + "mapid": 753, + "renownpro": 38.4299999999996 + }, + "754": { + "id": 754, + "mapid": 754, + "renownpro": 38.4699999999996 + }, + "755": { + "id": 755, + "mapid": 755, + "renownpro": 38.5099999999996 + }, + "756": { + "id": 756, + "mapid": 756, + "renownpro": 38.5499999999996 + }, + "757": { + "id": 757, + "mapid": 757, + "renownpro": 38.5899999999996 + }, + "758": { + "id": 758, + "mapid": 758, + "renownpro": 38.6299999999996 + }, + "759": { + "id": 759, + "mapid": 759, + "renownpro": 38.6699999999996 + }, + "760": { + "id": 760, + "mapid": 760, + "renownpro": 38.7099999999996 + }, + "761": { + "id": 761, + "mapid": 761, + "renownpro": 38.7499999999996 + }, + "762": { + "id": 762, + "mapid": 762, + "renownpro": 38.7899999999996 + }, + "763": { + "id": 763, + "mapid": 763, + "renownpro": 38.8299999999996 + }, + "764": { + "id": 764, + "mapid": 764, + "renownpro": 38.8699999999996 + }, + "765": { + "id": 765, + "mapid": 765, + "renownpro": 38.9099999999996 + }, + "766": { + "id": 766, + "mapid": 766, + "renownpro": 38.9499999999996 + }, + "767": { + "id": 767, + "mapid": 767, + "renownpro": 38.9899999999996 + }, + "768": { + "id": 768, + "mapid": 768, + "renownpro": 39.0299999999996 + }, + "769": { + "id": 769, + "mapid": 769, + "renownpro": 39.0699999999996 + }, + "770": { + "id": 770, + "mapid": 770, + "renownpro": 39.1099999999996 + }, + "771": { + "id": 771, + "mapid": 771, + "renownpro": 39.1499999999996 + }, + "772": { + "id": 772, + "mapid": 772, + "renownpro": 39.1899999999996 + }, + "773": { + "id": 773, + "mapid": 773, + "renownpro": 39.2299999999996 + }, + "774": { + "id": 774, + "mapid": 774, + "renownpro": 39.2699999999996 + }, + "775": { + "id": 775, + "mapid": 775, + "renownpro": 39.3099999999996 + }, + "776": { + "id": 776, + "mapid": 776, + "renownpro": 39.3499999999996 + }, + "777": { + "id": 777, + "mapid": 777, + "renownpro": 39.3899999999996 + }, + "778": { + "id": 778, + "mapid": 778, + "renownpro": 39.4299999999996 + }, + "779": { + "id": 779, + "mapid": 779, + "renownpro": 39.4699999999996 + }, + "780": { + "id": 780, + "mapid": 780, + "renownpro": 39.5099999999996 + }, + "781": { + "id": 781, + "mapid": 781, + "renownpro": 39.5499999999996 + }, + "782": { + "id": 782, + "mapid": 782, + "renownpro": 39.5899999999996 + }, + "783": { + "id": 783, + "mapid": 783, + "renownpro": 39.6299999999996 + }, + "784": { + "id": 784, + "mapid": 784, + "renownpro": 39.6699999999996 + }, + "785": { + "id": 785, + "mapid": 785, + "renownpro": 39.7099999999996 + }, + "786": { + "id": 786, + "mapid": 786, + "renownpro": 39.7499999999996 + }, + "787": { + "id": 787, + "mapid": 787, + "renownpro": 39.7899999999996 + }, + "788": { + "id": 788, + "mapid": 788, + "renownpro": 39.8299999999996 + }, + "789": { + "id": 789, + "mapid": 789, + "renownpro": 39.8699999999996 + }, + "790": { + "id": 790, + "mapid": 790, + "renownpro": 39.9099999999996 + }, + "791": { + "id": 791, + "mapid": 791, + "renownpro": 39.9499999999996 + }, + "792": { + "id": 792, + "mapid": 792, + "renownpro": 39.9899999999996 + }, + "793": { + "id": 793, + "mapid": 793, + "renownpro": 40.0299999999996 + }, + "794": { + "id": 794, + "mapid": 794, + "renownpro": 40.0699999999996 + }, + "795": { + "id": 795, + "mapid": 795, + "renownpro": 40.1099999999996 + }, + "796": { + "id": 796, + "mapid": 796, + "renownpro": 40.1499999999996 + }, + "797": { + "id": 797, + "mapid": 797, + "renownpro": 40.1899999999996 + }, + "798": { + "id": 798, + "mapid": 798, + "renownpro": 40.2299999999996 + }, + "799": { + "id": 799, + "mapid": 799, + "renownpro": 40.2699999999996 + }, + "800": { + "id": 800, + "mapid": 800, + "renownpro": 40.3099999999996 + }, + "801": { + "id": 801, + "mapid": 801, + "renownpro": 40.3499999999996 + }, + "802": { + "id": 802, + "mapid": 802, + "renownpro": 40.3899999999996 + }, + "803": { + "id": 803, + "mapid": 803, + "renownpro": 40.4299999999996 + }, + "804": { + "id": 804, + "mapid": 804, + "renownpro": 40.4699999999996 + }, + "805": { + "id": 805, + "mapid": 805, + "renownpro": 40.5099999999996 + }, + "806": { + "id": 806, + "mapid": 806, + "renownpro": 40.5499999999996 + }, + "807": { + "id": 807, + "mapid": 807, + "renownpro": 40.5899999999996 + }, + "808": { + "id": 808, + "mapid": 808, + "renownpro": 40.6299999999996 + }, + "809": { + "id": 809, + "mapid": 809, + "renownpro": 40.6699999999996 + }, + "810": { + "id": 810, + "mapid": 810, + "renownpro": 40.7099999999996 + }, + "811": { + "id": 811, + "mapid": 811, + "renownpro": 40.7499999999996 + }, + "812": { + "id": 812, + "mapid": 812, + "renownpro": 40.7899999999996 + }, + "813": { + "id": 813, + "mapid": 813, + "renownpro": 40.8299999999996 + }, + "814": { + "id": 814, + "mapid": 814, + "renownpro": 40.8699999999996 + }, + "815": { + "id": 815, + "mapid": 815, + "renownpro": 40.9099999999996 + }, + "816": { + "id": 816, + "mapid": 816, + "renownpro": 40.9499999999996 + }, + "817": { + "id": 817, + "mapid": 817, + "renownpro": 40.9899999999996 + }, + "818": { + "id": 818, + "mapid": 818, + "renownpro": 41.0299999999996 + }, + "819": { + "id": 819, + "mapid": 819, + "renownpro": 41.0699999999996 + }, + "820": { + "id": 820, + "mapid": 820, + "renownpro": 41.1099999999996 + }, + "821": { + "id": 821, + "mapid": 821, + "renownpro": 41.1499999999996 + }, + "822": { + "id": 822, + "mapid": 822, + "renownpro": 41.1899999999996 + }, + "823": { + "id": 823, + "mapid": 823, + "renownpro": 41.2299999999996 + }, + "824": { + "id": 824, + "mapid": 824, + "renownpro": 41.2699999999996 + }, + "825": { + "id": 825, + "mapid": 825, + "renownpro": 41.3099999999996 + }, + "826": { + "id": 826, + "mapid": 826, + "renownpro": 41.3499999999996 + }, + "827": { + "id": 827, + "mapid": 827, + "renownpro": 41.3899999999996 + }, + "828": { + "id": 828, + "mapid": 828, + "renownpro": 41.4299999999996 + }, + "829": { + "id": 829, + "mapid": 829, + "renownpro": 41.4699999999996 + }, + "830": { + "id": 830, + "mapid": 830, + "renownpro": 41.5099999999996 + }, + "831": { + "id": 831, + "mapid": 831, + "renownpro": 41.5499999999995 + }, + "832": { + "id": 832, + "mapid": 832, + "renownpro": 41.5899999999995 + }, + "833": { + "id": 833, + "mapid": 833, + "renownpro": 41.6299999999995 + }, + "834": { + "id": 834, + "mapid": 834, + "renownpro": 41.6699999999995 + }, + "835": { + "id": 835, + "mapid": 835, + "renownpro": 41.7099999999995 + }, + "836": { + "id": 836, + "mapid": 836, + "renownpro": 41.7499999999995 + }, + "837": { + "id": 837, + "mapid": 837, + "renownpro": 41.7899999999995 + }, + "838": { + "id": 838, + "mapid": 838, + "renownpro": 41.8299999999995 + }, + "839": { + "id": 839, + "mapid": 839, + "renownpro": 41.8699999999995 + }, + "840": { + "id": 840, + "mapid": 840, + "renownpro": 41.9099999999995 + }, + "841": { + "id": 841, + "mapid": 841, + "renownpro": 41.9499999999995 + }, + "842": { + "id": 842, + "mapid": 842, + "renownpro": 41.9899999999995 + }, + "843": { + "id": 843, + "mapid": 843, + "renownpro": 42.0299999999995 + }, + "844": { + "id": 844, + "mapid": 844, + "renownpro": 42.0699999999995 + }, + "845": { + "id": 845, + "mapid": 845, + "renownpro": 42.1099999999995 + }, + "846": { + "id": 846, + "mapid": 846, + "renownpro": 42.1499999999995 + }, + "847": { + "id": 847, + "mapid": 847, + "renownpro": 42.1899999999995 + }, + "848": { + "id": 848, + "mapid": 848, + "renownpro": 42.2299999999995 + }, + "849": { + "id": 849, + "mapid": 849, + "renownpro": 42.2699999999995 + }, + "850": { + "id": 850, + "mapid": 850, + "renownpro": 42.3099999999995 + }, + "851": { + "id": 851, + "mapid": 851, + "renownpro": 42.3499999999995 + }, + "852": { + "id": 852, + "mapid": 852, + "renownpro": 42.3899999999995 + }, + "853": { + "id": 853, + "mapid": 853, + "renownpro": 42.4299999999995 + }, + "854": { + "id": 854, + "mapid": 854, + "renownpro": 42.4699999999995 + }, + "855": { + "id": 855, + "mapid": 855, + "renownpro": 42.5099999999995 + }, + "856": { + "id": 856, + "mapid": 856, + "renownpro": 42.5499999999995 + }, + "857": { + "id": 857, + "mapid": 857, + "renownpro": 42.5899999999995 + }, + "858": { + "id": 858, + "mapid": 858, + "renownpro": 42.6299999999995 + }, + "859": { + "id": 859, + "mapid": 859, + "renownpro": 42.6699999999995 + }, + "860": { + "id": 860, + "mapid": 860, + "renownpro": 42.7099999999995 + }, + "861": { + "id": 861, + "mapid": 861, + "renownpro": 42.7499999999995 + }, + "862": { + "id": 862, + "mapid": 862, + "renownpro": 42.7899999999995 + }, + "863": { + "id": 863, + "mapid": 863, + "renownpro": 42.8299999999995 + }, + "864": { + "id": 864, + "mapid": 864, + "renownpro": 42.8699999999995 + }, + "865": { + "id": 865, + "mapid": 865, + "renownpro": 42.9099999999995 + }, + "866": { + "id": 866, + "mapid": 866, + "renownpro": 42.9499999999995 + }, + "867": { + "id": 867, + "mapid": 867, + "renownpro": 42.9899999999995 + }, + "868": { + "id": 868, + "mapid": 868, + "renownpro": 43.0299999999995 + }, + "869": { + "id": 869, + "mapid": 869, + "renownpro": 43.0699999999995 + }, + "870": { + "id": 870, + "mapid": 870, + "renownpro": 43.1099999999995 + }, + "871": { + "id": 871, + "mapid": 871, + "renownpro": 43.1499999999995 + }, + "872": { + "id": 872, + "mapid": 872, + "renownpro": 43.1899999999995 + }, + "873": { + "id": 873, + "mapid": 873, + "renownpro": 43.2299999999995 + }, + "874": { + "id": 874, + "mapid": 874, + "renownpro": 43.2699999999995 + }, + "875": { + "id": 875, + "mapid": 875, + "renownpro": 43.3099999999995 + }, + "876": { + "id": 876, + "mapid": 876, + "renownpro": 43.3499999999995 + }, + "877": { + "id": 877, + "mapid": 877, + "renownpro": 43.3899999999995 + }, + "878": { + "id": 878, + "mapid": 878, + "renownpro": 43.4299999999995 + }, + "879": { + "id": 879, + "mapid": 879, + "renownpro": 43.4699999999995 + }, + "880": { + "id": 880, + "mapid": 880, + "renownpro": 43.5099999999995 + }, + "881": { + "id": 881, + "mapid": 881, + "renownpro": 43.5499999999995 + }, + "882": { + "id": 882, + "mapid": 882, + "renownpro": 43.5899999999995 + }, + "883": { + "id": 883, + "mapid": 883, + "renownpro": 43.6299999999995 + }, + "884": { + "id": 884, + "mapid": 884, + "renownpro": 43.6699999999995 + }, + "885": { + "id": 885, + "mapid": 885, + "renownpro": 43.7099999999995 + }, + "886": { + "id": 886, + "mapid": 886, + "renownpro": 43.7499999999995 + }, + "887": { + "id": 887, + "mapid": 887, + "renownpro": 43.7899999999995 + }, + "888": { + "id": 888, + "mapid": 888, + "renownpro": 43.8299999999995 + }, + "889": { + "id": 889, + "mapid": 889, + "renownpro": 43.8699999999995 + }, + "890": { + "id": 890, + "mapid": 890, + "renownpro": 43.9099999999995 + }, + "891": { + "id": 891, + "mapid": 891, + "renownpro": 43.9499999999995 + }, + "892": { + "id": 892, + "mapid": 892, + "renownpro": 43.9899999999995 + }, + "893": { + "id": 893, + "mapid": 893, + "renownpro": 44.0299999999995 + }, + "894": { + "id": 894, + "mapid": 894, + "renownpro": 44.0699999999995 + }, + "895": { + "id": 895, + "mapid": 895, + "renownpro": 44.1099999999995 + }, + "896": { + "id": 896, + "mapid": 896, + "renownpro": 44.1499999999995 + }, + "897": { + "id": 897, + "mapid": 897, + "renownpro": 44.1899999999995 + }, + "898": { + "id": 898, + "mapid": 898, + "renownpro": 44.2299999999995 + }, + "899": { + "id": 899, + "mapid": 899, + "renownpro": 44.2699999999995 + }, + "900": { + "id": 900, + "mapid": 900, + "renownpro": 44.3099999999995 + }, + "901": { + "id": 901, + "mapid": 901, + "renownpro": 44.3499999999995 + }, + "902": { + "id": 902, + "mapid": 902, + "renownpro": 44.3899999999995 + }, + "903": { + "id": 903, + "mapid": 903, + "renownpro": 44.4299999999995 + }, + "904": { + "id": 904, + "mapid": 904, + "renownpro": 44.4699999999995 + }, + "905": { + "id": 905, + "mapid": 905, + "renownpro": 44.5099999999995 + }, + "906": { + "id": 906, + "mapid": 906, + "renownpro": 44.5499999999995 + }, + "907": { + "id": 907, + "mapid": 907, + "renownpro": 44.5899999999995 + }, + "908": { + "id": 908, + "mapid": 908, + "renownpro": 44.6299999999995 + }, + "909": { + "id": 909, + "mapid": 909, + "renownpro": 44.6699999999995 + }, + "910": { + "id": 910, + "mapid": 910, + "renownpro": 44.7099999999995 + }, + "911": { + "id": 911, + "mapid": 911, + "renownpro": 44.7499999999995 + }, + "912": { + "id": 912, + "mapid": 912, + "renownpro": 44.7899999999995 + }, + "913": { + "id": 913, + "mapid": 913, + "renownpro": 44.8299999999995 + }, + "914": { + "id": 914, + "mapid": 914, + "renownpro": 44.8699999999995 + }, + "915": { + "id": 915, + "mapid": 915, + "renownpro": 44.9099999999995 + }, + "916": { + "id": 916, + "mapid": 916, + "renownpro": 44.9499999999995 + }, + "917": { + "id": 917, + "mapid": 917, + "renownpro": 44.9899999999995 + }, + "918": { + "id": 918, + "mapid": 918, + "renownpro": 45.0299999999995 + }, + "919": { + "id": 919, + "mapid": 919, + "renownpro": 45.0699999999995 + }, + "920": { + "id": 920, + "mapid": 920, + "renownpro": 45.1099999999995 + }, + "921": { + "id": 921, + "mapid": 921, + "renownpro": 45.1499999999995 + }, + "922": { + "id": 922, + "mapid": 922, + "renownpro": 45.1899999999995 + }, + "923": { + "id": 923, + "mapid": 923, + "renownpro": 45.2299999999995 + }, + "924": { + "id": 924, + "mapid": 924, + "renownpro": 45.2699999999995 + }, + "925": { + "id": 925, + "mapid": 925, + "renownpro": 45.3099999999995 + }, + "926": { + "id": 926, + "mapid": 926, + "renownpro": 45.3499999999995 + }, + "927": { + "id": 927, + "mapid": 927, + "renownpro": 45.3899999999995 + }, + "928": { + "id": 928, + "mapid": 928, + "renownpro": 45.4299999999995 + }, + "929": { + "id": 929, + "mapid": 929, + "renownpro": 45.4699999999995 + }, + "930": { + "id": 930, + "mapid": 930, + "renownpro": 45.5099999999995 + }, + "931": { + "id": 931, + "mapid": 931, + "renownpro": 45.5499999999995 + }, + "932": { + "id": 932, + "mapid": 932, + "renownpro": 45.5899999999995 + }, + "933": { + "id": 933, + "mapid": 933, + "renownpro": 45.6299999999995 + }, + "934": { + "id": 934, + "mapid": 934, + "renownpro": 45.6699999999995 + }, + "935": { + "id": 935, + "mapid": 935, + "renownpro": 45.7099999999995 + }, + "936": { + "id": 936, + "mapid": 936, + "renownpro": 45.7499999999995 + }, + "937": { + "id": 937, + "mapid": 937, + "renownpro": 45.7899999999995 + }, + "938": { + "id": 938, + "mapid": 938, + "renownpro": 45.8299999999995 + }, + "939": { + "id": 939, + "mapid": 939, + "renownpro": 45.8699999999995 + }, + "940": { + "id": 940, + "mapid": 940, + "renownpro": 45.9099999999995 + }, + "941": { + "id": 941, + "mapid": 941, + "renownpro": 45.9499999999995 + }, + "942": { + "id": 942, + "mapid": 942, + "renownpro": 45.9899999999995 + }, + "943": { + "id": 943, + "mapid": 943, + "renownpro": 46.0299999999995 + }, + "944": { + "id": 944, + "mapid": 944, + "renownpro": 46.0699999999995 + }, + "945": { + "id": 945, + "mapid": 945, + "renownpro": 46.1099999999995 + }, + "946": { + "id": 946, + "mapid": 946, + "renownpro": 46.1499999999995 + }, + "947": { + "id": 947, + "mapid": 947, + "renownpro": 46.1899999999995 + }, + "948": { + "id": 948, + "mapid": 948, + "renownpro": 46.2299999999994 + }, + "949": { + "id": 949, + "mapid": 949, + "renownpro": 46.2699999999994 + }, + "950": { + "id": 950, + "mapid": 950, + "renownpro": 46.3099999999994 + }, + "951": { + "id": 951, + "mapid": 951, + "renownpro": 46.3499999999994 + }, + "952": { + "id": 952, + "mapid": 952, + "renownpro": 46.3899999999994 + }, + "953": { + "id": 953, + "mapid": 953, + "renownpro": 46.4299999999994 + }, + "954": { + "id": 954, + "mapid": 954, + "renownpro": 46.4699999999994 + }, + "955": { + "id": 955, + "mapid": 955, + "renownpro": 46.5099999999994 + }, + "956": { + "id": 956, + "mapid": 956, + "renownpro": 46.5499999999994 + }, + "957": { + "id": 957, + "mapid": 957, + "renownpro": 46.5899999999994 + }, + "958": { + "id": 958, + "mapid": 958, + "renownpro": 46.6299999999994 + }, + "959": { + "id": 959, + "mapid": 959, + "renownpro": 46.6699999999994 + }, + "960": { + "id": 960, + "mapid": 960, + "renownpro": 46.7099999999994 + }, + "961": { + "id": 961, + "mapid": 961, + "renownpro": 46.7499999999994 + }, + "962": { + "id": 962, + "mapid": 962, + "renownpro": 46.7899999999994 + }, + "963": { + "id": 963, + "mapid": 963, + "renownpro": 46.8299999999994 + }, + "964": { + "id": 964, + "mapid": 964, + "renownpro": 46.8699999999994 + }, + "965": { + "id": 965, + "mapid": 965, + "renownpro": 46.9099999999994 + }, + "966": { + "id": 966, + "mapid": 966, + "renownpro": 46.9499999999994 + }, + "967": { + "id": 967, + "mapid": 967, + "renownpro": 46.9899999999994 + }, + "968": { + "id": 968, + "mapid": 968, + "renownpro": 47.0299999999994 + }, + "969": { + "id": 969, + "mapid": 969, + "renownpro": 47.0699999999994 + }, + "970": { + "id": 970, + "mapid": 970, + "renownpro": 47.1099999999994 + }, + "971": { + "id": 971, + "mapid": 971, + "renownpro": 47.1499999999994 + }, + "972": { + "id": 972, + "mapid": 972, + "renownpro": 47.1899999999994 + }, + "973": { + "id": 973, + "mapid": 973, + "renownpro": 47.2299999999994 + }, + "974": { + "id": 974, + "mapid": 974, + "renownpro": 47.2699999999994 + }, + "975": { + "id": 975, + "mapid": 975, + "renownpro": 47.3099999999994 + }, + "976": { + "id": 976, + "mapid": 976, + "renownpro": 47.3499999999994 + }, + "977": { + "id": 977, + "mapid": 977, + "renownpro": 47.3899999999994 + }, + "978": { + "id": 978, + "mapid": 978, + "renownpro": 47.4299999999994 + }, + "979": { + "id": 979, + "mapid": 979, + "renownpro": 47.4699999999994 + }, + "980": { + "id": 980, + "mapid": 980, + "renownpro": 47.5099999999994 + }, + "981": { + "id": 981, + "mapid": 981, + "renownpro": 47.5499999999994 + }, + "982": { + "id": 982, + "mapid": 982, + "renownpro": 47.5899999999994 + }, + "983": { + "id": 983, + "mapid": 983, + "renownpro": 47.6299999999994 + }, + "984": { + "id": 984, + "mapid": 984, + "renownpro": 47.6699999999994 + }, + "985": { + "id": 985, + "mapid": 985, + "renownpro": 47.7099999999994 + }, + "986": { + "id": 986, + "mapid": 986, + "renownpro": 47.7499999999994 + }, + "987": { + "id": 987, + "mapid": 987, + "renownpro": 47.7899999999994 + }, + "988": { + "id": 988, + "mapid": 988, + "renownpro": 47.8299999999994 + }, + "989": { + "id": 989, + "mapid": 989, + "renownpro": 47.8699999999994 + }, + "990": { + "id": 990, + "mapid": 990, + "renownpro": 47.9099999999994 + }, + "991": { + "id": 991, + "mapid": 991, + "renownpro": 47.9499999999994 + }, + "992": { + "id": 992, + "mapid": 992, + "renownpro": 47.9899999999994 + }, + "993": { + "id": 993, + "mapid": 993, + "renownpro": 48.0299999999994 + }, + "994": { + "id": 994, + "mapid": 994, + "renownpro": 48.0699999999994 + }, + "995": { + "id": 995, + "mapid": 995, + "renownpro": 48.1099999999994 + }, + "996": { + "id": 996, + "mapid": 996, + "renownpro": 48.1499999999994 + }, + "997": { + "id": 997, + "mapid": 997, + "renownpro": 48.1899999999994 + }, + "998": { + "id": 998, + "mapid": 998, + "renownpro": 48.2299999999994 + }, + "999": { + "id": 999, + "mapid": 999, + "renownpro": 48.2699999999994 + }, + "1000": { + "id": 1000, + "mapid": 1000, + "renownpro": 48.3099999999994 + } +} \ No newline at end of file diff --git a/src/json/renown_level.json b/src/json/renown_level.json new file mode 100644 index 0000000..1857a5b --- /dev/null +++ b/src/json/renown_level.json @@ -0,0 +1,362 @@ +{ + "1": { + "id": 1, + "renownlevel": 1, + "maxlevel": 250, + "cost": 5, + "atk": 2, + "def": 1, + "hp": 8 + }, + "2": { + "id": 2, + "renownlevel": 2, + "maxlevel": 500, + "cost": 6, + "atk": 2, + "def": 1, + "hp": 9 + }, + "3": { + "id": 3, + "renownlevel": 3, + "maxlevel": 750, + "cost": 7, + "atk": 2, + "def": 1, + "hp": 10 + }, + "4": { + "id": 4, + "renownlevel": 4, + "maxlevel": 1000, + "cost": 9, + "atk": 4, + "def": 2, + "hp": 11 + }, + "5": { + "id": 5, + "renownlevel": 5, + "maxlevel": 1250, + "cost": 11, + "atk": 4, + "def": 2, + "hp": 12 + }, + "6": { + "id": 6, + "renownlevel": 6, + "maxlevel": 1500, + "cost": 13, + "atk": 4, + "def": 2, + "hp": 13 + }, + "7": { + "id": 7, + "renownlevel": 7, + "maxlevel": 1750, + "cost": 15, + "atk": 6, + "def": 3, + "hp": 14 + }, + "8": { + "id": 8, + "renownlevel": 8, + "maxlevel": 2000, + "cost": 17, + "atk": 6, + "def": 3, + "hp": 15 + }, + "9": { + "id": 9, + "renownlevel": 9, + "maxlevel": 2500, + "cost": 19, + "atk": 6, + "def": 3, + "hp": 16 + }, + "10": { + "id": 10, + "renownlevel": 10, + "maxlevel": 3000, + "cost": 21, + "atk": 8, + "def": 4, + "hp": 17 + }, + "11": { + "id": 11, + "renownlevel": 11, + "maxlevel": 3500, + "cost": 23, + "atk": 8, + "def": 4, + "hp": 18 + }, + "12": { + "id": 12, + "renownlevel": 12, + "maxlevel": 4000, + "cost": 25, + "atk": 8, + "def": 4, + "hp": 19 + }, + "13": { + "id": 13, + "renownlevel": 13, + "maxlevel": 4500, + "cost": 27, + "atk": 10, + "def": 5, + "hp": 20 + }, + "14": { + "id": 14, + "renownlevel": 14, + "maxlevel": 5000, + "cost": 30, + "atk": 10, + "def": 5, + "hp": 21 + }, + "15": { + "id": 15, + "renownlevel": 15, + "maxlevel": 5000, + "cost": 33, + "atk": 10, + "def": 5, + "hp": 21 + }, + "16": { + "id": 16, + "renownlevel": 16, + "maxlevel": 5000, + "cost": 36, + "atk": 12, + "def": 6, + "hp": 22 + }, + "17": { + "id": 17, + "renownlevel": 17, + "maxlevel": 5000, + "cost": 39, + "atk": 12, + "def": 6, + "hp": 22 + }, + "18": { + "id": 18, + "renownlevel": 18, + "maxlevel": 5000, + "cost": 42, + "atk": 12, + "def": 6, + "hp": 22 + }, + "19": { + "id": 19, + "renownlevel": 19, + "maxlevel": 5000, + "cost": 45, + "atk": 14, + "def": 7, + "hp": 23 + }, + "20": { + "id": 20, + "renownlevel": 20, + "maxlevel": 5000, + "cost": 48, + "atk": 14, + "def": 7, + "hp": 23 + }, + "21": { + "id": 21, + "renownlevel": 21, + "maxlevel": 5000, + "cost": 51, + "atk": 14, + "def": 7, + "hp": 23 + }, + "22": { + "id": 22, + "renownlevel": 22, + "maxlevel": 5000, + "cost": 54, + "atk": 14, + "def": 7, + "hp": 23 + }, + "23": { + "id": 23, + "renownlevel": 23, + "maxlevel": 5000, + "cost": 57, + "atk": 16, + "def": 8, + "hp": 24 + }, + "24": { + "id": 24, + "renownlevel": 24, + "maxlevel": 5000, + "cost": 60, + "atk": 16, + "def": 8, + "hp": 24 + }, + "25": { + "id": 25, + "renownlevel": 25, + "maxlevel": 5000, + "cost": 63, + "atk": 16, + "def": 8, + "hp": 24 + }, + "26": { + "id": 26, + "renownlevel": 26, + "maxlevel": 5000, + "cost": 66, + "atk": 16, + "def": 8, + "hp": 24 + }, + "27": { + "id": 27, + "renownlevel": 27, + "maxlevel": 5000, + "cost": 69, + "atk": 16, + "def": 8, + "hp": 24 + }, + "28": { + "id": 28, + "renownlevel": 28, + "maxlevel": 5000, + "cost": 72, + "atk": 18, + "def": 9, + "hp": 25 + }, + "29": { + "id": 29, + "renownlevel": 29, + "maxlevel": 5000, + "cost": 75, + "atk": 18, + "def": 9, + "hp": 25 + }, + "30": { + "id": 30, + "renownlevel": 30, + "maxlevel": 5000, + "cost": 78, + "atk": 18, + "def": 9, + "hp": 25 + }, + "31": { + "id": 31, + "renownlevel": 31, + "maxlevel": 5000, + "cost": 81, + "atk": 18, + "def": 9, + "hp": 25 + }, + "32": { + "id": 32, + "renownlevel": 32, + "maxlevel": 5000, + "cost": 84, + "atk": 18, + "def": 9, + "hp": 25 + }, + "33": { + "id": 33, + "renownlevel": 33, + "maxlevel": 5000, + "cost": 87, + "atk": 18, + "def": 10, + "hp": 25 + }, + "34": { + "id": 34, + "renownlevel": 34, + "maxlevel": 5000, + "cost": 90, + "atk": 18, + "def": 10, + "hp": 25 + }, + "35": { + "id": 35, + "renownlevel": 35, + "maxlevel": 5000, + "cost": 93, + "atk": 18, + "def": 10, + "hp": 25 + }, + "36": { + "id": 36, + "renownlevel": 36, + "maxlevel": 5000, + "cost": 97, + "atk": 18, + "def": 10, + "hp": 25 + }, + "37": { + "id": 37, + "renownlevel": 37, + "maxlevel": 5000, + "cost": 101, + "atk": 18, + "def": 10, + "hp": 25 + }, + "38": { + "id": 38, + "renownlevel": 38, + "maxlevel": 5000, + "cost": 105, + "atk": 18, + "def": 10, + "hp": 25 + }, + "39": { + "id": 39, + "renownlevel": 39, + "maxlevel": 5000, + "cost": 109, + "atk": 18, + "def": 10, + "hp": 25 + }, + "40": { + "id": 40, + "renownlevel": 40, + "maxlevel": 5000, + "cost": 113, + "atk": 18, + "def": 10, + "hp": 25 + } +} \ No newline at end of file diff --git a/src/json/shop.json b/src/json/shop.json index 4e0b020..c27331a 100644 --- a/src/json/shop.json +++ b/src/json/shop.json @@ -2,6 +2,7 @@ "1": { "id": 1, "type": 1, + "version": 1, "name": "wsw_wz_zhsd", "undefined": "杂货店", "openCond": [ @@ -46,6 +47,7 @@ "2": { "id": 2, "type": 5, + "version": 1, "name": "wsw_wz_slsd", "undefined": "势力商店", "openCond": [ @@ -84,6 +86,7 @@ "3": { "id": 3, "type": 6, + "version": 1, "name": "wsw_wz_zzsd", "undefined": "战争商店", "openCond": [ @@ -125,6 +128,7 @@ "4": { "id": 4, "type": 7, + "version": 1, "name": "wsw_wz_spsd", "undefined": "饰品商店", "openCond": [ @@ -169,6 +173,7 @@ "5": { "id": 5, "type": 2, + "version": 1, "name": "intr_shop_name_5", "undefined": "杂货", "openCond": [ @@ -208,6 +213,7 @@ "6": { "id": 6, "type": 2, + "version": 1, "name": "intr_shop_name_6", "undefined": "紫装", "openCond": [ @@ -264,6 +270,7 @@ "8": { "id": 8, "type": 3, + "version": 1, "name": "wsw_wz_rcsc", "undefined": "人才市场", "openCond": [ @@ -327,6 +334,7 @@ "9": { "id": 9, "type": 4, + "version": 1, "name": "wsw_wz_pjsd", "undefined": "配件商店", "openCond": [ @@ -384,6 +392,7 @@ "10": { "id": 10, "type": 8, + "version": 1, "name": "wsw_wz_rysd", "undefined": "荣誉商店", "openCond": [ @@ -427,6 +436,7 @@ "11": { "id": 11, "type": 9, + "version": 1, "name": "wsw_wz_jgsd", "undefined": "军功商店", "openCond": [ @@ -468,6 +478,7 @@ "12": { "id": 12, "type": 11, + "version": 1, "name": "wsw_wz_ltsd", "undefined": "擂台商店", "openCond": [ @@ -499,6 +510,7 @@ "13": { "id": 13, "type": 12, + "version": 1, "name": "wsw_wz_mrjxdh", "undefined": "每日精选兑换商店", "openCond": [ From 21994f214ad16247db2baf2b5cfe37607a6e010d Mon Sep 17 00:00:00 2001 From: dy Date: Tue, 26 Dec 2023 16:53:43 +0800 Subject: [PATCH 13/37] =?UTF-8?q?=E5=85=83=E6=97=A6fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/yuandan/ApiZLRec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api_s2c/event/yuandan/ApiZLRec.ts b/src/api_s2c/event/yuandan/ApiZLRec.ts index 240a590..7adb47c 100644 --- a/src/api_s2c/event/yuandan/ApiZLRec.ts +++ b/src/api_s2c/event/yuandan/ApiZLRec.ts @@ -25,7 +25,7 @@ export default async function (call: ApiCall) { if (!item) call.errorCode(-4) }) - let prize = [gift.prize, ...call.req.dlz] + let prize = [...gift.prize, ...call.req.dlz] await PlayerFun.sendPrize(call, prize); From 78b246f32abc121f979e09689d4589bd5d48f067 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 26 Dec 2023 17:25:03 +0800 Subject: [PATCH 14/37] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/public/rank/rank.ts | 352 ++++++++++++++++++++++++++-------------- 1 file changed, 232 insertions(+), 120 deletions(-) diff --git a/src/public/rank/rank.ts b/src/public/rank/rank.ts index c367d09..d28cbef 100644 --- a/src/public/rank/rank.ts +++ b/src/public/rank/rank.ts @@ -1,6 +1,5 @@ import { rankType, ResOpen } from '../../shared/protocols/rank/PtlOpen'; import { rankInfo } from '../../shared/protocols/type'; -import { player } from '../../shared/protocols/user/type'; import { Queue } from '../../shared/public/queue'; import { RankClslCross } from './rank_clsl'; //import { RankHbzbJfsCross, RankHbzbJfsLocal, RankHbzbZbsCross } from './rank_hbzb_jfs'; @@ -12,21 +11,17 @@ import { RankTujian } from './rank_tujian'; import { RankWzryCross } from './rank_wzry'; import { RankXszm } from './rank_xszm'; import { RankZccg } from './rank_zccg'; -import { sortEd } from '../../module/redis' import * as util from 'util' -import {RankKfjs} from "./rank_kfjs"; - +import { RankKfjs } from "./rank_kfjs"; import { clusterRunOnce } from '../../clusterUtils'; + export abstract class Rank { static list: Partial<{ qjzzd: RankQjzzd; zhanli: RankPower; tanxian: RankTanXian; - //hbzbLocal: RankHbzbJfsLocal; - // hbzbCross: RankHbzbJfsCross; - // hbzbZbsCross: RankHbzbZbsCross; slzd1: RankSlzd1; slzd2: RankSlzd2; slzd3: RankSlzd3; @@ -41,17 +36,12 @@ export abstract class Rank { kfjs: RankKfjs }> = {}; - // list: rankInfo[]; queue = new Queue(); findKey = 'uid'; countMaxNum = 50; utimeTTL = 60; abstract getType(): rankType; - // abstract compare(other: rankInfo, cur: rankInfo): boolean; - // abstract compareSort(a: rankInfo, b: rankInfo): number; - // abstract getRankList(uid: string, obj?: {gud?:player, min?: number, max?:number}): Promise; - // abstract getValArr(info: rankInfo): number|string; // 运算后的积分值，排名依据 // 获取rank数据, 注：可能重写，具体根据type类型判断 async getRankList(uid: string, { min, max }): Promise<{ rankList: rankInfo[]; myRank: rankInfo; }> { @@ -65,13 +55,18 @@ export abstract class Rank { myRank: { rank, player: data?.player || conn?.gud || {}, - valArr: [ score ] + valArr: [score] } }; } - // 积分, 排名依据, ，注：可能重写，具体根据type类型判断 - getValArr(info: rankInfo):number|string { + /** + * 根据RankInfo数据，获取用于排名的积分值得 + * 注：可能重写，具体根据type类型判断 + * @param info + * @returns 积分值 + */ + getValArr(info: rankInfo): number | string { return info?.valArr[0] || 0 } @@ -79,15 +74,19 @@ export abstract class Rank { compare(other: rankInfo, cur: rankInfo): boolean { return cur.valArr[0] > other.valArr[0]; } - + // rankList排序，注：可能重写，具体根据type类型判断 compareSort(a: rankInfo, b: rankInfo): number { return b.valArr[0] - a.valArr[0]; } - - // 页码转换为min，max - static pageToMin (page, offset) { + /** + * 页面转换，根据page和offset转换出min和max + * @param page 页面 + * @param offset 每页数量 + * @returns + */ + static pageToMin(page: number, offset: number) { let res = { min: page * offset, max: page * offset + offset @@ -95,9 +94,16 @@ export abstract class Rank { return res } + /** + * 返回排行榜DB连接对象 + */ get db() { return G.mongodb.collection('rankList'); } + + /** + * 返回排行榜类型 + */ get type() { return this.getType(); } @@ -107,10 +113,16 @@ export abstract class Rank { this.cotr(); } + /** + * 根据type，获取redis Data的key + */ get getRedisKey() { return util.format('rank:%s:data', this.getType()) } + /** + * 根据type，获取redis Sort的key + */ get getRedisKeySort() { return util.format('rank:%s:sort', this.getType()) } @@ -119,152 +131,252 @@ export abstract class Rank { async cotr() { clusterRunOnce(async () => { // redis已存在则不初始化 - if(await this.getRankLen() > 0) return - this.db.find({ type: this.type }).toArray().then(listArr => { + //if(await this.getRankLen() > 0) return + + //将db里的数据，写入到 rank:xxx:sort里 + //写入的单条数据为： {uid:score} + this.db.find({ type: this.type }, { + projection: { + "idKey": 1, + "type": 1, + "data.valArr": 1, + "utime": 1 + } + }).toArray().then(listArr => { // 写入初始化数据 listArr = listArr || []; listArr.forEach(item => { - if(item.idKey && item.data) this.setRankData(item.idKey, item.data) + if (item.idKey && item.data) this.setRankData(item.idKey, item.data) }) }); }) + + this.getRankListRange(); } - // 更新数据与排名 - async setRankData(idKey: string, data: rankInfo) { - let key = this.getRedisKey + /** + * 更新玩家的积分 + * @param uid uid，在rank里通常保存于idKey这个字段 + * @param data 积分数据，主要是需要里面的data.valArr字段 + * @returns + */ + async setRankData(uid: string, data: rankInfo) { let keySort = this.getRedisKeySort - data.utime = G.time - // data - G.redis.hSet(key, idKey, data) - // sort - let valArr = await this.getValArr(data) - G.redis.zAdd(keySort, {value: idKey, score: valArr}) - return + + // let key = this.getRedisKey + // G.redis.hSet(key, idKey, data) + + /**积分 */ + let score = await this.getValArr(data) + //G.redis.zAdd(keySort, {value: idKey, score: valArr}) + await G.ioredis.zadd(keySort, score, uid) + return } - // 获取单个用户的数据 - async getRankData(idKey: string) { - let key = this.getRedisKey - let data = await G.redis.hGet(key, idKey) - if(!data || data.utime < (G.time - this.utimeTTL)) { - let type = this.getType() - let res = await this.db.findOne({isKey: idKey, type}) - if(res) { - data = G.mongodb.conversionIdObj(res) - this.setRankData(idKey, data.data) - } + /** + * 获取单个用户的数据 + * @param uid uid + * @returns + */ + async getRankData(uid: string) { + let data: rankInfo; + let res = await this.db.findOne({ "idKey": uid, "type": this.getType() }) + + if (res?.data && res.data.utime + 60 > G.time) { + data = (G.mongodb.conversionIdObj(res)).data; + } else if (res?.data) { + let player = await G.mongodb.collection("user").findOne({ uid: uid }, { projection: { _id: 0 } }); + + data = Object.assign(res.data, { player: player }); + this.db.updateOne({ idKey: uid, type: this.getType() }, { $set: { "data.player": data.player, "data.utime": G.time } }); } - if(data) return data - return undefined || {} + return data; + + // let key = this.getRedisKey + // let data = await G.redis.hGet(key, idKey) + // if(!data || data.utime < (G.time - this.utimeTTL)) { + // let type = this.getType() + // let res = await this.db.findOne({isKey: idKey, type}) //<--isKey？？意味着整个rank从来不会更新，res永远是空 + // if(res) { + // data = G.mongodb.conversionIdObj(res) + // this.setRankData(idKey, data.data) + // } + // } + // if(data) return data + // return undefined || {} } - // 获取单个用户的分数 - async getRankScore(idKey:string): Promise { - let score = await G.redis.zScore(this.getRedisKeySort, idKey) + /** + * 获取单个用户的排序分数 + * @param uid + * @returns + */ + async getRankScore(uid: string): Promise { + let score = await G.redis.zScore(this.getRedisKeySort, uid) return score || 0 - } - - // 获取单个用户的排名 *降序 - async getRankSortByOne(idKey: string):Promise { - let rank = await G.redis.zRevRank(this.getRedisKeySort, idKey) - return rank === 0 || rank > 0 ? rank: -1; } - // 获取单个指定排名的用户数据 *降序 + /** + * 从redis中获取单个用户的排名 *降序 + * @param uid + * @returns + */ + async getRankSortByOne(uid: string): Promise { + let rank = await G.redis.zRevRank(this.getRedisKeySort, uid) + return rank === 0 || rank > 0 ? rank : -1; + } + + // 从redis中获取单个指定排名的用户数据 *降序 async getRankSortDataByOne(rank: number): Promise { - let rankList:rankInfo[] = await this.getRankListRange(rank, rank + 1) + let rankList: rankInfo[] = await this.getRankListRange(rank, rank + 1) let rankInfo = rankList && rankList.length > 0 ? rankList[0] : {} as rankInfo return rankInfo } - + // 获取排名长度 - async getRankLen() { - return await G.redis.hLen(this.getRedisKey) - } + // async getRankLen() { + // return await G.redis.hLen(this.getRedisKey) + // } - // 获取指定排名范围的数据 *降序 - async getRankListRange(min:number = 0, max:number = 50): Promise { - let idKeys = await this.getRankListIdKeyRange(min, max) - if(idKeys && idKeys.length > 0) { - let res = await G.redis.hmGet(this.getRedisKey, idKeys) - res = await this.checkData(res) - return res.sort(this.compareSort) - } - return [] - } - - // 获取指定排名范围的idKey *降序 - async getRankListIdKeyRange(min:number = 0, max: number = 50): Promise { - let idKeys = await G.redis.zRevRange(this.getRedisKeySort, min, max - 1) - return idKeys || [] - } + /** + * 获取指定排名范围的数据 *降序 + * @param min + * @param max + * @returns + */ + async getRankListRange(min: number = 0, max: number = 50): Promise { + let uids = await this.getRankListIdKeyRange(min, max) + if (uids && uids.length > 0) { + let res = await this.db.find({ idKey: { $in: uids }, type: this.getType() }).toArray() - // 获取指定类型的全部rank列表,返回为积分排序后的数组 - async getRankListAll(): Promise { - let res = await G.redis.hGetAll(this.getRedisKey) - if(res) { - // 如果是用户数据，则比对utime，更新数据 - // res = await this.checkData(res) - return Object.values(res).sort(this.compareSort) + switch (this.getType()) { + default: // 排行数据更新逻辑 默认更新playerInfo + let updateUids = []; + res = res.map(item => { + // 没有player 或者 player 过期 + if (!item.data?.player || item.data.utime + 60 < G.time) { + updateUids.push(item.idKey); + } + return item; + }); + let newUserArr = await G.mongodb.collection('user').find( + { uid: { $in: updateUids } }, { projection: { _id: 0 } } + ).toArray(); + + newUserArr.forEach(item => { + // 每次遍历查找？ + let index = res.findIndex(x => x.idKey == item.uid); + + res[index].data.player = item; + this.db.updateOne({ idKey: item.uid, type: this.getType() }, { $set: { "data.player": item } }); + + // 跟新redis score + this.setRankData(item.uid, res[index].data as any); + }) + } + + return res.map(ele => ele.data).sort(this.compareSort) as any; } return [] } - // 按排名获取全部的idKey + /** + * 从redis中获取指定排名范围的uid集合 *降序 + * @param min + * @param max + * @returns uid集合数组 + */ + async getRankListIdKeyRange(min: number = 0, max: number = 50): Promise { + let uids = await G.redis.zRevRange(this.getRedisKeySort, min, max - 1) + return uids || [] + } + + /** + * 获取指定类型的全部rank列表,返回为积分排序后的数组 + * @returns + */ + async getRankListAll(): Promise { + // let res = await G.redis.hGetAll(this.getRedisKey) + let res = (await this.db.find({ type: this.getType() }).toArray()).map(ele => ele.data); + if (res) { + // 如果是用户数据，则比对utime，更新数据 + // res = await this.checkData(res) + return res.sort(this.compareSort) + } + return [] + } + + /** + * 按排名获取全部的idKey + * @returns + */ async getRankListIdKeyAll(): Promise { let res = this.getRankListIdKeyRange(0, -1) return res } // 验证数据的过期时间，更新数据 - async checkData(rankList: rankInfo[]): Promise { - let updateUid = [] - rankList.forEach((value,key) => { - // 仅针对用户表，公会表暂不考虑 - if(rankList[key].player?.uid && (rankList[key].utime || 0) < (G.time - this.utimeTTL)) { - // 更新数据 - updateUid.push(rankList[key].player.uid) - } - }) - if(updateUid.length > 0) { - let newUserArr = await G.mongodb.collection('user').find({uid:{$in: updateUid}}).toArray() - // let newUserArr = await G.redis.gets('user', ...updateUid.map(uid => [uid] as [string])) - // let newUserArr = await G.mongodb.collection('user').find({uid:{$in: updateUid}}).toArray() - newUserArr.forEach(item => { - let index = rankList.findIndex( x => x.player.uid == item.uid); - rankList[index].player = item; - this.setRankData(item.uid, rankList[index]); - }) - } - return rankList + // async checkData(rankList: rankInfo[]): Promise { + // let updateUid = [] + // rankList.forEach((value,key) => { + // // 仅针对用户表，公会表暂不考虑 + // if(rankList[key].player?.uid && (rankList[key].utime || 0) < (G.time - this.utimeTTL)) { + // // 更新数据 + // updateUid.push(rankList[key].player.uid) + // } + // }) + // if(updateUid.length > 0) { + // let newUserArr = await G.mongodb.collection('user').find({uid:{$in: updateUid}}).toArray() + // // let newUserArr = await G.redis.gets('user', ...updateUid.map(uid => [uid] as [string])) + // // let newUserArr = await G.mongodb.collection('user').find({uid:{$in: updateUid}}).toArray() + // newUserArr.forEach(item => { + // let index = rankList.findIndex( x => x.player.uid == item.uid); + // rankList[index].player = item; + // this.setRankData(item.uid, rankList[index]); + // }) + // } + // return rankList + // } + + + /** + * 删除指定idk的排名数据 + * @param idKey + * @returns + */ + async delRankData(idKey: string) { + // G.redis.hDel(this.getRedisKey, idKey) + G.redis.zRem(this.getRedisKeySort, idKey); + this.db.updateOne({ idKey: idKey, type: this.getType() }, { + $set: { idKey: `del_${idKey}` } + }); } - async delRankData(idKey:string) { - G.redis.hDel(this.getRedisKey, idKey) - G.redis.zRem(this.getRedisKeySort, idKey) - } - - // 原逻辑前50(countMaxNum)名才更新数据（上榜），多余的数据会删除。 + /** + * 原逻辑前50(countMaxNum)名才更新数据（上榜），多余的数据会删除。 + * @param info + * @returns + */ async addNew(info: rankInfo) { //this.queue.enqueue(async () => { - await this.setRankData(info.player[this.findKey], info) - await this.db.updateOne({ type: this.type, idKey: info.player[this.findKey] }, { $set: { data: info } }, { upsert: true }); - // 删除第50名以后的数据，（排名从0开始计算） - // let idKeys:string[] = await this.getRankListIdKeyRange(50, -1) - // idKeys.forEach(idKey => { - // this.db.deleteOne({ type: this.type, idKey: idKey }); - // this.delRankData(idKey) - // }) + await this.setRankData(info.player[this.findKey], info) + await this.db.updateOne({ type: this.type, idKey: info.player[this.findKey] }, { $set: { data: info } }, { upsert: true }); + // 删除第50名以后的数据，（排名从0开始计算） + // let idKeys:string[] = await this.getRankListIdKeyRange(50, -1) + // idKeys.forEach(idKey => { + // this.db.deleteOne({ type: this.type, idKey: idKey }); + // this.delRankData(idKey) + // }) //}); } + // 清空相关rank数据 async clear() { this.queue.enqueue(async () => { + // G.redis.rawDel(this.getRedisKey) + G.redis.rawDel(this.getRedisKeySort); await this.db.deleteMany({ type: this.type }); - G.redis.rawDel(this.getRedisKey) - G.redis.rawDel(this.getRedisKeySort) }); } } \ No newline at end of file From 08d0bed29193bb094620436ecea950d99154e3c7 Mon Sep 17 00:00:00 2001 From: dy Date: Tue, 26 Dec 2023 17:33:48 +0800 Subject: [PATCH 15/37] =?UTF-8?q?=E5=85=83=E6=97=A6=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/yuandan/ApiDMRec.ts | 6 ++-- src/api_s2c/event/yuandan/ApiDZRec.ts | 15 +++++++-- src/api_s2c/event/yuandan/ApiExchange.ts | 4 +-- src/api_s2c/event/yuandan/ApiZLRec.ts | 2 +- src/api_s2c/event/yuandan/fun.ts | 4 +-- .../protocols/event/yuandan/PtlDZRec.ts | 1 + src/shared/protocols/serviceProto.ts | 33 +++++++++++++++++++ 7 files changed, 54 insertions(+), 11 deletions(-) diff --git a/src/api_s2c/event/yuandan/ApiDMRec.ts b/src/api_s2c/event/yuandan/ApiDMRec.ts index bcbec2f..758a4f6 100644 --- a/src/api_s2c/event/yuandan/ApiDMRec.ts +++ b/src/api_s2c/event/yuandan/ApiDMRec.ts @@ -9,12 +9,12 @@ export default async function (call: ApiCall) { let _hd = (await HuoDongFun.gethdList(call, 14))[0] if (!_hd) return call.errorCode(-1) - // 校验当前领取奖励 + // 奖励不符合 let toPrize = call.req.prize let prize = _hd.data.game.find(i => i.a == toPrize.a && i.t == toPrize.t && i.n == toPrize.n) - if (toPrize && !prize) return call.errorCode(-2) + if (toPrize && !prize) return call.errorCode(-4) - // 取奖励列表，判断是否有可领取奖励 + // 扣除免费次数或相应货币 let data = await G.mongodb.cEvent(`yuandan${_hd.hdid}`).findOne({uid: call.uid, type: `yuandan${_hd.hdid}`}) let rec = data?.gameNum diff --git a/src/api_s2c/event/yuandan/ApiDZRec.ts b/src/api_s2c/event/yuandan/ApiDZRec.ts index ce3f3f2..a801b42 100644 --- a/src/api_s2c/event/yuandan/ApiDZRec.ts +++ b/src/api_s2c/event/yuandan/ApiDZRec.ts @@ -10,15 +10,24 @@ export default async function (call: ApiCall) { 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) - await PlayerFun.sendPrize(call, gift.prize); + // 奖励不符合，严格判断 + 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}`}, { - $inc: {[`gift.${gift.id}`]: 1}, + $set: {[`gift.${gift.id}`]: JSON.stringify(prize)}, }, {upsert: true}) call.succ({}) diff --git a/src/api_s2c/event/yuandan/ApiExchange.ts b/src/api_s2c/event/yuandan/ApiExchange.ts index a3285db..72bbe41 100644 --- a/src/api_s2c/event/yuandan/ApiExchange.ts +++ b/src/api_s2c/event/yuandan/ApiExchange.ts @@ -5,12 +5,12 @@ 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) diff --git a/src/api_s2c/event/yuandan/ApiZLRec.ts b/src/api_s2c/event/yuandan/ApiZLRec.ts index 7adb47c..b810694 100644 --- a/src/api_s2c/event/yuandan/ApiZLRec.ts +++ b/src/api_s2c/event/yuandan/ApiZLRec.ts @@ -30,7 +30,7 @@ export default async function (call: ApiCall) { await PlayerFun.sendPrize(call, prize); await G.mongodb.cEvent(`yuandan${_hd.hdid}`).updateOne({uid: call.uid, type: `yuandan${_hd.hdid}`}, { - $inc: {[`qiandao.${call.req.id}`]: prize}, + $set: {[`qiandao.${call.req.id}`]: JSON.stringify(prize)}, }, {upsert: true}) call.succ({}) diff --git a/src/api_s2c/event/yuandan/fun.ts b/src/api_s2c/event/yuandan/fun.ts index 20a4c68..f815ece 100644 --- a/src/api_s2c/event/yuandan/fun.ts +++ b/src/api_s2c/event/yuandan/fun.ts @@ -50,8 +50,8 @@ export class Yuandanfun { /**设置数据 */ static async setData(uid: string, hdid: number, set: {}) { - await G.mongodb.cEvent(`christmas${hdid}`).updateOne( - {uid: uid, type: `christmas${hdid}`}, + await G.mongodb.cEvent(`yuandan${hdid}`).updateOne( + {uid: uid, type: `yuandan${hdid}`}, set ) } diff --git a/src/shared/protocols/event/yuandan/PtlDZRec.ts b/src/shared/protocols/event/yuandan/PtlDZRec.ts index 1942987..03db521 100644 --- a/src/shared/protocols/event/yuandan/PtlDZRec.ts +++ b/src/shared/protocols/event/yuandan/PtlDZRec.ts @@ -3,6 +3,7 @@ */ export type ReqDZRec = { id: string + dlz: { a: string, t: string, n: number }[] } export type ResDZRec = { diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 41a4fae..b8e538b 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -11460,6 +11460,39 @@ export const serviceProto: ServiceProto = { "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" + } + } + ] + } + } } ] }, From f50f6de93329ab2c1fdc85268f46940dfccde7bb Mon Sep 17 00:00:00 2001 From: dy Date: Tue, 26 Dec 2023 19:49:46 +0800 Subject: [PATCH 16/37] yuandan --- src/api_s2c/event/yuandan/ApiDMRec.ts | 4 +++- src/api_s2c/event/yuandan/ApiDZRec.ts | 4 ++-- src/api_s2c/event/yuandan/ApiZLRec.ts | 4 ++-- src/shared/protocols/event/yuandan/PtlDZRec.ts | 2 +- src/shared/protocols/event/yuandan/PtlZLRec.ts | 2 +- src/shared/protocols/serviceProto.ts | 16 ++++++++++++++-- 6 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/api_s2c/event/yuandan/ApiDMRec.ts b/src/api_s2c/event/yuandan/ApiDMRec.ts index 758a4f6..b0ddea0 100644 --- a/src/api_s2c/event/yuandan/ApiDMRec.ts +++ b/src/api_s2c/event/yuandan/ApiDMRec.ts @@ -23,7 +23,9 @@ export default async function (call: ApiCall) { await PlayerFun.cutNeed(call, _hd.data.gameneed); } - await PlayerFun.sendPrize(call, prize ? [prize] : []); + if (prize){ + await PlayerFun.sendPrize(call, [prize] ); + } await G.mongodb.cEvent(`yuandan${_hd.hdid}`).updateOne({uid: call.uid, type: `yuandan${_hd.hdid}`}, { $inc: {[`gameNum`]: 1}, diff --git a/src/api_s2c/event/yuandan/ApiDZRec.ts b/src/api_s2c/event/yuandan/ApiDZRec.ts index a801b42..a2dd1b8 100644 --- a/src/api_s2c/event/yuandan/ApiDZRec.ts +++ b/src/api_s2c/event/yuandan/ApiDZRec.ts @@ -27,10 +27,10 @@ export default async function (call: ApiCall) { await PlayerFun.sendPrize(call, prize); await G.mongodb.cEvent(`yuandan${_hd.hdid}`).updateOne({uid: call.uid, type: `yuandan${_hd.hdid}`}, { - $set: {[`gift.${gift.id}`]: JSON.stringify(prize)}, + $set: {[`gift.${gift.id}`]: prize}, }, {upsert: true}) - call.succ({}) + call.succ({[gift.id]: prize}) HongDianChange.sendChangeKey(call.uid, ['yuandan']); } diff --git a/src/api_s2c/event/yuandan/ApiZLRec.ts b/src/api_s2c/event/yuandan/ApiZLRec.ts index b810694..0a30022 100644 --- a/src/api_s2c/event/yuandan/ApiZLRec.ts +++ b/src/api_s2c/event/yuandan/ApiZLRec.ts @@ -30,10 +30,10 @@ export default async function (call: ApiCall) { 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}`]: JSON.stringify(prize)}, + $set: {[`qiandao.${call.req.id}`]: prize}, }, {upsert: true}) - call.succ({}) + call.succ({[call.req.id]: prize}) HongDianChange.sendChangeKey(call.uid, ['yuandan']); } diff --git a/src/shared/protocols/event/yuandan/PtlDZRec.ts b/src/shared/protocols/event/yuandan/PtlDZRec.ts index 03db521..5d38184 100644 --- a/src/shared/protocols/event/yuandan/PtlDZRec.ts +++ b/src/shared/protocols/event/yuandan/PtlDZRec.ts @@ -7,5 +7,5 @@ export type ReqDZRec = { } export type ResDZRec = { - + [k: string]: any; } diff --git a/src/shared/protocols/event/yuandan/PtlZLRec.ts b/src/shared/protocols/event/yuandan/PtlZLRec.ts index ef83032..a15b7d7 100644 --- a/src/shared/protocols/event/yuandan/PtlZLRec.ts +++ b/src/shared/protocols/event/yuandan/PtlZLRec.ts @@ -8,5 +8,5 @@ export type ReqZLRec = { } export type ResZLRec = { - + [k: string]: any; } diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index b8e538b..9dd6606 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -11497,7 +11497,13 @@ export const serviceProto: ServiceProto = { ] }, "event/yuandan/PtlDZRec/ResDZRec": { - "type": "Interface" + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" + } + } }, "event/yuandan/PtlExchange/ReqExchange": { "type": "Interface", @@ -11593,7 +11599,13 @@ export const serviceProto: ServiceProto = { ] }, "event/yuandan/PtlZLRec/ResZLRec": { - "type": "Interface" + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" + } + } }, "event/yuedujijin/PtlOpen/ReqOpen": { "type": "Interface", From 8503a65c1f9be921cc054c56ff5178a1b599b77a Mon Sep 17 00:00:00 2001 From: dy Date: Tue, 26 Dec 2023 20:04:05 +0800 Subject: [PATCH 17/37] yuandan fun --- src/api_s2c/event/yuandan/fun.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/api_s2c/event/yuandan/fun.ts b/src/api_s2c/event/yuandan/fun.ts index f815ece..c319a43 100644 --- a/src/api_s2c/event/yuandan/fun.ts +++ b/src/api_s2c/event/yuandan/fun.ts @@ -23,6 +23,7 @@ export class Yuandanfun { exchange: {}, taskfinish: [], taskval: await this.getTaskVal(call), + refreshTime: G.time }, }, {upsert: true, returnDocument: 'after'})).value } @@ -95,7 +96,7 @@ export class Yuandanfun { // 设置任务 if (isset == 1) { await G.mongodb.collection('event').updateMany( - {uid: call.uid, type: {$regex: "yuandan"}, hdid: parseInt(_hd.hdid)}, + {uid: call.uid, type: {$regex: `yuandan${_hd.hdid}`}}, _setData ) } From 944ef41d5d8cd10bdd57731400fc4f747c55b18e Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 27 Dec 2023 09:51:37 +0800 Subject: [PATCH 18/37] =?UTF-8?q?=E8=BE=BE=E6=91=A9=E7=8C=AE=E7=A4=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/yuandan/ApiDMRec.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api_s2c/event/yuandan/ApiDMRec.ts b/src/api_s2c/event/yuandan/ApiDMRec.ts index b0ddea0..6db04dd 100644 --- a/src/api_s2c/event/yuandan/ApiDMRec.ts +++ b/src/api_s2c/event/yuandan/ApiDMRec.ts @@ -11,7 +11,7 @@ export default async function (call: ApiCall) { // 奖励不符合 let toPrize = call.req.prize - let prize = _hd.data.game.find(i => i.a == toPrize.a && i.t == toPrize.t && i.n == toPrize.n) + let prize = _hd.data.game.find(i => i.a == toPrize?.a && i.t == toPrize?.t && i.n == toPrize?.n) if (toPrize && !prize) return call.errorCode(-4) // 扣除免费次数或相应货币 @@ -23,8 +23,8 @@ export default async function (call: ApiCall) { await PlayerFun.cutNeed(call, _hd.data.gameneed); } - if (prize){ - await PlayerFun.sendPrize(call, [prize] ); + if (prize) { + await PlayerFun.sendPrize(call, [prize]); } await G.mongodb.cEvent(`yuandan${_hd.hdid}`).updateOne({uid: call.uid, type: `yuandan${_hd.hdid}`}, { From 1cf4784d42220fbbf69c8a353bea43822c856dd7 Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 27 Dec 2023 11:02:53 +0800 Subject: [PATCH 19/37] =?UTF-8?q?=E5=85=83=E6=97=A6=E7=BA=A2=E7=82=B9?= =?UTF-8?q?=EF=BC=8C=E7=A0=B4=E5=86=B0=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/yuandan/ApiZLRec.ts | 9 ++- src/api_s2c/hongdian/fun.ts | 25 +++++- src/shared/protocols/event/yuandan/PtlOpen.ts | 11 ++- src/shared/protocols/serviceProto.ts | 78 +++++++++++++++++++ 4 files changed, 118 insertions(+), 5 deletions(-) diff --git a/src/api_s2c/event/yuandan/ApiZLRec.ts b/src/api_s2c/event/yuandan/ApiZLRec.ts index 0a30022..4b1340a 100644 --- a/src/api_s2c/event/yuandan/ApiZLRec.ts +++ b/src/api_s2c/event/yuandan/ApiZLRec.ts @@ -4,6 +4,7 @@ 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) @@ -18,11 +19,15 @@ export default async function (call: ApiCall) { 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(-4) + if (!item) call.errorCode(-5) }) let prize = [...gift.prize, ...call.req.dlz] @@ -30,7 +35,7 @@ export default async function (call: ApiCall) { 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}, + $set: {[`qiandao.${call.req.id}`]: prize, qiandaoTime: G.time}, }, {upsert: true}) call.succ({[call.req.id]: prize}) diff --git a/src/api_s2c/hongdian/fun.ts b/src/api_s2c/hongdian/fun.ts index 215f1f0..af9a11a 100644 --- a/src/api_s2c/hongdian/fun.ts +++ b/src/api_s2c/hongdian/fun.ts @@ -369,6 +369,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) { @@ -383,7 +387,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) @@ -397,6 +401,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/shared/protocols/event/yuandan/PtlOpen.ts b/src/shared/protocols/event/yuandan/PtlOpen.ts index 2940c39..15128e9 100644 --- a/src/shared/protocols/event/yuandan/PtlOpen.ts +++ b/src/shared/protocols/event/yuandan/PtlOpen.ts @@ -1,9 +1,16 @@ /** * 元旦 */ -export type ReqOpen = { -} +export type ReqOpen = {} export type ResOpen = { + 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/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 9dd6606..2ebe2d3 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -11525,6 +11525,84 @@ export const serviceProto: ServiceProto = { }, "event/yuandan/PtlOpen/ResOpen": { "type": "Interface", + "properties": [ + { + "id": 0, + "name": "qiandao", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" + } + } + } + }, + { + "id": 1, + "name": "gift", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" + } + } + } + }, + { + "id": 2, + "name": "taskfinish", + "type": { + "type": "Array", + "elementType": { + "type": "String" + } + } + }, + { + "id": 3, + "name": "taskval", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" + } + } + } + }, + { + "id": 4, + "name": "exchange", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" + } + } + } + }, + { + "id": 5, + "name": "gameNum", + "type": { + "type": "Number" + } + }, + { + "id": 6, + "name": "refreshTime", + "type": { + "type": "Number" + } + } + ], "indexSignature": { "keyType": "String", "type": { From 34ace42872380161b698712382052094f4afe347 Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 27 Dec 2023 11:03:10 +0800 Subject: [PATCH 20/37] proto --- src/shared/protocols/serviceProto.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 2ebe2d3..58d5d16 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -11601,6 +11601,13 @@ export const serviceProto: ServiceProto = { "type": { "type": "Number" } + }, + { + "id": 7, + "name": "qiandaoTime", + "type": { + "type": "Number" + } } ], "indexSignature": { From c3fa18c9b1720ee937181b8dd1ffd6d358791fef Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 27 Dec 2023 11:08:42 +0800 Subject: [PATCH 21/37] proto --- src/module/collection_event.ts | 2 +- src/shared/protocols/event/yuandan/PtlOpen.ts | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/module/collection_event.ts b/src/module/collection_event.ts index 5a42bd6..7908bf4 100644 --- a/src/module/collection_event.ts +++ b/src/module/collection_event.ts @@ -23,7 +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 {ResOpen as ResOpenYuandan} from '../shared/protocols/event/yuandan/PtlOpen'; +import {event as ResOpenYuandan} from '../shared/protocols/event/yuandan/PtlOpen'; export type eventType = { shouchong: { diff --git a/src/shared/protocols/event/yuandan/PtlOpen.ts b/src/shared/protocols/event/yuandan/PtlOpen.ts index 15128e9..ce008bd 100644 --- a/src/shared/protocols/event/yuandan/PtlOpen.ts +++ b/src/shared/protocols/event/yuandan/PtlOpen.ts @@ -4,6 +4,12 @@ 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[]; From d4bd776b489c813739eba6f875daa52f63359c68 Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 27 Dec 2023 11:09:00 +0800 Subject: [PATCH 22/37] proto --- src/shared/protocols/serviceProto.ts | 77 ++-------------------------- 1 file changed, 4 insertions(+), 73 deletions(-) diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 58d5d16..f0d7d73 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -11528,85 +11528,16 @@ export const serviceProto: ServiceProto = { "properties": [ { "id": 0, - "name": "qiandao", + "name": "data", "type": { - "type": "Interface", - "indexSignature": { - "keyType": "String", - "type": { - "type": "Any" - } - } + "type": "Any" } }, { "id": 1, - "name": "gift", + "name": "payLog", "type": { - "type": "Interface", - "indexSignature": { - "keyType": "String", - "type": { - "type": "Any" - } - } - } - }, - { - "id": 2, - "name": "taskfinish", - "type": { - "type": "Array", - "elementType": { - "type": "String" - } - } - }, - { - "id": 3, - "name": "taskval", - "type": { - "type": "Interface", - "indexSignature": { - "keyType": "String", - "type": { - "type": "Any" - } - } - } - }, - { - "id": 4, - "name": "exchange", - "type": { - "type": "Interface", - "indexSignature": { - "keyType": "String", - "type": { - "type": "Any" - } - } - } - }, - { - "id": 5, - "name": "gameNum", - "type": { - "type": "Number" - } - }, - { - "id": 6, - "name": "refreshTime", - "type": { - "type": "Number" - } - }, - { - "id": 7, - "name": "qiandaoTime", - "type": { - "type": "Number" + "type": "Any" } } ], From b578bb0db0dca0ba1b4bd2a7a2e0f264cac30cfd Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 27 Dec 2023 14:17:10 +0800 Subject: [PATCH 23/37] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E7=AB=9E=E8=B5=9B?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E8=B7=A8=E6=9C=8D=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/payForDiamond/ApiCanReceive.ts | 4 +- src/api_s2c/event/payForDiamond/ApiReceive.ts | 14 ++-- src/api_s2c/event/xiaofeijingsai/ApiOpen.ts | 38 +++++------ src/api_s2c/eventlist/ApihdGetList.ts | 7 ++ src/global.ts | 65 ++++++++++--------- src/ioredis.ts | 2 +- src/module/mongodb.ts | 2 + src/public/player.ts | 8 ++- .../scheduler/scheduler_xiaofeijingsai.ts | 16 +++-- 9 files changed, 87 insertions(+), 69 deletions(-) diff --git a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts index 77e0fa9..2b5f80c 100644 --- a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts @@ -26,10 +26,10 @@ export async function playerCanReceive(call: ApiCall, callError : boolean = true } activityId = activityInfo.hdid; const hasReceivedKey = hasGotKeyPrefix + activityId; - const hasReceivedStr = await G.iorediscross.get(hasReceivedKey); + const hasReceivedStr = await G.crossioredis.get(hasReceivedKey); const hasReceived = hasReceivedStr? parseInt(hasReceivedStr) : 0; const remaining = activityInfo.data['totalmoney'] - hasReceived; - const showOffResult = await G.iorediscross.lrange(showOffListKeyPrefix + activityId, 0, -1); + const showOffResult = await G.crossioredis.lrange(showOffListKeyPrefix + activityId, 0, -1); const showOffList = showOffResult.map(result => JSON.parse(result)); const zeroTime = PublicShared.getToDayZeroTime(); const vipScore = await ActionLog.getDayLog(call.uid, 'pay'); diff --git a/src/api_s2c/event/payForDiamond/ApiReceive.ts b/src/api_s2c/event/payForDiamond/ApiReceive.ts index a81b991..cdec0c5 100644 --- a/src/api_s2c/event/payForDiamond/ApiReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiReceive.ts @@ -71,12 +71,12 @@ export default async function (call: ApiCall) { } const activityData = canReceiveResult.activityInfo.data; // 更新 redis 领取记录之前先加锁, 防止多领 - const lockResult = await G.iorediscross.setnx(hasGotLockKey, 1); + const lockResult = await G.crossioredis.setnx(hasGotLockKey, 1); if (lockResult) { - await G.iorediscross.expire(hasGotLockKey, 1); // 设置 ttl 避免死锁 + await G.crossioredis.expire(hasGotLockKey, 1); // 设置 ttl 避免死锁 const activityId = call.req.activityId; const hasReceivedKey = hasGotKeyPrefix + activityId; - const hasReceivedStr = await G.iorediscross.get(hasReceivedKey); + const hasReceivedStr = await G.crossioredis.get(hasReceivedKey); const hasReceived = hasReceivedStr? parseInt(hasReceivedStr) : 0; const remaining = activityData['totalmoney'] - hasReceived; if (remaining <= 0) { @@ -86,8 +86,8 @@ export default async function (call: ApiCall) { } else { const { group, maxAmount } = randomWithWeight(activityData['groupConf']['base']['arr']); const gotAmount = calcDiamondGot(remaining, group, maxAmount); - await G.iorediscross.incrby(hasReceivedKey, Math.abs(gotAmount)); // 添加已领取的额度 - await G.iorediscross.del(hasGotLockKey); // 移除锁 + await G.crossioredis.incrby(hasReceivedKey, Math.abs(gotAmount)); // 添加已领取的额度 + await G.crossioredis.del(hasGotLockKey); // 移除锁 await PlayerFun.sendPrize(call, [{ 'a': 'attr', 't': 'rmbmoney', 'n': gotAmount }]); const showOff = gotAmount >= activityData['groupConf']['base']['loglimit']; call.succ({ // 领取核心逻辑完成, 请求可以返回了 @@ -108,8 +108,8 @@ export default async function (call: ApiCall) { name: call.conn.gud.name, gotAmount, serverID: call.conn.gud.sid }); const showOffListKey = showOffListKeyPrefix + activityId; - await G.iorediscross.lpush(showOffListKey, msg); - await G.iorediscross.ltrim(showOffListKey, 0, 49); // 限制列表保存 50 条消息, 避免无限增长 + await G.crossioredis.lpush(showOffListKey, msg); + await G.crossioredis.ltrim(showOffListKey, 0, 49); // 限制列表保存 50 条消息, 避免无限增长 } } } else { diff --git a/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts b/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts index 4fa2459..b3a47af 100644 --- a/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts +++ b/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts @@ -4,13 +4,13 @@ import {HuoDongFun} from "../../../public/huodongfun"; /** * 消费竞赛 - * redis缓存120秒 + * redis缓存60秒 * 返回活动日期内的 * @param call */ export default async function (call: ApiCall) { - let ioList = await G.ioredis.get(`rank:xiaofeijingsai`); + let ioList = await G.crossioredis.get(`rank:xiaofeijingsai`); if (ioList) { let myData = await getMyData(call, JSON.parse(ioList)) return call.succ({list: JSON.parse(ioList), myData}) @@ -21,28 +21,27 @@ export default async function (call: ApiCall) { let limit = _hd.data?.rank?.slice(-1)?.[0]?.rank?.slice(-1)?.[0] || call.req.limit || 100 - let rmbuse = await G.mongodb.collection('rmbuse').aggregate([ - {$match: {isAdd: false, cTime: {$gte: _hd.stime, $lte: _hd.etime}}}, - {$group: {_id: "$uid", total: {$sum: "$change"}}}, - {$sort: {total: 1}}, - {$limit: limit} - ]).toArray() - - let list: any = rmbuse.map(i => ({...i, total: R.negate(i.total)})) + let rmbuse = await G.crossmongodb.collection('rmbuse').find({ + time: { + $gte: _hd.stime, + $lte: _hd.etime + 10 + } + }).sort({change: 1}).limit(limit).toArray() + let list: any = rmbuse.map(i => ({...i, total: R.negate(i.change)})) let rankList = sortRankList(_hd.data.rank, list) - let users = await G.mongodb.collection('user').find({uid: {$in: rankList.map(i => i._id).filter(i => i._id != 'system')}}).toArray() + let users = await G.crossmongodb.collection('xfjs_user').find({uid: {$in: rankList.map(i => i._id).filter(i => i._id != 'system')}}).toArray() rankList = rankList.map(i => ({...i, player: users.find(v => v.uid == i._id) || {}})) // 活动结束前半小时，缓存过期时间改为10秒 - let exTime = (G.time + 1800) > _hd.etime ? 10 : 120 + let exTime = (G.time + 1800) > _hd.etime ? 10 : 60 - G.ioredis.setex(`rank:xiaofeijingsai`, exTime, JSON.stringify(rankList)); + G.crossioredis.setex(`rank:xiaofeijingsai`, exTime, JSON.stringify(rankList)); - let myData = await getMyData(call, rankList, _hd) + let myData = await getMyData(call, rankList) call.succ({list: rankList, myData}) } @@ -69,19 +68,14 @@ export function sortRankList(rank, list) { } // 获取自己的信息 -async function getMyData(call, rankList, _hd?) { +async function getMyData(call, rankList) { let myData = rankList.find(i => i._id == call.uid) if (myData) return myData - if (!_hd) { - _hd = (await HuoDongFun.gethdList(call, 11))[0] - } - let myCut = (await G.mongodb.collection('rmbuse').aggregate([ - {$match: {uid: call.uid, isAdd: false, cTime: {$gte: _hd.stime, $lte: _hd.etime}}}, - {$group: {_id: "$uid", total: {$sum: "$change"}}} - ]).toArray())[0] + let myCut: any = await G.crossmongodb.collection('rmbuse').findOne({uid: call.uid}) let myUser = await G.mongodb.collection('user').findOne({uid: call.uid}) + G.crossmongodb.collection('xfjs_user').updateOne({uid: call.uid}, myUser, {upsert: true}) if (!myCut) { myCut = {_id: myUser.uid, total: 0} diff --git a/src/api_s2c/eventlist/ApihdGetList.ts b/src/api_s2c/eventlist/ApihdGetList.ts index 24dfc45..63c1c23 100644 --- a/src/api_s2c/eventlist/ApihdGetList.ts +++ b/src/api_s2c/eventlist/ApihdGetList.ts @@ -8,4 +8,11 @@ export default async function (call: ApiCall) { let _hdList = await HuoDongFun.gethdList(call) call.succ({hdlist: _hdList}); + + // 消费竞赛是跨服活动，活动开启时，同步当前用户信息到跨服数据库 + G.huodong.xfjs = !!_hdList.find(i => i.htype == 11); + if (G.huodong.xfjs){ + let myUser = await G.mongodb.collection('user').findOne({uid: call.uid}) + G.crossmongodb.collection('xfjs_user').updateOne({uid: call.uid}, myUser, {upsert: true}) + } } \ No newline at end of file diff --git a/src/global.ts b/src/global.ts index 26105d1..6951f34 100644 --- a/src/global.ts +++ b/src/global.ts @@ -1,22 +1,22 @@ import EventEmitter from 'events'; -import { existsSync, readdirSync, readFileSync, writeFileSync } from 'fs'; -import { parse } from 'json5'; +import {existsSync, readdirSync, readFileSync, writeFileSync} from 'fs'; +import {parse} from 'json5'; import * as mathjs from 'mathjs'; -import { join, resolve } from 'path'; -import { argv, env } from 'process'; -import { HttpServer, WsClient, WsServer } from 'tsrpc'; -import { ServiceType as ServiceTypeCross } from './cross/protocols/serviceProto'; -import { MyEvent } from './event'; -import { addListener, gEventType } from './globalListener'; +import {join, resolve} from 'path'; +import {argv, env} from 'process'; +import {HttpServer, WsClient, WsServer} from 'tsrpc'; +import {ServiceType as ServiceTypeCross} from './cross/protocols/serviceProto'; +import {MyEvent} from './event'; +import {addListener, gEventType} from './globalListener'; import localConfig from './localConfig'; -import { ServiceType as ServiceTypeHttp } from './monopoly/protocols/serviceProto'; -import { SchedulerManage } from './public/scheduler/scheduler'; -import { _mongodb } from './setMongodb'; -import { redisJsonFun } from './setRedis'; -import { ResGetList } from './shared/protocols/pay/PtlGetList'; -import { ServiceType as ServiceTypeWs } from './shared/protocols/serviceProto'; -import { PublicShared } from './shared/public/public'; -import { clusterRunOnce } from './clusterUtils'; +import {ServiceType as ServiceTypeHttp} from './monopoly/protocols/serviceProto'; +import {SchedulerManage} from './public/scheduler/scheduler'; +import {_mongodb} from './setMongodb'; +import {redisJsonFun} from './setRedis'; +import {ResGetList} from './shared/protocols/pay/PtlGetList'; +import {ServiceType as ServiceTypeWs} from './shared/protocols/serviceProto'; +import {PublicShared} from './shared/public/public'; +import {clusterRunOnce} from './clusterUtils'; import * as ramda from 'ramda' import Redis from 'ioredis'; @@ -33,22 +33,24 @@ declare global { type atn = { a: string, t: string | number | any, n: number; colour?: number; shiwuBuff?: any; }; /**类型过滤 */ - type FilterConditionally = Pick< - Source, + type FilterConditionally = Pick; + }[keyof Source]>; interface Array { /**数组随机取值 */ random(): T; + /**取一个数组在当前数组中的交集 */ intersection(other: T[]): T[]; + /**取一个数组在当前数组中的差集 */ difference(other: T[]): T[]; + /**数组是否存在重复元素 */ isDuplication(): boolean; + /**打乱数组 */ shuffle(): this; } @@ -69,9 +71,9 @@ class _G { /**服务器日志模式 error | debug*/ logModel: string; } = { - serverType: 'msg', - logModel: 'error' - }; + serverType: 'msg', + logModel: 'error' + }; /**当前时间对象 */ date: Date; /**当前时间戳 */ @@ -93,7 +95,7 @@ class _G { /**ioredis连接对象 */ ioredis: Redis; /** 跨服 ioredis 连接对象 */ - iorediscross: Redis; + crossioredis: Redis; /**mongodb连接对象 */ mongodb: _mongodb; /**crossmongodb连接对象 */ @@ -102,6 +104,11 @@ class _G { /**所有玩家的充值记录 */ allPlayerPayLog: k_v = {}; + /**跨服活动——消费竞赛的开启状态 */ + huodong = { + xfjs: false + }; + private event = new EventEmitter(); /**映射开服时间 */ @@ -115,7 +122,7 @@ class _G { off(type: any, callback: any, caller?: any): void; emit(type: any, ...args: any[]): void; debug(): any; - removeAllListeners(type?:any):void; + removeAllListeners(type?: any): void; } { return MyEvent as any; } @@ -142,10 +149,10 @@ class _G { } on(event: T, callback: gEventType[T]) { - return this.event.on(event, (...args)=>{ - try{ + return this.event.on(event, (...args) => { + try { callback.call(this, ...args); - }catch(e){ + } catch (e) { console.error(e) } }); @@ -166,7 +173,7 @@ class _G { if (file.endsWith('.json5')) { let json = parse(readFileSync(join(jsonPath, file), 'utf-8')); this.gc[file.split('.')[0]] = json; - } else if(file.endsWith('.json')) { + } else if (file.endsWith('.json')) { let json = JSON.parse(readFileSync(join(jsonPath, file), 'utf-8')); this.gc[file.split('.')[0]] = json; } diff --git a/src/ioredis.ts b/src/ioredis.ts index 00d7f52..5c9c77e 100644 --- a/src/ioredis.ts +++ b/src/ioredis.ts @@ -16,7 +16,7 @@ export async function initIORedis() { G.ioredis = new Redis(G.argv.serverType == 'cross' ? G.config.crossRedisUrl : G.config.redisUrl,{ keyPrefix: preKey, }); - G.iorediscross = new Redis(G.config.crossRedisUrl,{ + G.crossioredis = new Redis(G.config.crossRedisUrl,{ keyPrefix: "cross_", }); } diff --git a/src/module/mongodb.ts b/src/module/mongodb.ts index 5d8c8ac..f4c5842 100644 --- a/src/module/mongodb.ts +++ b/src/module/mongodb.ts @@ -133,4 +133,6 @@ export type MongodbCollections = { fightLog: CollectionFightLog shop: CollectionShop pushgift:CollectionPushGift + + xfjs_user: CollectionUser; }; \ No newline at end of file diff --git a/src/public/player.ts b/src/public/player.ts index 00caf78..5d9a7e4 100644 --- a/src/public/player.ts +++ b/src/public/player.ts @@ -214,7 +214,6 @@ export class PlayerFun { } static async changeAttrLog(uid: string, change, atn, before) { - let data = { uid, before, @@ -225,6 +224,13 @@ export class PlayerFun { atn } G.mongodb.collection('rmbuse').insertOne(data); + // 消费竞赛开启时写入跨服数据库 + if (G.huodong.xfjs && !data.isAdd) { + G.crossmongodb.collection('rmbuse').updateOne({uid: data.uid}, { + time: G.time, + $inc: {change: data.change} + }, {upsert: true}); + } } static async changeAttr(uid: string, change: Partial) { diff --git a/src/public/scheduler/scheduler_xiaofeijingsai.ts b/src/public/scheduler/scheduler_xiaofeijingsai.ts index 5901064..4d4af5a 100644 --- a/src/public/scheduler/scheduler_xiaofeijingsai.ts +++ b/src/public/scheduler/scheduler_xiaofeijingsai.ts @@ -38,14 +38,15 @@ export class Scheduler_xfjs_Local_Ctor extends Scheduler { if (!_hd) return let limit = _hd.data?.rank?.slice(-1)?.[0]?.rank?.slice(-1)?.[0] || 100 - let rmbuse = await G.mongodb.collection('rmbuse').aggregate([ - {$match: {isAdd: false, cTime: {$gte: _hd.stime, $lte: _hd.etime}}}, - {$group: {_id: "$uid", total: {$sum: "$change"}}}, - {$sort: {total: 1}}, - {$limit: limit} - ]).toArray() - let list: any = rmbuse.map(i => ({...i, total: R.negate(i.total)})) + let rmbuse = await G.crossmongodb.collection('rmbuse').find({ + time: { + $gte: _hd.stime, + $lte: _hd.etime + 10 + } + }).sort({change: 1}).limit(limit).toArray() + + let list: any = rmbuse.map(i => ({...i, total: R.negate(i.change)})) let ranklist = sortRankList(_hd.data.rank, list) @@ -53,6 +54,7 @@ export class Scheduler_xfjs_Local_Ctor extends Scheduler { let users = R.slice(i.rank[0] - 1, i.rank[1])(ranklist) users.map(v => { if (v._id == 'system') return + if (G.config.serverId != users.sid) return; EmailFun.addEmail({ uid: v._id, type: 'system', From 0df09e0f9ef726672eded53b2a547fb7301d746b Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 27 Dec 2023 16:33:31 +0800 Subject: [PATCH 24/37] =?UTF-8?q?=E5=A8=83=E5=A8=83=E6=9C=BA=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=8E=89=E8=90=BD=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/yuandan/ApiDMRec.ts | 11 +++----- .../protocols/event/yuandan/PtlDMRec.ts | 2 +- src/shared/protocols/serviceProto.ts | 27 ++----------------- 3 files changed, 7 insertions(+), 33 deletions(-) diff --git a/src/api_s2c/event/yuandan/ApiDMRec.ts b/src/api_s2c/event/yuandan/ApiDMRec.ts index 6db04dd..f62c238 100644 --- a/src/api_s2c/event/yuandan/ApiDMRec.ts +++ b/src/api_s2c/event/yuandan/ApiDMRec.ts @@ -3,17 +3,13 @@ import {ReqDMRec, ResDMRec} from "../../../shared/protocols/event/yuandan/PtlDMR 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 toPrize = call.req.prize - let prize = _hd.data.game.find(i => i.a == toPrize?.a && i.t == toPrize?.t && i.n == toPrize?.n) - if (toPrize && !prize) return call.errorCode(-4) - // 扣除免费次数或相应货币 let data = await G.mongodb.cEvent(`yuandan${_hd.hdid}`).findOne({uid: call.uid, type: `yuandan${_hd.hdid}`}) let rec = data?.gameNum @@ -23,8 +19,9 @@ export default async function (call: ApiCall) { await PlayerFun.cutNeed(call, _hd.data.gameneed); } - if (prize) { - await PlayerFun.sendPrize(call, [prize]); + if (call.req.id) { + let prize = PublicShared.randomDropGroup(call.req.id, 1, _hd.data.game); + await PlayerFun.sendPrize(call, prize); } await G.mongodb.cEvent(`yuandan${_hd.hdid}`).updateOne({uid: call.uid, type: `yuandan${_hd.hdid}`}, { diff --git a/src/shared/protocols/event/yuandan/PtlDMRec.ts b/src/shared/protocols/event/yuandan/PtlDMRec.ts index cd4111e..0f18459 100644 --- a/src/shared/protocols/event/yuandan/PtlDMRec.ts +++ b/src/shared/protocols/event/yuandan/PtlDMRec.ts @@ -2,7 +2,7 @@ * 元旦达摩领奖 */ export type ReqDMRec = { - prize: { a: string, t: string, n: number } | null + id: string | null } export type ResDMRec = {} diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index f0d7d73..17478cc 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -11403,37 +11403,14 @@ export const serviceProto: ServiceProto = { "properties": [ { "id": 0, - "name": "prize", + "name": "id", "type": { "type": "Union", "members": [ { "id": 0, "type": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "a", - "type": { - "type": "String" - } - }, - { - "id": 1, - "name": "t", - "type": { - "type": "String" - } - }, - { - "id": 2, - "name": "n", - "type": { - "type": "Number" - } - } - ] + "type": "String" } }, { From 7c83a8bbe8aa2c4ec4240146b9e52f8e95d965bd Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 27 Dec 2023 16:41:22 +0800 Subject: [PATCH 25/37] =?UTF-8?q?=E5=A8=83=E5=A8=83=E6=9C=BA=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=8E=89=E8=90=BD=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/yuandan/ApiDMRec.ts | 2 +- src/shared/protocols/event/yuandan/PtlDMRec.ts | 2 +- src/shared/protocols/serviceProto.ts | 5 +++-- src/shared/public/public.ts | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/api_s2c/event/yuandan/ApiDMRec.ts b/src/api_s2c/event/yuandan/ApiDMRec.ts index f62c238..db205dc 100644 --- a/src/api_s2c/event/yuandan/ApiDMRec.ts +++ b/src/api_s2c/event/yuandan/ApiDMRec.ts @@ -20,7 +20,7 @@ export default async function (call: ApiCall) { } if (call.req.id) { - let prize = PublicShared.randomDropGroup(call.req.id, 1, _hd.data.game); + let prize = PublicShared.randomDropGroup('1', 1, {'1': _hd.data.game}); await PlayerFun.sendPrize(call, prize); } diff --git a/src/shared/protocols/event/yuandan/PtlDMRec.ts b/src/shared/protocols/event/yuandan/PtlDMRec.ts index 0f18459..8de9bbb 100644 --- a/src/shared/protocols/event/yuandan/PtlDMRec.ts +++ b/src/shared/protocols/event/yuandan/PtlDMRec.ts @@ -2,7 +2,7 @@ * 元旦达摩领奖 */ export type ReqDMRec = { - id: string | null + id: 1 | 0 } export type ResDMRec = {} diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 17478cc..a7b174a 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -11410,14 +11410,15 @@ export const serviceProto: ServiceProto = { { "id": 0, "type": { - "type": "String" + "type": "Literal", + "literal": 1 } }, { "id": 1, "type": { "type": "Literal", - "literal": null + "literal": 0 } } ] 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 = []; From 53a2becac537e4a7dadcbdb82bce86de604e5b3e Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 27 Dec 2023 16:53:33 +0800 Subject: [PATCH 26/37] =?UTF-8?q?=E5=A8=83=E5=A8=83=E6=9C=BA=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=8E=89=E8=90=BD=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/yuandan/ApiDMRec.ts | 5 +++-- src/shared/protocols/event/yuandan/PtlDMRec.ts | 6 +++++- src/shared/protocols/serviceProto.ts | 15 ++++++++++++++- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/api_s2c/event/yuandan/ApiDMRec.ts b/src/api_s2c/event/yuandan/ApiDMRec.ts index db205dc..693d595 100644 --- a/src/api_s2c/event/yuandan/ApiDMRec.ts +++ b/src/api_s2c/event/yuandan/ApiDMRec.ts @@ -19,8 +19,9 @@ export default async function (call: ApiCall) { await PlayerFun.cutNeed(call, _hd.data.gameneed); } + let prize = [] if (call.req.id) { - let prize = PublicShared.randomDropGroup('1', 1, {'1': _hd.data.game}); + prize = PublicShared.randomDropGroup('1', 1, {'1': _hd.data.game}); await PlayerFun.sendPrize(call, prize); } @@ -28,7 +29,7 @@ export default async function (call: ApiCall) { $inc: {[`gameNum`]: 1}, }, {upsert: true}) - call.succ({}) + call.succ({prize}) HongDianChange.sendChangeKey(call.uid, ['yuandan']); } diff --git a/src/shared/protocols/event/yuandan/PtlDMRec.ts b/src/shared/protocols/event/yuandan/PtlDMRec.ts index 8de9bbb..c77a5e9 100644 --- a/src/shared/protocols/event/yuandan/PtlDMRec.ts +++ b/src/shared/protocols/event/yuandan/PtlDMRec.ts @@ -1,3 +1,5 @@ +import {prizeType} from "../../type"; + /** * 元旦达摩领奖 */ @@ -5,4 +7,6 @@ export type ReqDMRec = { id: 1 | 0 } -export type ResDMRec = {} +export type ResDMRec = { + prize: prizeType[] +} diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index a7b174a..8d28d61 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -11427,7 +11427,20 @@ export const serviceProto: ServiceProto = { ] }, "event/yuandan/PtlDMRec/ResDMRec": { - "type": "Interface" + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "prize", + "type": { + "type": "Array", + "elementType": { + "type": "Reference", + "target": "type/prizeType" + } + } + } + ] }, "event/yuandan/PtlDZRec/ReqDZRec": { "type": "Interface", From 837e9b58c846904096eba08cc1d28c345ae4bf40 Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 27 Dec 2023 18:50:36 +0800 Subject: [PATCH 27/37] =?UTF-8?q?fix=20=E5=85=83=E6=97=A6=E7=BA=A2?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/yuandan/fun.ts | 1 + src/api_s2c/hongdian/fun.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/api_s2c/event/yuandan/fun.ts b/src/api_s2c/event/yuandan/fun.ts index c319a43..8ed1590 100644 --- a/src/api_s2c/event/yuandan/fun.ts +++ b/src/api_s2c/event/yuandan/fun.ts @@ -23,6 +23,7 @@ export class Yuandanfun { exchange: {}, taskfinish: [], taskval: await this.getTaskVal(call), + qiandaoTime: data?.qiandaoTime || 0, refreshTime: G.time }, }, {upsert: true, returnDocument: 'after'})).value diff --git a/src/api_s2c/hongdian/fun.ts b/src/api_s2c/hongdian/fun.ts index af9a11a..ea4623d 100644 --- a/src/api_s2c/hongdian/fun.ts +++ b/src/api_s2c/hongdian/fun.ts @@ -413,7 +413,7 @@ export class HuoDongHongDianFun { if (data?.gameNum < _hd.data.gamefree) return {show: true} - if (!PublicShared.chkSameDate(data.qiandaoTime || 0, G.time)) { + if (!PublicShared.chkSameDate(data?.qiandaoTime || 0, G.time)) { return {show: true} } From 771c4a2cebc2977a8fa1394f1c546515638a89d0 Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 27 Dec 2023 19:15:51 +0800 Subject: [PATCH 28/37] cehua json --- src/json/attr.json | 4 +- src/json/huodong.json5 | 65 +- src/json/pata.json | 8000 ++++++++++++++++++++++++++++++++++++ src/json/pay.json | 30 +- src/json/tuisonglibao.json | 10 +- 5 files changed, 8055 insertions(+), 54 deletions(-) diff --git a/src/json/attr.json b/src/json/attr.json index 6c07a87..592ff4e 100644 --- a/src/json/attr.json +++ b/src/json/attr.json @@ -154,8 +154,8 @@ "name": "intr_attr_name_17", "undefined": "元旦游戏币", "colour": 5, - "icon": "icon_hspj", - "sicon": "icon_hspj", + "icon": "icon_xnjb", + "sicon": "icon_xnjb", "describe": "intr_attr_describe_17", "advancedEffects": "ani_xiangzikuang" } diff --git a/src/json/huodong.json5 b/src/json/huodong.json5 index 158a5cb..5002f73 100644 --- a/src/json/huodong.json5 +++ b/src/json/huodong.json5 @@ -2398,7 +2398,7 @@ free: false, payId: 'ycmb_2_1', buyNum: 1, - prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 600},{'a': 'item', 't': '4', 'n': 10} ] + prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 300},{'a': 'attr', 't': 'rmbmoney', 'n': 300},{'a': 'item', 't': '4', 'n': 5},{'a': 'item', 't': '4', 'n': 5} ] }, { index: 2, @@ -2406,7 +2406,7 @@ free: false, payId: 'ycmb_2_2', buyNum: 1, - prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 1360},{'a': 'item', 't': '4', 'n': 20} ] + prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 680},{'a': 'attr', 't': 'rmbmoney', 'n': 680},{'a': 'item', 't': '4', 'n': 10},{'a': 'item', 't': '4', 'n': 10} ] }, { index: 3, @@ -2414,7 +2414,7 @@ free: false, payId: 'ycmb_2_3', buyNum: 1, - prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 2560},{'a': 'item', 't': '4', 'n': 50} ] + prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 1280},{'a': 'attr', 't': 'rmbmoney', 'n': 1280},{'a': 'item', 't': '4', 'n': 25},{'a': 'item', 't': '4', 'n': 25} ] }, { index: 4, @@ -2422,7 +2422,7 @@ free: false, payId: 'ycmb_2_4', buyNum: 3, - prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 6560},{'a': 'item', 't': '4', 'n': 100} ] + prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 3280},{'a': 'attr', 't': 'rmbmoney', 'n': 3280},{'a': 'item', 't': '4', 'n': 50},{'a': 'item', 't': '4', 'n': 50} ] }, { index: 4, @@ -2430,7 +2430,7 @@ free: false, payId: 'ycmb_2_5', buyNum: 10, - prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 12960},{'a': 'item', 't': '4', 'n': 200} ] + prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 6480},{'a': 'attr', 't': 'rmbmoney', 'n': 6480},{'a': 'item', 't': '4', 'n': 100},{'a': 'item', 't': '4', 'n': 100} ] } ], //任务相关 type 1 每日任务（每天刷新） 2 活动任务（轮数） 3 每日登录 4-一次性任务 任务hdid一定要唯一 @@ -2546,7 +2546,7 @@ free: false, payId: 'ycmb_2_1', buyNum: 1, - prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 600},{'a': 'item', 't': '4', 'n': 10} ] + prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 300},{'a': 'attr', 't': 'rmbmoney', 'n': 300},{'a': 'item', 't': '4', 'n': 5},{'a': 'item', 't': '4', 'n': 5} ] }, { index: 2, @@ -2554,7 +2554,7 @@ free: false, payId: 'ycmb_2_2', buyNum: 1, - prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 1360},{'a': 'item', 't': '4', 'n': 20} ] + prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 680},{'a': 'attr', 't': 'rmbmoney', 'n': 680},{'a': 'item', 't': '4', 'n': 10},{'a': 'item', 't': '4', 'n': 10} ] }, { index: 3, @@ -2562,7 +2562,7 @@ free: false, payId: 'ycmb_2_3', buyNum: 1, - prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 2560},{'a': 'item', 't': '4', 'n': 50} ] + prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 1280},{'a': 'attr', 't': 'rmbmoney', 'n': 1280},{'a': 'item', 't': '4', 'n': 25},{'a': 'item', 't': '4', 'n': 25} ] }, { index: 4, @@ -2570,7 +2570,7 @@ free: false, payId: 'ycmb_2_4', buyNum: 3, - prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 6560},{'a': 'item', 't': '4', 'n': 100} ] + prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 3280},{'a': 'attr', 't': 'rmbmoney', 'n': 3280},{'a': 'item', 't': '4', 'n': 50},{'a': 'item', 't': '4', 'n': 50} ] }, { index: 4, @@ -2578,7 +2578,7 @@ free: false, payId: 'ycmb_2_5', buyNum: 10, - prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 12960},{'a': 'item', 't': '4', 'n': 200} ] + prize: [ {'a': 'attr', 't': 'rmbmoney', 'n': 6480},{'a': 'attr', 't': 'rmbmoney', 'n': 6480},{'a': 'item', 't': '4', 'n': 100},{'a': 'item', 't': '4', 'n': 100} ] } ], //任务相关 type 1 每日任务（每天刷新） 2 活动任务（轮数） 3 每日登录 4-一次性任务 任务hdid一定要唯一 @@ -4607,14 +4607,15 @@ "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} - + //P是权重 + //gailv是显示的概率 + {"a": "item", "t":"1", "n": 10000000, "p": 10, "gailv": 10}, + {"a": "item", "t":"12", "n": 1000, "p": 10, "gailv": 10}, + {"a": "item", "t":"2", "n": 2000, "p": 10, "gailv": 10}, + {"a": "item", "t":"18", "n": 100, "p": 10, "gailv": 10}, + {"a": "item", "t":"18", "n": 200, "p": 10, "gailv": 10}, + {"a": "item", "t":"18", "n": 300, "p": 10, "gailv": 10}, + {"a": "item", "t":"18", "n": 400, "p": 10, "gailv": 10} ], //免费玩游戏次数 "gamefree": 3, @@ -4631,8 +4632,8 @@ "gift": [ { "id": 1, - "free": "true", - "payid": "", + "free": true, + "payId": "", "buynum": 1, //固定奖励 "prize": [{"a": "attr", "t":"rmbmoney", "n": 100}], @@ -4647,8 +4648,8 @@ }, { "id": 2, - "free": "false", - "payid": "xnhd_libao_1", + "free": false, + "payId": "xnhd_libao_1", "buynum": 2, "prize": [{"a": "attr", "t":"rmbmoney", "n": 120}], "des" : "intr_cszl_des_11", @@ -4665,8 +4666,8 @@ }, { "id": 3, - "free": "false", - "payid": "xnhd_libao_2", + "free": false, + "payId": "xnhd_libao_2", "buynum": 2, "prize": [{"a": "attr", "t":"rmbmoney", "n": 300}], "des" : "intr_cszl_des_12", @@ -4687,8 +4688,8 @@ }, { "id": 4, - "free": "false", - "payid": "xnhd_libao_3", + "free": false, + "payId": "xnhd_libao_3", "buynum": 5, "prize": [{"a": "attr", "t":"rmbmoney", "n": 680}], "des" : "intr_cszl_des_12", @@ -4709,8 +4710,8 @@ }, { "id": 5, - "free": "false", - "payid": "xnhd_libao_4", + "free": false, + "payId": "xnhd_libao_4", "buynum": 9, "prize": [{"a": "attr", "t":"rmbmoney", "n": 1280}], "des" : "intr_cszl_des_13", @@ -4733,8 +4734,8 @@ }, { "id": 6, - "free": "false", - "payid": "xnhd_libao_5", + "free": false, + "payId": "xnhd_libao_5", "buynum": 9, "prize": [{"a": "attr", "t":"rmbmoney", "n": 3280}], "des" : "intr_cszl_des_14", @@ -4759,8 +4760,8 @@ }, { "id": 7, - "free": "false", - "payid": "xnhd_libao_6", + "free": false, + "payId": "xnhd_libao_6", "buynum": 9, "prize": [{"a": "attr", "t":"rmbmoney", "n": 6480}], "des" : "intr_cszl_des_14", diff --git a/src/json/pata.json b/src/json/pata.json index 6dd87e7..3b8788a 100644 --- a/src/json/pata.json +++ b/src/json/pata.json @@ -19943,5 +19943,8005 @@ } ], "quickChallenge": 1 + }, + "501": { + "id": 501, + "npcid": 15501, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 91000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 550000 + }, + { + "a": "item", + "t": "23", + "n": 34900 + } + ], + "quickChallenge": 1 + }, + "502": { + "id": 502, + "npcid": 15502, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 91000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 550000 + }, + { + "a": "item", + "t": "23", + "n": 34900 + } + ], + "quickChallenge": 1 + }, + "503": { + "id": 503, + "npcid": 15503, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 91000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 550000 + }, + { + "a": "item", + "t": "23", + "n": 35000 + } + ], + "quickChallenge": 1 + }, + "504": { + "id": 504, + "npcid": 15504, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 91000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 550000 + }, + { + "a": "item", + "t": "23", + "n": 35000 + } + ], + "quickChallenge": 1 + }, + "505": { + "id": 505, + "npcid": 15505, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 91000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 550000 + }, + { + "a": "item", + "t": "23", + "n": 35000 + } + ], + "quickChallenge": 1 + }, + "506": { + "id": 506, + "npcid": 15506, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 92000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 550000 + }, + { + "a": "item", + "t": "23", + "n": 35100 + } + ], + "quickChallenge": 1 + }, + "507": { + "id": 507, + "npcid": 15507, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 92000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 550000 + }, + { + "a": "item", + "t": "23", + "n": 35100 + } + ], + "quickChallenge": 1 + }, + "508": { + "id": 508, + "npcid": 15508, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 92000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 550000 + }, + { + "a": "item", + "t": "23", + "n": 35100 + } + ], + "quickChallenge": 1 + }, + "509": { + "id": 509, + "npcid": 15509, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 92000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 550000 + }, + { + "a": "item", + "t": "23", + "n": 35200 + } + ], + "quickChallenge": 1 + }, + "510": { + "id": 510, + "npcid": 15510, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 92000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 550000 + }, + { + "a": "item", + "t": "23", + "n": 35200 + } + ], + "quickChallenge": 1 + }, + "511": { + "id": 511, + "npcid": 15511, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 93000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 560000 + }, + { + "a": "item", + "t": "23", + "n": 35200 + } + ], + "quickChallenge": 1 + }, + "512": { + "id": 512, + "npcid": 15512, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 93000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 560000 + }, + { + "a": "item", + "t": "23", + "n": 35300 + } + ], + "quickChallenge": 1 + }, + "513": { + "id": 513, + "npcid": 15513, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 93000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 560000 + }, + { + "a": "item", + "t": "23", + "n": 35300 + } + ], + "quickChallenge": 1 + }, + "514": { + "id": 514, + "npcid": 15514, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 93000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 560000 + }, + { + "a": "item", + "t": "23", + "n": 35300 + } + ], + "quickChallenge": 1 + }, + "515": { + "id": 515, + "npcid": 15515, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 93000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 560000 + }, + { + "a": "item", + "t": "23", + "n": 35400 + } + ], + "quickChallenge": 1 + }, + "516": { + "id": 516, + "npcid": 15516, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 94000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 560000 + }, + { + "a": "item", + "t": "23", + "n": 35400 + } + ], + "quickChallenge": 1 + }, + "517": { + "id": 517, + "npcid": 15517, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 94000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 560000 + }, + { + "a": "item", + "t": "23", + "n": 35400 + } + ], + "quickChallenge": 1 + }, + "518": { + "id": 518, + "npcid": 15518, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 94000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 560000 + }, + { + "a": "item", + "t": "23", + "n": 35500 + } + ], + "quickChallenge": 1 + }, + "519": { + "id": 519, + "npcid": 15519, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 94000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 560000 + }, + { + "a": "item", + "t": "23", + "n": 35500 + } + ], + "quickChallenge": 1 + }, + "520": { + "id": 520, + "npcid": 15520, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 94000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 560000 + }, + { + "a": "item", + "t": "23", + "n": 35500 + } + ], + "quickChallenge": 1 + }, + "521": { + "id": 521, + "npcid": 15521, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 95000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 570000 + }, + { + "a": "item", + "t": "23", + "n": 35600 + } + ], + "quickChallenge": 1 + }, + "522": { + "id": 522, + "npcid": 15522, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 95000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 570000 + }, + { + "a": "item", + "t": "23", + "n": 35600 + } + ], + "quickChallenge": 1 + }, + "523": { + "id": 523, + "npcid": 15523, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 95000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 570000 + }, + { + "a": "item", + "t": "23", + "n": 35600 + } + ], + "quickChallenge": 1 + }, + "524": { + "id": 524, + "npcid": 15524, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 95000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 570000 + }, + { + "a": "item", + "t": "23", + "n": 35700 + } + ], + "quickChallenge": 1 + }, + "525": { + "id": 525, + "npcid": 15525, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 95000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 570000 + }, + { + "a": "item", + "t": "23", + "n": 35700 + } + ], + "quickChallenge": 1 + }, + "526": { + "id": 526, + "npcid": 15526, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 96000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 570000 + }, + { + "a": "item", + "t": "23", + "n": 35700 + } + ], + "quickChallenge": 1 + }, + "527": { + "id": 527, + "npcid": 15527, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 96000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 570000 + }, + { + "a": "item", + "t": "23", + "n": 35800 + } + ], + "quickChallenge": 1 + }, + "528": { + "id": 528, + "npcid": 15528, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 96000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 570000 + }, + { + "a": "item", + "t": "23", + "n": 35800 + } + ], + "quickChallenge": 1 + }, + "529": { + "id": 529, + "npcid": 15529, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 96000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 570000 + }, + { + "a": "item", + "t": "23", + "n": 35800 + } + ], + "quickChallenge": 1 + }, + "530": { + "id": 530, + "npcid": 15530, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 96000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 570000 + }, + { + "a": "item", + "t": "23", + "n": 35900 + } + ], + "quickChallenge": 1 + }, + "531": { + "id": 531, + "npcid": 15531, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 97000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 580000 + }, + { + "a": "item", + "t": "23", + "n": 35900 + } + ], + "quickChallenge": 1 + }, + "532": { + "id": 532, + "npcid": 15532, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 97000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 580000 + }, + { + "a": "item", + "t": "23", + "n": 35900 + } + ], + "quickChallenge": 1 + }, + "533": { + "id": 533, + "npcid": 15533, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 97000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 580000 + }, + { + "a": "item", + "t": "23", + "n": 36000 + } + ], + "quickChallenge": 1 + }, + "534": { + "id": 534, + "npcid": 15534, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 97000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 580000 + }, + { + "a": "item", + "t": "23", + "n": 36000 + } + ], + "quickChallenge": 1 + }, + "535": { + "id": 535, + "npcid": 15535, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 97000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 580000 + }, + { + "a": "item", + "t": "23", + "n": 36000 + } + ], + "quickChallenge": 1 + }, + "536": { + "id": 536, + "npcid": 15536, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 98000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 580000 + }, + { + "a": "item", + "t": "23", + "n": 36100 + } + ], + "quickChallenge": 1 + }, + "537": { + "id": 537, + "npcid": 15537, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 98000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 580000 + }, + { + "a": "item", + "t": "23", + "n": 36100 + } + ], + "quickChallenge": 1 + }, + "538": { + "id": 538, + "npcid": 15538, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 98000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 580000 + }, + { + "a": "item", + "t": "23", + "n": 36100 + } + ], + "quickChallenge": 1 + }, + "539": { + "id": 539, + "npcid": 15539, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 98000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 580000 + }, + { + "a": "item", + "t": "23", + "n": 36200 + } + ], + "quickChallenge": 1 + }, + "540": { + "id": 540, + "npcid": 15540, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 98000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 580000 + }, + { + "a": "item", + "t": "23", + "n": 36200 + } + ], + "quickChallenge": 1 + }, + "541": { + "id": 541, + "npcid": 15541, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 99000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 590000 + }, + { + "a": "item", + "t": "23", + "n": 36200 + } + ], + "quickChallenge": 1 + }, + "542": { + "id": 542, + "npcid": 15542, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 99000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 590000 + }, + { + "a": "item", + "t": "23", + "n": 36300 + } + ], + "quickChallenge": 1 + }, + "543": { + "id": 543, + "npcid": 15543, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 99000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 590000 + }, + { + "a": "item", + "t": "23", + "n": 36300 + } + ], + "quickChallenge": 1 + }, + "544": { + "id": 544, + "npcid": 15544, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 99000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 590000 + }, + { + "a": "item", + "t": "23", + "n": 36300 + } + ], + "quickChallenge": 1 + }, + "545": { + "id": 545, + "npcid": 15545, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 99000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 590000 + }, + { + "a": "item", + "t": "23", + "n": 36400 + } + ], + "quickChallenge": 1 + }, + "546": { + "id": 546, + "npcid": 15546, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 100000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 590000 + }, + { + "a": "item", + "t": "23", + "n": 36400 + } + ], + "quickChallenge": 1 + }, + "547": { + "id": 547, + "npcid": 15547, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 100000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 590000 + }, + { + "a": "item", + "t": "23", + "n": 36400 + } + ], + "quickChallenge": 1 + }, + "548": { + "id": 548, + "npcid": 15548, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 100000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 590000 + }, + { + "a": "item", + "t": "23", + "n": 36500 + } + ], + "quickChallenge": 1 + }, + "549": { + "id": 549, + "npcid": 15549, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 100000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 590000 + }, + { + "a": "item", + "t": "23", + "n": 36500 + } + ], + "quickChallenge": 1 + }, + "550": { + "id": 550, + "npcid": 15550, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 100000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 590000 + }, + { + "a": "item", + "t": "23", + "n": 36500 + } + ], + "quickChallenge": 1 + }, + "551": { + "id": 551, + "npcid": 15551, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 101000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 600000 + }, + { + "a": "item", + "t": "23", + "n": 36600 + } + ], + "quickChallenge": 1 + }, + "552": { + "id": 552, + "npcid": 15552, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 101000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 600000 + }, + { + "a": "item", + "t": "23", + "n": 36600 + } + ], + "quickChallenge": 1 + }, + "553": { + "id": 553, + "npcid": 15553, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 101000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 600000 + }, + { + "a": "item", + "t": "23", + "n": 36600 + } + ], + "quickChallenge": 1 + }, + "554": { + "id": 554, + "npcid": 15554, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 101000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 600000 + }, + { + "a": "item", + "t": "23", + "n": 36700 + } + ], + "quickChallenge": 1 + }, + "555": { + "id": 555, + "npcid": 15555, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 101000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 600000 + }, + { + "a": "item", + "t": "23", + "n": 36700 + } + ], + "quickChallenge": 1 + }, + "556": { + "id": 556, + "npcid": 15556, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 102000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 600000 + }, + { + "a": "item", + "t": "23", + "n": 36700 + } + ], + "quickChallenge": 1 + }, + "557": { + "id": 557, + "npcid": 15557, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 102000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 600000 + }, + { + "a": "item", + "t": "23", + "n": 36800 + } + ], + "quickChallenge": 1 + }, + "558": { + "id": 558, + "npcid": 15558, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 102000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 600000 + }, + { + "a": "item", + "t": "23", + "n": 36800 + } + ], + "quickChallenge": 1 + }, + "559": { + "id": 559, + "npcid": 15559, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 102000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 600000 + }, + { + "a": "item", + "t": "23", + "n": 36800 + } + ], + "quickChallenge": 1 + }, + "560": { + "id": 560, + "npcid": 15560, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 102000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 600000 + }, + { + "a": "item", + "t": "23", + "n": 36900 + } + ], + "quickChallenge": 1 + }, + "561": { + "id": 561, + "npcid": 15561, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 103000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 610000 + }, + { + "a": "item", + "t": "23", + "n": 36900 + } + ], + "quickChallenge": 1 + }, + "562": { + "id": 562, + "npcid": 15562, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 103000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 610000 + }, + { + "a": "item", + "t": "23", + "n": 36900 + } + ], + "quickChallenge": 1 + }, + "563": { + "id": 563, + "npcid": 15563, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 103000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 610000 + }, + { + "a": "item", + "t": "23", + "n": 37000 + } + ], + "quickChallenge": 1 + }, + "564": { + "id": 564, + "npcid": 15564, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 103000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 610000 + }, + { + "a": "item", + "t": "23", + "n": 37000 + } + ], + "quickChallenge": 1 + }, + "565": { + "id": 565, + "npcid": 15565, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 103000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 610000 + }, + { + "a": "item", + "t": "23", + "n": 37000 + } + ], + "quickChallenge": 1 + }, + "566": { + "id": 566, + "npcid": 15566, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 104000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 610000 + }, + { + "a": "item", + "t": "23", + "n": 37100 + } + ], + "quickChallenge": 1 + }, + "567": { + "id": 567, + "npcid": 15567, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 104000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 610000 + }, + { + "a": "item", + "t": "23", + "n": 37100 + } + ], + "quickChallenge": 1 + }, + "568": { + "id": 568, + "npcid": 15568, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 104000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 610000 + }, + { + "a": "item", + "t": "23", + "n": 37100 + } + ], + "quickChallenge": 1 + }, + "569": { + "id": 569, + "npcid": 15569, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 104000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 610000 + }, + { + "a": "item", + "t": "23", + "n": 37200 + } + ], + "quickChallenge": 1 + }, + "570": { + "id": 570, + "npcid": 15570, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 104000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 610000 + }, + { + "a": "item", + "t": "23", + "n": 37200 + } + ], + "quickChallenge": 1 + }, + "571": { + "id": 571, + "npcid": 15571, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 105000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 620000 + }, + { + "a": "item", + "t": "23", + "n": 37200 + } + ], + "quickChallenge": 1 + }, + "572": { + "id": 572, + "npcid": 15572, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 105000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 620000 + }, + { + "a": "item", + "t": "23", + "n": 37300 + } + ], + "quickChallenge": 1 + }, + "573": { + "id": 573, + "npcid": 15573, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 105000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 620000 + }, + { + "a": "item", + "t": "23", + "n": 37300 + } + ], + "quickChallenge": 1 + }, + "574": { + "id": 574, + "npcid": 15574, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 105000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 620000 + }, + { + "a": "item", + "t": "23", + "n": 37300 + } + ], + "quickChallenge": 1 + }, + "575": { + "id": 575, + "npcid": 15575, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 105000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 620000 + }, + { + "a": "item", + "t": "23", + "n": 37400 + } + ], + "quickChallenge": 1 + }, + "576": { + "id": 576, + "npcid": 15576, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 106000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 620000 + }, + { + "a": "item", + "t": "23", + "n": 37400 + } + ], + "quickChallenge": 1 + }, + "577": { + "id": 577, + "npcid": 15577, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 106000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 620000 + }, + { + "a": "item", + "t": "23", + "n": 37400 + } + ], + "quickChallenge": 1 + }, + "578": { + "id": 578, + "npcid": 15578, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 106000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 620000 + }, + { + "a": "item", + "t": "23", + "n": 37500 + } + ], + "quickChallenge": 1 + }, + "579": { + "id": 579, + "npcid": 15579, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 106000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 620000 + }, + { + "a": "item", + "t": "23", + "n": 37500 + } + ], + "quickChallenge": 1 + }, + "580": { + "id": 580, + "npcid": 15580, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 106000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 620000 + }, + { + "a": "item", + "t": "23", + "n": 37500 + } + ], + "quickChallenge": 1 + }, + "581": { + "id": 581, + "npcid": 15581, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 107000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 630000 + }, + { + "a": "item", + "t": "23", + "n": 37600 + } + ], + "quickChallenge": 1 + }, + "582": { + "id": 582, + "npcid": 15582, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 107000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 630000 + }, + { + "a": "item", + "t": "23", + "n": 37600 + } + ], + "quickChallenge": 1 + }, + "583": { + "id": 583, + "npcid": 15583, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 107000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 630000 + }, + { + "a": "item", + "t": "23", + "n": 37600 + } + ], + "quickChallenge": 1 + }, + "584": { + "id": 584, + "npcid": 15584, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 107000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 630000 + }, + { + "a": "item", + "t": "23", + "n": 37700 + } + ], + "quickChallenge": 1 + }, + "585": { + "id": 585, + "npcid": 15585, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 107000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 630000 + }, + { + "a": "item", + "t": "23", + "n": 37700 + } + ], + "quickChallenge": 1 + }, + "586": { + "id": 586, + "npcid": 15586, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 108000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 630000 + }, + { + "a": "item", + "t": "23", + "n": 37700 + } + ], + "quickChallenge": 1 + }, + "587": { + "id": 587, + "npcid": 15587, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 108000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 630000 + }, + { + "a": "item", + "t": "23", + "n": 37800 + } + ], + "quickChallenge": 1 + }, + "588": { + "id": 588, + "npcid": 15588, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 108000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 630000 + }, + { + "a": "item", + "t": "23", + "n": 37800 + } + ], + "quickChallenge": 1 + }, + "589": { + "id": 589, + "npcid": 15589, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 108000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 630000 + }, + { + "a": "item", + "t": "23", + "n": 37800 + } + ], + "quickChallenge": 1 + }, + "590": { + "id": 590, + "npcid": 15590, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 108000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 630000 + }, + { + "a": "item", + "t": "23", + "n": 37900 + } + ], + "quickChallenge": 1 + }, + "591": { + "id": 591, + "npcid": 15591, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 109000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 640000 + }, + { + "a": "item", + "t": "23", + "n": 37900 + } + ], + "quickChallenge": 1 + }, + "592": { + "id": 592, + "npcid": 15592, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 109000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 640000 + }, + { + "a": "item", + "t": "23", + "n": 37900 + } + ], + "quickChallenge": 1 + }, + "593": { + "id": 593, + "npcid": 15593, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 109000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 640000 + }, + { + "a": "item", + "t": "23", + "n": 38000 + } + ], + "quickChallenge": 1 + }, + "594": { + "id": 594, + "npcid": 15594, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 109000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 640000 + }, + { + "a": "item", + "t": "23", + "n": 38000 + } + ], + "quickChallenge": 1 + }, + "595": { + "id": 595, + "npcid": 15595, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 109000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 640000 + }, + { + "a": "item", + "t": "23", + "n": 38000 + } + ], + "quickChallenge": 1 + }, + "596": { + "id": 596, + "npcid": 15596, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 110000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 640000 + }, + { + "a": "item", + "t": "23", + "n": 38100 + } + ], + "quickChallenge": 1 + }, + "597": { + "id": 597, + "npcid": 15597, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 110000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 640000 + }, + { + "a": "item", + "t": "23", + "n": 38100 + } + ], + "quickChallenge": 1 + }, + "598": { + "id": 598, + "npcid": 15598, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 110000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 640000 + }, + { + "a": "item", + "t": "23", + "n": 38100 + } + ], + "quickChallenge": 1 + }, + "599": { + "id": 599, + "npcid": 15599, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 110000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 640000 + }, + { + "a": "item", + "t": "23", + "n": 38200 + } + ], + "quickChallenge": 1 + }, + "600": { + "id": 600, + "npcid": 15600, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 110000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 640000 + }, + { + "a": "item", + "t": "23", + "n": 38200 + } + ], + "quickChallenge": 1 + }, + "601": { + "id": 601, + "npcid": 15601, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 111000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 650000 + }, + { + "a": "item", + "t": "23", + "n": 38200 + } + ], + "quickChallenge": 1 + }, + "602": { + "id": 602, + "npcid": 15602, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 111000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 650000 + }, + { + "a": "item", + "t": "23", + "n": 38300 + } + ], + "quickChallenge": 1 + }, + "603": { + "id": 603, + "npcid": 15603, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 111000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 650000 + }, + { + "a": "item", + "t": "23", + "n": 38300 + } + ], + "quickChallenge": 1 + }, + "604": { + "id": 604, + "npcid": 15604, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 111000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 650000 + }, + { + "a": "item", + "t": "23", + "n": 38300 + } + ], + "quickChallenge": 1 + }, + "605": { + "id": 605, + "npcid": 15605, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 111000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 650000 + }, + { + "a": "item", + "t": "23", + "n": 38400 + } + ], + "quickChallenge": 1 + }, + "606": { + "id": 606, + "npcid": 15606, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 112000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 650000 + }, + { + "a": "item", + "t": "23", + "n": 38400 + } + ], + "quickChallenge": 1 + }, + "607": { + "id": 607, + "npcid": 15607, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 112000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 650000 + }, + { + "a": "item", + "t": "23", + "n": 38400 + } + ], + "quickChallenge": 1 + }, + "608": { + "id": 608, + "npcid": 15608, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 112000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 650000 + }, + { + "a": "item", + "t": "23", + "n": 38500 + } + ], + "quickChallenge": 1 + }, + "609": { + "id": 609, + "npcid": 15609, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 112000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 650000 + }, + { + "a": "item", + "t": "23", + "n": 38500 + } + ], + "quickChallenge": 1 + }, + "610": { + "id": 610, + "npcid": 15610, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 112000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 650000 + }, + { + "a": "item", + "t": "23", + "n": 38500 + } + ], + "quickChallenge": 1 + }, + "611": { + "id": 611, + "npcid": 15611, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 113000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 660000 + }, + { + "a": "item", + "t": "23", + "n": 38600 + } + ], + "quickChallenge": 1 + }, + "612": { + "id": 612, + "npcid": 15612, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 113000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 660000 + }, + { + "a": "item", + "t": "23", + "n": 38600 + } + ], + "quickChallenge": 1 + }, + "613": { + "id": 613, + "npcid": 15613, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 113000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 660000 + }, + { + "a": "item", + "t": "23", + "n": 38600 + } + ], + "quickChallenge": 1 + }, + "614": { + "id": 614, + "npcid": 15614, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 113000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 660000 + }, + { + "a": "item", + "t": "23", + "n": 38700 + } + ], + "quickChallenge": 1 + }, + "615": { + "id": 615, + "npcid": 15615, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 113000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 660000 + }, + { + "a": "item", + "t": "23", + "n": 38700 + } + ], + "quickChallenge": 1 + }, + "616": { + "id": 616, + "npcid": 15616, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 114000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 660000 + }, + { + "a": "item", + "t": "23", + "n": 38700 + } + ], + "quickChallenge": 1 + }, + "617": { + "id": 617, + "npcid": 15617, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 114000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 660000 + }, + { + "a": "item", + "t": "23", + "n": 38800 + } + ], + "quickChallenge": 1 + }, + "618": { + "id": 618, + "npcid": 15618, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 114000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 660000 + }, + { + "a": "item", + "t": "23", + "n": 38800 + } + ], + "quickChallenge": 1 + }, + "619": { + "id": 619, + "npcid": 15619, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 114000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 660000 + }, + { + "a": "item", + "t": "23", + "n": 38800 + } + ], + "quickChallenge": 1 + }, + "620": { + "id": 620, + "npcid": 15620, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 114000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 660000 + }, + { + "a": "item", + "t": "23", + "n": 38900 + } + ], + "quickChallenge": 1 + }, + "621": { + "id": 621, + "npcid": 15621, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 115000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 670000 + }, + { + "a": "item", + "t": "23", + "n": 38900 + } + ], + "quickChallenge": 1 + }, + "622": { + "id": 622, + "npcid": 15622, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 115000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 670000 + }, + { + "a": "item", + "t": "23", + "n": 38900 + } + ], + "quickChallenge": 1 + }, + "623": { + "id": 623, + "npcid": 15623, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 115000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 670000 + }, + { + "a": "item", + "t": "23", + "n": 39000 + } + ], + "quickChallenge": 1 + }, + "624": { + "id": 624, + "npcid": 15624, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 115000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 670000 + }, + { + "a": "item", + "t": "23", + "n": 39000 + } + ], + "quickChallenge": 1 + }, + "625": { + "id": 625, + "npcid": 15625, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 115000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 670000 + }, + { + "a": "item", + "t": "23", + "n": 39000 + } + ], + "quickChallenge": 1 + }, + "626": { + "id": 626, + "npcid": 15626, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 116000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 670000 + }, + { + "a": "item", + "t": "23", + "n": 39100 + } + ], + "quickChallenge": 1 + }, + "627": { + "id": 627, + "npcid": 15627, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 116000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 670000 + }, + { + "a": "item", + "t": "23", + "n": 39100 + } + ], + "quickChallenge": 1 + }, + "628": { + "id": 628, + "npcid": 15628, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 116000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 670000 + }, + { + "a": "item", + "t": "23", + "n": 39100 + } + ], + "quickChallenge": 1 + }, + "629": { + "id": 629, + "npcid": 15629, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 116000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 670000 + }, + { + "a": "item", + "t": "23", + "n": 39200 + } + ], + "quickChallenge": 1 + }, + "630": { + "id": 630, + "npcid": 15630, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 116000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 670000 + }, + { + "a": "item", + "t": "23", + "n": 39200 + } + ], + "quickChallenge": 1 + }, + "631": { + "id": 631, + "npcid": 15631, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 117000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 680000 + }, + { + "a": "item", + "t": "23", + "n": 39200 + } + ], + "quickChallenge": 1 + }, + "632": { + "id": 632, + "npcid": 15632, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 117000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 680000 + }, + { + "a": "item", + "t": "23", + "n": 39300 + } + ], + "quickChallenge": 1 + }, + "633": { + "id": 633, + "npcid": 15633, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 117000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 680000 + }, + { + "a": "item", + "t": "23", + "n": 39300 + } + ], + "quickChallenge": 1 + }, + "634": { + "id": 634, + "npcid": 15634, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 117000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 680000 + }, + { + "a": "item", + "t": "23", + "n": 39300 + } + ], + "quickChallenge": 1 + }, + "635": { + "id": 635, + "npcid": 15635, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 117000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 680000 + }, + { + "a": "item", + "t": "23", + "n": 39400 + } + ], + "quickChallenge": 1 + }, + "636": { + "id": 636, + "npcid": 15636, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 118000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 680000 + }, + { + "a": "item", + "t": "23", + "n": 39400 + } + ], + "quickChallenge": 1 + }, + "637": { + "id": 637, + "npcid": 15637, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 118000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 680000 + }, + { + "a": "item", + "t": "23", + "n": 39400 + } + ], + "quickChallenge": 1 + }, + "638": { + "id": 638, + "npcid": 15638, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 118000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 680000 + }, + { + "a": "item", + "t": "23", + "n": 39500 + } + ], + "quickChallenge": 1 + }, + "639": { + "id": 639, + "npcid": 15639, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 118000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 680000 + }, + { + "a": "item", + "t": "23", + "n": 39500 + } + ], + "quickChallenge": 1 + }, + "640": { + "id": 640, + "npcid": 15640, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 118000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 680000 + }, + { + "a": "item", + "t": "23", + "n": 39500 + } + ], + "quickChallenge": 1 + }, + "641": { + "id": 641, + "npcid": 15641, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 119000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 690000 + }, + { + "a": "item", + "t": "23", + "n": 39600 + } + ], + "quickChallenge": 1 + }, + "642": { + "id": 642, + "npcid": 15642, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 119000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 690000 + }, + { + "a": "item", + "t": "23", + "n": 39600 + } + ], + "quickChallenge": 1 + }, + "643": { + "id": 643, + "npcid": 15643, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 119000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 690000 + }, + { + "a": "item", + "t": "23", + "n": 39600 + } + ], + "quickChallenge": 1 + }, + "644": { + "id": 644, + "npcid": 15644, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 119000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 690000 + }, + { + "a": "item", + "t": "23", + "n": 39700 + } + ], + "quickChallenge": 1 + }, + "645": { + "id": 645, + "npcid": 15645, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 119000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 690000 + }, + { + "a": "item", + "t": "23", + "n": 39700 + } + ], + "quickChallenge": 1 + }, + "646": { + "id": 646, + "npcid": 15646, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 120000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 690000 + }, + { + "a": "item", + "t": "23", + "n": 39700 + } + ], + "quickChallenge": 1 + }, + "647": { + "id": 647, + "npcid": 15647, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 120000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 690000 + }, + { + "a": "item", + "t": "23", + "n": 39800 + } + ], + "quickChallenge": 1 + }, + "648": { + "id": 648, + "npcid": 15648, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 120000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 690000 + }, + { + "a": "item", + "t": "23", + "n": 39800 + } + ], + "quickChallenge": 1 + }, + "649": { + "id": 649, + "npcid": 15649, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 120000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 690000 + }, + { + "a": "item", + "t": "23", + "n": 39800 + } + ], + "quickChallenge": 1 + }, + "650": { + "id": 650, + "npcid": 15650, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 120000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 690000 + }, + { + "a": "item", + "t": "23", + "n": 39900 + } + ], + "quickChallenge": 1 + }, + "651": { + "id": 651, + "npcid": 15651, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 121000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 700000 + }, + { + "a": "item", + "t": "23", + "n": 39900 + } + ], + "quickChallenge": 1 + }, + "652": { + "id": 652, + "npcid": 15652, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 121000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 700000 + }, + { + "a": "item", + "t": "23", + "n": 39900 + } + ], + "quickChallenge": 1 + }, + "653": { + "id": 653, + "npcid": 15653, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 121000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 700000 + }, + { + "a": "item", + "t": "23", + "n": 40000 + } + ], + "quickChallenge": 1 + }, + "654": { + "id": 654, + "npcid": 15654, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 121000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 700000 + }, + { + "a": "item", + "t": "23", + "n": 40000 + } + ], + "quickChallenge": 1 + }, + "655": { + "id": 655, + "npcid": 15655, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 121000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 700000 + }, + { + "a": "item", + "t": "23", + "n": 40000 + } + ], + "quickChallenge": 1 + }, + "656": { + "id": 656, + "npcid": 15656, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 122000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 700000 + }, + { + "a": "item", + "t": "23", + "n": 40100 + } + ], + "quickChallenge": 1 + }, + "657": { + "id": 657, + "npcid": 15657, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 122000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 700000 + }, + { + "a": "item", + "t": "23", + "n": 40100 + } + ], + "quickChallenge": 1 + }, + "658": { + "id": 658, + "npcid": 15658, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 122000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 700000 + }, + { + "a": "item", + "t": "23", + "n": 40100 + } + ], + "quickChallenge": 1 + }, + "659": { + "id": 659, + "npcid": 15659, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 122000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 700000 + }, + { + "a": "item", + "t": "23", + "n": 40200 + } + ], + "quickChallenge": 1 + }, + "660": { + "id": 660, + "npcid": 15660, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 122000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 700000 + }, + { + "a": "item", + "t": "23", + "n": 40200 + } + ], + "quickChallenge": 1 + }, + "661": { + "id": 661, + "npcid": 15661, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 123000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 710000 + }, + { + "a": "item", + "t": "23", + "n": 40200 + } + ], + "quickChallenge": 1 + }, + "662": { + "id": 662, + "npcid": 15662, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 123000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 710000 + }, + { + "a": "item", + "t": "23", + "n": 40300 + } + ], + "quickChallenge": 1 + }, + "663": { + "id": 663, + "npcid": 15663, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 123000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 710000 + }, + { + "a": "item", + "t": "23", + "n": 40300 + } + ], + "quickChallenge": 1 + }, + "664": { + "id": 664, + "npcid": 15664, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 123000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 710000 + }, + { + "a": "item", + "t": "23", + "n": 40300 + } + ], + "quickChallenge": 1 + }, + "665": { + "id": 665, + "npcid": 15665, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 123000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 710000 + }, + { + "a": "item", + "t": "23", + "n": 40400 + } + ], + "quickChallenge": 1 + }, + "666": { + "id": 666, + "npcid": 15666, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 124000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 710000 + }, + { + "a": "item", + "t": "23", + "n": 40400 + } + ], + "quickChallenge": 1 + }, + "667": { + "id": 667, + "npcid": 15667, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 124000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 710000 + }, + { + "a": "item", + "t": "23", + "n": 40400 + } + ], + "quickChallenge": 1 + }, + "668": { + "id": 668, + "npcid": 15668, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 124000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 710000 + }, + { + "a": "item", + "t": "23", + "n": 40500 + } + ], + "quickChallenge": 1 + }, + "669": { + "id": 669, + "npcid": 15669, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 124000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 710000 + }, + { + "a": "item", + "t": "23", + "n": 40500 + } + ], + "quickChallenge": 1 + }, + "670": { + "id": 670, + "npcid": 15670, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 124000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 710000 + }, + { + "a": "item", + "t": "23", + "n": 40500 + } + ], + "quickChallenge": 1 + }, + "671": { + "id": 671, + "npcid": 15671, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 125000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 720000 + }, + { + "a": "item", + "t": "23", + "n": 40600 + } + ], + "quickChallenge": 1 + }, + "672": { + "id": 672, + "npcid": 15672, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 125000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 720000 + }, + { + "a": "item", + "t": "23", + "n": 40600 + } + ], + "quickChallenge": 1 + }, + "673": { + "id": 673, + "npcid": 15673, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 125000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 720000 + }, + { + "a": "item", + "t": "23", + "n": 40600 + } + ], + "quickChallenge": 1 + }, + "674": { + "id": 674, + "npcid": 15674, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 125000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 720000 + }, + { + "a": "item", + "t": "23", + "n": 40700 + } + ], + "quickChallenge": 1 + }, + "675": { + "id": 675, + "npcid": 15675, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 125000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 720000 + }, + { + "a": "item", + "t": "23", + "n": 40700 + } + ], + "quickChallenge": 1 + }, + "676": { + "id": 676, + "npcid": 15676, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 126000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 720000 + }, + { + "a": "item", + "t": "23", + "n": 40700 + } + ], + "quickChallenge": 1 + }, + "677": { + "id": 677, + "npcid": 15677, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 126000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 720000 + }, + { + "a": "item", + "t": "23", + "n": 40800 + } + ], + "quickChallenge": 1 + }, + "678": { + "id": 678, + "npcid": 15678, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 126000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 720000 + }, + { + "a": "item", + "t": "23", + "n": 40800 + } + ], + "quickChallenge": 1 + }, + "679": { + "id": 679, + "npcid": 15679, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 126000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 720000 + }, + { + "a": "item", + "t": "23", + "n": 40800 + } + ], + "quickChallenge": 1 + }, + "680": { + "id": 680, + "npcid": 15680, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 126000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 720000 + }, + { + "a": "item", + "t": "23", + "n": 40900 + } + ], + "quickChallenge": 1 + }, + "681": { + "id": 681, + "npcid": 15681, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 127000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 730000 + }, + { + "a": "item", + "t": "23", + "n": 40900 + } + ], + "quickChallenge": 1 + }, + "682": { + "id": 682, + "npcid": 15682, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 127000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 730000 + }, + { + "a": "item", + "t": "23", + "n": 40900 + } + ], + "quickChallenge": 1 + }, + "683": { + "id": 683, + "npcid": 15683, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 127000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 730000 + }, + { + "a": "item", + "t": "23", + "n": 41000 + } + ], + "quickChallenge": 1 + }, + "684": { + "id": 684, + "npcid": 15684, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 127000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 730000 + }, + { + "a": "item", + "t": "23", + "n": 41000 + } + ], + "quickChallenge": 1 + }, + "685": { + "id": 685, + "npcid": 15685, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 127000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 730000 + }, + { + "a": "item", + "t": "23", + "n": 41000 + } + ], + "quickChallenge": 1 + }, + "686": { + "id": 686, + "npcid": 15686, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 128000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 730000 + }, + { + "a": "item", + "t": "23", + "n": 41100 + } + ], + "quickChallenge": 1 + }, + "687": { + "id": 687, + "npcid": 15687, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 128000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 730000 + }, + { + "a": "item", + "t": "23", + "n": 41100 + } + ], + "quickChallenge": 1 + }, + "688": { + "id": 688, + "npcid": 15688, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 128000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 730000 + }, + { + "a": "item", + "t": "23", + "n": 41100 + } + ], + "quickChallenge": 1 + }, + "689": { + "id": 689, + "npcid": 15689, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 128000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 730000 + }, + { + "a": "item", + "t": "23", + "n": 41200 + } + ], + "quickChallenge": 1 + }, + "690": { + "id": 690, + "npcid": 15690, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 128000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_msk", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 730000 + }, + { + "a": "item", + "t": "23", + "n": 41200 + } + ], + "quickChallenge": 1 + }, + "691": { + "id": 691, + "npcid": 15691, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 129000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 740000 + }, + { + "a": "item", + "t": "23", + "n": 41200 + } + ], + "quickChallenge": 1 + }, + "692": { + "id": 692, + "npcid": 15692, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 129000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 740000 + }, + { + "a": "item", + "t": "23", + "n": 41300 + } + ], + "quickChallenge": 1 + }, + "693": { + "id": 693, + "npcid": 15693, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 129000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 740000 + }, + { + "a": "item", + "t": "23", + "n": 41300 + } + ], + "quickChallenge": 1 + }, + "694": { + "id": 694, + "npcid": 15694, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 129000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 740000 + }, + { + "a": "item", + "t": "23", + "n": 41300 + } + ], + "quickChallenge": 1 + }, + "695": { + "id": 695, + "npcid": 15695, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 129000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 740000 + }, + { + "a": "item", + "t": "23", + "n": 41400 + } + ], + "quickChallenge": 1 + }, + "696": { + "id": 696, + "npcid": 15696, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 130000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 740000 + }, + { + "a": "item", + "t": "23", + "n": 41400 + } + ], + "quickChallenge": 1 + }, + "697": { + "id": 697, + "npcid": 15697, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 130000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 740000 + }, + { + "a": "item", + "t": "23", + "n": 41400 + } + ], + "quickChallenge": 1 + }, + "698": { + "id": 698, + "npcid": 15698, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 130000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "32", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 740000 + }, + { + "a": "item", + "t": "23", + "n": 41500 + } + ], + "quickChallenge": 1 + }, + "699": { + "id": 699, + "npcid": 15699, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 130000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "30", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 740000 + }, + { + "a": "item", + "t": "23", + "n": 41500 + } + ], + "quickChallenge": 1 + }, + "700": { + "id": 700, + "npcid": 15700, + "prize": [ + { + "a": "attr", + "t": "nexp", + "n": 130000 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 50 + }, + { + "a": "item", + "t": "23", + "n": 800 + }, + { + "a": "item", + "t": "31", + "n": 5 + } + ], + "img": "bg_fight1_sgd", + "sdprize": [ + { + "a": "item", + "t": "1", + "n": 740000 + }, + { + "a": "item", + "t": "23", + "n": 41500 + } + ], + "quickChallenge": 1 } } \ No newline at end of file diff --git a/src/json/pay.json b/src/json/pay.json index b5ce33f..d8cd45d 100644 --- a/src/json/pay.json +++ b/src/json/pay.json @@ -4246,7 +4246,7 @@ "firstPayPrize": [], "name": "pay_name_mingwang_4", "undefined": "名望礼包_128元", - "time": -1, + "time": 86400, "buys": 1, "needVip": 0, "front": {}, @@ -4265,8 +4265,8 @@ "prize": [], "firstPayPrize": [], "name": "pay_name_wkdlibao_1", - "undefined": "周末礼包_1元", - "time": 86400, + "undefined": "期间限定_1元", + "time": -1, "buys": 0, "needVip": 0, "front": {}, @@ -4285,8 +4285,8 @@ "prize": [], "firstPayPrize": [], "name": "pay_name_wkdlibao_2", - "undefined": "周末礼包_6元", - "time": 86400, + "undefined": "期间限定_6元", + "time": -1, "buys": 0, "needVip": 0, "front": {}, @@ -4305,8 +4305,8 @@ "prize": [], "firstPayPrize": [], "name": "pay_name_wkdlibao_3", - "undefined": "周末礼包_30元", - "time": 86400, + "undefined": "期间限定_30元", + "time": -1, "buys": 0, "needVip": 0, "front": {}, @@ -4325,8 +4325,8 @@ "prize": [], "firstPayPrize": [], "name": "pay_name_wkdlibao_4", - "undefined": "周末礼包_68元", - "time": 86400, + "undefined": "期间限定_68元", + "time": -1, "buys": 0, "needVip": 0, "front": {}, @@ -4345,8 +4345,8 @@ "prize": [], "firstPayPrize": [], "name": "pay_name_wkdlibao_5", - "undefined": "周末礼包_128元", - "time": 86400, + "undefined": "期间限定_128元", + "time": -1, "buys": 0, "needVip": 0, "front": {}, @@ -4365,8 +4365,8 @@ "prize": [], "firstPayPrize": [], "name": "pay_name_wkdlibao_6", - "undefined": "周末礼包_328元", - "time": 86400, + "undefined": "期间限定_328元", + "time": -1, "buys": 0, "needVip": 0, "front": {}, @@ -4385,8 +4385,8 @@ "prize": [], "firstPayPrize": [], "name": "pay_name_wkdlibao_7", - "undefined": "周末礼包_648元", - "time": 86400, + "undefined": "期间限定_648元", + "time": -1, "buys": 0, "needVip": 0, "front": {}, diff --git a/src/json/tuisonglibao.json b/src/json/tuisonglibao.json index cdc0822..e2160f2 100644 --- a/src/json/tuisonglibao.json +++ b/src/json/tuisonglibao.json @@ -11,7 +11,7 @@ "guanqialibao_2" ], "time": 3600, - "displayCD": 3600, + "displayCD": 10800, "scale": 3000, "icon": "gkts" }, @@ -393,8 +393,8 @@ "payId": [ "lv15" ], - "time": 3600, - "displayCD": 3600, + "time": 10800, + "displayCD": 10800, "scale": 3000, "icon": "djlb" }, @@ -408,8 +408,8 @@ "payId": [ "lv25" ], - "time": 3600, - "displayCD": 3600, + "time": 10800, + "displayCD": 10800, "scale": 3000, "icon": "djlb" }, From add9c7c5623af02d78a8803a23ef7c86862905c1 Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 27 Dec 2023 19:49:33 +0800 Subject: [PATCH 29/37] =?UTF-8?q?fix=20=E5=85=83=E6=97=A6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/yuandan/ApiTaskRec.ts | 3 --- src/api_s2c/event/yuandan/fun.ts | 9 ++++----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/api_s2c/event/yuandan/ApiTaskRec.ts b/src/api_s2c/event/yuandan/ApiTaskRec.ts index 14dd38d..04e95eb 100644 --- a/src/api_s2c/event/yuandan/ApiTaskRec.ts +++ b/src/api_s2c/event/yuandan/ApiTaskRec.ts @@ -22,10 +22,7 @@ export default async function (call: ApiCall) { return call.error('', { code: -3, message: globalThis.lng.yangchengmubiao_4 }) } _mydata.taskfinish.push(taskid) - let _addval = _con.addval let _setData = {} - _mydata["val"] += _addval - _setData["val"] = _mydata.val _setData["taskfinish"] = _mydata.taskfinish await Yuandanfun.setData(call.uid, _hd.hdid, { $set: _setData }) let _prize = _con.prize diff --git a/src/api_s2c/event/yuandan/fun.ts b/src/api_s2c/event/yuandan/fun.ts index 8ed1590..23f9037 100644 --- a/src/api_s2c/event/yuandan/fun.ts +++ b/src/api_s2c/event/yuandan/fun.ts @@ -41,7 +41,7 @@ export class Yuandanfun { let _tmp = _tasks[element] _tmp["id"] = element // 每日登录直接完成 - if (element == "1") { + if (_tmp.stype == "128") { _res[element] = 1 } else { _res[element] = 0 @@ -60,8 +60,7 @@ export class Yuandanfun { /**设置任务 */ static async setTaskVal(call: ApiCall, stype: number, val: number, chkCall: Function, chkval: number = 0, isinc: number = 0, alchangeVal: Function, arg) { - // let hdids = await this.gethdids(call) - // if (hdids.length <= 0) return // 活动过期，不计数 + // 活动过期，不计数 let _hd = await this.getCon(call) if (!_hd) return @@ -96,8 +95,8 @@ export class Yuandanfun { // 设置任务 if (isset == 1) { - await G.mongodb.collection('event').updateMany( - {uid: call.uid, type: {$regex: `yuandan${_hd.hdid}`}}, + await G.mongodb.collection('event').updateOne( + {uid: call.uid, type: `yuandan${_hd.hdid}`}, _setData ) } From 12300703b5133777bb8036586737e262448caf53 Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 27 Dec 2023 20:09:59 +0800 Subject: [PATCH 30/37] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E4=BB=98=E8=B4=B9=E7=A4=BC=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/yuandan/fun.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/api_s2c/event/yuandan/fun.ts b/src/api_s2c/event/yuandan/fun.ts index 23f9037..785049d 100644 --- a/src/api_s2c/event/yuandan/fun.ts +++ b/src/api_s2c/event/yuandan/fun.ts @@ -2,6 +2,7 @@ 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 { /**配置 */ @@ -27,10 +28,19 @@ export class Yuandanfun { 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) From 27ec272347e132066d7093b8c478048ceb67db0c Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 27 Dec 2023 20:21:13 +0800 Subject: [PATCH 31/37] cehua json --- src/json/tuisonglibao.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/json/tuisonglibao.json b/src/json/tuisonglibao.json index e2160f2..4880ba6 100644 --- a/src/json/tuisonglibao.json +++ b/src/json/tuisonglibao.json @@ -11,7 +11,7 @@ "guanqialibao_2" ], "time": 3600, - "displayCD": 10800, + "displayCD": 3600, "scale": 3000, "icon": "gkts" }, From c0e6f6516c19faff6f77948da40b73e8d0965ec6 Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 27 Dec 2023 20:49:23 +0800 Subject: [PATCH 32/37] cehua json --- src/json/item.json | 8 +- src/json/npc.json | 3000 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 3002 insertions(+), 6 deletions(-) diff --git a/src/json/item.json b/src/json/item.json index ece3438..c0dcdd7 100644 --- a/src/json/item.json +++ b/src/json/item.json @@ -2884,9 +2884,7 @@ "type": 3, "sort": 3, "colour": 6, - "way": [ - 75 - ], + "way": [], "go": "", "icon": "icon_gbsp_5002", "describe": "intr_item_describe_5002", @@ -2927,9 +2925,7 @@ "type": 3, "sort": 3, "colour": 6, - "way": [ - 75 - ], + "way": [], "go": "", "icon": "icon_gbsp_5004", "describe": "intr_item_describe_5004", diff --git a/src/json/npc.json b/src/json/npc.json index bd65555..37384b7 100644 --- a/src/json/npc.json +++ b/src/json/npc.json @@ -18825,6 +18825,3006 @@ "isboss": 0, "ghname": "npc_ghname_5" }, + "15501": { + "npcId": 15501, + "attr": {}, + "npclist": "4003_578_90072#5004_578_90070#3006_578_90071#4007_578_90070#4014_578_90074#5005_578_90073", + "npcLv": [ + 1502, + 1502, + 1502, + 1502, + 1502, + 1502 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15502": { + "npcId": 15502, + "attr": {}, + "npclist": "5002_581_90072#3014_581_90070#5005_581_90071#4010_581_90072#4009_581_90074#4004_581_90073", + "npcLv": [ + 1511, + 1511, + 1511, + 1511, + 1511, + 1511 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15503": { + "npcId": 15503, + "attr": {}, + "npclist": "4008_581_90072#5005_581_90070#4005_581_90071#4015_581_90072#4012_581_90074#4013_581_90073", + "npcLv": [ + 1511, + 1511, + 1511, + 1511, + 1511, + 1511 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15504": { + "npcId": 15504, + "attr": {}, + "npclist": "5005_584_90072#3010_584_90070#4011_584_90071#4003_584_90072#5001_584_90074#5003_584_90073", + "npcLv": [ + 1520, + 1520, + 1520, + 1520, + 1520, + 1520 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15505": { + "npcId": 15505, + "attr": {}, + "npclist": "4010_584_90072#5002_584_90070#3013_584_90071#3002_584_90072#4014_584_90074#3012_584_90073", + "npcLv": [ + 1520, + 1520, + 1520, + 1520, + 1520, + 1520 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15506": { + "npcId": 15506, + "attr": {}, + "npclist": "3014_587_90072#4005_587_90070#4015_587_90071#4012_587_90072#3006_587_90074#4009_587_90073", + "npcLv": [ + 1529, + 1529, + 1529, + 1529, + 1529, + 1529 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15507": { + "npcId": 15507, + "attr": {}, + "npclist": "4014_587_90072#4013_587_90070#4004_587_90071#5005_587_90072#5004_587_90074#3002_587_90073", + "npcLv": [ + 1529, + 1529, + 1529, + 1529, + 1529, + 1529 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15508": { + "npcId": 15508, + "attr": {}, + "npclist": "4011_590_90072#3005_590_90070#5003_590_90071#4008_590_90072#5001_590_90074#4003_590_90073", + "npcLv": [ + 1538, + 1538, + 1538, + 1538, + 1538, + 1538 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15509": { + "npcId": 15509, + "attr": {}, + "npclist": "4012_590_90072#4007_590_90070#4002_590_90071#3013_590_90072#4015_590_90074#3004_590_90073", + "npcLv": [ + 1538, + 1538, + 1538, + 1538, + 1538, + 1538 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15510": { + "npcId": 15510, + "attr": {}, + "npclist": "4004_593_90072#4006_593_90070#4009_593_90071#5002_593_90072#4010_593_90074#5004_593_90073", + "npcLv": [ + 1547, + 1547, + 1547, + 1547, + 1547, + 1547 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15511": { + "npcId": 15511, + "attr": {}, + "npclist": "4013_593_90072#4001_593_90070#3007_593_90071#4011_593_90072#3013_593_90074#4008_593_90073", + "npcLv": [ + 1547, + 1547, + 1547, + 1547, + 1547, + 1547 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15512": { + "npcId": 15512, + "attr": {}, + "npclist": "3004_596_90072#4014_596_90070#5004_596_90071#5003_596_90072#5005_596_90074#5001_596_90073", + "npcLv": [ + 1556, + 1556, + 1556, + 1556, + 1556, + 1556 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15513": { + "npcId": 15513, + "attr": {}, + "npclist": "5002_596_90072#2002_596_90070#4012_596_90071#3009_596_90072#4005_596_90074#4015_596_90073", + "npcLv": [ + 1556, + 1556, + 1556, + 1556, + 1556, + 1556 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15514": { + "npcId": 15514, + "attr": {}, + "npclist": "4009_599_90072#4013_599_90070#4003_599_90071#4008_599_90072#4014_599_90074#4010_599_90073", + "npcLv": [ + 1565, + 1565, + 1565, + 1565, + 1565, + 1565 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15515": { + "npcId": 15515, + "attr": {}, + "npclist": "3012_599_90072#3008_599_90070#3002_599_90071#5004_599_90072#4012_599_90074#3013_599_90073", + "npcLv": [ + 1565, + 1565, + 1565, + 1565, + 1565, + 1565 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15516": { + "npcId": 15516, + "attr": {}, + "npclist": "4007_602_90072#4014_602_90070#4004_602_90071#4013_602_90072#3005_602_90074#5003_602_90073", + "npcLv": [ + 1574, + 1574, + 1574, + 1574, + 1574, + 1574 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15517": { + "npcId": 15517, + "attr": {}, + "npclist": "5001_602_90072#4015_602_90070#3013_602_90071#5002_602_90072#5005_602_90074#4005_602_90073", + "npcLv": [ + 1574, + 1574, + 1574, + 1574, + 1574, + 1574 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15518": { + "npcId": 15518, + "attr": {}, + "npclist": "4012_605_90072#4003_605_90070#4009_605_90071#4010_605_90072#4006_605_90074#4011_605_90073", + "npcLv": [ + 1583, + 1583, + 1583, + 1583, + 1583, + 1583 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15519": { + "npcId": 15519, + "attr": {}, + "npclist": "4008_605_90072#4002_605_90070#5003_605_90071#3015_605_90072#4004_605_90074#5004_605_90073", + "npcLv": [ + 1583, + 1583, + 1583, + 1583, + 1583, + 1583 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15520": { + "npcId": 15520, + "attr": {}, + "npclist": "3013_608_90072#3012_608_90070#4011_608_90071#5005_608_90072#5002_608_90074#4013_608_90073", + "npcLv": [ + 1592, + 1592, + 1592, + 1592, + 1592, + 1592 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15521": { + "npcId": 15521, + "attr": {}, + "npclist": "4014_608_90072#5004_608_90070#4012_608_90071#4005_608_90072#4009_608_90074#3009_608_90073", + "npcLv": [ + 1592, + 1592, + 1592, + 1592, + 1592, + 1592 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15522": { + "npcId": 15522, + "attr": {}, + "npclist": "3015_611_90072#4010_611_90070#4007_611_90071#4015_611_90072#3014_611_90074#3001_611_90073", + "npcLv": [ + 1601, + 1601, + 1601, + 1601, + 1601, + 1601 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15523": { + "npcId": 15523, + "attr": {}, + "npclist": "4003_611_90072#4008_611_90070#5002_611_90071#3007_611_90072#3010_611_90074#4004_611_90073", + "npcLv": [ + 1601, + 1601, + 1601, + 1601, + 1601, + 1601 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15524": { + "npcId": 15524, + "attr": {}, + "npclist": "5003_614_90072#4005_614_90070#5005_614_90071#3005_614_90072#4013_614_90074#4006_614_90073", + "npcLv": [ + 1610, + 1610, + 1610, + 1610, + 1610, + 1610 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15525": { + "npcId": 15525, + "attr": {}, + "npclist": "5002_614_90072#4014_614_90070#3013_614_90071#4006_614_90072#4012_614_90074#4015_614_90073", + "npcLv": [ + 1610, + 1610, + 1610, + 1610, + 1610, + 1610 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15526": { + "npcId": 15526, + "attr": {}, + "npclist": "4010_617_90072#3009_617_90070#4003_617_90071#5004_617_90072#3002_617_90074#3012_617_90073", + "npcLv": [ + 1619, + 1619, + 1619, + 1619, + 1619, + 1619 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15527": { + "npcId": 15527, + "attr": {}, + "npclist": "3001_617_90072#4011_617_90070#5001_617_90071#4005_617_90072#3011_617_90074#4009_617_90073", + "npcLv": [ + 1619, + 1619, + 1619, + 1619, + 1619, + 1619 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15528": { + "npcId": 15528, + "attr": {}, + "npclist": "3006_620_90072#4013_620_90070#4012_620_90071#4014_620_90072#5005_620_90074#4008_620_90073", + "npcLv": [ + 1628, + 1628, + 1628, + 1628, + 1628, + 1628 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15529": { + "npcId": 15529, + "attr": {}, + "npclist": "4015_620_90072#4004_620_90070#3015_620_90071#3013_620_90072#5001_620_90074#3010_620_90073", + "npcLv": [ + 1628, + 1628, + 1628, + 1628, + 1628, + 1628 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15530": { + "npcId": 15530, + "attr": {}, + "npclist": "4013_623_90072#4001_623_90070#4006_623_90071#5003_623_90072#4014_623_90074#4005_623_90073", + "npcLv": [ + 1637, + 1637, + 1637, + 1637, + 1637, + 1637 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15531": { + "npcId": 15531, + "attr": {}, + "npclist": "4008_623_90072#4012_623_90070#4002_623_90071#4009_623_90072#2002_623_90074#5005_623_90073", + "npcLv": [ + 1637, + 1637, + 1637, + 1637, + 1637, + 1637 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15532": { + "npcId": 15532, + "attr": {}, + "npclist": "4011_626_90072#4015_626_90070#5002_626_90071#4003_626_90072#5005_626_90074#4014_626_90073", + "npcLv": [ + 1646, + 1646, + 1646, + 1646, + 1646, + 1646 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15533": { + "npcId": 15533, + "attr": {}, + "npclist": "3008_626_90072#4006_626_90070#5003_626_90071#4010_626_90072#5001_626_90074#3010_626_90073", + "npcLv": [ + 1646, + 1646, + 1646, + 1646, + 1646, + 1646 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15534": { + "npcId": 15534, + "attr": {}, + "npclist": "4009_629_90072#3012_629_90070#4004_629_90071#4013_629_90072#4014_629_90074#4010_629_90073", + "npcLv": [ + 1655, + 1655, + 1655, + 1655, + 1655, + 1655 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15535": { + "npcId": 15535, + "attr": {}, + "npclist": "5005_629_90072#5004_629_90070#4012_629_90071#3005_629_90072#3015_629_90074#4003_629_90073", + "npcLv": [ + 1655, + 1655, + 1655, + 1655, + 1655, + 1655 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15536": { + "npcId": 15536, + "attr": {}, + "npclist": "4006_632_90072#4005_632_90070#3014_632_90071#5002_632_90072#4013_632_90074#3008_632_90073", + "npcLv": [ + 1664, + 1664, + 1664, + 1664, + 1664, + 1664 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15537": { + "npcId": 15537, + "attr": {}, + "npclist": "4014_632_90072#3005_632_90070#4008_632_90071#4012_632_90072#4007_632_90074#3001_632_90073", + "npcLv": [ + 1664, + 1664, + 1664, + 1664, + 1664, + 1664 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15538": { + "npcId": 15538, + "attr": {}, + "npclist": "4003_635_90072#4015_635_90070#4009_635_90071#4011_635_90072#4002_635_90074#4008_635_90073", + "npcLv": [ + 1673, + 1673, + 1673, + 1673, + 1673, + 1673 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15539": { + "npcId": 15539, + "attr": {}, + "npclist": "5001_635_90072#3014_635_90070#4014_635_90071#4005_635_90072#5003_635_90074#4013_635_90073", + "npcLv": [ + 1673, + 1673, + 1673, + 1673, + 1673, + 1673 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15540": { + "npcId": 15540, + "attr": {}, + "npclist": "3006_638_90072#5002_638_90070#3010_638_90071#4012_638_90072#3007_638_90074#3015_638_90073", + "npcLv": [ + 1682, + 1682, + 1682, + 1682, + 1682, + 1682 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15541": { + "npcId": 15541, + "attr": {}, + "npclist": "5005_638_90072#5001_638_90070#4010_638_90071#4001_638_90072#4009_638_90074#5004_638_90073", + "npcLv": [ + 1682, + 1682, + 1682, + 1682, + 1682, + 1682 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15542": { + "npcId": 15542, + "attr": {}, + "npclist": "4004_641_90072#4013_641_90070#4003_641_90071#3010_641_90072#4008_641_90074#4015_641_90073", + "npcLv": [ + 1691, + 1691, + 1691, + 1691, + 1691, + 1691 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15543": { + "npcId": 15543, + "attr": {}, + "npclist": "3005_641_90072#4006_641_90070#3002_641_90071#4014_641_90072#4012_641_90074#4009_641_90073", + "npcLv": [ + 1691, + 1691, + 1691, + 1691, + 1691, + 1691 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15544": { + "npcId": 15544, + "attr": {}, + "npclist": "4010_644_90072#3006_644_90070#5005_644_90071#4008_644_90072#5002_644_90074#3013_644_90073", + "npcLv": [ + 1700, + 1700, + 1700, + 1700, + 1700, + 1700 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15545": { + "npcId": 15545, + "attr": {}, + "npclist": "3011_644_90072#5004_644_90070#4011_644_90071#5001_644_90072#3010_644_90074#5003_644_90073", + "npcLv": [ + 1700, + 1700, + 1700, + 1700, + 1700, + 1700 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15546": { + "npcId": 15546, + "attr": {}, + "npclist": "4013_647_90072#4012_647_90070#4004_647_90071#4009_647_90072#4003_647_90074#4014_647_90073", + "npcLv": [ + 1709, + 1709, + 1709, + 1709, + 1709, + 1709 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15547": { + "npcId": 15547, + "attr": {}, + "npclist": "3012_647_90072#3010_647_90070#4015_647_90071#4002_647_90072#3007_647_90074#4005_647_90073", + "npcLv": [ + 1709, + 1709, + 1709, + 1709, + 1709, + 1709 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15548": { + "npcId": 15548, + "attr": {}, + "npclist": "4014_650_90072#4009_650_90070#4011_650_90071#3013_650_90072#3005_650_90074#5001_650_90073", + "npcLv": [ + 1718, + 1718, + 1718, + 1718, + 1718, + 1718 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15549": { + "npcId": 15549, + "attr": {}, + "npclist": "3010_650_90072#4008_650_90070#3007_650_90071#5003_650_90072#5005_650_90074#5002_650_90073", + "npcLv": [ + 1718, + 1718, + 1718, + 1718, + 1718, + 1718 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15550": { + "npcId": 15550, + "attr": {}, + "npclist": "3009_653_90072#4013_653_90070#3005_653_90071#4006_653_90072#3001_653_90074#3011_653_90073", + "npcLv": [ + 1727, + 1727, + 1727, + 1727, + 1727, + 1727 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15551": { + "npcId": 15551, + "attr": {}, + "npclist": "4012_653_90072#3011_653_90070#4015_653_90071#5005_653_90072#4014_653_90074#3002_653_90073", + "npcLv": [ + 1727, + 1727, + 1727, + 1727, + 1727, + 1727 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15552": { + "npcId": 15552, + "attr": {}, + "npclist": "4009_656_90072#2002_656_90070#4008_656_90071#4010_656_90072#4004_656_90074#4007_656_90073", + "npcLv": [ + 1736, + 1736, + 1736, + 1736, + 1736, + 1736 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15553": { + "npcId": 15553, + "attr": {}, + "npclist": "5001_656_90072#4011_656_90070#3015_656_90071#3009_656_90072#5002_656_90074#5003_656_90073", + "npcLv": [ + 1736, + 1736, + 1736, + 1736, + 1736, + 1736 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15554": { + "npcId": 15554, + "attr": {}, + "npclist": "4015_659_90072#4012_659_90070#5001_659_90071#4013_659_90072#4008_659_90074#4002_659_90073", + "npcLv": [ + 1745, + 1745, + 1745, + 1745, + 1745, + 1745 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15555": { + "npcId": 15555, + "attr": {}, + "npclist": "3010_659_90072#3008_659_90070#4009_659_90071#4014_659_90072#4001_659_90074#4004_659_90073", + "npcLv": [ + 1745, + 1745, + 1745, + 1745, + 1745, + 1745 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15556": { + "npcId": 15556, + "attr": {}, + "npclist": "4014_662_90072#5002_662_90070#4015_662_90071#4012_662_90072#5004_662_90074#3005_662_90073", + "npcLv": [ + 1754, + 1754, + 1754, + 1754, + 1754, + 1754 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15557": { + "npcId": 15557, + "attr": {}, + "npclist": "3009_662_90072#5001_662_90070#3013_662_90071#5003_662_90072#4009_662_90074#4013_662_90073", + "npcLv": [ + 1754, + 1754, + 1754, + 1754, + 1754, + 1754 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15558": { + "npcId": 15558, + "attr": {}, + "npclist": "3007_665_90072#4008_665_90070#4013_665_90071#4003_665_90072#3008_665_90074#3012_665_90073", + "npcLv": [ + 1763, + 1763, + 1763, + 1763, + 1763, + 1763 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15559": { + "npcId": 15559, + "attr": {}, + "npclist": "5005_665_90072#4001_665_90070#3013_665_90071#3007_665_90072#3010_665_90074#3011_665_90073", + "npcLv": [ + 1763, + 1763, + 1763, + 1763, + 1763, + 1763 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15560": { + "npcId": 15560, + "attr": {}, + "npclist": "4013_668_90072#4014_668_90070#5004_668_90071#5002_668_90072#4012_668_90074#4010_668_90073", + "npcLv": [ + 1772, + 1772, + 1772, + 1772, + 1772, + 1772 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15561": { + "npcId": 15561, + "attr": {}, + "npclist": "5001_668_90072#4004_668_90070#4002_668_90071#4011_668_90072#4006_668_90074#3002_668_90073", + "npcLv": [ + 1772, + 1772, + 1772, + 1772, + 1772, + 1772 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15562": { + "npcId": 15562, + "attr": {}, + "npclist": "4008_671_90072#4013_671_90070#4005_671_90071#5005_671_90072#3014_671_90074#3008_671_90073", + "npcLv": [ + 1781, + 1781, + 1781, + 1781, + 1781, + 1781 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15563": { + "npcId": 15563, + "attr": {}, + "npclist": "3013_671_90072#3010_671_90070#4007_671_90071#4004_671_90072#4014_671_90074#4009_671_90073", + "npcLv": [ + 1781, + 1781, + 1781, + 1781, + 1781, + 1781 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15564": { + "npcId": 15564, + "attr": {}, + "npclist": "4014_674_90072#4012_674_90070#3007_674_90071#5001_674_90072#4013_674_90074#4015_674_90073", + "npcLv": [ + 1790, + 1790, + 1790, + 1790, + 1790, + 1790 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15565": { + "npcId": 15565, + "attr": {}, + "npclist": "5003_674_90072#3013_674_90070#4008_674_90071#4003_674_90072#5002_674_90074#5004_674_90073", + "npcLv": [ + 1790, + 1790, + 1790, + 1790, + 1790, + 1790 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15566": { + "npcId": 15566, + "attr": {}, + "npclist": "4011_677_90072#4002_677_90070#3007_677_90071#4010_677_90072#4009_677_90074#4004_677_90073", + "npcLv": [ + 1799, + 1799, + 1799, + 1799, + 1799, + 1799 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15567": { + "npcId": 15567, + "attr": {}, + "npclist": "3001_677_90072#4014_677_90070#4015_677_90071#3009_677_90072#3013_677_90074#4013_677_90073", + "npcLv": [ + 1799, + 1799, + 1799, + 1799, + 1799, + 1799 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15568": { + "npcId": 15568, + "attr": {}, + "npclist": "5002_680_90072#4012_680_90070#4011_680_90071#3010_680_90072#3005_680_90074#5005_680_90073", + "npcLv": [ + 1808, + 1808, + 1808, + 1808, + 1808, + 1808 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15569": { + "npcId": 15569, + "attr": {}, + "npclist": "3015_680_90072#3012_680_90070#3002_680_90071#4014_680_90072#4005_680_90074#4008_680_90073", + "npcLv": [ + 1808, + 1808, + 1808, + 1808, + 1808, + 1808 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15570": { + "npcId": 15570, + "attr": {}, + "npclist": "4010_683_90072#4013_683_90070#3010_683_90071#4009_683_90072#5001_683_90074#4003_683_90073", + "npcLv": [ + 1817, + 1817, + 1817, + 1817, + 1817, + 1817 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15571": { + "npcId": 15571, + "attr": {}, + "npclist": "4007_683_90072#4004_683_90070#5003_683_90071#5004_683_90072#2002_683_90074#3011_683_90073", + "npcLv": [ + 1817, + 1817, + 1817, + 1817, + 1817, + 1817 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15572": { + "npcId": 15572, + "attr": {}, + "npclist": "4013_686_90072#4015_686_90070#4012_686_90071#5002_686_90072#4014_686_90074#5003_686_90073", + "npcLv": [ + 1826, + 1826, + 1826, + 1826, + 1826, + 1826 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15573": { + "npcId": 15573, + "attr": {}, + "npclist": "4001_686_90072#4002_686_90070#5001_686_90071#4004_686_90072#5005_686_90074#3009_686_90073", + "npcLv": [ + 1826, + 1826, + 1826, + 1826, + 1826, + 1826 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15574": { + "npcId": 15574, + "attr": {}, + "npclist": "3010_689_90072#4009_689_90070#4007_689_90071#3015_689_90072#5002_689_90074#5005_689_90073", + "npcLv": [ + 1835, + 1835, + 1835, + 1835, + 1835, + 1835 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15575": { + "npcId": 15575, + "attr": {}, + "npclist": "4014_689_90072#4008_689_90070#4003_689_90071#4012_689_90072#4001_689_90074#4011_689_90073", + "npcLv": [ + 1835, + 1835, + 1835, + 1835, + 1835, + 1835 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15576": { + "npcId": 15576, + "attr": {}, + "npclist": "4003_692_90072#5001_692_90070#4013_692_90071#4015_692_90072#5003_692_90074#4006_692_90073", + "npcLv": [ + 1844, + 1844, + 1844, + 1844, + 1844, + 1844 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15577": { + "npcId": 15577, + "attr": {}, + "npclist": "3005_692_90072#3007_692_90070#4010_692_90071#3005_692_90072#4013_692_90074#5002_692_90073", + "npcLv": [ + 1844, + 1844, + 1844, + 1844, + 1844, + 1844 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15578": { + "npcId": 15578, + "attr": {}, + "npclist": "4009_695_90072#4014_695_90070#3014_695_90071#3006_695_90072#3011_695_90074#4012_695_90073", + "npcLv": [ + 1853, + 1853, + 1853, + 1853, + 1853, + 1853 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15579": { + "npcId": 15579, + "attr": {}, + "npclist": "4008_695_90072#5004_695_90070#5005_695_90071#4014_695_90072#3001_695_90074#4013_695_90073", + "npcLv": [ + 1853, + 1853, + 1853, + 1853, + 1853, + 1853 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15580": { + "npcId": 15580, + "attr": {}, + "npclist": "3011_698_90072#4013_698_90070#5003_698_90071#5002_698_90072#4010_698_90074#4001_698_90073", + "npcLv": [ + 1862, + 1862, + 1862, + 1862, + 1862, + 1862 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15581": { + "npcId": 15581, + "attr": {}, + "npclist": "4014_698_90072#2002_698_90070#4004_698_90071#4011_698_90072#3010_698_90074#4015_698_90073", + "npcLv": [ + 1862, + 1862, + 1862, + 1862, + 1862, + 1862 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15582": { + "npcId": 15582, + "attr": {}, + "npclist": "5004_701_90072#4009_701_90070#4012_701_90071#4006_701_90072#3013_701_90074#3008_701_90073", + "npcLv": [ + 1871, + 1871, + 1871, + 1871, + 1871, + 1871 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15583": { + "npcId": 15583, + "attr": {}, + "npclist": "4013_701_90072#4005_701_90070#3005_701_90071#5005_701_90072#4003_701_90074#4014_701_90073", + "npcLv": [ + 1871, + 1871, + 1871, + 1871, + 1871, + 1871 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15584": { + "npcId": 15584, + "attr": {}, + "npclist": "5002_704_90072#4015_704_90070#4008_704_90071#4009_704_90072#3006_704_90074#3001_704_90073", + "npcLv": [ + 1880, + 1880, + 1880, + 1880, + 1880, + 1880 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15585": { + "npcId": 15585, + "attr": {}, + "npclist": "4004_704_90072#4011_704_90070#3005_704_90071#5001_704_90072#3007_704_90074#4010_704_90073", + "npcLv": [ + 1880, + 1880, + 1880, + 1880, + 1880, + 1880 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15586": { + "npcId": 15586, + "attr": {}, + "npclist": "3010_707_90072#4013_707_90070#5004_707_90071#4003_707_90072#4007_707_90074#5005_707_90073", + "npcLv": [ + 1889, + 1889, + 1889, + 1889, + 1889, + 1889 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15587": { + "npcId": 15587, + "attr": {}, + "npclist": "4012_707_90072#3014_707_90070#4013_707_90071#5005_707_90072#5003_707_90074#4009_707_90073", + "npcLv": [ + 1889, + 1889, + 1889, + 1889, + 1889, + 1889 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15588": { + "npcId": 15588, + "attr": {}, + "npclist": "4011_710_90072#4014_710_90070#4010_710_90071#4002_710_90072#4008_710_90074#3015_710_90073", + "npcLv": [ + 1898, + 1898, + 1898, + 1898, + 1898, + 1898 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15589": { + "npcId": 15589, + "attr": {}, + "npclist": "3002_710_90072#5001_710_90070#5002_710_90071#3007_710_90072#4013_710_90074#5004_710_90073", + "npcLv": [ + 1898, + 1898, + 1898, + 1898, + 1898, + 1898 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15590": { + "npcId": 15590, + "attr": {}, + "npclist": "5003_713_90072#4012_713_90070#4011_713_90071#4014_713_90072#3015_713_90074#4013_713_90073", + "npcLv": [ + 1907, + 1907, + 1907, + 1907, + 1907, + 1907 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15591": { + "npcId": 15591, + "attr": {}, + "npclist": "4015_713_90072#3008_713_90070#4003_713_90071#3007_713_90072#3005_713_90074#4007_713_90073", + "npcLv": [ + 1907, + 1907, + 1907, + 1907, + 1907, + 1907 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15592": { + "npcId": 15592, + "attr": {}, + "npclist": "4008_716_90072#5001_716_90070#5005_716_90071#5004_716_90072#4005_716_90074#5002_716_90073", + "npcLv": [ + 1916, + 1916, + 1916, + 1916, + 1916, + 1916 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15593": { + "npcId": 15593, + "attr": {}, + "npclist": "4014_716_90072#4006_716_90070#5004_716_90071#4004_716_90072#3010_716_90074#3011_716_90073", + "npcLv": [ + 1916, + 1916, + 1916, + 1916, + 1916, + 1916 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15594": { + "npcId": 15594, + "attr": {}, + "npclist": "3013_719_90072#4013_719_90070#4012_719_90071#5001_719_90072#5002_719_90074#4003_719_90073", + "npcLv": [ + 1925, + 1925, + 1925, + 1925, + 1925, + 1925 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15595": { + "npcId": 15595, + "attr": {}, + "npclist": "4010_719_90072#5003_719_90070#4015_719_90071#4008_719_90072#4009_719_90074#5005_719_90073", + "npcLv": [ + 1925, + 1925, + 1925, + 1925, + 1925, + 1925 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15596": { + "npcId": 15596, + "attr": {}, + "npclist": "3010_722_90072#3015_722_90070#4001_722_90071#3001_722_90072#4007_722_90074#3007_722_90073", + "npcLv": [ + 1934, + 1934, + 1934, + 1934, + 1934, + 1934 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15597": { + "npcId": 15597, + "attr": {}, + "npclist": "4013_722_90072#5004_722_90070#3002_722_90071#4012_722_90072#4015_722_90074#3007_722_90073", + "npcLv": [ + 1934, + 1934, + 1934, + 1934, + 1934, + 1934 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15598": { + "npcId": 15598, + "attr": {}, + "npclist": "5002_725_90072#4013_725_90070#3010_725_90071#3013_725_90072#4011_725_90074#3005_725_90073", + "npcLv": [ + 1943, + 1943, + 1943, + 1943, + 1943, + 1943 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15599": { + "npcId": 15599, + "attr": {}, + "npclist": "3007_725_90072#4009_725_90070#4014_725_90071#5001_725_90072#5005_725_90074#4015_725_90073", + "npcLv": [ + 1943, + 1943, + 1943, + 1943, + 1943, + 1943 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15600": { + "npcId": 15600, + "attr": {}, + "npclist": "3010_728_90072#3009_728_90070#5003_728_90071#4013_728_90072#3010_728_90074#4004_728_90073", + "npcLv": [ + 1952, + 1952, + 1952, + 1952, + 1952, + 1952 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15601": { + "npcId": 15601, + "attr": {}, + "npclist": "4014_728_90072#5002_728_90070#4010_728_90071#4006_728_90072#3009_728_90074#4012_728_90073", + "npcLv": [ + 1952, + 1952, + 1952, + 1952, + 1952, + 1952 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15602": { + "npcId": 15602, + "attr": {}, + "npclist": "5004_731_90072#4005_731_90070#5005_731_90071#3002_731_90072#4002_731_90074#3001_731_90073", + "npcLv": [ + 1961, + 1961, + 1961, + 1961, + 1961, + 1961 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15603": { + "npcId": 15603, + "attr": {}, + "npclist": "4008_731_90072#3005_731_90070#4002_731_90071#3011_731_90072#4013_731_90074#4011_731_90073", + "npcLv": [ + 1961, + 1961, + 1961, + 1961, + 1961, + 1961 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15604": { + "npcId": 15604, + "attr": {}, + "npclist": "5001_734_90072#4003_734_90070#3011_734_90071#5002_734_90072#5003_734_90074#3013_734_90073", + "npcLv": [ + 1970, + 1970, + 1970, + 1970, + 1970, + 1970 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15605": { + "npcId": 15605, + "attr": {}, + "npclist": "3005_734_90072#5004_734_90070#4012_734_90071#4010_734_90072#4014_734_90074#3002_734_90073", + "npcLv": [ + 1970, + 1970, + 1970, + 1970, + 1970, + 1970 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15606": { + "npcId": 15606, + "attr": {}, + "npclist": "4001_737_90072#3015_737_90070#4004_737_90071#3010_737_90072#4001_737_90074#4013_737_90073", + "npcLv": [ + 1979, + 1979, + 1979, + 1979, + 1979, + 1979 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15607": { + "npcId": 15607, + "attr": {}, + "npclist": "4015_737_90072#4012_737_90070#5004_737_90071#5003_737_90072#5005_737_90074#5002_737_90073", + "npcLv": [ + 1979, + 1979, + 1979, + 1979, + 1979, + 1979 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15608": { + "npcId": 15608, + "attr": {}, + "npclist": "4009_740_90072#4014_740_90070#4013_740_90071#4007_740_90072#4010_740_90074#3010_740_90073", + "npcLv": [ + 1988, + 1988, + 1988, + 1988, + 1988, + 1988 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15609": { + "npcId": 15609, + "attr": {}, + "npclist": "4012_740_90072#4011_740_90070#4001_740_90071#3015_740_90072#3013_740_90074#3001_740_90073", + "npcLv": [ + 1988, + 1988, + 1988, + 1988, + 1988, + 1988 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15610": { + "npcId": 15610, + "attr": {}, + "npclist": "3012_743_90072#5005_743_90070#4015_743_90071#3005_743_90072#4008_743_90074#5004_743_90073", + "npcLv": [ + 1997, + 1997, + 1997, + 1997, + 1997, + 1997 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15611": { + "npcId": 15611, + "attr": {}, + "npclist": "3013_743_90072#3011_743_90070#5003_743_90071#5002_743_90072#3005_743_90074#4005_743_90073", + "npcLv": [ + 1997, + 1997, + 1997, + 1997, + 1997, + 1997 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15612": { + "npcId": 15612, + "attr": {}, + "npclist": "4013_746_90072#3009_746_90070#4006_746_90071#4003_746_90072#4015_746_90074#3007_746_90073", + "npcLv": [ + 2006, + 2006, + 2006, + 2006, + 2006, + 2006 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15613": { + "npcId": 15613, + "attr": {}, + "npclist": "5005_746_90072#4007_746_90070#4012_746_90071#5004_746_90072#3001_746_90074#4010_746_90073", + "npcLv": [ + 2006, + 2006, + 2006, + 2006, + 2006, + 2006 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15614": { + "npcId": 15614, + "attr": {}, + "npclist": "4011_749_90072#3010_749_90070#2002_749_90071#4004_749_90072#4014_749_90074#5004_749_90073", + "npcLv": [ + 2015, + 2015, + 2015, + 2015, + 2015, + 2015 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15615": { + "npcId": 15615, + "attr": {}, + "npclist": "5003_749_90072#5002_749_90070#5005_749_90071#3010_749_90072#4006_749_90074#4003_749_90073", + "npcLv": [ + 2015, + 2015, + 2015, + 2015, + 2015, + 2015 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15616": { + "npcId": 15616, + "attr": {}, + "npclist": "3013_752_90072#5001_752_90070#4009_752_90071#3008_752_90072#4012_752_90074#3009_752_90073", + "npcLv": [ + 2024, + 2024, + 2024, + 2024, + 2024, + 2024 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15617": { + "npcId": 15617, + "attr": {}, + "npclist": "4004_752_90072#4011_752_90070#5004_752_90071#3001_752_90072#4005_752_90074#4015_752_90073", + "npcLv": [ + 2024, + 2024, + 2024, + 2024, + 2024, + 2024 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15618": { + "npcId": 15618, + "attr": {}, + "npclist": "5002_755_90072#4002_755_90070#3006_755_90071#4010_755_90072#5005_755_90074#3009_755_90073", + "npcLv": [ + 2033, + 2033, + 2033, + 2033, + 2033, + 2033 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15619": { + "npcId": 15619, + "attr": {}, + "npclist": "3014_755_90072#5004_755_90070#5003_755_90071#4003_755_90072#4015_755_90074#4011_755_90073", + "npcLv": [ + 2033, + 2033, + 2033, + 2033, + 2033, + 2033 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15620": { + "npcId": 15620, + "attr": {}, + "npclist": "3001_758_90072#4014_758_90070#4013_758_90071#3002_758_90072#4009_758_90074#3014_758_90073", + "npcLv": [ + 2042, + 2042, + 2042, + 2042, + 2042, + 2042 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15621": { + "npcId": 15621, + "attr": {}, + "npclist": "5004_758_90072#3009_758_90070#5002_758_90071#4013_758_90072#3005_758_90074#4012_758_90073", + "npcLv": [ + 2042, + 2042, + 2042, + 2042, + 2042, + 2042 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15622": { + "npcId": 15622, + "attr": {}, + "npclist": "5001_761_90072#4015_761_90070#4005_761_90071#3011_761_90072#4003_761_90074#5005_761_90073", + "npcLv": [ + 2051, + 2051, + 2051, + 2051, + 2051, + 2051 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15623": { + "npcId": 15623, + "attr": {}, + "npclist": "4014_761_90072#3007_761_90070#3013_761_90071#4002_761_90072#5002_761_90074#4009_761_90073", + "npcLv": [ + 2051, + 2051, + 2051, + 2051, + 2051, + 2051 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15624": { + "npcId": 15624, + "attr": {}, + "npclist": "4015_764_90072#4007_764_90070#5004_764_90071#4012_764_90072#4011_764_90074#4001_764_90073", + "npcLv": [ + 2060, + 2060, + 2060, + 2060, + 2060, + 2060 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15625": { + "npcId": 15625, + "attr": {}, + "npclist": "3006_764_90072#4004_764_90070#3015_764_90071#5005_764_90072#5003_764_90074#4013_764_90073", + "npcLv": [ + 2060, + 2060, + 2060, + 2060, + 2060, + 2060 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15626": { + "npcId": 15626, + "attr": {}, + "npclist": "3002_767_90072#4010_767_90070#5001_767_90071#4007_767_90072#3013_767_90074#4008_767_90073", + "npcLv": [ + 2069, + 2069, + 2069, + 2069, + 2069, + 2069 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15627": { + "npcId": 15627, + "attr": {}, + "npclist": "5005_767_90072#2002_767_90070#3010_767_90071#4013_767_90072#3011_767_90074#5002_767_90073", + "npcLv": [ + 2069, + 2069, + 2069, + 2069, + 2069, + 2069 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15628": { + "npcId": 15628, + "attr": {}, + "npclist": "4010_770_90072#4011_770_90070#4006_770_90071#4003_770_90072#3009_770_90074#5004_770_90073", + "npcLv": [ + 2078, + 2078, + 2078, + 2078, + 2078, + 2078 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15629": { + "npcId": 15629, + "attr": {}, + "npclist": "3001_770_90072#4014_770_90070#4015_770_90071#5005_770_90072#5001_770_90074#4002_770_90073", + "npcLv": [ + 2078, + 2078, + 2078, + 2078, + 2078, + 2078 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15630": { + "npcId": 15630, + "attr": {}, + "npclist": "3010_773_90072#4013_773_90070#4005_773_90071#5002_773_90072#4007_773_90074#3013_773_90073", + "npcLv": [ + 2087, + 2087, + 2087, + 2087, + 2087, + 2087 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15631": { + "npcId": 15631, + "attr": {}, + "npclist": "4011_773_90072#4001_773_90070#4012_773_90071#4009_773_90072#4015_773_90074#5003_773_90073", + "npcLv": [ + 2087, + 2087, + 2087, + 2087, + 2087, + 2087 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15632": { + "npcId": 15632, + "attr": {}, + "npclist": "3015_776_90072#5002_776_90070#4003_776_90071#5004_776_90072#5005_776_90074#4014_776_90073", + "npcLv": [ + 2096, + 2096, + 2096, + 2096, + 2096, + 2096 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15633": { + "npcId": 15633, + "attr": {}, + "npclist": "4013_776_90072#4006_776_90070#3002_776_90071#3007_776_90072#3015_776_90074#3007_776_90073", + "npcLv": [ + 2096, + 2096, + 2096, + 2096, + 2096, + 2096 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15634": { + "npcId": 15634, + "attr": {}, + "npclist": "4012_779_90072#5004_779_90070#4011_779_90071#3013_779_90072#3007_779_90074#4015_779_90073", + "npcLv": [ + 2105, + 2105, + 2105, + 2105, + 2105, + 2105 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15635": { + "npcId": 15635, + "attr": {}, + "npclist": "5002_779_90072#4008_779_90070#4010_779_90071#5001_779_90072#4004_779_90074#3007_779_90073", + "npcLv": [ + 2105, + 2105, + 2105, + 2105, + 2105, + 2105 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15636": { + "npcId": 15636, + "attr": {}, + "npclist": "3010_782_90072#3005_782_90070#4006_782_90071#4015_782_90072#5003_782_90074#4014_782_90073", + "npcLv": [ + 2114, + 2114, + 2114, + 2114, + 2114, + 2114 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15637": { + "npcId": 15637, + "attr": {}, + "npclist": "4009_782_90072#4015_782_90070#4013_782_90071#4010_782_90072#4005_782_90074#4003_782_90073", + "npcLv": [ + 2114, + 2114, + 2114, + 2114, + 2114, + 2114 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15638": { + "npcId": 15638, + "attr": {}, + "npclist": "4002_785_90072#4012_785_90070#5002_785_90071#5005_785_90072#3009_785_90074#4011_785_90073", + "npcLv": [ + 2123, + 2123, + 2123, + 2123, + 2123, + 2123 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15639": { + "npcId": 15639, + "attr": {}, + "npclist": "3013_785_90072#3005_785_90070#3014_785_90071#4013_785_90072#3011_785_90074#5004_785_90073", + "npcLv": [ + 2123, + 2123, + 2123, + 2123, + 2123, + 2123 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15640": { + "npcId": 15640, + "attr": {}, + "npclist": "4014_788_90072#4007_788_90070#4011_788_90071#4012_788_90072#5002_788_90074#4010_788_90073", + "npcLv": [ + 2132, + 2132, + 2132, + 2132, + 2132, + 2132 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15641": { + "npcId": 15641, + "attr": {}, + "npclist": "4008_788_90072#4015_788_90070#5003_788_90071#4006_788_90072#4009_788_90074#3002_788_90073", + "npcLv": [ + 2132, + 2132, + 2132, + 2132, + 2132, + 2132 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15642": { + "npcId": 15642, + "attr": {}, + "npclist": "3005_791_90072#5001_791_90070#5005_791_90071#4003_791_90072#3009_791_90074#5002_791_90073", + "npcLv": [ + 2141, + 2141, + 2141, + 2141, + 2141, + 2141 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15643": { + "npcId": 15643, + "attr": {}, + "npclist": "4015_791_90072#4011_791_90070#4004_791_90071#5004_791_90072#4012_791_90074#4001_791_90073", + "npcLv": [ + 2141, + 2141, + 2141, + 2141, + 2141, + 2141 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15644": { + "npcId": 15644, + "attr": {}, + "npclist": "4007_794_90072#3009_794_90070#5003_794_90071#3013_794_90072#4006_794_90074#4009_794_90073", + "npcLv": [ + 2150, + 2150, + 2150, + 2150, + 2150, + 2150 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15645": { + "npcId": 15645, + "attr": {}, + "npclist": "3010_794_90072#4014_794_90070#4002_794_90071#4005_794_90072#4013_794_90074#3007_794_90073", + "npcLv": [ + 2150, + 2150, + 2150, + 2150, + 2150, + 2150 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15646": { + "npcId": 15646, + "attr": {}, + "npclist": "4011_797_90072#5004_797_90070#4015_797_90071#5005_797_90072#5002_797_90074#4012_797_90073", + "npcLv": [ + 2159, + 2159, + 2159, + 2159, + 2159, + 2159 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15647": { + "npcId": 15647, + "attr": {}, + "npclist": "3009_797_90072#3015_797_90070#4010_797_90071#4014_797_90072#3002_797_90074#4013_797_90073", + "npcLv": [ + 2159, + 2159, + 2159, + 2159, + 2159, + 2159 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15648": { + "npcId": 15648, + "attr": {}, + "npclist": "5001_800_90072#5002_800_90070#3002_800_90071#4012_800_90072#3006_800_90074#2002_800_90073", + "npcLv": [ + 2168, + 2168, + 2168, + 2168, + 2168, + 2168 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15649": { + "npcId": 15649, + "attr": {}, + "npclist": "3011_800_90072#4009_800_90070#4011_800_90071#4015_800_90072#3001_800_90074#4006_800_90073", + "npcLv": [ + 2168, + 2168, + 2168, + 2168, + 2168, + 2168 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15650": { + "npcId": 15650, + "attr": {}, + "npclist": "4010_803_90072#3013_803_90070#4008_803_90071#3010_803_90072#4014_803_90074#3012_803_90073", + "npcLv": [ + 2177, + 2177, + 2177, + 2177, + 2177, + 2177 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15651": { + "npcId": 15651, + "attr": {}, + "npclist": "5002_803_90072#3007_803_90070#3009_803_90071#5003_803_90072#4005_803_90074#5005_803_90073", + "npcLv": [ + 2177, + 2177, + 2177, + 2177, + 2177, + 2177 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15652": { + "npcId": 15652, + "attr": {}, + "npclist": "4001_806_90072#3010_806_90070#4003_806_90071#5004_806_90072#4011_806_90074#4014_806_90073", + "npcLv": [ + 2186, + 2186, + 2186, + 2186, + 2186, + 2186 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15653": { + "npcId": 15653, + "attr": {}, + "npclist": "3007_806_90072#4013_806_90070#5002_806_90071#5005_806_90072#4015_806_90074#3001_806_90073", + "npcLv": [ + 2186, + 2186, + 2186, + 2186, + 2186, + 2186 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15654": { + "npcId": 15654, + "attr": {}, + "npclist": "4013_809_90072#5003_809_90070#4012_809_90071#3015_809_90072#3010_809_90074#4011_809_90073", + "npcLv": [ + 2195, + 2195, + 2195, + 2195, + 2195, + 2195 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15655": { + "npcId": 15655, + "attr": {}, + "npclist": "4003_809_90072#4014_809_90070#3011_809_90071#4008_809_90072#4002_809_90074#3007_809_90073", + "npcLv": [ + 2195, + 2195, + 2195, + 2195, + 2195, + 2195 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15656": { + "npcId": 15656, + "attr": {}, + "npclist": "3002_812_90072#3009_812_90070#4009_812_90071#5001_812_90072#5002_812_90074#4015_812_90073", + "npcLv": [ + 2204, + 2204, + 2204, + 2204, + 2204, + 2204 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15657": { + "npcId": 15657, + "attr": {}, + "npclist": "4012_812_90072#3005_812_90070#3009_812_90071#4010_812_90072#4014_812_90074#5004_812_90073", + "npcLv": [ + 2204, + 2204, + 2204, + 2204, + 2204, + 2204 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15658": { + "npcId": 15658, + "attr": {}, + "npclist": "4014_815_90072#4013_815_90070#4007_815_90071#5005_815_90072#3011_815_90074#5002_815_90073", + "npcLv": [ + 2213, + 2213, + 2213, + 2213, + 2213, + 2213 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15659": { + "npcId": 15659, + "attr": {}, + "npclist": "3005_815_90072#4006_815_90070#3014_815_90071#4003_815_90072#5001_815_90074#4002_815_90073", + "npcLv": [ + 2213, + 2213, + 2213, + 2213, + 2213, + 2213 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15660": { + "npcId": 15660, + "attr": {}, + "npclist": "5003_818_90072#4012_818_90070#4015_818_90071#4013_818_90072#4007_818_90074#3010_818_90073", + "npcLv": [ + 2222, + 2222, + 2222, + 2222, + 2222, + 2222 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15661": { + "npcId": 15661, + "attr": {}, + "npclist": "4014_818_90072#5002_818_90070#4011_818_90071#5004_818_90072#3014_818_90074#4009_818_90073", + "npcLv": [ + 2222, + 2222, + 2222, + 2222, + 2222, + 2222 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15662": { + "npcId": 15662, + "attr": {}, + "npclist": "4006_821_90072#4015_821_90070#4005_821_90071#4004_821_90072#4013_821_90074#3015_821_90073", + "npcLv": [ + 2231, + 2231, + 2231, + 2231, + 2231, + 2231 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15663": { + "npcId": 15663, + "attr": {}, + "npclist": "3013_821_90072#3015_821_90070#5004_821_90071#4012_821_90072#4010_821_90074#3005_821_90073", + "npcLv": [ + 2231, + 2231, + 2231, + 2231, + 2231, + 2231 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15664": { + "npcId": 15664, + "attr": {}, + "npclist": "4011_824_90072#4014_824_90070#5003_824_90071#3001_824_90072#5005_824_90074#4010_824_90073", + "npcLv": [ + 2240, + 2240, + 2240, + 2240, + 2240, + 2240 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15665": { + "npcId": 15665, + "attr": {}, + "npclist": "4015_824_90072#4005_824_90070#5002_824_90071#4002_824_90072#3005_824_90074#4013_824_90073", + "npcLv": [ + 2240, + 2240, + 2240, + 2240, + 2240, + 2240 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15666": { + "npcId": 15666, + "attr": {}, + "npclist": "3014_827_90072#5004_827_90070#4011_827_90071#3002_827_90072#4008_827_90074#3006_827_90073", + "npcLv": [ + 2249, + 2249, + 2249, + 2249, + 2249, + 2249 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15667": { + "npcId": 15667, + "attr": {}, + "npclist": "3007_827_90072#4015_827_90070#4003_827_90071#4010_827_90072#5002_827_90074#4012_827_90073", + "npcLv": [ + 2249, + 2249, + 2249, + 2249, + 2249, + 2249 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15668": { + "npcId": 15668, + "attr": {}, + "npclist": "3009_830_90072#4013_830_90070#3001_830_90071#4014_830_90072#2002_830_90074#4007_830_90073", + "npcLv": [ + 2258, + 2258, + 2258, + 2258, + 2258, + 2258 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15669": { + "npcId": 15669, + "attr": {}, + "npclist": "5002_830_90072#3006_830_90070#4006_830_90071#3013_830_90072#5003_830_90074#5005_830_90073", + "npcLv": [ + 2258, + 2258, + 2258, + 2258, + 2258, + 2258 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15670": { + "npcId": 15670, + "attr": {}, + "npclist": "5004_833_90072#3010_833_90070#3007_833_90071#4012_833_90072#4014_833_90074#4011_833_90073", + "npcLv": [ + 2267, + 2267, + 2267, + 2267, + 2267, + 2267 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15671": { + "npcId": 15671, + "attr": {}, + "npclist": "4013_833_90072#4008_833_90070#4009_833_90071#3010_833_90072#4002_833_90074#3002_833_90073", + "npcLv": [ + 2267, + 2267, + 2267, + 2267, + 2267, + 2267 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15672": { + "npcId": 15672, + "attr": {}, + "npclist": "3001_836_90072#4002_836_90070#5001_836_90071#4005_836_90072#5002_836_90074#4001_836_90073", + "npcLv": [ + 2276, + 2276, + 2276, + 2276, + 2276, + 2276 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15673": { + "npcId": 15673, + "attr": {}, + "npclist": "3013_836_90072#4013_836_90070#4007_836_90071#4015_836_90072#5005_836_90074#4014_836_90073", + "npcLv": [ + 2276, + 2276, + 2276, + 2276, + 2276, + 2276 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15674": { + "npcId": 15674, + "attr": {}, + "npclist": "4009_839_90072#4010_839_90070#5004_839_90071#4011_839_90072#4012_839_90074#4003_839_90073", + "npcLv": [ + 2285, + 2285, + 2285, + 2285, + 2285, + 2285 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15675": { + "npcId": 15675, + "attr": {}, + "npclist": "4002_839_90072#5001_839_90070#3007_839_90071#5003_839_90072#3007_839_90074#4015_839_90073", + "npcLv": [ + 2285, + 2285, + 2285, + 2285, + 2285, + 2285 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15676": { + "npcId": 15676, + "attr": {}, + "npclist": "4008_842_90072#4014_842_90070#4013_842_90071#5005_842_90072#5002_842_90074#3011_842_90073", + "npcLv": [ + 2294, + 2294, + 2294, + 2294, + 2294, + 2294 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15677": { + "npcId": 15677, + "attr": {}, + "npclist": "4001_842_90072#4003_842_90070#4011_842_90071#4006_842_90072#4005_842_90074#4012_842_90073", + "npcLv": [ + 2294, + 2294, + 2294, + 2294, + 2294, + 2294 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15678": { + "npcId": 15678, + "attr": {}, + "npclist": "4014_845_90072#5003_845_90070#4013_845_90071#3010_845_90072#5001_845_90074#5004_845_90073", + "npcLv": [ + 2303, + 2303, + 2303, + 2303, + 2303, + 2303 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15679": { + "npcId": 15679, + "attr": {}, + "npclist": "4010_845_90072#4014_845_90070#4008_845_90071#4004_845_90072#4013_845_90074#3007_845_90073", + "npcLv": [ + 2303, + 2303, + 2303, + 2303, + 2303, + 2303 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15680": { + "npcId": 15680, + "attr": {}, + "npclist": "4015_848_90072#3015_848_90070#4002_848_90071#3005_848_90072#3001_848_90074#3002_848_90073", + "npcLv": [ + 2312, + 2312, + 2312, + 2312, + 2312, + 2312 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15681": { + "npcId": 15681, + "attr": {}, + "npclist": "4011_848_90072#5002_848_90070#5004_848_90071#4014_848_90072#3014_848_90074#4012_848_90073", + "npcLv": [ + 2312, + 2312, + 2312, + 2312, + 2312, + 2312 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15682": { + "npcId": 15682, + "attr": {}, + "npclist": "4007_851_90072#3010_851_90070#4009_851_90071#3005_851_90072#3009_851_90074#5005_851_90073", + "npcLv": [ + 2321, + 2321, + 2321, + 2321, + 2321, + 2321 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15683": { + "npcId": 15683, + "attr": {}, + "npclist": "5003_851_90072#4013_851_90070#4015_851_90071#3011_851_90072#4010_851_90074#5001_851_90073", + "npcLv": [ + 2321, + 2321, + 2321, + 2321, + 2321, + 2321 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15684": { + "npcId": 15684, + "attr": {}, + "npclist": "5004_854_90072#4004_854_90070#4006_854_90071#3013_854_90072#4015_854_90074#4003_854_90073", + "npcLv": [ + 2330, + 2330, + 2330, + 2330, + 2330, + 2330 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15685": { + "npcId": 15685, + "attr": {}, + "npclist": "3006_854_90072#4012_854_90070#3002_854_90071#5005_854_90072#4006_854_90074#5002_854_90073", + "npcLv": [ + 2330, + 2330, + 2330, + 2330, + 2330, + 2330 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15686": { + "npcId": 15686, + "attr": {}, + "npclist": "4013_857_90072#4011_857_90070#4007_857_90071#4009_857_90072#4014_857_90074#3001_857_90073", + "npcLv": [ + 2339, + 2339, + 2339, + 2339, + 2339, + 2339 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15687": { + "npcId": 15687, + "attr": {}, + "npclist": "3011_857_90072#3005_857_90070#5002_857_90071#5003_857_90072#4004_857_90074#4010_857_90073", + "npcLv": [ + 2339, + 2339, + 2339, + 2339, + 2339, + 2339 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15688": { + "npcId": 15688, + "attr": {}, + "npclist": "5004_860_90072#4003_860_90070#4013_860_90071#4011_860_90072#4008_860_90074#4015_860_90073", + "npcLv": [ + 2348, + 2348, + 2348, + 2348, + 2348, + 2348 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15689": { + "npcId": 15689, + "attr": {}, + "npclist": "3013_860_90072#5001_860_90070#4014_860_90071#4002_860_90072#5003_860_90074#4009_860_90073", + "npcLv": [ + 2348, + 2348, + 2348, + 2348, + 2348, + 2348 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15690": { + "npcId": 15690, + "attr": {}, + "npclist": "4014_863_90072#3015_863_90070#5005_863_90071#5004_863_90072#3010_863_90074#4011_863_90073", + "npcLv": [ + 2357, + 2357, + 2357, + 2357, + 2357, + 2357 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15691": { + "npcId": 15691, + "attr": {}, + "npclist": "4013_863_90072#4015_863_90070#4010_863_90071#3007_863_90072#3002_863_90074#3014_863_90073", + "npcLv": [ + 2357, + 2357, + 2357, + 2357, + 2357, + 2357 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15692": { + "npcId": 15692, + "attr": {}, + "npclist": "5001_866_90072#5002_866_90070#4012_866_90071#4007_866_90072#4002_866_90074#4004_866_90073", + "npcLv": [ + 2366, + 2366, + 2366, + 2366, + 2366, + 2366 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15693": { + "npcId": 15693, + "attr": {}, + "npclist": "4015_866_90072#4014_866_90070#3010_866_90071#4011_866_90072#4013_866_90074#5003_866_90073", + "npcLv": [ + 2366, + 2366, + 2366, + 2366, + 2366, + 2366 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15694": { + "npcId": 15694, + "attr": {}, + "npclist": "4003_869_90072#4010_869_90070#4001_869_90071#4005_869_90072#5005_869_90074#5004_869_90073", + "npcLv": [ + 2375, + 2375, + 2375, + 2375, + 2375, + 2375 + ], + "isboss": 0, + "ghname": "npc_ghname_1" + }, + "15695": { + "npcId": 15695, + "attr": {}, + "npclist": "3010_869_90072#4015_869_90070#3007_869_90071#5003_869_90072#5002_869_90074#4002_869_90073", + "npcLv": [ + 2375, + 2375, + 2375, + 2375, + 2375, + 2375 + ], + "isboss": 0, + "ghname": "npc_ghname_2" + }, + "15696": { + "npcId": 15696, + "attr": {}, + "npclist": "4012_872_90072#4009_872_90070#4014_872_90071#3009_872_90072#3002_872_90074#5005_872_90073", + "npcLv": [ + 2384, + 2384, + 2384, + 2384, + 2384, + 2384 + ], + "isboss": 0, + "ghname": "npc_ghname_3" + }, + "15697": { + "npcId": 15697, + "attr": {}, + "npclist": "3007_872_90072#4008_872_90070#5004_872_90071#5002_872_90072#4006_872_90074#4015_872_90073", + "npcLv": [ + 2384, + 2384, + 2384, + 2384, + 2384, + 2384 + ], + "isboss": 0, + "ghname": "npc_ghname_4" + }, + "15698": { + "npcId": 15698, + "attr": {}, + "npclist": "4005_875_90072#3010_875_90070#5001_875_90071#4015_875_90072#3013_875_90074#4012_875_90073", + "npcLv": [ + 2393, + 2393, + 2393, + 2393, + 2393, + 2393 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, + "15699": { + "npcId": 15699, + "attr": {}, + "npclist": "5004_875_90072#5002_875_90070#3012_875_90071#4010_875_90072#4013_875_90074#5003_875_90073", + "npcLv": [ + 2393, + 2393, + 2393, + 2393, + 2393, + 2393 + ], + "isboss": 0, + "ghname": "npc_ghname_6" + }, + "15700": { + "npcId": 15700, + "attr": {}, + "npclist": "5002_878_90072#4004_878_90070#4011_878_90071#5005_878_90072#5001_878_90074#4007_878_90073", + "npcLv": [ + 2402, + 2402, + 2402, + 2402, + 2402, + 2402 + ], + "isboss": 0, + "ghname": "npc_ghname_5" + }, "17001": { "npcId": 17001, "attr": {}, From 722e92a54b4b8e6357ab65dcd72a8d5adbc94d46 Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 27 Dec 2023 21:05:53 +0800 Subject: [PATCH 33/37] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E7=AB=9E=E8=B5=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/xiaofeijingsai/ApiOpen.ts | 4 ++-- src/api_s2c/eventlist/ApihdGetList.ts | 4 ++-- src/module/mongodb.ts | 2 +- src/setMongodb.ts | 7 ++++++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts b/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts index b3a47af..4862a90 100644 --- a/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts +++ b/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts @@ -32,7 +32,7 @@ export default async function (call: ApiCall) { let rankList = sortRankList(_hd.data.rank, list) - let users = await G.crossmongodb.collection('xfjs_user').find({uid: {$in: rankList.map(i => i._id).filter(i => i._id != 'system')}}).toArray() + let users = await G.crossmongodb.collection('huodong_user').find({uid: {$in: rankList.map(i => i._id).filter(i => i._id != 'system')}}).toArray() rankList = rankList.map(i => ({...i, player: users.find(v => v.uid == i._id) || {}})) @@ -75,7 +75,7 @@ async function getMyData(call, rankList) { let myCut: any = await G.crossmongodb.collection('rmbuse').findOne({uid: call.uid}) let myUser = await G.mongodb.collection('user').findOne({uid: call.uid}) - G.crossmongodb.collection('xfjs_user').updateOne({uid: call.uid}, myUser, {upsert: true}) + G.crossmongodb.collection('huodong_user').updateOne({uid: call.uid}, myUser, {upsert: true}) if (!myCut) { myCut = {_id: myUser.uid, total: 0} diff --git a/src/api_s2c/eventlist/ApihdGetList.ts b/src/api_s2c/eventlist/ApihdGetList.ts index 63c1c23..fd35120 100644 --- a/src/api_s2c/eventlist/ApihdGetList.ts +++ b/src/api_s2c/eventlist/ApihdGetList.ts @@ -11,8 +11,8 @@ export default async function (call: ApiCall) { // 消费竞赛是跨服活动，活动开启时，同步当前用户信息到跨服数据库 G.huodong.xfjs = !!_hdList.find(i => i.htype == 11); - if (G.huodong.xfjs){ + if (G.huodong.xfjs) { let myUser = await G.mongodb.collection('user').findOne({uid: call.uid}) - G.crossmongodb.collection('xfjs_user').updateOne({uid: call.uid}, myUser, {upsert: true}) + G.crossmongodb.collection('huodong_user').updateOne({uid: call.uid}, {$set: myUser}, {upsert: true}) } } \ No newline at end of file diff --git a/src/module/mongodb.ts b/src/module/mongodb.ts index f4c5842..e5c920e 100644 --- a/src/module/mongodb.ts +++ b/src/module/mongodb.ts @@ -134,5 +134,5 @@ export type MongodbCollections = { shop: CollectionShop pushgift:CollectionPushGift - xfjs_user: CollectionUser; + huodong_user: CollectionUser; }; \ No newline at end of file diff --git a/src/setMongodb.ts b/src/setMongodb.ts index 7860f9c..f7a267b 100644 --- a/src/setMongodb.ts +++ b/src/setMongodb.ts @@ -438,7 +438,12 @@ const crossIndexs: Partial<{ [k in keyof MongodbCollections]: IndexDescription[] { key: {zkey: 1} }, - ] + ], + huodong_user: [ + { + key: {uid: 1}, unique: true, + } + ], }; export async function initMongoDB() { From 7b5c470f52bf9277bc9e3727a9677d2d8bbc1fbc Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 27 Dec 2023 22:31:09 +0800 Subject: [PATCH 34/37] =?UTF-8?q?fix=20=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/hongdian/fun.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/api_s2c/hongdian/fun.ts b/src/api_s2c/hongdian/fun.ts index ea4623d..c73321e 100644 --- a/src/api_s2c/hongdian/fun.ts +++ b/src/api_s2c/hongdian/fun.ts @@ -417,6 +417,16 @@ export class HuoDongHongDianFun { return {show: true} } + for (let i = 1; i++; i <= data.taskval.length) { + if (data?.taskval[i] >= _hd?.data?.task?.[i]?.pval && !data?.taskfinish.find(v => v == i + '')) { + return {show: true} + } + } + + // let a = data.taskval. + // + // if () + return {show: false} } From 847a1d03e9b0e1d4efbe60421f6c74d770d7fc42 Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 28 Dec 2023 15:14:42 +0800 Subject: [PATCH 35/37] =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/hongdian/fun.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/api_s2c/hongdian/fun.ts b/src/api_s2c/hongdian/fun.ts index c73321e..a147aa0 100644 --- a/src/api_s2c/hongdian/fun.ts +++ b/src/api_s2c/hongdian/fun.ts @@ -423,10 +423,6 @@ export class HuoDongHongDianFun { } } - // let a = data.taskval. - // - // if () - return {show: false} } From 86595c68b3d538a130c0ad6f559d1ab2ccd133d9 Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 28 Dec 2023 15:17:06 +0800 Subject: [PATCH 36/37] cehua json --- src/json/g123item.json | 42 ++++ src/json/huodong.json5 | 60 +++--- src/json/item.json | 38 ++++ src/json/patacom.json | 350 ++++++++++++++++++++++++++++++++++ src/json/playerChatFrame.json | 19 +- src/json/playerHeadFrame.json | 17 ++ 6 files changed, 495 insertions(+), 31 deletions(-) diff --git a/src/json/g123item.json b/src/json/g123item.json index 670fbf3..36224df 100644 --- a/src/json/g123item.json +++ b/src/json/g123item.json @@ -7139,6 +7139,27 @@ "rarity": 4 } }, + "item^50011": { + "itemId": "item^50011", + "name": "新春安宁", + "i18nKey": "playerheadFrame_name_25", + "detailI18nKey": "intr_item_describe_50011", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, "item^50101": { "itemId": "item^50101", "name": "冰天雪地", @@ -7223,6 +7244,27 @@ "rarity": 4 } }, + "item^50105": { + "itemId": "item^50105", + "name": "新年快乐", + "i18nKey": "playerChatFrame_name_9", + "detailI18nKey": "intr_item_describe_50105", + "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png", + "value": 0, + "typeId": "item", + "typeName": "道具", + "isStoreSupported": true, + "isAiSupported": true, + "attributes": { + "storeDisplayPrice": null, + "storeCategory": "", + "setQuantity": 1, + "purchaseLimit": 0, + "sellMinCp": 100, + "sellMaxCp": 500, + "rarity": 4 + } + }, "item^50201": { "itemId": "item^50201", "name": "招贤纳士", diff --git a/src/json/huodong.json5 b/src/json/huodong.json5 index 5002f73..cb19964 100644 --- a/src/json/huodong.json5 +++ b/src/json/huodong.json5 @@ -2672,7 +2672,7 @@ { a: 'item', t: '49', - n: 6, + n: 4, p: 10, s: 3600 } @@ -2733,7 +2733,7 @@ { a: 'item', t: '49', - n: 6, + n: 4, p: 10, s: 3600 } @@ -3023,13 +3023,13 @@ "showtime" : "仅供参考，会复写正确值", "data" : { tasks: [ - { total: 100, prize: [{a: 'attr', t: 'rmbmoney', n: 500},{a: 'item', t: '4', n: 2}] }, - { total: 200, prize: [{a: 'attr', t: 'rmbmoney', n: 1000},{a: 'item', t: '12', n: 500}]}, - { total: 500, prize: [{a: 'attr', t: 'rmbmoney', n: 1500},{a: 'item', t: '4', n: 5}]}, - { total: 1000, prize: [{a: 'attr', t: 'rmbmoney', n: 2000},{a: 'item', t: '600', n: 20}]}, - { total: 2000, prize: [{a: 'attr', t: 'rmbmoney', n: 3000},{a: 'item', t: '609', n: 1}]}, - { total: 3000, prize: [{a: 'attr', t: 'rmbmoney', n: 6000},{a: 'item', t: '611', n: 1}]}, - { total: 5000, prize: [{a: 'attr', t: 'rmbmoney', n: 10000},{a: 'item', t: '610', n: 1}]} + { total: 1000, prize: [{a: 'attr', t: 'rmbmoney', n: 500},{a: 'item', t: '4', n: 2}] }, + { total: 2000, prize: [{a: 'attr', t: 'rmbmoney', n: 1000},{a: 'item', t: '12', n: 500}]}, + { total: 5000, prize: [{a: 'attr', t: 'rmbmoney', n: 1500},{a: 'item', t: '4', n: 5}]}, + { total: 10000, prize: [{a: 'attr', t: 'rmbmoney', n: 2000},{a: 'item', t: '600', n: 20}]}, + { total: 20000, prize: [{a: 'attr', t: 'rmbmoney', n: 3000},{a: 'item', t: '609', n: 1}]}, + { total: 30000, prize: [{a: 'attr', t: 'rmbmoney', n: 6000},{a: 'item', t: '611', n: 1}]}, + { total: 50000, prize: [{a: 'attr', t: 'rmbmoney', n: 10000},{a: 'item', t: '610', n: 1}]} ] }, "hdid" : 5001, // 唯一活动id 累计充值 @@ -3044,13 +3044,13 @@ "showtime" : "仅供参考，会复写正确值", "data" : { tasks: [ - { total: 100, prize: [{a: 'attr', t: 'rmbmoney', n: 500},{a: 'item', t: '4', n: 2}] }, - { total: 200, prize: [{a: 'attr', t: 'rmbmoney', n: 1000},{a: 'item', t: '12', n: 500}]}, - { total: 500, prize: [{a: 'attr', t: 'rmbmoney', n: 1500},{a: 'item', t: '4', n: 5}]}, - { total: 1000, prize: [{a: 'attr', t: 'rmbmoney', n: 2000},{a: 'item', t: '600', n: 20}]}, - { total: 2000, prize: [{a: 'attr', t: 'rmbmoney', n: 3000},{a: 'item', t: '609', n: 1}]}, - { total: 3000, prize: [{a: 'attr', t: 'rmbmoney', n: 6000},{a: 'item', t: '611', n: 1}]}, - { total: 5000, prize: [{a: 'attr', t: 'rmbmoney', n: 10000},{a: 'item', t: '610', n: 1}]} + { total: 1000, prize: [{a: 'attr', t: 'rmbmoney', n: 500},{a: 'item', t: '4', n: 2}] }, + { total: 2000, prize: [{a: 'attr', t: 'rmbmoney', n: 1000},{a: 'item', t: '12', n: 500}]}, + { total: 5000, prize: [{a: 'attr', t: 'rmbmoney', n: 1500},{a: 'item', t: '4', n: 5}]}, + { total: 10000, prize: [{a: 'attr', t: 'rmbmoney', n: 2000},{a: 'item', t: '600', n: 20}]}, + { total: 20000, prize: [{a: 'attr', t: 'rmbmoney', n: 3000},{a: 'item', t: '609', n: 1}]}, + { total: 30000, prize: [{a: 'attr', t: 'rmbmoney', n: 6000},{a: 'item', t: '611', n: 1}]}, + { total: 50000, prize: [{a: 'attr', t: 'rmbmoney', n: 10000},{a: 'item', t: '610', n: 1}]} ] }, "hdid" : 5002, // 唯一活动id 累计充值 @@ -3065,13 +3065,13 @@ "showtime" : "仅供参考，会复写正确值", "data" : { tasks: [ - { total: 100, prize: [{a: 'attr', t: 'rmbmoney', n: 500},{a: 'item', t: '4', n: 2}] }, - { total: 200, prize: [{a: 'attr', t: 'rmbmoney', n: 1000},{a: 'item', t: '12', n: 500}]}, - { total: 500, prize: [{a: 'attr', t: 'rmbmoney', n: 1500},{a: 'item', t: '4', n: 5}]}, - { total: 1000, prize: [{a: 'attr', t: 'rmbmoney', n: 2000},{a: 'item', t: '600', n: 20}]}, - { total: 2000, prize: [{a: 'attr', t: 'rmbmoney', n: 3000},{a: 'item', t: '609', n: 1}]}, - { total: 3000, prize: [{a: 'attr', t: 'rmbmoney', n: 6000},{a: 'item', t: '611', n: 1}]}, - { total: 5000, prize: [{a: 'attr', t: 'rmbmoney', n: 10000},{a: 'item', t: '610', n: 1}]} + { total: 1000, prize: [{a: 'attr', t: 'rmbmoney', n: 500},{a: 'item', t: '4', n: 2}] }, + { total: 2000, prize: [{a: 'attr', t: 'rmbmoney', n: 1000},{a: 'item', t: '12', n: 500}]}, + { total: 5000, prize: [{a: 'attr', t: 'rmbmoney', n: 1500},{a: 'item', t: '4', n: 5}]}, + { total: 10000, prize: [{a: 'attr', t: 'rmbmoney', n: 2000},{a: 'item', t: '600', n: 20}]}, + { total: 20000, prize: [{a: 'attr', t: 'rmbmoney', n: 3000},{a: 'item', t: '609', n: 1}]}, + { total: 30000, prize: [{a: 'attr', t: 'rmbmoney', n: 6000},{a: 'item', t: '611', n: 1}]}, + { total: 50000, prize: [{a: 'attr', t: 'rmbmoney', n: 10000},{a: 'item', t: '610', n: 1}]} ] }, "hdid" : 5003, // 唯一活动id 累计充值 @@ -3086,13 +3086,13 @@ "showtime" : "仅供参考，会复写正确值", "data" : { tasks: [ - { total: 100, prize: [{a: 'attr', t: 'rmbmoney', n: 500},{a: 'item', t: '4', n: 2}] }, - { total: 200, prize: [{a: 'attr', t: 'rmbmoney', n: 1000},{a: 'item', t: '12', n: 500}]}, - { total: 500, prize: [{a: 'attr', t: 'rmbmoney', n: 1500},{a: 'item', t: '4', n: 5}]}, - { total: 1000, prize: [{a: 'attr', t: 'rmbmoney', n: 2000},{a: 'item', t: '600', n: 20}]}, - { total: 2000, prize: [{a: 'attr', t: 'rmbmoney', n: 3000},{a: 'item', t: '609', n: 1}]}, - { total: 3000, prize: [{a: 'attr', t: 'rmbmoney', n: 6000},{a: 'item', t: '611', n: 1}]}, - { total: 5000, prize: [{a: 'attr', t: 'rmbmoney', n: 10000},{a: 'item', t: '610', n: 1}]} + { total: 1000, prize: [{a: 'attr', t: 'rmbmoney', n: 500},{a: 'item', t: '4', n: 2}] }, + { total: 2000, prize: [{a: 'attr', t: 'rmbmoney', n: 1000},{a: 'item', t: '12', n: 500}]}, + { total: 5000, prize: [{a: 'attr', t: 'rmbmoney', n: 1500},{a: 'item', t: '4', n: 5}]}, + { total: 10000, prize: [{a: 'attr', t: 'rmbmoney', n: 2000},{a: 'item', t: '600', n: 20}]}, + { total: 20000, prize: [{a: 'attr', t: 'rmbmoney', n: 3000},{a: 'item', t: '609', n: 1}]}, + { total: 30000, prize: [{a: 'attr', t: 'rmbmoney', n: 6000},{a: 'item', t: '611', n: 1}]}, + { total: 50000, prize: [{a: 'attr', t: 'rmbmoney', n: 10000},{a: 'item', t: '610', n: 1}]} ] } }, diff --git a/src/json/item.json b/src/json/item.json index c0dcdd7..bd9985f 100644 --- a/src/json/item.json +++ b/src/json/item.json @@ -4029,6 +4029,25 @@ "payId": "", "advancedEffects": "" }, + "50011": { + "id": 50011, + "name": "playerheadFrame_name_25", + "undefined": "使用后解锁头像框“新春安宁”", + "type": 7, + "sort": 1, + "colour": 4, + "way": [], + "go": "", + "icon": "txk_029", + "sicon": "txk_029", + "describe": "intr_item_describe_50011", + "diaoluo": 25, + "useNeed": [], + "usePrize": [], + "selecPrize": [], + "payId": "", + "advancedEffects": "" + }, "50101": { "id": 50101, "name": "playerChatFrame_name_6", @@ -4105,6 +4124,25 @@ "payId": "", "advancedEffects": "" }, + "50105": { + "id": 50105, + "name": "playerChatFrame_name_9", + "undefined": "使用后解锁聊天框“新年快乐”", + "type": 8, + "sort": 1, + "colour": 4, + "way": [], + "go": "", + "icon": "lt_dhk15", + "sicon": "lt_dhk15", + "describe": "intr_item_describe_50105", + "diaoluo": 9, + "useNeed": [], + "usePrize": [], + "selecPrize": [], + "payId": "", + "advancedEffects": "" + }, "50201": { "id": 50201, "name": "playerheadFrame_name_16", diff --git a/src/json/patacom.json b/src/json/patacom.json index 9a202fb..afce856 100644 --- a/src/json/patacom.json +++ b/src/json/patacom.json @@ -878,5 +878,355 @@ "n": 1 } ] + }, + "510": { + "id": 510, + "prize": [ + { + "a": "item", + "t": "1", + "n": 1020000 + }, + { + "a": "item", + "t": "12", + "n": 300 + } + ] + }, + "520": { + "id": 520, + "prize": [ + { + "a": "item", + "t": "1", + "n": 1040000 + }, + { + "a": "item", + "t": "12", + "n": 300 + }, + { + "a": "equip", + "t": "3009", + "n": 1 + } + ] + }, + "530": { + "id": 530, + "prize": [ + { + "a": "item", + "t": "1", + "n": 1060000 + }, + { + "a": "item", + "t": "12", + "n": 300 + } + ] + }, + "540": { + "id": 540, + "prize": [ + { + "a": "item", + "t": "1", + "n": 1080000 + }, + { + "a": "item", + "t": "12", + "n": 300 + }, + { + "a": "equip", + "t": "2009", + "n": 1 + } + ] + }, + "550": { + "id": 550, + "prize": [ + { + "a": "item", + "t": "1", + "n": 1100000 + }, + { + "a": "item", + "t": "12", + "n": 300 + } + ] + }, + "560": { + "id": 560, + "prize": [ + { + "a": "item", + "t": "1", + "n": 1120000 + }, + { + "a": "item", + "t": "12", + "n": 300 + }, + { + "a": "equip", + "t": "1009", + "n": 1 + } + ] + }, + "570": { + "id": 570, + "prize": [ + { + "a": "item", + "t": "1", + "n": 1140000 + }, + { + "a": "item", + "t": "12", + "n": 300 + } + ] + }, + "580": { + "id": 580, + "prize": [ + { + "a": "item", + "t": "1", + "n": 1160000 + }, + { + "a": "item", + "t": "12", + "n": 300 + }, + { + "a": "equip", + "t": "4003", + "n": 1 + } + ] + }, + "590": { + "id": 590, + "prize": [ + { + "a": "item", + "t": "1", + "n": 1180000 + }, + { + "a": "item", + "t": "12", + "n": 300 + } + ] + }, + "600": { + "id": 600, + "prize": [ + { + "a": "item", + "t": "1", + "n": 1200000 + }, + { + "a": "item", + "t": "12", + "n": 300 + }, + { + "a": "equip", + "t": "3003", + "n": 1 + } + ] + }, + "610": { + "id": 610, + "prize": [ + { + "a": "item", + "t": "1", + "n": 1220000 + }, + { + "a": "item", + "t": "12", + "n": 300 + } + ] + }, + "620": { + "id": 620, + "prize": [ + { + "a": "item", + "t": "1", + "n": 1240000 + }, + { + "a": "item", + "t": "12", + "n": 300 + }, + { + "a": "equip", + "t": "2003", + "n": 1 + } + ] + }, + "630": { + "id": 630, + "prize": [ + { + "a": "item", + "t": "1", + "n": 1260000 + }, + { + "a": "item", + "t": "12", + "n": 300 + } + ] + }, + "640": { + "id": 640, + "prize": [ + { + "a": "item", + "t": "1", + "n": 1280000 + }, + { + "a": "item", + "t": "12", + "n": 300 + }, + { + "a": "equip", + "t": "1003", + "n": 1 + } + ] + }, + "650": { + "id": 650, + "prize": [ + { + "a": "item", + "t": "1", + "n": 1300000 + }, + { + "a": "item", + "t": "12", + "n": 300 + } + ] + }, + "660": { + "id": 660, + "prize": [ + { + "a": "item", + "t": "1", + "n": 1320000 + }, + { + "a": "item", + "t": "12", + "n": 300 + }, + { + "a": "equip", + "t": "4004", + "n": 1 + } + ] + }, + "670": { + "id": 670, + "prize": [ + { + "a": "item", + "t": "1", + "n": 1340000 + }, + { + "a": "item", + "t": "12", + "n": 300 + } + ] + }, + "680": { + "id": 680, + "prize": [ + { + "a": "item", + "t": "1", + "n": 1360000 + }, + { + "a": "item", + "t": "12", + "n": 300 + }, + { + "a": "equip", + "t": "3004", + "n": 1 + } + ] + }, + "690": { + "id": 690, + "prize": [ + { + "a": "item", + "t": "1", + "n": 1380000 + }, + { + "a": "item", + "t": "12", + "n": 300 + } + ] + }, + "700": { + "id": 700, + "prize": [ + { + "a": "item", + "t": "1", + "n": 1400000 + }, + { + "a": "item", + "t": "12", + "n": 300 + }, + { + "a": "equip", + "t": "2004", + "n": 1 + } + ] } } \ No newline at end of file diff --git a/src/json/playerChatFrame.json b/src/json/playerChatFrame.json index 2ce6ea9..6646f7b 100644 --- a/src/json/playerChatFrame.json +++ b/src/json/playerChatFrame.json @@ -133,7 +133,24 @@ "buff": { "defpro": 0.01 }, - "colour": 3, + "colour": 4, + "ani": "" + }, + "9": { + "id": 9, + "name": "playerChatFrame_name_9", + "img": "lt_dhk15", + "cond": [ + "time", + -1 + ], + "undefined": "新年庆典获得", + "intr": "playerChatFrame_des_9", + "sort": 9, + "buff": { + "defpro": 0.01 + }, + "colour": 4, "ani": "" } } \ No newline at end of file diff --git a/src/json/playerHeadFrame.json b/src/json/playerHeadFrame.json index a52191d..3b8ad3e 100644 --- a/src/json/playerHeadFrame.json +++ b/src/json/playerHeadFrame.json @@ -408,5 +408,22 @@ }, "colour": 5, "ani": "" + }, + "25": { + "id": 25, + "name": "playerheadFrame_name_25", + "undefined": "新年庆典活动获得，解锁后生命加成+1%", + "img": "txk_029", + "cond": [ + "time", + -1 + ], + "intr": "playerheadFrame_des_25", + "sort": 25, + "buff": { + "hppro": 0.01 + }, + "colour": 4, + "ani": "" } } \ No newline at end of file From f2b9f1239031050c8add7bb00a14c50ba50b6e60 Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 28 Dec 2023 17:33:47 +0800 Subject: [PATCH 37/37] huodong.json --- src/json/huodong.json5 | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/json/huodong.json5 b/src/json/huodong.json5 index cb19964..e701f4a 100644 --- a/src/json/huodong.json5 +++ b/src/json/huodong.json5 @@ -3030,8 +3030,10 @@ { total: 20000, prize: [{a: 'attr', t: 'rmbmoney', n: 3000},{a: 'item', t: '609', n: 1}]}, { total: 30000, prize: [{a: 'attr', t: 'rmbmoney', n: 6000},{a: 'item', t: '611', n: 1}]}, { total: 50000, prize: [{a: 'attr', t: 'rmbmoney', n: 10000},{a: 'item', t: '610', n: 1}]} - ] - }, + ] + } + }, + { "hdid" : 5001, // 唯一活动id 累计充值 "htype" : 5, // 后端唯一识别标识 "stype" : 500, // 前端唯一识别标识（看前端需要是否修改） @@ -3051,8 +3053,10 @@ { total: 20000, prize: [{a: 'attr', t: 'rmbmoney', n: 3000},{a: 'item', t: '609', n: 1}]}, { total: 30000, prize: [{a: 'attr', t: 'rmbmoney', n: 6000},{a: 'item', t: '611', n: 1}]}, { total: 50000, prize: [{a: 'attr', t: 'rmbmoney', n: 10000},{a: 'item', t: '610', n: 1}]} - ] - }, + ] + } + }, + { "hdid" : 5002, // 唯一活动id 累计充值 "htype" : 5, // 后端唯一识别标识 "stype" : 500, // 前端唯一识别标识（看前端需要是否修改） @@ -3072,8 +3076,10 @@ { total: 20000, prize: [{a: 'attr', t: 'rmbmoney', n: 3000},{a: 'item', t: '609', n: 1}]}, { total: 30000, prize: [{a: 'attr', t: 'rmbmoney', n: 6000},{a: 'item', t: '611', n: 1}]}, { total: 50000, prize: [{a: 'attr', t: 'rmbmoney', n: 10000},{a: 'item', t: '610', n: 1}]} - ] - }, + ] + } + }, + { "hdid" : 5003, // 唯一活动id 累计充值 "htype" : 5, // 后端唯一识别标识 "stype" : 500, // 前端唯一识别标识（看前端需要是否修改） @@ -3093,9 +3099,9 @@ { total: 20000, prize: [{a: 'attr', t: 'rmbmoney', n: 3000},{a: 'item', t: '609', n: 1}]}, { total: 30000, prize: [{a: 'attr', t: 'rmbmoney', n: 6000},{a: 'item', t: '611', n: 1}]}, { total: 50000, prize: [{a: 'attr', t: 'rmbmoney', n: 10000},{a: 'item', t: '610', n: 1}]} - ] - } - }, + ] + } + }, { "hdid" : 6000, // 唯一活动id 七日登录 "htype" : 6, // 后端唯一识别标识