فهرست منبع

加回ThirdParty,编译通过

tanghai 1 سال پیش
والد
کامیت
91621b83b5
43فایلهای تغییر یافته به همراه221 افزوده شده و 56 حذف شده
  1. 1 1
      DotNet/App/Program.cs
  2. 5 19
      DotNet/Core/DotNet.Core.csproj
  3. 2 0
      DotNet/Loader/CodeLoader.cs
  4. 1 0
      DotNet/Loader/DotNet.Loader.csproj
  5. 1 19
      DotNet/ThirdParty/DotNet.ThirdParty.csproj
  6. 135 0
      ET.sln
  7. 1 1
      Share/Analyzer/Share.Analyzer.csproj
  8. 4 4
      Share/Share.SourceGenerator/Share.SourceGenerator.csproj
  9. 1 1
      Share/Tool/Init.cs
  10. 1 1
      Unity/Directory.Build.props
  11. BIN
      Unity/Packages/com.et.core/Plugins/Share.SourceGenerator.dll
  12. 2 1
      Unity/Packages/com.et.core/Scripts/Core/Unity.Core.asmdef
  13. 2 1
      Unity/Packages/com.et.loader/Scripts/Editor/Unity.Editor.asmdef
  14. 2 1
      Unity/Packages/com.et.loader/Scripts/Loader/Unity.Loader.asmdef
  15. 8 0
      Unity/Packages/com.et.thirdparty/Scripts.meta
  16. 0 0
      Unity/Packages/com.et.thirdparty/Scripts/ETTask.meta
  17. 0 0
      Unity/Packages/com.et.thirdparty/Scripts/ETTask/AsyncETTaskCompletedMethodBuilder.cs
  18. 0 0
      Unity/Packages/com.et.thirdparty/Scripts/ETTask/AsyncETTaskCompletedMethodBuilder.cs.meta
  19. 0 0
      Unity/Packages/com.et.thirdparty/Scripts/ETTask/AsyncETTaskMethodBuilder.cs
  20. 0 0
      Unity/Packages/com.et.thirdparty/Scripts/ETTask/AsyncETTaskMethodBuilder.cs.meta
  21. 0 0
      Unity/Packages/com.et.thirdparty/Scripts/ETTask/AsyncETVoidMethodBuilder.cs
  22. 0 0
      Unity/Packages/com.et.thirdparty/Scripts/ETTask/AsyncETVoidMethodBuilder.cs.meta
  23. 0 0
      Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETCancellationToken.cs
  24. 0 0
      Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETCancellationToken.cs.meta
  25. 0 4
      Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETTask.cs
  26. 0 0
      Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETTask.cs.meta
  27. 0 0
      Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETTaskCompleted.cs
  28. 0 0
      Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETTaskCompleted.cs.meta
  29. 0 0
      Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETTaskHelper.cs
  30. 0 0
      Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETTaskHelper.cs.meta
  31. 0 0
      Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETVoid.cs
  32. 0 0
      Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETVoid.cs.meta
  33. 0 0
      Unity/Packages/com.et.thirdparty/Scripts/ETTask/IAwaiter.cs
  34. 0 0
      Unity/Packages/com.et.thirdparty/Scripts/ETTask/IAwaiter.cs.meta
  35. 0 1
      Unity/Packages/com.et.thirdparty/Scripts/ETTask/StateMachineWrap.cs
  36. 0 0
      Unity/Packages/com.et.thirdparty/Scripts/ETTask/StateMachineWrap.cs.meta
  37. 14 0
      Unity/Packages/com.et.thirdparty/Scripts/Unity.ThirdParty.asmdef
  38. 7 0
      Unity/Packages/com.et.thirdparty/Scripts/Unity.ThirdParty.asmdef.meta
  39. 17 0
      Unity/Packages/com.et.thirdparty/package.json
  40. 7 0
      Unity/Packages/com.et.thirdparty/package.json.meta
  41. 6 0
      Unity/Packages/packages-lock.json
  42. 1 1
      Unity/ProjectSettings/EditorBuildSettings.asset
  43. 3 1
      Unity/ProjectSettings/QualitySettings.asset

