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/atlas/api_atlasactivate.go b/modules/atlas/api_atlasactivate.go index 49e6c943c..41cd11c95 100644 --- a/modules/atlas/api_atlasactivate.go +++ b/modules/atlas/api_atlasactivate.go @@ -17,7 +17,29 @@ func (this *apiComp) ActivateCheck(session comm.IUserSession, req *pb.AtlasActiv // 激活图鉴信息 func (this *apiComp) Activate(session comm.IUserSession, req *pb.AtlasActivateReq) (code pb.ErrorCode, data proto.Message) { + if code = this.ActivateCheck(session, req); code != pb.ErrorCode_Success { + return + } - session.SendMsg(string(this.module.GetType()), "activate", &pb.AtlasActivateResp{}) + atlasConf := this.module.configure.GetPandoAtlasConf(req.Id) + if atlasConf == nil { + code = pb.ErrorCode_ReqParameterError + return + } + list, _ := this.module.modelPandaAtlas.getPandaAtlasList(session.GetUserId()) + if v, ok := list.Collect[req.Id]; ok { + if !v.Activate { + update := make(map[string]interface{}) + v.Activate = true // 找到图鉴积分 并更新积分 + list.Score += atlasConf.AtlasScore + update["collect"] = list.Collect + update["score"] = list.Score + this.module.modelPandaAtlas.modifyPandaAtlasList(session.GetUserId(), update) + session.SendMsg(string(this.module.GetType()), "activate", &pb.AtlasActivateResp{}) + } else { + code = pb.ErrorCode_SmithyNoActivateAtlas + } + } + code = pb.ErrorCode_SmithyNoFoundAtlas return } diff --git a/modules/atlas/api_getatlas.go b/modules/atlas/api_getatlas.go index aa27b6856..6de7b788f 100644 --- a/modules/atlas/api_getatlas.go +++ b/modules/atlas/api_getatlas.go @@ -8,19 +8,25 @@ import ( ) //参数校验 -func (this *apiComp) AtlasListCheck(session comm.IUserSession, req *pb.SmithyAtlasListReq) (code pb.ErrorCode) { +func (this *apiComp) AtlasListCheck(session comm.IUserSession, req *pb.AtlasGetListReq) (code pb.ErrorCode) { return } // 获取铁匠铺图鉴信息 -func (this *apiComp) AtlasList(session comm.IUserSession, req *pb.SmithyAtlasListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) AtlasList(session comm.IUserSession, req *pb.AtlasGetListReq) (code pb.ErrorCode, data proto.Message) { code = this.AtlasListCheck(session, req) if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 } - - session.SendMsg(string(this.module.GetType()), "atlaslist", &pb.SmithyAtlasListResp{}) + list, err := this.module.modelPandaAtlas.getPandaAtlasList(session.GetUserId()) + if err != nil { + code = pb.ErrorCode_DBError + return + } + session.SendMsg(string(this.module.GetType()), "getlist", &pb.AtlasGetListResp{ + Data: list, + }) return } diff --git a/modules/atlas/comp_configure.go b/modules/atlas/comp_configure.go index 2814420ea..0554a373f 100644 --- a/modules/atlas/comp_configure.go +++ b/modules/atlas/comp_configure.go @@ -1,27 +1,40 @@ package atlas import ( + "fmt" "go_dreamfactory/lego/core" "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" "go_dreamfactory/sys/configure" - "sync" + cfg "go_dreamfactory/sys/configure/structs" ) -const () +const ( + pandaJx = "game_pandamasjx.json" // 武馆教习 + pandaAtlas = "game_pandamastj.json" // 武馆图鉴 + pandaAtlasAward = "game_pandamastjjl.json" // 武馆图鉴奖励 +) // /配置管理基础组件 type configureComp struct { modules.MCompConfigure module *PandaAtlas - hlock sync.RWMutex } // 组件初始化接口 func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { err = this.MCompConfigure.Init(service, module, comp, options) this.module = module.(*PandaAtlas) + err = this.LoadMultiConfigure(map[string]interface{}{ + pandaJx: cfg.NewGamePandamasJx, + pandaAtlas: cfg.NewGamePandamasTj, + pandaAtlasAward: cfg.NewGamePandamasTjjl, + }) + _d := this.GetPandoAtlasConf("10110") + _d1 := this.GetPandoJxConf("10001") + _d2 := this.GetPandoAtlasAwardConf(1) + this.module.Debugf("%v,%v,%v", _d, _d1, _d2) return } @@ -41,3 +54,42 @@ func (this *configureComp) LoadMultiConfigure(confs map[string]interface{}) (err func (this *configureComp) GetConfigure(name string) (v interface{}, err error) { return configure.GetConfigure(name) } + +// 获取教习数据 +func (this *configureComp) GetPandoJxConf(id string) (conf *cfg.GamePandamasJxData) { + + if v, err := this.GetConfigure(pandaJx); err == nil { + if configure, ok := v.(*cfg.GamePandamasJx); ok { + return configure.Get(id) + } + } else { + err = fmt.Errorf("%T no is *cfg.GamePandamasJxData", v) + } + return +} + +// 获取武馆图鉴数据 +func (this *configureComp) GetPandoAtlasConf(id string) (conf *cfg.GamePandamasTjData) { + + if v, err := this.GetConfigure(pandaAtlas); err == nil { + if configure, ok := v.(*cfg.GamePandamasTj); ok { + return configure.Get(id) + } + } else { + err = fmt.Errorf("%T no is *cfg.GamePandamasTjData", v) + } + return +} + +// 获取图鉴奖励 +func (this *configureComp) GetPandoAtlasAwardConf(lv int32) (conf *cfg.GamePandamasTjjlData) { + + if v, err := this.GetConfigure(pandaAtlasAward); err == nil { + if configure, ok := v.(*cfg.GamePandamasTjjl); ok { + return configure.Get(lv) + } + } else { + err = fmt.Errorf("%T no is *cfg.GamePandamasTjData", v) + } + return +} diff --git a/modules/atlas/model_atlas.go b/modules/atlas/model_atlas.go index 3464c0d75..55761e85e 100644 --- a/modules/atlas/model_atlas.go +++ b/modules/atlas/model_atlas.go @@ -29,14 +29,13 @@ func (this *modelPandaAtlas) Init(service core.IService, module core.IModule, co func (this *modelPandaAtlas) getPandaAtlasList(uid string) (result *pb.DBPandaAtlas, err error) { result = &pb.DBPandaAtlas{ - Collect: map[string]*pb.Collect{}, + Collect: map[string]*pb.CollectInfo{}, } if err = this.Get(uid, result); err != nil { if mongo.ErrNoDocuments == err { result.Id = primitive.NewObjectID().Hex() result.Uid = uid - - result.Collect = make(map[string]*pb.Collect, 0) + result.Collect = make(map[string]*pb.CollectInfo, 0) result.Award = 1 // 初始1级 this.Add(uid, result) err = nil diff --git a/modules/atlas/module.go b/modules/atlas/module.go index 6c850c228..a257cba86 100644 --- a/modules/atlas/module.go +++ b/modules/atlas/module.go @@ -15,7 +15,9 @@ import ( type PandaAtlas struct { modules.ModuleBase api *apiComp + configure *configureComp modelPandaAtlas *modelPandaAtlas + service core.IService } func NewModule() core.IModule { @@ -28,14 +30,14 @@ func (this *PandaAtlas) GetType() core.M_Modules { func (this *PandaAtlas) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { err = this.ModuleBase.Init(service, module, options) - + this.service = service return } func (this *PandaAtlas) OnInstallComp() { this.ModuleBase.OnInstallComp() this.api = this.RegisterComp(new(apiComp)).(*apiComp) - + this.configure = this.RegisterComp(new(configureComp)).(*configureComp) this.modelPandaAtlas = this.RegisterComp(new(modelPandaAtlas)).(*modelPandaAtlas) } diff --git a/modules/smithy/api_rise.go b/modules/smithy/api_rise.go index 7e2c7f7d1..75b0c151e 100644 --- a/modules/smithy/api_rise.go +++ b/modules/smithy/api_rise.go @@ -10,7 +10,7 @@ import ( //参数校验 func (this *apiComp) RiseCheck(session comm.IUserSession, req *pb.SmithyRiseReq) (code pb.ErrorCode) { - if req.ItemId != "" && req.Count > 0 { + if req.ItemId != "" && req.Count < 0 { code = pb.ErrorCode_ReqParameterError } return 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/atlas_db.pb.go b/pb/atlas_db.pb.go index 1d0d47fdf..0e0b50840 100644 --- a/pb/atlas_db.pb.go +++ b/pb/atlas_db.pb.go @@ -25,11 +25,11 @@ type DBPandaAtlas struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID - Collect map[string]*Collect `protobuf:"bytes,3,rep,name=collect,proto3" json:"collect" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 收藏品图鉴信息 - Score int32 `protobuf:"varint,4,opt,name=score,proto3" json:"score"` // 总积分 - Award int32 `protobuf:"varint,5,opt,name=award,proto3" json:"award"` // 奖励进度 + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID + Collect map[string]*CollectInfo `protobuf:"bytes,3,rep,name=collect,proto3" json:"collect" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 收藏品图鉴信息 + Score int32 `protobuf:"varint,4,opt,name=score,proto3" json:"score"` // 总积分 + Award int32 `protobuf:"varint,5,opt,name=award,proto3" json:"award"` // 奖励进度 } func (x *DBPandaAtlas) Reset() { @@ -78,7 +78,7 @@ func (x *DBPandaAtlas) GetUid() string { return "" } -func (x *DBPandaAtlas) GetCollect() map[string]*Collect { +func (x *DBPandaAtlas) GetCollect() map[string]*CollectInfo { if x != nil { return x.Collect } @@ -99,17 +99,18 @@ func (x *DBPandaAtlas) GetAward() int32 { return 0 } -type Collect struct { +type CollectInfo struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Score int32 `protobuf:"varint,1,opt,name=score,proto3" json:"score"` - Time int64 `protobuf:"varint,2,opt,name=time,proto3" json:"time"` // 获得时间 + Score int32 `protobuf:"varint,1,opt,name=score,proto3" json:"score"` + Time int64 `protobuf:"varint,2,opt,name=time,proto3" json:"time"` // 获得时间 + Activate bool `protobuf:"varint,3,opt,name=activate,proto3" json:"activate"` // 是否激活 } -func (x *Collect) Reset() { - *x = Collect{} +func (x *CollectInfo) Reset() { + *x = CollectInfo{} if protoimpl.UnsafeEnabled { mi := &file_atlas_atlas_db_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -117,13 +118,13 @@ func (x *Collect) Reset() { } } -func (x *Collect) String() string { +func (x *CollectInfo) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Collect) ProtoMessage() {} +func (*CollectInfo) ProtoMessage() {} -func (x *Collect) ProtoReflect() protoreflect.Message { +func (x *CollectInfo) ProtoReflect() protoreflect.Message { mi := &file_atlas_atlas_db_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -135,30 +136,37 @@ func (x *Collect) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Collect.ProtoReflect.Descriptor instead. -func (*Collect) Descriptor() ([]byte, []int) { +// Deprecated: Use CollectInfo.ProtoReflect.Descriptor instead. +func (*CollectInfo) Descriptor() ([]byte, []int) { return file_atlas_atlas_db_proto_rawDescGZIP(), []int{1} } -func (x *Collect) GetScore() int32 { +func (x *CollectInfo) GetScore() int32 { if x != nil { return x.Score } return 0 } -func (x *Collect) GetTime() int64 { +func (x *CollectInfo) GetTime() int64 { if x != nil { return x.Time } return 0 } +func (x *CollectInfo) GetActivate() bool { + if x != nil { + return x.Activate + } + return false +} + var File_atlas_atlas_db_proto protoreflect.FileDescriptor var file_atlas_atlas_db_proto_rawDesc = []byte{ 0x0a, 0x14, 0x61, 0x74, 0x6c, 0x61, 0x73, 0x2f, 0x61, 0x74, 0x6c, 0x61, 0x73, 0x5f, 0x64, 0x62, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd8, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x50, 0x61, 0x6e, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xdc, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x50, 0x61, 0x6e, 0x64, 0x61, 0x41, 0x74, 0x6c, 0x61, 0x73, 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, 0x34, 0x0a, 0x07, 0x63, 0x6f, 0x6c, @@ -167,16 +175,18 @@ var file_atlas_atlas_db_proto_rawDesc = []byte{ 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x05, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x44, 0x0a, 0x0c, 0x43, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x48, 0x0a, 0x0c, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, - 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1e, 0x0a, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x43, - 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, - 0x01, 0x22, 0x33, 0x0a, 0x07, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, - 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, - 0x72, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x22, 0x0a, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x43, + 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x53, 0x0a, 0x0b, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, + 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, + 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1a, + 0x0a, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -194,12 +204,12 @@ func file_atlas_atlas_db_proto_rawDescGZIP() []byte { var file_atlas_atlas_db_proto_msgTypes = make([]protoimpl.MessageInfo, 3) var file_atlas_atlas_db_proto_goTypes = []interface{}{ (*DBPandaAtlas)(nil), // 0: DBPandaAtlas - (*Collect)(nil), // 1: Collect + (*CollectInfo)(nil), // 1: CollectInfo nil, // 2: DBPandaAtlas.CollectEntry } var file_atlas_atlas_db_proto_depIdxs = []int32{ 2, // 0: DBPandaAtlas.collect:type_name -> DBPandaAtlas.CollectEntry - 1, // 1: DBPandaAtlas.CollectEntry.value:type_name -> Collect + 1, // 1: DBPandaAtlas.CollectEntry.value:type_name -> CollectInfo 2, // [2:2] is the sub-list for method output_type 2, // [2:2] is the sub-list for method input_type 2, // [2:2] is the sub-list for extension type_name @@ -226,7 +236,7 @@ func file_atlas_atlas_db_proto_init() { } } file_atlas_atlas_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Collect); i { + switch v := v.(*CollectInfo); i { case 0: return &v.state case 1: diff --git a/pb/atlas_msg.pb.go b/pb/atlas_msg.pb.go index 77ef09a65..0edb1cad7 100644 --- a/pb/atlas_msg.pb.go +++ b/pb/atlas_msg.pb.go @@ -287,101 +287,6 @@ func (x *AtlasAwardResp) GetData() *DBPandaAtlas { return nil } -//图鉴任务奖励领取 -type TaskAwardReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId"` -} - -func (x *TaskAwardReq) Reset() { - *x = TaskAwardReq{} - if protoimpl.UnsafeEnabled { - mi := &file_atlas_atlas_msg_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TaskAwardReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TaskAwardReq) ProtoMessage() {} - -func (x *TaskAwardReq) ProtoReflect() protoreflect.Message { - mi := &file_atlas_atlas_msg_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use TaskAwardReq.ProtoReflect.Descriptor instead. -func (*TaskAwardReq) Descriptor() ([]byte, []int) { - return file_atlas_atlas_msg_proto_rawDescGZIP(), []int{6} -} - -func (x *TaskAwardReq) GetTaskId() int32 { - if x != nil { - return x.TaskId - } - return 0 -} - -type TaskAwardResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId"` -} - -func (x *TaskAwardResp) Reset() { - *x = TaskAwardResp{} - if protoimpl.UnsafeEnabled { - mi := &file_atlas_atlas_msg_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TaskAwardResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TaskAwardResp) ProtoMessage() {} - -func (x *TaskAwardResp) ProtoReflect() protoreflect.Message { - mi := &file_atlas_atlas_msg_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use TaskAwardResp.ProtoReflect.Descriptor instead. -func (*TaskAwardResp) Descriptor() ([]byte, []int) { - return file_atlas_atlas_msg_proto_rawDescGZIP(), []int{7} -} - -func (x *TaskAwardResp) GetTaskId() int32 { - if x != nil { - return x.TaskId - } - return 0 -} - var File_atlas_atlas_msg_proto protoreflect.FileDescriptor var file_atlas_atlas_msg_proto_rawDesc = []byte{ @@ -402,13 +307,8 @@ var file_atlas_atlas_msg_proto_rawDesc = []byte{ 0x64, 0x52, 0x65, 0x71, 0x22, 0x33, 0x0a, 0x0e, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x6e, 0x64, 0x61, 0x41, 0x74, - 0x6c, 0x61, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x26, 0x0a, 0x0c, 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, 0x27, 0x0a, 0x0d, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, - 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6c, 0x61, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, + 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -423,7 +323,7 @@ func file_atlas_atlas_msg_proto_rawDescGZIP() []byte { return file_atlas_atlas_msg_proto_rawDescData } -var file_atlas_atlas_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 8) +var file_atlas_atlas_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_atlas_atlas_msg_proto_goTypes = []interface{}{ (*AtlasGetListReq)(nil), // 0: AtlasGetListReq (*AtlasGetListResp)(nil), // 1: AtlasGetListResp @@ -431,14 +331,12 @@ var file_atlas_atlas_msg_proto_goTypes = []interface{}{ (*AtlasActivateResp)(nil), // 3: AtlasActivateResp (*AtlasAwardReq)(nil), // 4: AtlasAwardReq (*AtlasAwardResp)(nil), // 5: AtlasAwardResp - (*TaskAwardReq)(nil), // 6: TaskAwardReq - (*TaskAwardResp)(nil), // 7: TaskAwardResp - (*DBPandaAtlas)(nil), // 8: DBPandaAtlas + (*DBPandaAtlas)(nil), // 6: DBPandaAtlas } var file_atlas_atlas_msg_proto_depIdxs = []int32{ - 8, // 0: AtlasGetListResp.data:type_name -> DBPandaAtlas - 8, // 1: AtlasActivateResp.data:type_name -> DBPandaAtlas - 8, // 2: AtlasAwardResp.data:type_name -> DBPandaAtlas + 6, // 0: AtlasGetListResp.data:type_name -> DBPandaAtlas + 6, // 1: AtlasActivateResp.data:type_name -> DBPandaAtlas + 6, // 2: AtlasAwardResp.data:type_name -> DBPandaAtlas 3, // [3:3] is the sub-list for method output_type 3, // [3:3] is the sub-list for method input_type 3, // [3:3] is the sub-list for extension type_name @@ -525,30 +423,6 @@ func file_atlas_atlas_msg_proto_init() { return nil } } - file_atlas_atlas_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TaskAwardReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_atlas_atlas_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TaskAwardResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } } type x struct{} out := protoimpl.TypeBuilder{ @@ -556,7 +430,7 @@ func file_atlas_atlas_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_atlas_atlas_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 8, + NumMessages: 6, NumExtensions: 0, NumServices: 0, }, 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,