升级版本成功. yooasset注释了一些不该注释的. 是因为unity版本不兼容, 猫大推荐用6000版本. 后续出问题再说把

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/AssemblyReference.asmref

@@ -1 +0,0 @@
-{ "reference": "ET.Hotfix" }

Packages/cn.etetet.actorlocation/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cn.etetet.actorlocation",
   "displayName": "ET.ActorLocation",
-  "version": "2.0.1",
+  "version": "3.0.0",
   "unity": "2022.3",
   "description": "实现了actor location机制",
   "author": {
@@ -13,11 +13,6 @@
     "url": "https://github.com/egametang/ET"
   },
   "relatedPackages": {},
-  "dependencies": {
-    "cn.etetet.core": "2.0.0",
-    "cn.etetet.netinner": "2.0.1",
-    "cn.etetet.startconfig": "2.0.1"
-  },
   "publishConfig": {
     "registry": "https://npm.pkg.github.com/@ET-Packages"
   }

Packages/cn.etetet.ai/Scripts/Hotfix/Share/AIComponentSystem.cs

@@ -50,7 +50,7 @@ namespace ET
 
             var oneAI = AIConfigCategory.Instance.AIConfigs[self.AIConfigId];
 
-            foreach (AIConfig aiConfig in oneAI.Values)
+            foreach (AIConfig aiConfig in oneAI)
             {
 
                 AAIHandler aaiHandler = AIDispatcherComponent.Instance.Get(aiConfig.Name);

Packages/cn.etetet.ai/Scripts/Model/Share/AIConfig.cs

@@ -8,9 +8,9 @@ namespace ET
 	public partial class AIConfigCategory
 	{
 		[BsonIgnore]
-		public Dictionary<int, SortedDictionary<int, AIConfig>> AIConfigs = new Dictionary<int, SortedDictionary<int, AIConfig>>();
+		public Dictionary<int, List<AIConfig>> AIConfigs = new ();
 
-		public SortedDictionary<int, AIConfig> GetAI(int aiConfigId)
+		public List<AIConfig> GetAI(int aiConfigId)
 		{
 			return this.AIConfigs[aiConfigId];
 		}
@@ -19,14 +19,19 @@ namespace ET
 		{
 			foreach (var kv in this.GetAll())
 			{
-				SortedDictionary<int, AIConfig> aiNodeConfig;
+				List<AIConfig> aiNodeConfig;
 				if (!this.AIConfigs.TryGetValue(kv.Value.AIConfigId, out aiNodeConfig))
 				{
-					aiNodeConfig = new SortedDictionary<int, AIConfig>();
+					aiNodeConfig = new List<AIConfig>();
 					this.AIConfigs.Add(kv.Value.AIConfigId, aiNodeConfig);
 				}
 				
-				aiNodeConfig.Add(kv.Key, kv.Value);
+				aiNodeConfig.Add(kv.Value);
+			}
+
+			foreach (var kv in this.AIConfigs)
+			{
+				kv.Value.Sort((x, y)=>x.AIConfigId - y.AIConfigId);
 			}
 		}
 	}

Packages/cn.etetet.ai/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cn.etetet.ai",
   "displayName": "ET.AI",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "unity": "2022.3",
   "description": "行为机模块，用来写ai非常方便",
   "author": {

Packages/cn.etetet.aoi/Scripts/Hotfix/Server/AssemblyReference.asmref

@@ -1 +0,0 @@
-{ "reference": "ET.Hotfix" }

Packages/cn.etetet.aoi/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cn.etetet.aoi",
   "displayName": "ET.Aoi",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "unity": "2022.3",
   "description": "一个九宫格的aoi实现",
   "author": {
@@ -13,9 +13,6 @@
     "url": "https://github.com/egametang/ET"
   },
   "relatedPackages": {},
-  "dependencies": {
-    "cn.etetet.unit": "2.0.0"
-  },
   "publishConfig": {
     "registry": "https://npm.pkg.github.com/@ET-Packages"
   }

Packages/cn.etetet.console/Scripts/Hotfix/Server/AssemblyReference.asmref

@@ -1 +0,0 @@
-{ "reference": "ET.Hotfix" }

Packages/cn.etetet.console/Scripts/Hotfix/Server/AssemblyReference.asmref.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 20b9d48b241ad4f46b745af922c402d4
-AssemblyDefinitionReferenceImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.console/Scripts/Model/Server/AssemblyReference.asmref

@@ -1 +0,0 @@
-{ "reference": "ET.Model" }

Packages/cn.etetet.console/Scripts/Model/Server/AssemblyReference.asmref.meta

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

Packages/cn.etetet.console/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cn.etetet.console",
   "displayName": "ET.Console",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "unity": "2022.3",
   "description": "实现了控制台解析分发",
   "author": {
@@ -13,9 +13,6 @@
     "url": "https://github.com/egametang/ET"
   },
   "relatedPackages": {},
-  "dependencies": {
-    "cn.etetet.core": "2.0.0"
-  },
   "publishConfig": {
     "registry": "https://npm.pkg.github.com/@ET-Packages"
   }

Packages/cn.etetet.core/DotNet~/ET.Core.csproj

@@ -15,7 +15,7 @@
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
       <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-      <DefineConstants>DOTNET;</DefineConstants>
+      <DefineConstants>DOTNET</DefineConstants>
       <OutputPath>$(SolutionDir)Bin</OutputPath>
       <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
       <Optimize>false</Optimize>

Packages/cn.etetet.core/DotNet~/obj/Debug/ET.Core.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("ET.Core")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+aa2a78be4bed74025e5e3b5c495d4447257fa77e")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6224485cc0b0a102f3e99ce865d9192cdd42abee")]
 [assembly: System.Reflection.AssemblyProductAttribute("ET.Core")]
 [assembly: System.Reflection.AssemblyTitleAttribute("ET.Core")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

Packages/cn.etetet.core/DotNet~/obj/Debug/ET.Core.AssemblyInfoInputs.cache

@@ -1 +1 @@
-7bc0567fbf4dd0541066641fc34322cbf5b6f6056e47805110b729cfc3e02a95
+020949359ce3e1c4be99065c803e5ac2dce0fb179eda81b7f7bcf1d16e908c9e

Packages/cn.etetet.core/DotNet~/obj/Debug/ET.Core.csproj.FileListAbsolute.txt

@@ -1,31 +1,3 @@
-C:\Documents\ET-StateSync\Bin\ET.Core.deps.json
-C:\Documents\ET-StateSync\Bin\ET.Core.dll
-C:\Documents\ET-StateSync\Bin\ET.Core.pdb
-C:\Documents\ET-StateSync\Packages\cn.etetet.core\DotNet~\obj\Debug\ET.Core.csproj.AssemblyReference.cache
-C:\Documents\ET-StateSync\Packages\cn.etetet.core\DotNet~\obj\Debug\ET.Core.GeneratedMSBuildEditorConfig.editorconfig
-C:\Documents\ET-StateSync\Packages\cn.etetet.core\DotNet~\obj\Debug\ET.Core.AssemblyInfoInputs.cache
-C:\Documents\ET-StateSync\Packages\cn.etetet.core\DotNet~\obj\Debug\ET.Core.AssemblyInfo.cs
-C:\Documents\ET-StateSync\Packages\cn.etetet.core\DotNet~\obj\Debug\ET.Core.csproj.CoreCompileInputs.cache
-C:\Documents\ET-StateSync\Packages\cn.etetet.core\DotNet~\obj\Debug\ET.Core.sourcelink.json
-C:\Documents\ET-StateSync\Packages\cn.etetet.core\DotNet~\obj\Debug\ET.Core.csproj.Up2Date
-C:\Documents\ET-StateSync\Packages\cn.etetet.core\DotNet~\obj\Debug\ET.Core.dll
-C:\Documents\ET-StateSync\Packages\cn.etetet.core\DotNet~\obj\Debug\refint\ET.Core.dll
-C:\Documents\ET-StateSync\Packages\cn.etetet.core\DotNet~\obj\Debug\ET.Core.pdb
-C:\Documents\ET-StateSync\Packages\cn.etetet.core\DotNet~\obj\Debug\ref\ET.Core.dll
-E:\0A-MyProject\ET9\ET\Bin\ET.Core.deps.json
-E:\0A-MyProject\ET9\ET\Bin\ET.Core.dll
-E:\0A-MyProject\ET9\ET\Bin\ET.Core.pdb
-E:\0A-MyProject\ET9\ET\Packages\cn.etetet.core\DotNet~\obj\Debug\ET.Core.csproj.AssemblyReference.cache
-E:\0A-MyProject\ET9\ET\Packages\cn.etetet.core\DotNet~\obj\Debug\ET.Core.GeneratedMSBuildEditorConfig.editorconfig
-E:\0A-MyProject\ET9\ET\Packages\cn.etetet.core\DotNet~\obj\Debug\ET.Core.AssemblyInfoInputs.cache
-E:\0A-MyProject\ET9\ET\Packages\cn.etetet.core\DotNet~\obj\Debug\ET.Core.AssemblyInfo.cs
-E:\0A-MyProject\ET9\ET\Packages\cn.etetet.core\DotNet~\obj\Debug\ET.Core.csproj.CoreCompileInputs.cache
-E:\0A-MyProject\ET9\ET\Packages\cn.etetet.core\DotNet~\obj\Debug\ET.Core.sourcelink.json
-E:\0A-MyProject\ET9\ET\Packages\cn.etetet.core\DotNet~\obj\Debug\ET.Core.csproj.Up2Date
-E:\0A-MyProject\ET9\ET\Packages\cn.etetet.core\DotNet~\obj\Debug\ET.Core.dll
-E:\0A-MyProject\ET9\ET\Packages\cn.etetet.core\DotNet~\obj\Debug\refint\ET.Core.dll
-E:\0A-MyProject\ET9\ET\Packages\cn.etetet.core\DotNet~\obj\Debug\ET.Core.pdb
-E:\0A-MyProject\ET9\ET\Packages\cn.etetet.core\DotNet~\obj\Debug\ref\ET.Core.dll
 E:\0A_ET9\ET9_WebGL_Dev\Bin\ET.Core.deps.json
 E:\0A_ET9\ET9_WebGL_Dev\Bin\ET.Core.dll
 E:\0A_ET9\ET9_WebGL_Dev\Bin\ET.Core.pdb

Packages/cn.etetet.core/DotNet~/obj/rider.project.model.nuget.info

@@ -1 +1 @@
-17683267409475111
+17683989885649813

Packages/cn.etetet.core/DotNet~/obj/rider.project.restore.info

@@ -1 +1 @@
-17683267409475111
+17683989885649813

Packages/cn.etetet.core/Editor/ComponentViewEditor/ComponentViewEditor.cs

@@ -2,73 +2,130 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-
 using UnityEditor;
 using UnityEngine;
 
 namespace ET
 {
-    [CustomEditor(typeof (ComponentView))]
-    public class ComponentViewEditor: Editor
+    [CustomEditor(typeof(ComponentView))]
+    public class ComponentViewEditor : Editor
     {
         public override void OnInspectorGUI()
         {
-            ComponentView componentView = (ComponentView) target;
-            Entity component = componentView.Component;
-            ComponentViewHelper.Draw(component);
+            var componentView = (ComponentView)target;
+            var component     = componentView.Component;
+            ComponentViewHelper.DrawAction(component);
         }
     }
 
-    public static class ComponentViewHelper
+    public static partial class ComponentViewHelper
     {
-        private static readonly List<ITypeDrawer> typeDrawers = new List<ITypeDrawer>();
+        private static readonly List<ITypeDrawer> typeDrawers = new();
+
+        private static readonly Dictionary<Type, EntityDrawer> entityDrawerDict = new();
+
+        private static Action<Entity> drawAction;
 
         static ComponentViewHelper()
         {
-            Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
+            var assemblies        = AppDomain.CurrentDomain.GetAssemblies();
+            var systemGenericType = typeof(EntityDrawerSystem<>);
+
             foreach (Assembly assembly in assemblies)
             {
                 foreach (Type type in assembly.GetTypes())
                 {
-                    if (!type.IsDefined(typeof (TypeDrawerAttribute)))
+                    if (type.IsDefined(typeof(TypeDrawerAttribute)))
                     {
-                        continue;
+                        ITypeDrawer iTypeDrawer = (ITypeDrawer)Activator.CreateInstance(type);
+                        typeDrawers.Add(iTypeDrawer);
                     }
 
-                    ITypeDrawer iTypeDrawer = (ITypeDrawer) Activator.CreateInstance(type);
-                    typeDrawers.Add(iTypeDrawer);
+                    if (type.IsDefined(typeof(EntityDrawerAttribute)))
+                    {
+                        var baseType = type.BaseType;
+                        if (baseType is not { IsGenericType: true })
+                        {
+                            continue;
+                        }
+
+                        if (baseType.GetGenericTypeDefinition() != systemGenericType)
+                        {
+                            continue;
+                        }
+
+                        var entityType = baseType.GetGenericArguments()[0];
+                        var attribute  = type.GetCustomAttribute<EntityDrawerAttribute>();
+                        var iDrawer    = (IEntityDrawer)Activator.CreateInstance(type);
+                        var order      = attribute.Order;
+                        var drawerData = new EntityDrawer
+                        {
+                            EntityType     = entityType,
+                            Drawer         = iDrawer,
+                            Order          = order,
+                            SkipTypeDrawer = attribute.SkipTypeDrawer
+                        };
+
+                        if (entityDrawerDict.TryGetValue(entityType, out var drawer))
+                        {
+                            if (order > drawer.Order)
+                            {
+                                entityDrawerDict[entityType] = drawerData;
+                            }
+                        }
+                        else
+                        {
+                            entityDrawerDict.Add(entityType, drawerData);
+                        }
+                    }
                 }
             }
+
+            drawAction = Draw;
+
+            OverrideDraw();
         }
-        
-        public static void Draw(Entity entity)
+
+        public static void DrawAction(Entity entity)
         {
             try
             {
-                FieldInfo[] fields = entity.GetType()
-                        .GetFields(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance | BindingFlags.FlattenHierarchy);
+                drawAction?.Invoke(entity);
+            }
+            catch (Exception e)
+            {
+                Debug.Log($"组件视图绘制错误: {entity.GetType().FullName}, {e}");
+            }
+        }
+
+        private static void Draw(Entity entity)
+        {
+            EditorGUILayout.BeginVertical();
+
+            EditorGUILayout.LongField("InstanceId: ", entity.InstanceId);
 
-                EditorGUILayout.BeginVertical();
-                
-                EditorGUILayout.LongField("InstanceId: ", entity.InstanceId);
-                
-                EditorGUILayout.LongField("Id: ", entity.Id);
+            EditorGUILayout.LongField("Id: ", entity.Id);
 
+            var entityType = entity.GetType();
+            entityDrawerDict.TryGetValue(entityType, out var entityDrawer);
+            var skipTypeDrawer = entityDrawer?.SkipTypeDrawer ?? false;
+
+            if (!skipTypeDrawer)
+            {
+                var fields = entityType.GetFields(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance | BindingFlags.FlattenHierarchy);
                 foreach (FieldInfo fieldInfo in fields)
                 {
                     Type type = fieldInfo.FieldType;
-                    if (type.IsDefined(typeof (HideInInspector), false))
+                    if (type.IsDefined(typeof(HideInInspector), false))
                     {
                         continue;
                     }
 
-                    if (fieldInfo.IsDefined(typeof (HideInInspector), false))
+                    if (fieldInfo.IsDefined(typeof(HideInInspector), false))
                     {
                         continue;
                     }
 
-                    object value = fieldInfo.GetValue(entity);
-
                     foreach (ITypeDrawer typeDrawer in typeDrawers)
                     {
                         if (!typeDrawer.HandlesType(type))
@@ -82,27 +139,32 @@ namespace ET
                             fieldName = fieldName.Substring(1, fieldName.Length - 17);
                         }
 
+                        object value = fieldInfo.GetValue(entity);
+
                         try
                         {
-                            value = typeDrawer.DrawAndGetNewValue(type, fieldName, value, null);
+                            value = typeDrawer.DrawAndGetNewValue(type, fieldName, value, entity);
                         }
                         catch (Exception e)
                         {
                             Debug.LogError(e);
                         }
-                        
+
                         fieldInfo.SetValue(entity, value);
                         break;
                     }
                 }
-
-                EditorGUILayout.EndVertical();
             }
-            catch (Exception e)
+
+            if (entityDrawer != null)
             {
-                UnityEngine.Debug.Log($"component view error: {entity.GetType().FullName} {e}");
+                entityDrawer.Drawer.Drawer(entity);
             }
+
+            EditorGUILayout.EndVertical();
         }
+
+        static partial void OverrideDraw();
     }
 }
 #endif

