From a1af1c6eba4a83d78e771baf4f77630618fcba30 Mon Sep 17 00:00:00 2001
From: liwei <2211068034@qq.com>
Date: Sat, 1 Jul 2023 00:31:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_buriedcondi.json |  2 +-
 bin/json/game_heromethod.json  | 48 +++++++++++++++---------------
 bin/json/game_navigation.json  |  2 +-
 bin/json/game_newsmithy.json   | 54 +++++++++++++++++-----------------
 bin/json/game_rdtasknpc.json   |  3 +-
 5 files changed, 54 insertions(+), 55 deletions(-)

diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index bf939935f..76fee3b82 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -17812,7 +17812,7 @@
     "NPC": -102,
     "value": 1,
     "filter": [
-      10
+      9
     ],
     "filter2": [
       "套装效果",
diff --git a/bin/json/game_heromethod.json b/bin/json/game_heromethod.json
index d67573987..1c0ac714f 100644
--- a/bin/json/game_heromethod.json
+++ b/bin/json/game_heromethod.json
@@ -149,7 +149,7 @@
     "pro2": 110,
     "equip_suit3": [
       3,
-      19
+      13
     ],
     "pro3": 100
   },
@@ -166,7 +166,7 @@
     "pro1": 790,
     "equip_suit2": [
       3,
-      19
+      13
     ],
     "pro2": 110,
     "equip_suit3": [
@@ -183,7 +183,7 @@
     },
     "equip_suit1": [
       3,
-      19
+      13
     ],
     "pro1": 790,
     "equip_suit2": [
@@ -347,7 +347,7 @@
     "pro2": 110,
     "equip_suit3": [
       3,
-      19
+      13
     ],
     "pro3": 100
   },
