huangjinghao 1 mesiac pred
rodič
commit
75f1e6150d
2 zmenil súbory, kde vykonal 57 pridanie a 488 odobranie
  1. 1 1
      protocol/A_new_buildjson.bat
  2. 56 487
      protocol/msg_mys.json

+ 1 - 1
protocol/A_new_buildjson.bat

@@ -1 +1 @@
-pbjs -t json -w commonjs -o msg_mys.json ws_protocol.proto
+pbjs -t json -w commonjs -o msg_mys.json ws_common_request.proto ws_enter_game_request.proto ws_game_mode.proto ws_message_types.proto ws_protocol.proto ws_response.proto

+ 56 - 487
protocol/msg_mys.json

@@ -2,601 +2,170 @@
     "package": "vip.metadev.module.battle.protobuf",
     "syntax": "proto2",
     "options": {
-        "java_outer_classname": "WsProtocol",
+        "java_outer_classname": "WebSocketResponseProto",
         "java_multiple_files": false
     },
     "messages": [
         {
-            "name": "WsEnvelope",
+            "name": "CommonRequest",
             "syntax": "proto2",
             "fields": [
                 {
                     "rule": "required",
                     "type": "string",
-                    "name": "type",
+                    "name": "session_id",
                     "id": 1
                 },
                 {
-                    "rule": "required",
+                    "rule": "optional",
                     "type": "string",
-                    "name": "message_id",
+                    "name": "token",
                     "id": 2
                 },
                 {
-                    "rule": "required",
+                    "rule": "optional",
                     "type": "string",
-                    "name": "session_id",
+                    "name": "client_version",
                     "id": 3
                 },
                 {
                     "rule": "optional",
                     "type": "string",
-                    "name": "player_id",
+                    "name": "device_info",
                     "id": 4
                 },
                 {
                     "rule": "optional",
                     "type": "string",
-                    "name": "scene_id",
+                    "name": "data",
                     "id": 5
-                },
-                {
-                    "rule": "required",
-                    "type": "bytes",
-                    "name": "payload",
-                    "id": 6
-                },
-                {
-                    "rule": "optional",
-                    "type": "string",
-                    "name": "client_version",
-                    "id": 7
-                },
-                {
-                    "rule": "optional",
-                    "type": "string",
-                    "name": "device_info",
-                    "id": 8
                 }
             ]
         },
         {
-            "name": "WsError",
+            "name": "EnterGameRequest",
             "syntax": "proto2",
             "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "error_code",
-                    "id": 1
-                },
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "error_message",
-                    "id": 2
-                }
-            ]
-        },
-        {
-            "name": "WsHeartbeat",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "heartbeat_id",
-                    "id": 1
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "client_timestamp",
-                    "id": 2
-                },
                 {
                     "rule": "optional",
-                    "type": "int64",
-                    "name": "server_timestamp",
-                    "id": 3
-                }
-            ]
-        },
-        {
-            "name": "WsConnectionAck",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "status",
-                    "id": 1
-                },
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "message",
-                    "id": 2
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "server_timestamp",
-                    "id": 3
-                }
-            ]
-        },
-        {
-            "name": "WsAuthentication",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "token",
-                    "id": 1
-                },
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "player_id",
-                    "id": 2
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "auth_timestamp",
-                    "id": 3
-                }
-            ]
-        },
-        {
-            "name": "WsAuthenticationResponse",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "result",
-                    "id": 1
+                    "type": "WsMessageType",
+                    "name": "message_type",
+                    "id": 1,
+                    "options": {
+                        "default": "GAME_JOIN"
+                    }
                 },
                 {
                     "rule": "required",
-                    "type": "string",
-                    "name": "message",
+                    "type": "GameMode",
+                    "name": "game_mode",
                     "id": 2
                 },
                 {
-                    "rule": "optional",
-                    "type": "PlayerInfo",
-                    "name": "player_info",
+                    "rule": "repeated",
+                    "type": "CommonRequest",
+                    "name": "envelope",
                     "id": 3
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "auth_timestamp",
-                    "id": 4
                 }
             ]
         },
         {
-            "name": "PlayerInfo",
+            "name": "WebSocketResponse",
             "syntax": "proto2",
             "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "player_id",
-                    "id": 1
-                },
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "nickname",
-                    "id": 2
-                },
-                {
-                    "rule": "required",
-                    "type": "int32",
-                    "name": "level",
-                    "id": 3
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "experience",
-                    "id": 4
-                },
-                {
-                    "rule": "required",
-                    "type": "int32",
-                    "name": "vip_level",
-                    "id": 5
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "gold",
-                    "id": 6
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "diamond",
-                    "id": 7
-                },
                 {
                     "rule": "optional",
-                    "type": "string",
-                    "name": "avatar_url",
-                    "id": 8
-                },
-                {
-                    "rule": "required",
-                    "type": "bool",
-                    "name": "online",
-                    "id": 9
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "last_login_time",
-                    "id": 10
-                }
-            ]
-        },
-        {
-            "name": "WsGameStateUpdate",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "game_id",
-                    "id": 1
-                },
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "game_state",
-                    "id": 2
-                },
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "game_mode",
-                    "id": 3
-                },
-                {
-                    "rule": "required",
-                    "type": "int32",
-                    "name": "current_round",
-                    "id": 4
-                },
-                {
-                    "rule": "required",
-                    "type": "int32",
-                    "name": "total_rounds",
-                    "id": 5
-                },
-                {
-                    "rule": "required",
-                    "type": "int32",
-                    "name": "game_time",
-                    "id": 6
-                }
-            ]
-        },
-        {
-            "name": "WsBattleAction",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "action_type",
+                    "type": "WsMessageType",
+                    "name": "message_type",
                     "id": 1
                 },
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "action_id",
-                    "id": 2
-                },
                 {
                     "rule": "optional",
                     "type": "string",
-                    "name": "target_id",
-                    "id": 3
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "action_timestamp",
-                    "id": 4
-                }
-            ]
-        },
-        {
-            "name": "WsBattleResult",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "battle_id",
-                    "id": 1
-                },
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "result",
+                    "name": "session_id",
                     "id": 2
                 },
                 {
                     "rule": "optional",
                     "type": "string",
-                    "name": "winner_id",
-                    "id": 3
-                },
-                {
-                    "rule": "repeated",
-                    "type": "BattleReward",
-                    "name": "rewards",
-                    "id": 4
-                },
-                {
-                    "rule": "optional",
-                    "type": "BattleStats",
-                    "name": "battle_stats",
-                    "id": 5
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "battle_timestamp",
-                    "id": 6
-                }
-            ]
-        },
-        {
-            "name": "BattleReward",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "reward_type",
-                    "id": 1
-                },
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "reward_id",
-                    "id": 2
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "reward_amount",
+                    "name": "status",
                     "id": 3
                 },
                 {
                     "rule": "optional",
                     "type": "string",
-                    "name": "reward_description",
-                    "id": 4
-                }
-            ]
-        },
-        {
-            "name": "BattleStats",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "total_damage",
-                    "id": 1
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "damage_taken",
-                    "id": 2
-                },
-                {
-                    "rule": "required",
-                    "type": "int32",
-                    "name": "skills_used",
-                    "id": 3
-                },
-                {
-                    "rule": "required",
-                    "type": "int32",
-                    "name": "items_used",
+                    "name": "error_code",
                     "id": 4
                 },