Packages/cn.etetet.core/Editor/ComponentViewEditor/EntityDrawerAttribute.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace ET
+{
+    public class EntityDrawerAttribute : Attribute
+    {
+        public bool SkipTypeDrawer { get; }
+
+        public int Order { get; } //优先级 如果觉得官方的绘制不好看的可以通过更高优先级重写
+
+        public EntityDrawerAttribute(bool skipTypeDrawer = false, int order = 0)
+        {
+            SkipTypeDrawer = skipTypeDrawer;
+            Order          = order;
+        }
+    }
+}

Packages/cn.etetet.core/Editor/ComponentViewEditor/EntityDrawerAttribute.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a4c615f20449407a82a0ddc9cd303559
+timeCreated: 1736317581

Packages/cn.etetet.core/Editor/ComponentViewEditor/IEntityDrawer.cs

@@ -0,0 +1,27 @@
+using System;
+
+namespace ET
+{
+    public interface IEntityDrawer
+    {
+        void Drawer(Entity entity);
+    }
+
+    public abstract class EntityDrawerSystem<T> : IEntityDrawer where T : Entity
+    {
+        void IEntityDrawer.Drawer(Entity entity)
+        {
+            Drawer((T)entity);
+        }
+
+        protected abstract void Drawer(T entity);
+    }
+
+    public class EntityDrawer
+    {
+        public Type          EntityType;
+        public bool          SkipTypeDrawer;
+        public int           Order;
+        public IEntityDrawer Drawer;
+    }
+}

