部分不热更的代码挪到Mono程序集中

Robot/Model/Robot.Model.csproj

@@ -33,6 +33,10 @@
             <Link>Core\%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
 
+        <Compile Include="..\..\Unity\Assets\Mono\Core\**\*.cs"> 
+            <Link>Core\%(RecursiveDir)%(FileName)%(Extension)</Link>
+        </Compile>
+
         <Compile Include="..\..\Unity\Assets\Model\Module\AI\**\*.cs">
             <Link>Module\AI\%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>

Server/Model/Server.Model.csproj

@@ -30,6 +30,11 @@
       <Link>Core\%(RecursiveDir)%(FileName)%(Extension)</Link>
     </Compile>
 
+    <Compile Include="..\..\Unity\Assets\Mono\Core\**\*.cs">
+      <Link>Core\%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Compile>
+    
+
     <Compile Include="..\..\Unity\Assets\Model\Demo\Move\MoveComponent.cs">
       <Link>Demo\Move\MoveComponent.cs</Link>
     </Compile>

Unity/Assets/Hotfix/Unity.Hotfix.asmdef

@@ -3,7 +3,8 @@
     "rootNamespace": "ET",
     "references": [
         "Unity.Model",
-        "Unity.ThirdParty"
+        "Unity.ThirdParty",
+        "Unity.Mono"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

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

@@ -0,0 +1,22 @@
+namespace ET
+{
+    public static class ETCancelationTokenHelper
+    {
+        public static async ETVoid CancelAfter(this ETCancellationToken self, long afterTimeCancel)
+        {
+            if (self.IsCancel())
+            {
+                return;
+            }
+
+            await TimerComponent.Instance.WaitAsync(afterTimeCancel);
+            
+            if (self.IsCancel())
+            {
+                return;
+            }
+            
+            self.Cancel();
+        }
+    }
+}

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

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

Unity/Assets/Model/Core/Helper/MethodInfoHelper.cs

@@ -1,26 +0,0 @@
-using System.Reflection;
-
-namespace ET
-{
-	public static class MethodInfoHelper
-	{
-		public static void Run(this MethodInfo methodInfo, object obj, params object[] param)
-		{
-
-			if (methodInfo.IsStatic)
-			{
-				object[] p = new object[param.Length + 1];
-				p[0] = obj;
-				for (int i = 0; i < param.Length; ++i)
-				{
-					p[i + 1] = param[i];
-				}
-				methodInfo.Invoke(null, p);
-			}
-			else
-			{
-				methodInfo.Invoke(obj, param);
-			}
-		}
-	}
-}

Unity/Assets/Model/Core/Helper/MethodInfoHelper.cs.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: f6c057a0a9e5e6e4f869e977024352d4
-timeCreated: 1479721303
-licenseType: Pro
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Model/Core/Log/FileLogger.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 974211e5d43ce494397b2aaa91de6203
+guid: 39b9a5c0c04074fe98a07efb8e5c32b5
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Model/Core/Log/ILog.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b1faf3edb0de4f74c9eb003e4107057f
+guid: 04b6d875b4e1c40b2b52e9cee81e0a05
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Model/Core/Log/Log.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a4f756ded1750bd4ab42950ee5eb2c2c
+guid: aa77a53f7692e427ca51ef0715e44731
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Model/Core/Log/LogHelper.cs

@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-#if !SERVER
-namespace ET
-{
-    public static class LogHelper
-    {
-        public static void Debug(this Entity entity, string msg)
-        {
-            Log.Debug($"Zone:{entity.DomainZone()} | {msg}");
-        }
-
-        public static void Info(this Entity entity, string msg)
-        {
-            Log.Info($"Zone:{entity.DomainZone()} | {msg}");
-        }
-
-        public static void Error(this Entity entity, string msg)
-        {
-            Log.Info($"Zone:{entity.DomainZone()} | {msg}");
-            Log.Error($"Zone:{entity.DomainZone()} | {msg}");
-        }
-
-        public static void Trace(this Entity entity, string msg)
-        {
-            Log.Trace($"Zone:{entity.DomainZone()} | {msg}");
-        }
-
-        public static void TraceInfo(this Entity entity, string msg)
-        {
-            Log.TraceInfo($"Zone:{entity.DomainZone()} | {msg}");
-        }
-    }
-}
-#endif

Unity/Assets/Model/Core/Log/NLogger.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8728892c1e1827249896f12655525133
+guid: 9624ce3c50cbe4f2e870f3c112593da7
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Model/Core/Log/UnityLogger.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3370a9e64c81ab24485a544494ea3b9c
+guid: 8c476c26d329746f699866f1033a4141
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Model/Core/Helper/IdGenerater.cs.meta → Unity/Assets/Model/Core/Object/IdGenerater.cs.meta

@@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: 1418e246bc45e154ea76c01c5638e667
-timeCreated: 1474942922
-licenseType: Pro
+guid: c78c8a5172ba24af3b0ebb528d203057
 MonoImporter:
+  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Unity/Assets/Model/Core/Helper/ProtobufHelper.cs.meta → Unity/Assets/Model/Core/ProtobufHelper.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bb7d09256bcb09a438c110b9caa3b78b
+guid: 792302fb6ddd040ee8c2974c0d0ba0c8
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Model/Core/Helper/TimeHelper.cs.meta → Unity/Assets/Model/Core/TimeHelper.cs.meta

@@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: d84339e3b40f2b9418d7c60a62f9c50a
-timeCreated: 1474945123
-licenseType: Pro
+guid: d32ee27f6a0354cd28851cf89d404416
 MonoImporter:
+  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Unity/Assets/Model/Unity.Model.asmdef

@@ -2,7 +2,8 @@
     "name": "Unity.Model",
     "rootNamespace": "ET",
     "references": [
-        "Unity.ThirdParty"
+        "Unity.ThirdParty",
+        "Unity.Mono"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Unity/Assets/Mono/Async.meta

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

Unity/Assets/Mono/Core.meta

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

Unity/Assets/Mono/Core/Async.meta

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

Unity/Assets/Model/Core/Async/AsyncETTaskCompletedMethodBuilder.cs → Unity/Assets/Mono/Core/Async/AsyncETTaskCompletedMethodBuilder.cs

@@ -21,9 +21,13 @@ namespace ET
         // 3. SetException
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         [DebuggerHidden]
-        public void SetException(Exception exception)
+        public void SetException(Exception e)
         {
-            Log.Error(exception);
+#if NOT_UNITY
+            Log.Error(e);
+#else
+            UnityEngine.Debug.LogError(e);
+#endif
         }
 
         // 4. SetResult

Unity/Assets/Model/Core/Async/AsyncETVoidMethodBuilder.cs → Unity/Assets/Mono/Core/Async/AsyncETVoidMethodBuilder.cs

@@ -23,9 +23,13 @@ namespace ET
         // 3. SetException
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         [DebuggerHidden]
-        public void SetException(Exception exception)
+        public void SetException(Exception e)
         {
-            Log.Error(exception);
+#if NOT_UNITY
+            Log.Error(e);
+#else
+            UnityEngine.Debug.LogError(e);
+#endif
         }
 
         // 4. SetResult

Unity/Assets/Model/Core/Async/ETCancellationToken.cs → Unity/Assets/Mono/Core/Async/ETCancellationToken.cs

@@ -46,20 +46,12 @@ namespace ET
             }
             catch (Exception e)
             {
+#if NOT_UNITY
                 Log.Error(e);
+#else
+                UnityEngine.Debug.LogError(e);
+#endif
             }
         }