-                {
-                    "rule": "required",
-                    "type": "int32",
-                    "name": "battle_duration",
-                    "id": 5
-                }
-            ]
-        },
-        {
-            "name": "WsItemUse",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "item_id",
-                    "id": 1
-                },
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "item_type",
-                    "id": 2
-                },
-                {
-                    "rule": "required",
-                    "type": "int32",
-                    "name": "use_amount",
-                    "id": 3
-                },
                 {
                     "rule": "optional",
                     "type": "string",
-                    "name": "target_id",
-                    "id": 4
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "use_timestamp",
+                    "name": "error_message",
                     "id": 5
-                }
-            ]
-        },
-        {
-            "name": "WsSkillUse",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "skill_id",
-                    "id": 1
-                },
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "skill_name",
-                    "id": 2
-                },
-                {
-                    "rule": "required",
-                    "type": "int32",
-                    "name": "skill_level",
-                    "id": 3
                 },
                 {
                     "rule": "optional",
-                    "type": "string",
-                    "name": "target_id",
-                    "id": 4
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "use_timestamp",
-                    "id": 5
+                    "type": "bytes",
+                    "name": "data",
+                    "id": 6
                 }
             ]
-        },
+        }
+    ],
+    "enums": [
         {
-            "name": "WsSystemNotification",
+            "name": "GameMode",
             "syntax": "proto2",
-            "fields": [
+            "values": [
                 {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "notification_type",
+                    "name": "STORY_MODE",
                     "id": 1
                 },
                 {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "title",
+                    "name": "ENDLESS_NOVICE",
                     "id": 2
                 },
                 {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "content",
+                    "name": "ENDLESS_INTERMEDIATE",
                     "id": 3
                 },
                 {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "priority",
+                    "name": "ENDLESS_ADVANCED",
                     "id": 4
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "notification_timestamp",
-                    "id": 5
                 }
             ]
         },
         {
-            "name": "WsPlayerStateUpdate",
+            "name": "WsMessageType",
             "syntax": "proto2",
-            "fields": [
+            "values": [
                 {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "player_id",
-                    "id": 1
+                    "name": "UNKNOWN",
+                    "id": 0
                 },
                 {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "state_type",
-                    "id": 2
-                },
-                {
-                    "rule": "optional",
-                    "type": "string",
-                    "name": "state_description",
-                    "id": 3
+                    "name": "CONNECTION_ACK",
+                    "id": 1000
                 },
                 {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "state_timestamp",
-                    "id": 4
-                }
-            ]
-        },
-        {
-            "name": "WsSceneChange",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "scene_id",
-                    "id": 1
+                    "name": "HEARTBEAT",
+                    "id": 1001
                 },
                 {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "scene_name",
-                    "id": 2
+                    "name": "AUTHENTICATION",
+                    "id": 1002
                 },
                 {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "scene_type",
-                    "id": 3
+                    "name": "AUTHENTICATION_RESPONSE",
+                    "id": 1003
                 },
                 {
-                    "rule": "optional",
-                    "type": "string",
-                    "name": "change_reason",
-                    "id": 4
+                    "name": "ERROR",
+                    "id": 1004
                 },
                 {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "change_timestamp",
-                    "id": 5
+                    "name": "GAME_JOIN",
+                    "id": 2000
                 }
             ]
         }