From c638a27def5ca4de47fe07707e6a8c24f2a29dcc Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Mon, 14 Aug 2023 15:24:51 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E9=98=B2=E7=A0=B4=E8=A7=A3)?=
 =?UTF-8?q?:=20=E5=8F=AF=E8=B7=B3=E8=BF=87=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/servers/battle/handler/normalBattleHandler.ts       | 6 +++---
 shared/pubUtils/dictionary/DicWar.ts                        | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/game-server/app/servers/battle/handler/normalBattleHandler.ts b/game-server/app/servers/battle/handler/normalBattleHandler.ts
index 6b1ee1daf..87c15a038 100644
--- a/game-server/app/servers/battle/handler/normalBattleHandler.ts
+++ b/game-server/app/servers/battle/handler/normalBattleHandler.ts
@@ -601,7 +601,7 @@ export class NormalBattleHandler {
         if(!role) return resResult(STATUS.ROLE_NOT_FOUND);
         let { warStar, vipStartTime } = role;
 
-        if(!vipStartTime || vipStartTime == 0) {
+        if((!vipStartTime || vipStartTime == 0) && role.lv <= 30) {
             return resResult(STATUS.SUCCESS, {
                 battleCode,
                 canSkip: false
@@ -624,11 +624,11 @@ export class NormalBattleHandler {
                 canSkip = false;
                 break;
             case WAR_TYPE.NORMAL:
-                canSkip = dicWar.chapter != 0 && hasPass;
+                canSkip = dicWar.isCity? (dicWar.chapter != 0 && hasPass): true;
                 break;
             case WAR_TYPE.MAIN_ELITE:
             case WAR_TYPE.MYSTERY:
-                canSkip = hasPass;
+                canSkip = dicWar.isCity? hasPass: true;
                 break;
             case WAR_TYPE.ACT_TREASURE_HUNT:
             case WAR_TYPE.ACT_SELF_SHOP:
diff --git a/shared/pubUtils/dictionary/DicWar.ts b/shared/pubUtils/dictionary/DicWar.ts
index fb5c63dcc..d2570a3a8 100644
--- a/shared/pubUtils/dictionary/DicWar.ts
+++ b/shared/pubUtils/dictionary/DicWar.ts
@@ -56,6 +56,7 @@ export interface DicWar {
     // 显示
     readonly selectView: number;
     readonly level: number;
+    readonly isCity: boolean;
 }
 
 export interface DicComBattleReward {
@@ -126,9 +127,10 @@ export function loadWar() {
                 }
                 dicComBattleReward.set(o.war_id, reward);
             }
-            dicWar.set(o.war_id, o);
             if(!!o.heroId) dicHeroIdByWar.set(o.war_id, o.heroId);
             if(o.HeroNum) o.minHeroNum = parseInt(o.HeroNum.split('&')[0]);
+            o.isCity = o.iconInMap? o.iconInMap.startsWith('city&'): false;
+            dicWar.set(o.war_id, o);
         });
     }
 }