diff --git a/Config/StartConfig/LocalAllServer.txt b/Config/StartConfig/LocalAllServer.txt index 271e9aaf7b02bf799539ac0410777ae71cb83d31..435086cd3ccd7653e6098ff785958016e138ee99 100644 --- a/Config/StartConfig/LocalAllServer.txt +++ b/Config/StartConfig/LocalAllServer.txt @@ -1 +1 @@ -{ "_t" : "StartConfig", "_id" : NumberLong("96832337674244"), "Type" : "Config", "components" : [{ "_t" : "InnerConfig", "_id" : NumberLong("96832337674245"), "Host" : "127.0.0.1", "Port" : 20000 }, { "_t" : "OuterConfig", "_id" : NumberLong("96832337674246"), "Host" : "127.0.0.1", "Port" : 10000 }], "AppId" : 1, "AppType" : "AllServer", "ServerIP" : "*" } +{ "_t" : "StartConfig", "_id" : NumberLong("96871765901315"), "Type" : "Config", "components" : [{ "_t" : "InnerConfig", "_id" : NumberLong("96871765901316"), "Host" : "127.0.0.1", "Port" : 20000 }, { "_t" : "OuterConfig", "_id" : NumberLong("96871765901317"), "Host" : "127.0.0.1", "Port" : 10000 }], "AppId" : 1, "AppType" : "AllServer", "ServerIP" : "*" } diff --git a/Server/App/Program.cs b/Server/App/Program.cs index 0e3162c86bcd1b81be9330455ce30a501cf6fdfc..bd20ed22e31e5b274b3e9a3f94f0440e6f4143b3 100644 --- a/Server/App/Program.cs +++ b/Server/App/Program.cs @@ -2,7 +2,7 @@ using Base; using Model; using NLog; -using Object = Base.Object; +using Object = Model.Object; namespace App { @@ -12,8 +12,6 @@ namespace App { try { - BsonClassMapRegister.Register(); - Object.ObjectManager.Register("Model", typeof(Game).Assembly); Object.ObjectManager.Register("Controller", DllHelper.GetController()); diff --git a/Server/Base/Server.Base.csproj b/Server/Base/Server.Base.csproj index 5c2334a068799f34b2526fdf059930566e141b48..0ce5c77575ea6abee38c6727973a0a0d1fa27701 100644 --- a/Server/Base/Server.Base.csproj +++ b/Server/Base/Server.Base.csproj @@ -149,33 +149,6 @@ Network\UNet\USocketManager.cs - - Object\Component.cs - - - Object\Entity.cs - - - Object\IAwake.cs - - - Object\ILoader.cs - - - Object\IStart.cs - - - Object\IUpdate.cs - - - Object\Object.cs - - - Object\ObjectEventAttribute.cs - - - Object\ObjectManager.cs - QueueDictionary.cs diff --git a/Server/Controller/Message/C2R_LoginHandler.cs b/Server/Controller/Message/C2R_LoginHandler.cs index e8f5a1828045fcfb58160a4c18c86d4b61309e16..eb9357da4c471e2792f783f5cd76c5fec7c1a42d 100644 --- a/Server/Controller/Message/C2R_LoginHandler.cs +++ b/Server/Controller/Message/C2R_LoginHandler.cs @@ -18,7 +18,7 @@ namespace Controller } // 随机分配一个Gate - Entity config = Game.Scene.GetComponent().GetAddress(); + StartConfig config = Game.Scene.GetComponent().GetAddress(); //Log.Debug($"gate address: {MongoHelper.ToJson(config)}"); string innerAddress = $"{config.GetComponent().Host}:{config.GetComponent().Port}"; Session gateSession = Game.Scene.GetComponent().Get(innerAddress); diff --git a/Server/Controller/Message/M2A_ReloadHandler.cs b/Server/Controller/Message/M2A_ReloadHandler.cs index 672f67bb4115e879b72f04a44b7cc764c0d8dcf3..5121465cb6bd06ee076ffe0a32480f78a41ee9a0 100644 --- a/Server/Controller/Message/M2A_ReloadHandler.cs +++ b/Server/Controller/Message/M2A_ReloadHandler.cs @@ -1,7 +1,7 @@ using System; using Base; using Model; -using Object = Base.Object; +using Object = Model.Object; namespace Controller { diff --git a/Server/Model/Component/RealmGateAddressComponent.cs b/Server/Model/Component/RealmGateAddressComponent.cs index 2ac2232abb9991c44974fb8e91252c39c297e436..a93d84d61704f7c9e48c272d387849b90f931ee9 100644 --- a/Server/Model/Component/RealmGateAddressComponent.cs +++ b/Server/Model/Component/RealmGateAddressComponent.cs @@ -29,7 +29,7 @@ namespace Model } } - public Entity GetAddress() + public StartConfig GetAddress() { int n = RandomHelper.RandomNumber(0, this.GateAddress.Count); return this.GateAddress[n]; diff --git a/Server/Model/Server.Model.csproj b/Server/Model/Server.Model.csproj index 292bc8b56ce3e4adcf4c1c8381945a66082d0164..db9ebe3d6fb01c0218e761319ca9807f8561e526 100644 --- a/Server/Model/Server.Model.csproj +++ b/Server/Model/Server.Model.csproj @@ -86,6 +86,9 @@ Config\AConfig.cs + + Config\AConfigComponent.cs + Config\ConfigAttribute.cs @@ -155,8 +158,32 @@ Message\RpcException.cs - - Other\BsonClassMapRegister.cs + + Object\Component.cs + + + Object\Entity.cs + + + Object\IAwake.cs + + + Object\ILoader.cs + + + Object\IStart.cs + + + Object\IUpdate.cs + + + Object\Object.cs + + + Object\ObjectEventAttribute.cs + + + Object\ObjectManager.cs Other\EntityType.cs diff --git a/Unity/Assets/Editor/EditorInit.cs b/Unity/Assets/Editor/EditorInit.cs index f90ea01960d370040547c4aa81575e877a60f406..a21fc545591b1994be163c76a67f18cbd69383a6 100644 --- a/Unity/Assets/Editor/EditorInit.cs +++ b/Unity/Assets/Editor/EditorInit.cs @@ -2,8 +2,8 @@ using Base; using UnityEditor; using UnityEngine; -using Object = Base.Object; using Model; +using Object = Model.Object; namespace MyEditor { @@ -12,7 +12,6 @@ namespace MyEditor { static EditorInit() { - BsonClassMapRegister.Register(); EditorApplication.update += Update; } diff --git a/Unity/Assets/Editor/ObjectManagerToolsEditor/ObjectManagerToolsWindow.cs b/Unity/Assets/Editor/ObjectManagerToolsEditor/ObjectManagerToolsWindow.cs index 93e9f65592849021e0b31b75c2f3dd0353703d4b..98d8da6d13650e47704539646dc8849f1688921b 100644 --- a/Unity/Assets/Editor/ObjectManagerToolsEditor/ObjectManagerToolsWindow.cs +++ b/Unity/Assets/Editor/ObjectManagerToolsEditor/ObjectManagerToolsWindow.cs @@ -1,4 +1,5 @@ using Base; +using Model; using UnityEditor; public class ObjectManagerToolsWindow : EditorWindow diff --git a/Unity/Assets/Scripts/Component/Config/ClientConfig.cs b/Unity/Assets/Scripts/Component/Config/ClientConfig.cs index f09b86259d6e1d227899404931d71a7a5df9ccf2..0b911de38b778050003ed08d662944e5ef126135 100644 --- a/Unity/Assets/Scripts/Component/Config/ClientConfig.cs +++ b/Unity/Assets/Scripts/Component/Config/ClientConfig.cs @@ -1,10 +1,9 @@ -using Base; -using MongoDB.Bson.Serialization.Attributes; +using MongoDB.Bson.Serialization.Attributes; namespace Model { [BsonIgnoreExtraElements] - public class ClientConfig: Component + public class ClientConfig: AConfigComponent { public string Host = ""; public int Port; diff --git a/Unity/Assets/Scripts/Component/Config/InnerConfig.cs b/Unity/Assets/Scripts/Component/Config/InnerConfig.cs index 49d9fcc2f96a9dfa1197d8617e134b9b4beb7acd..f6380b93cae3f833c5cb0f5be3bdae1aa328f95b 100644 --- a/Unity/Assets/Scripts/Component/Config/InnerConfig.cs +++ b/Unity/Assets/Scripts/Component/Config/InnerConfig.cs @@ -1,10 +1,9 @@ -using Base; -using MongoDB.Bson.Serialization.Attributes; +using MongoDB.Bson.Serialization.Attributes; namespace Model { [BsonIgnoreExtraElements] - public class InnerConfig : Component + public class InnerConfig : AConfigComponent { public string Host { get; set; } public int Port { get; set; } diff --git a/Unity/Assets/Scripts/Component/Config/OuterConfig.cs b/Unity/Assets/Scripts/Component/Config/OuterConfig.cs index b67d6a4e71c641716241cbeb98f8f9b842c37f55..e83a1694c491ed4cb0f1b0d6f586affa19fe8237 100644 --- a/Unity/Assets/Scripts/Component/Config/OuterConfig.cs +++ b/Unity/Assets/Scripts/Component/Config/OuterConfig.cs @@ -1,10 +1,9 @@ -using Base; -using MongoDB.Bson.Serialization.Attributes; +using MongoDB.Bson.Serialization.Attributes; namespace Model { [BsonIgnoreExtraElements] - public class OuterConfig : Component + public class OuterConfig : AConfigComponent { public string Host { get; set; } public int Port { get; set; } diff --git a/Unity/Assets/Scripts/Component/ConfigComponent.cs b/Unity/Assets/Scripts/Component/ConfigComponent.cs index bff36f38496dc7faadc12b387e7ca9e9686a5333..033907b1e21716fb58e1ee99e231335097a1a64a 100644 --- a/Unity/Assets/Scripts/Component/ConfigComponent.cs +++ b/Unity/Assets/Scripts/Component/ConfigComponent.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Reflection; using Base; -using Object = Base.Object; +using Object = Model.Object; namespace Model { diff --git a/Unity/Assets/Scripts/Component/EventComponent.cs b/Unity/Assets/Scripts/Component/EventComponent.cs index daab82a05667a249f20c2e4e11cc9c13fde6d505..bfdb60306b41ce27fa6270ac0d93cb8052ae4412 100644 --- a/Unity/Assets/Scripts/Component/EventComponent.cs +++ b/Unity/Assets/Scripts/Component/EventComponent.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Reflection; using Base; -using Object = Base.Object; +using Object = Model.Object; namespace Model { diff --git a/Unity/Assets/Scripts/Component/MessageDispatherComponent.cs b/Unity/Assets/Scripts/Component/MessageDispatherComponent.cs index d114e68be4df5d46563dbd8d1fcf881cb6ed5c52..a21190d56f2e0e287c3477c09e707a32a9a247fd 100644 --- a/Unity/Assets/Scripts/Component/MessageDispatherComponent.cs +++ b/Unity/Assets/Scripts/Component/MessageDispatherComponent.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Reflection; using Base; -using Object = Base.Object; +using Object = Model.Object; namespace Model { diff --git a/Unity/Assets/Scripts/Config/AConfigComponent.cs b/Unity/Assets/Scripts/Config/AConfigComponent.cs new file mode 100644 index 0000000000000000000000000000000000000000..7929bd394897ce35656b3812f7946474f5448e36 --- /dev/null +++ b/Unity/Assets/Scripts/Config/AConfigComponent.cs @@ -0,0 +1,15 @@ +using Base; +using MongoDB.Bson.Serialization.Attributes; + +namespace Model +{ + /// + /// 每个Config的基类 + /// + [BsonKnownTypes(typeof(ClientConfig))] + [BsonKnownTypes(typeof(InnerConfig))] + [BsonKnownTypes(typeof(OuterConfig))] + public abstract class AConfigComponent: Component + { + } +} \ No newline at end of file diff --git a/Unity/Assets/Scripts/Config/AConfigComponent.cs.meta b/Unity/Assets/Scripts/Config/AConfigComponent.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..88fa1d6e2624b61c8d386a70ad0650151669f6a1 --- /dev/null +++ b/Unity/Assets/Scripts/Config/AConfigComponent.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 3a286d83056068f4ba8dfcf7a37b926d +timeCreated: 1478145676 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Scripts/Entity/UI.cs b/Unity/Assets/Scripts/Entity/UI.cs index b5e605a44fb84453886b82998638a1c1269eb9a3..a3d687b50e956a5658b6b55b42c84a9712cbaf6f 100644 --- a/Unity/Assets/Scripts/Entity/UI.cs +++ b/Unity/Assets/Scripts/Entity/UI.cs @@ -1,6 +1,4 @@ -using Base; -using UnityEngine; -using Component = Base.Component; +using UnityEngine; namespace Model { diff --git a/Unity/Assets/Scripts/Init.cs b/Unity/Assets/Scripts/Init.cs index 65d05ea9f1a22114f5938ee36e6a757b5679dfd4..ebccc9be3088e1debc36a803eaede7435380240a 100644 --- a/Unity/Assets/Scripts/Init.cs +++ b/Unity/Assets/Scripts/Init.cs @@ -1,7 +1,6 @@ using System; using Base; using UnityEngine; -using Object = Base.Object; namespace Model { @@ -9,7 +8,6 @@ namespace Model { private void Start() { - BsonClassMapRegister.Register(); Object.ObjectManager.Register("Model", typeof(Game).Assembly); Object.ObjectManager.Register("Controller", DllHelper.GetController()); diff --git a/Unity/Assets/Plugins/Base/Object.meta b/Unity/Assets/Scripts/Object.meta similarity index 67% rename from Unity/Assets/Plugins/Base/Object.meta rename to Unity/Assets/Scripts/Object.meta index 9274ef360428db52ecfb2507c8d527227bde41a1..3548c36b1e5cf471c13ef5f35e26e0a45e28d67d 100644 --- a/Unity/Assets/Plugins/Base/Object.meta +++ b/Unity/Assets/Scripts/Object.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: bfb63bc23132cfe47aaac731331ca16e +guid: 600c9bb417aba1641897df52e4ea0eeb folderAsset: yes -timeCreated: 1474942922 +timeCreated: 1478146107 licenseType: Pro DefaultImporter: userData: diff --git a/Unity/Assets/Plugins/Base/Object/Component.cs b/Unity/Assets/Scripts/Object/Component.cs similarity index 90% rename from Unity/Assets/Plugins/Base/Object/Component.cs rename to Unity/Assets/Scripts/Object/Component.cs index 360a7df802160aaad9666164f09810f69153ceb6..657948604c77db4474221a856b638d338940db54 100644 --- a/Unity/Assets/Plugins/Base/Object/Component.cs +++ b/Unity/Assets/Scripts/Object/Component.cs @@ -1,10 +1,11 @@ using MongoDB.Bson.Serialization.Attributes; -namespace Base +namespace Model { /// /// Component的Id与Owner Entity Id一样 /// + [BsonKnownTypes(typeof(AConfigComponent))] public abstract class Component : Object { [BsonIgnore] diff --git a/Unity/Assets/Plugins/Base/Object/Component.cs.meta b/Unity/Assets/Scripts/Object/Component.cs.meta similarity index 100% rename from Unity/Assets/Plugins/Base/Object/Component.cs.meta rename to Unity/Assets/Scripts/Object/Component.cs.meta diff --git a/Unity/Assets/Plugins/Base/Object/Entity.cs b/Unity/Assets/Scripts/Object/Entity.cs similarity index 99% rename from Unity/Assets/Plugins/Base/Object/Entity.cs rename to Unity/Assets/Scripts/Object/Entity.cs index c3c81648657125e3d8dfdf2afd536349ce80d7bb..3bf2b1fcde8d5736c88e7204e5375f7e5d8bd8d9 100644 --- a/Unity/Assets/Plugins/Base/Object/Entity.cs +++ b/Unity/Assets/Scripts/Object/Entity.cs @@ -1,9 +1,10 @@ using System; using System.Collections.Generic; using System.Linq; +using Base; using MongoDB.Bson.Serialization.Attributes; -namespace Base +namespace Model { public class Entity: Object { diff --git a/Unity/Assets/Plugins/Base/Object/Entity.cs.meta b/Unity/Assets/Scripts/Object/Entity.cs.meta similarity index 100% rename from Unity/Assets/Plugins/Base/Object/Entity.cs.meta rename to Unity/Assets/Scripts/Object/Entity.cs.meta diff --git a/Unity/Assets/Plugins/Base/Object/IAwake.cs b/Unity/Assets/Scripts/Object/IAwake.cs similarity index 95% rename from Unity/Assets/Plugins/Base/Object/IAwake.cs rename to Unity/Assets/Scripts/Object/IAwake.cs index 6034d288780d4a4ad9869929fc943440583d63b1..411f058a6ef6a9a378640eccc753d3f6f792a516 100644 --- a/Unity/Assets/Plugins/Base/Object/IAwake.cs +++ b/Unity/Assets/Scripts/Object/IAwake.cs @@ -1,4 +1,4 @@ -namespace Base +namespace Model { /// /// World的Componet实现该接口后,会在World.Start时调用该Start方法 diff --git a/Unity/Assets/Plugins/Base/Object/IAwake.cs.meta b/Unity/Assets/Scripts/Object/IAwake.cs.meta similarity index 100% rename from Unity/Assets/Plugins/Base/Object/IAwake.cs.meta rename to Unity/Assets/Scripts/Object/IAwake.cs.meta diff --git a/Unity/Assets/Plugins/Base/Object/ILoader.cs b/Unity/Assets/Scripts/Object/ILoader.cs similarity index 88% rename from Unity/Assets/Plugins/Base/Object/ILoader.cs rename to Unity/Assets/Scripts/Object/ILoader.cs index 323b8fea6db5527a6a9bd58b104af64a60613731..4fb2bab7fc9abf8a73056e6f4b0744a856f10fb6 100644 --- a/Unity/Assets/Plugins/Base/Object/ILoader.cs +++ b/Unity/Assets/Scripts/Object/ILoader.cs @@ -1,4 +1,4 @@ -namespace Base +namespace Model { /// /// World的Componet实现该接口,World.Load会调用Load方法 diff --git a/Unity/Assets/Plugins/Base/Object/ILoader.cs.meta b/Unity/Assets/Scripts/Object/ILoader.cs.meta similarity index 100% rename from Unity/Assets/Plugins/Base/Object/ILoader.cs.meta rename to Unity/Assets/Scripts/Object/ILoader.cs.meta diff --git a/Unity/Assets/Plugins/Base/Object/IStart.cs b/Unity/Assets/Scripts/Object/IStart.cs similarity index 88% rename from Unity/Assets/Plugins/Base/Object/IStart.cs rename to Unity/Assets/Scripts/Object/IStart.cs index e92bb5e8c9e36ae059df8cf8861ba02851f45e20..0e168464c05c59f917890d366413c2697fc9078c 100644 --- a/Unity/Assets/Plugins/Base/Object/IStart.cs +++ b/Unity/Assets/Scripts/Object/IStart.cs @@ -1,4 +1,4 @@ -namespace Base +namespace Model { /// /// World的Componet实现该接口后,会在World.Start时调用该Start方法 diff --git a/Unity/Assets/Plugins/Base/Object/IStart.cs.meta b/Unity/Assets/Scripts/Object/IStart.cs.meta similarity index 100% rename from Unity/Assets/Plugins/Base/Object/IStart.cs.meta rename to Unity/Assets/Scripts/Object/IStart.cs.meta diff --git a/Unity/Assets/Plugins/Base/Object/IUpdate.cs b/Unity/Assets/Scripts/Object/IUpdate.cs similarity index 87% rename from Unity/Assets/Plugins/Base/Object/IUpdate.cs rename to Unity/Assets/Scripts/Object/IUpdate.cs index ea68f2fee20c1927dc53803f226d005ce6c07cc5..4006949e3a6a0a5a29eb3832b0d143153b7f4335 100644 --- a/Unity/Assets/Plugins/Base/Object/IUpdate.cs +++ b/Unity/Assets/Scripts/Object/IUpdate.cs @@ -1,4 +1,4 @@ -namespace Base +namespace Model { /// /// 实现了该接口的World Componet会每帧刷新 diff --git a/Unity/Assets/Plugins/Base/Object/IUpdate.cs.meta b/Unity/Assets/Scripts/Object/IUpdate.cs.meta similarity index 100% rename from Unity/Assets/Plugins/Base/Object/IUpdate.cs.meta rename to Unity/Assets/Scripts/Object/IUpdate.cs.meta diff --git a/Unity/Assets/Plugins/Base/Object/Object.cs b/Unity/Assets/Scripts/Object/Object.cs similarity index 95% rename from Unity/Assets/Plugins/Base/Object/Object.cs rename to Unity/Assets/Scripts/Object/Object.cs index ad8d0b84cd050d0c90ab66d09fca9f8e6695683d..517345fdf3480cdf91c2f8c69fce618429614f27 100644 --- a/Unity/Assets/Plugins/Base/Object/Object.cs +++ b/Unity/Assets/Scripts/Object/Object.cs @@ -1,8 +1,9 @@ using System; using System.ComponentModel; +using Base; using MongoDB.Bson.Serialization.Attributes; -namespace Base +namespace Model { public abstract class Object: IDisposable, ISupportInitialize { diff --git a/Unity/Assets/Plugins/Base/Object/Object.cs.meta b/Unity/Assets/Scripts/Object/Object.cs.meta similarity index 100% rename from Unity/Assets/Plugins/Base/Object/Object.cs.meta rename to Unity/Assets/Scripts/Object/Object.cs.meta diff --git a/Unity/Assets/Plugins/Base/Object/ObjectEventAttribute.cs b/Unity/Assets/Scripts/Object/ObjectEventAttribute.cs similarity index 88% rename from Unity/Assets/Plugins/Base/Object/ObjectEventAttribute.cs rename to Unity/Assets/Scripts/Object/ObjectEventAttribute.cs index 510f5d0cfee4c273a49750be0405f00bb3914243..cd3a62503c32ea316a0a69a25680b0b54d96fa64 100644 --- a/Unity/Assets/Plugins/Base/Object/ObjectEventAttribute.cs +++ b/Unity/Assets/Scripts/Object/ObjectEventAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Base +namespace Model { [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] public class ObjectEventAttribute: Attribute diff --git a/Unity/Assets/Plugins/Base/Object/ObjectEventAttribute.cs.meta b/Unity/Assets/Scripts/Object/ObjectEventAttribute.cs.meta similarity index 100% rename from Unity/Assets/Plugins/Base/Object/ObjectEventAttribute.cs.meta rename to Unity/Assets/Scripts/Object/ObjectEventAttribute.cs.meta diff --git a/Unity/Assets/Plugins/Base/Object/ObjectManager.cs b/Unity/Assets/Scripts/Object/ObjectManager.cs similarity index 99% rename from Unity/Assets/Plugins/Base/Object/ObjectManager.cs rename to Unity/Assets/Scripts/Object/ObjectManager.cs index e587e3180ccbaa1e30342ba38437fbc13241df0f..10b560020d5ee4ff66c02ee7624a9fa059019835 100644 --- a/Unity/Assets/Plugins/Base/Object/ObjectManager.cs +++ b/Unity/Assets/Scripts/Object/ObjectManager.cs @@ -3,8 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Text; +using Base; -namespace Base +namespace Model { public interface IObjectEvent { diff --git a/Unity/Assets/Plugins/Base/Object/ObjectManager.cs.meta b/Unity/Assets/Scripts/Object/ObjectManager.cs.meta similarity index 100% rename from Unity/Assets/Plugins/Base/Object/ObjectManager.cs.meta rename to Unity/Assets/Scripts/Object/ObjectManager.cs.meta diff --git a/Unity/Assets/Scripts/Other/BsonClassMapRegister.cs b/Unity/Assets/Scripts/Other/BsonClassMapRegister.cs deleted file mode 100644 index 23a25804b622abf342560757c4739413fda99210..0000000000000000000000000000000000000000 --- a/Unity/Assets/Scripts/Other/BsonClassMapRegister.cs +++ /dev/null @@ -1,22 +0,0 @@ -using MongoDB.Bson.Serialization; - -namespace Model -{ - public static class BsonClassMapRegister - { - private static bool isRegister; - - public static void Register() - { - if (isRegister) - { - return; - } - isRegister = true; - - BsonClassMap.RegisterClassMap(); - BsonClassMap.RegisterClassMap(); - BsonClassMap.RegisterClassMap(); - } - } -} \ No newline at end of file diff --git a/Unity/Assets/Scripts/Other/BsonClassMapRegister.cs.meta b/Unity/Assets/Scripts/Other/BsonClassMapRegister.cs.meta deleted file mode 100644 index 104c166a4715860ab7b03a59329e99774008f538..0000000000000000000000000000000000000000 --- a/Unity/Assets/Scripts/Other/BsonClassMapRegister.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 134d0d7bf9f397e48849fe72d43bee76 -timeCreated: 1477036759 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity/Unity.CSharp.Plugins.csproj b/Unity/Unity.CSharp.Plugins.csproj index 214d7a4ea2a16a13247e56a1b04da5d6e217a227..1dd308b38d26b1bbf39b8438003a96df1086abbb 100644 --- a/Unity/Unity.CSharp.Plugins.csproj +++ b/Unity/Unity.CSharp.Plugins.csproj @@ -108,15 +108,6 @@ - - - - - - - - - diff --git a/Unity/Unity.CSharp.csproj b/Unity/Unity.CSharp.csproj index a3dad6718cecbfdc5f94123b44de52f0cf01211f..cf545f8a49587f1f6d83c58c898d842c37811f74 100644 --- a/Unity/Unity.CSharp.csproj +++ b/Unity/Unity.CSharp.csproj @@ -97,6 +97,7 @@ + @@ -125,7 +126,15 @@ - + + + + + + + + +