ThreadSynchronizationContext跟ProcessHelper放到mono层

Tools/Proto2CS/Program.cs

@@ -66,7 +66,6 @@ namespace ET
             sb.Append("{\n");
 
             bool isMsgStart = false;
-            string parentClass = "";
             foreach (string line in s.Split('\n'))
             {
                 string newline = line.Trim();
@@ -90,7 +89,7 @@ namespace ET
 
                 if (newline.StartsWith("message"))
                 {
-                    parentClass = "";
+                    string parentClass = "";
                     isMsgStart = true;
                     string msgName = newline.Split(splitChars, StringSplitOptions.RemoveEmptyEntries)[1];
                     string[] ss = newline.Split(new[] { "//" }, StringSplitOptions.RemoveEmptyEntries);

Tools/Proto2CS/Proto2CS.csproj

@@ -24,9 +24,6 @@
 
     <ItemGroup>
       <Compile Remove=".vs\**" />
-      <Compile Include="..\..\Unity\Assets\Model\Core\ProcessHelper.cs">
-        <Link>ProcessHelper.cs</Link>
-      </Compile>
     </ItemGroup>
 
     <ItemGroup>

Unity/Assets/Model/Core/Async/ETCancelationTokenHelper.cs.meta → Unity/Assets/Model/Core/ETCancelationTokenHelper.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 22afc7742f9274e1db0c7eda8c867883
+guid: a38ce9aae34c0471c8999f491d1d006d
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Model/Core/Helper.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f798859b298d44d02b304fdf960f0c0a
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/ModelView/Demo/Entry.cs

@@ -11,8 +11,6 @@ namespace ET
 		{
 			try
 			{
-				SynchronizationContext.SetSynchronizationContext(ThreadSynchronizationContext.Instance);
-
 				string[] assemblyNames = { "Unity.Model.dll", "Unity.Hotfix.dll", "Unity.ModelView.dll", "Unity.HotfixView.dll" };
 				
 				foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())

Unity/Assets/Mono/Async.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 51f11fcb95b364027b92a6baf227be96
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Model/Core/ProcessHelper.cs.meta → Unity/Assets/Mono/Core/Helper/ProcessHelper.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 00776f30e655841a7b02fe4d63214c0e
+guid: 8f6f1dd88f9c6457dad5db960404a12b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Model/Core/ThreadSynchronizationContext.cs → Unity/Assets/Mono/Core/ThreadSynchronizationContext.cs

@@ -35,7 +35,11 @@ namespace ET
                 }
                 catch (Exception e)
                 {
+#if NOT_UNITY
                     Log.Error(e);
+#else
+                    UnityEngine.Debug.LogError(e);
+#endif
                 }
             }
         }
@@ -53,9 +57,13 @@ namespace ET
                 {
                     action();
                 }
-                catch (Exception ex)
+                catch (Exception e)
                 {
-                    Log.Error(ex);
+#if NOT_UNITY
+                    Log.Error(e);
+#else
+                    UnityEngine.Debug.LogError(e);
+#endif
                 }
 
                 return;

Unity/Assets/Model/Core/ThreadSynchronizationContext.cs.meta → Unity/Assets/Mono/Core/ThreadSynchronizationContext.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1e2c69592e0af46f696aa02a097dbc1d
+guid: b298acf68974f43389f4468ec8d37ff0
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Mono/Helper.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1debe666c99f04876bbd3e1c114d18f1
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Mono/MonoBehaviour/Init.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Reflection;
+using System.Threading;
 using UnityEngine;
 
 namespace ET
@@ -18,6 +19,8 @@ namespace ET
 		
 		private void Awake()
 		{
+			SynchronizationContext.SetSynchronizationContext(ThreadSynchronizationContext.Instance);
+			
 			DontDestroyOnLoad(gameObject);
 			
 			Assembly modelAssembly = null;

Unity/Unity.Mono.csproj

@@ -78,6 +78,8 @@
      <Compile Include="Assets\Mono\MonoBehaviour\CanvasConfig.cs" />
      <Compile Include="Assets\Mono\Core\Helper\StringHelper.cs" />
      <Compile Include="Assets\Mono\Core\Async\ETTaskHelper.cs" />
+     <Compile Include="Assets\Mono\Core\ThreadSynchronizationContext.cs" />
+     <Compile Include="Assets\Mono\Core\Helper\ProcessHelper.cs" />
      <None Include="Assets\Mono\Unity.Mono.asmdef" />
  <Reference Include="UnityEngine">
  <HintPath>/Applications/Unity/Hub/Editor/2020.3.11f1c1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.dll</HintPath>