Packages/cn.etetet.core/Editor/ComponentViewEditor/IEntityDrawer.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 80b92043a1744135a29c981fd49c6baa
+timeCreated: 1736317561

Packages/cn.etetet.core/Scripts/Core/Share/DoubleMap.cs

@@ -51,7 +51,7 @@ namespace ET
 		{
 			if (key == null || value == null || kv.ContainsKey(key) || vk.ContainsKey(value))
 			{
-				return;
+				throw new Exception($"double map add fail: {key} {value}");
 			}
 			kv.Add(key, value);
 			vk.Add(value, key);

Packages/cn.etetet.core/Scripts/Core/Share/Entity/Entity.cs

@@ -688,8 +688,7 @@ namespace ET
             Entity component = Create(type, isFromPool);
             component.Id = this.Id;
             component.ComponentParent = this;
-            EntitySystemSingleton entitySystemSingleton = EntitySystemSingleton.Instance;
-            entitySystemSingleton.Awake(component);
+            EntitySystemSingleton.Instance.Awake(component);
 
             return component;
         }
@@ -705,8 +704,7 @@ namespace ET
             Entity component = Create(type, isFromPool);
             component.Id = id;
             component.ComponentParent = this;
-            EntitySystemSingleton entitySystemSingleton = EntitySystemSingleton.Instance;
-            entitySystemSingleton.Awake(component);
+            EntitySystemSingleton.Instance.Awake(component);
 
             return component as K;
         }
