diff --git a/src/api_s2c/event/shouchong/ApiOpen.ts b/src/api_s2c/event/shouchong/ApiOpen.ts index 010d12f..4f6fb4b 100644 --- a/src/api_s2c/event/shouchong/ApiOpen.ts +++ b/src/api_s2c/event/shouchong/ApiOpen.ts @@ -1,11 +1,14 @@ import { ApiCall } from "tsrpc"; import { ReqOpen, ResOpen } from "../../../shared/protocols/event/shouchong/PtlOpen"; +import {PayFun} from "../../../public/pay"; export default async function (call: ApiCall) { - let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' }); + let data = await G.mongodb.cEvent('shouchongzhigou').findOne({uid: call.uid, type: 'shouchongzhigou'}) + + let payIds = R.compose(R.map(i=>i.payid),R.values())(G.gc.shouchong) call.succ({ - payNum: call.conn.gud.payExp / 10, - receive: Object.fromEntries(Object.keys(G.gc.shouchong).map(k => [k, data?.receive?.[k] || []])) - }); + receive: data?.receive || {}, + buyLog: await PayFun.getPayLogs(call.uid, payIds) + }) } \ No newline at end of file diff --git a/src/api_s2c/event/shouchong/ApiReceive.ts b/src/api_s2c/event/shouchong/ApiReceive.ts index 6e29d12..e5debb9 100644 --- a/src/api_s2c/event/shouchong/ApiReceive.ts +++ b/src/api_s2c/event/shouchong/ApiReceive.ts @@ -1,28 +1,31 @@ -import { ApiCall } from "tsrpc"; -import { PlayerFun } from '../../../public/player'; -import { ReqReceive, ResReceive } from "../../../shared/protocols/event/shouchong/PtlReceive"; -import { PublicShared } from '../../../shared/public/public'; -import { HongDianChange } from "../../hongdian/fun"; +import {ApiCall} from "tsrpc"; +import {PlayerFun} from '../../../public/player'; +import {ReqReceive, ResReceive} from "../../../shared/protocols/event/shouchong/PtlReceive"; +import {PublicShared} from '../../../shared/public/public'; +import {HongDianChange} from "../../hongdian/fun"; +import {PayFun} from "../../../public/pay"; export default async function (call: ApiCall) { let conf = G.gc.shouchong[call.req.k]; - if (!conf) return call.error(globalThis.lng.pata_getprize_1); - let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' }); + let payLog = await PayFun.getPayLog(call.uid, conf.payid) + if (!payLog) return call.errorCode(-1) + + let data = await G.mongodb.cEvent('shouchongzhigou').findOne({ uid: call.uid, type: 'shouchongzhigou' }); let recArr = data?.receive?.[call.req.k] || []; - if (call.conn.gud.payExp < conf.paynum) return call.error(globalThis.lng.event_kfkh_9); + // if (call.conn.gud.payExp < conf.paynum) return call.error(globalThis.lng.event_kfkh_9); if (recArr.length >= conf.prize.length) return call.error(globalThis.lng.event_kfkh_3); if (recArr.slice(-1)[0] && PublicShared.getToDayZeroTime() < recArr.slice(-1)[0]) return call.error(globalThis.lng.event_kfkh_10); await PlayerFun.sendPrize(call, conf.prize[recArr.length]); - await G.mongodb.cEvent('shouchong').updateOne( - { uid: call.uid, type: 'shouchong' }, + await G.mongodb.cEvent('shouchongzhigou').updateOne( + { uid: call.uid, type: 'shouchongzhigou' }, { $push: G.mongodb.createTreeObj({ key: 'receive', k: call.req.k, val: G.time }) }, { upsert: true } ); @@ -40,17 +43,16 @@ export default async function (call: ApiCall) { } export async function getShouChongRedPoint(call: ApiCall) { - let res = { show: false }; - let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' }); + // let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' }); + // + // for (let [id, conf] of Object.entries(G.gc.shouchong)) { + // let rec = data?.receive?.[id] || []; + // if (call.conn.gud.payExp / 10 < conf.paynum || rec.length >= conf.prize.length) continue; + // if (rec.length == 0 || rec.slice(-1)[0] < PublicShared.getToDayZeroTime(G.time)) { + // res = { show: true }; + // break; + // } + // } - for (let [id, conf] of Object.entries(G.gc.shouchong)) { - let rec = data?.receive?.[id] || []; - if (call.conn.gud.payExp / 10 < conf.paynum || rec.length >= conf.prize.length) continue; - if (rec.length == 0 || rec.slice(-1)[0] < PublicShared.getToDayZeroTime(G.time)) { - res = { show: true }; - break; - } - } - - return res; + return {show: false}; } \ No newline at end of file diff --git a/src/api_s2c/gonghui/ApiGetList.ts b/src/api_s2c/gonghui/ApiGetList.ts index 4d96835..bd1ee59 100644 --- a/src/api_s2c/gonghui/ApiGetList.ts +++ b/src/api_s2c/gonghui/ApiGetList.ts @@ -2,20 +2,46 @@ import {ApiCall} from "tsrpc"; import {GHManage} from '../../public/gonghui/manage'; import {ReqGetList, ResGetList} from "../../shared/protocols/gonghui/PtlGetList"; +async function getGongHuiZhanli(ghId:string):Promise{ + //如果redis里有,则直接返回 + let zhanliRes = await G.ioredis.get(`gongHuiZhanLi:${ghId}`); + if(zhanliRes){ + return parseInt(zhanliRes); + } + + let GHData = await GHManage.getGHList(); + let ghs = Object.values(GHData).map(item => item.data).filter(i => !!i.players); + let fuids = R.flatten(ghs.map(i => i.players.map(j => j.uid))) + let allRoles = await G.mongodb.find('user',{uid: {$in: fuids}},['uid','power']) + let zhanlis = Object.fromEntries(allRoles.map(r => [r.uid, r.power])); + + + for (let gh of ghs) { + let uids = gh.players.map(p => p.uid); + let zhanli = uids.map(u => (zhanlis[u] || 0)).reduce((a, b) => a + b); + //重设redis的值,有效期1小时 + G.ioredis.setex(`gongHuiZhanLi:${gh._id}`,3600, zhanli); + + if(gh._id == ghId){ + zhanliRes = zhanli; + } + } + + return parseInt(zhanliRes||"0"); +} + export default async function (call: ApiCall) { let arr: ResGetList['list'] = []; let GHData = await GHManage.getGHList(); let ghs = Object.values(GHData).map(item => item.data).filter(i => !!i.players); - - let fuids = R.flatten(ghs.map(i => i.players.map(j => j.uid))) - - let allRoles = await G.mongodb.find('user',{uid: {$in: fuids}},['uid','power']) - let zhanlis = Object.fromEntries(allRoles.map(r => [r.uid, r.power])); - + // let fuids = R.flatten(ghs.map(i => i.players.map(j => j.uid))) + // let allRoles = await G.mongodb.find('user',{uid: {$in: fuids}},['uid','power']) + // let zhanlis = Object.fromEntries(allRoles.map(r => [r.uid, r.power])); for (let gh of ghs) { - let uids = gh.players.map(p => p.uid); - let zhanli = uids.map(u => (zhanlis[u] || 0)).reduce((a, b) => a + b); + //let uids = gh.players.map(p => p.uid); + //let zhanli = uids.map(u => (zhanlis[u] || 0)).reduce((a, b) => a + b); + let zhanli = await getGongHuiZhanli(gh._id); arr.push({ gh: gh, zhanli: zhanli diff --git a/src/json/attr.json b/src/json/attr.json index 16dc0f5..3d3120f 100644 --- a/src/json/attr.json +++ b/src/json/attr.json @@ -108,5 +108,25 @@ "sicon": "icon_heroBox_11", "describe": "tlsd_guess_prize_3", "advancedEffects": "ani_xiangzikuang" + }, + "shengdanExp": { + "id": "shengdanExp", + "name": "intr_attr_name_13", + "undefined": "圣诞战令经验", + "colour": 5, + "icon": "icon_shengdanExp", + "sicon": "icon_shengdanExp", + "describe": "intr_attr_describe_13", + "advancedEffects": "ani_xiangzikuang" + }, + "shengdanBullet": { + "id": "shengdanBullet", + "name": "intr_attr_name_14", + "undefined": "圣诞子弹", + "colour": 5, + "icon": "icon_zuanshi", + "sicon": "icon_zuanshi", + "describe": "intr_attr_describe_14", + "advancedEffects": "ani_xiangzikuang" } } \ No newline at end of file diff --git a/src/json/herogrow.json b/src/json/herogrow.json index 720f6c6..cca1f3c 100644 --- a/src/json/herogrow.json +++ b/src/json/herogrow.json @@ -100,7 +100,11 @@ "atk": 80, "maxdps": 200, "def": 55, - "speed": 5 + "speed": 5, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -132,7 +136,11 @@ "atk": 80, "maxdps": 365, "def": 95, - "speed": 5 + "speed": 5, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -164,7 +172,11 @@ "atk": 80, "maxdps": 550, "def": 145, - "speed": 5 + "speed": 5, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -196,7 +208,11 @@ "atk": 80, "maxdps": 745, "def": 195, - "speed": 5 + "speed": 5, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -323,7 +339,11 @@ "atk": 80, "maxdps": 110, "hp": 1150, - "speed": 5 + "speed": 5, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -355,7 +375,11 @@ "atk": 80, "maxdps": 195, "hp": 1200, - "speed": 5 + "speed": 5, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -387,7 +411,11 @@ "atk": 80, "maxdps": 300, "hp": 2160, - "speed": 5 + "speed": 5, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -419,7 +447,11 @@ "atk": 80, "maxdps": 415, "hp": 3170, - "speed": 5 + "speed": 5, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -546,7 +578,11 @@ "atk": 100, "maxdps": 120, "hp": 1200, - "speed": 10 + "speed": 10, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -578,7 +614,11 @@ "atk": 100, "maxdps": 210, "hp": 2120, - "speed": 10 + "speed": 10, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -610,7 +650,11 @@ "atk": 100, "maxdps": 320, "hp": 3170, - "speed": 10 + "speed": 10, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -642,7 +686,11 @@ "atk": 100, "maxdps": 440, "hp": 4280, - "speed": 10 + "speed": 10, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -766,7 +814,11 @@ "jj_attr": { "atk": 260, "hp": 630, - "speed": 10 + "speed": 10, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -797,7 +849,11 @@ "jj_attr": { "atk": 385, "hp": 1100, - "speed": 10 + "speed": 10, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -828,7 +884,11 @@ "jj_attr": { "atk": 530, "hp": 1650, - "speed": 10 + "speed": 10, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -859,7 +919,11 @@ "jj_attr": { "atk": 680, "hp": 2250, - "speed": 10 + "speed": 10, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -983,7 +1047,11 @@ "jj_attr": { "def": 150, "xixuepro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -1014,7 +1082,11 @@ "jj_attr": { "def": 350, "xixuepro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -1046,7 +1118,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -1078,7 +1154,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -1110,7 +1190,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 33800 + "hp": 33800, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -1142,7 +1226,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 33800 + "hp": 33800, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -1174,7 +1262,11 @@ "def": 3050, "xixuepro": 0.06, "speed": 290, - "hp": 33800 + "hp": 33800, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -1206,7 +1298,11 @@ "def": 3050, "xixuepro": 0.06, "speed": 290, - "hp": 33800 + "hp": 33800, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 1890 @@ -1332,7 +1428,11 @@ "jj_attr": { "atk": 168, "baoshangpro": 0.15, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -1364,7 +1464,11 @@ "atk": 168, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -1396,7 +1500,11 @@ "atk": 613, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -1429,7 +1537,11 @@ "baoshangpro": 0.15, "speed": 20, "hp": 2300, - "xixuepro": 0.3 + "xixuepro": 0.3, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -1463,7 +1575,11 @@ "speed": 20, "hp": 2300, "xixuepro": 0.3, - "def": 2700 + "def": 2700, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -1497,7 +1613,11 @@ "speed": 20, "hp": 2300, "xixuepro": 0.3, - "def": 2700 + "def": 2700, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -1532,7 +1652,11 @@ "hp": 2300, "xixuepro": 0.3, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -1567,7 +1691,11 @@ "hp": 2300, "xixuepro": 0.3, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "atk": 1176 @@ -1693,7 +1821,11 @@ "jj_attr": { "def": 150, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -1724,7 +1856,11 @@ "jj_attr": { "def": 350, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -1756,7 +1892,11 @@ "def": 350, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -1789,7 +1929,11 @@ "undpspro": 0.06, "speed": 20, "hp": 3000, - "longdpsdrop": 0.4 + "longdpsdrop": 0.4, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -1822,7 +1966,11 @@ "undpspro": 0.06, "speed": 20, "hp": 33800, - "longdpsdrop": 0.4 + "longdpsdrop": 0.4, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -1856,7 +2004,11 @@ "speed": 20, "hp": 33800, "longdpsdrop": 0.4, - "neardpsdrop": 0.5 + "neardpsdrop": 0.5, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -1892,7 +2044,11 @@ "longdpsdrop": 0.4, "neardpsdrop": 0.5, "atk": 1680, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -1928,7 +2084,11 @@ "longdpsdrop": 0.4, "neardpsdrop": 0.5, "atk": 1680, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 1890 @@ -2055,7 +2215,11 @@ "atk": 168, "baoshangpro": 0.15, "speed": 20, - "fanshang": 1 + "fanshang": 1, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -2088,7 +2252,11 @@ "baoshangpro": 0.15, "speed": 20, "fanshang": 1, - "hp": 2300 + "hp": 2300, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -2121,7 +2289,11 @@ "baoshangpro": 0.15, "speed": 20, "fanshang": 1, - "hp": 2300 + "hp": 2300, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -2154,7 +2326,11 @@ "baoshangpro": 0.15, "speed": 20, "fanshang": 1, - "hp": 2300 + "hp": 2300, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -2187,7 +2363,11 @@ "baoshangpro": 0.15, "speed": 20, "fanshang": 1, - "hp": 33100 + "hp": 33100, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -2220,7 +2400,11 @@ "baoshangpro": 0.15, "speed": 20, "fanshang": 2, - "hp": 33100 + "hp": 33100, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -2255,7 +2439,11 @@ "hp": 33100, "fanshang": 2, "def": 2700, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -2290,7 +2478,11 @@ "hp": 33100, "fanshang": 2, "def": 2700, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 1890 @@ -2416,7 +2608,11 @@ "jj_attr": { "atk": 168, "baoshangpro": 0.1, - "speed": 15 + "speed": 15, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -2448,7 +2644,11 @@ "atk": 168, "baoshangpro": 0.1, "speed": 15, - "hp": 2000 + "hp": 2000, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -2480,7 +2680,11 @@ "atk": 568, "baoshangpro": 0.1, "speed": 15, - "hp": 2000 + "hp": 2000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -2513,7 +2717,11 @@ "baoshangpro": 0.1, "speed": 15, "hp": 2000, - "magdpsdrop": 4 + "magdpsdrop": 4, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -2546,7 +2754,11 @@ "baoshangpro": 0.1, "speed": 15, "hp": 32800, - "magdpsdrop": 4 + "magdpsdrop": 4, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -2579,7 +2791,11 @@ "baoshangpro": 0.1, "speed": 15, "hp": 32800, - "magdpsdrop": 4 + "magdpsdrop": 4, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -2614,7 +2830,11 @@ "hp": 32800, "magdpsdrop": 4, "def": 2700, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -2649,7 +2869,11 @@ "hp": 32800, "magdpsdrop": 4, "def": 2700, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 21560 @@ -2776,7 +3000,11 @@ "atk": 168, "fanshangpro": 0.06, "speed": 20, - "xixuepro": 0.75 + "xixuepro": 0.75, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -2809,7 +3037,11 @@ "fanshangpro": 0.06, "speed": 20, "xixuepro": 0.75, - "def": 220 + "def": 220, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -2842,7 +3074,11 @@ "fanshangpro": 0.06, "speed": 20, "xixuepro": 0.75, - "def": 200 + "def": 200, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -2876,7 +3112,11 @@ "speed": 20, "xixuepro": 0.75, "def": 200, - "neardpsdrop": 0.4 + "neardpsdrop": 0.4, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -2910,7 +3150,11 @@ "speed": 20, "xixuepro": 0.75, "def": 200, - "neardpsdrop": 0.4 + "neardpsdrop": 0.4, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -2944,7 +3188,11 @@ "speed": 20, "xixuepro": 1, "def": 200, - "neardpsdrop": 0.4 + "neardpsdrop": 0.4, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -2980,7 +3228,11 @@ "def": 200, "neardpsdrop": 0.4, "hp": 30800, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -3016,7 +3268,11 @@ "def": 200, "neardpsdrop": 0.4, "hp": 30800, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "atk": 1175 @@ -3142,7 +3398,11 @@ "jj_attr": { "atk": 168, "xixuepro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -3174,7 +3434,11 @@ "atk": 168, "xixuepro": 0.06, "speed": 20, - "def": 200 + "def": 200, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -3207,7 +3471,11 @@ "xixuepro": 0.06, "speed": 20, "def": 200, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -3240,7 +3508,11 @@ "xixuepro": 0.06, "speed": 20, "def": 200, - "hp": 3000 + "hp": 3000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -3273,7 +3545,11 @@ "xixuepro": 0.06, "speed": 20, "def": 2900, - "hp": 3000 + "hp": 3000, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -3306,7 +3582,11 @@ "xixuepro": 0.06, "speed": 20, "def": 2900, - "hp": 3000 + "hp": 3000, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -3340,7 +3620,11 @@ "speed": 20, "def": 2900, "hp": 33800, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -3374,7 +3658,11 @@ "speed": 20, "def": 2900, "hp": 33800, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 1890 @@ -3500,7 +3788,11 @@ "jj_attr": { "atk": 150, "baoshangpro": 0.1, - "speed": 15 + "speed": 15, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -3532,7 +3824,11 @@ "atk": 150, "baoshangpro": 0.1, "speed": 15, - "hp": 2000 + "hp": 2000, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -3564,7 +3860,11 @@ "atk": 550, "baoshangpro": 0.1, "speed": 15, - "hp": 2000 + "hp": 2000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -3596,7 +3896,11 @@ "atk": 550, "baoshangpro": 0.1, "speed": 15, - "hp": 2000 + "hp": 2000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -3628,7 +3932,11 @@ "atk": 2230, "baoshangpro": 0.1, "speed": 15, - "hp": 2000 + "hp": 2000, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -3660,7 +3968,11 @@ "atk": 2230, "baoshangpro": 0.1, "speed": 15, - "hp": 2000 + "hp": 2000, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -3693,7 +4005,11 @@ "baoshangpro": 0.1, "speed": 15, "hp": 32800, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -3726,7 +4042,11 @@ "baoshangpro": 0.1, "speed": 15, "hp": 32800, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "atk": 1176 @@ -3852,7 +4172,11 @@ "jj_attr": { "def": 150, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -3883,7 +4207,11 @@ "jj_attr": { "def": 350, "undpspro": 0.06, - "speed": 220 + "speed": 220, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -3915,7 +4243,11 @@ "def": 350, "undpspro": 0.06, "speed": 220, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -3948,7 +4280,10 @@ "undpspro": 0.06, "speed": 220, "hp": 3000, - "defpro": 0.5 + "defpro": 0.8, + "atkpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -3982,7 +4317,10 @@ "speed": 220, "hp": 3000, "atk": 1680, - "defpro": 0.5 + "defpro": 1, + "atkpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -4016,7 +4354,10 @@ "speed": 220, "hp": 3000, "atk": 1680, - "defpro": 0.5 + "defpro": 1.2, + "atkpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -4051,7 +4392,10 @@ "hp": 33800, "atk": 1680, "pvpdpsdrop": 0.3, - "defpro": 0.5 + "defpro": 1.4, + "atkpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -4086,7 +4430,10 @@ "hp": 33800, "atk": 1680, "pvpdpsdrop": 0.3, - "defpro": 0.5 + "defpro": 1.8, + "atkpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "atk": 1176 @@ -4212,7 +4559,11 @@ "jj_attr": { "atk": 150, "fanshangpro": 0.05, - "speed": 15 + "speed": 15, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -4244,7 +4595,11 @@ "atk": 150, "fanshangpro": 0.05, "speed": 15, - "def": 200 + "def": 200, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -4276,7 +4631,11 @@ "atk": 550, "fanshangpro": 0.05, "speed": 15, - "def": 200 + "def": 200, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -4308,7 +4667,11 @@ "atk": 550, "fanshangpro": 0.05, "speed": 15, - "def": 200 + "def": 200, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -4340,7 +4703,11 @@ "atk": 2230, "fanshangpro": 0.05, "speed": 15, - "def": 200 + "def": 200, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -4372,7 +4739,11 @@ "atk": 2230, "fanshangpro": 0.05, "speed": 15, - "def": 200 + "def": 200, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -4405,7 +4776,11 @@ "fanshangpro": 0.05, "speed": 15, "def": 2900, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -4438,7 +4813,11 @@ "fanshangpro": 0.05, "speed": 15, "def": 2900, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "atk": 1176 @@ -4564,7 +4943,11 @@ "jj_attr": { "atk": 168, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -4596,7 +4979,11 @@ "atk": 168, "undpspro": 0.06, "speed": 20, - "def": 200 + "def": 200, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -4629,7 +5016,11 @@ "undpspro": 0.06, "speed": 20, "def": 200, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -4662,7 +5053,11 @@ "undpspro": 0.06, "speed": 20, "def": 200, - "hp": 3000 + "hp": 3000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -4695,7 +5090,11 @@ "undpspro": 0.06, "speed": 20, "def": 200, - "hp": 3000 + "hp": 3000, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -4728,7 +5127,11 @@ "undpspro": 0.06, "speed": 20, "def": 200, - "hp": 3000 + "hp": 3000, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -4762,7 +5165,11 @@ "speed": 20, "def": 2900, "hp": 3000, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -4796,7 +5203,11 @@ "speed": 20, "def": 2900, "hp": 3000, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 1890 @@ -4922,7 +5333,11 @@ "jj_attr": { "hp": 1500, "undpspro": 0.05, - "speed": 15 + "speed": 15, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -4954,7 +5369,11 @@ "atk": 220, "hp": 1500, "undpspro": 0.05, - "speed": 15 + "speed": 15, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -4986,7 +5405,11 @@ "atk": 220, "hp": 4500, "undpspro": 0.05, - "speed": 15 + "speed": 15, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -5019,7 +5442,11 @@ "hp": 4500, "undpspro": 0.05, "speed": 15, - "phydpsdrop": 0.3 + "phydpsdrop": 0.3, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -5052,7 +5479,11 @@ "hp": 4500, "undpspro": 0.05, "speed": 15, - "phydpsdrop": 0.3 + "phydpsdrop": 0.3, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -5085,7 +5516,11 @@ "hp": 4500, "undpspro": 0.05, "speed": 15, - "phydpsdrop": 0.3 + "phydpsdrop": 0.3, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -5120,7 +5555,11 @@ "speed": 15, "phydpsdrop": 0.3, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -5155,7 +5594,11 @@ "speed": 15, "phydpsdrop": 0.3, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 1980 @@ -5281,7 +5724,11 @@ "jj_attr": { "def": 150, "xixuepro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -5312,7 +5759,11 @@ "jj_attr": { "def": 350, "xixuepro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -5344,7 +5795,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -5376,7 +5831,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -5408,7 +5867,11 @@ "def": 3050, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -5441,7 +5904,11 @@ "xixuepro": 0.06, "speed": 20, "hp": 3000, - "magdpsdrop": 0.3 + "magdpsdrop": 0.3, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -5476,7 +5943,11 @@ "speed": 20, "hp": 3000, "magdpsdrop": 0.3, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -5511,7 +5982,11 @@ "speed": 20, "hp": 3000, "magdpsdrop": 0.3, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 1980 @@ -5637,7 +6112,11 @@ "jj_attr": { "atk": 150, "fanshangpro": 0.05, - "speed": 15 + "speed": 15, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -5669,7 +6148,11 @@ "atk": 150, "fanshangpro": 0.05, "speed": 15, - "def": 200 + "def": 200, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -5701,7 +6184,11 @@ "atk": 550, "fanshangpro": 0.05, "speed": 15, - "def": 200 + "def": 200, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -5734,7 +6221,11 @@ "fanshangpro": 0.05, "speed": 15, "def": 200, - "neardpsdrop": 0.4 + "neardpsdrop": 0.4, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -5767,7 +6258,11 @@ "fanshangpro": 0.05, "speed": 15, "def": 200, - "neardpsdrop": 0.4 + "neardpsdrop": 0.4, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -5800,7 +6295,11 @@ "fanshangpro": 0.05, "speed": 15, "def": 200, - "neardpsdrop": 0.4 + "neardpsdrop": 0.4, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -5834,7 +6333,11 @@ "speed": 15, "def": 2900, "neardpsdrop": 0.4, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -5868,7 +6371,11 @@ "speed": 15, "def": 2900, "neardpsdrop": 0.4, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "atk": 1176 @@ -5994,7 +6501,11 @@ "jj_attr": { "atk": 168, "baoshangpro": 0.15, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -6026,7 +6537,11 @@ "atk": 168, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -6058,7 +6573,11 @@ "atk": 613, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -6091,7 +6610,11 @@ "baoshangpro": 0.15, "speed": 20, "hp": 2300, - "xixuepro": 0.3 + "xixuepro": 0.3, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -6124,7 +6647,11 @@ "baoshangpro": 0.15, "speed": 20, "hp": 33100, - "xixuepro": 0.3 + "xixuepro": 0.3, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -6157,7 +6684,11 @@ "baoshangpro": 0.15, "speed": 20, "hp": 33100, - "xixuepro": 0.3 + "xixuepro": 0.3, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -6192,7 +6723,11 @@ "hp": 33100, "xixuepro": 0.3, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -6227,7 +6762,11 @@ "hp": 33100, "xixuepro": 0.3, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 21560 @@ -6353,7 +6892,11 @@ "jj_attr": { "atk": 168, "mingzhongpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -6385,7 +6928,11 @@ "atk": 168, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -6417,7 +6964,11 @@ "atk": 613, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -6449,7 +7000,11 @@ "atk": 613, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -6481,7 +7036,11 @@ "atk": 2293, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -6513,7 +7072,11 @@ "atk": 2293, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -6546,7 +7109,11 @@ "mingzhongpro": 0.06, "speed": 20, "hp": 2300, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -6579,7 +7146,11 @@ "mingzhongpro": 0.06, "speed": 20, "hp": 33100, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 21560 @@ -6705,7 +7276,11 @@ "jj_attr": { "atk": 168, "fanshangpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -6737,7 +7312,11 @@ "atk": 168, "fanshangpro": 0.06, "speed": 20, - "def": 220 + "def": 220, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -6769,7 +7348,11 @@ "atk": 613, "fanshangpro": 0.06, "speed": 20, - "def": 220 + "def": 220, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -6801,7 +7384,11 @@ "atk": 1226, "fanshangpro": 0.06, "speed": 20, - "def": 220 + "def": 220, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -6834,7 +7421,11 @@ "fanshangpro": 0.06, "speed": 20, "def": 220, - "hp": 30800 + "hp": 30800, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -6867,7 +7458,11 @@ "fanshangpro": 0.06, "speed": 20, "def": 220, - "hp": 30800 + "hp": 30800, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -6901,7 +7496,11 @@ "speed": 20, "def": 220, "hp": 30800, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -6935,7 +7534,11 @@ "speed": 20, "def": 220, "hp": 30800, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 21560 @@ -7061,7 +7664,11 @@ "jj_attr": { "atk": 168, "mingzhongpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -7093,7 +7700,11 @@ "atk": 168, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -7125,7 +7736,11 @@ "atk": 613, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -7157,7 +7772,11 @@ "atk": 1226, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -7190,7 +7809,11 @@ "mingzhongpro": 0.06, "speed": 20, "hp": 2300, - "def": 2700 + "def": 2700, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -7223,7 +7846,11 @@ "mingzhongpro": 0.06, "speed": 20, "hp": 2300, - "def": 2700 + "def": 2700, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -7257,7 +7884,11 @@ "speed": 20, "hp": 2300, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -7291,7 +7922,11 @@ "speed": 20, "hp": 2300, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 1980 @@ -7417,7 +8052,11 @@ "jj_attr": { "atk": 168, "mingzhongpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -7449,7 +8088,11 @@ "atk": 168, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -7481,7 +8124,11 @@ "atk": 613, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -7513,7 +8160,11 @@ "atk": 613, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -7546,7 +8197,11 @@ "mingzhongpro": 0.06, "speed": 20, "hp": 2300, - "def": 2700 + "def": 2700, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -7579,7 +8234,11 @@ "mingzhongpro": 0.06, "speed": 20, "hp": 2300, - "def": 2700 + "def": 2700, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -7612,7 +8271,11 @@ "mingzhongpro": 0.06, "speed": 20, "hp": 2300, - "def": 2700 + "def": 2700, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -7645,7 +8308,11 @@ "mingzhongpro": 0.06, "speed": 20, "hp": 2300, - "def": 2700 + "def": 2700, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "atk": 1176 @@ -7771,7 +8438,11 @@ "jj_attr": { "atk": 168, "baoshangpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -7803,7 +8474,11 @@ "atk": 168, "baoshangpro": 0.06, "speed": 20, - "def": 220 + "def": 220, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -7835,7 +8510,11 @@ "atk": 613, "baoshangpro": 0.06, "speed": 20, - "def": 220 + "def": 220, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -7867,7 +8546,11 @@ "atk": 613, "baoshangpro": 0.06, "speed": 20, - "def": 220 + "def": 220, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -7899,7 +8582,11 @@ "atk": 2293, "baoshangpro": 0.06, "speed": 20, - "def": 220 + "def": 220, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -7931,7 +8618,11 @@ "atk": 2293, "baoshangpro": 0.06, "speed": 20, - "def": 220 + "def": 220, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -7964,7 +8655,11 @@ "baoshangpro": 0.06, "speed": 20, "def": 2920, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -7997,7 +8692,11 @@ "baoshangpro": 0.06, "speed": 20, "def": 2920, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "atk": 1176 @@ -8123,7 +8822,11 @@ "jj_attr": { "atk": 168, "baoshangpro": 0.15, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -8155,7 +8858,11 @@ "atk": 168, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -8187,7 +8894,11 @@ "atk": 613, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -8219,7 +8930,11 @@ "atk": 613, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -8252,7 +8967,11 @@ "baoshangpro": 0.15, "speed": 20, "hp": 2300, - "def": 2700 + "def": 2700, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -8285,7 +9004,11 @@ "baoshangpro": 0.15, "speed": 20, "hp": 2300, - "def": 2700 + "def": 2700, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -8319,7 +9042,11 @@ "speed": 20, "hp": 2300, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -8353,7 +9080,11 @@ "speed": 20, "hp": 2300, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 21560 @@ -8479,7 +9210,11 @@ "jj_attr": { "def": 150, "xixuepro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -8510,7 +9245,11 @@ "jj_attr": { "def": 350, "xixuepro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -8542,7 +9281,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -8574,7 +9317,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -8606,7 +9353,11 @@ "def": 3050, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -8638,7 +9389,11 @@ "def": 3050, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -8672,7 +9427,11 @@ "xixuepro": 0.06, "speed": 20, "hp": 3000, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -8706,7 +9465,11 @@ "xixuepro": 0.06, "speed": 20, "hp": 3000, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "atk": 1176 @@ -8832,7 +9595,11 @@ "jj_attr": { "def": 150, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -8863,7 +9630,11 @@ "jj_attr": { "def": 350, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -8895,7 +9666,11 @@ "def": 350, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -8927,7 +9702,11 @@ "def": 350, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -8959,7 +9738,11 @@ "def": 3050, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -8991,7 +9774,11 @@ "def": 3050, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -9024,7 +9811,11 @@ "undpspro": 0.06, "speed": 20, "hp": 33800, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -9057,7 +9848,11 @@ "undpspro": 0.06, "speed": 20, "hp": 33800, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 1980 @@ -9183,7 +9978,11 @@ "jj_attr": { "def": 150, "xixuepro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -9214,7 +10013,11 @@ "jj_attr": { "def": 350, "xixuepro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -9246,7 +10049,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -9278,7 +10085,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -9310,7 +10121,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 33800 + "hp": 33800, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -9342,7 +10157,11 @@ "def": 350, "xixuepro": 0.06, "speed": 20, - "hp": 33800 + "hp": 33800, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -9375,7 +10194,11 @@ "xixuepro": 0.06, "speed": 20, "hp": 33800, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -9408,7 +10231,11 @@ "xixuepro": 0.06, "speed": 20, "hp": 33800, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 21560 @@ -9534,7 +10361,11 @@ "jj_attr": { "atk": 168, "baoshangpro": 0.15, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -9565,7 +10396,11 @@ "jj_attr": { "atk": 168, "baoshangpro": 0.15, - "speed": 20 + "speed": 20, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -9596,7 +10431,11 @@ "jj_attr": { "atk": 613, "baoshangpro": 0.15, - "speed": 20 + "speed": 20, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -9627,7 +10466,11 @@ "jj_attr": { "atk": 613, "baoshangpro": 0.15, - "speed": 20 + "speed": 20, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -9659,7 +10502,11 @@ "atk": 613, "baoshangpro": 0.15, "speed": 20, - "hp": 30800 + "hp": 30800, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -9691,7 +10538,11 @@ "atk": 613, "baoshangpro": 0.15, "speed": 20, - "hp": 30800 + "hp": 30800, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -9725,7 +10576,11 @@ "speed": 20, "hp": 30800, "def": 2700, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -9759,7 +10614,11 @@ "speed": 20, "hp": 30800, "def": 2700, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 1890 @@ -9885,7 +10744,11 @@ "jj_attr": { "def": 150, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -9916,7 +10779,11 @@ "jj_attr": { "def": 350, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -9948,7 +10815,11 @@ "def": 350, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -9981,7 +10852,11 @@ "undpspro": 0.06, "speed": 20, "hp": 3000, - "xixuepro": 0.5 + "xixuepro": 0.5, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -10015,7 +10890,11 @@ "speed": 20, "hp": 3000, "atk": 1680, - "xixuepro": 0.5 + "xixuepro": 0.5, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -10049,7 +10928,11 @@ "speed": 20, "hp": 3000, "atk": 1680, - "xixuepro": 0.5 + "xixuepro": 0.5, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -10084,7 +10967,11 @@ "hp": 33800, "atk": 1680, "pvpdpspro": 0.3, - "xixuepro": 0.5 + "xixuepro": 0.5, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -10119,7 +11006,11 @@ "hp": 33800, "atk": 1680, "pvpdpspro": 0.3, - "xixuepro": 0.5 + "xixuepro": 0.5, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 1890 @@ -10245,7 +11136,11 @@ "jj_attr": { "atk": 168, "baoshangpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -10277,7 +11172,11 @@ "atk": 168, "baoshangpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -10308,7 +11207,11 @@ "jj_attr": { "atk": 613, "baoshangpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -10339,7 +11242,11 @@ "jj_attr": { "atk": 613, "baoshangpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -10370,7 +11277,11 @@ "jj_attr": { "atk": 2293, "baoshangpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -10401,7 +11312,11 @@ "jj_attr": { "atk": 2293, "baoshangpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -10434,7 +11349,11 @@ "baoshangpro": 0.06, "speed": 20, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -10467,7 +11386,11 @@ "baoshangpro": 0.06, "speed": 20, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "atk": 1176 @@ -10593,7 +11516,11 @@ "jj_attr": { "def": 150, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -10624,7 +11551,11 @@ "jj_attr": { "def": 350, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -10656,7 +11587,11 @@ "def": 350, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -10688,7 +11623,11 @@ "def": 350, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -10721,7 +11660,11 @@ "def": 350, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -10754,7 +11697,11 @@ "def": 350, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -10788,7 +11735,11 @@ "undpspro": 0.06, "speed": 20, "hp": 3000, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -10822,7 +11773,11 @@ "undpspro": 0.06, "speed": 20, "hp": 3000, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 21560 @@ -10948,7 +11903,11 @@ "jj_attr": { "atk": 150, "baoshangpro": 0.1, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -10980,7 +11939,11 @@ "atk": 150, "baoshangpro": 0.1, "speed": 20, - "hp": 2000 + "hp": 2000, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -11012,7 +11975,11 @@ "atk": 550, "baoshangpro": 0.1, "speed": 20, - "hp": 2000 + "hp": 2000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -11044,7 +12011,11 @@ "atk": 550, "baoshangpro": 0.1, "speed": 20, - "hp": 2000 + "hp": 2000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -11076,7 +12047,11 @@ "atk": 2230, "baoshangpro": 0.1, "speed": 20, - "hp": 2000 + "hp": 2000, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -11108,7 +12083,11 @@ "atk": 2230, "baoshangpro": 0.1, "speed": 20, - "hp": 2000 + "hp": 2000, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -11142,7 +12121,11 @@ "speed": 20, "hp": 2000, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -11176,7 +12159,11 @@ "speed": 20, "hp": 2000, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 21560 @@ -11302,7 +12289,11 @@ "jj_attr": { "atk": 168, "mingzhongpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -11334,7 +12325,11 @@ "atk": 168, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -11366,7 +12361,11 @@ "atk": 613, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -11398,7 +12397,11 @@ "atk": 613, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -11430,7 +12433,11 @@ "atk": 613, "mingzhongpro": 0.06, "speed": 20, - "hp": 33100 + "hp": 33100, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -11462,7 +12469,11 @@ "atk": 613, "mingzhongpro": 0.06, "speed": 20, - "hp": 33100 + "hp": 33100, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -11496,7 +12507,11 @@ "speed": 20, "hp": 33100, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -11530,7 +12545,11 @@ "speed": 20, "hp": 33100, "def": 2700, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 21560 @@ -11656,7 +12675,11 @@ "jj_attr": { "atk": 168, "baoshangpro": 0.15, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -11688,7 +12711,11 @@ "atk": 168, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -11720,7 +12747,11 @@ "atk": 613, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -11752,7 +12783,11 @@ "atk": 613, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -11784,7 +12819,11 @@ "atk": 2293, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -11816,7 +12855,11 @@ "atk": 2293, "baoshangpro": 0.15, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -11850,7 +12893,11 @@ "speed": 20, "hp": 2300, "mingzhongpro": 0.15, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -11884,7 +12931,11 @@ "speed": 20, "hp": 2300, "mingzhongpro": 0.15, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "def": 2700 @@ -12010,7 +13061,11 @@ "jj_attr": { "atk": 168, "undpspro": 0.05, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -12042,7 +13097,11 @@ "atk": 168, "undpspro": 0.05, "speed": 20, - "def": 270 + "def": 270, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -12075,7 +13134,11 @@ "undpspro": 0.05, "speed": 20, "def": 270, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -12108,7 +13171,11 @@ "undpspro": 0.05, "speed": 20, "def": 270, - "hp": 3000 + "hp": 3000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -12141,7 +13208,11 @@ "undpspro": 0.05, "speed": 20, "def": 270, - "hp": 33800 + "hp": 33800, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -12174,7 +13245,11 @@ "undpspro": 0.05, "speed": 20, "def": 270, - "hp": 33800 + "hp": 33800, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -12209,7 +13284,11 @@ "def": 270, "hp": 33800, "shanbipro": 0.2, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -12244,7 +13323,11 @@ "def": 270, "hp": 33800, "shanbipro": 0.2, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 30800 @@ -12370,7 +13453,11 @@ "jj_attr": { "atk": 168, "mingzhongpro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -12402,7 +13489,11 @@ "atk": 168, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -12434,7 +13525,11 @@ "atk": 613, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -12466,7 +13561,11 @@ "atk": 613, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -12498,7 +13597,11 @@ "atk": 1848, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -12530,7 +13633,11 @@ "atk": 1848, "mingzhongpro": 0.06, "speed": 20, - "hp": 2300 + "hp": 2300, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -12563,7 +13670,11 @@ "mingzhongpro": 0.06, "speed": 20, "hp": 33100, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -12596,7 +13707,11 @@ "mingzhongpro": 0.06, "speed": 20, "hp": 33100, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 21560 @@ -12722,7 +13837,11 @@ "jj_attr": { "atk": 168, "xixuepro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -12754,7 +13873,11 @@ "atk": 168, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -12786,7 +13909,11 @@ "atk": 613, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -12818,7 +13945,11 @@ "atk": 613, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -12850,7 +13981,11 @@ "atk": 2293, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -12882,7 +14017,11 @@ "atk": 2293, "xixuepro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -12916,7 +14055,11 @@ "speed": 20, "hp": 3000, "def": 2700, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -12950,7 +14093,11 @@ "speed": 20, "hp": 3000, "def": 2700, - "pvpdpsdrop": 0.3 + "pvpdpsdrop": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "hp": 30800 @@ -13076,7 +14223,11 @@ "jj_attr": { "def": 150, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.4, + "defpro": 0.4, + "hppro": 0.4, + "speedpro": 0.4 }, "jj_allattr": {}, "buff": { @@ -13107,7 +14258,11 @@ "jj_attr": { "def": 200, "undpspro": 0.06, - "speed": 20 + "speed": 20, + "atkpro": 0.5, + "defpro": 0.5, + "hppro": 0.5, + "speedpro": 0.5 }, "jj_allattr": {}, "buff": { @@ -13139,7 +14294,11 @@ "def": 200, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.6, + "defpro": 0.6, + "hppro": 0.6, + "speedpro": 0.6 }, "jj_allattr": {}, "buff": { @@ -13171,7 +14330,11 @@ "def": 200, "undpspro": 0.06, "speed": 20, - "hp": 3000 + "hp": 3000, + "atkpro": 0.8, + "defpro": 0.8, + "hppro": 0.8, + "speedpro": 0.8 }, "jj_allattr": {}, "buff": { @@ -13204,7 +14367,11 @@ "undpspro": 0.06, "speed": 20, "hp": 3000, - "atk": 1680 + "atk": 1680, + "atkpro": 1, + "defpro": 1, + "hppro": 1, + "speedpro": 1 }, "jj_allattr": {}, "buff": { @@ -13237,7 +14404,11 @@ "undpspro": 0.06, "speed": 20, "hp": 3000, - "atk": 1680 + "atk": 1680, + "atkpro": 1.2, + "defpro": 1.2, + "hppro": 1.2, + "speedpro": 1.2 }, "jj_allattr": {}, "buff": { @@ -13272,7 +14443,11 @@ "hp": 3000, "atk": 1680, "mingzhongpro": 0.15, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.4, + "defpro": 1.4, + "hppro": 1.4, + "speedpro": 1.4 }, "jj_allattr": {}, "buff": { @@ -13307,7 +14482,11 @@ "hp": 3000, "atk": 1680, "mingzhongpro": 0.15, - "pvpdpspro": 0.3 + "pvpdpspro": 0.3, + "atkpro": 1.8, + "defpro": 1.8, + "hppro": 1.8, + "speedpro": 1.8 }, "jj_allattr": { "atk": 1680 diff --git a/src/json/herogrow_ewai.json b/src/json/herogrow_ewai.json index 791c542..0e08149 100644 --- a/src/json/herogrow_ewai.json +++ b/src/json/herogrow_ewai.json @@ -22,41 +22,41 @@ "5": { "id": 5, "jieji": 4, - "ewai_buff": 0.4 + "ewai_buff": 40 }, "6": { "id": 6, "jieji": 5, - "ewai_buff": 0.5 + "ewai_buff": 50 }, "7": { "id": 7, "jieji": 6, - "ewai_buff": 0.6 + "ewai_buff": 60 }, "8": { "id": 8, "jieji": 7, - "ewai_buff": 0.8 + "ewai_buff": 80 }, "9": { "id": 9, "jieji": 8, - "ewai_buff": 1 + "ewai_buff": 100 }, "10": { "id": 10, "jieji": 9, - "ewai_buff": 1.2 + "ewai_buff": 120 }, "11": { "id": 11, "jieji": 10, - "ewai_buff": 1.4 + "ewai_buff": 140 }, "12": { "id": 12, "jieji": 11, - "ewai_buff": 1.8 + "ewai_buff": 180 } } \ No newline at end of file diff --git a/src/json/huobanzhaomu.json5 b/src/json/huobanzhaomu.json5 index cc2c9c2..bc40ef1 100644 --- a/src/json/huobanzhaomu.json5 +++ b/src/json/huobanzhaomu.json5 @@ -7,7 +7,7 @@ { total: 2, gudKey: 'loginDays', - prize: [{a: 'hero', t: '4013', n: 1}] + prize: [{a: 'hero', t: '4004', n: 1}] }, { total: 1, diff --git a/src/json/huodong.json5 b/src/json/huodong.json5 index fee6481..2fc7624 100644 --- a/src/json/huodong.json5 +++ b/src/json/huodong.json5 @@ -2464,12 +2464,12 @@ 'cond': [], 'stype': 118 }, - '2004': { + '2004': { 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 20}], 'tujing': '', 'title': 'intr_yczm_day_des_2', 'type': 2, - 'pval': 300, + 'pval': 250, 'cond': [], 'stype': 118 }, @@ -2478,12 +2478,21 @@ 'tujing': '', 'title': 'intr_yczm_day_des_2', 'type': 2, - 'pval': 400, + 'pval': 300, 'cond': [], 'stype': 118 }, '2006': { - 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 40}], + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 400, + 'cond': [], + 'stype': 118 + }, + '2007': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}], 'tujing': '', 'title': 'intr_yczm_day_des_2', 'type': 2, @@ -2608,7 +2617,7 @@ 'tujing': '', 'title': 'intr_yczm_day_des_2', 'type': 2, - 'pval': 300, + 'pval': 250, 'cond': [], 'stype': 118 }, @@ -2617,12 +2626,21 @@ 'tujing': '', 'title': 'intr_yczm_day_des_2', 'type': 2, - 'pval': 400, + 'pval': 300, 'cond': [], 'stype': 118 }, '2006': { - 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 40}], + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}], + 'tujing': '', + 'title': 'intr_yczm_day_des_2', + 'type': 2, + 'pval': 400, + 'cond': [], + 'stype': 118 + }, + '2007': { + 'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}], 'tujing': '', 'title': 'intr_yczm_day_des_2', 'type': 2, @@ -3291,116 +3309,462 @@ "task" : { "1": { "pval" : 1, - "stype" : "", + "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" : 500000 + "n" : 100000 } ], "des" : "intr_cszl_des_1" }, "2": { - "pval" : 1, - "stype" : "101", + "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_1" + "des" : "intr_cszl_des_2" }, "3": { - "pval" : 2, - "stype" : "101", + "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" : 500000 + "n" : 1000000 } ], - "des" : "intr_cszl_des_1" - } + "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":"jinbi", "n": 1}], + "gameneed": [{"a": "attr", "t":"shengdanBullet", "n": 1}], //玩游戏拿分 "game": [5,10,20,30,50], + //免费玩游戏次数 + "gamefree": 3, //战令 "zhanling":[ { "val": 2500, "pt": [{"a": "item", "t":"1", "n": 200000}], - "gj": [{"a": "item", "t":"50101", "n": 1},{"a": "item", "t":"1", "n": 500000}] + "gj": [{"a": "item", "t":"50009", "n": 1},{"a": "item", "t":"1", "n": 500000}] }, { - "val": 2, + "val": 5000, "pt": [{"a": "attr", "t":"rmbmoney", "n": 500}], - "gj": [{"a": "attr", "t":"jinbi", "n": 1}] + "gj": [{"a": "item", "t":"23", "n": 2000},{"a": "item", "t":"1", "n": 500000}] }, { - "val": 3, - "pt": [{"a": "attr", "t":"jinbi", "n": 1}], - "gj": [{"a": "attr", "t":"jinbi", "n": 1}] + "val": 7500, + "pt": [{"a": "item", "t":"50104", "n": 1}], + "gj": [{"a": "item", "t":"9", "n": 100},{"a": "item", "t":"10", "n": 800}] + }, + { + "val": 10000, + "pt": [{"a": "item", "t":"4", "n": 10}], + "gj": [{"a": "item", "t":"28", "n": 5000},{"a": "item", "t":"605", "n": 2}] + }, + { + "val": 12500, + "pt": [{"a": "item", "t":"2", "n": 500}], + "gj": [{"a": "item", "t":"9", "n": 150},{"a": "item", "t":"10", "n": 1500}] + }, + { + "val": 15000, + "pt": [{"a": "item", "t":"600", "n": 10}], + "gj": [{"a": "item", "t":"605", "n": 2},{"a": "item", "t":"28", "n": 10000}] + }, + { + "val": 17500, + "pt": [{"a": "item", "t":"600", "n": 10}], + "gj": [{"a": "item", "t":"605", "n": 2},{"a": "item", "t":"28", "n": 20000}] + }, + { + "val": 20000, + "pt": [{"a": "item", "t":"10", "n": 800}], + "gj": [{"a": "item", "t":"600", "n": 20},{"a": "item", "t":"28", "n": 20000}] + }, + { + "val": 22500, + "pt": [{"a": "attr", "t":"rmbmoney", "n": 2000}], + "gj": [{"a": "item", "t":"600", "n": 20},{"a": "item", "t":"28", "n": 20000}] } ], - //战令PayID "zlpayid":"ycmb_1_1", //活动礼包 "libao": { "1": { "payid": "", - "buynum": 2, - "basep": [{"a": "attr", "t":"rmbmoney", "n": 1}], - "des" : "intr_cszl_des_1", + "buynum": 1, + "basep": [{"a": "attr", "t":"rmbmoney", "n": 100}], + "des" : "intr_cszl_des_10", "dlz": [ { - "1": {"a": "attr", "t":"rmbmoney", "n": 1}, - "2": {"a": "attr", "t":"rmbmoney", "n": 2}, - "3": {"a": "attr", "t":"rmbmoney", "n": 3} - }, - { - "1": {"a": "attr", "t":"rmbmoney", "n": 1}, - "2": {"a": "attr", "t":"rmbmoney", "n": 2}, - "3": {"a": "attr", "t":"rmbmoney", "n": 3} + "1": {"a": "attr", "t":"jinbi", "n": 100000}, + "2": {"a": "item", "t":"1", "n": 50000} } ] }, "2": { - "payid": "ycmb_1_2", + "payid": "pay_name_sdhd_libao_2", "buynum": 2, - "basep": [{"a": "attr", "t":"rmbmoney", "n": 2}], - "des" : "intr_cszl_des_2", + "basep": [{"a": "attr", "t":"rmbmoney", "n": 120}], + "des" : "intr_cszl_des_11", "dlz": [ { - "1": {"a": "attr", "t":"rmbmoney", "n": 1}, - "2": {"a": "attr", "t":"rmbmoney", "n": 2}, - "3": {"a": "attr", "t":"rmbmoney", "n": 3} + "1": {"a": "item", "t":"2", "n": 400}, + "2": {"a": "item", "t":"12", "n": 200} }, { - "1": {"a": "attr", "t":"rmbmoney", "n": 1}, - "2": {"a": "attr", "t":"rmbmoney", "n": 2}, - "3": {"a": "attr", "t":"rmbmoney", "n": 3} + "1": {"a": "attr", "t":"jinbi", "n": 1000000}, + "2": {"a": "item", "t":"1", "n": 500000} } ] - } + }, + "3": { + "payid": "pay_name_sdhd_libao_3", + "buynum": 2, + "basep": [{"a": "attr", "t":"rmbmoney", "n": 300}], + "des" : "intr_cszl_des_12", + "dlz": [ + { + "1": {"a": "item", "t":"9", "n": 500}, + "2": {"a": "item", "t":"10", "n": 100} + }, + { + "1": {"a": "item", "t":"9", "n": 500}, + "2": {"a": "item", "t":"10", "n": 100} + }, + { + "1": {"a": "item", "t":"9", "n": 500}, + "2": {"a": "item", "t":"10", "n": 100} + } + ] + }, + "4": { + "payid": "pay_name_sdhd_libao_4", + "buynum": 5, + "basep": [{"a": "attr", "t":"rmbmoney", "n": 680}], + "des" : "intr_cszl_des_12", + "dlz": [ + { + "1": {"a": "item", "t":"615", "n": 1}, + "2": {"a": "item", "t":"18", "n": 200} + }, + { + "1": {"a": "item", "t":"615", "n": 1}, + "2": {"a": "item", "t":"18", "n": 200} + }, + { + "1": {"a": "item", "t":"615", "n": 1}, + "2": {"a": "item", "t":"18", "n": 200} + } + ] + }, + "5": { + "payid": "pay_name_sdhd_libao_5", + "buynum": 9, + "basep": [{"a": "attr", "t":"rmbmoney", "n": 1280}], + "des" : "intr_cszl_des_13", + "dlz": [ + { + "1": {"a": "item", "t":"600", "n": 10}, + "2": {"a": "item", "t":"605", "n": 2}, + "3": {"a": "item", "t":"606", "n": 1} + }, + { + "1": {"a": "item", "t":"600", "n": 10}, + "2": {"a": "item", "t":"605", "n": 2}, + "3": {"a": "item", "t":"606", "n": 1} + }, + { + "1": {"a": "item", "t":"1", "n": 5000000}, + "2": {"a": "attr", "t":"jinbi", "n": 10000000} + } + ] + }, + "6": { + "payid": "pay_name_sdhd_libao_6", + "buynum": 9, + "basep": [{"a": "attr", "t":"rmbmoney", "n": 3280}], + "des" : "intr_cszl_des_14", + "dlz": [ + { + "1": {"a": "item", "t":"600", "n": 20}, + "2": {"a": "item", "t":"5002", "n": 10}, + "3": {"a": "item", "t":"5004", "n": 10} + }, + { + "1": {"a": "item", "t":"600", "n": 20}, + "2": {"a": "item", "t":"5002", "n": 10}, + "3": {"a": "item", "t":"5004", "n": 10} + }, + { + "1": {"a": "item", "t":"1", "n": 10000000}, + "2": {"a": "item", "t":"12", "n": 1000}, + "3": {"a": "item", "t":"2", "n": 2000}, + "4": {"a": "item", "t":"18", "n": 500} + } + ] + }, + "7": { + "payid": "pay_name_sdhd_libao_7", + "buynum": 9, + "basep": [{"a": "attr", "t":"rmbmoney", "n": 6480}], + "des" : "intr_cszl_des_14", + "dlz": [ + { + "1": {"a": "item", "t":"600", "n": 30}, + "2": {"a": "item", "t":"5002", "n": 20}, + "3": {"a": "item", "t":"5004", "n": 20} + }, + { + "1": {"a": "item", "t":"600", "n": 30}, + "2": {"a": "item", "t":"5002", "n": 20}, + "3": {"a": "item", "t":"5004", "n": 20} + }, + { + "1": {"a": "item", "t":"605", "n": 4}, + "2": {"a": "item", "t":"606", "n": 2}, + "3": {"a": "item", "t":"18", "n": 1000}, + "4": {"a": "item", "t":"23", "n": 1000000} + } + ] + }, }, //签到奖励 "qiandao": [ - [{"a": "attr", "t":"jinbi", "n": 1}], - [{"a": "attr", "t":"jinbi", "n": 1}], - [{"a": "attr", "t":"jinbi", "n": 1}], - [{"a": "attr", "t":"jinbi", "n": 1}], - [{"a": "attr", "t":"jinbi", "n": 1}], - [{"a": "attr", "t":"jinbi", "n": 1}], - [{"a": "attr", "t":"jinbi", "n": 1}] + [{"a": "attr", "t":"shengdanExp", "n": 100},{"a": "attr", "t":"shengdanBullet", "n": 1},{"a": "item", "t":"4", "n": 10},{"a": "item", "t":"1", "n": 300000}], + [{"a": "attr", "t":"shengdanExp", "n": 100},{"a": "attr", "t":"shengdanBullet", "n": 1},{"a": "attr", "t":"rmbmoney", "n": 300},{"a": "item", "t":"1", "n": 300000}], + [{"a": "attr", "t":"shengdanExp", "n": 100},{"a": "attr", "t":"shengdanBullet", "n": 1},{"a": "item", "t":"12", "n": 300},{"a": "item", "t":"1", "n": 300000}], + [{"a": "attr", "t":"shengdanExp", "n": 100},{"a": "attr", "t":"shengdanBullet", "n": 1},{"a": "item", "t":"9", "n": 200},{"a": "item", "t":"1", "n": 300000}], + [{"a": "attr", "t":"shengdanExp", "n": 100},{"a": "attr", "t":"shengdanBullet", "n": 1},{"a": "item", "t":"2", "n": 400},{"a": "item", "t":"1", "n": 300000}], + [{"a": "attr", "t":"shengdanExp", "n": 100},{"a": "attr", "t":"shengdanBullet", "n": 1},{"a": "item", "t":"27", "n": 5000},{"a": "item", "t":"1", "n": 300000}], + [{"a": "attr", "t":"shengdanExp", "n": 100},{"a": "attr", "t":"shengdanBullet", "n": 1},{"a": "item", "t":"4", "n": 10},{"a": "item", "t":"1", "n": 300000}], ] } }, @@ -3408,7 +3772,7 @@ "hdid" : 9000, // 唯一活动id 周末礼包 "htype" : 9, // 后端唯一识别标识 "stype" : 900, // 前端唯一识别标识(看前端需要是否修改) - "ttype" : 0, // 0 按照开服时间计算,1 玩家注册时间计算 4 屏蔽此活动 + "ttype" : 4, // 0 按照开服时间计算,1 玩家注册时间计算 4 屏蔽此活动 "stime" : 0, // 活动开始天数 "rtime" : 30, // 活动显示结束天数 "etime" : 30, // 活动实际结束 diff --git a/src/json/item.json b/src/json/item.json index 6fd94b2..1802cff 100644 --- a/src/json/item.json +++ b/src/json/item.json @@ -2075,6 +2075,7 @@ "637": { "id": 637, "name": "intr_item_name_637", + "undefined": "使用后可以选择获得巴拉莱卡、罗贝尔特中的一个干部", "type": 2, "sort": 1, "colour": 6, @@ -3993,6 +3994,24 @@ "payId": "", "advancedEffects": "" }, + "50009": { + "id": 50009, + "name": "playerheadFrame_name_23", + "undefined": "使用后解锁头像框“圣诞氛围”", + "type": 7, + "sort": 1, + "colour": 4, + "way": [], + "go": "", + "icon": "txk_028", + "describe": "intr_item_describe_50009", + "diaoluo": 23, + "useNeed": [], + "usePrize": [], + "selecPrize": [], + "payId": "", + "advancedEffects": "" + }, "50101": { "id": 50101, "name": "playerChatFrame_name_6", @@ -4044,7 +4063,26 @@ "useNeed": [], "usePrize": [], "selecPrize": [], - "payId": "" + "payId": "", + "advancedEffects": "" + }, + "50104": { + "id": 50104, + "name": "playerChatFrame_name_8", + "undefined": "使用后解锁聊天框“圣诞快乐”", + "type": 8, + "sort": 1, + "colour": 4, + "way": [], + "go": "", + "icon": "lt_dhk14", + "describe": "intr_item_describe_50104", + "diaoluo": 8, + "useNeed": [], + "usePrize": [], + "selecPrize": [], + "payId": "", + "advancedEffects": "" }, "50201": { "id": 50201, @@ -4054,13 +4092,15 @@ "sort": 1, "colour": 4, "way": [], + "go": "", "icon": "txk_017", "describe": "intr_item_describe_50201", "diaoluo": 16, "useNeed": [], "usePrize": [], "selecPrize": [], - "payId": "" + "payId": "", + "advancedEffects": "" }, "50202": { "id": 50202, @@ -4070,13 +4110,15 @@ "sort": 1, "colour": 4, "way": [], + "go": "", "icon": "txk_011", "describe": "intr_item_describe_50202", "diaoluo": 17, "useNeed": [], "usePrize": [], "selecPrize": [], - "payId": "" + "payId": "", + "advancedEffects": "" }, "50203": { "id": 50203, @@ -4086,13 +4128,15 @@ "sort": 1, "colour": 4, "way": [], + "go": "", "icon": "txk_005", "describe": "intr_item_describe_50203", "diaoluo": 18, "useNeed": [], "usePrize": [], "selecPrize": [], - "payId": "" + "payId": "", + "advancedEffects": "" }, "50204": { "id": 50204, @@ -4102,13 +4146,15 @@ "sort": 1, "colour": 4, "way": [], + "go": "", "icon": "txk_004", "describe": "intr_item_describe_50204", "diaoluo": 19, "useNeed": [], "usePrize": [], "selecPrize": [], - "payId": "" + "payId": "", + "advancedEffects": "" }, "50205": { "id": 50205, @@ -4118,13 +4164,15 @@ "sort": 1, "colour": 4, "way": [], + "go": "", "icon": "txk_024", "describe": "intr_item_describe_50205", "diaoluo": 20, "useNeed": [], "usePrize": [], "selecPrize": [], - "payId": "" + "payId": "", + "advancedEffects": "" }, "50206": { "id": 50206, @@ -4134,13 +4182,15 @@ "sort": 1, "colour": 4, "way": [], + "go": "", "icon": "txk_013", "describe": "intr_item_describe_50206", "diaoluo": 21, "useNeed": [], "usePrize": [], "selecPrize": [], - "payId": "" + "payId": "", + "advancedEffects": "" }, "50207": { "id": 50207, @@ -4150,13 +4200,51 @@ "sort": 1, "colour": 4, "way": [], + "go": "", "icon": "txk_021", "describe": "intr_item_describe_50207", "diaoluo": 22, "useNeed": [], "usePrize": [], "selecPrize": [], - "payId": "" + "payId": "", + "advancedEffects": "" + }, + "50301": { + "id": 50301, + "name": "playerModel_name_3", + "undefined": "使用后解锁主角造型“圣诞庆典:男”", + "type": 6, + "sort": 1, + "colour": 5, + "way": [], + "go": "", + "icon": 100011, + "describe": "intr_item_describe_50208", + "diaoluo": 3, + "useNeed": [], + "usePrize": [], + "selecPrize": [], + "payId": "", + "advancedEffects": "ani_xiangzikuang" + }, + "50302": { + "id": 50302, + "name": "playerModel_name_4", + "undefined": "使用后解锁主角造型“圣诞庆典:女”", + "type": 6, + "sort": 1, + "colour": 5, + "way": [], + "go": "", + "icon": 100021, + "describe": "intr_item_describe_50209", + "diaoluo": 4, + "useNeed": [], + "usePrize": [], + "selecPrize": [], + "payId": "", + "advancedEffects": "ani_xiangzikuang" }, "60101": { "id": 60101, diff --git a/src/json/kfcb_content.json b/src/json/kfcb_content.json index ef8bc42..7f6bed4 100644 --- a/src/json/kfcb_content.json +++ b/src/json/kfcb_content.json @@ -10,7 +10,13 @@ 2 ], "content": "kfcb_des_1", - "text": "kfcb_text_1" + "text": "kfcb_text_1", + "payIds": [ + "kfcb_libao_1", + "kfcb_libao_2", + "kfcb_libao_3", + "kfcb_libao_7" + ] }, "2": { "id": 2, @@ -23,7 +29,12 @@ 4 ], "content": "kfcb_des_2", - "text": "kfcb_text_2" + "text": "kfcb_text_2", + "payIds": [ + "kfcb_libao_4", + "kfcb_libao_5", + "kfcb_libao_6" + ] }, "3": { "id": 3, @@ -36,7 +47,11 @@ 6 ], "content": "kfcb_des_3", - "text": "kfcb_text_3" + "text": "kfcb_text_3", + "payIds": [ + "kfcb_libao_1", + "kfcb_libao_2" + ] }, "4": { "id": 4, @@ -49,7 +64,11 @@ 8 ], "content": "kfcb_des_4", - "text": "kfcb_text_4" + "text": "kfcb_text_4", + "payIds": [ + "kfcb_libao_2", + "kfcb_libao_3" + ] }, "5": { "id": 5, @@ -62,7 +81,12 @@ 10 ], "content": "kfcb_des_5", - "text": "kfcb_text_5" + "text": "kfcb_text_5", + "payIds": [ + "kfcb_libao_1", + "kfcb_libao_2", + "kfcb_libao_3" + ] }, "6": { "id": 6, @@ -75,7 +99,12 @@ 12 ], "content": "kfcb_des_6", - "text": "kfcb_text_6" + "text": "kfcb_text_6", + "payIds": [ + "kfcb_libao_1", + "kfcb_libao_2", + "kfcb_libao_3" + ] }, "7": { "id": 7, @@ -88,6 +117,11 @@ 14 ], "content": "kfcb_des_7", - "text": "kfcb_text_7" + "text": "kfcb_text_7", + "payIds": [ + "kfcb_libao_1", + "kfcb_libao_2", + "kfcb_libao_3" + ] } } \ No newline at end of file diff --git a/src/json/openCond.json b/src/json/openCond.json index 0326a27..2478204 100644 --- a/src/json/openCond.json +++ b/src/json/openCond.json @@ -1313,5 +1313,31 @@ "display": { "lv": 15 } + }, + "shengdanhuodong": { + "name": "shengdanhuodong", + "undefined": "圣诞活动", + "and": { + "lv": 15 + }, + "or": {}, + "time": 0, + "tips": "openCond_tips_96", + "display": { + "lv": 15 + } + }, + "yuandanhuodong": { + "name": "yuandanhuodong", + "undefined": "元旦活动", + "and": { + "lv": 15 + }, + "or": {}, + "time": 0, + "tips": "openCond_tips_96", + "display": { + "lv": 15 + } } } \ No newline at end of file diff --git a/src/json/pay.json b/src/json/pay.json index 7a8595f..21d98f2 100644 --- a/src/json/pay.json +++ b/src/json/pay.json @@ -305,7 +305,12 @@ { "a": "attr", "t": "rmbmoney", - "n": 680 + "n": 1360 + }, + { + "a": "item", + "t": "609", + "n": 1 } ], "firstPayPrize": [], @@ -331,12 +336,12 @@ { "a": "attr", "t": "rmbmoney", - "n": 300 + "n": 600 }, { "a": "item", "t": "24", - "n": 10 + "n": 30 } ], "firstPayPrize": [], @@ -362,12 +367,12 @@ { "a": "attr", "t": "rmbmoney", - "n": 300 + "n": 600 }, { - "a": "item", - "t": "6", - "n": 20 + "a": "attr", + "t": "jinbi", + "n": 10000000 } ], "firstPayPrize": [], @@ -393,12 +398,12 @@ { "a": "attr", "t": "rmbmoney", - "n": 680 + "n": 1360 }, { "a": "item", "t": "4", - "n": 10 + "n": 20 } ], "firstPayPrize": [], @@ -928,7 +933,7 @@ }, { "a": "hero", - "t": "4005", + "t": "4013", "n": 1 }, { @@ -1025,7 +1030,7 @@ { "a": "attr", "t": "payExp", - "n": 300 + "n": 60 } ], "prize": [ @@ -1205,7 +1210,7 @@ { "a": "attr", "t": "payExp", - "n": 300 + "n": 680 } ], "prize": [ @@ -1241,7 +1246,7 @@ { "a": "attr", "t": "payExp", - "n": 300 + "n": 680 } ], "prize": [ @@ -1277,7 +1282,7 @@ { "a": "attr", "t": "payExp", - "n": 300 + "n": 680 } ], "prize": [ @@ -1313,7 +1318,7 @@ { "a": "attr", "t": "payExp", - "n": 300 + "n": 1280 } ], "prize": [ @@ -1906,7 +1911,7 @@ { "a": "attr", "t": "payExp", - "n": 6480 + "n": 3280 } ], "prize": [ @@ -1990,7 +1995,7 @@ } ], "firstPayPrize": [], - "name": "pay_name_136Gift4", + "name": "pay_name_136Gift3", "undefined": "1元礼包", "time": 86400, "buys": 0, @@ -2062,7 +2067,7 @@ } ], "firstPayPrize": [], - "name": "pay_name_136Gift4", + "name": "pay_name_136Gift6", "undefined": "6元礼包", "time": 86400, "buys": 0, @@ -2070,6 +2075,26 @@ "front": {}, "currency": "CNY" }, + "136GiftAll": { + "id": "136GiftAll", + "money": 60, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 600 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_136Gift2", + "undefined": "每日礼包全买", + "time": 86400, + "buys": 0, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, "xianshizhaomu_gift_1": { "id": "xianshizhaomu_gift_1", "money": 30, @@ -4911,5 +4936,204 @@ "front": {}, "currency": "CNY" }, - "undefined": {} + "sdhd_zhanling_1": { + "id": "sdhd_zhanling_1", + "money": 128, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_sdhd_zhanling_1", + "undefined": "圣诞战令_1", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "sdhd_zhanling_2": { + "id": "sdhd_zhanling_2", + "money": 198, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1980 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_sdhd_zhanling_1", + "undefined": "圣诞战令_2", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "sdhd_zhanling_3": { + "id": "sdhd_zhanling_3", + "money": 328, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 3280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_sdhd_zhanling_1", + "undefined": "圣诞战令_3", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "sdhd_libao_1": { + "id": "sdhd_libao_1", + "money": 0.5, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_sdhd_libao_1", + "undefined": "圣诞自选_1", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "sdhd_libao_2": { + "id": "sdhd_libao_2", + "money": 6, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_sdhd_libao_2", + "undefined": "圣诞自选_2", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "sdhd_libao_3": { + "id": "sdhd_libao_3", + "money": 30, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_sdhd_libao_3", + "undefined": "圣诞自选_3", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "sdhd_libao_4": { + "id": "sdhd_libao_4", + "money": 68, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_sdhd_libao_4", + "undefined": "圣诞自选_4", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "sdhd_libao_5": { + "id": "sdhd_libao_5", + "money": 128, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_sdhd_libao_5", + "undefined": "圣诞自选_5", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "sdhd_libao_6": { + "id": "sdhd_libao_6", + "money": 328, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_sdhd_libao_6", + "undefined": "圣诞自选_6", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + }, + "sdhd_libao_7": { + "id": "sdhd_libao_7", + "money": 648, + "payExp": [ + { + "a": "attr", + "t": "payExp", + "n": 1280 + } + ], + "prize": [], + "firstPayPrize": [], + "name": "pay_name_sdhd_libao_7", + "undefined": "圣诞自选_7", + "time": -1, + "buys": 1, + "needVip": 0, + "front": {}, + "currency": "CNY" + } } \ No newline at end of file diff --git a/src/json/payEmail.json5 b/src/json/payEmail.json5 index 37ba7b7..6ebe0fc 100644 --- a/src/json/payEmail.json5 +++ b/src/json/payEmail.json5 @@ -26,7 +26,7 @@ day: 7, title: 'title_email_zhongshenka_day7', content: 'intr_email_zhongshenka_day7', - prize: [{ a: 'item', t: '4', n: 10 },{ a: 'item', t: '9', n: 200 }] + prize: [{ a: 'item', t: '4', n: 10 },{ a: 'item', t: '1', n: 5000000 }] } ], chaozhiyueka: [ diff --git a/src/json/playerChatFrame.json b/src/json/playerChatFrame.json index f9a8c1f..2ce6ea9 100644 --- a/src/json/playerChatFrame.json +++ b/src/json/playerChatFrame.json @@ -118,5 +118,22 @@ }, "colour": 3, "ani": "" + }, + "8": { + "id": 8, + "name": "playerChatFrame_name_8", + "img": "lt_dhk14", + "cond": [ + "time", + -1 + ], + "undefined": "圣诞庆典获得", + "intr": "playerChatFrame_des_8", + "sort": 8, + "buff": { + "defpro": 0.01 + }, + "colour": 3, + "ani": "" } } \ No newline at end of file diff --git a/src/json/playerHead.json b/src/json/playerHead.json index cd31c39..04f1367 100644 --- a/src/json/playerHead.json +++ b/src/json/playerHead.json @@ -26,7 +26,7 @@ "intr": "intr_playerinfo_intr_2", "sort": 2, "buff": {}, - "colour": 2, + "colour": 1, "ani": "" }, "1001": { diff --git a/src/json/playerHeadFrame.json b/src/json/playerHeadFrame.json index 2960294..485c541 100644 --- a/src/json/playerHeadFrame.json +++ b/src/json/playerHeadFrame.json @@ -208,7 +208,7 @@ "13": { "id": 13, "name": "playerheadFrame_name_13", - "undefined": "购买战令获得", + "undefined": "购买悬赏令获得,解锁后伤害加成+2%(限时30天)", "img": "txk_002", "cond": [ "time", @@ -216,14 +216,16 @@ ], "intr": "playerheadFrame_des_13", "sort": 13, - "buff": {}, + "buff": { + "dpspro": 0.02 + }, "colour": 4, "ani": "" }, "14": { "id": 14, "name": "playerheadFrame_name_14", - "undefined": "铁笼死斗晋级八强获得", + "undefined": "铁笼死斗晋级八强获得,解锁后防御加成+1%(限时7天)", "img": "txk_003", "cond": [ "time", @@ -231,14 +233,16 @@ ], "intr": "playerheadFrame_des_14", "sort": 14, - "buff": {}, + "buff": { + "defpro": 0.01 + }, "colour": 4, "ani": "" }, "15": { "id": 15, "name": "playerheadFrame_name_15", - "undefined": "购买名望特权礼包获得", + "undefined": "购买名望特权礼包获得,解锁后伤害加成+1%", "img": "txk_020", "cond": [ "time", @@ -255,7 +259,7 @@ "16": { "id": 16, "name": "playerheadFrame_name_16", - "undefined": "开服冲榜活动获得", + "undefined": "开服冲榜活动获得,解锁后攻击加成+1%", "img": "txk_017", "cond": [ "time", @@ -272,7 +276,7 @@ "17": { "id": 17, "name": "playerheadFrame_name_17", - "undefined": "开服冲榜活动获得", + "undefined": "开服冲榜活动获得,解锁后防御加成+1%", "img": "txk_011", "cond": [ "time", @@ -289,7 +293,7 @@ "18": { "id": 18, "name": "playerheadFrame_name_18", - "undefined": "开服冲榜活动获得", + "undefined": "开服冲榜活动获得,解锁后生命加成+1%", "img": "txk_005", "cond": [ "time", @@ -306,7 +310,7 @@ "19": { "id": 19, "name": "playerheadFrame_name_19", - "undefined": "开服冲榜活动获得", + "undefined": "开服冲榜活动获得,解锁后攻击加成+1%", "img": "txk_004", "cond": [ "time", @@ -323,7 +327,7 @@ "20": { "id": 20, "name": "playerheadFrame_name_20", - "undefined": "开服冲榜活动获得", + "undefined": "开服冲榜活动获得,解锁后防御加成+1%", "img": "txk_024", "cond": [ "time", @@ -340,7 +344,7 @@ "21": { "id": 21, "name": "playerheadFrame_name_21", - "undefined": "开服冲榜活动获得", + "undefined": "开服冲榜活动获得,解锁后生命加成+1%", "img": "txk_013", "cond": [ "time", @@ -357,7 +361,7 @@ "22": { "id": 22, "name": "playerheadFrame_name_22", - "undefined": "开服冲榜活动获得", + "undefined": "开服冲榜活动获得,解锁后伤害加成+1%", "img": "txk_021", "cond": [ "time", @@ -370,5 +374,22 @@ }, "colour": 4, "ani": "" + }, + "23": { + "id": 23, + "name": "playerheadFrame_name_23", + "undefined": "圣诞庆典活动获得,解锁后生命加成+1%", + "img": "txk_028", + "cond": [ + "time", + -1 + ], + "intr": "playerheadFrame_des_23", + "sort": 23, + "buff": { + "hppro": 0.01 + }, + "colour": 4, + "ani": "" } } \ No newline at end of file diff --git a/src/json/playerModel.json b/src/json/playerModel.json index fbbf9b8..dcf972b 100644 --- a/src/json/playerModel.json +++ b/src/json/playerModel.json @@ -33,6 +33,44 @@ "colour": 1, "mwSpine": "ani_mingwangnv", "fireHead": "img_lih1" + }, + "3": { + "type": 1, + "id": 3, + "name": "playerModel_name_3", + "head": 100011, + "img": 100011, + "cond": [ + "time", + -1 + ], + "intr": "playerModel_des_3", + "sort": 3, + "buff": { + "defpro": 0.02 + }, + "colour": 5, + "mwSpine": "ani_mingwangnan", + "fireHead": "img_lih21" + }, + "4": { + "type": 1, + "id": 4, + "name": "playerModel_name_4", + "head": 100021, + "img": 100021, + "cond": [ + "time", + -1 + ], + "intr": "playerModel_des_4", + "sort": 4, + "buff": { + "atkpro": 0.02 + }, + "colour": 5, + "mwSpine": "ani_mingwangnv", + "fireHead": "img_lih11" } } } \ No newline at end of file diff --git a/src/json/shop.json b/src/json/shop.json index 6dea8cf..d13cfdf 100644 --- a/src/json/shop.json +++ b/src/json/shop.json @@ -495,5 +495,36 @@ "vip": [], "npcImg": 3011, "npcText": "intr_shopCom_text_10" + }, + "13": { + "id": 13, + "type": 12, + "name": "wsw_wz_dhsd", + "undefined": "兑换商店", + "openCond": [ + "lv", + 15 + ], + "autoRefreshTime": 0, + "recoilRefreshNeed": [], + "recoilRefreshNum": 0, + "freeRefreshInterval": 0, + "freeRefreshNum": 0, + "shopItems": [ + 4001 + ], + "showItem": [ + { + "a": "attr", + "t": "jinbi", + "n": 0 + }, + { + "a": "attr", + "t": "rmbmoney", + "n": 0 + } + ], + "vip": [] } } \ No newline at end of file diff --git a/src/json/shopItem.json b/src/json/shopItem.json index 371a482..ec6950d 100644 --- a/src/json/shopItem.json +++ b/src/json/shopItem.json @@ -3918,6 +3918,31 @@ 9999 ], "vipAddbuyNum": [] + }, + { + "id": 4001, + "a": "item", + "t": 4, + "n": 10, + "p": 1, + "colour": 4, + "buyNum": -1, + "openDay": 1, + "buyNeed": [ + { + "a": "item", + "t": "15", + "n": 2800 + } + ], + "sale": 10, + "needVip": 0, + "needZCCG": 0, + "lv": [ + 1, + 9999 + ], + "vipAddbuyNum": [] } ], "4002": [ diff --git a/src/json/task.json b/src/json/task.json index a78d34a..c597cec 100644 --- a/src/json/task.json +++ b/src/json/task.json @@ -1202,13 +1202,13 @@ "n": 100000 } ], - "pval": 2, + "pval": 1, "name": "intr_task_name_2007", "intr": "intr_task_intr_2007", "pretask": 2015, "followtask": 2017, "cond": [ - 1 + 2 ], "tiaozhuan": 67, "order": 17, @@ -1467,13 +1467,13 @@ "n": 100000 } ], - "pval": 3, + "pval": 1, "name": "intr_task_name_2016", "intr": "intr_task_intr_2016", "pretask": 2022, "followtask": 2024, "cond": [ - 1 + 3 ], "tiaozhuan": 67, "order": 24, @@ -1619,13 +1619,13 @@ "n": 200000 } ], - "pval": 4, + "pval": 2, "name": "intr_task_name_2016", "intr": "intr_task_intr_2016", "pretask": 2026, "followtask": 2028, "cond": [ - 1 + 2 ], "tiaozhuan": 67, "order": 28, @@ -3016,13 +3016,13 @@ "n": 100000 } ], - "pval": 3, + "pval": 2, "name": "intr_task_name_2016", "intr": "intr_task_intr_2016", "pretask": 2064, "followtask": 2066, "cond": [ - 2 + 3 ], "tiaozhuan": 67, "order": 66, @@ -3350,13 +3350,13 @@ "n": 100000 } ], - "pval": 4, + "pval": 3, "name": "intr_task_name_2016", "intr": "intr_task_intr_2016", "pretask": 2073, "followtask": 2075, "cond": [ - 2 + 3 ], "tiaozhuan": 67, "order": 75, diff --git a/src/module/collection_event.ts b/src/module/collection_event.ts index e1eeef3..6681c58 100644 --- a/src/module/collection_event.ts +++ b/src/module/collection_event.ts @@ -26,6 +26,9 @@ export type eventType = { shouchong: { receive: k_v; }; + shouchongzhigou: { + receive: k_v; + }; kaifukuanghuan: Omit; dayjijin: Omit; dengjijijin: Omit; diff --git a/src/setMongodb.ts b/src/setMongodb.ts index b157290..a3df1cc 100644 --- a/src/setMongodb.ts +++ b/src/setMongodb.ts @@ -2,6 +2,7 @@ import { Collection, CreateIndexesOptions, Db, + FindCursor, IndexDescription, IndexSpecification, MongoClient, @@ -18,6 +19,7 @@ import {HuoDongFun} from './public/huodongfun'; import {zbsGroup} from './api_s2c/hbzb/zbs/fun'; import {clusterRunOnce} from './clusterUtils'; import { PublicShared } from './shared/public/public'; +import { addGameLog } from './gameLog'; const indexs: Partial<{ [k in keyof MongodbCollections]: IndexDescription[] }> = { item: [ @@ -636,4 +638,27 @@ export class _mongodb { indexInformation(name) { return this.db.indexInformation(name) } +} + +//@ts-ignore +FindCursor.prototype._toArray = FindCursor.prototype.toArray; +//@ts-ignore +FindCursor.prototype.toArray = async function(){ + let rss = await this._toArray(); + + //如果返回的数据超过50条 + if(rss.length>50){ + addGameLog("system","findCount",null,{ + collection: this.namespace.collection, + db:this.namespace.db, + count:rss.length + }) + console.log("system,findCount",{ + collection: this.namespace.collection, + db:this.namespace.db, + count:rss.length + }) + console.trace(); + } + return rss; } \ No newline at end of file diff --git a/src/shared/protocols/event/shouchong/PtlOpen.ts b/src/shared/protocols/event/shouchong/PtlOpen.ts index cad5f93..d839863 100644 --- a/src/shared/protocols/event/shouchong/PtlOpen.ts +++ b/src/shared/protocols/event/shouchong/PtlOpen.ts @@ -8,8 +8,10 @@ export type ReqOpen = { }; export type ResOpen = { - payNum: number; receive: { [k: string]: number[]; }; + buyLog:{ + [k: string]: any; + } }; \ No newline at end of file diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 5c4141b..c60ab37 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -10262,13 +10262,6 @@ export const serviceProto: ServiceProto = { "properties": [ { "id": 0, - "name": "payNum", - "type": { - "type": "Number" - } - }, - { - "id": 1, "name": "receive", "type": { "type": "Interface", @@ -10282,6 +10275,19 @@ export const serviceProto: ServiceProto = { } } } + }, + { + "id": 1, + "name": "buyLog", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Any" + } + } + } } ] },