diff --git a/俱乐部/Debug_Unicode/create_dumpD.lib b/俱乐部/Debug_Unicode/create_dumpD.lib
new file mode 100644
index 0000000..aed968f
Binary files /dev/null and b/俱乐部/Debug_Unicode/create_dumpD.lib differ
diff --git a/俱乐部/Platform.sln b/俱乐部/Platform.sln
index f0c5d31..d9fa470 100644
--- a/俱乐部/Platform.sln
+++ b/俱乐部/Platform.sln
@@ -49,14 +49,14 @@ Global
{CCD2D328-1912-4FC4-91B5-2333A7EF6EB7}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32
{CCD2D328-1912-4FC4-91B5-2333A7EF6EB7}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32
{CCD2D328-1912-4FC4-91B5-2333A7EF6EB7}.Release_Unicode|x64.ActiveCfg = Release_Unicode|Win32
- {51FD2060-F4F9-4982-8474-473541D4FCF8}.Debug_Unicode|Win32.ActiveCfg = Release_Unicode|Win32
- {51FD2060-F4F9-4982-8474-473541D4FCF8}.Debug_Unicode|Win32.Build.0 = Release_Unicode|Win32
+ {51FD2060-F4F9-4982-8474-473541D4FCF8}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32
+ {51FD2060-F4F9-4982-8474-473541D4FCF8}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32
{51FD2060-F4F9-4982-8474-473541D4FCF8}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|Win32
{51FD2060-F4F9-4982-8474-473541D4FCF8}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32
{51FD2060-F4F9-4982-8474-473541D4FCF8}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32
{51FD2060-F4F9-4982-8474-473541D4FCF8}.Release_Unicode|x64.ActiveCfg = Release_Unicode|Win32
- {C38EABE4-E7E3-437A-8ECF-97A8626227D0}.Debug_Unicode|Win32.ActiveCfg = Release_Unicode|Win32
- {C38EABE4-E7E3-437A-8ECF-97A8626227D0}.Debug_Unicode|Win32.Build.0 = Release_Unicode|Win32
+ {C38EABE4-E7E3-437A-8ECF-97A8626227D0}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32
+ {C38EABE4-E7E3-437A-8ECF-97A8626227D0}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32
{C38EABE4-E7E3-437A-8ECF-97A8626227D0}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|Win32
{C38EABE4-E7E3-437A-8ECF-97A8626227D0}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32
{C38EABE4-E7E3-437A-8ECF-97A8626227D0}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32
diff --git a/俱乐部/Source/ServerControl/CorrespondServer/CorrespondServer.vcxproj b/俱乐部/Source/ServerControl/CorrespondServer/CorrespondServer.vcxproj
index 2fc7383..5f43f95 100644
--- a/俱乐部/Source/ServerControl/CorrespondServer/CorrespondServer.vcxproj
+++ b/俱乐部/Source/ServerControl/CorrespondServer/CorrespondServer.vcxproj
@@ -64,7 +64,7 @@
Windows
true
- ../../../\Source\Libs\Release_Unicode
+ $(SolutionDir)Source\Libs\$(Configuration)
false
diff --git a/俱乐部/Source/ServerControl/KernelEngine/KernelEngine.vcxproj b/俱乐部/Source/ServerControl/KernelEngine/KernelEngine.vcxproj
index 5d3c19f..0f99ee1 100644
--- a/俱乐部/Source/ServerControl/KernelEngine/KernelEngine.vcxproj
+++ b/俱乐部/Source/ServerControl/KernelEngine/KernelEngine.vcxproj
@@ -5,18 +5,10 @@
Debug_Unicode
Win32
-
- Debug
- Win32
-
Release_Unicode
Win32
-
- Release
- Win32
-
{DA531A23-506A-4643-BA47-B77542C5F41C}
@@ -25,13 +17,6 @@
10.0
-
- DynamicLibrary
- true
- v142
- MultiByte
- Dynamic
-
DynamicLibrary
true
@@ -39,14 +24,6 @@
Unicode
Dynamic
-
- DynamicLibrary
- false
- v142
- true
- MultiByte
- Dynamic
-
DynamicLibrary
false
@@ -58,57 +35,22 @@
-
-
-
-
-
-
-
- true
-
true
$(SolutionDir)Bin\$(Configuration)\
$(ProjectName)D
-
- false
-
false
$(SolutionDir)Bin\$(Configuration)\
-
-
- Use
- Level3
- Disabled
- _USING_V110_SDK71_;WIN32;_WINDOWS;_DEBUG;_AFXEXT;KERNEL_ENGINE_DLL;%(PreprocessorDefinitions)
- true
-
-
- Windows
- true
- .\KernelEngine.def
-
-
- false
- _DEBUG;%(PreprocessorDefinitions)
-
-
- 0x0804
- _DEBUG;%(PreprocessorDefinitions)
- $(IntDir);%(AdditionalIncludeDirectories)
-
-
Use
@@ -141,33 +83,6 @@
-
-
- Level3
- Use
- MaxSpeed
- true
- true
- WIN32;_WINDOWS;NDEBUG;_AFXEXT;KERNEL_ENGINE_DLL;%(PreprocessorDefinitions)
- true
-
-
- Windows
- true
- true
- true
- .\KernelEngine.def
-
-
- false
- NDEBUG;%(PreprocessorDefinitions)
-
-
- 0x0804
- NDEBUG;%(PreprocessorDefinitions)
- $(IntDir);%(AdditionalIncludeDirectories)
-
-
Level3
@@ -224,9 +139,7 @@ copy /y $(OutDir)$(TargetFileName) ..\..\..\Publish\Server\$(Configuration)\$(Ta
- Create
Create
- Create
Create
diff --git a/俱乐部/Source/ServerControl/KernelEngine/Release_Unicode/KernelEngine.res b/俱乐部/Source/ServerControl/KernelEngine/Release_Unicode/KernelEngine.res
new file mode 100644
index 0000000..7e19584
Binary files /dev/null and b/俱乐部/Source/ServerControl/KernelEngine/Release_Unicode/KernelEngine.res differ
diff --git a/俱乐部/Source/ServerControl/LogonServer/LogonServer.vcxproj b/俱乐部/Source/ServerControl/LogonServer/LogonServer.vcxproj
index 71f9028..334e4ce 100644
--- a/俱乐部/Source/ServerControl/LogonServer/LogonServer.vcxproj
+++ b/俱乐部/Source/ServerControl/LogonServer/LogonServer.vcxproj
@@ -5,18 +5,10 @@
Debug_Unicode
Win32
-
- Debug
- Win32
-
Release_Unicode
Win32
-
- Release
- Win32
-
{74DE8924-75DC-4444-AB26-B687F71BD778}
@@ -25,13 +17,6 @@
10.0
-
- Application
- true
- v142
- MultiByte
- Dynamic
-
Application
true
@@ -39,14 +24,6 @@
Unicode
Dynamic
-
- Application
- false
- v142
- true
- MultiByte
- Dynamic
-
Application
false
@@ -58,58 +35,23 @@
-
-
-
-
-
-
-
- true
-
true
$(SolutionDir)Bin\$(Configuration)\
../../../\Source\SharedControl\create_dump;../../../\Source\ServerControl\curl-7.32.0\include;$(IncludePath)
-
- false
-
false
$(SolutionDir)Bin\$(Configuration)\
../../../\Source\SharedControl\create_dump;$(IncludePath);../../../\Source\ServerControl\curl-7.32.0\include;
-
-
- Use
- Level3
- Disabled
- _USING_V110_SDK71_;WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)
- true
-
-
- Windows
- true
-
-
- false
- true
- _DEBUG;%(PreprocessorDefinitions)
-
-
- 0x0804
- _DEBUG;%(PreprocessorDefinitions)
- $(IntDir);%(AdditionalIncludeDirectories)
-
-
NotUsing
@@ -141,33 +83,6 @@
-
-
- Level3
- Use
- MaxSpeed
- true
- true
- WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)
- true
-
-
- Windows
- true
- true
- true
-
-
- false
- true
- NDEBUG;%(PreprocessorDefinitions)
-
-
- 0x0804
- NDEBUG;%(PreprocessorDefinitions)
- $(IntDir);%(AdditionalIncludeDirectories)
-
-
Level3
@@ -246,9 +161,7 @@ copy /y $(OutDir)$(TargetFileName) ..\..\..\Publish\Server\$(Configuration)\$(Ta
- Create
Create
- Create
Create
diff --git a/俱乐部/Source/ServerControl/ModuleManager/ModuleManager.vcxproj b/俱乐部/Source/ServerControl/ModuleManager/ModuleManager.vcxproj
index 62d7746..da6a5a9 100644
--- a/俱乐部/Source/ServerControl/ModuleManager/ModuleManager.vcxproj
+++ b/俱乐部/Source/ServerControl/ModuleManager/ModuleManager.vcxproj
@@ -5,18 +5,10 @@
Debug_Unicode
Win32
-
- Debug
- Win32
-
Release_Unicode
Win32
-
- Release
- Win32
-
{C323A106-B50D-48CB-A353-CFBE5308F2A5}
@@ -25,13 +17,6 @@
10.0
-
- DynamicLibrary
- true
- v142
- Unicode
- Dynamic
-
DynamicLibrary
true
@@ -39,14 +24,6 @@
Unicode
Dynamic
-
- DynamicLibrary
- false
- v142
- true
- Unicode
- Dynamic
-
DynamicLibrary
false
@@ -58,57 +35,22 @@
-
-
-
-
-
-
-
- true
-
true
$(SolutionDir)Bin\$(Configuration)\
$(ProjectName)D
-
- false
-
false
$(SolutionDir)Bin\$(Configuration)\
-
-
- Use
- Level3
- Disabled
- _USING_V110_SDK71_;WIN32;_WINDOWS;_DEBUG;_AFXEXT;MODULE_MANAGER_DLL;%(PreprocessorDefinitions)
- true
-
-
- Windows
- true
- .\ModuleManager.def
-
-
- false
- _DEBUG;%(PreprocessorDefinitions)
-
-
- 0x0804
- _DEBUG;%(PreprocessorDefinitions)
- $(IntDir);%(AdditionalIncludeDirectories)
-
-
Use
@@ -139,33 +81,6 @@
-
-
- Level3
- Use
- MaxSpeed
- true
- true
- WIN32;_WINDOWS;NDEBUG;_AFXEXT;MODULE_MANAGER_DLL;%(PreprocessorDefinitions)
- true
-
-
- Windows
- true
- true
- true
- .\ModuleManager.def
-
-
- false
- NDEBUG;%(PreprocessorDefinitions)
-
-
- 0x0804
- NDEBUG;%(PreprocessorDefinitions)
- $(IntDir);%(AdditionalIncludeDirectories)
-
-
Level3
@@ -221,9 +136,7 @@ copy /y $(OutDir)$(TargetFileName) ..\..\..\Publish\Server\$(Configuration)\$(Ta
- Create
Create
- Create
Create
diff --git a/俱乐部/Source/ServerControl/ModuleManager/Release_Unicode/ModuleManager.res b/俱乐部/Source/ServerControl/ModuleManager/Release_Unicode/ModuleManager.res
new file mode 100644
index 0000000..308b290
Binary files /dev/null and b/俱乐部/Source/ServerControl/ModuleManager/Release_Unicode/ModuleManager.res differ
diff --git a/俱乐部/Source/SharedControl/ProcessControl/ProcessControl.vcxproj b/俱乐部/Source/SharedControl/ProcessControl/ProcessControl.vcxproj
index ccbeb51..02dcbf8 100644
--- a/俱乐部/Source/SharedControl/ProcessControl/ProcessControl.vcxproj
+++ b/俱乐部/Source/SharedControl/ProcessControl/ProcessControl.vcxproj
@@ -5,18 +5,10 @@
Debug_Unicode
Win32
-
- Debug
- Win32
-
Release_Unicode
Win32
-
- Release
- Win32
-
{B4766ADF-5AA6-4ADF-9354-4F889FFF028E}
@@ -24,13 +16,6 @@
MFCDLLProj
-
- DynamicLibrary
- true
- v120
- MultiByte
- Dynamic
-
DynamicLibrary
true
@@ -38,14 +23,6 @@
Unicode
Dynamic
-
- DynamicLibrary
- false
- v120
- true
- MultiByte
- Dynamic
-
DynamicLibrary
false
@@ -57,57 +34,22 @@
-
-
-
-
-
-
-
- true
-
true
$(SolutionDir)Bin\$(Configuration)\
$(ProjectName)D
-
- false
-
false
$(SolutionDir)Bin\$(Configuration)\
-
-
- Use
- Level3
- Disabled
- _USING_V110_SDK71_;WIN32;_WINDOWS;_DEBUG;_AFXEXT;PROCESS_CONTROL_DLL;%(PreprocessorDefinitions)
- true
-
-
- Windows
- true
- .\ProcessControl.def
-
-
- false
- _DEBUG;%(PreprocessorDefinitions)
-
-
- 0x0804
- _DEBUG;%(PreprocessorDefinitions)
- $(IntDir);%(AdditionalIncludeDirectories)
-
-
Use
@@ -136,33 +78,6 @@
-
-
- Level3
- Use
- MaxSpeed
- true
- true
- WIN32;_WINDOWS;NDEBUG;_AFXEXT;PROCESS_CONTROL_DLL;%(PreprocessorDefinitions)
- true
-
-
- Windows
- true
- true
- true
- .\ProcessControl.def
-
-
- false
- NDEBUG;%(PreprocessorDefinitions)
-
-
- 0x0804
- NDEBUG;%(PreprocessorDefinitions)
- $(IntDir);%(AdditionalIncludeDirectories)
-
-
Level3
@@ -211,9 +126,7 @@ copy /y $(OutDir)$(TargetFileName) ..\..\..\Publish\Client\$(Configuration)\$(Ta
- Create
Create
- Create
Create
diff --git a/俱乐部/Source/SharedControl/ProcessControl/Release_Unicode/ProcessControl.res b/俱乐部/Source/SharedControl/ProcessControl/Release_Unicode/ProcessControl.res
new file mode 100644
index 0000000..d3719a2
Binary files /dev/null and b/俱乐部/Source/SharedControl/ProcessControl/Release_Unicode/ProcessControl.res differ
diff --git a/俱乐部/Source/SharedControl/ServiceCore/ServiceCore.vcxproj b/俱乐部/Source/SharedControl/ServiceCore/ServiceCore.vcxproj
index f366b58..3529f3a 100644
--- a/俱乐部/Source/SharedControl/ServiceCore/ServiceCore.vcxproj
+++ b/俱乐部/Source/SharedControl/ServiceCore/ServiceCore.vcxproj
@@ -5,18 +5,10 @@
Debug_Unicode
Win32
-
- Debug
- Win32
-
Release_Unicode
Win32
-
- Release
- Win32
-
{60710DEB-8538-4CB6-8ABA-3A143E451C21}
@@ -25,13 +17,6 @@
10.0
-
- DynamicLibrary
- true
- v142
- MultiByte
- Dynamic
-
DynamicLibrary
true
@@ -39,14 +24,6 @@
Unicode
Dynamic
-
- DynamicLibrary
- false
- v142
- true
- MultiByte
- Dynamic
-
DynamicLibrary
false
@@ -58,57 +35,22 @@
-
-
-
-
-
-
-
- true
-
true
$(SolutionDir)Bin\$(Configuration)\
$(ProjectName)D
-
- false
-
false
$(SolutionDir)Bin\$(Configuration)\
-
-
- Use
- Level3
- Disabled
- _USING_V110_SDK71_;WIN32;_WINDOWS;_DEBUG;_AFXEXT;SERVICE_CORE_DLL;%(PreprocessorDefinitions)
- true
-
-
- Windows
- true
- .\ServiceCore.def
-
-
- false
- _DEBUG;%(PreprocessorDefinitions)
-
-
- 0x0804
- _DEBUG;%(PreprocessorDefinitions)
- $(IntDir);%(AdditionalIncludeDirectories)
-
-
Use
@@ -138,33 +80,6 @@
-
-
- Level3
- Use
- MaxSpeed
- true
- true
- WIN32;_WINDOWS;NDEBUG;_AFXEXT;SERVICE_CORE_DLL;%(PreprocessorDefinitions)
- true
-
-
- Windows
- true
- true
- true
- .\ServiceCore.def
-
-
- false
- NDEBUG;%(PreprocessorDefinitions)
-
-
- 0x0804
- NDEBUG;%(PreprocessorDefinitions)
- $(IntDir);%(AdditionalIncludeDirectories)
-
-
Level3
@@ -212,9 +127,7 @@ copy /y $(OutDir)$(TargetFileName) ..\..\..\Publish\Client\$(Configuration)\$(Ta
- Create
Create
- Create
Create
diff --git a/游戏服务器/Debug_Unicode/GameServer.res b/游戏服务器/Debug_Unicode/GameServer.res
new file mode 100644
index 0000000..ba43dc3
Binary files /dev/null and b/游戏服务器/Debug_Unicode/GameServer.res differ
diff --git a/游戏服务器/GameServer.vcxproj b/游戏服务器/GameServer.vcxproj
index 848bf5d..f9b1a98 100644
--- a/游戏服务器/GameServer.vcxproj
+++ b/游戏服务器/GameServer.vcxproj
@@ -88,7 +88,8 @@
Windows
$(OutDir)GameServer.lib
MachineX86
- $(SolutionDir)Source\Protobuf;%(AdditionalLibraryDirectories)
+ $(SolutionDir)Source\Protobuf;$(SolutionDir)Source\Libs\$(Configuration);%(AdditionalLibraryDirectories)
+ %(AdditionalDependencies)
diff --git a/游戏服务器/Poker/TableFrameSinkPoker.cpp b/游戏服务器/Poker/TableFrameSinkPoker.cpp
index 796778a..c1197b6 100644
--- a/游戏服务器/Poker/TableFrameSinkPoker.cpp
+++ b/游戏服务器/Poker/TableFrameSinkPoker.cpp
@@ -454,7 +454,7 @@ bool CTableFrameSinkPoker::OnEventGameStart()
{
CopyMemory(GameStart.cbCardData[i], m_cbCardData[i], MAX_COUNT_Poker);
}
- RepayRecord(INVALID_CHAIR, SUB_S_GAME_START_Poker, &GameSt......art, sizeof(GameStart));
+ RepayRecord(INVALID_CHAIR, SUB_S_GAME_START_Poker, &GameStart, sizeof(GameStart));
for (int i = 0; i < m_cbPlayerNum;i++)
{
ZeroMemory(GameStart.cbCardData, GAME_PLAYER*MAX_COUNT_Poker);
diff --git a/游戏服务器/TableFrameSink.cpp b/游戏服务器/TableFrameSink.cpp
index d93556c..4b3e6c6 100644
--- a/游戏服务器/TableFrameSink.cpp
+++ b/游戏服务器/TableFrameSink.cpp
@@ -311,24 +311,11 @@ bool CTableFrameSink::RepayRecordEnd()
for (auto& grp : m_UserReplayRecord)
{
RecordPacket::pb_GameRecordPacket* Packet = RecordResp.add_precordpacket();
-<<<<<<< .mine
- Packet->set_wchairid(grp.wchairid());
- Packet->set_wsubcmdid(grp.wsubcmdid());
- Packet->set_wmaincmdid(grp.wmaincmdid());
- Packet->set_pdata(grp.pdata());
-||||||| .r248
- Packet->set_wchairid(grp.wChairID);
- Packet->set_wsubcmdid(grp.wSubCmdID);
- Packet->set_wmaincmdid(grp.wMainCmdID);
- std::string wPacket = CW2AEX<1024>(grp.wPacket, CP_UTF8).m_psz;
- Packet->set_pdata(wPacket);
-=======
Packet->set_wchairid(grp.wchairid());
Packet->set_wsubcmdid(grp.wsubcmdid());
Packet->set_wmaincmdid(grp.wmaincmdid());
Packet->set_pdata(grp.pdata());
->>>>>>> .r273
}
std::string pbresp = RecordResp.SerializePartialAsString();
@@ -343,73 +330,12 @@ bool CTableFrameSink::RepayRecordEnd()
bool CTableFrameSink::RepayRecord(WORD wChairID, WORD wSubCmdId, void* pData, WORD wSize)
{
-<<<<<<< .mine
- //ȡû
- /*char* dwpdate = new char[wSize];
- CopyMemory(dwpdate, pData, wSize);
- RecordPacket::pb_GameRecordPacket Packet;
- Packet.set_wchairid(wChairID);
- Packet.set_wsubcmdid(wSubCmdId);
- Packet.set_wmaincmdid(MDM_GF_GAME);
- Packet.set_pdata(dwpdate);
- std::string pbpacket = Packet.SerializePartialAsString();
-
- GameRecordPacket record;
- CString dwPacket = (CA2CTEX<2048>(pbpacket.c_str(), CP_UTF8)).m_szBuffer;
- _sntprintf(record.wPacket, CountArray(record.wPacket), TEXT("%s"), pData);
- CopyMemory(record.wPacket, pData, wSize);
- record.wSize = wSize;
- record.wPacketSize = pbpacket.length();*/
-
- RecordPacket::pb_GameRecordPacket record;
- record.set_wchairid(wChairID);
- record.set_wsubcmdid(wSubCmdId);
- record.set_wmaincmdid(MDM_GF_GAME);
- record.set_pdata((char*)pData);
- m_UserReplayRecord.push_back(record);
- /*if (nullptr != dwpdate)
- {
- delete[] dwpdate;
- dwpdate = nullptr;
- }*/
-||||||| .r248
- //ȡû
- /*char* dwpdate = new char[wSize];
- CopyMemory(dwpdate, pData, wSize);
- RecordPacket::pb_GameRecordPacket Packet;
- Packet.set_wchairid(wChairID);
- Packet.set_wsubcmdid(wSubCmdId);
- Packet.set_wmaincmdid(MDM_GF_GAME);
- Packet.set_pdata(dwpdate);
- std::string pbpacket = Packet.SerializePartialAsString();
-
- GameRecordPacket record;
- CString dwPacket = (CA2CTEX<2048>(pbpacket.c_str(), CP_UTF8)).m_szBuffer;
- _sntprintf(record.wPacket, CountArray(record.wPacket), TEXT("%s"), pData);
- CopyMemory(record.wPacket, pData, wSize);
- record.wSize = wSize;
- record.wPacketSize = pbpacket.length();*/
-
- GameRecordPacket record;
- record.wSize = wSize;
- record.wChairID = wChairID;
- record.wSubCmdID = wSubCmdId;
- record.wMainCmdID = MDM_GF_GAME;
- _sntprintf(record.wPacket, wSize, TEXT("%s"), pData);
- m_UserReplayRecord.push_back(record);
- /*if (nullptr != dwpdate)
- {
- delete[] dwpdate;
- dwpdate = nullptr;
- }*/
-=======
RecordPacket::pb_GameRecordPacket pRecordPacket;
pRecordPacket.set_wchairid(wChairID);
pRecordPacket.set_wsubcmdid(wSubCmdId);
pRecordPacket.set_wmaincmdid(MDM_GF_GAME);
pRecordPacket.set_pdata((char*)pData,wSize);
m_UserReplayRecord.push_back(pRecordPacket);
->>>>>>> .r273
return true;
}
diff --git a/游戏服务器/TableFrameSink.h b/游戏服务器/TableFrameSink.h
index 15c4bfc..084d23c 100644
--- a/游戏服务器/TableFrameSink.h
+++ b/游戏服务器/TableFrameSink.h
@@ -7,13 +7,7 @@
#include "GameLogic.h"
#include "ReplayRecordManager.h"
#include "data.h"
-<<<<<<< .mine
#include "../ֲ/Source/MessageDef/Pb_RecordPacket.pb.h"
-
-||||||| .r248
-=======
-#include "../ֲ/Source/MessageDef/Pb_RecordPacket.pb.h"
->>>>>>> .r273
enum MagicCount
{
MagicZero=0,
@@ -146,14 +140,7 @@ private:
const tagGameServiceOption * m_pGameServiceOption; //ò
bool m_bReplayRecordStart; //Ƿʼ¼
-<<<<<<< .mine
-
- std::vector m_UserReplayRecord; //ĸλûݵļ¼ڻطš
-||||||| .r248
- std::vector m_UserReplayRecord; //ĸλûݵļ¼ڻطš
-=======
std::vector m_UserReplayRecord; //ĸλûݵļ¼ڻطš
->>>>>>> .r273
//bool m_bReduceBean; //Ƿѿ۷Ϸ
//LONGLONG m_lUserTmpScore[GAME_PLAYER];