فهرست منبع

kcplib工程目录名字不对,修复一下

tanghai 7 سال پیش
والد
کامیت
f1de003355

+ 15 - 15
Client-Server.sln

@@ -25,8 +25,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.Driver.Core", "Serv
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Google.Protobuf", "Server\ThirdParty\Google.Protobuf\Google.Protobuf.csproj", "{BC06C46E-79F3-4AB6-800E-FA080CA54A0B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KcpLib", "Server\ThirdParty\Libs\KcpLib.csproj", "{B055A8CF-EF01-4100-A73F-9A26CBBBC57F}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Model", "Unity\Unity.Model.csproj", "{6396AEEA-8EF9-9740-4CEF-891CC997106C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Hotfix", "Unity\Unity.Hotfix.csproj", "{350246F3-F094-675F-855B-FB9B18C2B23E}"
@@ -35,6 +33,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Editor", "Unity\Unity
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ThirdParty", "Unity\Unity.ThirdParty.csproj", "{CFBC0A95-3456-3439-6B2E-60FDE0FE5EE1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KcpLib", "Server\ThirdParty\KcpLib\KcpLib.csproj", "{CD9683D9-0B4B-42D1-A1E0-1689BEEFD725}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -129,18 +129,6 @@ Global
 		{BC06C46E-79F3-4AB6-800E-FA080CA54A0B}.Release|x64.Build.0 = Release|Any CPU
 		{BC06C46E-79F3-4AB6-800E-FA080CA54A0B}.Release|x86.ActiveCfg = Release|Any CPU
 		{BC06C46E-79F3-4AB6-800E-FA080CA54A0B}.Release|x86.Build.0 = Release|Any CPU
-		{B055A8CF-EF01-4100-A73F-9A26CBBBC57F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B055A8CF-EF01-4100-A73F-9A26CBBBC57F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B055A8CF-EF01-4100-A73F-9A26CBBBC57F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B055A8CF-EF01-4100-A73F-9A26CBBBC57F}.Debug|x64.Build.0 = Debug|Any CPU
-		{B055A8CF-EF01-4100-A73F-9A26CBBBC57F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B055A8CF-EF01-4100-A73F-9A26CBBBC57F}.Debug|x86.Build.0 = Debug|Any CPU
-		{B055A8CF-EF01-4100-A73F-9A26CBBBC57F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B055A8CF-EF01-4100-A73F-9A26CBBBC57F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B055A8CF-EF01-4100-A73F-9A26CBBBC57F}.Release|x64.ActiveCfg = Release|Any CPU
-		{B055A8CF-EF01-4100-A73F-9A26CBBBC57F}.Release|x64.Build.0 = Release|Any CPU
-		{B055A8CF-EF01-4100-A73F-9A26CBBBC57F}.Release|x86.ActiveCfg = Release|Any CPU
-		{B055A8CF-EF01-4100-A73F-9A26CBBBC57F}.Release|x86.Build.0 = Release|Any CPU
 		{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -189,6 +177,18 @@ Global
 		{CFBC0A95-3456-3439-6B2E-60FDE0FE5EE1}.Release|x64.Build.0 = Release|Any CPU
 		{CFBC0A95-3456-3439-6B2E-60FDE0FE5EE1}.Release|x86.ActiveCfg = Release|Any CPU
 		{CFBC0A95-3456-3439-6B2E-60FDE0FE5EE1}.Release|x86.Build.0 = Release|Any CPU
+		{CD9683D9-0B4B-42D1-A1E0-1689BEEFD725}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD9683D9-0B4B-42D1-A1E0-1689BEEFD725}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD9683D9-0B4B-42D1-A1E0-1689BEEFD725}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CD9683D9-0B4B-42D1-A1E0-1689BEEFD725}.Debug|x64.Build.0 = Debug|Any CPU
+		{CD9683D9-0B4B-42D1-A1E0-1689BEEFD725}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CD9683D9-0B4B-42D1-A1E0-1689BEEFD725}.Debug|x86.Build.0 = Debug|Any CPU
+		{CD9683D9-0B4B-42D1-A1E0-1689BEEFD725}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CD9683D9-0B4B-42D1-A1E0-1689BEEFD725}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CD9683D9-0B4B-42D1-A1E0-1689BEEFD725}.Release|x64.ActiveCfg = Release|Any CPU
+		{CD9683D9-0B4B-42D1-A1E0-1689BEEFD725}.Release|x64.Build.0 = Release|Any CPU
+		{CD9683D9-0B4B-42D1-A1E0-1689BEEFD725}.Release|x86.ActiveCfg = Release|Any CPU
+		{CD9683D9-0B4B-42D1-A1E0-1689BEEFD725}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -203,11 +203,11 @@ Global
 		{6D19C1F8-085C-422E-8DAF-2E49024DB08C} = {4940CE10-6652-4AC6-9D30-CF200A217643}
 		{831276B2-B7EB-4FD0-93E5-4D2109C78950} = {4940CE10-6652-4AC6-9D30-CF200A217643}
 		{BC06C46E-79F3-4AB6-800E-FA080CA54A0B} = {78640FA0-9F11-412D-A639-61F03D02407A}
