将帧同步demo抽出成一个module

Client-Server.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27130.2027
+VisualStudioVersion = 15.0.27130.2036
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Plugins", "Unity\Unity.Plugins.csproj", "{D1FDB199-0FB7-099D-3771-C6A942E4E326}"
 EndProject

Server/Hotfix/Server.Hotfix.csproj

@@ -21,11 +21,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Model\Server.Model.csproj" />
+    <Compile Remove="Other\**" />
+    <EmbeddedResource Remove="Other\**" />
+    <None Remove="Other\**" />
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Other\" />
+    <ProjectReference Include="..\Model\Server.Model.csproj" />
   </ItemGroup>
 
 </Project>

Server/Model/Entity/SceneEntity.cs

@@ -1,19 +0,0 @@
-using MongoDB.Bson.Serialization.Attributes;
-
-namespace ETModel
-{
-	// 需要记录自己所在Scene的继承这个类
-	public class SceneEntity : Entity
-	{
-		[BsonIgnore]
-		public Scene Scene { get; set; }
-
-		protected SceneEntity()
-		{
-		}
-
-		protected SceneEntity(long id) : base(id)
-		{
-		}
-	}
-}

Server/Model/Module/Location/LocationComponent.cs

@@ -1,19 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using MongoDB.Bson.Serialization.Attributes;
 
 namespace ETModel
 {
-	public abstract class LocationTask : SceneEntity
+	public abstract class LocationTask: Component
 	{
-		protected LocationTask()
-		{
-		}
-
-		protected LocationTask(long id) : base(id)
-		{
-		}
-
+		[BsonIgnore]
+		public Scene Scene { get; set; }
+		
 		public abstract void Run();
 	}
 

Server/Model/Server.Model.csproj

@@ -70,6 +70,7 @@
     <Compile Include="..\..\Unity\Assets\Scripts\Module\Config\AConfig.cs" Link="Module\Config\AConfig.cs" />
     <Compile Include="..\..\Unity\Assets\Scripts\Module\Config\ConfigAttribute.cs" Link="Module\Config\ConfigAttribute.cs" />
     <Compile Include="..\..\Unity\Assets\Scripts\Module\Config\ConfigComponent.cs" Link="Module\Config\ConfigComponent.cs" />
+    <Compile Include="..\..\Unity\Assets\Scripts\Module\FrameSync\FrameMessage.cs" Link="Module\FrameSync\FrameMessage.cs" />
     <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\AMHandler.cs" Link="Module\Message\AMHandler.cs" />
     <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\ErrorCode.cs" Link="Module\Message\ErrorCode.cs" />
     <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\IActorMessage.cs" Link="Module\Message\IActorMessage.cs" />

Unity/Assets/Scripts/Component/BundleDownloaderComponent.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 1d8fc4d7d4864d01b66efa363af35d88
-timeCreated: 1510746092

Unity/Assets/Scripts/Entity/Config.meta

@@ -1,3 +1,8 @@
-fileFormatVersion: 2
+fileFormatVersion: 2
 guid: abb2f46490234e2b9c85fce15f369485
-timeCreated: 1505441031
+folderAsset: yes
+timeCreated: 1505441031
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Scripts/Helper/MessageHelper.cs

@@ -1,6 +0,0 @@
-using System;
-
-namespace ETModel
-{
-
-}

Unity/Assets/Scripts/Helper/ResourceHelper.cs

@@ -1,21 +0,0 @@
-#if UNITY_EDITOR
-using UnityEditor;
-#endif
-using UnityEngine;
-
-namespace ETModel
-{
-	public static class ResourceHelper
-	{
-		public static UnityEngine.Object LoadResource(string bundleName, string prefab)
-		{
-#if  UNITY_EDITOR
-			string[] realPath = AssetDatabase.GetAssetPathsFromAssetBundleAndAssetName(bundleName.ToLower() + ".unity3d", prefab);
-			UnityEngine.Object resource = AssetDatabase.LoadAssetAtPath(realPath[0], typeof(GameObject));
-			return resource;
-#else
-			return null;
-#endif
-		}
-	}
-}

Unity/Assets/Scripts/Factory.meta → Unity/Assets/Scripts/Module/AssetsBundle.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 94650ee7db5039a46af443a359904797
+guid: 35402e9dfc2969c49a5189bb598071a0
 folderAsset: yes
-timeCreated: 1506146595
+timeCreated: 1520238560
 licenseType: Free
 DefaultImporter:
   userData: 

Unity/Assets/Scripts/Helper/MessageHelper.cs.meta → Unity/Assets/Scripts/Module/AssetsBundle/BundleDownloaderComponent.cs.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: f8758a6b16e89d74d8c8994247dc95cf
-timeCreated: 1517811152
+guid: ab9da8db48016d343941424a91194c2b
+timeCreated: 1520238560
 licenseType: Free
 MonoImporter:
   serializedVersion: 2

Unity/Assets/Scripts/Component/ResourcesComponent.cs.meta → Unity/Assets/Scripts/Module/AssetsBundle/ResourcesComponent.cs.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 509cf7df1ed2a52438a824cb162c208a
-timeCreated: 1498124686
+guid: 8da8ce2d353f6e64a918bd4230056fbe
+timeCreated: 1520238560
 licenseType: Free
 MonoImporter:
   serializedVersion: 2

Unity/Assets/Scripts/Module/FrameSync.meta

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

Unity/Assets/Scripts/Module/FrameSync/FrameMessage.cs

@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+using ProtoBuf;
+
+namespace ETModel
+{
+	[Message(Opcode.FrameMessage)]
+	[ProtoContract]
+	public partial class FrameMessage : MessageObject, IActorMessage
+	{
+		[ProtoMember(1, IsRequired = true)]
+		public int Frame;
+
+		[ProtoMember(2)]
+		public List<MessageObject> Messages = new List<MessageObject>();
+
+	}
+}

Unity/Assets/Scripts/Helper/ResourceHelper.cs.meta → Unity/Assets/Scripts/Module/FrameSync/FrameMessage.cs.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 0e8b296cdfa75c44287f010732230bad
-timeCreated: 1495183239
-licenseType: Pro
+guid: 86afd5075954a1d4db4f7affb78b6eba
+timeCreated: 1520238285
+licenseType: Free
 MonoImporter:
   serializedVersion: 2
   defaultReferences: []

Unity/Assets/Scripts/Module/Message/IActorMessage.cs

@@ -24,16 +24,4 @@ namespace ETModel
 	{
 		long Id { get; set; }
 	}
-
-	[Message(Opcode.FrameMessage)]
-	[ProtoContract]
-	public partial class FrameMessage : MessageObject, IActorMessage
-	{
-		[ProtoMember(1, IsRequired = true)]
-		public int Frame;
-
-		[ProtoMember(2)]
-		public List<MessageObject> Messages = new List<MessageObject>();
-
-	}
 }