@@ -722,8 +720,7 @@ namespace ET
             Entity component = Create(type, isFromPool);
             component.Id = id;
             component.ComponentParent = this;
-            EntitySystemSingleton entitySystemSingleton = EntitySystemSingleton.Instance;
-            entitySystemSingleton.Awake(component, p1);
+            EntitySystemSingleton.Instance.Awake(component, p1);
 
             return component as K;
         }
@@ -739,8 +736,7 @@ namespace ET
             Entity component = Create(type, isFromPool);
             component.Id = id;
             component.ComponentParent = this;
-            EntitySystemSingleton entitySystemSingleton = EntitySystemSingleton.Instance;
-            entitySystemSingleton.Awake(component, p1, p2);
+            EntitySystemSingleton.Instance.Awake(component, p1, p2);
 
             return component as K;
         }
@@ -757,7 +753,39 @@ namespace ET
             component.Id = id;
             component.ComponentParent = this;
             EntitySystemSingleton entitySystemSingleton = EntitySystemSingleton.Instance;
-            entitySystemSingleton.Awake(component, p1, p2, p3);
+            EntitySystemSingleton.Instance.Awake(component, p1, p2, p3);
+
+            return component as K;
+        }
+
+        public K AddComponentWithId<K, P1, P2, P3, P4>(long id, P1 p1, P2 p2, P3 p3, P4 p4, bool isFromPool = false) where K : Entity, IAwake<P1, P2, P3, P4>, new()
+        {
+            Type type = typeof (K);
+            if (this.components != null && this.components.ContainsKey(this.GetComponentLongHashCode(type)))
+            {
+                throw new Exception($"entity already has component: {type.FullName}");
+            }
+
+            Entity component = Create(type, isFromPool);
+            component.Id = id;
+            component.ComponentParent = this;
+            EntitySystemSingleton.Instance.Awake(component, p1, p2, p3, p4);
+
+            return component as K;
+        }
+
+        public K AddComponentWithId<K, P1, P2, P3, P4, P5>(long id, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, bool isFromPool = false) where K : Entity, IAwake<P1, P2, P3, P4, P5>, new()
+        {
+            Type type = typeof (K);
+            if (this.components != null && this.components.ContainsKey(this.GetComponentLongHashCode(type)))
+            {
+                throw new Exception($"entity already has component: {type.FullName}");
+            }
+
+            Entity component = Create(type, isFromPool);
+            component.Id = id;
+            component.ComponentParent = this;
+            EntitySystemSingleton.Instance.Awake(component, p1, p2, p3, p4, p5);
 
             return component as K;
         }
@@ -782,6 +810,16 @@ namespace ET
             return this.AddComponentWithId<K, P1, P2, P3>(this.Id, p1, p2, p3, isFromPool);
         }
 
+        public K AddComponent<K, P1, P2, P3, P4>(P1 p1, P2 p2, P3 p3, P4 p4, bool isFromPool = false) where K : Entity, IAwake<P1, P2, P3, P4>, new()
+        {
+            return this.AddComponentWithId<K, P1, P2, P3, P4>(this.Id, p1, p2, p3, p4, isFromPool);
+        }
+
+        public K AddComponent<K, P1, P2, P3, P4, P5>(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, bool isFromPool = false) where K : Entity, IAwake<P1, P2, P3, P4, P5>, new()
+        {
+            return this.AddComponentWithId<K, P1, P2, P3, P4, P5>(this.Id, p1, p2, p3, p4, p5, isFromPool);
+        }
+
         public Entity AddChild(Entity entity)
         {
             entity.Parent = this;
@@ -832,6 +870,28 @@ namespace ET
             return component;
         }
 
+        public T AddChild<T, A, B, C, D>(A a, B b, C c, D d, bool isFromPool = false) where T : Entity, IAwake<A, B, C, D>
+        {
+            Type type = typeof (T);
+            T component = (T) Entity.Create(type, isFromPool);
+            component.Id = IdGenerater.Instance.GenerateId();
+            component.Parent = this;
+
+            EntitySystemSingleton.Instance.Awake(component, a, b, c, d);
+            return component;
+        }
+
+        public T AddChild<T, A, B, C, D, E>(A a, B b, C c, D d, E e, bool isFromPool = false) where T : Entity, IAwake<A, B, C, D, E>
+        {
+            Type type = typeof (T);
+            T component = (T) Entity.Create(type, isFromPool);
+            component.Id = IdGenerater.Instance.GenerateId();
+            component.Parent = this;
+
+            EntitySystemSingleton.Instance.Awake(component, a, b, c, d, e);
+            return component;
+        }
+
         public T AddChildWithId<T>(long id, bool isFromPool = false) where T : Entity, IAwake
         {
             Type type = typeof (T);
@@ -875,6 +935,28 @@ namespace ET
             return component;
         }
 
