主线：添加warType

game-server/app/services/normalBattleService.ts

@@ -195,28 +195,31 @@ export async function getBattleList(role: RoleType, type: number) {
     return result;
 }
 
-export function getStarOfChapter(warStar: WarStar[]) {
-    let map = new Map<number, number>();
+export function getStarOfChapter(warStar: WarStar[], warTye: number, chapter: number) {
+    let starOfChapter = 0
     for(let { id, star } of warStar ) {
         let dicWar = gameData.war.get(id);
-        if(dicWar.warType == WAR_TYPE.NORMAL && star > 0) {
-            if(!map.has(dicWar.chapter)) {
-                map.set(dicWar.chapter, star);
-            } else {
-                map.set(dicWar.chapter, map.get(dicWar.chapter) + star);
-            }
+        if(dicWar.warType == warTye && star > 0) {
+            starOfChapter += star;
         }
     }
-    return map;
+    return starOfChapter;
 }
 
 export function getMainChapter(role: RoleType) {
-    let chapterMap = getStarOfChapter(role.warStar);
-    let chapterArr: { chapter: number, star: number }[] = [];
-    for(let [ chapter, star ] of chapterMap) {
-        chapterArr.push({ chapter, star });
+    let chapterArr: { chapter: number, star: number, warType: number }[] = [];
+    for(let { id, star } of role.warStar ) {
+        let dicWar = gameData.war.get(id);
+        if((dicWar.warType == WAR_TYPE.NORMAL || dicWar.warType == WAR_TYPE.MAIN_ELITE) && star > 0) {
+            let curChapter = chapterArr.find(cur => cur.warType == dicWar.warType && cur.chapter == dicWar.chapter);
+            if(!curChapter) {
+                chapterArr.push({ chapter: dicWar.chapter, star, warType: dicWar.warType });
+            } else {
+                curChapter.star += star;
+            }
+        }
     }
-
+    
     return {
         star: chapterArr,
         receivedBox: role.receivedBox||[],