Skip to content

Commit f5e3e21

Browse files
ylmbtmylmbtm
committed
提交服务器代码
1 parent e3abb38 commit f5e3e21

20 files changed

+683
-22
lines changed

‎ConfigData/Data_Award.xls

439 KB
Binary file not shown.

‎Server/Src/AccountServer/AccountServer.vcxproj

+84
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,18 @@
55
<Configuration>Debug</Configuration>
66
<Platform>Win32</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Release|Win32">
913
<Configuration>Release</Configuration>
1014
<Platform>Win32</Platform>
1115
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
1220
</ItemGroup>
1321
<PropertyGroup Label="Globals">
1422
<ProjectGuid>{EF6DEC31-F0BA-4831-92BC-AF3A714D5696}</ProjectGuid>
@@ -21,34 +29,61 @@
2129
<CharacterSet>MultiByte</CharacterSet>
2230
<WholeProgramOptimization>true</WholeProgramOptimization>
2331
</PropertyGroup>
32+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
33+
<ConfigurationType>Application</ConfigurationType>
34+
<CharacterSet>MultiByte</CharacterSet>
35+
<WholeProgramOptimization>true</WholeProgramOptimization>
36+
</PropertyGroup>
2437
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2538
<ConfigurationType>Application</ConfigurationType>
2639
<CharacterSet>MultiByte</CharacterSet>
2740
</PropertyGroup>
41+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
42+
<ConfigurationType>Application</ConfigurationType>
43+
<CharacterSet>MultiByte</CharacterSet>
44+
</PropertyGroup>
2845
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
2946
<ImportGroup Label="ExtensionSettings">
3047
</ImportGroup>
3148
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
3249
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3350
</ImportGroup>
51+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
52+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
53+
</ImportGroup>
3454
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
3555
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3656
</ImportGroup>
57+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
58+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
59+
</ImportGroup>
3760
<PropertyGroup Label="UserMacros" />
3861
<PropertyGroup>
3962
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
4063
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
64+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)\</OutDir>
4165
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
66+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>
4267
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
68+
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
4369
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
70+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)\</OutDir>
4471
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
72+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</IntDir>
4573
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
74+
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
4675
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
76+
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
4777
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
78+
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
4879
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
80+
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
4981
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
82+
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
5083
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
84+
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
5185
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
86+
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
5287
</PropertyGroup>
5388
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5489
<ClCompile>
@@ -72,6 +107,26 @@
72107
<AdditionalDependencies>libprotocd.lib;libprotobufd.lib;%(AdditionalDependencies)</AdditionalDependencies>
73108
</Link>
74109
</ItemDefinitionGroup>
110+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
111+
<ClCompile>
112+
<Optimization>Disabled</Optimization>
113+
<AdditionalIncludeDirectories>..\ServerEngine;..\..\Common;..\..\Common\MySql;..\..\Common\protobuf\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
114+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
115+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
116+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
117+
<PrecompiledHeader>Use</PrecompiledHeader>
118+
<WarningLevel>Level3</WarningLevel>
119+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
120+
<DisableSpecificWarnings>4996;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
121+
</ClCompile>
122+
<Link>
123+
<OutputFile>..\Debug\$(ProjectName).exe</OutputFile>
124+
<AdditionalLibraryDirectories>..\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
125+
<GenerateDebugInformation>true</GenerateDebugInformation>
126+
<SubSystem>Console</SubSystem>
127+
<AdditionalDependencies>libprotocd.lib;libprotobufd.lib;%(AdditionalDependencies)</AdditionalDependencies>
128+
</Link>
129+
</ItemDefinitionGroup>
75130
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
76131
<ClCompile>
77132
<Optimization>MaxSpeed</Optimization>
@@ -98,10 +153,37 @@
98153
</IgnoreSpecificDefaultLibraries>
99154
</Link>
100155
</ItemDefinitionGroup>
156+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
157+
<ClCompile>
158+
<Optimization>MaxSpeed</Optimization>
159+
<IntrinsicFunctions>true</IntrinsicFunctions>
160+
<AdditionalIncludeDirectories>..\ServerEngine;..\..\Common;..\..\Common\MySql;..\..\Common\protobuf\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
161+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
162+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
163+
<FunctionLevelLinking>true</FunctionLevelLinking>
164+
<PrecompiledHeader>Use</PrecompiledHeader>
165+
<WarningLevel>Level3</WarningLevel>
166+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
167+
<DisableSpecificWarnings>4800</DisableSpecificWarnings>
168+
</ClCompile>
169+
<Link>
170+
<OutputFile>..\Release\$(ProjectName).exe</OutputFile>
171+
<AdditionalLibraryDirectories>..\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
172+
<GenerateDebugInformation>true</GenerateDebugInformation>
173+
<SubSystem>Console</SubSystem>
174+
<OptimizeReferences>true</OptimizeReferences>
175+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
176+
<AdditionalDependencies>libprotoc.lib;libprotobuf.lib;%(AdditionalDependencies)</AdditionalDependencies>
177+
<IgnoreSpecificDefaultLibraries>
178+
</IgnoreSpecificDefaultLibraries>
179+
</Link>
180+
</ItemDefinitionGroup>
101181
<ItemGroup>
102182
<ClCompile Include="..\Message\Msg_Login.pb.cc">
103183
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
184+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
104185
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
186+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
105187
</ClCompile>
106188
<ClCompile Include="AccountManager.cpp" />
107189
<ClCompile Include="AccountMsgHandler.cpp" />
@@ -110,7 +192,9 @@
110192
<ClCompile Include="GameService.cpp" />
111193
<ClCompile Include="stdafx.cpp">
112194
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
195+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
113196
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
197+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
114198
</ClCompile>
115199
<ClCompile Include="..\..\Common\Sqlite\CppSQLite3.cpp" />
116200
</ItemGroup>

‎Server/Src/AccountServer/GameService.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ BOOL CGameService::DispatchPacket(NetPacket *pNetPacket)
8787
BOOL CGameService::Uninit()
8888
{
8989
ServiceBase::GetInstancePtr()->StopNetwork();
90+
google::protobuf::ShutdownProtobufLibrary();
9091
return TRUE;
9192
}
9293

0 commit comments

Comments
 (0)