diff --git a/game-server/app/servers/connector/remote/connectorRemote.ts b/game-server/app/servers/connector/remote/connectorRemote.ts index 24202618c..4f6acfe70 100644 --- a/game-server/app/servers/connector/remote/connectorRemote.ts +++ b/game-server/app/servers/connector/remote/connectorRemote.ts @@ -5,10 +5,11 @@ import { reloadResources } from '../../../pubUtils/data'; import { UserGuildType } from '../../../db/UserGuild'; import { kickUser } from '../../../services/connectorService'; import { PVPConfigModel, PVPConfigType } from '../../../db/SystemConfig'; -import { setDicAuctionTime } from '../../../services/guildActivity/guildActivityService'; +import { setDicAuctionTime, setDicGuildActivity } from '../../../services/guildActivity/guildActivityService'; import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService'; import { taflush } from '../../../services/sdkService'; import { errlogger } from '../../../util/logger'; +import { setWeek } from '../../../pubUtils/timeUtil'; export default function (app: Application) { new HandlerService(app, {}); return new ConnectorRemote(app); @@ -140,4 +141,26 @@ export class ConnectorRemote { errlogger.error(`remote ${__filename} \n ${e.stack}`); } } + + async setDay(week: number) { + try { + setWeek(week); + } catch(e) { + errlogger.error(`remote ${__filename} \n ${e.stack}`); + } + } + + /** + * 改变字典表中的军团活动开始时间&持续时间 + * @param {number} aid 活动 + * @param {number} startSeconds 从现在开始几秒后开启活动 + * @param {number} endSeconds 从开始之后几秒后结束活动 + */ + public async setDicGuildActivity(now: number, aid: number, startSeconds: number, endSeconds: number) { + try { + setDicGuildActivity(now, aid, startSeconds, endSeconds); + } catch(e) { + errlogger.error(`remote ${__filename} \n ${e.stack}`); + } + } } diff --git a/game-server/app/servers/gm/handler/gmHandler.ts b/game-server/app/servers/gm/handler/gmHandler.ts index 78249afc2..205cfec04 100644 --- a/game-server/app/servers/gm/handler/gmHandler.ts +++ b/game-server/app/servers/gm/handler/gmHandler.ts @@ -333,11 +333,13 @@ export class GmHandler { let startTimes = await pinus.app.rpc.guild.guildActivityRemote.setDicGuildActivity.broadcast(now.getTime(), aid, startActivity, endActivity); await pinus.app.rpc.systimer.systimerRemote.setDicGuildActivity.broadcast(now.getTime(), aid, startActivity, endActivity); + await pinus.app.rpc.connector.connectorRemote.setDicGuildActivity.broadcast(now.getTime(), aid, startActivity, endActivity); await pinus.app.rpc.guild.guildActivityRemote.setDicAuctionTime.broadcast(startTimes[0], endActivity, startGuildAuction, endGuildAuction, startWorldAuction, endWorldAuction); await pinus.app.rpc.connector.connectorRemote.setDicAuctionTime.broadcast(startTimes[0], endActivity, startGuildAuction, endGuildAuction, startWorldAuction, endWorldAuction); await pinus.app.rpc.systimer.systimerRemote.setDicAuctionTime.broadcast(startTimes[0], endActivity, startGuildAuction, endGuildAuction, startWorldAuction, endWorldAuction); await pinus.app.rpc.guild.guildActivityRemote.setDay.broadcast(day); await pinus.app.rpc.systimer.systimerRemote.setDay.broadcast(day); + await pinus.app.rpc.connector.connectorRemote.setDay.broadcast(day); await pinus.app.rpc.guild.guildActivityRemote.guildActivityEnd.broadcast(aid); // 清空旧数据 @@ -383,6 +385,7 @@ export class GmHandler { await pinus.app.rpc.systimer.systimerRemote.reloadResources.broadcast(); await pinus.app.rpc.guild.guildActivityRemote.setDay.broadcast(now.getDay()); await pinus.app.rpc.systimer.systimerRemote.setDay.broadcast(now.getDay()); + await pinus.app.rpc.connector.connectorRemote.setDay.broadcast(now.getDay()); // 开启定时器 await pinus.app.rpc.systimer.systimerRemote.setAuctionSchedule.broadcast(); diff --git a/game-server/app/services/connectorService.ts b/game-server/app/services/connectorService.ts index d715edd05..7f61e0634 100644 --- a/game-server/app/services/connectorService.ts +++ b/game-server/app/services/connectorService.ts @@ -25,7 +25,6 @@ import { addRoleToGuildChannel } from './chatChannelService'; import { getMyGuildInfo, getGuildWithRefActive, getUserGuildWithRefActive, getWishPool, getInvitationList } from './guildService'; import { getAuction } from './auctionService'; import { getGuildTrainInstance, getTrainBoxRewardsResult } from './guildTrainService'; -import { BossInstanceModel } from '../db/BossInstance'; import { getBossInstanceInfo } from './guildBossService'; import { getEvent } from './eventSercive'; import { getBattleListOfMain, getMainChapter } from './normalBattleService'; @@ -201,7 +200,7 @@ export async function getModuleData(type: string, data: { role: RoleType, sessio case 'battle': return await getBattleListOfMain(role); case 'guildActivity': - return getAllGuildActivityStatus(); + return getAllGuildActivityStatus(role.guildCode, role.serverId); case 'chapter': return getMainChapter(role); case 'survey': diff --git a/game-server/app/services/guildActivity/guildActivityService.ts b/game-server/app/services/guildActivity/guildActivityService.ts index e54063105..dbc379052 100644 --- a/game-server/app/services/guildActivity/guildActivityService.ts +++ b/game-server/app/services/guildActivity/guildActivityService.ts @@ -107,12 +107,17 @@ export function getGuildActivityStatus(id: number) { return getGuildActivityByDic(dicGuildActivity); } -export function getAllGuildActivityStatus() { - let guildActivities: { aid: number, status: number, time: number, isOpen: boolean }[] = []; - gameData.guildActivity.forEach((dicGuildActivity, aid) => { +export async function getAllGuildActivityStatus(guildCode: string, serverId: number) { + let guildActivities: { aid: number, status: number, time: number, isOpen: boolean, isCompleted?: boolean }[] = []; + for(let [ aid, dicGuildActivity ] of gameData.guildActivity) { let res = getGuildActivityByDic(dicGuildActivity); - guildActivities.push({aid ,...res}); - }); + let isCompleted = res.isOpen; + if(res.status == GUILD_ACTIVITY_STATUS.START && guildCode) { + let guildActivityRec = await GuildActivityRecordModel.getRecord(guildCode, serverId, aid); + if(guildActivityRec) isCompleted = guildActivityRec.isCompleted; + } + guildActivities.push({aid, ...res, isCompleted}); + } return guildActivities; } @@ -342,7 +347,11 @@ export async function sendEndMsgToAllServer() { } export async function sendGuildActivityStatus(serverId: number) { - let guildActivities = getAllGuildActivityStatus(); + let guildActivities: { aid: number, status: number, time: number, isOpen: boolean }[] = []; + gameData.guildActivity.forEach((dicGuildActivity, aid) => { + let res = getGuildActivityByDic(dicGuildActivity); + guildActivities.push({aid ,...res}); + }); await sendMessageToServerWithSuc(serverId, PUSH_ROUTE.GUILD_ACTIVITY_STATUS, { guildActivities }); } diff --git a/shared/resource/jsons/dic_zyz_hero_talent.json b/shared/resource/jsons/dic_zyz_hero_talent.json index 815298405..bf49f8701 100644 --- a/shared/resource/jsons/dic_zyz_hero_talent.json +++ b/shared/resource/jsons/dic_zyz_hero_talent.json @@ -24,7 +24,7 @@ "name": "生命(5)", "levelCount": 5, "levelSeid": "1000001011&1000001021&1000001031&1000001041&1000001051", - "levelConsume": "2&2&2&2&2", + "levelConsume": "1&1&1&1&1", "prepositionId": "1&", "preTotalPoint": 0, "preSinglePoint": 0, @@ -42,8 +42,8 @@ "levelSeid": "1010301011&", "levelConsume": "1&", "prepositionId": "2&", - "preTotalPoint": 8, - "preSinglePoint": 8, + "preTotalPoint": 4, + "preSinglePoint": 4, "bgName": "bubing", "iconSize": 1 }, @@ -58,8 +58,8 @@ "levelSeid": "1010302011&", "levelConsume": "1&", "prepositionId": "2&", - "preTotalPoint": 8, - "preSinglePoint": 8, + "preTotalPoint": 4, + "preSinglePoint": 4, "bgName": "bubing", "iconSize": 1 }, @@ -74,8 +74,8 @@ "levelSeid": "1010303011&", "levelConsume": "1&", "prepositionId": "2&", - "preTotalPoint": 8, - "preSinglePoint": 8, + "preTotalPoint": 4, + "preSinglePoint": 4, "bgName": "bubing", "iconSize": 1 }, @@ -88,9 +88,9 @@ "name": "物防(5)", "levelCount": 5, "levelSeid": "1000004011&1000004021&1000004031&1000004041&1000004051", - "levelConsume": "2&2&2&2&2", + "levelConsume": "1&1&1&1&1", "prepositionId": "3|4|5", - "preTotalPoint": 9, + "preTotalPoint": 5, "preSinglePoint": 1, "bgName": "bubing", "iconSize": 1 @@ -106,8 +106,8 @@ "levelSeid": "1010501011&", "levelConsume": "1&", "prepositionId": "6&", - "preTotalPoint": 19, - "preSinglePoint": 8, + "preTotalPoint": 10, + "preSinglePoint": 4, "bgName": "bubing", "iconSize": 2 }, @@ -122,8 +122,8 @@ "levelSeid": "1010502011&", "levelConsume": "1&", "prepositionId": "6&", - "preTotalPoint": 19, - "preSinglePoint": 8, + "preTotalPoint": 10, + "preSinglePoint": 4, "bgName": "bubing", "iconSize": 2 }, @@ -138,8 +138,8 @@ "levelSeid": "1010503011&", "levelConsume": "1&", "prepositionId": "6&", - "preTotalPoint": 19, - "preSinglePoint": 8, + "preTotalPoint": 10, + "preSinglePoint": 4, "bgName": "bubing", "iconSize": 2 }, @@ -152,9 +152,9 @@ "name": "策防(5)", "levelCount": 5, "levelSeid": "1000005011&1000005021&1000005031&1000005041&1000005051", - "levelConsume": "2&2&2&2&2", + "levelConsume": "1&1&1&1&1", "prepositionId": "7|8|9", - "preTotalPoint": 19, + "preTotalPoint": 11, "preSinglePoint": 1, "bgName": "bubing", "iconSize": 1 @@ -170,8 +170,8 @@ "levelSeid": "1000025011&1000025021&1000025031", "levelConsume": "1&1&1", "prepositionId": "10&", - "preTotalPoint": 29, - "preSinglePoint": 8, + "preTotalPoint": 16, + "preSinglePoint": 4, "bgName": "bubing", "iconSize": 1 }, @@ -186,8 +186,8 @@ "levelSeid": "1000012011&1000012021&1000012031", "levelConsume": "1&1&1", "prepositionId": "10&", - "preTotalPoint": 29, - "preSinglePoint": 8, + "preTotalPoint": 16, + "preSinglePoint": 4, "bgName": "bubing", "iconSize": 1 }, @@ -202,8 +202,8 @@ "levelSeid": "1000011011&1000011021&1000011031", "levelConsume": "1&1&1", "prepositionId": "10&", - "preTotalPoint": 29, - "preSinglePoint": 8, + "preTotalPoint": 16, + "preSinglePoint": 4, "bgName": "bubing", "iconSize": 1 }, @@ -218,7 +218,7 @@ "levelSeid": "1010801011&", "levelConsume": "1&", "prepositionId": "11&", - "preTotalPoint": 30, + "preTotalPoint": 22, "preSinglePoint": 3, "bgName": "bubing", "iconSize": 2 @@ -234,7 +234,7 @@ "levelSeid": "1010802011&", "levelConsume": "1&", "prepositionId": "12&", - "preTotalPoint": 30, + "preTotalPoint": 22, "preSinglePoint": 3, "bgName": "bubing", "iconSize": 2 @@ -250,7 +250,7 @@ "levelSeid": "1010803011&", "levelConsume": "1&", "prepositionId": "13&", - "preTotalPoint": 30, + "preTotalPoint": 22, "preSinglePoint": 3, "bgName": "bubing", "iconSize": 2 @@ -280,7 +280,7 @@ "name": "生命(5)", "levelCount": 5, "levelSeid": "1000001011&1000001021&1000001031&1000001041&1000001051", - "levelConsume": "2&2&2&2&2", + "levelConsume": "1&1&1&1&1", "prepositionId": "17&", "preTotalPoint": 0, "preSinglePoint": 0, @@ -298,8 +298,8 @@ "levelSeid": "1020301011&", "levelConsume": "1&", "prepositionId": "18&", - "preTotalPoint": 8, - "preSinglePoint": 8, + "preTotalPoint": 4, + "preSinglePoint": 4, "bgName": "qiangbing", "iconSize": 1 }, @@ -314,8 +314,8 @@ "levelSeid": "1020302011&", "levelConsume": "1&", "prepositionId": "18&", - "preTotalPoint": 8, - "preSinglePoint": 8, + "preTotalPoint": 4, + "preSinglePoint": 4, "bgName": "qiangbing", "iconSize": 1 }, @@ -330,8 +330,8 @@ "levelSeid": "1020303011&", "levelConsume": "1&", "prepositionId": "18&", - "preTotalPoint": 8, - "preSinglePoint": 8, + "preTotalPoint": 4, + "preSinglePoint": 4, "bgName": "qiangbing", "iconSize": 1 }, @@ -344,9 +344,9 @@ "name": "物防(5)", "levelCount": 5, "levelSeid": "1000004011&1000004021&1000004031&1000004041&1000004051", - "levelConsume": "2&2&2&2&2", + "levelConsume": "1&1&1&1&1", "prepositionId": "19|20|21", - "preTotalPoint": 9, + "preTotalPoint": 5, "preSinglePoint": 1, "bgName": "qiangbing", "iconSize": 1 @@ -362,8 +362,8 @@ "levelSeid": "1020501011&", "levelConsume": "1&", "prepositionId": "22&", - "preTotalPoint": 19, - "preSinglePoint": 8, + "preTotalPoint": 10, + "preSinglePoint": 4, "bgName": "qiangbing", "iconSize": 2 }, @@ -378,8 +378,8 @@ "levelSeid": "1020502011&", "levelConsume": "1&", "prepositionId": "22&", - "preTotalPoint": 19, - "preSinglePoint": 8, + "preTotalPoint": 10, + "preSinglePoint": 4, "bgName": "qiangbing", "iconSize": 2 }, @@ -394,8 +394,8 @@ "levelSeid": "1020503011&", "levelConsume": "1&", "prepositionId": "22&", - "preTotalPoint": 19, - "preSinglePoint": 8, + "preTotalPoint": 10, + "preSinglePoint": 4, "bgName": "qiangbing", "iconSize": 2 }, @@ -408,9 +408,9 @@ "name": "攻击(5)", "levelCount": 5, "levelSeid": "1000002011&1000002021&1000002031&1000002041&1000002051", - "levelConsume": "2&2&2&2&2", + "levelConsume": "1&1&1&1&1", "prepositionId": "23|24|25", - "preTotalPoint": 19, + "preTotalPoint": 11, "preSinglePoint": 1, "bgName": "qiangbing", "iconSize": 1 @@ -426,8 +426,8 @@ "levelSeid": "1000020011&1000020021&1000020031", "levelConsume": "1&1&1", "prepositionId": "26&", - "preTotalPoint": 29, - "preSinglePoint": 8, + "preTotalPoint": 16, + "preSinglePoint": 4, "bgName": "qiangbing", "iconSize": 1 }, @@ -442,8 +442,8 @@ "levelSeid": "1000022011&1000022021&1000022031", "levelConsume": "1&1&1", "prepositionId": "26&", - "preTotalPoint": 29, - "preSinglePoint": 8, + "preTotalPoint": 16, + "preSinglePoint": 4, "bgName": "qiangbing", "iconSize": 1 }, @@ -458,8 +458,8 @@ "levelSeid": "1000011011&1000011021&1000011031", "levelConsume": "1&1&1", "prepositionId": "26&", - "preTotalPoint": 29, - "preSinglePoint": 8, + "preTotalPoint": 16, + "preSinglePoint": 4, "bgName": "qiangbing", "iconSize": 1 }, @@ -474,7 +474,7 @@ "levelSeid": "1020801011&", "levelConsume": "1&", "prepositionId": "27&", - "preTotalPoint": 30, + "preTotalPoint": 22, "preSinglePoint": 3, "bgName": "qiangbing", "iconSize": 2 @@ -490,7 +490,7 @@ "levelSeid": "1020802011&", "levelConsume": "1&", "prepositionId": "28&", - "preTotalPoint": 30, + "preTotalPoint": 22, "preSinglePoint": 3, "bgName": "qiangbing", "iconSize": 2 @@ -506,7 +506,7 @@ "levelSeid": "1020803011&", "levelConsume": "1&", "prepositionId": "29&", - "preTotalPoint": 30, + "preTotalPoint": 22, "preSinglePoint": 3, "bgName": "qiangbing", "iconSize": 2 @@ -536,7 +536,7 @@ "name": "生命(5)", "levelCount": 5, "levelSeid": "1000001011&1000001021&1000001031&1000001041&1000001051", - "levelConsume": "2&2&2&2&2", + "levelConsume": "1&1&1&1&1", "prepositionId": "33&", "preTotalPoint": 0, "preSinglePoint": 0, @@ -554,8 +554,8 @@ "levelSeid": "1020301011&", "levelConsume": "1&", "prepositionId": "34&", - "preTotalPoint": 8, - "preSinglePoint": 8, + "preTotalPoint": 4, + "preSinglePoint": 4, "bgName": "qibing", "iconSize": 1 }, @@ -570,8 +570,8 @@ "levelSeid": "1030302011&", "levelConsume": "1&", "prepositionId": "34&", - "preTotalPoint": 8, - "preSinglePoint": 8, + "preTotalPoint": 4, + "preSinglePoint": 4, "bgName": "qibing", "iconSize": 1 }, @@ -586,8 +586,8 @@ "levelSeid": "1030303011&", "levelConsume": "1&", "prepositionId": "34&", - "preTotalPoint": 8, - "preSinglePoint": 8, + "preTotalPoint": 4, + "preSinglePoint": 4, "bgName": "qibing", "iconSize": 1 }, @@ -600,9 +600,9 @@ "name": "攻击(5)", "levelCount": 5, "levelSeid": "1000002011&1000002021&1000002031&1000002041&1000002051", - "levelConsume": "2&2&2&2&2", + "levelConsume": "1&1&1&1&1", "prepositionId": "35|36|37", - "preTotalPoint": 9, + "preTotalPoint": 5, "preSinglePoint": 1, "bgName": "qibing", "iconSize": 1 @@ -618,8 +618,8 @@ "levelSeid": "1030501011&", "levelConsume": "1&", "prepositionId": "38&", - "preTotalPoint": 19, - "preSinglePoint": 8, + "preTotalPoint": 10, + "preSinglePoint": 4, "bgName": "qibing", "iconSize": 2 }, @@ -634,8 +634,8 @@ "levelSeid": "1030502011&", "levelConsume": "1&", "prepositionId": "38&", - "preTotalPoint": 19, - "preSinglePoint": 8, + "preTotalPoint": 10, + "preSinglePoint": 4, "bgName": "qibing", "iconSize": 2 }, @@ -648,9 +648,9 @@ "name": "物防(5)", "levelCount": 5, "levelSeid": "1000004011&1000004021&1000004031&1000004041&1000004051", - "levelConsume": "2&2&2&2&2", + "levelConsume": "1&1&1&1&1", "prepositionId": "39|40", - "preTotalPoint": 19, + "preTotalPoint": 11, "preSinglePoint": 1, "bgName": "qibing", "iconSize": 1 @@ -666,8 +666,8 @@ "levelSeid": "1000012011&1000012021&1000012031", "levelConsume": "1&1&1", "prepositionId": "41&", - "preTotalPoint": 29, - "preSinglePoint": 8, + "preTotalPoint": 16, + "preSinglePoint": 4, "bgName": "qibing", "iconSize": 1 }, @@ -682,8 +682,8 @@ "levelSeid": "1000022011&1000022021&1000022031", "levelConsume": "1&1&1", "prepositionId": "41&", - "preTotalPoint": 29, - "preSinglePoint": 8, + "preTotalPoint": 16, + "preSinglePoint": 4, "bgName": "qibing", "iconSize": 1 }, @@ -698,8 +698,8 @@ "levelSeid": "1000020011&1000020021&1000020031", "levelConsume": "1&1&1", "prepositionId": "41&", - "preTotalPoint": 29, - "preSinglePoint": 8, + "preTotalPoint": 16, + "preSinglePoint": 4, "bgName": "qibing", "iconSize": 1 }, @@ -714,7 +714,7 @@ "levelSeid": "1030801011&", "levelConsume": "1&", "prepositionId": "42&", - "preTotalPoint": 30, + "preTotalPoint": 22, "preSinglePoint": 3, "bgName": "qibing", "iconSize": 2 @@ -730,7 +730,7 @@ "levelSeid": "1030802011&", "levelConsume": "1&", "prepositionId": "44&", - "preTotalPoint": 30, + "preTotalPoint": 22, "preSinglePoint": 3, "bgName": "qibing", "iconSize": 2 @@ -760,7 +760,7 @@ "name": "攻击(5)", "levelCount": 5, "levelSeid": "1000002011&1000002021&1000002031&1000002041&1000002051", - "levelConsume": "2&2&2&2&2", + "levelConsume": "1&1&1&1&1", "prepositionId": "47&", "preTotalPoint": 0, "preSinglePoint": 0, @@ -778,8 +778,8 @@ "levelSeid": "1040301011&", "levelConsume": "1&", "prepositionId": "48&", - "preTotalPoint": 8, - "preSinglePoint": 8, + "preTotalPoint": 4, + "preSinglePoint": 4, "bgName": "gongbing", "iconSize": 1 }, @@ -794,8 +794,8 @@ "levelSeid": "1040302011&", "levelConsume": "1&", "prepositionId": "48&", - "preTotalPoint": 8, - "preSinglePoint": 8, + "preTotalPoint": 4, + "preSinglePoint": 4, "bgName": "gongbing", "iconSize": 1 }, @@ -810,8 +810,8 @@ "levelSeid": "1040303011&", "levelConsume": "1&", "prepositionId": "48&", - "preTotalPoint": 8, - "preSinglePoint": 8, + "preTotalPoint": 4, + "preSinglePoint": 4, "bgName": "gongbing", "iconSize": 1 }, @@ -824,9 +824,9 @@ "name": "物防(5)", "levelCount": 5, "levelSeid": "1000004011&1000004021&1000004031&1000004041&1000004051", - "levelConsume": "2&2&2&2&2", + "levelConsume": "1&1&1&1&1", "prepositionId": "49|50|51", - "preTotalPoint": 9, + "preTotalPoint": 5, "preSinglePoint": 1, "bgName": "gongbing", "iconSize": 1 @@ -842,8 +842,8 @@ "levelSeid": "1040501011&", "levelConsume": "1&", "prepositionId": "52&", - "preTotalPoint": 19, - "preSinglePoint": 8, + "preTotalPoint": 10, + "preSinglePoint": 4, "bgName": "gongbing", "iconSize": 2 }, @@ -858,8 +858,8 @@ "levelSeid": "1040502011&", "levelConsume": "1&", "prepositionId": "52&", - "preTotalPoint": 19, - "preSinglePoint": 8, + "preTotalPoint": 10, + "preSinglePoint": 4, "bgName": "gongbing", "iconSize": 2 }, @@ -872,9 +872,9 @@ "name": "策防(5)", "levelCount": 5, "levelSeid": "1000005011&1000005021&1000005031&1000005041&1000005051", - "levelConsume": "2&2&2&2&2", + "levelConsume": "1&1&1&1&1", "prepositionId": "53|54", - "preTotalPoint": 19, + "preTotalPoint": 11, "preSinglePoint": 1, "bgName": "gongbing", "iconSize": 1 @@ -890,8 +890,8 @@ "levelSeid": "1000020011&1000020021&1000020031", "levelConsume": "1&1&1", "prepositionId": "55&", - "preTotalPoint": 29, - "preSinglePoint": 8, + "preTotalPoint": 16, + "preSinglePoint": 4, "bgName": "gongbing", "iconSize": 1 }, @@ -906,8 +906,8 @@ "levelSeid": "1000022011&1000022021&1000022031", "levelConsume": "1&1&1", "prepositionId": "55&", - "preTotalPoint": 29, - "preSinglePoint": 8, + "preTotalPoint": 16, + "preSinglePoint": 4, "bgName": "gongbing", "iconSize": 1 }, @@ -922,8 +922,8 @@ "levelSeid": "1000009011&1000009021&1000009031", "levelConsume": "1&1&1", "prepositionId": "55&", - "preTotalPoint": 29, - "preSinglePoint": 8, + "preTotalPoint": 16, + "preSinglePoint": 4, "bgName": "gongbing", "iconSize": 1 }, @@ -938,7 +938,7 @@ "levelSeid": "1040801011&", "levelConsume": "1&", "prepositionId": "56&", - "preTotalPoint": 30, + "preTotalPoint": 22, "preSinglePoint": 3, "bgName": "gongbing", "iconSize": 2 @@ -954,7 +954,7 @@ "levelSeid": "1040802011&", "levelConsume": "1&", "prepositionId": "58&", - "preTotalPoint": 30, + "preTotalPoint": 22, "preSinglePoint": 3, "bgName": "gongbing", "iconSize": 2 @@ -984,7 +984,7 @@ "name": "攻击(5)", "levelCount": 5, "levelSeid": "1000002011&1000002021&1000002031&1000002041&1000002051", - "levelConsume": "2&2&2&2&2", + "levelConsume": "1&1&1&1&1", "prepositionId": "61&", "preTotalPoint": 0, "preSinglePoint": 0, @@ -1002,8 +1002,8 @@ "levelSeid": "1050101011&", "levelConsume": "1&", "prepositionId": "62&", - "preTotalPoint": 8, - "preSinglePoint": 8, + "preTotalPoint": 4, + "preSinglePoint": 4, "bgName": "youxia", "iconSize": 1 }, @@ -1018,8 +1018,8 @@ "levelSeid": "1050302011&", "levelConsume": "1&", "prepositionId": "62&", - "preTotalPoint": 8, - "preSinglePoint": 8, + "preTotalPoint": 4, + "preSinglePoint": 4, "bgName": "youxia", "iconSize": 1 }, @@ -1034,8 +1034,8 @@ "levelSeid": "1050303011&", "levelConsume": "1&", "prepositionId": "62&", - "preTotalPoint": 8, - "preSinglePoint": 8, + "preTotalPoint": 4, + "preSinglePoint": 4, "bgName": "youxia", "iconSize": 1 }, @@ -1048,9 +1048,9 @@ "name": "物防(5)", "levelCount": 5, "levelSeid": "1000004011&1000004021&1000004031&1000004041&1000004051", - "levelConsume": "2&2&2&2&2", + "levelConsume": "1&1&1&1&1", "prepositionId": "63|64|65", - "preTotalPoint": 9, + "preTotalPoint": 5, "preSinglePoint": 1, "bgName": "youxia", "iconSize": 1 @@ -1066,8 +1066,8 @@ "levelSeid": "1050501011&", "levelConsume": "1&", "prepositionId": "66&", - "preTotalPoint": 19, - "preSinglePoint": 8, + "preTotalPoint": 10, + "preSinglePoint": 4, "bgName": "youxia", "iconSize": 2 }, @@ -1082,8 +1082,8 @@ "levelSeid": "1050502011&", "levelConsume": "1&", "prepositionId": "66&", - "preTotalPoint": 19, - "preSinglePoint": 8, + "preTotalPoint": 10, + "preSinglePoint": 4, "bgName": "youxia", "iconSize": 2 }, @@ -1096,9 +1096,9 @@ "name": "策防(5)", "levelCount": 5, "levelSeid": "1000005011&1000005021&1000005031&1000005041&1000005051", - "levelConsume": "2&2&2&2&2", + "levelConsume": "1&1&1&1&1", "prepositionId": "67|68", - "preTotalPoint": 19, + "preTotalPoint": 11, "preSinglePoint": 1, "bgName": "youxia", "iconSize": 1 @@ -1114,8 +1114,8 @@ "levelSeid": "1000020011&1000020021&1000020031", "levelConsume": "1&1&1", "prepositionId": "69&", - "preTotalPoint": 29, - "preSinglePoint": 8, + "preTotalPoint": 16, + "preSinglePoint": 4, "bgName": "youxia", "iconSize": 1 }, @@ -1130,8 +1130,8 @@ "levelSeid": "1000022011&1000022021&1000022031", "levelConsume": "1&1&1", "prepositionId": "69&", - "preTotalPoint": 29, - "preSinglePoint": 8, + "preTotalPoint": 16, + "preSinglePoint": 4, "bgName": "youxia", "iconSize": 1 }, @@ -1146,8 +1146,8 @@ "levelSeid": "1000011011&1000011021&1000011031", "levelConsume": "1&1&1", "prepositionId": "69&", - "preTotalPoint": 29, - "preSinglePoint": 8, + "preTotalPoint": 16, + "preSinglePoint": 4, "bgName": "youxia", "iconSize": 1 }, @@ -1162,7 +1162,7 @@ "levelSeid": "1050801011&", "levelConsume": "1&", "prepositionId": "70&", - "preTotalPoint": 30, + "preTotalPoint": 22, "preSinglePoint": 3, "bgName": "youxia", "iconSize": 2 @@ -1178,7 +1178,7 @@ "levelSeid": "1050802011&", "levelConsume": "1&", "prepositionId": "72&", - "preTotalPoint": 30, + "preTotalPoint": 22, "preSinglePoint": 3, "bgName": "youxia", "iconSize": 2 @@ -1208,7 +1208,7 @@ "name": "生命(5)", "levelCount": 5, "levelSeid": "1000001011&1000001021&1000001031&1000001041&1000001051", - "levelConsume": "2&2&2&2&2", + "levelConsume": "1&1&1&1&1", "prepositionId": "75&", "preTotalPoint": 0, "preSinglePoint": 0, @@ -1226,8 +1226,8 @@ "levelSeid": "1060301011&", "levelConsume": "1&", "prepositionId": "76&", - "preTotalPoint": 8, - "preSinglePoint": 8, + "preTotalPoint": 4, + "preSinglePoint": 4, "bgName": "ceshi", "iconSize": 1 }, @@ -1242,8 +1242,8 @@ "levelSeid": "1060302011&", "levelConsume": "1&", "prepositionId": "76&", - "preTotalPoint": 8, - "preSinglePoint": 8, + "preTotalPoint": 4, + "preSinglePoint": 4, "bgName": "ceshi", "iconSize": 1 }, @@ -1258,8 +1258,8 @@ "levelSeid": "1060303011&", "levelConsume": "1&", "prepositionId": "76&", - "preTotalPoint": 8, - "preSinglePoint": 8, + "preTotalPoint": 4, + "preSinglePoint": 4, "bgName": "ceshi", "iconSize": 1 }, @@ -1272,9 +1272,9 @@ "name": "攻击(5)", "levelCount": 5, "levelSeid": "1000004011&1000004021&1000004031&1000004041&1000004051", - "levelConsume": "2&2&2&2&2", + "levelConsume": "1&1&1&1&1", "prepositionId": "77|78|79", - "preTotalPoint": 9, + "preTotalPoint": 5, "preSinglePoint": 1, "bgName": "ceshi", "iconSize": 1 @@ -1290,8 +1290,8 @@ "levelSeid": "1060501011&", "levelConsume": "1&", "prepositionId": "80&", - "preTotalPoint": 19, - "preSinglePoint": 8, + "preTotalPoint": 10, + "preSinglePoint": 4, "bgName": "ceshi", "iconSize": 2 }, @@ -1306,8 +1306,8 @@ "levelSeid": "1060502011&", "levelConsume": "1&", "prepositionId": "80&", - "preTotalPoint": 19, - "preSinglePoint": 8, + "preTotalPoint": 10, + "preSinglePoint": 4, "bgName": "ceshi", "iconSize": 2 }, @@ -1320,9 +1320,9 @@ "name": "策防(5)", "levelCount": 5, "levelSeid": "1000005011&1000005021&1000005031&1000005041&1000005051", - "levelConsume": "2&2&2&2&2", + "levelConsume": "1&1&1&1&1", "prepositionId": "81|82", - "preTotalPoint": 19, + "preTotalPoint": 11, "preSinglePoint": 1, "bgName": "ceshi", "iconSize": 1 @@ -1338,8 +1338,8 @@ "levelSeid": "1000020011&1000020021&1000020031", "levelConsume": "1&1&1", "prepositionId": "83&", - "preTotalPoint": 29, - "preSinglePoint": 8, + "preTotalPoint": 16, + "preSinglePoint": 4, "bgName": "ceshi", "iconSize": 1 }, @@ -1354,8 +1354,8 @@ "levelSeid": "1000022011&1000022021&1000022031", "levelConsume": "1&1&1", "prepositionId": "83&", - "preTotalPoint": 29, - "preSinglePoint": 8, + "preTotalPoint": 16, + "preSinglePoint": 4, "bgName": "ceshi", "iconSize": 1 }, @@ -1370,8 +1370,8 @@ "levelSeid": "1000011011&1000011021&1000011031", "levelConsume": "1&1&1", "prepositionId": "83&", - "preTotalPoint": 29, - "preSinglePoint": 8, + "preTotalPoint": 16, + "preSinglePoint": 4, "bgName": "ceshi", "iconSize": 1 }, @@ -1386,7 +1386,7 @@ "levelSeid": "1060801011&", "levelConsume": "1&", "prepositionId": "84&", - "preTotalPoint": 30, + "preTotalPoint": 22, "preSinglePoint": 3, "bgName": "ceshi", "iconSize": 2 @@ -1402,7 +1402,7 @@ "levelSeid": "1060802011&", "levelConsume": "1&", "prepositionId": "86&", - "preTotalPoint": 30, + "preTotalPoint": 22, "preSinglePoint": 3, "bgName": "ceshi", "iconSize": 2 @@ -1432,7 +1432,7 @@ "name": "生命(5)", "levelCount": 5, "levelSeid": "1000001011&1000001021&1000001031&1000001041&1000001051", - "levelConsume": "2&2&2&2&2", + "levelConsume": "1&1&1&1&1", "prepositionId": "89&", "preTotalPoint": 0, "preSinglePoint": 0, @@ -1450,8 +1450,8 @@ "levelSeid": "1070301011&", "levelConsume": "1&", "prepositionId": "90&", - "preTotalPoint": 8, - "preSinglePoint": 8, + "preTotalPoint": 4, + "preSinglePoint": 4, "bgName": "yizhe", "iconSize": 1 }, @@ -1466,8 +1466,8 @@ "levelSeid": "1070302011&", "levelConsume": "1&", "prepositionId": "90&", - "preTotalPoint": 8, - "preSinglePoint": 8, + "preTotalPoint": 4, + "preSinglePoint": 4, "bgName": "yizhe", "iconSize": 1 }, @@ -1482,8 +1482,8 @@ "levelSeid": "1070303011&", "levelConsume": "1&", "prepositionId": "90&", - "preTotalPoint": 8, - "preSinglePoint": 8, + "preTotalPoint": 4, + "preSinglePoint": 4, "bgName": "yizhe", "iconSize": 1 }, @@ -1496,9 +1496,9 @@ "name": "物防(5)", "levelCount": 5, "levelSeid": "1000004011&1000004021&1000004031&1000004041&1000004051", - "levelConsume": "2&2&2&2&2", + "levelConsume": "1&1&1&1&1", "prepositionId": "91|92|93", - "preTotalPoint": 9, + "preTotalPoint": 5, "preSinglePoint": 1, "bgName": "yizhe", "iconSize": 1 @@ -1514,8 +1514,8 @@ "levelSeid": "1070501011&", "levelConsume": "1&", "prepositionId": "94&", - "preTotalPoint": 19, - "preSinglePoint": 8, + "preTotalPoint": 10, + "preSinglePoint": 4, "bgName": "yizhe", "iconSize": 2 }, @@ -1530,8 +1530,8 @@ "levelSeid": "1070502011&", "levelConsume": "1&", "prepositionId": "94&", - "preTotalPoint": 19, - "preSinglePoint": 8, + "preTotalPoint": 10, + "preSinglePoint": 4, "bgName": "yizhe", "iconSize": 2 }, @@ -1544,9 +1544,9 @@ "name": "策防(5)", "levelCount": 5, "levelSeid": "1000005011&1000005021&1000005031&1000005041&1000005051", - "levelConsume": "2&2&2&2&2", + "levelConsume": "1&1&1&1&1", "prepositionId": "95|96", - "preTotalPoint": 19, + "preTotalPoint": 11, "preSinglePoint": 1, "bgName": "yizhe", "iconSize": 1 @@ -1562,8 +1562,8 @@ "levelSeid": "1000020011&1000020021&1000020031", "levelConsume": "1&1&1", "prepositionId": "97&", - "preTotalPoint": 29, - "preSinglePoint": 8, + "preTotalPoint": 16, + "preSinglePoint": 4, "bgName": "yizhe", "iconSize": 1 }, @@ -1578,8 +1578,8 @@ "levelSeid": "1000022011&1000022021&1000022031", "levelConsume": "1&1&1", "prepositionId": "97&", - "preTotalPoint": 29, - "preSinglePoint": 8, + "preTotalPoint": 16, + "preSinglePoint": 4, "bgName": "yizhe", "iconSize": 1 }, @@ -1594,8 +1594,8 @@ "levelSeid": "1000025011&1000025021&1000025031", "levelConsume": "1&1&1", "prepositionId": "97&", - "preTotalPoint": 29, - "preSinglePoint": 8, + "preTotalPoint": 16, + "preSinglePoint": 4, "bgName": "yizhe", "iconSize": 1 }, @@ -1610,7 +1610,7 @@ "levelSeid": "1070801011&", "levelConsume": "1&", "prepositionId": "98&", - "preTotalPoint": 30, + "preTotalPoint": 22, "preSinglePoint": 3, "bgName": "yizhe", "iconSize": 2 @@ -1626,7 +1626,7 @@ "levelSeid": "1070802011&", "levelConsume": "1&", "prepositionId": "100&", - "preTotalPoint": 30, + "preTotalPoint": 22, "preSinglePoint": 3, "bgName": "yizhe", "iconSize": 2