客户端彻底删除Mongo

Robot/Model/Robot.Model.csproj

@@ -22,13 +22,13 @@
       <DefineConstants>TRACECOREAPP;NOT_UNITY</DefineConstants>
     </PropertyGroup>
     <ItemGroup>
+        <Compile Include="..\..\Server\Model\Base\MongoHelper.cs">
+          <Link>Base\MongoHelper.cs</Link>
+        </Compile>
         <Compile Include="..\..\Server\Model\Base\MongoRegister.cs">
           <Link>Base\MongoRegister.cs</Link>
         </Compile>
-        <Compile Include="..\..\Unity\Assets\Editor\Helper\MongoHelper.cs">
-          <Link>Base\MongoHelper.cs</Link>
-        </Compile>
-        <Compile Include="..\..\Unity\Assets\Editor\Helper\StructBsonSerialize.cs">
+        <Compile Include="..\..\Server\Model\Base\StructBsonSerialize.cs">
           <Link>Base\StructBsonSerialize.cs</Link>
         </Compile>
         <Compile Include="..\..\Unity\Codes\Model\Module\Config\**\*.cs">

Server/Model/Demo/Unit/Unit.cs

@@ -4,7 +4,6 @@ using UnityEngine;
 
 namespace ET
 {
-    [BsonIgnoreExtraElements]
     public sealed class Unit: Entity
     {
         public int ConfigId; //配置表id

Server/Model/Server.Model.csproj

@@ -22,14 +22,6 @@
   </PropertyGroup>
   <ItemGroup>
 
-    <Compile Include="..\..\Unity\Assets\Editor\Helper\MongoHelper.cs">
-      <Link>Base\MongoHelper.cs</Link>
-    </Compile>
-
-    <Compile Include="..\..\Unity\Assets\Editor\Helper\StructBsonSerialize.cs">
-      <Link>Base\StructBsonSerialize.cs</Link>
-    </Compile>
-
     <Compile Include="..\..\Unity\Codes\Model\Core\**\*.cs"> 
       <Link>Core\%(RecursiveDir)%(FileName)%(Extension)</Link>
     </Compile>

Unity/Assets/Editor/BuildEditor/ETBuildSettings.asset

@@ -13,7 +13,7 @@ MonoBehaviour:
   m_Name: ETBuildSettings
   m_EditorClassIdentifier: 
   clearFolder: 1
-  isBuildExe: 0
+  isBuildExe: 1
   isContainAB: 1
   buildType: 0
   buildAssetBundleOptions: 0

Unity/Assets/Editor/RsyncEditor/RsyncConfig.cs

@@ -1,13 +0,0 @@
-using System.Collections.Generic;
-
-namespace ET
-{
-	public class RsyncConfig
-	{
-		public string Host = "";
-		public string Account = "";
-		public string Password = "";
-		public string RelativePath = "";
-		public List<string> Exclude = new List<string>();
-	}
-}

Unity/Assets/Editor/RsyncEditor/RsyncEditor.cs

@@ -1,90 +0,0 @@
-using System.Diagnostics;
-using System.IO;
-
-using UnityEditor;
-using UnityEngine;
-
-namespace ET
-{
-	public class RsyncEditor: EditorWindow
-	{
-		private const string ConfigFile = @"..\Tools\cwRsync\Config\rsyncConfig.txt";
-		private RsyncConfig rsyncConfig;
-		private bool isFold = true;
-
-		[MenuItem("Tools/Rsync同步")]
-		private static void ShowWindow()
-		{
-			GetWindow(typeof (RsyncEditor));
-		}
-
-		private void OnEnable()
-		{
-			if (!File.Exists(ConfigFile))
-			{
-				this.rsyncConfig = new RsyncConfig();
-				return;
-			}
-			string s = File.ReadAllText(ConfigFile);
-			this.rsyncConfig = MongoHelper.FromJson<RsyncConfig>(s);
-		}
-
-		private void OnGUI()
-		{
-			rsyncConfig.Host = EditorGUILayout.TextField("服务器地址", rsyncConfig.Host);
-			rsyncConfig.Account = EditorGUILayout.TextField("账号（必须是Linux已有的账号）", rsyncConfig.Account);
-			rsyncConfig.Password = EditorGUILayout.TextField("密码", rsyncConfig.Password);
-			rsyncConfig.RelativePath = EditorGUILayout.TextField("相对路径", rsyncConfig.RelativePath);
-
-			this.isFold = EditorGUILayout.Foldout(isFold, $"排除列表:");
-
-			if (!this.isFold)
-			{
-				for (int i = 0; i < this.rsyncConfig.Exclude.Count; ++i)
-				{
-					GUILayout.BeginHorizontal();
-					this.rsyncConfig.Exclude[i] = EditorGUILayout.TextField(this.rsyncConfig.Exclude[i]);
-					if (GUILayout.Button("删除"))
-					{
-						this.rsyncConfig.Exclude.RemoveAt(i);
-						break;
-					}
-					GUILayout.EndHorizontal();
-				}
-			}
-
-			if (GUILayout.Button("添加排除项目"))
-			{
-				this.rsyncConfig.Exclude.Add("");
-			}
-
-			if (GUILayout.Button("保存"))
-			{
-				File.WriteAllText(ConfigFile, MongoHelper.ToJson(this.rsyncConfig));
-				using (StreamWriter sw = new StreamWriter(new FileStream(@"..\Tools\cwRsync\Config\exclude.txt", FileMode.Create)))
-				{
-					foreach (string s in this.rsyncConfig.Exclude)
-					{
-						sw.Write(s + "\n");
-					}
-				}
-
-				File.WriteAllText($@"..\Tools\cwRsync\Config\rsync.secrets", this.rsyncConfig.Password);
-				File.WriteAllText($@"..\Tools\cwRsync\Config\rsyncd.secrets", $"{this.rsyncConfig.Account}:{this.rsyncConfig.Password}");
-
-				string rsyncdConf = "uid = 0\n" + "gid = 0\n" + "use chroot = no\n" + "max connections = 100\n" + "read only = no\n" + "write only = no\n" +
-				                    "log file =/var/log/rsyncd.log\n" + "fake super = yes\n" + "[Upload]\n" + $"path = /home/{this.rsyncConfig.Account}/\n" + 
-									$"auth users = {this.rsyncConfig.Account}\n" + "secrets file = /etc/rsyncd.secrets\n" + "list = yes";
-				File.WriteAllText($@"..\Tools\cwRsync\Config\rsyncd.conf", rsyncdConf);
-			}
-
-			if (GUILayout.Button("同步"))
-			{
-				string arguments =
-						$"-vzrtopg --password-file=./Tools/cwRsync/Config/rsync.secrets --exclude-from=./Tools/cwRsync/Config/exclude.txt --delete ./ {this.rsyncConfig.Account}@{this.rsyncConfig.Host}::Upload/{this.rsyncConfig.RelativePath} --chmod=ugo=rwX";
-				ProcessHelper.Run(@"./Tools/cwRsync/rsync.exe", arguments, @"..\");
-				UnityEngine.Debug.Log("同步完成!");
-			}
-		}
-	}
-}

Unity/Assets/Mono/ILRuntime/Generate/System_Collections_Generic_List_1_ILTypeInstance_Binding.cs

@@ -29,14 +29,11 @@ namespace ILRuntime.Runtime.Generated
             method = type.GetMethod("Add", flag, null, args, null);
             app.RegisterCLRMethodRedirection(method, Add_1);
             args = new Type[]{};
-            method = type.GetMethod("get_Capacity", flag, null, args, null);
-            app.RegisterCLRMethodRedirection(method, get_Capacity_2);
-            args = new Type[]{};
             method = type.GetMethod("Clear", flag, null, args, null);
-            app.RegisterCLRMethodRedirection(method, Clear_3);
+            app.RegisterCLRMethodRedirection(method, Clear_2);
             args = new Type[]{typeof(System.Int32)};
             method = type.GetMethod("get_Item", flag, null, args, null);
-            app.RegisterCLRMethodRedirection(method, get_Item_4);
+            app.RegisterCLRMethodRedirection(method, get_Item_3);
 
             args = new Type[]{};
             method = type.GetConstructor(flag, null, args, null);
@@ -82,24 +79,7 @@ namespace ILRuntime.Runtime.Generated
             return __ret;
         }
 
-        static StackObject* get_Capacity_2(ILIntepreter __intp, StackObject* __esp, IList<object> __mStack, CLRMethod __method, bool isNewObj)
-        {
-            ILRuntime.Runtime.Enviorment.AppDomain __domain = __intp.AppDomain;
-            StackObject* ptr_of_this_method;
-            StackObject* __ret = ILIntepreter.Minus(__esp, 1);
-
-            ptr_of_this_method = ILIntepreter.Minus(__esp, 1);
-            System.Collections.Generic.List<ILRuntime.Runtime.Intepreter.ILTypeInstance> instance_of_this_method = (System.Collections.Generic.List<ILRuntime.Runtime.Intepreter.ILTypeInstance>)typeof(System.Collections.Generic.List<ILRuntime.Runtime.Intepreter.ILTypeInstance>).CheckCLRTypes(StackObject.ToObject(ptr_of_this_method, __domain, __mStack), (CLR.Utils.Extensions.TypeFlags)0);
-            __intp.Free(ptr_of_this_method);
-
-            var result_of_this_method = instance_of_this_method.Capacity;
-
-            __ret->ObjectType = ObjectTypes.Integer;
-            __ret->Value = result_of_this_method;
-            return __ret + 1;
-        }
-
-        static StackObject* Clear_3(ILIntepreter __intp, StackObject* __esp, IList<object> __mStack, CLRMethod __method, bool isNewObj)
+        static StackObject* Clear_2(ILIntepreter __intp, StackObject* __esp, IList<object> __mStack, CLRMethod __method, bool isNewObj)
         {
             ILRuntime.Runtime.Enviorment.AppDomain __domain = __intp.AppDomain;
             StackObject* ptr_of_this_method;
@@ -114,7 +94,7 @@ namespace ILRuntime.Runtime.Generated
             return __ret;
         }
 
-        static StackObject* get_Item_4(ILIntepreter __intp, StackObject* __esp, IList<object> __mStack, CLRMethod __method, bool isNewObj)
+        static StackObject* get_Item_3(ILIntepreter __intp, StackObject* __esp, IList<object> __mStack, CLRMethod __method, bool isNewObj)
         {
             ILRuntime.Runtime.Enviorment.AppDomain __domain = __intp.AppDomain;
             StackObject* ptr_of_this_method;

Unity/Assets/Editor/RsyncEditor.meta → Unity/Assets/Mono/Module/Mongo.meta

@@ -1,9 +1,8 @@
 fileFormatVersion: 2
-guid: 56c88c70f2044f74dae91724d10cd93c
+guid: f63e576faec01438bad600ad19afb2f2
 folderAsset: yes
-timeCreated: 1477156499
-licenseType: Pro
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Unity/Assets/Mono/Module/Mongo/BsonDefaultValueAttribute.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace MongoDB.Bson.Serialization.Attributes
+{
+    public class BsonDefaultValueAttribute: Attribute
+    {
+        public BsonDefaultValueAttribute(object o)
+        {
+        }
+    }
+}

Unity/Assets/Editor/Helper/MongoHelper.cs.meta → Unity/Assets/Mono/Module/Mongo/BsonDefaultValueAttribute.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e9e7cfc5d7f224678b2ccfe057dfccd0
+guid: fc02366f973384d61ad58acb70e89326
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Mono/Module/Mongo/BsonDictionaryOptionsAttribute.cs

@@ -0,0 +1,19 @@
+using System;
+
+namespace MongoDB.Bson.Serialization.Attributes
+{
+    public enum DictionaryRepresentation
+    {
+        Document,
+        ArrayOfArrays,
+        ArrayOfDocuments,
+    }
+    
+    public class BsonDictionaryOptionsAttribute: Attribute
+    {
+        public BsonDictionaryOptionsAttribute(DictionaryRepresentation dictionaryRepresentation)
+        {
+            
+        }
+    }
+}

Unity/Assets/Editor/Helper/StructBsonSerialize.cs.meta → Unity/Assets/Mono/Module/Mongo/BsonDictionaryOptionsAttribute.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 183b697f8d848e54cb2acde793f76d3c
+guid: 61e8f7a3e414845d6a34308009d87761
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Mono/Module/Mongo/BsonElementAttribute.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace MongoDB.Bson.Serialization.Attributes
+{
+    public class BsonElementAttribute: Attribute
+    {
+        public BsonElementAttribute()
+        {}
+
+        public BsonElementAttribute(string s)
+        {
+        }
+    }
+}

Unity/Assets/Editor/RsyncEditor/RsyncEditor.cs.meta → Unity/Assets/Mono/Module/Mongo/BsonElementAttribute.cs.meta

@@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: 386af34361bc52a4b8269f8ef9643fcf
-timeCreated: 1477156531
-licenseType: Pro
+guid: 13362913ce6b3461fa91c2391c1d7ece
 MonoImporter:
+  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Unity/Assets/Mono/Module/Mongo/BsonIdAttribute.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace MongoDB.Bson.Serialization.Attributes
+{
+    public class BsonIdAttribute: Attribute
+    {
+        
+    }
+}

Unity/Assets/Editor/RsyncEditor/RsyncConfig.cs.meta → Unity/Assets/Mono/Module/Mongo/BsonIdAttribute.cs.meta

@@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: 09fcb878a3792c84fb09f0c0f1ef2572
-timeCreated: 1477277139
-licenseType: Pro
+guid: 03f8666852fb74140b9e2ca3633653ad
 MonoImporter:
+  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Unity/Assets/Mono/Module/Mongo/BsonIgnoreAttribute.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace MongoDB.Bson.Serialization.Attributes
+{
+    public class BsonIgnoreAttribute: Attribute
+    {
+        
+    }
+}

Unity/Assets/Mono/Module/Mongo/BsonIgnoreAttribute.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c828bfd92da23482bbefed7ed93bf93d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Mono/Module/Mongo/BsonIgnoreExtraElementsAttribute.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace MongoDB.Bson.Serialization.Attributes
+{
+    public class BsonIgnoreExtraElementsAttribute: Attribute
+    {
+    }
+}

Unity/Assets/Mono/Module/Mongo/BsonIgnoreExtraElementsAttribute.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e96c2d4b5954b48d89aa0015ae5134b4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Mono/Module/Mongo/BsonIgnoreIfDefaultAttribute.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace MongoDB.Bson.Serialization.Attributes
+{
+    public class BsonIgnoreIfDefaultAttribute: Attribute
+    {
+    }
+}

Unity/Assets/Mono/Module/Mongo/BsonIgnoreIfDefaultAttribute.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5ea7692cd96c24f5b9e5e31d4fcdaf89
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Mono/Module/Mongo/BsonIgnoreIfNullAttribute.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace MongoDB.Bson.Serialization.Attributes
+{
+    public class BsonIgnoreIfNullAttribute: Attribute
+    {
+        
+    }
+}

Unity/Assets/Mono/Module/Mongo/BsonIgnoreIfNullAttribute.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0615166f285584fbeb9c4976e936a9ea
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Mono/Unity.Mono.asmdef

@@ -1,5 +1,6 @@
 {
     "name": "Unity.Mono",
+    "rootNamespace": "",
     "references": [
         "Unity.ThirdParty"
     ],

Unity/Assets/Plugins/MongoDB.Bson.dll.meta

@@ -1,33 +0,0 @@
-fileFormatVersion: 2
-guid: 00040ff63a829498a92c82f29736b067
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Any: 
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      Windows Store Apps: WindowsStoreApps
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Codes/Model/Core/Object/Entity.cs

@@ -15,9 +15,6 @@ namespace ET
         IsCreate = 1 << 3,
     }
 
-#if NOT_UNITY
-    [BsonIgnoreExtraElements]
-#endif
     public partial class Entity: DisposeObject
     {
         [IgnoreDataMember]

Unity/Codes/Model/Core/Object/ProtoObject.cs

@@ -40,7 +40,7 @@ namespace ET
         }
     }
     
-    public abstract class DisposeObject: IDisposable, ISupportInitialize
+    public abstract class DisposeObject: Object, IDisposable, ISupportInitialize
     {
         public virtual void Dispose()
         {

Unity/Codes/Model/Module/Message/MessageSerializeHelper.cs

@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using MongoDB.Bson.IO;
 
 namespace ET
 {

Unity/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.4.10f1
-m_EditorVersionWithRevision: 2019.4.10f1 (5311b3af6f69)
+m_EditorVersion: 2019.4.32f1c1
+m_EditorVersionWithRevision: 2019.4.32f1c1 (55f062fbe553)