Merge branch 'develop' of http://8.134.253.64:3000/huangjinghao/FishConfig into develop

protocol/A_new_buildjson.bat

@@ -1 +1 @@
-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
+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 ws_index_request.proto

protocol/msg_mys.json

@@ -2,7 +2,7 @@
     "package": "vip.metadev.module.battle.protobuf",
     "syntax": "proto2",
     "options": {
-        "java_outer_classname": "UpgradeMagicRequestProto",
+        "java_outer_classname": "IndexDataRequestProto",
         "java_multiple_files": false
     },
     "messages": [
@@ -121,11 +121,20 @@
                         "default": false
                     }
                 },
+                {
+                    "rule": "optional",
+                    "type": "int32",
+                    "name": "fish_group_id",
+                    "id": 5,
+                    "options": {
+                        "default": 1
+                    }
+                },
                 {
                     "rule": "optional",
                     "type": "bool",
                     "name": "is_violent",
-                    "id": 5,
+                    "id": 6,
                     "options": {
                         "default": false
                     }
@@ -133,17 +142,17 @@
                 {
                     "rule": "optional",
                     "type": "int32",
-                    "name": "scene_type",
-                    "id": 6,
+                    "name": "map_id",
+                    "id": 7,
                     "options": {
-                        "default": 1
+                        "default": 1001
                     }
                 },
                 {
                     "rule": "repeated",
                     "type": "CommonRequest",
                     "name": "envelope",
-                    "id": 7
+                    "id": 8
                 }
             ]
         },
@@ -174,30 +183,6 @@
                 }
             ]
         },
-        {
-            "name": "BattleRealTimeRequest",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "optional",
-                    "type": "WsMessageType",
-                    "name": "message_id",
-                    "id": 1,
-                    "options": {
-                        "default": "BATTLE_REAL_TIME_UPDATE"
-                    }
-                },
-                {
-                    "rule": "optional",
-                    "type": "int32",
-                    "name": "magic_array_id",
-                    "id": 2,
-                    "options": {
-                        "default": 1
-                    }
-                }
-            ]
-        },
         {
             "name": "BattleResponse",
             "syntax": "proto2",
@@ -440,6 +425,27 @@
                     "id": 3
                 }
             ]
+        },
+        {
+            "name": "IndexDataRequest",
+            "syntax": "proto2",
+            "fields": [
+                {
+                    "rule": "optional",
+                    "type": "WsMessageType",
+                    "name": "message_id",
+                    "id": 1,
+                    "options": {
+                        "default": "INDEX_DATA"
+                    }
+                },
+                {
+                    "rule": "repeated",
+                    "type": "CommonRequest",
+                    "name": "envelope",
+                    "id": 2
+                }
+            ]
         }
     ],
     "enums": [
@@ -488,7 +494,7 @@
                     "id": 2003
                 },
                 {
-                    "name": "BATTLE_REAL_TIME_UPDATE",
+                    "name": "INDEX_DATA",
                     "id": 2004
                 },
                 {