diff --git a/game-server/app/servers/guild/handler/guildBossHandler.ts b/game-server/app/servers/guild/handler/guildBossHandler.ts index be0961d04..ab3266acb 100644 --- a/game-server/app/servers/guild/handler/guildBossHandler.ts +++ b/game-server/app/servers/guild/handler/guildBossHandler.ts @@ -63,7 +63,7 @@ export class GuildHandler { let bossBase = getBossByLv(curStructure.lv); let dicBossBaseWar = getRandSingleEelm(bossBase.wars); // let bossHp = Math.ceil(medianCe * bossBase.ratio); - let bossHp = await getBossHp(serverId, code, dicBossBaseWar); + let { ratio, bossHp } = await getBossHp(serverId, code, dicBossBaseWar, bossBase.bossLevel); let resGuild = await GuildModel.costFund(code, bossBase.opencost); if (!resGuild) { @@ -83,7 +83,7 @@ export class GuildHandler { } await refreshGuildOfBoss(guild, 1); - bossInstance = await BossInstanceModel.openBossInstance(code, bossHp, dicBossBaseWar.warId, bossBase.bossLevel); + bossInstance = await BossInstanceModel.openBossInstance(code, bossHp, ratio, dicBossBaseWar.warId, bossBase.bossLevel); res.releaseCallback(); let result = await getBossInstanceInfoByData(bossInstance, userGuild, guild); diff --git a/game-server/app/services/guildBossService.ts b/game-server/app/services/guildBossService.ts index bf513a90c..00323daa1 100644 --- a/game-server/app/services/guildBossService.ts +++ b/game-server/app/services/guildBossService.ts @@ -17,6 +17,7 @@ import { nowSeconds } from '../pubUtils/timeUtil'; import { GUILDACTIVITY } from '../pubUtils/dicParam'; import { ServerRecordModel } from '../db/ServerRecords'; import { sendMessageToGuildWithSuc, sendMessageToUsersWithSuc } from './pushService'; +import { AttributeCal } from '../domain/roleField/attribute'; /** * 获得boss界面 @@ -41,10 +42,10 @@ export async function getBossInstanceInfoByData(bossInstance: BossInstanceType, let bossInfo = null; if(bossInstance) { - let { code, warId, ranks, bossHp, bossTotalHp, bossLv, encourageCnt } = bossInstance; + let { code, warId, ranks, bossHp, bossTotalHp, ratio, bossLv, encourageCnt } = bossInstance; let dicBossBase = gameData.bossBaseByBossLv.get(bossLv); let rankInfo = getRanks(ranks, userGuild.roleId); - bossInfo = { bossCode: code, warId, ...rankInfo, bossHp, bossTotalHp, bossLv, encourageCnt, encourageMax: dicBossBase.encourageSum }; + bossInfo = { bossCode: code, warId, ...rankInfo, bossHp, bossTotalHp, bossLv, encourageCnt, encourageMax: dicBossBase.encourageSum, ratio }; } return { status, bossInfo, ...refObj } } @@ -178,11 +179,21 @@ export async function removeBossRank(guildCode: string, roleId: string) { await BossInstanceModel.removeBossRank(guildCode, roleId); } -export async function getBossHp(serverId: number, guildCode: string, dicBossBaseWar: {warId: number, bossHp: number, bossHpRatio: number }) { +function getBossSubAttrCe(secondAttrLevel: number, bossLevel: number) { + let newAttribute = new AttributeCal(); + newAttribute.setLv(bossLevel); + let subAttr = gameData.towerPvpSubAttr.get(secondAttrLevel); + if(subAttr) newAttribute.setByWarJson(subAttr.secondAtr); + let newCe = newAttribute.calCe(); + return newCe * bossLevel; +} + +export async function getBossHp(serverId: number, guildCode: string, dicBossBaseWar: {warId: number, bossHp: number, bossHpRatio: number }, bossLv: number) { let { warId, bossHp: minBossHp, bossHpRatio } = dicBossBaseWar; + console.log('getBossHp', warId, minBossHp, bossHpRatio) let serverRecord = await ServerRecordModel.findTodayData(serverId); - if(!serverRecord) return minBossHp; + if(!serverRecord) return { ratio: 1, bossHp: minBossHp }; let dicWar = gameData.war.get(warId); let dicWarJson = gameData.warJson.get(dicWar.dispatchJsonId); @@ -203,11 +214,13 @@ export async function getBossHp(serverId: number, guildCode: string, dicBossBase activeCe += activePlayers[i].topLineupCe; } } - console.log(`getBossHp activeCe ${activeCe}`); - let B = activeCe/6/GUILDACTIVITY.GATEACTIVITY_ENEMYCE; + let subCe = getBossSubAttrCe(dicWar.secondAttrLevel, bossLv) + console.log(`getBossHp activeCe ${activeCe} subCe ${subCe}`); + let B = (activeCe - subCe)/6/GUILDACTIVITY.GATEACTIVITY_ENEMYCE; + if(B <= 0) B = 1; console.log(`getBossHp B ${B}`); let bossBaseHp = B * hp; let bossHp = Math.floor(bossBaseHp * bossHpRatio); - if(bossHp == 0) return minBossHp; - return bossHp; + if(bossHp <= 0) bossHp = minBossHp; + return { ratio: B, bossHp }; } \ No newline at end of file diff --git a/shared/db/BossInstance.ts b/shared/db/BossInstance.ts index ed1529bbf..8592146c3 100644 --- a/shared/db/BossInstance.ts +++ b/shared/db/BossInstance.ts @@ -32,6 +32,9 @@ export default class BossInstance extends BaseModel { @prop({ required: true }) bossTotalHp: number; + @prop({ required: true }) + ratio: number; // 敌军倍率 + @prop({ required: true }) bossLv: number; @@ -66,10 +69,10 @@ export default class BossInstance extends BaseModel { return bossInstance; } - public static async openBossInstance(guildCode: string, bossHp: number, warId: number, bossLv: number) { + public static async openBossInstance(guildCode: string, bossHp: number, ratio: number, warId: number, bossLv: number) { let code = genCode(10); let doc = new BossInstanceModel(); - let update = Object.assign(doc.toJSON(), { guildCode, bossHp, bossTotalHp: bossHp, bossLv, warId }); + let update = Object.assign(doc.toJSON(), { guildCode, bossHp, bossTotalHp: bossHp, ratio, bossLv, warId }); const bossInstance: BossInstanceType = await BossInstanceModel.findOneAndUpdate({ code },{ $set: update }, {new: true, upsert: true}).lean(); return bossInstance; } diff --git a/shared/pubUtils/dictionary/DicWar.ts b/shared/pubUtils/dictionary/DicWar.ts index 09f9ab8f0..f3bea8330 100644 --- a/shared/pubUtils/dictionary/DicWar.ts +++ b/shared/pubUtils/dictionary/DicWar.ts @@ -55,6 +55,8 @@ export interface DicWar { readonly failReward: Map; // 上场数量 readonly minHeroNum: number; + // 次级属性 关联 + readonly secondAttrLevel: number; } export const dicWar = new Map(); diff --git a/shared/resource/jsons/dic_goods.json b/shared/resource/jsons/dic_goods.json index 5e674d32f..dd0eb7180 100644 --- a/shared/resource/jsons/dic_goods.json +++ b/shared/resource/jsons/dic_goods.json @@ -7849,7 +7849,7 @@ }, { "good_id": 71008, - "name": "一阶地玉任选礼包", + "name": "一品地玉任选礼包", "quality": 1, "image_id": "putongbaoxiang", "itid": 24, @@ -7867,7 +7867,7 @@ }, { "good_id": 71009, - "name": "一阶地玉随机礼包", + "name": "一品地玉随机礼包", "quality": 1, "image_id": "putongbaoxiang", "itid": 24, @@ -8425,7 +8425,7 @@ }, { "good_id": 71040, - "name": "5阶天晶任选宝箱", + "name": "5品天晶任选宝箱", "quality": 3, "image_id": "zhongjibaoxiang", "itid": 24, @@ -8439,11 +8439,11 @@ "condition": 0, "timelimit": 0, "gift": 41, - "info": "打开可任选1颗5阶天晶" + "info": "打开可任选1颗5品天晶" }, { "good_id": 71041, - "name": "4阶天晶任选宝箱", + "name": "4品天晶任选宝箱", "quality": 2, "image_id": "zhongjibaoxiang", "itid": 24, @@ -8457,11 +8457,11 @@ "condition": 0, "timelimit": 0, "gift": 42, - "info": "打开可任选1颗4阶天晶" + "info": "打开可任选1颗4品天晶" }, { "good_id": 71042, - "name": "3阶天晶任选宝箱", + "name": "3品天晶任选宝箱", "quality": 2, "image_id": "zhongjibaoxiang", "itid": 24, @@ -8475,11 +8475,11 @@ "condition": 0, "timelimit": 0, "gift": 43, - "info": "打开可任选1颗3阶天晶" + "info": "打开可任选1颗3品天晶" }, { "good_id": 71043, - "name": "4阶地玉任选宝箱", + "name": "4品地玉任选宝箱", "quality": 2, "image_id": "zhongjibaoxiang", "itid": 24, @@ -8493,11 +8493,11 @@ "condition": 0, "timelimit": 0, "gift": 44, - "info": "打开可任选1颗4阶地玉" + "info": "打开可任选1颗4品地玉" }, { "good_id": 71044, - "name": "5阶地玉任选宝箱", + "name": "5品地玉任选宝箱", "quality": 3, "image_id": "zhongjibaoxiang", "itid": 24, @@ -8511,7 +8511,7 @@ "condition": 0, "timelimit": 0, "gift": 45, - "info": "打开可任选1颗5阶地玉" + "info": "打开可任选1颗5品地玉" }, { "good_id": 72001, diff --git a/shared/resource/jsons/dic_zyz_gk_armyboss.json b/shared/resource/jsons/dic_zyz_gk_armyboss.json index 6592284bb..ab622381b 100644 --- a/shared/resource/jsons/dic_zyz_gk_armyboss.json +++ b/shared/resource/jsons/dic_zyz_gk_armyboss.json @@ -1,12 +1,14 @@ [ { "war_id": 8001, - "script_id": "S_8001", + "script_id": "&", "dispatchJsonId": 8001, - "bg_img": 8001, - "mapid": 8001, + "bg_img": 9213, + "mapid": 9213, "warType": 20, "gk_name": "10级血煞张角", + "secondAttrLevel": 1, + "level": 10, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -25,6 +27,8 @@ "mapid": 224, "warType": 20, "gk_name": "10级魔化董卓", + "secondAttrLevel": 1, + "level": 10, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -43,6 +47,8 @@ "mapid": 2533, "warType": 20, "gk_name": "10级东岳帝像", + "secondAttrLevel": 1, + "level": 10, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -60,7 +66,9 @@ "bg_img": 2543, "mapid": 2543, "warType": 20, - "gk_name": "10级魔化狼王", + "gk_name": "10级白狼凶灵", + "secondAttrLevel": 1, + "level": 10, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -78,7 +86,9 @@ "bg_img": 2553, "mapid": 2553, "warType": 20, - "gk_name": "10级袁术", + "gk_name": "10级仲帝妄语", + "secondAttrLevel": 1, + "level": 10, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -97,6 +107,8 @@ "mapid": 2563, "warType": 20, "gk_name": "10级不动明王", + "secondAttrLevel": 1, + "level": 10, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -115,6 +127,8 @@ "mapid": 2573, "warType": 20, "gk_name": "10级蜘蛛女王", + "secondAttrLevel": 1, + "level": 10, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -133,6 +147,8 @@ "mapid": 2523, "warType": 20, "gk_name": "10级何太后", + "secondAttrLevel": 1, + "level": 10, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -145,12 +161,14 @@ }, { "war_id": 8009, - "script_id": "S_8001", + "script_id": "&", "dispatchJsonId": 8001, - "bg_img": 8001, - "mapid": 8001, + "bg_img": 9213, + "mapid": 9213, "warType": 20, "gk_name": "20级血煞张角", + "secondAttrLevel": 1, + "level": 20, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -169,6 +187,8 @@ "mapid": 224, "warType": 20, "gk_name": "20级魔化董卓", + "secondAttrLevel": 1, + "level": 20, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -187,6 +207,8 @@ "mapid": 2533, "warType": 20, "gk_name": "20级东岳帝像", + "secondAttrLevel": 1, + "level": 20, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -204,7 +226,9 @@ "bg_img": 2543, "mapid": 2543, "warType": 20, - "gk_name": "20级魔化狼王", + "gk_name": "20级白狼凶灵", + "secondAttrLevel": 1, + "level": 20, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -223,6 +247,8 @@ "mapid": 2553, "warType": 20, "gk_name": "20级袁术", + "secondAttrLevel": 1, + "level": 20, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -241,6 +267,8 @@ "mapid": 2563, "warType": 20, "gk_name": "20级不动明王", + "secondAttrLevel": 1, + "level": 20, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -259,6 +287,8 @@ "mapid": 2573, "warType": 20, "gk_name": "20级蜘蛛女王", + "secondAttrLevel": 1, + "level": 20, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -277,6 +307,8 @@ "mapid": 2523, "warType": 20, "gk_name": "20级何太后", + "secondAttrLevel": 1, + "level": 20, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -289,12 +321,14 @@ }, { "war_id": 8017, - "script_id": "S_8001", + "script_id": "&", "dispatchJsonId": 8001, - "bg_img": 8001, - "mapid": 8001, + "bg_img": 9213, + "mapid": 9213, "warType": 20, "gk_name": "30级血煞张角", + "secondAttrLevel": 2, + "level": 30, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -313,6 +347,8 @@ "mapid": 224, "warType": 20, "gk_name": "30级魔化董卓", + "secondAttrLevel": 2, + "level": 30, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -331,6 +367,8 @@ "mapid": 2533, "warType": 20, "gk_name": "30级东岳帝像", + "secondAttrLevel": 2, + "level": 30, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -348,7 +386,9 @@ "bg_img": 2543, "mapid": 2543, "warType": 20, - "gk_name": "30级魔化狼王", + "gk_name": "30级白狼凶灵", + "secondAttrLevel": 2, + "level": 30, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -367,6 +407,8 @@ "mapid": 2553, "warType": 20, "gk_name": "30级袁术", + "secondAttrLevel": 2, + "level": 30, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -385,6 +427,8 @@ "mapid": 2563, "warType": 20, "gk_name": "30级不动明王", + "secondAttrLevel": 2, + "level": 30, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -403,6 +447,8 @@ "mapid": 2573, "warType": 20, "gk_name": "30级蜘蛛女王", + "secondAttrLevel": 2, + "level": 30, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -421,6 +467,8 @@ "mapid": 2523, "warType": 20, "gk_name": "30级何太后", + "secondAttrLevel": 2, + "level": 30, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -433,12 +481,14 @@ }, { "war_id": 8025, - "script_id": "S_8001", + "script_id": "&", "dispatchJsonId": 8001, - "bg_img": 8001, - "mapid": 8001, + "bg_img": 9213, + "mapid": 9213, "warType": 20, "gk_name": "40级血煞张角", + "secondAttrLevel": 2, + "level": 40, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -457,6 +507,8 @@ "mapid": 224, "warType": 20, "gk_name": "40级魔化董卓", + "secondAttrLevel": 2, + "level": 40, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -475,6 +527,8 @@ "mapid": 2533, "warType": 20, "gk_name": "40级东岳帝像", + "secondAttrLevel": 2, + "level": 40, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -492,7 +546,9 @@ "bg_img": 2543, "mapid": 2543, "warType": 20, - "gk_name": "40级魔化狼王", + "gk_name": "40级白狼凶灵", + "secondAttrLevel": 2, + "level": 40, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -511,6 +567,8 @@ "mapid": 2553, "warType": 20, "gk_name": "40级袁术", + "secondAttrLevel": 2, + "level": 40, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -529,6 +587,8 @@ "mapid": 2563, "warType": 20, "gk_name": "40级不动明王", + "secondAttrLevel": 2, + "level": 40, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -547,6 +607,8 @@ "mapid": 2573, "warType": 20, "gk_name": "40级蜘蛛女王", + "secondAttrLevel": 2, + "level": 40, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -565,6 +627,8 @@ "mapid": 2523, "warType": 20, "gk_name": "40级何太后", + "secondAttrLevel": 2, + "level": 40, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -577,12 +641,14 @@ }, { "war_id": 8033, - "script_id": "S_8001", + "script_id": "&", "dispatchJsonId": 8001, - "bg_img": 8001, - "mapid": 8001, + "bg_img": 9213, + "mapid": 9213, "warType": 20, "gk_name": "50级血煞张角", + "secondAttrLevel": 3, + "level": 50, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -601,6 +667,8 @@ "mapid": 224, "warType": 20, "gk_name": "50级魔化董卓", + "secondAttrLevel": 3, + "level": 50, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -619,6 +687,8 @@ "mapid": 2533, "warType": 20, "gk_name": "50级东岳帝像", + "secondAttrLevel": 3, + "level": 50, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -636,7 +706,9 @@ "bg_img": 2543, "mapid": 2543, "warType": 20, - "gk_name": "50级魔化狼王", + "gk_name": "50级白狼凶灵", + "secondAttrLevel": 3, + "level": 50, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -655,6 +727,8 @@ "mapid": 2553, "warType": 20, "gk_name": "50级袁术", + "secondAttrLevel": 3, + "level": 50, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -673,6 +747,8 @@ "mapid": 2563, "warType": 20, "gk_name": "50级不动明王", + "secondAttrLevel": 3, + "level": 50, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -691,6 +767,8 @@ "mapid": 2573, "warType": 20, "gk_name": "50级蜘蛛女王", + "secondAttrLevel": 3, + "level": 50, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -709,6 +787,8 @@ "mapid": 2523, "warType": 20, "gk_name": "50级何太后", + "secondAttrLevel": 3, + "level": 50, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -721,12 +801,14 @@ }, { "war_id": 8041, - "script_id": "S_8001", + "script_id": "&", "dispatchJsonId": 8001, - "bg_img": 8001, - "mapid": 8001, + "bg_img": 9213, + "mapid": 9213, "warType": 20, "gk_name": "60级血煞张角", + "secondAttrLevel": 3, + "level": 60, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -745,6 +827,8 @@ "mapid": 224, "warType": 20, "gk_name": "60级魔化董卓", + "secondAttrLevel": 3, + "level": 60, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -763,6 +847,8 @@ "mapid": 2533, "warType": 20, "gk_name": "60级东岳帝像", + "secondAttrLevel": 3, + "level": 60, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -780,7 +866,9 @@ "bg_img": 2543, "mapid": 2543, "warType": 20, - "gk_name": "60级魔化狼王", + "gk_name": "60级白狼凶灵", + "secondAttrLevel": 3, + "level": 60, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -799,6 +887,8 @@ "mapid": 2553, "warType": 20, "gk_name": "60级袁术", + "secondAttrLevel": 3, + "level": 60, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -817,6 +907,8 @@ "mapid": 2563, "warType": 20, "gk_name": "60级不动明王", + "secondAttrLevel": 3, + "level": 60, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -835,6 +927,8 @@ "mapid": 2573, "warType": 20, "gk_name": "60级蜘蛛女王", + "secondAttrLevel": 3, + "level": 60, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -853,6 +947,8 @@ "mapid": 2523, "warType": 20, "gk_name": "60级何太后", + "secondAttrLevel": 3, + "level": 60, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -865,12 +961,14 @@ }, { "war_id": 8049, - "script_id": "S_8001", + "script_id": "&", "dispatchJsonId": 8001, - "bg_img": 8001, - "mapid": 8001, + "bg_img": 9213, + "mapid": 9213, "warType": 20, "gk_name": "70级血煞张角", + "secondAttrLevel": 4, + "level": 70, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -889,6 +987,8 @@ "mapid": 224, "warType": 20, "gk_name": "70级魔化董卓", + "secondAttrLevel": 4, + "level": 70, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -907,6 +1007,8 @@ "mapid": 2533, "warType": 20, "gk_name": "70级东岳帝像", + "secondAttrLevel": 4, + "level": 70, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -924,7 +1026,9 @@ "bg_img": 2543, "mapid": 2543, "warType": 20, - "gk_name": "70级魔化狼王", + "gk_name": "70级白狼凶灵", + "secondAttrLevel": 4, + "level": 70, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -943,6 +1047,8 @@ "mapid": 2553, "warType": 20, "gk_name": "70级袁术", + "secondAttrLevel": 4, + "level": 70, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -961,6 +1067,8 @@ "mapid": 2563, "warType": 20, "gk_name": "70级不动明王", + "secondAttrLevel": 4, + "level": 70, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -979,6 +1087,8 @@ "mapid": 2573, "warType": 20, "gk_name": "70级蜘蛛女王", + "secondAttrLevel": 4, + "level": 70, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -997,6 +1107,8 @@ "mapid": 2523, "warType": 20, "gk_name": "70级何太后", + "secondAttrLevel": 4, + "level": 70, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1009,12 +1121,14 @@ }, { "war_id": 8057, - "script_id": "S_8001", + "script_id": "&", "dispatchJsonId": 8001, - "bg_img": 8001, - "mapid": 8001, + "bg_img": 9213, + "mapid": 9213, "warType": 20, "gk_name": "80级血煞张角", + "secondAttrLevel": 4, + "level": 80, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1033,6 +1147,8 @@ "mapid": 224, "warType": 20, "gk_name": "80级魔化董卓", + "secondAttrLevel": 4, + "level": 80, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1051,6 +1167,8 @@ "mapid": 2533, "warType": 20, "gk_name": "80级东岳帝像", + "secondAttrLevel": 4, + "level": 80, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1068,7 +1186,9 @@ "bg_img": 2543, "mapid": 2543, "warType": 20, - "gk_name": "80级魔化狼王", + "gk_name": "80级白狼凶灵", + "secondAttrLevel": 4, + "level": 80, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1087,6 +1207,8 @@ "mapid": 2553, "warType": 20, "gk_name": "80级袁术", + "secondAttrLevel": 4, + "level": 80, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1105,6 +1227,8 @@ "mapid": 2563, "warType": 20, "gk_name": "80级不动明王", + "secondAttrLevel": 4, + "level": 80, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1123,6 +1247,8 @@ "mapid": 2573, "warType": 20, "gk_name": "80级蜘蛛女王", + "secondAttrLevel": 4, + "level": 80, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1141,6 +1267,8 @@ "mapid": 2523, "warType": 20, "gk_name": "80级何太后", + "secondAttrLevel": 4, + "level": 80, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1153,12 +1281,14 @@ }, { "war_id": 8065, - "script_id": "S_8001", + "script_id": "&", "dispatchJsonId": 8001, - "bg_img": 8001, - "mapid": 8001, + "bg_img": 9213, + "mapid": 9213, "warType": 20, "gk_name": "90级血煞张角", + "secondAttrLevel": 5, + "level": 90, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1177,6 +1307,8 @@ "mapid": 224, "warType": 20, "gk_name": "90级魔化董卓", + "secondAttrLevel": 5, + "level": 90, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1195,6 +1327,8 @@ "mapid": 2533, "warType": 20, "gk_name": "90级东岳帝像", + "secondAttrLevel": 5, + "level": 90, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1212,7 +1346,9 @@ "bg_img": 2543, "mapid": 2543, "warType": 20, - "gk_name": "90级魔化狼王", + "gk_name": "90级白狼凶灵", + "secondAttrLevel": 5, + "level": 90, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1231,6 +1367,8 @@ "mapid": 2553, "warType": 20, "gk_name": "90级袁术", + "secondAttrLevel": 5, + "level": 90, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1249,6 +1387,8 @@ "mapid": 2563, "warType": 20, "gk_name": "90级不动明王", + "secondAttrLevel": 5, + "level": 90, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1267,6 +1407,8 @@ "mapid": 2573, "warType": 20, "gk_name": "90级蜘蛛女王", + "secondAttrLevel": 5, + "level": 90, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1285,6 +1427,8 @@ "mapid": 2523, "warType": 20, "gk_name": "90级何太后", + "secondAttrLevel": 5, + "level": 90, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1297,12 +1441,14 @@ }, { "war_id": 8073, - "script_id": "S_8001", + "script_id": "&", "dispatchJsonId": 8001, - "bg_img": 8001, - "mapid": 8001, + "bg_img": 9213, + "mapid": 9213, "warType": 20, "gk_name": "100级血煞张角", + "secondAttrLevel": 5, + "level": 100, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1321,6 +1467,8 @@ "mapid": 224, "warType": 20, "gk_name": "100级魔化董卓", + "secondAttrLevel": 5, + "level": 100, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1339,6 +1487,8 @@ "mapid": 2533, "warType": 20, "gk_name": "100级东岳帝像", + "secondAttrLevel": 5, + "level": 100, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1356,7 +1506,9 @@ "bg_img": 2543, "mapid": 2543, "warType": 20, - "gk_name": "100级魔化狼王", + "gk_name": "100级白狼凶灵", + "secondAttrLevel": 5, + "level": 100, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1375,6 +1527,8 @@ "mapid": 2553, "warType": 20, "gk_name": "100级袁术", + "secondAttrLevel": 5, + "level": 100, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1393,6 +1547,8 @@ "mapid": 2563, "warType": 20, "gk_name": "100级不动明王", + "secondAttrLevel": 5, + "level": 100, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1411,6 +1567,8 @@ "mapid": 2573, "warType": 20, "gk_name": "100级蜘蛛女王", + "secondAttrLevel": 5, + "level": 100, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", @@ -1429,6 +1587,8 @@ "mapid": 2523, "warType": 20, "gk_name": "100级何太后", + "secondAttrLevel": 5, + "level": 100, "lvLimted": 1, "turnLimted": 20, "victoryInfoInUI": "消灭所有敌军", diff --git a/shared/resource/warJsons/8001.json b/shared/resource/warJsons/8001.json index 1a7eab544..72604064c 100644 --- a/shared/resource/warJsons/8001.json +++ b/shared/resource/warJsons/8001.json @@ -20,8 +20,7 @@ "spine": 0, "bossStage": 0, "addbuff": "101&", - "bloodShow": "1&0", - "bloodShow_1": "1&0" + "bloodShow": "1&0" }, { "warId": 8001, @@ -44,8 +43,7 @@ "spine": 0, "bossStage": 0, "addbuff": "101&", - "bloodShow": "1&0", - "bloodShow_1": "1&0" + "bloodShow": "1&0" }, { "warId": 8001, @@ -68,8 +66,7 @@ "spine": 0, "bossStage": 0, "addbuff": "101&", - "bloodShow": "1&0", - "bloodShow_1": "1&0" + "bloodShow": "1&0" }, { "warId": 8001, @@ -92,8 +89,7 @@ "spine": 0, "bossStage": 0, "addbuff": "101&", - "bloodShow": "1&0", - "bloodShow_1": "1&0" + "bloodShow": "1&0" }, { "warId": 8001, @@ -116,8 +112,7 @@ "spine": 0, "bossStage": 0, "addbuff": "101&", - "bloodShow": "1&0", - "bloodShow_1": "1&0" + "bloodShow": "1&0" }, { "warId": 8001, @@ -140,8 +135,7 @@ "spine": 0, "bossStage": 0, "addbuff": "101&", - "bloodShow": "1&0", - "bloodShow_1": "1&0" + "bloodShow": "1&0" }, { "warId": 8001, @@ -157,14 +151,13 @@ "lv": 20, "hide": 0, "initial_ai": 1, - "attribute": "1&3202|2&25000|4&8000|5&8000", + "attribute": "1&5000|2&450|4&450|5&450", "skill": 0, "seid": 0, "star": 0, "spine": 0, "bossStage": 1, "addbuff": "&", - "bloodShow": "0&1", - "bloodShow_1": "0&1" + "bloodShow": "0&0" } ] \ No newline at end of file diff --git a/shared/resource/warJsons/8002.json b/shared/resource/warJsons/8002.json index 7237e4c79..33991495f 100644 --- a/shared/resource/warJsons/8002.json +++ b/shared/resource/warJsons/8002.json @@ -157,13 +157,13 @@ "lv": 20, "hide": 0, "initial_ai": 1, - "attribute": "1&3202|2&25000|4&8000|5&8000", + "attribute": "1&5000|2&450|4&450|5&450", "skill": 0, "seid": 0, "star": 0, "spine": 0, "bossStage": 1, - "bloodShow": "0&1", + "bloodShow": "0&0", "bloodShow_1": "0&0", "addbuff": "&" } diff --git a/shared/resource/warJsons/8003.json b/shared/resource/warJsons/8003.json index 9d9d71e68..561762c53 100644 --- a/shared/resource/warJsons/8003.json +++ b/shared/resource/warJsons/8003.json @@ -151,7 +151,7 @@ "lv": 20, "hide": 0, "initial_ai": 1, - "attribute": "&", + "attribute": "1&5000|2&450|4&450|5&450", "skill": 0, "seid": 0, "star": 0, @@ -174,7 +174,7 @@ "lv": 20, "hide": 0, "initial_ai": 1, - "attribute": "&", + "attribute": "1&2800|2&400|4&400|5&400", "skill": 0, "seid": 0, "star": 0, @@ -197,7 +197,7 @@ "lv": 20, "hide": 0, "initial_ai": 1, - "attribute": "&", + "attribute": "1&2800|2&400|4&400|5&400", "skill": 0, "seid": 0, "star": 0, diff --git a/shared/resource/warJsons/8004.json b/shared/resource/warJsons/8004.json index 79e35538d..cf01f8a3a 100644 --- a/shared/resource/warJsons/8004.json +++ b/shared/resource/warJsons/8004.json @@ -145,7 +145,7 @@ "lv": 20, "hide": 0, "initial_ai": 1, - "attribute": "&", + "attribute": "1&5000|2&450|4&450|5&450", "skill": 0, "seid": 0, "star": 0, diff --git a/shared/resource/warJsons/8005.json b/shared/resource/warJsons/8005.json index b1f1c847b..8761f9af1 100644 --- a/shared/resource/warJsons/8005.json +++ b/shared/resource/warJsons/8005.json @@ -145,7 +145,7 @@ "lv": 20, "hide": 0, "initial_ai": 1, - "attribute": "1&1000000", + "attribute": "1&5000|2&450|4&450|5&450", "skill": 0, "seid": 0, "star": 0, diff --git a/shared/resource/warJsons/8006.json b/shared/resource/warJsons/8006.json index 580e8b83f..f43e9d4b7 100644 --- a/shared/resource/warJsons/8006.json +++ b/shared/resource/warJsons/8006.json @@ -145,7 +145,7 @@ "lv": 70, "hide": 0, "initial_ai": 1, - "attribute": "&", + "attribute": "1&300|2&700|4&400|5&420", "skill": 0, "seid": 0, "star": 0, @@ -167,7 +167,7 @@ "lv": 70, "hide": 1, "initial_ai": 1, - "attribute": "&", + "attribute": "1&10|2&700|4&400|5&400", "skill": 0, "seid": 0, "star": 0, @@ -189,7 +189,7 @@ "lv": 70, "hide": 1, "initial_ai": 1, - "attribute": "&", + "attribute": "1&300|2&30|4&200|5&200", "skill": 0, "seid": 0, "star": 0, @@ -211,7 +211,7 @@ "lv": 70, "hide": 1, "initial_ai": 1, - "attribute": "&", + "attribute": "1&300|2&30|4&200|5&200", "skill": 0, "seid": 0, "star": 0, @@ -233,7 +233,7 @@ "lv": 70, "hide": 1, "initial_ai": 1, - "attribute": "&", + "attribute": "1&300|2&30|4&200|5&200", "skill": 0, "seid": 0, "star": 0, @@ -255,7 +255,7 @@ "lv": 70, "hide": 1, "initial_ai": 1, - "attribute": "&", + "attribute": "1&300|2&30|4&200|5&200", "skill": 0, "seid": 0, "star": 0, diff --git a/shared/resource/warJsons/8007.json b/shared/resource/warJsons/8007.json index b3655f180..d1c672724 100644 --- a/shared/resource/warJsons/8007.json +++ b/shared/resource/warJsons/8007.json @@ -167,7 +167,7 @@ "lv": 20, "hide": 0, "initial_ai": 1, - "attribute": "1&1000000", + "attribute": "1&5000|2&450|4&450|5&450", "skill": 0, "seid": 0, "star": 0, diff --git a/shared/resource/warJsons/8008.json b/shared/resource/warJsons/8008.json index 9c2b1a71f..dd1deed2f 100644 --- a/shared/resource/warJsons/8008.json +++ b/shared/resource/warJsons/8008.json @@ -8,7 +8,7 @@ "outIndex": 0, "dirction": 1, "x": 4, - "y": 5, + "y": 3, "var": 501, "lv": 20, "hide": 0, @@ -19,7 +19,8 @@ "star": 0, "spine": 0, "bossStage": 0, - "addbuff": "1&0" + "addbuff": "1&0", + "bloodShow": "1&0" }, { "warId": 8008, @@ -29,8 +30,8 @@ "relation": 0, "outIndex": 1, "dirction": 1, - "x": 4, - "y": 6, + "x": 5, + "y": 3, "var": 502, "lv": 20, "hide": 0, @@ -41,7 +42,8 @@ "star": 0, "spine": 0, "bossStage": 0, - "addbuff": "1&0" + "addbuff": "1&0", + "bloodShow": "1&0" }, { "warId": 8008, @@ -51,8 +53,8 @@ "relation": 0, "outIndex": 2, "dirction": 1, - "x": 4, - "y": 7, + "x": 6, + "y": 3, "var": 503, "lv": 20, "hide": 0, @@ -63,7 +65,8 @@ "star": 0, "spine": 0, "bossStage": 0, - "addbuff": "1&0" + "addbuff": "1&0", + "bloodShow": "1&0" }, { "warId": 8008, @@ -72,9 +75,9 @@ "dataId": 504, "relation": 0, "outIndex": 3, - "dirction": 1, - "x": 5, - "y": 5, + "dirction": 0, + "x": 8, + "y": 3, "var": 504, "lv": 20, "hide": 0, @@ -85,7 +88,8 @@ "star": 0, "spine": 0, "bossStage": 0, - "addbuff": "1&0" + "addbuff": "1&0", + "bloodShow": "1&0" }, { "warId": 8008, @@ -94,9 +98,9 @@ "dataId": 505, "relation": 0, "outIndex": 4, - "dirction": 1, - "x": 5, - "y": 6, + "dirction": 0, + "x": 9, + "y": 3, "var": 505, "lv": 20, "hide": 0, @@ -107,7 +111,8 @@ "star": 0, "spine": 0, "bossStage": 0, - "addbuff": "1&0" + "addbuff": "1&0", + "bloodShow": "1&0" }, { "warId": 8008, @@ -116,9 +121,9 @@ "dataId": 506, "relation": 0, "outIndex": 5, - "dirction": 1, - "x": 5, - "y": 7, + "dirction": 0, + "x": 10, + "y": 3, "var": 506, "lv": 20, "hide": 0, @@ -129,116 +134,122 @@ "star": 0, "spine": 0, "bossStage": 0, - "addbuff": "1&0" + "addbuff": "1&0", + "bloodShow": "1&0" }, { "warId": 8008, "actorName": "何太后", "actorId": 3205, - "dataId": 1501, + "dataId": 2001, "relation": 2, "outIndex": 0, "dirction": 0, - "x": 6, + "x": 7, "y": 6, - "var": 1501, + "var": 2001, "lv": 32, "hide": 0, "initial_ai": 1, - "attribute": "1&450000|2&11000|4&6500|5&6500", + "attribute": "1&5000|2&450|4&450|5&450", "skill": 0, "seid": 0, "star": 0, "spine": 0, "bossStage": 1, - "addbuff": "0&0" + "addbuff": "0&0", + "bloodShow": "0&0" }, { "warId": 8008, "actorName": "宫女亡魂", "actorId": 3206, - "dataId": 1502, + "dataId": 2002, "relation": 2, "outIndex": 1, - "dirction": 2, + "dirction": 1, "x": 3, "y": 3, - "var": 1502, + "var": 2002, "lv": 32, "hide": 0, "initial_ai": 1, - "attribute": "1&11000|2&6900|4&3400|5&4200", + "attribute": "1&2800|2&400|4&400|5&400", "skill": 0, "seid": 0, "star": 0, "spine": 0, "bossStage": 0, - "addbuff": "1&0" + "addbuff": "1&0", + "bloodShow": "1&0" }, { "warId": 8008, "actorName": "宫女亡魂", "actorId": 3206, - "dataId": 1503, + "dataId": 2003, "relation": 2, "outIndex": 2, - "dirction": 2, + "dirction": 1, "x": 3, "y": 5, - "var": 1503, + "var": 2003, "lv": 32, "hide": 0, "initial_ai": 1, - "attribute": "1&11000|2&6900|4&3400|5&4200", + "attribute": "1&2800|2&400|4&400|5&400", "skill": 0, "seid": 0, "star": 0, "spine": 0, "bossStage": 0, - "addbuff": "1&0" + "addbuff": "1&0", + "bloodShow": "1&0" }, { "warId": 8008, "actorName": "皇宫禁卫鬼侍", "actorId": 3207, - "dataId": 1504, + "dataId": 2004, "relation": 2, "outIndex": 3, "dirction": 0, - "x": 9, + "x": 11, "y": 3, - "var": 1504, + "var": 2004, "lv": 32, "hide": 0, "initial_ai": 1, - "attribute": "1&12400|2&6000|4&4100|5&3800", + "attribute": "1&3000|2&400|4&400|5&400", "skill": 0, "seid": 0, "star": 0, "spine": 0, "bossStage": 0, - "addbuff": "1&0" + "addbuff": "1&0", + "bloodShow": "1&0" }, { "warId": 8008, "actorName": "皇宫禁卫鬼侍", "actorId": 3207, - "dataId": 1505, + "dataId": 2005, "relation": 2, "outIndex": 4, "dirction": 0, - "x": 9, + "x": 11, "y": 5, - "var": 1505, + "var": 2005, "lv": 32, "hide": 0, "initial_ai": 1, - "attribute": "1&12400|2&6000|4&4100|5&3800", + "attribute": "1&3000|2&400|4&400|5&400", "skill": 0, "seid": 0, "star": 0, "spine": 0, "bossStage": 0, - "addbuff": "1&0" + "addbuff": "1&0", + "bloodShow": "1&0" } ] \ No newline at end of file