+        public T AddChildWithId<T, A, B, C, D>(long id, A a, B b, C c, D d, bool isFromPool = false) where T : Entity, IAwake<A, B, C, D>
+        {
+            Type type = typeof (T);
+            T component = (T) Entity.Create(type, isFromPool);
+            component.Id = id;
+            component.Parent = this;
+
+            EntitySystemSingleton.Instance.Awake(component, a, b, c, d);
+            return component;
+        }
+
+        public T AddChildWithId<T, A, B, C, D, E>(long id, A a, B b, C c, D d, E e, bool isFromPool = false) where T : Entity, IAwake<A, B, C, D, E>
+        {
+            Type type = typeof (T);
+            T component = (T) Entity.Create(type, isFromPool);
+            component.Id = id;
+            component.Parent = this;
+
+            EntitySystemSingleton.Instance.Awake(component, a, b, c, d, e);
+            return component;
+        }
+
         public override void BeginInit()
         {
             // 如果没有挂到树上，不用执行SerializeSystem

Packages/cn.etetet.core/Scripts/Core/Share/Entity/EntityRef.cs

@@ -2,24 +2,57 @@ using System;
 
 namespace ET
 {
-    public struct EntityRef<T> where T: Entity
+    public struct EntityRef<T>: IEquatable<EntityRef<T>> where T: Entity
     {
         private readonly long instanceId;
         private T entity;
 
+        public override int GetHashCode()
+        {
+            return this.instanceId.GetHashCode();
+        }
+
+        public bool Equals(EntityRef<T> obj)
+        {
+            return this.instanceId == obj.instanceId;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is not EntityRef<T> entityRef)
+            {
+                return false;
+            }
+
+            return this.instanceId == entityRef.instanceId;
+        }
+        
+        public static bool operator ==(EntityRef<T> left, EntityRef<T> right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(EntityRef<T> left, EntityRef<T> right)
+        {
+            return !left.Equals(right);
+        }
+
         private EntityRef(T t)
         {
             if (t == null)
             {
-                this.instanceId = 0;
-                this.entity = null;
-                return;
+                throw new Exception("cant convert to entityref, entity is null");
+            }
+
+            if (t.InstanceId == 0)
+            {
+                throw new Exception("cant convert to entityref, entity instanceid == 0!");
             }
             this.instanceId = t.InstanceId;
             this.entity = t;
         }
         
-        private T UnWrap
+        public T Entity
         {
             get
             {
@@ -43,12 +76,12 @@ namespace ET
 
         public static implicit operator T(EntityRef<T> v)
         {
-            return v.UnWrap;
+            return v.Entity;
         }
     }
     
     
-    public struct EntityWeakRef<T> where T: Entity
+    public struct EntityWeakRef<T>: IEquatable<EntityWeakRef<T>> where T: Entity
     {
         private long instanceId;
         // 使用WeakReference，这样不会导致entity dispose了却无法gc的问题
@@ -59,15 +92,18 @@ namespace ET
         {
             if (t == null)
             {
-                this.instanceId = 0;
-                this.weakRef = null;
-                return;
+                throw new Exception("cant convert to entityref, entity is null");
+            }
+
+            if (t.InstanceId == 0)
+            {
+                throw new Exception("cant convert to entityref, entity instanceid == 0!");
             }
             this.instanceId = t.InstanceId;
             this.weakRef = new WeakReference<T>(t);
         }
         
-        private T UnWrap
+        public T Entity
         {
             get
             {
@@ -98,7 +134,37 @@ namespace ET
 
         public static implicit operator T(EntityWeakRef<T> v)
         {
-            return v.UnWrap;
+            return v.Entity;
+        }
+        
+        public override int GetHashCode()
+        {
+            return this.instanceId.GetHashCode();
+        }
+
+        public bool Equals(EntityWeakRef<T> obj)
+        {
+            return this.instanceId == obj.instanceId;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is not EntityWeakRef<T> entityRef)
+            {
+                return false;
+            }
+
+            return this.instanceId == entityRef.instanceId;
+        }
+        
+        public static bool operator ==(EntityWeakRef<T> left, EntityWeakRef<T> right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(EntityWeakRef<T> left, EntityWeakRef<T> right)
+        {
+            return !left.Equals(right);
         }
     }
 }

Packages/cn.etetet.core/Scripts/Core/Share/Entity/EntitySystemSingleton.cs

@@ -237,6 +237,68 @@ namespace ET
             }
         }
 
+        public void Awake<P1, P2, P3, P4>(Entity component, P1 p1, P2 p2, P3 p3, P4 p4)
+        {
+            if (component is not IAwake<P1, P2, P3, P4>)
+            {
+                return;
+            }
+            
+            List<SystemObject> iAwakeSystems = this.TypeSystems.GetSystems(component.GetType(), typeof (IAwakeSystem<P1, P2, P3, P4>));
+            if (iAwakeSystems == null)
+            {
+                return;
+            }
+
+            foreach (IAwakeSystem<P1, P2, P3, P4> aAwakeSystem in iAwakeSystems)
+            {
+                if (aAwakeSystem == null)
+                {
+                    continue;
+                }
+
+                try
+                {
+                    aAwakeSystem.Run(component, p1, p2, p3, p4);
+                }
+                catch (Exception e)
+                {
+                    Log.Error(e);
+                }
+            }
+        }
+
+        public void Awake<P1, P2, P3, P4, P5>(Entity component, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5)
+        {
+            if (component is not IAwake<P1, P2, P3, P4, P5>)
+            {
+                return;
+            }
+            
+            List<SystemObject> iAwakeSystems = this.TypeSystems.GetSystems(component.GetType(), typeof (IAwakeSystem<P1, P2, P3, P4, P5>));
+            if (iAwakeSystems == null)
+            {
+                return;
+            }
+
+            foreach (IAwakeSystem<P1, P2, P3, P4, P5> aAwakeSystem in iAwakeSystems)
+            {
+                if (aAwakeSystem == null)
+                {
+                    continue;
+                }
+
+                try
+                {
+                    aAwakeSystem.Run(component, p1, p2, p3, p4, p5);
+                }
+                catch (Exception e)
+                {
+                    Log.Error(e);
+                }
+            }
+        }
+
         public void Destroy(Entity component)
         {
             if (component is not IDestroy)

Packages/cn.etetet.core/Scripts/Core/Share/Entity/IAwakeSystem.cs

@@ -22,6 +22,10 @@ namespace ET
     {
     }
     
+    public interface IAwake<A, B, C, D, E>
+    {
+    }
+
     public interface IAwakeSystem: ISystemType
     {
         void Run(Entity o);
@@ -47,6 +51,11 @@ namespace ET
         void Run(Entity o, A a, B b, C c, D d);
     }
 
+    public interface IAwakeSystem<A, B, C, D, E>: ISystemType
+    {
+        void Run(Entity o, A a, B b, C c, D d, E e);
+    }
+
     [EntitySystem]
     public abstract class AwakeSystem<T> : SystemObject, IAwakeSystem where T: Entity, IAwake
     {
@@ -151,4 +160,25 @@ namespace ET
 
         protected abstract void Awake(T self, A a, B b, C c, D d);
     }
+
+    [EntitySystem]
+    public abstract class AwakeSystem<T, A, B, C, D, E> : SystemObject, IAwakeSystem<A, B, C, D, E> where T: Entity, IAwake<A, B, C, D, E>
+    {
+        Type ISystemType.Type()
+        {
+            return typeof(T);
+        }
+
+        Type ISystemType.SystemType()
+        {
+            return typeof(IAwakeSystem<A, B, C, D, E>);
+        }
+
+        void IAwakeSystem<A, B, C, D, E>.Run(Entity o, A a, B b, C c, D d, E e)
+        {
+            this.Awake((T)o, a, b, c, d, e);
+        }
+
+        protected abstract void Awake(T self, A a, B b, C c, D d, E e);
+    }
 }

Packages/cn.etetet.core/Scripts/Core/Share/ErrorCore.cs

@@ -32,8 +32,6 @@
         public const int ERR_PacketParserError = 110005;
         public const int ERR_WebsocketConnectError = 110304;
         
-        public const int ERR_WebsocketError = 110305;
-
         // 110000 以上，避免跟SocketError冲突
     }
 }

Packages/cn.etetet.core/Scripts/Core/Share/Helper/ProcessHelper.cs

@@ -27,7 +27,7 @@ namespace ET
             }
             else
             {
-                return Run("/usr/local/bin/dotnet", arguments, workingDirectory, waitExit);
+                return Run("/usr/local/share/dotnet/dotnet", arguments, workingDirectory, waitExit);
             }
         }
 

