ソースを参照

1.CSharp-Mono.sln和CSharp.sln统一放到CSharp目录
2.需要在linux上跑的程序集去除对nuget的依赖,直接引用package下的dll

tanghai 11 年 前
コミット
102cea6882
51 ファイル変更757 行追加1658 行削除
  1. 0 69
      CSharp-Mono/CSharp-Mono.sln
  2. 0 8
      CSharp-Mono/CSharp-Mono.userprefs
  3. 0 95
      CSharp-Mono/Game/Controller/Controller.csproj
  4. 0 27
      CSharp-Mono/Game/Controller/Properties/AssemblyInfo.cs
  5. 0 155
      CSharp-Mono/Game/Model/Model.csproj
  6. 0 27
      CSharp-Mono/Game/Model/Properties/AssemblyInfo.cs
  7. 0 157
      CSharp-Mono/Platform/Common/Common.csproj
  8. 0 27
      CSharp-Mono/Platform/Common/Properties/AssemblyInfo.cs
  9. 0 27
      CSharp-Mono/Platform/TNet/Properties/AssemblyInfo.cs
  10. 0 78
      CSharp-Mono/Platform/TNet/TNet.csproj
  11. 0 27
      CSharp-Mono/Platform/TNetTest/Properties/AssemblyInfo.cs
  12. 0 56
      CSharp-Mono/Platform/TNetTest/TNetTest.csproj
  13. 0 27
      CSharp-Mono/Platform/UNet/Properties/AssemblyInfo.cs
  14. 0 90
      CSharp-Mono/Platform/UNet/UNet.csproj
  15. 0 27
      CSharp-Mono/Platform/UNetTest/Properties/AssemblyInfo.cs
  16. 0 53
      CSharp-Mono/Platform/UNetTest/UNetTest.csproj
  17. 1 1
      CSharp/App/Modules/BehaviorTreeModule/BehaviorTreeModule.csproj
  18. 75 0
      CSharp/CSharp-Mono.sln
  19. 13 0
      CSharp/CSharp-Mono.userprefs
  20. 115 134
      CSharp/CSharp.sln
  21. 10 30
      CSharp/Game/Controller/Controller.csproj
  22. 36 0
      CSharp/Game/Controller/Properties/AssemblyInfo.cs
  23. 0 4
      CSharp/Game/Controller/packages.config
  24. 32 43
      CSharp/Game/Model/Model.csproj
  25. 36 0
      CSharp/Game/Model/Properties/AssemblyInfo.cs
  26. 0 4
      CSharp/Game/Model/packages.config
  27. 0 116
      CSharp/Game/MongoDBTest/MongoDBTest.csproj
  28. 0 4
      CSharp/Game/MongoDBTest/packages.config
  29. 23 46
      CSharp/Platform/Common/Common.csproj
  30. 36 0
      CSharp/Platform/Common/Properties/AssemblyInfo.cs
  31. 0 6
      CSharp/Platform/Common/packages.config
  32. 5 8
      CSharp/Platform/TNet/Properties/AssemblyInfo.cs
  33. 14 37
      CSharp/Platform/TNet/TNet.csproj
  34. 0 4
      CSharp/Platform/TNet/packages.config
  35. 0 108
      CSharp/Platform/TNetTest/TNetTest.csproj
  36. 0 4
      CSharp/Platform/TNetTest/packages.config
  37. 36 0
      CSharp/Platform/UNet/Properties/AssemblyInfo.cs
  38. 19 34
      CSharp/Platform/UNet/UNet.csproj
  39. 0 4
      CSharp/Platform/UNet/packages.config
  40. 0 114
      CSharp/Platform/UNetTest/UNetTest.csproj
  41. 0 4
      CSharp/Platform/UNetTest/packages.config
  42. 72 0
      CSharp/Tests/ModelTest/ModelTest.csproj
  43. 3 3
      CSharp/Tests/ModelTest/MongoDBTest.cs
  44. 36 0
      CSharp/Tests/ModelTest/Properties/AssemblyInfo.cs
  45. 36 0
      CSharp/Tests/TNetTest/Properties/AssemblyInfo.cs
  46. 62 0
      CSharp/Tests/TNetTest/TNetTest.csproj
  47. 0 0
      CSharp/Tests/TNetTest/TServiceTest.cs
  48. 0 0
      CSharp/Tests/TNetTest/TcpListenerTest.cs
  49. 36 0
      CSharp/Tests/UNetTest/Properties/AssemblyInfo.cs
  50. 61 0
      CSharp/Tests/UNetTest/UNetTest.csproj
  51. 0 0
      CSharp/Tests/UNetTest/UServiceTest.cs

+ 0 - 69
CSharp-Mono/CSharp-Mono.sln

