From 7fce2a29fc98a7b962d30cdd846ecd61f0d322cd Mon Sep 17 00:00:00 2001 From: ctrlcvs <1509167646@qq.com> Date: Tue, 6 Jun 2023 13:16:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=98=9F=E9=93=81=E5=9B=BE?= =?UTF-8?q?=E9=89=B4=E5=8C=B9=E9=85=8D=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/srGallery.js | 5 +- resources/sr/weapon/data.json | 141 ++++++++++++---------------------- 2 files changed, 50 insertions(+), 96 deletions(-) diff --git a/model/srGallery.js b/model/srGallery.js index 882b928..e25f9e1 100644 --- a/model/srGallery.js +++ b/model/srGallery.js @@ -26,8 +26,9 @@ export async function GetData(e) { let list = Data.readJSON(pathPlus, 'weapon/data.json') let items = Data.readJSON(pathPlus, 'items/data.json') let role=GetRole(name) - if(!role) return false; - name=role.name + if(role) { + name=role.name + } let roleData; let isUp=e.msg.includes('专武'); lodash.forEach(list,(v,k)=>{ diff --git a/resources/sr/weapon/data.json b/resources/sr/weapon/data.json index 8757f27..e190c3a 100644 --- a/resources/sr/weapon/data.json +++ b/resources/sr/weapon/data.json @@ -25,8 +25,7 @@ "希儿", "彦卿", "丹恒", - "素裳", - "开拓者" + "素裳" ], "belongRole": [], "values": [ @@ -274,8 +273,7 @@ "suitRole": [ "白露", "娜塔莎", - "罗刹", - "开拓者" + "罗刹" ], "belongRole": [], "values": [ @@ -1013,8 +1011,7 @@ "卡芙卡", "瓦尔特", "桑博", - "佩拉", - "开拓者" + "佩拉" ], "belongRole": [], "values": [ @@ -1261,8 +1258,7 @@ "suitRole": [ "布洛妮娅", "停云", - "艾丝妲", - "开拓者" + "艾丝妲" ], "belongRole": [], "values": [ @@ -1510,8 +1506,7 @@ "姬子", "青雀", "黑塔", - "希露瓦", - "开拓者" + "希露瓦" ], "belongRole": [], "values": [ @@ -1755,8 +1750,7 @@ "希儿", "彦卿", "丹恒", - "素裳", - "开拓者" + "素裳" ], "belongRole": [], "values": [ @@ -2003,8 +1997,7 @@ "suitRole": [ "白露", "娜塔莎", - "罗刹", - "开拓者" + "罗刹" ], "belongRole": [], "values": [ @@ -2252,8 +2245,7 @@ "刃", "克拉拉", "虎克", - "阿兰", - "开拓者" + "阿兰" ], "belongRole": [], "values": [ @@ -3220,8 +3212,7 @@ "姬子", "青雀", "黑塔", - "希露瓦", - "开拓者" + "希露瓦" ], "belongRole": [], "values": [ @@ -3464,8 +3455,7 @@ "希儿", "彦卿", "丹恒", - "素裳", - "开拓者" + "素裳" ], "belongRole": [], "values": [ @@ -3712,8 +3702,7 @@ "suitRole": [ "白露", "娜塔莎", - "罗刹", - "开拓者" + "罗刹" ], "belongRole": [], "values": [ @@ -4445,8 +4434,7 @@ "卡芙卡", "瓦尔特", "桑博", - "佩拉", - "开拓者" + "佩拉" ], "belongRole": [], "values": [ @@ -4688,8 +4676,7 @@ "suitRole": [ "布洛妮娅", "停云", - "艾丝妲", - "开拓者" + "艾丝妲" ], "belongRole": [], "values": [ @@ -4937,8 +4924,7 @@ "姬子", "青雀", "黑塔", - "希露瓦", - "开拓者" + "希露瓦" ], "belongRole": [], "values": [ @@ -5185,8 +5171,7 @@ "suitRole": [ "白露", "娜塔莎", - "罗刹", - "开拓者" + "罗刹" ], "belongRole": [ "娜塔莎" @@ -5437,8 +5422,7 @@ "卡芙卡", "瓦尔特", "桑博", - "佩拉", - "开拓者" + "佩拉" ], "belongRole": [ "佩拉" @@ -5937,8 +5921,7 @@ "希儿", "彦卿", "丹恒", - "素裳", - "开拓者" + "素裳" ], "belongRole": [ "丹恒" @@ -6186,8 +6169,7 @@ "suitRole": [ "布洛妮娅", "停云", - "艾丝妲", - "开拓者" + "艾丝妲" ], "belongRole": [ "布洛妮娅" @@ -6684,8 +6666,7 @@ "姬子", "青雀", "黑塔", - "希露瓦", - "开拓者" + "希露瓦" ], "belongRole": [ "黑塔" @@ -6938,8 +6919,7 @@ "suitRole": [ "白露", "娜塔莎", - "罗刹", - "开拓者" + "罗刹" ], "belongRole": [ "娜塔莎" @@ -7190,8 +7170,7 @@ "卡芙卡", "瓦尔特", "桑博", - "佩拉", - "开拓者" + "佩拉" ], "belongRole": [ "桑博" @@ -7691,8 +7670,7 @@ "希儿", "彦卿", "丹恒", - "素裳", - "开拓者" + "素裳" ], "belongRole": [ "素裳" @@ -7942,8 +7920,7 @@ "suitRole": [ "布洛妮娅", "停云", - "艾丝妲", - "开拓者" + "艾丝妲" ], "belongRole": [ "艾丝妲" @@ -8437,8 +8414,7 @@ "姬子", "青雀", "黑塔", - "希露瓦", - "开拓者" + "希露瓦" ], "belongRole": [ "希露瓦" @@ -8685,8 +8661,7 @@ "suitRole": [ "白露", "娜塔莎", - "罗刹", - "开拓者" + "罗刹" ], "belongRole": [ "罗刹" @@ -8941,8 +8916,7 @@ "卡芙卡", "瓦尔特", "桑博", - "佩拉", - "开拓者" + "佩拉" ], "belongRole": [ "卢卡" @@ -9456,8 +9430,7 @@ "希儿", "彦卿", "丹恒", - "素裳", - "开拓者" + "素裳" ], "belongRole": [], "values": [ @@ -9702,8 +9675,7 @@ "suitRole": [ "布洛妮娅", "停云", - "艾丝妲", - "开拓者" + "艾丝妲" ], "belongRole": [], "values": [ @@ -10200,8 +10172,7 @@ "姬子", "青雀", "黑塔", - "希露瓦", - "开拓者" + "希露瓦" ], "belongRole": [], "values": [ @@ -10449,8 +10420,7 @@ "suitRole": [ "白露", "娜塔莎", - "罗刹", - "开拓者" + "罗刹" ], "belongRole": [ "白露" @@ -10699,8 +10669,7 @@ "卡芙卡", "瓦尔特", "桑博", - "佩拉", - "开拓者" + "佩拉" ], "belongRole": [ "卡芙卡" @@ -11198,8 +11167,7 @@ "希儿", "彦卿", "丹恒", - "素裳", - "开拓者" + "素裳" ], "belongRole": [ "彦卿" @@ -11448,8 +11416,7 @@ "suitRole": [ "布洛妮娅", "停云", - "艾丝妲", - "开拓者" + "艾丝妲" ], "belongRole": [], "values": [ @@ -11947,8 +11914,7 @@ "姬子", "青雀", "黑塔", - "希露瓦", - "开拓者" + "希露瓦" ], "belongRole": [], "values": [ @@ -12198,8 +12164,7 @@ "suitRole": [ "白露", "娜塔莎", - "罗刹", - "开拓者" + "罗刹" ], "belongRole": [], "values": [ @@ -12445,8 +12410,7 @@ "卡芙卡", "瓦尔特", "桑博", - "佩拉", - "开拓者" + "佩拉" ], "belongRole": [], "values": [ @@ -12935,8 +12899,7 @@ "希儿", "彦卿", "丹恒", - "素裳", - "开拓者" + "素裳" ], "belongRole": [], "values": [ @@ -13182,8 +13145,7 @@ "suitRole": [ "布洛妮娅", "停云", - "艾丝妲", - "开拓者" + "艾丝妲" ], "belongRole": [ "停云" @@ -13685,8 +13647,7 @@ "姬子", "青雀", "黑塔", - "希露瓦", - "开拓者" + "希露瓦" ], "belongRole": [ "青雀" @@ -13936,8 +13897,7 @@ "姬子", "青雀", "黑塔", - "希露瓦", - "开拓者" + "希露瓦" ], "belongRole": [ "姬子" @@ -14186,8 +14146,7 @@ "希儿", "彦卿", "丹恒", - "素裳", - "开拓者" + "素裳" ], "belongRole": [ "希儿" @@ -14704,8 +14663,7 @@ "suitRole": [ "布洛妮娅", "停云", - "艾丝妲", - "开拓者" + "艾丝妲" ], "belongRole": [ "布洛妮娅" @@ -14958,8 +14916,7 @@ "卡芙卡", "瓦尔特", "桑博", - "佩拉", - "开拓者" + "佩拉" ], "belongRole": [ "瓦尔特" @@ -15470,8 +15427,7 @@ "姬子", "青雀", "黑塔", - "希露瓦", - "开拓者" + "希露瓦" ], "belongRole": [ "景元" @@ -15724,8 +15680,7 @@ "希儿", "彦卿", "丹恒", - "素裳", - "开拓者" + "素裳" ], "belongRole": [ "彦卿" @@ -15985,8 +15940,7 @@ "suitRole": [ "白露", "娜塔莎", - "罗刹", - "开拓者" + "罗刹" ], "belongRole": [], "values": [ @@ -16498,8 +16452,7 @@ "希儿", "彦卿", "丹恒", - "素裳", - "开拓者" + "素裳" ], "belongRole": [], "values": [