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 ws_index_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 ws_daily_task_request.proto

protocol/msg_mys.json

@@ -2,7 +2,7 @@
     "package": "vip.metadev.module.battle.protobuf",
     "syntax": "proto2",
     "options": {
-        "java_outer_classname": "IndexDataRequestProto",
+        "java_outer_classname": "DailyTaskRequestProto",
         "java_multiple_files": false
     },
     "messages": [
@@ -692,6 +692,150 @@
                     "id": 3
                 }
             ]
+        },
+        {
+            "name": "DailyTaskRequest",
+            "syntax": "proto2",
+            "fields": [
+                {
+                    "rule": "optional",
+                    "type": "WsMessageType",
+                    "name": "message_id",
+                    "id": 1,
+                    "options": {
+                        "default": "DAILY_TASK_INDEX"
+                    }
+                },
+                {
+                    "rule": "repeated",
+                    "type": "CommonRequest",
+                    "name": "envelope",
+                    "id": 2
+                }
+            ]
+        },
+        {
+            "name": "DailyTaskResponse",
+            "syntax": "proto2",
+            "fields": [
+                {
+                    "rule": "optional",
+                    "type": "StoryTicketTask",
+                    "name": "story_ticket_task",
+                    "id": 1
+                },
+                {
+                    "rule": "optional",
+                    "type": "VipTask",
+                    "name": "vip_task",
+                    "id": 2
+                },
+                {
+                    "rule": "optional",
+                    "type": "RechargeTask",
+                    "name": "recharge_task",
+                    "id": 3
+                }
+            ]
+        },
+        {
+            "name": "StoryTicketTask",
+            "syntax": "proto2",
+            "fields": [
+                {
+                    "rule": "repeated",
+                    "type": "int64",
+                    "name": "task_ids",
+                    "id": 1
+                },
+                {
+                    "rule": "optional",
+                    "type": "int64",
+                    "name": "current_coin_cost",
+                    "id": 2
+                }
+            ]
+        },
+        {
+            "name": "VipTask",
+            "syntax": "proto2",
+            "fields": [
+                {
+                    "rule": "repeated",
+                    "type": "int64",
+                    "name": "task_ids",
+                    "id": 1
+                },
+                {
+                    "rule": "optional",
+                    "type": "int64",
+                    "name": "award_magic_stone",
+                    "id": 2
+                }
+            ]
+        },
+        {
+            "name": "RechargeTask",
+            "syntax": "proto2",
+            "fields": [
+                {
+                    "rule": "repeated",
+                    "type": "int64",
+                    "name": "task_ids",
+                    "id": 1
+                },
+                {
+                    "rule": "optional",
+                    "type": "int64",
+                    "name": "recharge_amount",
+                    "id": 2
+                }
+            ]
+        },
+        {
+            "name": "ClaimAwardRequest",
+            "syntax": "proto2",
+            "fields": [
+                {
+                    "rule": "optional",
+                    "type": "WsMessageType",
+                    "name": "message_id",
+                    "id": 1,
+                    "options": {
+                        "default": "CLAIM_AWARD"
+                    }
+                },
+                {
+                    "rule": "repeated",
+                    "type": "ClaimAwardDto",
+                    "name": "task_list",
+                    "id": 2
+                },
+                {
+                    "rule": "repeated",
+                    "type": "CommonRequest",
+                    "name": "envelope",
+                    "id": 3
+                }
+            ]
+        },
+        {
+            "name": "ClaimAwardDto",
+            "syntax": "proto2",
+            "fields": [
+                {
+                    "rule": "optional",
+                    "type": "int32",
+                    "name": "task_id",
+                    "id": 1
+                },
+                {
+                    "rule": "optional",
+                    "type": "int32",
+                    "name": "task_type",
+                    "id": 2
+                }
+            ]
         }
     ],
     "enums": [