diff --git a/game-server/app/servers/battle/handler/guildBossHandler.ts b/game-server/app/servers/battle/handler/guildBossHandler.ts index 2078e72c6..df7531060 100644 --- a/game-server/app/servers/battle/handler/guildBossHandler.ts +++ b/game-server/app/servers/battle/handler/guildBossHandler.ts @@ -1,12 +1,18 @@ import { Application, BackendSession, pinus } from 'pinus'; -import { resResult, genCode } from '../../../pubUtils/util'; +import { resResult, genCode, getRandomByLen } from '../../../pubUtils/util'; import { STATUS } from '../../../consts'; -import { BossScriptModel } from '../../../db/BossScript'; +import { BossInstanceModel } from '../../../db/BossInstance'; import { BattleRecordModel } from '../../../db/BattleRecord'; import { nowSeconds, getTodayZeroPoint } from '../../../pubUtils/timeUtil'; -import { getBossScriptInfo, bossResult, checkMemberExists, pushBossHpMessage, getBossScriptWhenEnd, addBossScript } from '../../../services/guildBossService'; -import { findWhere } from 'underscore' -import { GUILD_DATA_NAME } from '../../../consts/constModules/guildConst'; +import { getBossInstanceInfo, bossResult, checkMemberExists, pushBossHpMessage, getBossInstanceWhenEnd, addBossInstance } from '../../../services/guildBossService'; +import { findWhere, random } from 'underscore' +import { GUILD_DATA_NAME, GUILD_STRUCTURE } from '../../../consts/constModules/guildConst'; +import { UserGuildModel } from '../../../db/UserGuild'; +import { GUILD_OPERATE } from '../../../consts'; +import { checkAuth } from '../../../services/guildService'; +import { GuildModel } from '../../../db/Guild'; +import { getBossByLv } from '../../../pubUtils/data'; +import { lockData } from '../../../services/redLockService'; export default function (app: Application) { return new GuildHandler(app); } @@ -16,50 +22,73 @@ export class GuildHandler { } // 获得boss关卡 - async getBossScript(msg: { code: string }, session: BackendSession) { - const { code } = msg; - //TODO校验 + async getBossInstance(msg: {}, session: BackendSession) { const roleId = session.get('roleId'); - let bossScript = await BossScriptModel.findBossScript(code); - if (!bossScript) { - return resResult(STATUS.SUCCESS, {type: 1});//1：等待团长开启，2：今日已开启，且boss通关，3：开启中 + let userGuild = await UserGuildModel.getMyGuild(roleId, 'guildCode'); + if (!userGuild) + return resResult(STATUS.WRONG_PARMS); + const { guildCode: code } = userGuild; + let bossInstance = await BossInstanceModel.findBossInstance(code); + if (!bossInstance) { + return resResult(STATUS.SUCCESS, {status: 1});//1：等待团长开启，2：今日已开启，且boss通关，3：开启中 } - let result = await getBossScriptInfo(bossScript, roleId); + let result = await getBossInstanceInfo(bossInstance, roleId); return resResult(STATUS.SUCCESS, result); } //开启演武场 - async openBossScript(msg: { code: string }, session: BackendSession) { - const { code } = msg; + async openBossInstance(msg: {}, session: BackendSession) { const roleId = session.get('roleId'); - //TODO检查权限 - let bossScript = await BossScriptModel.findBossScript(code); - if (!!bossScript && ( bossScript.bossHp > 0 || bossScript.time >= getTodayZeroPoint() )) { + const serverId = session.get('serverId'); + let userGuild = await UserGuildModel.getMyGuild(roleId, 'auth guildCode'); + if (!userGuild) + return resResult(STATUS.WRONG_PARMS); + const { guildCode: code } = userGuild; + const checkMyResult = await checkAuth(GUILD_OPERATE.OPEN_BOSS, roleId, null, userGuild); + if(!checkMyResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH); + let res:any = await lockData(serverId, GUILD_DATA_NAME.BOSS_SCRIPT, code);//加锁 + if (!!res.err) + return resResult(STATUS.REDLOCK_ERR); + let bossInstance = await BossInstanceModel.findBossInstance(code); + if (!!bossInstance && ( bossInstance.bossHp > 0 || bossInstance.startTime >= getTodayZeroPoint() )) { return resResult(STATUS.GUILD_SCRIPT_IS_OPENED_TODAY); } - //TODO随机地图 - let bossHp = 1000; - let warId = 1; - await BossScriptModel.openBossScript(code, bossHp, warId); - let result = {warId, ranks: [], myRank: {}, bossHp, type: 3}; + const guild = await GuildModel.findByCode(code, serverId, 'lv structure'); + if(!guild) { + return resResult(STATUS.GUILD_NOT_FOUND); + } + const { structure } = guild; + const curStructure = structure.find(cur => cur.id == GUILD_STRUCTURE.BOSS); + if(!curStructure) { + return resResult(STATUS.GUILD_STRUCTURE_NOT_FOUND); + } + let bossBase = getBossByLv(curStructure.lv); + let {bossHp, warId } = getRandomByLen(bossBase.wars); + let resGuild = await GuildModel.costFund(code, bossBase.consume) + if (!resGuild) + return resResult(STATUS.GUILD_FUND_NOT_ENOUGH); + await BossInstanceModel.openBossInstance(code, bossHp, warId); + let result = {warId, ranks: [], myRank: {}, bossHp, type: 3, isBattled: false}; return resResult(STATUS.SUCCESS, result); } - async bossScriptStart(msg: { code: string }, session: BackendSession) { - const { code } = msg; + async battleBoss(msg: {}, session: BackendSession) { const roleId = session.get('roleId'); const roleName = session.get('roleName'); - //TODO校验 - let bossScript = await BossScriptModel.findBossScript(code); - if (!bossScript) + let userGuild = await UserGuildModel.getMyGuild(roleId, 'guildCode'); + if (!userGuild) + return resResult(STATUS.WRONG_PARMS); + const { guildCode: code } = userGuild; + let bossInstance = await BossInstanceModel.findBossInstance(code); + if (!bossInstance) return resResult(STATUS.GUILD_SCRIPT_NOT_OPENED); - if (bossScript.bossHp <= 0) + if (bossInstance.bossHp <= 0) return resResult(STATUS.GUILD_SCRIPT_IS_COMPLETE); - let myRank = findWhere(bossScript.ranks, {roleId}); + let myRank = findWhere(bossInstance.ranks, {roleId}); if (!!myRank && myRank.time > getTodayZeroPoint()) return resResult(STATUS.GUILD_SCRIPT_IS_BATTLED); - let { warId, ranks } = bossScript; + let { warId, ranks } = bossInstance; const battleCode = genCode(8); // 关卡唯一值 //TODO查看地图字典 let warInfo; @@ -67,52 +96,66 @@ export class GuildHandler { $set: { roleId, roleName, battleId: warId, status: 0, - warName: warInfo.gk_name, - warType: warInfo.warType, - record: { heroes:[],recordNum: bossScript.num, bossHp: bossScript.bossHp}, + // warName: warInfo.gk_name, + // warType: warInfo.warType, + record: { heroes:[],recordNum: bossInstance.num, bossHp: bossInstance.bossHp}, } }, true); const serverId = session.get('serverId'); - await addBossScript(code, serverId, roleId); + await addBossInstance(code, serverId, roleId); if (!findWhere(ranks, {roleId})) { - await BossScriptModel.pushRanks(code, {roleId, score: 0, time:nowSeconds()}); + await BossInstanceModel.pushRanks(code, {roleId, score: 0, time: nowSeconds()}); + } else { + await BossInstanceModel.updateRank(code, roleId); } return resResult(STATUS.SUCCESS, { battleCode }); } - async action (msg: { code: string, damage: number, battleCode: string }, session: BackendSession ) { - const { code, battleCode, damage } = msg; + async action (msg: { damage: number, battleCode: string }, session: BackendSession ) { + const { battleCode, damage } = msg; const roleId = session.get('roleId'); const serverId = session.get('serverId'); + let userGuild = await UserGuildModel.getMyGuild(roleId, 'guildCode'); + if (!userGuild) + return resResult(STATUS.WRONG_PARMS); + const { guildCode: code } = userGuild; let flag = await checkMemberExists(code, serverId, roleId, battleCode); if (!flag) { - return; + return resResult(STATUS.REDLOCK_ERR); } //记录伤害 - let bossScript = await BossScriptModel.updateBossHp(code, damage, roleId); - if (!bossScript) {//进入结算 + let bossInstance = await BossInstanceModel.updateBossHp(code, damage, roleId); + if (!bossInstance) {//进入结算 let flag = await bossResult(code, serverId, GUILD_DATA_NAME.BOSS_SCRIPT, roleId, damage); if (!flag) { return resResult(STATUS.WRONG_PARMS); } + return resResult(STATUS.SUCCESS, { bossHp: 0 }); } else { - pushBossHpMessage(code, serverId, bossScript.bossHp); + pushBossHpMessage(code, serverId, bossInstance.bossHp); + return resResult(STATUS.SUCCESS, { bossHp: bossInstance.bossHp }); } - return resResult(STATUS.SUCCESS, { bossHp: bossScript.bossHp>0?bossScript.bossHp:0 }); } - async bossScriptEnd(msg: { code: string, battleCode: string }, session: BackendSession) { - const { code, battleCode } = msg; + async battleBossEnd(msg: { battleCode: string }, session: BackendSession) { + const { battleCode } = msg; const roleId = session.get('roleId'); + let userGuild = await UserGuildModel.getMyGuild(roleId, 'guildCode'); + if (!userGuild) + return resResult(STATUS.WRONG_PARMS); + const { guildCode: code } = userGuild; const battleRecord = await BattleRecordModel.getBattleRecordByCode(battleCode, true); - if(!battleRecord || battleRecord.status != 0 || roleId != battleRecord.roleId) { + if (!battleRecord || battleRecord.status != 0 || roleId != battleRecord.roleId) { return resResult(STATUS.WRONG_PARMS); } await BattleRecordModel.updateBattleRecordByCode(battleCode, { $set: { status: 1 }//战斗结束统一设置成1 }, true); - let bossScript = await BossScriptModel.findBossScript(code); - let result = await getBossScriptWhenEnd(bossScript, roleId, battleRecord.record.recordNum); + let bossInstance = await BossInstanceModel.findBossInstance(code); + let result = await getBossInstanceWhenEnd(bossInstance, roleId, battleRecord.record.recordNum); + return resResult(STATUS.SUCCESS, result); } + + } \ No newline at end of file diff --git a/game-server/app/servers/battle/handler/guildTrainHandler.ts b/game-server/app/servers/battle/handler/guildTrainHandler.ts index a0f8e7e11..707c85497 100644 --- a/game-server/app/servers/battle/handler/guildTrainHandler.ts +++ b/game-server/app/servers/battle/handler/guildTrainHandler.ts @@ -4,11 +4,12 @@ import { STATUS, GUILD_OPERATE, GUILD_AUTH, GUILD_JOB } from '../../../consts'; import { GuildTrainModel } from '../../../db/GuildTrain'; import { BattleRecordModel } from '../../../db/BattleRecord'; import { nowSeconds, getTodayZeroPoint } from '../../../pubUtils/timeUtil'; -import { getUserGuild, getGuildTrainInfo } from '../../../services/guildTrainService'; +import { getUserGuild, getGuildTrainInfo, lockTrain, getGuildTrain, getGuildTrainRewards} from '../../../services/guildTrainService'; import { findIndex, findWhere, indexBy } from 'underscore' import { lockData } from '../../../services/redLockService'; import { GUILD_DATA_NAME } from '../../../consts/constModules/guildConst'; import { UserGuildModel } from '../../../db/UserGuild'; +import { GuildModel } from '../../../db/Guild'; export default function (app: Application) { return new GuildTrainHandler(app); } @@ -18,17 +19,28 @@ export class GuildTrainHandler { } - async getTrainScript(msg: { code: string }, session: BackendSession) { + //获得试炼的详情 + async getTrainScriptByTrainId(msg: { code: string}, session: BackendSession) { const { code } = msg; const roleId = session.get('roleId'); - let guildTrains = await GuildTrainModel.findGuildTrain(code); + const serverId = session.get('serverId'); let userGuild = await getUserGuild(roleId, code); if (!userGuild) return resResult(STATUS.WRONG_PARMS); - if (!guildTrains) - guildTrains = []; + let { trainId } = await GuildModel.findGuild(code, serverId, 'trainId'); + let trainIds = [trainId]; + if (trainId - 1 > 0) { + trainIds.push(trainId - 1); + } + let guildTrains = await GuildTrainModel.findGuildTrainByTrainIds(code, trainIds); + if (!guildTrains || !findWhere(guildTrains, {trainId})) { + let guildTrain = await lockTrain(code, trainId); + if (!guildTrains) { + guildTrains.push(guildTrain); + } + } let { trainCount, trainRewards } = userGuild; - let result = getGuildTrainInfo(guildTrains, roleId, trainCount, trainRewards); + let result = getGuildTrainInfo(guildTrains, roleId, trainCount, trainRewards, [trainId]); return resResult(STATUS.SUCCESS, result); } @@ -41,8 +53,8 @@ export class GuildTrainHandler { return resResult(STATUS.WRONG_PARMS); if (userGuild.trainCount > 2) //TODO检查次数 return resResult(STATUS.GUILD_TRAIN_BATTLE_COUNT_NOT_ENOUGH); - let guildTrain = await GuildTrainModel.findTrainByTrainIdNotLock(code, trainId); - if (!guildTrain) + let guildTrain = await GuildTrainModel.findTrainByTrainIdNotLock(code, trainId, 'trainId isComplete trainScripts'); + if (!guildTrain && guildTrain.isComplete) return resResult(STATUS.GUILD_TRAIN_SCRIPT_NOT_OPENED); let trainScript = findWhere(guildTrain.trainScripts, { hid }); if (!trainScript) @@ -89,12 +101,13 @@ export class GuildTrainHandler { await BattleRecordModel.updateBattleRecordByCode(battleCode, { $set: { status: isSuccess?1:2 } }, true); - + let guildTrains = []; + let trainIds = []; let trainId = battleRecord.record.trainId; let hid = battleRecord.record.hid; let res:any = await lockData(serverId, GUILD_DATA_NAME.TRAIN, code + '_' + trainId);//加锁 if (!!res.err) - return true; + return resResult(STATUS.REDLOCK_ERR); let guildTrain = await GuildTrainModel.findTrainByTrainIdNotLock(code, trainId); if (!guildTrain) { res.releaseCallback();//解锁 @@ -111,14 +124,14 @@ export class GuildTrainHandler { let { isComplete, reports, ranks } = guildTrain; let index = findIndex(ranks, {roleId}); if (index !== -1) { - ranks[index].score += addScore; + ranks[index].score += addScore; } + let needLockNext = false; + let resGuildTrain; let report = {roleId, trainId, hid, score: addScore, time: nowSeconds(), isSuccessed: isSuccess, type: 1};//1表示普通战报， 2表示系统战报即：被成功压制 if (trainScript.progress < 1000 ) { if (trainScript.progress + addScore >= 1000) { reports.push(...[{isSuccessed: true, type: 2, time:nowSeconds(), score: addScore, roleId, trainId, hid},report]); - await GuildTrainModel.updateGuildTrain(code, trainId, {reports, ranks}); - let needLockNext = false; if (!isComplete) { isComplete = true; guildTrain.trainScripts.forEach(({hid: otherHid, progress})=>{ @@ -126,39 +139,86 @@ export class GuildTrainHandler { isComplete = false; } }); - if (isComplete) {//解锁下一关 + if (isComplete) { //解锁下一关 needLockNext = true; } } let progress = 1000; - GuildTrainModel.updateGuildTrainProgress(code, trainId, hid, progress, ranks, reports, isComplete); - if (needLockNext) { - + resGuildTrain = await GuildTrainModel.updateGuildTrainProgress(code, trainId, hid, progress, ranks, reports, isComplete); + if (needLockNext) { // + let nextResGuildTrain = await lockTrain(code, trainId + 1); + trainIds.push(nextResGuildTrain.trainId); + guildTrains.push(nextResGuildTrain); } res.releaseCallback();//解锁 } else { let progress = trainScript.progress + addScore; - GuildTrainModel.updateGuildTrainProgress(code, trainId, hid, progress, ranks, reports, isComplete); + resGuildTrain = await GuildTrainModel.updateGuildTrainProgress(code, trainId, hid, progress, ranks, reports, isComplete); res.releaseCallback();//解锁 } } else { reports.push(report); - GuildTrainModel.updateGuildTrain(code, trainId, {reports, ranks}); + resGuildTrain = await GuildTrainModel.updateGuildTrain(code, trainId, {reports, ranks}); res.releaseCallback();//解锁 } - let guildTrains = await GuildTrainModel.findGuildTrain(code); - if (!guildTrains) - guildTrains = []; + if (!needLockNext) { + if (trainId - 1 > 0 ) { + let lastGuildTrain = await GuildTrainModel.findTrainByTrainIdNotLock(code, trainId - 1); + guildTrains.push(lastGuildTrain); + } + trainIds.push(resGuildTrain.trainId); + } + guildTrains.push(resGuildTrain); let { trainCount, trainRewards } = userGuild; - let result = getGuildTrainInfo(guildTrains, roleId, trainCount, trainRewards); + let result = getGuildTrainInfo(guildTrains, roleId, trainCount, trainRewards, trainIds); return resResult(STATUS.SUCCESS, result); } - async getTrainScriptBox(msg: { code: string }, session: BackendSession) { - + async getTrainScriptBox(msg: { code: string, trainId: number , hid: number, index: number}, session: BackendSession) { + let { code, trainId, hid, index } = msg; + const roleId = session.get('roleId'); + const serverId = session.get('serverId'); + let userGuild = await getUserGuild(roleId, code); + if (!userGuild) + return resResult(STATUS.WRONG_PARMS); + let res:any = await lockData(serverId, GUILD_DATA_NAME.TRAIN_BOX, code + '_' + trainId);//加锁 + if (!!res.err) + return resResult(STATUS.REDLOCK_ERR); + let guildTrain = await GuildTrainModel.findTrainScriptBoxByIndex(code, roleId, trainId, hid, index, 1000, nowSeconds() - 24*60*60); + if (!guildTrain) { + res.releaseCallback();//解锁 + return resResult(STATUS.GUILD_TRAIN_SCRIPT_NOT_OPENED); + } + let good; + let resGuildTrain = await GuildTrainModel.receiveBoxByIndex(code, roleId, trainId, hid, index, good); + res.releaseCallback();//解锁 + + if (!resGuildTrain) { + let result:any = getGuildTrainRewards(guildTrain); + return resResult(STATUS.GUILD_GET_TRAIN_BOX_FAIL, result); + } + let result:any = getGuildTrainRewards(resGuildTrain); + + result.goods = [good]; + return resResult(STATUS.SUCCESS, result); } - async getTrainLvUpRewards(msg: { trainId: number }, session: BackendSession) { + async getTrainLvUpRewards(msg: {code: string, trainId: number }, session: BackendSession) { + let { code, trainId } = msg; + const roleId = session.get('roleId'); + //TODO奖励 + let good; + let userGuild = await UserGuildModel.receiveTrainRewards(roleId, trainId); + if (!userGuild) { + return resResult(STATUS.GUILD_GET_TRAIN_REWARD_FAIL); + } + let { trainRewards } = userGuild; + return resResult(STATUS.SUCCESS, { trainRewards }); + } + //购买挑战次数 + async purchaseTrainCount(msg: {code: string, trainId: number }, session: BackendSession) { + let { code, trainId } = msg; + const roleId = session.get('roleId'); } } \ No newline at end of file diff --git a/game-server/app/services/guildBossService.ts b/game-server/app/services/guildBossService.ts index 1a0db1437..85aa43cdf 100644 --- a/game-server/app/services/guildBossService.ts +++ b/game-server/app/services/guildBossService.ts @@ -1,4 +1,4 @@ -import { BossScriptType, BossScriptModel } from '../db/BossScript'; +import { BossInstanceType, BossInstanceModel } from '../db/BossInstance'; import { getTodayZeroPoint, nowSeconds } from '../pubUtils/timeUtil'; import { lockData } from '../services/redLockService'; import { findIndex, indexBy, values } from 'underscore'; @@ -10,22 +10,22 @@ import { deepCopy, resResult } from '../pubUtils/util'; import { BattleRecordModel } from '../db/BattleRecord'; /** * - * @param bossScript + * @param bossInstance * @param roleId */ -export async function getBossScriptInfo(bossScript: BossScriptType, roleId:string) { - let { warId, ranks, bossHp, winWarId, winTime, roleIdRecords, guildCode } = bossScript; +export async function getBossInstanceInfo(bossInstance: BossInstanceType, roleId:string) { + let { warId, ranks, bossHp, winWarId, winTime, roleIdRecords, guildCode } = bossInstance; ranks.sort(function(a, b) { return b.score - a.score + a.time - b.time; }); let result:any = {}; //1：等待团长开启，2：今日已开启，且boss通关，3：开启中 - if ( bossScript.bossHp <= 0 ) { + if ( bossInstance.bossHp <= 0 ) { if (!!winWarId && winTime > getTodayZeroPoint() && roleIdRecords.indexOf(roleId) == -1) { result = { winWarId }; - await BossScriptModel.recordRoleIdWhenCheck(guildCode, roleId); + await BossInstanceModel.recordRoleIdWhenCheck(guildCode, roleId); } - if (bossScript.time < getTodayZeroPoint()) { + if (bossInstance.startTime < getTodayZeroPoint()) { result.type = 1; return result; } else { @@ -36,7 +36,7 @@ export async function getBossScriptInfo(bossScript: BossScriptType, roleId:strin let isBattled = false; let myRank = {}; - ranks.forEach(({roleId: battleRoleId, score, time}, index) => { + let lastRanks = ranks.map(({roleId: battleRoleId, score, time}, index) => { if (roleId == battleRoleId) { myRank = {roleId, score, rankLv: index + 1}; if (time >= getTodayZeroPoint()) @@ -44,22 +44,22 @@ export async function getBossScriptInfo(bossScript: BossScriptType, roleId:strin } return {roleId, score, rankLv: index + 1}; }); - return {warId, ranks, myRank, bossHp, type: 3, isBattled}; + return {warId, ranks: lastRanks, myRank, bossHp, type: 3, isBattled}; } /** * 战斗结束返回 - * @param bossScript + * @param bossInstance * @param roleId * @param battleNum */ -export async function getBossScriptWhenEnd(bossScript: BossScriptType, roleId:string, battleNum:number) { - let { warId, ranks, bossHp, winWarId, guildCode, recordRanks, winNum } = bossScript; +export async function getBossInstanceWhenEnd(bossInstance: BossInstanceType, roleId:string, battleNum:number) { + let { warId, ranks, bossHp, winWarId, guildCode, recordRanks, winNum } = bossInstance; let pushRanks; let result:any = {}; if (battleNum == winNum) { pushRanks = deepCopy(recordRanks); result = {warId: winWarId, bossHp: 0, type: 3}; - await BossScriptModel.recordRoleIdWhenCheck(guildCode, roleId); + await BossInstanceModel.recordRoleIdWhenCheck(guildCode, roleId); } else { pushRanks = deepCopy(ranks); result = {warId, bossHp, type: 3}; @@ -94,10 +94,10 @@ export async function bossResult(code: string, serverId: string, dataName: strin let res:any = await lockData(serverId, dataName, code);//加锁 if (!!res.err) return true; - let {winSettled, ranks, num, warId, bossHp} = await BossScriptModel.findBossScript(code);//锁定关卡信息 + let {winSettled, ranks, num, warId, bossHp} = await BossInstanceModel.findBossInstance(code);//锁定关卡信息 if (winSettled) { res.releaseCallback();//解锁 - await BossScriptModel.recordRoleIdWhenCheck(code, roleId); + await BossInstanceModel.recordRoleIdWhenCheck(code, roleId); return true; } let index = findIndex(ranks, {roleId}); @@ -110,7 +110,7 @@ export async function bossResult(code: string, serverId: string, dataName: strin res.releaseCallback();//解锁 return true; } - let { recordRanks } = await BossScriptModel.updateBossScript(code, { bossHp: 0, winSettled: true, ranks, recordRanks: ranks, winNum: num, winWarId: warId, roleIdRecords:[roleId]}, ); + let { recordRanks } = await BossInstanceModel.updateBossInstance(code, { bossHp: 0, winSettled: true, ranks, recordRanks: ranks, winNum: num, winWarId: warId, roleIdRecords:[roleId]}, ); await pushBossHpMessage(code, serverId, 0, true); res.releaseCallback();//数据修改解锁 recordRanks.sort(function(a, b) { @@ -137,7 +137,7 @@ export async function bossResult(code: string, serverId: string, dataName: strin return true; } -export async function addBossScript(code: string, serverId:string, roleId: string) { +export async function addBossInstance(code: string, serverId:string, roleId: string) { let loginKey = 'login_roleId_' + roleId; let sid = await getRedis(loginKey); let key = 'serverId_' + serverId + 'guildCode_' + code; @@ -148,12 +148,13 @@ export async function addBossScript(code: string, serverId:string, roleId: strin export async function pushBossHpMessage(code: string, serverId:string, bossHp:number, isDelKey?: boolean ) { let key = 'serverId_' + serverId + 'guildCode_' + code; let members = await smembersAsync(key); - members.forEach(member=>{ + let uids = members.map(member=>{ let arr = member.split('|'); let uid = arr[0]; let sid = arr[1]; - pinus.app.channelService.pushMessageByUids('onBossHpUpdate', resResult(STATUS.SUCCESS, {bossHp}), [{uid, sid}]); + return {uid, sid}; }); + pinus.app.channelService.pushMessageByUids('onBossHpUpdate', resResult(STATUS.SUCCESS, {bossHp}), uids); if (isDelKey) { delAsync(key); } @@ -170,7 +171,7 @@ export async function checkMemberExists(code: string, serverId:string, roleId: s if(!battleRecord || battleRecord.status != 0 || roleId != battleRecord.roleId) { return false; } - addBossScript(code, serverId, roleId); + addBossInstance(code, serverId, roleId); flag = true; } return flag; diff --git a/game-server/app/services/guildTrainService.ts b/game-server/app/services/guildTrainService.ts index 5813fba6b..94045fa72 100644 --- a/game-server/app/services/guildTrainService.ts +++ b/game-server/app/services/guildTrainService.ts @@ -3,6 +3,7 @@ import { getJobInfoById } from '../pubUtils/gamedata'; import { getTodayZeroPoint, nowSeconds } from '../pubUtils/timeUtil'; import { GUILD_REPORT_NUM } from '../consts/constModules/guildConst'; import { GuildTrainType, GuildTrainModel } from '../db/GuildTrain'; +import { GuildModel } from '../db/Guild'; import { findWhere } from 'underscore'; export async function getUserGuild(roleId: string, code: string) { let userGuild = await UserGuildModel.getMyGuild(roleId,'trainCount trainTime trainRewards'); @@ -28,31 +29,64 @@ export async function recordUserGuild(roleId: string, code: string) { return userGuild; } +export function getGuildTrain (guildTrains, trainCount:number, trainRewards: Array) { + let list = []; + list = guildTrains.map(({trainId, isComplete})=>{ + return ({trainId, isComplete, }); + }); + return { list, trainCount, trainRewards}; +} -export function getGuildTrainInfo (guildTrains: Array, roleId: string, trainCount:number, trainRewards: Array) { - guildTrains.forEach(({trainId, isComplete, trainScripts, ranks, reports})=>{ +export function getGuildTrainRewards (guildTrain) { + let trainBoxs = guildTrain.trainScripts.map(({hid, trainBoxs})=>{ + return {hid, recordBoxs: trainBoxs}; + }) + return { trainBoxs}; +} + +export function getGuildTrainInfo (guildTrains: Array, roleId: string, trainCount:number, trainRewards: Array, trainIds:Array) { + let guildTrain; + guildTrains.map(({trainId, isComplete, trainScripts, ranks, reports})=>{ + if (trainIds.indexOf(trainId) == -1) { + return; + } ranks.sort(function(a, b) { return b.score - a.score; }); let myRank = {}; - ranks.forEach(({roleId: rankRoleId, score}, index)=>{ + let resRanks = ranks.map(({roleId: rankRoleId, score}, index)=>{ if (roleId == rankRoleId) myRank = {roleId: rankRoleId, score, rankLv: index+1}; return {roleId: rankRoleId, score, rankLv: index+1}; }); - let guildTrain = findWhere(guildTrains, { trainId: trainId - 1}); - if (!!guildTrain) { - let lenNum = guildTrain.reports.length; + let resTrainBoxs = []; + let resTrainScripts = trainScripts.map(({hid, progress, time, trainBoxs})=>{ + resTrainBoxs.push({hid, recordBoxs: trainBoxs}); + return {hid, progress, time}; + }) + let lastGuildTrain = findWhere(guildTrains, { trainId: trainId - 1}); + if (!!lastGuildTrain) { + let lenNum = lastGuildTrain.reports.length; if (lenNum < GUILD_REPORT_NUM) - reports = [...guildTrain.reports, ...reports] + reports = [...lastGuildTrain.reports, ...reports]; else { - let trainReports = guildTrain.reports.splice(lenNum - GUILD_REPORT_NUM - 1, GUILD_REPORT_NUM); - reports = [...trainReports, ...reports] + let trainReports = lastGuildTrain.reports.splice(lenNum - GUILD_REPORT_NUM - 1, GUILD_REPORT_NUM); + reports = [...trainReports, ...reports]; + } + let flag = false; + let lastTrainBoxs = lastGuildTrain.trainScripts.map(({hid, time, trainBoxs}) => { + if (time + 24 * 60 * 60 < nowSeconds()) { + flag = true; + } + return {}; + }); + if (flag) { + resTrainBoxs.push(...lastTrainBoxs); } } - return {trainId, isComplete, trainScripts, reports, myRank, ranks}; + guildTrain = {trainId, isComplete, trainScripts: resTrainScripts, trainBoxs: resTrainBoxs, reports, myRank, ranks: resRanks}; }); - return { list: guildTrains, trainCount, trainRewards}; + return { guildTrain, trainCount, trainRewards}; } export async function lockTrain(code: string, trainId: number) { @@ -60,5 +94,8 @@ export async function lockTrain(code: string, trainId: number) { if (!!guildTrain) { return; } - + let trainScripts; + guildTrain = await GuildTrainModel.openGuildTrain(code, trainId, trainScripts); + await GuildModel.updateInfo(code, {trainId}); + return guildTrain; } \ No newline at end of file diff --git a/game-server/app/services/redLockService.ts b/game-server/app/services/redLockService.ts index 28c587a2e..a6c9997e3 100644 --- a/game-server/app/services/redLockService.ts +++ b/game-server/app/services/redLockService.ts @@ -49,7 +49,10 @@ export async function lockData(serverId: string, dataName: string, id: string ) let key = 'serverId_'+serverId+'_'+dataName+'_'+id; let lockKey = 'locks:' + key; console.log(' lockKey = '+ lockKey); - _redlockCache.redlock.lock(lockKey, _redlockCache.ttl).then(function(lock) { + return await lock(lockKey); +} +function lock(lockKey: string) { + return _redlockCache.redlock.lock(lockKey, _redlockCache.ttl).then(function(lock) { setLock(lockKey, lock); return {err: null, releaseCallback: releaseCallback.bind(null, lockKey)}; }).catch(function(err) { @@ -57,7 +60,6 @@ export async function lockData(serverId: string, dataName: string, id: string ) return { err }; }); } - export async function releaseCallback(lockKey: string) { releaseLock(lockKey); } \ No newline at end of file diff --git a/shared/consts/constModules/guildConst.ts b/shared/consts/constModules/guildConst.ts index bd86bb0f8..bda55e9c4 100644 --- a/shared/consts/constModules/guildConst.ts +++ b/shared/consts/constModules/guildConst.ts @@ -117,8 +117,9 @@ export enum GUILD_REC_TYPE { IMPEACH = 11, // 弹劾 roleName roleName } export enum GUILD_DATA_NAME { - BOSS_SCRIPT = 'BossScript', - TRAIN = 'BossScript', + BOSS_SCRIPT = 'BossInstance', + TRAIN = 'BossInstance', + TRAIN_BOX = 'BossInstanceBox', } export const GUILD_REPORT_NUM = 40; diff --git a/shared/consts/statusCode.ts b/shared/consts/statusCode.ts index 3b87ed4c6..e75790569 100644 --- a/shared/consts/statusCode.ts +++ b/shared/consts/statusCode.ts @@ -221,6 +221,10 @@ export const STATUS = { GUILD_TRAIN_SCRIPT_NOT_OPENED: {code: 30910, simStr: '试炼关卡未开启'}, GUILD_TRAIN_BATTLE_COUNT_NOT_ENOUGH: {code: 30911, simStr: '试炼挑战次数已用完'}, GUILD_TRAIN_IS_COMPLETE: {code: 30912, simStr: '试炼关卡已经被压制'}, + GUILD_GET_TRAIN_BOX_FAIL: {code: 30913, simStr: '宝箱领取失败'}, + GUILD_TRAIN_REWARD_IS_RECEIVED: {code: 30913, simStr: '试炼进阶奖励已领取'}, + GUILD_GET_TRAIN_REWARD_FAIL: {code: 30913, simStr: '宝箱领取失败'}, + // 社交相关状态 40000 - 49999 // 运营模块相关状态 50000 - 59999 // GM后台相关状态 60000 - 69999 diff --git a/shared/db/BossInstance.ts b/shared/db/BossInstance.ts new file mode 100644 index 000000000..3d4489dd4 --- /dev/null +++ b/shared/db/BossInstance.ts @@ -0,0 +1,102 @@ +import BaseModel from './BaseModel'; +import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose'; +import { nowSeconds } from '../pubUtils/timeUtil'; + +class Rank { + @prop({ required: true }) + roleId: string; + @prop({ required: true }) + score: number; + @prop({ required: true }) + time: number; +} + +class LastRecord { + @prop({ required: true, default: 0 }) + warId: number; + @prop({ required: true}) + roleIds: Array; +} + +@index({ guildCode: 1 }) +export default class BossInstance extends BaseModel { + @prop({ required: true }) + guildCode: string; + + @prop({ required: true }) + warId: number; + + @prop({ required: true }) + bossHp: number; + + @prop({ required: true, type: Rank, default:[]}) + ranks:Array; + + @prop({ required: true }) + startTime: number; + + @prop({ required: true, default: 0}) + num: number; + + @prop({ required: true, default:[]}) + roleIdRecords: Array; //记录提示过胜利boss关的玩家 + + @prop({ required: true }) + winWarId: number; //记录上一次通关的关卡 + + @prop({ required: true }) + winTime: number; //记录上一次通关的时间 + + @prop({ required: true, default: 0}) + winNum: number; + + @prop({ required: true, type: Rank, default:[]}) + recordRanks:Array; + + @prop({ required: true, default: false }) + winSettled: boolean; //胜利是否结算过 + public static async findBossInstance(guildCode: string, lean = true) { + const bossInstance: BossInstanceType = await BossInstanceModel.findOne({ guildCode }).lean(lean); + return bossInstance; + } + + public static async openBossInstance(guildCode: string, bossHp: number, warId: number, lean = true) { + const bossInstance: BossInstanceType = await BossInstanceModel.findOneAndUpdate({ guildCode },{ranks:[], time: nowSeconds(), bossHp, warId, $inc: { recordNum: 1 }}, {new: true, upsert: true}).lean(lean); + return bossInstance; + } + //记录玩家boss通关后首次查看boss关卡 + public static async recordRoleIdWhenCheck(guildCode: string, roleId: string, lean = true) { + const bossInstance: BossInstanceType = await BossInstanceModel.findOneAndUpdate({ guildCode }, { $push:{ roleIdRecords: roleId } }, { new: true }).lean(lean); + return bossInstance; + } + + public static async pushRecordRanks(guildCode: string, recordRank: Rank, lean = true) { + const bossInstance: BossInstanceType = await BossInstanceModel.findOneAndUpdate({ guildCode }, { $push:{ recordRanks: recordRank } }, { new: true }).lean(lean); + return bossInstance; + } + + public static async pushRanks(guildCode: string, rank: Rank, lean = true) { + const bossInstance: BossInstanceType = await BossInstanceModel.findOneAndUpdate({ guildCode }, { $push:{ ranks: rank } }, { new: true }).lean(lean); + return bossInstance; + } + + public static async updateBossInstance(guildCode: string, update:BossInstanceTypeParam, lean = true) { + const bossInstance: BossInstanceType = await BossInstanceModel.findOneAndUpdate({ guildCode }, { $set:update }, { new: true }).lean(lean); + return bossInstance; + } + + public static async updateBossHp(guildCode: string, hp: number, roleId: string, lean = true) { + const bossInstance: BossInstanceType = await BossInstanceModel.findOneAndUpdate({ guildCode, 'ranks.roleId': roleId, bossHp: { $gte: hp } }, { $inc: { bossHp: - hp ,'ranks.$.score': hp}, }, { new: true }).lean(lean); + return bossInstance; + } + + public static async updateRank(guildCode: string, roleId: string, lean = true) { + const bossInstance: BossInstanceType = await BossInstanceModel.findOneAndUpdate({ guildCode, 'ranks.roleId': roleId }, { $set:{ 'ranks.$.time': nowSeconds() } }, { new: true }).lean(lean); + return bossInstance; + } +} + +export const BossInstanceModel = getModelForClass(BossInstance); + +export interface BossInstanceType extends Pick, keyof BossInstance> {}; +export type BossInstanceTypeParam = Partial; // 将所有字段变成可选项 diff --git a/shared/db/BossScript.ts b/shared/db/BossScript.ts deleted file mode 100644 index 5b33df7fc..000000000 --- a/shared/db/BossScript.ts +++ /dev/null @@ -1,97 +0,0 @@ -import BaseModel from './BaseModel'; -import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose'; -import { nowSeconds } from '../pubUtils/timeUtil'; - -class Rank { - @prop({ required: true }) - roleId: string; - @prop({ required: true }) - score: number; - @prop({ required: true }) - time: number; -} - -class LastRecord { - @prop({ required: true, default: 0 }) - warId: number; - @prop({ required: true}) - roleIds: Array; -} - -@index({ guildCode: 1 }) -export default class BossScript extends BaseModel { - @prop({ required: true }) - guildCode: string; - - @prop({ required: true }) - warId: number; - - @prop({ required: true }) - bossHp: number; - - @prop({ required: true, type: Rank, default:[]}) - ranks:Array; - - @prop({ required: true }) - time: number; - - @prop({ required: true, default: 0}) - num: number; - - @prop({ required: true, default:[]}) - roleIdRecords: Array; //记录提示过胜利boss关的玩家 - - @prop({ required: true }) - winWarId: number; //记录上一次通关的关卡 - - @prop({ required: true }) - winTime: number; //记录上一次通关的时间 - - @prop({ required: true, default: 0}) - winNum: number; - - @prop({ required: true, type: Rank, default:[]}) - recordRanks:Array; - - @prop({ required: true, default: false }) - winSettled: boolean; //胜利是否结算过 - public static async findBossScript(guildCode: string, lean = true) { - const bossScript: BossScriptType = await BossScriptModel.findOne({ guildCode }).lean(lean); - return bossScript; - } - - public static async openBossScript(guildCode: string, bossHp: number, warId: number, lean = true) { - const bossScript: BossScriptType = await BossScriptModel.findOneAndUpdate({ guildCode },{ranks:[], time: nowSeconds(), bossHp, warId, $inc: { recordNum: 1 }}, {new: true, upsert: true}).lean(lean); - return bossScript; - } - //记录玩家boss通关后首次查看boss关卡 - public static async recordRoleIdWhenCheck(guildCode: string, roleId: string, lean = true) { - const bossScript: BossScriptType = await BossScriptModel.findOneAndUpdate({ guildCode }, { $push:{ roleIdRecords: roleId } }).lean(lean); - return bossScript; - } - - public static async pushRecordRanks(guildCode: string, recordRank: Rank, lean = true) { - const bossScript: BossScriptType = await BossScriptModel.findOneAndUpdate({ guildCode }, { $push:{ recordRanks: recordRank } }).lean(lean); - return bossScript; - } - - public static async pushRanks(guildCode: string, rank: Rank, lean = true) { - const bossScript: BossScriptType = await BossScriptModel.findOneAndUpdate({ guildCode }, { $push:{ recordRanks: rank } }).lean(lean); - return bossScript; - } - - public static async updateBossScript(guildCode: string, update:BossScriptTypeParam, lean = true) { - const bossScript: BossScriptType = await BossScriptModel.findOneAndUpdate({ guildCode }, { $set:update }).lean(lean); - return bossScript; - } - - public static async updateBossHp(guildCode: string, hp: number, roleId: string, lean = true) { - const bossScript: BossScriptType = await BossScriptModel.findOneAndUpdate({ guildCode, 'ranks.roleId': roleId, bossHp: { $gt: 0 } }, { $inc: { bossHp: - hp ,'ranks.$.score': hp}, }).lean(lean); - return bossScript; - } -} - -export const BossScriptModel = getModelForClass(BossScript); - -export interface BossScriptType extends Pick, keyof BossScript> {}; -export type BossScriptTypeParam = Partial; // 将所有字段变成可选项 diff --git a/shared/db/Guild.ts b/shared/db/Guild.ts index 8e54613a3..b0e9969ca 100644 --- a/shared/db/Guild.ts +++ b/shared/db/Guild.ts @@ -8,7 +8,7 @@ class Structure { @prop({ required: true }) id: number; @prop({ required: true }) - lv: number; + lv: number; } @index({ code: 1 }) @@ -77,6 +77,8 @@ export default class Guild extends BaseModel { @prop({ required: true, default: 1, select: false }) serverId: number; // 分服 + @prop({ required: true, default: 1 }) + trainId: number; // 试炼id public static async createGuild(params: { name: string, icon: number, notice: string }, role: RoleType, serverId: number) { const doc = new GuildModel(); const update = Object.assign(doc.toJSON(), params, { leader: role._id, members: [role.roleId], guildCe: role.ce, serverId }); @@ -143,7 +145,7 @@ export default class Guild extends BaseModel { return result; } - public static async updateInfo(code: string, update: GuildUpdateParam, incParam: { managerCnt?: number }, select?: string) { + public static async updateInfo(code: string, update: GuildUpdateParam, incParam?: { managerCnt?: number }, select?: string) { const result: GuildType = await GuildModel.findOneAndUpdate({ code }, { $set: update, $inc: incParam }, { new: true }).select(select).lean(); return result; } @@ -162,6 +164,11 @@ export default class Guild extends BaseModel { const result: GuildType = await GuildModel.findOneAndUpdate({ code, fund: {$gte: cost}}, { $inc: { fund: -1 * cost } }, {new: true}).lean(); return result; } + + public static async findGuild(code: string, serverId: number, select?: string, lean = true) { + const result = await GuildModel.findOne({ code, status: GUILD_STATUS.RUNNING, serverId }).select(select).lean(lean); + return result; + } } export const GuildModel = getModelForClass(Guild); diff --git a/shared/db/GuildTrain.ts b/shared/db/GuildTrain.ts index 41b80710b..a438a4a9c 100644 --- a/shared/db/GuildTrain.ts +++ b/shared/db/GuildTrain.ts @@ -1,8 +1,19 @@ import BaseModel from './BaseModel'; import { index, getModelForClass, prop, DocumentType, Ref } from '@typegoose/typegoose'; +class Reward { + @prop({ required: true }) + id: number; + @prop({ required: true }) + count: number; +} class TrainBox { - + @prop({ required: true }) + roleId: string; + @prop({ required: true, type: Reward }) + good: Reward; + @prop({ required: true }) + index: number; } class TrainScript { @@ -56,16 +67,21 @@ export default class GuildTrain extends BaseModel { @prop({ required: true, default: false}) locked: boolean; - public static async findGuildTrain(guildCode: string, locked = false, lean = true) { - const guildTrain: GuildTrainType[] = await GuildTrainModel.findOne({ guildCode, locked }).lean(lean); + public static async findGuildTrain(guildCode: string, select?: string, locked = false, lean = true) { + const guildTrains: GuildTrainType[] = await GuildTrainModel.find({ guildCode, locked }).select(select).lean(lean); + return guildTrains; + } + + public static async findGuildTrainByTrainIds(guildCode: string, trainIds:Array, locked = false, lean = true) { + const guildTrains: GuildTrainType[] = await GuildTrainModel.find({ trainId:{ $in:trainIds}, guildCode, locked }).lean(lean); + return guildTrains; + } + + public static async findTrainByTrainIdNotLock(guildCode: string, trainId: number, select?: string, locked = false, lean = true) { + const guildTrain: GuildTrainType = await GuildTrainModel.findOne({ guildCode, trainId, locked }).select(select).lean(lean); return guildTrain; } - public static async findTrainByTrainIdNotLock(guildCode: string, trainId: number, locked = false, lean = true) { - const guildTrain: GuildTrainType = await GuildTrainModel.findOne({ guildCode, trainId, locked }).lean(lean); - return guildTrain; - } - public static async updateGuildTrain(guildCode: string, trainId: number, update: GuildTrainTypeParam, lean = true) { const guildTrain: GuildTrainType = await GuildTrainModel.findOneAndUpdate({ guildCode, trainId}, { $set: update }).lean(lean); return guildTrain; @@ -77,10 +93,22 @@ export default class GuildTrain extends BaseModel { return guildTrain; } - public static async openGuildTrain() { - // const bossScript: BossScriptType = await BossScriptModel.findOneAndUpdate({ guildCode },{ranks:[], time: nowSeconds(), bossHp, warId, $inc: { recordNum: 1 }}, {new: true, upsert: true}).lean(lean); + public static async openGuildTrain(guildCode: string, trainId: number, trainScripts: Array, lean = true) { + const guildTrain: GuildTrainType = await GuildTrainModel.findOneAndUpdate({ guildCode, trainId },{ trainId, reports: [], locked: false, ranks: [], trainScripts, isComplete: false, guildCode}, {new: true, upsert: true}).lean(lean); + return guildTrain; } + public static async findTrainScriptBoxByIndex(guildCode: string, roleId: string, trainId: number, hid: number, index: number, progress: number, time, locked = false, lean = true) { + const guildTrain: GuildTrainType = await GuildTrainModel.findOne({ guildCode, trainId, locked, 'trainScripts.hid': hid, + 'trainScripts.index':{$ne:index },'trainScripts.roleId':{$ne:roleId }, progress: {$gte: progress}, time:{$gte: time}}).lean(lean); + return guildTrain; + } + + public static async receiveBoxByIndex(guildCode: string, roleId: string, trainId: number, hid: number, index: number, good: Reward, locked = false, lean = true) { + const guildTrain: GuildTrainType = await GuildTrainModel.findOneAndUpdate({ guildCode, trainId, locked, 'trainScripts.hid': hid, }, + { $push:{ 'trainScripts.$.trainBoxs': {roleId, index, good} }} ).lean(lean); + return guildTrain; + } } diff --git a/shared/db/UserGuild.ts b/shared/db/UserGuild.ts index 1f36e0bd9..2c88653ce 100644 --- a/shared/db/UserGuild.ts +++ b/shared/db/UserGuild.ts @@ -128,6 +128,12 @@ export default class UserGuild extends BaseModel { const result = await UserGuildModel.findOneAndUpdate({ roleId, status: USER_GUILD_STATUS.ON }, { $inc: { honourWeekly: inc } }, { new: true }).select(select).lean(); return result; } + + public static async receiveTrainRewards(roleId: string, trainId: number, lean = true) { + const result = await UserGuildModel.findOneAndUpdate({ roleId, status: USER_GUILD_STATUS.ON, 'trainRewards':{$ne: trainId }}, + {$push:{trainRewards: trainId} }).lean(lean); + return result; + } } export const UserGuildModel = getModelForClass(UserGuild); diff --git a/shared/pubUtils/data.ts b/shared/pubUtils/data.ts index 59e6113d2..92b205628 100644 --- a/shared/pubUtils/data.ts +++ b/shared/pubUtils/data.ts @@ -330,4 +330,8 @@ export function getStructureConsume(structureId: number, level: number) { export function hasStructureConsume(structureId: number, level: number) { return gameData.structureConsume.get(structureId).has(level); +} + +export function getBossByLv(lv: number) { + return gameData.bossBase.get(lv); } \ No newline at end of file diff --git a/shared/pubUtils/dictionary/DicStructure.ts b/shared/pubUtils/dictionary/DicStructure.ts index a0d2a31b3..932e08c42 100644 --- a/shared/pubUtils/dictionary/DicStructure.ts +++ b/shared/pubUtils/dictionary/DicStructure.ts @@ -52,17 +52,20 @@ export interface DicBossBase { // boss等级 readonly bossLevel: number; // 关卡id - readonly warId: number; + readonly wars: Array<{warId:number, bossHp:number}>; // 掉落的拍卖行奖励 readonly reward: RewardInter[]; + + readonly consume: number; } const DicBossKeys: KeysEnum = { id: true, level: true, bossLevel: true, - warId: true, - reward: true + wars: true, + reward: true, + consume: true }; // 练兵场 @@ -181,6 +184,13 @@ let arrBoss = JSON.parse(strBoss); arrBoss.forEach(o => { setStructureConsume(o); o.reward = parseGoodStr(o.reward); + o.wars = o.warIdHP.split('|').map((warStrs)=> { + if (!warStrs) { + return; + } + let warArr = warStrs.split('&'); + return { warId: parseInt(warArr[0]), bossHp: parseInt(warArr[1])} + }); dicBossBase.set(o.level, _.pick(o, Object.keys(DicBossKeys))); }); arrBoss = undefined; diff --git a/shared/pubUtils/util.ts b/shared/pubUtils/util.ts index 19a7917ee..ef6a1a8f9 100644 --- a/shared/pubUtils/util.ts +++ b/shared/pubUtils/util.ts @@ -4,7 +4,6 @@ import { HeroModel, HeroType } from '../db/Hero'; import fs = require('fs'); import path = require('path'); -import { DicRandomEffectPool } from './dictionary/DicRandomEffectPool'; import { HERO_CE_RATIO, ABI_STAGE } from '../consts'; import { findIndex } from 'underscore'; @@ -167,9 +166,6 @@ export async function calculateSumCE(roleId: string, type: number, param: { num? return sum; } -export function getRandomByLen(arr: Array): number -export function getRandomByLen(arr: Array): string -export function getRandomByLen(arr: Array): DicRandomEffectPool export function getRandomByLen(arr: Array): any { let len = arr.length; return arr[Math.floor(Math.random() * len)] diff --git a/shared/resource/jsons/dic_army_authority.json b/shared/resource/jsons/dic_army_authority.json index 46d0fe5cc..26d2ebf60 100755 --- a/shared/resource/jsons/dic_army_authority.json +++ b/shared/resource/jsons/dic_army_authority.json @@ -1,117 +1,117 @@ [ { "id": 1, - "name": "创建军团", + "name": " 创建军团", "authority": "4&" }, { "id": 2, - "name": "显示所有军团列表", + "name": " 显示所有军团列表", "authority": "1&2&3&4" }, { "id": 3, - "name": "申请加入军团", + "name": " 申请加入军团", "authority": "4&" }, { "id": 4, - "name": "查看军团详细（头像，名字，人数，团长，等级，战力，公告，需求等）", + "name": " 查看军团详细（头像，名字，人数，团长，等级，战力，公告，需求等） ", "authority": "1&2&3&4" }, { "id": 5, - "name": "团员查看自己军团详细（资金，军团活跃，自己的职位，自己的功勋）", + "name": " 团员查看自己军团详细（资金，军团活跃，自己的职位，自己的功勋） ", "authority": "1&2&3" }, { "id": 6, - "name": "玩家查看自己被邀请的军团", + "name": " 玩家查看自己被邀请的军团", "authority": "4&" }, { "id": 7, - "name": "玩家接受邀请", + "name": " 玩家接受邀请", "authority": "4&" }, { "id": 8, - "name": "查看成员列表（仅名字，职位，登录时间）", + "name": " 查看成员列表（仅名字，职位，登录时间）", "authority": "1&2&3&4" }, { "id": 9, - "name": "查看成员列表（名字，管理职务，战力，功勋，登录时间）", + "name": " 查看成员列表（名字，管理职务，战力，功勋，登录时间）", "authority": "1&2&3" }, { "id": 10, - "name": "查看成员列表（任命，罢免，转让 按钮）", + "name": " 查看成员列表（任命，罢免，转让 按钮）", "authority": "1&" }, { "id": 11, - "name": "修改公会名，公告信息，加入条件，是否自动加入", + "name": " 修改公会名，公告信息，加入条件，是否自动加入", "authority": "1&2" }, { "id": 12, - "name": "查看申请列表", + "name": " 查看申请列表", "authority": "1&2" }, { "id": 13, - "name": "（一键）同意/拒绝加入", + "name": " （一键）同意/拒绝加入", "authority": "1&2" }, { "id": 14, - "name": "查看/刷新 可邀请人列表", + "name": " 查看/刷新 可邀请人列表", "authority": "1&2" }, { "id": 15, - "name": "邀请某人", + "name": " 邀请某人", "authority": "1&2" }, { "id": 16, - "name": "发送消息给军团内所有成员的游戏", + "name": " 发送消息给军团内所有成员的游戏", "authority": "1&2" }, { "id": 17, - "name": "招募（发送消息至世界频道）", + "name": " 招募（发送消息至世界频道）", "authority": "1&2" }, { "id": 18, - "name": "踢人", + "name": " 踢人", "authority": "1&" }, { "id": 19, - "name": "解散军团", + "name": " 解散军团", "authority": "1&" }, { "id": 20, - "name": "退出军团", + "name": " 退出军团", "authority": "2&3" }, { "id": 21, - "name": "弹劾团长", + "name": " 弹劾团长", "authority": "2&3" }, { "id": 22, - "name": "消耗军团资金升级建筑物", + "name": " 消耗军团资金升级建筑物", "authority": "1&2" }, { "id": 23, - "name": "获得军团动态", + "name": " 获得军团动态", "authority": "1&2&3" }, { @@ -138,10 +138,5 @@ "id": 28, "name": "被弹劾", "authority": "1&" - }, - { - "id": 29, - "name": "领取活跃宝箱", - "authority": "1&2&3" } ] \ No newline at end of file diff --git a/shared/resource/jsons/dic_army_bossBase.json b/shared/resource/jsons/dic_army_bossBase.json index 13a56325c..53e684d20 100755 --- a/shared/resource/jsons/dic_army_bossBase.json +++ b/shared/resource/jsons/dic_army_bossBase.json @@ -4,7 +4,7 @@ "structureId": 3, "level": 1, "bossLevel": 20, - "warId": "8001&8002&8003&8004", + "warIdHP": "8001&1000000|8002&1000000|8003&1000000|8004&1000000", "reward": "21008&40&1|42008&20&2", "consume": 5000, "buildWords": "&" @@ -14,7 +14,7 @@ "structureId": 3, "level": 2, "bossLevel": 25, - "warId": "8001&8002&8003&8004", + "warIdHP": "8001&2000000|8002&2000000|8003&2000000|8004&2000000", "reward": "20001&60&1|21008&40&1|42008&20&2|42115&20&3", "consume": 6000, "buildWords": "&" @@ -24,7 +24,7 @@ "structureId": 3, "level": 3, "bossLevel": 30, - "warId": "8001&8002&8003&8004", + "warIdHP": "8001&3000000|8002&3000000|8003&3000000|8004&3000000", "reward": "20001&60&1|21008&40&1|42008&20&2|42115&20&3", "consume": 7000, "buildWords": "&" @@ -34,7 +34,7 @@ "structureId": 3, "level": 4, "bossLevel": 40, - "warId": "8001&8002&8003&8004", + "warIdHP": "8001&4000000|8002&4000000|8003&4000000|8004&4000000", "reward": "20001&60&1|21008&40&1|42008&20&2|42115&20&3", "consume": 8000, "buildWords": "&" @@ -44,7 +44,7 @@ "structureId": 3, "level": 5, "bossLevel": 50, - "warId": "8001&8002&8003&8004", + "warIdHP": "8001&4000000|8002&4000000|8003&4000000|8004&4000000", "reward": "20001&60&1|21008&40&1|42008&20&2|42115&20&3", "consume": 9000, "buildWords": "&" @@ -54,7 +54,7 @@ "structureId": 3, "level": 6, "bossLevel": 60, - "warId": "8001&8002&8003&8004", + "warIdHP": "8001&4000000|8002&4000000|8003&4000000|8004&4000000", "reward": "20001&60&1|21008&40&1|42008&20&2|42115&20&3", "consume": 10000, "buildWords": "&" @@ -64,7 +64,7 @@ "structureId": 3, "level": 7, "bossLevel": 70, - "warId": "8001&8002&8003&8004", + "warIdHP": "8001&4000000|8002&4000000|8003&4000000|8004&4000000", "reward": "20001&60&1|21008&40&1|42008&20&2|42115&20&3", "consume": 11000, "buildWords": "&" @@ -74,7 +74,7 @@ "structureId": 3, "level": 8, "bossLevel": 80, - "warId": "8001&8002&8003&8004", + "warIdHP": "8001&4000000|8002&4000000|8003&4000000|8004&4000000", "reward": "20001&60&1|21008&40&1|42008&20&2|42115&20&3", "consume": 12000, "buildWords": "&" @@ -84,7 +84,7 @@ "structureId": 3, "level": 9, "bossLevel": 90, - "warId": "8001&8002&8003&8004", + "warIdHP": "8001&4000000|8002&4000000|8003&4000000|8004&4000000", "reward": "20001&60&1|21008&40&1|42008&20&2|42115&20&3", "consume": 13000, "buildWords": "&" @@ -94,7 +94,7 @@ "structureId": 3, "level": 10, "bossLevel": 100, - "warId": "8001&8002&8003&8004", + "warIdHP": "8001&4000000|8002&4000000|8003&4000000|8004&4000000", "reward": "20001&60&1|21008&40&1|42008&20&2|42115&20&3", "consume": 15000, "buildWords": "&" diff --git a/shared/resource/jsons/dic_army_donateBase.json b/shared/resource/jsons/dic_army_donateBase.json index eb1816635..191f1df93 100755 --- a/shared/resource/jsons/dic_army_donateBase.json +++ b/shared/resource/jsons/dic_army_donateBase.json @@ -1,7 +1,7 @@ [ { "id": 1, - "structureId": 5, + "structureId": 7, "level": 1, "donatevalue": "1&2000|2&10|2&20", "donateReward": "20&20|100&200|400&600", @@ -11,7 +11,7 @@ }, { "id": 2, - "structureId": 5, + "structureId": 7, "level": 2, "donatevalue": "1&4000|2&20|2&40", "donateReward": "40&40|200&400|600&1000", @@ -21,7 +21,7 @@ }, { "id": 3, - "structureId": 5, + "structureId": 7, "level": 3, "donatevalue": "1&6000|2&30|2&60", "donateReward": "60&60|300&600|800&1400", @@ -31,7 +31,7 @@ }, { "id": 4, - "structureId": 5, + "structureId": 7, "level": 4, "donatevalue": "1&8000|2&40|2&80", "donateReward": "80&80|400&800|1000&1800", @@ -41,7 +41,7 @@ }, { "id": 5, - "structureId": 5, + "structureId": 7, "level": 5, "donatevalue": "1&10000|2&50|2&100", "donateReward": "100&100|500&1000|1200&2200", @@ -51,7 +51,7 @@ }, { "id": 6, - "structureId": 5, + "structureId": 7, "level": 6, "donatevalue": "1&12000|2&60|2&120", "donateReward": "120&120|600&1200|1400&2600", @@ -61,7 +61,7 @@ }, { "id": 7, - "structureId": 5, + "structureId": 7, "level": 7, "donatevalue": "1&14000|2&70|2&140", "donateReward": "140&140|700&1400|1600&3000", @@ -71,7 +71,7 @@ }, { "id": 8, - "structureId": 5, + "structureId": 7, "level": 8, "donatevalue": "1&16000|2&80|2&160", "donateReward": "160&160|800&1600|1800&3400", @@ -81,7 +81,7 @@ }, { "id": 9, - "structureId": 5, + "structureId": 7, "level": 9, "donatevalue": "1&18000|2&90|2&180", "donateReward": "180&180|900&1800|2000&3800", @@ -91,7 +91,7 @@ }, { "id": 10, - "structureId": 5, + "structureId": 7, "level": 10, "donatevalue": "1&20000|2&100|2&200", "donateReward": "200&200|1000&2000|2200&4200", diff --git a/shared/resource/jsons/dic_army_structureLevel.json b/shared/resource/jsons/dic_army_structureLevel.json new file mode 100644 index 000000000..1349d3937 --- /dev/null +++ b/shared/resource/jsons/dic_army_structureLevel.json @@ -0,0 +1,52 @@ +[ + { + "id": 1, + "centreLevel": 1, + "structureId": "5&6&7" + }, + { + "id": 2, + "centreLevel": 2, + "structureId": "2&3&4" + }, + { + "id": 3, + "centreLevel": 3, + "structureId": "&" + }, + { + "id": 4, + "centreLevel": 4, + "structureId": "&" + }, + { + "id": 5, + "centreLevel": 5, + "structureId": "&" + }, + { + "id": 6, + "centreLevel": 6, + "structureId": "&" + }, + { + "id": 7, + "centreLevel": 7, + "structureId": "&" + }, + { + "id": 8, + "centreLevel": 8, + "structureId": "&" + }, + { + "id": 9, + "centreLevel": 9, + "structureId": "&" + }, + { + "id": 10, + "centreLevel": 10, + "structureId": "&" + } +] \ No newline at end of file diff --git a/shared/resource/jsons/dic_blueprt_compose.json b/shared/resource/jsons/dic_blueprt_compose.json index 32dff20e8..807812176 100644 --- a/shared/resource/jsons/dic_blueprt_compose.json +++ b/shared/resource/jsons/dic_blueprt_compose.json @@ -16,11 +16,5 @@ "coinNum": 30, "blueprtNum": 3, "targetQuality": 4 - }, - { - "quality": 4, - "coinNum": 40, - "blueprtNum": 3, - "targetQuality": 5 } ] \ No newline at end of file diff --git a/shared/resource/jsons/dic_blueprt_possibility .json b/shared/resource/jsons/dic_blueprt_possibility .json new file mode 100644 index 000000000..3c429e005 --- /dev/null +++ b/shared/resource/jsons/dic_blueprt_possibility .json @@ -0,0 +1,22 @@ +[ + { + "min": 20, + "max": 39, + "possibility": "1&100" + }, + { + "min": 40, + "max": 59, + "possibility": "1&70|2&30" + }, + { + "min": 60, + "max": 79, + "possibility": "2&70|3&30" + }, + { + "min": 80, + "max": 100, + "possibility": "2&60|3&40" + } +] \ No newline at end of file diff --git a/shared/resource/jsons/dic_treasure_combatnum.json b/shared/resource/jsons/dic_treasure_combatnum.json index 26619cbf6..6f4ec8d5b 100644 --- a/shared/resource/jsons/dic_treasure_combatnum.json +++ b/shared/resource/jsons/dic_treasure_combatnum.json @@ -2,1401 +2,3865 @@ { "good_id": 33001, "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, - "combatnum_c": 200000 + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33002, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, - "combatnum_c": 200000 + "quality": 2, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33003, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, - "combatnum_c": 200000 + "quality": 3, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33004, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, - "combatnum_c": 200000 + "quality": 4, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33005, "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, - "combatnum_c": 200000 + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33006, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, - "combatnum_c": 200000 + "quality": 2, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33007, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, - "combatnum_c": 200000 + "quality": 3, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33008, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, - "combatnum_c": 200000 + "quality": 4, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33009, "quality": 1, "combatnum_a": 50000, "combatnum_b": 100000, - "combatnum_c": 200000 + "combatnum_c": 150000 }, { "good_id": 33010, - "quality": 1, + "quality": 2, "combatnum_a": 50000, "combatnum_b": 100000, - "combatnum_c": 200000 + "combatnum_c": 150000 }, { "good_id": 33011, - "quality": 1, + "quality": 3, "combatnum_a": 50000, "combatnum_b": 100000, - "combatnum_c": 200000 + "combatnum_c": 150000 }, { "good_id": 33012, - "quality": 1, + "quality": 4, "combatnum_a": 50000, "combatnum_b": 100000, - "combatnum_c": 200000 + "combatnum_c": 150000 }, { "good_id": 33013, "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, + "combatnum_a": 70000, + "combatnum_b": 120000, "combatnum_c": 200000 }, { "good_id": 33014, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, "combatnum_c": 200000 }, { "good_id": 33015, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, "combatnum_c": 200000 }, { "good_id": 33016, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, "combatnum_c": 200000 }, { "good_id": 33017, "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, + "combatnum_a": 70000, + "combatnum_b": 120000, "combatnum_c": 200000 }, { "good_id": 33018, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, "combatnum_c": 200000 }, { "good_id": 33019, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, "combatnum_c": 200000 }, { "good_id": 33020, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, "combatnum_c": 200000 }, { "good_id": 33021, "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, + "combatnum_a": 70000, + "combatnum_b": 120000, "combatnum_c": 200000 }, { "good_id": 33022, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, "combatnum_c": 200000 }, { "good_id": 33023, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, "combatnum_c": 200000 }, { "good_id": 33024, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, "combatnum_c": 200000 }, { "good_id": 33025, "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, - "combatnum_c": 200000 + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33026, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, - "combatnum_c": 200000 + "quality": 2, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33027, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, - "combatnum_c": 200000 + "quality": 3, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33028, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, - "combatnum_c": 200000 + "quality": 4, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33029, "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, - "combatnum_c": 200000 + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33030, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, - "combatnum_c": 200000 + "quality": 2, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33031, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, - "combatnum_c": 200000 + "quality": 3, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33032, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, - "combatnum_c": 200000 + "quality": 4, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33033, "quality": 1, "combatnum_a": 50000, "combatnum_b": 100000, - "combatnum_c": 200000 + "combatnum_c": 150000 }, { "good_id": 33034, - "quality": 1, + "quality": 2, "combatnum_a": 50000, "combatnum_b": 100000, - "combatnum_c": 200000 + "combatnum_c": 150000 }, { "good_id": 33035, - "quality": 1, + "quality": 3, "combatnum_a": 50000, "combatnum_b": 100000, - "combatnum_c": 200000 + "combatnum_c": 150000 }, { "good_id": 33036, - "quality": 1, + "quality": 4, "combatnum_a": 50000, "combatnum_b": 100000, - "combatnum_c": 200000 + "combatnum_c": 150000 }, { "good_id": 33037, "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, + "combatnum_a": 70000, + "combatnum_b": 120000, "combatnum_c": 200000 }, { "good_id": 33038, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, "combatnum_c": 200000 }, { "good_id": 33039, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, "combatnum_c": 200000 }, { "good_id": 33040, - "quality": 1, - "combatnum_a": 50000, - "combatnum_b": 100000, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, "combatnum_c": 200000 }, { "good_id": 33041, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33042, "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33043, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33044, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33045, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33046, "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33047, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33048, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33049, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 1, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33050, "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33051, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 3, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33052, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 4, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33053, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 1, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33054, "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33055, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 3, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33056, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 4, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33057, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 1, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33058, "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33059, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 3, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33060, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 4, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33061, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33062, "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33063, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33064, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33065, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33066, "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33067, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33068, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33069, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33070, "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33071, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33072, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33073, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 1, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33074, "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33075, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 3, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33076, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 4, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33077, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 1, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33078, "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33079, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 3, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33080, - "quality": 2, - "combatnum_a": 100000, - "combatnum_b": 300000, - "combatnum_c": 400000 + "quality": 4, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33081, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 1, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33082, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 2, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33083, "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33084, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 4, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33085, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33086, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33087, "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33088, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33089, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33090, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33091, "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33092, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33093, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33094, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33095, "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33096, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33097, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 1, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33098, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 2, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33099, "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33100, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 4, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33101, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 1, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33102, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 2, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33103, "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33104, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 4, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33105, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 1, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33106, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 2, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33107, "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33108, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 4, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33109, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33110, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33111, "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33112, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33113, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33114, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33115, "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33116, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33117, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33118, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33119, "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33120, - "quality": 3, - "combatnum_a": 300000, - "combatnum_b": 500000, - "combatnum_c": 600000 + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33121, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 1, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33122, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 2, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33123, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 3, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33124, "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33125, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 1, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33126, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 2, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33127, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 3, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33128, "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33129, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 1, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33130, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 2, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33131, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 3, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33132, "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33133, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33134, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33135, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33136, "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33137, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33138, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33139, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33140, "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33141, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33142, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33143, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33144, "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33145, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 1, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33146, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 2, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33147, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 3, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33148, "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33149, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 1, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33150, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 2, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33151, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 3, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33152, "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33153, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 1, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33154, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 2, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33155, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 3, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33156, "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33157, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33158, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33159, - "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33160, "quality": 4, - "combatnum_a": 500000, - "combatnum_b": 700000, - "combatnum_c": 800000 + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33161, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33162, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33163, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33164, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33165, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33166, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33167, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33168, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33169, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 1, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33170, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 2, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33171, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 3, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33172, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 4, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33173, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 1, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33174, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 2, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33175, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 3, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33176, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 4, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33177, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 1, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33178, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 2, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33179, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 3, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33180, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 4, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 }, { "good_id": 33181, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33182, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33183, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33184, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33185, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33186, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33187, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33188, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33189, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33190, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33191, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33192, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 }, { "good_id": 33193, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 1, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33194, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 2, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33195, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 3, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33196, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 4, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 }, { "good_id": 33197, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 1, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33198, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 2, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33199, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 3, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 }, { "good_id": 33200, - "quality": 5, - "combatnum_a": 700000, - "combatnum_b": 900000, - "combatnum_c": 1300000 + "quality": 4, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33201, + "quality": 1, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33202, + "quality": 2, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33203, + "quality": 3, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33204, + "quality": 4, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33205, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33206, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33207, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33208, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33209, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33210, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33211, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33212, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33213, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33214, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33215, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33216, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33217, + "quality": 1, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33218, + "quality": 2, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33219, + "quality": 3, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33220, + "quality": 4, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33221, + "quality": 1, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33222, + "quality": 2, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33223, + "quality": 3, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33224, + "quality": 4, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33225, + "quality": 1, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33226, + "quality": 2, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33227, + "quality": 3, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33228, + "quality": 4, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33229, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33230, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33231, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33232, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33233, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33234, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33235, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33236, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33237, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33238, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33239, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33240, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33241, + "quality": 1, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33242, + "quality": 2, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33243, + "quality": 3, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33244, + "quality": 4, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33245, + "quality": 1, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33246, + "quality": 2, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33247, + "quality": 3, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33248, + "quality": 4, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33249, + "quality": 1, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33250, + "quality": 2, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33251, + "quality": 3, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33252, + "quality": 4, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33253, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33254, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33255, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33256, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33257, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33258, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33259, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33260, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33261, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33262, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33263, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33264, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33265, + "quality": 1, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33266, + "quality": 2, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33267, + "quality": 3, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33268, + "quality": 4, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33269, + "quality": 1, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33270, + "quality": 2, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33271, + "quality": 3, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33272, + "quality": 4, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33273, + "quality": 1, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33274, + "quality": 2, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33275, + "quality": 3, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33276, + "quality": 4, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33277, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33278, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33279, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33280, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33281, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33282, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33283, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33284, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33285, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33286, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33287, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33288, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33289, + "quality": 1, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33290, + "quality": 2, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33291, + "quality": 3, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33292, + "quality": 4, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33293, + "quality": 1, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33294, + "quality": 2, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33295, + "quality": 3, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33296, + "quality": 4, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33297, + "quality": 1, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33298, + "quality": 2, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33299, + "quality": 3, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33300, + "quality": 4, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33301, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33302, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33303, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33304, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33305, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33306, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33307, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33308, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33309, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33310, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33311, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33312, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33313, + "quality": 1, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33314, + "quality": 2, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33315, + "quality": 3, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33316, + "quality": 4, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33317, + "quality": 1, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33318, + "quality": 2, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33319, + "quality": 3, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33320, + "quality": 4, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33321, + "quality": 1, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33322, + "quality": 2, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33323, + "quality": 3, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33324, + "quality": 4, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33325, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33326, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33327, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33328, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33329, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33330, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33331, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33332, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33333, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33334, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33335, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33336, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33337, + "quality": 1, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33338, + "quality": 2, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33339, + "quality": 3, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33340, + "quality": 4, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33341, + "quality": 1, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33342, + "quality": 2, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33343, + "quality": 3, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33344, + "quality": 4, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33345, + "quality": 1, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33346, + "quality": 2, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33347, + "quality": 3, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33348, + "quality": 4, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33349, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33350, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33351, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33352, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33353, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33354, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33355, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33356, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33357, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33358, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33359, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33360, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33361, + "quality": 1, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33362, + "quality": 2, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33363, + "quality": 3, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33364, + "quality": 4, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33365, + "quality": 1, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33366, + "quality": 2, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33367, + "quality": 3, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33368, + "quality": 4, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33369, + "quality": 1, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33370, + "quality": 2, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33371, + "quality": 3, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33372, + "quality": 4, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33373, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33374, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33375, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33376, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33377, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33378, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33379, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33380, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33381, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33382, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33383, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33384, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33385, + "quality": 1, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33386, + "quality": 2, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33387, + "quality": 3, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33388, + "quality": 4, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33389, + "quality": 1, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33390, + "quality": 2, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33391, + "quality": 3, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33392, + "quality": 4, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33393, + "quality": 1, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33394, + "quality": 2, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33395, + "quality": 3, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33396, + "quality": 4, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33397, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33398, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33399, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33400, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33401, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33402, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33403, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33404, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33405, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33406, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33407, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33408, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33409, + "quality": 1, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33410, + "quality": 2, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33411, + "quality": 3, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33412, + "quality": 4, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33413, + "quality": 1, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33414, + "quality": 2, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33415, + "quality": 3, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33416, + "quality": 4, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33417, + "quality": 1, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33418, + "quality": 2, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33419, + "quality": 3, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33420, + "quality": 4, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33421, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33422, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33423, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33424, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33425, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33426, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33427, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33428, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33429, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33430, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33431, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33432, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33433, + "quality": 1, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33434, + "quality": 2, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33435, + "quality": 3, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33436, + "quality": 4, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33437, + "quality": 1, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33438, + "quality": 2, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33439, + "quality": 3, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33440, + "quality": 4, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33441, + "quality": 1, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33442, + "quality": 2, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33443, + "quality": 3, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33444, + "quality": 4, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33445, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33446, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33447, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33448, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33449, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33450, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33451, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33452, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33453, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33454, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33455, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33456, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33457, + "quality": 1, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33458, + "quality": 2, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33459, + "quality": 3, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33460, + "quality": 4, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33461, + "quality": 1, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33462, + "quality": 2, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33463, + "quality": 3, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33464, + "quality": 4, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33465, + "quality": 1, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33466, + "quality": 2, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33467, + "quality": 3, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33468, + "quality": 4, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33469, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33470, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33471, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33472, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33473, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33474, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33475, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33476, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33477, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33478, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33479, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33480, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33481, + "quality": 1, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33482, + "quality": 2, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33483, + "quality": 3, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33484, + "quality": 4, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33485, + "quality": 1, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33486, + "quality": 2, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33487, + "quality": 3, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33488, + "quality": 4, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33489, + "quality": 1, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33490, + "quality": 2, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33491, + "quality": 3, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33492, + "quality": 4, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33493, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33494, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33495, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33496, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33497, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33498, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33499, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33500, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33501, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33502, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33503, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33504, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33505, + "quality": 1, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33506, + "quality": 2, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33507, + "quality": 3, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33508, + "quality": 4, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33509, + "quality": 1, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33510, + "quality": 2, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33511, + "quality": 3, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33512, + "quality": 4, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33513, + "quality": 1, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33514, + "quality": 2, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33515, + "quality": 3, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33516, + "quality": 4, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33517, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33518, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33519, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33520, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33521, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33522, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33523, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33524, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33525, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33526, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33527, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33528, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33529, + "quality": 1, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33530, + "quality": 2, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33531, + "quality": 3, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33532, + "quality": 4, + "combatnum_a": 10000, + "combatnum_b": 50000, + "combatnum_c": 100000 + }, + { + "good_id": 33533, + "quality": 1, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33534, + "quality": 2, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33535, + "quality": 3, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33536, + "quality": 4, + "combatnum_a": 30000, + "combatnum_b": 80000, + "combatnum_c": 120000 + }, + { + "good_id": 33537, + "quality": 1, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33538, + "quality": 2, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33539, + "quality": 3, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33540, + "quality": 4, + "combatnum_a": 50000, + "combatnum_b": 100000, + "combatnum_c": 150000 + }, + { + "good_id": 33541, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33542, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33543, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33544, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33545, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33546, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33547, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33548, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33549, + "quality": 1, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33550, + "quality": 2, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33551, + "quality": 3, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 + }, + { + "good_id": 33552, + "quality": 4, + "combatnum_a": 70000, + "combatnum_b": 120000, + "combatnum_c": 200000 } ] \ No newline at end of file diff --git a/shared/resource/jsons/dic_zyz_approach.json b/shared/resource/jsons/dic_zyz_approach.json index 60e9cb205..05a5cec0a 100644 --- a/shared/resource/jsons/dic_zyz_approach.json +++ b/shared/resource/jsons/dic_zyz_approach.json @@ -2,43 +2,43 @@ { "type": 1, "name": "商店", - "icon": 2, + "icon": "tubiao2_shangcheng", "description": "去商店买呀" }, { "type": 2, "name": "关卡", - "icon": 3, + "icon": "tubiao2_shangcheng", "description": "去关卡扫荡" }, { "type": 3, "name": "招募", - "icon": 4, + "icon": "tubiao2_shangcheng", "description": "招募获得" }, { "type": 4, "name": "活动", - "icon": 5, + "icon": "tubiao2_shangcheng", "description": "去活动页面" }, { "type": 5, "name": "武将信息", - "icon": 6, + "icon": "tubiao2_shangcheng", "description": "去武将信息界面" }, { "type": 6, "name": "合成界面", - "icon": 7, + "icon": "tubiao_hecheng", "description": "去合成界面" }, { "type": 8, "name": "寻宝界面", - "icon": 8, + "icon": "tubiao2_shangcheng", "description": "去寻宝界面" } ] \ No newline at end of file diff --git a/shared/resource/jsons/dic_zyz_event.json b/shared/resource/jsons/dic_zyz_event.json index 2e7890ca8..86d35dc0d 100644 --- a/shared/resource/jsons/dic_zyz_event.json +++ b/shared/resource/jsons/dic_zyz_event.json @@ -11,7 +11,7 @@ "suitLevel": "1&20", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "1&4", "winDialogue": "&", "loseDialogue": "&" @@ -28,7 +28,7 @@ "suitLevel": "1&20", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "2&3", "winDialogue": "&", "loseDialogue": "&" @@ -45,7 +45,7 @@ "suitLevel": "1&20", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "1&4", "winDialogue": "&", "loseDialogue": "&" @@ -62,7 +62,7 @@ "suitLevel": "1&20", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "16&17", "winDialogue": "18&", "loseDialogue": "19&" @@ -79,7 +79,7 @@ "suitLevel": "1&20", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "16&17", "winDialogue": "18&", "loseDialogue": "19&" @@ -96,7 +96,7 @@ "suitLevel": "1&20", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "20&21&22&23&24", "winDialogue": "25&", "loseDialogue": "26&" @@ -113,7 +113,7 @@ "suitLevel": "1&20", "warId": 2001, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "5&6", "winDialogue": "3&", "loseDialogue": "7&" @@ -130,7 +130,7 @@ "suitLevel": "1&20", "warId": 2002, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "27&28&29&30&31", "winDialogue": "32&33", "loseDialogue": "34&" @@ -147,7 +147,7 @@ "suitLevel": "1&20", "warId": 2003, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "8&9&10&11", "winDialogue": "12&13", "loseDialogue": "14&15" @@ -164,7 +164,7 @@ "suitLevel": "21&40", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "1&4", "winDialogue": "&", "loseDialogue": "&" @@ -181,7 +181,7 @@ "suitLevel": "21&40", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "2&3", "winDialogue": "&", "loseDialogue": "&" @@ -198,7 +198,7 @@ "suitLevel": "21&40", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "1&4", "winDialogue": "&", "loseDialogue": "&" @@ -215,7 +215,7 @@ "suitLevel": "21&40", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "16&17", "winDialogue": "18&", "loseDialogue": "19&" @@ -232,7 +232,7 @@ "suitLevel": "21&40", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "16&17", "winDialogue": "18&", "loseDialogue": "19&" @@ -249,7 +249,7 @@ "suitLevel": "21&40", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "20&21&22&23&24", "winDialogue": "25&", "loseDialogue": "26&" @@ -266,7 +266,7 @@ "suitLevel": "21&40", "warId": 2001, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "5&6", "winDialogue": "3&", "loseDialogue": "7&" @@ -283,7 +283,7 @@ "suitLevel": "21&40", "warId": 2002, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "27&28&29&30&31", "winDialogue": "32&33", "loseDialogue": "34&" @@ -300,7 +300,7 @@ "suitLevel": "21&40", "warId": 2003, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "8&9&10&11", "winDialogue": "12&13", "loseDialogue": "14&15" @@ -317,7 +317,7 @@ "suitLevel": "41&100", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "1&4", "winDialogue": "&", "loseDialogue": "&" @@ -334,7 +334,7 @@ "suitLevel": "41&100", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "2&3", "winDialogue": "&", "loseDialogue": "&" @@ -351,7 +351,7 @@ "suitLevel": "41&100", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "1&4", "winDialogue": "&", "loseDialogue": "&" @@ -368,7 +368,7 @@ "suitLevel": "41&100", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "16&17", "winDialogue": "18&", "loseDialogue": "19&" @@ -385,7 +385,7 @@ "suitLevel": "41&100", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "16&17", "winDialogue": "18&", "loseDialogue": "19&" @@ -402,7 +402,7 @@ "suitLevel": "41&100", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "20&21&22&23&24", "winDialogue": "25&", "loseDialogue": "26&" @@ -419,7 +419,7 @@ "suitLevel": "41&100", "warId": 2001, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "5&6", "winDialogue": "3&", "loseDialogue": "7&" @@ -436,7 +436,7 @@ "suitLevel": "41&100", "warId": 2002, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "27&28&29&30&31", "winDialogue": "32&33", "loseDialogue": "34&" @@ -453,7 +453,7 @@ "suitLevel": "41&100", "warId": 2003, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "8&9&10&11", "winDialogue": "12&13", "loseDialogue": "14&15" @@ -470,7 +470,7 @@ "suitLevel": "61&100", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "1&4", "winDialogue": "&", "loseDialogue": "&" @@ -487,7 +487,7 @@ "suitLevel": "61&100", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "2&3", "winDialogue": "&", "loseDialogue": "&" @@ -504,7 +504,7 @@ "suitLevel": "61&100", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "1&4", "winDialogue": "&", "loseDialogue": "&" @@ -521,7 +521,7 @@ "suitLevel": "61&100", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "16&17", "winDialogue": "18&", "loseDialogue": "19&" @@ -538,7 +538,7 @@ "suitLevel": "61&100", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "16&17", "winDialogue": "18&", "loseDialogue": "19&" @@ -555,7 +555,7 @@ "suitLevel": "61&100", "warId": 0, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "20&21&22&23&24", "winDialogue": "25&", "loseDialogue": "26&" @@ -572,7 +572,7 @@ "suitLevel": "61&100", "warId": 2001, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "5&6", "winDialogue": "3&", "loseDialogue": "7&" @@ -589,7 +589,7 @@ "suitLevel": "61&100", "warId": 2002, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "27&28&29&30&31", "winDialogue": "32&33", "loseDialogue": "34&" @@ -606,7 +606,7 @@ "suitLevel": "61&100", "warId": 2003, "weight": 1, - "movePointArray": "44&46&48&50", + "movePointArray": "26&27&28&29", "startDialogue": "8&9&10&11", "winDialogue": "12&13", "loseDialogue": "14&15" diff --git a/shared/resource/jsons/dic_zyz_gk_pvp.json b/shared/resource/jsons/dic_zyz_gk_pvp.json index e47297c7a..8162c9b53 100755 --- a/shared/resource/jsons/dic_zyz_gk_pvp.json +++ b/shared/resource/jsons/dic_zyz_gk_pvp.json @@ -6,7 +6,7 @@ "warType": 9, "gk_name": "地图1", "victoryInfoInUI": "5回合内杀死2个敌军", - "victoryCondition ": "111&5&2&", + "pvpVictoryCondition": "111&5&2&", "turnLimted": 10 }, { @@ -16,7 +16,7 @@ "warType": 9, "gk_name": "地图2", "victoryInfoInUI": "我军死亡武将不超过2人", - "victoryCondition ": "102&2&", + "pvpVictoryCondition": "102&2&", "turnLimted": 10 }, { @@ -26,7 +26,7 @@ "warType": 9, "gk_name": "地图3", "victoryInfoInUI": "我军全员生存", - "victoryCondition ": "102&0&", + "pvpVictoryCondition": "102&0&", "turnLimted": 10 }, { @@ -35,8 +35,8 @@ "bg_img_id": 501, "warType": 9, "gk_name": "地图4", - "victoryInfoInUI": "8回合内获得胜利", - "victoryCondition ": "106&8&", + "victoryInfoInUI": "10回合内获得胜利", + "pvpVictoryCondition": "106&10&", "turnLimted": 10 }, { @@ -46,7 +46,7 @@ "warType": 9, "gk_name": "地图5", "victoryInfoInUI": "同一名武将击杀3名敌军", - "victoryCondition ": "400&3&", + "pvpVictoryCondition": "400&3&", "turnLimted": 10 } ] \ No newline at end of file diff --git a/shared/resource/jsons/dic_zyz_hero.json b/shared/resource/jsons/dic_zyz_hero.json index da6fe0bac..396ad0731 100644 --- a/shared/resource/jsons/dic_zyz_hero.json +++ b/shared/resource/jsons/dic_zyz_hero.json @@ -39,7 +39,9 @@ "imgPosofInfoUI": "-414&-193", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41001 + "initialSkin": 41001, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 2, @@ -81,7 +83,9 @@ "imgPosofInfoUI": "-511&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41003 + "initialSkin": 41003, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 3, @@ -123,7 +127,9 @@ "imgPosofInfoUI": "-304&120", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41004 + "initialSkin": 41004, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 4, @@ -165,7 +171,9 @@ "imgPosofInfoUI": "-292&-143", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41005 + "initialSkin": 41005, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 5, @@ -207,7 +215,9 @@ "imgPosofInfoUI": "-204&-176", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41006 + "initialSkin": 41006, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 6, @@ -249,7 +259,9 @@ "imgPosofInfoUI": "-418&-191", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41007 + "initialSkin": 41007, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 7, @@ -291,7 +303,9 @@ "imgPosofInfoUI": "-408&-47", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41008 + "initialSkin": 41008, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 8, @@ -333,7 +347,9 @@ "imgPosofInfoUI": "-387&-178", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41009 + "initialSkin": 41009, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 9, @@ -375,7 +391,9 @@ "imgPosofInfoUI": "-413&-68", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41010 + "initialSkin": 41010, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 10, @@ -417,7 +435,9 @@ "imgPosofInfoUI": "-393&-166", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41011 + "initialSkin": 41011, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 11, @@ -459,12 +479,14 @@ "imgPosofInfoUI": "-269&-118", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41012 + "initialSkin": 41012, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 12, "spineName": "lidian", - "rSpineName": "&", + "rSpineName": "LH_lidian", "name": "李典", "face_id": "lidian", "quality": 2, @@ -501,7 +523,9 @@ "imgPosofInfoUI": "-443&-52", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41013 + "initialSkin": 41013, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 13, @@ -543,12 +567,14 @@ "imgPosofInfoUI": "-387&-85", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41014 + "initialSkin": 41014, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 14, "spineName": "jiaxu", - "rSpineName": "&", + "rSpineName": "LH_jiaxu", "name": "贾诩", "face_id": "jiaxu", "quality": 2, @@ -585,7 +611,9 @@ "imgPosofInfoUI": "-413&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41015 + "initialSkin": 41015, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 15, @@ -627,7 +655,9 @@ "imgPosofInfoUI": "-450&-156", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41016 + "initialSkin": 41016, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 16, @@ -669,7 +699,9 @@ "imgPosofInfoUI": "-387&-156", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41017 + "initialSkin": 41017, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 17, @@ -711,7 +743,9 @@ "imgPosofInfoUI": "-424&-213", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41018 + "initialSkin": 41018, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 18, @@ -753,7 +787,9 @@ "imgPosofInfoUI": "-297&-158", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41019 + "initialSkin": 41019, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 19, @@ -795,7 +831,9 @@ "imgPosofInfoUI": "-388&-115", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41020 + "initialSkin": 41020, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 20, @@ -837,7 +875,9 @@ "imgPosofInfoUI": "-385&-120", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41021 + "initialSkin": 41021, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 21, @@ -879,7 +919,9 @@ "imgPosofInfoUI": "-199&-118", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41022 + "initialSkin": 41022, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 22, @@ -921,7 +963,9 @@ "imgPosofInfoUI": "-327&-115", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41023 + "initialSkin": 41023, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 23, @@ -963,7 +1007,9 @@ "imgPosofInfoUI": "-438&-27", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41024 + "initialSkin": 41024, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 24, @@ -1005,7 +1051,9 @@ "imgPosofInfoUI": "-529&-183", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41025 + "initialSkin": 41025, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 25, @@ -1047,7 +1095,9 @@ "imgPosofInfoUI": "-440&-35", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41026 + "initialSkin": 41026, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 26, @@ -1089,7 +1139,9 @@ "imgPosofInfoUI": "-471&-65", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41027 + "initialSkin": 41027, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 27, @@ -1131,7 +1183,9 @@ "imgPosofInfoUI": "-395&-85", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41028 + "initialSkin": 41028, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 28, @@ -1173,7 +1227,9 @@ "imgPosofInfoUI": "-448&-166", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41029 + "initialSkin": 41029, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 29, @@ -1215,7 +1271,9 @@ "imgPosofInfoUI": "-367&-120", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41030 + "initialSkin": 41030, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 30, @@ -1257,7 +1315,9 @@ "imgPosofInfoUI": "-357&-141", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41031 + "initialSkin": 41031, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 31, @@ -1299,7 +1359,9 @@ "imgPosofInfoUI": "-380&-186", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41032 + "initialSkin": 41032, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 32, @@ -1341,7 +1403,9 @@ "imgPosofInfoUI": "-350&-118", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41033 + "initialSkin": 41033, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 33, @@ -1383,7 +1447,9 @@ "imgPosofInfoUI": "-511&-90", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41034 + "initialSkin": 41034, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 34, @@ -1425,7 +1491,9 @@ "imgPosofInfoUI": "-529&-186", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41035 + "initialSkin": 41035, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 35, @@ -1467,7 +1535,9 @@ "imgPosofInfoUI": "-503&-123", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41036 + "initialSkin": 41036, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 36, @@ -1509,7 +1579,9 @@ "imgPosofInfoUI": "-448&-153", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41037 + "initialSkin": 41037, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 37, @@ -1551,7 +1623,9 @@ "imgPosofInfoUI": "-581&-153", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41038 + "initialSkin": 41038, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 38, @@ -1593,7 +1667,9 @@ "imgPosofInfoUI": "-387&-37", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41039 + "initialSkin": 41039, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 39, @@ -1635,7 +1711,9 @@ "imgPosofInfoUI": "-398&-173", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41040 + "initialSkin": 41040, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 40, @@ -1677,7 +1755,9 @@ "imgPosofInfoUI": "-458&-108", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41041 + "initialSkin": 41041, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 41, @@ -1719,7 +1799,9 @@ "imgPosofInfoUI": "-541&-168", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41042 + "initialSkin": 41042, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 42, @@ -1761,7 +1843,9 @@ "imgPosofInfoUI": "-435&-70", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41043 + "initialSkin": 41043, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 43, @@ -1803,7 +1887,9 @@ "imgPosofInfoUI": "-365&-171", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41044 + "initialSkin": 41044, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 44, @@ -1845,7 +1931,9 @@ "imgPosofInfoUI": "-508&-118", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41045 + "initialSkin": 41045, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 45, @@ -1887,7 +1975,9 @@ "imgPosofInfoUI": "-330&-146", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41046 + "initialSkin": 41046, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 46, @@ -1929,7 +2019,9 @@ "imgPosofInfoUI": "-393&-17", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41047 + "initialSkin": 41047, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 47, @@ -1971,7 +2063,9 @@ "imgPosofInfoUI": "-445&-156", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41048 + "initialSkin": 41048, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 48, @@ -2013,7 +2107,9 @@ "imgPosofInfoUI": "-526&-146", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41049 + "initialSkin": 41049, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 49, @@ -2055,7 +2151,9 @@ "imgPosofInfoUI": "60&-15", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41050 + "initialSkin": 41050, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 50, @@ -2097,7 +2195,9 @@ "imgPosofInfoUI": "-299&-141", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41051 + "initialSkin": 41051, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 51, @@ -2139,7 +2239,9 @@ "imgPosofInfoUI": "-433&-128", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41052 + "initialSkin": 41052, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 52, @@ -2181,7 +2283,9 @@ "imgPosofInfoUI": "-390&-158", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41053 + "initialSkin": 41053, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 53, @@ -2223,7 +2327,9 @@ "imgPosofInfoUI": "-604&-105", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41054 + "initialSkin": 41054, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 54, @@ -2265,7 +2371,9 @@ "imgPosofInfoUI": "-617&-138", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41055 + "initialSkin": 41055, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 55, @@ -2307,7 +2415,9 @@ "imgPosofInfoUI": "-410&-136", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41056 + "initialSkin": 41056, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 56, @@ -2349,7 +2459,9 @@ "imgPosofInfoUI": "-463&-123", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 41057 + "initialSkin": 41057, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 57, @@ -2391,7 +2503,9 @@ "imgPosofInfoUI": "-702&-188", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 58, @@ -2433,7 +2547,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 301, @@ -2475,7 +2591,9 @@ "imgPosofInfoUI": "-414&-193", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 302, @@ -2517,7 +2635,9 @@ "imgPosofInfoUI": "-511&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 303, @@ -2559,7 +2679,9 @@ "imgPosofInfoUI": "-304&120", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 304, @@ -2601,7 +2723,9 @@ "imgPosofInfoUI": "-292&-143", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 305, @@ -2643,7 +2767,9 @@ "imgPosofInfoUI": "-204&-176", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 306, @@ -2685,7 +2811,9 @@ "imgPosofInfoUI": "-418&-191", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 307, @@ -2727,7 +2855,9 @@ "imgPosofInfoUI": "-408&-47", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 308, @@ -2769,7 +2899,9 @@ "imgPosofInfoUI": "-387&-178", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 309, @@ -2811,7 +2943,9 @@ "imgPosofInfoUI": "-413&-68", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 310, @@ -2853,7 +2987,9 @@ "imgPosofInfoUI": "-393&-166", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 311, @@ -2895,7 +3031,9 @@ "imgPosofInfoUI": "-269&-118", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 312, @@ -2937,7 +3075,9 @@ "imgPosofInfoUI": "-443&-52", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 313, @@ -2979,7 +3119,9 @@ "imgPosofInfoUI": "-387&-85", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 314, @@ -3021,7 +3163,9 @@ "imgPosofInfoUI": "-413&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 315, @@ -3063,7 +3207,9 @@ "imgPosofInfoUI": "-450&-156", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 316, @@ -3105,7 +3251,9 @@ "imgPosofInfoUI": "-387&-156", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 317, @@ -3147,7 +3295,9 @@ "imgPosofInfoUI": "-424&-213", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 318, @@ -3189,7 +3339,9 @@ "imgPosofInfoUI": "-297&-158", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 319, @@ -3231,7 +3383,9 @@ "imgPosofInfoUI": "-279&-90", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 320, @@ -3273,7 +3427,9 @@ "imgPosofInfoUI": "-385&-120", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 321, @@ -3315,7 +3471,9 @@ "imgPosofInfoUI": "-199&-118", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 322, @@ -3357,7 +3515,9 @@ "imgPosofInfoUI": "-327&-115", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 323, @@ -3399,7 +3559,9 @@ "imgPosofInfoUI": "-438&-27", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 324, @@ -3441,7 +3603,9 @@ "imgPosofInfoUI": "-529&-183", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 325, @@ -3483,7 +3647,9 @@ "imgPosofInfoUI": "-440&-35", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 326, @@ -3525,7 +3691,9 @@ "imgPosofInfoUI": "-471&-65", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 327, @@ -3567,7 +3735,9 @@ "imgPosofInfoUI": "-395&-85", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 328, @@ -3609,7 +3779,9 @@ "imgPosofInfoUI": "-448&-166", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 329, @@ -3651,7 +3823,9 @@ "imgPosofInfoUI": "-367&-120", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 330, @@ -3693,7 +3867,9 @@ "imgPosofInfoUI": "-357&-141", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 331, @@ -3735,7 +3911,9 @@ "imgPosofInfoUI": "-380&-186", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 332, @@ -3777,7 +3955,9 @@ "imgPosofInfoUI": "-350&-118", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 333, @@ -3819,7 +3999,9 @@ "imgPosofInfoUI": "-511&-90", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 334, @@ -3861,7 +4043,9 @@ "imgPosofInfoUI": "-529&-186", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 335, @@ -3903,7 +4087,9 @@ "imgPosofInfoUI": "-503&-123", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 336, @@ -3945,7 +4131,9 @@ "imgPosofInfoUI": "-448&-153", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 337, @@ -3987,7 +4175,9 @@ "imgPosofInfoUI": "-581&-153", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 338, @@ -4029,7 +4219,9 @@ "imgPosofInfoUI": "-387&-37", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 339, @@ -4071,7 +4263,9 @@ "imgPosofInfoUI": "-398&-173", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 340, @@ -4113,7 +4307,9 @@ "imgPosofInfoUI": "-458&-108", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 341, @@ -4155,7 +4351,9 @@ "imgPosofInfoUI": "-541&-168", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 342, @@ -4197,7 +4395,9 @@ "imgPosofInfoUI": "-435&-70", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 343, @@ -4239,7 +4439,9 @@ "imgPosofInfoUI": "-365&-171", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 344, @@ -4281,7 +4483,9 @@ "imgPosofInfoUI": "-508&-118", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 345, @@ -4323,7 +4527,9 @@ "imgPosofInfoUI": "-330&-146", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 346, @@ -4365,7 +4571,9 @@ "imgPosofInfoUI": "-393&-17", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 347, @@ -4407,7 +4615,9 @@ "imgPosofInfoUI": "-445&-156", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 348, @@ -4449,7 +4659,9 @@ "imgPosofInfoUI": "-526&-146", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 349, @@ -4491,7 +4703,9 @@ "imgPosofInfoUI": "60&-15", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 350, @@ -4533,7 +4747,9 @@ "imgPosofInfoUI": "-299&-141", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 351, @@ -4575,7 +4791,9 @@ "imgPosofInfoUI": "-433&-128", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 352, @@ -4617,7 +4835,9 @@ "imgPosofInfoUI": "-390&-158", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 353, @@ -4659,7 +4879,9 @@ "imgPosofInfoUI": "-604&-105", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 354, @@ -4701,7 +4923,9 @@ "imgPosofInfoUI": "-617&-138", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 355, @@ -4743,7 +4967,9 @@ "imgPosofInfoUI": "-410&-136", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 356, @@ -4785,7 +5011,9 @@ "imgPosofInfoUI": "-463&-123", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 357, @@ -4827,7 +5055,9 @@ "imgPosofInfoUI": "-702&-188", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 358, @@ -4869,7 +5099,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1001, @@ -4911,7 +5143,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1002, @@ -4953,7 +5187,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1003, @@ -4995,7 +5231,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1004, @@ -5037,7 +5275,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1005, @@ -5079,7 +5319,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1006, @@ -5121,7 +5363,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1007, @@ -5163,7 +5407,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1008, @@ -5205,7 +5451,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1009, @@ -5247,7 +5495,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1010, @@ -5289,7 +5539,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1011, @@ -5331,7 +5583,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1012, @@ -5373,7 +5627,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1013, @@ -5415,7 +5671,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1014, @@ -5457,7 +5715,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1015, @@ -5499,7 +5759,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1016, @@ -5541,7 +5803,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1017, @@ -5583,7 +5847,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1018, @@ -5625,7 +5891,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1020, @@ -5667,7 +5935,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1021, @@ -5709,7 +5979,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1022, @@ -5751,7 +6023,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1023, @@ -5793,7 +6067,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1024, @@ -5835,7 +6111,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1025, @@ -5877,7 +6155,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1026, @@ -5919,7 +6199,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1027, @@ -5961,7 +6243,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1028, @@ -6003,7 +6287,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1029, @@ -6045,7 +6331,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1030, @@ -6087,7 +6375,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1031, @@ -6129,7 +6419,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1032, @@ -6171,7 +6463,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1033, @@ -6213,7 +6507,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1034, @@ -6255,7 +6551,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1035, @@ -6297,7 +6595,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "1&18|2&19", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1036, @@ -6339,7 +6639,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1037, @@ -6381,7 +6683,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1038, @@ -6423,7 +6727,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1039, @@ -6465,7 +6771,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1040, @@ -6507,7 +6815,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1041, @@ -6549,7 +6859,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1042, @@ -6591,7 +6903,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1043, @@ -6633,7 +6947,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1044, @@ -6675,7 +6991,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1045, @@ -6717,7 +7035,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1046, @@ -6759,7 +7079,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1047, @@ -6801,7 +7123,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1048, @@ -6843,7 +7167,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1049, @@ -6885,7 +7211,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1050, @@ -6927,7 +7255,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1051, @@ -6969,7 +7299,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1052, @@ -7011,7 +7343,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1053, @@ -7053,7 +7387,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1054, @@ -7095,7 +7431,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1055, @@ -7137,7 +7475,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1056, @@ -7179,7 +7519,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1057, @@ -7221,7 +7563,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1074, @@ -7263,7 +7607,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1075, @@ -7305,7 +7651,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1076, @@ -7347,7 +7695,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1077, @@ -7389,7 +7739,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1078, @@ -7431,7 +7783,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1080, @@ -7473,7 +7827,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1502, @@ -7515,7 +7871,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1503, @@ -7557,7 +7915,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1504, @@ -7599,7 +7959,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1505, @@ -7641,7 +8003,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1506, @@ -7683,7 +8047,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1507, @@ -7725,7 +8091,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1508, @@ -7767,7 +8135,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1509, @@ -7809,7 +8179,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1510, @@ -7851,7 +8223,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1511, @@ -7893,7 +8267,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1512, @@ -7935,7 +8311,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 1513, @@ -7977,7 +8355,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 2001, @@ -8019,7 +8399,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 2002, @@ -8061,7 +8443,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 2003, @@ -8103,7 +8487,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 2004, @@ -8145,7 +8531,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 2005, @@ -8187,7 +8575,9 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" }, { "heroId": 2006, @@ -8229,6 +8619,8 @@ "imgPosofInfoUI": "-471&-161", "skillScroll": "&", "position": "30&40&30", - "initialSkin": 0 + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "dunqi" } ] \ No newline at end of file diff --git a/shared/resource/jsons/dic_zyz_state.json b/shared/resource/jsons/dic_zyz_state.json index c8c80720f..cabd23161 100644 --- a/shared/resource/jsons/dic_zyz_state.json +++ b/shared/resource/jsons/dic_zyz_state.json @@ -12,7 +12,10 @@ "dotOrHot": 0, "img": 31, "info": "封怒状态描述文字", - "showOnChar": "封怒" + "showOnChar": "封怒", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 2, @@ -27,7 +30,10 @@ "dotOrHot": 0, "img": 27, "info": "援护状态描述文字", - "showOnChar": "援护" + "showOnChar": "援护", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 3, @@ -42,7 +48,10 @@ "dotOrHot": 0, "img": 43, "info": "封技状态描述文字", - "showOnChar": "封技" + "showOnChar": "封技", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 4, @@ -57,7 +66,10 @@ "dotOrHot": 0, "img": 45, "info": "激怒状态描述文字", - "showOnChar": "激怒" + "showOnChar": "激怒", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 5, @@ -72,7 +84,10 @@ "dotOrHot": 0, "img": 19, "info": "护盾状态描述文字", - "showOnChar": "护盾" + "showOnChar": "护盾", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 6, @@ -87,7 +102,10 @@ "dotOrHot": 0, "img": 14, "info": "共享状态描述文字", - "showOnChar": "共享" + "showOnChar": "共享", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 7, @@ -102,7 +120,10 @@ "dotOrHot": 0, "img": 32, "info": "定身状态描述文字", - "showOnChar": "定身" + "showOnChar": "定身", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 8, @@ -117,7 +138,10 @@ "dotOrHot": 0, "img": 1, "info": "昏迷状态描述文字", - "showOnChar": "昏迷" + "showOnChar": "昏迷", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 9, @@ -132,7 +156,10 @@ "dotOrHot": 0, "img": 1, "info": "共杀状态描述文字", - "showOnChar": "共杀" + "showOnChar": "共杀", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 10, @@ -147,7 +174,10 @@ "dotOrHot": 0, "img": 1, "info": "遏制状态描述文字", - "showOnChar": "遏制" + "showOnChar": "遏制", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 11, @@ -162,7 +192,10 @@ "dotOrHot": 0, "img": 1, "info": "睡眠状态描述文字", - "showOnChar": "睡眠" + "showOnChar": "睡眠", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 12, @@ -177,7 +210,10 @@ "dotOrHot": 0, "img": 1, "info": "免疫技能状态描述文字", - "showOnChar": "免疫技能" + "showOnChar": "免疫技能", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 13, @@ -192,7 +228,10 @@ "dotOrHot": 1, "img": 1, "info": "每回合造成25%策攻的中毒伤害", - "showOnChar": "中毒" + "showOnChar": "中毒", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 14, @@ -207,7 +246,10 @@ "dotOrHot": 1, "img": 1, "info": "燃烧状态描述文字", - "showOnChar": "燃烧" + "showOnChar": "燃烧", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 15, @@ -222,7 +264,10 @@ "dotOrHot": 1, "img": 1, "info": "流血状态描述文字", - "showOnChar": "流血" + "showOnChar": "流血", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 16, @@ -237,7 +282,10 @@ "dotOrHot": 0, "img": 1, "info": "致死状态描述文字", - "showOnChar": "致死" + "showOnChar": "致死", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 17, @@ -252,7 +300,10 @@ "dotOrHot": 0, "img": 8, "info": "物攻上升 状态描述文字", - "showOnChar": "物攻↑" + "showOnChar": "物攻↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 18, @@ -267,7 +318,10 @@ "dotOrHot": 0, "img": 7, "info": "物攻下降状态描述文字", - "showOnChar": "物攻↓" + "showOnChar": "物攻↓", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 19, @@ -282,7 +336,10 @@ "dotOrHot": 0, "img": 8, "info": "策攻上升 状态描述文字", - "showOnChar": "策攻↑" + "showOnChar": "策攻↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 20, @@ -297,7 +354,10 @@ "dotOrHot": 0, "img": 7, "info": "策攻下降状态描述文字", - "showOnChar": "策攻↓" + "showOnChar": "策攻↓", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 21, @@ -312,7 +372,10 @@ "dotOrHot": 0, "img": 8, "info": "物防上升 状态描述文字", - "showOnChar": "物防↑" + "showOnChar": "物防↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 22, @@ -327,7 +390,10 @@ "dotOrHot": 0, "img": 7, "info": "物防下降状态描述文字", - "showOnChar": "物防↓" + "showOnChar": "物防↓", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 23, @@ -342,7 +408,10 @@ "dotOrHot": 0, "img": 8, "info": "策防上升 状态描述文字", - "showOnChar": "策防↑" + "showOnChar": "策防↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 24, @@ -357,7 +426,10 @@ "dotOrHot": 0, "img": 7, "info": "策防下降状态描述文字", - "showOnChar": "策防↓" + "showOnChar": "策防↓", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 25, @@ -372,7 +444,10 @@ "dotOrHot": 0, "img": 8, "info": "敏捷上升 状态描述文字", - "showOnChar": "敏捷↑" + "showOnChar": "敏捷↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 26, @@ -387,7 +462,10 @@ "dotOrHot": 0, "img": 7, "info": "敏捷下降20%", - "showOnChar": "敏捷↓" + "showOnChar": "敏捷↓", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 27, @@ -402,7 +480,10 @@ "dotOrHot": 0, "img": 8, "info": "幸运上升20%", - "showOnChar": "幸运↑" + "showOnChar": "幸运↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 28, @@ -417,7 +498,10 @@ "dotOrHot": 0, "img": 7, "info": "幸运下降状态描述文字", - "showOnChar": "幸运↓" + "showOnChar": "幸运↓", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 29, @@ -432,7 +516,10 @@ "dotOrHot": 0, "img": 8, "info": "命中上升 状态描述文字", - "showOnChar": "命中↑" + "showOnChar": "命中↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 30, @@ -447,7 +534,10 @@ "dotOrHot": 0, "img": 7, "info": "命中下降状态描述文字", - "showOnChar": "命中↓" + "showOnChar": "命中↓", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 31, @@ -462,7 +552,10 @@ "dotOrHot": 0, "img": 8, "info": "暴击上升 状态描述文字", - "showOnChar": "暴击↑" + "showOnChar": "暴击↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 32, @@ -477,7 +570,10 @@ "dotOrHot": 0, "img": 7, "info": "暴击下降状态描述文字", - "showOnChar": "暴击↓" + "showOnChar": "暴击↓", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 33, @@ -492,7 +588,10 @@ "dotOrHot": 0, "img": 8, "info": "格挡上升 状态描述文字", - "showOnChar": "格挡↑" + "showOnChar": "格挡↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 34, @@ -507,7 +606,10 @@ "dotOrHot": 0, "img": 7, "info": "格挡下降状态描述文字", - "showOnChar": "格挡↓" + "showOnChar": "格挡↓", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 35, @@ -522,7 +624,10 @@ "dotOrHot": 0, "img": 8, "info": "抗暴上升 状态描述文字", - "showOnChar": "抗暴↑" + "showOnChar": "抗暴↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 36, @@ -537,7 +642,10 @@ "dotOrHot": 0, "img": 7, "info": "抗暴下降状态描述文字", - "showOnChar": "抗暴↓" + "showOnChar": "抗暴↓", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 37, @@ -552,7 +660,10 @@ "dotOrHot": 0, "img": 8, "info": "伤害加深上升 状态描述文字", - "showOnChar": "增伤↑" + "showOnChar": "增伤↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 38, @@ -567,7 +678,10 @@ "dotOrHot": 0, "img": 7, "info": "伤害加深下降状态描述文字", - "showOnChar": "增伤↓" + "showOnChar": "增伤↓", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 39, @@ -582,7 +696,10 @@ "dotOrHot": 0, "img": 8, "info": "伤害加深上升 状态描述文字", - "showOnChar": "增伤↑" + "showOnChar": "增伤↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 40, @@ -597,7 +714,10 @@ "dotOrHot": 0, "img": 7, "info": "伤害减免下降状态描述文字", - "showOnChar": "减伤↓" + "showOnChar": "减伤↓", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 41, @@ -612,7 +732,10 @@ "dotOrHot": 0, "img": 8, "info": "忽视防御上升 状态描述文字", - "showOnChar": "忽视防御" + "showOnChar": "忽视防御", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 42, @@ -627,7 +750,10 @@ "dotOrHot": 0, "img": 1, "info": "吸血上升 状态描述文字", - "showOnChar": "吸血↑" + "showOnChar": "吸血↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 43, @@ -642,7 +768,10 @@ "dotOrHot": 0, "img": 8, "info": "物理伤害加深上升 状态描述文字", - "showOnChar": "增伤↑" + "showOnChar": "增伤↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 44, @@ -657,7 +786,10 @@ "dotOrHot": 0, "img": 7, "info": "攻击时，物理伤害加深下降25%", - "showOnChar": "增伤↓" + "showOnChar": "增伤↓", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 45, @@ -672,7 +804,10 @@ "dotOrHot": 0, "img": 8, "info": "策略伤害加深上升 状态描述文字", - "showOnChar": "增伤↑" + "showOnChar": "增伤↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 46, @@ -687,7 +822,10 @@ "dotOrHot": 0, "img": 3, "info": "策略伤害加深降低10%", - "showOnChar": "增伤↓" + "showOnChar": "增伤↓", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 47, @@ -702,7 +840,10 @@ "dotOrHot": 0, "img": 5, "info": "灵质Ⅳ状态描述文字", - "showOnChar": "灵质Ⅳ" + "showOnChar": "灵质Ⅳ", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 48, @@ -717,7 +858,10 @@ "dotOrHot": 0, "img": 19, "info": "护盾（攻击百分比）状态描述文字", - "showOnChar": "护盾" + "showOnChar": "护盾", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 49, @@ -732,7 +876,10 @@ "dotOrHot": 0, "img": 8, "info": "物防上升 状态描述文字", - "showOnChar": "物防↑" + "showOnChar": "物防↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 50, @@ -747,7 +894,10 @@ "dotOrHot": 0, "img": 16, "info": "白面怪（提升攻击，双防）状态描述文字", - "showOnChar": "白面怪" + "showOnChar": "白面怪", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 51, @@ -762,7 +912,10 @@ "dotOrHot": 0, "img": 5, "info": "两栖作战状态描述文字", - "showOnChar": "两栖作战" + "showOnChar": "两栖作战", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 52, @@ -777,7 +930,10 @@ "dotOrHot": 0, "img": 19, "info": "可以抵消自身生命10%伤害的护盾", - "showOnChar": "护盾" + "showOnChar": "护盾", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 53, @@ -792,7 +948,10 @@ "dotOrHot": 0, "img": 8, "info": "物攻上升 状态描述文字", - "showOnChar": "物攻↑" + "showOnChar": "物攻↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 54, @@ -807,7 +966,10 @@ "dotOrHot": 0, "img": 18, "info": "蓄势状态描述文字", - "showOnChar": "蓄势" + "showOnChar": "蓄势", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 55, @@ -822,7 +984,10 @@ "dotOrHot": 0, "img": 8, "info": "伤害减免增加20%", - "showOnChar": "减伤↑" + "showOnChar": "减伤↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 56, @@ -837,7 +1002,10 @@ "dotOrHot": 0, "img": 7, "info": "物理伤害减免下降状态描述文字", - "showOnChar": "减伤↓" + "showOnChar": "减伤↓", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 57, @@ -852,7 +1020,10 @@ "dotOrHot": 0, "img": 7, "info": "策略伤害减免上升20%", - "showOnChar": "减伤↑" + "showOnChar": "减伤↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 58, @@ -867,7 +1038,10 @@ "dotOrHot": 0, "img": 7, "info": "策略伤害减免下降状态描述文字", - "showOnChar": "减伤↓" + "showOnChar": "减伤↓", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 59, @@ -882,7 +1056,10 @@ "dotOrHot": 0, "img": 5, "info": "灵质Ⅰ状态描述文字", - "showOnChar": "灵质Ⅰ" + "showOnChar": "灵质Ⅰ", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 60, @@ -897,7 +1074,10 @@ "dotOrHot": 0, "img": 5, "info": "灵质Ⅱ状态描述文字", - "showOnChar": "灵质Ⅱ" + "showOnChar": "灵质Ⅱ", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 61, @@ -912,7 +1092,10 @@ "dotOrHot": 0, "img": 5, "info": "灵质Ⅲ状态描述文字", - "showOnChar": "灵质Ⅲ" + "showOnChar": "灵质Ⅲ", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 62, @@ -927,7 +1110,10 @@ "dotOrHot": 0, "img": 8, "info": "伤害减免上升10%", - "showOnChar": "减伤↑" + "showOnChar": "减伤↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 63, @@ -942,7 +1128,10 @@ "dotOrHot": 0, "img": 19, "info": "护盾（溢出治疗量）状态描述文字", - "showOnChar": "护盾" + "showOnChar": "护盾", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 64, @@ -957,7 +1146,10 @@ "dotOrHot": 0, "img": 19, "info": "可以抵消自身攻击30%伤害的护盾", - "showOnChar": "护盾" + "showOnChar": "护盾", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 65, @@ -972,7 +1164,10 @@ "dotOrHot": 0, "img": 44, "info": "回春状态描述文字", - "showOnChar": "回春" + "showOnChar": "回春", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 66, @@ -987,7 +1182,10 @@ "dotOrHot": 0, "img": 3, "info": "策略伤害加深降低20%", - "showOnChar": "增伤↓" + "showOnChar": "增伤↓", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 67, @@ -1002,7 +1200,10 @@ "dotOrHot": 0, "img": 7, "info": "策略伤害减免上升30%", - "showOnChar": "减伤↑" + "showOnChar": "减伤↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 68, @@ -1017,7 +1218,10 @@ "dotOrHot": 0, "img": 8, "info": "伤害减免增加30%", - "showOnChar": "减伤↑" + "showOnChar": "减伤↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 69, @@ -1032,7 +1236,10 @@ "dotOrHot": 0, "img": 19, "info": "可以抵消自身生命20%伤害的护盾", - "showOnChar": "护盾" + "showOnChar": "护盾", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 70, @@ -1047,7 +1254,10 @@ "dotOrHot": 0, "img": 19, "info": "可以抵消自身生命30%伤害的护盾", - "showOnChar": "护盾" + "showOnChar": "护盾", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 71, @@ -1062,7 +1272,10 @@ "dotOrHot": 0, "img": 7, "info": "攻击时，物理伤害加深下降30%", - "showOnChar": "增伤↓" + "showOnChar": "增伤↓", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 72, @@ -1077,7 +1290,10 @@ "dotOrHot": 0, "img": 8, "info": "幸运上升30%", - "showOnChar": "幸运↑" + "showOnChar": "幸运↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 73, @@ -1092,7 +1308,10 @@ "dotOrHot": 1, "img": 1, "info": "每回合造成30%策攻的中毒伤害", - "showOnChar": "中毒" + "showOnChar": "中毒", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 74, @@ -1107,7 +1326,10 @@ "dotOrHot": 0, "img": 7, "info": "敏捷下降25%", - "showOnChar": "敏捷↓" + "showOnChar": "敏捷↓", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 }, { "buffId": 75, @@ -1122,6 +1344,45 @@ "dotOrHot": 0, "img": 8, "info": "伤害减免上升15%", - "showOnChar": "减伤↑" + "showOnChar": "减伤↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 + }, + { + "buffId": 76, + "type": 123, + "name": "分担伤害", + "maxOlyNum": 1, + "round": 1, + "times": 1, + "cover": 1, + "buffOrDebuff": 0, + "gainvalue": "30&", + "dotOrHot": 0, + "img": 8, + "info": "分担伤害30%", + "showOnChar": "减伤↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 + }, + { + "buffId": 77, + "type": 123, + "name": "分担伤害", + "maxOlyNum": 1, + "round": 2, + "times": 1, + "cover": 1, + "buffOrDebuff": 0, + "gainvalue": "30&", + "dotOrHot": 0, + "img": 8, + "info": "分担伤害30%", + "showOnChar": "减伤↑", + "tipImageName": "chaofeng", + "spineName": "chaofeng", + "actionPosition": 0 } ] \ No newline at end of file diff --git a/shared/resource/jsons/dic_zyz_strings.json b/shared/resource/jsons/dic_zyz_strings.json index c49a118b7..186b6586d 100644 --- a/shared/resource/jsons/dic_zyz_strings.json +++ b/shared/resource/jsons/dic_zyz_strings.json @@ -13,5 +13,15 @@ "id": 3, "string": "这里写上远征玩法说明", "tip": "远征说明" + }, + { + "id": 4, + "string": "这里写PVP玩法说明", + "tip": "PVP说明" + }, + { + "id": 5, + "string": "战场特殊机制\r\n不同地图胜利条件不同\r\n防守方先手\r\n开场双方即血量翻倍\r\n敌军初始怒气值+50\r\n第6回合开始怒气值回复速度翻倍\r\n第9、10回合全体攻击提升100%", + "tip": "PVP战场规则" } ] \ No newline at end of file diff --git a/shared/resource/jsons/dic_zyz_suit.json b/shared/resource/jsons/dic_zyz_suit.json index 86d579555..fb7b36de9 100644 --- a/shared/resource/jsons/dic_zyz_suit.json +++ b/shared/resource/jsons/dic_zyz_suit.json @@ -1,163 +1,226 @@ [ { "id": 1, - "name": "初级防御套装", + "name": "忠武", "totalCount": 6, "effect": "2&1553|4&1536|6&1104", - "tireInfo": "25&225&625&2025&3025&4025&5025&6025" + "tireInfo": "25&225&625&2025&3025&4025&5025&6025", + "attribute": 1 }, { "id": 2, - "name": "初级攻击套装", + "name": "定武", "totalCount": 6, "effect": "2&1553|4&1536|6&1104", - "tireInfo": "125&325&425&2125&3125&4125&5125&6125" + "tireInfo": "125&325&425&2125&3125&4125&5125&6125", + "attribute": 1 }, { "id": 3, - "name": "初级机能套装", + "name": "乱武", "totalCount": 6, "effect": "2&1553|4&1536|6&1104", - "tireInfo": "525&725&2225&3225&4225&5225&6225" + "tireInfo": "525&725&2225&3225&4225&5225&6225", + "attribute": 1 }, { "id": 4, - "name": "起始级防御套装", + "name": "振威", "totalCount": 6, "effect": "2&1553|4&1536|6&1104", - "tireInfo": "26&226&626&2026&3026&4026&6026&6026" + "tireInfo": "26&226&626&2026&3026&4026&6026&6026", + "attribute": 1 }, { "id": 5, - "name": "起始级攻击套装", + "name": "扬威", "totalCount": 6, "effect": "2&1553|4&1536|6&1104", - "tireInfo": "126&326&426&2126&3126&4126&5126&6126" + "tireInfo": "126&326&426&2126&3126&4126&5126&6126", + "attribute": 1 }, { "id": 6, - "name": "起始级机能套装", + "name": "建威", "totalCount": 6, "effect": "2&1553|4&1536|6&1104", - "tireInfo": "526&726&2226&3226&4226&5226&6226" + "tireInfo": "526&726&2226&3226&4226&5226&6226", + "attribute": 1 }, { "id": 7, - "name": "中级防御套装", + "name": "翊军", "totalCount": 6, "effect": "2&1553|4&1536|6&1104", - "tireInfo": "27&227&627&2027&3027&4027&5027&6027" + "tireInfo": "27&227&627&2027&3027&4027&5027&6027", + "attribute": 1 }, { "id": 8, - "name": "中级攻击套装", + "name": "破虏", "totalCount": 6, "effect": "2&1553|4&1536|6&1104", - "tireInfo": "127&327&427&2127&3127&4127&5127&6127" + "tireInfo": "127&327&427&2127&3127&4127&5127&6127", + "attribute": 1 }, { "id": 9, - "name": "中级机能套装", + "name": "鹰扬", "totalCount": 6, "effect": "2&1553|4&1536|6&1104", - "tireInfo": "527&727&2227&3227&4227&5227&6227" + "tireInfo": "527&727&2227&3227&4227&5227&6227", + "attribute": 1 }, { "id": 10, - "name": "高级防御套装", + "name": "镇军慑敌", "totalCount": 6, "effect": "2&1553|4&1536|6&1104", - "tireInfo": "28&228&628&2028&3028&4028&5028&6028" + "tireInfo": "28&228&628&2028&3028&4028&5028&6028", + "attribute": 1 }, { "id": 11, - "name": "高级攻击套装", + "name": "破军斩将", "totalCount": 6, "effect": "2&1553|4&1536|6&1104", - "tireInfo": "128&328&428&2128&3128&4128&5128&6128" + "tireInfo": "128&328&428&2128&3128&4128&5128&6128", + "attribute": 1 }, { "id": 12, - "name": "高级机能套装", + "name": "护军平难", "totalCount": 6, "effect": "2&1553|4&1536|6&1104", - "tireInfo": "528&728&2228&3228&4228&5228&6228" + "tireInfo": "528&728&2228&3228&4228&5228&6228", + "attribute": 1 }, { "id": 13, - "name": "精良防御套装", + "name": "镇国无忧", "totalCount": 6, "effect": "2&1553|4&1536|6&1104", - "tireInfo": "29&229&629&2029&3029&4029&5029&6029" + "tireInfo": "29&229&629&2029&3029&4029&5029&6029", + "attribute": 1 }, { "id": 14, - "name": "精良攻击套装", + "name": "灭国破军", "totalCount": 6, "effect": "2&1553|4&1536|6&1104", - "tireInfo": "129&329&429&2129&3129&4129&5129&6129" + "tireInfo": "129&329&429&2129&3129&4129&5129&6129", + "attribute": 1 }, { "id": 15, - "name": "精良机能套装", + "name": "辅国定策", "totalCount": 6, "effect": "2&1553|4&1536|6&1104", - "tireInfo": "529&729&2229&3229&4229&5229&6229" + "tireInfo": "529&729&2229&3229&4229&5229&6229", + "attribute": 1 }, { "id": 16, - "name": "特级禁卫套装", + "name": "光寒九州", "totalCount": 6, "effect": "2&1553|4&1536|6&1104", - "tireInfo": "30&2030&3030&4030&5030&6030" + "tireInfo": "30&2030&3030&4030&5030&6030", + "attribute": 2 }, { "id": 17, - "name": "特级羽林套装", + "name": "枪出如龙", "totalCount": 6, "effect": "2&1553|4&1536|6&1104", - "tireInfo": "130&2130&3130&4130&5130&6130" + "tireInfo": "130&2130&3130&4130&5130&6130", + "attribute": 2 }, { "id": 18, - "name": "特级神射手套装", + "name": "羿射九日", "totalCount": 6, "effect": "2&1553|4&1536|6&1104", - "tireInfo": "330&2230&3230&4230&5230&6230" + "tireInfo": "330&2230&3230&4230&5230&6230", + "attribute": 2 }, { "id": 19, - "name": "特级铁骑套装", + "name": "龙骑无双", "totalCount": 6, "effect": "2&1553|4&1536|6&1104", - "tireInfo": "230&2030&3030&4030&5030&6030" + "tireInfo": "230&2030&3030&4030&5030&6030", + "attribute": 2 }, { "id": 20, - "name": "特级宗师套装", + "name": "侠之大者", "totalCount": 6, "effect": "2&1553|4&1536|6&1104", - "tireInfo": "630&2130&3130&4130&5130&6130" + "tireInfo": "630&2130&3130&4130&5130&6130", + "attribute": 2 }, { "id": 21, - "name": "特级谋主套装", + "name": "多智近妖", "totalCount": 6, "effect": "2&1553|4&1536|6&1104", - "tireInfo": "530&2230&3230&4230&5230&6230" + "tireInfo": "530&2230&3230&4230&5230&6230", + "attribute": 2 }, { "id": 22, - "name": "特级道尊套装", + "name": "乾坤无极", "totalCount": 6, "effect": "2&1553|4&1536|6&1104", - "tireInfo": "430&2130&3130&4130&5130&6130" + "tireInfo": "430&2130&3130&4130&5130&6130", + "attribute": 2 }, { "id": 23, - "name": "特级医圣套装", + "name": "起死回生", "totalCount": 6, "effect": "2&1553|4&1536|6&1104", - "tireInfo": "730&2230&3230&4230&5230&6230" + "tireInfo": "730&2230&3230&4230&5230&6230", + "attribute": 2 + }, + { + "id": 24, + "name": "永固山河", + "totalCount": 6, + "effect": "2&1553|4&1536|6&1104", + "tireInfo": "&", + "attribute": 3 + }, + { + "id": 25, + "name": "平沙望月", + "totalCount": 6, + "effect": "2&1553|4&1536|6&1104", + "tireInfo": "&", + "attribute": 3 + }, + { + "id": 26, + "name": "千叶长生", + "totalCount": 6, + "effect": "2&1553|4&1536|6&1104", + "tireInfo": "&", + "attribute": 3 + }, + { + "id": 27, + "name": "鹤鸣九天", + "totalCount": 6, + "effect": "2&1553|4&1536|6&1104", + "tireInfo": "&", + "attribute": 3 + }, + { + "id": 28, + "name": "一将功成", + "totalCount": 6, + "effect": "2&1553|4&1536|6&1104", + "tireInfo": "&", + "attribute": 3 } ] \ No newline at end of file diff --git a/shared/resource/jsons/dic_zyz_xunbao.json b/shared/resource/jsons/dic_zyz_xunbao.json index 26da9770e..4bc5e4a15 100644 --- a/shared/resource/jsons/dic_zyz_xunbao.json +++ b/shared/resource/jsons/dic_zyz_xunbao.json @@ -2,31 +2,25 @@ { "quality": 1, "name": "良品", - "assistanceTime": 4, - "assistanceLevel": 20 + "assistanceTime": 5, + "assistanceLevel": 0 }, { "quality": 2, "name": "精品", "assistanceTime": 3, - "assistanceLevel": 20 + "assistanceLevel": 0 }, { "quality": 3, "name": "珍品", "assistanceTime": 2, - "assistanceLevel": 40 + "assistanceLevel": 0 }, { "quality": 4, "name": "圣品", - "assistanceTime": 1, - "assistanceLevel": 60 - }, - { - "quality": 5, - "name": "神品", - "assistanceTime": 1, - "assistanceLevel": 80 + "assistanceTime": 5, + "assistanceLevel": 0 } ] \ No newline at end of file