更新

protocol/A_new_buildjson.bat

@@ -1 +1 @@
-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
+pbjs -t json -w commonjs -o msg_mys.json ws_battle_progress_request.proto ws_choose_magic_request.proto ws_common_request.proto ws_common_response.proto ws_enter_game_request.proto ws_game_mode.proto ws_mail_request.proto ws_message_types.proto ws_protocol.proto ws_upgrade_magic_request.proto

protocol/msg_mys.json

@@ -2,7 +2,7 @@
     "package": "vip.metadev.module.battle.protobuf",
     "syntax": "proto2",
     "options": {
-        "java_outer_classname": "WebSocketResponseProto",
+        "java_outer_classname": "UpgradeMagicRequestProto",
         "java_multiple_files": false
     },
     "messages": [
@@ -43,22 +43,142 @@
             ]
         },
         {
-            "name": "EnterGameRequest",
+            "name": "CommonResponse",
             "syntax": "proto2",
             "fields": [
                 {
                     "rule": "optional",
                     "type": "WsMessageType",
                     "name": "message_type",
+                    "id": 1
+                },
+                {
+                    "rule": "optional",
+                    "type": "string",
+                    "name": "session_id",
+                    "id": 2
+                },
+                {
+                    "rule": "optional",
+                    "type": "string",
+                    "name": "code",
+                    "id": 3
+                },
+                {
+                    "rule": "optional",
+                    "type": "string",
+                    "name": "msg",
+                    "id": 4
+                },
+                {
+                    "rule": "optional",
+                    "type": "string",
+                    "name": "data",
+                    "id": 5
+                }
+            ]
+        },
+        {
+            "name": "BattleProgressRequest",
+            "syntax": "proto2",
+            "fields": [
+                {
+                    "rule": "optional",
+                    "type": "WsMessageType",
+                    "name": "message_id",
+                    "id": 1,
+                    "options": {
+                        "default": "BATTLE_PROGRESS_UPDATE"
+                    }
+                },
+                {
+                    "rule": "optional",
+                    "type": "int32",
+                    "name": "gold_added",
+                    "id": 2,
+                    "options": {
+                        "default": 0
+                    }
+                },
+                {
+                    "rule": "optional",
+                    "type": "int32",
+                    "name": "gold_consumed",
+                    "id": 3,
+                    "options": {
+                        "default": 0
+                    }
+                },
+                {
+                    "rule": "repeated",
+                    "type": "int64",
+                    "name": "monster_ids",
+                    "id": 4
+                },
+                {
+                    "rule": "repeated",
+                    "type": "int64",
+                    "name": "reward_monster_ids",
+                    "id": 5
+                },
+                {
+                    "rule": "optional",
+                    "type": "int32",
+                    "name": "current_gold_balance",
+                    "id": 6,
+                    "options": {
+                        "default": 0
+                    }
+                },
+                {
+                    "rule": "optional",
+                    "type": "bool",
+                    "name": "battle_over",
+                    "id": 7,
+                    "options": {
+                        "default": false
+                    }
+                },
+                {
+                    "rule": "repeated",
+                    "type": "CommonRequest",
+                    "name": "envelope",
+                    "id": 8
+                }
+            ]
+        },
+        {
+            "name": "BattleProgressResponse",
+            "syntax": "proto2",
+            "fields": [
+                {
+                    "rule": "optional",
+                    "type": "int32",
+                    "name": "current_gold_balance",
                     "id": 1,
                     "options": {
-                        "default": "GAME_JOIN"
+                        "default": 0
+                    }
+                }
+            ]
+        },
+        {
+            "name": "ChooseMagicRequest",
+            "syntax": "proto2",
+            "fields": [
+                {
+                    "rule": "optional",
+                    "type": "WsMessageType",
+                    "name": "message_id",
+                    "id": 1,
+                    "options": {
+                        "default": "CHOOSE_MAGIC_ARRAY"
                     }
                 },
                 {
                     "rule": "required",
-                    "type": "GameMode",
-                    "name": "game_mode",
+                    "type": "int64",
+                    "name": "magic_array_id",
                     "id": 2
                 },
                 {
@@ -70,71 +190,208 @@
             ]
         },
         {
-            "name": "WebSocketResponse",
+            "name": "EnterGameRequest",
             "syntax": "proto2",
             "fields": [
                 {
                     "rule": "optional",
                     "type": "WsMessageType",
-                    "name": "message_type",
-                    "id": 1
+                    "name": "message_id",
+                    "id": 1,
+                    "options": {
+                        "default": "ENTER_GAME"
+                    }
                 },
                 {
-                    "rule": "optional",
+                    "rule": "required",
                     "type": "string",
-                    "name": "session_id",
+                    "name": "game_mode",
                     "id": 2
                 },
+                {
+                    "rule": "repeated",
+                    "type": "CommonRequest",
+                    "name": "envelope",
+                    "id": 3
+                }
+            ]
+        },
+        {
+            "name": "MailListRequestMessage",
+            "syntax": "proto2",
+            "fields": [
                 {
                     "rule": "optional",
-                    "type": "string",
+                    "type": "WsMessageType",
+                    "name": "message_id",
+                    "id": 1,
+                    "options": {
+                        "default": "MAIL_LIST_REQUEST"
+                    }
+                },
+                {
+                    "rule": "required",
+                    "type": "int32",
                     "name": "status",
+                    "id": 2
+                },
+                {
+                    "rule": "required",
+                    "type": "int32",
+                    "name": "pageNum",
                     "id": 3
                 },
                 {
-                    "rule": "optional",
-                    "type": "string",
-                    "name": "error_code",
+                    "rule": "required",
+                    "type": "int32",
+                    "name": "pageSize",
                     "id": 4
                 },
+                {
+                    "rule": "repeated",
+                    "type": "CommonRequest",
+                    "name": "envelope",
+                    "id": 10
+                }
+            ]
+        },
+        {
+            "name": "MailDetailRequestMessage",
+            "syntax": "proto2",
+            "fields": [
                 {
                     "rule": "optional",
-                    "type": "string",
-                    "name": "error_message",
-                    "id": 5
+                    "type": "WsMessageType",
+                    "name": "message_id",
+                    "id": 1,
+                    "options": {
+                        "default": "MAIL_DETAIL_REQUEST"
+                    }
                 },
+                {
+                    "rule": "required",
+                    "type": "int32",
+                    "name": "mailId",
+                    "id": 2
+                },
+                {
+                    "rule": "repeated",
+                    "type": "CommonRequest",
+                    "name": "envelope",
+                    "id": 10
+                }
+            ]
+        },
+        {
+            "name": "MailClaimRequestMessage",
+            "syntax": "proto2",
+            "fields": [
                 {
                     "rule": "optional",
-                    "type": "bytes",
-                    "name": "data",
-                    "id": 6
+                    "type": "WsMessageType",
+                    "name": "message_id",
+                    "id": 1,
+                    "options": {
+                        "default": "MAIL_CLAIM_REQUEST"
+                    }
+                },
+                {
+                    "rule": "required",
+                    "type": "int64",
+                    "name": "mailIds",
+                    "id": 2
+                },
+                {
+                    "rule": "repeated",
+                    "type": "CommonRequest",
+                    "name": "envelope",
+                    "id": 10
                 }
             ]
-        }
-    ],
-    "enums": [
+        },
         {
-            "name": "GameMode",
+            "name": "MailReadRequestMessage",
             "syntax": "proto2",
-            "values": [
+            "fields": [
                 {
-                    "name": "STORY_MODE",
-                    "id": 1
+                    "rule": "optional",
+                    "type": "WsMessageType",
+                    "name": "message_id",
+                    "id": 1,
+                    "options": {
+                        "default": "MAIL_READ_REQUEST"
+                    }
                 },
                 {
-                    "name": "ENDLESS_NOVICE",
+                    "rule": "required",
+                    "type": "int64",
+                    "name": "mailIds",
                     "id": 2
                 },
                 {
-                    "name": "ENDLESS_INTERMEDIATE",
-                    "id": 3
+                    "rule": "repeated",
+                    "type": "CommonRequest",
+                    "name": "envelope",
+                    "id": 10
+                }
+            ]
+        },
+        {
+            "name": "MailDeleteRequestMessage",
+            "syntax": "proto2",
+            "fields": [
+                {
+                    "rule": "optional",
+                    "type": "WsMessageType",
+                    "name": "message_id",
+                    "id": 1,
+                    "options": {
+                        "default": "MAIL_DELETE_REQUEST"
+                    }
                 },
                 {
-                    "name": "ENDLESS_ADVANCED",
-                    "id": 4
+                    "rule": "required",
+                    "type": "int64",
+                    "name": "mailIds",
+                    "id": 2
+                },
+                {
+                    "rule": "repeated",
+                    "type": "CommonRequest",
+                    "name": "envelope",
+                    "id": 10
                 }
             ]
         },
+        {
+            "name": "UpgradeMagicRequest",
+            "syntax": "proto2",
+            "fields": [
+                {
+                    "rule": "optional",
+                    "type": "WsMessageType",
+                    "name": "message_id",
+                    "id": 1,
+                    "options": {
+                        "default": "UPGRADE_MAGIC_ARRAY"
+                    }
+                },
+                {
+                    "rule": "required",
+                    "type": "int64",
+                    "name": "magic_array_id",
+                    "id": 2
+                },
+                {
+                    "rule": "repeated",
+                    "type": "CommonRequest",
+                    "name": "envelope",
+                    "id": 3
+                }
+            ]
+        }
+    ],
+    "enums": [
         {
             "name": "WsMessageType",
             "syntax": "proto2",
@@ -164,8 +421,74 @@
                     "id": 1004
                 },
                 {
-                    "name": "GAME_JOIN",
+                    "name": "ENTER_GAME",
                     "id": 2000
+                },
+                {
+                    "name": "BATTLE_PROGRESS_UPDATE",
+                    "id": 2001
+                },
+                {
+                    "name": "CHOOSE_MAGIC_ARRAY",
+                    "id": 2002
+                },
+                {
+                    "name": "UPGRADE_MAGIC_ARRAY",
+                    "id": 2003
+                },
+                {
+                    "name": "MAIL_NOTIFICATION",
+                    "id": 3000
+                },
+                {
+                    "name": "MAIL_LIST_REQUEST",
+                    "id": 3001
+                },
+                {
+                    "name": "MAIL_DETAIL_REQUEST",
+                    "id": 3002
+                },
+                {
+                    "name": "MAIL_CLAIM_REQUEST",
+                    "id": 3003
+                },
+                {
+                    "name": "MAIL_READ_REQUEST",
+                    "id": 3004
+                },
+                {
+                    "name": "MAIL_DELETE_REQUEST",
+                    "id": 3005
+                },
+                {
+                    "name": "MAIL_UNREAD_COUNT",
+                    "id": 3006
+                },
+                {
+                    "name": "MAIL_STATUS_UPDATE",
+                    "id": 3007
+                }
+            ]
+        },
+        {
+            "name": "GameMode",
+            "syntax": "proto2",
+            "values": [
+                {
+                    "name": "STORY_MODE",
+                    "id": 1
+                },
+                {
+                    "name": "ENDLESS_NOVICE",
+                    "id": 2
+                },
+                {
+                    "name": "ENDLESS_INTERMEDIATE",
+                    "id": 3
+                },
+                {
+                    "name": "ENDLESS_ADVANCED",
+                    "id": 4
                 }
             ]
         }