-
-        public async ETVoid CancelAfter(long afterTimeCancel)
-        {
-            if (this.actions == null)
-            {
-                return;
-            }
-
-            await TimerComponent.Instance.WaitAsync(afterTimeCancel);
-            
-            this.Invoke();
-        }
     }
 }

Unity/Assets/Mono/Core/Helper.meta

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

Unity/Assets/Model/Core/Helper/ObjectHelper.cs → Unity/Assets/Mono/Core/Helper/ObjectHelper.cs

@@ -4,9 +4,7 @@
 	{
 		public static void Swap<T>(ref T t1, ref T t2)
 		{
-			T t3 = t1;
-			t1 = t2;
-			t2 = t3;
+			(t1, t2) = (t2, t1);
 		}
 	}
 }

Unity/Assets/Mono/Helper.meta

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

Unity/Assets/Mono/Unity.Mono.asmdef

@@ -1,10 +1,12 @@
 {
     "name": "Unity.Mono",
     "rootNamespace": "ET",
-    "references": [],
+    "references": [
+        "GUID:bebd02018e98e44409a761968a7cbcd9"
+    ],
     "includePlatforms": [],
     "excludePlatforms": [],
-    "allowUnsafeCode": false,
+    "allowUnsafeCode": true,
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": true,

Unity/Unity.Mono.csproj

@@ -31,7 +31,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn></NoWarn>
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -41,7 +41,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn></NoWarn>
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup>
@@ -52,12 +52,32 @@
     <ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades>
   </PropertyGroup>
   <ItemGroup>
+     <Compile Include="Assets\Mono\Core\Helper\NetworkHelper.cs" />
      <Compile Include="Assets\Mono\MonoBehaviour\Init.cs" />
+     <Compile Include="Assets\Mono\Core\Async\ETCancellationToken.cs" />
      <Compile Include="Assets\Mono\MonoBehaviour\ReferenceCollector.cs" />
+     <Compile Include="Assets\Mono\Core\Helper\EnumHelper.cs" />
+     <Compile Include="Assets\Mono\Core\Async\ETTask.cs" />
+     <Compile Include="Assets\Mono\Core\Helper\FileHelper.cs" />
+     <Compile Include="Assets\Mono\Core\Async\AsyncETVoidMethodBuilder.cs" />
+     <Compile Include="Assets\Mono\Core\Async\AsyncMethodBuilderAttribute.cs" />
      <Compile Include="Assets\Mono\MonoBehaviour\UILayerScript.cs" />
+     <Compile Include="Assets\Mono\Core\Helper\ByteHelper.cs" />
+     <Compile Include="Assets\Mono\Core\Async\IAwaiter.cs" />
+     <Compile Include="Assets\Mono\Core\Helper\JsonHelper.cs" />
+     <Compile Include="Assets\Mono\Core\Helper\RandomHelper.cs" />
      <Compile Include="Assets\Mono\MonoBehaviour\GizmosDebug.cs" />
+     <Compile Include="Assets\Mono\Core\Async\AsyncETTaskCompletedMethodBuilder.cs" />
+     <Compile Include="Assets\Mono\Core\Helper\ZipHelper.cs" />
+     <Compile Include="Assets\Mono\Core\Async\AsyncETTaskMethodBuilder.cs" />
+     <Compile Include="Assets\Mono\Core\Helper\MD5Helper.cs" />
+     <Compile Include="Assets\Mono\Core\Helper\ObjectHelper.cs" />
+     <Compile Include="Assets\Mono\Core\Async\ETVoid.cs" />
+     <Compile Include="Assets\Mono\Core\Async\ETTaskCompleted.cs" />
      <Compile Include="Assets\Mono\MonoBehaviour\ComponentView.cs" />
      <Compile Include="Assets\Mono\MonoBehaviour\CanvasConfig.cs" />
+     <Compile Include="Assets\Mono\Core\Helper\StringHelper.cs" />
+     <Compile Include="Assets\Mono\Core\Async\ETTaskHelper.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>
@@ -652,6 +672,10 @@
  </Reference>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="Unity.ThirdParty.csproj">
+      <Project>{d2ad5be1-263a-9a30-ab0f-dc5b08044350}</Project>
+      <Name>Unity.ThirdParty</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.