1.JsonHelper挪到热更层

2.windows上加上启动单进程服务器的菜单
3.几个Build dll菜单折叠一下

Unity/Assets/Editor/BuildEditor/BuildAssemblieEditor.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
-using ILRuntime.Mono.Cecil;
 using UnityEngine;
 using UnityEditor;
 using UnityEditor.Compilation;
@@ -14,7 +13,7 @@ namespace ET
     {
         private const string CodeDir = "Assets/Bundles/Code/";
 
-        [MenuItem("Tools/BuildCodeDebug _F5")]
+        [MenuItem("Tools/Build/BuildCodeDebug _F5")]
         public static void BuildCodeDebug()
         {
             BuildAssemblieEditor.BuildMuteAssembly("Code", new []
@@ -30,7 +29,7 @@ namespace ET
             AssetDatabase.Refresh();
         }
         
-        [MenuItem("Tools/BuildCodeRelease _F6")]
+        [MenuItem("Tools/Build/BuildCodeRelease _F6")]
         public static void BuildCodeRelease()
         {
             BuildAssemblieEditor.BuildMuteAssembly("Code", new []
@@ -46,7 +45,7 @@ namespace ET
             AssetDatabase.Refresh();
         }
         
-        [MenuItem("Tools/BuildData _F7")]
+        [MenuItem("Tools/Build/BuildData _F7")]
         public static void BuildData()
         {
             BuildAssemblieEditor.BuildMuteAssembly("Data", new []
@@ -57,7 +56,7 @@ namespace ET
         }
         
         
-        [MenuItem("Tools/BuildLogic _F8")]
+        [MenuItem("Tools/Build/BuildLogic _F8")]
         public static void BuildLogic()
         {
             string[] logicFiles = Directory.GetFiles(Define.BuildOutputDir, "Logic_*");

Unity/Assets/Editor/ServerCommandLineEditor/ServerCommandLineEditor.cs

@@ -3,22 +3,13 @@ using UnityEngine;
 
 namespace ET
 {
-    public class ServerCommandLineEditor: EditorWindow
+    public static class ServerCommandLineEditor
     {
-        public void OnGUI()
+        [MenuItem("Tools/启动单进程服务器(仅windows可用)")]
+        public static void ShowWindow()
         {
-            if (GUILayout.Button("启动"))
-            {
-                string arguments = $"";
-                ProcessHelper.Run("App.exe", arguments, "../Bin/");
-            }
-
-            if (GUILayout.Button("启动数据库"))
-            {
-                ProcessHelper.Run("mongod", @"--dbpath=db", "../Database/bin/");
-            }
-
-            GUILayout.EndHorizontal();
+            string arguments = $"Server.dll --Process=1 --Console=1";
+            ProcessHelper.Run("dotnet.exe", arguments, "../Bin/");
         }
     }
 }

Unity/Assets/Mono/Core/Helper/JsonHelper.cs.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 4a70fc9ae05ae2443be10cb73468fb7a
-timeCreated: 1519957708
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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

@@ -150,7 +150,6 @@ namespace ILRuntime.Runtime.Generated
             System_Collections_IEnumerator_Binding.Register(app);
             System_Collections_Generic_Dictionary_2_Type_UnOrderMultiMap_2_Type_Object_Binding.Register(app);
             System_DateTime_Binding.Register(app);
-            ET_JsonHelper_Binding.Register(app);
             System_Collections_Generic_Dictionary_2_Type_Queue_1_ILTypeInstance_Binding.Register(app);
             System_Collections_Generic_Queue_1_ILTypeInstance_Binding.Register(app);
             ProtoBuf_Meta_RuntimeTypeModel_Binding.Register(app);

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

@@ -1,80 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-using ILRuntime.CLR.TypeSystem;
-using ILRuntime.CLR.Method;
-using ILRuntime.Runtime.Enviorment;
-using ILRuntime.Runtime.Intepreter;
-using ILRuntime.Runtime.Stack;
-using ILRuntime.Reflection;
-using ILRuntime.CLR.Utils;
-
-namespace ILRuntime.Runtime.Generated
-{
-    unsafe class ET_JsonHelper_Binding
-    {
-        public static void Register(ILRuntime.Runtime.Enviorment.AppDomain app)
-        {
-            BindingFlags flag = BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static | BindingFlags.DeclaredOnly;
-            MethodBase method;
-            Type[] args;
-            Type type = typeof(ET.JsonHelper);
-            args = new Type[]{typeof(System.Object)};
-            method = type.GetMethod("ToJson", flag, null, args, null);
-            app.RegisterCLRMethodRedirection(method, ToJson_0);
-            args = new Type[]{typeof(System.Type), typeof(System.String)};
-            method = type.GetMethod("FromJson", flag, null, args, null);
-            app.RegisterCLRMethodRedirection(method, FromJson_1);
-
-
-        }
-
-
-        static StackObject* ToJson_0(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.Object @message = (System.Object)typeof(System.Object).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 = ET.JsonHelper.ToJson(@message);
-
-            return ILIntepreter.PushObject(__ret, __mStack, result_of_this_method);
-        }
-
-        static StackObject* FromJson_1(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, 2);
-
-            ptr_of_this_method = ILIntepreter.Minus(__esp, 1);
-            System.String @json = (System.String)typeof(System.String).CheckCLRTypes(StackObject.ToObject(ptr_of_this_method, __domain, __mStack), (CLR.Utils.Extensions.TypeFlags)0);
-            __intp.Free(ptr_of_this_method);
-
-            ptr_of_this_method = ILIntepreter.Minus(__esp, 2);
-            System.Type @type = (System.Type)typeof(System.Type).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 = ET.JsonHelper.FromJson(@type, @json);
-
-            object obj_result_of_this_method = result_of_this_method;
-            if(obj_result_of_this_method is CrossBindingAdaptorType)
-            {    
-                return ILIntepreter.PushObject(__ret, __mStack, ((CrossBindingAdaptorType)obj_result_of_this_method).ILInstance, true);
-            }
-            return ILIntepreter.PushObject(__ret, __mStack, result_of_this_method, true);
-        }
-
-
-
-    }
-}

Unity/Assets/Mono/ILRuntime/Generate/ET_JsonHelper_Binding.cs.meta

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