Gogs vor 2 Tagen
Ursprung
Commit
c99681d61b
1 geänderte Dateien mit 12 neuen und 13 gelöschten Zeilen
  1. 12 13
      bin/client_msg/msg.ts

+ 12 - 13
bin/client_msg/msg.ts

@@ -11,17 +11,16 @@ export enum MsgID {
     ReqHeartBeat = 8,
     SendColorSz = 9,
     SendRoleMove = 10,
-    NotifyPlayerSzNumber = 11,
-    NotifyPlayerMove = 12,
-    NotifyPlayerOpt = 13,
-    NotifyPlayerStatus = 14,
-    NotifySettlement = 15,
-    MatchLudo = 16,
-    ResMatchLudo = 17,
-    NotifyUpdateRoomInfo = 18,
-    BeKickLogin = 19,
-<<<<<<< HEAD
-=======
-    UpdateUserInfo = 20,
->>>>>>> 2ecde32175e8ba468084ddfc07a1ec19028ff79f
+    SendQuitRoom = 11,
+    NotifyPlayerSzNumber = 12,
+    NotifyPlayerMove = 13,
+    NotifyPlayerOpt = 14,
+    NotifyPlayerStatus = 15,
+    NotifySettlement = 16,
+    MatchLudo = 17,
+    ResMatchLudo = 18,
+    NotifyUpdateRoomInfo = 19,
+    BeKickLogin = 20,
+    UpdateUserInfo = 21,
+    ReqShop = 22,
 }