Unity/Hotfix/Unity.Hotfix.csproj

@@ -56,13 +56,13 @@
     <Compile Include="Base\Helper\ExceptionHelper.cs" />
     <Compile Include="Base\Helper\JsonHelper.cs" />
     <Compile Include="Base\Object\IStart.cs" />
-    <Compile Include="Component\OperaComponent.cs" />
+    <Compile Include="Module\FrameSync\OperaComponent.cs" />
     <Compile Include="Entity\Config\UnitConfig.cs" />
     <Compile Include="Event\TestHotfixSubscribMonoEvent_LogString.cs" />
-    <Compile Include="Handler\Actor_CreateUnitsHandler.cs" />
-    <Compile Include="Handler\Actor_TestHandler.cs" />
-    <Compile Include="Handler\Frame_ClickMapHandler.cs" />
-    <Compile Include="Handler\G2C_TestHotfixHandler.cs" />
+    <Compile Include="Module\FrameSync\Actor_CreateUnitsHandler.cs" />
+    <Compile Include="Module\FrameSync\Actor_TestHandler.cs" />
+    <Compile Include="Module\FrameSync\Frame_ClickMapHandler.cs" />
+    <Compile Include="Module\FrameSync\G2C_TestHotfixHandler.cs" />
     <Compile Include="Module\Config\ACategory.cs" />
     <Compile Include="Module\Config\AConfig.cs" />
     <Compile Include="Module\Config\ConfigComponent.cs" />
