调整配置的加载

DotNet/App/ConfigLoader.cs → DotNet/Loader/ConfigLoader.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace ET.Server
+namespace ET
 {
     [Invoke]
     public class GetAllConfigBytes: AInvokeHandler<ConfigComponent.GetAllConfigBytes, Dictionary<Type, byte[]>>

DotNet/Loader/DotNet.Loader.csproj

@@ -28,7 +28,7 @@
     </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"/>
+        <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>

Unity/Assets/Scripts/Core/World/Module/Config/ConfigAttribute.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 5237b38531c8cea41a44538f14db11c1
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Scripts/Core/World/Module/Config/ConfigComponent.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: a66d5c2a1d19de249a94ff9839a3624d
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Scripts/Core/World/Module/Config/ConfigSingleton.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: e3f57aff7b8dfc3489d97b45c8423bc8
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Scripts/Core/World/Module/Config/IConfig.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 986a79748635bf741ba4ba0ac5e68d5b
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Scripts/Core/World/Module/Config/IMerge.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: c2d3bd3ce794a884e96904d2f9f5b5b5
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Scripts/Core/World/Module/Network.meta

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

Unity/Assets/Scripts/ModelView/Client/Demo/Config/ConfigLoader.cs → Unity/Assets/Scripts/Loader/ConfigLoader.cs

@@ -3,9 +3,8 @@ using System.Collections.Generic;
 using System.IO;
 using UnityEngine;
 
-namespace ET.Client
+namespace ET
 {
-    /*
     [Invoke]
     public class GetAllConfigBytes: AInvokeHandler<ConfigComponent.GetAllConfigBytes, Dictionary<Type, byte[]>>
     {
@@ -56,16 +55,11 @@ namespace ET.Client
             }
             else
             {
-                using (RootEntity.Instance.AddComponent<ResourcesComponent>())
+                Dictionary<string, UnityEngine.Object> dictionary = AssetsBundleHelper.LoadBundle("config.unity3d");
+                foreach (Type type in configTypes)
                 {
-                    const string configBundleName = "config.unity3d";
-                    ResourcesComponent.Instance.LoadBundle(configBundleName);
-                    
-                    foreach (Type configType in configTypes)
-                    {
-                        TextAsset v = ResourcesComponent.Instance.GetAsset(configBundleName, configType.Name) as TextAsset;
-                        output[configType] = v.bytes;
-                    }
+                    TextAsset v = dictionary[type.Name] as TextAsset;
+                    output[type] = v.bytes;
                 }
             }
 
@@ -78,10 +72,7 @@ namespace ET.Client
     {
         public override byte[] Handle(ConfigComponent.GetOneConfigBytes args)
         {
-            //TextAsset v = ResourcesComponent.Instance.GetAsset("config.unity3d", configName) as TextAsset;
-            //return v.bytes;
             throw new NotImplementedException("client cant use LoadOneConfig");
         }
     }
-    */
 }

Unity/Assets/Scripts/ModelView/Client/Demo/Config/ConfigLoader.cs.meta → Unity/Assets/Scripts/Loader/ConfigLoader.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 10190f390e3576c41ac78a2ab042ddce
+guid: c3d36213fb9e6a44a924e9b26dcae1fe
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Scripts/Loader/Module.meta

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

Unity/Assets/Scripts/ModelView/Client/Demo/Camera.meta

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

Unity/Assets/Scripts/ModelView/Client/Demo/Config.meta

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

Unity/Assets/Scripts/ModelView/Client/Demo/Global.meta

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

Unity/Assets/Scripts/ModelView/Client/LockStep/UnitFView.meta

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