Răsfoiți Sursa

先暂时不把module加到excel的命名空间中

tanghai 1 an în urmă
părinte
comite
a9537969ea

+ 1 - 1
Generate/ClientServer/Excel/Core/StartMachineConfig.cs

@@ -4,7 +4,7 @@ using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
 using System.ComponentModel;
 
-namespace ET.Core
+namespace ET
 {
     [Config]
     public partial class StartMachineConfigCategory : Singleton<StartMachineConfigCategory>, IMerge

+ 1 - 1
Generate/ClientServer/Excel/Core/StartProcessConfig.cs

@@ -4,7 +4,7 @@ using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
 using System.ComponentModel;
 
-namespace ET.Core
+namespace ET
 {
     [Config]
     public partial class StartProcessConfigCategory : Singleton<StartProcessConfigCategory>, IMerge

+ 1 - 1
Generate/ClientServer/Excel/Core/StartSceneConfig.cs

@@ -4,7 +4,7 @@ using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
 using System.ComponentModel;
 
-namespace ET.Core
+namespace ET
 {
     [Config]
     public partial class StartSceneConfigCategory : Singleton<StartSceneConfigCategory>, IMerge

+ 1 - 1
Generate/ClientServer/Excel/Core/StartZoneConfig.cs

@@ -4,7 +4,7 @@ using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
 using System.ComponentModel;
 
-namespace ET.Core
+namespace ET
 {
     [Config]
     public partial class StartZoneConfigCategory : Singleton<StartZoneConfigCategory>, IMerge

+ 1 - 1
Generate/Server/Excel/Core/StartMachineConfig.cs

@@ -4,7 +4,7 @@ using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
 using System.ComponentModel;
 
-namespace ET.Core
+namespace ET
 {
     [Config]
     public partial class StartMachineConfigCategory : Singleton<StartMachineConfigCategory>, IMerge

+ 1 - 1
Generate/Server/Excel/Core/StartProcessConfig.cs

@@ -4,7 +4,7 @@ using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
 using System.ComponentModel;
 
-namespace ET.Core
+namespace ET
 {
     [Config]
     public partial class StartProcessConfigCategory : Singleton<StartProcessConfigCategory>, IMerge

+ 1 - 1
Generate/Server/Excel/Core/StartSceneConfig.cs

@@ -4,7 +4,7 @@ using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
 using System.ComponentModel;
 
-namespace ET.Core
+namespace ET
 {
     [Config]
     public partial class StartSceneConfigCategory : Singleton<StartSceneConfigCategory>, IMerge

+ 1 - 1
Generate/Server/Excel/Core/StartZoneConfig.cs

@@ -4,7 +4,7 @@ using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
 using System.ComponentModel;
 
-namespace ET.Core
+namespace ET
 {
     [Config]
     public partial class StartZoneConfigCategory : Singleton<StartZoneConfigCategory>, IMerge

+ 3 - 2
Share/Tool/ExcelExporter/ExcelExporter.cs

@@ -497,7 +497,8 @@ namespace ET
                 sb.Append($"\t\tpublic {fieldType} {headInfo.FieldName} {{ get; set; }}\n");
             }
 
-            template = template.Replace("(ns)", $"ET.{table.Module}");
+            //template = template.Replace("(ns)", $"ET.{table.Module}");
+            template = template.Replace("(ns)", "ET");
             string content = template.Replace("(ConfigName)", table.Name).Replace(("(Fields)"), sb.ToString());
             sw.Write(content);
         }
@@ -644,7 +645,7 @@ namespace ET
             }
 
             Assembly ass = GetAssembly(configType);
-            Type type = ass.GetType($"ET.{table.Module}.{table.Name}Category");
+            Type type = ass.GetType($"ET.{table.Name}Category");
 
             IMerge final = Activator.CreateInstance(type) as IMerge;
 

+ 1 - 1
Unity/ProjectSettings/EditorBuildSettings.asset

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