修复所有编译错误

Unity/Assets/Scripts/Config/ConfigHelper.cs

@@ -1,5 +1,4 @@
 using System;
-using Model;
 using UnityEngine;
 
 namespace Model

Unity/Assets/Scripts/Entity/Message.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: e9766182470b7474a9ac9f1cccc8edcc
+folderAsset: yes
+timeCreated: 1498120811
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Scripts/Entity/Message/InnerMessage.cs

@@ -0,0 +1 @@
+using MongoDB.Bson.Serialization.Attributes;


// ·þÎñÆ÷ÄÚ²¿ÏûÏ¢ Opcode´Ó10000¿ªÊ¼


namespace Model

{

	[Message(10001)]

	[BsonIgnoreExtraElements]

	public class R2G_GetLoginKey: ARequest

	{

	}


	[Message(10002)]

	[BsonIgnoreExtraElements]

	public class G2R_GetLoginKey: AResponse

	{

		public long Key;


		public G2R_GetLoginKey()

		{

		}


		public G2R_GetLoginKey(long key)

		{

			this.Key = key;

		}

	}


	[Message(10003)]

	[BsonIgnoreExtraElements]

	public class M2A_Reload: ARequest

	{

	}


	[Message(10004)]

	[BsonIgnoreExtraElements]

	public class A2M_Reload: AResponse

	{

	}


	[Message(10005)]

	[BsonIgnoreExtraElements]

	public class G2G_LockRequest: ARequest

	{

		public long Id;

		public string Address;

	}


	[Message(10006)]

	[BsonIgnoreExtraElements]

	public class G2G_LockResponse: AResponse

	{

	}


	[Message(10007)]

	[BsonIgnoreExtraElements]

	public class G2G_LockReleaseRequest: ARequest

	{

		public long Id;

		public string Address;

	}


	[Message(10008)]

	[BsonIgnoreExtraElements]

	public class G2G_LockReleaseResponse: AResponse

	{

	}

}

Unity/Assets/Scripts/Entity/Message/InnerMessage.cs.meta

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

Unity/Hotfix/Entity/Message/Opcode.cs → Unity/Assets/Scripts/Entity/Message/Opcode.cs

