Bläddra i källkod

修改部分log及编译问题

大爷 2 år sedan
förälder
incheckning
dfb4cd98c4

+ 1 - 1
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/Scene/SceneChangeStart_AddComponent.cs

@@ -10,7 +10,7 @@ namespace ET.Client
             Scene currentScene = scene.CurrentScene();
             
             // 加载场景资源
-            await ResourcesComponent.Instance.LoadBundleAsync($"{currentScene.Name}.unity3d");
+            //await ResourcesComponent.Instance.LoadBundleAsync($"{currentScene.Name}.unity3d");
             // 切换到map场景
 
             await SceneManager.LoadSceneAsync(currentScene.Name);

+ 4 - 3
Unity/Assets/Scripts/Core/Module/Config/ConfigComponent.cs

@@ -78,13 +78,14 @@ namespace ET
 			{
 				category.Register();
 			}
-		}
+            Log.Debug("register all config ok");
+        }
 		
 		private void LoadOneInThread(Type configType, byte[] oneConfigBytes)
 		{
 			object category = SerializeHelper.Deserialize(configType, oneConfigBytes, 0, oneConfigBytes.Length);
-			
-			lock (this)
+            Log.Debug($"Deserialize: {configType} ok");
+            lock (this)
 			{
 				this.allConfig[configType] = category as ISingleton;	
 			}

+ 1 - 1
Unity/Assets/Scripts/Core/Serialize/MongoHelper.cs

@@ -106,7 +106,7 @@ namespace ET
                     continue;
                 }
 
-                Log.Debug($"LookupClassMap: {type.Name}");
+                //Log.Debug($"LookupClassMap: {type.Name}");
                 BsonClassMap.LookupClassMap(type);
             }
         }

+ 1 - 1
Unity/Assets/Scripts/Editor/ServerCommandLineEditor/ServerCommandLineEditor.cs

@@ -28,7 +28,7 @@ namespace ET
 
         public void OnEnable()
         {
-            DirectoryInfo directoryInfo = new DirectoryInfo("../Config/Excel/s/StartConfig");
+            DirectoryInfo directoryInfo = new DirectoryInfo("../Config/GenFromExcel/s/StartConfig");
             this.startConfigs = directoryInfo.GetDirectories().Select(x => x.Name).ToArray();
         }
 

+ 2 - 1
Unity/Assets/Scripts/Empty/Model/Unity.Model.asmdef

@@ -5,7 +5,8 @@
         "Unity.ThirdParty",
         "Unity.Core",
         "Unity.Mathematics",
-        "FairyGUI.Runtime"
+        "FairyGUI.Runtime",
+        "UniTask"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

+ 4 - 1
Unity/Assets/Scripts/Empty/ModelView/Unity.ModelView.asmdef

@@ -6,7 +6,10 @@
         "Unity.ThirdParty",
         "Unity.Core",
         "Unity.Mathematics",
-        "Unity.Loader"
+        "Unity.Loader",
+        "UniTask",
+        "UniTask.YooAsset",
+        "YooAsset"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

+ 2 - 1
Unity/Assets/Scripts/Loader/CodeLoader.cs

@@ -102,6 +102,7 @@ namespace ET
             foreach (var task in rawFileOperations)
             {
                 var ret = RuntimeApi.LoadMetadataForAOTAssembly(task.GetRawBytes(), HomologousImageMode.SuperSet);
+                if (ret != LoadImageErrorCode.OK)
                 {
                     Log.Error($"Error occurs when loadMetadataForAOT: {ret}");
                 }
@@ -129,4 +130,4 @@ namespace ET
             start.Run();
         }
     }
-}
+}