-		{B055A8CF-EF01-4100-A73F-9A26CBBBC57F} = {78640FA0-9F11-412D-A639-61F03D02407A}
 		{6396AEEA-8EF9-9740-4CEF-891CC997106C} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{350246F3-F094-675F-855B-FB9B18C2B23E} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{CFBC0A95-3456-3439-6B2E-60FDE0FE5EE1} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{CD9683D9-0B4B-42D1-A1E0-1689BEEFD725} = {78640FA0-9F11-412D-A639-61F03D02407A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EABC01E3-3EB5-47EF-B46E-AAD8BB3585F1}

+ 1 - 0
Client-Server.sln.DotSettings.user

@@ -51,4 +51,5 @@
 	<s:String x:Key="/Default/Housekeeping/Layout/DialogWindows/RefactoringWizardWindow/Location/@EntryValue">122,-178</s:String>
 	<s:Int64 x:Key="/Default/Environment/SearchAndNavigation/DefaultOccurrencesGroupingIndex/@EntryValue">0</s:Int64>
 	<s:String x:Key="/Default/Profiling/Configurations/=1/@EntryIndexedValue">&lt;data&gt;&lt;HostParameters type="LocalHostParameters" /&gt;&lt;Argument type="StandaloneArgument"&gt;&lt;Arguments IsNull="False"&gt;&lt;/Arguments&gt;&lt;FileName IsNull="False"&gt;&lt;/FileName&gt;&lt;WorkingDirectory IsNull="False"&gt;&lt;/WorkingDirectory&gt;&lt;Scope&gt;&lt;ProcessFilters /&gt;&lt;/Scope&gt;&lt;/Argument&gt;&lt;Info type="TimelineInfo" /&gt;&lt;HostOptions type="HostOptions"&gt;&lt;HostTempPath IsNull="False"&gt;&lt;/HostTempPath&gt;&lt;/HostOptions&gt;&lt;/data&gt;</s:String>
+	
 	</wpf:ResourceDictionary>

+ 1 - 1
Server/Model/Server.Model.csproj

@@ -305,7 +305,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ThirdParty\Google.Protobuf\Google.Protobuf.csproj" />
-    <ProjectReference Include="..\ThirdParty\Libs\KcpLib.csproj" />
+    <ProjectReference Include="..\ThirdParty\KcpLib\KcpLib.csproj" />
     <ProjectReference Include="..\ThirdParty\MongodbDriver\DotNetCoreDriver\MongoDB.Bson\MongoDB.Bson.csproj" />
     <ProjectReference Include="..\ThirdParty\MongodbDriver\DotNetCoreDriver\MongoDB.Driver.Core\MongoDB.Driver.Core.csproj" />
     <ProjectReference Include="..\ThirdParty\MongodbDriver\DotNetCoreDriver\MongoDB.Driver\MongoDB.Driver.csproj" />

+ 14 - 14
Server/Server.sln

