From 8b2bfca06d77836fc1f0643da1b15a3b1955e6bd Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 17 Feb 2023 10:04:14 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=B6=88=E8=80=97=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_newsmithy.json | 2181 ++++++++++++++--- bin/json/game_smithycustomer.json | 14 +- bin/json/game_smithyproficiency.json | 326 +-- bin/json/game_smithytool.json | 2 +- modules/smithy/api_forgeequip.go | 8 +- sys/configure/structs/Game.NewSmithyData.go | 56 +- .../structs/Game.SmithyProficiencyData.go | 4 +- 7 files changed, 2004 insertions(+), 587 deletions(-) diff --git a/bin/json/game_newsmithy.json b/bin/json/game_newsmithy.json index 3f0e34c4b..2a2394147 100644 --- a/bin/json/game_newsmithy.json +++ b/bin/json/game_newsmithy.json @@ -3,7 +3,16 @@ "id": 1, "item_id": 0, "type": 1, - "consume": [ + "drawing_name": { + "key": "1", + "text": "1阶攻击图纸" + }, + "quality_text": { + "key": "1", + "text": "普通-史诗" + }, + "basic_drop": 10001, + "basic_cos": [ { "a": "item", "t": "10001", @@ -20,899 +29,2471 @@ "n": 3 } ], - "temperature": 50, - "quality": { + "temperature_cos": 50, + "refine_cos": { "a": "item", "t": "20201", "n": 2 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 3 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 4 + }, + "customized_lv": [ + 10, + 15 + ], + "customized_lv_distribution": [ + 50, + 50 + ] }, { "id": 2, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "2", + "text": "2阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 3 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 4 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 5 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 3, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "3", + "text": "3阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 4 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 5 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 6 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 4, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "4", + "text": "4阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 5 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 6 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 7 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 5, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "5", + "text": "5阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 6 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 7 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 8 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 6, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "6", + "text": "6阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 7 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 8 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 9 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 7, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "7", + "text": "7阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 8 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 9 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 10 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 8, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "8", + "text": "8阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 9 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 10 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 11 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 9, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "9", + "text": "9阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 10 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 11 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 12 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 10, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "10", + "text": "10阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 11 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 12 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 13 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 11, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "11", + "text": "11阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 12 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 13 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 14 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 12, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "12", + "text": "12阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 13 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 14 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 15 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 13, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "13", + "text": "13阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 14 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 15 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 16 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 14, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "14", + "text": "14阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 15 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 16 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 17 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 15, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "15", + "text": "15阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 16 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 17 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 18 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 16, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "16", + "text": "16阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 17 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 18 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 19 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 17, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "17", + "text": "17阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 18 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 19 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 20 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 18, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "18", + "text": "18阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 19 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 20 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 21 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 19, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "19", + "text": "19阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 20 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 21 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 22 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 20, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "20", + "text": "20阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 21 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 22 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 23 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 21, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "21", + "text": "21阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 22 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 23 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 24 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 22, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "22", + "text": "22阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 23 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 24 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 25 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 23, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "23", + "text": "23阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 24 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 25 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 26 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 24, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "24", + "text": "24阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 25 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 26 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 27 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 25, "item_id": 0, "type": 1, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "25", + "text": "25阶攻击图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 26 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 27 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 28 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 26, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "26", + "text": "1阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 27 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 28 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 29 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 27, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "27", + "text": "2阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 28 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 29 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 30 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 28, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "28", + "text": "3阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 29 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 30 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 31 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 29, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "29", + "text": "4阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 30 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 31 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 32 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 30, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "30", + "text": "5阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 31 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 32 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 33 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 31, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "31", + "text": "6阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 32 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 33 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 34 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 32, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "32", + "text": "7阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 33 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 34 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 35 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 33, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "33", + "text": "8阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 34 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 35 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 36 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 34, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "34", + "text": "9阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 35 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 36 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 37 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 35, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "35", + "text": "10阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 36 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 37 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 38 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 36, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "36", + "text": "11阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 37 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 38 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 39 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 37, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "37", + "text": "12阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 38 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 39 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 40 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 38, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "38", + "text": "13阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 39 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 40 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 41 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 39, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "39", + "text": "14阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 40 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 41 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 42 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 40, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "40", + "text": "15阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 41 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 42 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 43 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 41, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "41", + "text": "16阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 42 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 43 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 44 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 42, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "42", + "text": "17阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 43 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 44 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 45 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 43, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "43", + "text": "18阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 44 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 45 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 46 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 44, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "44", + "text": "19阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 45 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 46 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 47 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 45, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "45", + "text": "20阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 46 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 47 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 48 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 46, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "46", + "text": "21阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 47 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 48 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 49 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 47, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "47", + "text": "22阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 48 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 49 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 50 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 48, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "48", + "text": "23阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 49 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 50 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 51 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 49, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "49", + "text": "24阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 50 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 51 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 52 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 50, "item_id": 0, "type": 2, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "50", + "text": "25阶防御图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 51 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 52 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 53 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 51, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "51", + "text": "1阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 52 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 53 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 54 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 52, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "52", + "text": "2阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 53 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 54 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 55 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 53, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "53", + "text": "3阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 54 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 55 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 56 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 54, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "54", + "text": "4阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 55 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 56 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 57 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 55, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "55", + "text": "5阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 56 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 57 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 58 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 56, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "56", + "text": "6阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 57 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 58 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 59 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 57, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "57", + "text": "7阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 58 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 59 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 60 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 58, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "58", + "text": "8阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 59 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 60 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 61 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 59, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "59", + "text": "9阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 60 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 61 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 62 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 60, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "60", + "text": "10阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 61 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 62 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 63 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 61, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "61", + "text": "11阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 62 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 63 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 64 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 62, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "62", + "text": "12阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 63 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 64 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 65 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 63, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "63", + "text": "13阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 64 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 65 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 66 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 64, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "64", + "text": "14阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 65 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 66 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 67 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 65, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "65", + "text": "15阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 66 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 67 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 68 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 66, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "66", + "text": "16阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 67 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 68 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 69 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 67, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "67", + "text": "17阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 68 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 69 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 70 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 68, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "68", + "text": "18阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 69 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 70 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 71 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 69, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "69", + "text": "19阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 70 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 71 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 72 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 70, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "70", + "text": "20阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 71 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 72 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 73 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 71, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "71", + "text": "21阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 72 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 73 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 74 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 72, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "72", + "text": "22阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 73 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 74 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 75 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 73, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "73", + "text": "23阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 74 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 75 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 76 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 74, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "74", + "text": "24阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 75 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 76 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 77 + }, + "customized_lv": [], + "customized_lv_distribution": [] }, { "id": 75, "item_id": 0, "type": 3, - "consume": [], - "temperature": 0, - "quality": { + "drawing_name": { + "key": "75", + "text": "25阶辅助图纸" + }, + "quality_text": { + "key": "", + "text": "" + }, + "basic_drop": 0, + "basic_cos": [], + "temperature_cos": 0, + "refine_cos": { "a": "item", "t": "20201", "n": 76 - } + }, + "customized_cos1": { + "a": "item", + "t": "20201", + "n": 77 + }, + "customized_cos2": { + "a": "item", + "t": "20201", + "n": 78 + }, + "customized_lv": [], + "customized_lv_distribution": [] } ] \ No newline at end of file diff --git a/bin/json/game_smithycustomer.json b/bin/json/game_smithycustomer.json index a3068e3de..820c34bfb 100644 --- a/bin/json/game_smithycustomer.json +++ b/bin/json/game_smithycustomer.json @@ -3,8 +3,8 @@ "customer_id": 1, "customer_type": 1, "customer_speak": { - "key": "我需要{0}件【{1}】，如果你暂时没有备货的话我可以在这等一段时间，但不会太久。", - "text": "" + "key": "1", + "text": "我需要{0}件【{1}】，如果你暂时没有备货的话我可以在这等一段时间，但不会太久。" }, "goods": [], "reword": [], @@ -14,8 +14,8 @@ "customer_id": 2, "customer_type": 2, "customer_speak": { - "key": "我需要{0}件【{1}】，如果你暂时没有备货的话我可以在这等一段时间，但不会太久。", - "text": "" + "key": "2", + "text": "我需要{0}件【{1}】，如果你暂时没有备货的话我可以在这等一段时间，但不会太久。" }, "goods": [], "reword": [], @@ -25,7 +25,7 @@ "customer_id": 3, "customer_type": 3, "customer_speak": { - "key": "", + "key": "3", "text": "" }, "goods": [], @@ -36,8 +36,8 @@ "customer_id": 4, "customer_type": 4, "customer_speak": { - "key": "我有个宝贝，你要是喜欢的话便宜你点卖你。", - "text": "" + "key": "4", + "text": "我有个宝贝，你要是喜欢的话便宜你点卖你。" }, "goods": [], "reword": [], diff --git a/bin/json/game_smithyproficiency.json b/bin/json/game_smithyproficiency.json index 8f26b84f8..2152a0d8c 100644 --- a/bin/json/game_smithyproficiency.json +++ b/bin/json/game_smithyproficiency.json @@ -2,27 +2,27 @@ { "id": 1, "proficiency": 20, - "reelId": 1, "proficiency_lv": 1, + "reelId": 1, "title_text": { "key": "1", "text": "lv.{0}:熟练度{1}" }, "content_text": { "key": "1", - "text": "炉温消耗-{0}%" + "text": "炉温消耗-{0}℃" }, "type": 1, - "value1": 100, + "value1": 5, "value2": 0 }, { "id": 2, "proficiency": 40, - "reelId": 1, "proficiency_lv": 2, + "reelId": 1, "title_text": { - "key": "1", + "key": "2", "text": "lv.{0}:熟练度{1}" }, "content_text": { @@ -31,15 +31,15 @@ }, "type": 2, "value1": 10001, - "value2": -275 + "value2": -125 }, { "id": 3, "proficiency": 60, - "reelId": 1, "proficiency_lv": 3, + "reelId": 1, "title_text": { - "key": "1", + "key": "3", "text": "lv.{0}:熟练度{1}" }, "content_text": { @@ -53,324 +53,120 @@ { "id": 4, "proficiency": 80, - "reelId": 1, "proficiency_lv": 4, + "reelId": 1, "title_text": { - "key": "1", + "key": "4", "text": "lv.{0}:熟练度{1}" }, "content_text": { "key": "4", - "text": "解锁套装" + "text": "炉温消耗-{0}℃" }, - "type": 4, + "type": 1, "value1": 5, "value2": 0 }, { "id": 5, "proficiency": 100, - "reelId": 1, "proficiency_lv": 5, + "reelId": 1, "title_text": { - "key": "1", + "key": "5", "text": "lv.{0}:熟练度{1}" }, "content_text": { "key": "5", - "text": "{0}级装备售价提高{1}%" + "text": "{0}%概率制造两件装备" }, "type": 5, - "value1": 1, - "value2": 10 + "value1": 5, + "value2": 0 }, { "id": 6, - "proficiency": 120, - "reelId": 0, - "proficiency_lv": 0, + "proficiency": 25, + "proficiency_lv": 1, + "reelId": 2, "title_text": { - "key": "", - "text": "" + "key": "6", + "text": "lv.{0}:熟练度{1}" }, "content_text": { - "key": "", - "text": "" + "key": "6", + "text": "炉温消耗-{0}℃" }, "type": 1, - "value1": 0, + "value1": 5, "value2": 0 }, { "id": 7, - "proficiency": 140, - "reelId": 0, - "proficiency_lv": 0, + "proficiency": 50, + "proficiency_lv": 2, + "reelId": 2, "title_text": { - "key": "", - "text": "" + "key": "7", + "text": "lv.{0}:熟练度{1}" }, "content_text": { - "key": "", - "text": "" + "key": "7", + "text": "材料消耗减少" }, - "type": 0, - "value1": 0, - "value2": 0 + "type": 2, + "value1": 10001, + "value2": -125 }, { "id": 8, - "proficiency": 160, - "reelId": 0, - "proficiency_lv": 0, + "proficiency": 75, + "proficiency_lv": 3, + "reelId": 2, "title_text": { - "key": "", - "text": "" + "key": "8", + "text": "lv.{0}:熟练度{1}" }, "content_text": { - "key": "", - "text": "" + "key": "8", + "text": "解锁图纸【紫金雷神锤】" }, - "type": 0, - "value1": 0, + "type": 3, + "value1": 2, "value2": 0 }, { "id": 9, - "proficiency": 180, - "reelId": 0, - "proficiency_lv": 0, + "proficiency": 100, + "proficiency_lv": 4, + "reelId": 2, "title_text": { - "key": "", - "text": "" + "key": "9", + "text": "lv.{0}:熟练度{1}" }, "content_text": { - "key": "", - "text": "" + "key": "9", + "text": "解锁套装" }, - "type": 0, + "type": 4, "value1": 0, "value2": 0 }, { "id": 10, - "proficiency": 200, - "reelId": 0, - "proficiency_lv": 0, + "proficiency": 125, + "proficiency_lv": 5, + "reelId": 2, "title_text": { - "key": "", - "text": "" + "key": "10", + "text": "lv.{0}:熟练度{1}" }, "content_text": { - "key": "", - "text": "" + "key": "10", + "text": "{0}%概率制造两件装备" }, - "type": 0, - "value1": 0, - "value2": 0 - }, - { - "id": 11, - "proficiency": 220, - "reelId": 0, - "proficiency_lv": 0, - "title_text": { - "key": "", - "text": "" - }, - "content_text": { - "key": "", - "text": "" - }, - "type": 0, - "value1": 0, - "value2": 0 - }, - { - "id": 12, - "proficiency": 240, - "reelId": 0, - "proficiency_lv": 0, - "title_text": { - "key": "", - "text": "" - }, - "content_text": { - "key": "", - "text": "" - }, - "type": 0, - "value1": 0, - "value2": 0 - }, - { - "id": 13, - "proficiency": 260, - "reelId": 0, - "proficiency_lv": 0, - "title_text": { - "key": "", - "text": "" - }, - "content_text": { - "key": "", - "text": "" - }, - "type": 0, - "value1": 0, - "value2": 0 - }, - { - "id": 14, - "proficiency": 280, - "reelId": 0, - "proficiency_lv": 0, - "title_text": { - "key": "", - "text": "" - }, - "content_text": { - "key": "", - "text": "" - }, - "type": 0, - "value1": 0, - "value2": 0 - }, - { - "id": 15, - "proficiency": 300, - "reelId": 0, - "proficiency_lv": 0, - "title_text": { - "key": "", - "text": "" - }, - "content_text": { - "key": "", - "text": "" - }, - "type": 0, - "value1": 0, - "value2": 0 - }, - { - "id": 16, - "proficiency": 0, - "reelId": 0, - "proficiency_lv": 0, - "title_text": { - "key": "", - "text": "" - }, - "content_text": { - "key": "", - "text": "" - }, - "type": 0, - "value1": 0, - "value2": 0 - }, - { - "id": 17, - "proficiency": 0, - "reelId": 0, - "proficiency_lv": 0, - "title_text": { - "key": "", - "text": "" - }, - "content_text": { - "key": "", - "text": "" - }, - "type": 0, - "value1": 0, - "value2": 0 - }, - { - "id": 18, - "proficiency": 0, - "reelId": 0, - "proficiency_lv": 0, - "title_text": { - "key": "", - "text": "" - }, - "content_text": { - "key": "", - "text": "" - }, - "type": 0, - "value1": 0, - "value2": 0 - }, - { - "id": 19, - "proficiency": 0, - "reelId": 0, - "proficiency_lv": 0, - "title_text": { - "key": "", - "text": "" - }, - "content_text": { - "key": "", - "text": "" - }, - "type": 0, - "value1": 0, - "value2": 0 - }, - { - "id": 20, - "proficiency": 0, - "reelId": 0, - "proficiency_lv": 0, - "title_text": { - "key": "", - "text": "" - }, - "content_text": { - "key": "", - "text": "" - }, - "type": 0, - "value1": 0, - "value2": 0 - }, - { - "id": 21, - "proficiency": 0, - "reelId": 0, - "proficiency_lv": 0, - "title_text": { - "key": "", - "text": "" - }, - "content_text": { - "key": "", - "text": "" - }, - "type": 0, - "value1": 0, - "value2": 0 - }, - { - "id": 22, - "proficiency": 0, - "reelId": 0, - "proficiency_lv": 0, - "title_text": { - "key": "", - "text": "" - }, - "content_text": { - "key": "", - "text": "" - }, - "type": 0, - "value1": 0, + "type": 5, + "value1": 5, "value2": 0 } ] \ No newline at end of file diff --git a/bin/json/game_smithytool.json b/bin/json/game_smithytool.json index 4e2fd0e9d..74dda8969 100644 --- a/bin/json/game_smithytool.json +++ b/bin/json/game_smithytool.json @@ -323,7 +323,7 @@ "id": 11, "skill_type": 2, "skill_lv": 1, - "preconditions": 5, + "preconditions": 15, "up_material": [], "name_text": { "key": "", diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go index c3b1bb27a..4ca04c2dd 100644 --- a/modules/smithy/api_forgeequip.go +++ b/modules/smithy/api_forgeequip.go @@ -57,9 +57,9 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq stove.Data[req.ReelId].Value += 1 // 是否是精益打造 if req.Quality > 0 { - costRes = append(costRes, reelcfg.Quality) + costRes = append(costRes, reelcfg.RefineCos) } - costRes = append(costRes, reelcfg.Consume...) + costRes = append(costRes, reelcfg.BasicCos...) subAtn := this.module.modelStove.CheckForgeConsume(req.ReelId, stove.Data[req.ReelId].Lv) costRes = append(costRes, subAtn...) if code = this.module.CheckRes(session, costRes); code != pb.ErrorCode_Success { @@ -68,7 +68,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq // 熟练度减少的温度 t := this.module.modelStove.CheckTemperature(req.ReelId, stove.Data[req.ReelId].Lv) // 检查炉温 是否够 - if stove.Temperature < reelcfg.Temperature-t { + if stove.Temperature < reelcfg.TemperatureCos-t { code = pb.ErrorCode_SmithyNoTemperature // 炉温不够 直接返回 return } @@ -89,7 +89,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq if code = this.module.ConsumeRes(session, costRes, true); code != pb.ErrorCode_Success { return } - stove.Temperature -= (reelcfg.Temperature - t) // 消耗温度 + stove.Temperature -= (reelcfg.TemperatureCos - t) // 消耗温度 stove.RecoveTime = configure.Now().Unix() update["data"] = stove.Data update["recoveTime"] = stove.RecoveTime diff --git a/sys/configure/structs/Game.NewSmithyData.go b/sys/configure/structs/Game.NewSmithyData.go index ff8c757ab..08f8a9db7 100644 --- a/sys/configure/structs/Game.NewSmithyData.go +++ b/sys/configure/structs/Game.NewSmithyData.go @@ -14,9 +14,16 @@ type GameNewSmithyData struct { Id int32 ItemId int32 Type int32 - Consume []*Gameatn - Temperature int32 - Quality *Gameatn + DrawingName string + QualityText string + BasicDrop int32 + BasicCos []*Gameatn + TemperatureCos int32 + RefineCos *Gameatn + CustomizedCos1 *Gameatn + CustomizedCos2 *Gameatn + CustomizedLv []int32 + CustomizedLvDistribution []int32 } const TypeId_GameNewSmithyData = -1249020316 @@ -29,22 +36,55 @@ func (_v *GameNewSmithyData)Deserialize(_buf map[string]interface{}) (err error) { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["item_id"].(float64); !_ok_ { err = errors.New("item_id error"); return }; _v.ItemId = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["drawing_name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.DrawingName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.DrawingName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["quality_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.QualityText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.QualityText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["basic_drop"].(float64); !_ok_ { err = errors.New("basic_drop error"); return }; _v.BasicDrop = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool - if _arr_, _ok_ = _buf["consume"].([]interface{}); !_ok_ { err = errors.New("consume error"); return } + if _arr_, _ok_ = _buf["basic_cos"].([]interface{}); !_ok_ { err = errors.New("basic_cos error"); return } - _v.Consume = make([]*Gameatn, 0, len(_arr_)) + _v.BasicCos = make([]*Gameatn, 0, len(_arr_)) for _, _e_ := range _arr_ { var _list_v_ *Gameatn { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } - _v.Consume = append(_v.Consume, _list_v_) + _v.BasicCos = append(_v.BasicCos, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["temperature_cos"].(float64); !_ok_ { err = errors.New("temperature_cos error"); return }; _v.TemperatureCos = int32(_tempNum_) } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["refine_cos"].(map[string]interface{}); !_ok_ { err = errors.New("refine_cos error"); return }; if _v.RefineCos, err = DeserializeGameatn(_x_); err != nil { return } } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["customized_cos1"].(map[string]interface{}); !_ok_ { err = errors.New("customized_cos1 error"); return }; if _v.CustomizedCos1, err = DeserializeGameatn(_x_); err != nil { return } } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["customized_cos2"].(map[string]interface{}); !_ok_ { err = errors.New("customized_cos2 error"); return }; if _v.CustomizedCos2, err = DeserializeGameatn(_x_); err != nil { return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["customized_lv"].([]interface{}); !_ok_ { err = errors.New("customized_lv error"); return } + + _v.CustomizedLv = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.CustomizedLv = append(_v.CustomizedLv, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["customized_lv_distribution"].([]interface{}); !_ok_ { err = errors.New("customized_lv_distribution error"); return } + + _v.CustomizedLvDistribution = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.CustomizedLvDistribution = append(_v.CustomizedLvDistribution, _list_v_) } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["temperature"].(float64); !_ok_ { err = errors.New("temperature error"); return }; _v.Temperature = int32(_tempNum_) } - { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["quality"].(map[string]interface{}); !_ok_ { err = errors.New("quality error"); return }; if _v.Quality, err = DeserializeGameatn(_x_); err != nil { return } } return } diff --git a/sys/configure/structs/Game.SmithyProficiencyData.go b/sys/configure/structs/Game.SmithyProficiencyData.go index 996f2ef40..b114d72c8 100644 --- a/sys/configure/structs/Game.SmithyProficiencyData.go +++ b/sys/configure/structs/Game.SmithyProficiencyData.go @@ -13,8 +13,8 @@ import "errors" type GameSmithyProficiencyData struct { Id int32 Proficiency int32 - ReelId int32 ProficiencyLv int32 + ReelId int32 TitleText string ContentText string Type int32 @@ -31,8 +31,8 @@ func (*GameSmithyProficiencyData) GetTypeId() int32 { func (_v *GameSmithyProficiencyData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["proficiency"].(float64); !_ok_ { err = errors.New("proficiency error"); return }; _v.Proficiency = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["reelId"].(float64); !_ok_ { err = errors.New("reelId error"); return }; _v.ReelId = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["proficiency_lv"].(float64); !_ok_ { err = errors.New("proficiency_lv error"); return }; _v.ProficiencyLv = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["reelId"].(float64); !_ok_ { err = errors.New("reelId error"); return }; _v.ReelId = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["title_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TitleText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TitleText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["content_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ContentText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ContentText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } From 97f426ff354f98388ee6b27eb2074cb45b4313de Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 17 Feb 2023 11:58:38 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=8F=B0=20=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=89=93=E9=80=A0=E4=B8=A4=E4=BB=B6=E8=A3=85=E5=A4=87?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_drawcard.json | 297 ++------------------------------- comm/const.go | 9 + modules/hero/configure_comp.go | 2 + modules/smithy/model_stove.go | 31 +++- 4 files changed, 57 insertions(+), 282 deletions(-) diff --git a/bin/json/game_drawcard.json b/bin/json/game_drawcard.json index 04c7ab53c..b50ced312 100644 --- a/bin/json/game_drawcard.json +++ b/bin/json/game_drawcard.json @@ -5,7 +5,7 @@ "card_pool_type": "base_pool1", "star": 3, "race": 1, - "id": "24004", + "id": "15005", "weight": 1000 }, { @@ -14,7 +14,7 @@ "card_pool_type": "base_pool1", "star": 4, "race": 1, - "id": "24004", + "id": "15005", "weight": 1000 }, { @@ -23,7 +23,7 @@ "card_pool_type": "base_pool1", "star": 5, "race": 1, - "id": "24004", + "id": "15005", "weight": 1000 }, { @@ -32,7 +32,7 @@ "card_pool_type": "base_pool2", "star": 3, "race": 1, - "id": "25001", + "id": "24005", "weight": 1000 }, { @@ -41,7 +41,7 @@ "card_pool_type": "base_pool2", "star": 4, "race": 1, - "id": "25001", + "id": "24005", "weight": 1000 }, { @@ -50,7 +50,7 @@ "card_pool_type": "base_pool2", "star": 5, "race": 1, - "id": "25001", + "id": "24005", "weight": 1000 }, { @@ -59,7 +59,7 @@ "card_pool_type": "base_pool3", "star": 3, "race": 1, - "id": "25004", + "id": "14001", "weight": 1000 }, { @@ -68,7 +68,7 @@ "card_pool_type": "base_pool3", "star": 4, "race": 1, - "id": "25004", + "id": "14001", "weight": 1000 }, { @@ -77,7 +77,7 @@ "card_pool_type": "base_pool3", "star": 5, "race": 1, - "id": "25004", + "id": "14001", "weight": 1000 }, { @@ -86,7 +86,7 @@ "card_pool_type": "base_pool4", "star": 3, "race": 1, - "id": "24008", + "id": "14003", "weight": 1000 }, { @@ -95,7 +95,7 @@ "card_pool_type": "base_pool4", "star": 4, "race": 1, - "id": "24008", + "id": "14003", "weight": 1000 }, { @@ -104,7 +104,7 @@ "card_pool_type": "base_pool4", "star": 5, "race": 1, - "id": "24008", + "id": "14003", "weight": 1000 }, { @@ -113,7 +113,7 @@ "card_pool_type": "base_pool5", "star": 3, "race": 1, - "id": "24003", + "id": "35006", "weight": 1000 }, { @@ -122,7 +122,7 @@ "card_pool_type": "base_pool5", "star": 4, "race": 1, - "id": "24003", + "id": "35006", "weight": 1000 }, { @@ -131,7 +131,7 @@ "card_pool_type": "base_pool5", "star": 5, "race": 1, - "id": "24003", + "id": "35006", "weight": 1000 }, { @@ -140,7 +140,7 @@ "card_pool_type": "base_pool6", "star": 3, "race": 1, - "id": "44002", + "id": "34007", "weight": 1000 }, { @@ -149,7 +149,7 @@ "card_pool_type": "base_pool6", "star": 4, "race": 1, - "id": "44002", + "id": "34007", "weight": 1000 }, { @@ -158,268 +158,7 @@ "card_pool_type": "base_pool6", "star": 5, "race": 1, - "id": "44002", - "weight": 1000 - }, - { - "key": 19, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 4, - "race": 3, - "id": "34006", - "weight": 1000 - }, - { - "key": 20, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 5, - "race": 4, - "id": "45003", - "weight": 1000 - }, - { - "key": 21, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 4, - "race": 4, - "id": "44005", - "weight": 1000 - }, - { - "key": 22, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 4, - "race": 1, - "id": "14003", - "weight": 1000 - }, - { - "key": 23, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 5, - "race": 1, - "id": "15005", - "weight": 1000 - }, - { - "key": 24, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 4, - "race": 2, - "id": "24003", - "weight": 1000 - }, - { - "key": 25, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 4, - "race": 2, - "id": "24008", - "weight": 1000 - }, - { - "key": 26, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 5, - "race": 2, - "id": "25001", - "weight": 1000 - }, - { - "key": 27, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 5, - "race": 2, - "id": "25004", - "weight": 1000 - }, - { - "key": 28, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 5, - "race": 3, - "id": "35006", - "weight": 1000 - }, - { - "key": 29, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 4, - "race": 4, - "id": "44002", - "weight": 1000 - }, - { - "key": 30, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 3, - "race": 2, - "id": "24002", - "weight": 1000 - }, - { - "key": 31, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 4, - "race": 2, - "id": "24004", - "weight": 1000 - }, - { - "key": 32, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 5, - "race": 2, - "id": "35001", - "weight": 1000 - }, - { - "key": 33, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 3, - "race": 1, - "id": "13003", - "weight": 1000 - }, - { - "key": 34, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 4, - "race": 4, - "id": "44006", - "weight": 1000 - }, - { - "key": 35, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 5, - "race": 2, - "id": "35001", - "weight": 1000 - }, - { - "key": 36, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 4, - "race": 4, - "id": "44005", - "weight": 1000 - }, - { - "key": 37, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 5, - "race": 1, - "id": "15004", - "weight": 1000 - }, - { - "key": 38, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 3, - "race": 2, - "id": "24002", - "weight": 1000 - }, - { - "key": 39, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 4, - "race": 4, - "id": "45003", - "weight": 1000 - }, - { - "key": 40, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 4, - "race": 1, - "id": "14003", - "weight": 1000 - }, - { - "key": 41, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 5, - "race": 1, - "id": "15005", - "weight": 1000 - }, - { - "key": 42, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 4, - "race": 2, - "id": "24003", - "weight": 1000 - }, - { - "key": 43, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 4, - "race": 2, - "id": "24004", - "weight": 1000 - }, - { - "key": 44, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 5, - "race": 2, - "id": "25004", - "weight": 1000 - }, - { - "key": 45, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 4, - "race": 3, - "id": "34006", - "weight": 1000 - }, - { - "key": 46, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 5, - "race": 2, - "id": "25001", - "weight": 1000 - }, - { - "key": 47, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 4, - "race": 1, - "id": "14007", + "id": "34007", "weight": 1000 }, { diff --git a/comm/const.go b/comm/const.go index 3c1c9711c..c1c5d2d6e 100644 --- a/comm/const.go +++ b/comm/const.go @@ -732,4 +732,13 @@ const ( SmithyReelType2 = 2 // 材料消耗减少 SmithyReelType3 = 3 // 解锁图纸【紫金雷神锤】 SmithyReelType4 = 4 + SmithyReelType5 = 5 // 概率制造两件装备 +) + +const ( + SmithyToolsSkill1 = 1 // 史诗品质概率提升 + SmithyToolsSkill2 = 2 // 所有装备售价提升 + SmithyToolsSkill3 = 3 // 所有图纸炉温消耗减少 + SmithyToolsSkill4 = 4 // 每日顾客数量提升至{0}人 + SmithyToolsSkill5 = 5 // 顾客购买装备数量上限提高至{0}件 ) diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go index 4e0a7928a..37baee464 100644 --- a/modules/hero/configure_comp.go +++ b/modules/hero/configure_comp.go @@ -140,6 +140,8 @@ func (this *configureComp) SetHeroDrawConfig() { err = fmt.Errorf("%T no is *cfg.Game_drawCard", v) return } else { + this.hlock.Lock() + defer this.hlock.Unlock() for _, v := range _configure.GetDataList() { if _, ok := this.drawCardCfg[v.CardPoolType]; !ok { this.drawCardCfg[v.CardPoolType] = make(map[int32][]*cfg.GameDrawCardData, 0) diff --git a/modules/smithy/model_stove.go b/modules/smithy/model_stove.go index 4fd071481..62d0edf41 100644 --- a/modules/smithy/model_stove.go +++ b/modules/smithy/model_stove.go @@ -8,7 +8,9 @@ import ( "go_dreamfactory/pb" "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" + "math/rand" "strconv" + "time" "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" @@ -66,15 +68,38 @@ func (this *modelStove) updateSmithyStove(uid string, update map[string]interfac func (this *modelStove) CheckTemperature(reelId int32, lv int32) (t int32) { var index int32 for index = 1; index <= lv; index++ { - if cfg := this.module.configure.GetSmithyProficileData(reelId, index); cfg != nil { - if cfg.Type == comm.SmithyReelType1 { - t += cfg.Value1 + if cfgData := this.module.configure.GetSmithyProficileData(reelId, index); cfgData != nil { + if cfgData.Type == comm.SmithyReelType1 { + t += cfgData.Value1 } } } return } +// 检查额外概率制造两件装备 +func (this *modelStove) CheckForgetwoEquip(reelId int32, lv int32) (b bool) { + var ( + index int32 + value int32 + ) + for index = 1; index <= lv; index++ { + if cfgData := this.module.configure.GetSmithyProficileData(reelId, index); cfgData != nil { + if cfgData.Type == comm.SmithyReelType5 { + value += cfgData.Value1 + } + } + } + if value > 0 { + rand.Seed(time.Now().UnixNano()) + if value < int32(rand.Intn(100)) { + return true + } + } + + return false +} + // 检查消耗减少 func (this *modelStove) CheckForgeConsume(reelId int32, lv int32) (atn []*cfg.Gameatn) { var index int32 From 5ae69ab05094de2f2906e2188f19d13ce2c637dc Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 17 Feb 2023 12:07:13 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E8=A7=A3=E6=9E=90=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/smithy/comp_configure.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/smithy/comp_configure.go b/modules/smithy/comp_configure.go index c44a03e24..65505c884 100644 --- a/modules/smithy/comp_configure.go +++ b/modules/smithy/comp_configure.go @@ -54,7 +54,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp configure.RegisterConfigure(game_smproficiency, cfg.NewGameSmithyProficiency, this.LoadProficileData) this._mapskill = make(map[int64]*cfg.GameSmithyToolData, 0) configure.RegisterConfigure(game_smithytools, cfg.NewGameSmithyTool, this.LoadSmithySkillData) - err = this.LoadConfigure(game_smithyreel, cfg.NewGameSmithyStove) + err = this.LoadConfigure(game_smithyreel, cfg.NewGameNewSmithy) err = this.LoadConfigure(game_smithystove, cfg.NewGameSmithyStoveV1) err = this.LoadConfigure(game_smithytools, cfg.NewGameSmithyTool) err = this.LoadConfigure(game_smithystoveold, cfg.NewGameSmithyStove) From 4de830806d3474241f433f624162c2067129eecf Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 17 Feb 2023 16:35:45 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=8F=B0=E6=8A=80?= =?UTF-8?q?=E8=83=BD=E6=95=B0=E6=8D=AE=E5=8A=A0=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/smithy/comp_configure.go | 2 ++ modules/smithy/model_stove.go | 59 ++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/modules/smithy/comp_configure.go b/modules/smithy/comp_configure.go index 704822656..df5a2f45a 100644 --- a/modules/smithy/comp_configure.go +++ b/modules/smithy/comp_configure.go @@ -61,6 +61,8 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp err = this.LoadConfigure(game_smithystoveold, cfg.NewGameSmithyStove) err = this.LoadConfigure(game_smithycustomer, cfg.NewGameSmithyCustomer) + _d := this.GetSmithProficiencyConf(1) + this.module.Errorf("%v", _d) return } diff --git a/modules/smithy/model_stove.go b/modules/smithy/model_stove.go index 62d0edf41..efffbb945 100644 --- a/modules/smithy/model_stove.go +++ b/modules/smithy/model_stove.go @@ -140,3 +140,62 @@ func (this *modelStove) calculationRecoveryT(uid string, stove *pb.DBStove) { this.module.modelStove.updateSmithyStove(uid, update) } } + +// 通过技能获取额外的提升 +func (this *modelStove) StoveToolsQualityProbability(stove *pb.DBStove) int32 { + if v, ok := stove.Skill[comm.SmithyToolsSkill1]; ok { + if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, v); conf != nil { + return conf.Value + } + } + return 0 +} + +// 所有装备售价提升{0}% +func (this *modelStove) StoveToolsSellUp(uid string) int32 { + stove, err := this.module.modelStove.getSmithyStoveList(uid) + if err != nil { + if v, ok := stove.Skill[comm.SmithyToolsSkill2]; ok { + if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, v); conf != nil { + return conf.Value + } + } + } + return 0 +} + +// 所有图纸炉温消耗减少 +func (this *modelStove) StoveToolsTemperature(stove *pb.DBStove) int32 { + if v, ok := stove.Skill[comm.SmithyToolsSkill3]; ok { + if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, v); conf != nil { + return conf.Value + } + } + return 0 +} + +//每日顾客数量提升至{0}人 +func (this *modelStove) StoveSkillAddCustomer(uid string) int32 { + stove, err := this.module.modelStove.getSmithyStoveList(uid) + if err != nil { + if v, ok := stove.Skill[comm.SmithyToolsSkill4]; ok { + if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, v); conf != nil { + return conf.Value + } + } + } + return 0 +} + +//顾客购买装备数量上限提高至{0}件 +func (this *modelStove) StoveSkillBuyEquip(uid string) int32 { + stove, err := this.module.modelStove.getSmithyStoveList(uid) + if err != nil { + if v, ok := stove.Skill[comm.SmithyToolsSkill5]; ok { + if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, v); conf != nil { + return conf.Value + } + } + } + return 0 +} From 61daf826ccfd362cf3cbb3cf229ea46d8df0c0f3 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 17 Feb 2023 16:53:51 +0800 Subject: [PATCH 05/11] update --- modules/smithy/model_stove.go | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/modules/smithy/model_stove.go b/modules/smithy/model_stove.go index efffbb945..52b656ace 100644 --- a/modules/smithy/model_stove.go +++ b/modules/smithy/model_stove.go @@ -146,6 +146,10 @@ func (this *modelStove) StoveToolsQualityProbability(stove *pb.DBStove) int32 { if v, ok := stove.Skill[comm.SmithyToolsSkill1]; ok { if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, v); conf != nil { return conf.Value + } else { + if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, 0); conf != nil { + return conf.Value + } } } return 0 @@ -153,11 +157,14 @@ func (this *modelStove) StoveToolsQualityProbability(stove *pb.DBStove) int32 { // 所有装备售价提升{0}% func (this *modelStove) StoveToolsSellUp(uid string) int32 { - stove, err := this.module.modelStove.getSmithyStoveList(uid) - if err != nil { + if stove, err := this.module.modelStove.getSmithyStoveList(uid); err == nil { if v, ok := stove.Skill[comm.SmithyToolsSkill2]; ok { if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, v); conf != nil { return conf.Value + } else { + if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, 0); conf != nil { + return conf.Value + } } } } @@ -169,6 +176,10 @@ func (this *modelStove) StoveToolsTemperature(stove *pb.DBStove) int32 { if v, ok := stove.Skill[comm.SmithyToolsSkill3]; ok { if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, v); conf != nil { return conf.Value + } else { + if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, 0); conf != nil { + return conf.Value + } } } return 0 @@ -176,12 +187,15 @@ func (this *modelStove) StoveToolsTemperature(stove *pb.DBStove) int32 { //每日顾客数量提升至{0}人 func (this *modelStove) StoveSkillAddCustomer(uid string) int32 { - stove, err := this.module.modelStove.getSmithyStoveList(uid) - if err != nil { + if stove, err := this.module.modelStove.getSmithyStoveList(uid); err == nil { if v, ok := stove.Skill[comm.SmithyToolsSkill4]; ok { if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, v); conf != nil { return conf.Value } + } else { + if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, 0); conf != nil { + return conf.Value + } } } return 0 @@ -189,8 +203,7 @@ func (this *modelStove) StoveSkillAddCustomer(uid string) int32 { //顾客购买装备数量上限提高至{0}件 func (this *modelStove) StoveSkillBuyEquip(uid string) int32 { - stove, err := this.module.modelStove.getSmithyStoveList(uid) - if err != nil { + if stove, err := this.module.modelStove.getSmithyStoveList(uid); err == nil { if v, ok := stove.Skill[comm.SmithyToolsSkill5]; ok { if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, v); conf != nil { return conf.Value From 15df32ec6d4ca1401e80c61e661eafcfb01d8e90 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Fri, 17 Feb 2023 11:59:38 +0800 Subject: [PATCH 06/11] update --- bin/json/game_smithycustomer.json | 32 ++++++++++++++++++++++++---- cmd/v2/ui/protocol.go | 19 +++++++++++++++++ cmd/v2/ui/views/smithy.go | 35 +++++++++++++++++++++++++++++++ modules/smithy/api_trade.go | 4 ++-- modules/smithy/model_trade.go | 3 +++ 5 files changed, 87 insertions(+), 6 deletions(-) create mode 100644 cmd/v2/ui/views/smithy.go diff --git a/bin/json/game_smithycustomer.json b/bin/json/game_smithycustomer.json index 820c34bfb..e9e196320 100644 --- a/bin/json/game_smithycustomer.json +++ b/bin/json/game_smithycustomer.json @@ -7,7 +7,13 @@ "text": "我需要{0}件【{1}】，如果你暂时没有备货的话我可以在这等一段时间，但不会太久。" }, "goods": [], - "reword": [], + "reword": [ + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], "weight": 4500 }, { @@ -18,7 +24,13 @@ "text": "我需要{0}件【{1}】，如果你暂时没有备货的话我可以在这等一段时间，但不会太久。" }, "goods": [], - "reword": [], + "reword": [ + { + "a": "item", + "t": "30001", + "n": 10 + } + ], "weight": 4500 }, { @@ -39,8 +51,20 @@ "key": "4", "text": "我有个宝贝，你要是喜欢的话便宜你点卖你。" }, - "goods": [], - "reword": [], + "goods": [ + { + "a": "item", + "t": "30001", + "n": 10 + } + ], + "reword": [ + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], "weight": 500 } ] \ No newline at end of file diff --git a/cmd/v2/ui/protocol.go b/cmd/v2/ui/protocol.go index f1a94a970..36cb77d70 100644 --- a/cmd/v2/ui/protocol.go +++ b/cmd/v2/ui/protocol.go @@ -120,6 +120,8 @@ var ( ff(comm.ModuleGrowtask, growtask.GrowtaskSubTypeList): &formview.GrowtaskListView{}, //worldtask ff(comm.ModuleWorldtask, worldtask.WorldtaskSubtypeMine): &formview.WorldtaskMineView{}, + //smithy + ff(comm.ModuleSmithy, "customer"): &formview.SmithyView{}, } ) @@ -147,6 +149,7 @@ var ( string(comm.ModuleGrowtask), string(comm.ModuleWorldtask), string(comm.ModuleReddot), + string(comm.ModuleSmithy), }, "gm": {ff(comm.ModuleGM, "cmd")}, "sys": { @@ -245,6 +248,9 @@ var ( "worldtask": { ff(comm.ModuleWorldtask, worldtask.WorldtaskSubtypeMine), }, + "smithy": { + ff(comm.ModuleSmithy, "customer"), + }, } ) @@ -877,6 +883,19 @@ var ( SubType: worldtask.WorldtaskSubtypeMine, Enabled: true, }, + // smithy + string(comm.ModuleSmithy): { + NavLabel: "铁匠铺", + MainType: string(comm.ModuleSmithy), + Enabled: true, + }, + ff(comm.ModuleSmithy, "customer"): { + NavLabel: "顾客", + Desc: "当前铁匠铺中的顾客", + MainType: string(comm.ModuleSmithy), + SubType: "customer", + Enabled: true, + }, } ) diff --git a/cmd/v2/ui/views/smithy.go b/cmd/v2/ui/views/smithy.go new file mode 100644 index 000000000..fad4d8847 --- /dev/null +++ b/cmd/v2/ui/views/smithy.go @@ -0,0 +1,35 @@ +package formview + +import ( + "go_dreamfactory/cmd/v2/model" + "go_dreamfactory/cmd/v2/service" + "go_dreamfactory/pb" + + "fyne.io/fyne/v2" + "fyne.io/fyne/v2/container" + "fyne.io/fyne/v2/widget" + "github.com/sirupsen/logrus" +) + +type SmithyView struct { + BaseformView +} + +func (s *SmithyView) CreateView(t *model.TestCase) fyne.CanvasObject { + //查询顾客 + loadCustomer := func() { + if err := service.GetPttService().SendToClient( + t.MainType, + "customer", + &pb.SmithyCustomerReq{}, + ); err != nil { + logrus.Error(err) + return + } + } + customerBtn := widget.NewButton("顾客", loadCustomer) + + btns := container.NewHBox(customerBtn) + c := container.NewBorder(btns, nil, nil, nil) + return c +} diff --git a/modules/smithy/api_trade.go b/modules/smithy/api_trade.go index 2bf2f76fe..4967039c0 100644 --- a/modules/smithy/api_trade.go +++ b/modules/smithy/api_trade.go @@ -4,7 +4,7 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" ) // 贸易 @@ -16,7 +16,7 @@ func (this *apiComp) SellCheck(session comm.IUserSession, req *pb.SmithySellReq) return } -func (this *apiComp) SellItem(session comm.IUserSession, req *pb.SmithySellReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (code pb.ErrorCode, data proto.Message) { if code = this.SellCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/smithy/model_trade.go b/modules/smithy/model_trade.go index 793f675b5..4196c1c11 100644 --- a/modules/smithy/model_trade.go +++ b/modules/smithy/model_trade.go @@ -45,6 +45,9 @@ func newWeightedRandom(items []*cfg.GameSmithyCustomerData) *WeightedRandom { } func (wr *WeightedRandom) pick() *cfg.GameSmithyCustomerData { + if wr.totalWeight <= 0 { + return nil + } randomNumber := rand.Intn(wr.totalWeight) for _, item := range wr.items { if randomNumber < int(item.Weight) { From 524963ef0b6463571ad8d4fe7ebb55cad7b165ce Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Fri, 17 Feb 2023 16:37:21 +0800 Subject: [PATCH 07/11] update --- modules/gateway/agent.go | 13 +- modules/smithy/api_getCustomer.go | 9 +- modules/smithy/api_trade.go | 4 +- modules/smithy/comp_configure.go | 2 +- modules/smithy/model_trade.go | 69 ++++- pb/smithy_db.pb.go | 353 ++++++++++++++--------- pb/smithy_msg.pb.go | 459 ++++++++++++++++++++---------- 7 files changed, 595 insertions(+), 314 deletions(-) diff --git a/modules/gateway/agent.go b/modules/gateway/agent.go index ff7d3ff49..4d24d4b0c 100644 --- a/modules/gateway/agent.go +++ b/modules/gateway/agent.go @@ -44,7 +44,7 @@ func newAgent(gateway IGateway, conn *websocket.Conn) *Agent { return agent } -//用户代理 +// 用户代理 type Agent struct { gateway IGateway wsConn *websocket.Conn @@ -142,7 +142,7 @@ locp: this.gateway.Debugf("agent:%s uId:%s writeLoop end!", this.sessionId, this.uId) } -//安全认证 所有协议 +// 安全认证 所有协议 func (this *Agent) secAuth(msg *pb.UserMessage) (code pb.ErrorCode, err error) { if !utils.ValidSecretKey(msg.Sec) { //验证失败 this.gateway.Errorf("%v", msg.Sec) @@ -151,7 +151,7 @@ func (this *Agent) secAuth(msg *pb.UserMessage) (code pb.ErrorCode, err error) { return this.decodeUserData(msg) } -//解码 +// 解码 func (this *Agent) decodeUserData(msg *pb.UserMessage) (code pb.ErrorCode, err error) { base64Str := msg.Sec dec, err := base64.StdEncoding.DecodeString(base64Str[35:]) @@ -242,7 +242,7 @@ func (this *Agent) WriteBytes(data []byte) (err error) { return } -//外部代用关闭 +// 外部代用关闭 func (this *Agent) Close() { if !atomic.CompareAndSwapInt32(&this.state, 1, 2) { return @@ -254,7 +254,7 @@ func (this *Agent) Close() { this.gateway.DisConnect(this) } -//分发用户消息 +// 分发用户消息 func (this *Agent) messageDistribution(msg *pb.UserMessage) (err error) { var ( req *pb.AgentMessage = getmsg() @@ -304,7 +304,8 @@ func (this *Agent) messageDistribution(msg *pb.UserMessage) (err error) { } stime := time.Now() // this.gateway.Debugf("----------3 agent:%s uId:%s MainType:%s SubType:%s ", this.sessionId, this.uId, msg.MainType, msg.SubType) - ctx, _ := context.WithTimeout(context.Background(), time.Second*5) + // ctx, _ := context.WithTimeout(context.Background(), time.Second*5) + ctx := context.Background() if len(serviceTag) == 0 { // this.gateway.Debugf("----------4 agent:%s uId:%s MainType:%s SubType:%s ", this.sessionId, this.uId, msg.MainType, msg.SubType) if err = this.gateway.Service().RpcCall(ctx, servicePath, string(comm.Rpc_GatewayRoute), req, reply); err != nil { diff --git a/modules/smithy/api_getCustomer.go b/modules/smithy/api_getCustomer.go index 58acfb0f3..cadd126ab 100644 --- a/modules/smithy/api_getCustomer.go +++ b/modules/smithy/api_getCustomer.go @@ -9,6 +9,9 @@ import ( "google.golang.org/protobuf/proto" ) +// 3个顾客 +var customerCount int32 = 3 + func (this *apiComp) CustomerCheck(session comm.IUserSession, req *pb.SmithyCustomerReq) (code pb.ErrorCode) { return } @@ -17,7 +20,7 @@ func (this *apiComp) Customer(session comm.IUserSession, req *pb.SmithyCustomerR cus, err := this.module.modelTrade.getDBCustomer(session.GetUserId()) if err != nil { if err == mongo.ErrNoDocuments { - c, err := this.module.modelTrade.addCustomer(session.GetUserId(), 3) + c, err := this.module.modelTrade.addCustomer(session.GetUserId(), customerCount) //3个顾客 if err != nil { code = pb.ErrorCode_DBError return @@ -31,7 +34,7 @@ func (this *apiComp) Customer(session comm.IUserSession, req *pb.SmithyCustomerR if utils.IsFirstTody(cus.LastRefreshTime) { this.module.modelTrade.DelByUId(session.GetUserId()) - c, err := this.module.modelTrade.addCustomer(session.GetUserId(), 3) + c, err := this.module.modelTrade.addCustomer(session.GetUserId(), customerCount) if err != nil { code = pb.ErrorCode_DBError return @@ -40,7 +43,7 @@ func (this *apiComp) Customer(session comm.IUserSession, req *pb.SmithyCustomerR } rsp := &pb.SmithyCustomerResp{ - CustomerIds: cus.CustomerIds, + CustomerEquips: cus.CustomerEquips, } session.SendMsg(string(this.module.GetType()), "customer", rsp) diff --git a/modules/smithy/api_trade.go b/modules/smithy/api_trade.go index 4967039c0..4f9f8a570 100644 --- a/modules/smithy/api_trade.go +++ b/modules/smithy/api_trade.go @@ -10,7 +10,7 @@ import ( // 贸易 func (this *apiComp) SellCheck(session comm.IUserSession, req *pb.SmithySellReq) (code pb.ErrorCode) { - if req.CustomerId == 0 || len(req.Ids) == 0 { + if req.CustomerId == 0 || len(req.EquipIds) == 0 { code = pb.ErrorCode_ReqParameterError } return @@ -37,7 +37,7 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (cod rsp := &pb.SmithySellResp{ CustomerId: req.CustomerId, - Ids: req.Ids, + EquipIds: req.EquipIds, } session.SendMsg(string(this.module.GetType()), "sell", rsp) diff --git a/modules/smithy/comp_configure.go b/modules/smithy/comp_configure.go index df5a2f45a..9aae9b2f6 100644 --- a/modules/smithy/comp_configure.go +++ b/modules/smithy/comp_configure.go @@ -198,7 +198,7 @@ func (this *configureComp) GetSmithyProficileData(reelid int32, proficile int32) // 获取铁匠铺顾客配置 func (this *configureComp) GetSmithyCustomerConfList() (data []*cfg.GameSmithyCustomerData) { - if v, err := this.GetConfigure(game_smithycustomer); err != nil { + if v, err := this.GetConfigure(game_smithycustomer); err == nil { if conf, ok := v.(*cfg.GameSmithyCustomer); ok { data = conf.GetDataList() return diff --git a/modules/smithy/model_trade.go b/modules/smithy/model_trade.go index 4196c1c11..c69d98899 100644 --- a/modules/smithy/model_trade.go +++ b/modules/smithy/model_trade.go @@ -6,7 +6,6 @@ import ( "go_dreamfactory/modules" "go_dreamfactory/pb" "go_dreamfactory/sys/configure" - cfg "go_dreamfactory/sys/configure/structs" "math/rand" "go.mongodb.org/mongo-driver/bson/primitive" @@ -30,13 +29,18 @@ func (this *modelTrade) Init(service core.IService, module core.IModule, comp co return } +type WeightItem struct { + Id interface{} + Weight int +} + // 权重项目 type WeightedRandom struct { - items []*cfg.GameSmithyCustomerData + items []*WeightItem totalWeight int } -func newWeightedRandom(items []*cfg.GameSmithyCustomerData) *WeightedRandom { +func newWeightedRandom(items []*WeightItem) *WeightedRandom { wr := &WeightedRandom{items: items} for _, item := range wr.items { wr.totalWeight += int(item.Weight) @@ -44,7 +48,7 @@ func newWeightedRandom(items []*cfg.GameSmithyCustomerData) *WeightedRandom { return wr } -func (wr *WeightedRandom) pick() *cfg.GameSmithyCustomerData { +func (wr *WeightedRandom) pick() *WeightItem { if wr.totalWeight <= 0 { return nil } @@ -60,10 +64,14 @@ func (wr *WeightedRandom) pick() *cfg.GameSmithyCustomerData { // 随机顾客 func (s *modelTrade) getCustomerRandom() (customerId int32) { - items := s.module.configure.GetSmithyCustomerConfList() + confList := s.module.configure.GetSmithyCustomerConfList() + var items []*WeightItem + for _, v := range confList { + items = append(items, &WeightItem{Id: v.CustomerId, Weight: int(v.Weight)}) + } wr := newWeightedRandom(items) if c := wr.pick(); c != nil { - customerId = c.CustomerId + customerId = (c.Id).(int32) } return } @@ -71,7 +79,6 @@ func (s *modelTrade) getCustomerRandom() (customerId int32) { func (s *modelTrade) getDBCustomer(uid string) (*pb.DBCustomer, error) { customer := &pb.DBCustomer{} if err := s.Get(uid, customer); err != nil { - s.module.Errorln(err) return nil, err } return customer, nil @@ -86,7 +93,10 @@ func (s *modelTrade) addCustomer(uid string, num int32) (*pb.DBCustomer, error) LastRefreshTime: configure.Now().Unix(), } for i := 0; i < int(num); i++ { - customer.CustomerIds = append(customer.CustomerIds, s.getCustomerRandom()) + customer.CustomerEquips = append(customer.CustomerEquips, &pb.CustomerEquip{ + CustomerId: s.getCustomerRandom(), + EquipId: s.GetEquipRandom(uid), + }) } if err := s.Add(uid, customer); err != nil { s.module.Errorln(err) @@ -97,9 +107,9 @@ func (s *modelTrade) addCustomer(uid string, num int32) (*pb.DBCustomer, error) // 移除顾客 func (s *modelTrade) removeCustomer(cus *pb.DBCustomer, customerId int32) *pb.DBCustomer { - for i, v := range cus.CustomerIds { - if v == customerId { - cus.CustomerIds = append(cus.CustomerIds[:i], cus.CustomerIds[i+1:]...) + for i, v := range cus.CustomerEquips { + if v.CustomerId == customerId { + cus.CustomerEquips = append(cus.CustomerEquips[:i], cus.CustomerEquips[i+1:]...) i-- } } @@ -119,10 +129,13 @@ func (s *modelTrade) updateCustomer(uid string, customerId int32) error { return comm.NewCustomError(pb.ErrorCode_SmithyCustomerLimit) } - cus.CustomerIds = append(cus.CustomerIds, s.getCustomerRandom()) + cus.CustomerEquips = append(cus.CustomerEquips, &pb.CustomerEquip{ + CustomerId: s.getCustomerRandom(), + EquipId: s.GetEquipRandom(uid), + }) cus.LastRefreshTime = configure.Now().Unix() update := map[string]interface{}{ - "customerIds": cus.CustomerIds, + "customerIds": cus.CustomerEquips, "total": cus.Total, "lastRefreshTime": cus.LastRefreshTime, } @@ -133,6 +146,34 @@ func (s *modelTrade) updateCustomer(uid string, customerId int32) error { return nil } -//顾客类型策略 +// 返回概率下的装备套装 +func (s *modelTrade) GetEquipRandom(uid string) string { + //获取玩家所有解锁套装 + unlockEquips := []*pb.DB_Equipment{} + var unlockEquipsItems []*WeightItem + for _, v := range unlockEquips { + unlockEquipsItems = append(unlockEquipsItems, &WeightItem{ + Id: v.Id, + Weight: 5, + }) + } + //获取玩家已有装备 + ownerEquips := []*pb.DB_Equipment{} + var ownerEquipsItems []*WeightItem + for _, v := range ownerEquips { + ownerEquipsItems = append(ownerEquipsItems, &WeightItem{ + Id: v.Id, + Weight: 7, + }) + } + + merge := append(unlockEquipsItems, ownerEquipsItems...) + // 设置权重 + wr := newWeightedRandom(merge) + if c := wr.pick(); c != nil { + return c.Id.(string) + } + return "" +} //交易 diff --git a/pb/smithy_db.pb.go b/pb/smithy_db.pb.go index 1d360c4b2..1df1a59da 100644 --- a/pb/smithy_db.pb.go +++ b/pb/smithy_db.pb.go @@ -179,22 +179,85 @@ func (x *DBStove) GetRecoveTime() int64 { return 0 } +type CustomerEquip struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + CustomerId int32 `protobuf:"varint,1,opt,name=customerId,proto3" json:"customerId"` //顾客ID + EquipId string `protobuf:"bytes,2,opt,name=equipId,proto3" json:"equipId"` //装备ID + EquipCount int32 `protobuf:"varint,3,opt,name=equipCount,proto3" json:"equipCount"` //装备数量 +} + +func (x *CustomerEquip) Reset() { + *x = CustomerEquip{} + if protoimpl.UnsafeEnabled { + mi := &file_smithy_smithy_db_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CustomerEquip) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CustomerEquip) ProtoMessage() {} + +func (x *CustomerEquip) ProtoReflect() protoreflect.Message { + mi := &file_smithy_smithy_db_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CustomerEquip.ProtoReflect.Descriptor instead. +func (*CustomerEquip) Descriptor() ([]byte, []int) { + return file_smithy_smithy_db_proto_rawDescGZIP(), []int{2} +} + +func (x *CustomerEquip) GetCustomerId() int32 { + if x != nil { + return x.CustomerId + } + return 0 +} + +func (x *CustomerEquip) GetEquipId() string { + if x != nil { + return x.EquipId + } + return "" +} + +func (x *CustomerEquip) GetEquipCount() int32 { + if x != nil { + return x.EquipCount + } + return 0 +} + type DBCustomer struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` // - CustomerIds []int32 `protobuf:"varint,3,rep,packed,name=customerIds,proto3" json:"customerIds" bson:"customerIds"` // 顾客Ids - Total int32 `protobuf:"varint,4,opt,name=total,proto3" json:"total" bson:"total"` //顾客累计数 - LastRefreshTime int64 `protobuf:"varint,5,opt,name=lastRefreshTime,proto3" json:"lastRefreshTime" bson:"lastRefreshTime"` // 上次更新时间 + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` // + CustomerEquips []*CustomerEquip `protobuf:"bytes,3,rep,name=customerEquips,proto3" json:"customerEquips" bson:"customerEquips"` // 顾客装备 + Total int32 `protobuf:"varint,4,opt,name=total,proto3" json:"total" bson:"total"` //顾客累计数 + LastRefreshTime int64 `protobuf:"varint,5,opt,name=lastRefreshTime,proto3" json:"lastRefreshTime" bson:"lastRefreshTime"` // 上次更新时间 } func (x *DBCustomer) Reset() { *x = DBCustomer{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_db_proto_msgTypes[2] + mi := &file_smithy_smithy_db_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -207,7 +270,7 @@ func (x *DBCustomer) String() string { func (*DBCustomer) ProtoMessage() {} func (x *DBCustomer) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_db_proto_msgTypes[2] + mi := &file_smithy_smithy_db_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -220,7 +283,7 @@ func (x *DBCustomer) ProtoReflect() protoreflect.Message { // Deprecated: Use DBCustomer.ProtoReflect.Descriptor instead. func (*DBCustomer) Descriptor() ([]byte, []int) { - return file_smithy_smithy_db_proto_rawDescGZIP(), []int{2} + return file_smithy_smithy_db_proto_rawDescGZIP(), []int{3} } func (x *DBCustomer) GetId() string { @@ -237,9 +300,9 @@ func (x *DBCustomer) GetUid() string { return "" } -func (x *DBCustomer) GetCustomerIds() []int32 { +func (x *DBCustomer) GetCustomerEquips() []*CustomerEquip { if x != nil { - return x.CustomerIds + return x.CustomerEquips } return nil } @@ -273,7 +336,7 @@ type DBTujian struct { func (x *DBTujian) Reset() { *x = DBTujian{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_db_proto_msgTypes[3] + mi := &file_smithy_smithy_db_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -286,7 +349,7 @@ func (x *DBTujian) String() string { func (*DBTujian) ProtoMessage() {} func (x *DBTujian) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_db_proto_msgTypes[3] + mi := &file_smithy_smithy_db_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -299,7 +362,7 @@ func (x *DBTujian) ProtoReflect() protoreflect.Message { // Deprecated: Use DBTujian.ProtoReflect.Descriptor instead. func (*DBTujian) Descriptor() ([]byte, []int) { - return file_smithy_smithy_db_proto_rawDescGZIP(), []int{3} + return file_smithy_smithy_db_proto_rawDescGZIP(), []int{4} } func (x *DBTujian) GetId() string { @@ -343,7 +406,7 @@ type ForgeData struct { func (x *ForgeData) Reset() { *x = ForgeData{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_db_proto_msgTypes[4] + mi := &file_smithy_smithy_db_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -356,7 +419,7 @@ func (x *ForgeData) String() string { func (*ForgeData) ProtoMessage() {} func (x *ForgeData) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_db_proto_msgTypes[4] + mi := &file_smithy_smithy_db_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -369,7 +432,7 @@ func (x *ForgeData) ProtoReflect() protoreflect.Message { // Deprecated: Use ForgeData.ProtoReflect.Descriptor instead. func (*ForgeData) Descriptor() ([]byte, []int) { - return file_smithy_smithy_db_proto_rawDescGZIP(), []int{4} + return file_smithy_smithy_db_proto_rawDescGZIP(), []int{5} } func (x *ForgeData) GetForgeCount() int32 { @@ -407,7 +470,7 @@ type Clang struct { func (x *Clang) Reset() { *x = Clang{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_db_proto_msgTypes[5] + mi := &file_smithy_smithy_db_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -420,7 +483,7 @@ func (x *Clang) String() string { func (*Clang) ProtoMessage() {} func (x *Clang) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_db_proto_msgTypes[5] + mi := &file_smithy_smithy_db_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -433,7 +496,7 @@ func (x *Clang) ProtoReflect() protoreflect.Message { // Deprecated: Use Clang.ProtoReflect.Descriptor instead. func (*Clang) Descriptor() ([]byte, []int) { - return file_smithy_smithy_db_proto_rawDescGZIP(), []int{5} + return file_smithy_smithy_db_proto_rawDescGZIP(), []int{6} } func (x *Clang) GetDeskType() int32 { @@ -470,7 +533,7 @@ type OrderClang struct { func (x *OrderClang) Reset() { *x = OrderClang{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_db_proto_msgTypes[6] + mi := &file_smithy_smithy_db_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -483,7 +546,7 @@ func (x *OrderClang) String() string { func (*OrderClang) ProtoMessage() {} func (x *OrderClang) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_db_proto_msgTypes[6] + mi := &file_smithy_smithy_db_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -496,7 +559,7 @@ func (x *OrderClang) ProtoReflect() protoreflect.Message { // Deprecated: Use OrderClang.ProtoReflect.Descriptor instead. func (*OrderClang) Descriptor() ([]byte, []int) { - return file_smithy_smithy_db_proto_rawDescGZIP(), []int{6} + return file_smithy_smithy_db_proto_rawDescGZIP(), []int{7} } func (x *OrderClang) GetDeskType() int32 { @@ -542,7 +605,7 @@ type DBSmithy struct { func (x *DBSmithy) Reset() { *x = DBSmithy{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_db_proto_msgTypes[7] + mi := &file_smithy_smithy_db_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -555,7 +618,7 @@ func (x *DBSmithy) String() string { func (*DBSmithy) ProtoMessage() {} func (x *DBSmithy) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_db_proto_msgTypes[7] + mi := &file_smithy_smithy_db_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -568,7 +631,7 @@ func (x *DBSmithy) ProtoReflect() protoreflect.Message { // Deprecated: Use DBSmithy.ProtoReflect.Descriptor instead. func (*DBSmithy) Descriptor() ([]byte, []int) { - return file_smithy_smithy_db_proto_rawDescGZIP(), []int{7} + return file_smithy_smithy_db_proto_rawDescGZIP(), []int{8} } func (x *DBSmithy) GetId() string { @@ -690,78 +753,86 @@ var file_smithy_smithy_db_proto_rawDesc = []byte{ 0x1a, 0x38, 0x0a, 0x0a, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x90, 0x01, 0x0a, 0x0a, 0x44, - 0x42, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x63, - 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, - 0x52, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x73, 0x12, 0x14, 0x0a, - 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, - 0x74, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x66, 0x72, 0x65, - 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6c, 0x61, - 0x73, 0x74, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x22, 0xba, 0x01, - 0x0a, 0x08, 0x44, 0x42, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2d, 0x0a, 0x06, - 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, - 0x42, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x2e, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x73, - 0x6c, 0x69, 0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x6c, 0x69, - 0x64, 0x65, 0x72, 0x1a, 0x45, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x55, 0x0a, 0x09, 0x46, 0x6f, - 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1e, 0x0a, 0x0a, 0x66, 0x6f, 0x72, 0x67, 0x65, - 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x66, 0x6f, 0x72, - 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, - 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, - 0x79, 0x22, 0x4f, 0x0a, 0x05, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, - 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, - 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, - 0x73, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x54, 0x69, - 0x6d, 0x65, 0x22, 0x5a, 0x0a, 0x0a, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, - 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, - 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x82, - 0x04, 0x0a, 0x08, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x69, 0x0a, 0x0d, 0x43, 0x75, + 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x63, + 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x65, + 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x71, + 0x75, 0x69, 0x70, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x43, 0x6f, + 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, + 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0xa6, 0x01, 0x0a, 0x0a, 0x44, 0x42, 0x43, 0x75, 0x73, 0x74, + 0x6f, 0x6d, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x36, 0x0a, 0x0e, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, + 0x65, 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, + 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x0e, + 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x73, 0x12, 0x14, + 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, + 0x6f, 0x74, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x66, 0x72, + 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6c, + 0x61, 0x73, 0x74, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x22, 0xba, + 0x01, 0x0a, 0x08, 0x44, 0x42, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, - 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, - 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x43, - 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x23, 0x0a, 0x06, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, 0x72, - 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, - 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, - 0x65, 0x6d, 0x73, 0x12, 0x2a, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x06, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2e, 0x53, 0x6b, - 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, - 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x12, 0x24, 0x0a, 0x0d, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, - 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, - 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, - 0x6f, 0x72, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, - 0x74, 0x68, 0x79, 0x2e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x52, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1e, 0x0a, - 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1c, 0x0a, - 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x53, - 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, - 0x6f, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, - 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2d, 0x0a, + 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, + 0x44, 0x42, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x2e, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x12, 0x16, 0x0a, 0x06, + 0x73, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x6c, + 0x69, 0x64, 0x65, 0x72, 0x1a, 0x45, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x55, 0x0a, 0x09, 0x46, + 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1e, 0x0a, 0x0a, 0x66, 0x6f, 0x72, 0x67, + 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x66, 0x6f, + 0x72, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, 0x6c, + 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, + 0x74, 0x79, 0x22, 0x4f, 0x0a, 0x05, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, + 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, + 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, + 0x05, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x54, + 0x69, 0x6d, 0x65, 0x22, 0x5a, 0x0a, 0x0a, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, + 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, + 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, + 0x82, 0x04, 0x0a, 0x08, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x12, 0x0e, 0x0a, 0x02, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, + 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, + 0x0a, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, + 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x23, 0x0a, 0x06, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, + 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, + 0x73, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, + 0x74, 0x65, 0x6d, 0x73, 0x12, 0x2a, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x06, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2e, 0x53, + 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, + 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x12, 0x24, 0x0a, 0x0d, 0x6f, 0x72, + 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, + 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, + 0x6f, 0x6f, 0x72, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x53, 0x6d, + 0x69, 0x74, 0x68, 0x79, 0x2e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x52, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1e, + 0x0a, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0b, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1c, + 0x0a, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x38, 0x0a, 0x0a, + 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, + 0x6f, 0x6f, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -776,41 +847,43 @@ func file_smithy_smithy_db_proto_rawDescGZIP() []byte { return file_smithy_smithy_db_proto_rawDescData } -var file_smithy_smithy_db_proto_msgTypes = make([]protoimpl.MessageInfo, 14) +var file_smithy_smithy_db_proto_msgTypes = make([]protoimpl.MessageInfo, 15) var file_smithy_smithy_db_proto_goTypes = []interface{}{ - (*Mastery)(nil), // 0: Mastery - (*DBStove)(nil), // 1: DBStove - (*DBCustomer)(nil), // 2: DBCustomer - (*DBTujian)(nil), // 3: DBTujian - (*ForgeData)(nil), // 4: ForgeData - (*Clang)(nil), // 5: Clang - (*OrderClang)(nil), // 6: OrderClang - (*DBSmithy)(nil), // 7: DBSmithy - nil, // 8: DBStove.DataEntry - nil, // 9: DBStove.SkillEntry - nil, // 10: DBStove.ForgeEntry - nil, // 11: DBTujian.TujianEntry - nil, // 12: DBSmithy.SkillEntry - nil, // 13: DBSmithy.DeskFloorEntry - (*UserAssets)(nil), // 14: UserAssets + (*Mastery)(nil), // 0: Mastery + (*DBStove)(nil), // 1: DBStove + (*CustomerEquip)(nil), // 2: CustomerEquip + (*DBCustomer)(nil), // 3: DBCustomer + (*DBTujian)(nil), // 4: DBTujian + (*ForgeData)(nil), // 5: ForgeData + (*Clang)(nil), // 6: Clang + (*OrderClang)(nil), // 7: OrderClang + (*DBSmithy)(nil), // 8: DBSmithy + nil, // 9: DBStove.DataEntry + nil, // 10: DBStove.SkillEntry + nil, // 11: DBStove.ForgeEntry + nil, // 12: DBTujian.TujianEntry + nil, // 13: DBSmithy.SkillEntry + nil, // 14: DBSmithy.DeskFloorEntry + (*UserAssets)(nil), // 15: UserAssets } var file_smithy_smithy_db_proto_depIdxs = []int32{ - 8, // 0: DBStove.data:type_name -> DBStove.DataEntry - 9, // 1: DBStove.skill:type_name -> DBStove.SkillEntry - 10, // 2: DBStove.forge:type_name -> DBStove.ForgeEntry - 11, // 3: DBTujian.tujian:type_name -> DBTujian.TujianEntry - 5, // 4: DBSmithy.clang:type_name -> Clang - 6, // 5: DBSmithy.orders:type_name -> OrderClang - 14, // 6: DBSmithy.items:type_name -> UserAssets - 12, // 7: DBSmithy.skill:type_name -> DBSmithy.SkillEntry - 13, // 8: DBSmithy.deskFloor:type_name -> DBSmithy.DeskFloorEntry - 0, // 9: DBStove.DataEntry.value:type_name -> Mastery - 4, // 10: DBTujian.TujianEntry.value:type_name -> ForgeData - 11, // [11:11] is the sub-list for method output_type - 11, // [11:11] is the sub-list for method input_type - 11, // [11:11] is the sub-list for extension type_name - 11, // [11:11] is the sub-list for extension extendee - 0, // [0:11] is the sub-list for field type_name + 9, // 0: DBStove.data:type_name -> DBStove.DataEntry + 10, // 1: DBStove.skill:type_name -> DBStove.SkillEntry + 11, // 2: DBStove.forge:type_name -> DBStove.ForgeEntry + 2, // 3: DBCustomer.customerEquips:type_name -> CustomerEquip + 12, // 4: DBTujian.tujian:type_name -> DBTujian.TujianEntry + 6, // 5: DBSmithy.clang:type_name -> Clang + 7, // 6: DBSmithy.orders:type_name -> OrderClang + 15, // 7: DBSmithy.items:type_name -> UserAssets + 13, // 8: DBSmithy.skill:type_name -> DBSmithy.SkillEntry + 14, // 9: DBSmithy.deskFloor:type_name -> DBSmithy.DeskFloorEntry + 0, // 10: DBStove.DataEntry.value:type_name -> Mastery + 5, // 11: DBTujian.TujianEntry.value:type_name -> ForgeData + 12, // [12:12] is the sub-list for method output_type + 12, // [12:12] is the sub-list for method input_type + 12, // [12:12] is the sub-list for extension type_name + 12, // [12:12] is the sub-list for extension extendee + 0, // [0:12] is the sub-list for field type_name } func init() { file_smithy_smithy_db_proto_init() } @@ -845,7 +918,7 @@ func file_smithy_smithy_db_proto_init() { } } file_smithy_smithy_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DBCustomer); i { + switch v := v.(*CustomerEquip); i { case 0: return &v.state case 1: @@ -857,7 +930,7 @@ func file_smithy_smithy_db_proto_init() { } } file_smithy_smithy_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DBTujian); i { + switch v := v.(*DBCustomer); i { case 0: return &v.state case 1: @@ -869,7 +942,7 @@ func file_smithy_smithy_db_proto_init() { } } file_smithy_smithy_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ForgeData); i { + switch v := v.(*DBTujian); i { case 0: return &v.state case 1: @@ -881,7 +954,7 @@ func file_smithy_smithy_db_proto_init() { } } file_smithy_smithy_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Clang); i { + switch v := v.(*ForgeData); i { case 0: return &v.state case 1: @@ -893,7 +966,7 @@ func file_smithy_smithy_db_proto_init() { } } file_smithy_smithy_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OrderClang); i { + switch v := v.(*Clang); i { case 0: return &v.state case 1: @@ -905,6 +978,18 @@ func file_smithy_smithy_db_proto_init() { } } file_smithy_smithy_db_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*OrderClang); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_smithy_smithy_db_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DBSmithy); i { case 0: return &v.state @@ -923,7 +1008,7 @@ func file_smithy_smithy_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_smithy_smithy_db_proto_rawDesc, NumEnums: 0, - NumMessages: 14, + NumMessages: 15, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/smithy_msg.pb.go b/pb/smithy_msg.pb.go index b91728ce2..5af8c7846 100644 --- a/pb/smithy_msg.pb.go +++ b/pb/smithy_msg.pb.go @@ -636,7 +636,7 @@ func (x *SmithyToolsUpResp) GetData() *DBStove { return nil } -// 刷新商人 +// 顾客 type SmithyCustomerReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -680,7 +680,7 @@ type SmithyCustomerResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - CustomerIds []int32 `protobuf:"varint,1,rep,packed,name=customerIds,proto3" json:"customerIds"` //顾客 + CustomerEquips []*CustomerEquip `protobuf:"bytes,1,rep,name=customerEquips,proto3" json:"customerEquips"` //顾客及装备信息 } func (x *SmithyCustomerResp) Reset() { @@ -715,27 +715,138 @@ func (*SmithyCustomerResp) Descriptor() ([]byte, []int) { return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{13} } -func (x *SmithyCustomerResp) GetCustomerIds() []int32 { +func (x *SmithyCustomerResp) GetCustomerEquips() []*CustomerEquip { if x != nil { - return x.CustomerIds + return x.CustomerEquips } return nil } +// 待交易装备 +type SmithyEquipitemReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + CustomerId int32 `protobuf:"varint,1,opt,name=customerId,proto3" json:"customerId"` //顾客ID +} + +func (x *SmithyEquipitemReq) Reset() { + *x = SmithyEquipitemReq{} + if protoimpl.UnsafeEnabled { + mi := &file_smithy_smithy_msg_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SmithyEquipitemReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SmithyEquipitemReq) ProtoMessage() {} + +func (x *SmithyEquipitemReq) ProtoReflect() protoreflect.Message { + mi := &file_smithy_smithy_msg_proto_msgTypes[14] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SmithyEquipitemReq.ProtoReflect.Descriptor instead. +func (*SmithyEquipitemReq) Descriptor() ([]byte, []int) { + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{14} +} + +func (x *SmithyEquipitemReq) GetCustomerId() int32 { + if x != nil { + return x.CustomerId + } + return 0 +} + +type SmithyEquipitemResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + CustomerId int32 `protobuf:"varint,1,opt,name=customerId,proto3" json:"customerId"` //顾客ID + EquipId string `protobuf:"bytes,2,opt,name=equipId,proto3" json:"equipId"` //装备ID + Count int32 `protobuf:"varint,3,opt,name=count,proto3" json:"count"` //装备数量 +} + +func (x *SmithyEquipitemResp) Reset() { + *x = SmithyEquipitemResp{} + if protoimpl.UnsafeEnabled { + mi := &file_smithy_smithy_msg_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SmithyEquipitemResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SmithyEquipitemResp) ProtoMessage() {} + +func (x *SmithyEquipitemResp) ProtoReflect() protoreflect.Message { + mi := &file_smithy_smithy_msg_proto_msgTypes[15] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SmithyEquipitemResp.ProtoReflect.Descriptor instead. +func (*SmithyEquipitemResp) Descriptor() ([]byte, []int) { + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{15} +} + +func (x *SmithyEquipitemResp) GetCustomerId() int32 { + if x != nil { + return x.CustomerId + } + return 0 +} + +func (x *SmithyEquipitemResp) GetEquipId() string { + if x != nil { + return x.EquipId + } + return "" +} + +func (x *SmithyEquipitemResp) GetCount() int32 { + if x != nil { + return x.Count + } + return 0 +} + // 出售装备 type SmithySellReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Ids []int32 `protobuf:"varint,1,rep,packed,name=ids,proto3" json:"ids"` // 装备ID - CustomerId int32 `protobuf:"varint,2,opt,name=customerId,proto3" json:"customerId"` //顾客ID + EquipIds []string `protobuf:"bytes,1,rep,name=equipIds,proto3" json:"equipIds"` // 装备ID + CustomerId int32 `protobuf:"varint,2,opt,name=customerId,proto3" json:"customerId"` //顾客ID } func (x *SmithySellReq) Reset() { *x = SmithySellReq{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[14] + mi := &file_smithy_smithy_msg_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -748,7 +859,7 @@ func (x *SmithySellReq) String() string { func (*SmithySellReq) ProtoMessage() {} func (x *SmithySellReq) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[14] + mi := &file_smithy_smithy_msg_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -761,12 +872,12 @@ func (x *SmithySellReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithySellReq.ProtoReflect.Descriptor instead. func (*SmithySellReq) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{14} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{16} } -func (x *SmithySellReq) GetIds() []int32 { +func (x *SmithySellReq) GetEquipIds() []string { if x != nil { - return x.Ids + return x.EquipIds } return nil } @@ -783,14 +894,14 @@ type SmithySellResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - CustomerId int32 `protobuf:"varint,1,opt,name=customerId,proto3" json:"customerId"` //顾客ID - Ids []int32 `protobuf:"varint,2,rep,packed,name=ids,proto3" json:"ids"` //出售的装备 + CustomerId int32 `protobuf:"varint,1,opt,name=customerId,proto3" json:"customerId"` //顾客ID + EquipIds []string `protobuf:"bytes,2,rep,name=equipIds,proto3" json:"equipIds"` //出售的装备 } func (x *SmithySellResp) Reset() { *x = SmithySellResp{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[15] + mi := &file_smithy_smithy_msg_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -803,7 +914,7 @@ func (x *SmithySellResp) String() string { func (*SmithySellResp) ProtoMessage() {} func (x *SmithySellResp) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[15] + mi := &file_smithy_smithy_msg_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -816,7 +927,7 @@ func (x *SmithySellResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithySellResp.ProtoReflect.Descriptor instead. func (*SmithySellResp) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{15} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{17} } func (x *SmithySellResp) GetCustomerId() int32 { @@ -826,9 +937,9 @@ func (x *SmithySellResp) GetCustomerId() int32 { return 0 } -func (x *SmithySellResp) GetIds() []int32 { +func (x *SmithySellResp) GetEquipIds() []string { if x != nil { - return x.Ids + return x.EquipIds } return nil } @@ -846,7 +957,7 @@ type SmithyCreateOrderReq struct { func (x *SmithyCreateOrderReq) Reset() { *x = SmithyCreateOrderReq{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[16] + mi := &file_smithy_smithy_msg_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -859,7 +970,7 @@ func (x *SmithyCreateOrderReq) String() string { func (*SmithyCreateOrderReq) ProtoMessage() {} func (x *SmithyCreateOrderReq) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[16] + mi := &file_smithy_smithy_msg_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -872,7 +983,7 @@ func (x *SmithyCreateOrderReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyCreateOrderReq.ProtoReflect.Descriptor instead. func (*SmithyCreateOrderReq) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{16} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{18} } func (x *SmithyCreateOrderReq) GetOrder() []*OrderClang { @@ -893,7 +1004,7 @@ type SmithyCreateOrderResp struct { func (x *SmithyCreateOrderResp) Reset() { *x = SmithyCreateOrderResp{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[17] + mi := &file_smithy_smithy_msg_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -906,7 +1017,7 @@ func (x *SmithyCreateOrderResp) String() string { func (*SmithyCreateOrderResp) ProtoMessage() {} func (x *SmithyCreateOrderResp) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[17] + mi := &file_smithy_smithy_msg_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -919,7 +1030,7 @@ func (x *SmithyCreateOrderResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyCreateOrderResp.ProtoReflect.Descriptor instead. func (*SmithyCreateOrderResp) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{17} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{19} } func (x *SmithyCreateOrderResp) GetData() *DBSmithy { @@ -939,7 +1050,7 @@ type SmithyGetRewardReq struct { func (x *SmithyGetRewardReq) Reset() { *x = SmithyGetRewardReq{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[18] + mi := &file_smithy_smithy_msg_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -952,7 +1063,7 @@ func (x *SmithyGetRewardReq) String() string { func (*SmithyGetRewardReq) ProtoMessage() {} func (x *SmithyGetRewardReq) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[18] + mi := &file_smithy_smithy_msg_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -965,7 +1076,7 @@ func (x *SmithyGetRewardReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyGetRewardReq.ProtoReflect.Descriptor instead. func (*SmithyGetRewardReq) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{18} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{20} } type SmithyGetRewardResp struct { @@ -979,7 +1090,7 @@ type SmithyGetRewardResp struct { func (x *SmithyGetRewardResp) Reset() { *x = SmithyGetRewardResp{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[19] + mi := &file_smithy_smithy_msg_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -992,7 +1103,7 @@ func (x *SmithyGetRewardResp) String() string { func (*SmithyGetRewardResp) ProtoMessage() {} func (x *SmithyGetRewardResp) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[19] + mi := &file_smithy_smithy_msg_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1005,7 +1116,7 @@ func (x *SmithyGetRewardResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyGetRewardResp.ProtoReflect.Descriptor instead. func (*SmithyGetRewardResp) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{19} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{21} } func (x *SmithyGetRewardResp) GetData() *DBSmithy { @@ -1027,7 +1138,7 @@ type SmithyDeskSkillLvReq struct { func (x *SmithyDeskSkillLvReq) Reset() { *x = SmithyDeskSkillLvReq{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[20] + mi := &file_smithy_smithy_msg_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1040,7 +1151,7 @@ func (x *SmithyDeskSkillLvReq) String() string { func (*SmithyDeskSkillLvReq) ProtoMessage() {} func (x *SmithyDeskSkillLvReq) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[20] + mi := &file_smithy_smithy_msg_proto_msgTypes[22] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1053,7 +1164,7 @@ func (x *SmithyDeskSkillLvReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyDeskSkillLvReq.ProtoReflect.Descriptor instead. func (*SmithyDeskSkillLvReq) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{20} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{22} } func (x *SmithyDeskSkillLvReq) GetDeskType() int32 { @@ -1074,7 +1185,7 @@ type SmithyDeskSkillLvResp struct { func (x *SmithyDeskSkillLvResp) Reset() { *x = SmithyDeskSkillLvResp{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[21] + mi := &file_smithy_smithy_msg_proto_msgTypes[23] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1087,7 +1198,7 @@ func (x *SmithyDeskSkillLvResp) String() string { func (*SmithyDeskSkillLvResp) ProtoMessage() {} func (x *SmithyDeskSkillLvResp) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[21] + mi := &file_smithy_smithy_msg_proto_msgTypes[23] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1100,7 +1211,7 @@ func (x *SmithyDeskSkillLvResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyDeskSkillLvResp.ProtoReflect.Descriptor instead. func (*SmithyDeskSkillLvResp) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{21} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{23} } func (x *SmithyDeskSkillLvResp) GetData() *DBSmithy { @@ -1120,7 +1231,7 @@ type SmithyStoveSkillLvReq struct { func (x *SmithyStoveSkillLvReq) Reset() { *x = SmithyStoveSkillLvReq{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[22] + mi := &file_smithy_smithy_msg_proto_msgTypes[24] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1133,7 +1244,7 @@ func (x *SmithyStoveSkillLvReq) String() string { func (*SmithyStoveSkillLvReq) ProtoMessage() {} func (x *SmithyStoveSkillLvReq) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[22] + mi := &file_smithy_smithy_msg_proto_msgTypes[24] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1146,7 +1257,7 @@ func (x *SmithyStoveSkillLvReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyStoveSkillLvReq.ProtoReflect.Descriptor instead. func (*SmithyStoveSkillLvReq) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{22} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{24} } type SmithyStoveSkillLvResp struct { @@ -1160,7 +1271,7 @@ type SmithyStoveSkillLvResp struct { func (x *SmithyStoveSkillLvResp) Reset() { *x = SmithyStoveSkillLvResp{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[23] + mi := &file_smithy_smithy_msg_proto_msgTypes[25] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1173,7 +1284,7 @@ func (x *SmithyStoveSkillLvResp) String() string { func (*SmithyStoveSkillLvResp) ProtoMessage() {} func (x *SmithyStoveSkillLvResp) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[23] + mi := &file_smithy_smithy_msg_proto_msgTypes[25] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1186,7 +1297,7 @@ func (x *SmithyStoveSkillLvResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyStoveSkillLvResp.ProtoReflect.Descriptor instead. func (*SmithyStoveSkillLvResp) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{23} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{25} } func (x *SmithyStoveSkillLvResp) GetData() *DBSmithy { @@ -1207,7 +1318,7 @@ type SmithyGetRandUserReq struct { func (x *SmithyGetRandUserReq) Reset() { *x = SmithyGetRandUserReq{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[24] + mi := &file_smithy_smithy_msg_proto_msgTypes[26] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1220,7 +1331,7 @@ func (x *SmithyGetRandUserReq) String() string { func (*SmithyGetRandUserReq) ProtoMessage() {} func (x *SmithyGetRandUserReq) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[24] + mi := &file_smithy_smithy_msg_proto_msgTypes[26] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1233,7 +1344,7 @@ func (x *SmithyGetRandUserReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyGetRandUserReq.ProtoReflect.Descriptor instead. func (*SmithyGetRandUserReq) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{24} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{26} } func (x *SmithyGetRandUserReq) GetPeople() int32 { @@ -1254,7 +1365,7 @@ type SmithyGetRandUserResp struct { func (x *SmithyGetRandUserResp) Reset() { *x = SmithyGetRandUserResp{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[25] + mi := &file_smithy_smithy_msg_proto_msgTypes[27] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1267,7 +1378,7 @@ func (x *SmithyGetRandUserResp) String() string { func (*SmithyGetRandUserResp) ProtoMessage() {} func (x *SmithyGetRandUserResp) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[25] + mi := &file_smithy_smithy_msg_proto_msgTypes[27] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1280,7 +1391,7 @@ func (x *SmithyGetRandUserResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyGetRandUserResp.ProtoReflect.Descriptor instead. func (*SmithyGetRandUserResp) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{25} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{27} } func (x *SmithyGetRandUserResp) GetUser() []*DBUser { @@ -1299,7 +1410,7 @@ type SmithyGetListReq struct { func (x *SmithyGetListReq) Reset() { *x = SmithyGetListReq{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[26] + mi := &file_smithy_smithy_msg_proto_msgTypes[28] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1312,7 +1423,7 @@ func (x *SmithyGetListReq) String() string { func (*SmithyGetListReq) ProtoMessage() {} func (x *SmithyGetListReq) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[26] + mi := &file_smithy_smithy_msg_proto_msgTypes[28] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1325,7 +1436,7 @@ func (x *SmithyGetListReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyGetListReq.ProtoReflect.Descriptor instead. func (*SmithyGetListReq) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{26} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{28} } // 返回进度信息 @@ -1340,7 +1451,7 @@ type SmithyGetListResp struct { func (x *SmithyGetListResp) Reset() { *x = SmithyGetListResp{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[27] + mi := &file_smithy_smithy_msg_proto_msgTypes[29] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1353,7 +1464,7 @@ func (x *SmithyGetListResp) String() string { func (*SmithyGetListResp) ProtoMessage() {} func (x *SmithyGetListResp) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[27] + mi := &file_smithy_smithy_msg_proto_msgTypes[29] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1366,7 +1477,7 @@ func (x *SmithyGetListResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyGetListResp.ProtoReflect.Descriptor instead. func (*SmithyGetListResp) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{27} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{29} } func (x *SmithyGetListResp) GetData() *DBSmithy { @@ -1429,55 +1540,67 @@ var file_smithy_smithy_msg_proto_rawDesc = []byte{ 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x13, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73, - 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x52, 0x65, 0x71, 0x22, 0x36, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, - 0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, - 0x0a, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x73, - 0x22, 0x41, 0x0a, 0x0d, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, - 0x71, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x03, - 0x69, 0x64, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, - 0x72, 0x49, 0x64, 0x22, 0x42, 0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x65, 0x6c, - 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, - 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, - 0x6d, 0x65, 0x72, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, - 0x28, 0x05, 0x52, 0x03, 0x69, 0x64, 0x73, 0x22, 0x39, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, - 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, - 0x21, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, - 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x05, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x72, 0x65, 0x61, - 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, - 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, - 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6d, - 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, - 0x22, 0x34, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, - 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, - 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x32, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, - 0x44, 0x65, 0x73, 0x6b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x1a, - 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, - 0x69, 0x74, 0x68, 0x79, 0x44, 0x65, 0x73, 0x6b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x22, 0x17, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, - 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x16, 0x53, - 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, - 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, - 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, - 0x74, 0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, - 0x70, 0x65, 0x6f, 0x70, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x65, - 0x6f, 0x70, 0x6c, 0x65, 0x22, 0x34, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, - 0x74, 0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, - 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, - 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6d, - 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x32, - 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x52, 0x65, 0x71, 0x22, 0x4c, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, + 0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x36, + 0x0a, 0x0e, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x73, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, + 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x0e, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, + 0x45, 0x71, 0x75, 0x69, 0x70, 0x73, 0x22, 0x34, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, + 0x45, 0x71, 0x75, 0x69, 0x70, 0x69, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, + 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x22, 0x65, 0x0a, 0x13, + 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x45, 0x71, 0x75, 0x69, 0x70, 0x69, 0x74, 0x65, 0x6d, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, + 0x72, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x12, 0x14, 0x0a, + 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x22, 0x4b, 0x0a, 0x0d, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x65, 0x6c, + 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, + 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, + 0x22, 0x4c, 0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, + 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x18, 0x02, + 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x22, 0x39, + 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x21, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, + 0x6e, 0x67, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69, + 0x74, 0x68, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, + 0x61, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, + 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, + 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, + 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, + 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x32, 0x0a, + 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x44, 0x65, 0x73, 0x6b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, + 0x4c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, + 0x65, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x44, 0x65, 0x73, 0x6b, 0x53, + 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, + 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x17, 0x0a, 0x15, 0x53, 0x6d, 0x69, + 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, + 0x65, 0x71, 0x22, 0x37, 0x0a, 0x16, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, + 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, + 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, + 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x14, 0x53, + 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, + 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x65, 0x6f, 0x70, 0x6c, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x65, 0x6f, 0x70, 0x6c, 0x65, 0x22, 0x34, 0x0a, 0x15, 0x53, + 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, + 0x72, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, + 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, + 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, + 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, + 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1492,7 +1615,7 @@ func file_smithy_smithy_msg_proto_rawDescGZIP() []byte { return file_smithy_smithy_msg_proto_rawDescData } -var file_smithy_smithy_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 28) +var file_smithy_smithy_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 30) var file_smithy_smithy_msg_proto_goTypes = []interface{}{ (*SmithyGetStoveInfoReq)(nil), // 0: SmithyGetStoveInfoReq (*SmithyGetStoveInfoResp)(nil), // 1: SmithyGetStoveInfoResp @@ -1508,44 +1631,48 @@ var file_smithy_smithy_msg_proto_goTypes = []interface{}{ (*SmithyToolsUpResp)(nil), // 11: SmithyToolsUpResp (*SmithyCustomerReq)(nil), // 12: SmithyCustomerReq (*SmithyCustomerResp)(nil), // 13: SmithyCustomerResp - (*SmithySellReq)(nil), // 14: SmithySellReq - (*SmithySellResp)(nil), // 15: SmithySellResp - (*SmithyCreateOrderReq)(nil), // 16: SmithyCreateOrderReq - (*SmithyCreateOrderResp)(nil), // 17: SmithyCreateOrderResp - (*SmithyGetRewardReq)(nil), // 18: SmithyGetRewardReq - (*SmithyGetRewardResp)(nil), // 19: SmithyGetRewardResp - (*SmithyDeskSkillLvReq)(nil), // 20: SmithyDeskSkillLvReq - (*SmithyDeskSkillLvResp)(nil), // 21: SmithyDeskSkillLvResp - (*SmithyStoveSkillLvReq)(nil), // 22: SmithyStoveSkillLvReq - (*SmithyStoveSkillLvResp)(nil), // 23: SmithyStoveSkillLvResp - (*SmithyGetRandUserReq)(nil), // 24: SmithyGetRandUserReq - (*SmithyGetRandUserResp)(nil), // 25: SmithyGetRandUserResp - (*SmithyGetListReq)(nil), // 26: SmithyGetListReq - (*SmithyGetListResp)(nil), // 27: SmithyGetListResp - (*DBStove)(nil), // 28: DBStove - (*OrderClang)(nil), // 29: OrderClang - (*DBSmithy)(nil), // 30: DBSmithy - (*DBUser)(nil), // 31: DBUser + (*SmithyEquipitemReq)(nil), // 14: SmithyEquipitemReq + (*SmithyEquipitemResp)(nil), // 15: SmithyEquipitemResp + (*SmithySellReq)(nil), // 16: SmithySellReq + (*SmithySellResp)(nil), // 17: SmithySellResp + (*SmithyCreateOrderReq)(nil), // 18: SmithyCreateOrderReq + (*SmithyCreateOrderResp)(nil), // 19: SmithyCreateOrderResp + (*SmithyGetRewardReq)(nil), // 20: SmithyGetRewardReq + (*SmithyGetRewardResp)(nil), // 21: SmithyGetRewardResp + (*SmithyDeskSkillLvReq)(nil), // 22: SmithyDeskSkillLvReq + (*SmithyDeskSkillLvResp)(nil), // 23: SmithyDeskSkillLvResp + (*SmithyStoveSkillLvReq)(nil), // 24: SmithyStoveSkillLvReq + (*SmithyStoveSkillLvResp)(nil), // 25: SmithyStoveSkillLvResp + (*SmithyGetRandUserReq)(nil), // 26: SmithyGetRandUserReq + (*SmithyGetRandUserResp)(nil), // 27: SmithyGetRandUserResp + (*SmithyGetListReq)(nil), // 28: SmithyGetListReq + (*SmithyGetListResp)(nil), // 29: SmithyGetListResp + (*DBStove)(nil), // 30: DBStove + (*CustomerEquip)(nil), // 31: CustomerEquip + (*OrderClang)(nil), // 32: OrderClang + (*DBSmithy)(nil), // 33: DBSmithy + (*DBUser)(nil), // 34: DBUser } var file_smithy_smithy_msg_proto_depIdxs = []int32{ - 28, // 0: SmithyGetStoveInfoResp.data:type_name -> DBStove - 28, // 1: SmithyForgeEquipResp.data:type_name -> DBStove - 28, // 2: SmithyOrderEquipResp.data:type_name -> DBStove - 28, // 3: SmithyStoveUpResp.data:type_name -> DBStove - 28, // 4: SmithyRiseResp.data:type_name -> DBStove - 28, // 5: SmithyToolsUpResp.data:type_name -> DBStove - 29, // 6: SmithyCreateOrderReq.order:type_name -> OrderClang - 30, // 7: SmithyCreateOrderResp.data:type_name -> DBSmithy - 30, // 8: SmithyGetRewardResp.data:type_name -> DBSmithy - 30, // 9: SmithyDeskSkillLvResp.data:type_name -> DBSmithy - 30, // 10: SmithyStoveSkillLvResp.data:type_name -> DBSmithy - 31, // 11: SmithyGetRandUserResp.user:type_name -> DBUser - 30, // 12: SmithyGetListResp.data:type_name -> DBSmithy - 13, // [13:13] is the sub-list for method output_type - 13, // [13:13] is the sub-list for method input_type - 13, // [13:13] is the sub-list for extension type_name - 13, // [13:13] is the sub-list for extension extendee - 0, // [0:13] is the sub-list for field type_name + 30, // 0: SmithyGetStoveInfoResp.data:type_name -> DBStove + 30, // 1: SmithyForgeEquipResp.data:type_name -> DBStove + 30, // 2: SmithyOrderEquipResp.data:type_name -> DBStove + 30, // 3: SmithyStoveUpResp.data:type_name -> DBStove + 30, // 4: SmithyRiseResp.data:type_name -> DBStove + 30, // 5: SmithyToolsUpResp.data:type_name -> DBStove + 31, // 6: SmithyCustomerResp.customerEquips:type_name -> CustomerEquip + 32, // 7: SmithyCreateOrderReq.order:type_name -> OrderClang + 33, // 8: SmithyCreateOrderResp.data:type_name -> DBSmithy + 33, // 9: SmithyGetRewardResp.data:type_name -> DBSmithy + 33, // 10: SmithyDeskSkillLvResp.data:type_name -> DBSmithy + 33, // 11: SmithyStoveSkillLvResp.data:type_name -> DBSmithy + 34, // 12: SmithyGetRandUserResp.user:type_name -> DBUser + 33, // 13: SmithyGetListResp.data:type_name -> DBSmithy + 14, // [14:14] is the sub-list for method output_type + 14, // [14:14] is the sub-list for method input_type + 14, // [14:14] is the sub-list for extension type_name + 14, // [14:14] is the sub-list for extension extendee + 0, // [0:14] is the sub-list for field type_name } func init() { file_smithy_smithy_msg_proto_init() } @@ -1725,7 +1852,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithySellReq); i { + switch v := v.(*SmithyEquipitemReq); i { case 0: return &v.state case 1: @@ -1737,7 +1864,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithySellResp); i { + switch v := v.(*SmithyEquipitemResp); i { case 0: return &v.state case 1: @@ -1749,7 +1876,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyCreateOrderReq); i { + switch v := v.(*SmithySellReq); i { case 0: return &v.state case 1: @@ -1761,7 +1888,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyCreateOrderResp); i { + switch v := v.(*SmithySellResp); i { case 0: return &v.state case 1: @@ -1773,7 +1900,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyGetRewardReq); i { + switch v := v.(*SmithyCreateOrderReq); i { case 0: return &v.state case 1: @@ -1785,7 +1912,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyGetRewardResp); i { + switch v := v.(*SmithyCreateOrderResp); i { case 0: return &v.state case 1: @@ -1797,7 +1924,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyDeskSkillLvReq); i { + switch v := v.(*SmithyGetRewardReq); i { case 0: return &v.state case 1: @@ -1809,7 +1936,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyDeskSkillLvResp); i { + switch v := v.(*SmithyGetRewardResp); i { case 0: return &v.state case 1: @@ -1821,7 +1948,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyStoveSkillLvReq); i { + switch v := v.(*SmithyDeskSkillLvReq); i { case 0: return &v.state case 1: @@ -1833,7 +1960,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyStoveSkillLvResp); i { + switch v := v.(*SmithyDeskSkillLvResp); i { case 0: return &v.state case 1: @@ -1845,7 +1972,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyGetRandUserReq); i { + switch v := v.(*SmithyStoveSkillLvReq); i { case 0: return &v.state case 1: @@ -1857,7 +1984,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyGetRandUserResp); i { + switch v := v.(*SmithyStoveSkillLvResp); i { case 0: return &v.state case 1: @@ -1869,7 +1996,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyGetListReq); i { + switch v := v.(*SmithyGetRandUserReq); i { case 0: return &v.state case 1: @@ -1881,6 +2008,30 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SmithyGetRandUserResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_smithy_smithy_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SmithyGetListReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_smithy_smithy_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SmithyGetListResp); i { case 0: return &v.state @@ -1899,7 +2050,7 @@ func file_smithy_smithy_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_smithy_smithy_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 28, + NumMessages: 30, NumExtensions: 0, NumServices: 0, }, From 7c9bb001982d43986d6c8ef34a64c9174465bd0e Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Fri, 17 Feb 2023 18:29:57 +0800 Subject: [PATCH 08/11] update --- modules/smithy/api_getCustomer.go | 2 +- modules/smithy/api_trade.go | 13 + modules/smithy/model_trade.go | 40 ++- pb/errorcode.pb.go | 19 +- pb/smithy_db.pb.go | 231 ++++++++-------- pb/smithy_msg.pb.go | 431 ++++++++++-------------------- 6 files changed, 313 insertions(+), 423 deletions(-) diff --git a/modules/smithy/api_getCustomer.go b/modules/smithy/api_getCustomer.go index cadd126ab..85ac7508e 100644 --- a/modules/smithy/api_getCustomer.go +++ b/modules/smithy/api_getCustomer.go @@ -43,7 +43,7 @@ func (this *apiComp) Customer(session comm.IUserSession, req *pb.SmithyCustomerR } rsp := &pb.SmithyCustomerResp{ - CustomerEquips: cus.CustomerEquips, + Customers: cus.Customers, } session.SendMsg(string(this.module.GetType()), "customer", rsp) diff --git a/modules/smithy/api_trade.go b/modules/smithy/api_trade.go index 4f9f8a570..1f99bea94 100644 --- a/modules/smithy/api_trade.go +++ b/modules/smithy/api_trade.go @@ -24,6 +24,19 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (cod //校验customer类型，因为有的类型是不能进入交易逻辑的 //TODO + // cus, err := this.module.modelTrade.getDBCustomer(session.GetUserId()) + // if err != nil { + // code = pb.ErrorCode_DBError + // return + // } + + + if imodule, err := this.service.GetModule(comm.ModuleEquipment); err == nil { + if iequip, ok := imodule.(comm.IEquipment); ok { + iequip.RecycleEquipments(session, req.EquipIds, this.module.modelStove.StoveToolsSellUp(session.GetUserId())) + } + } + _ = this.module.modelTrade.updateCustomer(session.GetUserId(), req.CustomerId) conf := this.module.configure.GetSmithyCustomerConf(req.CustomerId) diff --git a/modules/smithy/model_trade.go b/modules/smithy/model_trade.go index c69d98899..929a3489f 100644 --- a/modules/smithy/model_trade.go +++ b/modules/smithy/model_trade.go @@ -93,9 +93,10 @@ func (s *modelTrade) addCustomer(uid string, num int32) (*pb.DBCustomer, error) LastRefreshTime: configure.Now().Unix(), } for i := 0; i < int(num); i++ { - customer.CustomerEquips = append(customer.CustomerEquips, &pb.CustomerEquip{ + customer.Customers = append(customer.Customers, &pb.CustomerInfo{ CustomerId: s.getCustomerRandom(), - EquipId: s.GetEquipRandom(uid), + SuitId: s.GetSuitRandom(uid), + EquipCount: s.module.modelStove.StoveSkillBuyEquip(uid), }) } if err := s.Add(uid, customer); err != nil { @@ -107,9 +108,9 @@ func (s *modelTrade) addCustomer(uid string, num int32) (*pb.DBCustomer, error) // 移除顾客 func (s *modelTrade) removeCustomer(cus *pb.DBCustomer, customerId int32) *pb.DBCustomer { - for i, v := range cus.CustomerEquips { + for i, v := range cus.Customers { if v.CustomerId == customerId { - cus.CustomerEquips = append(cus.CustomerEquips[:i], cus.CustomerEquips[i+1:]...) + cus.Customers = append(cus.Customers[:i], cus.Customers[i+1:]...) i-- } } @@ -129,13 +130,14 @@ func (s *modelTrade) updateCustomer(uid string, customerId int32) error { return comm.NewCustomError(pb.ErrorCode_SmithyCustomerLimit) } - cus.CustomerEquips = append(cus.CustomerEquips, &pb.CustomerEquip{ + cus.Customers = append(cus.Customers, &pb.CustomerInfo{ CustomerId: s.getCustomerRandom(), - EquipId: s.GetEquipRandom(uid), + SuitId: s.GetSuitRandom(uid), + EquipCount: s.module.modelStove.StoveSkillBuyEquip(uid), }) cus.LastRefreshTime = configure.Now().Unix() update := map[string]interface{}{ - "customerIds": cus.CustomerEquips, + "customerIds": cus.Customers, "total": cus.Total, "lastRefreshTime": cus.LastRefreshTime, } @@ -146,8 +148,8 @@ func (s *modelTrade) updateCustomer(uid string, customerId int32) error { return nil } -// 返回概率下的装备套装 -func (s *modelTrade) GetEquipRandom(uid string) string { +// 返回概率下的套装 +func (s *modelTrade) GetSuitRandom(uid string) string { //获取玩家所有解锁套装 unlockEquips := []*pb.DB_Equipment{} var unlockEquipsItems []*WeightItem @@ -176,4 +178,22 @@ func (s *modelTrade) GetEquipRandom(uid string) string { return "" } -//交易 +// 交易 +func (s *modelTrade) trade(uid string, customerId int32) error { + cus, err := s.getDBCustomer(uid) + if err != nil { + return err + } + + for i, v := range cus.Customers { + if v.CustomerId == customerId { + if v.EquipCount <= 0 { + return comm.NewCustomError(pb.ErrorCode_SmithyCustomerEquipNoEnough) + } + cus.Customers = append(cus.Customers[:i], cus.Customers[i+1:]...) + i-- + + } + } + return nil +} diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index 6f7c40d1d..c5d36b89d 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -316,10 +316,11 @@ const ( ErrorCode_AutoBattleNoData ErrorCode = 4001 //没有正在自动战斗的数据 ErrorCode_AutoBattleStatesErr ErrorCode = 4002 // 自动战斗状态错误 // smithy - ErrorCode_SmithyNoReel ErrorCode = 4101 // 没有激活图纸信息 - ErrorCode_SmithyNoTemperature ErrorCode = 4102 // 炉温不够不能打造 - ErrorCode_SmithyStoveMaxLv ErrorCode = 4103 // 炉子达到最大等级 - ErrorCode_SmithyCustomerLimit ErrorCode = 4104 //顾客上限 + ErrorCode_SmithyNoReel ErrorCode = 4101 // 没有激活图纸信息 + ErrorCode_SmithyNoTemperature ErrorCode = 4102 // 炉温不够不能打造 + ErrorCode_SmithyStoveMaxLv ErrorCode = 4103 // 炉子达到最大等级 + ErrorCode_SmithyCustomerLimit ErrorCode = 4104 //顾客上限 + ErrorCode_SmithyCustomerEquipNoEnough ErrorCode = 4105 //装备回收数量不足 ) // Enum value maps for ErrorCode. @@ -590,6 +591,7 @@ var ( 4102: "SmithyNoTemperature", 4103: "SmithyStoveMaxLv", 4104: "SmithyCustomerLimit", + 4105: "SmithyCustomerEquipNoEnough", } ErrorCode_value = map[string]int32{ "Success": 0, @@ -857,6 +859,7 @@ var ( "SmithyNoTemperature": 4102, "SmithyStoveMaxLv": 4103, "SmithyCustomerLimit": 4104, + "SmithyCustomerEquipNoEnough": 4105, } ) @@ -891,7 +894,7 @@ var File_errorcode_proto protoreflect.FileDescriptor var file_errorcode_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2a, 0xf0, 0x2f, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0x92, 0x30, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12, 0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, @@ -1274,8 +1277,10 @@ var file_errorcode_proto_rawDesc = []byte{ 0x10, 0x86, 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0x87, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69, - 0x74, 0x10, 0x88, 0x20, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x74, 0x10, 0x88, 0x20, 0x12, 0x20, 0x0a, 0x1b, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75, + 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, + 0x75, 0x67, 0x68, 0x10, 0x89, 0x20, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/smithy_db.pb.go b/pb/smithy_db.pb.go index 1df1a59da..cb2c41e8c 100644 --- a/pb/smithy_db.pb.go +++ b/pb/smithy_db.pb.go @@ -179,18 +179,18 @@ func (x *DBStove) GetRecoveTime() int64 { return 0 } -type CustomerEquip struct { +type CustomerInfo struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields CustomerId int32 `protobuf:"varint,1,opt,name=customerId,proto3" json:"customerId"` //顾客ID - EquipId string `protobuf:"bytes,2,opt,name=equipId,proto3" json:"equipId"` //装备ID + SuitId string `protobuf:"bytes,2,opt,name=suitId,proto3" json:"suitId"` //套装ID 随机套装 EquipCount int32 `protobuf:"varint,3,opt,name=equipCount,proto3" json:"equipCount"` //装备数量 } -func (x *CustomerEquip) Reset() { - *x = CustomerEquip{} +func (x *CustomerInfo) Reset() { + *x = CustomerInfo{} if protoimpl.UnsafeEnabled { mi := &file_smithy_smithy_db_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -198,13 +198,13 @@ func (x *CustomerEquip) Reset() { } } -func (x *CustomerEquip) String() string { +func (x *CustomerInfo) String() string { return protoimpl.X.MessageStringOf(x) } -func (*CustomerEquip) ProtoMessage() {} +func (*CustomerInfo) ProtoMessage() {} -func (x *CustomerEquip) ProtoReflect() protoreflect.Message { +func (x *CustomerInfo) ProtoReflect() protoreflect.Message { mi := &file_smithy_smithy_db_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -216,26 +216,26 @@ func (x *CustomerEquip) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use CustomerEquip.ProtoReflect.Descriptor instead. -func (*CustomerEquip) Descriptor() ([]byte, []int) { +// Deprecated: Use CustomerInfo.ProtoReflect.Descriptor instead. +func (*CustomerInfo) Descriptor() ([]byte, []int) { return file_smithy_smithy_db_proto_rawDescGZIP(), []int{2} } -func (x *CustomerEquip) GetCustomerId() int32 { +func (x *CustomerInfo) GetCustomerId() int32 { if x != nil { return x.CustomerId } return 0 } -func (x *CustomerEquip) GetEquipId() string { +func (x *CustomerInfo) GetSuitId() string { if x != nil { - return x.EquipId + return x.SuitId } return "" } -func (x *CustomerEquip) GetEquipCount() int32 { +func (x *CustomerInfo) GetEquipCount() int32 { if x != nil { return x.EquipCount } @@ -247,11 +247,11 @@ type DBCustomer struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` // - CustomerEquips []*CustomerEquip `protobuf:"bytes,3,rep,name=customerEquips,proto3" json:"customerEquips" bson:"customerEquips"` // 顾客装备 - Total int32 `protobuf:"varint,4,opt,name=total,proto3" json:"total" bson:"total"` //顾客累计数 - LastRefreshTime int64 `protobuf:"varint,5,opt,name=lastRefreshTime,proto3" json:"lastRefreshTime" bson:"lastRefreshTime"` // 上次更新时间 + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` // + Customers []*CustomerInfo `protobuf:"bytes,3,rep,name=customers,proto3" json:"customers" bson:"customers"` // 顾客信息 + Total int32 `protobuf:"varint,4,opt,name=total,proto3" json:"total" bson:"total"` //顾客累计数 + LastRefreshTime int64 `protobuf:"varint,5,opt,name=lastRefreshTime,proto3" json:"lastRefreshTime" bson:"lastRefreshTime"` // 上次更新时间 } func (x *DBCustomer) Reset() { @@ -300,9 +300,9 @@ func (x *DBCustomer) GetUid() string { return "" } -func (x *DBCustomer) GetCustomerEquips() []*CustomerEquip { +func (x *DBCustomer) GetCustomers() []*CustomerInfo { if x != nil { - return x.CustomerEquips + return x.Customers } return nil } @@ -753,86 +753,85 @@ var file_smithy_smithy_db_proto_rawDesc = []byte{ 0x1a, 0x38, 0x0a, 0x0a, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x69, 0x0a, 0x0d, 0x43, 0x75, - 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x63, - 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x65, - 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x71, - 0x75, 0x69, 0x70, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x43, 0x6f, - 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, - 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0xa6, 0x01, 0x0a, 0x0a, 0x44, 0x42, 0x43, 0x75, 0x73, 0x74, - 0x6f, 0x6d, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x36, 0x0a, 0x0e, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, - 0x65, 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, - 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x0e, - 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x73, 0x12, 0x14, - 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, - 0x6f, 0x74, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x66, 0x72, - 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6c, - 0x61, 0x73, 0x74, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x22, 0xba, - 0x01, 0x0a, 0x08, 0x44, 0x42, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, - 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2d, 0x0a, - 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, - 0x44, 0x42, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x2e, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x12, 0x16, 0x0a, 0x06, - 0x73, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x6c, - 0x69, 0x64, 0x65, 0x72, 0x1a, 0x45, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, - 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x55, 0x0a, 0x09, 0x46, - 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1e, 0x0a, 0x0a, 0x66, 0x6f, 0x72, 0x67, - 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x66, 0x6f, - 0x72, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, 0x6c, - 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, - 0x74, 0x79, 0x22, 0x4f, 0x0a, 0x05, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, - 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, - 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, - 0x05, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x54, - 0x69, 0x6d, 0x65, 0x22, 0x5a, 0x0a, 0x0a, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, - 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, - 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, - 0x82, 0x04, 0x0a, 0x08, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x12, 0x0e, 0x0a, 0x02, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, - 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, - 0x0a, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, - 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x23, 0x0a, 0x06, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, - 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, - 0x73, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, - 0x74, 0x65, 0x6d, 0x73, 0x12, 0x2a, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x06, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2e, 0x53, - 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, - 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x12, 0x24, 0x0a, 0x0d, 0x6f, 0x72, - 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, - 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, - 0x6f, 0x6f, 0x72, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x53, 0x6d, - 0x69, 0x74, 0x68, 0x79, 0x2e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x52, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1e, - 0x0a, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0b, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1c, - 0x0a, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x38, 0x0a, 0x0a, - 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x66, 0x0a, 0x0c, 0x43, 0x75, + 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, + 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, + 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x75, + 0x69, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x75, 0x69, 0x74, + 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x43, 0x6f, 0x75, 0x6e, 0x74, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x43, 0x6f, 0x75, + 0x6e, 0x74, 0x22, 0x9b, 0x01, 0x0a, 0x0a, 0x44, 0x42, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, + 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, + 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x75, 0x69, 0x64, 0x12, 0x2b, 0x0a, 0x09, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x73, + 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, + 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x73, + 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65, + 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, + 0x22, 0xba, 0x01, 0x0a, 0x08, 0x44, 0x42, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x12, 0x0e, 0x0a, + 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, + 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, + 0x2d, 0x0a, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x15, 0x2e, 0x44, 0x42, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x2e, 0x54, 0x75, 0x6a, 0x69, 0x61, + 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x12, 0x16, + 0x0a, 0x06, 0x73, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, + 0x73, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x1a, 0x45, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, + 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x55, 0x0a, + 0x09, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1e, 0x0a, 0x0a, 0x66, 0x6f, + 0x72, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, + 0x66, 0x6f, 0x72, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, + 0x61, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x71, 0x75, 0x61, + 0x6c, 0x69, 0x74, 0x79, 0x22, 0x4f, 0x0a, 0x05, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, + 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, + 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, + 0x14, 0x0a, 0x05, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, + 0x73, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x5a, 0x0a, 0x0a, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, + 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, + 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, + 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, + 0x65, 0x22, 0x82, 0x04, 0x0a, 0x08, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x12, 0x0e, + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, + 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, + 0x12, 0x1c, 0x0a, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x06, 0x2e, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x23, + 0x0a, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, + 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x06, 0x6f, 0x72, 0x64, + 0x65, 0x72, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, + 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x2a, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, + 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, + 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, + 0x6c, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x18, 0x07, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x12, 0x24, 0x0a, 0x0d, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, + 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x09, 0x64, 0x65, 0x73, 0x6b, + 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, + 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, + 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0b, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, + 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x38, + 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x44, 0x65, 0x73, 0x6b, + 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, - 0x6f, 0x6f, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -849,28 +848,28 @@ func file_smithy_smithy_db_proto_rawDescGZIP() []byte { var file_smithy_smithy_db_proto_msgTypes = make([]protoimpl.MessageInfo, 15) var file_smithy_smithy_db_proto_goTypes = []interface{}{ - (*Mastery)(nil), // 0: Mastery - (*DBStove)(nil), // 1: DBStove - (*CustomerEquip)(nil), // 2: CustomerEquip - (*DBCustomer)(nil), // 3: DBCustomer - (*DBTujian)(nil), // 4: DBTujian - (*ForgeData)(nil), // 5: ForgeData - (*Clang)(nil), // 6: Clang - (*OrderClang)(nil), // 7: OrderClang - (*DBSmithy)(nil), // 8: DBSmithy - nil, // 9: DBStove.DataEntry - nil, // 10: DBStove.SkillEntry - nil, // 11: DBStove.ForgeEntry - nil, // 12: DBTujian.TujianEntry - nil, // 13: DBSmithy.SkillEntry - nil, // 14: DBSmithy.DeskFloorEntry - (*UserAssets)(nil), // 15: UserAssets + (*Mastery)(nil), // 0: Mastery + (*DBStove)(nil), // 1: DBStove + (*CustomerInfo)(nil), // 2: CustomerInfo + (*DBCustomer)(nil), // 3: DBCustomer + (*DBTujian)(nil), // 4: DBTujian + (*ForgeData)(nil), // 5: ForgeData + (*Clang)(nil), // 6: Clang + (*OrderClang)(nil), // 7: OrderClang + (*DBSmithy)(nil), // 8: DBSmithy + nil, // 9: DBStove.DataEntry + nil, // 10: DBStove.SkillEntry + nil, // 11: DBStove.ForgeEntry + nil, // 12: DBTujian.TujianEntry + nil, // 13: DBSmithy.SkillEntry + nil, // 14: DBSmithy.DeskFloorEntry + (*UserAssets)(nil), // 15: UserAssets } var file_smithy_smithy_db_proto_depIdxs = []int32{ 9, // 0: DBStove.data:type_name -> DBStove.DataEntry 10, // 1: DBStove.skill:type_name -> DBStove.SkillEntry 11, // 2: DBStove.forge:type_name -> DBStove.ForgeEntry - 2, // 3: DBCustomer.customerEquips:type_name -> CustomerEquip + 2, // 3: DBCustomer.customers:type_name -> CustomerInfo 12, // 4: DBTujian.tujian:type_name -> DBTujian.TujianEntry 6, // 5: DBSmithy.clang:type_name -> Clang 7, // 6: DBSmithy.orders:type_name -> OrderClang @@ -918,7 +917,7 @@ func file_smithy_smithy_db_proto_init() { } } file_smithy_smithy_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CustomerEquip); i { + switch v := v.(*CustomerInfo); i { case 0: return &v.state case 1: diff --git a/pb/smithy_msg.pb.go b/pb/smithy_msg.pb.go index 5af8c7846..76fecf44c 100644 --- a/pb/smithy_msg.pb.go +++ b/pb/smithy_msg.pb.go @@ -680,7 +680,7 @@ type SmithyCustomerResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - CustomerEquips []*CustomerEquip `protobuf:"bytes,1,rep,name=customerEquips,proto3" json:"customerEquips"` //顾客及装备信息 + Customers []*CustomerInfo `protobuf:"bytes,1,rep,name=customers,proto3" json:"customers"` //顾客及装备信息 } func (x *SmithyCustomerResp) Reset() { @@ -715,124 +715,13 @@ func (*SmithyCustomerResp) Descriptor() ([]byte, []int) { return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{13} } -func (x *SmithyCustomerResp) GetCustomerEquips() []*CustomerEquip { +func (x *SmithyCustomerResp) GetCustomers() []*CustomerInfo { if x != nil { - return x.CustomerEquips + return x.Customers } return nil } -// 待交易装备 -type SmithyEquipitemReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - CustomerId int32 `protobuf:"varint,1,opt,name=customerId,proto3" json:"customerId"` //顾客ID -} - -func (x *SmithyEquipitemReq) Reset() { - *x = SmithyEquipitemReq{} - if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *SmithyEquipitemReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*SmithyEquipitemReq) ProtoMessage() {} - -func (x *SmithyEquipitemReq) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[14] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use SmithyEquipitemReq.ProtoReflect.Descriptor instead. -func (*SmithyEquipitemReq) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{14} -} - -func (x *SmithyEquipitemReq) GetCustomerId() int32 { - if x != nil { - return x.CustomerId - } - return 0 -} - -type SmithyEquipitemResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - CustomerId int32 `protobuf:"varint,1,opt,name=customerId,proto3" json:"customerId"` //顾客ID - EquipId string `protobuf:"bytes,2,opt,name=equipId,proto3" json:"equipId"` //装备ID - Count int32 `protobuf:"varint,3,opt,name=count,proto3" json:"count"` //装备数量 -} - -func (x *SmithyEquipitemResp) Reset() { - *x = SmithyEquipitemResp{} - if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *SmithyEquipitemResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*SmithyEquipitemResp) ProtoMessage() {} - -func (x *SmithyEquipitemResp) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[15] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use SmithyEquipitemResp.ProtoReflect.Descriptor instead. -func (*SmithyEquipitemResp) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{15} -} - -func (x *SmithyEquipitemResp) GetCustomerId() int32 { - if x != nil { - return x.CustomerId - } - return 0 -} - -func (x *SmithyEquipitemResp) GetEquipId() string { - if x != nil { - return x.EquipId - } - return "" -} - -func (x *SmithyEquipitemResp) GetCount() int32 { - if x != nil { - return x.Count - } - return 0 -} - // 出售装备 type SmithySellReq struct { state protoimpl.MessageState @@ -846,7 +735,7 @@ type SmithySellReq struct { func (x *SmithySellReq) Reset() { *x = SmithySellReq{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[16] + mi := &file_smithy_smithy_msg_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -859,7 +748,7 @@ func (x *SmithySellReq) String() string { func (*SmithySellReq) ProtoMessage() {} func (x *SmithySellReq) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[16] + mi := &file_smithy_smithy_msg_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -872,7 +761,7 @@ func (x *SmithySellReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithySellReq.ProtoReflect.Descriptor instead. func (*SmithySellReq) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{16} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{14} } func (x *SmithySellReq) GetEquipIds() []string { @@ -901,7 +790,7 @@ type SmithySellResp struct { func (x *SmithySellResp) Reset() { *x = SmithySellResp{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[17] + mi := &file_smithy_smithy_msg_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -914,7 +803,7 @@ func (x *SmithySellResp) String() string { func (*SmithySellResp) ProtoMessage() {} func (x *SmithySellResp) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[17] + mi := &file_smithy_smithy_msg_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -927,7 +816,7 @@ func (x *SmithySellResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithySellResp.ProtoReflect.Descriptor instead. func (*SmithySellResp) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{17} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{15} } func (x *SmithySellResp) GetCustomerId() int32 { @@ -957,7 +846,7 @@ type SmithyCreateOrderReq struct { func (x *SmithyCreateOrderReq) Reset() { *x = SmithyCreateOrderReq{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[18] + mi := &file_smithy_smithy_msg_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -970,7 +859,7 @@ func (x *SmithyCreateOrderReq) String() string { func (*SmithyCreateOrderReq) ProtoMessage() {} func (x *SmithyCreateOrderReq) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[18] + mi := &file_smithy_smithy_msg_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -983,7 +872,7 @@ func (x *SmithyCreateOrderReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyCreateOrderReq.ProtoReflect.Descriptor instead. func (*SmithyCreateOrderReq) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{18} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{16} } func (x *SmithyCreateOrderReq) GetOrder() []*OrderClang { @@ -1004,7 +893,7 @@ type SmithyCreateOrderResp struct { func (x *SmithyCreateOrderResp) Reset() { *x = SmithyCreateOrderResp{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[19] + mi := &file_smithy_smithy_msg_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1017,7 +906,7 @@ func (x *SmithyCreateOrderResp) String() string { func (*SmithyCreateOrderResp) ProtoMessage() {} func (x *SmithyCreateOrderResp) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[19] + mi := &file_smithy_smithy_msg_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1030,7 +919,7 @@ func (x *SmithyCreateOrderResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyCreateOrderResp.ProtoReflect.Descriptor instead. func (*SmithyCreateOrderResp) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{19} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{17} } func (x *SmithyCreateOrderResp) GetData() *DBSmithy { @@ -1050,7 +939,7 @@ type SmithyGetRewardReq struct { func (x *SmithyGetRewardReq) Reset() { *x = SmithyGetRewardReq{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[20] + mi := &file_smithy_smithy_msg_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1063,7 +952,7 @@ func (x *SmithyGetRewardReq) String() string { func (*SmithyGetRewardReq) ProtoMessage() {} func (x *SmithyGetRewardReq) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[20] + mi := &file_smithy_smithy_msg_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1076,7 +965,7 @@ func (x *SmithyGetRewardReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyGetRewardReq.ProtoReflect.Descriptor instead. func (*SmithyGetRewardReq) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{20} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{18} } type SmithyGetRewardResp struct { @@ -1090,7 +979,7 @@ type SmithyGetRewardResp struct { func (x *SmithyGetRewardResp) Reset() { *x = SmithyGetRewardResp{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[21] + mi := &file_smithy_smithy_msg_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1103,7 +992,7 @@ func (x *SmithyGetRewardResp) String() string { func (*SmithyGetRewardResp) ProtoMessage() {} func (x *SmithyGetRewardResp) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[21] + mi := &file_smithy_smithy_msg_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1116,7 +1005,7 @@ func (x *SmithyGetRewardResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyGetRewardResp.ProtoReflect.Descriptor instead. func (*SmithyGetRewardResp) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{21} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{19} } func (x *SmithyGetRewardResp) GetData() *DBSmithy { @@ -1138,7 +1027,7 @@ type SmithyDeskSkillLvReq struct { func (x *SmithyDeskSkillLvReq) Reset() { *x = SmithyDeskSkillLvReq{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[22] + mi := &file_smithy_smithy_msg_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1151,7 +1040,7 @@ func (x *SmithyDeskSkillLvReq) String() string { func (*SmithyDeskSkillLvReq) ProtoMessage() {} func (x *SmithyDeskSkillLvReq) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[22] + mi := &file_smithy_smithy_msg_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1164,7 +1053,7 @@ func (x *SmithyDeskSkillLvReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyDeskSkillLvReq.ProtoReflect.Descriptor instead. func (*SmithyDeskSkillLvReq) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{22} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{20} } func (x *SmithyDeskSkillLvReq) GetDeskType() int32 { @@ -1185,7 +1074,7 @@ type SmithyDeskSkillLvResp struct { func (x *SmithyDeskSkillLvResp) Reset() { *x = SmithyDeskSkillLvResp{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[23] + mi := &file_smithy_smithy_msg_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1198,7 +1087,7 @@ func (x *SmithyDeskSkillLvResp) String() string { func (*SmithyDeskSkillLvResp) ProtoMessage() {} func (x *SmithyDeskSkillLvResp) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[23] + mi := &file_smithy_smithy_msg_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1211,7 +1100,7 @@ func (x *SmithyDeskSkillLvResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyDeskSkillLvResp.ProtoReflect.Descriptor instead. func (*SmithyDeskSkillLvResp) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{23} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{21} } func (x *SmithyDeskSkillLvResp) GetData() *DBSmithy { @@ -1231,7 +1120,7 @@ type SmithyStoveSkillLvReq struct { func (x *SmithyStoveSkillLvReq) Reset() { *x = SmithyStoveSkillLvReq{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[24] + mi := &file_smithy_smithy_msg_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1244,7 +1133,7 @@ func (x *SmithyStoveSkillLvReq) String() string { func (*SmithyStoveSkillLvReq) ProtoMessage() {} func (x *SmithyStoveSkillLvReq) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[24] + mi := &file_smithy_smithy_msg_proto_msgTypes[22] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1257,7 +1146,7 @@ func (x *SmithyStoveSkillLvReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyStoveSkillLvReq.ProtoReflect.Descriptor instead. func (*SmithyStoveSkillLvReq) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{24} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{22} } type SmithyStoveSkillLvResp struct { @@ -1271,7 +1160,7 @@ type SmithyStoveSkillLvResp struct { func (x *SmithyStoveSkillLvResp) Reset() { *x = SmithyStoveSkillLvResp{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[25] + mi := &file_smithy_smithy_msg_proto_msgTypes[23] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1284,7 +1173,7 @@ func (x *SmithyStoveSkillLvResp) String() string { func (*SmithyStoveSkillLvResp) ProtoMessage() {} func (x *SmithyStoveSkillLvResp) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[25] + mi := &file_smithy_smithy_msg_proto_msgTypes[23] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1297,7 +1186,7 @@ func (x *SmithyStoveSkillLvResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyStoveSkillLvResp.ProtoReflect.Descriptor instead. func (*SmithyStoveSkillLvResp) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{25} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{23} } func (x *SmithyStoveSkillLvResp) GetData() *DBSmithy { @@ -1318,7 +1207,7 @@ type SmithyGetRandUserReq struct { func (x *SmithyGetRandUserReq) Reset() { *x = SmithyGetRandUserReq{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[26] + mi := &file_smithy_smithy_msg_proto_msgTypes[24] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1331,7 +1220,7 @@ func (x *SmithyGetRandUserReq) String() string { func (*SmithyGetRandUserReq) ProtoMessage() {} func (x *SmithyGetRandUserReq) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[26] + mi := &file_smithy_smithy_msg_proto_msgTypes[24] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1344,7 +1233,7 @@ func (x *SmithyGetRandUserReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyGetRandUserReq.ProtoReflect.Descriptor instead. func (*SmithyGetRandUserReq) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{26} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{24} } func (x *SmithyGetRandUserReq) GetPeople() int32 { @@ -1365,7 +1254,7 @@ type SmithyGetRandUserResp struct { func (x *SmithyGetRandUserResp) Reset() { *x = SmithyGetRandUserResp{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[27] + mi := &file_smithy_smithy_msg_proto_msgTypes[25] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1378,7 +1267,7 @@ func (x *SmithyGetRandUserResp) String() string { func (*SmithyGetRandUserResp) ProtoMessage() {} func (x *SmithyGetRandUserResp) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[27] + mi := &file_smithy_smithy_msg_proto_msgTypes[25] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1391,7 +1280,7 @@ func (x *SmithyGetRandUserResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyGetRandUserResp.ProtoReflect.Descriptor instead. func (*SmithyGetRandUserResp) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{27} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{25} } func (x *SmithyGetRandUserResp) GetUser() []*DBUser { @@ -1410,7 +1299,7 @@ type SmithyGetListReq struct { func (x *SmithyGetListReq) Reset() { *x = SmithyGetListReq{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[28] + mi := &file_smithy_smithy_msg_proto_msgTypes[26] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1423,7 +1312,7 @@ func (x *SmithyGetListReq) String() string { func (*SmithyGetListReq) ProtoMessage() {} func (x *SmithyGetListReq) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[28] + mi := &file_smithy_smithy_msg_proto_msgTypes[26] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1436,7 +1325,7 @@ func (x *SmithyGetListReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyGetListReq.ProtoReflect.Descriptor instead. func (*SmithyGetListReq) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{28} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{26} } // 返回进度信息 @@ -1451,7 +1340,7 @@ type SmithyGetListResp struct { func (x *SmithyGetListResp) Reset() { *x = SmithyGetListResp{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[29] + mi := &file_smithy_smithy_msg_proto_msgTypes[27] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1464,7 +1353,7 @@ func (x *SmithyGetListResp) String() string { func (*SmithyGetListResp) ProtoMessage() {} func (x *SmithyGetListResp) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[29] + mi := &file_smithy_smithy_msg_proto_msgTypes[27] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1477,7 +1366,7 @@ func (x *SmithyGetListResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyGetListResp.ProtoReflect.Descriptor instead. func (*SmithyGetListResp) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{29} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{27} } func (x *SmithyGetListResp) GetData() *DBSmithy { @@ -1540,67 +1429,57 @@ var file_smithy_smithy_msg_proto_rawDesc = []byte{ 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x13, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73, - 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x52, 0x65, 0x71, 0x22, 0x4c, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, - 0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x36, - 0x0a, 0x0e, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x73, - 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, - 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x0e, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, - 0x45, 0x71, 0x75, 0x69, 0x70, 0x73, 0x22, 0x34, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, - 0x45, 0x71, 0x75, 0x69, 0x70, 0x69, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, - 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x22, 0x65, 0x0a, 0x13, - 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x45, 0x71, 0x75, 0x69, 0x70, 0x69, 0x74, 0x65, 0x6d, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, - 0x72, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x12, 0x14, 0x0a, - 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x22, 0x4b, 0x0a, 0x0d, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x65, 0x6c, - 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, - 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, - 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, - 0x22, 0x4c, 0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, - 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, - 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x18, 0x02, - 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x22, 0x39, - 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, - 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x21, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, - 0x6e, 0x67, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69, - 0x74, 0x68, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, + 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x52, 0x65, 0x71, 0x22, 0x41, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, + 0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2b, + 0x0a, 0x09, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, + 0x52, 0x09, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x73, 0x22, 0x4b, 0x0a, 0x0d, 0x53, + 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, + 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, + 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74, + 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x75, + 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x22, 0x4c, 0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74, + 0x68, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, + 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, + 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x71, + 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x65, 0x71, + 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x22, 0x39, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, + 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x21, + 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, + 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6d, 0x69, + 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, + 0x34, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, + 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, + 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x32, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x44, + 0x65, 0x73, 0x6b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, + 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69, + 0x74, 0x68, 0x79, 0x44, 0x65, 0x73, 0x6b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, - 0x61, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, - 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, - 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, - 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, - 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x32, 0x0a, - 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x44, 0x65, 0x73, 0x6b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, - 0x4c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, - 0x65, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x44, 0x65, 0x73, 0x6b, 0x53, - 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, - 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x17, 0x0a, 0x15, 0x53, 0x6d, 0x69, - 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, - 0x65, 0x71, 0x22, 0x37, 0x0a, 0x16, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, - 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, - 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, - 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x14, 0x53, - 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, - 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x65, 0x6f, 0x70, 0x6c, 0x65, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x65, 0x6f, 0x70, 0x6c, 0x65, 0x22, 0x34, 0x0a, 0x15, 0x53, - 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, - 0x72, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, - 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, - 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, - 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, - 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x22, 0x17, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, + 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x16, 0x53, 0x6d, + 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, + 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, + 0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x70, + 0x65, 0x6f, 0x70, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x65, 0x6f, + 0x70, 0x6c, 0x65, 0x22, 0x34, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, + 0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, + 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, + 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6d, 0x69, + 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, + 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, + 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( @@ -1615,7 +1494,7 @@ func file_smithy_smithy_msg_proto_rawDescGZIP() []byte { return file_smithy_smithy_msg_proto_rawDescData } -var file_smithy_smithy_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 30) +var file_smithy_smithy_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 28) var file_smithy_smithy_msg_proto_goTypes = []interface{}{ (*SmithyGetStoveInfoReq)(nil), // 0: SmithyGetStoveInfoReq (*SmithyGetStoveInfoResp)(nil), // 1: SmithyGetStoveInfoResp @@ -1631,43 +1510,41 @@ var file_smithy_smithy_msg_proto_goTypes = []interface{}{ (*SmithyToolsUpResp)(nil), // 11: SmithyToolsUpResp (*SmithyCustomerReq)(nil), // 12: SmithyCustomerReq (*SmithyCustomerResp)(nil), // 13: SmithyCustomerResp - (*SmithyEquipitemReq)(nil), // 14: SmithyEquipitemReq - (*SmithyEquipitemResp)(nil), // 15: SmithyEquipitemResp - (*SmithySellReq)(nil), // 16: SmithySellReq - (*SmithySellResp)(nil), // 17: SmithySellResp - (*SmithyCreateOrderReq)(nil), // 18: SmithyCreateOrderReq - (*SmithyCreateOrderResp)(nil), // 19: SmithyCreateOrderResp - (*SmithyGetRewardReq)(nil), // 20: SmithyGetRewardReq - (*SmithyGetRewardResp)(nil), // 21: SmithyGetRewardResp - (*SmithyDeskSkillLvReq)(nil), // 22: SmithyDeskSkillLvReq - (*SmithyDeskSkillLvResp)(nil), // 23: SmithyDeskSkillLvResp - (*SmithyStoveSkillLvReq)(nil), // 24: SmithyStoveSkillLvReq - (*SmithyStoveSkillLvResp)(nil), // 25: SmithyStoveSkillLvResp - (*SmithyGetRandUserReq)(nil), // 26: SmithyGetRandUserReq - (*SmithyGetRandUserResp)(nil), // 27: SmithyGetRandUserResp - (*SmithyGetListReq)(nil), // 28: SmithyGetListReq - (*SmithyGetListResp)(nil), // 29: SmithyGetListResp - (*DBStove)(nil), // 30: DBStove - (*CustomerEquip)(nil), // 31: CustomerEquip - (*OrderClang)(nil), // 32: OrderClang - (*DBSmithy)(nil), // 33: DBSmithy - (*DBUser)(nil), // 34: DBUser + (*SmithySellReq)(nil), // 14: SmithySellReq + (*SmithySellResp)(nil), // 15: SmithySellResp + (*SmithyCreateOrderReq)(nil), // 16: SmithyCreateOrderReq + (*SmithyCreateOrderResp)(nil), // 17: SmithyCreateOrderResp + (*SmithyGetRewardReq)(nil), // 18: SmithyGetRewardReq + (*SmithyGetRewardResp)(nil), // 19: SmithyGetRewardResp + (*SmithyDeskSkillLvReq)(nil), // 20: SmithyDeskSkillLvReq + (*SmithyDeskSkillLvResp)(nil), // 21: SmithyDeskSkillLvResp + (*SmithyStoveSkillLvReq)(nil), // 22: SmithyStoveSkillLvReq + (*SmithyStoveSkillLvResp)(nil), // 23: SmithyStoveSkillLvResp + (*SmithyGetRandUserReq)(nil), // 24: SmithyGetRandUserReq + (*SmithyGetRandUserResp)(nil), // 25: SmithyGetRandUserResp + (*SmithyGetListReq)(nil), // 26: SmithyGetListReq + (*SmithyGetListResp)(nil), // 27: SmithyGetListResp + (*DBStove)(nil), // 28: DBStove + (*CustomerInfo)(nil), // 29: CustomerInfo + (*OrderClang)(nil), // 30: OrderClang + (*DBSmithy)(nil), // 31: DBSmithy + (*DBUser)(nil), // 32: DBUser } var file_smithy_smithy_msg_proto_depIdxs = []int32{ - 30, // 0: SmithyGetStoveInfoResp.data:type_name -> DBStove - 30, // 1: SmithyForgeEquipResp.data:type_name -> DBStove - 30, // 2: SmithyOrderEquipResp.data:type_name -> DBStove - 30, // 3: SmithyStoveUpResp.data:type_name -> DBStove - 30, // 4: SmithyRiseResp.data:type_name -> DBStove - 30, // 5: SmithyToolsUpResp.data:type_name -> DBStove - 31, // 6: SmithyCustomerResp.customerEquips:type_name -> CustomerEquip - 32, // 7: SmithyCreateOrderReq.order:type_name -> OrderClang - 33, // 8: SmithyCreateOrderResp.data:type_name -> DBSmithy - 33, // 9: SmithyGetRewardResp.data:type_name -> DBSmithy - 33, // 10: SmithyDeskSkillLvResp.data:type_name -> DBSmithy - 33, // 11: SmithyStoveSkillLvResp.data:type_name -> DBSmithy - 34, // 12: SmithyGetRandUserResp.user:type_name -> DBUser - 33, // 13: SmithyGetListResp.data:type_name -> DBSmithy + 28, // 0: SmithyGetStoveInfoResp.data:type_name -> DBStove + 28, // 1: SmithyForgeEquipResp.data:type_name -> DBStove + 28, // 2: SmithyOrderEquipResp.data:type_name -> DBStove + 28, // 3: SmithyStoveUpResp.data:type_name -> DBStove + 28, // 4: SmithyRiseResp.data:type_name -> DBStove + 28, // 5: SmithyToolsUpResp.data:type_name -> DBStove + 29, // 6: SmithyCustomerResp.customers:type_name -> CustomerInfo + 30, // 7: SmithyCreateOrderReq.order:type_name -> OrderClang + 31, // 8: SmithyCreateOrderResp.data:type_name -> DBSmithy + 31, // 9: SmithyGetRewardResp.data:type_name -> DBSmithy + 31, // 10: SmithyDeskSkillLvResp.data:type_name -> DBSmithy + 31, // 11: SmithyStoveSkillLvResp.data:type_name -> DBSmithy + 32, // 12: SmithyGetRandUserResp.user:type_name -> DBUser + 31, // 13: SmithyGetListResp.data:type_name -> DBSmithy 14, // [14:14] is the sub-list for method output_type 14, // [14:14] is the sub-list for method input_type 14, // [14:14] is the sub-list for extension type_name @@ -1852,30 +1729,6 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyEquipitemReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_smithy_smithy_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyEquipitemResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_smithy_smithy_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SmithySellReq); i { case 0: return &v.state @@ -1887,7 +1740,7 @@ func file_smithy_smithy_msg_proto_init() { return nil } } - file_smithy_smithy_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { + file_smithy_smithy_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SmithySellResp); i { case 0: return &v.state @@ -1899,7 +1752,7 @@ func file_smithy_smithy_msg_proto_init() { return nil } } - file_smithy_smithy_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + file_smithy_smithy_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SmithyCreateOrderReq); i { case 0: return &v.state @@ -1911,7 +1764,7 @@ func file_smithy_smithy_msg_proto_init() { return nil } } - file_smithy_smithy_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + file_smithy_smithy_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SmithyCreateOrderResp); i { case 0: return &v.state @@ -1923,7 +1776,7 @@ func file_smithy_smithy_msg_proto_init() { return nil } } - file_smithy_smithy_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { + file_smithy_smithy_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SmithyGetRewardReq); i { case 0: return &v.state @@ -1935,7 +1788,7 @@ func file_smithy_smithy_msg_proto_init() { return nil } } - file_smithy_smithy_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { + file_smithy_smithy_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SmithyGetRewardResp); i { case 0: return &v.state @@ -1947,7 +1800,7 @@ func file_smithy_smithy_msg_proto_init() { return nil } } - file_smithy_smithy_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { + file_smithy_smithy_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SmithyDeskSkillLvReq); i { case 0: return &v.state @@ -1959,7 +1812,7 @@ func file_smithy_smithy_msg_proto_init() { return nil } } - file_smithy_smithy_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { + file_smithy_smithy_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SmithyDeskSkillLvResp); i { case 0: return &v.state @@ -1971,7 +1824,7 @@ func file_smithy_smithy_msg_proto_init() { return nil } } - file_smithy_smithy_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { + file_smithy_smithy_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SmithyStoveSkillLvReq); i { case 0: return &v.state @@ -1983,7 +1836,7 @@ func file_smithy_smithy_msg_proto_init() { return nil } } - file_smithy_smithy_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { + file_smithy_smithy_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SmithyStoveSkillLvResp); i { case 0: return &v.state @@ -1995,7 +1848,7 @@ func file_smithy_smithy_msg_proto_init() { return nil } } - file_smithy_smithy_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { + file_smithy_smithy_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SmithyGetRandUserReq); i { case 0: return &v.state @@ -2007,7 +1860,7 @@ func file_smithy_smithy_msg_proto_init() { return nil } } - file_smithy_smithy_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { + file_smithy_smithy_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SmithyGetRandUserResp); i { case 0: return &v.state @@ -2019,7 +1872,7 @@ func file_smithy_smithy_msg_proto_init() { return nil } } - file_smithy_smithy_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { + file_smithy_smithy_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SmithyGetListReq); i { case 0: return &v.state @@ -2031,7 +1884,7 @@ func file_smithy_smithy_msg_proto_init() { return nil } } - file_smithy_smithy_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { + file_smithy_smithy_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SmithyGetListResp); i { case 0: return &v.state @@ -2050,7 +1903,7 @@ func file_smithy_smithy_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_smithy_smithy_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 30, + NumMessages: 28, NumExtensions: 0, NumServices: 0, }, From e9d658a44120608f6121699b218f4f9e07c85c65 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 17 Feb 2023 19:23:48 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E5=86=99=E9=94=99?= =?UTF-8?q?=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/friend/api_cross_stop.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/friend/api_cross_stop.go b/modules/friend/api_cross_stop.go index f61e3d0d4..eb764cbab 100644 --- a/modules/friend/api_cross_stop.go +++ b/modules/friend/api_cross_stop.go @@ -23,7 +23,7 @@ func (this *apiComp) Stop(session comm.IUserSession, req *pb.FriendStopReq) (cod resp := &pb.FriendStopResp{ IsSucc: true, } - if err := session.SendMsg(string(this.moduleFriend.GetType()), FriendSubTypeQiecuo, resp); err != nil { + if err := session.SendMsg(string(this.moduleFriend.GetType()), "stop", resp); err != nil { code = pb.ErrorCode_SystemError return } From 53b2cca605271f91353998388e58dfbf9abfcaed Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 17 Feb 2023 19:33:10 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E6=8C=91=E6=88=98?= =?UTF-8?q?=E5=8D=B7=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/items/modelitems.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/items/modelitems.go b/modules/items/modelitems.go index d7e795f26..f54cb2c3b 100644 --- a/modules/items/modelitems.go +++ b/modules/items/modelitems.go @@ -497,8 +497,16 @@ func (this *ModelItemsComp) buyTicket(session comm.IUserSession, buy int32) (inf if code = this.module.ConsumeRes(session, needs, true); code != pb.ErrorCode_Success { return } + + atn := this.module.configure.GetGlobalConf().CopsBuyGet + + res := &cfg.Gameatn{ + A: atn.A, + T: atn.T, + N: atn.N * buy, + } info.Buyunifiedticket += buy - if code = this.module.DispenseRes(session, []*cfg.Gameatn{{A: comm.ItemType, T: comm.UnifiedTicket, N: buy}}, true); code != pb.ErrorCode_Success { + if code = this.module.DispenseRes(session, []*cfg.Gameatn{res}, true); code != pb.ErrorCode_Success { return } this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{ From 146b6ae78c6d4c81493288e9f4844c440693ff19 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 17 Feb 2023 19:52:34 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=88=86=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_drawcard.json | 36 +- bin/json/game_drop.json | 964 ++++++++++++++----- bin/json/game_global.json | 6 +- bin/json/game_hero.json | 965 +++----------------- bin/json/game_msgdistrib.json | 6 + bin/json/game_newsmithy.json | 75 -- bin/json/game_smithytool.json | 50 +- sys/configure/structs/Game.NewSmithyData.go | 2 - sys/configure/structs/game.DropData.go | 4 + sys/configure/structs/game.globalData.go | 15 + 10 files changed, 923 insertions(+), 1200 deletions(-) diff --git a/bin/json/game_drawcard.json b/bin/json/game_drawcard.json index b50ced312..a3892dfaa 100644 --- a/bin/json/game_drawcard.json +++ b/bin/json/game_drawcard.json @@ -5,7 +5,7 @@ "card_pool_type": "base_pool1", "star": 3, "race": 1, - "id": "15005", + "id": "35006", "weight": 1000 }, { @@ -14,7 +14,7 @@ "card_pool_type": "base_pool1", "star": 4, "race": 1, - "id": "15005", + "id": "35006", "weight": 1000 }, { @@ -23,7 +23,7 @@ "card_pool_type": "base_pool1", "star": 5, "race": 1, - "id": "15005", + "id": "35006", "weight": 1000 }, { @@ -32,7 +32,7 @@ "card_pool_type": "base_pool2", "star": 3, "race": 1, - "id": "24005", + "id": "34007", "weight": 1000 }, { @@ -41,7 +41,7 @@ "card_pool_type": "base_pool2", "star": 4, "race": 1, - "id": "24005", + "id": "34007", "weight": 1000 }, { @@ -50,7 +50,7 @@ "card_pool_type": "base_pool2", "star": 5, "race": 1, - "id": "24005", + "id": "34007", "weight": 1000 }, { @@ -59,7 +59,7 @@ "card_pool_type": "base_pool3", "star": 3, "race": 1, - "id": "14001", + "id": "45003", "weight": 1000 }, { @@ -68,7 +68,7 @@ "card_pool_type": "base_pool3", "star": 4, "race": 1, - "id": "14001", + "id": "45003", "weight": 1000 }, { @@ -77,7 +77,7 @@ "card_pool_type": "base_pool3", "star": 5, "race": 1, - "id": "14001", + "id": "45003", "weight": 1000 }, { @@ -86,7 +86,7 @@ "card_pool_type": "base_pool4", "star": 3, "race": 1, - "id": "14003", + "id": "14007", "weight": 1000 }, { @@ -95,7 +95,7 @@ "card_pool_type": "base_pool4", "star": 4, "race": 1, - "id": "14003", + "id": "14007", "weight": 1000 }, { @@ -104,7 +104,7 @@ "card_pool_type": "base_pool4", "star": 5, "race": 1, - "id": "14003", + "id": "14007", "weight": 1000 }, { @@ -113,7 +113,7 @@ "card_pool_type": "base_pool5", "star": 3, "race": 1, - "id": "35006", + "id": "34006", "weight": 1000 }, { @@ -122,7 +122,7 @@ "card_pool_type": "base_pool5", "star": 4, "race": 1, - "id": "35006", + "id": "34006", "weight": 1000 }, { @@ -131,7 +131,7 @@ "card_pool_type": "base_pool5", "star": 5, "race": 1, - "id": "35006", + "id": "34006", "weight": 1000 }, { @@ -140,7 +140,7 @@ "card_pool_type": "base_pool6", "star": 3, "race": 1, - "id": "34007", + "id": "34002", "weight": 1000 }, { @@ -149,7 +149,7 @@ "card_pool_type": "base_pool6", "star": 4, "race": 1, - "id": "34007", + "id": "34002", "weight": 1000 }, { @@ -158,7 +158,7 @@ "card_pool_type": "base_pool6", "star": 5, "race": 1, - "id": "34007", + "id": "34002", "weight": 1000 }, { diff --git a/bin/json/game_drop.json b/bin/json/game_drop.json index 16c066695..5e58be268 100644 --- a/bin/json/game_drop.json +++ b/bin/json/game_drop.json @@ -10,7 +10,9 @@ } ], "star": 1, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 2, @@ -23,7 +25,9 @@ } ], "star": 1, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 3, @@ -36,7 +40,9 @@ } ], "star": 1, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 4, @@ -49,7 +55,9 @@ } ], "star": 1, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 5, @@ -62,7 +70,9 @@ } ], "star": 1, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 6, @@ -75,7 +85,9 @@ } ], "star": 1, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 7, @@ -88,7 +100,9 @@ } ], "star": 1, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 8, @@ -101,7 +115,9 @@ } ], "star": 1, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 9, @@ -114,7 +130,9 @@ } ], "star": 1, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 10, @@ -127,7 +145,9 @@ } ], "star": 1, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 11, @@ -140,7 +160,9 @@ } ], "star": 1, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 12, @@ -153,7 +175,9 @@ } ], "star": 1, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 13, @@ -166,7 +190,9 @@ } ], "star": 1, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 14, @@ -179,7 +205,9 @@ } ], "star": 1, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 15, @@ -192,7 +220,9 @@ } ], "star": 1, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 16, @@ -205,7 +235,9 @@ } ], "star": 2, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 17, @@ -218,7 +250,9 @@ } ], "star": 2, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 18, @@ -231,7 +265,9 @@ } ], "star": 2, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 19, @@ -244,7 +280,9 @@ } ], "star": 2, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 20, @@ -257,7 +295,9 @@ } ], "star": 2, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 21, @@ -270,7 +310,9 @@ } ], "star": 2, - "p": 333 + "p": 333, + "enable_type": 1, + "condition": 9 }, { "id": 22, @@ -283,7 +325,9 @@ } ], "star": 3, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 23, @@ -296,7 +340,9 @@ } ], "star": 3, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 24, @@ -309,7 +355,9 @@ } ], "star": 3, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 25, @@ -322,7 +370,9 @@ } ], "star": 3, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 26, @@ -335,7 +385,9 @@ } ], "star": 3, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 27, @@ -348,7 +400,9 @@ } ], "star": 3, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 28, @@ -361,7 +415,9 @@ } ], "star": 4, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 29, @@ -374,7 +430,9 @@ } ], "star": 4, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 30, @@ -387,7 +445,9 @@ } ], "star": 4, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 31, @@ -400,7 +460,9 @@ } ], "star": 4, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 32, @@ -413,7 +475,9 @@ } ], "star": 4, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 33, @@ -426,7 +490,9 @@ } ], "star": 4, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 34, @@ -439,7 +505,9 @@ } ], "star": 5, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 35, @@ -452,7 +520,9 @@ } ], "star": 5, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 36, @@ -465,7 +535,9 @@ } ], "star": 5, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 37, @@ -478,7 +550,9 @@ } ], "star": 5, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 38, @@ -491,7 +565,9 @@ } ], "star": 5, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 39, @@ -504,7 +580,9 @@ } ], "star": 5, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 40, @@ -517,7 +595,9 @@ } ], "star": 6, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 41, @@ -530,7 +610,9 @@ } ], "star": 6, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 42, @@ -543,7 +625,9 @@ } ], "star": 6, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 43, @@ -556,7 +640,9 @@ } ], "star": 6, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 44, @@ -569,7 +655,9 @@ } ], "star": 6, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 45, @@ -582,7 +670,9 @@ } ], "star": 6, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 46, @@ -595,7 +685,9 @@ } ], "star": 1, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 47, @@ -608,7 +700,9 @@ } ], "star": 1, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 48, @@ -621,7 +715,9 @@ } ], "star": 1, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 49, @@ -634,7 +730,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 50, @@ -647,7 +745,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 51, @@ -660,7 +760,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 52, @@ -673,7 +775,9 @@ } ], "star": 2, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 53, @@ -686,7 +790,9 @@ } ], "star": 2, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 54, @@ -699,7 +805,9 @@ } ], "star": 2, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 55, @@ -712,7 +820,9 @@ } ], "star": 2, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 56, @@ -725,7 +835,9 @@ } ], "star": 2, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 57, @@ -738,7 +850,9 @@ } ], "star": 2, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 58, @@ -751,7 +865,9 @@ } ], "star": 3, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 59, @@ -764,7 +880,9 @@ } ], "star": 3, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 60, @@ -777,7 +895,9 @@ } ], "star": 3, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 61, @@ -790,7 +910,9 @@ } ], "star": 3, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 62, @@ -803,7 +925,9 @@ } ], "star": 3, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 63, @@ -816,7 +940,9 @@ } ], "star": 3, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 64, @@ -829,7 +955,9 @@ } ], "star": 4, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 65, @@ -842,7 +970,9 @@ } ], "star": 4, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 66, @@ -855,7 +985,9 @@ } ], "star": 4, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 67, @@ -868,7 +1000,9 @@ } ], "star": 4, - "p": 333 + "p": 333, + "enable_type": 0, + "condition": 0 }, { "id": 68, @@ -881,7 +1015,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 69, @@ -894,7 +1030,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 70, @@ -907,7 +1045,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 71, @@ -920,7 +1060,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 72, @@ -933,7 +1075,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 73, @@ -946,7 +1090,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 74, @@ -959,7 +1105,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 75, @@ -972,7 +1120,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 76, @@ -985,7 +1135,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 77, @@ -998,7 +1150,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 78, @@ -1011,7 +1165,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 79, @@ -1024,7 +1180,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 80, @@ -1037,7 +1195,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 81, @@ -1050,7 +1210,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 82, @@ -1063,7 +1225,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 83, @@ -1076,7 +1240,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 84, @@ -1089,7 +1255,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 85, @@ -1102,7 +1270,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 86, @@ -1115,7 +1285,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 87, @@ -1128,7 +1300,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 88, @@ -1141,7 +1315,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 89, @@ -1154,7 +1330,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 90, @@ -1167,7 +1345,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 91, @@ -1180,7 +1360,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 92, @@ -1193,7 +1375,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 93, @@ -1206,7 +1390,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 94, @@ -1219,7 +1405,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 95, @@ -1232,7 +1420,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 96, @@ -1245,7 +1435,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 97, @@ -1258,7 +1450,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 98, @@ -1271,7 +1465,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 99, @@ -1284,7 +1480,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 100, @@ -1297,7 +1495,9 @@ } ], "star": 1, - "p": 250 + "p": 250, + "enable_type": 0, + "condition": 0 }, { "id": 101, @@ -1310,7 +1510,9 @@ } ], "star": 1, - "p": 67 + "p": 67, + "enable_type": 0, + "condition": 0 }, { "id": 102, @@ -1323,7 +1525,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 103, @@ -1336,7 +1540,9 @@ } ], "star": 1, - "p": 250 + "p": 250, + "enable_type": 0, + "condition": 0 }, { "id": 104, @@ -1349,7 +1555,9 @@ } ], "star": 1, - "p": 67 + "p": 67, + "enable_type": 0, + "condition": 0 }, { "id": 105, @@ -1362,7 +1570,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 106, @@ -1375,7 +1585,9 @@ } ], "star": 1, - "p": 250 + "p": 250, + "enable_type": 0, + "condition": 0 }, { "id": 107, @@ -1388,7 +1600,9 @@ } ], "star": 1, - "p": 67 + "p": 67, + "enable_type": 0, + "condition": 0 }, { "id": 108, @@ -1401,7 +1615,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 109, @@ -1414,7 +1630,9 @@ } ], "star": 1, - "p": 250 + "p": 250, + "enable_type": 0, + "condition": 0 }, { "id": 110, @@ -1427,7 +1645,9 @@ } ], "star": 1, - "p": 67 + "p": 67, + "enable_type": 0, + "condition": 0 }, { "id": 111, @@ -1440,7 +1660,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 112, @@ -1453,7 +1675,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 113, @@ -1466,7 +1690,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 114, @@ -1479,7 +1705,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 115, @@ -1492,7 +1720,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 116, @@ -1505,7 +1735,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 117, @@ -1518,7 +1750,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 118, @@ -1531,7 +1765,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 119, @@ -1544,7 +1780,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 120, @@ -1557,7 +1795,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 121, @@ -1570,7 +1810,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 122, @@ -1583,7 +1825,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 123, @@ -1596,7 +1840,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 124, @@ -1609,7 +1855,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 125, @@ -1622,7 +1870,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 126, @@ -1635,7 +1885,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 127, @@ -1648,7 +1900,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 128, @@ -1661,7 +1915,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 129, @@ -1674,7 +1930,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 130, @@ -1687,7 +1945,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 131, @@ -1700,7 +1960,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 132, @@ -1713,7 +1975,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 133, @@ -1726,7 +1990,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 134, @@ -1739,7 +2005,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 135, @@ -1752,7 +2020,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 136, @@ -1765,7 +2035,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 137, @@ -1778,7 +2050,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 138, @@ -1791,7 +2065,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 139, @@ -1804,7 +2080,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 140, @@ -1817,7 +2095,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 141, @@ -1830,7 +2110,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 142, @@ -1843,7 +2125,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 143, @@ -1856,7 +2140,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 144, @@ -1869,7 +2155,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 145, @@ -1882,7 +2170,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 146, @@ -1895,7 +2185,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 147, @@ -1908,7 +2200,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 148, @@ -1921,7 +2215,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 149, @@ -1934,7 +2230,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 150, @@ -1947,7 +2245,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 151, @@ -1960,7 +2260,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 152, @@ -1973,7 +2275,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 153, @@ -1986,7 +2290,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 154, @@ -1999,7 +2305,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 155, @@ -2012,7 +2320,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 156, @@ -2025,7 +2335,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 157, @@ -2038,7 +2350,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 158, @@ -2051,7 +2365,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 159, @@ -2064,7 +2380,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 160, @@ -2077,7 +2395,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 161, @@ -2090,7 +2410,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 162, @@ -2103,7 +2425,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 163, @@ -2116,7 +2440,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 164, @@ -2129,7 +2455,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 165, @@ -2142,7 +2470,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 166, @@ -2155,7 +2485,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 167, @@ -2168,7 +2500,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 168, @@ -2181,7 +2515,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 169, @@ -2194,7 +2530,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 170, @@ -2207,7 +2545,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 171, @@ -2220,7 +2560,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 172, @@ -2233,7 +2575,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 173, @@ -2246,7 +2590,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 174, @@ -2259,7 +2605,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 175, @@ -2272,7 +2620,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 176, @@ -2285,7 +2635,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 177, @@ -2298,7 +2650,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 178, @@ -2311,7 +2665,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 179, @@ -2324,7 +2680,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 180, @@ -2337,7 +2695,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 181, @@ -2350,7 +2710,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 182, @@ -2363,7 +2725,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 183, @@ -2376,7 +2740,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 184, @@ -2389,7 +2755,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 185, @@ -2402,7 +2770,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 186, @@ -2415,7 +2785,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 187, @@ -2428,7 +2800,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 188, @@ -2441,7 +2815,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 189, @@ -2454,7 +2830,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 190, @@ -2467,7 +2845,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 191, @@ -2480,7 +2860,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 192, @@ -2493,7 +2875,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 193, @@ -2506,7 +2890,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 194, @@ -2519,7 +2905,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 195, @@ -2532,7 +2920,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 196, @@ -2545,7 +2935,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 197, @@ -2558,7 +2950,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 198, @@ -2571,7 +2965,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 199, @@ -2584,7 +2980,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 200, @@ -2597,7 +2995,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 201, @@ -2610,7 +3010,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 202, @@ -2623,7 +3025,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 203, @@ -2636,7 +3040,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 204, @@ -2649,7 +3055,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 205, @@ -2662,7 +3070,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 206, @@ -2675,7 +3085,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 207, @@ -2688,7 +3100,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 208, @@ -2701,7 +3115,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 209, @@ -2714,7 +3130,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 210, @@ -2727,7 +3145,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 211, @@ -2740,7 +3160,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 212, @@ -2753,7 +3175,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 213, @@ -2766,7 +3190,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 214, @@ -2779,7 +3205,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 215, @@ -2792,7 +3220,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 216, @@ -2805,7 +3235,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 217, @@ -2818,7 +3250,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 218, @@ -2831,7 +3265,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 219, @@ -2844,7 +3280,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 220, @@ -2857,7 +3295,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 221, @@ -2870,7 +3310,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 222, @@ -2883,7 +3325,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 223, @@ -2896,7 +3340,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 224, @@ -2909,7 +3355,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 225, @@ -2922,7 +3370,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 226, @@ -2935,7 +3385,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 227, @@ -2948,7 +3400,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 228, @@ -2961,7 +3415,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 229, @@ -2974,7 +3430,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 230, @@ -2987,7 +3445,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 231, @@ -3000,7 +3460,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 232, @@ -3013,7 +3475,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 233, @@ -3026,7 +3490,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 234, @@ -3039,7 +3505,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 235, @@ -3052,7 +3520,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 236, @@ -3065,7 +3535,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 237, @@ -3078,7 +3550,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 238, @@ -3091,7 +3565,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 239, @@ -3104,7 +3580,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 240, @@ -3117,7 +3595,9 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 }, { "id": 241, @@ -3130,6 +3610,8 @@ } ], "star": 1, - "p": 1000 + "p": 1000, + "enable_type": 0, + "condition": 0 } ] \ No newline at end of file diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 0e5c07f48..119d6ad13 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -543,6 +543,10 @@ "a": "item", "t": "500000", "n": 0 - } + }, + "smithy_PurchaseType": [ + 50, + 50 + ] } ] \ No newline at end of file diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index 251619978..3ceadf6b6 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -6,7 +6,7 @@ "text": "闪闪" }, "star": 3, - "color": 2, + "color": 3, "race": 1, "job": 2, "type": 1, @@ -85,7 +85,7 @@ "text": "食人鱼先生" }, "star": 3, - "color": 2, + "color": 3, "race": 1, "job": 1, "type": 1, @@ -164,7 +164,7 @@ "text": "啊啊" }, "star": 3, - "color": 2, + "color": 3, "race": 1, "job": 2, "type": 1, @@ -243,7 +243,7 @@ "text": "法夸德勋爵" }, "star": 3, - "color": 2, + "color": 3, "race": 1, "job": 1, "type": 1, @@ -322,7 +322,7 @@ "text": "大大" }, "star": 3, - "color": 2, + "color": 3, "race": 1, "job": 3, "type": 1, @@ -401,7 +401,7 @@ "text": "史图依克" }, "star": 4, - "color": 3, + "color": 4, "race": 1, "job": 2, "type": 1, @@ -480,7 +480,7 @@ "text": "大龙" }, "star": 4, - "color": 3, + "color": 4, "race": 1, "job": 2, "type": 1, @@ -559,7 +559,7 @@ "text": "亚丝翠" }, "star": 4, - "color": 3, + "color": 4, "race": 1, "job": 4, "type": 1, @@ -638,7 +638,7 @@ "text": "克莱尔·努涅斯" }, "star": 4, - "color": 3, + "color": 4, "race": 1, "job": 3, "type": 1, @@ -717,7 +717,7 @@ "text": "鹤大师" }, "star": 4, - "color": 3, + "color": 4, "race": 1, "job": 1, "type": 1, @@ -796,7 +796,7 @@ "text": "布兰奇" }, "star": 4, - "color": 3, + "color": 4, "race": 1, "job": 4, "type": 1, @@ -875,7 +875,7 @@ "text": "格里斯特王子" }, "star": 4, - "color": 3, + "color": 4, "race": 1, "job": 2, "type": 1, @@ -954,7 +954,7 @@ "text": "吉姆·莱克" }, "star": 5, - "color": 4, + "color": 5, "race": 1, "job": 1, "type": 1, @@ -1033,7 +1033,7 @@ "text": "船长" }, "star": 5, - "color": 4, + "color": 5, "race": 1, "job": 1, "type": 1, @@ -1112,7 +1112,7 @@ "text": "希沙窦斯" }, "star": 5, - "color": 4, + "color": 5, "race": 1, "job": 1, "type": 1, @@ -1191,7 +1191,7 @@ "text": "小欧" }, "star": 5, - "color": 4, + "color": 5, "race": 1, "job": 4, "type": 1, @@ -1270,7 +1270,7 @@ "text": "斯梅克船长" }, "star": 3, - "color": 2, + "color": 3, "race": 2, "job": 3, "type": 1, @@ -1349,7 +1349,7 @@ "text": "警卫队长" }, "star": 3, - "color": 2, + "color": 3, "race": 2, "job": 1, "type": 1, @@ -1428,7 +1428,7 @@ "text": "黛塔黛恩" }, "star": 3, - "color": 2, + "color": 3, "race": 2, "job": 3, "type": 1, @@ -1507,7 +1507,7 @@ "text": "吉姆·普雷斯科特" }, "star": 3, - "color": 2, + "color": 3, "race": 2, "job": 4, "type": 1, @@ -1586,7 +1586,7 @@ "text": "警长" }, "star": 4, - "color": 3, + "color": 4, "race": 2, "job": 1, "type": 1, @@ -1665,7 +1665,7 @@ "text": "牙仙" }, "star": 3, - "color": 2, + "color": 3, "race": 2, "job": 1, "type": 1, @@ -1744,7 +1744,7 @@ "text": "睡神沙人" }, "star": 4, - "color": 3, + "color": 4, "race": 2, "job": 4, "type": 1, @@ -1823,7 +1823,7 @@ "text": "邦尼兔" }, "star": 4, - "color": 3, + "color": 4, "race": 2, "job": 1, "type": 1, @@ -1902,7 +1902,7 @@ "text": "金猴" }, "star": 4, - "color": 3, + "color": 4, "race": 2, "job": 3, "type": 1, @@ -1981,7 +1981,7 @@ "text": "凯尔" }, "star": 4, - "color": 3, + "color": 4, "race": 2, "job": 3, "type": 1, @@ -2060,7 +2060,7 @@ "text": "小钱" }, "star": 4, - "color": 3, + "color": 4, "race": 2, "job": 3, "type": 1, @@ -2139,7 +2139,7 @@ "text": "暴芙那特" }, "star": 4, - "color": 3, + "color": 4, "race": 2, "job": 1, "type": 1, @@ -2218,7 +2218,7 @@ "text": "云朵先生" }, "star": 4, - "color": 3, + "color": 4, "race": 2, "job": 4, "type": 1, @@ -2297,7 +2297,7 @@ "text": "阿宝" }, "star": 5, - "color": 4, + "color": 5, "race": 2, "job": 2, "type": 1, @@ -2376,7 +2376,7 @@ "text": "沃尔夫先生" }, "star": 5, - "color": 4, + "color": 5, "race": 2, "job": 3, "type": 1, @@ -2455,7 +2455,7 @@ "text": "羊仙姑" }, "star": 5, - "color": 4, + "color": 5, "race": 2, "job": 4, "type": 1, @@ -2534,7 +2534,7 @@ "text": "波比" }, "star": 5, - "color": 4, + "color": 5, "race": 2, "job": 3, "type": 1, @@ -2613,7 +2613,7 @@ "text": "巫嘎" }, "star": 3, - "color": 2, + "color": 3, "race": 3, "job": 3, "type": 1, @@ -2692,7 +2692,7 @@ "text": "坦克" }, "star": 3, - "color": 2, + "color": 3, "race": 3, "job": 1, "type": 1, @@ -2771,7 +2771,7 @@ "text": "胡德先生" }, "star": 3, - "color": 2, + "color": 3, "race": 3, "job": 1, "type": 1, @@ -2850,7 +2850,7 @@ "text": "普鲁格兰杰" }, "star": 3, - "color": 2, + "color": 3, "race": 3, "job": 1, "type": 1, @@ -2929,7 +2929,7 @@ "text": "鼻涕粗" }, "star": 3, - "color": 2, + "color": 3, "race": 3, "job": 1, "type": 1, @@ -3008,7 +3008,7 @@ "text": "珍妮丝·邓普顿" }, "star": 3, - "color": 2, + "color": 3, "race": 3, "job": 3, "type": 1, @@ -3087,7 +3087,7 @@ "text": "贫嘴驴" }, "star": 4, - "color": 3, + "color": 4, "race": 3, "job": 1, "type": 1, @@ -3166,7 +3166,7 @@ "text": "蒂姆·邓普顿" }, "star": 4, - "color": 3, + "color": 4, "race": 3, "job": 3, "type": 1, @@ -3245,7 +3245,7 @@ "text": "圣诞老人" }, "star": 4, - "color": 3, + "color": 4, "race": 3, "job": 1, "type": 1, @@ -3324,7 +3324,7 @@ "text": "瓜哥" }, "star": 4, - "color": 3, + "color": 4, "race": 3, "job": 3, "type": 1, @@ -3403,7 +3403,7 @@ "text": "沃尔特·史翠克勒" }, "star": 4, - "color": 3, + "color": 4, "race": 3, "job": 4, "type": 1, @@ -3482,7 +3482,7 @@ "text": "冰霜杰克" }, "star": 4, - "color": 3, + "color": 4, "race": 3, "job": 4, "type": 1, @@ -3561,7 +3561,7 @@ "text": "菲奥娜" }, "star": 4, - "color": 3, + "color": 4, "race": 3, "job": 1, "type": 1, @@ -3640,7 +3640,7 @@ "text": "悍夫那特" }, "star": 4, - "color": 3, + "color": 4, "race": 3, "job": 4, "type": 1, @@ -3719,7 +3719,7 @@ "text": "师父" }, "star": 5, - "color": 4, + "color": 5, "race": 2, "job": 2, "type": 1, @@ -3798,7 +3798,7 @@ "text": "希卡普" }, "star": 5, - "color": 4, + "color": 5, "race": 3, "job": 4, "type": 1, @@ -3877,7 +3877,7 @@ "text": "漆黑" }, "star": 5, - "color": 4, + "color": 5, "race": 3, "job": 1, "type": 1, @@ -3956,7 +3956,7 @@ "text": "黛安·福克斯顿" }, "star": 5, - "color": 4, + "color": 5, "race": 3, "job": 1, "type": 1, @@ -4035,7 +4035,7 @@ "text": "幸运·普雷斯科特" }, "star": 5, - "color": 4, + "color": 5, "race": 3, "job": 3, "type": 1, @@ -4114,7 +4114,7 @@ "text": "平先生" }, "star": 5, - "color": 4, + "color": 5, "race": 3, "job": 3, "type": 1, @@ -4193,7 +4193,7 @@ "text": "阿比盖尔·斯通" }, "star": 3, - "color": 2, + "color": 3, "race": 4, "job": 3, "type": 1, @@ -4272,7 +4272,7 @@ "text": "果酱教授" }, "star": 3, - "color": 2, + "color": 3, "race": 4, "job": 4, "type": 1, @@ -4351,7 +4351,7 @@ "text": "史蒂夫·帕丘克" }, "star": 3, - "color": 2, + "color": 3, "race": 4, "job": 3, "type": 1, @@ -4430,7 +4430,7 @@ "text": "姜饼人" }, "star": 3, - "color": 2, + "color": 3, "race": 4, "job": 1, "type": 1, @@ -4509,7 +4509,7 @@ "text": "瓦希尔指挥官" }, "star": 3, - "color": 2, + "color": 3, "race": 4, "job": 1, "type": 1, @@ -4588,7 +4588,7 @@ "text": "布里奇特" }, "star": 3, - "color": 2, + "color": 3, "race": 4, "job": 3, "type": 1, @@ -4667,7 +4667,7 @@ "text": "戈伯" }, "star": 3, - "color": 2, + "color": 3, "race": 4, "job": 1, "type": 1, @@ -4746,7 +4746,7 @@ "text": "美肚鲨" }, "star": 4, - "color": 3, + "color": 4, "race": 4, "job": 3, "type": 1, @@ -4825,7 +4825,7 @@ "text": "蛇先生" }, "star": 4, - "color": 3, + "color": 4, "race": 4, "job": 3, "type": 1, @@ -4904,7 +4904,7 @@ "text": "匹诺曹" }, "star": 4, - "color": 3, + "color": 4, "race": 4, "job": 1, "type": 1, @@ -4983,7 +4983,7 @@ "text": "骇客蛛" }, "star": 4, - "color": 3, + "color": 4, "race": 4, "job": 3, "type": 1, @@ -5062,7 +5062,7 @@ "text": "悍娇虎" }, "star": 4, - "color": 3, + "color": 4, "race": 4, "job": 1, "type": 1, @@ -5141,7 +5141,7 @@ "text": "乌龟大师" }, "star": 5, - "color": 4, + "color": 5, "race": 4, "job": 1, "type": 1, @@ -5220,7 +5220,7 @@ "text": "梅林" }, "star": 5, - "color": 4, + "color": 5, "race": 4, "job": 3, "type": 1, @@ -5299,7 +5299,7 @@ "text": "盖" }, "star": 5, - "color": 4, + "color": 5, "race": 4, "job": 3, "type": 1, @@ -5378,7 +5378,7 @@ "text": "穿靴子的猫" }, "star": 5, - "color": 4, + "color": 5, "race": 4, "job": 1, "type": 1, @@ -5457,7 +5457,7 @@ "text": "小伊" }, "star": 4, - "color": 3, + "color": 4, "race": 4, "job": 3, "type": 1, @@ -5536,7 +5536,7 @@ "text": "亚力克斯" }, "star": 5, - "color": 4, + "color": 5, "race": 1, "job": 3, "type": 1, @@ -5608,725 +5608,14 @@ ], "expitemnum": 3 }, - { - "hid": "43901", - "name": { - "key": "hero_43901", - "text": "升星精灵·稀有" - }, - "star": 3, - "color": 2, - "race": 4, - "job": 5, - "type": 2, - "ip": 1, - "sd": 1, - "handbook": -1, - "prefab": "43901", - "rotation": "0|0|0", - "icon": "43901", - "vocal": "43901", - "tujing": [ - 107 - ], - "intr": { - "key": "herointr_43901", - "text": "可以用来进行3星英雄进阶" - }, - "events": "hero_43901", - "cite": "", - "effectstay": [], - "hpspace": { - "x": 0, - "y": 0, - "z": 0 - }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0, - "txt": { - "key": "atlas_43901", - "text": "" - }, - "enteranivalue": -1, - "camerainterval": 0, - "equiprcom": [ - "11001", - "11002", - "11003", - "11004", - "11005", - "11006", - "11011", - "11012", - "11013", - "11014", - "11015", - "11016" - ], - "angle": 0, - "deviation": 0, - "show": 1, - "herofrag": [ - { - "a": "item", - "t": "625001", - "n": 1 - } - ], - "heroskillup": [ - "625001" - ], - "expitem": [ - { - "a": "item", - "t": "625001", - "n": 1 - } - ], - "expitemnum": 3 - }, - { - "hid": "43902", - "name": { - "key": "hero_43902", - "text": "升星精灵·史诗" - }, - "star": 4, - "color": 3, - "race": 4, - "job": 5, - "type": 2, - "ip": 1, - "sd": 1, - "handbook": -1, - "prefab": "43901", - "rotation": "0|0|0", - "icon": "43902", - "vocal": "43902", - "tujing": [ - 107 - ], - "intr": { - "key": "herointr_43902", - "text": "可以用来进行4星英雄进阶" - }, - "events": "hero_43902", - "cite": "", - "effectstay": [], - "hpspace": { - "x": 0, - "y": 0, - "z": 0 - }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0, - "txt": { - "key": "atlas_43902", - "text": "" - }, - "enteranivalue": -1, - "camerainterval": 0, - "equiprcom": [ - "11001", - "11002", - "11003", - "11004", - "11005", - "11006", - "11011", - "11012", - "11013", - "11014", - "11015", - "11016" - ], - "angle": 0, - "deviation": 0, - "show": 1, - "herofrag": [ - { - "a": "item", - "t": "625001", - "n": 1 - } - ], - "heroskillup": [ - "625001" - ], - "expitem": [ - { - "a": "item", - "t": "625001", - "n": 1 - } - ], - "expitemnum": 3 - }, - { - "hid": "43903", - "name": { - "key": "hero_43903", - "text": "升星精灵·传说" - }, - "star": 5, - "color": 4, - "race": 4, - "job": 5, - "type": 2, - "ip": 1, - "sd": 1, - "handbook": -1, - "prefab": "43901", - "rotation": "0|0|0", - "icon": "43903", - "vocal": "43903", - "tujing": [ - 107 - ], - "intr": { - "key": "herointr_43903", - "text": "可以用来进行5星英雄进阶" - }, - "events": "hero_43903", - "cite": "", - "effectstay": [], - "hpspace": { - "x": 0, - "y": 0, - "z": 0 - }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0, - "txt": { - "key": "atlas_43903", - "text": "" - }, - "enteranivalue": -1, - "camerainterval": 0, - "equiprcom": [ - "11001", - "11002", - "11003", - "11004", - "11005", - "11006", - "11011", - "11012", - "11013", - "11014", - "11015", - "11016" - ], - "angle": 0, - "deviation": 0, - "show": 1, - "herofrag": [ - { - "a": "item", - "t": "625001", - "n": 1 - } - ], - "heroskillup": [ - "625001" - ], - "expitem": [ - { - "a": "item", - "t": "625001", - "n": 1 - } - ], - "expitemnum": 3 - }, - { - "hid": "42911", - "name": { - "key": "hero_42911", - "text": "初级经验精灵" - }, - "star": 2, - "color": 1, - "race": 4, - "job": 5, - "type": 3, - "ip": 1, - "sd": 1, - "handbook": -1, - "prefab": "42911", - "rotation": "0|0|0", - "icon": "42911", - "vocal": "42911", - "tujing": [ - 107 - ], - "intr": { - "key": "herointr_42911", - "text": "可以用来少量英雄经验" - }, - "events": "hero_42911", - "cite": "", - "effectstay": [], - "hpspace": { - "x": 0, - "y": 0, - "z": 0 - }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0, - "txt": { - "key": "atlas_42911", - "text": "" - }, - "enteranivalue": -1, - "camerainterval": 0, - "equiprcom": [ - "11021", - "11022", - "11023", - "11024", - "11025", - "11026", - "11031", - "11032", - "11033", - "11034", - "11035", - "11036" - ], - "angle": 0, - "deviation": 0, - "show": 1, - "herofrag": [ - { - "a": "item", - "t": "625001", - "n": 1 - } - ], - "heroskillup": [ - "625001" - ], - "expitem": [ - { - "a": "item", - "t": "625001", - "n": 1 - } - ], - "expitemnum": 3 - }, - { - "hid": "43911", - "name": { - "key": "hero_43911", - "text": "中级经验精灵" - }, - "star": 3, - "color": 2, - "race": 4, - "job": 5, - "type": 3, - "ip": 1, - "sd": 1, - "handbook": -1, - "prefab": "43911", - "rotation": "0|0|0", - "icon": "43911", - "vocal": "43911", - "tujing": [ - 107 - ], - "intr": { - "key": "herointr_43911", - "text": "可以用来一些英雄经验" - }, - "events": "hero_43911", - "cite": "", - "effectstay": [], - "hpspace": { - "x": 0, - "y": 0, - "z": 0 - }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0, - "txt": { - "key": "atlas_43911", - "text": "" - }, - "enteranivalue": -1, - "camerainterval": 0, - "equiprcom": [ - "11041", - "11042", - "11043", - "11044", - "11045", - "11046", - "11051", - "11052", - "11053", - "11054", - "11055", - "11056" - ], - "angle": 0, - "deviation": 0, - "show": 1, - "herofrag": [ - { - "a": "item", - "t": "625001", - "n": 1 - } - ], - "heroskillup": [ - "625001" - ], - "expitem": [ - { - "a": "item", - "t": "625001", - "n": 1 - } - ], - "expitemnum": 3 - }, - { - "hid": "44911", - "name": { - "key": "hero_44911", - "text": "高级经验精灵" - }, - "star": 4, - "color": 3, - "race": 4, - "job": 5, - "type": 3, - "ip": 1, - "sd": 1, - "handbook": -1, - "prefab": "44911", - "rotation": "0|0|0", - "icon": "44911", - "vocal": "44911", - "tujing": [ - 107 - ], - "intr": { - "key": "herointr_44911", - "text": "可以用来大量英雄经验" - }, - "events": "hero_44911", - "cite": "", - "effectstay": [], - "hpspace": { - "x": 0, - "y": 0, - "z": 0 - }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0, - "txt": { - "key": "atlas_44911", - "text": "" - }, - "enteranivalue": -1, - "camerainterval": 0, - "equiprcom": [ - "10001", - "10002", - "10003", - "10004", - "10005", - "10006", - "10011", - "10012", - "10013", - "10014", - "10015", - "10016" - ], - "angle": 0, - "deviation": 0, - "show": 1, - "herofrag": [ - { - "a": "item", - "t": "625001", - "n": 1 - } - ], - "heroskillup": [ - "625001" - ], - "expitem": [ - { - "a": "item", - "t": "625001", - "n": 1 - } - ], - "expitemnum": 3 - }, - { - "hid": "43921", - "name": { - "key": "hero_43921", - "text": "技能精灵·稀有" - }, - "star": 3, - "color": 2, - "race": 4, - "job": 5, - "type": 4, - "ip": 1, - "sd": 1, - "handbook": -1, - "prefab": "43921", - "rotation": "0|0|0", - "icon": "43921", - "vocal": "43921", - "tujing": [ - 107 - ], - "intr": { - "key": "herointr_43921", - "text": "可以用来升级初始3星英雄的技能" - }, - "events": "hero_43921", - "cite": "", - "effectstay": [], - "hpspace": { - "x": 0, - "y": 0, - "z": 0 - }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0, - "txt": { - "key": "atlas_43921", - "text": "" - }, - "enteranivalue": -1, - "camerainterval": 0, - "equiprcom": [ - "10021", - "10022", - "10023", - "10024", - "10025", - "10026", - "10031", - "10032", - "10033", - "10034", - "10035", - "10036" - ], - "angle": 0, - "deviation": 0, - "show": 1, - "herofrag": [ - { - "a": "item", - "t": "625001", - "n": 1 - } - ], - "heroskillup": [ - "625001" - ], - "expitem": [ - { - "a": "item", - "t": "625001", - "n": 1 - } - ], - "expitemnum": 3 - }, - { - "hid": "44921", - "name": { - "key": "hero_44921", - "text": "技能精灵·史诗" - }, - "star": 4, - "color": 3, - "race": 4, - "job": 5, - "type": 4, - "ip": 1, - "sd": 1, - "handbook": -1, - "prefab": "44921", - "rotation": "0|0|0", - "icon": "44921", - "vocal": "44921", - "tujing": [ - 107 - ], - "intr": { - "key": "herointr_44921", - "text": "可以用来升级初始4星英雄的技能" - }, - "events": "hero_44921", - "cite": "", - "effectstay": [], - "hpspace": { - "x": 0, - "y": 0, - "z": 0 - }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0, - "txt": { - "key": "atlas_44921", - "text": "" - }, - "enteranivalue": -1, - "camerainterval": 0, - "equiprcom": [ - "10041", - "10042", - "10043", - "10044", - "10045", - "10046", - "10051", - "10052", - "10053", - "10054", - "10055", - "10056" - ], - "angle": 0, - "deviation": 0, - "show": 1, - "herofrag": [ - { - "a": "item", - "t": "625001", - "n": 1 - } - ], - "heroskillup": [ - "625001" - ], - "expitem": [ - { - "a": "item", - "t": "625001", - "n": 1 - } - ], - "expitemnum": 3 - }, - { - "hid": "45921", - "name": { - "key": "hero_45921", - "text": "技能精灵·传说" - }, - "star": 5, - "color": 4, - "race": 4, - "job": 5, - "type": 4, - "ip": 1, - "sd": 1, - "handbook": -1, - "prefab": "45921", - "rotation": "0|0|0", - "icon": "45921", - "vocal": "45921", - "tujing": [ - 107 - ], - "intr": { - "key": "herointr_45921", - "text": "可以用来升级初始5星英雄的技能" - }, - "events": "hero_45921", - "cite": "", - "effectstay": [], - "hpspace": { - "x": 0, - "y": 0, - "z": 0 - }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0, - "txt": { - "key": "atlas_45921", - "text": "" - }, - "enteranivalue": -1, - "camerainterval": 0, - "equiprcom": [ - "11001", - "11002", - "11003", - "11004", - "11005", - "11006", - "11011", - "11012", - "11013", - "11014", - "11015", - "11016" - ], - "angle": 0, - "deviation": 0, - "show": 1, - "herofrag": [ - { - "a": "item", - "t": "625001", - "n": 1 - } - ], - "heroskillup": [ - "625001" - ], - "expitem": [ - { - "a": "item", - "t": "625001", - "n": 1 - } - ], - "expitemnum": 3 - }, { "hid": "51001", "name": { "key": "hero_51001", "text": "啵啵星人" }, - "star": 2, - "color": 1, + "star": 3, + "color": 3, "race": 4, "job": 3, "type": 5, @@ -6404,8 +5693,8 @@ "key": "hero_51002", "text": "埃雷特手下1号" }, - "star": 2, - "color": 1, + "star": 3, + "color": 3, "race": 4, "job": 3, "type": 5, @@ -6483,8 +5772,8 @@ "key": "hero_51003", "text": "埃雷特手下2号" }, - "star": 2, - "color": 1, + "star": 3, + "color": 3, "race": 4, "job": 3, "type": 5, @@ -6562,8 +5851,8 @@ "key": "hero_51004", "text": "豺狼小怪" }, - "star": 2, - "color": 1, + "star": 3, + "color": 3, "race": 4, "job": 3, "type": 5, @@ -6641,8 +5930,8 @@ "key": "hero_51005", "text": "犀牛守卫" }, - "star": 2, - "color": 1, + "star": 3, + "color": 3, "race": 4, "job": 1, "type": 5, @@ -6720,8 +6009,8 @@ "key": "hero_51006", "text": "羊群" }, - "star": 2, - "color": 1, + "star": 3, + "color": 3, "race": 4, "job": 3, "type": 5, @@ -6799,8 +6088,8 @@ "key": "hero_51007", "text": "香塔尔杜布瓦队长手下2号" }, - "star": 2, - "color": 1, + "star": 3, + "color": 3, "race": 4, "job": 3, "type": 5, @@ -6878,8 +6167,8 @@ "key": "hero_54005", "text": "无牙仔" }, - "star": 2, - "color": 1, + "star": 3, + "color": 3, "race": 4, "job": 1, "type": 5, @@ -6957,8 +6246,8 @@ "key": "hero_51010", "text": "警卫1号" }, - "star": 2, - "color": 1, + "star": 3, + "color": 3, "race": 4, "job": 1, "type": 5, @@ -7036,8 +6325,8 @@ "key": "hero_51011", "text": "警卫2号" }, - "star": 2, - "color": 1, + "star": 3, + "color": 3, "race": 4, "job": 3, "type": 5, @@ -7115,8 +6404,8 @@ "key": "hero_51012", "text": "小猴子" }, - "star": 2, - "color": 1, + "star": 3, + "color": 3, "race": 4, "job": 3, "type": 5, @@ -7194,8 +6483,8 @@ "key": "hero_51013", "text": "巨怪啰啰" }, - "star": 2, - "color": 1, + "star": 3, + "color": 3, "race": 4, "job": 1, "type": 5, @@ -7273,8 +6562,8 @@ "key": "hero_51014", "text": "博啃族宫廷守卫" }, - "star": 2, - "color": 1, + "star": 3, + "color": 3, "race": 4, "job": 1, "type": 5, @@ -7353,7 +6642,7 @@ "text": "致命纳得" }, "star": 4, - "color": 3, + "color": 4, "race": 4, "job": 1, "type": 5, @@ -7432,7 +6721,7 @@ "text": "埃雷特" }, "star": 3, - "color": 2, + "color": 3, "race": 4, "job": 3, "type": 5, @@ -7511,7 +6800,7 @@ "text": "豺狼头领" }, "star": 3, - "color": 2, + "color": 3, "race": 4, "job": 1, "type": 5, @@ -7590,7 +6879,7 @@ "text": "豪猪大师（翡翠僵尸）" }, "star": 3, - "color": 2, + "color": 3, "race": 4, "job": 1, "type": 5, @@ -7669,7 +6958,7 @@ "text": "丝塔西" }, "star": 3, - "color": 2, + "color": 3, "race": 4, "job": 1, "type": 5, @@ -7748,7 +7037,7 @@ "text": "小猴子首领" }, "star": 3, - "color": 2, + "color": 3, "race": 4, "job": 1, "type": 5, @@ -7827,7 +7116,7 @@ "text": "巨怪首领" }, "star": 3, - "color": 2, + "color": 3, "race": 4, "job": 3, "type": 5, @@ -7906,7 +7195,7 @@ "text": "火龙" }, "star": 5, - "color": 4, + "color": 5, "race": 4, "job": 2, "type": 5, @@ -7985,7 +7274,7 @@ "text": "巨型猩猩怪兽" }, "star": 5, - "color": 4, + "color": 5, "race": 4, "job": 2, "type": 5, @@ -8064,7 +7353,7 @@ "text": "格尔族" }, "star": 5, - "color": 4, + "color": 5, "race": 4, "job": 2, "type": 5, @@ -8143,7 +7432,7 @@ "text": "大厨" }, "star": 5, - "color": 4, + "color": 5, "race": 4, "job": 2, "type": 5, @@ -8222,7 +7511,7 @@ "text": "火焰泰坦" }, "star": 5, - "color": 4, + "color": 5, "race": 4, "job": 2, "type": 5, @@ -8301,7 +7590,7 @@ "text": "森林泰坦" }, "star": 5, - "color": 4, + "color": 5, "race": 4, "job": 2, "type": 5, @@ -8380,7 +7669,7 @@ "text": "冰霜泰坦" }, "star": 5, - "color": 4, + "color": 5, "race": 4, "job": 2, "type": 5, @@ -8459,7 +7748,7 @@ "text": "莫甘娜巨怪" }, "star": 5, - "color": 4, + "color": 5, "race": 2, "job": 2, "type": 5, @@ -8538,7 +7827,7 @@ "text": "黑化波比" }, "star": 5, - "color": 4, + "color": 5, "race": 2, "job": 2, "type": 5, @@ -8619,7 +7908,7 @@ "text": "黑化食人鱼先生" }, "star": 3, - "color": 2, + "color": 3, "race": 1, "job": 1, "type": 5, @@ -8698,7 +7987,7 @@ "text": "黑化啊啊" }, "star": 3, - "color": 2, + "color": 3, "race": 1, "job": 2, "type": 5, @@ -8777,7 +8066,7 @@ "text": "黑化法夸德勋爵" }, "star": 3, - "color": 2, + "color": 3, "race": 1, "job": 1, "type": 5, @@ -8856,7 +8145,7 @@ "text": "黑化亚丝翠" }, "star": 4, - "color": 3, + "color": 4, "race": 1, "job": 4, "type": 5, @@ -8935,7 +8224,7 @@ "text": "黑化牙仙" }, "star": 4, - "color": 3, + "color": 4, "race": 2, "job": 1, "type": 5, @@ -9014,7 +8303,7 @@ "text": "黑化睡神沙人" }, "star": 4, - "color": 3, + "color": 4, "race": 2, "job": 4, "type": 5, @@ -9093,7 +8382,7 @@ "text": "黑化邦尼兔" }, "star": 4, - "color": 3, + "color": 4, "race": 2, "job": 1, "type": 5, @@ -9172,7 +8461,7 @@ "text": "黑化坦克" }, "star": 3, - "color": 2, + "color": 3, "race": 3, "job": 1, "type": 5, @@ -9251,7 +8540,7 @@ "text": "黑化珍妮丝·邓普顿" }, "star": 3, - "color": 2, + "color": 3, "race": 3, "job": 3, "type": 5, @@ -9330,7 +8619,7 @@ "text": "黑化蒂姆·邓普顿" }, "star": 4, - "color": 3, + "color": 4, "race": 3, "job": 3, "type": 5, @@ -9409,7 +8698,7 @@ "text": "黑化蛇先生" }, "star": 4, - "color": 3, + "color": 4, "race": 4, "job": 3, "type": 5, @@ -9488,7 +8777,7 @@ "text": "黑化小伊" }, "star": 4, - "color": 3, + "color": 4, "race": 4, "job": 3, "type": 5, @@ -9566,8 +8855,8 @@ "key": "hero_51004", "text": "玉化豺狼小怪" }, - "star": 2, - "color": 1, + "star": 3, + "color": 3, "race": 4, "job": 3, "type": 5, diff --git a/bin/json/game_msgdistrib.json b/bin/json/game_msgdistrib.json index 8f4a883ee..43d9bf13c 100644 --- a/bin/json/game_msgdistrib.json +++ b/bin/json/game_msgdistrib.json @@ -100,5 +100,11 @@ "open": true, "routrules": "~/worker", "describe": "附魔副本排行榜数据" + }, + { + "msgid": "pvp", + "open": true, + "routrules": "~/worker", + "describe": "pvp" } ] \ No newline at end of file diff --git a/bin/json/game_newsmithy.json b/bin/json/game_newsmithy.json index 2a2394147..f247b2f39 100644 --- a/bin/json/game_newsmithy.json +++ b/bin/json/game_newsmithy.json @@ -1,7 +1,6 @@ [ { "id": 1, - "item_id": 0, "type": 1, "drawing_name": { "key": "1", @@ -56,7 +55,6 @@ }, { "id": 2, - "item_id": 0, "type": 1, "drawing_name": { "key": "2", @@ -89,7 +87,6 @@ }, { "id": 3, - "item_id": 0, "type": 1, "drawing_name": { "key": "3", @@ -122,7 +119,6 @@ }, { "id": 4, - "item_id": 0, "type": 1, "drawing_name": { "key": "4", @@ -155,7 +151,6 @@ }, { "id": 5, - "item_id": 0, "type": 1, "drawing_name": { "key": "5", @@ -188,7 +183,6 @@ }, { "id": 6, - "item_id": 0, "type": 1, "drawing_name": { "key": "6", @@ -221,7 +215,6 @@ }, { "id": 7, - "item_id": 0, "type": 1, "drawing_name": { "key": "7", @@ -254,7 +247,6 @@ }, { "id": 8, - "item_id": 0, "type": 1, "drawing_name": { "key": "8", @@ -287,7 +279,6 @@ }, { "id": 9, - "item_id": 0, "type": 1, "drawing_name": { "key": "9", @@ -320,7 +311,6 @@ }, { "id": 10, - "item_id": 0, "type": 1, "drawing_name": { "key": "10", @@ -353,7 +343,6 @@ }, { "id": 11, - "item_id": 0, "type": 1, "drawing_name": { "key": "11", @@ -386,7 +375,6 @@ }, { "id": 12, - "item_id": 0, "type": 1, "drawing_name": { "key": "12", @@ -419,7 +407,6 @@ }, { "id": 13, - "item_id": 0, "type": 1, "drawing_name": { "key": "13", @@ -452,7 +439,6 @@ }, { "id": 14, - "item_id": 0, "type": 1, "drawing_name": { "key": "14", @@ -485,7 +471,6 @@ }, { "id": 15, - "item_id": 0, "type": 1, "drawing_name": { "key": "15", @@ -518,7 +503,6 @@ }, { "id": 16, - "item_id": 0, "type": 1, "drawing_name": { "key": "16", @@ -551,7 +535,6 @@ }, { "id": 17, - "item_id": 0, "type": 1, "drawing_name": { "key": "17", @@ -584,7 +567,6 @@ }, { "id": 18, - "item_id": 0, "type": 1, "drawing_name": { "key": "18", @@ -617,7 +599,6 @@ }, { "id": 19, - "item_id": 0, "type": 1, "drawing_name": { "key": "19", @@ -650,7 +631,6 @@ }, { "id": 20, - "item_id": 0, "type": 1, "drawing_name": { "key": "20", @@ -683,7 +663,6 @@ }, { "id": 21, - "item_id": 0, "type": 1, "drawing_name": { "key": "21", @@ -716,7 +695,6 @@ }, { "id": 22, - "item_id": 0, "type": 1, "drawing_name": { "key": "22", @@ -749,7 +727,6 @@ }, { "id": 23, - "item_id": 0, "type": 1, "drawing_name": { "key": "23", @@ -782,7 +759,6 @@ }, { "id": 24, - "item_id": 0, "type": 1, "drawing_name": { "key": "24", @@ -815,7 +791,6 @@ }, { "id": 25, - "item_id": 0, "type": 1, "drawing_name": { "key": "25", @@ -848,7 +823,6 @@ }, { "id": 26, - "item_id": 0, "type": 2, "drawing_name": { "key": "26", @@ -881,7 +855,6 @@ }, { "id": 27, - "item_id": 0, "type": 2, "drawing_name": { "key": "27", @@ -914,7 +887,6 @@ }, { "id": 28, - "item_id": 0, "type": 2, "drawing_name": { "key": "28", @@ -947,7 +919,6 @@ }, { "id": 29, - "item_id": 0, "type": 2, "drawing_name": { "key": "29", @@ -980,7 +951,6 @@ }, { "id": 30, - "item_id": 0, "type": 2, "drawing_name": { "key": "30", @@ -1013,7 +983,6 @@ }, { "id": 31, - "item_id": 0, "type": 2, "drawing_name": { "key": "31", @@ -1046,7 +1015,6 @@ }, { "id": 32, - "item_id": 0, "type": 2, "drawing_name": { "key": "32", @@ -1079,7 +1047,6 @@ }, { "id": 33, - "item_id": 0, "type": 2, "drawing_name": { "key": "33", @@ -1112,7 +1079,6 @@ }, { "id": 34, - "item_id": 0, "type": 2, "drawing_name": { "key": "34", @@ -1145,7 +1111,6 @@ }, { "id": 35, - "item_id": 0, "type": 2, "drawing_name": { "key": "35", @@ -1178,7 +1143,6 @@ }, { "id": 36, - "item_id": 0, "type": 2, "drawing_name": { "key": "36", @@ -1211,7 +1175,6 @@ }, { "id": 37, - "item_id": 0, "type": 2, "drawing_name": { "key": "37", @@ -1244,7 +1207,6 @@ }, { "id": 38, - "item_id": 0, "type": 2, "drawing_name": { "key": "38", @@ -1277,7 +1239,6 @@ }, { "id": 39, - "item_id": 0, "type": 2, "drawing_name": { "key": "39", @@ -1310,7 +1271,6 @@ }, { "id": 40, - "item_id": 0, "type": 2, "drawing_name": { "key": "40", @@ -1343,7 +1303,6 @@ }, { "id": 41, - "item_id": 0, "type": 2, "drawing_name": { "key": "41", @@ -1376,7 +1335,6 @@ }, { "id": 42, - "item_id": 0, "type": 2, "drawing_name": { "key": "42", @@ -1409,7 +1367,6 @@ }, { "id": 43, - "item_id": 0, "type": 2, "drawing_name": { "key": "43", @@ -1442,7 +1399,6 @@ }, { "id": 44, - "item_id": 0, "type": 2, "drawing_name": { "key": "44", @@ -1475,7 +1431,6 @@ }, { "id": 45, - "item_id": 0, "type": 2, "drawing_name": { "key": "45", @@ -1508,7 +1463,6 @@ }, { "id": 46, - "item_id": 0, "type": 2, "drawing_name": { "key": "46", @@ -1541,7 +1495,6 @@ }, { "id": 47, - "item_id": 0, "type": 2, "drawing_name": { "key": "47", @@ -1574,7 +1527,6 @@ }, { "id": 48, - "item_id": 0, "type": 2, "drawing_name": { "key": "48", @@ -1607,7 +1559,6 @@ }, { "id": 49, - "item_id": 0, "type": 2, "drawing_name": { "key": "49", @@ -1640,7 +1591,6 @@ }, { "id": 50, - "item_id": 0, "type": 2, "drawing_name": { "key": "50", @@ -1673,7 +1623,6 @@ }, { "id": 51, - "item_id": 0, "type": 3, "drawing_name": { "key": "51", @@ -1706,7 +1655,6 @@ }, { "id": 52, - "item_id": 0, "type": 3, "drawing_name": { "key": "52", @@ -1739,7 +1687,6 @@ }, { "id": 53, - "item_id": 0, "type": 3, "drawing_name": { "key": "53", @@ -1772,7 +1719,6 @@ }, { "id": 54, - "item_id": 0, "type": 3, "drawing_name": { "key": "54", @@ -1805,7 +1751,6 @@ }, { "id": 55, - "item_id": 0, "type": 3, "drawing_name": { "key": "55", @@ -1838,7 +1783,6 @@ }, { "id": 56, - "item_id": 0, "type": 3, "drawing_name": { "key": "56", @@ -1871,7 +1815,6 @@ }, { "id": 57, - "item_id": 0, "type": 3, "drawing_name": { "key": "57", @@ -1904,7 +1847,6 @@ }, { "id": 58, - "item_id": 0, "type": 3, "drawing_name": { "key": "58", @@ -1937,7 +1879,6 @@ }, { "id": 59, - "item_id": 0, "type": 3, "drawing_name": { "key": "59", @@ -1970,7 +1911,6 @@ }, { "id": 60, - "item_id": 0, "type": 3, "drawing_name": { "key": "60", @@ -2003,7 +1943,6 @@ }, { "id": 61, - "item_id": 0, "type": 3, "drawing_name": { "key": "61", @@ -2036,7 +1975,6 @@ }, { "id": 62, - "item_id": 0, "type": 3, "drawing_name": { "key": "62", @@ -2069,7 +2007,6 @@ }, { "id": 63, - "item_id": 0, "type": 3, "drawing_name": { "key": "63", @@ -2102,7 +2039,6 @@ }, { "id": 64, - "item_id": 0, "type": 3, "drawing_name": { "key": "64", @@ -2135,7 +2071,6 @@ }, { "id": 65, - "item_id": 0, "type": 3, "drawing_name": { "key": "65", @@ -2168,7 +2103,6 @@ }, { "id": 66, - "item_id": 0, "type": 3, "drawing_name": { "key": "66", @@ -2201,7 +2135,6 @@ }, { "id": 67, - "item_id": 0, "type": 3, "drawing_name": { "key": "67", @@ -2234,7 +2167,6 @@ }, { "id": 68, - "item_id": 0, "type": 3, "drawing_name": { "key": "68", @@ -2267,7 +2199,6 @@ }, { "id": 69, - "item_id": 0, "type": 3, "drawing_name": { "key": "69", @@ -2300,7 +2231,6 @@ }, { "id": 70, - "item_id": 0, "type": 3, "drawing_name": { "key": "70", @@ -2333,7 +2263,6 @@ }, { "id": 71, - "item_id": 0, "type": 3, "drawing_name": { "key": "71", @@ -2366,7 +2295,6 @@ }, { "id": 72, - "item_id": 0, "type": 3, "drawing_name": { "key": "72", @@ -2399,7 +2327,6 @@ }, { "id": 73, - "item_id": 0, "type": 3, "drawing_name": { "key": "73", @@ -2432,7 +2359,6 @@ }, { "id": 74, - "item_id": 0, "type": 3, "drawing_name": { "key": "74", @@ -2465,7 +2391,6 @@ }, { "id": 75, - "item_id": 0, "type": 3, "drawing_name": { "key": "75", diff --git a/bin/json/game_smithytool.json b/bin/json/game_smithytool.json index 74dda8969..50bea78d3 100644 --- a/bin/json/game_smithytool.json +++ b/bin/json/game_smithytool.json @@ -323,7 +323,7 @@ "id": 11, "skill_type": 2, "skill_lv": 1, - "preconditions": 15, + "preconditions": 10, "up_material": [], "name_text": { "key": "", @@ -339,7 +339,7 @@ "id": 12, "skill_type": 2, "skill_lv": 2, - "preconditions": 15, + "preconditions": 10, "up_material": [], "name_text": { "key": "", @@ -355,7 +355,7 @@ "id": 13, "skill_type": 2, "skill_lv": 3, - "preconditions": 15, + "preconditions": 10, "up_material": [], "name_text": { "key": "", @@ -371,7 +371,7 @@ "id": 14, "skill_type": 2, "skill_lv": 4, - "preconditions": 15, + "preconditions": 10, "up_material": [], "name_text": { "key": "", @@ -387,7 +387,7 @@ "id": 15, "skill_type": 2, "skill_lv": 5, - "preconditions": 15, + "preconditions": 10, "up_material": [], "name_text": { "key": "", @@ -403,7 +403,7 @@ "id": 16, "skill_type": 2, "skill_lv": 6, - "preconditions": 15, + "preconditions": 10, "up_material": [], "name_text": { "key": "", @@ -419,7 +419,7 @@ "id": 17, "skill_type": 2, "skill_lv": 7, - "preconditions": 15, + "preconditions": 10, "up_material": [], "name_text": { "key": "", @@ -435,7 +435,7 @@ "id": 18, "skill_type": 2, "skill_lv": 8, - "preconditions": 15, + "preconditions": 10, "up_material": [], "name_text": { "key": "", @@ -451,7 +451,7 @@ "id": 19, "skill_type": 2, "skill_lv": 9, - "preconditions": 15, + "preconditions": 10, "up_material": [], "name_text": { "key": "", @@ -467,7 +467,7 @@ "id": 20, "skill_type": 2, "skill_lv": 10, - "preconditions": 15, + "preconditions": 10, "up_material": [], "name_text": { "key": "", @@ -483,7 +483,7 @@ "id": 21, "skill_type": 3, "skill_lv": 1, - "preconditions": 25, + "preconditions": 20, "up_material": [], "name_text": { "key": "", @@ -499,7 +499,7 @@ "id": 22, "skill_type": 3, "skill_lv": 2, - "preconditions": 25, + "preconditions": 21, "up_material": [], "name_text": { "key": "", @@ -515,7 +515,7 @@ "id": 23, "skill_type": 3, "skill_lv": 3, - "preconditions": 25, + "preconditions": 22, "up_material": [], "name_text": { "key": "", @@ -531,7 +531,7 @@ "id": 24, "skill_type": 3, "skill_lv": 4, - "preconditions": 25, + "preconditions": 23, "up_material": [], "name_text": { "key": "", @@ -547,7 +547,7 @@ "id": 25, "skill_type": 3, "skill_lv": 5, - "preconditions": 25, + "preconditions": 24, "up_material": [], "name_text": { "key": "", @@ -813,7 +813,7 @@ "key": "41", "text": "顾客购买装备数量上限提高至{0}件" }, - "value": 0 + "value": 6 }, { "id": 42, @@ -829,7 +829,7 @@ "key": "42", "text": "顾客购买装备数量上限提高至{0}件" }, - "value": 0 + "value": 7 }, { "id": 43, @@ -845,7 +845,7 @@ "key": "43", "text": "顾客购买装备数量上限提高至{0}件" }, - "value": 0 + "value": 8 }, { "id": 44, @@ -861,7 +861,7 @@ "key": "44", "text": "顾客购买装备数量上限提高至{0}件" }, - "value": 0 + "value": 9 }, { "id": 45, @@ -877,7 +877,7 @@ "key": "45", "text": "顾客购买装备数量上限提高至{0}件" }, - "value": 0 + "value": 10 }, { "id": 46, @@ -893,7 +893,7 @@ "key": "46", "text": "顾客购买装备数量上限提高至{0}件" }, - "value": 0 + "value": 11 }, { "id": 47, @@ -909,7 +909,7 @@ "key": "47", "text": "顾客购买装备数量上限提高至{0}件" }, - "value": 0 + "value": 12 }, { "id": 48, @@ -925,7 +925,7 @@ "key": "48", "text": "顾客购买装备数量上限提高至{0}件" }, - "value": 0 + "value": 13 }, { "id": 49, @@ -941,7 +941,7 @@ "key": "49", "text": "顾客购买装备数量上限提高至{0}件" }, - "value": 0 + "value": 14 }, { "id": 50, @@ -957,6 +957,6 @@ "key": "50", "text": "顾客购买装备数量上限提高至{0}件" }, - "value": 0 + "value": 15 } ] \ No newline at end of file diff --git a/sys/configure/structs/Game.NewSmithyData.go b/sys/configure/structs/Game.NewSmithyData.go index 08f8a9db7..9ee79fb40 100644 --- a/sys/configure/structs/Game.NewSmithyData.go +++ b/sys/configure/structs/Game.NewSmithyData.go @@ -12,7 +12,6 @@ import "errors" type GameNewSmithyData struct { Id int32 - ItemId int32 Type int32 DrawingName string QualityText string @@ -34,7 +33,6 @@ func (*GameNewSmithyData) GetTypeId() int32 { func (_v *GameNewSmithyData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["item_id"].(float64); !_ok_ { err = errors.New("item_id error"); return }; _v.ItemId = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["drawing_name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.DrawingName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.DrawingName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["quality_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.QualityText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.QualityText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } diff --git a/sys/configure/structs/game.DropData.go b/sys/configure/structs/game.DropData.go index f27a0510c..21ef8d0c5 100644 --- a/sys/configure/structs/game.DropData.go +++ b/sys/configure/structs/game.DropData.go @@ -16,6 +16,8 @@ type GameDropData struct { Prize []*Gameatn Star int32 P int32 + EnableType int32 + Condition int32 } const TypeId_GameDropData = 1700203957 @@ -43,6 +45,8 @@ func (_v *GameDropData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["p"].(float64); !_ok_ { err = errors.New("p error"); return }; _v.P = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["enable_type"].(float64); !_ok_ { err = errors.New("enable_type error"); return }; _v.EnableType = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["condition"].(float64); !_ok_ { err = errors.New("condition error"); return }; _v.Condition = int32(_tempNum_) } return } diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index 7cc786d52..5eb796c8d 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -175,6 +175,7 @@ type GameGlobalData struct { RotateDizzyTime float32 Moonshopmoney []int32 Generaltp *Gameatn + SmithyPurchaseType []int32 } const TypeId_GameGlobalData = 477542761 @@ -738,6 +739,20 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["generaltp"].(map[string]interface{}); !_ok_ { err = errors.New("generaltp error"); return }; if _v.Generaltp, err = DeserializeGameatn(_x_); err != nil { return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["smithy_PurchaseType"].([]interface{}); !_ok_ { err = errors.New("smithy_PurchaseType error"); return } + + _v.SmithyPurchaseType = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.SmithyPurchaseType = append(_v.SmithyPurchaseType, _list_v_) + } + } + return }