merged master

This commit is contained in:
2020-08-20 10:43:37 -05:00
parent 42597c2a7a
commit d6e1f57c23
8 changed files with 3283 additions and 2 deletions

View File

@@ -10,6 +10,7 @@ enum SHARDPACKETID {
P_CL2FE_REQ_PC_ENTER = 318767105,
P_CL2FE_REQ_PC_LOADING_COMPLETE = 318767245,
P_CL2FE_REP_LIVE_CHECK = 318767221,
P_CL2FE_REQ_NANO_ACTIVE = 318767119,
P_CL2FE_REQ_PC_MOVE = 318767107,
P_CL2FE_REQ_PC_STOP = 318767108,
P_CL2FE_REQ_PC_JUMP = 318767109,
@@ -21,6 +22,7 @@ enum SHARDPACKETID {
P_CL2FE_REQ_PC_EXIT = 318767106,
// shard 2 client
P_FE2CL_REP_NANO_ACTIVE_SUCC = 822083624,
P_FE2CL_REP_PC_ENTER_SUCC = 822083586,
P_FE2CL_REP_PC_LOADING_COMPLETE_SUCC = 822083833,
P_FE2CL_REQ_LIVE_CHECK = 822083792,