tanghai 8 роки тому
батько
коміт
ad6d169c2c

+ 0 - 2
.gitignore

@@ -34,5 +34,3 @@ _ReSharper.CSharp/
 /Logs
 /Unity/CSharp60Support/compilation.log
 /.vs
-/Unity/.vs/
-/Unity/Unity.sln

+ 9 - 0
Unity/Assets/Scripts/Base.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 5a0e66833e8706d4bb62a6486e57b0b3
+folderAsset: yes
+timeCreated: 1495185207
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 2
Unity/Assets/Scripts/ILAdapterAttribute.cs.meta → Unity/Assets/Scripts/IL/ILAdapterAttribute.cs.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 4dbba48a941e87b4a9f59bec38c122c8
-timeCreated: 1495162206
+guid: dfe25f88b146b3642a3c5dc24d5ddaf2
+timeCreated: 1495185208
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

+ 2 - 2
Unity/Assets/Scripts/ILRedirection.cs.meta → Unity/Assets/Scripts/IL/ILRedirection.cs.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 74334a38d294e7e4fa059d05458688e4
-timeCreated: 1495184512
+guid: 04d37d1b01c652a42a4a9ab9eca299ad
+timeCreated: 1495185207
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

+ 8 - 0
Unity/Assets/Scripts/Init.cs

@@ -31,6 +31,7 @@ namespace Model
 
 				this.RegisterAssembly();
 				this.RegisterILAdapter();
+				this.RegisterDelegate();
 				this.RegisterRedirection();
 
 				IType hotfixInitType = AppDomain.LoadedTypes["Hotfix.HotfixInit"];
@@ -74,6 +75,13 @@ namespace Model
 		{
 		}
 
+		public void RegisterDelegate()
+		{
+			AppDomain.DelegateManager.RegisterMethodDelegate<AChannel, System.Net.Sockets.SocketError>();
+			AppDomain.DelegateManager.RegisterMethodDelegate<System.Byte[], System.Int32, System.Int32>();
+
+		}
+
 		public void RegisterILAdapter()
 		{
 			Assembly assembly = typeof(Init).Assembly;

+ 0 - 1
Unity/Hotfix/Model/Component/EventComponent.cs

@@ -47,7 +47,6 @@ namespace Model
 			{
 				try
 				{
-					Log.Debug(obj.GetType().FullName);
 					IEvent iEvent = (IEvent)obj;
 					iEvent.Run();
 				}

+ 0 - 13
Unity/Hotfix/Model/Component/UnitComponentE.cs

@@ -1,13 +0,0 @@
-using Model;
-
-namespace Hotfix
-{
-	[EntityEvent(EntityEventId.UnitComponent)]
-	public static class UnitComponentE
-	{
-		public static void Awake(this UnitComponent component)
-		{
-			Log.Debug("UnitComponent Awake");
-		}
-	}
-}

+ 0 - 1
Unity/Hotfix/Unity.Hotfix.csproj

@@ -77,7 +77,6 @@
     <Compile Include="Model\Component\UIComponent.cs" />
     <Compile Include="UI\UILobby\Component\UILobbyComponent.cs" />
     <Compile Include="Model\Component\UnitComponent.cs" />
-    <Compile Include="Model\Component\UnitComponentE.cs" />
     <Compile Include="Handler\R2C_ServerLogHandler.cs" />
     <Compile Include="Model\Config\ACategory.cs" />
     <Compile Include="Model\Config\AConfig.cs" />

+ 1 - 3
Unity/Unity.sln

@@ -1,8 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26430.6
-MinimumVisualStudioVersion = 10.0.40219.1
+# Visual Studio 2017
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Plugins", "Unity.Plugins.csproj", "{D1FDB199-0FB7-099D-3771-C6A942E4E326}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity", "Unity.csproj", "{CF118143-7E37-744F-BE45-3F55345FEC40}"