Packages/cn.etetet.core/Scripts/Core/Share/Network/AService.cs

@@ -10,8 +10,8 @@ namespace ET
         public Action<long, IPEndPoint> AcceptCallback;
         public Action<long, MemoryBuffer> ReadCallback;
         public Action<long, int> ErrorCallback;
-        
-        public long Id { get; set; }
+
+        public long Id { get; set; } = IdGenerater.Instance.GenerateId();
         
         public ServiceType ServiceType { get; protected set; }
         
@@ -60,13 +60,17 @@ namespace ET
         
         public virtual void Dispose()
         {
+            this.Id = 0;
         }
 
         public abstract void Update();
 
         public abstract void Remove(long id, int error = 0);
-        
-        public abstract bool IsDisposed();
+
+        public bool IsDisposed()
+        {
+            return this.Id == 0;
+        }
         
         public abstract void Create(long id, IPEndPoint ipEndPoint);
 

Packages/cn.etetet.core/Scripts/Core/Share/Network/KService.cs

@@ -87,11 +87,6 @@ namespace ET
             this.routerAckCallback.Remove(id);
         }
         
-        public override bool IsDisposed()
-        {
-            return this.Transport == null;
-        }
-
         public override void Dispose()
         {
             if (this.IsDisposed())
@@ -237,6 +232,10 @@ namespace ET
                             {
                                 realAddress = this.cache.ToStr(9, messageLength - 9);
                             }
+                            else
+                            {
+                                realAddress = this.ipEndPoint.ToString();    
+                            }
 
                             remoteConn = BitConverter.ToUInt32(this.cache, 1);
                             localConn = BitConverter.ToUInt32(this.cache, 5);
@@ -259,7 +258,7 @@ namespace ET
                                 
                                 kChannel.RealAddress = realAddress;
 
-                                IPEndPoint realEndPoint = kChannel.RealAddress == null? kChannel.RemoteAddress : NetworkHelper.ToIPEndPoint(kChannel.RealAddress);
+                                IPEndPoint realEndPoint = NetworkHelper.ToIPEndPoint(kChannel.RealAddress);
                                 this.AcceptCallback(kChannel.Id, realEndPoint);
                             }
                             if (kChannel.RemoteConn != remoteConn)

Packages/cn.etetet.core/Scripts/Core/Share/Network/TService.cs

@@ -132,6 +132,11 @@ namespace ET
 		
 		public override void Dispose()
 		{
+			if (this.IsDisposed())
+			{
+				return;
+			}
+			
 			base.Dispose();
 			
 			this.acceptor?.Close();
@@ -143,7 +148,6 @@ namespace ET
 				TChannel channel = this.idChannels[id];
 				channel.Dispose();
 			}
-			this.idChannels.Clear();
 		}
 
 		public override void Remove(long id, int error = 0)
@@ -271,10 +275,5 @@ namespace ET
 				}
 			}
 		}
-		
-		public override bool IsDisposed()
-		{
-			return this.acceptor == null;
-		}
 	}
 }

Packages/cn.etetet.core/Scripts/Core/Share/SortedSet.cs

@@ -1913,16 +1913,19 @@ namespace ET
 
                 // 2 log(n + 1) is the maximum height.
                 // 这里缓存了Stack，防止GC
-                if (set.stack != null)
+                lock (this._tree)
                 {
-                    _stack = set.stack;
-                    _stack.Clear();
-                    set.stack = null;
-                }
-                else
-                {
-                    _stack = new Stack<Node>(2 * (int)Math.Log(set.Count + 1));
+                    if (set.stack != null)
+                    {
+                        _stack = set.stack;
+                        set.stack = null;
+                    }
+                    else
+                    {
+                        _stack = new Stack<Node>(2 * (int)Math.Log(set.Count + 1));
+                    }
                 }
+
                 _current = null;
                 _reverse = reverse;
 
@@ -2006,7 +2009,11 @@ namespace ET
 
             public void Dispose()
             {
-                this._tree.stack = this._stack;
+                this._stack.Clear();
+                lock (this._tree)
+                {
+                    this._tree.stack = this._stack;
+                }
             }
 
             public T Current

Packages/cn.etetet.core/Scripts/Core/Share/World/Fiber/MainThreadScheduler.cs

@@ -10,6 +10,7 @@ namespace ET
         private readonly ConcurrentQueue<int> addIds = new();
         private readonly FiberManager fiberManager;
         private readonly ThreadSynchronizationContext threadSynchronizationContext = new();
+        private Fiber firstFiber;
 
         public MainThreadScheduler(FiberManager fiberManager)
         {
@@ -50,11 +51,10 @@ namespace ET
                 Fiber.Instance = fiber;
                 SynchronizationContext.SetSynchronizationContext(fiber.ThreadSynchronizationContext);
                 fiber.Update();
-                Fiber.Instance = null;
-                
                 this.idQueue.Enqueue(id);
             }
             
+            Fiber.Instance = this.firstFiber;
             // Fiber调度完成，要还原成默认的上下文，否则unity的回调会找不到正确的上下文
             SynchronizationContext.SetSynchronizationContext(this.threadSynchronizationContext);
         }
@@ -83,8 +83,6 @@ namespace ET
                 Fiber.Instance = fiber;
                 SynchronizationContext.SetSynchronizationContext(fiber.ThreadSynchronizationContext);
                 fiber.LateUpdate();
-                Fiber.Instance = null;
-                
                 this.idQueue.Enqueue(id);
             }
 
@@ -94,6 +92,7 @@ namespace ET
                 this.idQueue.Enqueue(result);
             }
             