+ 1 - 1
DotNet/App/Program.cs

@@ -14,7 +14,7 @@ namespace ET
             //model并没有用到,就不会加载,结果会导致CodeLoader反射调用model失败。
             //客户端服务端不热更不共享的组件可以写到Loader中,比如表现层需要一个组件不需要热更,可以写在Loader中,这样性能更高。如果客户端跟服务端共享的并且不需要热更的
             //的组件可以写在Core中
-            Entry.Init();
+            //Entry.Init();
             
             Init init = new();
             init.Start();

+ 5 - 19
DotNet/Core/DotNet.Core.csproj

@@ -16,44 +16,30 @@
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
       <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-      <DefineConstants>DOTNET</DefineConstants>
+      <DefineConstants>DOTNET;UNITY_DOTSPLAYER</DefineConstants>
       <OutputPath>..\..\Bin\</OutputPath>
       <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
       <Optimize>false</Optimize>
-      <NoWarn>0169,0649,3021,8981,CS9193,CS9192</NoWarn>
+      <NoWarn>0169,0649,3021,8981,CS9193,CS9192,NU1903</NoWarn>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">  
       <AllowUnsafeBlocks>true</AllowUnsafeBlocks> 
-      <DefineConstants>DOTNET</DefineConstants>
+      <DefineConstants>DOTNET;UNITY_DOTSPLAYER</DefineConstants>
       <OutputPath>..\..\Bin\</OutputPath>
       <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-      <NoWarn>0169,0649,3021,8981,CS9193,CS9192</NoWarn>
+      <NoWarn>0169,0649,3021,8981,CS9193,CS9192,NU1903</NoWarn>
     </PropertyGroup>
     
     <ItemGroup> 
         <Compile Include="..\..\Unity\Packages\com.et.core\Scripts\Core\**\*.cs">
             <Link>Core\%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
-
-        <Compile Include="..\..\Unity\Library\PackageCache\com.unity.mathematics*\Unity.Mathematics\**\*.cs">
-            <Link>Core/Unity.Mathematics/$([System.String]::new(%(RecursiveDir)).Substring($([System.String]::new(%(RecursiveDir)).Indexof("Unity.Mathematics"))).Replace("Unity.Mathematics", ""))/%(FileName)%(Extension)</Link>
-        </Compile>
     </ItemGroup>
     
     <ItemGroup>
       <ProjectReference Include="..\..\Share\Analyzer\Share.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" /> 
       <ProjectReference Include="..\..\Share\Share.SourceGenerator\Share.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="CommandLineParser" Version="2.8.0" />
-        <PackageReference Include="EPPlus" Version="5.8.8" />
-        <PackageReference Include="MemoryPack" Version="1.10.0" />
-        <PackageReference Include="MongoDB.Driver" Version="2.17.1" />
-        <PackageReference Include="NLog" Version="4.7.15" />
-        <PackageReference Include="SharpZipLib" Version="1.3.3" />
-        <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.0.1" />
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
+      <ProjectReference Include="..\ThirdParty\DotNet.ThirdParty.csproj" />
     </ItemGroup>
 </Project>

+ 2 - 0
DotNet/Loader/CodeLoader.cs

@@ -6,6 +6,7 @@ using System.Runtime.Loader;
 
 namespace ET
 {
+    /*
     public class CodeLoader: Singleton<CodeLoader>, ISingletonAwake
     {
         private AssemblyLoadContext assemblyLoadContext;
@@ -53,4 +54,5 @@ namespace ET
             Log.Debug($"reload dll finish!");
         }
     }
+    */
 }

+ 1 - 0
DotNet/Loader/DotNet.Loader.csproj

@@ -30,5 +30,6 @@
         <ProjectReference Include="..\..\Share\Analyzer\Share.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
         <ProjectReference Include="..\..\Share\Share.SourceGenerator\Share.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
         <ProjectReference Include="..\Core\DotNet.Core.csproj" />
+        <ProjectReference Include="..\ThirdParty\DotNet.ThirdParty.csproj" />
     </ItemGroup>
 </Project>

+ 1 - 19
DotNet/ThirdParty/DotNet.ThirdParty.csproj