@@ -1,4 +1,4 @@
-namespace Hotfix
+namespace Model
 {
 	public static class Opcode
 	{

Unity/Assets/Scripts/Entity/Message/Opcode.cs.meta

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

Unity/Hotfix/Entity/Message/OuterMessage.cs → Unity/Assets/Scripts/Entity/Message/OuterMessage.cs

@@ -1,9 +1,8 @@
-using Model;
 using MongoDB.Bson.Serialization.Attributes;
 
 // 服务器与客户端之间的消息 Opcode从1-9999
 
-namespace Hotfix
+namespace Model
 {
 	[Message(Opcode.C2R_Login)]
 	[BsonIgnoreExtraElements]

Unity/Assets/Scripts/Entity/Message/OuterMessage.cs.meta

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

Unity/Assets/Scripts/Entity/Session.cs

@@ -40,7 +40,7 @@ namespace Model
 
 		private async void StartRecv()
 		{
-			TimerComponent timerComponent = Hotfix.Scene.GetComponent<TimerComponent>();
+			TimerComponent timerComponent = Game.Scene.GetComponent<TimerComponent>();
 			while (true)
 			{
 				if (this.Id == 0)

Unity/Assets/Scripts/Helper/JsonHelper.cs

@@ -6,29 +6,29 @@ namespace Model
 	{
 		public static string ToJson(object obj)
 		{
-			return JsonMapper.ToJson(obj);
+			return MongoHelper.ToJson(obj);
 		}
 
 		public static T FromJson<T>(string str)
 		{
-			return JsonMapper.ToObject<T>(str);
+			return MongoHelper.FromJson<T>(str);
 		}
 
 		public static object FromJson(Type type, string str)
 		{
-			return JsonMapper.ToObject(type, str);
+			return MongoHelper.FromJson(type, str);
 		}
 
 		public static T FromJson<T>(byte[] bytes, int index, int count)
 		{
 			string str = bytes.ToStr();
-			return JsonMapper.ToObject<T>(str);
+			return MongoHelper.FromJson<T>(str);
 		}
 
 		public static object FromJson(Type type, byte[] bytes, int index, int count)
 		{
 			string str = bytes.ToStr(index, count);
-			return JsonMapper.ToObject(type, str);
+			return MongoHelper.FromJson(type, str);
 		}
 	}
 }

Unity/Hotfix/Entity/Message/InnerMessage.cs

@@ -1 +0,0 @@
-using MongoDB.Bson.Serialization.Attributes;


// ·þÎñÆ÷ÄÚ²¿ÏûÏ¢ Opcode´Ó10000¿ªÊ¼


namespace Hotfix

{

	[Message(10001)]

	[BsonIgnoreExtraElements]

	public class R2G_GetLoginKey: ARequest

	{

	}


	[Message(10002)]

	[BsonIgnoreExtraElements]

	public class G2R_GetLoginKey: AResponse

	{

		public long Key;


		public G2R_GetLoginKey()

		{

		}


		public G2R_GetLoginKey(long key)

		{

			this.Key = key;

		}

	}


	[Message(10003)]

	[BsonIgnoreExtraElements]

	public class M2A_Reload: ARequest

	{

	}


	[Message(10004)]

	[BsonIgnoreExtraElements]

	public class A2M_Reload: AResponse

	{

	}


	[Message(10005)]

	[BsonIgnoreExtraElements]

	public class G2G_LockRequest: ARequest

	{

		public long Id;

		public string Address;

	}


	[Message(10006)]

	[BsonIgnoreExtraElements]

	public class G2G_LockResponse: AResponse

	{

	}


	[Message(10007)]

	[BsonIgnoreExtraElements]

	public class G2G_LockReleaseRequest: ARequest

	{

		public long Id;

		public string Address;

	}


	[Message(10008)]

	[BsonIgnoreExtraElements]

	public class G2G_LockReleaseResponse: AResponse

	{

	}

}

Unity/Hotfix/Helper/JsonHelper.cs

@@ -0,0 +1,36 @@
+using System;
+using LitJson;
+using Model;
+
+namespace Hotfix
+{
+	public static class JsonHelper
+	{
+		public static string ToJson(object obj)
+		{
+			return JsonMapper.ToJson(obj);
+		}
+
+		public static T FromJson<T>(string str)
+		{
+			return JsonMapper.ToObject<T>(str);
+		}
+
+		public static object FromJson(Type type, string str)
+		{
+			return JsonMapper.ToObject(type, str);
+		}
+
+		public static T FromJson<T>(byte[] bytes, int index, int count)
+		{
+			string str = bytes.ToStr();
+			return JsonMapper.ToObject<T>(str);
+		}
+
+		public static object FromJson(Type type, byte[] bytes, int index, int count)
+		{
+			string str = bytes.ToStr(index, count);
+			return JsonMapper.ToObject(type, str);
+		}
+	}
+}

Unity/Hotfix/Object/Object.cs

@@ -1,5 +1,4 @@
 using Model;
-using MongoDB.Bson;
 
 namespace Hotfix
 {

Unity/Hotfix/Unity.Hotfix.csproj

@@ -55,6 +55,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Helper\JsonHelper.cs" />
     <Compile Include="HotfixInit.cs" />
     <Compile Include="LitJson\IJsonWrapper.cs" />
     <Compile Include="LitJson\JsonData.cs" />
@@ -82,9 +83,6 @@
     <Compile Include="Component\UnitComponent.cs" />
     <Compile Include="Handler\R2C_ServerLogHandler.cs" />
     <Compile Include="Entity\Hotfix.cs" />
-    <Compile Include="Entity\Message\InnerMessage.cs" />
-    <Compile Include="Entity\Message\Opcode.cs" />
-    <Compile Include="Entity\Message\OuterMessage.cs" />
     <Compile Include="Entity\Scene.cs" />
     <Compile Include="Entity\UI.cs" />
     <Compile Include="Entity\Unit.cs" />
@@ -120,9 +118,7 @@
       <Name>Unity.Plugins</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Helper\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>echo FA | xcopy $(TargetName).dll $(SolutionDir)Assets\Res\Code\$(TargetName).dll.bytes

Unity/Unity.csproj

@@ -374,6 +374,9 @@
     <Compile Include="Assets\Scripts\Component\Config\RunServerConfig.cs" />
     <Compile Include="Assets\Scripts\Component\EventComponent.cs" />
     <Compile Include="Assets\Scripts\Component\MessageDispatherComponent.cs" />
+    <Compile Include="Assets\Scripts\Component\NetInnerComponent.cs" />
+    <Compile Include="Assets\Scripts\Component\NetOuterComponent.cs" />
+    <Compile Include="Assets\Scripts\Component\NetworkComponent.cs" />
     <Compile Include="Assets\Scripts\Component\TimerComponent.cs" />
     <Compile Include="Assets\Scripts\Config\ACategory.cs" />
     <Compile Include="Assets\Scripts\Config\AConfig.cs" />
@@ -383,17 +386,17 @@
     <Compile Include="Assets\Scripts\Config\ICategory.cs" />
     <Compile Include="Assets\Scripts\Define.cs" />
     <Compile Include="Assets\Scripts\DllHelper.cs" />
-    <Compile Include="Assets\Scripts\EntityEventType.cs" />
     <Compile Include="Assets\Scripts\Entity\AssetBundleLoaderAsync.cs" />
-    <Compile Include="Assets\Scripts\Component\NetInnerComponent.cs" />
-    <Compile Include="Assets\Scripts\Component\NetOuterComponent.cs" />
-    <Compile Include="Assets\Scripts\Component\NetworkComponent.cs" />
     <Compile Include="Assets\Scripts\Entity\Config\BuffConfig.cs" />
     <Compile Include="Assets\Scripts\Entity\Config\StartConfig.cs" />
     <Compile Include="Assets\Scripts\Entity\Game.cs" />
+    <Compile Include="Assets\Scripts\Entity\Message\InnerMessage.cs" />
+    <Compile Include="Assets\Scripts\Entity\Message\Opcode.cs" />
+    <Compile Include="Assets\Scripts\Entity\Message\OuterMessage.cs" />
     <Compile Include="Assets\Scripts\Entity\Scene.cs" />
     <Compile Include="Assets\Scripts\Entity\Session.cs" />
     <Compile Include="Assets\Scripts\Entity\WWWAsync.cs" />
+    <Compile Include="Assets\Scripts\EntityEventType.cs" />
     <Compile Include="Assets\Scripts\Event\AEventAttribute.cs" />
     <Compile Include="Assets\Scripts\Event\Env.cs" />
     <Compile Include="Assets\Scripts\Event\EnvKey.cs" />
@@ -423,12 +426,12 @@
     <Compile Include="Assets\Scripts\Message\OpcodeHelper.cs" />
     <Compile Include="Assets\Scripts\Message\RpcException.cs" />
     <Compile Include="Assets\Scripts\MonoMethod.cs" />
+    <Compile Include="Assets\Scripts\Object\Component.cs" />
     <Compile Include="Assets\Scripts\Object\Disposer.cs" />
+    <Compile Include="Assets\Scripts\Object\Entity.cs" />
     <Compile Include="Assets\Scripts\Object\EntityEventAttribute.cs" />
     <Compile Include="Assets\Scripts\Object\EntityEventId.cs" />
     <Compile Include="Assets\Scripts\Object\EntityType.cs" />
-    <Compile Include="Assets\Scripts\Object\Component.cs" />
-    <Compile Include="Assets\Scripts\Object\Entity.cs" />
     <Compile Include="Assets\Scripts\Object\IAwake.cs" />
     <Compile Include="Assets\Scripts\Object\ILoad.cs" />
     <Compile Include="Assets\Scripts\Object\IUpdate.cs" />