@@ -364,7 +364,7 @@
     "pro1": 790,
     "equip_suit2": [
       3,
-      19
+      13
     ],
     "pro2": 110,
     "equip_suit3": [
@@ -381,7 +381,7 @@
     },
     "equip_suit1": [
       3,
-      19
+      13
     ],
     "pro1": 790,
     "equip_suit2": [
@@ -398,7 +398,7 @@
   {
     "hid": "23002",
     "herointr": {
-      "key": "hero_method_hero_method_herointr_19",
+      "key": "hero_method_hero_method_herointr_13",
       "text": "幸运·普雷斯科特是一名兼具群体增益与群体减益能力的辅助型守护者。1技能能够为我方全体附加免疫和防御力上升的状态，在攻击敌方全体的同时弱化敌方全体的攻击力。2技能能在造成伤害的同时降低敌亡个体的防御力。"
     },
     "equip_suit1": [
@@ -545,7 +545,7 @@
     "pro2": 110,
     "equip_suit3": [
       3,
-      19
+      13
     ],
     "pro3": 100
   },
@@ -562,7 +562,7 @@
     "pro1": 790,
     "equip_suit2": [
       3,
-      19
+      13
     ],
     "pro2": 110,
     "equip_suit3": [
@@ -579,7 +579,7 @@
     },
     "equip_suit1": [
       3,
-      19
+      13
     ],
     "pro1": 790,
     "equip_suit2": [
@@ -743,7 +743,7 @@
     "pro2": 110,
     "equip_suit3": [
       3,
-      19
+      13
     ],
     "pro3": 100
   },
@@ -760,7 +760,7 @@
     "pro1": 790,
     "equip_suit2": [
       3,
-      19
+      13
     ],
     "pro2": 110,
     "equip_suit3": [
@@ -777,7 +777,7 @@
     },
     "equip_suit1": [
       3,
-      19
+      13
     ],
     "pro1": 790,
     "equip_suit2": [
@@ -941,7 +941,7 @@
     "pro2": 110,
     "equip_suit3": [
       3,
-      19
+      13
     ],
     "pro3": 100
   },
@@ -958,7 +958,7 @@
     "pro1": 790,
     "equip_suit2": [
       3,
-      19
+      13
     ],
     "pro2": 110,
     "equip_suit3": [
@@ -975,7 +975,7 @@
     },
     "equip_suit1": [
       3,
-      19
+      13
     ],
     "pro1": 790,
     "equip_suit2": [
@@ -1139,7 +1139,7 @@
     "pro2": 110,
     "equip_suit3": [
       3,
-      19
+      13
     ],
     "pro3": 100
   },
@@ -1156,7 +1156,7 @@
     "pro1": 790,
     "equip_suit2": [
       3,
-      19
+      13
     ],
     "pro2": 110,
     "equip_suit3": [
@@ -1173,7 +1173,7 @@
     },
     "equip_suit1": [
       3,
-      19
+      13
     ],
     "pro1": 790,
     "equip_suit2": [
@@ -1337,7 +1337,7 @@
     "pro2": 110,
     "equip_suit3": [
       3,
-      19
+      13
     ],
     "pro3": 100
   },
@@ -1354,7 +1354,7 @@
     "pro1": 790,
     "equip_suit2": [
       3,
-      19
+      13
     ],
     "pro2": 110,
     "equip_suit3": [
@@ -1371,7 +1371,7 @@
     },
     "equip_suit1": [
       3,
-      19
+      13
     ],
     "pro1": 790,
     "equip_suit2": [
@@ -1535,7 +1535,7 @@
     "pro2": 110,
     "equip_suit3": [
       3,
-      19
+      13
     ],
     "pro3": 100
   },
@@ -1552,7 +1552,7 @@
     "pro1": 790,
     "equip_suit2": [
       3,
-      19
+      13
     ],
     "pro2": 110,
     "equip_suit3": [
diff --git a/bin/json/game_navigation.json b/bin/json/game_navigation.json
index 69c6165c5..4604b5d26 100644
--- a/bin/json/game_navigation.json
+++ b/bin/json/game_navigation.json
@@ -138,7 +138,7 @@
       "text": "主线关卡"
     },
     "npcName": [
-      "20010_骇客蛛_1"
+      "功能入口_主线"
     ],
     "functionicon": "icon_sytj",
     "jumpId": 166
diff --git a/bin/json/game_newsmithy.json b/bin/json/game_newsmithy.json
index e786a06b6..dc47d6106 100644
--- a/bin/json/game_newsmithy.json
+++ b/bin/json/game_newsmithy.json
@@ -13,7 +13,7 @@
       "text": "完美攻击一阶图纸"
     },
     "star": 1,
-    "drawing_png": "tj_img_gjtz",
+    "drawing_png": "tj_gjtz1_1",
     "basic_drop": 11001,
     "basic_cos": [
       {
@@ -51,7 +51,7 @@
       "text": "完美攻击二阶图纸"
     },
     "star": 2,
-    "drawing_png": "tj_img_gjtz",
+    "drawing_png": "tj_gjtz1_2",
     "basic_drop": 11002,
     "basic_cos": [
       {
@@ -90,7 +90,7 @@
       "text": "完美攻击三阶图纸"
     },
     "star": 2,
-    "drawing_png": "tj_img_gjtz",
+    "drawing_png": "tj_gjtz1_2",
     "basic_drop": 11003,
     "basic_cos": [
       {
@@ -128,7 +128,7 @@
       "text": "史诗攻击一阶图纸"
     },
     "star": 3,
-    "drawing_png": "tj_img_gjtz",
+    "drawing_png": "tj_gjtz1_3",
     "basic_drop": 11004,
     "basic_cos": [
       {
@@ -179,7 +179,7 @@
       "text": "史诗攻击二阶图纸"
     },
     "star": 3,
-    "drawing_png": "tj_img_gjtz",
+    "drawing_png": "tj_gjtz1_3",
     "basic_drop": 11005,
     "basic_cos": [
       {
@@ -229,7 +229,7 @@
       "text": "传说攻击一阶图纸"
     },
     "star": 4,
-    "drawing_png": "tj_img_gjtz",
+    "drawing_png": "tj_gjtz1_4",
     "basic_drop": 11006,
     "basic_cos": [
       {
@@ -280,7 +280,7 @@
       "text": "传说攻击二阶图纸"
     },
     "star": 4,
-    "drawing_png": "tj_img_gjtz",
+    "drawing_png": "tj_gjtz1_4",
     "basic_drop": 11007,
     "basic_cos": [
       {
@@ -330,7 +330,7 @@
       "text": "完美攻击一阶图纸"
     },
     "star": 4,
-    "drawing_png": "tj_img_gjtz",
+    "drawing_png": "tj_gjtz1_4",
     "basic_drop": 11008,
     "basic_cos": [
       {
@@ -387,7 +387,7 @@
       "text": "闪耀攻击二阶图纸"
     },
     "star": 4,
-    "drawing_png": "tj_img_gjtz",
+    "drawing_png": "tj_gjtz1_4",
     "basic_drop": 11009,
     "basic_cos": [
       {
@@ -443,7 +443,7 @@
       "text": "完美防御一阶图纸"
     },
     "star": 1,
-    "drawing_png": "tj_img_fytz",
+    "drawing_png": "tj_fytz_1_1",
     "basic_drop": 12001,
     "basic_cos": [
       {
@@ -481,7 +481,7 @@
       "text": "完美防御二阶图纸"
     },
     "star": 2,
-    "drawing_png": "tj_img_fytz",
+    "drawing_png": "tj_fytz_1_2",
     "basic_drop": 12002,
     "basic_cos": [
       {
@@ -520,7 +520,7 @@
       "text": "完美防御三阶图纸"
     },
     "star": 2,
-    "drawing_png": "tj_img_fytz",
+    "drawing_png": "tj_fytz_1_2",
     "basic_drop": 12003,
     "basic_cos": [
       {
@@ -558,7 +558,7 @@
       "text": "史诗防御一阶图纸"
     },
     "star": 3,
-    "drawing_png": "tj_img_fytz",
+    "drawing_png": "tj_fytz_1_3",
     "basic_drop": 12004,
     "basic_cos": [
       {
@@ -609,7 +609,7 @@
       "text": "史诗防御二阶图纸"
     },
     "star": 3,
-    "drawing_png": "tj_img_fytz",
+    "drawing_png": "tj_fytz_1_3",
     "basic_drop": 12005,
     "basic_cos": [
       {
@@ -659,7 +659,7 @@
       "text": "传说防御一阶图纸"
     },
     "star": 4,
-    "drawing_png": "tj_img_fytz",
+    "drawing_png": "tj_fytz_1_4",
     "basic_drop": 12006,
     "basic_cos": [
       {
@@ -710,7 +710,7 @@
       "text": "传说防御二阶图纸"
     },
     "star": 4,
-    "drawing_png": "tj_img_fytz",
+    "drawing_png": "tj_fytz_1_4",
     "basic_drop": 12007,
     "basic_cos": [
       {
@@ -760,7 +760,7 @@
       "text": "完美防御一阶图纸"
     },
     "star": 4,
-    "drawing_png": "tj_img_fytz",
+    "drawing_png": "tj_fytz_1_4",
     "basic_drop": 12008,
     "basic_cos": [
       {
@@ -817,7 +817,7 @@
       "text": "闪耀防御二阶图纸"
     },
     "star": 4,
-    "drawing_png": "tj_img_fytz",
+    "drawing_png": "tj_fytz_1_4",
     "basic_drop": 12009,
     "basic_cos": [
       {
@@ -873,7 +873,7 @@
       "text": "完美辅助一阶图纸"
     },
     "star": 1,
-    "drawing_png": "tj_img_fztz",
+    "drawing_png": "tj_fztz_1_1",
     "basic_drop": 13001,
     "basic_cos": [
       {
@@ -911,7 +911,7 @@
       "text": "完美辅助二阶图纸"
     },
     "star": 2,
-    "drawing_png": "tj_img_fztz",
+    "drawing_png": "tj_fztz_1_2",
     "basic_drop": 13002,
     "basic_cos": [
       {
@@ -950,7 +950,7 @@
       "text": "完美辅助三阶图纸"
     },
     "star": 2,
-    "drawing_png": "tj_img_fztz",
+    "drawing_png": "tj_fztz_1_2",
     "basic_drop": 13003,
     "basic_cos": [
       {
@@ -988,7 +988,7 @@
       "text": "史诗辅助一阶图纸"
     },
     "star": 3,
-    "drawing_png": "tj_img_fztz",
+    "drawing_png": "tj_fztz_1_3",
     "basic_drop": 13004,
     "basic_cos": [
       {
@@ -1039,7 +1039,7 @@
       "text": "史诗辅助二阶图纸"
     },
     "star": 3,
-    "drawing_png": "tj_img_fztz",
+    "drawing_png": "tj_fztz_1_3",
     "basic_drop": 13005,
     "basic_cos": [
       {
@@ -1089,7 +1089,7 @@
       "text": "传说辅助一阶图纸"
     },
     "star": 4,
-    "drawing_png": "tj_img_fztz",
+    "drawing_png": "tj_fztz_1_4",
     "basic_drop": 13006,
     "basic_cos": [
       {
@@ -1140,7 +1140,7 @@
       "text": "传说辅助二阶图纸"
     },
     "star": 4,
-    "drawing_png": "tj_img_fztz",
+    "drawing_png": "tj_fztz_1_4",
     "basic_drop": 13007,
     "basic_cos": [
       {
@@ -1190,7 +1190,7 @@
       "text": "完美辅助一阶图纸"
     },
     "star": 4,
-    "drawing_png": "tj_img_fztz",
+    "drawing_png": "tj_fztz_1_4",
     "basic_drop": 13008,
     "basic_cos": [
       {
@@ -1247,7 +1247,7 @@
       "text": "闪耀辅助二阶图纸"
     },
     "star": 4,
-    "drawing_png": "tj_img_fztz",
+    "drawing_png": "tj_fztz_1_4",
     "basic_drop": 13009,
     "basic_cos": [
       {
diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json
index f2d61113c..635514502 100644
--- a/bin/json/game_rdtasknpc.json
+++ b/bin/json/game_rdtasknpc.json
@@ -1234,7 +1234,7 @@
     "heroid": 25001,
     "datas": [
       "WuGuanScene",
-      "阿宝",
+      "总教习",
       "137"
     ],
     "event": [
@@ -1248,7 +1248,6 @@
     "heroid": 25001,
     "datas": [
       "WuGuanScene",
-      "木桩2",
       "137"
     ],
     "event": [