@@ -31,31 +31,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-
-        <Compile Include="..\..\Unity\Assets\Scripts\ThirdParty\TrueSync\**\*.cs">
-            <Link>TrueSync/%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Assets\Scripts\ThirdParty\ETTask\**\*.cs">
+        <Compile Include="..\..\Unity\Packages\com.et.thirdparty\Scripts\ETTask\**\*.cs">
             <Link>ETTask/%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
 
-        <Compile Include="..\..\Unity\Assets\Scripts\ThirdParty\Kcp\**\*.cs">
-            <Link>Kcp/%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Assets\Scripts\ThirdParty\NativeCollection\**\*.cs">
-            <Link>NativeCollection/%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Assets\Scripts\ThirdParty\DotRecast\**\*.cs">
-            <Link>DotRecast/%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
         <Compile Include="..\..\Unity\Library\PackageCache\com.unity.mathematics*\Unity.Mathematics\**\*.cs">
             <Link>Unity.Mathematics/$([System.String]::new(%(RecursiveDir)).Substring($([System.String]::new(%(RecursiveDir)).Indexof("Unity.Mathematics"))).Replace("Unity.Mathematics", ""))/%(FileName)%(Extension)</Link>
         </Compile>
-
     </ItemGroup>
 
     <ItemGroup>

+ 135 - 0
ET.sln

