From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version

---
 Main/System/Battle/BattleFieldFactory.cs |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/Main/System/Battle/BattleFieldFactory.cs b/Main/System/Battle/BattleFieldFactory.cs
index b12531c..a228d18 100644
--- a/Main/System/Battle/BattleFieldFactory.cs
+++ b/Main/System/Battle/BattleFieldFactory.cs
@@ -1,3 +1,4 @@
+using Cysharp.Threading.Tasks;
 using LitJson;
 using System;
 using System.Collections;
@@ -7,7 +8,7 @@
 public static class BattleFieldFactory
 {
 
-    public static BattleField CreateBattleField(string guid, int MapID, int FuncLineID, JsonData extendData, List<TeamBase> redTeamList, List<TeamBase> blueTeamList)
+    public static async UniTask<BattleField> CreateBattleField(string guid, int MapID, int FuncLineID, JsonData extendData, List<TeamBase> redTeamList, List<TeamBase> blueTeamList)
     {
         BattleField battleField = null;
 
@@ -29,10 +30,21 @@
             case 30020:
                 battleField = new TianziBillboradBattleField(guid);
                 break;
+            case 30030:
+                battleField = new WarlordPavilionBattleField(guid);
+                break;
+            case 30000:
+                battleField = new PriviewBattleField(guid);
+                break;
+            case 32000:
+                battleField = new QYBattleField(guid);
+                break;
             default:
                 break;
         }
 
+        await battleField.LoadRoot();
+
         return battleField;
     }
 

--
Gitblit v1.8.0