+            Fiber.Instance = this.firstFiber;
             // Fiber调度完成，要还原成默认的上下文，否则unity的回调会找不到正确的上下文
             SynchronizationContext.SetSynchronizationContext(this.threadSynchronizationContext);
         }
@@ -102,6 +101,7 @@ namespace ET
         public void Add(int fiberId = 0)
         {
             this.addIds.Enqueue(fiberId);
+            this.firstFiber ??= this.fiberManager.Get(fiberId);
         }
     }
 }

Packages/cn.etetet.core/Scripts/Core/Share/World/Fiber/ThreadPoolScheduler.cs

@@ -36,7 +36,7 @@ namespace ET
                     Thread.Sleep(1);
                     
                     // count最小为1
-                    count = this.fiberManager.Count() / this.threads.Count + 1;
+                    count = this.idQueue.Count / this.threads.Count + 1;
                 }
 
                 --count;

Packages/cn.etetet.core/Scripts/Model/Share/PackageType.cs

@@ -1,7 +1,8 @@
 namespace ET
 {
+    [UniqueId]
     public static partial class PackageType
     {
         public const int Core = 1;
     }
-}
+}

Packages/cn.etetet.core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cn.etetet.core",
   "displayName": "ET.Core",
-  "version": "2.0.5",
+  "version": "3.0.3",
   "description": "et框架核心, 实现了纤程，网络，entity等et基础功能",
   "author": {
     "name": "tanghai",
@@ -12,11 +12,8 @@
     "url": "https://github.com/egametang/ET"
   },
   "relatedPackages": {},
-  "dependencies": {
-    "cn.etetet.sourcegenerator": "0.0.5",
-    "cn.etetet.memorypack": "1.10.0"
-  },
   "publishConfig": {
     "registry": "https://npm.pkg.github.com/@ET-Packages"
-  }
+  },
+  "dependencies": {}
 }

Packages/cn.etetet.demores/Scenes/Mat/Urp.mat

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 7
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -33,7 +33,8 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap:
     RenderType: Opaque
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
@@ -133,3 +134,4 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 0.5}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

Packages/cn.etetet.demores/Unit/Skeleton/Ani/Materials/skeleton_D.mat

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 7
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -32,7 +32,8 @@ Material:
   m_CustomRenderQueue: 2000
   stringTagMap:
     RenderType: Opaque
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
@@ -94,3 +95,4 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

Packages/cn.etetet.demores/Unit/Skeleton/Character/Materials/skeleton_D.mat

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 7
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -32,7 +32,8 @@ Material:
   m_CustomRenderQueue: 2000
   stringTagMap:
     RenderType: Opaque
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
@@ -94,3 +95,4 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

Packages/cn.etetet.demores/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cn.etetet.demores",
   "displayName": "ET.DemoRes",