@@ -1,69 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Game", "Game", "{1CB353E9-E0E7-42F1-B2C6-9028D6FC25D2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model", "Game\Model\Model.csproj", "{01895B6C-E8E9-4F14-9497-E9DB426ADB11}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controller", "Game\Controller\Controller.csproj", "{86CD4CD0-D91D-4E44-B610-61565918FA14}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platform", "Platform", "{3B94631D-6166-4733-922D-8D7ED69510F2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Platform\Common\Common.csproj", "{EF4373AF-66D4-4313-A882-60EF0AE4239A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TNet", "Platform\TNet\TNet.csproj", "{AA3FD3AA-1835-42F4-9BE3-4A26D7CA8AB1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UNet", "Platform\UNet\UNet.csproj", "{3A56E389-BB11-421C-9E11-EA88C5CA3EFC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TNetTest", "Platform\TNetTest\TNetTest.csproj", "{27CDF1D7-723A-4BD9-BA7E-39CB479DCA85}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UNetTest", "Platform\UNetTest\UNetTest.csproj", "{E4DD0EC7-FAC5-459A-8496-E5B4F828C9BD}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{01895B6C-E8E9-4F14-9497-E9DB426ADB11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{01895B6C-E8E9-4F14-9497-E9DB426ADB11}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{01895B6C-E8E9-4F14-9497-E9DB426ADB11}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{01895B6C-E8E9-4F14-9497-E9DB426ADB11}.Release|Any CPU.Build.0 = Release|Any CPU
-		{27CDF1D7-723A-4BD9-BA7E-39CB479DCA85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{27CDF1D7-723A-4BD9-BA7E-39CB479DCA85}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{27CDF1D7-723A-4BD9-BA7E-39CB479DCA85}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{27CDF1D7-723A-4BD9-BA7E-39CB479DCA85}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A56E389-BB11-421C-9E11-EA88C5CA3EFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A56E389-BB11-421C-9E11-EA88C5CA3EFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A56E389-BB11-421C-9E11-EA88C5CA3EFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A56E389-BB11-421C-9E11-EA88C5CA3EFC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{86CD4CD0-D91D-4E44-B610-61565918FA14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{86CD4CD0-D91D-4E44-B610-61565918FA14}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{86CD4CD0-D91D-4E44-B610-61565918FA14}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{86CD4CD0-D91D-4E44-B610-61565918FA14}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AA3FD3AA-1835-42F4-9BE3-4A26D7CA8AB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA3FD3AA-1835-42F4-9BE3-4A26D7CA8AB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AA3FD3AA-1835-42F4-9BE3-4A26D7CA8AB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AA3FD3AA-1835-42F4-9BE3-4A26D7CA8AB1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E4DD0EC7-FAC5-459A-8496-E5B4F828C9BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E4DD0EC7-FAC5-459A-8496-E5B4F828C9BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E4DD0EC7-FAC5-459A-8496-E5B4F828C9BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E4DD0EC7-FAC5-459A-8496-E5B4F828C9BD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EF4373AF-66D4-4313-A882-60EF0AE4239A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF4373AF-66D4-4313-A882-60EF0AE4239A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF4373AF-66D4-4313-A882-60EF0AE4239A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EF4373AF-66D4-4313-A882-60EF0AE4239A}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{01895B6C-E8E9-4F14-9497-E9DB426ADB11} = {1CB353E9-E0E7-42F1-B2C6-9028D6FC25D2}
-		{86CD4CD0-D91D-4E44-B610-61565918FA14} = {1CB353E9-E0E7-42F1-B2C6-9028D6FC25D2}
-		{EF4373AF-66D4-4313-A882-60EF0AE4239A} = {3B94631D-6166-4733-922D-8D7ED69510F2}
-		{AA3FD3AA-1835-42F4-9BE3-4A26D7CA8AB1} = {3B94631D-6166-4733-922D-8D7ED69510F2}
-		{3A56E389-BB11-421C-9E11-EA88C5CA3EFC} = {3B94631D-6166-4733-922D-8D7ED69510F2}
-		{27CDF1D7-723A-4BD9-BA7E-39CB479DCA85} = {3B94631D-6166-4733-922D-8D7ED69510F2}
-		{E4DD0EC7-FAC5-459A-8496-E5B4F828C9BD} = {3B94631D-6166-4733-922D-8D7ED69510F2}
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		outputpath = Bin
-	EndGlobalSection
-EndGlobal

+ 0 - 8
CSharp-Mono/CSharp-Mono.userprefs

@@ -1,8 +0,0 @@
-<Properties StartupItem="Platform\Common\Common.csproj">
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench />
-  <MonoDevelop.Ide.DebuggingService.Breakpoints>
-    <BreakpointStore />
-  </MonoDevelop.Ide.DebuggingService.Breakpoints>
-  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
-</Properties>

+ 0 - 95
CSharp-Mono/Game/Controller/Controller.csproj

@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{86CD4CD0-D91D-4E44-B610-61565918FA14}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Controller</RootNamespace>
-    <AssemblyName>Controller</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="MongoDB.Driver">
-      <HintPath>..\..\..\CSharp\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Driver.dll</HintPath>
-    </Reference>
-    <Reference Include="MongoDB.Bson">
-      <HintPath>..\..\..\CSharp\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Bson.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\..\CSharp\Game\Controller\MessageType.cs">
-      <Link>MessageType.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Controller\NodeType.cs">
-      <Link>NodeType.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Controller\Action\BuffTimeoutAction.cs">
-      <Link>Action\BuffTimeoutAction.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Controller\Action\MessageAction.cs">
-      <Link>Action\MessageAction.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Controller\BehaviorTreeNode\Not.cs">
-      <Link>BehaviorTreeNode\Not.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Controller\BehaviorTreeNode\Selector.cs">
-      <Link>BehaviorTreeNode\Selector.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Controller\BehaviorTreeNode\Sequence.cs">
-      <Link>BehaviorTreeNode\Sequence.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Controller\ConfigCategory\BuffCategory.cs">
-      <Link>ConfigCategory\BuffCategory.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Controller\ConfigCategory\GlobalCategory.cs">
-      <Link>ConfigCategory\GlobalCategory.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Controller\ConfigCategory\NodeCategory.cs">
-      <Link>ConfigCategory\NodeCategory.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Controller\ConfigCategory\UnitCategory.cs">
-      <Link>ConfigCategory\UnitCategory.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Controller\Event\AfterAddBuff.cs">
-      <Link>Event\AfterAddBuff.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Controller\Factory\UnitFactory.cs">
-      <Link>Factory\UnitFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Controller\Message\CMsgLoginEvent.cs">
-      <Link>Message\CMsgLoginEvent.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\..\Platform\Common\Common.csproj">
-      <Project>{EF4373AF-66D4-4313-A882-60EF0AE4239A}</Project>
-      <Name>Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Model\Model.csproj">
-      <Project>{01895B6C-E8E9-4F14-9497-E9DB426ADB11}</Project>
-      <Name>Model</Name>
-    </ProjectReference>
-  </ItemGroup>
-</Project>

+ 0 - 27
CSharp-Mono/Game/Controller/Properties/AssemblyInfo.cs

@@ -1,27 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("Controller")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("tanghai")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-

+ 0 - 155
CSharp-Mono/Game/Model/Model.csproj

@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{01895B6C-E8E9-4F14-9497-E9DB426ADB11}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Model</RootNamespace>
-    <AssemblyName>Model</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="MongoDB.Driver">
-      <HintPath>..\..\..\CSharp\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Driver.dll</HintPath>
-    </Reference>
-    <Reference Include="MongoDB.Bson">
-      <HintPath>..\..\..\CSharp\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Bson.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\..\CSharp\Game\Model\BehaviorTree\BehaviorTree.cs">
-      <Link>BehaviorTree\BehaviorTree.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\BehaviorTree\BehaviorTreeFactory.cs">
-      <Link>BehaviorTree\BehaviorTreeFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\BehaviorTree\BlackBoard.cs">
-      <Link>BehaviorTree\BlackBoard.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\BehaviorTree\Node.cs">
-      <Link>BehaviorTree\Node.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\BehaviorTree\NodeAttribute.cs">
-      <Link>BehaviorTree\NodeAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\Component\ActorComponent.cs">
-      <Link>Component\ActorComponent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\Component\BehaviorTreeComponent.cs">
-      <Link>Component\BehaviorTreeComponent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\Component\BuffComponent.cs">
-      <Link>Component\BuffComponent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\Component\ChannelUnitInfoComponent.cs">
-      <Link>Component\ChannelUnitInfoComponent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\Component\ConfigComponent.cs">
-      <Link>Component\ConfigComponent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\Component\EventComponent.cs">
-      <Link>Component\EventComponent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\Component\FactoryComponent.cs">
-      <Link>Component\FactoryComponent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\Component\NetworkComponent.cs">
-      <Link>Component\NetworkComponent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\Component\TimerComponent.cs">
-      <Link>Component\TimerComponent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\Component\UnitComponent.cs">
-      <Link>Component\UnitComponent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\Config\BuffConfig.cs">
-      <Link>Config\BuffConfig.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\Config\GlobalConfig.cs">
-      <Link>Config\GlobalConfig.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\Config\NodeConfig.cs">
-      <Link>Config\NodeConfig.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\Config\UnitConfig.cs">
-      <Link>Config\UnitConfig.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\Buff.cs">
-      <Link>Buff.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\BuffType.cs">
-      <Link>BuffType.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\EnvKey.cs">
-      <Link>EnvKey.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\EventAttribute.cs">
-      <Link>EventAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\EventType.cs">
-      <Link>EventType.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\FactoryAttribute.cs">
-      <Link>FactoryAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\IAssemblyLoader.cs">
-      <Link>IAssemblyLoader.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\IFactory.cs">
-      <Link>IFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\MessageAttribute.cs">
-      <Link>MessageAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\Unit.cs">
-      <Link>Unit.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\UnitType.cs">
-      <Link>UnitType.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Game\Model\World.cs">
-      <Link>World.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Folder Include="BehaviorTree\" />
-    <Folder Include="Component\" />
-    <Folder Include="Config\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Platform\Common\Common.csproj">
-      <Project>{EF4373AF-66D4-4313-A882-60EF0AE4239A}</Project>
-      <Name>Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Platform\TNet\TNet.csproj">
-      <Project>{AA3FD3AA-1835-42F4-9BE3-4A26D7CA8AB1}</Project>
-      <Name>TNet</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Platform\UNet\UNet.csproj">
-      <Project>{3A56E389-BB11-421C-9E11-EA88C5CA3EFC}</Project>
-      <Name>UNet</Name>
-    </ProjectReference>
-  </ItemGroup>
-</Project>

+ 0 - 27
CSharp-Mono/Game/Model/Properties/AssemblyInfo.cs

@@ -1,27 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("Model")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("tanghai")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-

+ 0 - 157
CSharp-Mono/Platform/Common/Common.csproj

@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{EF4373AF-66D4-4313-A882-60EF0AE4239A}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Common</RootNamespace>
-    <AssemblyName>Common</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Xml" />
-    <Reference Include="MongoDB.Bson">
-      <HintPath>..\..\..\CSharp\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Bson.dll</HintPath>
-    </Reference>
-    <Reference Include="MongoDB.Driver">
-      <HintPath>..\..\..\CSharp\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Driver.dll</HintPath>
-    </Reference>
-    <Reference Include="NLog">
-      <HintPath>..\..\..\CSharp\packages\NLog.3.2.0.0\lib\net45\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="protobuf-net">
-      <HintPath>..\..\..\CSharp\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\..\CSharp\Platform\Common\Base\Component.cs">
-      <Link>Base\Component.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Base\Entity.cs">
-      <Link>Base\Entity.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Base\MultiMap.cs">
-      <Link>Base\MultiMap.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Base\Object.cs">
-      <Link>Base\Object.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Base\QueueDictionary.cs">
-      <Link>Base\QueueDictionary.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Base\TimerManager.cs">
-      <Link>Base\TimerManager.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Config\ACategory.cs">
-      <Link>Config\ACategory.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Config\AConfig.cs">
-      <Link>Config\AConfig.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Config\ConfigAttribute.cs">
-      <Link>Config\ConfigAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Config\ICategory.cs">
-      <Link>Config\ICategory.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Event\AEventAttribute.cs">
-      <Link>Event\AEventAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Event\Env.cs">
-      <Link>Event\Env.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Event\IEventAsync.cs">
-      <Link>Event\IEventAsync.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Event\IEventSync.cs">
-      <Link>Event\IEventSync.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Helper\BigIntegerHelper.cs">
-      <Link>Helper\BigIntegerHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Helper\ByteHelper.cs">
-      <Link>Helper\ByteHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Helper\EnumHelper.cs">
-      <Link>Helper\EnumHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Helper\LoaderHelper.cs">
-      <Link>Helper\LoaderHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Helper\MongoHelper.cs">
-      <Link>Helper\MongoHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Helper\ProtobufHelper.cs">
-      <Link>Helper\ProtobufHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Helper\RandomHelper.cs">
-      <Link>Helper\RandomHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Helper\StringHelper.cs">
-      <Link>Helper\StringHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Helper\TimeHelper.cs">
-      <Link>Helper\TimeHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Helper\XmlHelper.cs">
-      <Link>Helper\XmlHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Logger\ALogDecorater.cs">
-      <Link>Logger\ALogDecorater.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Logger\ILog.cs">
-      <Link>Logger\ILog.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Logger\Log.cs">
-      <Link>Logger\Log.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Logger\NLogAdapter.cs">
-      <Link>Logger\NLogAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Logger\StackInfoDecorater.cs">
-      <Link>Logger\StackInfoDecorater.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Network\AChannel.cs">
-      <Link>Network\AChannel.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\Common\Network\IService.cs">
-      <Link>Network\IService.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Folder Include="Base\" />
-    <Folder Include="Config\" />
-    <Folder Include="Event\" />
-    <Folder Include="Helper\" />
-    <Folder Include="Logger\" />
-    <Folder Include="Network\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\CSharp\Platform\Common\Helper\Packages.config">
-      <Link>Helper\Packages.config</Link>
-    </None>
-  </ItemGroup>
-</Project>

+ 0 - 27
CSharp-Mono/Platform/Common/Properties/AssemblyInfo.cs

@@ -1,27 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("Common")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("tanghai")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-

+ 0 - 27
CSharp-Mono/Platform/TNet/Properties/AssemblyInfo.cs

@@ -1,27 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("TNet")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("tanghai")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-

+ 0 - 78
CSharp-Mono/Platform/TNet/TNet.csproj

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{AA3FD3AA-1835-42F4-9BE3-4A26D7CA8AB1}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>TNet</RootNamespace>
-    <AssemblyName>TNet</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="MongoDB.Driver">
-      <HintPath>..\..\..\CSharp\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Driver.dll</HintPath>
-    </Reference>
-    <Reference Include="MongoDB.Bson">
-      <HintPath>..\..\..\CSharp\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Bson.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\..\CSharp\Platform\TNet\IPoller.cs">
-      <Link>IPoller.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\TNet\PacketParser.cs">
-      <Link>PacketParser.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\TNet\TBuffer.cs">
-      <Link>TBuffer.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\TNet\TChannel.cs">
-      <Link>TChannel.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\TNet\TPoller.cs">
-      <Link>TPoller.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\TNet\TService.cs">
-      <Link>TService.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\TNet\TSocket.cs">
-      <Link>TSocket.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <None Include="..\..\..\CSharp\Platform\TNet\packages.config">
-      <Link>packages.config</Link>
-    </None>
-    <None Include="..\..\..\CSharp\Platform\TNet\TNet.csproj">
-      <Link>TNet.csproj</Link>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Common\Common.csproj">
-      <Project>{EF4373AF-66D4-4313-A882-60EF0AE4239A}</Project>
-      <Name>Common</Name>
-    </ProjectReference>
-  </ItemGroup>
-</Project>

+ 0 - 27
CSharp-Mono/Platform/TNetTest/Properties/AssemblyInfo.cs

@@ -1,27 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("TNetTest")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("tanghai")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-

+ 0 - 56
CSharp-Mono/Platform/TNetTest/TNetTest.csproj

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{27CDF1D7-723A-4BD9-BA7E-39CB479DCA85}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>TNetTest</RootNamespace>
-    <AssemblyName>TNetTest</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\..\CSharp\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\..\CSharp\Platform\TNetTest\TcpListenerTest.cs">
-      <Link>TcpListenerTest.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\TNetTest\TServiceTest.cs">
-      <Link>TServiceTest.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\TNet\TNet.csproj">
-      <Project>{AA3FD3AA-1835-42F4-9BE3-4A26D7CA8AB1}</Project>
-      <Name>TNet</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Common\Common.csproj">
-      <Project>{EF4373AF-66D4-4313-A882-60EF0AE4239A}</Project>
-      <Name>Common</Name>
-    </ProjectReference>
-  </ItemGroup>
-</Project>

+ 0 - 27
CSharp-Mono/Platform/UNet/Properties/AssemblyInfo.cs

@@ -1,27 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("UNet")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("tanghai")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-

+ 0 - 90
CSharp-Mono/Platform/UNet/UNet.csproj

@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{3A56E389-BB11-421C-9E11-EA88C5CA3EFC}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>UNet</RootNamespace>
-    <AssemblyName>UNet</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="MongoDB.Bson">
-      <HintPath>..\..\..\CSharp\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Bson.dll</HintPath>
-    </Reference>
-    <Reference Include="MongoDB.Driver">
-      <HintPath>..\..\..\CSharp\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Driver.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\..\CSharp\Platform\UNet\Library.cs">
-      <Link>Library.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\UNet\NativeMethods.cs">
-      <Link>NativeMethods.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\UNet\NativeStructs.cs">
-      <Link>NativeStructs.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\UNet\UAddress.cs">
-      <Link>UAddress.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\UNet\UChannel.cs">
-      <Link>UChannel.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\UNet\UException.cs">
-      <Link>UException.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\UNet\UPacket.cs">
-      <Link>UPacket.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\UNet\UPoller.cs">
-      <Link>UPoller.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\UNet\UService.cs">
-      <Link>UService.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\UNet\USocket.cs">
-      <Link>USocket.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\CSharp\Platform\UNet\USocketManager.cs">
-      <Link>USocketManager.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <None Include="..\..\..\CSharp\Platform\UNet\packages.config">
-      <Link>packages.config</Link>
-    </None>
-    <None Include="..\..\..\CSharp\Platform\UNet\UNet.csproj">
-      <Link>UNet.csproj</Link>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Common\Common.csproj">
-      <Project>{EF4373AF-66D4-4313-A882-60EF0AE4239A}</Project>
-      <Name>Common</Name>
-    </ProjectReference>
-  </ItemGroup>
-</Project>

+ 0 - 27
CSharp-Mono/Platform/UNetTest/Properties/AssemblyInfo.cs

@@ -1,27 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("UNetTest")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("tanghai")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-

+ 0 - 53
CSharp-Mono/Platform/UNetTest/UNetTest.csproj

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{E4DD0EC7-FAC5-459A-8496-E5B4F828C9BD}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>UNetTest</RootNamespace>
-    <AssemblyName>UNetTest</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\..\CSharp\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\..\CSharp\Platform\UNetTest\UServiceTest.cs">
-      <Link>UServiceTest.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\Common\Common.csproj">
-      <Project>{EF4373AF-66D4-4313-A882-60EF0AE4239A}</Project>
-      <Name>Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\UNet\UNet.csproj">
-      <Project>{3A56E389-BB11-421C-9E11-EA88C5CA3EFC}</Project>
-      <Name>UNet</Name>
-    </ProjectReference>
-  </ItemGroup>
-</Project>

+ 1 - 1
CSharp/App/Modules/BehaviorTreeModule/BehaviorTreeModule.csproj

@@ -132,7 +132,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Platform\Common\Common.csproj">
-      <Project>{19f8f043-1f99-4550-99df-dea5c7d77e55}</Project>
+      <Project>{f06b995e-6508-4c5c-a396-554316c9215d}</Project>
       <Name>Common</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\Infrastructure\Infrastructure.csproj">

+ 75 - 0
CSharp/CSharp-Mono.sln

@@ -0,0 +1,75 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Game", "Game", "{BEA22CC3-9FA8-4663-82DC-6B2119A8E35E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model", "Game\Model\Model.csproj", "{0608C0C1-F584-4092-AAF9-1E99A78E3703}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controller", "Game\Controller\Controller.csproj", "{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platform", "Platform", "{0048704C-EEF3-4142-9E94-8A2D6A838D76}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Platform\Common\Common.csproj", "{F06B995E-6508-4C5C-A396-554316C9215D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TNet", "Platform\TNet\TNet.csproj", "{B1B78524-3F75-40D7-BF12-10B25A00C590}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UNet", "Platform\UNet\UNet.csproj", "{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{C69F1D82-6684-49D1-B388-CA4AECD6AD0D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelTest", "Tests\ModelTest\ModelTest.csproj", "{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TNetTest", "Tests\TNetTest\TNetTest.csproj", "{1888D319-0495-43F3-BA8D-163EC20D9437}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UNetTest", "Tests\UNetTest\UNetTest.csproj", "{47A7404D-F501-43C5-8183-4B4E9E8C24B2}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1B78524-3F75-40D7-BF12-10B25A00C590}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1B78524-3F75-40D7-BF12-10B25A00C590}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1B78524-3F75-40D7-BF12-10B25A00C590}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1B78524-3F75-40D7-BF12-10B25A00C590}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F06B995E-6508-4C5C-A396-554316C9215D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F06B995E-6508-4C5C-A396-554316C9215D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F06B995E-6508-4C5C-A396-554316C9215D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F06B995E-6508-4C5C-A396-554316C9215D}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{0608C0C1-F584-4092-AAF9-1E99A78E3703} = {BEA22CC3-9FA8-4663-82DC-6B2119A8E35E}
+		{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C} = {BEA22CC3-9FA8-4663-82DC-6B2119A8E35E}
+		{F06B995E-6508-4C5C-A396-554316C9215D} = {0048704C-EEF3-4142-9E94-8A2D6A838D76}
+		{B1B78524-3F75-40D7-BF12-10B25A00C590} = {0048704C-EEF3-4142-9E94-8A2D6A838D76}
+		{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E} = {0048704C-EEF3-4142-9E94-8A2D6A838D76}
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35} = {C69F1D82-6684-49D1-B388-CA4AECD6AD0D}
+		{1888D319-0495-43F3-BA8D-163EC20D9437} = {C69F1D82-6684-49D1-B388-CA4AECD6AD0D}
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2} = {C69F1D82-6684-49D1-B388-CA4AECD6AD0D}
+	EndGlobalSection
+EndGlobal

+ 13 - 0
CSharp/CSharp-Mono.userprefs

@@ -0,0 +1,13 @@
+<Properties StartupItem="Platform\Common\Common.csproj">
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+  <MonoDevelop.Ide.Workbench ActiveDocument="Game\Model\Component\NetworkComponent.cs">
+    <Files>
+      <File FileName="Game\Model\BehaviorTree\BlackBoard.cs" Line="7" Column="7" />
+      <File FileName="Game\Model\Component\NetworkComponent.cs" Line="19" Column="19" />
+    </Files>
+  </MonoDevelop.Ide.Workbench>
+  <MonoDevelop.Ide.DebuggingService.Breakpoints>
+    <BreakpointStore />
+  </MonoDevelop.Ide.DebuggingService.Breakpoints>
+  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
+</Properties>

+ 115 - 134
CSharp/CSharp.sln

@@ -20,35 +20,29 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Editor", "App\Editor\Editor
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Infrastructure", "App\Infrastructure\Infrastructure.csproj", "{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{FD5F443E-CBEE-443E-821D-C47C86E09534}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Game", "Game", "{D0CC1FF4-2747-4278-A51F-BE9AA959175B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2814EB55-E1C2-4751-AC14-94116DA9D22B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TNet", "Platform\TNet\TNet.csproj", "{B42D431A-3A54-4649-942A-C5356D7F9FBC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TNetTest", "Platform\TNetTest\TNetTest.csproj", "{F176D1FA-63E5-4B89-9A03-D44CCCCC069A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BehaviorTreeModule", "App\Modules\BehaviorTreeModule\BehaviorTreeModule.csproj", "{6CD185D1-08E0-4729-A999-2D5B57BA8193}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Platform\Common\Common.csproj", "{19F8F043-1F99-4550-99DF-DEA5C7D77E55}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ENet", "Platform\ENet\ENet.vcxproj", "{C9992B7C-313E-4C9F-A954-640D01EDFB58}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model", "Game\Model\Model.csproj", "{0FA529D1-D0A9-4A8E-90F5-117CE80F2EDE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Platform\Common\Common.csproj", "{F06B995E-6508-4C5C-A396-554316C9215D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controller", "Game\Controller\Controller.csproj", "{E69C1F22-E004-4D69-8667-787BD243454B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TNet", "Platform\TNet\TNet.csproj", "{B1B78524-3F75-40D7-BF12-10B25A00C590}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BehaviorTreeModule", "App\Modules\BehaviorTreeModule\BehaviorTreeModule.csproj", "{6CD185D1-08E0-4729-A999-2D5B57BA8193}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UNet", "Platform\UNet\UNet.csproj", "{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDBTest", "Game\MongoDBTest\MongoDBTest.csproj", "{93FB20CF-827A-4CED-A273-90117EB7192F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controller", "Game\Controller\Controller.csproj", "{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{AAD111B8-4746-4445-A428-97A72A04FCCD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model", "Game\Model\Model.csproj", "{0608C0C1-F584-4092-AAF9-1E99A78E3703}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UNet", "Platform\UNet\UNet.csproj", "{D0B4CFAC-A368-4742-9863-68776CFA9938}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{A455F8EB-008D-4534-BE6F-702175666215}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UNetTest", "Platform\UNetTest\UNetTest.csproj", "{901A8E5C-C4C6-4C3C-8E18-068D75119F5D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TNetTest", "Tests\TNetTest\TNetTest.csproj", "{1888D319-0495-43F3-BA8D-163EC20D9437}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProfileExe", "Platform\ProfileExe\ProfileExe.csproj", "{CBA52DC8-1C80-4A79-9AC5-73514EBBD749}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UNetTest", "Tests\UNetTest\UNetTest.csproj", "{47A7404D-F501-43C5-8183-4B4E9E8C24B2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ENet", "Platform\ENet\ENet.vcxproj", "{C9992B7C-313E-4C9F-A954-640D01EDFB58}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelTest", "Tests\ModelTest\ModelTest.csproj", "{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -88,66 +82,6 @@ Global
 		{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}.Release|Win32.ActiveCfg = Release|Any CPU
 		{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}.Release|x86.ActiveCfg = Release|Any CPU
-		{B42D431A-3A54-4649-942A-C5356D7F9FBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B42D431A-3A54-4649-942A-C5356D7F9FBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B42D431A-3A54-4649-942A-C5356D7F9FBC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B42D431A-3A54-4649-942A-C5356D7F9FBC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B42D431A-3A54-4649-942A-C5356D7F9FBC}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{B42D431A-3A54-4649-942A-C5356D7F9FBC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B42D431A-3A54-4649-942A-C5356D7F9FBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B42D431A-3A54-4649-942A-C5356D7F9FBC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B42D431A-3A54-4649-942A-C5356D7F9FBC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B42D431A-3A54-4649-942A-C5356D7F9FBC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B42D431A-3A54-4649-942A-C5356D7F9FBC}.Release|Win32.ActiveCfg = Release|Any CPU
-		{B42D431A-3A54-4649-942A-C5356D7F9FBC}.Release|x86.ActiveCfg = Release|Any CPU
-		{F176D1FA-63E5-4B89-9A03-D44CCCCC069A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F176D1FA-63E5-4B89-9A03-D44CCCCC069A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F176D1FA-63E5-4B89-9A03-D44CCCCC069A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F176D1FA-63E5-4B89-9A03-D44CCCCC069A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F176D1FA-63E5-4B89-9A03-D44CCCCC069A}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{F176D1FA-63E5-4B89-9A03-D44CCCCC069A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F176D1FA-63E5-4B89-9A03-D44CCCCC069A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F176D1FA-63E5-4B89-9A03-D44CCCCC069A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F176D1FA-63E5-4B89-9A03-D44CCCCC069A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{F176D1FA-63E5-4B89-9A03-D44CCCCC069A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F176D1FA-63E5-4B89-9A03-D44CCCCC069A}.Release|Win32.ActiveCfg = Release|Any CPU
-		{F176D1FA-63E5-4B89-9A03-D44CCCCC069A}.Release|x86.ActiveCfg = Release|Any CPU
-		{19F8F043-1F99-4550-99DF-DEA5C7D77E55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{19F8F043-1F99-4550-99DF-DEA5C7D77E55}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19F8F043-1F99-4550-99DF-DEA5C7D77E55}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{19F8F043-1F99-4550-99DF-DEA5C7D77E55}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{19F8F043-1F99-4550-99DF-DEA5C7D77E55}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{19F8F043-1F99-4550-99DF-DEA5C7D77E55}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{19F8F043-1F99-4550-99DF-DEA5C7D77E55}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{19F8F043-1F99-4550-99DF-DEA5C7D77E55}.Release|Any CPU.Build.0 = Release|Any CPU
-		{19F8F043-1F99-4550-99DF-DEA5C7D77E55}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{19F8F043-1F99-4550-99DF-DEA5C7D77E55}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{19F8F043-1F99-4550-99DF-DEA5C7D77E55}.Release|Win32.ActiveCfg = Release|Any CPU
-		{19F8F043-1F99-4550-99DF-DEA5C7D77E55}.Release|x86.ActiveCfg = Release|Any CPU
-		{0FA529D1-D0A9-4A8E-90F5-117CE80F2EDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0FA529D1-D0A9-4A8E-90F5-117CE80F2EDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0FA529D1-D0A9-4A8E-90F5-117CE80F2EDE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0FA529D1-D0A9-4A8E-90F5-117CE80F2EDE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0FA529D1-D0A9-4A8E-90F5-117CE80F2EDE}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{0FA529D1-D0A9-4A8E-90F5-117CE80F2EDE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0FA529D1-D0A9-4A8E-90F5-117CE80F2EDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0FA529D1-D0A9-4A8E-90F5-117CE80F2EDE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0FA529D1-D0A9-4A8E-90F5-117CE80F2EDE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{0FA529D1-D0A9-4A8E-90F5-117CE80F2EDE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{0FA529D1-D0A9-4A8E-90F5-117CE80F2EDE}.Release|Win32.ActiveCfg = Release|Any CPU
-		{0FA529D1-D0A9-4A8E-90F5-117CE80F2EDE}.Release|x86.ActiveCfg = Release|Any CPU
-		{E69C1F22-E004-4D69-8667-787BD243454B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E69C1F22-E004-4D69-8667-787BD243454B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E69C1F22-E004-4D69-8667-787BD243454B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E69C1F22-E004-4D69-8667-787BD243454B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E69C1F22-E004-4D69-8667-787BD243454B}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{E69C1F22-E004-4D69-8667-787BD243454B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E69C1F22-E004-4D69-8667-787BD243454B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E69C1F22-E004-4D69-8667-787BD243454B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E69C1F22-E004-4D69-8667-787BD243454B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E69C1F22-E004-4D69-8667-787BD243454B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E69C1F22-E004-4D69-8667-787BD243454B}.Release|Win32.ActiveCfg = Release|Any CPU
-		{E69C1F22-E004-4D69-8667-787BD243454B}.Release|x86.ActiveCfg = Release|Any CPU
 		{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -160,54 +94,6 @@ Global
 		{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Release|Win32.ActiveCfg = Release|Any CPU
 		{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Release|x86.ActiveCfg = Release|Any CPU
-		{93FB20CF-827A-4CED-A273-90117EB7192F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{93FB20CF-827A-4CED-A273-90117EB7192F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{93FB20CF-827A-4CED-A273-90117EB7192F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{93FB20CF-827A-4CED-A273-90117EB7192F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{93FB20CF-827A-4CED-A273-90117EB7192F}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{93FB20CF-827A-4CED-A273-90117EB7192F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{93FB20CF-827A-4CED-A273-90117EB7192F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{93FB20CF-827A-4CED-A273-90117EB7192F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{93FB20CF-827A-4CED-A273-90117EB7192F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{93FB20CF-827A-4CED-A273-90117EB7192F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{93FB20CF-827A-4CED-A273-90117EB7192F}.Release|Win32.ActiveCfg = Release|Any CPU
-		{93FB20CF-827A-4CED-A273-90117EB7192F}.Release|x86.ActiveCfg = Release|Any CPU
-		{D0B4CFAC-A368-4742-9863-68776CFA9938}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D0B4CFAC-A368-4742-9863-68776CFA9938}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D0B4CFAC-A368-4742-9863-68776CFA9938}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D0B4CFAC-A368-4742-9863-68776CFA9938}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D0B4CFAC-A368-4742-9863-68776CFA9938}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{D0B4CFAC-A368-4742-9863-68776CFA9938}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D0B4CFAC-A368-4742-9863-68776CFA9938}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D0B4CFAC-A368-4742-9863-68776CFA9938}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D0B4CFAC-A368-4742-9863-68776CFA9938}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{D0B4CFAC-A368-4742-9863-68776CFA9938}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{D0B4CFAC-A368-4742-9863-68776CFA9938}.Release|Win32.ActiveCfg = Release|Any CPU
-		{D0B4CFAC-A368-4742-9863-68776CFA9938}.Release|x86.ActiveCfg = Release|Any CPU
-		{901A8E5C-C4C6-4C3C-8E18-068D75119F5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{901A8E5C-C4C6-4C3C-8E18-068D75119F5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{901A8E5C-C4C6-4C3C-8E18-068D75119F5D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{901A8E5C-C4C6-4C3C-8E18-068D75119F5D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{901A8E5C-C4C6-4C3C-8E18-068D75119F5D}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{901A8E5C-C4C6-4C3C-8E18-068D75119F5D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{901A8E5C-C4C6-4C3C-8E18-068D75119F5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{901A8E5C-C4C6-4C3C-8E18-068D75119F5D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{901A8E5C-C4C6-4C3C-8E18-068D75119F5D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{901A8E5C-C4C6-4C3C-8E18-068D75119F5D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{901A8E5C-C4C6-4C3C-8E18-068D75119F5D}.Release|Win32.ActiveCfg = Release|Any CPU
-		{901A8E5C-C4C6-4C3C-8E18-068D75119F5D}.Release|x86.ActiveCfg = Release|Any CPU
-		{CBA52DC8-1C80-4A79-9AC5-73514EBBD749}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CBA52DC8-1C80-4A79-9AC5-73514EBBD749}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CBA52DC8-1C80-4A79-9AC5-73514EBBD749}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CBA52DC8-1C80-4A79-9AC5-73514EBBD749}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CBA52DC8-1C80-4A79-9AC5-73514EBBD749}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{CBA52DC8-1C80-4A79-9AC5-73514EBBD749}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CBA52DC8-1C80-4A79-9AC5-73514EBBD749}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CBA52DC8-1C80-4A79-9AC5-73514EBBD749}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CBA52DC8-1C80-4A79-9AC5-73514EBBD749}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{CBA52DC8-1C80-4A79-9AC5-73514EBBD749}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{CBA52DC8-1C80-4A79-9AC5-73514EBBD749}.Release|Win32.ActiveCfg = Release|Any CPU
-		{CBA52DC8-1C80-4A79-9AC5-73514EBBD749}.Release|x86.ActiveCfg = Release|Any CPU
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|Mixed Platforms.Build.0 = Debug|Win32
@@ -222,6 +108,102 @@ Global
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Release|Win32.Build.0 = Release|Win32
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Release|x86.ActiveCfg = Release|Win32
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Release|x86.Build.0 = Release|Win32
+		{F06B995E-6508-4C5C-A396-554316C9215D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F06B995E-6508-4C5C-A396-554316C9215D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F06B995E-6508-4C5C-A396-554316C9215D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F06B995E-6508-4C5C-A396-554316C9215D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F06B995E-6508-4C5C-A396-554316C9215D}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{F06B995E-6508-4C5C-A396-554316C9215D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F06B995E-6508-4C5C-A396-554316C9215D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F06B995E-6508-4C5C-A396-554316C9215D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F06B995E-6508-4C5C-A396-554316C9215D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F06B995E-6508-4C5C-A396-554316C9215D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F06B995E-6508-4C5C-A396-554316C9215D}.Release|Win32.ActiveCfg = Release|Any CPU
+		{F06B995E-6508-4C5C-A396-554316C9215D}.Release|x86.ActiveCfg = Release|Any CPU
+		{B1B78524-3F75-40D7-BF12-10B25A00C590}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1B78524-3F75-40D7-BF12-10B25A00C590}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1B78524-3F75-40D7-BF12-10B25A00C590}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B1B78524-3F75-40D7-BF12-10B25A00C590}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B1B78524-3F75-40D7-BF12-10B25A00C590}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{B1B78524-3F75-40D7-BF12-10B25A00C590}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B1B78524-3F75-40D7-BF12-10B25A00C590}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1B78524-3F75-40D7-BF12-10B25A00C590}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1B78524-3F75-40D7-BF12-10B25A00C590}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B1B78524-3F75-40D7-BF12-10B25A00C590}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B1B78524-3F75-40D7-BF12-10B25A00C590}.Release|Win32.ActiveCfg = Release|Any CPU
+		{B1B78524-3F75-40D7-BF12-10B25A00C590}.Release|x86.ActiveCfg = Release|Any CPU
+		{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Release|Win32.ActiveCfg = Release|Any CPU
+		{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Release|x86.ActiveCfg = Release|Any CPU
+		{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Release|Win32.ActiveCfg = Release|Any CPU
+		{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Release|x86.ActiveCfg = Release|Any CPU
+		{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Release|Win32.ActiveCfg = Release|Any CPU
+		{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Release|x86.ActiveCfg = Release|Any CPU
+		{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|Win32.ActiveCfg = Release|Any CPU
+		{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|x86.ActiveCfg = Release|Any CPU
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|Win32.ActiveCfg = Release|Any CPU
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|x86.ActiveCfg = Release|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|Win32.ActiveCfg = Release|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -230,16 +212,15 @@ Global
 		{C4C64188-4FAE-4CC3-A9E6-D9D4AF7429B6} = {6E9D97F0-4243-452E-B832-1A855B8118EB}
 		{C46F3337-0F48-4A72-84AD-8FDD1F159BB0} = {6E9D97F0-4243-452E-B832-1A855B8118EB}
 		{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3} = {6E9D97F0-4243-452E-B832-1A855B8118EB}
-		{B42D431A-3A54-4649-942A-C5356D7F9FBC} = {ADBF5F67-B480-4A93-9D50-C81856FC61A9}
-		{F176D1FA-63E5-4B89-9A03-D44CCCCC069A} = {ADBF5F67-B480-4A93-9D50-C81856FC61A9}
-		{19F8F043-1F99-4550-99DF-DEA5C7D77E55} = {ADBF5F67-B480-4A93-9D50-C81856FC61A9}
-		{0FA529D1-D0A9-4A8E-90F5-117CE80F2EDE} = {D0CC1FF4-2747-4278-A51F-BE9AA959175B}
-		{E69C1F22-E004-4D69-8667-787BD243454B} = {D0CC1FF4-2747-4278-A51F-BE9AA959175B}
 		{6CD185D1-08E0-4729-A999-2D5B57BA8193} = {C4C64188-4FAE-4CC3-A9E6-D9D4AF7429B6}
-		{93FB20CF-827A-4CED-A273-90117EB7192F} = {D0CC1FF4-2747-4278-A51F-BE9AA959175B}
-		{D0B4CFAC-A368-4742-9863-68776CFA9938} = {ADBF5F67-B480-4A93-9D50-C81856FC61A9}
-		{901A8E5C-C4C6-4C3C-8E18-068D75119F5D} = {ADBF5F67-B480-4A93-9D50-C81856FC61A9}
-		{CBA52DC8-1C80-4A79-9AC5-73514EBBD749} = {ADBF5F67-B480-4A93-9D50-C81856FC61A9}
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58} = {ADBF5F67-B480-4A93-9D50-C81856FC61A9}
+		{F06B995E-6508-4C5C-A396-554316C9215D} = {ADBF5F67-B480-4A93-9D50-C81856FC61A9}
+		{B1B78524-3F75-40D7-BF12-10B25A00C590} = {ADBF5F67-B480-4A93-9D50-C81856FC61A9}
+		{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E} = {ADBF5F67-B480-4A93-9D50-C81856FC61A9}
+		{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C} = {D0CC1FF4-2747-4278-A51F-BE9AA959175B}
+		{0608C0C1-F584-4092-AAF9-1E99A78E3703} = {D0CC1FF4-2747-4278-A51F-BE9AA959175B}
+		{1888D319-0495-43F3-BA8D-163EC20D9437} = {A455F8EB-008D-4534-BE6F-702175666215}
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2} = {A455F8EB-008D-4534-BE6F-702175666215}
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35} = {A455F8EB-008D-4534-BE6F-702175666215}
 	EndGlobalSection
 EndGlobal

+ 10 - 30
CSharp/Game/Controller/Controller.csproj

@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{E69C1F22-E004-4D69-8667-787BD243454B}</ProjectGuid>
+    <ProjectGuid>{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Controller</RootNamespace>
     <AssemblyName>Controller</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -33,57 +30,40 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="MongoDB.Bson, Version=1.10.0.52, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="MongoDB.Bson">
       <HintPath>..\..\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Bson.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Driver, Version=1.10.0.52, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Driver.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Action\BuffTimeoutAction.cs" />
+    <Compile Include="Action\MessageAction.cs" />
     <Compile Include="BehaviorTreeNode\Not.cs" />
     <Compile Include="BehaviorTreeNode\Selector.cs" />
     <Compile Include="BehaviorTreeNode\Sequence.cs" />
-    <Compile Include="Action\MessageAction.cs" />
     <Compile Include="ConfigCategory\BuffCategory.cs" />
     <Compile Include="ConfigCategory\GlobalCategory.cs" />
     <Compile Include="ConfigCategory\NodeCategory.cs" />
     <Compile Include="ConfigCategory\UnitCategory.cs" />
-    <Compile Include="Action\BuffTimeoutAction.cs" />
     <Compile Include="Event\AfterAddBuff.cs" />
+    <Compile Include="Factory\UnitFactory.cs" />
     <Compile Include="MessageType.cs" />
     <Compile Include="Message\CMsgLoginEvent.cs" />
     <Compile Include="NodeType.cs" />
-    <Compile Include="Factory\UnitFactory.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Platform\Common\Common.csproj">
-      <Project>{19f8f043-1f99-4550-99df-dea5c7d77e55}</Project>
+      <Project>{F06B995E-6508-4C5C-A396-554316C9215D}</Project>
       <Name>Common</Name>
     </ProjectReference>
     <ProjectReference Include="..\Model\Model.csproj">
-      <Project>{0fa529d1-d0a9-4a8e-90f5-117ce80f2ede}</Project>
+      <Project>{0608C0C1-F584-4092-AAF9-1E99A78E3703}</Project>
       <Name>Model</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息,请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

+ 36 - 0
CSharp/Game/Controller/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的常规信息通过以下
+// 特性集控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("Controller")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Controller")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 使此程序集中的类型
+// 对 COM 组件不可见。  如果需要从 COM 访问此程序集中的类型,
+// 则将该类型上的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("d9d1f906-81a1-48c8-b901-93e2aede657c")]
+
+// 程序集的版本信息由下面四个值组成: 
+//
+//      主版本
+//      次版本 
+//      生成号
+//      修订号
+//
+// 可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
+// 方法是按如下所示使用“*”: 
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

+ 0 - 4
CSharp/Game/Controller/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="mongocsharpdriver" version="1.10.0-rc1" targetFramework="net451" />
-</packages>

+ 32 - 43
CSharp/Game/Model/Model.csproj

@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{0FA529D1-D0A9-4A8E-90F5-117CE80F2EDE}</ProjectGuid>
+    <ProjectGuid>{0608C0C1-F584-4092-AAF9-1E99A78E3703}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Model</RootNamespace>
     <AssemblyName>Model</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -33,77 +30,69 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="MongoDB.Bson, Version=1.10.0.52, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="MongoDB.Bson">
       <HintPath>..\..\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Bson.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Driver, Version=1.10.0.52, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="MongoDB.Driver">
       <HintPath>..\..\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Driver.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Component\ChannelUnitInfoComponent.cs" />
-    <Compile Include="Component\ActorComponent.cs" />
-    <Compile Include="Component\BehaviorTreeComponent.cs" />
     <Compile Include="BehaviorTree\BehaviorTree.cs" />
     <Compile Include="BehaviorTree\BehaviorTreeFactory.cs" />
     <Compile Include="BehaviorTree\BlackBoard.cs" />
     <Compile Include="BehaviorTree\Node.cs" />
     <Compile Include="BehaviorTree\NodeAttribute.cs" />
     <Compile Include="Buff.cs" />
-    <Compile Include="Component\NetworkComponent.cs" />
+    <Compile Include="BuffType.cs" />
+    <Compile Include="Component\ActorComponent.cs" />
+    <Compile Include="Component\BehaviorTreeComponent.cs" />
     <Compile Include="Component\BuffComponent.cs" />
+    <Compile Include="Component\ChannelUnitInfoComponent.cs" />
     <Compile Include="Component\ConfigComponent.cs" />
     <Compile Include="Component\EventComponent.cs" />
+    <Compile Include="Component\FactoryComponent.cs" />
+    <Compile Include="Component\NetworkComponent.cs" />
     <Compile Include="Component\TimerComponent.cs" />
-    <Compile Include="Config\UnitConfig.cs" />
+    <Compile Include="Component\UnitComponent.cs" />
     <Compile Include="Config\BuffConfig.cs" />
+    <Compile Include="Config\GlobalConfig.cs" />
+    <Compile Include="Config\NodeConfig.cs" />
+    <Compile Include="Config\UnitConfig.cs" />
     <Compile Include="EnvKey.cs" />
+    <Compile Include="EventAttribute.cs" />
     <Compile Include="EventType.cs" />
-    <Compile Include="MessageAttribute.cs" />
     <Compile Include="FactoryAttribute.cs" />
-    <Compile Include="Component\FactoryComponent.cs" />
     <Compile Include="IAssemblyLoader.cs" />
     <Compile Include="IFactory.cs" />
-    <Compile Include="Component\UnitComponent.cs" />
-    <Compile Include="BuffType.cs" />
-    <Compile Include="Config\GlobalConfig.cs" />
-    <Compile Include="Config\NodeConfig.cs" />
+    <Compile Include="MessageAttribute.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Unit.cs" />
     <Compile Include="UnitType.cs" />
     <Compile Include="World.cs" />
-    <Compile Include="EventAttribute.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
   </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
   <ItemGroup>
     <ProjectReference Include="..\..\Platform\Common\Common.csproj">
-      <Project>{19f8f043-1f99-4550-99df-dea5c7d77e55}</Project>
+      <Project>{F06B995E-6508-4C5C-A396-554316C9215D}</Project>
       <Name>Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Platform\TNet\TNet.csproj">
-      <Project>{b42d431a-3a54-4649-942a-c5356d7f9fbc}</Project>
-      <Name>TNet</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Platform\UNet\UNet.csproj">
-      <Project>{d0b4cfac-a368-4742-9863-68776cfa9938}</Project>
+      <Project>{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}</Project>
       <Name>UNet</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Platform\TNet\TNet.csproj">
+      <Project>{B1B78524-3F75-40D7-BF12-10B25A00C590}</Project>
+      <Name>TNet</Name>
+    </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>

+ 36 - 0
CSharp/Game/Model/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的常规信息通过以下
+// 特性集控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("Model")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Model")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 使此程序集中的类型
+// 对 COM 组件不可见。  如果需要从 COM 访问此程序集中的类型,
+// 则将该类型上的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("b506d89a-5985-4165-93b4-e58e5c8718c3")]
+
+// 程序集的版本信息由下面四个值组成: 
+//
+//      主版本
+//      次版本 
+//      生成号
+//      修订号
+//
+// 可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
+// 方法是按如下所示使用“*”: 
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

+ 0 - 4
CSharp/Game/Model/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="mongocsharpdriver" version="1.10.0-rc1" targetFramework="net451" />
-</packages>

+ 0 - 116
CSharp/Game/MongoDBTest/MongoDBTest.csproj

@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{93FB20CF-827A-4CED-A273-90117EB7192F}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MongoDBTest</RootNamespace>
-    <AssemblyName>MongoDBTest</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
-    <IsCodedUITest>False</IsCodedUITest>
-    <TestProjectType>UnitTest</TestProjectType>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="MongoDB.Bson, Version=1.10.0.52, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Bson.dll</HintPath>
-    </Reference>
-    <Reference Include="MongoDB.Driver, Version=1.10.0.52, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Driver.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-  </ItemGroup>
-  <Choose>
-    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-      </ItemGroup>
-    </When>
-    <Otherwise>
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
-  <ItemGroup>
-    <Compile Include="MongoDBTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Platform\Common\Common.csproj">
-      <Project>{19F8F043-1F99-4550-99DF-DEA5C7D77E55}</Project>
-      <Name>Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Model\Model.csproj">
-      <Project>{0fa529d1-d0a9-4a8e-90f5-117ce80f2ede}</Project>
-      <Name>Model</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Choose>
-    <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息,请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

+ 0 - 4
CSharp/Game/MongoDBTest/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="mongocsharpdriver" version="1.10.0-rc1" targetFramework="net451" />
-</packages>

+ 23 - 46
CSharp/Platform/Common/Common.csproj

@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{19F8F043-1F99-4550-99DF-DEA5C7D77E55}</ProjectGuid>
+    <ProjectGuid>{F06B995E-6508-4C5C-A396-554316C9215D}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Common</RootNamespace>
     <AssemblyName>Common</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -32,80 +30,59 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="MongoDB.Bson, Version=1.10.0.52, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Xml" />
+    <Reference Include="MongoDB.Bson">
       <HintPath>..\..\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Bson.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Driver, Version=1.10.0.52, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Driver.dll</HintPath>
-    </Reference>
-    <Reference Include="NLog, Version=3.2.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="NLog">
       <HintPath>..\..\packages\NLog.3.2.0.0\lib\net45\NLog.dll</HintPath>
     </Reference>
-    <Reference Include="protobuf-net, Version=2.0.0.668, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="protobuf-net">
       <HintPath>..\..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Base\QueueDictionary.cs" />
-    <Compile Include="Base\TimerManager.cs" />
-    <Compile Include="Base\Entity.cs" />
     <Compile Include="Base\Component.cs" />
+    <Compile Include="Base\Entity.cs" />
     <Compile Include="Base\MultiMap.cs" />
+    <Compile Include="Base\Object.cs" />
+    <Compile Include="Base\QueueDictionary.cs" />
+    <Compile Include="Base\TimerManager.cs" />
+    <Compile Include="Config\ACategory.cs" />
+    <Compile Include="Config\AConfig.cs" />
+    <Compile Include="Config\ConfigAttribute.cs" />
     <Compile Include="Config\ICategory.cs" />
-    <Compile Include="Event\Env.cs" />
     <Compile Include="Event\AEventAttribute.cs" />
+    <Compile Include="Event\Env.cs" />
     <Compile Include="Event\IEventAsync.cs" />
     <Compile Include="Event\IEventSync.cs" />
-    <Compile Include="Base\Object.cs" />
-    <Compile Include="Config\ConfigAttribute.cs" />
-    <Compile Include="Config\ACategory.cs" />
-    <Compile Include="Config\AConfig.cs" />
     <Compile Include="Helper\BigIntegerHelper.cs" />
     <Compile Include="Helper\ByteHelper.cs" />
     <Compile Include="Helper\EnumHelper.cs" />
     <Compile Include="Helper\LoaderHelper.cs" />
     <Compile Include="Helper\MongoHelper.cs" />
+    <Compile Include="Helper\ProtobufHelper.cs" />
+    <Compile Include="Helper\RandomHelper.cs" />
+    <Compile Include="Helper\StringHelper.cs" />
+    <Compile Include="Helper\TimeHelper.cs" />
+    <Compile Include="Helper\XmlHelper.cs" />
     <Compile Include="Hooks\Native.cs" />
     <Compile Include="Logger\ALogDecorater.cs" />
     <Compile Include="Logger\ILog.cs" />
     <Compile Include="Logger\Log.cs" />
     <Compile Include="Logger\NLogAdapter.cs" />
     <Compile Include="Logger\StackInfoDecorater.cs" />
-    <Compile Include="Helper\ProtobufHelper.cs" />
-    <Compile Include="Helper\RandomHelper.cs" />
-    <Compile Include="Helper\StringHelper.cs" />
-    <Compile Include="Helper\TimeHelper.cs" />
-    <Compile Include="Helper\XmlHelper.cs" />
     <Compile Include="Network\AChannel.cs" />
     <Compile Include="Network\IService.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Helper\Packages.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息,请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

+ 36 - 0
CSharp/Platform/Common/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的常规信息通过以下
+// 特性集控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("Common")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Common")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 使此程序集中的类型
+// 对 COM 组件不可见。  如果需要从 COM 访问此程序集中的类型,
+// 则将该类型上的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("38372c8f-df2b-4735-9620-d997a155cd6e")]
+
+// 程序集的版本信息由下面四个值组成: 
+//
+//      主版本
+//      次版本 
+//      生成号
+//      修订号
+//
+// 可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
+// 方法是按如下所示使用“*”: 
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

+ 0 - 6
CSharp/Platform/Common/packages.config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="mongocsharpdriver" version="1.10.0-rc1" targetFramework="net45" />
-  <package id="NLog" version="3.2.0.0" targetFramework="net45" />
-  <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" />
-</packages>

+ 5 - 8
CSharp/Platform/TNet/Properties/AssemblyInfo.cs

@@ -1,28 +1,26 @@
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // 有关程序集的常规信息通过以下
 // 特性集控制。更改这些特性值可修改
 // 与程序集关联的信息。
-
 [assembly: AssemblyTitle("TNet")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Microsoft")]
 [assembly: AssemblyProduct("TNet")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
 // 将 ComVisible 设置为 false 使此程序集中的类型
 // 对 COM 组件不可见。  如果需要从 COM 访问此程序集中的类型,
 // 则将该类型上的 ComVisible 特性设置为 true。
-
 [assembly: ComVisible(false)]
 
 // 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
-
-[assembly: Guid("1d25432e-c932-4279-b52e-2dba415a191b")]
+[assembly: Guid("ea27beb7-2529-483e-966d-b207a76b9857")]
 
 // 程序集的版本信息由下面四个值组成: 
 //
@@ -34,6 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

+ 14 - 37
CSharp/Platform/TNet/TNet.csproj

@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{B42D431A-3A54-4649-942A-C5356D7F9FBC}</ProjectGuid>
+    <ProjectGuid>{B1B78524-3F75-40D7-BF12-10B25A00C590}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TNet</RootNamespace>
     <AssemblyName>TNet</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -33,54 +30,34 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="MongoDB.Bson, Version=1.10.0.52, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Bson.dll</HintPath>
-    </Reference>
-    <Reference Include="MongoDB.Driver, Version=1.10.0.52, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Driver.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+    <Reference Include="MongoDB.Bson">
+      <HintPath>..\..\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Bson.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="IPoller.cs" />
     <Compile Include="PacketParser.cs" />
-    <Compile Include="TPoller.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TBuffer.cs" />
-    <Compile Include="TService.cs" />
     <Compile Include="TChannel.cs" />
+    <Compile Include="TPoller.cs" />
+    <Compile Include="TService.cs" />
     <Compile Include="TSocket.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Common\Common.csproj">
-      <Project>{19f8f043-1f99-4550-99df-dea5c7d77e55}</Project>
+      <Project>{F06B995E-6508-4C5C-A396-554316C9215D}</Project>
       <Name>Common</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息,请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
   </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
   -->
 </Project>

+ 0 - 4
CSharp/Platform/TNet/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="mongocsharpdriver" version="1.10.0-rc1" targetFramework="net451" />
-</packages>

+ 0 - 108
CSharp/Platform/TNetTest/TNetTest.csproj

@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{F176D1FA-63E5-4B89-9A03-D44CCCCC069A}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TNetTest</RootNamespace>
-    <AssemblyName>TNetTest</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
-    <IsCodedUITest>False</IsCodedUITest>
-    <TestProjectType>UnitTest</TestProjectType>
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-  </ItemGroup>
-  <Choose>
-    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-      </ItemGroup>
-    </When>
-    <Otherwise />
-  </Choose>
-  <ItemGroup>
-    <Compile Include="TcpListenerTest.cs" />
-    <Compile Include="TServiceTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Common\Common.csproj">
-      <Project>{19f8f043-1f99-4550-99df-dea5c7d77e55}</Project>
-      <Name>Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\TNet\TNet.csproj">
-      <Project>{b42d431a-3a54-4649-942a-c5356d7f9fbc}</Project>
-      <Name>TNet</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Choose>
-    <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息,请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

+ 0 - 4
CSharp/Platform/TNetTest/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit" version="2.6.4" targetFramework="net451" />
-</packages>

+ 36 - 0
CSharp/Platform/UNet/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的常规信息通过以下
+// 特性集控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("UNet")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("UNet")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 使此程序集中的类型
+// 对 COM 组件不可见。  如果需要从 COM 访问此程序集中的类型,
+// 则将该类型上的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("c7b48d91-aa58-4781-b82e-4f0ffa2e1521")]
+
+// 程序集的版本信息由下面四个值组成: 
+//
+//      主版本
+//      次版本 
+//      生成号
+//      修订号
+//
+// 可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
+// 方法是按如下所示使用“*”: 
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

+ 19 - 34
CSharp/Platform/UNet/UNet.csproj

@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{D0B4CFAC-A368-4742-9863-68776CFA9938}</ProjectGuid>
+    <ProjectGuid>{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>UNet</RootNamespace>
     <AssemblyName>UNet</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -23,7 +20,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -34,49 +30,38 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="MongoDB.Bson, Version=1.10.0.52, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Bson.dll</HintPath>
-    </Reference>
-    <Reference Include="MongoDB.Driver, Version=1.10.0.52, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Driver.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="MongoDB.Bson">
+      <HintPath>..\..\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Bson.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="UAddress.cs" />
-    <Compile Include="UException.cs" />
-    <Compile Include="UPoller.cs" />
     <Compile Include="Library.cs" />
     <Compile Include="NativeMethods.cs" />
     <Compile Include="NativeStructs.cs" />
-    <Compile Include="UPacket.cs" />
-    <Compile Include="USocket.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UAddress.cs" />
     <Compile Include="UChannel.cs" />
+    <Compile Include="UException.cs" />
+    <Compile Include="UPacket.cs" />
+    <Compile Include="UPoller.cs" />
     <Compile Include="UService.cs" />
+    <Compile Include="USocket.cs" />
     <Compile Include="USocketManager.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Common\Common.csproj">
-      <Project>{19F8F043-1F99-4550-99DF-DEA5C7D77E55}</Project>
+      <Project>{F06B995E-6508-4C5C-A396-554316C9215D}</Project>
       <Name>Common</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
   -->
 </Project>

+ 0 - 4
CSharp/Platform/UNet/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="mongocsharpdriver" version="1.10.0-rc1" targetFramework="net451" />
-</packages>

+ 0 - 114
CSharp/Platform/UNetTest/UNetTest.csproj

@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{901A8E5C-C4C6-4C3C-8E18-068D75119F5D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>UNetTest</RootNamespace>
-    <AssemblyName>UNetTest</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
-    <IsCodedUITest>False</IsCodedUITest>
-    <TestProjectType>UnitTest</TestProjectType>
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-  <Choose>
-    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-      </ItemGroup>
-    </When>
-    <Otherwise />
-  </Choose>
-  <ItemGroup>
-    <Compile Include="UServiceTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Common\Common.csproj">
-      <Project>{19f8f043-1f99-4550-99df-dea5c7d77e55}</Project>
-      <Name>Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\TNet\TNet.csproj">
-      <Project>{b42d431a-3a54-4649-942a-c5356d7f9fbc}</Project>
-      <Name>TNet</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\UNet\UNet.csproj">
-      <Project>{d0b4cfac-a368-4742-9863-68776cfa9938}</Project>
-      <Name>UNet</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Choose>
-    <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息,请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

+ 0 - 4
CSharp/Platform/UNetTest/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit" version="2.6.4" targetFramework="net451" />
-</packages>

+ 72 - 0
CSharp/Tests/ModelTest/ModelTest.csproj

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ModelTest</RootNamespace>
+    <AssemblyName>ModelTest</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\Bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\Bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="MongoDB.Bson">
+      <HintPath>..\..\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Bson.dll</HintPath>
+    </Reference>
+    <Reference Include="MongoDB.Driver">
+      <HintPath>..\..\packages\mongocsharpdriver.1.10.0-rc1\lib\net35\MongoDB.Driver.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MongoDBTest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Game\Model\Model.csproj">
+      <Project>{0608C0C1-F584-4092-AAF9-1E99A78E3703}</Project>
+      <Name>Model</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Platform\Common\Common.csproj">
+      <Project>{F06B995E-6508-4C5C-A396-554316C9215D}</Project>
+      <Name>Common</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

+ 3 - 3
CSharp/Game/MongoDBTest/MongoDBTest.cs → CSharp/Tests/ModelTest/MongoDBTest.cs

@@ -1,16 +1,16 @@
 using System;
 using Common.Helper;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Model;
 using MongoDB.Driver;
 using MongoDB.Driver.Builders;
+using NUnit.Framework;
 
 namespace MongoDBTest
 {
-	[TestClass]
+	[TestFixture]
 	public class MongoDBTest
 	{
-		[TestMethod]
+		[Test]
 		public void TestMongoDB()
 		{
 			const string connectionString = "mongodb://localhost";

+ 36 - 0
CSharp/Tests/ModelTest/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的常规信息通过以下
+// 特性集控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("ModelTest")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("ModelTest")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 使此程序集中的类型
+// 对 COM 组件不可见。  如果需要从 COM 访问此程序集中的类型,
+// 则将该类型上的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("f120341f-2199-4f30-9f50-23789d5ab3b2")]
+
+// 程序集的版本信息由下面四个值组成: 
+//
+//      主版本
+//      次版本 
+//      生成号
+//      修订号
+//
+// 可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
+// 方法是按如下所示使用“*”: 
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

+ 36 - 0
CSharp/Tests/TNetTest/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的常规信息通过以下
+// 特性集控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("TNetTest")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("TNetTest")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 使此程序集中的类型
+// 对 COM 组件不可见。  如果需要从 COM 访问此程序集中的类型,
+// 则将该类型上的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("eda665c1-8001-4071-a2d2-4a0e5c09a5e6")]
+
+// 程序集的版本信息由下面四个值组成: 
+//
+//      主版本
+//      次版本 
+//      生成号
+//      修订号
+//
+// 可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
+// 方法是按如下所示使用“*”: 
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

+ 62 - 0
CSharp/Tests/TNetTest/TNetTest.csproj

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{1888D319-0495-43F3-BA8D-163EC20D9437}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>TNetTest</RootNamespace>
+    <AssemblyName>TNetTest</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\Bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\Bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TcpListenerTest.cs" />
+    <Compile Include="TServiceTest.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Platform\Common\Common.csproj">
+      <Project>{F06B995E-6508-4C5C-A396-554316C9215D}</Project>
+      <Name>Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Platform\TNet\TNet.csproj">
+      <Project>{B1B78524-3F75-40D7-BF12-10B25A00C590}</Project>
+      <Name>TNet</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

+ 0 - 0
CSharp/Platform/TNetTest/TServiceTest.cs → CSharp/Tests/TNetTest/TServiceTest.cs


+ 0 - 0
CSharp/Platform/TNetTest/TcpListenerTest.cs → CSharp/Tests/TNetTest/TcpListenerTest.cs


+ 36 - 0
CSharp/Tests/UNetTest/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的常规信息通过以下
+// 特性集控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("UNetTest")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("UNetTest")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 使此程序集中的类型
+// 对 COM 组件不可见。  如果需要从 COM 访问此程序集中的类型,
+// 则将该类型上的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("83642fc3-a7f2-46a5-8522-a5343c8857ac")]
+
+// 程序集的版本信息由下面四个值组成: 
+//
+//      主版本
+//      次版本 
+//      生成号
+//      修订号
+//
+// 可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
+// 方法是按如下所示使用“*”: 
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

+ 61 - 0
CSharp/Tests/UNetTest/UNetTest.csproj

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{47A7404D-F501-43C5-8183-4B4E9E8C24B2}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>UNetTest</RootNamespace>
+    <AssemblyName>UNetTest</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\Bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\Bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UServiceTest.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Platform\Common\Common.csproj">
+      <Project>{F06B995E-6508-4C5C-A396-554316C9215D}</Project>
+      <Name>Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Platform\UNet\UNet.csproj">
+      <Project>{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}</Project>
+      <Name>UNet</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

+ 0 - 0
CSharp/Platform/UNetTest/UServiceTest.cs → CSharp/Tests/UNetTest/UServiceTest.cs