From d210e54fc003bfaddfb1eafed8528ee51e0fa339 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 24 Feb 2023 11:48:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=8F=B0=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=20=E6=9D=A1=E4=BB=B6=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_drawcard.json | 24 +-- bin/json/game_smithytool.json | 338 +++++++++++++++++----------------- modules/smithy/api_toolsup.go | 21 ++- pb/errorcode.pb.go | 15 +- pb/userexpand.pb.go | 14 +- 5 files changed, 211 insertions(+), 201 deletions(-) diff --git a/bin/json/game_drawcard.json b/bin/json/game_drawcard.json index 885ba8971..afbd41b4f 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": "34006", + "id": "34007", "weight": 1000 }, { @@ -14,7 +14,7 @@ "card_pool_type": "base_pool1", "star": 4, "race": 1, - "id": "34006", + "id": "34007", "weight": 1000 }, { @@ -23,7 +23,7 @@ "card_pool_type": "base_pool1", "star": 5, "race": 1, - "id": "34006", + "id": "34007", "weight": 1000 }, { @@ -32,7 +32,7 @@ "card_pool_type": "base_pool2", "star": 3, "race": 1, - "id": "24002", + "id": "13003", "weight": 1000 }, { @@ -41,7 +41,7 @@ "card_pool_type": "base_pool2", "star": 4, "race": 1, - "id": "24002", + "id": "13003", "weight": 1000 }, { @@ -50,7 +50,7 @@ "card_pool_type": "base_pool2", "star": 5, "race": 1, - "id": "24002", + "id": "13003", "weight": 1000 }, { @@ -59,7 +59,7 @@ "card_pool_type": "base_pool3", "star": 3, "race": 1, - "id": "14003", + "id": "34002", "weight": 1000 }, { @@ -68,7 +68,7 @@ "card_pool_type": "base_pool3", "star": 4, "race": 1, - "id": "14003", + "id": "34002", "weight": 1000 }, { @@ -77,7 +77,7 @@ "card_pool_type": "base_pool3", "star": 5, "race": 1, - "id": "14003", + "id": "34002", "weight": 1000 }, { @@ -86,7 +86,7 @@ "card_pool_type": "base_pool4", "star": 3, "race": 1, - "id": "24008", + "id": "15002", "weight": 1000 }, { @@ -95,7 +95,7 @@ "card_pool_type": "base_pool4", "star": 4, "race": 1, - "id": "24008", + "id": "15002", "weight": 1000 }, { @@ -104,7 +104,7 @@ "card_pool_type": "base_pool4", "star": 5, "race": 1, - "id": "24008", + "id": "15002", "weight": 1000 }, { diff --git a/bin/json/game_smithytool.json b/bin/json/game_smithytool.json index cced3f840..cc5036bff 100644 --- a/bin/json/game_smithytool.json +++ b/bin/json/game_smithytool.json @@ -22,11 +22,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_1", - "text": "测量尺lv.{0}" + "key": "newsmithy_tool_name_text1", + "text": "造诣lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_1", + "key": "newsmithy_tool_content_text1", "text": "史诗品质概率提升{0}%" }, "value": 0 @@ -54,11 +54,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_1", - "text": "测量尺lv.{0}" + "key": "newsmithy_tool_name_text1", + "text": "造诣lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_1", + "key": "newsmithy_tool_content_text1", "text": "史诗品质概率提升{0}%" }, "value": 5 @@ -86,11 +86,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_1", - "text": "测量尺lv.{0}" + "key": "newsmithy_tool_name_text1", + "text": "造诣lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_1", + "key": "newsmithy_tool_content_text1", "text": "史诗品质概率提升{0}%" }, "value": 10 @@ -118,11 +118,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_1", - "text": "测量尺lv.{0}" + "key": "newsmithy_tool_name_text1", + "text": "造诣lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_1", + "key": "newsmithy_tool_content_text1", "text": "史诗品质概率提升{0}%" }, "value": 15 @@ -150,11 +150,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_1", - "text": "测量尺lv.{0}" + "key": "newsmithy_tool_name_text1", + "text": "造诣lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_1", + "key": "newsmithy_tool_content_text1", "text": "史诗品质概率提升{0}%" }, "value": 20 @@ -182,11 +182,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_1", - "text": "测量尺lv.{0}" + "key": "newsmithy_tool_name_text1", + "text": "造诣lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_1", + "key": "newsmithy_tool_content_text1", "text": "史诗品质概率提升{0}%" }, "value": 25 @@ -214,11 +214,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_1", - "text": "测量尺lv.{0}" + "key": "newsmithy_tool_name_text1", + "text": "造诣lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_1", + "key": "newsmithy_tool_content_text1", "text": "史诗品质概率提升{0}%" }, "value": 30 @@ -246,11 +246,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_1", - "text": "测量尺lv.{0}" + "key": "newsmithy_tool_name_text1", + "text": "造诣lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_1", + "key": "newsmithy_tool_content_text1", "text": "史诗品质概率提升{0}%" }, "value": 35 @@ -278,11 +278,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_1", - "text": "测量尺lv.{0}" + "key": "newsmithy_tool_name_text1", + "text": "造诣lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_1", + "key": "newsmithy_tool_content_text1", "text": "史诗品质概率提升{0}%" }, "value": 40 @@ -310,11 +310,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_1", - "text": "测量尺lv.{0}" + "key": "newsmithy_tool_name_text1", + "text": "造诣lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_1", + "key": "newsmithy_tool_content_text1", "text": "史诗品质概率提升{0}%" }, "value": 45 @@ -326,11 +326,11 @@ "preconditions": 0, "up_material": [], "name_text": { - "key": "newsmithy_name_text_1", - "text": "测量尺lv.{0}" + "key": "newsmithy_tool_name_text1", + "text": "造诣lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_1", + "key": "newsmithy_tool_content_text1", "text": "史诗品质概率提升{0}%" }, "value": 50 @@ -339,7 +339,7 @@ "id": 12, "skill_type": 2, "skill_lv": 0, - "preconditions": 0, + "preconditions": 6, "up_material": [ { "a": "item", @@ -358,11 +358,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_2", - "text": "包装盒lv.{0}" + "key": "newsmithy_tool_name_text2", + "text": "精装lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_1", + "key": "newsmithy_tool_content_text2", "text": "所有装备售价提升{0}%" }, "value": 0 @@ -390,11 +390,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_2", - "text": "包装盒lv.{0}" + "key": "newsmithy_tool_name_text2", + "text": "精装lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_2", + "key": "newsmithy_tool_content_text2", "text": "所有装备售价提升{0}%" }, "value": 20 @@ -422,11 +422,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_2", - "text": "包装盒lv.{0}" + "key": "newsmithy_tool_name_text2", + "text": "精装lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_2", + "key": "newsmithy_tool_content_text2", "text": "所有装备售价提升{0}%" }, "value": 40 @@ -454,11 +454,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_2", - "text": "包装盒lv.{0}" + "key": "newsmithy_tool_name_text2", + "text": "精装lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_2", + "key": "newsmithy_tool_content_text2", "text": "所有装备售价提升{0}%" }, "value": 60 @@ -486,11 +486,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_2", - "text": "包装盒lv.{0}" + "key": "newsmithy_tool_name_text2", + "text": "精装lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_2", + "key": "newsmithy_tool_content_text2", "text": "所有装备售价提升{0}%" }, "value": 80 @@ -518,11 +518,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_2", - "text": "包装盒lv.{0}" + "key": "newsmithy_tool_name_text2", + "text": "精装lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_2", + "key": "newsmithy_tool_content_text2", "text": "所有装备售价提升{0}%" }, "value": 100 @@ -550,11 +550,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_2", - "text": "包装盒lv.{0}" + "key": "newsmithy_tool_name_text2", + "text": "精装lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_2", + "key": "newsmithy_tool_content_text2", "text": "所有装备售价提升{0}%" }, "value": 120 @@ -582,11 +582,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_2", - "text": "包装盒lv.{0}" + "key": "newsmithy_tool_name_text2", + "text": "精装lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_2", + "key": "newsmithy_tool_content_text2", "text": "所有装备售价提升{0}%" }, "value": 140 @@ -614,11 +614,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_2", - "text": "包装盒lv.{0}" + "key": "newsmithy_tool_name_text2", + "text": "精装lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_2", + "key": "newsmithy_tool_content_text2", "text": "所有装备售价提升{0}%" }, "value": 160 @@ -646,11 +646,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_2", - "text": "包装盒lv.{0}" + "key": "newsmithy_tool_name_text2", + "text": "精装lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_2", + "key": "newsmithy_tool_content_text2", "text": "所有装备售价提升{0}%" }, "value": 180 @@ -662,11 +662,11 @@ "preconditions": 6, "up_material": [], "name_text": { - "key": "newsmithy_name_text_2", - "text": "包装盒lv.{0}" + "key": "newsmithy_tool_name_text2", + "text": "精装lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_2", + "key": "newsmithy_tool_content_text2", "text": "所有装备售价提升{0}%" }, "value": 200 @@ -675,7 +675,7 @@ "id": 23, "skill_type": 3, "skill_lv": 0, - "preconditions": 0, + "preconditions": 17, "up_material": [ { "a": "item", @@ -694,11 +694,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_3", - "text": "温控装置lv.{0}" + "key": "newsmithy_tool_name_text3", + "text": "节能lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_2", + "key": "newsmithy_tool_content_text3", "text": "所有图纸炉温消耗减少{0}%" }, "value": 0 @@ -726,11 +726,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_3", - "text": "温控装置lv.{0}" + "key": "newsmithy_tool_name_text3", + "text": "节能lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_3", + "key": "newsmithy_tool_content_text3", "text": "所有图纸炉温消耗减少{0}%" }, "value": 30 @@ -758,11 +758,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_3", - "text": "温控装置lv.{0}" + "key": "newsmithy_tool_name_text3", + "text": "节能lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_3", + "key": "newsmithy_tool_content_text3", "text": "所有图纸炉温消耗减少{0}%" }, "value": 60 @@ -790,11 +790,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_3", - "text": "温控装置lv.{0}" + "key": "newsmithy_tool_name_text3", + "text": "节能lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_3", + "key": "newsmithy_tool_content_text3", "text": "所有图纸炉温消耗减少{0}%" }, "value": 90 @@ -822,11 +822,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_3", - "text": "温控装置lv.{0}" + "key": "newsmithy_tool_name_text3", + "text": "节能lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_3", + "key": "newsmithy_tool_content_text3", "text": "所有图纸炉温消耗减少{0}%" }, "value": 120 @@ -854,11 +854,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_3", - "text": "温控装置lv.{0}" + "key": "newsmithy_tool_name_text3", + "text": "节能lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_3", + "key": "newsmithy_tool_content_text3", "text": "所有图纸炉温消耗减少{0}%" }, "value": 150 @@ -886,11 +886,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_3", - "text": "温控装置lv.{0}" + "key": "newsmithy_tool_name_text3", + "text": "节能lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_3", + "key": "newsmithy_tool_content_text3", "text": "所有图纸炉温消耗减少{0}%" }, "value": 180 @@ -918,11 +918,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_3", - "text": "温控装置lv.{0}" + "key": "newsmithy_tool_name_text3", + "text": "节能lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_3", + "key": "newsmithy_tool_content_text3", "text": "所有图纸炉温消耗减少{0}%" }, "value": 210 @@ -950,11 +950,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_3", - "text": "温控装置lv.{0}" + "key": "newsmithy_tool_name_text3", + "text": "节能lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_3", + "key": "newsmithy_tool_content_text3", "text": "所有图纸炉温消耗减少{0}%" }, "value": 240 @@ -982,11 +982,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_3", - "text": "温控装置lv.{0}" + "key": "newsmithy_tool_name_text3", + "text": "节能lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_3", + "key": "newsmithy_tool_content_text3", "text": "所有图纸炉温消耗减少{0}%" }, "value": 270 @@ -998,11 +998,11 @@ "preconditions": 17, "up_material": [], "name_text": { - "key": "newsmithy_name_text_3", - "text": "温控装置lv.{0}" + "key": "newsmithy_tool_name_text3", + "text": "节能lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_3", + "key": "newsmithy_tool_content_text3", "text": "所有图纸炉温消耗减少{0}%" }, "value": 300 @@ -1011,7 +1011,7 @@ "id": 34, "skill_type": 4, "skill_lv": 0, - "preconditions": 0, + "preconditions": 28, "up_material": [ { "a": "item", @@ -1030,11 +1030,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_4", - "text": "宣传单lv.{0}" + "key": "newsmithy_tool_name_text4", + "text": "推广lv.{0}" }, "content_text": { - "key": "newsmithy_content_text_3", + "key": "newsmithy_tool_content_text4", "text": "每日顾客数量提升至{0}人" }, "value": 20 @@ -1062,11 +1062,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_4", - "text": "宣传单lv.{0}" + "key": "newsmithy_tool_name_text4", + "text": "推广lv.{0}" }, "content_text": { - "key": "newsmithy_content_text35", + "key": "newsmithy_tool_content_text4", "text": "每日顾客数量提升至{0}人" }, "value": 21 @@ -1094,11 +1094,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_4", - "text": "宣传单lv.{0}" + "key": "newsmithy_tool_name_text4", + "text": "推广lv.{0}" }, "content_text": { - "key": "newsmithy_content_text36", + "key": "newsmithy_tool_content_text4", "text": "每日顾客数量提升至{0}人" }, "value": 22 @@ -1126,11 +1126,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_4", - "text": "宣传单lv.{0}" + "key": "newsmithy_tool_name_text4", + "text": "推广lv.{0}" }, "content_text": { - "key": "newsmithy_content_text37", + "key": "newsmithy_tool_content_text4", "text": "每日顾客数量提升至{0}人" }, "value": 23 @@ -1158,11 +1158,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_4", - "text": "宣传单lv.{0}" + "key": "newsmithy_tool_name_text4", + "text": "推广lv.{0}" }, "content_text": { - "key": "newsmithy_content_text38", + "key": "newsmithy_tool_content_text4", "text": "每日顾客数量提升至{0}人" }, "value": 24 @@ -1190,11 +1190,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_4", - "text": "宣传单lv.{0}" + "key": "newsmithy_tool_name_text4", + "text": "推广lv.{0}" }, "content_text": { - "key": "newsmithy_content_text39", + "key": "newsmithy_tool_content_text4", "text": "每日顾客数量提升至{0}人" }, "value": 25 @@ -1222,11 +1222,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_4", - "text": "宣传单lv.{0}" + "key": "newsmithy_tool_name_text4", + "text": "推广lv.{0}" }, "content_text": { - "key": "newsmithy_content_text40", + "key": "newsmithy_tool_content_text4", "text": "每日顾客数量提升至{0}人" }, "value": 26 @@ -1254,11 +1254,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_4", - "text": "宣传单lv.{0}" + "key": "newsmithy_tool_name_text4", + "text": "推广lv.{0}" }, "content_text": { - "key": "newsmithy_content_text41", + "key": "newsmithy_tool_content_text4", "text": "每日顾客数量提升至{0}人" }, "value": 27 @@ -1286,11 +1286,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_4", - "text": "宣传单lv.{0}" + "key": "newsmithy_tool_name_text4", + "text": "推广lv.{0}" }, "content_text": { - "key": "newsmithy_content_text42", + "key": "newsmithy_tool_content_text4", "text": "每日顾客数量提升至{0}人" }, "value": 28 @@ -1318,11 +1318,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_4", - "text": "宣传单lv.{0}" + "key": "newsmithy_tool_name_text4", + "text": "推广lv.{0}" }, "content_text": { - "key": "newsmithy_content_text43", + "key": "newsmithy_tool_content_text4", "text": "每日顾客数量提升至{0}人" }, "value": 29 @@ -1334,11 +1334,11 @@ "preconditions": 28, "up_material": [], "name_text": { - "key": "newsmithy_name_text_4", - "text": "宣传单lv.{0}" + "key": "newsmithy_tool_name_text4", + "text": "推广lv.{0}" }, "content_text": { - "key": "newsmithy_content_text44", + "key": "newsmithy_tool_content_text4", "text": "每日顾客数量提升至{0}人" }, "value": 30 @@ -1347,7 +1347,7 @@ "id": 45, "skill_type": 5, "skill_lv": 0, - "preconditions": 0, + "preconditions": 39, "up_material": [ { "a": "item", @@ -1366,11 +1366,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_5", - "text": "会员制lv.{0}" + "key": "newsmithy_tool_name_text5", + "text": "促销lv.{0}" }, "content_text": { - "key": "newsmithy_content_text45", + "key": "newsmithy_tool_content_text5", "text": "顾客购买装备数量上限提高至{0}件" }, "value": 5 @@ -1398,11 +1398,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_5", - "text": "会员制lv.{0}" + "key": "newsmithy_tool_name_text5", + "text": "促销lv.{0}" }, "content_text": { - "key": "newsmithy_content_text46", + "key": "newsmithy_tool_content_text5", "text": "顾客购买装备数量上限提高至{0}件" }, "value": 6 @@ -1430,11 +1430,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_5", - "text": "会员制lv.{0}" + "key": "newsmithy_tool_name_text5", + "text": "促销lv.{0}" }, "content_text": { - "key": "newsmithy_content_text47", + "key": "newsmithy_tool_content_text5", "text": "顾客购买装备数量上限提高至{0}件" }, "value": 7 @@ -1462,11 +1462,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_5", - "text": "会员制lv.{0}" + "key": "newsmithy_tool_name_text5", + "text": "促销lv.{0}" }, "content_text": { - "key": "newsmithy_content_text48", + "key": "newsmithy_tool_content_text5", "text": "顾客购买装备数量上限提高至{0}件" }, "value": 8 @@ -1494,11 +1494,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_5", - "text": "会员制lv.{0}" + "key": "newsmithy_tool_name_text5", + "text": "促销lv.{0}" }, "content_text": { - "key": "newsmithy_content_text49", + "key": "newsmithy_tool_content_text5", "text": "顾客购买装备数量上限提高至{0}件" }, "value": 9 @@ -1526,11 +1526,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_5", - "text": "会员制lv.{0}" + "key": "newsmithy_tool_name_text5", + "text": "促销lv.{0}" }, "content_text": { - "key": "newsmithy_content_text50", + "key": "newsmithy_tool_content_text5", "text": "顾客购买装备数量上限提高至{0}件" }, "value": 10 @@ -1558,11 +1558,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_5", - "text": "会员制lv.{0}" + "key": "newsmithy_tool_name_text5", + "text": "促销lv.{0}" }, "content_text": { - "key": "newsmithy_content_text51", + "key": "newsmithy_tool_content_text5", "text": "顾客购买装备数量上限提高至{0}件" }, "value": 11 @@ -1590,11 +1590,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_5", - "text": "会员制lv.{0}" + "key": "newsmithy_tool_name_text5", + "text": "促销lv.{0}" }, "content_text": { - "key": "newsmithy_content_text52", + "key": "newsmithy_tool_content_text5", "text": "顾客购买装备数量上限提高至{0}件" }, "value": 12 @@ -1622,11 +1622,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_5", - "text": "会员制lv.{0}" + "key": "newsmithy_tool_name_text5", + "text": "促销lv.{0}" }, "content_text": { - "key": "newsmithy_content_text53", + "key": "newsmithy_tool_content_text5", "text": "顾客购买装备数量上限提高至{0}件" }, "value": 13 @@ -1654,11 +1654,11 @@ } ], "name_text": { - "key": "newsmithy_name_text_5", - "text": "会员制lv.{0}" + "key": "newsmithy_tool_name_text5", + "text": "促销lv.{0}" }, "content_text": { - "key": "newsmithy_content_text54", + "key": "newsmithy_tool_content_text5", "text": "顾客购买装备数量上限提高至{0}件" }, "value": 14 @@ -1670,11 +1670,11 @@ "preconditions": 39, "up_material": [], "name_text": { - "key": "newsmithy_name_text_5", - "text": "会员制lv.{0}" + "key": "newsmithy_tool_name_text5", + "text": "促销lv.{0}" }, "content_text": { - "key": "newsmithy_content_text55", + "key": "newsmithy_tool_content_text5", "text": "顾客购买装备数量上限提高至{0}件" }, "value": 15 diff --git a/modules/smithy/api_toolsup.go b/modules/smithy/api_toolsup.go index 1e709fed7..529931530 100644 --- a/modules/smithy/api_toolsup.go +++ b/modules/smithy/api_toolsup.go @@ -30,12 +30,23 @@ func (this *apiComp) ToolsUp(session comm.IUserSession, req *pb.SmithyToolsUpReq return } // 校验前置条件 - if conf.Preconditions == 0 { - stove.Skill[conf.SkillType] = conf.SkillLv - } else { - //TODU + if conf.Preconditions != 0 { + if stove.Skill[conf.SkillType]+1 == conf.SkillLv { // 必须是一级一级的升级(即当前等级的下一级) + // 判断前置条件 + if conf.Preconditions != 0 { + poreConf := this.module.configure.GetSmithyToolsData(conf.Preconditions) + if poreConf == nil { // 配置没找到 + code = pb.ErrorCode_ConfigNoFound + return + } + if _, ok := stove.Skill[poreConf.SkillType]; !ok { + code = pb.ErrorCode_SmithyLvToolsPre // 前置条件不满足 + return + } + } + } } - + stove.Skill[conf.SkillType] = conf.SkillLv if this.module.ConsumeRes(session, conf.UpMaterial, true); code != pb.ErrorCode_Success { return } diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index 955a6d789..f31f4aad3 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -332,6 +332,8 @@ const ( ErrorCode_SmithyTaskReceived ErrorCode = 4111 //图鉴任务奖励已领 ErrorCode_SmithyNoFoundAtlas ErrorCode = 4112 // 没有找到图鉴数据 ErrorCode_SmithyNoActivateAtlas ErrorCode = 4113 // 没有图鉴更新数据 + ErrorCode_SmithyLvToolsFailed ErrorCode = 4114 // + ErrorCode_SmithyLvToolsPre ErrorCode = 4115 // 前置条件不足 ) // Enum value maps for ErrorCode. @@ -614,6 +616,8 @@ var ( 4111: "SmithyTaskReceived", 4112: "SmithyNoFoundAtlas", 4113: "SmithyNoActivateAtlas", + 4114: "SmithyLvToolsFailed", + 4115: "SmithyLvToolsPre", } ErrorCode_value = map[string]int32{ "Success": 0, @@ -893,6 +897,8 @@ var ( "SmithyTaskReceived": 4111, "SmithyNoFoundAtlas": 4112, "SmithyNoActivateAtlas": 4113, + "SmithyLvToolsFailed": 4114, + "SmithyLvToolsPre": 4115, } ) @@ -927,7 +933,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, 0xb2, 0x32, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0xe3, 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, @@ -1330,8 +1336,11 @@ var file_errorcode_proto_rawDesc = []byte{ 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, 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, + 0x6c, 0x61, 0x73, 0x10, 0x91, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, + 0x4c, 0x76, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0x92, 0x20, + 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x76, 0x54, 0x6f, 0x6f, 0x6c, + 0x73, 0x50, 0x72, 0x65, 0x10, 0x93, 0x20, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/userexpand.pb.go b/pb/userexpand.pb.go index 2f94e09a3..dd8075b3a 100644 --- a/pb/userexpand.pb.go +++ b/pb/userexpand.pb.go @@ -57,7 +57,6 @@ type DBUserExpand struct { SociatyTicket int32 `protobuf:"varint,33,opt,name=sociatyTicket,proto3" json:"sociatyTicket" bson:"sociatyTicket"` //公会boss挑战券数量 Mline map[int32]int32 `protobuf:"bytes,34,rep,name=mline,proto3" json:"mline" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"mline"` //主线关卡最大进度 key难度val是关卡ID SuiteId []int32 `protobuf:"varint,35,rep,packed,name=suiteId,proto3" json:"suiteId" bson:"suiteId"` // 套装Id - Globalbuff int32 `protobuf:"varint,36,opt,name=globalbuff,proto3" json:"globalbuff" bson:"globalbuff"` // 全局buff } func (x *DBUserExpand) Reset() { @@ -309,18 +308,11 @@ func (x *DBUserExpand) GetSuiteId() []int32 { return nil } -func (x *DBUserExpand) GetGlobalbuff() int32 { - if x != nil { - return x.Globalbuff - } - return 0 -} - var File_userexpand_proto protoreflect.FileDescriptor var file_userexpand_proto_rawDesc = []byte{ 0x0a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0xac, 0x0a, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, + 0x74, 0x6f, 0x22, 0x8c, 0x0a, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 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, 0x2c, 0x0a, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x61, @@ -393,9 +385,7 @@ var file_userexpand_proto_rawDesc = []byte{ 0x32, 0x18, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x4d, 0x6c, 0x69, 0x6e, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x6d, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x18, 0x23, 0x20, 0x03, - 0x28, 0x05, 0x52, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x67, - 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x62, 0x75, 0x66, 0x66, 0x18, 0x24, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x0a, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x62, 0x75, 0x66, 0x66, 0x1a, 0x3a, 0x0a, 0x0c, 0x45, + 0x28, 0x05, 0x52, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x1a, 0x3a, 0x0a, 0x0c, 0x45, 0x78, 0x70, 0x69, 0x74, 0x65, 0x6d, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61,