-  "version": "0.0.2",
+  "version": "3.0.0",
   "unity": "2022.3",
   "description": "et自带demo的一些资源",
   "author": {

Packages/cn.etetet.excel/CodeMode/Model/Client/AIConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e876a1b25df9b724e9f82f16389dcb7a
+guid: 8542bf01578910540a7aa2165672953e
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Packages/cn.etetet.aoi/Scripts/Hotfix/Server/AssemblyReference.asmref.meta → Packages/cn.etetet.excel/CodeMode/Model/Client/AssemblyReference.asmref.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6a7b29015c5b1744aa80ca33ca11ec38
+guid: 2727f56b6eecac54c856c203ca80c3af
 AssemblyDefinitionReferenceImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/CodeMode/Model/Client/UnitConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: aa39186382bdddc47ae89437e759b95d
+guid: 58253a330a7bf3c47980e618c15ffdfc
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Packages/cn.etetet.excel/CodeMode/Model/ClientServer/AIConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 67830b127f69b924d8f27268fc5ba03c
+guid: bd87341647076294c967ab01b52e6148
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Packages/cn.etetet.excel/CodeMode/Model/ClientServer/AssemblyReference.asmref

@@ -1 +0,0 @@
-{ "reference": "ET.Model" }

Packages/cn.etetet.excel/CodeMode/Model/ClientServer/AssemblyReference.asmref.meta

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

Packages/cn.etetet.excel/CodeMode/Model/ClientServer/StartMachineConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 577ecc293df337246aeae5f7276b0997
+guid: 5c6ab50f6b7ae414dbe4b812aea2e594
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Packages/cn.etetet.excel/CodeMode/Model/ClientServer/StartProcessConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9912b2d6d75243244acc038fb3aed11a
+guid: c37509c0c9e4e5a4fa23e771fd559c04
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Packages/cn.etetet.excel/CodeMode/Model/ClientServer/StartSceneConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 582ee21d01a9a554eab3df6ac347a4e3
+guid: 593b6ee65c96f6644a447e146189d4e6
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Packages/cn.etetet.excel/CodeMode/Model/ClientServer/StartZoneConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 484d4fbf704dac1438919dd58813dd4b
+guid: 359a2a39221b60f4ca8d2eaa30921159
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Packages/cn.etetet.excel/CodeMode/Model/ClientServer/UnitConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 937935582af702747b5d5f4c57d78c41
+guid: 62aeea50f149c4c4a90ee9ff44ce8271
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Packages/cn.etetet.excel/CodeMode/Model/Server/AIConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6e8d6451a11e60d4ba6e2725d200f7d2
+guid: 4f46b2b7be791a34d9146595be0b3f3f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Packages/cn.etetet.excel/CodeMode/Model/Server/StartMachineConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 92239e6e4f724a74a872f04680c710c4
+guid: b5374f11cb2b7844187b076d550a8783
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Packages/cn.etetet.excel/CodeMode/Model/Server/StartProcessConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4ae8d1f2ede0aba4598a020a09c9452f
+guid: 158d727586edb104ba3e5283145fb28e
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Packages/cn.etetet.excel/CodeMode/Model/Server/StartSceneConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 23fe6289dbc6d1747bdcf4fbc07c935f
+guid: 9bfd0809a130b5140a02993ab8100fa8
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Packages/cn.etetet.excel/CodeMode/Model/Server/StartZoneConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6c768f580e1d06d4c9d138a49fb6ffa1
+guid: 6b1d63ca500803f489e6aa20a34381cc
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Packages/cn.etetet.excel/CodeMode/Model/Server/UnitConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3d4a135d4d434834fb5e4cb3a06e7aac
+guid: 847ce198a4f668840b55bc64e24c7797
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Packages/cn.etetet.excel/Config/Bytes/c/AIConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 604fa8f36526c3f4fb2bdd1b627aee21
+guid: 7fb1edc2ad7b66d43b07ac79fb28a88d
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/c/UnitConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3728c0f5d89d9ae4d9b843cdce33900a
+guid: c0fdb2dc948adb94caf79d59928106e2
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/cs/AIConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cd2bd1b833c36ae4b8f6d69abc597a54
+guid: 77c7016a57b9d7240be182112fcf937e
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/cs/StartConfig.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c404c9827a952564296108aff3fdf950
+guid: c3b75b345d0ae0e4681639f2b734c45f
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Packages/cn.etetet.excel/Config/Bytes/cs/StartConfig/Example.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e9231a0d20bf06245a8897acd2244738
+guid: 867e3f1f3eb4cdf4e848441293e5ba95
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Packages/cn.etetet.excel/Config/Bytes/cs/StartConfig/Example/StartMachineConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7764f1c80f0756845b60eef58386d527
+guid: 61212bab3650da44e937cf45280360db
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/cs/StartConfig/Example/StartProcessConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3831ce138338259459217b291347ce16
+guid: 102b461657c016b41858e6344e9f54d2
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/cs/StartConfig/Example/StartSceneConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3f1e39ee0d892294b9e0245abbd49eed
+guid: 9b21aa431762cac42b36353069ffa534
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/cs/StartConfig/Example/StartZoneConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 123441680ada3f44c8d86d5af419d3d7
+guid: 3cdeab6455d6d14478592b9aa6094955
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/cs/StartConfig/Localhost.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 56fa498d5bb9a1b4b82fd1c8f587c66a
+guid: fa2cde667c02c1143b9ca2d5d620e0b4
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Packages/cn.etetet.excel/Config/Bytes/cs/StartConfig/Localhost/StartMachineConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 10403a149f181fc489c3450c736cbd21
+guid: cae51c39aafc7e541b7ca3d55c43c8e9
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/cs/StartConfig/Localhost/StartProcessConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 25e9c478e604e194f91a8a06d621a281
+guid: 97e265b5f82d14645b824559e95f1dcc
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/cs/StartConfig/Localhost/StartSceneConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 685f1c73aeb028c428b232181a73ac07
+guid: e6d187cd502261c488c73df40efc6dcb
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/cs/StartConfig/Localhost/StartZoneConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0f557569fb45e76478fe1a9f7743279e
+guid: 5690056f7629ad943b91f357a267abb7
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/cs/StartConfig/Release.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 509ea66856ee1ee418ac01590fd5d9f4
+guid: a7143956e01328542bc91d93999e876a
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Packages/cn.etetet.excel/Config/Bytes/cs/StartConfig/Release/StartMachineConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b94c560d0f20d404f836d6fa56397d8f
+guid: f407948ac68fdd94d9e3d7ed50a3b435
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/cs/StartConfig/Release/StartProcessConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 59132c30cfdcd024aa67011e9c4a7bba
+guid: 39d50b83f884a0a458cfc52c73bee79e
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/cs/StartConfig/Release/StartSceneConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ca26c639f7d48a6499e6c0abcfbdef98
+guid: d0bf2554c84973042a5121fc34f43a83
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/cs/StartConfig/Release/StartZoneConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 81e752d4ffb2bf6409c9fbeadde60d59
+guid: 548c2083dbfe3b84a87775f4c5aacc1a
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/cs/UnitConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a12eea770bb39254a9e2d30154e569af
+guid: 8b92c02f678448d4c8917a9e48a127a6
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/s/AIConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5fc6cad1c9f15a8499ef9c877452e00a
+guid: d4c9f6af59b9e954391faace7a28f449
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/s/StartConfig.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 72d0bd5914a15cb43bcd54e23b08c060
+guid: 0acf596da0b8efc4eb771fd955906f35
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Packages/cn.etetet.excel/Config/Bytes/s/StartConfig/Example.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c559081ea17eabd479195fa3dde2269d
+guid: f0b8bf800d56b844ab3fc703a8b77252
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Packages/cn.etetet.excel/Config/Bytes/s/StartConfig/Example/StartMachineConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 438056c82d06cd0459ae655e26e76697
+guid: f14c5db196912824b85265cb237af7e2
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/s/StartConfig/Example/StartProcessConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 537a45930340a7c44b3cd14464615785
+guid: 245f5b062d0806a4b8d412a113d4ebd9
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/s/StartConfig/Example/StartSceneConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4e77a00f5a744ed409f164c9abb65fc6
+guid: 8c17d8d60beeed844b3d2e855ecf44ac
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/s/StartConfig/Example/StartZoneConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f0f4bfe43144a6849acaecd2ee17aa0c
+guid: 58f425c36b8a8cb4581ec8fcce33c255
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/s/StartConfig/Localhost.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9dab61dc5a5e7974aa4df6c10114888a
+guid: 314ab69a025fc314bae84341cf3b6f33
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Packages/cn.etetet.excel/Config/Bytes/s/StartConfig/Localhost/StartMachineConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7c52a985ef894b64e96e642804748649
+guid: 02402005811367248b4f91c0ce3098de
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/s/StartConfig/Localhost/StartProcessConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 81bb1d0ca284f214f8c6dbbbc23f9311
+guid: 0885d9c0690e15e49abebb53e3d213f9
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/s/StartConfig/Localhost/StartSceneConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bd9900516c5fef5439ecddcf1cc078bd
+guid: 288abe3ed66de94488689c0a1b7fd1d1
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/s/StartConfig/Localhost/StartZoneConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7ed451a8b3380f2408f61287b68ffa36
+guid: 5bca7250c587c7840b917f8a80435442
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/s/StartConfig/Release.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1fb2ea2888dcfb94d905868962787214
+guid: db32cfe5b2971a246aadcb88cfd5bb51
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Packages/cn.etetet.excel/Config/Bytes/s/StartConfig/Release/StartMachineConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 914c4b668fe21dc4590699b9389a7f27
+guid: ba6bb4f804cf88a40a0733ab5b314021
 TextScriptImporter:
   externalObjects: {}
   userData: 

Packages/cn.etetet.excel/Config/Bytes/s/StartConfig/Release/StartProcessConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 70ee8c2a2695fd24785f62af08788014
+guid: 4bac794b74fec354d8c48d75accf9e8c
 TextScriptImporter:
   externalObjects: {}
   userData: