diff --git a/bin/json/game_newsmithy.json b/bin/json/game_newsmithy.json index 823344eb4..47a993a78 100644 --- a/bin/json/game_newsmithy.json +++ b/bin/json/game_newsmithy.json @@ -45,8 +45,8 @@ "n": 4 }, "customized_lv": [ - 10, - 15 + 1, + 2 ], "customized_lv_distribution": [ 50, @@ -99,8 +99,8 @@ "n": 5 }, "customized_lv": [ - 10, - 15 + 1, + 2 ], "customized_lv_distribution": [ 50, @@ -153,8 +153,8 @@ "n": 6 }, "customized_lv": [ - 10, - 15 + 1, + 2 ], "customized_lv_distribution": [ 50, @@ -207,8 +207,8 @@ "n": 7 }, "customized_lv": [ - 10, - 15 + 1, + 2 ], "customized_lv_distribution": [ 50, @@ -261,8 +261,8 @@ "n": 8 }, "customized_lv": [ - 10, - 15 + 1, + 2 ], "customized_lv_distribution": [ 50, @@ -315,8 +315,8 @@ "n": 9 }, "customized_lv": [ - 10, - 15 + 1, + 2 ], "customized_lv_distribution": [ 50, @@ -369,8 +369,8 @@ "n": 10 }, "customized_lv": [ - 10, - 15 + 1, + 2 ], "customized_lv_distribution": [ 50, @@ -423,8 +423,8 @@ "n": 11 }, "customized_lv": [ - 10, - 15 + 1, + 2 ], "customized_lv_distribution": [ 50, @@ -477,8 +477,8 @@ "n": 12 }, "customized_lv": [ - 10, - 15 + 1, + 2 ], "customized_lv_distribution": [ 50, @@ -531,8 +531,8 @@ "n": 13 }, "customized_lv": [ - 10, - 15 + 1, + 2 ], "customized_lv_distribution": [ 50, @@ -585,8 +585,8 @@ "n": 14 }, "customized_lv": [ - 10, - 15 + 1, + 2 ], "customized_lv_distribution": [ 50, @@ -639,8 +639,8 @@ "n": 15 }, "customized_lv": [ - 10, - 15 + 1, + 2 ], "customized_lv_distribution": [ 50, @@ -693,8 +693,8 @@ "n": 16 }, "customized_lv": [ - 10, - 15 + 1, + 2 ], "customized_lv_distribution": [ 50, @@ -747,8 +747,8 @@ "n": 17 }, "customized_lv": [ - 10, - 15 + 1, + 2 ], "customized_lv_distribution": [ 50, @@ -801,8 +801,8 @@ "n": 18 }, "customized_lv": [ - 10, - 15 + 1, + 2 ], "customized_lv_distribution": [ 50, @@ -855,8 +855,8 @@ "n": 19 }, "customized_lv": [ - 10, - 15 + 1, + 2 ], "customized_lv_distribution": [ 50, @@ -909,8 +909,8 @@ "n": 20 }, "customized_lv": [ - 10, - 15 + 1, + 2 ], "customized_lv_distribution": [ 50, @@ -963,8 +963,8 @@ "n": 21 }, "customized_lv": [ - 10, - 15 + 1, + 2 ], "customized_lv_distribution": [ 50, @@ -1017,8 +1017,8 @@ "n": 22 }, "customized_lv": [ - 10, - 15 + 1, + 2 ], "customized_lv_distribution": [ 50, @@ -1071,8 +1071,8 @@ "n": 23 }, "customized_lv": [ - 10, - 15 + 1, + 2 ], "customized_lv_distribution": [ 50, @@ -1125,8 +1125,8 @@ "n": 24 }, "customized_lv": [ - 10, - 15 + 1, + 2 ], "customized_lv_distribution": [ 50, @@ -1179,8 +1179,8 @@ "n": 25 }, "customized_lv": [ - 10, - 15 + 1, + 2 ], "customized_lv_distribution": [ 50, @@ -1233,8 +1233,8 @@ "n": 26 }, "customized_lv": [ - 10, - 15 + 1, + 2 ], "customized_lv_distribution": [ 50, diff --git a/bin/json/game_smithytask.json b/bin/json/game_smithytask.json new file mode 100644 index 000000000..66763c29c --- /dev/null +++ b/bin/json/game_smithytask.json @@ -0,0 +1,296 @@ +[ + { + "key": 10001, + "id_list": 1, + "task_display": { + "key": "task_10001", + "text": "进行1次普通招募" + }, + "type_id": 2018001, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ] + }, + { + "key": 10002, + "id_list": 2, + "task_display": { + "key": "task_10002", + "text": "为任意英雄提升1次等级" + }, + "type_id": 2024001, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 11 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ] + }, + { + "key": 10004, + "id_list": 4, + "task_display": { + "key": "task_10004", + "text": "强化任意装备成功1次" + }, + "type_id": 2047001, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 12 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ] + }, + { + "key": 10006, + "id_list": 6, + "task_display": { + "key": "task_10006", + "text": "在商店购买任意1件商品" + }, + "type_id": 2064001, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 13 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ] + }, + { + "key": 10007, + "id_list": 7, + "task_display": { + "key": "task_10007", + "text": "使用好友助战英雄战斗1次" + }, + "type_id": 2012001, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 14 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ] + }, + { + "key": 10008, + "id_list": 8, + "task_display": { + "key": "task_10008", + "text": "进行竞技场挑战1次" + }, + "type_id": 2130001, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 15 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ] + }, + { + "key": 10009, + "id_list": 9, + "task_display": { + "key": "task_10009", + "text": "进行10次普通招募" + }, + "type_id": 3018001, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 16 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ] + }, + { + "key": 10010, + "id_list": 10, + "task_display": { + "key": "task_10010", + "text": "为任意英雄提升10次等级" + }, + "type_id": 3024001, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 17 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ] + }, + { + "key": 10011, + "id_list": 12, + "task_display": { + "key": "task_10011", + "text": "强化任意装备成功6次" + }, + "type_id": 3047001, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 18 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ] + }, + { + "key": 10012, + "id_list": 14, + "task_display": { + "key": "task_10012", + "text": "在商店购买任意7件商品" + }, + "type_id": 3064001, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 19 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ] + }, + { + "key": 10013, + "id_list": 15, + "task_display": { + "key": "task_10013", + "text": "使用好友助战英雄战斗7次" + }, + "type_id": 3012001, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 20 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ] + }, + { + "key": 10014, + "id_list": 17, + "task_display": { + "key": "task_10014", + "text": "刷新商店10次" + }, + "type_id": 3105001, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 21 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ] + }, + { + "key": 10015, + "id_list": 18, + "task_display": { + "key": "task_10015", + "text": "消费1000颗钻石" + }, + "type_id": 3104001, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 22 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ] + }, + { + "key": 10016, + "id_list": 19, + "task_display": { + "key": "task_10016", + "text": "进行30场竞技场挑战" + }, + "type_id": 3130001, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 23 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ] + } +] \ No newline at end of file diff --git a/bin/json/game_smithytool.json b/bin/json/game_smithytool.json index 69677abfd..cced3f840 100644 --- a/bin/json/game_smithytool.json +++ b/bin/json/game_smithytool.json @@ -2,6 +2,38 @@ { "id": 1, "skill_type": 1, + "skill_lv": 0, + "preconditions": 0, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], + "name_text": { + "key": "newsmithy_name_text_1", + "text": "测量尺lv.{0}" + }, + "content_text": { + "key": "newsmithy_content_text_1", + "text": "史诗品质概率提升{0}%" + }, + "value": 0 + }, + { + "id": 2, + "skill_type": 1, "skill_lv": 1, "preconditions": 0, "up_material": [ @@ -22,17 +54,17 @@ } ], "name_text": { - "key": "1", + "key": "newsmithy_name_text_1", "text": "测量尺lv.{0}" }, "content_text": { - "key": "1", + "key": "newsmithy_content_text_1", "text": "史诗品质概率提升{0}%" }, "value": 5 }, { - "id": 2, + "id": 3, "skill_type": 1, "skill_lv": 2, "preconditions": 0, @@ -54,17 +86,17 @@ } ], "name_text": { - "key": "2", + "key": "newsmithy_name_text_1", "text": "测量尺lv.{0}" }, "content_text": { - "key": "2", + "key": "newsmithy_content_text_1", "text": "史诗品质概率提升{0}%" }, "value": 10 }, { - "id": 3, + "id": 4, "skill_type": 1, "skill_lv": 3, "preconditions": 0, @@ -86,17 +118,17 @@ } ], "name_text": { - "key": "3", + "key": "newsmithy_name_text_1", "text": "测量尺lv.{0}" }, "content_text": { - "key": "3", + "key": "newsmithy_content_text_1", "text": "史诗品质概率提升{0}%" }, "value": 15 }, { - "id": 4, + "id": 5, "skill_type": 1, "skill_lv": 4, "preconditions": 0, @@ -118,17 +150,17 @@ } ], "name_text": { - "key": "4", + "key": "newsmithy_name_text_1", "text": "测量尺lv.{0}" }, "content_text": { - "key": "4", + "key": "newsmithy_content_text_1", "text": "史诗品质概率提升{0}%" }, "value": 20 }, { - "id": 5, + "id": 6, "skill_type": 1, "skill_lv": 5, "preconditions": 0, @@ -150,17 +182,17 @@ } ], "name_text": { - "key": "5", + "key": "newsmithy_name_text_1", "text": "测量尺lv.{0}" }, "content_text": { - "key": "5", + "key": "newsmithy_content_text_1", "text": "史诗品质概率提升{0}%" }, "value": 25 }, { - "id": 6, + "id": 7, "skill_type": 1, "skill_lv": 6, "preconditions": 0, @@ -182,17 +214,17 @@ } ], "name_text": { - "key": "6", + "key": "newsmithy_name_text_1", "text": "测量尺lv.{0}" }, "content_text": { - "key": "6", + "key": "newsmithy_content_text_1", "text": "史诗品质概率提升{0}%" }, "value": 30 }, { - "id": 7, + "id": 8, "skill_type": 1, "skill_lv": 7, "preconditions": 0, @@ -214,17 +246,17 @@ } ], "name_text": { - "key": "7", + "key": "newsmithy_name_text_1", "text": "测量尺lv.{0}" }, "content_text": { - "key": "7", + "key": "newsmithy_content_text_1", "text": "史诗品质概率提升{0}%" }, "value": 35 }, { - "id": 8, + "id": 9, "skill_type": 1, "skill_lv": 8, "preconditions": 0, @@ -246,17 +278,17 @@ } ], "name_text": { - "key": "8", + "key": "newsmithy_name_text_1", "text": "测量尺lv.{0}" }, "content_text": { - "key": "8", + "key": "newsmithy_content_text_1", "text": "史诗品质概率提升{0}%" }, "value": 40 }, { - "id": 9, + "id": 10, "skill_type": 1, "skill_lv": 9, "preconditions": 0, @@ -278,20 +310,36 @@ } ], "name_text": { - "key": "9", + "key": "newsmithy_name_text_1", "text": "测量尺lv.{0}" }, "content_text": { - "key": "9", + "key": "newsmithy_content_text_1", "text": "史诗品质概率提升{0}%" }, "value": 45 }, { - "id": 10, + "id": 11, "skill_type": 1, "skill_lv": 10, "preconditions": 0, + "up_material": [], + "name_text": { + "key": "newsmithy_name_text_1", + "text": "测量尺lv.{0}" + }, + "content_text": { + "key": "newsmithy_content_text_1", + "text": "史诗品质概率提升{0}%" + }, + "value": 50 + }, + { + "id": 12, + "skill_type": 2, + "skill_lv": 0, + "preconditions": 0, "up_material": [ { "a": "item", @@ -310,653 +358,1325 @@ } ], "name_text": { - "key": "10", - "text": "测量尺lv.{0}" + "key": "newsmithy_name_text_2", + "text": "包装盒lv.{0}" }, "content_text": { - "key": "10", - "text": "史诗品质概率提升{0}%" - }, - "value": 50 - }, - { - "id": 11, - "skill_type": 2, - "skill_lv": 1, - "preconditions": 15, - "up_material": [], - "name_text": { - "key": "", - "text": "" - }, - "content_text": { - "key": "11", + "key": "newsmithy_content_text_1", "text": "所有装备售价提升{0}%" }, - "value": 1 - }, - { - "id": 12, - "skill_type": 2, - "skill_lv": 2, - "preconditions": 15, - "up_material": [], - "name_text": { - "key": "", - "text": "" - }, - "content_text": { - "key": "12", - "text": "所有装备售价提升{0}%" - }, - "value": 1 + "value": 0 }, { "id": 13, "skill_type": 2, - "skill_lv": 3, - "preconditions": 15, - "up_material": [], + "skill_lv": 1, + "preconditions": 6, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_2", + "text": "包装盒lv.{0}" }, "content_text": { - "key": "13", + "key": "newsmithy_content_text_2", "text": "所有装备售价提升{0}%" }, - "value": 1 + "value": 20 }, { "id": 14, "skill_type": 2, - "skill_lv": 4, - "preconditions": 15, - "up_material": [], + "skill_lv": 2, + "preconditions": 6, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_2", + "text": "包装盒lv.{0}" }, "content_text": { - "key": "14", + "key": "newsmithy_content_text_2", "text": "所有装备售价提升{0}%" }, - "value": 1 + "value": 40 }, { "id": 15, "skill_type": 2, - "skill_lv": 5, - "preconditions": 15, - "up_material": [], + "skill_lv": 3, + "preconditions": 6, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_2", + "text": "包装盒lv.{0}" }, "content_text": { - "key": "15", + "key": "newsmithy_content_text_2", "text": "所有装备售价提升{0}%" }, - "value": 1 + "value": 60 }, { "id": 16, "skill_type": 2, - "skill_lv": 6, - "preconditions": 15, - "up_material": [], + "skill_lv": 4, + "preconditions": 6, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_2", + "text": "包装盒lv.{0}" }, "content_text": { - "key": "16", + "key": "newsmithy_content_text_2", "text": "所有装备售价提升{0}%" }, - "value": 1 + "value": 80 }, { "id": 17, "skill_type": 2, - "skill_lv": 7, - "preconditions": 15, - "up_material": [], + "skill_lv": 5, + "preconditions": 6, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_2", + "text": "包装盒lv.{0}" }, "content_text": { - "key": "17", + "key": "newsmithy_content_text_2", "text": "所有装备售价提升{0}%" }, - "value": 1 + "value": 100 }, { "id": 18, "skill_type": 2, - "skill_lv": 8, - "preconditions": 15, - "up_material": [], + "skill_lv": 6, + "preconditions": 6, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_2", + "text": "包装盒lv.{0}" }, "content_text": { - "key": "18", + "key": "newsmithy_content_text_2", "text": "所有装备售价提升{0}%" }, - "value": 1 + "value": 120 }, { "id": 19, "skill_type": 2, - "skill_lv": 9, - "preconditions": 15, - "up_material": [], + "skill_lv": 7, + "preconditions": 6, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_2", + "text": "包装盒lv.{0}" }, "content_text": { - "key": "19", + "key": "newsmithy_content_text_2", "text": "所有装备售价提升{0}%" }, - "value": 1 + "value": 140 }, { "id": 20, "skill_type": 2, - "skill_lv": 10, - "preconditions": 15, - "up_material": [], + "skill_lv": 8, + "preconditions": 6, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_2", + "text": "包装盒lv.{0}" }, "content_text": { - "key": "20", + "key": "newsmithy_content_text_2", "text": "所有装备售价提升{0}%" }, - "value": 1 + "value": 160 }, { "id": 21, - "skill_type": 3, - "skill_lv": 1, - "preconditions": 25, - "up_material": [], + "skill_type": 2, + "skill_lv": 9, + "preconditions": 6, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_2", + "text": "包装盒lv.{0}" }, "content_text": { - "key": "21", - "text": "所有图纸炉温消耗减少{0}%" + "key": "newsmithy_content_text_2", + "text": "所有装备售价提升{0}%" }, - "value": 1 + "value": 180 }, { "id": 22, - "skill_type": 3, - "skill_lv": 2, - "preconditions": 25, + "skill_type": 2, + "skill_lv": 10, + "preconditions": 6, "up_material": [], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_2", + "text": "包装盒lv.{0}" }, "content_text": { - "key": "22", - "text": "所有图纸炉温消耗减少{0}%" + "key": "newsmithy_content_text_2", + "text": "所有装备售价提升{0}%" }, - "value": 1 + "value": 200 }, { "id": 23, "skill_type": 3, - "skill_lv": 3, - "preconditions": 25, - "up_material": [], + "skill_lv": 0, + "preconditions": 0, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_3", + "text": "温控装置lv.{0}" }, "content_text": { - "key": "23", + "key": "newsmithy_content_text_2", "text": "所有图纸炉温消耗减少{0}%" }, - "value": 1 + "value": 0 }, { "id": 24, "skill_type": 3, - "skill_lv": 4, - "preconditions": 25, - "up_material": [], + "skill_lv": 1, + "preconditions": 17, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_3", + "text": "温控装置lv.{0}" }, "content_text": { - "key": "24", + "key": "newsmithy_content_text_3", "text": "所有图纸炉温消耗减少{0}%" }, - "value": 1 + "value": 30 }, { "id": 25, "skill_type": 3, - "skill_lv": 5, - "preconditions": 25, - "up_material": [], + "skill_lv": 2, + "preconditions": 17, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_3", + "text": "温控装置lv.{0}" }, "content_text": { - "key": "25", + "key": "newsmithy_content_text_3", "text": "所有图纸炉温消耗减少{0}%" }, - "value": 1 + "value": 60 }, { "id": 26, "skill_type": 3, - "skill_lv": 6, - "preconditions": 25, - "up_material": [], + "skill_lv": 3, + "preconditions": 17, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_3", + "text": "温控装置lv.{0}" }, "content_text": { - "key": "26", + "key": "newsmithy_content_text_3", "text": "所有图纸炉温消耗减少{0}%" }, - "value": 1 + "value": 90 }, { "id": 27, "skill_type": 3, - "skill_lv": 7, - "preconditions": 25, - "up_material": [], + "skill_lv": 4, + "preconditions": 17, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_3", + "text": "温控装置lv.{0}" }, "content_text": { - "key": "27", + "key": "newsmithy_content_text_3", "text": "所有图纸炉温消耗减少{0}%" }, - "value": 1 + "value": 120 }, { "id": 28, "skill_type": 3, - "skill_lv": 8, - "preconditions": 25, - "up_material": [], + "skill_lv": 5, + "preconditions": 17, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_3", + "text": "温控装置lv.{0}" }, "content_text": { - "key": "28", + "key": "newsmithy_content_text_3", "text": "所有图纸炉温消耗减少{0}%" }, - "value": 1 + "value": 150 }, { "id": 29, "skill_type": 3, - "skill_lv": 9, - "preconditions": 25, - "up_material": [], + "skill_lv": 6, + "preconditions": 17, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_3", + "text": "温控装置lv.{0}" }, "content_text": { - "key": "29", + "key": "newsmithy_content_text_3", "text": "所有图纸炉温消耗减少{0}%" }, - "value": 1 + "value": 180 }, { "id": 30, "skill_type": 3, - "skill_lv": 10, - "preconditions": 25, - "up_material": [], + "skill_lv": 7, + "preconditions": 17, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_3", + "text": "温控装置lv.{0}" }, "content_text": { - "key": "30", + "key": "newsmithy_content_text_3", "text": "所有图纸炉温消耗减少{0}%" }, - "value": 1 + "value": 210 }, { "id": 31, - "skill_type": 4, - "skill_lv": 1, - "preconditions": 35, - "up_material": [], + "skill_type": 3, + "skill_lv": 8, + "preconditions": 17, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_3", + "text": "温控装置lv.{0}" }, "content_text": { - "key": "31", - "text": "每日顾客数量提升至{0}人" + "key": "newsmithy_content_text_3", + "text": "所有图纸炉温消耗减少{0}%" }, - "value": 1 + "value": 240 }, { "id": 32, - "skill_type": 4, - "skill_lv": 2, - "preconditions": 35, - "up_material": [], + "skill_type": 3, + "skill_lv": 9, + "preconditions": 17, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_3", + "text": "温控装置lv.{0}" }, "content_text": { - "key": "32", - "text": "每日顾客数量提升至{0}人" + "key": "newsmithy_content_text_3", + "text": "所有图纸炉温消耗减少{0}%" }, - "value": 1 + "value": 270 }, { "id": 33, - "skill_type": 4, - "skill_lv": 3, - "preconditions": 35, + "skill_type": 3, + "skill_lv": 10, + "preconditions": 17, "up_material": [], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_3", + "text": "温控装置lv.{0}" }, "content_text": { - "key": "33", - "text": "每日顾客数量提升至{0}人" + "key": "newsmithy_content_text_3", + "text": "所有图纸炉温消耗减少{0}%" }, - "value": 1 + "value": 300 }, { "id": 34, "skill_type": 4, - "skill_lv": 4, - "preconditions": 35, - "up_material": [], + "skill_lv": 0, + "preconditions": 0, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_4", + "text": "宣传单lv.{0}" }, "content_text": { - "key": "34", + "key": "newsmithy_content_text_3", "text": "每日顾客数量提升至{0}人" }, - "value": 1 + "value": 20 }, { "id": 35, "skill_type": 4, - "skill_lv": 5, - "preconditions": 35, - "up_material": [], + "skill_lv": 1, + "preconditions": 28, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_4", + "text": "宣传单lv.{0}" }, "content_text": { - "key": "35", + "key": "newsmithy_content_text35", "text": "每日顾客数量提升至{0}人" }, - "value": 1 + "value": 21 }, { "id": 36, "skill_type": 4, - "skill_lv": 6, - "preconditions": 35, - "up_material": [], + "skill_lv": 2, + "preconditions": 28, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_4", + "text": "宣传单lv.{0}" }, "content_text": { - "key": "36", + "key": "newsmithy_content_text36", "text": "每日顾客数量提升至{0}人" }, - "value": 1 + "value": 22 }, { "id": 37, "skill_type": 4, - "skill_lv": 7, - "preconditions": 35, - "up_material": [], + "skill_lv": 3, + "preconditions": 28, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_4", + "text": "宣传单lv.{0}" }, "content_text": { - "key": "37", + "key": "newsmithy_content_text37", "text": "每日顾客数量提升至{0}人" }, - "value": 1 + "value": 23 }, { "id": 38, "skill_type": 4, - "skill_lv": 8, - "preconditions": 35, - "up_material": [], + "skill_lv": 4, + "preconditions": 28, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_4", + "text": "宣传单lv.{0}" }, "content_text": { - "key": "38", + "key": "newsmithy_content_text38", "text": "每日顾客数量提升至{0}人" }, - "value": 1 + "value": 24 }, { "id": 39, "skill_type": 4, - "skill_lv": 9, - "preconditions": 35, - "up_material": [], + "skill_lv": 5, + "preconditions": 28, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_4", + "text": "宣传单lv.{0}" }, "content_text": { - "key": "39", + "key": "newsmithy_content_text39", "text": "每日顾客数量提升至{0}人" }, - "value": 1 + "value": 25 }, { "id": 40, "skill_type": 4, - "skill_lv": 10, - "preconditions": 35, - "up_material": [], + "skill_lv": 6, + "preconditions": 28, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_4", + "text": "宣传单lv.{0}" }, "content_text": { - "key": "40", + "key": "newsmithy_content_text40", "text": "每日顾客数量提升至{0}人" }, - "value": 1 + "value": 26 }, { "id": 41, - "skill_type": 5, - "skill_lv": 1, - "preconditions": 45, - "up_material": [], + "skill_type": 4, + "skill_lv": 7, + "preconditions": 28, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_4", + "text": "宣传单lv.{0}" }, "content_text": { - "key": "41", - "text": "顾客购买装备数量上限提高至{0}件" + "key": "newsmithy_content_text41", + "text": "每日顾客数量提升至{0}人" }, - "value": 1 + "value": 27 }, { "id": 42, - "skill_type": 5, - "skill_lv": 2, - "preconditions": 45, - "up_material": [], + "skill_type": 4, + "skill_lv": 8, + "preconditions": 28, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_4", + "text": "宣传单lv.{0}" }, "content_text": { - "key": "42", - "text": "顾客购买装备数量上限提高至{0}件" + "key": "newsmithy_content_text42", + "text": "每日顾客数量提升至{0}人" }, - "value": 1 + "value": 28 }, { "id": 43, - "skill_type": 5, - "skill_lv": 3, - "preconditions": 45, - "up_material": [], + "skill_type": 4, + "skill_lv": 9, + "preconditions": 28, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_4", + "text": "宣传单lv.{0}" }, "content_text": { - "key": "43", - "text": "顾客购买装备数量上限提高至{0}件" + "key": "newsmithy_content_text43", + "text": "每日顾客数量提升至{0}人" }, - "value": 1 + "value": 29 }, { "id": 44, - "skill_type": 5, - "skill_lv": 4, - "preconditions": 45, + "skill_type": 4, + "skill_lv": 10, + "preconditions": 28, "up_material": [], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_4", + "text": "宣传单lv.{0}" }, "content_text": { - "key": "44", - "text": "顾客购买装备数量上限提高至{0}件" + "key": "newsmithy_content_text44", + "text": "每日顾客数量提升至{0}人" }, - "value": 1 + "value": 30 }, { "id": 45, "skill_type": 5, - "skill_lv": 5, - "preconditions": 45, - "up_material": [], + "skill_lv": 0, + "preconditions": 0, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_5", + "text": "会员制lv.{0}" }, "content_text": { - "key": "45", + "key": "newsmithy_content_text45", "text": "顾客购买装备数量上限提高至{0}件" }, - "value": 1 + "value": 5 }, { "id": 46, "skill_type": 5, - "skill_lv": 6, - "preconditions": 45, - "up_material": [], + "skill_lv": 1, + "preconditions": 39, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_5", + "text": "会员制lv.{0}" }, "content_text": { - "key": "46", + "key": "newsmithy_content_text46", "text": "顾客购买装备数量上限提高至{0}件" }, - "value": 1 + "value": 6 }, { "id": 47, "skill_type": 5, - "skill_lv": 7, - "preconditions": 45, - "up_material": [], + "skill_lv": 2, + "preconditions": 39, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_5", + "text": "会员制lv.{0}" }, "content_text": { - "key": "47", + "key": "newsmithy_content_text47", "text": "顾客购买装备数量上限提高至{0}件" }, - "value": 1 + "value": 7 }, { "id": 48, "skill_type": 5, - "skill_lv": 8, - "preconditions": 45, - "up_material": [], + "skill_lv": 3, + "preconditions": 39, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_5", + "text": "会员制lv.{0}" }, "content_text": { - "key": "48", + "key": "newsmithy_content_text48", "text": "顾客购买装备数量上限提高至{0}件" }, - "value": 1 + "value": 8 }, { "id": 49, "skill_type": 5, - "skill_lv": 9, - "preconditions": 45, - "up_material": [], + "skill_lv": 4, + "preconditions": 39, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_5", + "text": "会员制lv.{0}" }, "content_text": { - "key": "49", + "key": "newsmithy_content_text49", "text": "顾客购买装备数量上限提高至{0}件" }, - "value": 1 + "value": 9 }, { "id": 50, "skill_type": 5, - "skill_lv": 10, - "preconditions": 45, - "up_material": [], + "skill_lv": 5, + "preconditions": 39, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], "name_text": { - "key": "", - "text": "" + "key": "newsmithy_name_text_5", + "text": "会员制lv.{0}" }, "content_text": { - "key": "50", + "key": "newsmithy_content_text50", "text": "顾客购买装备数量上限提高至{0}件" }, - "value": 1 + "value": 10 + }, + { + "id": 51, + "skill_type": 5, + "skill_lv": 6, + "preconditions": 39, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], + "name_text": { + "key": "newsmithy_name_text_5", + "text": "会员制lv.{0}" + }, + "content_text": { + "key": "newsmithy_content_text51", + "text": "顾客购买装备数量上限提高至{0}件" + }, + "value": 11 + }, + { + "id": 52, + "skill_type": 5, + "skill_lv": 7, + "preconditions": 39, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], + "name_text": { + "key": "newsmithy_name_text_5", + "text": "会员制lv.{0}" + }, + "content_text": { + "key": "newsmithy_content_text52", + "text": "顾客购买装备数量上限提高至{0}件" + }, + "value": 12 + }, + { + "id": 53, + "skill_type": 5, + "skill_lv": 8, + "preconditions": 39, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], + "name_text": { + "key": "newsmithy_name_text_5", + "text": "会员制lv.{0}" + }, + "content_text": { + "key": "newsmithy_content_text53", + "text": "顾客购买装备数量上限提高至{0}件" + }, + "value": 13 + }, + { + "id": 54, + "skill_type": 5, + "skill_lv": 9, + "preconditions": 39, + "up_material": [ + { + "a": "item", + "t": "10002", + "n": 1 + }, + { + "a": "item", + "t": "10002", + "n": 2 + }, + { + "a": "item", + "t": "10002", + "n": 3 + } + ], + "name_text": { + "key": "newsmithy_name_text_5", + "text": "会员制lv.{0}" + }, + "content_text": { + "key": "newsmithy_content_text54", + "text": "顾客购买装备数量上限提高至{0}件" + }, + "value": 14 + }, + { + "id": 55, + "skill_type": 5, + "skill_lv": 10, + "preconditions": 39, + "up_material": [], + "name_text": { + "key": "newsmithy_name_text_5", + "text": "会员制lv.{0}" + }, + "content_text": { + "key": "newsmithy_content_text55", + "text": "顾客购买装备数量上限提高至{0}件" + }, + "value": 15 } ] \ No newline at end of file diff --git a/modules/equipment/module.go b/modules/equipment/module.go index a21a86bde..2afc6a115 100644 --- a/modules/equipment/module.go +++ b/modules/equipment/module.go @@ -364,6 +364,10 @@ func (this *Equipment) GetForgeEquip(session comm.IUserSession, suiteId int32, p lvs = append(lvs, v) } } + if len(lvs) == 0 { + code = pb.ErrorCode_ConfigNoFound + return + } r := rand.New(rand.NewSource(time.Now().Unix())) index := r.Perm(len(lvs))[0] if eruip, err = this.modelEquipment.newEquipment(session.GetUserId(), lvs[index], dyweight); err == nil { diff --git a/modules/smithy/api_atlasactivate.go b/modules/smithy/api_atlasactivate.go index 019e2c2ba..255fb2d80 100644 --- a/modules/smithy/api_atlasactivate.go +++ b/modules/smithy/api_atlasactivate.go @@ -17,7 +17,9 @@ func (this *apiComp) AtlasActivateCheck(session comm.IUserSession, req *pb.Smith // 获取铁匠铺图鉴信息 func (this *apiComp) AtlasActivate(session comm.IUserSession, req *pb.SmithyAtlasActivateReq) (code pb.ErrorCode, data proto.Message) { - + var ( + addScore int32 // 更新图鉴增加的积分 + ) code = this.AtlasActivateCheck(session, req) if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 @@ -35,18 +37,26 @@ func (this *apiComp) AtlasActivate(session comm.IUserSession, req *pb.SmithyAtla if v, ok := atlas.Atlas[req.Id]; ok { if !v.Activate { // 激活 v.Activate = true + addScore = v.Data[0].Score } else { //更新操作 if len(v.Data) > 1 { - v.Data = append(v.Data[:1], v.Data[1:]...) + addScore = v.Data[1].Score - v.Data[0].Score + v.Data = append(v.Data[:0], v.Data[1:]...) + } else { + code = pb.ErrorCode_SmithyNoActivateAtlas + return } } update := make(map[string]interface{}, 0) update["atlas"] = v + atlas.Score += addScore + update["score"] = atlas.Score this.module.modelAtlas.modifySmithyAtlasList(session.GetUserId(), update) } else { code = pb.ErrorCode_SmithyNoFoundAtlas return } + session.SendMsg(string(this.module.GetType()), "atlasactivate", &pb.SmithyAtlasActivateResp{Data: atlas}) return } diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go index a90569711..b0530c710 100644 --- a/modules/smithy/api_forgeequip.go +++ b/modules/smithy/api_forgeequip.go @@ -30,6 +30,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq customLv int32 // 定制装备的等级 rsp *pb.SmithyForgeEquipResp ) + rsp = &pb.SmithyForgeEquipResp{} update = make(map[string]interface{}) code = this.ForgeEquipCheck(session, req) if code != pb.ErrorCode_Success { @@ -55,7 +56,6 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq Lv: 1, Value: 0, } - //update["data"] = stove.Data } stove.Data[req.ReelId].Value += 1 stove.Forge[req.ReelId] += 1 @@ -153,20 +153,23 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq // 装备资源分发 if customLv > 0 { // - rsp.Equip = make([]string, 0) + sz := make([]int32, 4) // 最高 4个品质 // 获得极品权重 sz[3] = this.module.modelStove.StoveToolsQualityProbability(stove) if equip, code1 := this.module.ModuleEquipment.GetForgeEquip(session, req.SuiteId, req.Position, customLv, sz); code1 != pb.ErrorCode_Success { - rsp.Equip = append(rsp.Equip, equip.CId) + rsp.Equip = append(rsp.Equip, equip) return } } else { - rsp.Equip = make([]string, 0) + res := this.module.configure.GetDropReward(reelcfg.BasicDrop) - this.module.DispenseRes(session, res, true) - for _, v := range res { - rsp.Equip = append(rsp.Equip, v.T) + if err, atno := this.module.DispenseAtno(session, res, true); err == pb.ErrorCode_Success { + for _, v := range atno { + if eq, err1 := this.module.ModuleEquipment.QueryEquipment(session.GetUserId(), v.O); err1 == pb.ErrorCode_Success { + rsp.Equip = append(rsp.Equip, eq) + } + } } } diff --git a/modules/smithy/model_atlas.go b/modules/smithy/model_atlas.go index e8a8c0bea..bf136cdbb 100644 --- a/modules/smithy/model_atlas.go +++ b/modules/smithy/model_atlas.go @@ -52,65 +52,94 @@ func (this *modelAtlas) modifySmithyAtlasList(uid string, data map[string]interf // 检查是否激活图鉴 func (this *modelAtlas) CheckActivateAtlas(uid string, id string, lv int32, quality int32, forgeCount int32) bool { - conf := this.module.configure.GetSmithyAtlasConf(id) - if conf != nil { + atlasConf := this.module.configure.GetSmithyAtlasConf(id) + if atlasConf == nil { return false } list, err := this.module.modelAtlas.getSmithyAtlasList(uid) if err != nil { return false } - scoreConf := this.module.configure.GetSmithyAtlasScoreConf(quality, lv) - if scoreConf == nil { - return false - } - if v, ok := list.Atlas[id]; ok { // 找到相同的 校验 对应的分数 - // 获取分数 - if len(v.Data) == 1 { - if v.Data[0].Score <= scoreConf.Score { - newData := &pb.ForgeData{ - ForgeCount: forgeCount, - Lv: lv, - Quality: quality, - Score: scoreConf.Score, - Time: configure.Now().Unix(), + if atlasConf.TypeId == 1 { // 装备收藏图鉴信息 + scoreConf := this.module.configure.GetSmithyAtlasScoreConf(quality, lv) + if scoreConf == nil { + return false + } + if v, ok := list.Atlas[id]; ok { // 找到相同的 + if v.Activate { // 已经激活的 + if len(v.Data) > 1 { + if v.Data[1].Score <= scoreConf.Score { + v.Data[1].ForgeCount = forgeCount + v.Data[1].Lv = lv + v.Data[1].Quality = quality + v.Data[1].Score = scoreConf.Score + v.Data[1].Time = configure.Now().Unix() + update := make(map[string]interface{}, 0) + update["tujian"] = list.Atlas + this.module.modelAtlas.modifySmithyAtlasList(uid, update) // 更新分数信息 + } + } + } else { // 没有激活的 + if len(v.Data) == 1 { + if v.Data[0].Score <= scoreConf.Score { + v.Data[0].ForgeCount = forgeCount + v.Data[0].Lv = lv + v.Data[0].Quality = quality + v.Data[0].Score = scoreConf.Score + v.Data[0].Time = configure.Now().Unix() + update := make(map[string]interface{}, 0) + update["tujian"] = list.Atlas + this.module.modelAtlas.modifySmithyAtlasList(uid, update) // 更新分数信息 + } + } else { + v.Data = make([]*pb.ForgeData, 0) + newData := &pb.ForgeData{ + ForgeCount: forgeCount, + Lv: lv, + Quality: quality, + Score: scoreConf.Score, + Time: configure.Now().Unix(), + } + v.Data = append(v.Data, newData) + update := make(map[string]interface{}, 0) + update["tujian"] = list.Atlas + this.module.modelAtlas.modifySmithyAtlasList(uid, update) // 更新分数信息 } - v.Data = append(v.Data, newData) - update := make(map[string]interface{}, 0) - update["tujian"] = list.Atlas - this.module.modelAtlas.modifySmithyAtlasList(uid, update) // 更新分数信息 - return true } - } else if len(v.Data) == 2 { // 更新第二条数据 - if v.Data[1].Score <= scoreConf.Score { - v.Data[1].Lv = lv - v.Data[1].Quality = quality - v.Data[1].Score = scoreConf.Score - v.Data[1].ForgeCount = forgeCount // 更新锻造次数 - update := make(map[string]interface{}, 0) - update["tujian"] = list.Atlas - this.module.modelAtlas.modifySmithyAtlasList(uid, update) // 更新分数信息 - return true + return true + } else { + sz := &pb.ForgeList{} + newData := &pb.ForgeData{ + ForgeCount: forgeCount, + Lv: lv, + Quality: quality, + Score: scoreConf.Score, + Time: configure.Now().Unix(), } + sz.Data = append(sz.Data, newData) + sz.Activate = false // 第一次获得 默认是非激活状态 + list.Atlas[id] = sz + update := make(map[string]interface{}, 0) + update["tujian"] = list.Atlas + this.module.modelAtlas.modifySmithyAtlasList(uid, update) // 更新分数信息 } - - return false - } else { - sz := &pb.ForgeList{} - newData := &pb.ForgeData{ - ForgeCount: forgeCount, - Lv: lv, - Quality: quality, - Score: scoreConf.Score, - Time: configure.Now().Unix(), - } - sz.Data = append(sz.Data, newData) - sz.Activate = false // 第一次获得 默认是非激活状态 - list.Atlas[id] = sz - update := make(map[string]interface{}, 0) - update["tujian"] = list.Atlas - this.module.modelAtlas.modifySmithyAtlasList(uid, update) // 更新分数信息 } - return true } + +// 检查是否激活收藏品 +func (this *modelAtlas) CheckActivateAtlasCollect(uid string, id string) { + atlasConf := this.module.configure.GetSmithyAtlasConf(id) + if atlasConf != nil && atlasConf.TypeId == 2 { + if list, err := this.module.modelAtlas.getSmithyAtlasList(uid); err == nil { + + if _, ok := list.Collect[id]; !ok { + list.Collect[id] = &pb.CollectData{ + Score: atlasConf.AtlasScore, + Time: configure.Now().Unix(), + } + } + } + } + +} diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index ffac4b35e..c73649eb5 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -330,6 +330,7 @@ const ( ErrorCode_SmithyTaskNoFinished ErrorCode = 4110 //图鉴任务未完成 ErrorCode_SmithyTaskReceived ErrorCode = 4111 //图鉴任务奖励已领 ErrorCode_SmithyNoFoundAtlas ErrorCode = 4112 // 没有找到图鉴数据 + ErrorCode_SmithyNoActivateAtlas ErrorCode = 4113 // 没有图鉴更新数据 ) // Enum value maps for ErrorCode. @@ -610,6 +611,7 @@ var ( 4110: "SmithyTaskNoFinished", 4111: "SmithyTaskReceived", 4112: "SmithyNoFoundAtlas", + 4113: "SmithyNoActivateAtlas", } ErrorCode_value = map[string]int32{ "Success": 0, @@ -887,6 +889,7 @@ var ( "SmithyTaskNoFinished": 4110, "SmithyTaskReceived": 4111, "SmithyNoFoundAtlas": 4112, + "SmithyNoActivateAtlas": 4113, } ) @@ -921,7 +924,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, 0xfb, 0x31, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0x97, 0x32, 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, @@ -1320,8 +1323,10 @@ var file_errorcode_proto_rawDesc = []byte{ 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x8e, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0x8f, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, - 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x10, 0x90, 0x20, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x10, 0x90, 0x20, 0x12, + 0x1a, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x76, + 0x61, 0x74, 0x65, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x10, 0x91, 0x20, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/smithy_msg.pb.go b/pb/smithy_msg.pb.go index 5b15fc2df..7e64270a5 100644 --- a/pb/smithy_msg.pb.go +++ b/pb/smithy_msg.pb.go @@ -191,8 +191,8 @@ type SmithyForgeEquipResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Equip []string `protobuf:"bytes,1,rep,name=equip,proto3" json:"equip"` // 装备ID - Data *DBStove `protobuf:"bytes,2,opt,name=data,proto3" json:"data"` + Equip []*DB_Equipment `protobuf:"bytes,1,rep,name=equip,proto3" json:"equip"` // 装备ID + Data *DBStove `protobuf:"bytes,2,opt,name=data,proto3" json:"data"` } func (x *SmithyForgeEquipResp) Reset() { @@ -227,7 +227,7 @@ func (*SmithyForgeEquipResp) Descriptor() ([]byte, []int) { return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{3} } -func (x *SmithyForgeEquipResp) GetEquip() []string { +func (x *SmithyForgeEquipResp) GetEquip() []*DB_Equipment { if x != nil { return x.Equip } @@ -1737,125 +1737,128 @@ var file_smithy_smithy_msg_proto_rawDesc = []byte{ 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x73, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2f, 0x73, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x64, 0x62, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x17, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, - 0x65, 0x74, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x36, - 0x0a, 0x16, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, 0x76, 0x65, - 0x49, 0x6e, 0x66, 0x6f, 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, 0x91, 0x01, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, - 0x79, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x71, 0x12, 0x16, - 0x0a, 0x06, 0x72, 0x65, 0x65, 0x6c, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, - 0x72, 0x65, 0x65, 0x6c, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x61, 0x76, 0x61, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6c, 0x61, 0x76, 0x61, 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, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x12, 0x1a, - 0x0a, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x4a, 0x0a, 0x14, 0x53, 0x6d, - 0x69, 0x74, 0x68, 0x79, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, - 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x09, 0x52, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, - 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, - 0x53, 0x74, 0x6f, 0x76, 0x65, 0x55, 0x70, 0x52, 0x65, 0x71, 0x22, 0x31, 0x0a, 0x11, 0x53, 0x6d, - 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x55, 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, 0x3d, 0x0a, - 0x0d, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x69, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, - 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, - 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2e, 0x0a, 0x0e, - 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x69, 0x73, 0x65, 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, 0x22, 0x0a, 0x10, - 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x55, 0x70, 0x52, 0x65, 0x71, - 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, - 0x22, 0x31, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x55, - 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, + 0x2f, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x22, 0x17, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, + 0x53, 0x74, 0x6f, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x36, 0x0a, 0x16, + 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x49, 0x6e, + 0x66, 0x6f, 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, 0x91, 0x01, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x46, + 0x6f, 0x72, 0x67, 0x65, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, + 0x72, 0x65, 0x65, 0x6c, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x72, 0x65, + 0x65, 0x6c, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x61, 0x76, 0x61, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x04, 0x6c, 0x61, 0x76, 0x61, 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, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, + 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, + 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x59, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, + 0x68, 0x79, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x23, 0x0a, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x0d, 0x2e, 0x44, 0x42, 0x5f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x05, + 0x65, 0x71, 0x75, 0x69, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 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, 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, 0x79, 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, 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, 0x22, 0x31, 0x0a, 0x0f, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x65, 0x66, - 0x75, 0x73, 0x65, 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, 0x3f, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, - 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 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, 0x14, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, - 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x33, 0x0a, - 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4c, 0x69, 0x73, 0x74, + 0x61, 0x74, 0x61, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, + 0x76, 0x65, 0x55, 0x70, 0x52, 0x65, 0x71, 0x22, 0x31, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, + 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x55, 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, 0x3d, 0x0a, 0x0d, 0x53, 0x6d, + 0x69, 0x74, 0x68, 0x79, 0x52, 0x69, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x69, + 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x74, 0x65, + 0x6d, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2e, 0x0a, 0x0e, 0x53, 0x6d, 0x69, + 0x74, 0x68, 0x79, 0x52, 0x69, 0x73, 0x65, 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, 0x22, 0x0a, 0x10, 0x53, 0x6d, 0x69, + 0x74, 0x68, 0x79, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x55, 0x70, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, + 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x31, 0x0a, + 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x55, 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, 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, 0x79, 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, 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, + 0x22, 0x31, 0x0a, 0x0f, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, + 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, 0x3f, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x65, 0x66, + 0x75, 0x73, 0x65, 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, 0x14, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, + 0x6c, 0x61, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x33, 0x0a, 0x13, 0x53, 0x6d, + 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x08, 0x2e, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, + 0x28, 0x0a, 0x16, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x41, 0x63, + 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x37, 0x0a, 0x17, 0x53, 0x6d, 0x69, + 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x22, 0x28, 0x0a, 0x16, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, - 0x73, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x37, 0x0a, 0x17, - 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x41, 0x63, 0x74, 0x69, 0x76, - 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52, - 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x15, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, - 0x74, 0x6c, 0x61, 0x73, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, 0x14, - 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x41, 0x77, 0x61, 0x72, 0x64, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x22, 0x2c, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, - 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, - 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, - 0x22, 0x2d, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x77, - 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 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, 0x61, 0x22, 0x15, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, + 0x73, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, 0x14, 0x53, 0x6d, 0x69, + 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x08, 0x2e, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, + 0x2c, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x77, 0x61, + 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x2d, 0x0a, + 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 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 ( @@ -1909,36 +1912,38 @@ var file_smithy_smithy_msg_proto_goTypes = []interface{}{ (*SmithyGetListReq)(nil), // 34: SmithyGetListReq (*SmithyGetListResp)(nil), // 35: SmithyGetListResp (*DBStove)(nil), // 36: DBStove - (*CustomerInfo)(nil), // 37: CustomerInfo - (*DBAtlas)(nil), // 38: DBAtlas - (*OrderClang)(nil), // 39: OrderClang - (*DBSmithy)(nil), // 40: DBSmithy - (*DBUser)(nil), // 41: DBUser + (*DB_Equipment)(nil), // 37: DB_Equipment + (*CustomerInfo)(nil), // 38: CustomerInfo + (*DBAtlas)(nil), // 39: DBAtlas + (*OrderClang)(nil), // 40: OrderClang + (*DBSmithy)(nil), // 41: DBSmithy + (*DBUser)(nil), // 42: DBUser } var file_smithy_smithy_msg_proto_depIdxs = []int32{ 36, // 0: SmithyGetStoveInfoResp.data:type_name -> DBStove - 36, // 1: SmithyForgeEquipResp.data:type_name -> DBStove - 36, // 2: SmithyStoveUpResp.data:type_name -> DBStove - 36, // 3: SmithyRiseResp.data:type_name -> DBStove - 36, // 4: SmithyToolsUpResp.data:type_name -> DBStove - 37, // 5: SmithyCustomerResp.customers:type_name -> CustomerInfo - 37, // 6: SmithySellResp.customers:type_name -> CustomerInfo - 37, // 7: SmithyRefuseResp.customers:type_name -> CustomerInfo - 38, // 8: SmithyAtlasListResp.data:type_name -> DBAtlas - 38, // 9: SmithyAtlasActivateResp.data:type_name -> DBAtlas - 38, // 10: SmithyAtlasAwardResp.data:type_name -> DBAtlas - 39, // 11: SmithyCreateOrderReq.order:type_name -> OrderClang - 40, // 12: SmithyCreateOrderResp.data:type_name -> DBSmithy - 40, // 13: SmithyGetRewardResp.data:type_name -> DBSmithy - 40, // 14: SmithyDeskSkillLvResp.data:type_name -> DBSmithy - 40, // 15: SmithyStoveSkillLvResp.data:type_name -> DBSmithy - 41, // 16: SmithyGetRandUserResp.user:type_name -> DBUser - 40, // 17: SmithyGetListResp.data:type_name -> DBSmithy - 18, // [18:18] is the sub-list for method output_type - 18, // [18:18] is the sub-list for method input_type - 18, // [18:18] is the sub-list for extension type_name - 18, // [18:18] is the sub-list for extension extendee - 0, // [0:18] is the sub-list for field type_name + 37, // 1: SmithyForgeEquipResp.equip:type_name -> DB_Equipment + 36, // 2: SmithyForgeEquipResp.data:type_name -> DBStove + 36, // 3: SmithyStoveUpResp.data:type_name -> DBStove + 36, // 4: SmithyRiseResp.data:type_name -> DBStove + 36, // 5: SmithyToolsUpResp.data:type_name -> DBStove + 38, // 6: SmithyCustomerResp.customers:type_name -> CustomerInfo + 38, // 7: SmithySellResp.customers:type_name -> CustomerInfo + 38, // 8: SmithyRefuseResp.customers:type_name -> CustomerInfo + 39, // 9: SmithyAtlasListResp.data:type_name -> DBAtlas + 39, // 10: SmithyAtlasActivateResp.data:type_name -> DBAtlas + 39, // 11: SmithyAtlasAwardResp.data:type_name -> DBAtlas + 40, // 12: SmithyCreateOrderReq.order:type_name -> OrderClang + 41, // 13: SmithyCreateOrderResp.data:type_name -> DBSmithy + 41, // 14: SmithyGetRewardResp.data:type_name -> DBSmithy + 41, // 15: SmithyDeskSkillLvResp.data:type_name -> DBSmithy + 41, // 16: SmithyStoveSkillLvResp.data:type_name -> DBSmithy + 42, // 17: SmithyGetRandUserResp.user:type_name -> DBUser + 41, // 18: SmithyGetListResp.data:type_name -> DBSmithy + 19, // [19:19] is the sub-list for method output_type + 19, // [19:19] is the sub-list for method input_type + 19, // [19:19] is the sub-list for extension type_name + 19, // [19:19] is the sub-list for extension extendee + 0, // [0:19] is the sub-list for field type_name } func init() { file_smithy_smithy_msg_proto_init() } @@ -1948,6 +1953,7 @@ func file_smithy_smithy_msg_proto_init() { } file_smithy_smithy_db_proto_init() file_user_user_db_proto_init() + file_equipment_equipment_db_proto_init() if !protoimpl.UnsafeEnabled { file_smithy_smithy_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SmithyGetStoveInfoReq); i {