@@ -93,7 +93,7 @@
     <Compile Include="Entity\Scene.cs" />
     <Compile Include="Module\Message\HotfixMessage.cs" />
     <Compile Include="Module\Message\SessionHelper.cs" />
-    <Compile Include="Entity\UI.cs" />
+    <Compile Include="Module\UI\UI.cs" />
     <Compile Include="Init.cs" />
     <Compile Include="Module\Message\HotfixOpcode.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

Unity/Unity.csproj

@@ -12,12 +12,15 @@
     <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <TargetFrameworkProfile></TargetFrameworkProfile>
-    <CompilerResponseFile></CompilerResponseFile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <CompilerResponseFile>
+    </CompilerResponseFile>
     <UnityProjectType>Game:1</UnityProjectType>
     <UnityBuildTarget>StandaloneWindows:5</UnityBuildTarget>
     <UnityVersion>2017.1.1p4</UnityVersion>
-    <RootNamespace></RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <LangVersion>6</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
@@ -183,10 +186,6 @@
     <Compile Include="Assets\Scripts\BehaviorTreeNode\Sequence.cs" />
     <Compile Include="Assets\Scripts\BehaviorTreeNode\True.cs" />
     <Compile Include="Assets\Scripts\BehaviorTreeNode\UIScale.cs" />
-    <Compile Include="Assets\Scripts\Component\AnimatorComponent.cs" />
-    <Compile Include="Assets\Scripts\Component\BundleDownloaderComponent.cs" />
-    <Compile Include="Assets\Scripts\Component\CameraComponent.cs" />
-    <Compile Include="Assets\Scripts\Component\ClientFrameComponent.cs" />
     <Compile Include="Assets\Scripts\Component\Config\ClientConfig.cs" />
     <Compile Include="Assets\Scripts\Component\Config\DBConfig.cs" />
     <Compile Include="Assets\Scripts\Component\Config\GlobalProto.cs" />
@@ -195,41 +194,31 @@
     <Compile Include="Assets\Scripts\Component\Config\OuterConfig.cs" />
     <Compile Include="Assets\Scripts\Component\Config\RunServerConfig.cs" />
     <Compile Include="Assets\Scripts\Component\Config\StartConfig.cs" />
-    <Compile Include="Assets\Scripts\Component\Config\VersionConfig.cs" />
     <Compile Include="Assets\Scripts\Component\GlobalConfigComponent.cs" />
-    <Compile Include="Assets\Scripts\Component\MoveComponent.cs" />
-    <Compile Include="Assets\Scripts\Component\PlayerComponent.cs" />
-    <Compile Include="Assets\Scripts\Component\ResourcesComponent.cs" />
     <Compile Include="Assets\Scripts\Component\SceneChangeComponent.cs" />
-    <Compile Include="Assets\Scripts\Component\SessionComponent.cs" />
     <Compile Include="Assets\Scripts\Component\TimerComponent.cs" />
-    <Compile Include="Assets\Scripts\Component\UnitComponent.cs" />
-    <Compile Include="Assets\Scripts\Entity\AssetsBundleLoaderAsync.cs" />
-    <Compile Include="Assets\Scripts\Entity\AssetsLoaderAsync.cs" />
     <Compile Include="Assets\Scripts\Entity\Config\UnitConfig.cs" />
     <Compile Include="Assets\Scripts\Entity\Game.cs" />
     <Compile Include="Assets\Scripts\Entity\Hotfix.cs" />
-    <Compile Include="Assets\Scripts\Entity\Player.cs" />
     <Compile Include="Assets\Scripts\Entity\Scene.cs" />
     <Compile Include="Assets\Scripts\Entity\Session.cs" />
-    <Compile Include="Assets\Scripts\Entity\UI.cs" />
-    <Compile Include="Assets\Scripts\Entity\Unit.cs" />
     <Compile Include="Assets\Scripts\Entity\UnityWebRequestAsync.cs" />
     <Compile Include="Assets\Scripts\Entity\WWWAsync.cs" />
     <Compile Include="Assets\Scripts\Event\NumericWatcher_Hp_ShowUI.cs" />
-    <Compile Include="Assets\Scripts\Factory\PlayerFactory.cs" />
-    <Compile Include="Assets\Scripts\Factory\UnitFactory.cs" />
     <Compile Include="Assets\Scripts\Helper\ActionHelper.cs" />
     <Compile Include="Assets\Scripts\Helper\BundleHelper.cs" />
     <Compile Include="Assets\Scripts\Helper\DllHelper.cs" />
     <Compile Include="Assets\Scripts\Helper\GameObjectHelper.cs" />
     <Compile Include="Assets\Scripts\Helper\ILHelper.cs" />
-    <Compile Include="Assets\Scripts\Helper\MessageHelper.cs" />
     <Compile Include="Assets\Scripts\Helper\PathHelper.cs" />
     <Compile Include="Assets\Scripts\Helper\PositionHelper.cs" />
-    <Compile Include="Assets\Scripts\Helper\ResourceHelper.cs" />
     <Compile Include="Assets\Scripts\Helper\ResourcesHelper.cs" />
     <Compile Include="Assets\Scripts\Init.cs" />
+    <Compile Include="Assets\Scripts\Module\AssetsBundle\AssetsBundleLoaderAsync.cs" />
+    <Compile Include="Assets\Scripts\Module\AssetsBundle\AssetsLoaderAsync.cs" />
+    <Compile Include="Assets\Scripts\Module\AssetsBundle\BundleDownloaderComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\AssetsBundle\ResourcesComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\AssetsBundle\VersionConfig.cs" />
     <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorNodeConfig.cs" />
     <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTree.cs" />
     <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeArgsDict.cs" />
@@ -286,6 +275,18 @@
     <Compile Include="Assets\Scripts\Module\Config\ConfigAttribute.cs" />
     <Compile Include="Assets\Scripts\Module\Config\ConfigComponent.cs" />
     <Compile Include="Assets\Scripts\Module\Config\ConfigHelper.cs" />
+    <Compile Include="Assets\Scripts\Module\FrameSync\AnimatorComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\FrameSync\CameraComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\FrameSync\ClientFrameComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\FrameSync\FrameMessage.cs" />
+    <Compile Include="Assets\Scripts\Module\FrameSync\MoveComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\FrameSync\Player.cs" />
+    <Compile Include="Assets\Scripts\Module\FrameSync\PlayerComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\FrameSync\PlayerFactory.cs" />
+    <Compile Include="Assets\Scripts\Module\FrameSync\SessionComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\FrameSync\Unit.cs" />
+    <Compile Include="Assets\Scripts\Module\FrameSync\UnitComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\FrameSync\UnitFactory.cs" />
     <Compile Include="Assets\Scripts\Module\Message\AMHandler.cs" />
     <Compile Include="Assets\Scripts\Module\Message\ClientDispatcher.cs" />
     <Compile Include="Assets\Scripts\Module\Message\ErrorCode.cs" />
@@ -326,6 +327,7 @@
     <Compile Include="Assets\Scripts\Module\Numeric\NumericWatcherComponent.cs" />
     <Compile Include="Assets\Scripts\Module\UI\IUIFactory.cs" />
     <Compile Include="Assets\Scripts\Module\UI\LayerNames.cs" />
+    <Compile Include="Assets\Scripts\Module\UI\UI.cs" />
     <Compile Include="Assets\Scripts\Module\UI\UIComponent.cs" />
     <Compile Include="Assets\Scripts\Module\UI\UIFactoryAttribute.cs" />
     <Compile Include="Assets\Scripts\Module\UI\UIType.cs" />
@@ -680,4 +682,4 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="GenerateTargetFrameworkMonikerAttribute" />
-</Project>
+</Project>