演武台：boss血量修改

shared/db/Role.ts

@@ -699,7 +699,7 @@ export default class Role extends BaseModel {
     public static async getActivePlayers(serverId: number) {
         let yesterday = <Date>getTimeFunD().getBeforeDayWithHour(1);
         const roles: RoleType[] = await RoleModel.find({ serverId, updatedAt: { $gte: yesterday } })
-            .select('topLineup topLineupCe')
+            .select('roleId ce topLineup topLineupCe guildCode hasGuild')
             .sort({ ce: -1 }).lean();
         return roles
     }

shared/db/ServerRecords.ts

@@ -7,17 +7,26 @@ export class ActivePlayer {
   @prop({ required: true })
   roleId: string;
   @prop({ required: true })
+  ce: number;
+  @prop({ required: true })
   topLineupCe: number;
   @prop({ required: true, type: TopHero, default: [], _id: false })
   topLineup: Array<TopHero>;							// 总战力
   
   constructor(role: RoleType) {
     this.roleId = role.roleId;
+    this.ce = role.ce;
     this.topLineupCe = role.topLineupCe;
     this.topLineup = role.topLineup;
   }
 }
 
+export class GuildRecord {
+  @prop({ required: true })
+  guildCode: string;
+  @prop({ required: true, type: ActivePlayer, _id: false })
+  players: ActivePlayer[];
+}
 
 /**
   * 游戏字段接口
@@ -44,16 +53,18 @@ export default class ServerRecord extends BaseModel {
   @prop({ required: true, type: String, default: [] })
   activeGuildCodes: string[];          // 前一天参与军团活动的军团
 
+  @prop({ required: true, type: GuildRecord, _id: false })
+  activeGuilds: GuildRecord[];
+
   public static async updateData(serverId: number, update: ServerRecordUpdate) {
     let today = getZeroPoint();
-    const doc = new ServerRecordModel();
-    let rec: ServerRecordType = await ServerRecordModel.findOneAndUpdate({ serverId, today }, { $set: { ...doc.toJSON(), ...update } }, { new: true, upsert: true }).lean();
+    let rec: ServerRecordType = await ServerRecordModel.findOneAndUpdate({ serverId, today }, { $set: update }, { new: true, upsert: true }).lean();
     return rec;
   }
 
   public static async addActiveGuild(serverId: number, guildCode: string) {
     let tomorrow = getZeroPoint() + 86400;
-    let rec: ServerRecordType = await ServerRecordModel.findOneAndUpdate({ serverId, today: tomorrow }, { $addToSet: [guildCode] }, { new: true, upsert: true }).lean();
+    let rec: ServerRecordType = await ServerRecordModel.findOneAndUpdate({ serverId, today: tomorrow }, { $addToSet: { activeGuildCodes: guildCode } }, { new: true, upsert: true }).lean();
     return rec;
   }
 

shared/pubUtils/data.ts

@@ -12,7 +12,7 @@ import { dicQuestion, loadQuestion } from "./dictionary/DicQuestion";
 import { dicSe, loadSe } from "./dictionary/DicSe";
 import { dicTower, loadTower } from "./dictionary/DicTower";
 import { dicTowerTask, loadTowerTask } from "./dictionary/DicTowerTask";
-import { dicWar, dicWarPvp, dicDailyWarByType, loadWar } from "./dictionary/DicWar";
+import { dicWar, dicWarPvp, dicDailyWarByType, loadWar, dicHeroIdByWar } from "./dictionary/DicWar";
 import { dicWarJson, loadWarJson } from "./dictionary/DicWarJson";
 import { dicXunbao, loadXunbao } from "./dictionary/DicXunbao";
 import { AUCTION_TIME } from "../consts";
@@ -247,6 +247,7 @@ export const gameData = {
     jewelCondition: dicJewelCondition,
     blueprt: dicBlueprt,
     blueprtByLv: dicBlueprtByLv,
+    heroIdByWar: dicHeroIdByWar,
 };
 
 // 在此提供一些原先在gamedata中提供的方法，以便更方便获取gameData数据

shared/pubUtils/dictionary/DicStructure.ts

@@ -49,7 +49,7 @@ export interface DicBossBase {
     // boss等级
     readonly bossLevel: number;
     // 关卡id
-    readonly wars: Array<{warId:number, bossHp:number}>;
+    readonly wars: Array<{warId:number, bossHp: number, bossHpRatio:number}>;
     // 掉落的拍卖行奖励
     readonly rewards: number;
     // 
@@ -204,7 +204,7 @@ export function loadStructure() {
                 return;
             }
             let warArr = warStrs.split('&');
-            return { warId: parseInt(warArr[0]), bossHp: parseInt(warArr[1])}
+            return { warId: parseInt(warArr[0]), bossHp: parseInt(warArr[1]), bossHpRatio: parseInt(warArr[2])}
         });
         o.killReward = parseGoodStr(o.killReward);
         o.basicReward = parseGoodStr(o.basicReward);

shared/pubUtils/dictionary/DicWar.ts

@@ -54,10 +54,12 @@ export interface DicWar {
 export const dicWar = new Map<number, DicWar>();
 export const dicWarPvp = new Array<DicWar>();
 export const dicDailyWarByType = new Map<number, DicWar[]>();
+export const dicHeroIdByWar = new Map<number, number>();
 export function loadWar() {
     dicWar.clear();
     dicDailyWarByType.clear();
     dicWarPvp.splice(0, dicWarPvp.length);
+    dicHeroIdByWar.clear();
     for(let filename of WAR_RELATE_TABLES) {
         let arr = readFileAndParse(filename);
     
@@ -93,6 +95,7 @@ export function loadWar() {
                 o.failReward = parseTrainReward(o.failReward);
             }
             dicWar.set(o.war_id, o);
+            if(!!o.heroId) dicHeroIdByWar.set(o.war_id, o.heroId);
         });
     }
 }

shared/resource/jsons/dic_army_bossBase.json

@@ -4,7 +4,7 @@
         "structureId": 3,
         "level": 1,
         "bossLevel": 10,
-        "warIdHP": "8001&10000000|8002&10000000",
+        "warIdHP": "8001&10000000&10|8002&10000000&10",
         "rewards": 1,
         "consume": 50000,
         "buildWords": "&",
@@ -22,7 +22,7 @@
         "structureId": 3,
         "level": 2,
         "bossLevel": 20,
-        "warIdHP": "8005&20000000|8006&20000000",
+        "warIdHP": "8005&20000000&20|8006&20000000&20",
         "rewards": 1,
         "consume": 125000,
         "buildWords": "&",
@@ -40,7 +40,7 @@
         "structureId": 3,
         "level": 3,
         "bossLevel": 30,
-        "warIdHP": "8009&30000000|8010&30000000",
+        "warIdHP": "8009&30000000&30|8010&30000000&30",
         "rewards": 2,
         "consume": 350000,
         "buildWords": "&",
@@ -58,7 +58,7 @@
         "structureId": 3,
         "level": 4,
         "bossLevel": 40,
-        "warIdHP": "8013&40000000|8014&40000000",
+        "warIdHP": "8013&40000000&40|8014&40000000&40",
         "rewards": 2,
         "consume": 800000,
         "buildWords": "&",
@@ -76,7 +76,7 @@
         "structureId": 3,
         "level": 5,
         "bossLevel": 50,
-        "warIdHP": "8017&50000000|8018&50000000",
+        "warIdHP": "8017&50000000&50|8018&50000000&50",
         "rewards": 2,
         "consume": 1700000,
         "buildWords": "&",
@@ -94,7 +94,7 @@
         "structureId": 3,
         "level": 6,
         "bossLevel": 60,
-        "warIdHP": "8021&60000000|8022&60000000",
+        "warIdHP": "8021&60000000&60|8022&60000000&60",
         "rewards": 2,
         "consume": 3500000,
         "buildWords": "&",
@@ -112,7 +112,7 @@
         "structureId": 3,
         "level": 7,
         "bossLevel": 70,
-        "warIdHP": "8025&70000000|8026&70000000",
+        "warIdHP": "8025&70000000&65|8026&70000000&65",
         "rewards": 3,
         "consume": 6125000,
         "buildWords": "&",
@@ -130,7 +130,7 @@
         "structureId": 3,
         "level": 8,
         "bossLevel": 80,
-        "warIdHP": "8029&80000000|8030&80000000",
+        "warIdHP": "8029&80000000&70|8030&80000000&70",
         "rewards": 3,
         "consume": 9125000,
         "buildWords": "&",
@@ -148,7 +148,7 @@
         "structureId": 3,
         "level": 9,
         "bossLevel": 90,
-        "warIdHP": "8033&90000000|8034&90000000",
+        "warIdHP": "8033&90000000&75|8034&90000000&75",
         "rewards": 3,
         "consume": 13625000,
         "buildWords": "&",
@@ -166,7 +166,7 @@
         "structureId": 3,
         "level": 10,
         "bossLevel": 100,
-        "warIdHP": "8037&100000000|8038&100000000",
+        "warIdHP": "8037&100000000&80|8038&100000000&80",
         "rewards": 3,
         "consume": 99999999,
         "buildWords": "&",