Просмотр исходного кода

1.Game管理的Singleton增加ISingletonUpdate跟ISingletonLateUpdate接口,实现相应的接口即可执行对应的Update跟LateUpdate方法
2.NetThreadComponent删除,NetService实现ISingletonLateUpdate来进行Update
3.调整Core代码结构

tanghai 3 лет назад
Родитель
Сommit
091e05f25d
100 измененных файлов с 90 добавлено и 204 удалено
  1. 1 0
      DotNet/App/Init.cs
  2. 2 3
      Unity/Assets/Scripts/Codes/Hotfix/Server/Module/MessageInner/NetInnerComponentSystem.cs
  3. 0 1
      Unity/Assets/Scripts/Codes/Hotfix/Share/Demo/EntryEvent1_InitShare.cs
  4. 5 5
      Unity/Assets/Scripts/Codes/Hotfix/Share/Module/Message/NetKcpComponentSystem.cs
  5. 0 26
      Unity/Assets/Scripts/Codes/Hotfix/Share/Module/Message/NetThreadComponentSystem.cs
  6. 5 3
      Unity/Assets/Scripts/Codes/Hotfix/Share/Module/Message/SessionIdleCheckerComponentSystem.cs
  7. 0 1
      Unity/Assets/Scripts/Codes/Model/Client/Demo/Ping/PingComponent.cs
  8. 1 1
      Unity/Assets/Scripts/Codes/Model/Generate/Server/ConfigPartial/StartSceneConfig.cs
  9. 2 2
      Unity/Assets/Scripts/Codes/Model/Share/Entry.cs
  10. 1 1
      Unity/Assets/Scripts/Codes/Model/Share/Module/AI/AIConfig.cs
  11. 0 17
      Unity/Assets/Scripts/Codes/Model/Share/Module/Message/NetThreadComponent.cs
  12. 1 1
      Unity/Assets/Scripts/Codes/Model/Share/Module/Message/SessionIdleCheckerComponent.cs
  13. 0 3
      Unity/Assets/Scripts/Codes/Model/Share/Module/Recast/PathfindingComponent.cs
  14. 1 1
      Unity/Assets/Scripts/Core/Analyzer.meta
  15. 0 0
      Unity/Assets/Scripts/Core/Analyzer/ChildOfAttribute.cs
  16. 1 1
      Unity/Assets/Scripts/Core/Analyzer/ChildOfAttribute.cs.meta
  17. 0 0
      Unity/Assets/Scripts/Core/Analyzer/ComponentOfAttribute.cs
  18. 1 1
      Unity/Assets/Scripts/Core/Analyzer/ComponentOfAttribute.cs.meta
  19. 0 0
      Unity/Assets/Scripts/Core/Analyzer/EnableAccessEntiyChildAttribute.cs
  20. 1 1
      Unity/Assets/Scripts/Core/Analyzer/EnableAccessEntiyChildAttribute.cs.meta
  21. 0 0
      Unity/Assets/Scripts/Core/Analyzer/EnableMethodAttribute.cs
  22. 1 1
      Unity/Assets/Scripts/Core/Analyzer/EnableMethodAttribute.cs.meta
  23. 0 0
      Unity/Assets/Scripts/Core/Analyzer/FriendOfAttribute.cs
  24. 1 1
      Unity/Assets/Scripts/Core/Analyzer/FriendOfAttribute.cs.meta
  25. 0 0
      Unity/Assets/Scripts/Core/Analyzer/StaticFieldAttribute.cs
  26. 1 1
      Unity/Assets/Scripts/Core/Analyzer/StaticFieldAttribute.cs.meta
  27. 0 0
      Unity/Assets/Scripts/Core/Analyzer/UniqueIdAttribute.cs
  28. 1 1
      Unity/Assets/Scripts/Core/Analyzer/UniqueIdAttribute.cs.meta
  29. 0 75
      Unity/Assets/Scripts/Core/Entity/Game.cs
  30. 0 0
      Unity/Assets/Scripts/Core/Helper/JsonHelper.cs
  31. 1 1
      Unity/Assets/Scripts/Core/Helper/JsonHelper.cs.meta
  32. 0 0
      Unity/Assets/Scripts/Core/Helper/ProtobufHelper.cs
  33. 1 1
      Unity/Assets/Scripts/Core/Helper/ProtobufHelper.cs.meta
  34. 2 1
      Unity/Assets/Scripts/Core/Module.meta
  35. 1 1
      Unity/Assets/Scripts/Core/Module/Config.meta
  36. 0 0
      Unity/Assets/Scripts/Core/Module/Config/ConfigAttribute.cs
  37. 0 0
      Unity/Assets/Scripts/Core/Module/Config/ConfigAttribute.cs.meta
  38. 0 0
      Unity/Assets/Scripts/Core/Module/Config/ConfigComponent.cs
  39. 0 0
      Unity/Assets/Scripts/Core/Module/Config/ConfigComponent.cs.meta
  40. 6 1
      Unity/Assets/Scripts/Core/Module/Config/ConfigSingleton.cs
  41. 0 0
      Unity/Assets/Scripts/Core/Module/Config/ConfigSingleton.cs.meta
  42. 0 0
      Unity/Assets/Scripts/Core/Module/Config/IConfig.cs
  43. 0 0
      Unity/Assets/Scripts/Core/Module/Config/IConfig.cs.meta
  44. 0 0
      Unity/Assets/Scripts/Core/Module/Config/IMerge.cs
  45. 0 0
      Unity/Assets/Scripts/Core/Module/Config/IMerge.cs.meta
  46. 1 1
      Unity/Assets/Scripts/Core/Module/Entity.meta
  47. 2 2
      Unity/Assets/Scripts/Core/Module/Entity/Entity.cs
  48. 1 1
      Unity/Assets/Scripts/Core/Module/Entity/Entity.cs.meta
  49. 0 0
      Unity/Assets/Scripts/Core/Module/Entity/EntitySceneFactory.cs
  50. 1 1
      Unity/Assets/Scripts/Core/Module/Entity/EntitySceneFactory.cs.meta
  51. 0 0
      Unity/Assets/Scripts/Core/Module/Entity/Root.cs
  52. 1 1
      Unity/Assets/Scripts/Core/Module/Entity/Root.cs.meta
  53. 0 0
      Unity/Assets/Scripts/Core/Module/Entity/Scene.cs
  54. 1 1
      Unity/Assets/Scripts/Core/Module/Entity/Scene.cs.meta
  55. 0 0
      Unity/Assets/Scripts/Core/Module/Entity/SceneHelper.cs
  56. 1 1
      Unity/Assets/Scripts/Core/Module/Entity/SceneHelper.cs.meta
  57. 0 0
      Unity/Assets/Scripts/Core/Module/Entity/SceneType.cs
  58. 1 1
      Unity/Assets/Scripts/Core/Module/Entity/SceneType.cs.meta
  59. 8 0
      Unity/Assets/Scripts/Core/Module/EventSystem.meta
  60. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/BaseAttribute.cs
  61. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/BaseAttribute.cs.meta
  62. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/CallbackAttribute.cs
  63. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/CallbackAttribute.cs.meta
  64. 1 1
      Unity/Assets/Scripts/Core/Module/EventSystem/ComponentView.cs
  65. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/ComponentView.cs.meta
  66. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/EventAttribute.cs
  67. 1 1
      Unity/Assets/Scripts/Core/Module/EventSystem/EventAttribute.cs.meta
  68. 24 39
      Unity/Assets/Scripts/Core/Module/EventSystem/EventSystem.cs
  69. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/EventSystem.cs.meta
  70. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/IAddComponentSystem.cs
  71. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/IAddComponentSystem.cs.meta
  72. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/IAwakeSystem.cs
  73. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/IAwakeSystem.cs.meta
  74. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/ICallback.cs
  75. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/ICallback.cs.meta
  76. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/IDeserializeSystem.cs
  77. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/IDeserializeSystem.cs.meta
  78. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/IDestroySystem.cs
  79. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/IDestroySystem.cs.meta
  80. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/IEvent.cs
  81. 1 1
      Unity/Assets/Scripts/Core/Module/EventSystem/IEvent.cs.meta
  82. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/IGetComponentSystem.cs
  83. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/IGetComponentSystem.cs.meta
  84. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/ILateUpdateSystem.cs
  85. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/ILateUpdateSystem.cs.meta
  86. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/ILoadSystem.cs
  87. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/ILoadSystem.cs.meta
  88. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/ISerializeToEntity.cs
  89. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/ISerializeToEntity.cs.meta
  90. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/ISystemType.cs
  91. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/ISystemType.cs.meta
  92. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/ITransfer.cs
  93. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/ITransfer.cs.meta
  94. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/IUpdateSystem.cs
  95. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/IUpdateSystem.cs.meta
  96. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/ObjectSystemAttribute.cs
  97. 0 0
      Unity/Assets/Scripts/Core/Module/EventSystem/ObjectSystemAttribute.cs.meta
  98. 8 0
      Unity/Assets/Scripts/Core/Module/IdGenerater.meta
  99. 0 0
      Unity/Assets/Scripts/Core/Module/IdGenerater/IdGenerater.cs
  100. 1 1
      Unity/Assets/Scripts/Core/Module/IdGenerater/IdGenerater.cs.meta

