Преглед на файлове

修复客户端用工程的编译问题

大爷 преди 2 години
родител
ревизия
92edcc98f7

+ 6 - 4
Common/CommonAI/CommonAI_C.csproj

@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CommonAI</RootNamespace>
     <AssemblyName>CommonAI</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -39,7 +39,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>portable</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\Assets\Plugins\</OutputPath>
+    <OutputPath>..\..\Library\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;PATH_NO_SQRT;ClientOnly</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -55,7 +55,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Assets\Plugins\</OutputPath>
+    <OutputPath>..\..\Library\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>0</WarningLevel>
@@ -77,7 +77,7 @@
   <ItemGroup>
     <Reference Include="CommonLang, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Assets\Plugins\CommonLang.dll</HintPath>
+      <HintPath>..\..\Library\Debug\CommonLang.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
@@ -104,6 +104,8 @@
     <Compile Include="ZoneClient\ZoneObject.Unit.cs" />
     <Compile Include="ZoneClient\ZoneObject.Unit.Status.cs" />
     <Compile Include="ZoneServer\JSGModule\JSGGlobalData.cs" />
+    <Compile Include="ZoneServer\JSGModule\JSGHackerModule.cs" />
+    <Compile Include="ZoneServer\JSGModule\JSGSrvData.cs" />
     <Compile Include="ZoneServer\JSGModule\MSpaceNodeCache.cs" />
     <Compile Include="ZoneServer\JSGModule\JSGModule.cs" />
     <Compile Include="ZoneServer\JSGModule\JSGServerProfile.cs" />

+ 5 - 6
Common/CommonLang/CommonLang_C.csproj

@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CommonLang</RootNamespace>
     <AssemblyName>CommonLang</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -39,7 +39,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>portable</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\Assets\Plugins\</OutputPath>
+    <OutputPath>..\..\Library\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;USE_STREAM_ORDER;ClientOnly;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>0</WarningLevel>
@@ -53,7 +53,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Assets\Plugins\</OutputPath>
+    <OutputPath>..\..\Library\Debug\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -76,9 +76,8 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
-    <Reference Include="YXJDebug, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Assets\Plugins\YXJDebug.dll</HintPath>
+    <Reference Include="UnityEngine">
+      <HintPath>..\..\Library\UnityEngine.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

+ 4 - 0
Common/Pomelo/PomeloShare/PomeloShare.csproj

@@ -54,6 +54,10 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Ice, Version=3.6.4.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\StarEscort\DotNet\library\Ice.dll</HintPath>
+    </Reference>
     <Reference Include="log4net">
       <HintPath>..\..\..\Library\log4net.dll</HintPath>
     </Reference>

+ 4 - 4
Common/Pomelo/pomelo-dotnetClient/pomelo-dotnetClient.csproj

@@ -80,13 +80,13 @@
       <Project>{7990158b-ba84-4177-8eec-84bddc8a527a}</Project>
       <Name>CommonAIClient</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\CommonAI\CommonAI.csproj">
+    <ProjectReference Include="..\..\CommonAI\CommonAI_C.csproj">
       <Project>{0d86d14e-c45e-400a-8f50-ff7bde63b35a}</Project>
-      <Name>CommonAI</Name>
+      <Name>CommonAI_C</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\CommonLang\CommonLang.csproj">
+    <ProjectReference Include="..\..\CommonLang\CommonLang_C.csproj">
       <Project>{1835e71d-0b6c-463d-b538-e68891e4dacb}</Project>
-      <Name>CommonLang</Name>
+      <Name>CommonLang_C</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\CommonNetwork\CommonNetwork.csproj">
       <Project>{6c114f8f-ee02-4f15-8f3a-93691896d15f}</Project>

BIN
Common/protobuf-net/protobuf-net/bin/Debug/protobuf-net.dll


Файловите разлики са ограничени, защото са твърде много
+ 124 - 876
XmdsCommon.sln


+ 1 - 5
XmdsCommon/XmdsCommon.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>XmdsCommon</RootNamespace>
     <AssemblyName>XmdsCommon</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -47,10 +47,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Common\Library\SuperSocket(1.6.6).Binaries\Net45\Release\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />

+ 0 - 4
XmdsVSPlugins/XmdsPluginUpdate/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Ice" version="3.5.1.0" targetFramework="net45" />
-</packages>

+ 1 - 1
test/app.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	<appSettings>
-		<add key="zoneConfig.assetPath" value="E:\GameEditors\GameEditor\data"/>
+		<add key="zoneConfig.assetPath" value="E:\StarEscort\GameEditor\data"/>
 		<add key="logConfig.configFile" value="log4net"/>
 		<add key="logConfig.serverId" value="csharp-server-11"/>
 		<add key="logConfig.outputPath" value="../log/"/>

Някои файлове не бяха показани, защото твърде много файлове са промени