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

ILRuntime set current thread id for profiler

tanghai 4 лет назад
Родитель
Сommit
9326784f37

+ 3 - 0
Unity/Assets/Mono/CodeLoader.cs

@@ -58,6 +58,9 @@ namespace ET
 					//byte[] pdbBytes = File.ReadAllBytes(Path.Combine("../Unity/", Define.BuildOutputDir, "Code.pdb"));
 				
 					appDomain = new ILRuntime.Runtime.Enviorment.AppDomain();
+#if DEBUG && (UNITY_EDITOR || UNITY_ANDROID || UNITY_IPHONE)
+					this.appDomain.UnityMainThreadID = System.Threading.Thread.CurrentThread.ManagedThreadId;
+#endif
 					MemoryStream assStream = new MemoryStream(assBytes);
 					MemoryStream pdbStream = new MemoryStream(pdbBytes);
 					appDomain.LoadAssembly(assStream, pdbStream, new ILRuntime.Mono.Cecil.Pdb.PdbReaderProvider());

+ 52 - 0
Unity/Assets/Plugins/x86_64/libkcp.so.meta

@@ -0,0 +1,52 @@
+fileFormatVersion: 2
+guid: de9329d47deb3b34ba85f39aeb8d4da1
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+        DefaultValueInitialized: true
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 1
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Unity/Packages/manifest.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "com.unity.ide.rider": "3.0.7",
-    "com.unity.ide.visualstudio": "2.0.11",
+    "com.unity.ide.visualstudio": "2.0.12",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.6.2",
     "com.unity.ugui": "1.0.0",

+ 1 - 1
Unity/Packages/packages-lock.json

@@ -17,7 +17,7 @@
       "url": "https://packages.unity.cn"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.11",
+      "version": "2.0.12",
       "depth": 0,
       "source": "registry",
       "dependencies": {

+ 2 - 2
Unity/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2020.3.23f1c1
-m_EditorVersionWithRevision: 2020.3.23f1c1 (67850fddc0e1)
+m_EditorVersion: 2020.3.26f1c1
+m_EditorVersionWithRevision: 2020.3.26f1c1 (cf0e0a163043)

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
Unity/Unity.Mono.csproj


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
Unity/Unity.ThirdParty.csproj


Некоторые файлы не были показаны из-за большого количества измененных файлов