+ 1 - 0
DotNet/App/Init.cs

@@ -44,6 +44,7 @@ namespace ET
 					try
 					{
 						Thread.Sleep(1);
+						ThreadSynchronizationContext.Instance.Update();
 						Game.Update();
 						Game.LateUpdate();
 					}

+ 2 - 3
Unity/Assets/Scripts/Codes/Hotfix/Server/Module/MessageInner/NetInnerComponentSystem.cs

@@ -5,7 +5,6 @@ using System.Net.Sockets;
 namespace ET.Server
 {
     [FriendOf(typeof(NetInnerComponent))]
-    [FriendOf(typeof(NetThreadComponent))]
     public static class NetInnerComponentSystem
     {
         [ObjectSystem]
@@ -16,7 +15,7 @@ namespace ET.Server
                 NetInnerComponent.Instance = self;
                 self.SessionStreamDispatcherType = sessionStreamDispatcherType;
             
-                self.Service = new KService(NetThreadComponent.Instance.ThreadSynchronizationContext, AddressFamily.InterNetwork, ServiceType.Inner);
+                self.Service = new KService(ThreadSynchronizationContext.Instance, AddressFamily.InterNetwork, ServiceType.Inner);
                 self.Service.ErrorCallback += self.OnError;
                 self.Service.ReadCallback += self.OnRead;
             }
@@ -30,7 +29,7 @@ namespace ET.Server
                 NetInnerComponent.Instance = self;
                 self.SessionStreamDispatcherType = sessionStreamDispatcherType;
 
-                self.Service = new KService(NetThreadComponent.Instance.ThreadSynchronizationContext, address, ServiceType.Inner);
+                self.Service = new KService(ThreadSynchronizationContext.Instance, address, ServiceType.Inner);
                 self.Service.ErrorCallback += self.OnError;
                 self.Service.ReadCallback += self.OnRead;
                 self.Service.AcceptCallback += self.OnAccept;

+ 0 - 1
Unity/Assets/Scripts/Codes/Hotfix/Share/Demo/EntryEvent1_InitShare.cs

@@ -9,7 +9,6 @@ namespace ET
             Game.Scene.AddComponent<OpcodeTypeComponent>();
             Game.Scene.AddComponent<MessageDispatcherComponent>();
             Game.Scene.AddComponent<CoroutineLockComponent>();
-            Game.Scene.AddComponent<NetThreadComponent>();
             Game.Scene.AddComponent<NumericWatcherComponent>();
             Game.Scene.AddComponent<AIDispatcherComponent>();
             Game.Scene.AddComponent<ClientSceneManagerComponent>();

+ 5 - 5
Unity/Assets/Scripts/Codes/Hotfix/Share/Module/Message/NetKcpComponentSystem.cs

@@ -14,7 +14,7 @@ namespace ET
             protected override void Awake(NetKcpComponent self, AddressFamily addressFamily, int sessionStreamDispatcherType)
             {
                 self.SessionStreamDispatcherType = sessionStreamDispatcherType;
-                self.Service = new KService(NetThreadComponent.Instance.ThreadSynchronizationContext, addressFamily, ServiceType.Outer);
+                self.Service = new KService(ThreadSynchronizationContext.Instance, addressFamily, ServiceType.Outer);
                 self.Service.ErrorCallback += (channelId, error) => self.OnError(channelId, error);
                 self.Service.ReadCallback += (channelId, Memory) => self.OnRead(channelId, Memory);
             }
@@ -27,7 +27,7 @@ namespace ET
             {
                 self.SessionStreamDispatcherType = sessionStreamDispatcherType;
             
-                self.Service = new KService(NetThreadComponent.Instance.ThreadSynchronizationContext, address, ServiceType.Outer);
+                self.Service = new KService(ThreadSynchronizationContext.Instance, address, ServiceType.Outer);
                 self.Service.ErrorCallback += (channelId, error) => self.OnError(channelId, error);
                 self.Service.ReadCallback += (channelId, Memory) => self.OnRead(channelId, Memory);
                 self.Service.AcceptCallback += (channelId, IPAddress) => self.OnAccept(channelId, IPAddress);
@@ -77,7 +77,7 @@ namespace ET
             // 挂上这个组件,5秒就会删除session,所以客户端验证完成要删除这个组件。该组件的作用就是防止外挂一直连接不发消息也不进行权限验证
             session.AddComponent<SessionAcceptTimeoutComponent>();
             // 客户端连接,2秒检查一次recv消息,10秒没有消息则断开
-            session.AddComponent<SessionIdleCheckerComponent, int>(NetThreadComponent.checkInteral);
+            session.AddComponent<SessionIdleCheckerComponent>();
         }
 
         public static Session Get(this NetKcpComponent self, long id)
@@ -91,7 +91,7 @@ namespace ET
             long channelId = RandomGenerator.Instance.RandInt64();
             Session session = self.AddChildWithId<Session, AService>(channelId, self.Service);
             session.RemoteAddress = realIPEndPoint;
-            session.AddComponent<SessionIdleCheckerComponent, int>(NetThreadComponent.checkInteral);
+            session.AddComponent<SessionIdleCheckerComponent>();
             
             self.Service.GetOrCreate(session.Id, realIPEndPoint);
 
@@ -103,7 +103,7 @@ namespace ET
             long channelId = self.Service.CreateConnectChannelId(localConn);
             Session session = self.AddChildWithId<Session, AService>(channelId, self.Service);
             session.RemoteAddress = realIPEndPoint;
-            session.AddComponent<SessionIdleCheckerComponent, int>(NetThreadComponent.checkInteral);
+            session.AddComponent<SessionIdleCheckerComponent>();
             self.Service.GetOrCreate(session.Id, routerIPEndPoint);
 
             return session;

+ 0 - 26
Unity/Assets/Scripts/Codes/Hotfix/Share/Module/Message/NetThreadComponentSystem.cs

@@ -1,26 +0,0 @@
-namespace ET
-{
-    [FriendOf(typeof(NetThreadComponent))]
-    public static class NetThreadComponentSystem
-    {
-        [ObjectSystem]
-        public class NetThreadComponentAwakeSystem: AwakeSystem<NetThreadComponent>
-        {
-            protected override void Awake(NetThreadComponent self)
-            {
-                NetThreadComponent.Instance = self;
-                
-                self.ThreadSynchronizationContext = ThreadSynchronizationContext.Instance;
-            }
-        }
-
-        [ObjectSystem]
-        public class NetThreadComponentUpdateSystem: LateUpdateSystem<NetThreadComponent>
-        {
-            protected override void LateUpdate(NetThreadComponent self)
-            {
-                NetServices.Instance.Update();
-            }
-        }
-    }
-}

+ 5 - 3
Unity/Assets/Scripts/Codes/Hotfix/Share/Module/Message/SessionIdleCheckerComponentSystem.cs

@@ -19,11 +19,11 @@ namespace ET
     }
     
     [ObjectSystem]
