OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2025-10-02 12:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update CNShardServer.hpp

Browse Source
This commit is contained in:
Onii-chan
2020-08-22 13:44:06 +02:00
parent 0701871a0a
commit 292b677535
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/CNShardServer.hpp
View File

@@ -11,12 +11,9 @@ enum SHARDPACKETID {
P_CL2FE_REQ_PC_LOADING_COMPLETE = 318767245,
P_CL2FE_REP_LIVE_CHECK = 318767221,
P_CL2FE_REQ_NANO_ACTIVE = 318767119,
<<<<<<< Updated upstream
=======
P_CL2FE_REQ_NANO_EQUIP = 318767117,
P_CL2FE_REQ_NANO_SKILL_USE = 318767121,
P_CL2FE_REQ_NANO_TUNE = 318767120,
>>>>>>> Stashed changes
P_CL2FE_REQ_PC_MOVE = 318767107,
P_CL2FE_REQ_PC_STOP = 318767108,
P_CL2FE_REQ_PC_JUMP = 318767109,
@@ -36,14 +33,11 @@ enum SHARDPACKETID {
// shard 2 client
P_FE2CL_REP_NANO_ACTIVE_SUCC = 822083624,
<<<<<<< Updated upstream
=======
P_FE2CL_REP_PC_NANO_CREATE_SUCC = 822083667,
P_FE2CL_REP_NANO_EQUIP_SUCC = 822083622,
P_FE2CL_NANO_SKILL_USE_SUCC = 822083627,
P_FE2CL_NANO_SKILL_USE = 822083628,
P_FE2CL_REP_NANO_TUNE_SUCC = 822083625,
>>>>>>> Stashed changes
P_FE2CL_REP_PC_ENTER_SUCC = 822083586,
P_FE2CL_REP_PC_LOADING_COMPLETE_SUCC = 822083833,
P_FE2CL_REP_PC_GOTO_SUCC = 822083633,