Просмотр исходного кода

GlobalConfig中SceneType改成AppType,跟服务的一致

tanghai 2 лет назад
Родитель
Сommit
31b784214f

+ 2 - 2
Unity/Assets/Resources/GlobalConfig.asset

@@ -12,6 +12,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 36527db572638af47b03c805671cba75, type: 3}
   m_Name: GlobalConfig
   m_EditorClassIdentifier: 
-  CodeMode: 1
+  CodeMode: 3
   BuildType: 1
-  SceneType: LockStep
+  AppType: 8

+ 3 - 0
Unity/Assets/Scripts/Core/Module/Options/Options.cs

@@ -13,6 +13,9 @@ namespace ET
         Proto2CS,
         BenchmarkClient,
         BenchmarkServer,
+        
+        Demo,
+        LockStep,
     }
     
     public class Options: Singleton<Options>

+ 1 - 1
Unity/Assets/Scripts/HotfixView/Client/Demo/EntryEvent3_InitClient.cs

@@ -13,7 +13,7 @@ namespace ET.Client
 
             await ResourcesComponent.Instance.LoadBundleAsync("unit.unity3d");
 
-            SceneType sceneType = EnumHelper.FromString<SceneType>(GlobalComponent.Instance.GlobalConfig.SceneType);
+            SceneType sceneType = EnumHelper.FromString<SceneType>(GlobalComponent.Instance.GlobalConfig.AppType.ToString());
             
             Scene clientScene = await SceneFactory.CreateClientScene(1, sceneType, sceneType.ToString());
             

+ 1 - 1
Unity/Assets/Scripts/Loader/MonoBehaviour/GlobalConfig.cs

@@ -23,6 +23,6 @@ namespace ET
         
         public BuildType BuildType;
 
-        public string SceneType;
+        public AppType AppType;
     }
 }