-    public class SessionIdleCheckerComponentAwakeSystem: AwakeSystem<SessionIdleCheckerComponent, int>
+    public class SessionIdleCheckerComponentAwakeSystem: AwakeSystem<SessionIdleCheckerComponent>
     {
-        protected override void Awake(SessionIdleCheckerComponent self, int checkInteral)
+        protected override void Awake(SessionIdleCheckerComponent self)
         {
-            self.RepeatedTimer = TimerComponent.Instance.NewRepeatedTimer(checkInteral, TimerCallbackId.SessionIdleChecker, self);
+            self.RepeatedTimer = TimerComponent.Instance.NewRepeatedTimer(SessionIdleCheckerComponentSystem.CheckInteral, TimerCallbackId.SessionIdleChecker, self);
         }
     }
 
@@ -38,6 +38,8 @@ namespace ET
 
     public static class SessionIdleCheckerComponentSystem
     {
+        public const int CheckInteral = 2000;
+        
         public static void Check(this SessionIdleCheckerComponent self)
         {
             Session session = self.GetParent<Session>();

+ 0 - 1
Unity/Assets/Scripts/Codes/Model/Client/Demo/Ping/PingComponent.cs

@@ -3,7 +3,6 @@ namespace ET.Client
     [ComponentOf(typeof(Session))]
     public class PingComponent: Entity, IAwake, IDestroy
     {
-        [NoMemoryCheck]
         public C2G_Ping C2G_Ping = new C2G_Ping();
 
         public long Ping; //延迟值

+ 1 - 1
Unity/Assets/Scripts/Codes/Model/Generate/Server/ConfigPartial/StartSceneConfig.cs

@@ -29,7 +29,7 @@ namespace ET
         {
             return this.ClientScenesByName[zone][name];
         }
-        
+
         public override void AfterEndInit()
         {
             foreach (StartSceneConfig startSceneConfig in this.GetAll().Values)

+ 2 - 2
Unity/Assets/Scripts/Codes/Model/Share/Entry.cs

@@ -19,13 +19,13 @@
     {
         public static void Start()
         {
-            MongoRegister.Init();
-            
             StartAsync().Coroutine();
         }
         
         private static async ETTask StartAsync()
         {
+            MongoRegister.Init();
+            
             await EventSystem.Instance.PublishAsync(Game.Scene, new EventType.EntryEvent1());
             await EventSystem.Instance.PublishAsync(Game.Scene, new EventType.EntryEvent2());
             await EventSystem.Instance.PublishAsync(Game.Scene, new EventType.EntryEvent3());

+ 1 - 1
Unity/Assets/Scripts/Codes/Model/Share/Module/AI/AIConfig.cs

@@ -16,7 +16,7 @@ namespace ET
 		{
 			return this.AIConfigs[aiConfigId];
 		}
-		
+
 		public override void AfterEndInit()
 		{
 			foreach (var kv in this.GetAll())

+ 0 - 17
Unity/Assets/Scripts/Codes/Model/Share/Module/Message/NetThreadComponent.cs

@@ -1,17 +0,0 @@
-using System.Collections.Generic;
-
-namespace ET
-{
-    [ComponentOf(typeof(Scene))]
-    public class NetThreadComponent: Entity, IAwake, ILateUpdate, IDestroy
-    {
-        [StaticField]
-        public static NetThreadComponent Instance;
-        
-        public const int checkInteral = 2000;
-        public const int recvMaxIdleTime = 60000;
-        public const int sendMaxIdleTime = 60000;
-
-        public ThreadSynchronizationContext ThreadSynchronizationContext { get; set; }
-    }
-}

+ 1 - 1
Unity/Assets/Scripts/Codes/Model/Share/Module/Message/SessionIdleCheckerComponent.cs

@@ -1,7 +1,7 @@
 namespace ET
 {
     [ComponentOf(typeof(Session))]
-    public class SessionIdleCheckerComponent: Entity, IAwake<int>, IDestroy
+    public class SessionIdleCheckerComponent: Entity, IAwake, IDestroy
     {
         public long RepeatedTimer;
     }

+ 0 - 3
Unity/Assets/Scripts/Codes/Model/Share/Module/Recast/PathfindingComponent.cs

@@ -17,13 +17,10 @@ namespace ET
         
         public long NavMesh;
 
-        [NoMemoryCheck]
         public float[] StartPos = new float[3];
 
-        [NoMemoryCheck]
         public float[] EndPos = new float[3];
 
-        [NoMemoryCheck]
         public float[] Result = new float[Recast.MAX_POLYS * 3];
     }
 }

+ 1 - 1
Unity/Assets/Scripts/Core/Event.meta → Unity/Assets/Scripts/Core/Analyzer.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8ac10036dd2757e4cac6d6788348d25a
+guid: 8d0854a24c1619b43ace830bfa1b6e69
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 0 - 0
Unity/Assets/Scripts/Core/Object/ChildOfAttribute.cs → Unity/Assets/Scripts/Core/Analyzer/ChildOfAttribute.cs


+ 1 - 1
Unity/Assets/Scripts/Core/Object/ChildOfAttribute.cs.meta → Unity/Assets/Scripts/Core/Analyzer/ChildOfAttribute.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f10ed07d5fd898640b885f50fe7f1426
+guid: 9e06bd31e846d9a4abe88d5864a0a4d3
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 0 - 0
Unity/Assets/Scripts/Core/Object/ComponentOfAttribute.cs → Unity/Assets/Scripts/Core/Analyzer/ComponentOfAttribute.cs


+ 1 - 1
Unity/Assets/Scripts/Core/Object/ComponentOfAttribute.cs.meta → Unity/Assets/Scripts/Core/Analyzer/ComponentOfAttribute.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 11656e7bcdaa6ab4980af3aa2b49204d
+guid: 3e17786fd2fafce4f9d9fbdcdbf5b9fc
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 0 - 0
Unity/Assets/Scripts/Core/Object/EnableAccessEntiyChildAttribute.cs → Unity/Assets/Scripts/Core/Analyzer/EnableAccessEntiyChildAttribute.cs


+ 1 - 1
Unity/Assets/Scripts/Core/Object/EnableAccessEntiyChildAttribute.cs.meta → Unity/Assets/Scripts/Core/Analyzer/EnableAccessEntiyChildAttribute.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 97842853560d56c42a4e149134fef910
+guid: 5b4d17f76cb73474e94eb82e30be2560
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 0 - 0
Unity/Assets/Scripts/Core/Object/EnableMethodAttribute.cs → Unity/Assets/Scripts/Core/Analyzer/EnableMethodAttribute.cs


+ 1 - 1
Unity/Assets/Scripts/Core/Object/EnableMethodAttribute.cs.meta → Unity/Assets/Scripts/Core/Analyzer/EnableMethodAttribute.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2d04f11e8e7bc1d43968a522f4944c75
+guid: ce20015df46fb774eaf1cacc7cd9e35b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 0 - 0
Unity/Assets/Scripts/Core/Object/FriendOfAttribute.cs → Unity/Assets/Scripts/Core/Analyzer/FriendOfAttribute.cs


+ 1 - 1
Unity/Assets/Scripts/Core/Object/FriendOfAttribute.cs.meta → Unity/Assets/Scripts/Core/Analyzer/FriendOfAttribute.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6d7a9b6f8af735a41969637187243fcb
+guid: 516811198a72ec541a5f8f0e40454fa5
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 0 - 0
Unity/Assets/Scripts/Core/Object/StaticFieldAttribute.cs → Unity/Assets/Scripts/Core/Analyzer/StaticFieldAttribute.cs


+ 1 - 1
Unity/Assets/Scripts/Empty.cs.meta → Unity/Assets/Scripts/Core/Analyzer/StaticFieldAttribute.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3f3352570b288ec4ea7a3b53fb0cedb7
+guid: f0f1fd366c9df9c439b8e552ac26e607
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 0 - 0
Unity/Assets/Scripts/Core/Object/UniqueIdAttribute.cs → Unity/Assets/Scripts/Core/Analyzer/UniqueIdAttribute.cs


+ 1 - 1
Unity/Assets/Scripts/Core/Object/UniqueIdAttribute.cs.meta → Unity/Assets/Scripts/Core/Analyzer/UniqueIdAttribute.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ac9885deeb4fd7640a708df80bdf8920
+guid: 62584bd88ecb9ce439aeaaf2f76605f5
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 0 - 75
Unity/Assets/Scripts/Core/Entity/Game.cs

@@ -1,75 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ET
-{
-    public static class Game
-    {
-        [StaticField]
-        private static readonly Dictionary<Type, ISingleton> singletonTypes = new Dictionary<Type, ISingleton>();
-        [StaticField]
-        private static readonly Stack<ISingleton> singletons = new Stack<ISingleton>();
-
-        public static T AddSingleton<T>() where T: Singleton<T>, new()
-        {
-            T singleton = new T();
-            Type singletonType = typeof (T);
-            if (singletonTypes.ContainsKey(singletonType))
-            {
-                throw new Exception($"already exist singleton: {singletonType.Name}");
-            }
-
-            singletonTypes.Add(singletonType, singleton);
-            singletons.Push(singleton);
-            
-            singleton.Register();
-            
-            return singleton;
-        }
-        
-        public static void AddSingleton(ISingleton singleton)
-        {
-            Type singletonType = singleton.GetType();
-            if (singletonTypes.ContainsKey(singletonType))
-            {
-                throw new Exception($"already exist singleton: {singletonType.Name}");
-            }
-
-            singletonTypes.Add(singletonType, singleton);
-            singletons.Push(singleton);
-            
-            singleton.Register();
-        }
-
-        public static Scene Scene
-        {
-            get
-            {
-                return Root.Instance.Scene;
-            }
-        }
-
-        public static void Update()
-        {
-            ThreadSynchronizationContext.Instance.Update();
-            TimeInfo.Instance.Update();
-            EventSystem.Instance.Update();
-        }
-        
-        public static void LateUpdate()
-        {
-            EventSystem.Instance.LateUpdate();
-        }
-
-        public static void Close()
-        {
-            // 顺序反过来清理
-            while (singletons.Count > 0)
-            {
-                ISingleton iSingleton = singletons.Pop();
-                iSingleton.Destroy();
-            }
-            singletonTypes.Clear();
-        }
-    }
-}

+ 0 - 0
Unity/Assets/Scripts/Core/JsonHelper.cs → Unity/Assets/Scripts/Core/Helper/JsonHelper.cs


+ 1 - 1
Unity/Assets/Scripts/Core/JsonHelper.cs.meta → Unity/Assets/Scripts/Core/Helper/JsonHelper.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b538aca07869c864d84228e09f0c99e7
+guid: 2fd0119d404d61748a0f289373495b47
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 0 - 0
Unity/Assets/Scripts/Core/ProtobufHelper.cs → Unity/Assets/Scripts/Core/Helper/ProtobufHelper.cs


+ 1 - 1
Unity/Assets/Scripts/Core/ProtobufHelper.cs.meta → Unity/Assets/Scripts/Core/Helper/ProtobufHelper.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c43215222c4e28c40aea2a9f9ec2a457
+guid: cb8ca0c5f68c6eb41bdd905d9139678b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 2 - 1
Unity/Assets/Scripts/Editor/csc.rsp.meta → Unity/Assets/Scripts/Core/Module.meta

@@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: eaba7ce2bbb8544748d7136ff679d5a2
+guid: fd94f671f44cc5449b58ec76f5740fb7
+folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 

+ 1 - 1
Unity/Assets/Scripts/Core/Config.meta → Unity/Assets/Scripts/Core/Module/Config.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b99ee685b0003a94bba55deed4370826
+guid: 49ccd2dc1f78414428420ba5772e1b3d
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 0 - 0
Unity/Assets/Scripts/Core/Config/ConfigAttribute.cs → Unity/Assets/Scripts/Core/Module/Config/ConfigAttribute.cs


+ 0 - 0
Unity/Assets/Scripts/Core/Config/ConfigAttribute.cs.meta → Unity/Assets/Scripts/Core/Module/Config/ConfigAttribute.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/Config/ConfigComponent.cs → Unity/Assets/Scripts/Core/Module/Config/ConfigComponent.cs


+ 0 - 0
Unity/Assets/Scripts/Core/Config/ConfigComponent.cs.meta → Unity/Assets/Scripts/Core/Module/Config/ConfigComponent.cs.meta


+ 6 - 1
Unity/Assets/Scripts/Core/Config/ConfigSingleton.cs → Unity/Assets/Scripts/Core/Module/Config/ConfigSingleton.cs

@@ -30,7 +30,12 @@ namespace ET
             instance = null;
             t.Dispose();
         }
-        
+
+        public bool IsDisposed()
+        {
+            throw new NotImplementedException();
+        }
+
         public virtual void AfterEndInit()
         {
         }

+ 0 - 0
Unity/Assets/Scripts/Core/Config/ConfigSingleton.cs.meta → Unity/Assets/Scripts/Core/Module/Config/ConfigSingleton.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/Config/IConfig.cs → Unity/Assets/Scripts/Core/Module/Config/IConfig.cs


+ 0 - 0
Unity/Assets/Scripts/Core/Config/IConfig.cs.meta → Unity/Assets/Scripts/Core/Module/Config/IConfig.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/Config/IMerge.cs → Unity/Assets/Scripts/Core/Module/Config/IMerge.cs


+ 0 - 0
Unity/Assets/Scripts/Core/Config/IMerge.cs.meta → Unity/Assets/Scripts/Core/Module/Config/IMerge.cs.meta


+ 1 - 1
Unity/Assets/Scripts/Core/Entity.meta → Unity/Assets/Scripts/Core/Module/Entity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: fcb9e48c46883d34e9f95f17b49a1959
+guid: 8176d04b4c98ac9448b4c447166e2191
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 2 - 2
Unity/Assets/Scripts/Core/Object/Entity.cs → Unity/Assets/Scripts/Core/Module/Entity/Entity.cs

@@ -18,7 +18,7 @@ namespace ET
 
     public partial class Entity: DisposeObject
     {
-#if ENABLE_VIEW
+#if ENABLE_VIEW && UNITY_EDITOR
         private UnityEngine.GameObject viewGO;
 #endif
         
@@ -79,7 +79,7 @@ namespace ET
 
                 EventSystem.Instance.RegisterSystem(this, value);
                 
-#if ENABLE_VIEW
+#if ENABLE_VIEW && UNITY_EDITOR
                 if (value)
                 {
                     this.viewGO = new UnityEngine.GameObject(this.ViewName);

+ 1 - 1
Unity/Assets/Scripts/Core/Object/Entity.cs.meta → Unity/Assets/Scripts/Core/Module/Entity/Entity.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1c9e71a762563ca488e6c1266086d17b
+guid: 580c95b9e9aaeba43a04eff4ff74b46e
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 0 - 0
Unity/Assets/Scripts/Core/Entity/EntitySceneFactory.cs → Unity/Assets/Scripts/Core/Module/Entity/EntitySceneFactory.cs


+ 1 - 1
Unity/Assets/Scripts/Core/Entity/EntitySceneFactory.cs.meta → Unity/Assets/Scripts/Core/Module/Entity/EntitySceneFactory.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b90f5194adcf079438a94453e3aa314d
+guid: 91cb0fe18962a644b8760cf0191d3da3
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 0 - 0
Unity/Assets/Scripts/Core/Entity/Root.cs → Unity/Assets/Scripts/Core/Module/Entity/Root.cs


+ 1 - 1
Unity/Assets/Scripts/Core/Entity/Root.cs.meta → Unity/Assets/Scripts/Core/Module/Entity/Root.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 03d33b697b50f884e87c01a144073436
+guid: 02e24b5acad87864a8fa3ac0196795e5
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 0 - 0
Unity/Assets/Scripts/Core/Entity/Scene.cs → Unity/Assets/Scripts/Core/Module/Entity/Scene.cs


+ 1 - 1
Unity/Assets/Scripts/Core/Entity/Scene.cs.meta → Unity/Assets/Scripts/Core/Module/Entity/Scene.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 28c4c109868033245b38e07cfaea91aa
+guid: b20fe3ac8d3755b4582fbc0751d8cf8b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 0 - 0
Unity/Assets/Scripts/Core/Entity/SceneHelper.cs → Unity/Assets/Scripts/Core/Module/Entity/SceneHelper.cs


+ 1 - 1
Unity/Assets/Scripts/Core/Entity/SceneHelper.cs.meta → Unity/Assets/Scripts/Core/Module/Entity/SceneHelper.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 721286d1b1f1a0d43822c2063c4176e6
+guid: 0776cd39bea075f4a8154884800f3d26
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 0 - 0
Unity/Assets/Scripts/Core/Entity/SceneType.cs → Unity/Assets/Scripts/Core/Module/Entity/SceneType.cs


+ 1 - 1
Unity/Assets/Scripts/Core/Entity/SceneType.cs.meta → Unity/Assets/Scripts/Core/Module/Entity/SceneType.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8cd5baf93e9889c4ca7764129255fe56
+guid: b36ca6be079a1bb458f59657482f6260
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 8 - 0
Unity/Assets/Scripts/Core/Module/EventSystem.meta

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

+ 0 - 0
Unity/Assets/Scripts/Core/Object/BaseAttribute.cs → Unity/Assets/Scripts/Core/Module/EventSystem/BaseAttribute.cs


+ 0 - 0
Unity/Assets/Scripts/Core/Object/BaseAttribute.cs.meta → Unity/Assets/Scripts/Core/Module/EventSystem/BaseAttribute.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/Object/CallbackAttribute.cs → Unity/Assets/Scripts/Core/Module/EventSystem/CallbackAttribute.cs


+ 0 - 0
Unity/Assets/Scripts/Core/Object/CallbackAttribute.cs.meta → Unity/Assets/Scripts/Core/Module/EventSystem/CallbackAttribute.cs.meta


+ 1 - 1
Unity/Assets/Scripts/Core/Object/ComponentView.cs → Unity/Assets/Scripts/Core/Module/EventSystem/ComponentView.cs

@@ -1,4 +1,4 @@
-#if ENABLE_VIEW
+#if ENABLE_VIEW && UNITY_EDITOR
 using UnityEngine;
 
 namespace ET

+ 0 - 0
Unity/Assets/Scripts/Core/Object/ComponentView.cs.meta → Unity/Assets/Scripts/Core/Module/EventSystem/ComponentView.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/Event/EventAttribute.cs → Unity/Assets/Scripts/Core/Module/EventSystem/EventAttribute.cs


+ 1 - 1
Unity/Assets/Scripts/Core/Event/EventAttribute.cs.meta → Unity/Assets/Scripts/Core/Module/EventSystem/EventAttribute.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bc926f3d44df02544a61f0b5ef860bfc
+guid: 68a635393e1b00c489870d0fb6a97f8b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 24 - 39
Unity/Assets/Scripts/Core/Object/EventSystem.cs → Unity/Assets/Scripts/Core/Module/EventSystem/EventSystem.cs

@@ -7,7 +7,7 @@ namespace ET
 {
     using OneTypeSystems = UnOrderMultiMap<Type, object>;
 
-    public class EventSystem: Singleton<EventSystem>
+    public class EventSystem: Singleton<EventSystem>, ISingletonUpdate, ISingletonLateUpdate
     {
         private class TypeSystems
         {
@@ -64,17 +64,6 @@ namespace ET
             }
         }
         
-        private class TwoQueue
-        {
-            public Queue<long> Queue1 = new();
-            public Queue<long> Queue2 = new();
-
-            public void Swap()
-            {
-                (this.Queue1, this.Queue2) = (this.Queue2, this.Queue1);
-            }
-        }
-
         private readonly Dictionary<long, Entity> allEntities = new();
 
         private readonly Dictionary<string, Type> allTypes = new();
@@ -87,9 +76,9 @@ namespace ET
 
         private TypeSystems typeSystems = new();
 
-        private readonly TwoQueue[] twoQueues = new TwoQueue[(int)TwoQueueEnum.Max];
+        private readonly Queue<long>[] queues = new Queue<long>[(int)QueueEnum.Max];
 
-        private enum TwoQueueEnum
+        private enum QueueEnum
         {
             Update = 0,
             LateUpdate = 1,
@@ -99,9 +88,9 @@ namespace ET
 
         public EventSystem()
         {
-            for (int i = 0; i < this.twoQueues.Length; i++)
+            for (int i = 0; i < this.queues.Length; i++)
             {
-                this.twoQueues[i] = new TwoQueue();
+                this.queues[i] = new Queue<long>();
             }
         }
 
@@ -263,27 +252,26 @@ namespace ET
             {
                 return;
             }
+            
             if (component is ILoad)
             {
                 if (oneTypeSystems.ContainsKey(typeof (ILoadSystem)))
                 {
-                    this.twoQueues[(int)TwoQueueEnum.Load].Queue1.Enqueue(component.InstanceId);
+                    this.queues[(int)QueueEnum.Load].Enqueue(component.InstanceId);
                 }
             }
-
             if (component is IUpdate)
             {
                 if (oneTypeSystems.ContainsKey(typeof (IUpdateSystem)))
                 {
-                    this.twoQueues[(int)TwoQueueEnum.Update].Queue1.Enqueue(component.InstanceId);
+                    this.queues[(int)QueueEnum.Update].Enqueue(component.InstanceId);
                 }
             }
-
             if (component is ILateUpdate)
             {
                 if (oneTypeSystems.ContainsKey(typeof (ILateUpdateSystem)))
                 {
-                    this.twoQueues[(int)TwoQueueEnum.LateUpdate].Queue1.Enqueue(component.InstanceId);
+                    this.queues[(int)QueueEnum.LateUpdate].Enqueue(component.InstanceId);
                 }
             }
         }
@@ -517,10 +505,11 @@ namespace ET
 
         public void Load()
         {
-            TwoQueue twoQueue = this.twoQueues[(int)TwoQueueEnum.Load];
-            while (twoQueue.Queue1.Count > 0)
+            Queue<long> queue = this.queues[(int)QueueEnum.Load];
+            int count = queue.Count;
+            while (count-- > 0)
             {
-                long instanceId = twoQueue.Queue1.Dequeue();
+                long instanceId = queue.Dequeue();
                 Entity component;
                 if (!this.allEntities.TryGetValue(instanceId, out component))
                 {
@@ -538,7 +527,7 @@ namespace ET
                     continue;
                 }
 
-                twoQueue.Queue2.Enqueue(instanceId);
+                queue.Enqueue(instanceId);
 
                 foreach (ILoadSystem iLoadSystem in iLoadSystems)
                 {
@@ -552,8 +541,6 @@ namespace ET
                     }
                 }
             }
-
-            twoQueue.Swap();
         }
 
         public void Destroy(Entity component)
@@ -584,10 +571,11 @@ namespace ET
 
         public void Update()
         {
-            TwoQueue twoQueue = this.twoQueues[(int)TwoQueueEnum.Update];
-            while (twoQueue.Queue1.Count > 0)
+            Queue<long> queue = this.queues[(int)QueueEnum.Update];
+            int count = queue.Count;
+            while (count-- > 0)
             {
-                long instanceId = twoQueue.Queue1.Dequeue();
+                long instanceId = queue.Dequeue();
                 Entity component;
                 if (!this.allEntities.TryGetValue(instanceId, out component))
                 {
@@ -605,7 +593,7 @@ namespace ET
                     continue;
                 }
 
-                twoQueue.Queue2.Enqueue(instanceId);
+                queue.Enqueue(instanceId);
 
                 foreach (IUpdateSystem iUpdateSystem in iUpdateSystems)
                 {
@@ -619,16 +607,15 @@ namespace ET
                     }
                 }
             }
-
-            twoQueue.Swap();
         }
 
         public void LateUpdate()
         {
-            TwoQueue twoQueue = this.twoQueues[(int)TwoQueueEnum.LateUpdate];
-            while (twoQueue.Queue1.Count > 0)
+            Queue<long> queue = this.queues[(int)QueueEnum.LateUpdate];
+            int count = queue.Count;
+            while (count-- > 0)
             {
-                long instanceId = twoQueue.Queue1.Dequeue();
+                long instanceId = queue.Dequeue();
                 Entity component;
                 if (!this.allEntities.TryGetValue(instanceId, out component))
                 {
@@ -646,7 +633,7 @@ namespace ET
                     continue;
                 }
 
-                twoQueue.Queue2.Enqueue(instanceId);
+                queue.Enqueue(instanceId);
 
                 foreach (ILateUpdateSystem iLateUpdateSystem in iLateUpdateSystems)
                 {
@@ -660,8 +647,6 @@ namespace ET
                     }
                 }
             }
-
-            twoQueue.Swap();
         }
 
         public async ETTask PublishAsync<T>(Scene scene, T a) where T : struct

+ 0 - 0
Unity/Assets/Scripts/Core/Object/EventSystem.cs.meta → Unity/Assets/Scripts/Core/Module/EventSystem/EventSystem.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/Object/IAddComponentSystem.cs → Unity/Assets/Scripts/Core/Module/EventSystem/IAddComponentSystem.cs


+ 0 - 0
Unity/Assets/Scripts/Core/Object/IAddComponentSystem.cs.meta → Unity/Assets/Scripts/Core/Module/EventSystem/IAddComponentSystem.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/Object/IAwakeSystem.cs → Unity/Assets/Scripts/Core/Module/EventSystem/IAwakeSystem.cs


+ 0 - 0
Unity/Assets/Scripts/Core/Object/IAwakeSystem.cs.meta → Unity/Assets/Scripts/Core/Module/EventSystem/IAwakeSystem.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/Object/ICallback.cs → Unity/Assets/Scripts/Core/Module/EventSystem/ICallback.cs


+ 0 - 0
Unity/Assets/Scripts/Core/Object/ICallback.cs.meta → Unity/Assets/Scripts/Core/Module/EventSystem/ICallback.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/Object/IDeserializeSystem.cs → Unity/Assets/Scripts/Core/Module/EventSystem/IDeserializeSystem.cs


+ 0 - 0
Unity/Assets/Scripts/Core/Object/IDeserializeSystem.cs.meta → Unity/Assets/Scripts/Core/Module/EventSystem/IDeserializeSystem.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/Object/IDestroySystem.cs → Unity/Assets/Scripts/Core/Module/EventSystem/IDestroySystem.cs


+ 0 - 0
Unity/Assets/Scripts/Core/Object/IDestroySystem.cs.meta → Unity/Assets/Scripts/Core/Module/EventSystem/IDestroySystem.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/Event/IEvent.cs → Unity/Assets/Scripts/Core/Module/EventSystem/IEvent.cs


+ 1 - 1
Unity/Assets/Scripts/Core/Event/IEvent.cs.meta → Unity/Assets/Scripts/Core/Module/EventSystem/IEvent.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4a87167581f01b144aaa79f232e9fedb
+guid: 37f03a5bbacabb74496f35229db66c95
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 0 - 0
Unity/Assets/Scripts/Core/Object/IGetComponentSystem.cs → Unity/Assets/Scripts/Core/Module/EventSystem/IGetComponentSystem.cs


+ 0 - 0
Unity/Assets/Scripts/Core/Object/IGetComponentSystem.cs.meta → Unity/Assets/Scripts/Core/Module/EventSystem/IGetComponentSystem.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/Object/ILateUpdateSystem.cs → Unity/Assets/Scripts/Core/Module/EventSystem/ILateUpdateSystem.cs


+ 0 - 0
Unity/Assets/Scripts/Core/Object/ILateUpdateSystem.cs.meta → Unity/Assets/Scripts/Core/Module/EventSystem/ILateUpdateSystem.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/Object/ILoadSystem.cs → Unity/Assets/Scripts/Core/Module/EventSystem/ILoadSystem.cs


+ 0 - 0
Unity/Assets/Scripts/Core/Object/ILoadSystem.cs.meta → Unity/Assets/Scripts/Core/Module/EventSystem/ILoadSystem.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/Object/ISerializeToEntity.cs → Unity/Assets/Scripts/Core/Module/EventSystem/ISerializeToEntity.cs


+ 0 - 0
Unity/Assets/Scripts/Core/Object/ISerializeToEntity.cs.meta → Unity/Assets/Scripts/Core/Module/EventSystem/ISerializeToEntity.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/Object/ISystemType.cs → Unity/Assets/Scripts/Core/Module/EventSystem/ISystemType.cs


+ 0 - 0
Unity/Assets/Scripts/Core/Object/ISystemType.cs.meta → Unity/Assets/Scripts/Core/Module/EventSystem/ISystemType.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/Object/ITransfer.cs → Unity/Assets/Scripts/Core/Module/EventSystem/ITransfer.cs


+ 0 - 0
Unity/Assets/Scripts/Core/Object/ITransfer.cs.meta → Unity/Assets/Scripts/Core/Module/EventSystem/ITransfer.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/Object/IUpdateSystem.cs → Unity/Assets/Scripts/Core/Module/EventSystem/IUpdateSystem.cs


+ 0 - 0
Unity/Assets/Scripts/Core/Object/IUpdateSystem.cs.meta → Unity/Assets/Scripts/Core/Module/EventSystem/IUpdateSystem.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/Object/ObjectSystemAttribute.cs → Unity/Assets/Scripts/Core/Module/EventSystem/ObjectSystemAttribute.cs


+ 0 - 0
Unity/Assets/Scripts/Core/Object/ObjectSystemAttribute.cs.meta → Unity/Assets/Scripts/Core/Module/EventSystem/ObjectSystemAttribute.cs.meta


+ 8 - 0
Unity/Assets/Scripts/Core/Module/IdGenerater.meta

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

+ 0 - 0
Unity/Assets/Scripts/Core/Object/IdGenerater.cs → Unity/Assets/Scripts/Core/Module/IdGenerater/IdGenerater.cs


+ 1 - 1
Unity/Assets/Scripts/Core/Object/IdGenerater.cs.meta → Unity/Assets/Scripts/Core/Module/IdGenerater/IdGenerater.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: fea0f9f914890d14bad5ac80d41d4567
+guid: 01dd1407fbf957f41a818bcfb700c7ed
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Некоторые файлы не были показаны из-за большого количества измененных файлов