Prechádzať zdrojové kódy

1.Excel导出的Json挪到ET/Config目录下面
2.DotNet中增加一个Loader程序集,Unity.Mono改成Unity.Loader,这样保持程序集依赖关系一致,都是Model依赖Loader,而之前并不一致

这里大家看着可能比较困惑,DotNet中为什么要绕一大圈去加载Model程序集,而不是跟之前一样在App中直接调用Model层,现在却要在CoderLoader中获取Model的程序集找到Entry入口再调用。原因是,之前DotNet.App直接依赖Model,但是在客户端,之前的Mono却不依赖Model。这导致前端跟后端程序集依赖不太一样。所以这次加了个Loader的程序集,客户端的Mono程序集也改成Loader,这样前后端Model都引用Loader,Loader通过反射去调用Model的Entry。这样前后端的程序集依赖就保持了一致。

tanghai 3 rokov pred
rodič
commit
82dbd7b842
100 zmenil súbory, kde vykonal 108 pridanie a 419 odobranie
  1. 1 0
      .gitignore
  2. 0 0
      Config/Json/c/AIConfig.txt
  3. 0 0
      Config/Json/c/UnitConfig.txt
  4. 0 0
      Config/Json/cs/AIConfig.txt
  5. 0 0
      Config/Json/cs/StartConfig/Benchmark/StartMachineConfig.txt
  6. 0 0
      Config/Json/cs/StartConfig/Benchmark/StartProcessConfig.txt
  7. 0 0
      Config/Json/cs/StartConfig/Benchmark/StartSceneConfig.txt
  8. 0 0
      Config/Json/cs/StartConfig/Benchmark/StartZoneConfig.txt
  9. 0 0
      Config/Json/cs/StartConfig/Localhost/StartMachineConfig.txt
  10. 0 0
      Config/Json/cs/StartConfig/Localhost/StartProcessConfig.txt
  11. 0 0
      Config/Json/cs/StartConfig/Localhost/StartSceneConfig.txt
  12. 0 0
      Config/Json/cs/StartConfig/Localhost/StartZoneConfig.txt
  13. 0 0
      Config/Json/cs/StartConfig/Release/StartMachineConfig.txt
  14. 0 0
      Config/Json/cs/StartConfig/Release/StartProcessConfig.txt
  15. 0 0
      Config/Json/cs/StartConfig/Release/StartSceneConfig.txt
  16. 0 0
      Config/Json/cs/StartConfig/Release/StartZoneConfig.txt
  17. 0 0
      Config/Json/cs/StartConfig/RouterTest/StartMachineConfig.txt
  18. 0 0
      Config/Json/cs/StartConfig/RouterTest/StartProcessConfig.txt
  19. 0 0
      Config/Json/cs/StartConfig/RouterTest/StartSceneConfig.txt
  20. 0 0
      Config/Json/cs/StartConfig/RouterTest/StartZoneConfig.txt
  21. 0 0
      Config/Json/cs/UnitConfig.txt
  22. 0 0
      Config/Json/s/AIConfig.txt
  23. 0 0
      Config/Json/s/StartConfig/Benchmark/StartMachineConfig.txt
  24. 0 0
      Config/Json/s/StartConfig/Benchmark/StartProcessConfig.txt
  25. 0 0
      Config/Json/s/StartConfig/Benchmark/StartSceneConfig.txt
  26. 0 0
      Config/Json/s/StartConfig/Benchmark/StartZoneConfig.txt
  27. 0 0
      Config/Json/s/StartConfig/Localhost/StartMachineConfig.txt
  28. 0 0
      Config/Json/s/StartConfig/Localhost/StartProcessConfig.txt
  29. 0 0
      Config/Json/s/StartConfig/Localhost/StartSceneConfig.txt
  30. 0 0
      Config/Json/s/StartConfig/Localhost/StartZoneConfig.txt
  31. 0 0
      Config/Json/s/StartConfig/Release/StartMachineConfig.txt
  32. 0 0
      Config/Json/s/StartConfig/Release/StartProcessConfig.txt
  33. 0 0
      Config/Json/s/StartConfig/Release/StartSceneConfig.txt
  34. 0 0
      Config/Json/s/StartConfig/Release/StartZoneConfig.txt
  35. 0 0
      Config/Json/s/StartConfig/RouterTest/StartMachineConfig.txt
  36. 0 0
      Config/Json/s/StartConfig/RouterTest/StartProcessConfig.txt
  37. 0 0
      Config/Json/s/StartConfig/RouterTest/StartSceneConfig.txt
  38. 0 0
      Config/Json/s/StartConfig/RouterTest/StartZoneConfig.txt
  39. 0 0
      Config/Json/s/UnitConfig.txt
  40. 0 6
      DotNet/App/DotNet.App.csproj
  41. 18 0
      DotNet/App/Program.cs
  42. 1 0
      DotNet/Hotfix/DotNet.Hotfix.csproj
  43. 16 6
      DotNet/Loader/CodeLoader.cs
  44. 34 0
      DotNet/Loader/DotNet.Loader.csproj
  45. 3 3
      DotNet/Loader/Init.cs
  46. 1 4
      DotNet/Model/DotNet.Model.csproj
  47. 33 21
      ET.sln
  48. 1 1
      Share/Tool/ExcelExporter/ExcelExporter.cs
  49. 0 8
      Unity/Assets/Config/Excel/Json.meta
  50. 0 8
      Unity/Assets/Config/Excel/Json/c.meta
  51. 0 7
      Unity/Assets/Config/Excel/Json/c/AIConfig.txt.meta
  52. 0 7
      Unity/Assets/Config/Excel/Json/c/UnitConfig.txt.meta
  53. 0 8
      Unity/Assets/Config/Excel/Json/cs.meta
  54. 0 7
      Unity/Assets/Config/Excel/Json/cs/AIConfig.txt.meta
  55. 0 8
      Unity/Assets/Config/Excel/Json/cs/StartConfig.meta
  56. 0 8
      Unity/Assets/Config/Excel/Json/cs/StartConfig/Benchmark.meta
  57. 0 7
      Unity/Assets/Config/Excel/Json/cs/StartConfig/Benchmark/StartMachineConfig.txt.meta
  58. 0 7
      Unity/Assets/Config/Excel/Json/cs/StartConfig/Benchmark/StartProcessConfig.txt.meta
  59. 0 7
      Unity/Assets/Config/Excel/Json/cs/StartConfig/Benchmark/StartSceneConfig.txt.meta
  60. 0 7
      Unity/Assets/Config/Excel/Json/cs/StartConfig/Benchmark/StartZoneConfig.txt.meta
  61. 0 8
      Unity/Assets/Config/Excel/Json/cs/StartConfig/Localhost.meta
  62. 0 7
      Unity/Assets/Config/Excel/Json/cs/StartConfig/Localhost/StartMachineConfig.txt.meta
  63. 0 7
      Unity/Assets/Config/Excel/Json/cs/StartConfig/Localhost/StartProcessConfig.txt.meta
  64. 0 7
      Unity/Assets/Config/Excel/Json/cs/StartConfig/Localhost/StartSceneConfig.txt.meta
  65. 0 7
      Unity/Assets/Config/Excel/Json/cs/StartConfig/Localhost/StartZoneConfig.txt.meta
  66. 0 8
      Unity/Assets/Config/Excel/Json/cs/StartConfig/Release.meta
  67. 0 7
      Unity/Assets/Config/Excel/Json/cs/StartConfig/Release/StartMachineConfig.txt.meta
  68. 0 7
      Unity/Assets/Config/Excel/Json/cs/StartConfig/Release/StartProcessConfig.txt.meta
  69. 0 7
      Unity/Assets/Config/Excel/Json/cs/StartConfig/Release/StartSceneConfig.txt.meta
  70. 0 7
      Unity/Assets/Config/Excel/Json/cs/StartConfig/Release/StartZoneConfig.txt.meta
  71. 0 8
      Unity/Assets/Config/Excel/Json/cs/StartConfig/RouterTest.meta
  72. 0 7
      Unity/Assets/Config/Excel/Json/cs/StartConfig/RouterTest/StartMachineConfig.txt.meta
  73. 0 7
      Unity/Assets/Config/Excel/Json/cs/StartConfig/RouterTest/StartProcessConfig.txt.meta
  74. 0 7
      Unity/Assets/Config/Excel/Json/cs/StartConfig/RouterTest/StartSceneConfig.txt.meta
  75. 0 7
      Unity/Assets/Config/Excel/Json/cs/StartConfig/RouterTest/StartZoneConfig.txt.meta
  76. 0 7
      Unity/Assets/Config/Excel/Json/cs/UnitConfig.txt.meta
  77. 0 8
      Unity/Assets/Config/Excel/Json/s.meta
  78. 0 7
      Unity/Assets/Config/Excel/Json/s/AIConfig.txt.meta
  79. 0 8
      Unity/Assets/Config/Excel/Json/s/StartConfig.meta
  80. 0 8
      Unity/Assets/Config/Excel/Json/s/StartConfig/Benchmark.meta
  81. 0 7
      Unity/Assets/Config/Excel/Json/s/StartConfig/Benchmark/StartMachineConfig.txt.meta
  82. 0 7
      Unity/Assets/Config/Excel/Json/s/StartConfig/Benchmark/StartProcessConfig.txt.meta
  83. 0 7
      Unity/Assets/Config/Excel/Json/s/StartConfig/Benchmark/StartSceneConfig.txt.meta
  84. 0 7
      Unity/Assets/Config/Excel/Json/s/StartConfig/Benchmark/StartZoneConfig.txt.meta
  85. 0 8
      Unity/Assets/Config/Excel/Json/s/StartConfig/Localhost.meta
  86. 0 7
      Unity/Assets/Config/Excel/Json/s/StartConfig/Localhost/StartMachineConfig.txt.meta
  87. 0 7
      Unity/Assets/Config/Excel/Json/s/StartConfig/Localhost/StartProcessConfig.txt.meta
  88. 0 7
      Unity/Assets/Config/Excel/Json/s/StartConfig/Localhost/StartSceneConfig.txt.meta
  89. 0 7
      Unity/Assets/Config/Excel/Json/s/StartConfig/Localhost/StartZoneConfig.txt.meta
  90. 0 8
      Unity/Assets/Config/Excel/Json/s/StartConfig/Release.meta
  91. 0 7
      Unity/Assets/Config/Excel/Json/s/StartConfig/Release/StartMachineConfig.txt.meta
  92. 0 7
      Unity/Assets/Config/Excel/Json/s/StartConfig/Release/StartProcessConfig.txt.meta
  93. 0 7
      Unity/Assets/Config/Excel/Json/s/StartConfig/Release/StartSceneConfig.txt.meta
  94. 0 7
      Unity/Assets/Config/Excel/Json/s/StartConfig/Release/StartZoneConfig.txt.meta
  95. 0 8
      Unity/Assets/Config/Excel/Json/s/StartConfig/RouterTest.meta
  96. 0 7
      Unity/Assets/Config/Excel/Json/s/StartConfig/RouterTest/StartMachineConfig.txt.meta
  97. 0 7
      Unity/Assets/Config/Excel/Json/s/StartConfig/RouterTest/StartProcessConfig.txt.meta
  98. 0 7
      Unity/Assets/Config/Excel/Json/s/StartConfig/RouterTest/StartSceneConfig.txt.meta
  99. 0 7
      Unity/Assets/Config/Excel/Json/s/StartConfig/RouterTest/StartZoneConfig.txt.meta
  100. 0 7
      Unity/Assets/Config/Excel/Json/s/UnitConfig.txt.meta

+ 1 - 0
.gitignore

@@ -69,6 +69,7 @@ Server/.DS_Store
 /Unity/Unity.Core.csproj
 /Unity/UserSettings
 /Unity/Unity.Codes.csproj
+/Unity/Unity.Loader.csproj
 /Unity/Unity.Ignore.csproj
 Publish/
 /Unity/Assets/Bundles/Code/*

+ 0 - 0
Unity/Assets/Config/Excel/Json/c/AIConfig.txt → Config/Json/c/AIConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/c/UnitConfig.txt → Config/Json/c/UnitConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/cs/AIConfig.txt → Config/Json/cs/AIConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/cs/StartConfig/Benchmark/StartMachineConfig.txt → Config/Json/cs/StartConfig/Benchmark/StartMachineConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/cs/StartConfig/Benchmark/StartProcessConfig.txt → Config/Json/cs/StartConfig/Benchmark/StartProcessConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/cs/StartConfig/Benchmark/StartSceneConfig.txt → Config/Json/cs/StartConfig/Benchmark/StartSceneConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/cs/StartConfig/Benchmark/StartZoneConfig.txt → Config/Json/cs/StartConfig/Benchmark/StartZoneConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/cs/StartConfig/Localhost/StartMachineConfig.txt → Config/Json/cs/StartConfig/Localhost/StartMachineConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/cs/StartConfig/Localhost/StartProcessConfig.txt → Config/Json/cs/StartConfig/Localhost/StartProcessConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/cs/StartConfig/Localhost/StartSceneConfig.txt → Config/Json/cs/StartConfig/Localhost/StartSceneConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/cs/StartConfig/Localhost/StartZoneConfig.txt → Config/Json/cs/StartConfig/Localhost/StartZoneConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/cs/StartConfig/Release/StartMachineConfig.txt → Config/Json/cs/StartConfig/Release/StartMachineConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/cs/StartConfig/Release/StartProcessConfig.txt → Config/Json/cs/StartConfig/Release/StartProcessConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/cs/StartConfig/Release/StartSceneConfig.txt → Config/Json/cs/StartConfig/Release/StartSceneConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/cs/StartConfig/Release/StartZoneConfig.txt → Config/Json/cs/StartConfig/Release/StartZoneConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/cs/StartConfig/RouterTest/StartMachineConfig.txt → Config/Json/cs/StartConfig/RouterTest/StartMachineConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/cs/StartConfig/RouterTest/StartProcessConfig.txt → Config/Json/cs/StartConfig/RouterTest/StartProcessConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/cs/StartConfig/RouterTest/StartSceneConfig.txt → Config/Json/cs/StartConfig/RouterTest/StartSceneConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/cs/StartConfig/RouterTest/StartZoneConfig.txt → Config/Json/cs/StartConfig/RouterTest/StartZoneConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/cs/UnitConfig.txt → Config/Json/cs/UnitConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/s/AIConfig.txt → Config/Json/s/AIConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/s/StartConfig/Benchmark/StartMachineConfig.txt → Config/Json/s/StartConfig/Benchmark/StartMachineConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/s/StartConfig/Benchmark/StartProcessConfig.txt → Config/Json/s/StartConfig/Benchmark/StartProcessConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/s/StartConfig/Benchmark/StartSceneConfig.txt → Config/Json/s/StartConfig/Benchmark/StartSceneConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/s/StartConfig/Benchmark/StartZoneConfig.txt → Config/Json/s/StartConfig/Benchmark/StartZoneConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/s/StartConfig/Localhost/StartMachineConfig.txt → Config/Json/s/StartConfig/Localhost/StartMachineConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/s/StartConfig/Localhost/StartProcessConfig.txt → Config/Json/s/StartConfig/Localhost/StartProcessConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/s/StartConfig/Localhost/StartSceneConfig.txt → Config/Json/s/StartConfig/Localhost/StartSceneConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/s/StartConfig/Localhost/StartZoneConfig.txt → Config/Json/s/StartConfig/Localhost/StartZoneConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/s/StartConfig/Release/StartMachineConfig.txt → Config/Json/s/StartConfig/Release/StartMachineConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/s/StartConfig/Release/StartProcessConfig.txt → Config/Json/s/StartConfig/Release/StartProcessConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/s/StartConfig/Release/StartSceneConfig.txt → Config/Json/s/StartConfig/Release/StartSceneConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/s/StartConfig/Release/StartZoneConfig.txt → Config/Json/s/StartConfig/Release/StartZoneConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/s/StartConfig/RouterTest/StartMachineConfig.txt → Config/Json/s/StartConfig/RouterTest/StartMachineConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/s/StartConfig/RouterTest/StartProcessConfig.txt → Config/Json/s/StartConfig/RouterTest/StartProcessConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/s/StartConfig/RouterTest/StartSceneConfig.txt → Config/Json/s/StartConfig/RouterTest/StartSceneConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/s/StartConfig/RouterTest/StartZoneConfig.txt → Config/Json/s/StartConfig/RouterTest/StartZoneConfig.txt


+ 0 - 0
Unity/Assets/Config/Excel/Json/s/UnitConfig.txt → Config/Json/s/UnitConfig.txt


+ 0 - 6
DotNet/App/DotNet.App.csproj

@@ -27,12 +27,6 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Update="NLog.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Model\DotNet.Model.csproj" />
   </ItemGroup>

+ 18 - 0
DotNet/App/Program.cs

@@ -0,0 +1,18 @@
+namespace ET
+{
+    public static class Program
+    {
+        public static void Main()
+        {
+            //这里大家看着可能比较困惑,为什么要绕一大圈呢,之前这里直接调用Model层,现在却要在CoderLoader中获取Model的程序集找到Entry入口再调用
+            //原因是,之前DotNet.App直接依赖Model,但是在客户端,之前的Mono却不依赖Model。这导致前端跟后端程序集依赖不太一样
+            //所以这次加了个Loader的程序集,客户端的Mono程序集也改成Loader,这样前后端Model都引用Loader,Loader通过反射去调用Model的Entry。
+            //这样前后端的程序集依赖就保持了一致。这里调用了Entry.Init()是为了防止dotnet裁剪Model的程序集,毕竟如果App没有调用model,那么dotnet认为
+            //model并没有用到,就不会加载,结果会导致CodeLoader反射调用model失败。
+            //客户端服务端不热更不共享的组件可以写到Loader中,比如表现层需要一个组件不需要热更,可以写在Loader中,这样性能更高。如果客户端跟服务端共享的并且不需要热更的
+            //的组件可以写在Core中
+            Entry.Init();
+            Init.Start();
+        }
+    }
+}

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

@@ -38,6 +38,7 @@
     <ItemGroup>
         <ProjectReference Include="..\..\Share\Analyzer\Share.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
         <ProjectReference Include="..\App\DotNet.App.csproj" />
+        <ProjectReference Include="..\Loader\DotNet.Loader.csproj" />
         <ProjectReference Include="..\Model\DotNet.Model.csproj" />
     </ItemGroup>
 

+ 16 - 6
DotNet/App/CodeLoader.cs → DotNet/Loader/CodeLoader.cs

@@ -9,14 +9,24 @@ namespace ET
     public class CodeLoader: Singleton<CodeLoader>
     {
         private AssemblyLoadContext assemblyLoadContext;
-        
-        private Assembly hotfix;
+
+        private Assembly model;
 
         public void Start()
         {
+            Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
+            foreach (Assembly assembly in assemblies)
+            {
+                if (assembly.GetName().Name == "Model")
+                {
+                    this.model = assembly;
+                    break;
+                }
+            }
             this.LoadHotfix();
             
-            Entry.Start();
+            IStaticMethod start = new StaticMethod(this.model, "ET.Entry", "Start");
+            start.Run();
         }
 
         public void LoadHotfix()
@@ -26,9 +36,9 @@ namespace ET
             assemblyLoadContext = new AssemblyLoadContext("Hotfix", true);
             byte[] dllBytes = File.ReadAllBytes("./Hotfix.dll");
             byte[] pdbBytes = File.ReadAllBytes("./Hotfix.pdb");
-            this.hotfix = assemblyLoadContext.LoadFromStream(new MemoryStream(dllBytes), new MemoryStream(pdbBytes));
-            
-            Dictionary<string, Type> types = AssemblyHelper.GetAssemblyTypes(typeof(Init).Assembly, typeof (Game).Assembly, typeof(Entry).Assembly, this.hotfix);
+            Assembly hotfixAssembly = assemblyLoadContext.LoadFromStream(new MemoryStream(dllBytes), new MemoryStream(pdbBytes));
+
+            Dictionary<string, Type> types = AssemblyHelper.GetAssemblyTypes(Assembly.GetEntryAssembly(), typeof(Init).Assembly, typeof (Game).Assembly, this.model, hotfixAssembly);
 			
             EventSystem.Instance.Add(types);
         }

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

@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <RootNamespace>ET</RootNamespace>
+        <LangVersion>10</LangVersion>
+        <AssemblyName>Loader</AssemblyName>
+    </PropertyGroup>
+    <PropertyGroup>
+        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+        <DefineConstants>DOTNET</DefineConstants>
+        <OutputPath>..\..\Bin\</OutputPath> 
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <Optimize>false</Optimize>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> 
+        <DefineConstants>DOTNET</DefineConstants>
+        <OutputPath>..\..\Bin\</OutputPath>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <Optimize>true</Optimize>
+    </PropertyGroup>
+    <ItemGroup>
+        
+    </ItemGroup> 
+    <ItemGroup> 
+        <ProjectReference Include="..\..\Share\Analyzer\Share.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+        <ProjectReference Include="..\Core\DotNet.Core.csproj" />
+        <ProjectReference Include="..\ThirdParty\DotNet.ThirdParty.csproj" />
+    </ItemGroup>
+</Project>

+ 3 - 3
DotNet/App/Init.cs → DotNet/Loader/Init.cs

@@ -4,9 +4,9 @@ using CommandLine;
 
 namespace ET
 {
-	internal static class Init
+	public static class Init
 	{
-		private static void Main(string[] args)
+		public static void Start()
 		{
 			try
 			{	
@@ -19,7 +19,7 @@ namespace ET
 				Game.AddSingleton<MainThreadSynchronizationContext>();
 
 				// 命令行参数
-				Parser.Default.ParseArguments<Options>(args)
+				Parser.Default.ParseArguments<Options>(System.Environment.GetCommandLineArgs())
 					.WithNotParsed(error => throw new Exception($"命令行格式错误! {error}"))
 					.WithParsed(Game.AddSingleton);
 				

+ 1 - 4
DotNet/Model/DotNet.Model.csproj

@@ -25,10 +25,6 @@
     </PropertyGroup>
     <ItemGroup>
 
-        <Compile Include="..\..\Unity\Assets\Mono\Core\**\*.cs">
-            <Link>Core\%(RecursiveDir)%(FileName)%(Extension)</Link> 
-        </Compile> 
-
         <Compile Include="..\..\Unity\Assets\Scripts\Codes\Model\Server\**\*.cs"> 
             <Link>Server\%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
@@ -49,6 +45,7 @@
     <ItemGroup> 
         <ProjectReference Include="..\..\Share\Analyzer\Share.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
         <ProjectReference Include="..\Core\DotNet.Core.csproj" />
+        <ProjectReference Include="..\Loader\DotNet.Loader.csproj" />
         <ProjectReference Include="..\ThirdParty\DotNet.ThirdParty.csproj" />
     </ItemGroup>
 </Project>

+ 33 - 21
ET.sln

@@ -17,8 +17,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.HotfixView", "Unity\U
 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.Mono", "Unity\Unity.Mono.csproj", "{5910FA29-5797-199C-985B-FC9FC473328E}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ThirdParty", "Unity\Unity.ThirdParty.csproj", "{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Core", "Unity\Unity.Core.csproj", "{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}"
@@ -51,7 +49,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Editor.Codes", "Unity
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EnableCodes", "EnableCodes", "{13A8B20D-7FCD-4FF2-BCFB-5D31B8B8CBD0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DisableCodes", "DisableCodes", "{1FF5AB6A-4CC0-4F8D-8B7E-FBECC7712AA6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Loader", "Unity\Unity.Loader.csproj", "{32B76B98-B8F4-F864-D1F9-50CF255042D8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet.Loader", "DotNet\Loader\DotNet.Loader.csproj", "{1D5E890A-C9D5-45DF-B098-73DBE39EB311}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -123,18 +123,6 @@ Global
 		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Release|x64.Build.0 = Release|Any CPU
 		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Release|x86.ActiveCfg = Release|Any CPU
 		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Release|x86.Build.0 = Release|Any CPU
-		{5910FA29-5797-199C-985B-FC9FC473328E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5910FA29-5797-199C-985B-FC9FC473328E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5910FA29-5797-199C-985B-FC9FC473328E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5910FA29-5797-199C-985B-FC9FC473328E}.Debug|x64.Build.0 = Debug|Any CPU
-		{5910FA29-5797-199C-985B-FC9FC473328E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5910FA29-5797-199C-985B-FC9FC473328E}.Debug|x86.Build.0 = Debug|Any CPU
-		{5910FA29-5797-199C-985B-FC9FC473328E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5910FA29-5797-199C-985B-FC9FC473328E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5910FA29-5797-199C-985B-FC9FC473328E}.Release|x64.ActiveCfg = Release|Any CPU
-		{5910FA29-5797-199C-985B-FC9FC473328E}.Release|x64.Build.0 = Release|Any CPU
-		{5910FA29-5797-199C-985B-FC9FC473328E}.Release|x86.ActiveCfg = Release|Any CPU
-		{5910FA29-5797-199C-985B-FC9FC473328E}.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
@@ -303,13 +291,36 @@ Global
 		{89DD0821-4AE5-0EE7-65A0-445EF4C85913}.Release|x64.Build.0 = Debug|Any CPU
 		{89DD0821-4AE5-0EE7-65A0-445EF4C85913}.Release|x86.ActiveCfg = Debug|Any CPU
 		{89DD0821-4AE5-0EE7-65A0-445EF4C85913}.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
+		{1D5E890A-C9D5-45DF-B098-73DBE39EB311}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1D5E890A-C9D5-45DF-B098-73DBE39EB311}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1D5E890A-C9D5-45DF-B098-73DBE39EB311}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1D5E890A-C9D5-45DF-B098-73DBE39EB311}.Debug|x64.Build.0 = Debug|Any CPU
+		{1D5E890A-C9D5-45DF-B098-73DBE39EB311}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1D5E890A-C9D5-45DF-B098-73DBE39EB311}.Debug|x86.Build.0 = Debug|Any CPU
+		{1D5E890A-C9D5-45DF-B098-73DBE39EB311}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1D5E890A-C9D5-45DF-B098-73DBE39EB311}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1D5E890A-C9D5-45DF-B098-73DBE39EB311}.Release|x64.ActiveCfg = Release|Any CPU
+		{1D5E890A-C9D5-45DF-B098-73DBE39EB311}.Release|x64.Build.0 = Release|Any CPU
+		{1D5E890A-C9D5-45DF-B098-73DBE39EB311}.Release|x86.ActiveCfg = Release|Any CPU
+		{1D5E890A-C9D5-45DF-B098-73DBE39EB311}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{041131CD-3018-19B1-81B6-5DBEE2467FFB} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{5910FA29-5797-199C-985B-FC9FC473328E} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{CCF5D7E3-D5C6-4DE6-BB2D-1A931602F1AB} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
@@ -325,11 +336,12 @@ Global
 		{AB58BEC6-6A17-B4DC-A2EC-30AE7CA7216C} = {13A8B20D-7FCD-4FF2-BCFB-5D31B8B8CBD0}
 		{F35320F7-9304-81E8-7D71-B379F8BA7E35} = {13A8B20D-7FCD-4FF2-BCFB-5D31B8B8CBD0}
 		{E80DCC2F-4205-C895-4E78-6ED5FE5CD429} = {13A8B20D-7FCD-4FF2-BCFB-5D31B8B8CBD0}
-		{1FF5AB6A-4CC0-4F8D-8B7E-FBECC7712AA6} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509} = {1FF5AB6A-4CC0-4F8D-8B7E-FBECC7712AA6}
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E} = {1FF5AB6A-4CC0-4F8D-8B7E-FBECC7712AA6}
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29} = {1FF5AB6A-4CC0-4F8D-8B7E-FBECC7712AA6}
-		{C109842F-01DA-64D4-DBF2-00C6449E459E} = {1FF5AB6A-4CC0-4F8D-8B7E-FBECC7712AA6}
+		{32B76B98-B8F4-F864-D1F9-50CF255042D8} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{1D5E890A-C9D5-45DF-B098-73DBE39EB311} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
+		{52F66610-896A-C4D1-9881-1A19DF7AB80E} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{DE4513D3-889B-5C52-8E9C-744C99AE7509} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{9498BFB4-D9F5-C441-13E3-3F26F7700E29} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{C109842F-01DA-64D4-DBF2-00C6449E459E} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EABC01E3-3EB5-47EF-B46E-AAD8BB3585F1}

+ 1 - 1
Share/Tool/ExcelExporter/ExcelExporter.cs

@@ -62,7 +62,7 @@ namespace ET
 
         private const string excelDir = "../Unity/Assets/Config/Excel/";
 
-        private const string jsonDir = "../Unity/Assets/Config/Excel/Json/{0}/{1}";
+        private const string jsonDir = "../Config/Json/{0}/{1}";
 
         private const string clientProtoDir = "../Unity/Assets/Bundles/Config";
         private const string serverProtoDir = "../Config/Excel/{0}/{1}";

+ 0 - 8
Unity/Assets/Config/Excel/Json.meta

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

+ 0 - 8
Unity/Assets/Config/Excel/Json/c.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/c/AIConfig.txt.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/c/UnitConfig.txt.meta

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

+ 0 - 8
Unity/Assets/Config/Excel/Json/cs.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/cs/AIConfig.txt.meta

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

+ 0 - 8
Unity/Assets/Config/Excel/Json/cs/StartConfig.meta

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

+ 0 - 8
Unity/Assets/Config/Excel/Json/cs/StartConfig/Benchmark.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/cs/StartConfig/Benchmark/StartMachineConfig.txt.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/cs/StartConfig/Benchmark/StartProcessConfig.txt.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/cs/StartConfig/Benchmark/StartSceneConfig.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 8c7b67f365d71fe4e9a1ad1471e94943
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Unity/Assets/Config/Excel/Json/cs/StartConfig/Benchmark/StartZoneConfig.txt.meta

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

+ 0 - 8
Unity/Assets/Config/Excel/Json/cs/StartConfig/Localhost.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/cs/StartConfig/Localhost/StartMachineConfig.txt.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/cs/StartConfig/Localhost/StartProcessConfig.txt.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/cs/StartConfig/Localhost/StartSceneConfig.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 9a92dffb7d05fba4588369bb9e6d0360
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Unity/Assets/Config/Excel/Json/cs/StartConfig/Localhost/StartZoneConfig.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 26dafbf81698941499da2ce077f57133
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
Unity/Assets/Config/Excel/Json/cs/StartConfig/Release.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/cs/StartConfig/Release/StartMachineConfig.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 97fff97e87d362248910baf6eb277d40
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Unity/Assets/Config/Excel/Json/cs/StartConfig/Release/StartProcessConfig.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 143403d48cdcf744b8612deea9cc3c4c
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Unity/Assets/Config/Excel/Json/cs/StartConfig/Release/StartSceneConfig.txt.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/cs/StartConfig/Release/StartZoneConfig.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 89a53198cf57e7c4c8a4560e1360eaf0
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
Unity/Assets/Config/Excel/Json/cs/StartConfig/RouterTest.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/cs/StartConfig/RouterTest/StartMachineConfig.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 11fb64ba41b6571438a9824eca4ac9f5
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Unity/Assets/Config/Excel/Json/cs/StartConfig/RouterTest/StartProcessConfig.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 8d66d9fb63b0be24295c7e0b88ee37aa
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Unity/Assets/Config/Excel/Json/cs/StartConfig/RouterTest/StartSceneConfig.txt.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/cs/StartConfig/RouterTest/StartZoneConfig.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 15327c9b35e98194f89ea85d7e07fe74
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Unity/Assets/Config/Excel/Json/cs/UnitConfig.txt.meta

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

+ 0 - 8
Unity/Assets/Config/Excel/Json/s.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/s/AIConfig.txt.meta

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

+ 0 - 8
Unity/Assets/Config/Excel/Json/s/StartConfig.meta

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

+ 0 - 8
Unity/Assets/Config/Excel/Json/s/StartConfig/Benchmark.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/s/StartConfig/Benchmark/StartMachineConfig.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 599f63029f863ec46933bd9c7f57e682
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Unity/Assets/Config/Excel/Json/s/StartConfig/Benchmark/StartProcessConfig.txt.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/s/StartConfig/Benchmark/StartSceneConfig.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 78a8b84339602ae479d57adc2c3653c5
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Unity/Assets/Config/Excel/Json/s/StartConfig/Benchmark/StartZoneConfig.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 97a8e81e26b5ae14b9dabc4c3a62f435
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
Unity/Assets/Config/Excel/Json/s/StartConfig/Localhost.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/s/StartConfig/Localhost/StartMachineConfig.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 4b7dedc0294afd54b8f39f64db027d34
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Unity/Assets/Config/Excel/Json/s/StartConfig/Localhost/StartProcessConfig.txt.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/s/StartConfig/Localhost/StartSceneConfig.txt.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/s/StartConfig/Localhost/StartZoneConfig.txt.meta

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

+ 0 - 8
Unity/Assets/Config/Excel/Json/s/StartConfig/Release.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/s/StartConfig/Release/StartMachineConfig.txt.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/s/StartConfig/Release/StartProcessConfig.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 02a0b21f0af6692439a4c1c092fd104a
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Unity/Assets/Config/Excel/Json/s/StartConfig/Release/StartSceneConfig.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 4f94bb1647b1c3d4481f9f467fa28299
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Unity/Assets/Config/Excel/Json/s/StartConfig/Release/StartZoneConfig.txt.meta

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

+ 0 - 8
Unity/Assets/Config/Excel/Json/s/StartConfig/RouterTest.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/s/StartConfig/RouterTest/StartMachineConfig.txt.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/s/StartConfig/RouterTest/StartProcessConfig.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 6bc04b5dfa310614a951f6509cda7159
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Unity/Assets/Config/Excel/Json/s/StartConfig/RouterTest/StartSceneConfig.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 62f317d041e7fe043835cd3a022bad8b
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Unity/Assets/Config/Excel/Json/s/StartConfig/RouterTest/StartZoneConfig.txt.meta

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

+ 0 - 7
Unity/Assets/Config/Excel/Json/s/UnitConfig.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 663160fc27254244a8f750da2f23997a
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov