战力计算

shared/pubUtils/gamedata.ts

@@ -27,8 +27,9 @@ const blueprtToWar = new Map<number, number>();
 const goodInfo = new Map<number, any>();
 const blueprt = new Map<number, Array<number>>();
 const blueprtCompose = new Map<number, any>();
-const fiendShips = new Map<number, any>();
+const fiendShips = new Map<string, any>();
 const fashions = new Map<number, any>();
+const fiendShipHidAandIds = new Map<number, {actorId: number, level:number}>();
 function parseWarData() {
     let result = null;
     for (let filename of wars) {
@@ -254,7 +255,13 @@ function parseFiendShips() {
     const data = gamedata['jsons'][file] || [];
     data.forEach(elem => {
         if (elem && elem.id) {
-            fiendShips.set(elem.id, elem);
+            let hids = elem.memberId.split('|');
+            elem.hids = hids;
+            delete elem.memberId;
+            fiendShips.set(elem.shipId + '_' + elem.level, elem);
+            let fiendShipHidAandId = fiendShipHidAandIds.get(elem.shipId);
+            if (!fiendShipHidAandId || fiendShipHidAandId.level < elem.level)
+                fiendShipHidAandIds.set(elem.shipId, {actorId: elem.actorId, level: elem.level});
         }
     });
 }
@@ -279,7 +286,7 @@ function initData (folder: string) {
         var name = file.split('.')[0];
         try {
             gamedata[folder][name] = JSON.parse(
-                fs.readFileSync(path.resolve(__dirname, "../resource/" + folder + "/" + file)).toString()
+                fs.readFileSync(path.resolve(__dirname, "../resource/" + folder + "/" + file)).toString('utf8').replace(/^\uFEFF/, '')
             );
         } catch(e) {
             console.error(e);
@@ -361,6 +368,7 @@ export function getJobInfoById(jid: number) {
     const jobInfo = jobInfos.get(jid);
     return jobInfo;
 }
+
 export function getMaxGradeByjobClass(jobClass: number) {
     const job = jobClassMaxGrades.get(jobClass);
     return job?.jobid;
@@ -474,8 +482,13 @@ export function getBlueprtComposeByQuality(quality: number) {
 export function getFashionsById(id:number) {
     return fashions.get(id);
 }
-export function getFriendShipById(id:number) {
-    return fiendShips.get(id);
+
+export function getFriendShipById(shipId: number, level: number) {
+    return fiendShips.get(shipId +'_' + level);
+}
+
+export function getHidAndLevelByShipId(shipId: number) {
+    return fiendShipHidAandIds.get(shipId);
 }
 
 export function getFriendShipLevels() {
@@ -483,6 +496,6 @@ export function getFriendShipLevels() {
     return gamedata['jsons'][file] || [];
 }
 
-export function getJobByGradeAndClass(jobClass:number, grade: number) {
+export function getJobByGradeAndClass(jobClass: number, grade: number) {
     return jobClassAndgrades.get(jobClass +'_' + grade);
 }