From 522a9556ddeced51b74ad5762d2c16057bcff63d Mon Sep 17 00:00:00 2001 From: homeremote Date: Mon, 10 Feb 2020 19:35:13 +0800 Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=202:=E5=88=A0=E9=99=A4=E7=94=A8?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E7=9A=84=E7=BC=96=E8=AF=91=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 俱乐部/Debug_Unicode/create_dumpD.lib | Bin 0 -> 6246 bytes 俱乐部/Platform.sln | 8 +- .../CorrespondServer/CorrespondServer.vcxproj | 2 +- .../KernelEngine/KernelEngine.vcxproj | 87 ------------------ .../Release_Unicode/KernelEngine.res | Bin 0 -> 808 bytes .../LogonServer/LogonServer.vcxproj | 87 ------------------ .../ModuleManager/ModuleManager.vcxproj | 87 ------------------ .../Release_Unicode/ModuleManager.res | Bin 0 -> 7164 bytes .../ProcessControl/ProcessControl.vcxproj | 87 ------------------ .../Release_Unicode/ProcessControl.res | Bin 0 -> 816 bytes .../ServiceCore/ServiceCore.vcxproj | 87 ------------------ 游戏服务器/Debug_Unicode/GameServer.res | Bin 0 -> 800 bytes 游戏服务器/GameServer.vcxproj | 3 +- 游戏服务器/Poker/TableFrameSinkPoker.cpp | 2 +- 游戏服务器/TableFrameSink.cpp | 74 --------------- 游戏服务器/TableFrameSink.h | 13 --- 16 files changed, 8 insertions(+), 529 deletions(-) create mode 100644 俱乐部/Debug_Unicode/create_dumpD.lib create mode 100644 俱乐部/Source/ServerControl/KernelEngine/Release_Unicode/KernelEngine.res create mode 100644 俱乐部/Source/ServerControl/ModuleManager/Release_Unicode/ModuleManager.res create mode 100644 俱乐部/Source/SharedControl/ProcessControl/Release_Unicode/ProcessControl.res create mode 100644 游戏服务器/Debug_Unicode/GameServer.res diff --git a/俱乐部/Debug_Unicode/create_dumpD.lib b/俱乐部/Debug_Unicode/create_dumpD.lib new file mode 100644 index 0000000000000000000000000000000000000000..aed968f335bbe6f092c4fb23f40d64c90795bfb3 GIT binary patch literal 6246 zcmc&&&2Jk;6o0nUrZ^#SzBy3IMB(eu#5Qr#Rw%oU?NGOgC@6CH}-t2R)@^Y@QDYRlORUG@>1Z;=vg`%p zoRLxmrxD_ONidx##BCbb3lWrr@SF2y4XoQMqFhyyHOY+iOr5dHU6x|f6}~9u6TFNl zP@*%ulrOdtER;{Dqk}WKj{;L`fvJX(}NXZ|w_I_cmu? zQnhMDkn-sQdVIcW3M1Q4lSOXEx@UxqenExmb~wY#oBBm4wBchz%lKd$?qz|si`X5g z$8HY>@B0G)UW~Mth5_VBfCm!*+gNwU0j8$_ZXwgc2tWY)r$+(qAnp1XMtiI`k&eM1 zo&q;`U=W632nOJ3aDa0ktsjoU5$J>D)a#-t_rOoW&fY#C4FjR65IudY_cp z%!qX5*gVhLr=;$=eaZNNxwsz9z1}UiG1;BX7mMJYqba+dxgRuJ&_AzpZn;+-E_n3t z>Z3^qVBA)VV>T~r*LG%7S{GmiU*4x3y=B3(JS*mTg`dGJUn_Wcz_(a`(fclJS@7M~ z`S3=d6+B>|57(o7gvx^VwiDYaJX1*V>=*Mz81wYw2Qn!sLwG1%lSbFXoLsJ!FDu@c zk}rE#WASs^=e^HC?2>_G0$f{tBj@4~^=DhXm@Z1jkwS1fflAK; zsK^VHqRL5Db5Y7X;Xwk_d4dfJp+8R^dLgp|Ea^ScH~}wQn3HrHl-nC)r`8h)1`XEZ zgimk0^~Gl@N`e(kttYR3YCH_q^9rRB>-m^=^p;r9ld}pdyL=pxw7htB?0JEcCk?uD z!Mkr?{PG7}LECe4-L>(&AXOK!OyYUQV(`3qN+*2Z(~jQuUdLASI*qIM)-D&QSz?R? zAYQxbnE312-4m*ueQop6rU=mS&YG>hQ@QauS>1sVr(MQtfAvKg&<(P`u=M+%BosN- z)h#4bO)xr*4E|uCZryYTQs0Tcy@x1V1jXU!X|`oLWun<17v0~SMVb1DOx>n{wvjCw zassOD4?l|ha|)4>TbR{rM-z~aZQt*wzY-gs_fz)kyB873QG%prnX7%Qi_}C7p7N&W zgP%!=>_@%ff5L;Z;wBKC`iYsh4*nZ_NWAr!hT-6Z+dc|<6d5#eZ)4yO{85WJn5qeD zxx8&8em@P}4g2}~`0lS9B5~_TdiU?P32x{1?rXO9 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 0000000000000000000000000000000000000000..7e19584f9641cdd39baef72460509053e67e99d8 GIT binary patch literal 808 zcma)4u};EJ6g{mSaDeFS!r&l_sj-70M2!?9YFY(CqKg47wMi`mVekta{18`vz`+l3 zXLB*eNj&eChL$+^n)mwNednHg?!6BHik#DFJh{z`iJsiA5TnVR2_u()Cc4FK8%s$}HSL40)+6$9HECk z(d&XSu>%v9%q~};j68j-#N1(k4)G6E)8WaJ7%l3uIm^txhzi2u^i5*f z^ti{hXc$mSK+fn-jz{my`Ftw$6pM*mila@AAz9|WTi7Hfp4-G9V3l~4*GRAtwT3Ch zCo`)@YmF#hD&mphhL%wDTw;wJr$qYVt+F35Z&f`Xw`2ygd2g^nrA+?1S>*ZMy%_Iz zm;I_=YUrw*I2L{Gj7xPx=}T&)PH|=bqciT!8M*pYKW1%5sZ19&R`Be+wUXXgQrE2S nVs#g5Yg50**V$pjMDhFu@eT3qsi;FDB6ca{Kiy{|_hS44o6&fB literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..308b290ce9615e25c524b4280456ab9b8bf587da GIT binary patch literal 7164 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d3719a2e3289aea50dffc493e47fe9bc169446ed GIT binary patch literal 816 zcma)4%}N4M7(Fx0!WK%2$71M1R>N^gxZ9qPQo;bKZ~BAMGw-p7iiIg z^bEO(XqBDsn=Z~si|%m0xj*MS_k8DG0LZd0mr>_1(H6GZ-z3J;Jr_>OfEIRv!wy=w zVmw8YqblmCab9Jta4hY`dH)6^-_mIQN4g6*{CHHNHMn4rZ-xnm2;q}$hyZ;uhZtZ) z^qyi|9Kc0E`w1gZM4Gu}V(u_Tm-u_C>2lWBGuqVUu@_l=79|AdU#)ceQ1?7!m}}1R zm@&nTY8X??keuP491s1^+Q(yNAS^CYF^CS+OV=CMyq)bqqwutmJoHB)RztwBt2 zgZU$>5G_-!OOUb_kfp~MsHRJ7ljn>$Um3)KF>4nGecUn!NY=hfwp_vk+s$(RR==1Z zUvKzjKi9OyQmPS+^Lf3-$;6rp>Vv$|QV;&q)RJk?&?=8g*LZ!&k? l<#mre)?o3Kc3FW@y?RN&4&R`hIw2yY%K`uK`*u>#&JScfdXNAB literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ba43dc304ee94273b750c7b50458594d0628298f GIT binary patch literal 800 zcmah{!AiqG5PeC5RJ7_*JbCb7K_t*pq?9VQDg|k@4FyjUwT*?CmNpgq0uO$O{)7iV zMCc!Q5%FYwJ85VliW_D#yF2gAo7n|`b=qVS8r{Sg>(TiNV>CH4VWgv=v7V>fLKEkl z573}jgM~WRHO`0h)p$1Ez5oq#{8C&;|6Tfu)u1s|VwAa|kuSgiUHEXx)`f>QnSFH7 zWAvKDnAm}dJS_)@K4^=?Rv2@GKKFdwQH{e@TXNXcRizbKeF@&_XES4$d9sfTaZ#Qs zqldVZ{C(=^lF$DIf8YM7zdtN>6a!GeLX4wDjsaO_*aEhgHJnZHbAl^lnK)HjAQ+!| zy_o8wss5&%-pag+&x3Nn6G51|Ts_Of!TXoOHHCcgp-J9%BHc`KBzFKFay^DFb z;$|DV33fthvZfsB7L=x_KWY_r^gnIkeVmY|N5v!dG>BD})K$V`{lyONqbR*h;(m7Y kuYOipuf|vDFl(fE_Huv?d382V)%zH-E+=uvM*1oB4Z8Gp*Z=?k literal 0 HcmV?d00001 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];