diff --git a/Proto/InnerMessage.proto b/Proto/InnerMessage.proto index f6756df0784e62f383872c7d1542a49d54c06ce6..192aae8bcce1301a0358e0a5244d5fe6acbcf973 100644 --- a/Proto/InnerMessage.proto +++ b/Proto/InnerMessage.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package ETModel; +package ET; /// /// 传送unit diff --git a/Proto/OuterMessage.proto b/Proto/OuterMessage.proto index debb807de0cedb6db027a9f346583b9496b0c101..726abec4d890819090e9bb55695eab211d294ac9 100644 --- a/Proto/OuterMessage.proto +++ b/Proto/OuterMessage.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package ETModel; +package ET; message C2M_TestRequest // IActorLocationRequest { diff --git a/Server/App/Program.cs b/Server/App/Program.cs index cb183797617d32cd0de5b18511956e817d7b02cd..fed21db019270e7f0fbc336142832797aa1abae9 100644 --- a/Server/App/Program.cs +++ b/Server/App/Program.cs @@ -5,7 +5,7 @@ using System.Threading; using CommandLine; using NLog; -namespace ETModel +namespace ET { internal static class Program { diff --git a/Server/Hotfix/Demo/Actor_TransferHandler.cs b/Server/Hotfix/Demo/Actor_TransferHandler.cs index a1b13dfeb4d5659a22723ad108fb0d51f64d9eaf..1894b0a9af7c34a510da60ed6055d7bff9c112f1 100644 --- a/Server/Hotfix/Demo/Actor_TransferHandler.cs +++ b/Server/Hotfix/Demo/Actor_TransferHandler.cs @@ -1,8 +1,8 @@ using System; using System.Net; -using ETModel; -namespace ETHotfix + +namespace ET { [ActorMessageHandler] public class Actor_TransferHandler : AMActorRpcHandler diff --git a/Server/Hotfix/Demo/C2G_EnterMapHandler.cs b/Server/Hotfix/Demo/C2G_EnterMapHandler.cs index ce53ba59fbb762c0abcd2ed775dee4866148c600..8aefc441e2c2395f279e3d5dda80f4ddb8bf2e78 100644 --- a/Server/Hotfix/Demo/C2G_EnterMapHandler.cs +++ b/Server/Hotfix/Demo/C2G_EnterMapHandler.cs @@ -1,7 +1,7 @@ using System; -using ETModel; -namespace ETHotfix + +namespace ET { [MessageHandler] public class C2G_EnterMapHandler : AMRpcHandler diff --git a/Server/Hotfix/Demo/C2G_LoginGateHandler.cs b/Server/Hotfix/Demo/C2G_LoginGateHandler.cs index db5559b240859a1f03f36d05d2b18f49804fe96e..c7e73fc15aef079606562e80293fa13a8596cb72 100644 --- a/Server/Hotfix/Demo/C2G_LoginGateHandler.cs +++ b/Server/Hotfix/Demo/C2G_LoginGateHandler.cs @@ -1,7 +1,7 @@ using System; -using ETModel; -namespace ETHotfix + +namespace ET { [MessageHandler] public class C2G_LoginGateHandler : AMRpcHandler diff --git a/Server/Hotfix/Demo/C2M_TestActorRequestHandler.cs b/Server/Hotfix/Demo/C2M_TestActorRequestHandler.cs index ea9b35226c8ad6e8baf6d1015723ca4be3a69818..09336f84a84d00e4506db47fbd53ec5653b0d2e6 100644 --- a/Server/Hotfix/Demo/C2M_TestActorRequestHandler.cs +++ b/Server/Hotfix/Demo/C2M_TestActorRequestHandler.cs @@ -1,7 +1,7 @@ using System; -using ETModel; -namespace ETHotfix + +namespace ET { [ActorMessageHandler] public class C2M_TestActorRequestHandler : AMActorLocationRpcHandler diff --git a/Server/Hotfix/Demo/C2R_LoginHandler.cs b/Server/Hotfix/Demo/C2R_LoginHandler.cs index 363d8b19718bd5777c5b3acca2d98f2d24e957fd..2ad5d3ac019e2f558cde559b3435cb759b3c72b9 100644 --- a/Server/Hotfix/Demo/C2R_LoginHandler.cs +++ b/Server/Hotfix/Demo/C2R_LoginHandler.cs @@ -1,8 +1,8 @@ using System; using System.Net; -using ETModel; -namespace ETHotfix + +namespace ET { [MessageHandler] public class C2R_LoginHandler : AMRpcHandler diff --git a/Server/Hotfix/Demo/Frame_ClickMapHandler.cs b/Server/Hotfix/Demo/Frame_ClickMapHandler.cs index 16b0043cbc4a526a62d1722ae9a431b58fca0a92..12510556e2766cb15bc9ec94ad8d2ae1fd3ec78d 100644 --- a/Server/Hotfix/Demo/Frame_ClickMapHandler.cs +++ b/Server/Hotfix/Demo/Frame_ClickMapHandler.cs @@ -1,8 +1,8 @@ -using ETModel; + using PF; using UnityEngine; -namespace ETHotfix +namespace ET { [ActorMessageHandler] public class Frame_ClickMapHandler : AMActorLocationHandler diff --git a/Server/Hotfix/Demo/G2M_CreateUnitHandler.cs b/Server/Hotfix/Demo/G2M_CreateUnitHandler.cs index 4a2c9e3b06a78c0b216f5e4298761000268882ad..491e535fdf6635f6453f23ca8e5c7bc6875cd8de 100644 --- a/Server/Hotfix/Demo/G2M_CreateUnitHandler.cs +++ b/Server/Hotfix/Demo/G2M_CreateUnitHandler.cs @@ -1,9 +1,9 @@ using System; -using ETModel; + using PF; using UnityEngine; -namespace ETHotfix +namespace ET { [ActorMessageHandler] public class G2M_CreateUnitHandler : AMActorRpcHandler diff --git a/Server/Hotfix/Demo/G2M_SessionDisconnectHandler.cs b/Server/Hotfix/Demo/G2M_SessionDisconnectHandler.cs index e696f7f984dab6e15db3345d7ebe2e0ecceffd1f..c6c1ca1014b9836196475915e05faf31fae9e528 100644 --- a/Server/Hotfix/Demo/G2M_SessionDisconnectHandler.cs +++ b/Server/Hotfix/Demo/G2M_SessionDisconnectHandler.cs @@ -1,6 +1,6 @@ -using ETModel; + -namespace ETHotfix +namespace ET { [ActorMessageHandler] public class G2M_SessionDisconnectHandler : AMActorLocationHandler diff --git a/Server/Hotfix/Demo/M2M_TrasferUnitRequestHandler.cs b/Server/Hotfix/Demo/M2M_TrasferUnitRequestHandler.cs index 2aab6de37074bb5879eb6782b88a7813afefdaf7..fdf56bf824036e4b6ff3a16709b28dbf89773468 100644 --- a/Server/Hotfix/Demo/M2M_TrasferUnitRequestHandler.cs +++ b/Server/Hotfix/Demo/M2M_TrasferUnitRequestHandler.cs @@ -1,7 +1,7 @@ using System; -using ETModel; -namespace ETHotfix + +namespace ET { [ActorMessageHandler] public class M2M_TrasferUnitRequestHandler : AMActorRpcHandler diff --git a/Server/Hotfix/Demo/MessageHelper.cs b/Server/Hotfix/Demo/MessageHelper.cs index e4579451c06eb777f64d70ab7ec932122f931531..308fd2b477287ea8276e44edcb7460d3e24fede7 100644 --- a/Server/Hotfix/Demo/MessageHelper.cs +++ b/Server/Hotfix/Demo/MessageHelper.cs @@ -1,6 +1,6 @@ -using ETModel; + -namespace ETHotfix +namespace ET { public static class MessageHelper { diff --git a/Server/Hotfix/Demo/R2G_GetLoginKeyHandler.cs b/Server/Hotfix/Demo/R2G_GetLoginKeyHandler.cs index 54e7da723958e41f307a4c1a126ce744495a0bb0..56f0818fbe83a6ffc049bba25f08cbc54db6d0c6 100644 --- a/Server/Hotfix/Demo/R2G_GetLoginKeyHandler.cs +++ b/Server/Hotfix/Demo/R2G_GetLoginKeyHandler.cs @@ -1,7 +1,7 @@ using System; -using ETModel; -namespace ETHotfix + +namespace ET { [ActorMessageHandler] public class R2G_GetLoginKeyHandler : AMActorRpcHandler diff --git a/Server/Hotfix/Demo/RealmGateAddressHelper.cs b/Server/Hotfix/Demo/RealmGateAddressHelper.cs index 85a7ad147825a799d3e6cf64d3c368e776927205..2a93e30ac5c5d1cafd77e48fd09c65559741749f 100644 --- a/Server/Hotfix/Demo/RealmGateAddressHelper.cs +++ b/Server/Hotfix/Demo/RealmGateAddressHelper.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using ETModel; -namespace ETHotfix + +namespace ET { public static class RealmGateAddressHelper { diff --git a/Server/Hotfix/Demo/SessionPlayerComponentSystem.cs b/Server/Hotfix/Demo/SessionPlayerComponentSystem.cs index 543601d4682da5c759dc53b341e4efd577fc60ce..2e20c3878be43b3a25ca4cdd96d5be10799b0979 100644 --- a/Server/Hotfix/Demo/SessionPlayerComponentSystem.cs +++ b/Server/Hotfix/Demo/SessionPlayerComponentSystem.cs @@ -1,6 +1,6 @@ -using ETModel; + -namespace ETHotfix +namespace ET { [ObjectSystem] public class SessionPlayerComponentDestroySystem : DestroySystem diff --git a/Server/Hotfix/Demo/UnitPathComponentSystem.cs b/Server/Hotfix/Demo/UnitPathComponentSystem.cs index 33420fefdd22e8407c3873c8742242e59c0a7d2a..9a054cc8ca7ba6218a874da197e9b581dfd12943 100644 --- a/Server/Hotfix/Demo/UnitPathComponentSystem.cs +++ b/Server/Hotfix/Demo/UnitPathComponentSystem.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using System.Threading; -using ETModel; + using PF; using UnityEngine; -namespace ETHotfix +namespace ET { public static class UnitPathComponentHelper { diff --git a/Server/Hotfix/Handler/C2G_PlayerInfoHandler.cs b/Server/Hotfix/Handler/C2G_PlayerInfoHandler.cs index 1b5b9b171add77d19c38c4fcf4a03fc4f5d25978..6a11c709dea7c349b17aa674be04acecd53aa527 100644 --- a/Server/Hotfix/Handler/C2G_PlayerInfoHandler.cs +++ b/Server/Hotfix/Handler/C2G_PlayerInfoHandler.cs @@ -1,7 +1,7 @@ using System; -using ETModel; -namespace ETHotfix + +namespace ET { // 用来测试消息包含复杂类型，是否产生gc [MessageHandler] diff --git a/Server/Hotfix/Handler/C2M_ReloadHandler.cs b/Server/Hotfix/Handler/C2M_ReloadHandler.cs index f7dead4eefb0624a2c319e20e03f6b99b12b4372..dff86d73bfedd563782f272453800963cff9eedb 100644 --- a/Server/Hotfix/Handler/C2M_ReloadHandler.cs +++ b/Server/Hotfix/Handler/C2M_ReloadHandler.cs @@ -1,7 +1,7 @@ using System; -using ETModel; -namespace ETHotfix + +namespace ET { [MessageHandler] public class C2M_ReloadHandler: AMRpcHandler diff --git a/Server/Hotfix/Handler/C2R_PingHandler.cs b/Server/Hotfix/Handler/C2R_PingHandler.cs index 531da5cf8323b4b5c905662b1c689ce65007a6bb..8a6b353f6873f479752fec964ad9501337dd6ce5 100644 --- a/Server/Hotfix/Handler/C2R_PingHandler.cs +++ b/Server/Hotfix/Handler/C2R_PingHandler.cs @@ -1,7 +1,7 @@ using System; -using ETModel; -namespace ETHotfix + +namespace ET { [MessageHandler] public class C2R_PingHandler : AMRpcHandler diff --git a/Server/Hotfix/Handler/G2C_TestHandler.cs b/Server/Hotfix/Handler/G2C_TestHandler.cs index a8847b2146f6d7ad729840b00d8fcf0c523eb7c6..e66c2034c176ea0e21e2561d2483b807142b8f4a 100644 --- a/Server/Hotfix/Handler/G2C_TestHandler.cs +++ b/Server/Hotfix/Handler/G2C_TestHandler.cs @@ -1,6 +1,6 @@ -using ETModel; + -namespace ETHotfix +namespace ET { [MessageHandler] public class G2C_TestHandler: AMHandler diff --git a/Server/Hotfix/Handler/M2A_ReloadHandler.cs b/Server/Hotfix/Handler/M2A_ReloadHandler.cs index 2ed301ed9e897fed37dedaf84a8f0c26e67c6ee8..2fa0bdf5f93fc7040c4858210460d57989043327 100644 --- a/Server/Hotfix/Handler/M2A_ReloadHandler.cs +++ b/Server/Hotfix/Handler/M2A_ReloadHandler.cs @@ -1,7 +1,7 @@ using System; -using ETModel; -namespace ETHotfix + +namespace ET { [MessageHandler] public class M2A_ReloadHandler : AMRpcHandler diff --git a/Server/Hotfix/Helper/HotfixHelper.cs b/Server/Hotfix/Helper/HotfixHelper.cs index a7e5da0705c91fb06fe2ab1566e2d11db1e0b17c..e43a55c5e4fd882f0e7effd9c1b11e91b802ec9d 100644 --- a/Server/Hotfix/Helper/HotfixHelper.cs +++ b/Server/Hotfix/Helper/HotfixHelper.cs @@ -1,7 +1,7 @@ using System; using System.Reflection; -namespace ETHotfix +namespace ET { public static class HotfixHelper { diff --git a/Server/Hotfix/Module/Actor/ActorMessageDispatcherComponentSystem.cs b/Server/Hotfix/Module/Actor/ActorMessageDispatcherComponentSystem.cs index 2c1c5216c1da9947f45593be101e100d87ec4571..eddf8afbe597220e46766d9d8044ec0a44871979 100644 --- a/Server/Hotfix/Module/Actor/ActorMessageDispatcherComponentSystem.cs +++ b/Server/Hotfix/Module/Actor/ActorMessageDispatcherComponentSystem.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using ETModel; -namespace ETHotfix + +namespace ET { [ObjectSystem] public class ActorMessageDispatcherComponentAwakeSystem: AwakeSystem diff --git a/Server/Hotfix/Module/Actor/ActorMessageSenderComponentSystem.cs b/Server/Hotfix/Module/Actor/ActorMessageSenderComponentSystem.cs index a63cd1955683617ccaa8b91553618d25df87cd88..ccdddb77cf274e4208713c1b14dd780d6ad07d33 100644 --- a/Server/Hotfix/Module/Actor/ActorMessageSenderComponentSystem.cs +++ b/Server/Hotfix/Module/Actor/ActorMessageSenderComponentSystem.cs @@ -1,7 +1,7 @@ using System; -using ETModel; -namespace ETHotfix + +namespace ET { [ObjectSystem] public class ActorMessageSenderComponentAwakeSystem : AwakeSystem diff --git a/Server/Hotfix/Module/Actor/MailBoxComponentSystem.cs b/Server/Hotfix/Module/Actor/MailBoxComponentSystem.cs index 41c3d3ea616c3c39106128168fb9cdb05b685b40..3ba2f663da5f95a32871ca7a78f6442335b653c2 100644 --- a/Server/Hotfix/Module/Actor/MailBoxComponentSystem.cs +++ b/Server/Hotfix/Module/Actor/MailBoxComponentSystem.cs @@ -1,7 +1,7 @@ using System; -using ETModel; -namespace ETHotfix + +namespace ET { [ObjectSystem] public class MailBoxComponentAwakeSystem : AwakeSystem diff --git a/Server/Hotfix/Module/ActorLocation/ActorLocationSenderComponentSystem.cs b/Server/Hotfix/Module/ActorLocation/ActorLocationSenderComponentSystem.cs index 75f13ec9c11f04f5016db44a69ee517e6d416426..cd8dcf88d708c69ef2967b5f74f520ff74f76739 100644 --- a/Server/Hotfix/Module/ActorLocation/ActorLocationSenderComponentSystem.cs +++ b/Server/Hotfix/Module/ActorLocation/ActorLocationSenderComponentSystem.cs @@ -1,7 +1,7 @@ using System; -using ETModel; -namespace ETHotfix + +namespace ET { [ObjectSystem] public class ActorLocationSenderComponentAwakeSystem : AwakeSystem diff --git a/Server/Hotfix/Module/ActorLocation/ActorLocationSenderSystem.cs b/Server/Hotfix/Module/ActorLocation/ActorLocationSenderSystem.cs index b85376c9745b4fb83569bf8eccc8635a40a51523..77a79673a72f1ee9287d5d9a413737fe71faf13c 100644 --- a/Server/Hotfix/Module/ActorLocation/ActorLocationSenderSystem.cs +++ b/Server/Hotfix/Module/ActorLocation/ActorLocationSenderSystem.cs @@ -1,7 +1,7 @@ using System; -using ETModel; -namespace ETHotfix + +namespace ET { [ObjectSystem] public class ActorLocationSenderAwakeSystem: AwakeSystem diff --git a/Server/Hotfix/Module/ActorLocation/LocationProxyComponentSystem.cs b/Server/Hotfix/Module/ActorLocation/LocationProxyComponentSystem.cs index 347fd103aa5f4976114f11a58208733fc0e01af1..19339b614f83425b6d4b83ae95dfe01758d44b44 100644 --- a/Server/Hotfix/Module/ActorLocation/LocationProxyComponentSystem.cs +++ b/Server/Hotfix/Module/ActorLocation/LocationProxyComponentSystem.cs @@ -1,7 +1,7 @@ using System; -using ETModel; -namespace ETHotfix + +namespace ET { [ObjectSystem] public class LocationProxyComponentSystem : AwakeSystem diff --git a/Server/Hotfix/Module/ActorLocation/ObjectAddRequestHandler.cs b/Server/Hotfix/Module/ActorLocation/ObjectAddRequestHandler.cs index c127d706c9cc10bc48524e3b91478f9e2ccec29d..f06eaf75df00e89db6a3e670f55a939991f1e694 100644 --- a/Server/Hotfix/Module/ActorLocation/ObjectAddRequestHandler.cs +++ b/Server/Hotfix/Module/ActorLocation/ObjectAddRequestHandler.cs @@ -1,7 +1,7 @@ using System; -using ETModel; -namespace ETHotfix + +namespace ET { [ActorMessageHandler] public class ObjectAddRequestHandler : AMActorRpcHandler diff --git a/Server/Hotfix/Module/ActorLocation/ObjectGetRequestHandler.cs b/Server/Hotfix/Module/ActorLocation/ObjectGetRequestHandler.cs index e8cd818d71861ba64637feba074cd0f7885402b7..168a9af84f270d1688a048e16c77f95e4a46d8c8 100644 --- a/Server/Hotfix/Module/ActorLocation/ObjectGetRequestHandler.cs +++ b/Server/Hotfix/Module/ActorLocation/ObjectGetRequestHandler.cs @@ -1,7 +1,7 @@ using System; -using ETModel; -namespace ETHotfix + +namespace ET { [ActorMessageHandler] public class ObjectGetRequestHandler : AMActorRpcHandler diff --git a/Server/Hotfix/Module/ActorLocation/ObjectLockRequestHandler.cs b/Server/Hotfix/Module/ActorLocation/ObjectLockRequestHandler.cs index 5aa4fb6706f6b5caed4b8a18e586648dc2b5b91b..a6fffc7ba82819c29a64848f41f046106496c66d 100644 --- a/Server/Hotfix/Module/ActorLocation/ObjectLockRequestHandler.cs +++ b/Server/Hotfix/Module/ActorLocation/ObjectLockRequestHandler.cs @@ -1,7 +1,7 @@ using System; -using ETModel; -namespace ETHotfix + +namespace ET { [ActorMessageHandler] public class ObjectLockRequestHandler : AMActorRpcHandler diff --git a/Server/Hotfix/Module/ActorLocation/ObjectRemoveRequestHandler.cs b/Server/Hotfix/Module/ActorLocation/ObjectRemoveRequestHandler.cs index 33e1f206ba2d104cf723b040109793afdaef2ce2..ee47e1f0e900b83afa392eac0782369a301d8e51 100644 --- a/Server/Hotfix/Module/ActorLocation/ObjectRemoveRequestHandler.cs +++ b/Server/Hotfix/Module/ActorLocation/ObjectRemoveRequestHandler.cs @@ -1,7 +1,7 @@ using System; -using ETModel; -namespace ETHotfix + +namespace ET { [ActorMessageHandler] public class ObjectRemoveRequestHandler : AMActorRpcHandler diff --git a/Server/Hotfix/Module/ActorLocation/ObjectUnLockRequestHandler.cs b/Server/Hotfix/Module/ActorLocation/ObjectUnLockRequestHandler.cs index f8352672363822d8a2b8c279181c834b4bb2892f..6ab054356a3b12353e8a715541cc9a8ee4075c60 100644 --- a/Server/Hotfix/Module/ActorLocation/ObjectUnLockRequestHandler.cs +++ b/Server/Hotfix/Module/ActorLocation/ObjectUnLockRequestHandler.cs @@ -1,7 +1,7 @@ using System; -using ETModel; -namespace ETHotfix + +namespace ET { [ActorMessageHandler] public class ObjectUnLockRequestHandler : AMActorRpcHandler diff --git a/Server/Hotfix/Module/Benchmark/BenchmarkComponentSystem.cs b/Server/Hotfix/Module/Benchmark/BenchmarkComponentSystem.cs index 8642b7de8727df542227685d743a28a51da52270..79caf0a85c19583ba930384611bd3792e57419af 100644 --- a/Server/Hotfix/Module/Benchmark/BenchmarkComponentSystem.cs +++ b/Server/Hotfix/Module/Benchmark/BenchmarkComponentSystem.cs @@ -1,9 +1,9 @@ using System; using System.Net; using System.Threading.Tasks; -using ETModel; -namespace ETHotfix + +namespace ET { [ObjectSystem] public class BenchmarkComponentSystem : AwakeSystem diff --git a/Server/Hotfix/Module/Benchmark/WebSocketBenchmarkComponentSystem.cs b/Server/Hotfix/Module/Benchmark/WebSocketBenchmarkComponentSystem.cs index c66586cbf6431dd51c5a8032c3ee38f5f6c35091..4b31f5724b0a21f01f5cb02accdf5f1c56a3b984 100644 --- a/Server/Hotfix/Module/Benchmark/WebSocketBenchmarkComponentSystem.cs +++ b/Server/Hotfix/Module/Benchmark/WebSocketBenchmarkComponentSystem.cs @@ -1,7 +1,7 @@ using System; -using ETModel; -namespace ETHotfix + +namespace ET { [ObjectSystem] public class WebSocketBenchmarkComponentSystem : AwakeSystem diff --git a/Server/Hotfix/Module/Config/ConfigComponentSystem.cs b/Server/Hotfix/Module/Config/ConfigComponentSystem.cs index e06e47ed6d71755394ea41ad8c057e955dcd0edd..415581606bbd7b07340159ffd23d7658a2edcc71 100644 --- a/Server/Hotfix/Module/Config/ConfigComponentSystem.cs +++ b/Server/Hotfix/Module/Config/ConfigComponentSystem.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using ETModel; -namespace ETHotfix + +namespace ET { [ObjectSystem] public class ConfigAwakeSystem : AwakeSystem diff --git a/Server/Hotfix/Module/DB/DBComponentSystem.cs b/Server/Hotfix/Module/DB/DBComponentSystem.cs index 82283aa2e7f0b976424973923a15bacf37253ce4..5db7e4fcc4f99594993122ee4732cf6e4d27a6cd 100644 --- a/Server/Hotfix/Module/DB/DBComponentSystem.cs +++ b/Server/Hotfix/Module/DB/DBComponentSystem.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq.Expressions; using MongoDB.Driver; -namespace ETModel +namespace ET { [ObjectSystem] public class DBComponentAwakeSystem : AwakeSystem diff --git a/Server/Hotfix/Module/Message/InnerMessageDispatcher.cs b/Server/Hotfix/Module/Message/InnerMessageDispatcher.cs index a98c387ec885178f38ba691394320b7963e748dc..09238b412faa4b30e1b8da23f99e2f6a825cec49 100644 --- a/Server/Hotfix/Module/Message/InnerMessageDispatcher.cs +++ b/Server/Hotfix/Module/Message/InnerMessageDispatcher.cs @@ -1,6 +1,6 @@ -using ETModel; + -namespace ETHotfix +namespace ET { public class InnerMessageDispatcher: IMessageDispatcher { diff --git a/Server/Hotfix/Module/Message/InnerMessageDispatcherHelper.cs b/Server/Hotfix/Module/Message/InnerMessageDispatcherHelper.cs index da17f6492a23f0f0f5c009a9416635e5aaf7d64b..5173f5a2a24ff94cf72754af5879bcb0c93676d1 100644 --- a/Server/Hotfix/Module/Message/InnerMessageDispatcherHelper.cs +++ b/Server/Hotfix/Module/Message/InnerMessageDispatcherHelper.cs @@ -1,6 +1,6 @@ -using ETModel; + - namespace ETHotfix + namespace ET { public static class InnerMessageDispatcherHelper { diff --git a/Server/Hotfix/Module/Message/MessageDispatherComponentSystem.cs b/Server/Hotfix/Module/Message/MessageDispatherComponentSystem.cs index d83c31464d4b201a8cc1a939b2d398a63182afab..e9962512e214ad790cb3944ebde147d24e905f39 100644 --- a/Server/Hotfix/Module/Message/MessageDispatherComponentSystem.cs +++ b/Server/Hotfix/Module/Message/MessageDispatherComponentSystem.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using ETModel; -namespace ETHotfix + +namespace ET { [ObjectSystem] public class MessageDispatcherComponentAwakeSystem : AwakeSystem diff --git a/Server/Hotfix/Module/Message/NetInnerComponentSystem.cs b/Server/Hotfix/Module/Message/NetInnerComponentSystem.cs index 4a41ffb214ba955a3d0f3d28f6bfd0ff903c7945..59baed9395f42fd62833c1141f2b35a6b50938dc 100644 --- a/Server/Hotfix/Module/Message/NetInnerComponentSystem.cs +++ b/Server/Hotfix/Module/Message/NetInnerComponentSystem.cs @@ -1,6 +1,6 @@ -using ETModel; + -namespace ETHotfix +namespace ET { [ObjectSystem] public class NetInnerComponentAwakeSystem : AwakeSystem diff --git a/Server/Hotfix/Module/Message/OuterMessageDispatcher.cs b/Server/Hotfix/Module/Message/OuterMessageDispatcher.cs index debf05e340183cd8a5aeb0fc52e83f055834a244..6874e050b1bd925694fc1642f6db81b91806f552 100644 --- a/Server/Hotfix/Module/Message/OuterMessageDispatcher.cs +++ b/Server/Hotfix/Module/Message/OuterMessageDispatcher.cs @@ -1,6 +1,6 @@ -using ETModel; + -namespace ETHotfix +namespace ET { public class OuterMessageDispatcher: IMessageDispatcher { diff --git a/Server/Hotfix/Module/Scene/AfterScenesAdd_CreateScene.cs b/Server/Hotfix/Module/Scene/AfterScenesAdd_CreateScene.cs index db94319a74f863490bdd54245d2c0a3b08bddaa6..8b91d1f13cc02ab1e8243d4ad98362f9c9c7d607 100644 --- a/Server/Hotfix/Module/Scene/AfterScenesAdd_CreateScene.cs +++ b/Server/Hotfix/Module/Scene/AfterScenesAdd_CreateScene.cs @@ -1,6 +1,6 @@ -using ETModel; -namespace ETHotfix + +namespace ET { [Event(EventIdType.AfterScenesAdd)] public class AfterScenesAdd_CreateScene: AEvent diff --git a/Server/Hotfix/Module/Scene/SceneFactory.cs b/Server/Hotfix/Module/Scene/SceneFactory.cs index 86b9315fa1e12dd10476f41dd1ec80e5b1b48a59..260431855c0eec624664e245a484d48319a1b889 100644 --- a/Server/Hotfix/Module/Scene/SceneFactory.cs +++ b/Server/Hotfix/Module/Scene/SceneFactory.cs @@ -1,6 +1,6 @@ -using ETModel; -namespace ETHotfix + +namespace ET { public static class SceneFactory { diff --git a/Server/Hotfix/Server.Hotfix.csproj b/Server/Hotfix/Server.Hotfix.csproj index 2636e07a8395f122f2a4841fb8cd5745be5e00af..28e99bdc168972ef37d5e0278fcd755f73639728 100644 --- a/Server/Hotfix/Server.Hotfix.csproj +++ b/Server/Hotfix/Server.Hotfix.csproj @@ -21,6 +21,12 @@ Module\Message\NetOuterComponentSystem.cs + + Module\Numeric\NumericChangeEvent_NotifyWatcher.cs + + + Module\Numeric\NumericWatcher_Hp_ShowUI.cs + diff --git a/Server/Model/Base/Event/EventIdType.cs b/Server/Model/Base/Event/EventIdType.cs index 5d00c731a7dd915a5ae4e900893fe2e94a046be2..6292d758ba8c170ce1726099b36b19954ceea16c 100644 --- a/Server/Model/Base/Event/EventIdType.cs +++ b/Server/Model/Base/Event/EventIdType.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public static class EventIdType { diff --git a/Server/Model/Base/Helper/DllHelper.cs b/Server/Model/Base/Helper/DllHelper.cs index 8f5e80fcd58ca714fa95d8084b29c30820c1c886..dd9db8d75349ff99b3c7ba66925a94658a1ebd86 100644 --- a/Server/Model/Base/Helper/DllHelper.cs +++ b/Server/Model/Base/Helper/DllHelper.cs @@ -1,7 +1,7 @@ using System.IO; using System.Reflection; -namespace ETModel +namespace ET { public static class DllHelper { diff --git a/Server/Model/Base/Helper/JsonHelper.cs b/Server/Model/Base/Helper/JsonHelper.cs index f8e1df12151b4ede3a280692c0f8e104e2ea8bf3..aa8ead6305eb87c5de3f305785ce11d21d188286 100644 --- a/Server/Model/Base/Helper/JsonHelper.cs +++ b/Server/Model/Base/Helper/JsonHelper.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public static class JsonHelper { diff --git a/Server/Model/Base/Log.cs b/Server/Model/Base/Log.cs index dd33848741c2d5a0a02b86ddfe851e3f4244593c..b995fe9cd450054c1d691c4ab1c51ed2a93670c8 100644 --- a/Server/Model/Base/Log.cs +++ b/Server/Model/Base/Log.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public static class Log { diff --git a/Server/Model/Base/LogType.cs b/Server/Model/Base/LogType.cs index 13003c93583b74d9718f7647163dc2bf9d49479f..dd46fe11ed5bfece4d93e0e87b5237463b1e4c67 100644 --- a/Server/Model/Base/LogType.cs +++ b/Server/Model/Base/LogType.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public enum LogType { diff --git a/Server/Model/Base/Logger/ILog.cs b/Server/Model/Base/Logger/ILog.cs index 8d5d9fce9a8f6a0079c7867e30174c7c13389759..9f82e8e02952cdf2e8893289e6a50d1a88ba5b9a 100644 --- a/Server/Model/Base/Logger/ILog.cs +++ b/Server/Model/Base/Logger/ILog.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public interface ILog { diff --git a/Server/Model/Base/Logger/NLogAdapter.cs b/Server/Model/Base/Logger/NLogAdapter.cs index 3c411e95bf13fa0841acf4dcf3253c7d53a9a289..1d9ea688b51a15a767e97bc0ec7cad7d5716431a 100644 --- a/Server/Model/Base/Logger/NLogAdapter.cs +++ b/Server/Model/Base/Logger/NLogAdapter.cs @@ -1,6 +1,6 @@ using NLog; -namespace ETModel +namespace ET { public class NLogAdapter: ILog { diff --git a/Server/Model/Base/Object/IDBCollection.cs b/Server/Model/Base/Object/IDBCollection.cs index 2d25e15db22c67390749d80dcf9f6753db063079..8496f1062cbf867e6ae70777b3648dfb874773d7 100644 --- a/Server/Model/Base/Object/IDBCollection.cs +++ b/Server/Model/Base/Object/IDBCollection.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public interface IDBCollection { diff --git a/Server/Model/Component/KVComponent.cs b/Server/Model/Component/KVComponent.cs deleted file mode 100644 index a8e48086f6ca509cfd03b8a9d759aad8a27e2803..0000000000000000000000000000000000000000 --- a/Server/Model/Component/KVComponent.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.Collections.Generic; -using MongoDB.Bson.Serialization.Attributes; - -namespace ETModel -{ - /// - /// Key Value组件用于保存一些数据 - /// - public class KVComponent: Entity - { - [BsonElement] - private readonly Dictionary kv = new Dictionary(); - - public void Add(string key, object value) - { - this.kv.Add(key, value); - } - - public void Remove(string key) - { - this.kv.Remove(key); - } - - public T Get(string key) - { - if (!this.kv.TryGetValue(key, out object k)) - { - return default(T); - } - return (T) k; - } - - public override void Dispose() - { - if (this.IsDisposed) - { - return; - } - - base.Dispose(); - } - } -} \ No newline at end of file diff --git a/Server/Model/Component/OptionComponent.cs b/Server/Model/Component/OptionComponent.cs deleted file mode 100644 index 3abc923ffa4120ba5672a04c783707cf8f14902d..0000000000000000000000000000000000000000 --- a/Server/Model/Component/OptionComponent.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using CommandLine; - -namespace ETModel -{ - [ObjectSystem] - public class OptionComponentSystem : AwakeSystem - { - public override void Awake(OptionComponent self, string[] a) - { - self.Awake(a); - } - } - - public class OptionComponent : Entity - { - public Options Options { get; set; } - - public void Awake(string[] args) - { - Parser.Default.ParseArguments(args) - .WithNotParsed(error => throw new Exception($"命令行格式错误!")) - .WithParsed(options => { Options = options; }); - } - } -} diff --git a/Server/Model/Component/RobotComponent.cs b/Server/Model/Component/RobotComponent.cs deleted file mode 100644 index 66341dadcddae544a083ade1f72dac0435eae255..0000000000000000000000000000000000000000 --- a/Server/Model/Component/RobotComponent.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace ETModel -{ - public class RobotComponent: Entity - { - public override void Dispose() - { - if (this.IsDisposed) - { - return; - } - - base.Dispose(); - } - } -} \ No newline at end of file diff --git a/Server/Model/Demo/Config/StartProcessConfig.cs b/Server/Model/Demo/Config/StartProcessConfig.cs index 7f7f66214f729f8904eb97fdf7acd603e0a9070c..a71ed3bb2a8bed4fe7e1999a9bc8c9bee955d440 100644 --- a/Server/Model/Demo/Config/StartProcessConfig.cs +++ b/Server/Model/Demo/Config/StartProcessConfig.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { [Config] public partial class StartProcessConfigCategory : ACategory diff --git a/Server/Model/Demo/Config/StartSceneConfig.cs b/Server/Model/Demo/Config/StartSceneConfig.cs index 3945e6b4c09224c4fb66426960be257788586063..ebd74a39f117b15a18bbdce6bbcc20c3cbbc367e 100644 --- a/Server/Model/Demo/Config/StartSceneConfig.cs +++ b/Server/Model/Demo/Config/StartSceneConfig.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { [Config] public partial class StartSceneConfigCategory : ACategory diff --git a/Server/Model/Demo/Config/StartZoneConfig.cs b/Server/Model/Demo/Config/StartZoneConfig.cs index c7ecaf08ea8490e539c25d46383919cd183d8fd7..dfed28362f1a7b3c88d5925c653fb1fd5c12cb47 100644 --- a/Server/Model/Demo/Config/StartZoneConfig.cs +++ b/Server/Model/Demo/Config/StartZoneConfig.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { [Config] public partial class StartZoneConfigCategory : ACategory diff --git a/Server/Model/Demo/Config/UnitConfig.cs b/Server/Model/Demo/Config/UnitConfig.cs index 5f7a1f43665b1c4446b92e66b5348ffd4d650297..83309924dc5f0be97b40fe225da238e8ee31366b 100644 --- a/Server/Model/Demo/Config/UnitConfig.cs +++ b/Server/Model/Demo/Config/UnitConfig.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { [Config] public partial class UnitConfigCategory : ACategory diff --git a/Server/Model/Demo/ConfigPartial/StartProcessConfig.cs b/Server/Model/Demo/ConfigPartial/StartProcessConfig.cs index 1743f49ab52e36f873ed5dc6134ec75727f091a8..626b41d3642f1a90769f3ac1a99dc847107f1eb1 100644 --- a/Server/Model/Demo/ConfigPartial/StartProcessConfig.cs +++ b/Server/Model/Demo/ConfigPartial/StartProcessConfig.cs @@ -1,14 +1,11 @@ using System.ComponentModel; -namespace ETModel +namespace ET { - public partial class StartProcessConfigCategory : ISupportInitialize + public partial class StartProcessConfigCategory { - - - public void EndInit() + public override void EndInit() { - } } diff --git a/Server/Model/Demo/ConfigPartial/StartSceneConfig.cs b/Server/Model/Demo/ConfigPartial/StartSceneConfig.cs index c1ea07b0b014e34c6697e1a34a9057744a34b930..0c116de238e345bc60749e4a534d210a00a0b03e 100644 --- a/Server/Model/Demo/ConfigPartial/StartSceneConfig.cs +++ b/Server/Model/Demo/ConfigPartial/StartSceneConfig.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.ComponentModel; -namespace ETModel +namespace ET { - public partial class StartSceneConfigCategory: ISupportInitialize + public partial class StartSceneConfigCategory { public MultiMap Gates = new MultiMap(); @@ -23,7 +23,7 @@ namespace ETModel return this.ZoneScenesByName[zone][name]; } - public void EndInit() + public override void EndInit() { foreach (StartSceneConfig startSceneConfig in this.GetAll().Values) { diff --git a/Server/Model/Demo/GateSessionKeyComponent.cs b/Server/Model/Demo/GateSessionKeyComponent.cs index bd6688b180279aee145c882b6844c469610d03e2..0fa0e4b93b271e3576d782ae1dd4967ab1779080 100644 --- a/Server/Model/Demo/GateSessionKeyComponent.cs +++ b/Server/Model/Demo/GateSessionKeyComponent.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace ETModel +namespace ET { public class GateSessionKeyComponent : Entity { diff --git a/Server/Model/Demo/MoveComponent.cs b/Server/Model/Demo/MoveComponent.cs index e1ab5061891006dd74f20ac65d0fc0ad4761d1fa..c4143fb4d06dc966046a2513c071c2ed7cd7d7d2 100644 --- a/Server/Model/Demo/MoveComponent.cs +++ b/Server/Model/Demo/MoveComponent.cs @@ -2,7 +2,7 @@ using System; using System.Threading; using UnityEngine; -namespace ETModel +namespace ET { public class MoveComponent: Entity { diff --git a/Server/Model/Demo/Player.cs b/Server/Model/Demo/Player.cs index cd3efc784e710edf1342c58f47eff405e3be6d26..b296b9d417444c34376f68b7a69c58533996ed19 100644 --- a/Server/Model/Demo/Player.cs +++ b/Server/Model/Demo/Player.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { [ObjectSystem] public class PlayerSystem : AwakeSystem diff --git a/Server/Model/Demo/PlayerComponent.cs b/Server/Model/Demo/PlayerComponent.cs index 39592116116b23172780743fe830f453b8e4284b..b09510ffb5e53b85de9d63c5a5ac6f840504ab1d 100644 --- a/Server/Model/Demo/PlayerComponent.cs +++ b/Server/Model/Demo/PlayerComponent.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace ETModel +namespace ET { [ObjectSystem] public class PlayerComponentSystem : AwakeSystem diff --git a/Server/Model/Demo/SessionInfoComponent.cs b/Server/Model/Demo/SessionInfoComponent.cs index 4986f0228a100985eb85028e44c592460c09f648..6471f034df5cbe75c41f5303eb28b1ca51eded7f 100644 --- a/Server/Model/Demo/SessionInfoComponent.cs +++ b/Server/Model/Demo/SessionInfoComponent.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public class SessionInfoComponent : Entity { diff --git a/Server/Model/Demo/SessionPlayerComponent.cs b/Server/Model/Demo/SessionPlayerComponent.cs index 1c5d09f364925d3168cdfc51fb6d32ac8ab84b90..1ed233eacc1234835bead146fb549e7bf6bacae9 100644 --- a/Server/Model/Demo/SessionPlayerComponent.cs +++ b/Server/Model/Demo/SessionPlayerComponent.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public class SessionPlayerComponent : Entity { diff --git a/Server/Model/Demo/Unit.cs b/Server/Model/Demo/Unit.cs index f284cc9a8a603cc550e714322ec9594faf2316f2..d655541122be3246f200dd616ecb84863de87314 100644 --- a/Server/Model/Demo/Unit.cs +++ b/Server/Model/Demo/Unit.cs @@ -1,7 +1,7 @@ using PF; using UnityEngine; -namespace ETModel +namespace ET { public enum UnitType { diff --git a/Server/Model/Demo/UnitComponent.cs b/Server/Model/Demo/UnitComponent.cs index ac14343dbad982aec2d098510cf07aea31f67c5d..5bb569a5429273201e98b27ea447e44d3fe37adc 100644 --- a/Server/Model/Demo/UnitComponent.cs +++ b/Server/Model/Demo/UnitComponent.cs @@ -3,7 +3,7 @@ using System.Linq; using MongoDB.Bson.Serialization.Attributes; using MongoDB.Bson.Serialization.Options; -namespace ETModel +namespace ET { public class UnitComponent: Entity { diff --git a/Server/Model/Demo/UnitGateComponent.cs b/Server/Model/Demo/UnitGateComponent.cs index e4418d304e7d138e5a34c5e1729f878c7ac3b4a3..01b17de823f72f62b727afe4728ce2cae63d4ff4 100644 --- a/Server/Model/Demo/UnitGateComponent.cs +++ b/Server/Model/Demo/UnitGateComponent.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { [ObjectSystem] public class UnitGateComponentAwakeSystem : AwakeSystem diff --git a/Server/Model/Demo/UnitPathComponent.cs b/Server/Model/Demo/UnitPathComponent.cs index e0277b513c23d053ff906503c1ad453e9706ad36..0669ef5ac081243b3399522697a52c70feb7e3ee 100644 --- a/Server/Model/Demo/UnitPathComponent.cs +++ b/Server/Model/Demo/UnitPathComponent.cs @@ -3,7 +3,7 @@ using System.Threading; using PF; using UnityEngine; -namespace ETModel +namespace ET { public class UnitPathComponent: Entity { diff --git a/Server/Model/Module/Actor/AMActorHandler.cs b/Server/Model/Module/Actor/AMActorHandler.cs index ec5cf86079ac3d2de0cf0bf5e8b5e6945244d786..fa65479477fc208b075d62702b75f7c011a0fac7 100644 --- a/Server/Model/Module/Actor/AMActorHandler.cs +++ b/Server/Model/Module/Actor/AMActorHandler.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public abstract class AMActorHandler: IMActorHandler where E: Entity where Message : class, IActorMessage { diff --git a/Server/Model/Module/Actor/AMActorRpcHandler.cs b/Server/Model/Module/Actor/AMActorRpcHandler.cs index 3ff34b6eb90e10951bc1119afc8b44ff6cbba6cd..d43a6ed40f9cee66fb310ae4bce8c6f287219c8a 100644 --- a/Server/Model/Module/Actor/AMActorRpcHandler.cs +++ b/Server/Model/Module/Actor/AMActorRpcHandler.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public abstract class AMActorRpcHandler: IMActorHandler where E: Entity where Request: class, IActorRequest where Response : class, IActorResponse { diff --git a/Server/Model/Module/Actor/ActorMessageAttribute.cs b/Server/Model/Module/Actor/ActorMessageAttribute.cs index dd12ad51501a862d1e9251a679f8ec7a65abc73b..b5823cf9841bee29931401dbb90b5a51f613ff3f 100644 --- a/Server/Model/Module/Actor/ActorMessageAttribute.cs +++ b/Server/Model/Module/Actor/ActorMessageAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public class ActorMessageAttribute : Attribute { diff --git a/Server/Model/Module/Actor/ActorMessageDispatcherComponent.cs b/Server/Model/Module/Actor/ActorMessageDispatcherComponent.cs index 7e066cebd5aaade7d7e33b597a38e159b9c9824f..90be02acde65d707f990744c1ddb804f35dedaa0 100644 --- a/Server/Model/Module/Actor/ActorMessageDispatcherComponent.cs +++ b/Server/Model/Module/Actor/ActorMessageDispatcherComponent.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace ETModel +namespace ET { /// /// Actor消息分发组件 diff --git a/Server/Model/Module/Actor/ActorMessageHandlerAttribute.cs b/Server/Model/Module/Actor/ActorMessageHandlerAttribute.cs index 805b27dbf47d8c64a2da0a1856177e35ce54c255..ba52688cbebb16048423dbaa1ff13c2b6e38b27b 100644 --- a/Server/Model/Module/Actor/ActorMessageHandlerAttribute.cs +++ b/Server/Model/Module/Actor/ActorMessageHandlerAttribute.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public class ActorMessageHandlerAttribute : BaseAttribute { diff --git a/Server/Model/Module/Actor/ActorMessageSender.cs b/Server/Model/Module/Actor/ActorMessageSender.cs index f20200ac9b0fa71ba650247350cb59d73eae1b6d..275d59fa58f19a0007272e74c2c18c295596a765 100644 --- a/Server/Model/Module/Actor/ActorMessageSender.cs +++ b/Server/Model/Module/Actor/ActorMessageSender.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { // 知道对方的instanceId，使用这个类发actor消息 public struct ActorMessageSender diff --git a/Server/Model/Module/Actor/ActorMessageSenderComponent.cs b/Server/Model/Module/Actor/ActorMessageSenderComponent.cs index b9ec6129dc9ea1627d34f547a5bdd6f046b65e90..6c2ad97319e913ba49df0cd149a4c6a51503608e 100644 --- a/Server/Model/Module/Actor/ActorMessageSenderComponent.cs +++ b/Server/Model/Module/Actor/ActorMessageSenderComponent.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace ETModel +namespace ET { public class ActorMessageSenderComponent: Entity { diff --git a/Server/Model/Module/Actor/ActorResponse.cs b/Server/Model/Module/Actor/ActorResponse.cs index a969d2c52b7f81d757b4f6624157bfba4d5fc25f..346079ab9f214c5d15ae62a679afed03c0bb135b 100644 --- a/Server/Model/Module/Actor/ActorResponse.cs +++ b/Server/Model/Module/Actor/ActorResponse.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { /// /// actor RPC消息响应 diff --git a/Server/Model/Module/Actor/ActorTask.cs b/Server/Model/Module/Actor/ActorTask.cs index 3566dc4e8267807afd011a786d6223c3d46bd587..b5208677a7e0c51e4196d7be7a2daa56b6ad6f1f 100644 --- a/Server/Model/Module/Actor/ActorTask.cs +++ b/Server/Model/Module/Actor/ActorTask.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public struct ActorTask { diff --git a/Server/Model/Module/Actor/IMActorHandler.cs b/Server/Model/Module/Actor/IMActorHandler.cs index 083c36c0e814cfeb41c67315d7422c66c3b65398..e320ec9c6da0cb4c54e9d18ac2bf2a476aceb67e 100644 --- a/Server/Model/Module/Actor/IMActorHandler.cs +++ b/Server/Model/Module/Actor/IMActorHandler.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public interface IMActorHandler { diff --git a/Server/Model/Module/Actor/MailBoxComponent.cs b/Server/Model/Module/Actor/MailBoxComponent.cs index c4642e2c60feddbf5f7b4b74fe51909366d8c1be..5a5d07037a4aaaae24a317587b5f4a457ed9db55 100644 --- a/Server/Model/Module/Actor/MailBoxComponent.cs +++ b/Server/Model/Module/Actor/MailBoxComponent.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { /// /// 挂上这个组件表示该Entity是一个Actor,接收的消息将会队列处理 diff --git a/Server/Model/Module/Actor/MailboxType.cs b/Server/Model/Module/Actor/MailboxType.cs index 399d7f1accb5206d8a7b460fe6e39c61939fa112..5607118087824895916f1f1aff9fa04736150712 100644 --- a/Server/Model/Module/Actor/MailboxType.cs +++ b/Server/Model/Module/Actor/MailboxType.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public enum MailboxType { diff --git a/Server/Model/Module/ActorLocation/AMActorLocationHandler.cs b/Server/Model/Module/ActorLocation/AMActorLocationHandler.cs index 85f35bf980be629b252bf6cb9c8a90a46d1fce5c..850a2d5d1f6b01769e53bc20b8039f55f862f0cf 100644 --- a/Server/Model/Module/ActorLocation/AMActorLocationHandler.cs +++ b/Server/Model/Module/ActorLocation/AMActorLocationHandler.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public abstract class AMActorLocationHandler: IMActorHandler where E: Entity where Message : class, IActorLocationMessage { diff --git a/Server/Model/Module/ActorLocation/AMActorLocationRpcHandler.cs b/Server/Model/Module/ActorLocation/AMActorLocationRpcHandler.cs index 7f7e31aa8971a0e2be38dd2254d0dea0c99befd7..74f5fd4caad9d724f05ab9cc05224f3b27f8ecca 100644 --- a/Server/Model/Module/ActorLocation/AMActorLocationRpcHandler.cs +++ b/Server/Model/Module/ActorLocation/AMActorLocationRpcHandler.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public abstract class AMActorLocationRpcHandler: IMActorHandler where E: Entity where Request: class, IActorLocationRequest where Response : class, IActorLocationResponse { diff --git a/Server/Model/Module/ActorLocation/ActorLocationSender.cs b/Server/Model/Module/ActorLocation/ActorLocationSender.cs index 48e81cebe5145cd4597436b6ecc79f2d05ceedc1..742f2cb490046f7f4d68becf5e5048845fcb5fe1 100644 --- a/Server/Model/Module/ActorLocation/ActorLocationSender.cs +++ b/Server/Model/Module/ActorLocation/ActorLocationSender.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { // 知道对方的Id，使用这个类发actor消息 public class ActorLocationSender : Entity diff --git a/Server/Model/Module/ActorLocation/ActorLocationSenderComponent.cs b/Server/Model/Module/ActorLocation/ActorLocationSenderComponent.cs index 2dd62ec30501e1daf97eb89c2844880efb74aa03..e9c4d4b13a5145c81d06440b6314a695fffece24 100644 --- a/Server/Model/Module/ActorLocation/ActorLocationSenderComponent.cs +++ b/Server/Model/Module/ActorLocation/ActorLocationSenderComponent.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public class ActorLocationSenderComponent: Entity { diff --git a/Server/Model/Module/ActorLocation/LocationComponent.cs b/Server/Model/Module/ActorLocation/LocationComponent.cs index 6a7f8c17682183cf8bb54196be1b4e0efb99d0bd..152a2eb2c6f20a6e0c8fc604f279005682a5f32c 100644 --- a/Server/Model/Module/ActorLocation/LocationComponent.cs +++ b/Server/Model/Module/ActorLocation/LocationComponent.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace ETModel +namespace ET { [ObjectSystem] public class LockInfoAwakeSystem : AwakeSystem diff --git a/Server/Model/Module/ActorLocation/LocationProxyComponent.cs b/Server/Model/Module/ActorLocation/LocationProxyComponent.cs index 41f85201ee22752c097246a26b213b65c7f5ef6f..c3357dc0f9cc3f40093cc5bd19d296590dd6d2d7 100644 --- a/Server/Model/Module/ActorLocation/LocationProxyComponent.cs +++ b/Server/Model/Module/ActorLocation/LocationProxyComponent.cs @@ -1,6 +1,6 @@ using System.Net; -namespace ETModel +namespace ET { public class LocationProxyComponent : Entity { diff --git a/Server/Model/Module/Benchmark/BenchmarkComponent.cs b/Server/Model/Module/Benchmark/BenchmarkComponent.cs index ee0c5f359972f0ff45e2b0c83da58eec76a36676..97f0259d82821f2d48e35a22bd3dbe74471d4bc8 100644 --- a/Server/Model/Module/Benchmark/BenchmarkComponent.cs +++ b/Server/Model/Module/Benchmark/BenchmarkComponent.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public class BenchmarkComponent: Entity { diff --git a/Server/Model/Module/Benchmark/WebSocketBenchmarkComponent.cs b/Server/Model/Module/Benchmark/WebSocketBenchmarkComponent.cs index b8b9d54b5d43384f2ddf3e7cd601495361972979..034de799ac0db3085797db8b614ec8ab012d389f 100644 --- a/Server/Model/Module/Benchmark/WebSocketBenchmarkComponent.cs +++ b/Server/Model/Module/Benchmark/WebSocketBenchmarkComponent.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public class WebSocketBenchmarkComponent: Entity { diff --git a/Server/Model/Module/Config/ConfigComponent.cs b/Server/Model/Module/Config/ConfigComponent.cs index 9acddac06b232660cbd698efd0c6b67d11138fbf..41257d620c57911c87a505eaccce6459f51aa1f7 100644 --- a/Server/Model/Module/Config/ConfigComponent.cs +++ b/Server/Model/Module/Config/ConfigComponent.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace ETModel +namespace ET { /// /// Config组件会扫描所有的有ConfigAttribute标签的配置,加载进来 diff --git a/Server/Model/Module/Config/ConfigHelper.cs b/Server/Model/Module/Config/ConfigHelper.cs index c4058d41d197031962beff25556928fd922eada2..84d5199e183d78311cc5422e67a43fca208f4a34 100644 --- a/Server/Model/Module/Config/ConfigHelper.cs +++ b/Server/Model/Module/Config/ConfigHelper.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace ETModel +namespace ET { public static class ConfigHelper { diff --git a/Server/Model/Component/ConsoleComponent.cs b/Server/Model/Module/Console/ConsoleComponent.cs similarity index 99% rename from Server/Model/Component/ConsoleComponent.cs rename to Server/Model/Module/Console/ConsoleComponent.cs index a0d50c8d890b217bc0cc07fbdf8ba9c51665a23e..c8cc70bcf95a7e29f63b8887250005a6c18e4720 100644 --- a/Server/Model/Component/ConsoleComponent.cs +++ b/Server/Model/Module/Console/ConsoleComponent.cs @@ -2,7 +2,7 @@ using System; using System.Threading; using System.Threading.Tasks; -namespace ETModel +namespace ET { [ObjectSystem] public class ConsoleComponentAwakeSystem : StartSystem diff --git a/Server/Model/Component/ReplComponent.cs b/Server/Model/Module/Console/ReplComponent.cs similarity index 99% rename from Server/Model/Component/ReplComponent.cs rename to Server/Model/Module/Console/ReplComponent.cs index b1a0d09ec9bdd5997a550fb3491cb581e6bbdf68..15d3443d02900f7c1452d3da2a26b67f6deff532 100644 --- a/Server/Model/Component/ReplComponent.cs +++ b/Server/Model/Module/Console/ReplComponent.cs @@ -3,7 +3,7 @@ using System.Threading; using Microsoft.CodeAnalysis.CSharp.Scripting; using Microsoft.CodeAnalysis.Scripting; -namespace ETModel +namespace ET { [ObjectSystem] public class ReplComponentAwakeSystem : AwakeSystem diff --git a/Server/Model/Module/DB/DBComponent.cs b/Server/Model/Module/DB/DBComponent.cs index f03b7761051ae9c0585b66eb0e1f8f698b108a38..8f811ab951a6ed00e15ef50337c4a8ecc9921f5d 100644 --- a/Server/Model/Module/DB/DBComponent.cs +++ b/Server/Model/Module/DB/DBComponent.cs @@ -2,7 +2,7 @@ using System.Text; using MongoDB.Driver; -namespace ETModel +namespace ET { /// /// 用来缓存数据 diff --git a/Server/Model/Module/Message/AMRpcHandler.cs b/Server/Model/Module/Message/AMRpcHandler.cs index 04c1a8f40b2becbcc1a6d17e2e6abbc5b5a26173..9eeebb0a1f4d821b7e9b8559e2b2b816dbeb124d 100644 --- a/Server/Model/Module/Message/AMRpcHandler.cs +++ b/Server/Model/Module/Message/AMRpcHandler.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public abstract class AMRpcHandler: IMHandler where Request : class, IRequest where Response : class, IResponse { diff --git a/Server/Model/Module/Message/InnerMessage.cs b/Server/Model/Module/Message/InnerMessage.cs index b532d9ffa0ae63500f2d22fdc2971568dd45d519..ca6290b5dd584246c02a64341ac27ddf88fa3a45 100644 --- a/Server/Model/Module/Message/InnerMessage.cs +++ b/Server/Model/Module/Message/InnerMessage.cs @@ -1,6 +1,6 @@ -using ETModel; + using System.Collections.Generic; -namespace ETModel +namespace ET { /// /// 传送unit diff --git a/Server/Model/Module/Message/InnerOpcode.cs b/Server/Model/Module/Message/InnerOpcode.cs index 96a8c4b429e8756614a7aec2b603c890335983bf..5fbf30078a2774105b1dfa71c86c99b1eb6783ca 100644 --- a/Server/Model/Module/Message/InnerOpcode.cs +++ b/Server/Model/Module/Message/InnerOpcode.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public static partial class InnerOpcode { diff --git a/Server/Model/Module/Message/MessageDispatcherComponent.cs b/Server/Model/Module/Message/MessageDispatcherComponent.cs index 639c58c7328f2b120216e1df04a0e94d6c1ae76a..14e512afb8fda300e9a051d64d067041b3ed8c1d 100644 --- a/Server/Model/Module/Message/MessageDispatcherComponent.cs +++ b/Server/Model/Module/Message/MessageDispatcherComponent.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace ETModel +namespace ET { /// /// 消息分发组件 diff --git a/Server/Model/Module/Message/MongoPacker.cs b/Server/Model/Module/Message/MongoPacker.cs index 4c6c5cb6777eefea4209f94432fcdb8cf1519794..9b4ada3729f71dfd249f417e595e93ef3507c14f 100644 --- a/Server/Model/Module/Message/MongoPacker.cs +++ b/Server/Model/Module/Message/MongoPacker.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace ETModel +namespace ET { public class MongoPacker: IMessagePacker { diff --git a/Server/Model/Module/Message/NetInnerComponent.cs b/Server/Model/Module/Message/NetInnerComponent.cs index 75d9b026b0a36c6348d7e411450afd362d023043..a93e7bb4e3bca9490efbcc662b38ab981ca6b31e 100644 --- a/Server/Model/Module/Message/NetInnerComponent.cs +++ b/Server/Model/Module/Message/NetInnerComponent.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace ETModel +namespace ET { public class NetInnerComponent: NetworkComponent { diff --git a/Server/Model/Module/Pathfinding/ABPathWrap.cs b/Server/Model/Module/Pathfinding/ABPathWrap.cs index ca95814bc98c205115728be4715d36231474bbcb..b449794bcda8291ee7e5ee926c807cb1c42462c2 100644 --- a/Server/Model/Module/Pathfinding/ABPathWrap.cs +++ b/Server/Model/Module/Pathfinding/ABPathWrap.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using PF; using UnityEngine; -namespace ETModel +namespace ET { [ObjectSystem] public class ABPathAwakeSystem : AwakeSystem diff --git a/Server/Model/Module/Pathfinding/DeserializeHelper.cs b/Server/Model/Module/Pathfinding/DeserializeHelper.cs index 466c7a5936ebca52a7b77cb9cd71cf6f6cd881a5..a940d057b719414a2980205ba1228d8dbf25934a 100644 --- a/Server/Model/Module/Pathfinding/DeserializeHelper.cs +++ b/Server/Model/Module/Pathfinding/DeserializeHelper.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using PF; using Guid = PF.Guid; -namespace ETModel +namespace ET { public static class DeserializeHelper { diff --git a/Server/Model/Module/Pathfinding/PathModifyHelper.cs b/Server/Model/Module/Pathfinding/PathModifyHelper.cs index 03e454c959c757ed6dbe60efaae022728a6238eb..0f4c6e2362d103dac7a4fc64e02aba595ce13a5c 100644 --- a/Server/Model/Module/Pathfinding/PathModifyHelper.cs +++ b/Server/Model/Module/Pathfinding/PathModifyHelper.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using PF; using UnityEngine; -namespace ETModel +namespace ET { public static class PathModifyHelper { diff --git a/Server/Model/Module/Pathfinding/PathfindingComponent.cs b/Server/Model/Module/Pathfinding/PathfindingComponent.cs index baab63382f1b15aa7e3557d2e027ddea9b091420..dcde6cfbc0561ed18499e35cc3ca6172975d537d 100644 --- a/Server/Model/Module/Pathfinding/PathfindingComponent.cs +++ b/Server/Model/Module/Pathfinding/PathfindingComponent.cs @@ -1,6 +1,6 @@ using PF; -namespace ETModel +namespace ET { [ObjectSystem] public class PathfindingComponentAwakeSystem : AwakeSystem diff --git a/Server/Model/Other/Options.cs b/Server/Model/Other/Options.cs index 475d580c0309d18ca229d12f5259c564410bf0ca..f99ce4c4fb88f84d772a17dda95a3b6c5dc54218 100644 --- a/Server/Model/Other/Options.cs +++ b/Server/Model/Other/Options.cs @@ -1,6 +1,6 @@ using CommandLine; -namespace ETModel +namespace ET { public class Options: Entity { diff --git a/Server/Model/Server.Model.csproj b/Server/Model/Server.Model.csproj index bb8ca87a50005aba34122c5015ba053207c66ed0..8a885e63d245f2505edfdeaae7c187df1bfd1506 100644 --- a/Server/Model/Server.Model.csproj +++ b/Server/Model/Server.Model.csproj @@ -146,6 +146,9 @@ Entity\SceneType.cs + + Entity\TimerComponent.cs + Module\ActorLocation\IActorLocationMessage.cs @@ -215,7 +218,6 @@ - @@ -250,12 +252,21 @@ Module\Message\SessionIdleCheckComponent.cs - - - - - - + + Module\Numeric\INumericWatcher.cs + + + Module\Numeric\NumericComponent.cs + + + Module\Numeric\NumericType.cs + + + Module\Numeric\NumericWatcherAttribute.cs + + + Module\Numeric\NumericWatcherComponent.cs + Module\Pathfinding\Recast\ArrayPool.cs @@ -405,7 +416,6 @@ - diff --git a/Unity/Assets/Editor/BuildEditor/BuildEditor.cs b/Unity/Assets/Editor/BuildEditor/BuildEditor.cs index 9e5dc906e263f9810af35f749cc966a4ce2bfb29..fb83c7df09da1b76e9ef6276b7870e244cff3e12 100644 --- a/Unity/Assets/Editor/BuildEditor/BuildEditor.cs +++ b/Unity/Assets/Editor/BuildEditor/BuildEditor.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using ETModel; + using UnityEditor; using UnityEngine; using Object = UnityEngine.Object; -namespace ETEditor +namespace ET { public class BundleInfo { @@ -74,320 +74,5 @@ namespace ETEditor BuildHelper.Build(this.platformType, this.buildAssetBundleOptions, this.buildOptions, this.isBuildExe, this.isContainAB); } } - - private void SetPackingTagAndAssetBundle() - { - ClearPackingTagAndAssetBundle(); - - SetIndependentBundleAndAtlas("Assets/Bundles/Independent"); - - SetBundleAndAtlasWithoutShare("Assets/Bundles/UI"); - - SetRootBundleOnly("Assets/Bundles/Unit"); - - AssetDatabase.SaveAssets(); - AssetDatabase.Refresh(ImportAssetOptions.ForceSynchronousImport | ImportAssetOptions.ForceUpdate); - } - - private static void SetNoAtlas(string dir) - { - List paths = EditorResHelper.GetPrefabsAndScenes(dir); - - foreach (string path in paths) - { - List pathes = CollectDependencies(path); - - foreach (string pt in pathes) - { - if (pt == path) - { - continue; - } - - SetAtlas(pt, "", true); - } - } - } - - // 会将目录下的每个prefab引用的资源强制打成一个包，不分析共享资源 - private static void SetBundles(string dir) - { - List paths = EditorResHelper.GetPrefabsAndScenes(dir); - foreach (string path in paths) - { - string path1 = path.Replace('\\', '/'); - Object go = AssetDatabase.LoadAssetAtPath(path1); - - SetBundle(path1, go.name); - } - } - - // 会将目录下的每个prefab引用的资源打成一个包,只给顶层prefab打包 - private static void SetRootBundleOnly(string dir) - { - List paths = EditorResHelper.GetPrefabsAndScenes(dir); - foreach (string path in paths) - { - string path1 = path.Replace('\\', '/'); - Object go = AssetDatabase.LoadAssetAtPath(path1); - - SetBundle(path1, go.name); - } - } - - // 会将目录下的每个prefab引用的资源强制打成一个包，不分析共享资源 - private static void SetIndependentBundleAndAtlas(string dir) - { - List paths = EditorResHelper.GetPrefabsAndScenes(dir); - foreach (string path in paths) - { - string path1 = path.Replace('\\', '/'); - Object go = AssetDatabase.LoadAssetAtPath(path1); - - AssetImporter importer = AssetImporter.GetAtPath(path1); - if (importer == null || go == null) - { - Log.Error("error: " + path1); - continue; - } - importer.assetBundleName = $"{go.name}.unity3d"; - - List pathes = CollectDependencies(path1); - - foreach (string pt in pathes) - { - if (pt == path1) - { - continue; - } - - SetBundleAndAtlas(pt, go.name, true); - } - } - } - - private static void SetBundleAndAtlasWithoutShare(string dir) - { - List paths = EditorResHelper.GetPrefabsAndScenes(dir); - foreach (string path in paths) - { - string path1 = path.Replace('\\', '/'); - Object go = AssetDatabase.LoadAssetAtPath(path1); - - SetBundle(path1, go.name); - - //List pathes = CollectDependencies(path1); - //foreach (string pt in pathes) - //{ - // if (pt == path1) - // { - // continue; - // } - // - // SetBundleAndAtlas(pt, go.name); - //} - } - } - - private static List CollectDependencies(string o) - { - string[] paths = AssetDatabase.GetDependencies(o); - - //Log.Debug($"{o} dependecies: " + paths.ToList().ListToString()); - return paths.ToList(); - } - - // 分析共享资源 - private void SetShareBundleAndAtlas(string dir) - { - this.dictionary.Clear(); - List paths = EditorResHelper.GetPrefabsAndScenes(dir); - - foreach (string path in paths) - { - string path1 = path.Replace('\\', '/'); - Object go = AssetDatabase.LoadAssetAtPath(path1); - - SetBundle(path1, go.name); - - List pathes = CollectDependencies(path1); - foreach (string pt in pathes) - { - if (pt == path1) - { - continue; - } - - // 不存在则记录下来 - if (!this.dictionary.ContainsKey(pt)) - { - // 如果已经设置了包 - if (GetBundleName(pt) != "") - { - continue; - } - Log.Info($"{path1}----{pt}"); - BundleInfo bundleInfo = new BundleInfo(); - bundleInfo.ParentPaths.Add(path1); - this.dictionary.Add(pt, bundleInfo); - - SetAtlas(pt, go.name); - - continue; - } - - // 依赖的父亲不一样 - BundleInfo info = this.dictionary[pt]; - if (info.ParentPaths.Contains(path1)) - { - continue; - } - info.ParentPaths.Add(path1); - - DirectoryInfo dirInfo = new DirectoryInfo(dir); - string dirName = dirInfo.Name; - - SetBundleAndAtlas(pt, $"{dirName}-share", true); - } - } - } - - private static void ClearPackingTagAndAssetBundle() - { - //List bundlePaths = EditorResHelper.GetAllResourcePath("Assets/Bundles/", true); - //foreach (string bundlePath in bundlePaths) - //{ - // SetBundle(bundlePath, "", true); - //} - - List paths = EditorResHelper.GetAllResourcePath("Assets/Res", true); - foreach (string pt in paths) - { - SetBundleAndAtlas(pt, "", true); - } - } - - private static string GetBundleName(string path) - { - string extension = Path.GetExtension(path); - if (extension == ".cs" || extension == ".dll" || extension == ".js") - { - return ""; - } - if (path.Contains("Resources")) - { - return ""; - } - - AssetImporter importer = AssetImporter.GetAtPath(path); - if (importer == null) - { - return ""; - } - - return importer.assetBundleName; - } - - private static void SetBundle(string path, string name, bool overwrite = false) - { - string extension = Path.GetExtension(path); - if (extension == ".cs" || extension == ".dll" || extension == ".js") - { - return; - } - if (path.Contains("Resources")) - { - return; - } - - AssetImporter importer = AssetImporter.GetAtPath(path); - if (importer == null) - { - return; - } - - if (importer.assetBundleName != "" && overwrite == false) - { - return; - } - - //Log.Info(path); - string bundleName = ""; - if (name != "") - { - bundleName = $"{name}.unity3d"; - } - - importer.assetBundleName = bundleName; - } - - private static void SetAtlas(string path, string name, bool overwrite = false) - { - string extension = Path.GetExtension(path); - if (extension == ".cs" || extension == ".dll" || extension == ".js") - { - return; - } - if (path.Contains("Resources")) - { - return; - } - - TextureImporter textureImporter = AssetImporter.GetAtPath(path) as TextureImporter; - if (textureImporter == null) - { - return; - } - - if (textureImporter.spritePackingTag != "" && overwrite == false) - { - return; - } - - textureImporter.spritePackingTag = name; - AssetDatabase.ImportAsset(path, ImportAssetOptions.ForceSynchronousImport | ImportAssetOptions.ForceUpdate); - } - - private static void SetBundleAndAtlas(string path, string name, bool overwrite = false) - { - string extension = Path.GetExtension(path); - if (extension == ".cs" || extension == ".dll" || extension == ".js" || extension == ".mat") - { - return; - } - if (path.Contains("Resources")) - { - return; - } - - AssetImporter importer = AssetImporter.GetAtPath(path); - if (importer == null) - { - return; - } - - if (importer.assetBundleName == "" || overwrite) - { - string bundleName = ""; - if (name != "") - { - bundleName = $"{name}.unity3d"; - } - - importer.assetBundleName = bundleName; - } - - TextureImporter textureImporter = importer as TextureImporter; - if (textureImporter == null) - { - return; - } - - if (textureImporter.spritePackingTag == "" || overwrite) - { - textureImporter.spritePackingTag = name; - AssetDatabase.ImportAsset(path, ImportAssetOptions.ForceSynchronousImport | ImportAssetOptions.ForceUpdate); - } - } } } diff --git a/Unity/Assets/Editor/BuildEditor/BuildHelper.cs b/Unity/Assets/Editor/BuildEditor/BuildHelper.cs index a7d524c6617a632e8a0cd0fa363202e08d98e5f3..39972bf9a44cfd27f777085826b389ce33c2d790 100644 --- a/Unity/Assets/Editor/BuildEditor/BuildHelper.cs +++ b/Unity/Assets/Editor/BuildEditor/BuildHelper.cs @@ -1,8 +1,8 @@ using System.IO; -using ETModel; + using UnityEditor; -namespace ETEditor +namespace ET { public static class BuildHelper { diff --git a/Unity/Assets/Editor/ComponentViewEditor/ComponentViewEditor.cs b/Unity/Assets/Editor/ComponentViewEditor/ComponentViewEditor.cs index 7c2b3dcdecb1beb4497e32f1bc233cc2cfd2917a..96025fe4ba140e3ef4329078960dec86714816f2 100644 --- a/Unity/Assets/Editor/ComponentViewEditor/ComponentViewEditor.cs +++ b/Unity/Assets/Editor/ComponentViewEditor/ComponentViewEditor.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using System.Reflection; -using ETModel; + using UnityEditor; using UnityEngine; -namespace ETEditor +namespace ET { [CustomEditor(typeof (ComponentView))] public class ComponentViewEditor: Editor diff --git a/Unity/Assets/Editor/ComponentViewEditor/Entity/EditorLayout.cs b/Unity/Assets/Editor/ComponentViewEditor/Entity/EditorLayout.cs index 2500b3147988283bfdf1ab6b6fdd3872c3b68c6d..831b2d9d9c92a48999f27ee37ed6b77b3f741d1f 100644 --- a/Unity/Assets/Editor/ComponentViewEditor/Entity/EditorLayout.cs +++ b/Unity/Assets/Editor/ComponentViewEditor/Entity/EditorLayout.cs @@ -5,7 +5,7 @@ using System.Linq; using UnityEditor; using UnityEngine; -namespace ETEditor +namespace ET { public static class Styles { diff --git a/Unity/Assets/Editor/ComponentViewEditor/Entity/SerializationTypeExtension.cs b/Unity/Assets/Editor/ComponentViewEditor/Entity/SerializationTypeExtension.cs index 550d7206e1186fdb3d6dff6a9549879b00115528..ca59846a7b19e870ee90aba236659b0594a98bd0 100644 --- a/Unity/Assets/Editor/ComponentViewEditor/Entity/SerializationTypeExtension.cs +++ b/Unity/Assets/Editor/ComponentViewEditor/Entity/SerializationTypeExtension.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Reflection; using System.Text.RegularExpressions; -namespace ETEditor +namespace ET { public static class SerializationTypeExtension { diff --git a/Unity/Assets/Editor/ComponentViewEditor/ITypeDrawer.cs b/Unity/Assets/Editor/ComponentViewEditor/ITypeDrawer.cs index 35a54dd65c2d891f3c35a0a6930ea4343e95af22..d8330f713464e4e111e92bd748ddc5f9d16590cd 100644 --- a/Unity/Assets/Editor/ComponentViewEditor/ITypeDrawer.cs +++ b/Unity/Assets/Editor/ComponentViewEditor/ITypeDrawer.cs @@ -1,6 +1,6 @@ using System; -namespace ETEditor +namespace ET { public interface ITypeDrawer { diff --git a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/AnimationCurveTypeDrawer.cs b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/AnimationCurveTypeDrawer.cs index a877d867e277e241613e6012cea33943320dd52c..699955e6656e8f46fc5984d2f870b83b3e3789d8 100644 --- a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/AnimationCurveTypeDrawer.cs +++ b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/AnimationCurveTypeDrawer.cs @@ -2,7 +2,7 @@ using System; using UnityEditor; using UnityEngine; -namespace ETEditor +namespace ET { [TypeDrawer] public class AnimationCurveTypeDrawer: ITypeDrawer diff --git a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/BoolTypeDrawer.cs b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/BoolTypeDrawer.cs index e5cb8d5528746d3688c42969c8cf1efa3498b41f..6576c247cf95433322918ea00f0fa99b099a3deb 100644 --- a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/BoolTypeDrawer.cs +++ b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/BoolTypeDrawer.cs @@ -1,7 +1,7 @@ using System; using UnityEditor; -namespace ETEditor +namespace ET { [TypeDrawer] public class BoolTypeDrawer: ITypeDrawer diff --git a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/BoundsTypeDrawer.cs b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/BoundsTypeDrawer.cs index f7919d550647d6e110b8fff777490b2113e64ffe..fd2bc2efc9a4e48ba8bb61fa22bdce6922aaef64 100644 --- a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/BoundsTypeDrawer.cs +++ b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/BoundsTypeDrawer.cs @@ -2,7 +2,7 @@ using System; using UnityEditor; using UnityEngine; -namespace ETEditor +namespace ET { [TypeDrawer] public class BoundsTypeDrawer: ITypeDrawer diff --git a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/CharTypeDrawer.cs b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/CharTypeDrawer.cs index 9c77535f1b4a35b6b144c98d0dc0413f871528e7..93c7948cee20503f37c65837a66d90267085888f 100644 --- a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/CharTypeDrawer.cs +++ b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/CharTypeDrawer.cs @@ -1,7 +1,7 @@ using System; using UnityEditor; -namespace ETEditor +namespace ET { [TypeDrawer] public class CharTypeDrawer: ITypeDrawer diff --git a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/ColorTypeDrawer.cs b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/ColorTypeDrawer.cs index c639db322d1bcea2dae7da12d8af6913498aa99b..b47ce5e964678f9dd84607521cd1ca144f66e5f0 100644 --- a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/ColorTypeDrawer.cs +++ b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/ColorTypeDrawer.cs @@ -2,7 +2,7 @@ using System; using UnityEditor; using UnityEngine; -namespace ETEditor +namespace ET { [TypeDrawer] public class ColorTypeDrawer: ITypeDrawer diff --git a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/DateTimeTypeDrawer.cs b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/DateTimeTypeDrawer.cs index 7c7120d55476d5b798757a2f2195d2e48da68c73..5be7cb3c30d9c8926debcf7445b1884cdf0696d1 100644 --- a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/DateTimeTypeDrawer.cs +++ b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/DateTimeTypeDrawer.cs @@ -1,7 +1,7 @@ using System; using UnityEditor; -namespace ETEditor +namespace ET { [TypeDrawer] public class DateTimeTypeDrawer: ITypeDrawer diff --git a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/DoubleTypeDrawer.cs b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/DoubleTypeDrawer.cs index 8e622991d9404cc6ffaa968f497a40ee621af6f2..ed62c6ca566980cf64a7337431caf7448684b6a3 100644 --- a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/DoubleTypeDrawer.cs +++ b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/DoubleTypeDrawer.cs @@ -1,7 +1,7 @@ using System; using UnityEditor; -namespace ETEditor +namespace ET { [TypeDrawer] public class DoubleTypeDrawer: ITypeDrawer diff --git a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/EnumTypeDrawer.cs b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/EnumTypeDrawer.cs index 93c91d21ac73a81cb112ec0816e12bf334863da1..1af9f866cd8569394530086477cd8db1a035b0a8 100644 --- a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/EnumTypeDrawer.cs +++ b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/EnumTypeDrawer.cs @@ -1,7 +1,7 @@ using System; using UnityEditor; -namespace ETEditor +namespace ET { [TypeDrawer] public class EnumTypeDrawer: ITypeDrawer diff --git a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/FloatTypeDrawer.cs b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/FloatTypeDrawer.cs index 523b3ca45190a961483d08e7f7395366ccbcec3f..0be82f7bc13fd8a90579cb901e5b4b4d192036e6 100644 --- a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/FloatTypeDrawer.cs +++ b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/FloatTypeDrawer.cs @@ -1,7 +1,7 @@ using System; using UnityEditor; -namespace ETEditor +namespace ET { [TypeDrawer] public class FloatTypeDrawer: ITypeDrawer diff --git a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/IntTypeDrawer.cs b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/IntTypeDrawer.cs index 41f1177a1c0f444c5ba1515b50d93509294d2177..05c7356965564ac9d38fb3a8a0f3e866c1249177 100644 --- a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/IntTypeDrawer.cs +++ b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/IntTypeDrawer.cs @@ -1,7 +1,7 @@ using System; using UnityEditor; -namespace ETEditor +namespace ET { [TypeDrawer] public class IntTypeDrawer: ITypeDrawer diff --git a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/LongTypeDrawer.cs b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/LongTypeDrawer.cs index aeffecb09e6c9c0f21119d372a4ad3701442c9a8..c6d588e6a3637537c38047590bcba0c26a099d63 100644 --- a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/LongTypeDrawer.cs +++ b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/LongTypeDrawer.cs @@ -1,7 +1,7 @@ using System; using UnityEditor; -namespace ETEditor +namespace ET { [TypeDrawer] public class LongTypeDrawer: ITypeDrawer diff --git a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/RectTypeDrawer.cs b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/RectTypeDrawer.cs index b01e63111bea046847e30619619a77b0d91edff2..5ade002a88715935a0386110786b5b709458cfbe 100644 --- a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/RectTypeDrawer.cs +++ b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/RectTypeDrawer.cs @@ -2,7 +2,7 @@ using System; using UnityEditor; using UnityEngine; -namespace ETEditor +namespace ET { [TypeDrawer] public class RectTypeDrawer: ITypeDrawer diff --git a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/StringTypeDrawer.cs b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/StringTypeDrawer.cs index bc223b8400ee9d7931a39f98bfb9e2e670c906c3..91b9b47f274699533b8ca35538c4f27ec50d7634 100644 --- a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/StringTypeDrawer.cs +++ b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/StringTypeDrawer.cs @@ -1,7 +1,7 @@ using System; using UnityEditor; -namespace ETEditor +namespace ET { [TypeDrawer] public class StringTypeDrawer: ITypeDrawer diff --git a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/UnityObjectTypeDrawer.cs b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/UnityObjectTypeDrawer.cs index 3628be982d7f93b83c11d9dedd4d0f27f110e161..105205a1f4906c7c76b52a75991d24adc0864b23 100644 --- a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/UnityObjectTypeDrawer.cs +++ b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/UnityObjectTypeDrawer.cs @@ -1,7 +1,7 @@ using System; using UnityEditor; -namespace ETEditor +namespace ET { [TypeDrawer] public class UnityObjectTypeDrawer: ITypeDrawer diff --git a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/Vector2TypeDrawer.cs b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/Vector2TypeDrawer.cs index 0a111878ff744cff2776cc87c7e63e341a07908b..d3641f42d43a4a7b40e2f2a63bac57a295c5937c 100644 --- a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/Vector2TypeDrawer.cs +++ b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/Vector2TypeDrawer.cs @@ -2,7 +2,7 @@ using System; using UnityEditor; using UnityEngine; -namespace ETEditor +namespace ET { [TypeDrawer] public class Vector2TypeDrawer: ITypeDrawer diff --git a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/Vector3TypeDrawer.cs b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/Vector3TypeDrawer.cs index 24d7416ccd7fafba152205236780351a6e3eb936..8609a72055adf70b4334f79b668572a7f044d053 100644 --- a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/Vector3TypeDrawer.cs +++ b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/Vector3TypeDrawer.cs @@ -2,7 +2,7 @@ using System; using UnityEditor; using UnityEngine; -namespace ETEditor +namespace ET { [TypeDrawer] public class Vector3TypeDrawer: ITypeDrawer diff --git a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/Vector4TypeDrawer.cs b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/Vector4TypeDrawer.cs index a6d9a8b182514743dfcb0d50be11733aee13f14c..c2ffa06c63d69fcb39139f6c534c8c30a2e2dbeb 100644 --- a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/Vector4TypeDrawer.cs +++ b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawer/Vector4TypeDrawer.cs @@ -2,7 +2,7 @@ using System; using UnityEditor; using UnityEngine; -namespace ETEditor +namespace ET { [TypeDrawer] public class Vector4TypeDrawer: ITypeDrawer diff --git a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawerAttribute.cs b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawerAttribute.cs index 5761ce215ac7ad6f79034dbe7fa459512958df0e..cbc274b4dc457813429467eeae873bf34c7e1310 100644 --- a/Unity/Assets/Editor/ComponentViewEditor/TypeDrawerAttribute.cs +++ b/Unity/Assets/Editor/ComponentViewEditor/TypeDrawerAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace ETEditor +namespace ET { public class TypeDrawerAttribute: Attribute { diff --git a/Unity/Assets/Editor/ExcelExporterEditor/ExcelExporterEditor.cs b/Unity/Assets/Editor/ExcelExporterEditor/ExcelExporterEditor.cs index 634cebba400d8ac104e36db797e728b56cc5f458..e91c7b7a0b8f6cad742da4931b1b470b006a722e 100644 --- a/Unity/Assets/Editor/ExcelExporterEditor/ExcelExporterEditor.cs +++ b/Unity/Assets/Editor/ExcelExporterEditor/ExcelExporterEditor.cs @@ -2,346 +2,355 @@ using System.Collections.Generic; using System.IO; using System.Text; -using ETModel; using MongoDB.Bson; using NPOI.SS.UserModel; using NPOI.XSSF.UserModel; using UnityEditor; using UnityEngine; -public struct CellInfo +namespace ET { - public string Type; - public string Name; - public string Desc; -} + public struct CellInfo + { + public string Type; + public string Name; + public string Desc; + } + + public class ExcelMD5Info + { + public Dictionary fileMD5 = new Dictionary(); + + public string Get(string fileName) + { + string md5 = ""; + this.fileMD5.TryGetValue(fileName, out md5); + return md5; + } -public class ExcelMD5Info -{ - public Dictionary fileMD5 = new Dictionary(); - - public string Get(string fileName) - { - string md5 = ""; - this.fileMD5.TryGetValue(fileName, out md5); - return md5; - } - - public void Add(string fileName, string md5) - { - this.fileMD5[fileName] = md5; - } -} - -public class ExcelExporterEditor : EditorWindow -{ - [MenuItem("Tools/导出配置")] - private static void ShowWindow() - { - GetWindow(typeof(ExcelExporterEditor)); - } - - private const string ExcelPath = "../Excel"; - private const string ServerConfigPath = "../Config/"; - - private bool isClient; - - private ExcelMD5Info md5Info; - - // Update is called once per frame - private void OnGUI() - { - try - { - const string clientPath = "./Assets/Bundles/Config"; - - if (GUILayout.Button("导出客户端配置")) - { - this.isClient = true; - - ExportAll(clientPath); - - ExportAllClass(@"./Assets/Model/Demo/Config", "namespace ETModel\n{\n"); - - Log.Info($"导出客户端配置完成!"); - } - - if (GUILayout.Button("导出服务端配置")) - { - this.isClient = false; - - ExportAll(ServerConfigPath); - - ExportAllClass(@"../Server/Model/Demo/Config", "namespace ETModel\n{\n"); - - Log.Info($"导出服务端配置完成!"); - } + public void Add(string fileName, string md5) + { + this.fileMD5[fileName] = md5; + } + } + + public class ExcelExporterEditor: EditorWindow + { + [MenuItem("Tools/导出配置")] + private static void ShowWindow() + { + GetWindow(typeof (ExcelExporterEditor)); + } + + private const string ExcelPath = "../Excel"; + private const string ServerConfigPath = "../Config/"; + + private bool isClient; + + private ExcelMD5Info md5Info; + + // Update is called once per frame + private void OnGUI() + { + try + { + const string clientPath = "./Assets/Bundles/Config"; + + if (GUILayout.Button("导出客户端配置")) + { + this.isClient = true; + + ExportAll(clientPath); + + ExportAllClass(@"./Assets/Model/Demo/Config", "namespace ET\n{\n"); + + Log.Info($"导出客户端配置完成!"); + } + + if (GUILayout.Button("导出服务端配置")) + { + this.isClient = false; + + ExportAll(ServerConfigPath); + + ExportAllClass(@"../Server/Model/Demo/Config", "namespace ET\n{\n"); + + Log.Info($"导出服务端配置完成!"); + } + } + catch (Exception e) + { + Log.Error(e); + } + } + + private void ExportAllClass(string exportDir, string csHead) + { + foreach (string filePath in Directory.GetFiles(ExcelPath)) + { + if (Path.GetExtension(filePath) != ".xlsx") + { + continue; + } + + if (Path.GetFileName(filePath).StartsWith("~")) + { + continue; + } + + ExportClass(filePath, exportDir, csHead); + Log.Info($"生成{Path.GetFileName(filePath)}类"); + } + + AssetDatabase.Refresh(); + } + + private void ExportClass(string fileName, string exportDir, string csHead) + { + XSSFWorkbook xssfWorkbook; + using (FileStream file = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) + { + xssfWorkbook = new XSSFWorkbook(file); + } + + string protoName = Path.GetFileNameWithoutExtension(fileName); + + string exportPath = Path.Combine(exportDir, $"{protoName}.cs"); + using (FileStream txt = new FileStream(exportPath, FileMode.Create)) + using (StreamWriter sw = new StreamWriter(txt)) + { + StringBuilder sb = new StringBuilder(); + ISheet sheet = xssfWorkbook.GetSheetAt(0); + sb.Append(csHead); + + sb.Append($"\t[Config]\n"); + sb.Append($"\tpublic partial class {protoName}Category : ACategory<{protoName}>\n"); + sb.Append("\t{\n"); + sb.Append($"\t\tpublic static {protoName}Category Instance;\n"); + sb.Append($"\t\tpublic {protoName}Category()\n"); + sb.Append("\t\t{\n"); + sb.Append($"\t\t\tInstance = this;\n"); + sb.Append("\t\t}\n"); + sb.Append("\t}\n\n"); + + sb.Append($"\tpublic partial class {protoName}: IConfig\n"); + sb.Append("\t{\n"); + sb.Append("\t\tpublic long Id { get; set; }\n"); + + int cellCount = sheet.GetRow(3).LastCellNum; + + for (int i = 2; i < cellCount; i++) + { + string fieldDesc = GetCellString(sheet, 2, i); + + if (fieldDesc.StartsWith("#")) + { + continue; + } + + // s开头表示这个字段是服务端专用 + if (fieldDesc.StartsWith("s") && this.isClient) + { + continue; + } + + string fieldName = GetCellString(sheet, 3, i); + + if (fieldName == "Id" || fieldName == "_id") + { + continue; + } + + string fieldType = GetCellString(sheet, 4, i); + if (fieldType == "" || fieldName == "") + { + continue; + } + + sb.Append($"\t\tpublic {fieldType} {fieldName};\n"); + } + + sb.Append("\t}\n"); + sb.Append("}\n"); + + sw.Write(sb.ToString()); + } + } + + private void ExportAll(string exportDir) + { + string md5File = Path.Combine(ExcelPath, "md5.txt"); + if (!File.Exists(md5File)) + { + this.md5Info = new ExcelMD5Info(); + } + else + { + this.md5Info = MongoHelper.FromJson(File.ReadAllText(md5File)); + } + + foreach (string filePath in Directory.GetFiles(ExcelPath)) + { + if (Path.GetExtension(filePath) != ".xlsx") + { + continue; + } + + if (Path.GetFileName(filePath).StartsWith("~")) + { + continue; + } + + string fileName = Path.GetFileName(filePath); + string oldMD5 = this.md5Info.Get(fileName); + string md5 = MD5Helper.FileMD5(filePath); + this.md5Info.Add(fileName, md5); + // if (md5 == oldMD5) + // { + // continue; + // } + + Export(filePath, exportDir); + } + + File.WriteAllText(md5File, this.md5Info.ToJson()); + + Log.Info("所有表导表完成"); + AssetDatabase.Refresh(); + } + + private void Export(string fileName, string exportDir) + { + XSSFWorkbook xssfWorkbook; + using (FileStream file = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) + { + xssfWorkbook = new XSSFWorkbook(file); + } + + string protoName = Path.GetFileNameWithoutExtension(fileName); + Log.Info($"{protoName}导表开始"); + string exportPath = Path.Combine(exportDir, $"{protoName}.txt"); + using (FileStream txt = new FileStream(exportPath, FileMode.Create)) + using (StreamWriter sw = new StreamWriter(txt)) + { + for (int i = 0; i < xssfWorkbook.NumberOfSheets; ++i) + { + ISheet sheet = xssfWorkbook.GetSheetAt(i); + ExportSheet(sheet, sw); + } + } + + Log.Info($"{protoName}导表完成"); + } + + private void ExportSheet(ISheet sheet, StreamWriter sw) + { + int cellCount = sheet.GetRow(3).LastCellNum; + + CellInfo[] cellInfos = new CellInfo[cellCount]; + + for (int i = 2; i < cellCount; i++) + { + string fieldDesc = GetCellString(sheet, 2, i); + string fieldName = GetCellString(sheet, 3, i); + string fieldType = GetCellString(sheet, 4, i); + cellInfos[i] = new CellInfo() { Name = fieldName, Type = fieldType, Desc = fieldDesc }; + } + + for (int i = 5; i <= sheet.LastRowNum; ++i) + { + if (GetCellString(sheet, i, 2) == "") + { + continue; + } + + StringBuilder sb = new StringBuilder(); + sb.Append("{"); + IRow row = sheet.GetRow(i); + for (int j = 2; j < cellCount; ++j) + { + string desc = cellInfos[j].Desc.ToLower(); + if (desc.StartsWith("#")) + { + continue; + } + + // s开头表示这个字段是服务端专用 + if (desc.StartsWith("s") && this.isClient) + { + continue; + } + + // c开头表示这个字段是客户端专用 + if (desc.StartsWith("c") && !this.isClient) + { + continue; + } + + string fieldValue = GetCellString(row, j); + if (fieldValue == "") + { + continue; + } + + if (j > 2) + { + sb.Append(","); + } + + string fieldName = cellInfos[j].Name; + + if (fieldName == "Id" || fieldName == "_id") + { + fieldName = "_id"; + } + + string fieldType = cellInfos[j].Type; + sb.Append($"\"{fieldName}\":{Convert(fieldType, fieldValue)}"); + } + + sb.Append("}"); + sw.WriteLine(sb.ToString()); + } + } + + private static string Convert(string type, string value) + { + switch (type) + { + case "int[]": + case "int32[]": + case "long[]": + return $"[{value}]"; + case "string[]": + return $"[{value}]"; + case "int": + case "int32": + case "int64": + case "long": + case "float": + case "double": + return value; + case "string": + return $"\"{value}\""; + default: + throw new Exception($"不支持此类型: {type}"); + } + } + + private static string GetCellString(ISheet sheet, int i, int j) + { + return sheet.GetRow(i)?.GetCell(j)?.ToString() ?? ""; + } + + private static string GetCellString(IRow row, int i) + { + return row?.GetCell(i)?.ToString() ?? ""; + } + + private static string GetCellString(ICell cell) + { + return cell?.ToString() ?? ""; } - catch (Exception e) - { - Log.Error(e); - } - } - - private void ExportAllClass(string exportDir, string csHead) - { - foreach (string filePath in Directory.GetFiles(ExcelPath)) - { - if (Path.GetExtension(filePath) != ".xlsx") - { - continue; - } - if (Path.GetFileName(filePath).StartsWith("~")) - { - continue; - } - - ExportClass(filePath, exportDir, csHead); - Log.Info($"生成{Path.GetFileName(filePath)}类"); - } - AssetDatabase.Refresh(); - } - - private void ExportClass(string fileName, string exportDir, string csHead) - { - XSSFWorkbook xssfWorkbook; - using (FileStream file = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) - { - xssfWorkbook = new XSSFWorkbook(file); - } - - string protoName = Path.GetFileNameWithoutExtension(fileName); - - string exportPath = Path.Combine(exportDir, $"{protoName}.cs"); - using (FileStream txt = new FileStream(exportPath, FileMode.Create)) - using (StreamWriter sw = new StreamWriter(txt)) - { - StringBuilder sb = new StringBuilder(); - ISheet sheet = xssfWorkbook.GetSheetAt(0); - sb.Append(csHead); - - sb.Append($"\t[Config]\n"); - sb.Append($"\tpublic partial class {protoName}Category : ACategory<{protoName}>\n"); - sb.Append("\t{\n"); - sb.Append($"\t\tpublic static {protoName}Category Instance;\n"); - sb.Append($"\t\tpublic {protoName}Category()\n"); - sb.Append("\t\t{\n"); - sb.Append($"\t\t\tInstance = this;\n"); - sb.Append("\t\t}\n"); - sb.Append("\t}\n\n"); - - sb.Append($"\tpublic partial class {protoName}: IConfig\n"); - sb.Append("\t{\n"); - sb.Append("\t\tpublic long Id { get; set; }\n"); - - int cellCount = sheet.GetRow(3).LastCellNum; - - for (int i = 2; i < cellCount; i++) - { - string fieldDesc = GetCellString(sheet, 2, i); - - if (fieldDesc.StartsWith("#")) - { - continue; - } - - // s开头表示这个字段是服务端专用 - if (fieldDesc.StartsWith("s") && this.isClient) - { - continue; - } - - string fieldName = GetCellString(sheet, 3, i); - - if (fieldName == "Id" || fieldName == "_id") - { - continue; - } - - string fieldType = GetCellString(sheet, 4, i); - if (fieldType == "" || fieldName == "") - { - continue; - } - - sb.Append($"\t\tpublic {fieldType} {fieldName};\n"); - } - - sb.Append("\t}\n"); - sb.Append("}\n"); - - sw.Write(sb.ToString()); - } - } - - - private void ExportAll(string exportDir) - { - string md5File = Path.Combine(ExcelPath, "md5.txt"); - if (!File.Exists(md5File)) - { - this.md5Info = new ExcelMD5Info(); - } - else - { - this.md5Info = MongoHelper.FromJson(File.ReadAllText(md5File)); - } - - foreach (string filePath in Directory.GetFiles(ExcelPath)) - { - if (Path.GetExtension(filePath) != ".xlsx") - { - continue; - } - if (Path.GetFileName(filePath).StartsWith("~")) - { - continue; - } - string fileName = Path.GetFileName(filePath); - string oldMD5 = this.md5Info.Get(fileName); - string md5 = MD5Helper.FileMD5(filePath); - this.md5Info.Add(fileName, md5); - // if (md5 == oldMD5) - // { - // continue; - // } - - Export(filePath, exportDir); - } - - File.WriteAllText(md5File, this.md5Info.ToJson()); - - Log.Info("所有表导表完成"); - AssetDatabase.Refresh(); - } - - private void Export(string fileName, string exportDir) - { - XSSFWorkbook xssfWorkbook; - using (FileStream file = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) - { - xssfWorkbook = new XSSFWorkbook(file); - } - string protoName = Path.GetFileNameWithoutExtension(fileName); - Log.Info($"{protoName}导表开始"); - string exportPath = Path.Combine(exportDir, $"{protoName}.txt"); - using (FileStream txt = new FileStream(exportPath, FileMode.Create)) - using (StreamWriter sw = new StreamWriter(txt)) - { - for (int i = 0; i < xssfWorkbook.NumberOfSheets; ++i) - { - ISheet sheet = xssfWorkbook.GetSheetAt(i); - ExportSheet(sheet, sw); - } - } - Log.Info($"{protoName}导表完成"); - } - - private void ExportSheet(ISheet sheet, StreamWriter sw) - { - int cellCount = sheet.GetRow(3).LastCellNum; - - CellInfo[] cellInfos = new CellInfo[cellCount]; - - for (int i = 2; i < cellCount; i++) - { - string fieldDesc = GetCellString(sheet, 2, i); - string fieldName = GetCellString(sheet, 3, i); - string fieldType = GetCellString(sheet, 4, i); - cellInfos[i] = new CellInfo() { Name = fieldName, Type = fieldType, Desc = fieldDesc }; - } - - for (int i = 5; i <= sheet.LastRowNum; ++i) - { - if (GetCellString(sheet, i, 2) == "") - { - continue; - } - StringBuilder sb = new StringBuilder(); - sb.Append("{"); - IRow row = sheet.GetRow(i); - for (int j = 2; j < cellCount; ++j) - { - string desc = cellInfos[j].Desc.ToLower(); - if (desc.StartsWith("#")) - { - continue; - } - - // s开头表示这个字段是服务端专用 - if (desc.StartsWith("s") && this.isClient) - { - continue; - } - - // c开头表示这个字段是客户端专用 - if (desc.StartsWith("c") && !this.isClient) - { - continue; - } - - string fieldValue = GetCellString(row, j); - if (fieldValue == "") - { - continue; - } - - if (j > 2) - { - sb.Append(","); - } - - string fieldName = cellInfos[j].Name; - - if (fieldName == "Id" || fieldName == "_id") - { - fieldName = "_id"; - } - - string fieldType = cellInfos[j].Type; - sb.Append($"\"{fieldName}\":{Convert(fieldType, fieldValue)}"); - } - sb.Append("}"); - sw.WriteLine(sb.ToString()); - } - } - - private static string Convert(string type, string value) - { - switch (type) - { - case "int[]": - case "int32[]": - case "long[]": - return $"[{value}]"; - case "string[]": - return $"[{value}]"; - case "int": - case "int32": - case "int64": - case "long": - case "float": - case "double": - return value; - case "string": - return $"\"{value}\""; - default: - throw new Exception($"不支持此类型: {type}"); - } - } - - private static string GetCellString(ISheet sheet, int i, int j) - { - return sheet.GetRow(i)?.GetCell(j)?.ToString() ?? ""; - } - - private static string GetCellString(IRow row, int i) - { - return row?.GetCell(i)?.ToString() ?? ""; - } - - private static string GetCellString(ICell cell) - { - return cell?.ToString() ?? ""; - } -} + } +} \ No newline at end of file diff --git a/Unity/Assets/Editor/GlobalConfigEditor/GlobalConfigEditor.cs b/Unity/Assets/Editor/GlobalConfigEditor/GlobalConfigEditor.cs index 2ee4e05d0b8242deddf5389d8e2eaf6e35741399..8442731b71f381c73a1c896d94d3db96df175a23 100644 --- a/Unity/Assets/Editor/GlobalConfigEditor/GlobalConfigEditor.cs +++ b/Unity/Assets/Editor/GlobalConfigEditor/GlobalConfigEditor.cs @@ -1,9 +1,9 @@ using System.IO; -using ETModel; + using UnityEditor; using UnityEngine; -namespace ETEditor +namespace ET { public class GlobalProtoEditor: EditorWindow { diff --git a/Unity/Assets/Editor/Helper/EditorResHelper.cs b/Unity/Assets/Editor/Helper/EditorResHelper.cs index 2e8573b92af0cb3a90aae5fd9cecc207c2cb4fa8..0d00fc34a55333f7615a0b65f7ad70d9e9d472d3 100644 --- a/Unity/Assets/Editor/Helper/EditorResHelper.cs +++ b/Unity/Assets/Editor/Helper/EditorResHelper.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.IO; -namespace ETModel +namespace ET { public class EditorResHelper { diff --git a/Unity/Assets/Editor/ILRuntimeEditor/ILRuntimeCLRBinding.cs b/Unity/Assets/Editor/ILRuntimeEditor/ILRuntimeCLRBinding.cs index 56302468b3f78989e42d0378f13730053e4b9e6f..c36e308ea8043bde12a2849caa6c5d25e7f2e7ac 100644 --- a/Unity/Assets/Editor/ILRuntimeEditor/ILRuntimeCLRBinding.cs +++ b/Unity/Assets/Editor/ILRuntimeEditor/ILRuntimeCLRBinding.cs @@ -4,7 +4,7 @@ using UnityEngine; using System; using System.Collections.Generic; using System.IO; -using ETModel; + public static class ILRuntimeCLRBinding { diff --git a/Unity/Assets/Editor/Proto2CsEditor/InnerProto2CS.cs b/Unity/Assets/Editor/Proto2CsEditor/InnerProto2CS.cs index 512e8a117fe9c04aa9bdc34b728ccaa81a01ba28..09032c7ae185a70e764a39bd67a38c545325c78f 100644 --- a/Unity/Assets/Editor/Proto2CsEditor/InnerProto2CS.cs +++ b/Unity/Assets/Editor/Proto2CsEditor/InnerProto2CS.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.IO; using System.Text; -using ETModel; + using UnityEditor; -namespace ETEditor +namespace ET { [Flags] public enum HeadFlag @@ -41,7 +41,7 @@ namespace ETEditor string s = File.ReadAllText(proto); StringBuilder sb = new StringBuilder(); - sb.Append("using ETModel;\n"); + sb.Append("\n"); sb.Append("using System.Collections.Generic;\n"); sb.Append($"namespace {ns}\n"); sb.Append("{\n"); diff --git a/Unity/Assets/Editor/Proto2CsEditor/Proto2CSEditor.cs b/Unity/Assets/Editor/Proto2CsEditor/Proto2CSEditor.cs index fccd6bf6416937cd5f7635f6d1a00b3696e893c2..6fd9b7c045dacd7af1ea24cb06d6a11cddb3e9c2 100644 --- a/Unity/Assets/Editor/Proto2CsEditor/Proto2CSEditor.cs +++ b/Unity/Assets/Editor/Proto2CsEditor/Proto2CSEditor.cs @@ -1,8 +1,8 @@ using System.Diagnostics; -using ETModel; + using UnityEditor; -namespace ETEditor +namespace ET { internal class OpcodeInfo { diff --git a/Unity/Assets/Editor/RsyncEditor/RsyncConfig.cs b/Unity/Assets/Editor/RsyncEditor/RsyncConfig.cs index 282c72f29209f9f2380ba404f4a23a459354cdd3..eb6409b82bd49b7355ac6711eff5cea4153170b7 100644 --- a/Unity/Assets/Editor/RsyncEditor/RsyncConfig.cs +++ b/Unity/Assets/Editor/RsyncEditor/RsyncConfig.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace ETEditor +namespace ET { public class RsyncConfig { diff --git a/Unity/Assets/Editor/RsyncEditor/RsyncEditor.cs b/Unity/Assets/Editor/RsyncEditor/RsyncEditor.cs index 19f5a084411eb5cdf65c76a5d44345f7250f0a9e..9a36f1d4b1d38d5807b481ceffabf8bd2321bf57 100644 --- a/Unity/Assets/Editor/RsyncEditor/RsyncEditor.cs +++ b/Unity/Assets/Editor/RsyncEditor/RsyncEditor.cs @@ -1,10 +1,10 @@ using System.Diagnostics; using System.IO; -using ETModel; + using UnityEditor; using UnityEngine; -namespace ETEditor +namespace ET { public class RsyncEditor: EditorWindow { diff --git a/Unity/Assets/Editor/ServerCommandLineEditor/ServerCommandLineEditor.cs b/Unity/Assets/Editor/ServerCommandLineEditor/ServerCommandLineEditor.cs index 43f83ba344a43a925ce9d487d12412dcdb7c1e9d..2bc184aab871aa129b733c37acdbd9d06e29b747 100644 --- a/Unity/Assets/Editor/ServerCommandLineEditor/ServerCommandLineEditor.cs +++ b/Unity/Assets/Editor/ServerCommandLineEditor/ServerCommandLineEditor.cs @@ -6,7 +6,7 @@ using System.Reflection; using UnityEditor; using UnityEngine; -namespace ETModel +namespace ET { public class ServerCommandLineEditor: EditorWindow { diff --git a/Unity/Assets/Editor/ServerManagerEditor/ServerManagerEditor.cs b/Unity/Assets/Editor/ServerManagerEditor/ServerManagerEditor.cs index 774c2c0ee7379d67c6468486fca44a9ebc211fdc..8c64a834841ec88e1bcb3ebb1213cc23a4098ff2 100644 --- a/Unity/Assets/Editor/ServerManagerEditor/ServerManagerEditor.cs +++ b/Unity/Assets/Editor/ServerManagerEditor/ServerManagerEditor.cs @@ -3,12 +3,12 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; -using ETModel; + using MongoDB.Bson; using UnityEditor; using UnityEngine; -namespace ETEditor +namespace ET { public class ServerManagerEditor: EditorWindow { diff --git a/Unity/Assets/Hotfix/Module/Config/ConfigComponentSystem.cs b/Unity/Assets/Hotfix/Module/Config/ConfigComponentSystem.cs index e06e47ed6d71755394ea41ad8c057e955dcd0edd..415581606bbd7b07340159ffd23d7658a2edcc71 100644 --- a/Unity/Assets/Hotfix/Module/Config/ConfigComponentSystem.cs +++ b/Unity/Assets/Hotfix/Module/Config/ConfigComponentSystem.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using ETModel; -namespace ETHotfix + +namespace ET { [ObjectSystem] public class ConfigAwakeSystem : AwakeSystem diff --git a/Unity/Assets/Hotfix/Module/Message/NetOuterComponentSystem.cs b/Unity/Assets/Hotfix/Module/Message/NetOuterComponentSystem.cs index c0c794eaaba98f9925323d0e728a09c178475d3b..4897817c3444381586600220d9bbfc7b502b0b6d 100644 --- a/Unity/Assets/Hotfix/Module/Message/NetOuterComponentSystem.cs +++ b/Unity/Assets/Hotfix/Module/Message/NetOuterComponentSystem.cs @@ -1,6 +1,6 @@ -using ETModel; + -namespace ETHotfix +namespace ET { [ObjectSystem] public class NetOuterComponentAwakeSystem : AwakeSystem diff --git a/Unity/Assets/Model/Component.meta b/Unity/Assets/Hotfix/Module/Numeric.meta similarity index 57% rename from Unity/Assets/Model/Component.meta rename to Unity/Assets/Hotfix/Module/Numeric.meta index 5876c4c5994a6293f0ee30bf2e56747fa32bfeae..f15032e21d6df290b55d03636707fa3ef152860f 100644 --- a/Unity/Assets/Model/Component.meta +++ b/Unity/Assets/Hotfix/Module/Numeric.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: 2a558a9c1a99ead44867c6b71472566f +guid: 7f854d0ccf08646409a5d22d20bb0aa4 folderAsset: yes -timeCreated: 1498117616 -licenseType: Free DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Unity/Assets/Model/Module/Numeric/NumericChangeEvent_NotifyWatcher.cs b/Unity/Assets/Hotfix/Module/Numeric/NumericChangeEvent_NotifyWatcher.cs similarity index 93% rename from Unity/Assets/Model/Module/Numeric/NumericChangeEvent_NotifyWatcher.cs rename to Unity/Assets/Hotfix/Module/Numeric/NumericChangeEvent_NotifyWatcher.cs index c16aa03318e6770b9adbf2f8666e6dbcbafd9b52..b5dba009ab4ab80a68784d5af925805835ba4a9b 100644 --- a/Unity/Assets/Model/Module/Numeric/NumericChangeEvent_NotifyWatcher.cs +++ b/Unity/Assets/Hotfix/Module/Numeric/NumericChangeEvent_NotifyWatcher.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { // 分发数值监听 [Event(EventIdType.NumbericChange)] diff --git a/Unity/Assets/Model/Other/MonoStaticMethod.cs.meta b/Unity/Assets/Hotfix/Module/Numeric/NumericChangeEvent_NotifyWatcher.cs.meta similarity index 83% rename from Unity/Assets/Model/Other/MonoStaticMethod.cs.meta rename to Unity/Assets/Hotfix/Module/Numeric/NumericChangeEvent_NotifyWatcher.cs.meta index d65a5d8073220a15cdd5f3d80e23dfaf190efc14..78424de9c5ca891ec80f7a3f66176440fec08d6a 100644 --- a/Unity/Assets/Model/Other/MonoStaticMethod.cs.meta +++ b/Unity/Assets/Hotfix/Module/Numeric/NumericChangeEvent_NotifyWatcher.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1064d17366423964a8a543f681799a1e +guid: fd5baa7eaf9c81c42b95e54b0f749e0c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Unity/Assets/Model/Module/Numeric/NumericWatcher_Hp_ShowUI.cs b/Unity/Assets/Hotfix/Module/Numeric/NumericWatcher_Hp_ShowUI.cs similarity index 91% rename from Unity/Assets/Model/Module/Numeric/NumericWatcher_Hp_ShowUI.cs rename to Unity/Assets/Hotfix/Module/Numeric/NumericWatcher_Hp_ShowUI.cs index d024d213c86523cd36bf56fd422ec5277600d680..5a18ce3cf9c914073d7ab00708dd27d86c807b72 100644 --- a/Unity/Assets/Model/Module/Numeric/NumericWatcher_Hp_ShowUI.cs +++ b/Unity/Assets/Hotfix/Module/Numeric/NumericWatcher_Hp_ShowUI.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { /// /// 监视hp数值变化，改变血条值 diff --git a/Unity/Assets/Model/Other/IInstanceMethod.cs.meta b/Unity/Assets/Hotfix/Module/Numeric/NumericWatcher_Hp_ShowUI.cs.meta similarity index 69% rename from Unity/Assets/Model/Other/IInstanceMethod.cs.meta rename to Unity/Assets/Hotfix/Module/Numeric/NumericWatcher_Hp_ShowUI.cs.meta index d8efe20fc95b9425b202086571568367a7c03143..3ad2bccbb448fbf044383e5fedfaecb57cf4d8f9 100644 --- a/Unity/Assets/Model/Other/IInstanceMethod.cs.meta +++ b/Unity/Assets/Hotfix/Module/Numeric/NumericWatcher_Hp_ShowUI.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: e570313644ef84848b2868e1a993b6d3 -timeCreated: 1495178496 -licenseType: Pro +guid: 7c069aeec6c0509478d77244b57d8b8f MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Unity/Assets/Model/Base/Async/AsyncETTaskMethodBuilder.cs b/Unity/Assets/Model/Base/Async/AsyncETTaskMethodBuilder.cs index 44059c6176ac5f784fc74da090f358c286c19bc0..8ba6f3af1691c3b09260fc56ed1e75dbffb10c39 100644 --- a/Unity/Assets/Model/Base/Async/AsyncETTaskMethodBuilder.cs +++ b/Unity/Assets/Model/Base/Async/AsyncETTaskMethodBuilder.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.Runtime.CompilerServices; using System.Security; -namespace ETModel +namespace ET { public struct AsyncETTaskMethodBuilder { diff --git a/Unity/Assets/Model/Base/Async/AsyncETVoidMethodBuilder.cs b/Unity/Assets/Model/Base/Async/AsyncETVoidMethodBuilder.cs index 3f0169903632a2cbd8fb1c5b8aeb1123166dd91b..26216ca010ec68403f088e7db7ce84c1342429d5 100644 --- a/Unity/Assets/Model/Base/Async/AsyncETVoidMethodBuilder.cs +++ b/Unity/Assets/Model/Base/Async/AsyncETVoidMethodBuilder.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.Runtime.CompilerServices; using System.Security; -namespace ETModel +namespace ET { public struct AsyncETVoidMethodBuilder { diff --git a/Unity/Assets/Model/Base/Async/ETCancellationToken.cs b/Unity/Assets/Model/Base/Async/ETCancellationToken.cs index 425eac5125ea1b8c04a4489b28854fe9969dd2cb..83b7ffed56ddaa0cf6b021fc7c91f352171c9bb1 100644 --- a/Unity/Assets/Model/Base/Async/ETCancellationToken.cs +++ b/Unity/Assets/Model/Base/Async/ETCancellationToken.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace ETModel +namespace ET { [ObjectSystem] public class ETCancellationTokenDestroySystem: DestroySystem diff --git a/Unity/Assets/Model/Base/Async/ETCancellationTokenSource.cs b/Unity/Assets/Model/Base/Async/ETCancellationTokenSource.cs index 05bd72d2a46b54bc6368808c9a2a458d899f9971..11c4e10d22afddf41da5144e433ca052e735cdd3 100644 --- a/Unity/Assets/Model/Base/Async/ETCancellationTokenSource.cs +++ b/Unity/Assets/Model/Base/Async/ETCancellationTokenSource.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace ETModel +namespace ET { [ObjectSystem] public class ETCancellationTokenSourceAwakeSystem: AwakeSystem diff --git a/Unity/Assets/Model/Base/Async/ETTask.cs b/Unity/Assets/Model/Base/Async/ETTask.cs index 57f5c8d03c8d6fb333ffc107bd1fec2996c6d59d..77bd2f4c748dd362aeeb126c763a9f8f40e6c77b 100644 --- a/Unity/Assets/Model/Base/Async/ETTask.cs +++ b/Unity/Assets/Model/Base/Async/ETTask.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Runtime.CompilerServices; -namespace ETModel +namespace ET { /// /// Lightweight unity specified task-like object. diff --git a/Unity/Assets/Model/Base/Async/ETTaskCompletionSource.cs b/Unity/Assets/Model/Base/Async/ETTaskCompletionSource.cs index 85aadad1d128751c4dddc043e9d3df6c89e1954d..d8f15aade80d0fdd6fa260d4c82bab9b06357ea4 100644 --- a/Unity/Assets/Model/Base/Async/ETTaskCompletionSource.cs +++ b/Unity/Assets/Model/Base/Async/ETTaskCompletionSource.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.ExceptionServices; -namespace ETModel +namespace ET { public class ETTaskCompletionSource: IAwaiter { diff --git a/Unity/Assets/Model/Base/Async/ETTaskFactory.cs b/Unity/Assets/Model/Base/Async/ETTaskFactory.cs index 575a20ace9de83a848b0fcc2a848f7be50e2728f..327bc326bab94069cde0f8863beeb9788d385e2c 100644 --- a/Unity/Assets/Model/Base/Async/ETTaskFactory.cs +++ b/Unity/Assets/Model/Base/Async/ETTaskFactory.cs @@ -1,7 +1,7 @@ using System; using System.Threading; -namespace ETModel +namespace ET { public partial struct ETTask { diff --git a/Unity/Assets/Model/Base/Async/ETVoid.cs b/Unity/Assets/Model/Base/Async/ETVoid.cs index d9546fbdc0003790cab00a1eebb1242e51c1798f..a82744908e0eac186773d89325b32ca21d08f5f3 100644 --- a/Unity/Assets/Model/Base/Async/ETVoid.cs +++ b/Unity/Assets/Model/Base/Async/ETVoid.cs @@ -2,7 +2,7 @@ using System.Diagnostics; using System.Runtime.CompilerServices; -namespace ETModel +namespace ET { [AsyncMethodBuilder(typeof(AsyncETVoidMethodBuilder))] public struct ETVoid diff --git a/Unity/Assets/Model/Base/Async/IAwaiter.cs b/Unity/Assets/Model/Base/Async/IAwaiter.cs index 176848522eeac1638e348953899525f558b9bbbe..7f9025082d91119a2977f9a47ea328a0b689ffb9 100644 --- a/Unity/Assets/Model/Base/Async/IAwaiter.cs +++ b/Unity/Assets/Model/Base/Async/IAwaiter.cs @@ -1,6 +1,6 @@ using System.Runtime.CompilerServices; -namespace ETModel +namespace ET { public enum AwaiterStatus { diff --git a/Unity/Assets/Model/Base/Async/MoveNextRunner.cs b/Unity/Assets/Model/Base/Async/MoveNextRunner.cs index 5872f6f870450065f2680b0cc601f9ad31fbb355..c2f7c20e4b5247f511b49b35293e2c09f1b75243 100644 --- a/Unity/Assets/Model/Base/Async/MoveNextRunner.cs +++ b/Unity/Assets/Model/Base/Async/MoveNextRunner.cs @@ -1,6 +1,6 @@ using System.Runtime.CompilerServices; -namespace ETModel +namespace ET { internal class MoveNextRunner where TStateMachine : IAsyncStateMachine { diff --git a/Unity/Assets/Model/Base/DoubleMap.cs b/Unity/Assets/Model/Base/DoubleMap.cs index 3764cc028e562b96529de0bd320e3c62d00d4021..6e10998dbaa64ae0c0e0f370f987372ee82e1f04 100644 --- a/Unity/Assets/Model/Base/DoubleMap.cs +++ b/Unity/Assets/Model/Base/DoubleMap.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace ETModel +namespace ET { public class DoubleMap { diff --git a/Unity/Assets/Model/Base/Event/Env.cs b/Unity/Assets/Model/Base/Event/Env.cs index e9dd892b070678acfedb2e7ec8c27fbee92a32ca..3eb269c8a2c3b9d5c2b86d0aac51f40d265cc098 100644 --- a/Unity/Assets/Model/Base/Event/Env.cs +++ b/Unity/Assets/Model/Base/Event/Env.cs @@ -3,7 +3,7 @@ using System.Collections; using System.Collections.Generic; using MongoDB.Bson.Serialization.Attributes; -namespace ETModel +namespace ET { public class Env { diff --git a/Unity/Assets/Model/Base/Event/EnvKey.cs b/Unity/Assets/Model/Base/Event/EnvKey.cs index faa9c66be63cb899eb493bc6727f10d86201081f..5552738c9dddb87a4906ef8d3a066d8363cd0635 100644 --- a/Unity/Assets/Model/Base/Event/EnvKey.cs +++ b/Unity/Assets/Model/Base/Event/EnvKey.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { /// /// 一般使用事件名+变量名 diff --git a/Unity/Assets/Model/Base/Event/EventAttribute.cs b/Unity/Assets/Model/Base/Event/EventAttribute.cs index d2413821ed63e9c3c5b53a642ced3deeafc37d72..260167ed0b80ea1b1f66e79b8ff3c9f001dede78 100644 --- a/Unity/Assets/Model/Base/Event/EventAttribute.cs +++ b/Unity/Assets/Model/Base/Event/EventAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] public class EventAttribute: BaseAttribute diff --git a/Unity/Assets/Model/Base/Event/EventIdType.cs b/Unity/Assets/Model/Base/Event/EventIdType.cs index a1d94f7983a7b65f316c6732499f5ca633c4c36d..c45ecd07f4b14d2ede2fb4f904dbf1d401023f2d 100644 --- a/Unity/Assets/Model/Base/Event/EventIdType.cs +++ b/Unity/Assets/Model/Base/Event/EventIdType.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public static class EventIdType { diff --git a/Unity/Assets/Model/Base/Event/IEvent.cs b/Unity/Assets/Model/Base/Event/IEvent.cs index fd7408904dc96b7153007767c58a3cecf24ef9d5..169f36795a00e3deff899eb6f66a0c1086553ca3 100644 --- a/Unity/Assets/Model/Base/Event/IEvent.cs +++ b/Unity/Assets/Model/Base/Event/IEvent.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public interface IEvent { diff --git a/Unity/Assets/Model/Base/Helper/ByteHelper.cs b/Unity/Assets/Model/Base/Helper/ByteHelper.cs index c6f41554c41286ce78bec4db356b675edfbd6020..90c66cb551dfda454f3c49da8556d38efa0a7181 100644 --- a/Unity/Assets/Model/Base/Helper/ByteHelper.cs +++ b/Unity/Assets/Model/Base/Helper/ByteHelper.cs @@ -1,6 +1,6 @@ using System.Text; -namespace ETModel +namespace ET { public static class ByteHelper { diff --git a/Unity/Assets/Model/Base/Helper/Dumper.cs b/Unity/Assets/Model/Base/Helper/Dumper.cs index 076a8627b6e53dc0287aa984995f79b35b8827a3..976af1f4e7cc03fb2cc08e28f2b4958daee681a9 100644 --- a/Unity/Assets/Model/Base/Helper/Dumper.cs +++ b/Unity/Assets/Model/Base/Helper/Dumper.cs @@ -5,7 +5,7 @@ using System.Text; using Google.Protobuf; using UnityEngine; -namespace ETModel +namespace ET { public static class Dumper { diff --git a/Unity/Assets/Model/Base/Helper/EnumHelper.cs b/Unity/Assets/Model/Base/Helper/EnumHelper.cs index 074d6075eb75841eca34ab1dc9130e090f5d82fd..b31b56af4d86002db4850c6269569fe7e798a0a4 100644 --- a/Unity/Assets/Model/Base/Helper/EnumHelper.cs +++ b/Unity/Assets/Model/Base/Helper/EnumHelper.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public static class EnumHelper { diff --git a/Unity/Assets/Model/Base/Helper/FileHelper.cs b/Unity/Assets/Model/Base/Helper/FileHelper.cs index 50f13e0e0e9c873287a6ce8d8d49192d0bd94f54..09eb97e4293871a10d2aef2d46571720427cd46e 100644 --- a/Unity/Assets/Model/Base/Helper/FileHelper.cs +++ b/Unity/Assets/Model/Base/Helper/FileHelper.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; -namespace ETModel +namespace ET { public static class FileHelper { diff --git a/Unity/Assets/Model/Base/Helper/IdGenerater.cs b/Unity/Assets/Model/Base/Helper/IdGenerater.cs index ee2e5ff0653d8b9653209594f66e3da142452f3c..72711cd019733ac6cddd143cfe7731662aee339c 100644 --- a/Unity/Assets/Model/Base/Helper/IdGenerater.cs +++ b/Unity/Assets/Model/Base/Helper/IdGenerater.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; - namespace ETModel + namespace ET { [StructLayout(LayoutKind.Sequential, Pack = 1)] public struct IdStruct diff --git a/Unity/Assets/Model/Base/Helper/JsonHelper.cs b/Unity/Assets/Model/Base/Helper/JsonHelper.cs index f8e1df12151b4ede3a280692c0f8e104e2ea8bf3..aa8ead6305eb87c5de3f305785ce11d21d188286 100644 --- a/Unity/Assets/Model/Base/Helper/JsonHelper.cs +++ b/Unity/Assets/Model/Base/Helper/JsonHelper.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public static class JsonHelper { diff --git a/Unity/Assets/Model/Base/Helper/MD5Helper.cs b/Unity/Assets/Model/Base/Helper/MD5Helper.cs index 76d70c17a0a1f86cc12cacfbf12a007cb53a9b1b..bf4c3c56fc0016d736dc71d5b73c84753bf7775f 100644 --- a/Unity/Assets/Model/Base/Helper/MD5Helper.cs +++ b/Unity/Assets/Model/Base/Helper/MD5Helper.cs @@ -1,7 +1,7 @@ using System.IO; using System.Security.Cryptography; -namespace ETModel +namespace ET { public static class MD5Helper { diff --git a/Unity/Assets/Model/Base/Helper/MethodInfoHelper.cs b/Unity/Assets/Model/Base/Helper/MethodInfoHelper.cs index 13ace9577c7979d0dc0a0a63cf58e367074b3664..856442cce909a043edba4eca5a3e413b0463fcba 100644 --- a/Unity/Assets/Model/Base/Helper/MethodInfoHelper.cs +++ b/Unity/Assets/Model/Base/Helper/MethodInfoHelper.cs @@ -1,6 +1,6 @@ using System.Reflection; -namespace ETModel +namespace ET { public static class MethodInfoHelper { diff --git a/Unity/Assets/Model/Base/Helper/MongoHelper.cs b/Unity/Assets/Model/Base/Helper/MongoHelper.cs index 60705b1e52c57d2d4e98adb248893759f29ce42c..64fee20e4d0d7eb5c6aa125936aac63c61c5d586 100644 --- a/Unity/Assets/Model/Base/Helper/MongoHelper.cs +++ b/Unity/Assets/Model/Base/Helper/MongoHelper.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using MongoDB.Bson.Serialization.Conventions; using UnityEngine; -namespace ETModel +namespace ET { public static class MongoHelper { diff --git a/Unity/Assets/Model/Base/Helper/NetHelper.cs b/Unity/Assets/Model/Base/Helper/NetHelper.cs index f37b4e0b34d375f0bc9881fb5d8a97818cfefade..58fced13a88763ae14e706ee44a9c7ccfe911342 100644 --- a/Unity/Assets/Model/Base/Helper/NetHelper.cs +++ b/Unity/Assets/Model/Base/Helper/NetHelper.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Net; -namespace ETModel +namespace ET { public static class NetHelper { diff --git a/Unity/Assets/Model/Base/Helper/ObjectHelper.cs b/Unity/Assets/Model/Base/Helper/ObjectHelper.cs index d8ab3756da18203950563b6c0acf6b2d2a372c8d..d33b33ff9304c8d4e20972941e77b1bbda857c6d 100644 --- a/Unity/Assets/Model/Base/Helper/ObjectHelper.cs +++ b/Unity/Assets/Model/Base/Helper/ObjectHelper.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public static class ObjectHelper { diff --git a/Unity/Assets/Model/Base/Helper/RandomHelper.cs b/Unity/Assets/Model/Base/Helper/RandomHelper.cs index 4aa176228624ba8ee2fd6c9f36b6400c00e19499..9016d89a87b47744881e9ffa97ffe18e50c46f81 100644 --- a/Unity/Assets/Model/Base/Helper/RandomHelper.cs +++ b/Unity/Assets/Model/Base/Helper/RandomHelper.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public static class RandomHelper { diff --git a/Unity/Assets/Model/Base/Helper/StringHelper.cs b/Unity/Assets/Model/Base/Helper/StringHelper.cs index 596f1e418e8ec285a9da150da1706552dfbbfa6b..5cf3265421d26fefb642afb156e64a206927dff1 100644 --- a/Unity/Assets/Model/Base/Helper/StringHelper.cs +++ b/Unity/Assets/Model/Base/Helper/StringHelper.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Globalization; using System.Text; -namespace ETModel +namespace ET { public static class StringHelper { diff --git a/Unity/Assets/Model/Base/Helper/TimeHelper.cs b/Unity/Assets/Model/Base/Helper/TimeHelper.cs index b0a043077c995be354242f757d27b9f03ae51536..afede8185a936108218231a07a1192c87861671f 100644 --- a/Unity/Assets/Model/Base/Helper/TimeHelper.cs +++ b/Unity/Assets/Model/Base/Helper/TimeHelper.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public static class TimeHelper { diff --git a/Unity/Assets/Model/Base/Helper/ZipHelper.cs b/Unity/Assets/Model/Base/Helper/ZipHelper.cs index 3b3c36f27c4779a78453e859580fbd03a4a8bd5a..2e670514fdf07ee6f98703108ab702228dd5c2b4 100644 --- a/Unity/Assets/Model/Base/Helper/ZipHelper.cs +++ b/Unity/Assets/Model/Base/Helper/ZipHelper.cs @@ -1,7 +1,7 @@ using System.IO; using ICSharpCode.SharpZipLib.Zip.Compression; -namespace ETModel +namespace ET { public static class ZipHelper { @@ -55,7 +55,7 @@ namespace ETModel using System.IO; using System.IO.Compression; -namespace ETModel +namespace ET { public static class ZipHelper { diff --git a/Unity/Assets/Model/Base/ListComponent.cs b/Unity/Assets/Model/Base/ListComponent.cs index a89c1f5f3a37d18b8619a4102826a2ab8a8cfa1f..12367a5fbcfa4a2775406defa8f91fcf4195a27a 100644 --- a/Unity/Assets/Model/Base/ListComponent.cs +++ b/Unity/Assets/Model/Base/ListComponent.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace ETModel +namespace ET { public class ListComponent : Entity { diff --git a/Unity/Assets/Model/Base/Log.cs b/Unity/Assets/Model/Base/Log.cs index c1455150fcd0cbe3a50b53cada8c6ccb01f5906d..5cf2331d90bb6e92ee7444fb6c25a105bc89963d 100644 --- a/Unity/Assets/Model/Base/Log.cs +++ b/Unity/Assets/Model/Base/Log.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public static class Log { diff --git a/Unity/Assets/Model/Base/LogType.cs b/Unity/Assets/Model/Base/LogType.cs index 13003c93583b74d9718f7647163dc2bf9d49479f..dd46fe11ed5bfece4d93e0e87b5237463b1e4c67 100644 --- a/Unity/Assets/Model/Base/LogType.cs +++ b/Unity/Assets/Model/Base/LogType.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public enum LogType { diff --git a/Unity/Assets/Model/Base/MultiMap.cs b/Unity/Assets/Model/Base/MultiMap.cs index 864c759d284ded906b8ae30cf50c08c49862a24c..9d56b95a8f8eb4ce3d37891dd4ceeb81ae6d6d56 100644 --- a/Unity/Assets/Model/Base/MultiMap.cs +++ b/Unity/Assets/Model/Base/MultiMap.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace ETModel +namespace ET { public class MultiMap { diff --git a/Unity/Assets/Model/Base/MultiMapSet.cs b/Unity/Assets/Model/Base/MultiMapSet.cs index be5f9fe28d05caf123fed9dbf75b166e9050a426..901afdc3d8df32481ded2b5a665a1d1aa27080e3 100644 --- a/Unity/Assets/Model/Base/MultiMapSet.cs +++ b/Unity/Assets/Model/Base/MultiMapSet.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace ETModel +namespace ET { public class MultiMapSet { diff --git a/Unity/Assets/Model/Base/Object/BaseAttribute.cs b/Unity/Assets/Model/Base/Object/BaseAttribute.cs index a3c5605711e217b78901f7db9de0660678500826..7f9b593029b15218426e4aa9760d6087356eca6f 100644 --- a/Unity/Assets/Model/Base/Object/BaseAttribute.cs +++ b/Unity/Assets/Model/Base/Object/BaseAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] public class BaseAttribute: Attribute diff --git a/Unity/Assets/Model/Base/Object/ComponentView.cs b/Unity/Assets/Model/Base/Object/ComponentView.cs index 19607b7a29994baf5bb08ce7500e3badf2891377..6f2e0324df474adedfb135d0357e40f6254b869f 100644 --- a/Unity/Assets/Model/Base/Object/ComponentView.cs +++ b/Unity/Assets/Model/Base/Object/ComponentView.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace ETModel +namespace ET { public class ComponentView: MonoBehaviour { diff --git a/Unity/Assets/Model/Base/Object/Entity.cs b/Unity/Assets/Model/Base/Object/Entity.cs index e7b4398dd97900c491ef9dd6b38c6d4672556dbf..9a7d2fa68ecf6497c0c9eb098379c4e61049f6a5 100644 --- a/Unity/Assets/Model/Base/Object/Entity.cs +++ b/Unity/Assets/Model/Base/Object/Entity.cs @@ -6,7 +6,7 @@ using MongoDB.Bson.Serialization.Attributes; using UnityEngine; #endif -namespace ETModel +namespace ET { [Flags] public enum EntityStatus: byte diff --git a/Unity/Assets/Model/Base/Object/EntityCreateComponet.cs b/Unity/Assets/Model/Base/Object/EntityCreateComponet.cs index 1ac73e70e5f04e231250d7f30c8d3f6456460862..3a5140f9f2f5894fd4ec7b5ed8dc68a8892d4b5f 100644 --- a/Unity/Assets/Model/Base/Object/EntityCreateComponet.cs +++ b/Unity/Assets/Model/Base/Object/EntityCreateComponet.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public partial class Entity { diff --git a/Unity/Assets/Model/Base/Object/EntityEventAttribute.cs b/Unity/Assets/Model/Base/Object/EntityEventAttribute.cs index 2f6446755f1f6867f786853b15ecaa86126c95b5..79f0ff7024ce65adc53c1fa325754e2d9d5f56a7 100644 --- a/Unity/Assets/Model/Base/Object/EntityEventAttribute.cs +++ b/Unity/Assets/Model/Base/Object/EntityEventAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] public class EntityEventAttribute: Attribute diff --git a/Unity/Assets/Model/Base/Object/EntityFactory.cs b/Unity/Assets/Model/Base/Object/EntityFactory.cs index 3ddcac6a089f406d2e42dc22937bd6a37bda0c6f..88546c0e275ff78550603a2787ae47fd65006c36 100644 --- a/Unity/Assets/Model/Base/Object/EntityFactory.cs +++ b/Unity/Assets/Model/Base/Object/EntityFactory.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public static class EntityFactory { diff --git a/Unity/Assets/Model/Base/Object/EventProxy.cs b/Unity/Assets/Model/Base/Object/EventProxy.cs index e5c68dac81d09054c75855828911c19dd3add394..7237d642e4cb56b298acfba16aa1cc350617de19 100644 --- a/Unity/Assets/Model/Base/Object/EventProxy.cs +++ b/Unity/Assets/Model/Base/Object/EventProxy.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace ETModel +namespace ET { public class EventProxy: IEvent { diff --git a/Unity/Assets/Model/Base/Object/EventSystem.cs b/Unity/Assets/Model/Base/Object/EventSystem.cs index d9ac968191453fbd915393f282849ad9578fb1d9..f29bcbd0a9bd302fa000f2721c97b803fea849c8 100644 --- a/Unity/Assets/Model/Base/Object/EventSystem.cs +++ b/Unity/Assets/Model/Base/Object/EventSystem.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Reflection; using System.Text; -namespace ETModel +namespace ET { public enum DLLType { diff --git a/Unity/Assets/Model/Base/Object/HideInHierarchy.cs b/Unity/Assets/Model/Base/Object/HideInHierarchy.cs index c5807c4c2f4c233fb63fce5613a655e2642082d6..f874d2a129a2f59d2dd65dabfac524c6afdcfbd0 100644 --- a/Unity/Assets/Model/Base/Object/HideInHierarchy.cs +++ b/Unity/Assets/Model/Base/Object/HideInHierarchy.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public class HideInHierarchy: Attribute { diff --git a/Unity/Assets/Model/Base/Object/IAwakeSystem.cs b/Unity/Assets/Model/Base/Object/IAwakeSystem.cs index 71e63087a59cfc3ec12805b1bd957a2704888421..91ce0678a906a629ba97b7cbe7adde796aa12fbd 100644 --- a/Unity/Assets/Model/Base/Object/IAwakeSystem.cs +++ b/Unity/Assets/Model/Base/Object/IAwakeSystem.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public interface IAwakeSystem { diff --git a/Unity/Assets/Model/Base/Object/IChangeSystem.cs b/Unity/Assets/Model/Base/Object/IChangeSystem.cs index 6db0d59f0296768ff16cae750c86e19ffd0b240a..dddd9a7fb31d8c27560da64ecaeec519c2955f70 100644 --- a/Unity/Assets/Model/Base/Object/IChangeSystem.cs +++ b/Unity/Assets/Model/Base/Object/IChangeSystem.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public interface IChangeSystem { diff --git a/Unity/Assets/Model/Base/Object/IDeserializeSystem.cs b/Unity/Assets/Model/Base/Object/IDeserializeSystem.cs index a11ee62f4306c9cf645f36d3ed28add603f585d9..066e359cc74b39c1f76e7c3eae109f08e8d747a4 100644 --- a/Unity/Assets/Model/Base/Object/IDeserializeSystem.cs +++ b/Unity/Assets/Model/Base/Object/IDeserializeSystem.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public interface IDeserializeSystem { diff --git a/Unity/Assets/Model/Base/Object/IDestroySystem.cs b/Unity/Assets/Model/Base/Object/IDestroySystem.cs index 17b3ff52abd14de5718afe2243be3e3bde65bcfe..f2e9437a0c38d7098be7febaca474d060ee56d40 100644 --- a/Unity/Assets/Model/Base/Object/IDestroySystem.cs +++ b/Unity/Assets/Model/Base/Object/IDestroySystem.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public interface IDestroySystem { diff --git a/Unity/Assets/Model/Base/Object/ILateUpdateSystem.cs b/Unity/Assets/Model/Base/Object/ILateUpdateSystem.cs index b9deb4754db4d6ad93bce63622d40fc3befe281f..9793968096c8dbc59788576906ddf704707c6ca4 100644 --- a/Unity/Assets/Model/Base/Object/ILateUpdateSystem.cs +++ b/Unity/Assets/Model/Base/Object/ILateUpdateSystem.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public interface ILateUpdateSystem { diff --git a/Unity/Assets/Model/Base/Object/ILoadSystem.cs b/Unity/Assets/Model/Base/Object/ILoadSystem.cs index 5125d4310629e158e3f226098771ffab7995a6cd..f95e17b32ab7a0796c0d0da5d6dced4a6de7d2b1 100644 --- a/Unity/Assets/Model/Base/Object/ILoadSystem.cs +++ b/Unity/Assets/Model/Base/Object/ILoadSystem.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public interface ILoadSystem { diff --git a/Unity/Assets/Model/Base/Object/ISerializeToEntity.cs b/Unity/Assets/Model/Base/Object/ISerializeToEntity.cs index 0efccf0993b6729a47b1cd9c22519665d7cf947c..d404a488b0df334ffa61db98c526752fd302d2b7 100644 --- a/Unity/Assets/Model/Base/Object/ISerializeToEntity.cs +++ b/Unity/Assets/Model/Base/Object/ISerializeToEntity.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public interface ISerializeToEntity { diff --git a/Unity/Assets/Model/Base/Object/IStartSystem.cs b/Unity/Assets/Model/Base/Object/IStartSystem.cs index 124ad3e450fca8214d28e6552afee036c6a00636..f771c40965fe42bf1520df7917181f4a2d4b4e87 100644 --- a/Unity/Assets/Model/Base/Object/IStartSystem.cs +++ b/Unity/Assets/Model/Base/Object/IStartSystem.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public interface IStartSystem { diff --git a/Unity/Assets/Model/Base/Object/IUpdateSystem.cs b/Unity/Assets/Model/Base/Object/IUpdateSystem.cs index 4bf8052c3be983c001c79bb1a8f61cd470eac838..c211d430a13bf25de1266ac2af7214b9a3a05aa9 100644 --- a/Unity/Assets/Model/Base/Object/IUpdateSystem.cs +++ b/Unity/Assets/Model/Base/Object/IUpdateSystem.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public interface IUpdateSystem { diff --git a/Unity/Assets/Model/Base/Object/NoMemoryCheck.cs b/Unity/Assets/Model/Base/Object/NoMemoryCheck.cs index 89fd1eac5b098e646e5014b47050d83074ce389a..d0c701b9b45385ae580d2f227cbdee38bf4d33f4 100644 --- a/Unity/Assets/Model/Base/Object/NoMemoryCheck.cs +++ b/Unity/Assets/Model/Base/Object/NoMemoryCheck.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public class NoMemoryCheck: Attribute { diff --git a/Unity/Assets/Model/Base/Object/NoObjectPool.cs b/Unity/Assets/Model/Base/Object/NoObjectPool.cs index 455a12331f45af22069e92b8c1604ed47dc45519..9c1183bc22bee69a61ab1eabd512a78719c2d66a 100644 --- a/Unity/Assets/Model/Base/Object/NoObjectPool.cs +++ b/Unity/Assets/Model/Base/Object/NoObjectPool.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public class NoObjectPool: Attribute { diff --git a/Unity/Assets/Model/Base/Object/Object.cs b/Unity/Assets/Model/Base/Object/Object.cs index 9d169e9167a91cca1ca04e89816b1e91a03ae326..14f1bdc392fd3063be7eb519f332558d4755b6ad 100644 --- a/Unity/Assets/Model/Base/Object/Object.cs +++ b/Unity/Assets/Model/Base/Object/Object.cs @@ -5,7 +5,7 @@ using MongoDB.Bson.Serialization.Attributes; using UnityEngine; #endif -namespace ETModel +namespace ET { public abstract class Object: ISupportInitialize, IDisposable { diff --git a/Unity/Assets/Model/Base/Object/ObjectPool.cs b/Unity/Assets/Model/Base/Object/ObjectPool.cs index 9b4ca9a7ab51dda5e846d9439195bb7c1e77789c..96f385d4e605124c210a8fc041e41b021368f5c0 100644 --- a/Unity/Assets/Model/Base/Object/ObjectPool.cs +++ b/Unity/Assets/Model/Base/Object/ObjectPool.cs @@ -6,7 +6,7 @@ using System.Reflection; using System.Text; using UnityEngine; -namespace ETModel +namespace ET { public class ComponentQueue: Object { diff --git a/Unity/Assets/Model/Base/Object/ObjectSystemAttribute.cs b/Unity/Assets/Model/Base/Object/ObjectSystemAttribute.cs index b3c523ad6c645d9cc2e84c57dde41af3909d0082..d1b4bbf9ec70a409e58af5fd04b0daf5071a33d8 100644 --- a/Unity/Assets/Model/Base/Object/ObjectSystemAttribute.cs +++ b/Unity/Assets/Model/Base/Object/ObjectSystemAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] public class ObjectSystemAttribute: BaseAttribute diff --git a/Unity/Assets/Model/Base/OneThreadSynchronizationContext.cs b/Unity/Assets/Model/Base/OneThreadSynchronizationContext.cs index 1cab5e9d762b01868aa6cd2afc7e923aa803caae..22133b0df0ba1b49dae2e09921cbda2d4c21de59 100644 --- a/Unity/Assets/Model/Base/OneThreadSynchronizationContext.cs +++ b/Unity/Assets/Model/Base/OneThreadSynchronizationContext.cs @@ -2,7 +2,7 @@ using System.Collections.Concurrent; using System.Threading; -namespace ETModel +namespace ET { public class OneThreadSynchronizationContext : SynchronizationContext { diff --git a/Unity/Assets/Model/Base/Pool.cs b/Unity/Assets/Model/Base/Pool.cs index 4892232fc8444d7e8aab4b2d44e215ec77f1558b..839dd13841a39c79c21a9294272b0e664ef223dc 100644 --- a/Unity/Assets/Model/Base/Pool.cs +++ b/Unity/Assets/Model/Base/Pool.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace ETModel +namespace ET { public class Pool where T: class, new() { diff --git a/Unity/Assets/Model/Base/ProcessHelper.cs b/Unity/Assets/Model/Base/ProcessHelper.cs index c0daa33a83c1d292bcd4bb6e6bf3a87e97660a59..d23e83cf616f08de167d31a14a5164abd0726515 100644 --- a/Unity/Assets/Model/Base/ProcessHelper.cs +++ b/Unity/Assets/Model/Base/ProcessHelper.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.Runtime.InteropServices; using Path = System.IO.Path; -namespace ETModel +namespace ET { public static class ProcessHelper { diff --git a/Unity/Assets/Model/Base/QueueDictionary.cs b/Unity/Assets/Model/Base/QueueDictionary.cs index 07cf23d0d197e1e2e383d01b307434933d87c258..5606632566a9439f8e133c4124220db1fa726702 100644 --- a/Unity/Assets/Model/Base/QueueDictionary.cs +++ b/Unity/Assets/Model/Base/QueueDictionary.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace ETModel +namespace ET { public class QueueDictionary { diff --git a/Unity/Assets/Model/Base/StructBsonSerialize.cs b/Unity/Assets/Model/Base/StructBsonSerialize.cs index 8d99e7f5233c902eb0d2f5fdffeaa3d5e3e95e0b..df047676db06c5b12d2f87fd91a5ecb3a2fb8cc4 100644 --- a/Unity/Assets/Model/Base/StructBsonSerialize.cs +++ b/Unity/Assets/Model/Base/StructBsonSerialize.cs @@ -6,7 +6,7 @@ using MongoDB.Bson.IO; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; -namespace ETModel +namespace ET { public class StructBsonSerialize : StructSerializerBase where TValue : struct { diff --git a/Unity/Assets/Model/Base/TryLocker.cs b/Unity/Assets/Model/Base/TryLocker.cs index 0d52f3e317eca76ec2e5f371aa2970f941587bed..29c14273a564099f280ad3f91168ff80c6fcd345 100644 --- a/Unity/Assets/Model/Base/TryLocker.cs +++ b/Unity/Assets/Model/Base/TryLocker.cs @@ -1,7 +1,7 @@ using System; using System.Threading; -namespace ETModel +namespace ET { public class TryLock : IDisposable { diff --git a/Unity/Assets/Model/Base/UnOrderMultiMap.cs b/Unity/Assets/Model/Base/UnOrderMultiMap.cs index 0870c4bc166172ac5223a954d45ecc029b6cac6a..28c694492a18025f7f71cb27336c0d4aed5b1833 100644 --- a/Unity/Assets/Model/Base/UnOrderMultiMap.cs +++ b/Unity/Assets/Model/Base/UnOrderMultiMap.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace ETModel +namespace ET { public class UnOrderMultiMap { diff --git a/Unity/Assets/Model/Base/UnOrderMultiMapSet.cs b/Unity/Assets/Model/Base/UnOrderMultiMapSet.cs index 351378597264780a35bcffe5b5ea1ab9d30b6a74..dc3b3ecc17fd77cf86a55612e5c4110359c6411d 100644 --- a/Unity/Assets/Model/Base/UnOrderMultiMapSet.cs +++ b/Unity/Assets/Model/Base/UnOrderMultiMapSet.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; -namespace ETModel +namespace ET { public class UnOrderMultiMapSet { diff --git a/Unity/Assets/Model/Component/Config/GlobalProto.cs.meta b/Unity/Assets/Model/Component/Config/GlobalProto.cs.meta deleted file mode 100644 index 9502db53cd59258cf22bc7e00574f2ae27e2cc28..0000000000000000000000000000000000000000 --- a/Unity/Assets/Model/Component/Config/GlobalProto.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: f8c68652f939473db936aa3e8a567548 -timeCreated: 1510746252 \ No newline at end of file diff --git a/Unity/Assets/Model/Component/GlobalConfigComponent.cs.meta b/Unity/Assets/Model/Component/GlobalConfigComponent.cs.meta deleted file mode 100644 index 4140c435f699798da78f955c2e36c1597ad32c05..0000000000000000000000000000000000000000 --- a/Unity/Assets/Model/Component/GlobalConfigComponent.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 9829f725984449dbb8dac921152a1c26 -timeCreated: 1510746214 \ No newline at end of file diff --git a/Unity/Assets/Model/Demo/AnimatorComponent.cs b/Unity/Assets/Model/Demo/AnimatorComponent.cs index fa887956454be1c3b3c4883f420cc970ce2635ba..11a247a94895b5280a85a0760d7400344e4b8c42 100644 --- a/Unity/Assets/Model/Demo/AnimatorComponent.cs +++ b/Unity/Assets/Model/Demo/AnimatorComponent.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -namespace ETModel +namespace ET { [ObjectSystem] public class AnimatorComponentAwakeSystem : AwakeSystem diff --git a/Unity/Assets/Model/Demo/CameraComponent.cs b/Unity/Assets/Model/Demo/CameraComponent.cs index 29be654dc23738ed00732ca5bcd446fe6868b99c..cc04bcd51a07497531bd857fd92a58ae1d1fe32c 100644 --- a/Unity/Assets/Model/Demo/CameraComponent.cs +++ b/Unity/Assets/Model/Demo/CameraComponent.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace ETModel +namespace ET { [ObjectSystem] public class CameraComponentAwakeSystem : AwakeSystem diff --git a/Unity/Assets/Model/Demo/Config/StartProcessConfig.cs b/Unity/Assets/Model/Demo/Config/StartProcessConfig.cs index 7f7f66214f729f8904eb97fdf7acd603e0a9070c..a71ed3bb2a8bed4fe7e1999a9bc8c9bee955d440 100644 --- a/Unity/Assets/Model/Demo/Config/StartProcessConfig.cs +++ b/Unity/Assets/Model/Demo/Config/StartProcessConfig.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { [Config] public partial class StartProcessConfigCategory : ACategory diff --git a/Unity/Assets/Model/Demo/Config/StartSceneConfig.cs b/Unity/Assets/Model/Demo/Config/StartSceneConfig.cs index 3945e6b4c09224c4fb66426960be257788586063..ebd74a39f117b15a18bbdce6bbcc20c3cbbc367e 100644 --- a/Unity/Assets/Model/Demo/Config/StartSceneConfig.cs +++ b/Unity/Assets/Model/Demo/Config/StartSceneConfig.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { [Config] public partial class StartSceneConfigCategory : ACategory diff --git a/Unity/Assets/Model/Demo/Config/StartZoneConfig.cs b/Unity/Assets/Model/Demo/Config/StartZoneConfig.cs index c7ecaf08ea8490e539c25d46383919cd183d8fd7..dfed28362f1a7b3c88d5925c653fb1fd5c12cb47 100644 --- a/Unity/Assets/Model/Demo/Config/StartZoneConfig.cs +++ b/Unity/Assets/Model/Demo/Config/StartZoneConfig.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { [Config] public partial class StartZoneConfigCategory : ACategory diff --git a/Unity/Assets/Model/Demo/Config/UnitConfig.cs b/Unity/Assets/Model/Demo/Config/UnitConfig.cs index 5f7a1f43665b1c4446b92e66b5348ffd4d650297..83309924dc5f0be97b40fe225da238e8ee31366b 100644 --- a/Unity/Assets/Model/Demo/Config/UnitConfig.cs +++ b/Unity/Assets/Model/Demo/Config/UnitConfig.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { [Config] public partial class UnitConfigCategory : ACategory diff --git a/Unity/Assets/Model/Demo/G2C_TestHotfixHandler.cs b/Unity/Assets/Model/Demo/G2C_TestHotfixHandler.cs index 3366bbbccfe15b628fa49f9621c30023eb3a6e1d..4885d822562c3823cd4f9f34aa0cc008b22c7da4 100644 --- a/Unity/Assets/Model/Demo/G2C_TestHotfixHandler.cs +++ b/Unity/Assets/Model/Demo/G2C_TestHotfixHandler.cs @@ -1,11 +1,11 @@ -using ETModel; + -namespace ETModel +namespace ET { [MessageHandler] public class G2C_TestHotfixMessageHandler : AMHandler { - protected override async ETTask Run(ETModel.Session session, G2C_TestHotfixMessage message) + protected override async ETTask Run(Session session, G2C_TestHotfixMessage message) { Log.Debug(message.Info); await ETTask.CompletedTask; diff --git a/Unity/Assets/Model/Component/GlobalConfigComponent.cs b/Unity/Assets/Model/Demo/GlobalConfigComponent.cs similarity index 95% rename from Unity/Assets/Model/Component/GlobalConfigComponent.cs rename to Unity/Assets/Model/Demo/GlobalConfigComponent.cs index 695381ade3b51213fbad93137a9c01366685590e..9ab31c70ee51de58244342bab1f9ea43c7720df8 100644 --- a/Unity/Assets/Model/Component/GlobalConfigComponent.cs +++ b/Unity/Assets/Model/Demo/GlobalConfigComponent.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { [ObjectSystem] public class GlobalConfigComponentAwakeSystem : AwakeSystem diff --git a/Unity/Assets/Model/Demo/GlobalConfigComponent.cs.meta b/Unity/Assets/Model/Demo/GlobalConfigComponent.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..5b8f737ea9f1e0d475ab135190593a7e2161b527 --- /dev/null +++ b/Unity/Assets/Model/Demo/GlobalConfigComponent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 989e45d189229d74d83f376ada23eaeb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Model/Component/Config/GlobalProto.cs b/Unity/Assets/Model/Demo/GlobalProto.cs similarity index 95% rename from Unity/Assets/Model/Component/Config/GlobalProto.cs rename to Unity/Assets/Model/Demo/GlobalProto.cs index fc466cfe0eef9bda53f421aef9a5e638faa034eb..f7a514c8b4e2eb66f809a575e585ae31a37b5f38 100644 --- a/Unity/Assets/Model/Component/Config/GlobalProto.cs +++ b/Unity/Assets/Model/Demo/GlobalProto.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public class GlobalProto { diff --git a/Unity/Assets/Model/Demo/GlobalProto.cs.meta b/Unity/Assets/Model/Demo/GlobalProto.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..569f62b54619569747b7f25b2ae4aaa4bac883b4 --- /dev/null +++ b/Unity/Assets/Model/Demo/GlobalProto.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d8e40a0a74d77a54da64f52f36637daa +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Model/Demo/Helper/LoginHelper.cs b/Unity/Assets/Model/Demo/Helper/LoginHelper.cs index 93ec070609607346f983171cff127f39cfe521a0..51b08457aed28f94984b301312624fd0583f2325 100644 --- a/Unity/Assets/Model/Demo/Helper/LoginHelper.cs +++ b/Unity/Assets/Model/Demo/Helper/LoginHelper.cs @@ -1,7 +1,7 @@ using System; -using ETModel; -namespace ETModel + +namespace ET { public static class LoginHelper { @@ -10,19 +10,19 @@ namespace ETModel try { // 创建一个ETModel层的Session - ETModel.Session session = ETModel.Game.Scene.GetComponent().Create(GlobalConfigComponent.Instance.GlobalProto.Address); + Session session = Game.Scene.GetComponent().Create(GlobalConfigComponent.Instance.GlobalProto.Address); // 创建一个ETHotfix层的Session, ETHotfix的Session会通过ETModel层的Session发送消息 - Session realmSession = EntityFactory.Create(domain, session); + Session realmSession = EntityFactory.Create(domain, session); R2C_Login r2CLogin = (R2C_Login) await realmSession.Call(new C2R_Login() { Account = account, Password = "111111" }); realmSession.Dispose(); // 创建一个ETModel层的Session,并且保存到ETModel.SessionComponent中 - ETModel.Session gateSession = ETModel.Game.Scene.GetComponent().Create(r2CLogin.Address); - ETModel.Game.Scene.AddComponent().Session = gateSession; + Session gateSession = Game.Scene.GetComponent().Create(r2CLogin.Address); + Game.Scene.AddComponent().Session = gateSession; // 创建一个ETHotfix层的Session, 并且保存到ETHotfix.SessionComponent中 - Game.Scene.AddComponent().Session = EntityFactory.Create(Game.Scene, gateSession); + Game.Scene.AddComponent().Session = EntityFactory.Create(Game.Scene, gateSession); G2C_LoginGate g2CLoginGate = (G2C_LoginGate)await SessionComponent.Instance.Session.Call( new C2G_LoginGate() { Key = r2CLogin.Key, GateId = r2CLogin.GateId}); @@ -30,8 +30,8 @@ namespace ETModel Log.Info("登陆gate成功!"); // 创建Player - Player player = ETModel.EntityFactory.CreateWithId(ETModel.Game.Scene, g2CLoginGate.PlayerId); - PlayerComponent playerComponent = ETModel.Game.Scene.GetComponent(); + Player player = EntityFactory.CreateWithId(Game.Scene, g2CLoginGate.PlayerId); + PlayerComponent playerComponent = Game.Scene.GetComponent(); playerComponent.MyPlayer = player; Game.EventSystem.Run(EventIdType.LoginFinish); diff --git a/Unity/Assets/Model/Demo/Helper/MapHelper.cs b/Unity/Assets/Model/Demo/Helper/MapHelper.cs index eb7d56406e9be1219bdcadca00c5fc7905443f14..6fad6ef81ac0ee2054f789c6d9a53288219a4f11 100644 --- a/Unity/Assets/Model/Demo/Helper/MapHelper.cs +++ b/Unity/Assets/Model/Demo/Helper/MapHelper.cs @@ -1,7 +1,7 @@ using System; -using ETModel; -namespace ETModel + +namespace ET { public static class MapHelper { @@ -10,18 +10,18 @@ namespace ETModel try { // 加载Unit资源 - ResourcesComponent resourcesComponent = ETModel.Game.Scene.GetComponent(); + ResourcesComponent resourcesComponent = ET.Game.Scene.GetComponent(); await resourcesComponent.LoadBundleAsync($"unit.unity3d"); // 加载场景资源 - await ETModel.Game.Scene.GetComponent().LoadBundleAsync("map.unity3d"); + await ET.Game.Scene.GetComponent().LoadBundleAsync("map.unity3d"); // 切换到map场景 - using (SceneChangeComponent sceneChangeComponent = ETModel.Game.Scene.AddComponent()) + using (SceneChangeComponent sceneChangeComponent = ET.Game.Scene.AddComponent()) { await sceneChangeComponent.ChangeSceneAsync(sceneName); } - G2C_EnterMap g2CEnterMap = await ETModel.SessionComponent.Instance.Session.Call(new C2G_EnterMap()) as G2C_EnterMap; + G2C_EnterMap g2CEnterMap = await ET.SessionComponent.Instance.Session.Call(new C2G_EnterMap()) as G2C_EnterMap; PlayerComponent.Instance.MyPlayer.UnitId = g2CEnterMap.UnitId; Game.Scene.AddComponent(); diff --git a/Unity/Assets/Model/Demo/M2C_CreateUnitsHandler.cs b/Unity/Assets/Model/Demo/M2C_CreateUnitsHandler.cs index 5bc7317ddc09804c39b30aa0f95a7c7bfd4e8563..6383410f7750e2f9106110dea637d0cf23073842 100644 --- a/Unity/Assets/Model/Demo/M2C_CreateUnitsHandler.cs +++ b/Unity/Assets/Model/Demo/M2C_CreateUnitsHandler.cs @@ -1,14 +1,14 @@ -using ETModel; + using Vector3 = UnityEngine.Vector3; -namespace ETModel +namespace ET { [MessageHandler] public class M2C_CreateUnitsHandler : AMHandler { - protected override async ETTask Run(ETModel.Session session, M2C_CreateUnits message) + protected override async ETTask Run(Session session, M2C_CreateUnits message) { - UnitComponent unitComponent = ETModel.Game.Scene.GetComponent(); + UnitComponent unitComponent = Game.Scene.GetComponent(); foreach (UnitInfo unitInfo in message.Units) { @@ -16,7 +16,7 @@ namespace ETModel { continue; } - Unit unit = UnitFactory.Create(ETModel.Game.Scene, unitInfo.UnitId); + Unit unit = UnitFactory.Create(Game.Scene, unitInfo.UnitId); unit.Position = new Vector3(unitInfo.X, unitInfo.Y, unitInfo.Z); } diff --git a/Unity/Assets/Model/Demo/M2C_PathfindingResultHandler.cs b/Unity/Assets/Model/Demo/M2C_PathfindingResultHandler.cs index 043059da34961cf71a6ea7b6205168837fe1573d..032e249c1bb79ce9659c2d4a0b0d65847138458a 100644 --- a/Unity/Assets/Model/Demo/M2C_PathfindingResultHandler.cs +++ b/Unity/Assets/Model/Demo/M2C_PathfindingResultHandler.cs @@ -1,14 +1,14 @@ -using ETModel; + using UnityEngine; -namespace ETModel +namespace ET { [MessageHandler] public class M2C_PathfindingResultHandler : AMHandler { - protected override async ETTask Run(ETModel.Session session, M2C_PathfindingResult message) + protected override async ETTask Run(Session session, M2C_PathfindingResult message) { - Unit unit = ETModel.Game.Scene.GetComponent().Get(message.Id); + Unit unit = Game.Scene.GetComponent().Get(message.Id); unit.GetComponent().SetFloatValue("Speed", 5f); diff --git a/Unity/Assets/Model/Demo/MoveComponent.cs b/Unity/Assets/Model/Demo/MoveComponent.cs index 82f3ae45787a2f141f1949925055d2d494b5614d..a29616f6023ee5d06997824fb508c6d00d24277f 100644 --- a/Unity/Assets/Model/Demo/MoveComponent.cs +++ b/Unity/Assets/Model/Demo/MoveComponent.cs @@ -2,7 +2,7 @@ using System.Threading; using UnityEngine; -namespace ETModel +namespace ET { [ObjectSystem] public class MoveComponentUpdateSystem : UpdateSystem diff --git a/Unity/Assets/Model/Demo/OperaComponent.cs b/Unity/Assets/Model/Demo/OperaComponent.cs index 9462c8af46248b73ec3cd6f52fe8ec1aecf271c1..7290566aecf2322892ce93012960ea80430ad28c 100644 --- a/Unity/Assets/Model/Demo/OperaComponent.cs +++ b/Unity/Assets/Model/Demo/OperaComponent.cs @@ -1,8 +1,8 @@ using System; -using ETModel; + using UnityEngine; -namespace ETModel +namespace ET { [ObjectSystem] public class OperaComponentAwakeSystem : AwakeSystem @@ -47,7 +47,7 @@ namespace ETModel frameClickMap.X = this.ClickPoint.x; frameClickMap.Y = this.ClickPoint.y; frameClickMap.Z = this.ClickPoint.z; - ETModel.SessionComponent.Instance.Session.Send(frameClickMap); + SessionComponent.Instance.Session.Send(frameClickMap); // 测试actor rpc消息 this.TestActor().Coroutine(); diff --git a/Unity/Assets/Model/Demo/Player.cs b/Unity/Assets/Model/Demo/Player.cs index 1fb44660ece3e6dec43c4a5563cea76ea3131c4a..233477607eb68cb1e1b0c84cf82a5aff0c658f05 100644 --- a/Unity/Assets/Model/Demo/Player.cs +++ b/Unity/Assets/Model/Demo/Player.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public sealed class Player : Entity { diff --git a/Unity/Assets/Model/Demo/PlayerComponent.cs b/Unity/Assets/Model/Demo/PlayerComponent.cs index ea35197f7918cfd278a811a3a4d3d6bda8d3264b..7d333bae762535d87e84df3d94a7ce202d91e6d6 100644 --- a/Unity/Assets/Model/Demo/PlayerComponent.cs +++ b/Unity/Assets/Model/Demo/PlayerComponent.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace ETModel +namespace ET { [ObjectSystem] public class PlayerComponentAwakeSystem : AwakeSystem diff --git a/Unity/Assets/Model/Demo/PlayerFactory.cs b/Unity/Assets/Model/Demo/PlayerFactory.cs index e2a91000cfc7e8504bb0b1d50cede43831f516ac..8e169fbaf1d4e74ef296ad8a775706aab813a64b 100644 --- a/Unity/Assets/Model/Demo/PlayerFactory.cs +++ b/Unity/Assets/Model/Demo/PlayerFactory.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public static class PlayerFactory { diff --git a/Unity/Assets/Model/Demo/SessionComponent.cs b/Unity/Assets/Model/Demo/SessionComponent.cs index fd3306c8c34a9d1a773a978e67402b92ad784005..bcf16c72f484db9df149c0b71ca1fc5bb3f0b43e 100644 --- a/Unity/Assets/Model/Demo/SessionComponent.cs +++ b/Unity/Assets/Model/Demo/SessionComponent.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { [ObjectSystem] public class SessionComponentAwakeSystem : AwakeSystem diff --git a/Unity/Assets/Model/Demo/TurnComponent.cs b/Unity/Assets/Model/Demo/TurnComponent.cs index d35d5e635937dfc9bf1eea5bdf5a14f8109557ff..4f12e7781e9ea5a4f6cd003dd8e55d473e248c35 100644 --- a/Unity/Assets/Model/Demo/TurnComponent.cs +++ b/Unity/Assets/Model/Demo/TurnComponent.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace ETModel +namespace ET { [ObjectSystem] public class TurnComponentUpdateSystem : UpdateSystem diff --git a/Unity/Assets/Model/Demo/UI/UILoading/Component/UILoadingComponent.cs b/Unity/Assets/Model/Demo/UI/UILoading/Component/UILoadingComponent.cs index ae7bf1f8f513a80e217afa6aa8a0152a2014c1c4..e8d91de1c00148263233329d533e429f2644e752 100644 --- a/Unity/Assets/Model/Demo/UI/UILoading/Component/UILoadingComponent.cs +++ b/Unity/Assets/Model/Demo/UI/UILoading/Component/UILoadingComponent.cs @@ -1,7 +1,7 @@ using UnityEngine; using UnityEngine.UI; -namespace ETModel +namespace ET { [ObjectSystem] public class UiLoadingComponentAwakeSystem : AwakeSystem diff --git a/Unity/Assets/Model/Demo/UI/UILoading/System/LoadingBeginEvent_CreateLoadingUI.cs b/Unity/Assets/Model/Demo/UI/UILoading/System/LoadingBeginEvent_CreateLoadingUI.cs index abe8baefb242a46a373083845be4adb006a86619..eb009b0c2ecb6f89fa26b92ae9c89b612e8266fc 100644 --- a/Unity/Assets/Model/Demo/UI/UILoading/System/LoadingBeginEvent_CreateLoadingUI.cs +++ b/Unity/Assets/Model/Demo/UI/UILoading/System/LoadingBeginEvent_CreateLoadingUI.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace ETModel +namespace ET { [Event(EventIdType.LoadingBegin)] public class LoadingBeginEvent_CreateLoadingUI : AEvent diff --git a/Unity/Assets/Model/Demo/UI/UILoading/System/LoadingFinishEvent_RemoveLoadingUI.cs b/Unity/Assets/Model/Demo/UI/UILoading/System/LoadingFinishEvent_RemoveLoadingUI.cs index 942a30cbfc0f9539dd3b9e851bbbb38dc540af22..b0249d7da1519bb403ea55981de8f625d3bd5ce1 100644 --- a/Unity/Assets/Model/Demo/UI/UILoading/System/LoadingFinishEvent_RemoveLoadingUI.cs +++ b/Unity/Assets/Model/Demo/UI/UILoading/System/LoadingFinishEvent_RemoveLoadingUI.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { [Event(EventIdType.LoadingFinish)] public class LoadingFinishEvent_RemoveLoadingUI : AEvent diff --git a/Unity/Assets/Model/Demo/UI/UILoading/System/UILoadingFactory.cs b/Unity/Assets/Model/Demo/UI/UILoading/System/UILoadingFactory.cs index 88427ba014bc883f8b6a74dd9ea675ba35163082..d95bd7bd200a71781cdb427dd487f78f1668e660 100644 --- a/Unity/Assets/Model/Demo/UI/UILoading/System/UILoadingFactory.cs +++ b/Unity/Assets/Model/Demo/UI/UILoading/System/UILoadingFactory.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace ETModel +namespace ET { public static class UILoadingFactory { diff --git a/Unity/Assets/Model/Demo/UI/UILobby/Component/UILobbyComponent.cs b/Unity/Assets/Model/Demo/UI/UILobby/Component/UILobbyComponent.cs index 7b5caf7fa25aed10c8e8e754874b6b02e099b7fb..2271612eeb75a6ad2633fc0ef5a87a1d7d285ff4 100644 --- a/Unity/Assets/Model/Demo/UI/UILobby/Component/UILobbyComponent.cs +++ b/Unity/Assets/Model/Demo/UI/UILobby/Component/UILobbyComponent.cs @@ -1,8 +1,8 @@ -using ETModel; + using UnityEngine; using UnityEngine.UI; -namespace ETModel +namespace ET { [ObjectSystem] public class UiLobbyComponentSystem : AwakeSystem diff --git a/Unity/Assets/Model/Demo/UI/UILobby/System/EnterMapFinish_RemoveLobbyUI.cs b/Unity/Assets/Model/Demo/UI/UILobby/System/EnterMapFinish_RemoveLobbyUI.cs index b3c0b0898365ee27273393794fce7e7c0e4737b6..6e4b4ee5c14743f07af9374e0cef9346976319e5 100644 --- a/Unity/Assets/Model/Demo/UI/UILobby/System/EnterMapFinish_RemoveLobbyUI.cs +++ b/Unity/Assets/Model/Demo/UI/UILobby/System/EnterMapFinish_RemoveLobbyUI.cs @@ -1,6 +1,6 @@ -using ETModel; + -namespace ETModel +namespace ET { [Event(EventIdType.EnterMapFinish)] public class EnterMapFinish_RemoveLobbyUI: AEvent @@ -8,7 +8,7 @@ namespace ETModel public override void Run() { Game.Scene.GetComponent().Remove(UIType.UILobby); - ETModel.Game.Scene.GetComponent().UnloadBundle(UIType.UILobby.StringToAB()); + Game.Scene.GetComponent().UnloadBundle(UIType.UILobby.StringToAB()); } } } diff --git a/Unity/Assets/Model/Demo/UI/UILobby/System/LoginFinish_CreateLobbyUI.cs b/Unity/Assets/Model/Demo/UI/UILobby/System/LoginFinish_CreateLobbyUI.cs index 674752d123cd6906287db1e7a21dc2daa576d844..0bb3718799a26d4396958c26d9b30469b979baea 100644 --- a/Unity/Assets/Model/Demo/UI/UILobby/System/LoginFinish_CreateLobbyUI.cs +++ b/Unity/Assets/Model/Demo/UI/UILobby/System/LoginFinish_CreateLobbyUI.cs @@ -1,6 +1,6 @@ -using ETModel; + -namespace ETModel +namespace ET { [Event(EventIdType.LoginFinish)] public class LoginFinish_CreateLobbyUI: AEvent diff --git a/Unity/Assets/Model/Demo/UI/UILobby/System/UILobbyFactory.cs b/Unity/Assets/Model/Demo/UI/UILobby/System/UILobbyFactory.cs index ef4dc95194b3c591f4dff44e42927d69a35abb26..86701682a7c99f69313e1c6070ff80a4c35c66b5 100644 --- a/Unity/Assets/Model/Demo/UI/UILobby/System/UILobbyFactory.cs +++ b/Unity/Assets/Model/Demo/UI/UILobby/System/UILobbyFactory.cs @@ -1,8 +1,8 @@ using System; -using ETModel; + using UnityEngine; -namespace ETModel +namespace ET { public static class UILobbyFactory { @@ -10,7 +10,7 @@ namespace ETModel { try { - ResourcesComponent resourcesComponent = ETModel.Game.Scene.GetComponent(); + ResourcesComponent resourcesComponent = Game.Scene.GetComponent(); resourcesComponent.LoadBundle(UIType.UILobby.StringToAB()); GameObject bundleGameObject = (GameObject)resourcesComponent.GetAsset(UIType.UILobby.StringToAB(), UIType.UILobby); GameObject gameObject = UnityEngine.Object.Instantiate(bundleGameObject); diff --git a/Unity/Assets/Model/Demo/UI/UILogin/Component/UILoginComponent.cs b/Unity/Assets/Model/Demo/UI/UILogin/Component/UILoginComponent.cs index d1f11238d77d09b92db692fc03492de82b02f20c..c2153305ac260026aa364e6f2b75d25b4bc1301d 100644 --- a/Unity/Assets/Model/Demo/UI/UILogin/Component/UILoginComponent.cs +++ b/Unity/Assets/Model/Demo/UI/UILogin/Component/UILoginComponent.cs @@ -1,10 +1,10 @@ using System; using System.Net; -using ETModel; + using UnityEngine; using UnityEngine.UI; -namespace ETModel +namespace ET { [ObjectSystem] public class UiLoginComponentSystem : AwakeSystem diff --git a/Unity/Assets/Model/Demo/UI/UILogin/System/InitSceneStart_CreateLoginUI.cs b/Unity/Assets/Model/Demo/UI/UILogin/System/InitSceneStart_CreateLoginUI.cs index a768f5474769fa63ca6f4045f916d686b97d439b..d04ea79e7fcb394f77fcf6a2e4c66704f07c5c53 100644 --- a/Unity/Assets/Model/Demo/UI/UILogin/System/InitSceneStart_CreateLoginUI.cs +++ b/Unity/Assets/Model/Demo/UI/UILogin/System/InitSceneStart_CreateLoginUI.cs @@ -1,6 +1,6 @@ -using ETModel; + -namespace ETModel +namespace ET { [Event(EventIdType.InitSceneStart)] public class InitSceneStart_CreateLoginUI: AEvent diff --git a/Unity/Assets/Model/Demo/UI/UILogin/System/LoginFinish_RemoveLoginUI.cs b/Unity/Assets/Model/Demo/UI/UILogin/System/LoginFinish_RemoveLoginUI.cs index c164d2fdac1e41c2b26ca9d083d9600dfb581c08..5b3162433c99b64671dad8e78ad85f41195e1beb 100644 --- a/Unity/Assets/Model/Demo/UI/UILogin/System/LoginFinish_RemoveLoginUI.cs +++ b/Unity/Assets/Model/Demo/UI/UILogin/System/LoginFinish_RemoveLoginUI.cs @@ -1,6 +1,6 @@ -using ETModel; + -namespace ETModel +namespace ET { [Event(EventIdType.LoginFinish)] public class LoginFinish_RemoveLoginUI: AEvent @@ -8,7 +8,7 @@ namespace ETModel public override void Run() { Game.Scene.GetComponent().Remove(UIType.UILogin); - ETModel.Game.Scene.GetComponent().UnloadBundle(UIType.UILogin.StringToAB()); + Game.Scene.GetComponent().UnloadBundle(UIType.UILogin.StringToAB()); } } } diff --git a/Unity/Assets/Model/Demo/UI/UILogin/System/UILoginFactory.cs b/Unity/Assets/Model/Demo/UI/UILogin/System/UILoginFactory.cs index af99afee5d10bc8e2ce42b79f2a12e6aedaebd20..d0d147e965209eba0c498c408ba10a9be818dca0 100644 --- a/Unity/Assets/Model/Demo/UI/UILogin/System/UILoginFactory.cs +++ b/Unity/Assets/Model/Demo/UI/UILogin/System/UILoginFactory.cs @@ -1,8 +1,8 @@ using System; -using ETModel; + using UnityEngine; -namespace ETModel +namespace ET { public static class UILoginFactory { @@ -10,7 +10,7 @@ namespace ETModel { try { - ResourcesComponent resourcesComponent = ETModel.Game.Scene.GetComponent(); + ResourcesComponent resourcesComponent = Game.Scene.GetComponent(); resourcesComponent.LoadBundle(UIType.UILogin.StringToAB()); GameObject bundleGameObject = (GameObject)resourcesComponent.GetAsset(UIType.UILogin.StringToAB(), UIType.UILogin); GameObject gameObject = UnityEngine.Object.Instantiate(bundleGameObject); diff --git a/Unity/Assets/Model/Demo/Unit.cs b/Unity/Assets/Model/Demo/Unit.cs index 7bdf1282492ac674309e09730883716ef12620d6..379550ca8e039f3e4243dfa1e4b732f3ff4d8165 100644 --- a/Unity/Assets/Model/Demo/Unit.cs +++ b/Unity/Assets/Model/Demo/Unit.cs @@ -3,7 +3,7 @@ using UnityEngine; using Quaternion = UnityEngine.Quaternion; using Vector3 = UnityEngine.Vector3; -namespace ETModel +namespace ET { [ObjectSystem] public class UnitAwakeSystem : AwakeSystem diff --git a/Unity/Assets/Model/Demo/UnitComponent.cs b/Unity/Assets/Model/Demo/UnitComponent.cs index 86b4ea3e9956f2b53d4714a7a7dd8755de943538..c09db9e586bd67f0d5a6e72dde89012804807ed1 100644 --- a/Unity/Assets/Model/Demo/UnitComponent.cs +++ b/Unity/Assets/Model/Demo/UnitComponent.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace ETModel +namespace ET { [ObjectSystem] public class UnitComponentSystem : AwakeSystem diff --git a/Unity/Assets/Model/Demo/UnitFactory.cs b/Unity/Assets/Model/Demo/UnitFactory.cs index ae9add6cf5b2e692c6efde47a74b76b37768a671..6f37a363e31c8831c550f108681be2763c191f35 100644 --- a/Unity/Assets/Model/Demo/UnitFactory.cs +++ b/Unity/Assets/Model/Demo/UnitFactory.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace ETModel +namespace ET { public static class UnitFactory { diff --git a/Unity/Assets/Model/Demo/UnitPathComponent.cs b/Unity/Assets/Model/Demo/UnitPathComponent.cs index f2220facc5e9ed954ef21c6c816257d7efdc85e8..c42bed96ae7f5bd909f4101acc3c459003ec2fd1 100644 --- a/Unity/Assets/Model/Demo/UnitPathComponent.cs +++ b/Unity/Assets/Model/Demo/UnitPathComponent.cs @@ -2,7 +2,7 @@ using System.Threading; using UnityEngine; -namespace ETModel +namespace ET { public class UnitPathComponent : Entity { diff --git a/Unity/Assets/Model/Entity/EntitySceneFactory.cs b/Unity/Assets/Model/Entity/EntitySceneFactory.cs index 9b182262d6ed4fb287e158b4343bf8e52922b561..db8a6c8d725327d95778551ac36855fe07842a03 100644 --- a/Unity/Assets/Model/Entity/EntitySceneFactory.cs +++ b/Unity/Assets/Model/Entity/EntitySceneFactory.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public static class EntitySceneFactory { diff --git a/Unity/Assets/Model/Entity/Game.cs b/Unity/Assets/Model/Entity/Game.cs index a60afb69a27fef7f21bbea88928da034a9ce0b50..ef5210b8c3c3d25ff0468f84b532485544b15893 100644 --- a/Unity/Assets/Model/Entity/Game.cs +++ b/Unity/Assets/Model/Entity/Game.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public static class Game { diff --git a/Unity/Assets/Model/Entity/Scene.cs b/Unity/Assets/Model/Entity/Scene.cs index 6bd6e0dfaf3a7e11a3c8b5e35e4eb83eab78a3f6..96163f74736630e96bafca967ff074461a5b666f 100644 --- a/Unity/Assets/Model/Entity/Scene.cs +++ b/Unity/Assets/Model/Entity/Scene.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public sealed class Scene: Entity { diff --git a/Unity/Assets/Model/Component/SceneChangeComponent.cs b/Unity/Assets/Model/Entity/SceneChangeComponent.cs similarity index 98% rename from Unity/Assets/Model/Component/SceneChangeComponent.cs rename to Unity/Assets/Model/Entity/SceneChangeComponent.cs index c8a279e3ca6c2ab54fe653d849f88832a8fb24f0..756c4ceef7d70a89431ad7285fde265df9d94396 100644 --- a/Unity/Assets/Model/Component/SceneChangeComponent.cs +++ b/Unity/Assets/Model/Entity/SceneChangeComponent.cs @@ -1,7 +1,7 @@ using UnityEngine; using UnityEngine.SceneManagement; -namespace ETModel +namespace ET { [ObjectSystem] public class SceneChangeComponentUpdateSystem: UpdateSystem diff --git a/Unity/Assets/Model/Component/SceneChangeComponent.cs.meta b/Unity/Assets/Model/Entity/SceneChangeComponent.cs.meta similarity index 69% rename from Unity/Assets/Model/Component/SceneChangeComponent.cs.meta rename to Unity/Assets/Model/Entity/SceneChangeComponent.cs.meta index d946d84354eab56118f5a69643b25e438a64b805..00685bf01eb8215bf017b424bf211f2ce6325337 100644 --- a/Unity/Assets/Model/Component/SceneChangeComponent.cs.meta +++ b/Unity/Assets/Model/Entity/SceneChangeComponent.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: ff168b850f1f27e4dbc2cd1e1b918a35 -timeCreated: 1505704993 -licenseType: Free +guid: 401b38c3c4011244985e75f18116ca0e MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Unity/Assets/Model/Entity/SceneType.cs b/Unity/Assets/Model/Entity/SceneType.cs index 5e09c1a849b9468f04fbb369ae41faa3123166bd..008cb0fb1d24ea9e821b2251e5f739085bacb2e5 100644 --- a/Unity/Assets/Model/Entity/SceneType.cs +++ b/Unity/Assets/Model/Entity/SceneType.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public enum SceneType { diff --git a/Unity/Assets/Model/Component/TimerComponent.cs b/Unity/Assets/Model/Entity/TimerComponent.cs similarity index 99% rename from Unity/Assets/Model/Component/TimerComponent.cs rename to Unity/Assets/Model/Entity/TimerComponent.cs index 71e8fe95dd65aa734e1b4fa100d7f2d6abc9e9c4..48247bf0371e7a0a3e3ad2fd494915668186bb74 100644 --- a/Unity/Assets/Model/Component/TimerComponent.cs +++ b/Unity/Assets/Model/Entity/TimerComponent.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Threading; -namespace ETModel +namespace ET { public interface ITimer { diff --git a/Unity/Assets/Model/Component/TimerComponent.cs.meta b/Unity/Assets/Model/Entity/TimerComponent.cs.meta similarity index 69% rename from Unity/Assets/Model/Component/TimerComponent.cs.meta rename to Unity/Assets/Model/Entity/TimerComponent.cs.meta index 08464c885134285a689735aebe3bbf6fce7cfbe8..e6fba900a7608529350966d873defcbcb3a7a3cc 100644 --- a/Unity/Assets/Model/Component/TimerComponent.cs.meta +++ b/Unity/Assets/Model/Entity/TimerComponent.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 2f4a73ac996f1404aa1866a86140fe38 -timeCreated: 1498117617 -licenseType: Free +guid: 97811170f5fb5904e97754177178d43b MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Unity/Assets/Model/Entity/UnityWebRequestAsync.cs.meta b/Unity/Assets/Model/Entity/UnityWebRequestAsync.cs.meta deleted file mode 100644 index e38e1b61c36106b5fdc146b7e6561fa8802ec258..0000000000000000000000000000000000000000 --- a/Unity/Assets/Model/Entity/UnityWebRequestAsync.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 7de0fad0369a4e589c1ae427717f5b01 -timeCreated: 1510746129 \ No newline at end of file diff --git a/Unity/Assets/Model/Helper/ActionHelper.cs b/Unity/Assets/Model/Helper/ActionHelper.cs index f7478d6bb68aa57d550a07740224194019a14f20..08a9e0af324bbd07dbfcdd625fa54e87145341cc 100644 --- a/Unity/Assets/Model/Helper/ActionHelper.cs +++ b/Unity/Assets/Model/Helper/ActionHelper.cs @@ -1,7 +1,7 @@ using System; using UnityEngine.UI; -namespace ETModel +namespace ET { public static class ActionHelper { diff --git a/Unity/Assets/Model/Helper/BundleHelper.cs b/Unity/Assets/Model/Helper/BundleHelper.cs index 4327cd7eb477c8f6de4eb3da9c2e0187b0f43a05..0b750865378771585983b98a259b8c2801b73cef 100644 --- a/Unity/Assets/Model/Helper/BundleHelper.cs +++ b/Unity/Assets/Model/Helper/BundleHelper.cs @@ -3,7 +3,7 @@ using System.IO; using System.Threading.Tasks; using UnityEngine; -namespace ETModel +namespace ET { public static class BundleHelper { diff --git a/Unity/Assets/Model/Helper/GameObjectHelper.cs b/Unity/Assets/Model/Helper/GameObjectHelper.cs index f58b2a76785b748339654703f99841bb96001bdc..4d279f042d64457f5d9f1239e72f906c029f8c09 100644 --- a/Unity/Assets/Model/Helper/GameObjectHelper.cs +++ b/Unity/Assets/Model/Helper/GameObjectHelper.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace ETModel +namespace ET { public static class GameObjectHelper { diff --git a/Unity/Assets/Model/Helper/PathHelper.cs b/Unity/Assets/Model/Helper/PathHelper.cs index e4841ad84ab52d0e9a52090d10a440b46102ebb6..abe06b116b5344ce0dd31a3e2dad630ebe24e983 100644 --- a/Unity/Assets/Model/Helper/PathHelper.cs +++ b/Unity/Assets/Model/Helper/PathHelper.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace ETModel +namespace ET { public static class PathHelper { /// diff --git a/Unity/Assets/Model/Helper/PositionHelper.cs b/Unity/Assets/Model/Helper/PositionHelper.cs index ba25d198a5194e8053da7230aac730fff9c0876b..b870a2d182f48c36a89ad44a737e24ecae4e468a 100644 --- a/Unity/Assets/Model/Helper/PositionHelper.cs +++ b/Unity/Assets/Model/Helper/PositionHelper.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace ETModel +namespace ET { public static class PositionHelper { diff --git a/Unity/Assets/Model/Helper/ResourcesHelper.cs b/Unity/Assets/Model/Helper/ResourcesHelper.cs index 084f0343340be3fdfa69ada129953b5519ad303c..01d14e3fb77daed4294b9eabe22c99bb4688bbc2 100644 --- a/Unity/Assets/Model/Helper/ResourcesHelper.cs +++ b/Unity/Assets/Model/Helper/ResourcesHelper.cs @@ -8,7 +8,7 @@ using UnityEngine; using UnityEditor; #endif -namespace ETModel +namespace ET { public static class ResourcesHelper { diff --git a/Unity/Assets/Model/Init.cs b/Unity/Assets/Model/Init.cs index 907edc4d8c1ad1593e7917618289f0585ad175b0..0725524826dba0d55b59c01c6e7218e8354d8315 100644 --- a/Unity/Assets/Model/Init.cs +++ b/Unity/Assets/Model/Init.cs @@ -2,7 +2,7 @@ using System.Threading; using UnityEngine; -namespace ETModel +namespace ET { public class Init : MonoBehaviour { diff --git a/Unity/Assets/Model/Module/Actor/IActorMessage.cs b/Unity/Assets/Model/Module/Actor/IActorMessage.cs index d33998165f71c59ea31c65fde40ed8aa81a88064..f01e2ebdc43230216e02cea65593d51bca6e3efb 100644 --- a/Unity/Assets/Model/Module/Actor/IActorMessage.cs +++ b/Unity/Assets/Model/Module/Actor/IActorMessage.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { // 不需要返回消息 public interface IActorMessage: IMessage diff --git a/Unity/Assets/Model/Module/ActorLocation/IActorLocationMessage.cs b/Unity/Assets/Model/Module/ActorLocation/IActorLocationMessage.cs index 364516ee0644c188acc9a2ad4972b307e2e31200..3da0393c4cfc766c2da65d37a181d54ad86db04f 100644 --- a/Unity/Assets/Model/Module/ActorLocation/IActorLocationMessage.cs +++ b/Unity/Assets/Model/Module/ActorLocation/IActorLocationMessage.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public interface IActorLocationMessage : IActorRequest { diff --git a/Unity/Assets/Model/Module/AssetsBundle/AssetsBundleLoaderAsync.cs b/Unity/Assets/Model/Module/AssetsBundle/AssetsBundleLoaderAsync.cs index bcb26ed450ee5d82fbca49192b0d43464708fed1..a28d55ba1bc82716c416b1744f94a509ae330bf7 100644 --- a/Unity/Assets/Model/Module/AssetsBundle/AssetsBundleLoaderAsync.cs +++ b/Unity/Assets/Model/Module/AssetsBundle/AssetsBundleLoaderAsync.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using UnityEngine; -namespace ETModel +namespace ET { [ObjectSystem] public class AssetsBundleLoaderAsyncSystem : UpdateSystem diff --git a/Unity/Assets/Model/Module/AssetsBundle/AssetsLoaderAsync.cs b/Unity/Assets/Model/Module/AssetsBundle/AssetsLoaderAsync.cs index c4280048fd2e092a41fa7844403af57475ed48e3..a33e59ab5c84851ea55b76c47674f07ccafd3bce 100644 --- a/Unity/Assets/Model/Module/AssetsBundle/AssetsLoaderAsync.cs +++ b/Unity/Assets/Model/Module/AssetsBundle/AssetsLoaderAsync.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using UnityEngine; -namespace ETModel +namespace ET { [ObjectSystem] public class AssetsLoaderAsyncAwakeSystem : AwakeSystem diff --git a/Unity/Assets/Model/Module/AssetsBundle/BundleDownloaderComponent.cs b/Unity/Assets/Model/Module/AssetsBundle/BundleDownloaderComponent.cs index 941a3e03c6c9eb922ac80323acd1621e144f113b..38f19fb5fa3c3ef9a89df41c86404d4d2f5e35a4 100644 --- a/Unity/Assets/Model/Module/AssetsBundle/BundleDownloaderComponent.cs +++ b/Unity/Assets/Model/Module/AssetsBundle/BundleDownloaderComponent.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Threading.Tasks; -namespace ETModel +namespace ET { [ObjectSystem] public class UiBundleDownloaderComponentAwakeSystem : AwakeSystem diff --git a/Unity/Assets/Model/Module/AssetsBundle/ResourcesComponent.cs b/Unity/Assets/Model/Module/AssetsBundle/ResourcesComponent.cs index 3949073afab39a16b6e09ebe439cf0843602cc32..6710285a159d683c8ab995cab8a590bfcd4ab597 100644 --- a/Unity/Assets/Model/Module/AssetsBundle/ResourcesComponent.cs +++ b/Unity/Assets/Model/Module/AssetsBundle/ResourcesComponent.cs @@ -8,7 +8,7 @@ using UnityEngine; using UnityEditor; #endif -namespace ETModel +namespace ET { [ObjectSystem] public class ABInfoAwakeSystem : AwakeSystem diff --git a/Unity/Assets/Model/Module/AssetsBundle/VersionConfig.cs b/Unity/Assets/Model/Module/AssetsBundle/VersionConfig.cs index e7aed8f6c76a84dd9e825067ccc97337df97d162..1ff9ab74e778f9888cefebefb057269c0c4e5362 100644 --- a/Unity/Assets/Model/Module/AssetsBundle/VersionConfig.cs +++ b/Unity/Assets/Model/Module/AssetsBundle/VersionConfig.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using MongoDB.Bson.Serialization.Attributes; -namespace ETModel +namespace ET { public class FileVersionInfo { diff --git a/Unity/Assets/Model/Module/Config/ACategory.cs b/Unity/Assets/Model/Module/Config/ACategory.cs index be5e3aef916a35a034049bc9faf2ef386433ed13..bb2945e58a3289a3505df4bce56bd2fbaa30745b 100644 --- a/Unity/Assets/Model/Module/Config/ACategory.cs +++ b/Unity/Assets/Model/Module/Config/ACategory.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace ETModel +namespace ET { public abstract class ACategory : Object { diff --git a/Unity/Assets/Model/Module/Config/AConfigComponent.cs b/Unity/Assets/Model/Module/Config/AConfigComponent.cs index 62d8ec94302e0e6857b335dda09b6a025491f07a..868049811bec2ff63303cb38ba0c0ade702fbf68 100644 --- a/Unity/Assets/Model/Module/Config/AConfigComponent.cs +++ b/Unity/Assets/Model/Module/Config/AConfigComponent.cs @@ -2,7 +2,7 @@ using UnityEngine; #endif -namespace ETModel +namespace ET { /// /// 每个Config的基类 diff --git a/Unity/Assets/Model/Module/Config/ConfigAttribute.cs b/Unity/Assets/Model/Module/Config/ConfigAttribute.cs index 10c960d17ff235afd101639966e3d6c74a5a2ca6..137e7339055ab1180bdef243ea2da538f99b42f3 100644 --- a/Unity/Assets/Model/Module/Config/ConfigAttribute.cs +++ b/Unity/Assets/Model/Module/Config/ConfigAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { [AttributeUsage(AttributeTargets.Class)] public class ConfigAttribute: BaseAttribute diff --git a/Unity/Assets/Model/Module/Config/ConfigComponent.cs b/Unity/Assets/Model/Module/Config/ConfigComponent.cs index bacc47087c153dd569345c5c32e235b8673cc320..459388ced4408b7186980f085894646b32fc9c46 100644 --- a/Unity/Assets/Model/Module/Config/ConfigComponent.cs +++ b/Unity/Assets/Model/Module/Config/ConfigComponent.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace ETModel +namespace ET { /// /// Config组件会扫描所有的有ConfigAttribute标签的配置,加载进来 diff --git a/Unity/Assets/Model/Module/Config/ConfigHelper.cs b/Unity/Assets/Model/Module/Config/ConfigHelper.cs index 5711a582525e52263fa7b54c5a347ed392cbdb47..bdbec321ffd59b7322fccf58f55a9111b834b7d8 100644 --- a/Unity/Assets/Model/Module/Config/ConfigHelper.cs +++ b/Unity/Assets/Model/Module/Config/ConfigHelper.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace ETModel +namespace ET { public static class ConfigHelper { diff --git a/Unity/Assets/Model/Module/Config/IConfig.cs b/Unity/Assets/Model/Module/Config/IConfig.cs index cf283e014e6ea0bd5e4d8980e050d5dc25aa010f..a1820853b0991b3156c0078eaee255da30636cb0 100644 --- a/Unity/Assets/Model/Module/Config/IConfig.cs +++ b/Unity/Assets/Model/Module/Config/IConfig.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { /// /// 每个Config的基类 diff --git a/Unity/Assets/Model/Module/CoroutineLock/CoroutineLock.cs b/Unity/Assets/Model/Module/CoroutineLock/CoroutineLock.cs index 646afa646dabede5b1403a9c404aa0435efea1f4..c217f16f103e0d49ed1b932720be3fc232034088 100644 --- a/Unity/Assets/Model/Module/CoroutineLock/CoroutineLock.cs +++ b/Unity/Assets/Model/Module/CoroutineLock/CoroutineLock.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { [ObjectSystem] public class CoroutineLockSystem : AwakeSystem diff --git a/Unity/Assets/Model/Module/CoroutineLock/CoroutineLockComponent.cs b/Unity/Assets/Model/Module/CoroutineLock/CoroutineLockComponent.cs index 4462cedc882d48ef334c922c02bfa1540f1f48fd..9774706a40b9144d17cf88a40bb88a52a228018e 100644 --- a/Unity/Assets/Model/Module/CoroutineLock/CoroutineLockComponent.cs +++ b/Unity/Assets/Model/Module/CoroutineLock/CoroutineLockComponent.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace ETModel +namespace ET { [ObjectSystem] public class CoroutineLockComponentSystem : AwakeSystem diff --git a/Unity/Assets/Model/Module/CoroutineLock/CoroutineLockQueue.cs b/Unity/Assets/Model/Module/CoroutineLock/CoroutineLockQueue.cs index b3483fa420771fe65cb25afe8a62f786848a817b..11b670cf8e350c91f62caa161ef093fa295531bf 100644 --- a/Unity/Assets/Model/Module/CoroutineLock/CoroutineLockQueue.cs +++ b/Unity/Assets/Model/Module/CoroutineLock/CoroutineLockQueue.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace ETModel +namespace ET { public class CoroutineLockQueue: Entity { diff --git a/Unity/Assets/Model/Module/CoroutineLock/CoroutineLockQueueType.cs b/Unity/Assets/Model/Module/CoroutineLock/CoroutineLockQueueType.cs index 861d3a92797039b6095b573e9af33f09d2b45fe3..0ed9cb0d6466c0bcdb861e749e7e6fa64bdab4e3 100644 --- a/Unity/Assets/Model/Module/CoroutineLock/CoroutineLockQueueType.cs +++ b/Unity/Assets/Model/Module/CoroutineLock/CoroutineLockQueueType.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace ETModel +namespace ET { public class CoroutineLockQueueType: Entity { diff --git a/Unity/Assets/Model/Module/CoroutineLock/CoroutineLockType.cs b/Unity/Assets/Model/Module/CoroutineLock/CoroutineLockType.cs index feefdb4aea1fa734b9579c249b0af7aae826a2be..ec95a17006eb670866bb564440975735564a212f 100644 --- a/Unity/Assets/Model/Module/CoroutineLock/CoroutineLockType.cs +++ b/Unity/Assets/Model/Module/CoroutineLock/CoroutineLockType.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public enum CoroutineLockType { diff --git a/Unity/Assets/Model/Module/Message/AMHandler.cs b/Unity/Assets/Model/Module/Message/AMHandler.cs index dbc3d0dd5b2152c82122d616ac61a7505327face..c7c002fead6ce0d7ffa7f090656f4141830fd222 100644 --- a/Unity/Assets/Model/Module/Message/AMHandler.cs +++ b/Unity/Assets/Model/Module/Message/AMHandler.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public abstract class AMHandler : IMHandler where Message: class { diff --git a/Unity/Assets/Model/Module/Message/ErrorCode.cs b/Unity/Assets/Model/Module/Message/ErrorCode.cs index 3ac66fe830ad5ed5edb22766a2a674142948501c..a2e8ef491ecf4a7d2336a67007d1aa3afb68b126 100644 --- a/Unity/Assets/Model/Module/Message/ErrorCode.cs +++ b/Unity/Assets/Model/Module/Message/ErrorCode.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public static class ErrorCode { diff --git a/Unity/Assets/Model/Module/Message/IMHandler.cs b/Unity/Assets/Model/Module/Message/IMHandler.cs index 5a6c01fa01ce52c28fa3ad170dd54f483c4a8b14..c57e223e5fdb13bbfa979c0e06241a87b32ecf69 100644 --- a/Unity/Assets/Model/Module/Message/IMHandler.cs +++ b/Unity/Assets/Model/Module/Message/IMHandler.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public interface IMHandler { diff --git a/Unity/Assets/Model/Module/Message/IMessage.cs b/Unity/Assets/Model/Module/Message/IMessage.cs index da3b1b0873b6f40e700c8e1b11d2fd042555c8f7..0ef56132ce1d2bc05e1cc3430603717637e7e45c 100644 --- a/Unity/Assets/Model/Module/Message/IMessage.cs +++ b/Unity/Assets/Model/Module/Message/IMessage.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public interface IMessage { diff --git a/Unity/Assets/Model/Module/Message/IMessageDispatcher.cs b/Unity/Assets/Model/Module/Message/IMessageDispatcher.cs index 528d9fb9e2a0d5d030b1e24ed12d3450ef8e32bd..72e4ba6cad3571fe7de0240689ff5d65fc9c5652 100644 --- a/Unity/Assets/Model/Module/Message/IMessageDispatcher.cs +++ b/Unity/Assets/Model/Module/Message/IMessageDispatcher.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public interface IMessageDispatcher { diff --git a/Unity/Assets/Model/Module/Message/IMessagePacker.cs b/Unity/Assets/Model/Module/Message/IMessagePacker.cs index 7020899c889c60902beb4b3747e41b356b8b276e..38fbe106a87397bbae1461dde0ff936e7416492a 100644 --- a/Unity/Assets/Model/Module/Message/IMessagePacker.cs +++ b/Unity/Assets/Model/Module/Message/IMessagePacker.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace ETModel +namespace ET { public interface IMessagePacker { diff --git a/Unity/Assets/Model/Module/Message/MessageAttribute.cs b/Unity/Assets/Model/Module/Message/MessageAttribute.cs index dc8319bf64d2d204428ced1d6b1723c8cf5fde7e..36ddaf07df66fc6c1bb852c15e35ef8414fc622d 100644 --- a/Unity/Assets/Model/Module/Message/MessageAttribute.cs +++ b/Unity/Assets/Model/Module/Message/MessageAttribute.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public class MessageAttribute: BaseAttribute { diff --git a/Unity/Assets/Model/Module/Message/MessageDispatcherComponent.cs b/Unity/Assets/Model/Module/Message/MessageDispatcherComponent.cs index fe94f72bf605fad62d497e51f4613219618a8d45..34b4a9032204bc9f6805705c6c641845f1f144b6 100644 --- a/Unity/Assets/Model/Module/Message/MessageDispatcherComponent.cs +++ b/Unity/Assets/Model/Module/Message/MessageDispatcherComponent.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace ETModel +namespace ET { [ObjectSystem] public class MessageDispatcherComponentAwakeSystem : AwakeSystem diff --git a/Unity/Assets/Model/Module/Message/MessageHandlerAttribute.cs b/Unity/Assets/Model/Module/Message/MessageHandlerAttribute.cs index 9e21c78a7fc2faa46547f773e2d7d5d6206ef1b3..0fdc233cb761a7fb7f1acec1e1dc17749bcb41b5 100644 --- a/Unity/Assets/Model/Module/Message/MessageHandlerAttribute.cs +++ b/Unity/Assets/Model/Module/Message/MessageHandlerAttribute.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public class MessageHandlerAttribute : BaseAttribute { diff --git a/Unity/Assets/Model/Module/Message/MessageInfo.cs b/Unity/Assets/Model/Module/Message/MessageInfo.cs index 0d822d750346b2c8901237db19ef4c6f35f87918..f8fda9be8abef06b05e422dd10c1659463a814a9 100644 --- a/Unity/Assets/Model/Module/Message/MessageInfo.cs +++ b/Unity/Assets/Model/Module/Message/MessageInfo.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public struct MessageInfo { diff --git a/Unity/Assets/Model/Module/Message/MessagePool.cs b/Unity/Assets/Model/Module/Message/MessagePool.cs index 3bd42fadf634831993ae75544bd537461159493e..bcea0b890d504aab57403d03c5671b178657e0f0 100644 --- a/Unity/Assets/Model/Module/Message/MessagePool.cs +++ b/Unity/Assets/Model/Module/Message/MessagePool.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #endif -namespace ETModel +namespace ET { // 客户端为了0GC需要消息池，服务端消息需要跨协程不需要消息池 public class MessagePool diff --git a/Unity/Assets/Model/Module/Message/MessageProxy.cs b/Unity/Assets/Model/Module/Message/MessageProxy.cs index 40457f752a64799331967efe65ff72f23d24d871..ec840ab680c035179683ef83b95a65d9f7eb3829 100644 --- a/Unity/Assets/Model/Module/Message/MessageProxy.cs +++ b/Unity/Assets/Model/Module/Message/MessageProxy.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { public class MessageProxy: IMHandler { diff --git a/Unity/Assets/Model/Module/Message/NetOuterComponent.cs b/Unity/Assets/Model/Module/Message/NetOuterComponent.cs index bbb795e6c21e96251bdc98d77336b03bfb6ed0c7..182020da83bb6efdfa03b13908dccad63979e47d 100644 --- a/Unity/Assets/Model/Module/Message/NetOuterComponent.cs +++ b/Unity/Assets/Model/Module/Message/NetOuterComponent.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public class NetOuterComponent : NetworkComponent { diff --git a/Unity/Assets/Model/Module/Message/Network/AChannel.cs b/Unity/Assets/Model/Module/Message/Network/AChannel.cs index 6da613a22d777e596e616c650402767f262808a9..d7a85c22a9b582fc34f02338d1d3f4594d7a3420 100644 --- a/Unity/Assets/Model/Module/Message/Network/AChannel.cs +++ b/Unity/Assets/Model/Module/Message/Network/AChannel.cs @@ -2,7 +2,7 @@ using System.IO; using System.Net; -namespace ETModel +namespace ET { public enum ChannelType { diff --git a/Unity/Assets/Model/Module/Message/Network/AService.cs b/Unity/Assets/Model/Module/Message/Network/AService.cs index 1f1b159687515ba8593a9cd7601e86ce74ca6a37..b050bc05713e91c32cea65f6eca23b4daf827df3 100644 --- a/Unity/Assets/Model/Module/Message/Network/AService.cs +++ b/Unity/Assets/Model/Module/Message/Network/AService.cs @@ -1,7 +1,7 @@ using System; using System.Net; -namespace ETModel +namespace ET { public enum NetworkProtocol { diff --git a/Unity/Assets/Model/Module/Message/Network/Circularbuffer.cs b/Unity/Assets/Model/Module/Message/Network/Circularbuffer.cs index 2abf9813b9d69af216d782e091eb7bd0ef22e86b..51dba59050c3694cba4c3ee4fc06af9aa4eb3b46 100644 --- a/Unity/Assets/Model/Module/Message/Network/Circularbuffer.cs +++ b/Unity/Assets/Model/Module/Message/Network/Circularbuffer.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; -namespace ETModel +namespace ET { public class CircularBuffer: Stream { diff --git a/Unity/Assets/Model/Module/Message/Network/KCP/KChannel.cs b/Unity/Assets/Model/Module/Message/Network/KCP/KChannel.cs index fa714122612506674f8c4262f1b83f9abff31654..59b2a2a6554b3aba0bd6a3c3fd2b06a7bdb8565d 100644 --- a/Unity/Assets/Model/Module/Message/Network/KCP/KChannel.cs +++ b/Unity/Assets/Model/Module/Message/Network/KCP/KChannel.cs @@ -5,7 +5,7 @@ using System.Net; using System.Net.Sockets; using System.Runtime.InteropServices; -namespace ETModel +namespace ET { public struct WaitSendBuffer { diff --git a/Unity/Assets/Model/Module/Message/Network/KCP/KService.cs b/Unity/Assets/Model/Module/Message/Network/KCP/KService.cs index 114dacab64ca2bd774dd11381724752978ca4036..6d1798e835915ef7eb3a8d092b8b471895ba0c09 100644 --- a/Unity/Assets/Model/Module/Message/Network/KCP/KService.cs +++ b/Unity/Assets/Model/Module/Message/Network/KCP/KService.cs @@ -8,7 +8,7 @@ using Microsoft.IO; using System.Runtime.InteropServices; #endif -namespace ETModel +namespace ET { public static class KcpProtocalType { diff --git a/Unity/Assets/Model/Module/Message/Network/KCP/Kcp.cs b/Unity/Assets/Model/Module/Message/Network/KCP/Kcp.cs index 21905aca46f591085d4ce54065fb547081803b50..f0e0619db62a144eb343a11e5215e0e7a89e3633 100644 --- a/Unity/Assets/Model/Module/Message/Network/KCP/Kcp.cs +++ b/Unity/Assets/Model/Module/Message/Network/KCP/Kcp.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -namespace ETModel +namespace ET { public delegate int KcpOutput(IntPtr buf, int len, IntPtr kcp, IntPtr user); diff --git a/Unity/Assets/Model/Module/Message/Network/NetworkHelper.cs b/Unity/Assets/Model/Module/Message/Network/NetworkHelper.cs index 46ebc8d0f079ae7d13f98918e630752af9da4a6f..fabb73b56623121a72e03e83be244dc6ebb754ad 100644 --- a/Unity/Assets/Model/Module/Message/Network/NetworkHelper.cs +++ b/Unity/Assets/Model/Module/Message/Network/NetworkHelper.cs @@ -1,6 +1,6 @@ using System.Net; -namespace ETModel +namespace ET { public static class NetworkHelper { diff --git a/Unity/Assets/Model/Module/Message/Network/TCP/PacketParser.cs b/Unity/Assets/Model/Module/Message/Network/TCP/PacketParser.cs index 37dcff909d64ed6486f225402c3be88cbea0b9a8..cada1df46ca386cfe2e93e21988e166079dfa37f 100644 --- a/Unity/Assets/Model/Module/Message/Network/TCP/PacketParser.cs +++ b/Unity/Assets/Model/Module/Message/Network/TCP/PacketParser.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace ETModel +namespace ET { public enum ParserState { diff --git a/Unity/Assets/Model/Module/Message/Network/TCP/TChannel.cs b/Unity/Assets/Model/Module/Message/Network/TCP/TChannel.cs index 432d6a3151c53c3c941cb0b59b473b46ba942be5..62471ef57a7376f46814115264837f32d63c1300 100644 --- a/Unity/Assets/Model/Module/Message/Network/TCP/TChannel.cs +++ b/Unity/Assets/Model/Module/Message/Network/TCP/TChannel.cs @@ -6,7 +6,7 @@ using System.Net; using System.Net.Sockets; using Microsoft.IO; -namespace ETModel +namespace ET { /// /// 封装Socket,将回调push到主线程处理 diff --git a/Unity/Assets/Model/Module/Message/Network/TCP/TService.cs b/Unity/Assets/Model/Module/Message/Network/TCP/TService.cs index 1e0ac0010972ea919bfc2b1620a5bb332a113d5a..91deb05c4d8ed182459b64470061076cc5615ee6 100644 --- a/Unity/Assets/Model/Module/Message/Network/TCP/TService.cs +++ b/Unity/Assets/Model/Module/Message/Network/TCP/TService.cs @@ -5,7 +5,7 @@ using System.Net; using System.Net.Sockets; using Microsoft.IO; -namespace ETModel +namespace ET { public sealed class TService : AService { diff --git a/Unity/Assets/Model/Module/Message/Network/WebSocket/WChannel.cs b/Unity/Assets/Model/Module/Message/Network/WebSocket/WChannel.cs index 6d11962758cbe78700c83f49601645680ed0e09a..7e4eeb4340e7aa3a26bf6b6dd0d232577e6cd615 100644 --- a/Unity/Assets/Model/Module/Message/Network/WebSocket/WChannel.cs +++ b/Unity/Assets/Model/Module/Message/Network/WebSocket/WChannel.cs @@ -4,7 +4,7 @@ using System.IO; using System.Net.WebSockets; using System.Threading; -namespace ETModel +namespace ET { public class WChannel: AChannel { diff --git a/Unity/Assets/Model/Module/Message/Network/WebSocket/WService.cs b/Unity/Assets/Model/Module/Message/Network/WebSocket/WService.cs index 653d765a4cd6636b8c47b009fe7f27bf0c1c972c..7811e46a59bb37ceff951648013d35c6d4b97856 100644 --- a/Unity/Assets/Model/Module/Message/Network/WebSocket/WService.cs +++ b/Unity/Assets/Model/Module/Message/Network/WebSocket/WService.cs @@ -4,7 +4,7 @@ using System.Net; using System.Net.WebSockets; using Microsoft.IO; -namespace ETModel +namespace ET { public class WService: AService { diff --git a/Unity/Assets/Model/Module/Message/NetworkComponent.cs b/Unity/Assets/Model/Module/Message/NetworkComponent.cs index 85f28d2e75bc8d301b66ca463d48abbea79df34c..80a545b5169d880ee3df9b950d305dfc70e74a01 100644 --- a/Unity/Assets/Model/Module/Message/NetworkComponent.cs +++ b/Unity/Assets/Model/Module/Message/NetworkComponent.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Net; -namespace ETModel +namespace ET { public abstract class NetworkComponent : Entity { diff --git a/Unity/Assets/Model/Module/Message/Opcode.cs b/Unity/Assets/Model/Module/Message/Opcode.cs index d4d1db4c7359a31f2cb0c771a495dba0288d1530..8211c66fb5e64ceb7bd9dbef928df2b71850af92 100644 --- a/Unity/Assets/Model/Module/Message/Opcode.cs +++ b/Unity/Assets/Model/Module/Message/Opcode.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public static partial class Opcode { diff --git a/Unity/Assets/Model/Module/Message/OpcodeHelper.cs b/Unity/Assets/Model/Module/Message/OpcodeHelper.cs index 08cd658bb4c40f6262ce0112fe92723bdd656020..eb70ef64fa200df65b7b53b0673300f4fe77447c 100644 --- a/Unity/Assets/Model/Module/Message/OpcodeHelper.cs +++ b/Unity/Assets/Model/Module/Message/OpcodeHelper.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace ETModel +namespace ET { public static class OpcodeHelper { diff --git a/Unity/Assets/Model/Module/Message/OpcodeTypeComponent.cs b/Unity/Assets/Model/Module/Message/OpcodeTypeComponent.cs index 9b7472ae6c930446bf5cefcd674ed69687ab4b23..8bac3e6c946c73324cda03cfe68c40e843c04a60 100644 --- a/Unity/Assets/Model/Module/Message/OpcodeTypeComponent.cs +++ b/Unity/Assets/Model/Module/Message/OpcodeTypeComponent.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace ETModel +namespace ET { [ObjectSystem] public class OpcodeTypeComponentAwakeSystem : AwakeSystem diff --git a/Unity/Assets/Model/Module/Message/OuterMessage.cs b/Unity/Assets/Model/Module/Message/OuterMessage.cs index 06bab62f81eb94425c81916693d8291c6f7f136d..6ae20e94c030c13a6426e66f6b5201e988b96cf3 100644 --- a/Unity/Assets/Model/Module/Message/OuterMessage.cs +++ b/Unity/Assets/Model/Module/Message/OuterMessage.cs @@ -6,7 +6,7 @@ using pb = global::Google.Protobuf; using pbc = global::Google.Protobuf.Collections; using scg = global::System.Collections.Generic; -namespace ETModel { +namespace ET { #region Messages public partial class C2M_TestRequest : pb::IMessage { @@ -453,13 +453,13 @@ namespace ETModel { } } - private static readonly pb::FieldCodec _repeated_units_codec - = pb::FieldCodec.ForMessage(18, global::ETModel.UnitInfo.Parser); - private pbc::RepeatedField units_ = new pbc::RepeatedField(); + private static readonly pb::FieldCodec _repeated_units_codec + = pb::FieldCodec.ForMessage(18, global::ET.UnitInfo.Parser); + private pbc::RepeatedField units_ = new pbc::RepeatedField(); /// /// 所有的unit /// - public pbc::RepeatedField Units { + public pbc::RepeatedField Units { get { return units_; } set { units_ = value; } } @@ -666,10 +666,10 @@ namespace ETModel { } } - private static readonly pb::FieldCodec _repeated_units_codec - = pb::FieldCodec.ForMessage(10, global::ETModel.UnitInfo.Parser); - private pbc::RepeatedField units_ = new pbc::RepeatedField(); - public pbc::RepeatedField Units { + private static readonly pb::FieldCodec _repeated_units_codec + = pb::FieldCodec.ForMessage(10, global::ET.UnitInfo.Parser); + private pbc::RepeatedField units_ = new pbc::RepeatedField(); + public pbc::RepeatedField Units { get { return units_; } set { units_ = value; } } @@ -2152,18 +2152,18 @@ namespace ETModel { } } - private global::ETModel.PlayerInfo playerInfo_; - public global::ETModel.PlayerInfo PlayerInfo { + private global::ET.PlayerInfo playerInfo_; + public global::ET.PlayerInfo PlayerInfo { get { return playerInfo_; } set { playerInfo_ = value; } } - private static readonly pb::FieldCodec _repeated_playerInfos_codec - = pb::FieldCodec.ForMessage(18, global::ETModel.PlayerInfo.Parser); - private pbc::RepeatedField playerInfos_ = new pbc::RepeatedField(); - public pbc::RepeatedField PlayerInfos { + private static readonly pb::FieldCodec _repeated_playerInfos_codec + = pb::FieldCodec.ForMessage(18, global::ET.PlayerInfo.Parser); + private pbc::RepeatedField playerInfos_ = new pbc::RepeatedField(); + public pbc::RepeatedField PlayerInfos { get { return playerInfos_; } set { playerInfos_ = value; } } @@ -2254,7 +2254,7 @@ namespace ETModel { break; case 10: { if (playerInfo_ == null) { - playerInfo_ = new global::ETModel.PlayerInfo(); + playerInfo_ = new global::ET.PlayerInfo(); } input.ReadMessage(playerInfo_); break; diff --git a/Unity/Assets/Model/Module/Message/OuterMessageDispatcher.cs b/Unity/Assets/Model/Module/Message/OuterMessageDispatcher.cs index a4b7addb66fbbf1850de96fe8b72eb3d93dee2d5..f599fd2f2d0076e15c7efe914a1b27e0224e2823 100644 --- a/Unity/Assets/Model/Module/Message/OuterMessageDispatcher.cs +++ b/Unity/Assets/Model/Module/Message/OuterMessageDispatcher.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public class OuterMessageDispatcher: IMessageDispatcher { diff --git a/Unity/Assets/Model/Module/Message/OuterOpcode.cs b/Unity/Assets/Model/Module/Message/OuterOpcode.cs index 99b043da23f7bafadbe578eea8b09a427acbb96a..3edaa7515a534568a24b8b1809e5355dcddca5d8 100644 --- a/Unity/Assets/Model/Module/Message/OuterOpcode.cs +++ b/Unity/Assets/Model/Module/Message/OuterOpcode.cs @@ -1,5 +1,5 @@ -using ETModel; -namespace ETModel + +namespace ET { [Message(OuterOpcode.C2M_TestRequest)] public partial class C2M_TestRequest : IActorLocationRequest {} @@ -79,7 +79,7 @@ namespace ETModel public partial class G2C_PlayerInfo : IResponse {} } -namespace ETModel +namespace ET { public static partial class OuterOpcode { diff --git a/Unity/Assets/Model/Module/Message/ProtobufHelper.cs b/Unity/Assets/Model/Module/Message/ProtobufHelper.cs index ac6744b12b35898d65635234359c89ab3cc238f9..94d8b830dde1e2db11123e51eb4d3cbc4052df50 100644 --- a/Unity/Assets/Model/Module/Message/ProtobufHelper.cs +++ b/Unity/Assets/Model/Module/Message/ProtobufHelper.cs @@ -3,7 +3,7 @@ using System.ComponentModel; using System.IO; using Google.Protobuf; -namespace ETModel +namespace ET { public static class ProtobufHelper { diff --git a/Unity/Assets/Model/Module/Message/ProtobufPacker.cs b/Unity/Assets/Model/Module/Message/ProtobufPacker.cs index b3cb8fea5c2641211dd72a859d11d167aac72684..a258eaed06af2399e7025ee580076221eb4ea9a9 100644 --- a/Unity/Assets/Model/Module/Message/ProtobufPacker.cs +++ b/Unity/Assets/Model/Module/Message/ProtobufPacker.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace ETModel +namespace ET { public class ProtobufPacker : IMessagePacker { diff --git a/Unity/Assets/Model/Module/Message/RpcException.cs b/Unity/Assets/Model/Module/Message/RpcException.cs index 9403481ff1e3e21454ee9b2c6308976f5a8bf99d..8b4ef3718691eba1756b800627d5970d60115b60 100644 --- a/Unity/Assets/Model/Module/Message/RpcException.cs +++ b/Unity/Assets/Model/Module/Message/RpcException.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { /// /// RPC异常,带ErrorCode diff --git a/Unity/Assets/Model/Module/Message/Session.cs b/Unity/Assets/Model/Module/Message/Session.cs index 018f0bde020e15aa48b2e831c5c55e1d754f67b4..a3918efe5f3a753efb4f036d844c01b9fe1299e4 100644 --- a/Unity/Assets/Model/Module/Message/Session.cs +++ b/Unity/Assets/Model/Module/Message/Session.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -namespace ETModel +namespace ET { [ObjectSystem] public class SessionAwakeSystem : AwakeSystem diff --git a/Unity/Assets/Model/Module/Message/SessionCallbackComponent.cs b/Unity/Assets/Model/Module/Message/SessionCallbackComponent.cs index 5a5af4c163abc1469220d0097cd9f00317df66e7..13668e32d5653cb148abc8f9cbb7507bc1d122b2 100644 --- a/Unity/Assets/Model/Module/Message/SessionCallbackComponent.cs +++ b/Unity/Assets/Model/Module/Message/SessionCallbackComponent.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace ETModel +namespace ET { public class SessionCallbackComponent: Entity { diff --git a/Unity/Assets/Model/Module/Message/SessionIdleCheckComponent.cs b/Unity/Assets/Model/Module/Message/SessionIdleCheckComponent.cs index c05b8425e05118339aee20904e6752fac20bc8ae..e2b770a99ced3de07947f9204a8389e7733d94fb 100644 --- a/Unity/Assets/Model/Module/Message/SessionIdleCheckComponent.cs +++ b/Unity/Assets/Model/Module/Message/SessionIdleCheckComponent.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { [ObjectSystem] public class SessionIdleCheckerComponentAwakeSystem : AwakeSystem diff --git a/Unity/Assets/Model/Module/Numeric/INumericWatcher.cs b/Unity/Assets/Model/Module/Numeric/INumericWatcher.cs index 3c532daf74c985f5ca8a2659895eb8711213c470..d1d0c730b397a497d8ead9f0c68a098c5147c5c7 100644 --- a/Unity/Assets/Model/Module/Numeric/INumericWatcher.cs +++ b/Unity/Assets/Model/Module/Numeric/INumericWatcher.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public interface INumericWatcher { diff --git a/Unity/Assets/Model/Module/Numeric/NumericChangeEvent_NotifyWatcher.cs.meta b/Unity/Assets/Model/Module/Numeric/NumericChangeEvent_NotifyWatcher.cs.meta deleted file mode 100644 index 01e0744125043389a7c361c152b59dbf2d20376c..0000000000000000000000000000000000000000 --- a/Unity/Assets/Model/Module/Numeric/NumericChangeEvent_NotifyWatcher.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 384b8c339ff041543b3547c39ad02edf -timeCreated: 1506412332 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity/Assets/Model/Module/Numeric/NumericComponent.cs b/Unity/Assets/Model/Module/Numeric/NumericComponent.cs index bb0047223225e37c904757dd0ac61149307f83f0..de6bca79324c25c365f50c343cbe8c45a9847c38 100644 --- a/Unity/Assets/Model/Module/Numeric/NumericComponent.cs +++ b/Unity/Assets/Model/Module/Numeric/NumericComponent.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace ETModel +namespace ET { [ObjectSystem] public class NumericComponentAwakeSystem : AwakeSystem diff --git a/Unity/Assets/Model/Module/Numeric/NumericType.cs b/Unity/Assets/Model/Module/Numeric/NumericType.cs index e92012163a7c855242a8b6c891f035278150293f..a2df25f77abe7975d51e1ab049fe0268436abbce 100644 --- a/Unity/Assets/Model/Module/Numeric/NumericType.cs +++ b/Unity/Assets/Model/Module/Numeric/NumericType.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public enum NumericType { diff --git a/Unity/Assets/Model/Module/Numeric/NumericWatcherAttribute.cs b/Unity/Assets/Model/Module/Numeric/NumericWatcherAttribute.cs index 492f19fc56d8655805735af0254ab92bc76ec4ea..2938a2ff50c2dcefc552aa8a486ab2b6663507f7 100644 --- a/Unity/Assets/Model/Module/Numeric/NumericWatcherAttribute.cs +++ b/Unity/Assets/Model/Module/Numeric/NumericWatcherAttribute.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public class NumericWatcherAttribute : BaseAttribute { diff --git a/Unity/Assets/Model/Module/Numeric/NumericWatcherComponent.cs b/Unity/Assets/Model/Module/Numeric/NumericWatcherComponent.cs index 4443b123cb391fe1bf6af433a095c8d11acd38a8..c6dfc352ac6897c3e58f5b0718bbb1bd97efc1bc 100644 --- a/Unity/Assets/Model/Module/Numeric/NumericWatcherComponent.cs +++ b/Unity/Assets/Model/Module/Numeric/NumericWatcherComponent.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace ETModel +namespace ET { [ObjectSystem] public class NumericWatcherComponentAwakeSystem : AwakeSystem diff --git a/Unity/Assets/Model/Module/Numeric/NumericWatcher_Hp_ShowUI.cs.meta b/Unity/Assets/Model/Module/Numeric/NumericWatcher_Hp_ShowUI.cs.meta deleted file mode 100644 index 217c86b723f1f580ddc266765a86058fcdbf9374..0000000000000000000000000000000000000000 --- a/Unity/Assets/Model/Module/Numeric/NumericWatcher_Hp_ShowUI.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: f6f7d90d657e1af4e9d43b08fc2530b3 -timeCreated: 1506412332 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity/Assets/Model/Module/Pathfinding/Recast/AStarConfig.cs b/Unity/Assets/Model/Module/Pathfinding/Recast/AStarConfig.cs index b66e81929fa68e0f969dfcb27b26a278c327167c..a89e4d2edf75222d734bdd932209a63666574114 100644 --- a/Unity/Assets/Model/Module/Pathfinding/Recast/AStarConfig.cs +++ b/Unity/Assets/Model/Module/Pathfinding/Recast/AStarConfig.cs @@ -1,4 +1,5 @@ -using ETModel; + +using ET; using MongoDB.Bson.Serialization.Attributes; namespace PF diff --git a/Unity/Assets/Model/Module/UI/CanvasConfig.cs b/Unity/Assets/Model/Module/UI/CanvasConfig.cs index a88deed5102acaa7015a76b61d7492393c64a475..cbef23724401e991ad0eff619752d68f95947f6d 100644 --- a/Unity/Assets/Model/Module/UI/CanvasConfig.cs +++ b/Unity/Assets/Model/Module/UI/CanvasConfig.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace ETModel +namespace ET { public class CanvasConfig: MonoBehaviour { diff --git a/Unity/Assets/Model/Module/UI/LayerNames.cs b/Unity/Assets/Model/Module/UI/LayerNames.cs index 408bd1305ce96937c4b02e13d7ba3e0b940cc395..3d7f6356944e51e8f64c54eaa1deac3690048eae 100644 --- a/Unity/Assets/Model/Module/UI/LayerNames.cs +++ b/Unity/Assets/Model/Module/UI/LayerNames.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace ETModel +namespace ET { public static class LayerNames { diff --git a/Unity/Assets/Model/Module/UI/UI.cs b/Unity/Assets/Model/Module/UI/UI.cs index 2af44c51e83d7ba3372954e539a93943ca04dc3a..f0d0c2f02601b4d6d55786bf9ae9da3b4e42d86f 100644 --- a/Unity/Assets/Model/Module/UI/UI.cs +++ b/Unity/Assets/Model/Module/UI/UI.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using ETModel; + using UnityEngine; -namespace ETModel +namespace ET { [ObjectSystem] public class UiAwakeSystem : AwakeSystem diff --git a/Unity/Assets/Model/Module/UI/UIComponent.cs b/Unity/Assets/Model/Module/UI/UIComponent.cs index 1bdeb4451c472dd786811eefb01626216774f9c5..7c30b29b9ab896f34a8dd4cb19740f964c5b321e 100644 --- a/Unity/Assets/Model/Module/UI/UIComponent.cs +++ b/Unity/Assets/Model/Module/UI/UIComponent.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -namespace ETModel +namespace ET { [ObjectSystem] public class UIComponentAwakeSystem : AwakeSystem diff --git a/Unity/Assets/Model/Module/UI/UIFactoryAttribute.cs b/Unity/Assets/Model/Module/UI/UIFactoryAttribute.cs index 8fafc645af5ea7d2732458fa76f8dcadd75a9d21..fe488e31262ef39de2299dd5d9401ad0b7281dd1 100644 --- a/Unity/Assets/Model/Module/UI/UIFactoryAttribute.cs +++ b/Unity/Assets/Model/Module/UI/UIFactoryAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace ETModel +namespace ET { [AttributeUsage(AttributeTargets.Class)] public class UIFactoryAttribute: BaseAttribute diff --git a/Unity/Assets/Model/Module/UI/UIType.cs b/Unity/Assets/Model/Module/UI/UIType.cs index b9f14aaf6aaf627fbb31c6559d4dd1d38ea75663..7d241218ceea9bd911cb0eeabbabe28861aa433e 100644 --- a/Unity/Assets/Model/Module/UI/UIType.cs +++ b/Unity/Assets/Model/Module/UI/UIType.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace ETModel +namespace ET { public static class UIType { diff --git a/Unity/Assets/Model/Module/UI/UIViewComponent.cs b/Unity/Assets/Model/Module/UI/UIViewComponent.cs new file mode 100644 index 0000000000000000000000000000000000000000..e3aa2e752da27bc9758124ed2e600d6ab8c01e4f --- /dev/null +++ b/Unity/Assets/Model/Module/UI/UIViewComponent.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + +namespace ET +{ + [ObjectSystem] + public class UIViewComponentAwakeSystem : AwakeSystem + { + public override void Awake(UIViewComponent self) + { + } + } + + /// + /// 管理所有UI + /// + public class UIViewComponent: Entity + { + } +} \ No newline at end of file diff --git a/Unity/Assets/Model/Module/UI/UIViewComponent.cs.meta b/Unity/Assets/Model/Module/UI/UIViewComponent.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..86a1255c823461e18c70420541612fbe9c4bb383 --- /dev/null +++ b/Unity/Assets/Model/Module/UI/UIViewComponent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8666beca231a05e49b7608ff509f82c5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Model/Component/Config.meta b/Unity/Assets/Model/Module/UnityWebRequest.meta similarity index 57% rename from Unity/Assets/Model/Component/Config.meta rename to Unity/Assets/Model/Module/UnityWebRequest.meta index 6f00f0b23f143c72b7d7771dfd7b3a021106489d..0eaa7d7c58975155a60fa4e65b8d212edb35335e 100644 --- a/Unity/Assets/Model/Component/Config.meta +++ b/Unity/Assets/Model/Module/UnityWebRequest.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: 1136de56973a671409ed0bf599b1f478 +guid: a45190a32a44abe46a4c1a93b7caba2d folderAsset: yes -timeCreated: 1498118075 -licenseType: Free DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Unity/Assets/Model/Entity/UnityWebRequestAsync.cs b/Unity/Assets/Model/Module/UnityWebRequest/UnityWebRequestAsync.cs similarity index 99% rename from Unity/Assets/Model/Entity/UnityWebRequestAsync.cs rename to Unity/Assets/Model/Module/UnityWebRequest/UnityWebRequestAsync.cs index e086fbf839784ac2c5bea530ed2a861d4c0f51b9..6f1dfb6e527e3eefec7f3d08f0753050fc86d3c8 100644 --- a/Unity/Assets/Model/Entity/UnityWebRequestAsync.cs +++ b/Unity/Assets/Model/Module/UnityWebRequest/UnityWebRequestAsync.cs @@ -1,7 +1,7 @@ using System; using UnityEngine.Networking; -namespace ETModel +namespace ET { [ObjectSystem] public class UnityWebRequestUpdateSystem : UpdateSystem diff --git a/Unity/Assets/Model/Module/UnityWebRequest/UnityWebRequestAsync.cs.meta b/Unity/Assets/Model/Module/UnityWebRequest/UnityWebRequestAsync.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..1379829159b7880391c9ccbbb40aa5c152ca10ff --- /dev/null +++ b/Unity/Assets/Model/Module/UnityWebRequest/UnityWebRequestAsync.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cfb271b3a6c22234292337c5cdc8a947 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Model/Other/AppType.cs b/Unity/Assets/Model/Other/AppType.cs index 5bb78d0b258f348dcd85738b70b619311681d5a4..79d3aaf9f663f02c47356d11255b46cdbd3adece 100644 --- a/Unity/Assets/Model/Other/AppType.cs +++ b/Unity/Assets/Model/Other/AppType.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace ETModel +namespace ET { [Flags] public enum AppType diff --git a/Unity/Assets/Model/Other/Define.cs b/Unity/Assets/Model/Other/Define.cs index ed3ae172d89b2190698092c000182fe8b42cd691..973eef8f1da7760f4ca490ea135d6f2ca1ced25e 100644 --- a/Unity/Assets/Model/Other/Define.cs +++ b/Unity/Assets/Model/Other/Define.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public static class Define { diff --git a/Unity/Assets/Model/Other/GizmosDebug.cs b/Unity/Assets/Model/Other/GizmosDebug.cs index f9f2dd5a02749ea7f5160347d46272082b178c56..2d2f4a64ccd4fd056bc7cef685997dccb03fa4e0 100644 --- a/Unity/Assets/Model/Other/GizmosDebug.cs +++ b/Unity/Assets/Model/Other/GizmosDebug.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -namespace ETModel +namespace ET { public class GizmosDebug: MonoBehaviour { diff --git a/Unity/Assets/Model/Other/IInstanceMethod.cs b/Unity/Assets/Model/Other/IInstanceMethod.cs deleted file mode 100644 index fc23aadfe4c077f637c609275e357e697e9756ea..0000000000000000000000000000000000000000 --- a/Unity/Assets/Model/Other/IInstanceMethod.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace ETModel -{ - public abstract class IStaticMethod - { - public abstract void Run(); - public abstract void Run(object a); - public abstract void Run(object a, object b); - public abstract void Run(object a, object b, object c); - } -} diff --git a/Unity/Assets/Model/Other/MonoStaticMethod.cs b/Unity/Assets/Model/Other/MonoStaticMethod.cs deleted file mode 100644 index 175e05d66174df43e068c4e793d0fec2e9e59c64..0000000000000000000000000000000000000000 --- a/Unity/Assets/Model/Other/MonoStaticMethod.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Reflection; - -namespace ETModel - { - public class MonoStaticMethod : IStaticMethod - { - private readonly MethodInfo methodInfo; - - private readonly object[] param; - - public MonoStaticMethod(Type type, string methodName) - { - this.methodInfo = type.GetMethod(methodName); - this.param = new object[this.methodInfo.GetParameters().Length]; - } - - public override void Run() - { - this.methodInfo.Invoke(null, param); - } - - public override void Run(object a) - { - this.param[0] = a; - this.methodInfo.Invoke(null, param); - } - - public override void Run(object a, object b) - { - this.param[0] = a; - this.param[1] = b; - this.methodInfo.Invoke(null, param); - } - - public override void Run(object a, object b, object c) - { - this.param[0] = a; - this.param[1] = b; - this.param[2] = c; - this.methodInfo.Invoke(null, param); - } - } - } \ No newline at end of file diff --git a/Unity/Assets/Model/Other/MotionType.cs b/Unity/Assets/Model/Other/MotionType.cs index 3800a3692ca8b67fd1cfda2b999f7d5253fdb789..26c8ff696015770f7e81bdace4fc9f73b882193d 100644 --- a/Unity/Assets/Model/Other/MotionType.cs +++ b/Unity/Assets/Model/Other/MotionType.cs @@ -1,4 +1,4 @@ -namespace ETModel +namespace ET { public enum MotionType { diff --git a/Unity/Assets/Scenes/Init.unity b/Unity/Assets/Scenes/Init.unity index 9d02a9b31f96e356459db85ec75c3e3af4df6011..728d56ace5e8240fcbe4564062cb6cd1863df126 100644 --- a/Unity/Assets/Scenes/Init.unity +++ b/Unity/Assets/Scenes/Init.unity @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 10 + serializedVersion: 12 m_Resolution: 2 m_BakeResolution: 40 m_AtlasSize: 1024 @@ -62,6 +62,7 @@ LightmapSettings: m_AOMaxDistance: 1 m_CompAOExponent: 0 m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 m_Padding: 2 m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 @@ -76,10 +77,16 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 m_PVRFilterTypeDirect: 0 m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeAO: 0 - m_PVRFilteringMode: 1 + m_PVREnvironmentMIS: 0 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 @@ -87,7 +94,9 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 0 --- !u!196 &4 @@ -112,7 +121,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &403338139 +--- !u!1 &251107983 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -120,98 +129,96 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 403338140} - - component: {fileID: 403338144} - - component: {fileID: 403338143} - - component: {fileID: 403338142} - - component: {fileID: 403338141} + - component: {fileID: 251107984} + - component: {fileID: 251107987} + - component: {fileID: 251107986} + - component: {fileID: 251107985} m_Layer: 0 - m_Name: BackgroudCamera + m_Name: Low m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &403338140 -Transform: +--- !u!224 &251107984 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 403338139} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 251107983} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0, y: 0, z: 0} m_Children: [] - m_Father: {fileID: 575235020} + m_Father: {fileID: 1784017108} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!81 &403338141 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 403338139} - m_Enabled: 0 ---- !u!92 &403338142 -Behaviour: + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &251107985 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 403338139} + m_GameObject: {fileID: 251107983} m_Enabled: 1 ---- !u!124 &403338143 -Behaviour: + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &251107986 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 403338139} + m_GameObject: {fileID: 251107983} m_Enabled: 1 ---- !u!20 &403338144 -Camera: + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &251107987 +Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 403338139} + m_GameObject: {fileID: 251107983} m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 2 - m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0.019607844} - m_projectionMatrixMode: 1 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_GateFitMode: 2 - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -10 - m_CullingMask: - serializedVersion: 2 - m_Bits: 0 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 0 - m_AllowMSAA: 0 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1 &429867060 GameObject: m_ObjectHideFlags: 0 @@ -239,7 +246,7 @@ MonoBehaviour: m_GameObject: {fileID: 429867060} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: m_HorizontalAxis: Horizontal @@ -258,7 +265,7 @@ MonoBehaviour: m_GameObject: {fileID: 429867060} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} @@ -278,6 +285,104 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &493985069 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 493985070} + - component: {fileID: 493985073} + - component: {fileID: 493985072} + - component: {fileID: 493985071} + m_Layer: 0 + m_Name: Mid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &493985070 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 493985069} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 1784017108} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &493985071 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 493985069} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &493985072 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 493985069} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &493985073 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 493985069} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 10 + m_TargetDisplay: 0 --- !u!1 &575235018 GameObject: m_ObjectHideFlags: 0 @@ -319,8 +424,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 403338140} - - {fileID: 1245951402} + - {fileID: 1784017108} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -350,7 +454,6 @@ GameObject: - component: {fileID: 1245951402} - component: {fileID: 1245951406} - component: {fileID: 1245951405} - - component: {fileID: 1245951404} - component: {fileID: 1245951403} m_Layer: 0 m_Name: UICamera @@ -370,8 +473,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 575235020} - m_RootOrder: 1 + m_Father: {fileID: 1784017108} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!81 &1245951403 AudioListener: @@ -381,14 +484,6 @@ AudioListener: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1245951401} m_Enabled: 0 ---- !u!92 &1245951404 -Behaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1245951401} - m_Enabled: 1 --- !u!124 &1245951405 Behaviour: m_ObjectHideFlags: 0 @@ -409,9 +504,10 @@ Camera: m_ClearFlags: 3 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844} m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_GateFitMode: 2 m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 @@ -439,3 +535,135 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 +--- !u!1 &1439952248 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1439952249} + - component: {fileID: 1439952252} + - component: {fileID: 1439952251} + - component: {fileID: 1439952250} + m_Layer: 0 + m_Name: High + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1439952249 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1439952248} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 1784017108} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &1439952250 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1439952248} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1439952251 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1439952248} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &1439952252 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1439952248} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 20 + m_TargetDisplay: 0 +--- !u!1 &1784017107 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1784017108} + m_Layer: 0 + m_Name: UI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1784017108 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1784017107} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 251107984} + - {fileID: 493985070} + - {fileID: 1439952249} + - {fileID: 1245951402} + m_Father: {fileID: 575235020} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Unity/Unity.Hotfix.csproj b/Unity/Unity.Hotfix.csproj index f52c995352551f90af67bba65b5edb8dd4facd90..b8bfd05d9b3b3476632eec257e69959425f841e1 100644 --- a/Unity/Unity.Hotfix.csproj +++ b/Unity/Unity.Hotfix.csproj @@ -60,6 +60,8 @@ + + C:/Source/ET/Unity/Library/ScriptAssemblies/UnityEditor.UI.dll diff --git a/Unity/Unity.Model.csproj b/Unity/Unity.Model.csproj index 7ee233f3a8015ee32c078e1f05759add48947dcd..64e0a396f57ea3df4b450e13b441919315fa5d0e 100644 --- a/Unity/Unity.Model.csproj +++ b/Unity/Unity.Model.csproj @@ -129,10 +129,6 @@ - - - - @@ -140,6 +136,8 @@ + + @@ -170,8 +168,9 @@ + - + @@ -236,12 +235,10 @@ - - @@ -368,11 +365,11 @@ + + - -