@@ -21,7 +21,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.Driver.Core", "Thir
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Google.Protobuf", "ThirdParty\Google.Protobuf\Google.Protobuf.csproj", "{02B4D7EC-AC40-4675-963E-53CAB9A86BDE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KcpLib", "ThirdParty\Libs\KcpLib.csproj", "{9C71523E-4F8A-4F13-9884-DF580BAC8194}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KcpLib", "ThirdParty\KcpLib\KcpLib.csproj", "{2B432E70-FA05-4D99-8241-237B0E4F5D84}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -117,18 +117,18 @@ Global
 		{02B4D7EC-AC40-4675-963E-53CAB9A86BDE}.Release|x64.Build.0 = Release|Any CPU
 		{02B4D7EC-AC40-4675-963E-53CAB9A86BDE}.Release|x86.ActiveCfg = Release|Any CPU
 		{02B4D7EC-AC40-4675-963E-53CAB9A86BDE}.Release|x86.Build.0 = Release|Any CPU
-		{9C71523E-4F8A-4F13-9884-DF580BAC8194}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9C71523E-4F8A-4F13-9884-DF580BAC8194}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9C71523E-4F8A-4F13-9884-DF580BAC8194}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9C71523E-4F8A-4F13-9884-DF580BAC8194}.Debug|x64.Build.0 = Debug|Any CPU
-		{9C71523E-4F8A-4F13-9884-DF580BAC8194}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9C71523E-4F8A-4F13-9884-DF580BAC8194}.Debug|x86.Build.0 = Debug|Any CPU
-		{9C71523E-4F8A-4F13-9884-DF580BAC8194}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9C71523E-4F8A-4F13-9884-DF580BAC8194}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9C71523E-4F8A-4F13-9884-DF580BAC8194}.Release|x64.ActiveCfg = Release|Any CPU
-		{9C71523E-4F8A-4F13-9884-DF580BAC8194}.Release|x64.Build.0 = Release|Any CPU
-		{9C71523E-4F8A-4F13-9884-DF580BAC8194}.Release|x86.ActiveCfg = Release|Any CPU
-		{9C71523E-4F8A-4F13-9884-DF580BAC8194}.Release|x86.Build.0 = Release|Any CPU
+		{2B432E70-FA05-4D99-8241-237B0E4F5D84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B432E70-FA05-4D99-8241-237B0E4F5D84}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B432E70-FA05-4D99-8241-237B0E4F5D84}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2B432E70-FA05-4D99-8241-237B0E4F5D84}.Debug|x64.Build.0 = Debug|Any CPU
+		{2B432E70-FA05-4D99-8241-237B0E4F5D84}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2B432E70-FA05-4D99-8241-237B0E4F5D84}.Debug|x86.Build.0 = Debug|Any CPU
+		{2B432E70-FA05-4D99-8241-237B0E4F5D84}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B432E70-FA05-4D99-8241-237B0E4F5D84}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B432E70-FA05-4D99-8241-237B0E4F5D84}.Release|x64.ActiveCfg = Release|Any CPU
+		{2B432E70-FA05-4D99-8241-237B0E4F5D84}.Release|x64.Build.0 = Release|Any CPU
+		{2B432E70-FA05-4D99-8241-237B0E4F5D84}.Release|x86.ActiveCfg = Release|Any CPU
+		{2B432E70-FA05-4D99-8241-237B0E4F5D84}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -139,7 +139,7 @@ Global
 		{3FD1D683-59E8-47C4-9436-B3D856EFB094} = {6946DBCF-B81C-4B2A-A7C5-94A337D915C2}
 		{46A590DE-EBA3-4928-AB78-5C514D08C9E7} = {6946DBCF-B81C-4B2A-A7C5-94A337D915C2}
 		{02B4D7EC-AC40-4675-963E-53CAB9A86BDE} = {5D11E730-0CAA-4A47-BA1A-379004F0F6D9}
-		{9C71523E-4F8A-4F13-9884-DF580BAC8194} = {5D11E730-0CAA-4A47-BA1A-379004F0F6D9}
+		{2B432E70-FA05-4D99-8241-237B0E4F5D84} = {5D11E730-0CAA-4A47-BA1A-379004F0F6D9}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EE120158-643A-409C-B8F2-5E654E4D6D70}

+ 0 - 0
Server/ThirdParty/Libs/KcpLib.csproj → Server/ThirdParty/KcpLib/KcpLib.csproj


+ 0 - 0
Server/ThirdParty/Libs/libkcp.dylib → Server/ThirdParty/KcpLib/libkcp.dylib


+ 0 - 0
Server/ThirdParty/Libs/libkcp.so → Server/ThirdParty/KcpLib/libkcp.so