@@ -25,6 +25,24 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNet.Loader", "DotNet\Loa
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Share.SourceGenerator", "Share\Share.SourceGenerator\Share.SourceGenerator.csproj", "{B29C9195-BEE7-4291-B57C-990425CDEF81}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Core", "Unity\Unity.Core.csproj", "{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Loader", "Unity\Unity.Loader.csproj", "{32B76B98-B8F4-F864-D1F9-50CF255042D8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Editor", "Unity\Unity.Editor.csproj", "{041131CD-3018-19B1-81B6-5DBEE2467FFB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Model", "Unity\Unity.Model.csproj", "{9498BFB4-D9F5-C441-13E3-3F26F7700E29}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Hotfix", "Unity\Unity.Hotfix.csproj", "{52F66610-896A-C4D1-9881-1A19DF7AB80E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ModelView", "Unity\Unity.ModelView.csproj", "{C109842F-01DA-64D4-DBF2-00C6449E459E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.HotfixView", "Unity\Unity.HotfixView.csproj", "{DE4513D3-889B-5C52-8E9C-744C99AE7509}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet.ThirdParty", "DotNet\ThirdParty\DotNet.ThirdParty.csproj", "{36C32B5A-D491-4AD9-8E46-C8FB33880952}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ThirdParty", "Unity\Unity.ThirdParty.csproj", "{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -131,6 +149,114 @@ Global
 		{B29C9195-BEE7-4291-B57C-990425CDEF81}.Release|x64.Build.0 = Release|Any CPU
 		{B29C9195-BEE7-4291-B57C-990425CDEF81}.Release|x86.ActiveCfg = Release|Any CPU
 		{B29C9195-BEE7-4291-B57C-990425CDEF81}.Release|x86.Build.0 = Release|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|x64.Build.0 = Debug|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|x86.Build.0 = Debug|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|x64.ActiveCfg = Debug|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|x64.Build.0 = Debug|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|x86.ActiveCfg = Debug|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|x86.Build.0 = Debug|Any CPU
+		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Debug|x64.Build.0 = Debug|Any CPU
+		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Debug|x86.Build.0 = Debug|Any CPU
+		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Release|x64.ActiveCfg = Debug|Any CPU
+		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Release|x64.Build.0 = Debug|Any CPU
+		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Release|x86.ActiveCfg = Debug|Any CPU
+		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Release|x86.Build.0 = Debug|Any CPU
+		{041131CD-3018-19B1-81B6-5DBEE2467FFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{041131CD-3018-19B1-81B6-5DBEE2467FFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{041131CD-3018-19B1-81B6-5DBEE2467FFB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{041131CD-3018-19B1-81B6-5DBEE2467FFB}.Debug|x64.Build.0 = Debug|Any CPU
+		{041131CD-3018-19B1-81B6-5DBEE2467FFB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{041131CD-3018-19B1-81B6-5DBEE2467FFB}.Debug|x86.Build.0 = Debug|Any CPU
+		{041131CD-3018-19B1-81B6-5DBEE2467FFB}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{041131CD-3018-19B1-81B6-5DBEE2467FFB}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{041131CD-3018-19B1-81B6-5DBEE2467FFB}.Release|x64.ActiveCfg = Debug|Any CPU
+		{041131CD-3018-19B1-81B6-5DBEE2467FFB}.Release|x64.Build.0 = Debug|Any CPU
+		{041131CD-3018-19B1-81B6-5DBEE2467FFB}.Release|x86.ActiveCfg = Debug|Any CPU
+		{041131CD-3018-19B1-81B6-5DBEE2467FFB}.Release|x86.Build.0 = Debug|Any CPU
+		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Debug|x64.Build.0 = Debug|Any CPU
+		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Debug|x86.Build.0 = Debug|Any CPU
+		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Release|x64.ActiveCfg = Debug|Any CPU
+		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Release|x64.Build.0 = Debug|Any CPU
+		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Release|x86.ActiveCfg = Debug|Any CPU
+		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Release|x86.Build.0 = Debug|Any CPU
+		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Debug|x64.Build.0 = Debug|Any CPU
+		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Debug|x86.Build.0 = Debug|Any CPU
+		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Release|x64.ActiveCfg = Debug|Any CPU
+		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Release|x64.Build.0 = Debug|Any CPU
+		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Release|x86.ActiveCfg = Debug|Any CPU
+		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Release|x86.Build.0 = Debug|Any CPU
+		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Debug|x64.Build.0 = Debug|Any CPU
+		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Debug|x86.Build.0 = Debug|Any CPU
+		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Release|x64.ActiveCfg = Debug|Any CPU
+		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Release|x64.Build.0 = Debug|Any CPU
+		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Release|x86.ActiveCfg = Debug|Any CPU
+		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Release|x86.Build.0 = Debug|Any CPU
+		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Debug|x64.Build.0 = Debug|Any CPU
+		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Debug|x86.Build.0 = Debug|Any CPU
+		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Release|x64.ActiveCfg = Debug|Any CPU
+		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Release|x64.Build.0 = Debug|Any CPU
+		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Release|x86.ActiveCfg = Debug|Any CPU
+		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Release|x86.Build.0 = Debug|Any CPU
+		{36C32B5A-D491-4AD9-8E46-C8FB33880952}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36C32B5A-D491-4AD9-8E46-C8FB33880952}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36C32B5A-D491-4AD9-8E46-C8FB33880952}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{36C32B5A-D491-4AD9-8E46-C8FB33880952}.Debug|x64.Build.0 = Debug|Any CPU
+		{36C32B5A-D491-4AD9-8E46-C8FB33880952}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{36C32B5A-D491-4AD9-8E46-C8FB33880952}.Debug|x86.Build.0 = Debug|Any CPU
+		{36C32B5A-D491-4AD9-8E46-C8FB33880952}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36C32B5A-D491-4AD9-8E46-C8FB33880952}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36C32B5A-D491-4AD9-8E46-C8FB33880952}.Release|x64.ActiveCfg = Release|Any CPU
+		{36C32B5A-D491-4AD9-8E46-C8FB33880952}.Release|x64.Build.0 = Release|Any CPU
+		{36C32B5A-D491-4AD9-8E46-C8FB33880952}.Release|x86.ActiveCfg = Release|Any CPU
+		{36C32B5A-D491-4AD9-8E46-C8FB33880952}.Release|x86.Build.0 = Release|Any CPU
+		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Debug|x64.Build.0 = Debug|Any CPU
+		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Debug|x86.Build.0 = Debug|Any CPU
+		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Release|x64.ActiveCfg = Debug|Any CPU
+		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Release|x64.Build.0 = Debug|Any CPU
+		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Release|x86.ActiveCfg = Debug|Any CPU
+		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Release|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -144,6 +270,15 @@ Global
 		{1D028A2B-515C-49E2-923B-094CBD89BE5A} = {1272AF7B-A962-4BA4-8A9C-FFA7E131A0AC}
 		{1D5E890A-C9D5-45DF-B098-73DBE39EB311} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{B29C9195-BEE7-4291-B57C-990425CDEF81} = {1272AF7B-A962-4BA4-8A9C-FFA7E131A0AC}
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{32B76B98-B8F4-F864-D1F9-50CF255042D8} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{041131CD-3018-19B1-81B6-5DBEE2467FFB} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{9498BFB4-D9F5-C441-13E3-3F26F7700E29} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{52F66610-896A-C4D1-9881-1A19DF7AB80E} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{C109842F-01DA-64D4-DBF2-00C6449E459E} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{DE4513D3-889B-5C52-8E9C-744C99AE7509} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{36C32B5A-D491-4AD9-8E46-C8FB33880952} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
+		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EABC01E3-3EB5-47EF-B46E-AAD8BB3585F1}

+ 1 - 1
Share/Analyzer/Share.Analyzer.csproj

@@ -23,7 +23,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <Compile Include="../../Unity/Assets/Scripts/Core/Helper/StringHashHelper.cs" />
+        <Compile Include="../../Unity/Packages/com.et.core/Scripts/Core/Helper/StringHashHelper.cs" />
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" PrivateAssets="all" />

+ 4 - 4
Share/Share.SourceGenerator/Share.SourceGenerator.csproj

@@ -18,7 +18,7 @@
             <Link>Extension\%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
         <Compile Include="../Analyzer/Config/Definition.cs" />
-        <Compile Include="../../Unity/Assets/Scripts/Core/Helper/StringHashHelper.cs" />
+        <Compile Include="../../Unity/Packages/com.et.core/Scripts/Core/Helper/StringHashHelper.cs" />
         <Compile Include="../Analyzer/Config/AnalyzeAssembly.cs" />
     </ItemGroup>
 
@@ -30,8 +30,8 @@
         </PackageReference>
     </ItemGroup>
 
-<!--    <Target Name="PostBuild" AfterTargets="PostBuildEvent">-->
-<!--        <Copy SourceFiles="$(TargetDir)/$(TargetName).dll" DestinationFolder="$(ProjectDir)/../../Unity/Assets/Plugins/" ContinueOnError="false" />-->
-<!--    </Target>-->
+    <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+        <Copy SourceFiles="$(TargetDir)/$(TargetName).dll" DestinationFolder="$(ProjectDir)/../../Unity/Packages/com.et.core/Plugins/" ContinueOnError="false" />
+    </Target>
 
 </Project>

+ 1 - 1
Share/Tool/Init.cs

@@ -42,7 +42,7 @@ namespace ET
             try
             {
                 // 命令行参数
-                CommandLine.Parser.Default.ParseArguments<Options>(args)
+                Parser.Default.ParseArguments<Options>(args)
                     .WithNotParsed(error => throw new Exception($"命令行格式错误! {error}"))
                     .WithParsed((o)=>World.Instance.AddSingleton(o));
                 

+ 1 - 1
Unity/Directory.Build.props

@@ -5,6 +5,6 @@
     <DebugType>Portable</DebugType>
   </PropertyGroup>
   <ItemGroup>
-    <Analyzer Include="Assets\Plugins\Share.SourceGenerator.dll" />
+    <Analyzer Include="Packages\com.et.core\Plugins\Share.SourceGenerator.dll" />
   </ItemGroup>
 </Project>

BIN
Unity/Packages/com.et.core/Plugins/Share.SourceGenerator.dll


+ 2 - 1
Unity/Packages/com.et.core/Scripts/Core/Unity.Core.asmdef

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

+ 2 - 1
Unity/Packages/com.et.loader/Scripts/Editor/Unity.Editor.asmdef

@@ -7,7 +7,8 @@
         "HybridCLR.Runtime",
         "HybridCLR.Editor",
         "YooAsset",
-        "Unity.Mathematics"
+        "Unity.Mathematics",
+        "Unity.ThirdParty"
     ],
     "includePlatforms": [
         "Editor"

+ 2 - 1
Unity/Packages/com.et.loader/Scripts/Loader/Unity.Loader.asmdef

@@ -6,7 +6,8 @@
         "HybridCLR.Runtime",
         "MemoryPack",
         "YooAsset",
-        "YooAsset.Editor"
+        "YooAsset.Editor",
+        "Unity.ThirdParty"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

+ 8 - 0
Unity/Packages/com.et.thirdparty/Scripts.meta

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

+ 0 - 0
Unity/Packages/com.et.core/Scripts/Core/ETTask.meta → Unity/Packages/com.et.thirdparty/Scripts/ETTask.meta


+ 0 - 0
Unity/Packages/com.et.core/Scripts/Core/ETTask/AsyncETTaskCompletedMethodBuilder.cs → Unity/Packages/com.et.thirdparty/Scripts/ETTask/AsyncETTaskCompletedMethodBuilder.cs


+ 0 - 0
Unity/Packages/com.et.core/Scripts/Core/ETTask/AsyncETTaskCompletedMethodBuilder.cs.meta → Unity/Packages/com.et.thirdparty/Scripts/ETTask/AsyncETTaskCompletedMethodBuilder.cs.meta


+ 0 - 0
Unity/Packages/com.et.core/Scripts/Core/ETTask/AsyncETTaskMethodBuilder.cs → Unity/Packages/com.et.thirdparty/Scripts/ETTask/AsyncETTaskMethodBuilder.cs


+ 0 - 0
Unity/Packages/com.et.core/Scripts/Core/ETTask/AsyncETTaskMethodBuilder.cs.meta → Unity/Packages/com.et.thirdparty/Scripts/ETTask/AsyncETTaskMethodBuilder.cs.meta


+ 0 - 0
Unity/Packages/com.et.core/Scripts/Core/ETTask/AsyncETVoidMethodBuilder.cs → Unity/Packages/com.et.thirdparty/Scripts/ETTask/AsyncETVoidMethodBuilder.cs


+ 0 - 0
Unity/Packages/com.et.core/Scripts/Core/ETTask/AsyncETVoidMethodBuilder.cs.meta → Unity/Packages/com.et.thirdparty/Scripts/ETTask/AsyncETVoidMethodBuilder.cs.meta


+ 0 - 0
Unity/Packages/com.et.core/Scripts/Core/ETTask/ETCancellationToken.cs → Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETCancellationToken.cs


+ 0 - 0
Unity/Packages/com.et.core/Scripts/Core/ETTask/ETCancellationToken.cs.meta → Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETCancellationToken.cs.meta


+ 0 - 4
Unity/Packages/com.et.core/Scripts/Core/ETTask/ETTask.cs → Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETTask.cs

@@ -10,10 +10,8 @@ namespace ET
     [AsyncMethodBuilder(typeof (ETAsyncTaskMethodBuilder))]
     public class ETTask: ICriticalNotifyCompletion
     {
-        [StaticField]
         public static Action<Exception> ExceptionHandler;
         
-        [StaticField]
         public static ETTaskCompleted CompletedTask
         {
             get
@@ -22,7 +20,6 @@ namespace ET
             }
         }
 
-        [StaticField]
         private static readonly ConcurrentQueue<ETTask> queue = new();
 
         /// <summary>
@@ -168,7 +165,6 @@ namespace ET
     [AsyncMethodBuilder(typeof (ETAsyncTaskMethodBuilder<>))]
     public class ETTask<T>: ICriticalNotifyCompletion
     {
-        [StaticField]
         private static readonly ConcurrentQueue<ETTask<T>> queue = new();
         
         /// <summary>

+ 0 - 0
Unity/Packages/com.et.core/Scripts/Core/ETTask/ETTask.cs.meta → Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETTask.cs.meta


+ 0 - 0
Unity/Packages/com.et.core/Scripts/Core/ETTask/ETTaskCompleted.cs → Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETTaskCompleted.cs


+ 0 - 0
Unity/Packages/com.et.core/Scripts/Core/ETTask/ETTaskCompleted.cs.meta → Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETTaskCompleted.cs.meta


+ 0 - 0
Unity/Packages/com.et.core/Scripts/Core/ETTask/ETTaskHelper.cs → Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETTaskHelper.cs


+ 0 - 0
Unity/Packages/com.et.core/Scripts/Core/ETTask/ETTaskHelper.cs.meta → Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETTaskHelper.cs.meta


+ 0 - 0
Unity/Packages/com.et.core/Scripts/Core/ETTask/ETVoid.cs → Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETVoid.cs


+ 0 - 0
Unity/Packages/com.et.core/Scripts/Core/ETTask/ETVoid.cs.meta → Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETVoid.cs.meta


+ 0 - 0
Unity/Packages/com.et.core/Scripts/Core/ETTask/IAwaiter.cs → Unity/Packages/com.et.thirdparty/Scripts/ETTask/IAwaiter.cs


+ 0 - 0
Unity/Packages/com.et.core/Scripts/Core/ETTask/IAwaiter.cs.meta → Unity/Packages/com.et.thirdparty/Scripts/ETTask/IAwaiter.cs.meta


+ 0 - 1
Unity/Packages/com.et.core/Scripts/Core/ETTask/StateMachineWrap.cs → Unity/Packages/com.et.thirdparty/Scripts/ETTask/StateMachineWrap.cs

@@ -12,7 +12,6 @@ namespace ET
     
     public class StateMachineWrap<T>: IStateMachineWrap where T: IAsyncStateMachine
     {
-        [StaticField]
         private static readonly ConcurrentQueue<StateMachineWrap<T>> queue = new();
 
         public static StateMachineWrap<T> Fetch(ref T stateMachine)

+ 0 - 0
Unity/Packages/com.et.core/Scripts/Core/ETTask/StateMachineWrap.cs.meta → Unity/Packages/com.et.thirdparty/Scripts/ETTask/StateMachineWrap.cs.meta


+ 14 - 0
Unity/Packages/com.et.thirdparty/Scripts/Unity.ThirdParty.asmdef

@@ -0,0 +1,14 @@
+{
+    "name": "Unity.ThirdParty",
+    "rootNamespace": "ET",
+    "references": [],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": true,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

+ 7 - 0
Unity/Packages/com.et.thirdparty/Scripts/Unity.ThirdParty.asmdef.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 32de1db3416244197b0520795f5999d7
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 17 - 0
Unity/Packages/com.et.thirdparty/package.json

@@ -0,0 +1,17 @@
+{
+  "name": "com.et.thirdparty",
+  "displayName": "ET.ThirdParty",
+  "version": "0.0.1",
+  "unity": "2022.3",
+  "description": "et thirdparty",
+  "author": {
+    "name": "tanghai",
+    "url": "https://github.com/egametang/ET"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/egametang/ET"
+  },
+  "relatedPackages": {},
+  "dependencies": {}
+}

+ 7 - 0
Unity/Packages/com.et.thirdparty/package.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c21cdd76f084743c6a1d5ee8d278b190
+PackageManifestImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
Unity/Packages/packages-lock.json

@@ -26,6 +26,12 @@
       "source": "embedded",
       "dependencies": {}
     },
+    "com.et.thirdparty": {
+      "version": "file:com.et.thirdparty",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {}
+    },
     "com.tuyoogame.yooasset": {
       "version": "2.1.1",
       "depth": 0,

+ 1 - 1
Unity/ProjectSettings/EditorBuildSettings.asset

@@ -6,7 +6,7 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/Scenes/Init.unity
+    path: Packages/com.et.loader/Scenes/Init.unity
     guid: e0d691ac8c1d0454ba07089ea820e18a
   m_configObjects:
     com.unity.addressableassets: {fileID: 11400000, guid: f989b2ba24890344e858b377390e01f5,

+ 3 - 1
Unity/ProjectSettings/QualitySettings.asset

@@ -302,4 +302,6 @@ QualitySettings:
     terrainMaxTrees: 50
     excludedTargetPlatforms: []
   m_TextureMipmapLimitGroupNames: []
-  m_PerPlatformDefaultQuality: {}
+  m_PerPlatformDefaultQuality:
+    Server: 0
+    Standalone: 0