增加芙宁娜、夏洛蒂的角色信息

CHANGELOG.md

@@ -1,14 +1,16 @@
-# 2.4.6
+# 2.4.7
 
-* 星铁面板天赋展示更新，支持展示行迹信息
-* 增加`#重载面板`功能，用于手工修改面板数据后主动读取
+* 增加菲米尼、符玄、玲可、三月七、娜塔莎、罗刹、黑塔的伤害计算 **@Aluxes**
+* 初步增加星铁的排名功能 **@Simplxss**
+* 增加芙宁娜、夏洛蒂的角色信息
 
-# 2.4.1 ~ 2.4.5
+# 2.4.1 ~ 2.4.6
 
 * 初步支持星铁面板数据获取与展示
   * 可使用`#星铁更新面板`来获取面板信息，通过`#希儿面板`来进行查看
   * 星铁面板展示圣遗物评分，评分功能尚未完全完成，分值与样式不为最终版本
   * 部分角色的伤害计算，以及圣遗物评分功能仍在补全中
+  * 星铁面板天赋展示更新，支持展示行迹信息
 * 请配合使用Miao-Yunzai 3.1.0可达到最佳效果
   * Miao-Yunzai可使用`*`来代填`#星铁`前缀，能区分游戏使用不同UID
   * 其他Yunzai版本出现原神与星铁UID混淆情况为正常情况，请手动切换UID或命令后附加UID查询
@@ -21,6 +23,7 @@
   * 增加原神4.0相关的武器计算 **@SmallK111407**
 * 增加`#喵喵api`命令，用于查看喵ApiToken的有效期
 * 增加`#星铁日历`功能 **@Aluxes**
+* 增加`#重载面板`功能，用于手工修改面板数据后主动读取
 * 停用旧面板格式数据，非AttrIDs格式的数据不会展示，部分角色面板数据不展示是正常情况，重新更新面板数据即可
 * 一些已知问题修复
 

resources/meta/character/夏洛蒂/data.json

@@ -0,0 +1,41 @@
+{
+  "id": 10000088,
+  "name": "夏洛蒂",
+  "abbr": "夏洛蒂",
+  "title": "朗镜索真",
+  "star": 4,
+  "elem": "cryo",
+  "allegiance": "？？？",
+  "weapon": "catalyst",
+  "birth": "1-1",
+  "astro": "真视镜座",
+  "desc": "测试角色",
+  "cncv": "？？？",
+  "jpcv": "？？？",
+  "costume": false,
+  "ver": 1,
+  "baseAttr": {
+    "hp": 10766,
+    "atk": 173.1,
+    "def": 546.02
+  },
+  "growAttr": {
+    "key": "atkPct",
+    "value": 24
+  },
+  "talentId": {},
+  "talentCons": {
+    "a": 0,
+    "e": 5,
+    "q": 3
+  },
+  "materials": {
+    "gem": "哀叙冰玉",
+    "boss": "「图比昂装置」",
+    "specialty": "苍晶螺",
+    "normal": "奇械机芯齿轮",
+    "talent": "「正义」的哲学",
+    "weekly": "？？？"
+  },
+  "eta": 1699408800000
+}

resources/meta/character/芙宁娜/data.json

@@ -0,0 +1,41 @@
+{
+  "id": 10000089,
+  "name": "芙宁娜",
+  "abbr": "芙宁娜",
+  "title": "不休独舞",
+  "star": 5,
+  "elem": "hydro",
+  "allegiance": "？？？",
+  "weapon": "sword",
+  "birth": "1-1",
+  "astro": "司颂座",
+  "desc": "测试角色",
+  "cncv": "？？？",
+  "jpcv": "？？？",
+  "costume": false,
+  "ver": 1,
+  "baseAttr": {
+    "hp": 15307,
+    "atk": 243.96,
+    "def": 695.54
+  },
+  "growAttr": {
+    "key": "cpct",
+    "value": 19.2
+  },
+  "talentId": {},
+  "talentCons": {
+    "a": 0,
+    "e": 3,
+    "q": 5
+  },
+  "materials": {
+    "gem": "涤净青金",
+    "boss": "未能达成超越之水",
+    "specialty": "湖光铃兰",
+    "normal": "原素花蜜",
+    "talent": "「正义」的哲学",
+    "weekly": "？？？"
+  },
+  "eta": 1699408800000
+}

resources/meta/character/莱欧斯利/data.json

@@ -5,13 +5,13 @@
   "title": "寂罪的密使",
   "star": 5,
   "elem": "cryo",
-  "allegiance": "？？？",
+  "allegiance": "梅洛彼得堡",
   "weapon": "catalyst",
-  "birth": "1-1",
+  "birth": "11-23",
   "astro": "守狱犬座",
-  "desc": "测试角色",
-  "cncv": "？？？",
-  "jpcv": "？？？",
+  "desc": "梅洛彼得堡的公爵，隐于漆黑海底的领主。",
+  "cncv": "刘北辰",
+  "jpcv": "小野大辅",
   "costume": false,
   "ver": 1,
   "baseAttr": {
@@ -23,7 +23,11 @@
     "key": "cdmg",
     "value": 38.4
   },
-  "talentId": {},
+  "talentId": {
+    "10861": "a",
+    "10862": "e",
+    "10865": "q"
+  },
   "talentCons": {
     "a": 3,
     "e": 0,
@@ -37,5 +41,5 @@
     "talent": "「秩序」的哲学",
     "weekly": "原初绿洲之初绽"
   },
-  "eta": 1695780000000
+  "eta": 1697508000000
 }

resources/meta/character/莱欧斯利/detail.json

@@ -20,21 +20,21 @@
           "unit": "",
           "isSame": false,
           "values": [
-            "55.53%",
-            "60.05%",
-            "64.57%",
-            "71.02%",
-            "75.54%",
-            "80.71%",
-            "87.81%",
-            "94.91%",
-            "102.01%",
-            "109.76%",
-            "117.51%",
-            "125.26%",
-            "133%",
-            "140.75%",
-            "148.5%"
+            "53.36%",
+            "57.7%",
+            "62.05%",
+            "68.25%",
+            "72.59%",
+            "77.56%",
+            "84.38%",
+            "91.21%",
+            "98.03%",
+            "105.48%",
+            "112.92%",
+            "120.37%",
+            "127.81%",
+            "135.26%",
+            "142.71%"
           ]
         },
         {
@@ -42,21 +42,21 @@
           "unit": "",
           "isSame": false,
           "values": [
-            "53.81%",
-            "58.19%",
-            "62.57%",
-            "68.82%",
-            "73.2%",
-            "78.21%",
-            "85.09%",
-            "91.97%",
-            "98.86%",
-            "106.36%",
-            "113.87%",
-            "121.38%",
-            "128.89%",
-            "136.4%",
-            "143.9%"
+            "51.8%",
+            "56.01%",
+            "60.23%",
+            "66.25%",
+            "70.47%",
+            "75.29%",
+            "81.91%",
+            "88.54%",
+            "95.17%",
+            "102.39%",
+            "109.62%",
+            "116.85%",
+            "124.08%",
+            "131.3%",
+            "138.53%"
           ]
         },
         {
@@ -64,21 +64,21 @@
           "unit": "",
           "isSame": false,
           "values": [
-            "68.71%",
-            "74.3%",
-            "79.89%",
-            "87.88%",
-            "93.47%",
-            "99.87%",
-            "108.65%",
-            "117.44%",
-            "126.23%",
-            "135.82%",
-            "145.41%",
-            "154.99%",
-            "164.58%",
-            "174.17%",
-            "183.75%"
+            "67.22%",
+            "72.69%",
+            "78.17%",
+            "85.98%",
+            "91.45%",
+            "97.71%",
+            "106.31%",
+            "114.9%",
+            "123.5%",
+            "132.88%",
+            "142.26%",
+            "151.64%",
+            "161.02%",
+            "170.4%",
+            "179.78%"
           ]
         },
         {
@@ -86,21 +86,21 @@
           "unit": "",
           "isSame": false,
           "values": [
-            "38.28% + 38.28%",
-            "41.4% + 41.4%",
-            "44.51% + 44.51%",
-            "48.96% + 48.96%",
-            "52.08% + 52.08%",
-            "55.64% + 55.64%",
-            "60.54% + 60.54%",
-            "65.43% + 65.43%",
-            "70.33% + 70.33%",
-            "75.67% + 75.67%",
-            "81.01% + 81.01%",
-            "86.36% + 86.36%",
-            "91.7% + 91.7%",
-            "97.04% + 97.04%",
-            "102.38% + 102.38%"
+            "37.9% + 37.9%",
+            "40.99% + 40.99%",
+            "44.07% + 44.07%",
+            "48.48% + 48.48%",
+            "51.57% + 51.57%",
+            "55.09% + 55.09%",
+            "59.94% + 59.94%",
+            "64.79% + 64.79%",
+            "69.64% + 69.64%",
+            "74.93% + 74.93%",
+            "80.22% + 80.22%",
+            "85.5% + 85.5%",
+            "90.79% + 90.79%",
+            "96.08% + 96.08%",
+            "101.37% + 101.37%"
           ]
         },
         {
@@ -108,21 +108,21 @@
           "unit": "",
           "isSame": false,
           "values": [
-            "96.21%",
-            "104.04%",
-            "111.87%",
-            "123.06%",
-            "130.89%",
-            "139.84%",
-            "152.15%",
-            "164.45%",
-            "176.76%",
-            "190.18%",
-            "203.61%",
-            "217.03%",
-            "230.46%",
-            "243.88%",
-            "257.31%"
+            "90.74%",
+            "98.13%",
+            "105.51%",
+            "116.07%",
+            "123.45%",
+            "131.89%",
+            "143.5%",
+            "155.11%",
+            "166.71%",
+            "179.37%",
+            "192.04%",
+            "204.7%",
+            "217.36%",
+            "230.02%",
+            "242.68%"
           ]
         },
         {
@@ -130,21 +130,21 @@
           "unit": "",
           "isSame": false,
           "values": [
-            "131.2%",
-            "141.04%",
-            "150.88%",
-            "164%",
-            "173.84%",
-            "183.68%",
-            "196.8%",
-            "209.92%",
-            "223.04%",
-            "236.16%",
-            "249.28%",
-            "262.4%",
-            "278.8%",
-            "295.2%",
-            "311.6%"
+            "152.96%",
+            "164.43%",
+            "175.9%",
+            "191.2%",
+            "202.67%",
+            "214.14%",
+            "229.44%",
+            "244.74%",
+            "260.03%",
+            "275.33%",
+            "290.62%",
+            "305.92%",
+            "325.04%",
+            "344.16%",
+            "363.28%"
           ]
         },
         {
@@ -222,9 +222,10 @@
         "迅速调整呼吸、节奏与步伐，向前短距离冲刺，进入寒烈的惩裁状态，以发起更为猛烈的进攻。",
         "<h3>寒烈的惩裁</h3>",
         "·提高莱欧斯利的抗打断能力；",
-        "·生命值高于50%时，强化「普通攻击·迅烈倾霜拳」的斥逐拳，使其造成的伤害提升；命中敌人时，莱欧斯利将损失一定的生命值，每0.1秒至多因此损失一次生命值。",
-        "<i>「过去的裁罚已成定局，未来的选择犹在掌握。」</i>",
-        "<i>「若是不愿命运被一时的罪恶吞尽，还请珍重此刻的光阴。」</i>"
+        "·生命值高于50%时，强化「普通攻击·迅烈倾霜拳」的斥逐拳，使其造成的伤害提升；命中时莱欧斯利将损失一定的生命值，每0.1秒至多因此损失一次生命值；",
+        "效果将在莱欧斯利退场时解除。",
+        "<i>「过去的裁罚已成定局，未来的选择犹在掌握。」",
+        "「若是不愿命运被一时的罪恶吞尽，还请珍重此刻的光阴。」</i>"
       ],
       "tables": [
         {
@@ -232,21 +233,21 @@
           "unit": "",
           "isSame": false,
           "values": [
-            "136.87%普通攻击伤害",
-            "139.07%普通攻击伤害",
-            "141.28%普通攻击伤害",
-            "144.15%普通攻击伤害",
-            "146.36%普通攻击伤害",
-            "148.56%普通攻击伤害",
-            "151.43%普通攻击伤害",
-            "154.3%普通攻击伤害",
-            "157.17%普通攻击伤害",
-            "160.04%普通攻击伤害",
-            "162.91%普通攻击伤害",
-            "165.78%普通攻击伤害",
-            "168.65%普通攻击伤害",
-            "171.52%普通攻击伤害",
-            "174.39%普通攻击伤害"
+            "143.17%普通攻击伤害",
+            "145.75%普通攻击伤害",
+            "148.34%普通攻击伤害",
+            "151.7%普通攻击伤害",
+            "154.29%普通攻击伤害",
+            "156.87%普通攻击伤害",
+            "160.23%普通攻击伤害",
+            "163.59%普通攻击伤害",
+            "166.95%普通攻击伤害",
+            "170.31%普通攻击伤害",
+            "173.67%普通攻击伤害",
+            "177.03%普通攻击伤害",
+            "180.39%普通攻击伤害",
+            "183.75%普通攻击伤害",
+            "187.11%普通攻击伤害"
           ]
         },
         {
@@ -443,168 +444,168 @@
   "talentData": {
     "a": {
       "一段伤害": [
-        55.53,
-        60.05,
-        64.57,
-        71.02,
-        75.54,
-        80.71,
-        87.81,
-        94.91,
-        102.01,
-        109.76,
-        117.51,
-        125.26,
-        133,
-        140.75,
-        148.5
+        53.36,
+        57.7,
+        62.05,
+        68.25,
+        72.59,
+        77.56,
+        84.38,
+        91.21,
+        98.03,
+        105.48,
+        112.92,
+        120.37,
+        127.81,
+        135.26,
+        142.71
       ],
       "二段伤害": [
-        53.81,
-        58.19,
-        62.57,
-        68.82,
-        73.2,
-        78.21,
-        85.09,
-        91.97,
-        98.86,
-        106.36,
-        113.87,
-        121.38,
-        128.89,
-        136.4,
-        143.9
+        51.8,
+        56.01,
+        60.23,
+        66.25,
+        70.47,
+        75.29,
+        81.91,
+        88.54,
+        95.17,
+        102.39,
+        109.62,
+        116.85,
+        124.08,
+        131.3,
+        138.53
       ],
       "三段伤害": [
-        68.71,
-        74.3,
-        79.89,
-        87.88,
-        93.47,
-        99.87,
-        108.65,
-        117.44,
-        126.23,
-        135.82,
-        145.41,
-        154.99,
-        164.58,
-        174.17,
-        183.75
+        67.22,
+        72.69,
+        78.17,
+        85.98,
+        91.45,
+        97.71,
+        106.31,
+        114.9,
+        123.5,
+        132.88,
+        142.26,
+        151.64,
+        161.02,
+        170.4,
+        179.78
       ],
       "四段伤害": [
-        76.56,
-        82.8,
-        89.02,
-        97.92,
-        104.16,
-        111.28,
-        121.08,
-        130.86,
-        140.66,
-        151.34,
-        162.02,
-        172.72,
-        183.4,
-        194.08,
-        204.76
+        75.8,
+        81.98,
+        88.14,
+        96.96,
+        103.14,
+        110.18,
+        119.88,
+        129.58,
+        139.28,
+        149.86,
+        160.44,
+        171,
+        181.58,
+        192.16,
+        202.74
       ],
       "四段伤害2": [
         [
-          38.28,
-          38.28
+          37.9,
+          37.9
         ],
         [
-          41.4,
-          41.4
+          40.99,
+          40.99
         ],
         [
-          44.51,
-          44.51
+          44.07,
+          44.07
         ],
         [
-          48.96,
-          48.96
+          48.48,
+          48.48
         ],
         [
-          52.08,
-          52.08
+          51.57,
+          51.57
         ],
         [
-          55.64,
-          55.64
+          55.09,
+          55.09
         ],
         [
-          60.54,
-          60.54
+          59.94,
+          59.94
         ],
         [
-          65.43,
-          65.43
+          64.79,
+          64.79
         ],
         [
-          70.33,
-          70.33
+          69.64,
+          69.64
         ],
         [
-          75.67,
-          75.67
+          74.93,
+          74.93
         ],
         [
-          81.01,
-          81.01
+          80.22,
+          80.22
         ],
         [
-          86.36,
-          86.36
+          85.5,
+          85.5
         ],
         [
-          91.7,
-          91.7
+          90.79,
+          90.79
         ],
         [
-          97.04,
-          97.04
+          96.08,
+          96.08
         ],
         [
-          102.38,
-          102.38
+          101.37,
+          101.37
         ]
       ],
       "五段伤害": [
-        96.21,
-        104.04,
-        111.87,
-        123.06,
-        130.89,
-        139.84,
-        152.15,
-        164.45,
-        176.76,
-        190.18,
-        203.61,
-        217.03,
-        230.46,
-        243.88,
-        257.31
+        90.74,
+        98.13,
+        105.51,
+        116.07,
+        123.45,
+        131.89,
+        143.5,
+        155.11,
+        166.71,
+        179.37,
+        192.04,
+        204.7,
+        217.36,
+        230.02,
+        242.68
       ],
       "重击伤害": [
-        131.2,
-        141.04,
-        150.88,
-        164,
-        173.84,
-        183.68,
-        196.8,
-        209.92,
-        223.04,
-        236.16,
-        249.28,
-        262.4,
-        278.8,
-        295.2,
-        311.6
+        152.96,
+        164.43,
+        175.9,
+        191.2,
+        202.67,
+        214.14,
+        229.44,
+        244.74,
+        260.03,
+        275.33,
+        290.62,
+        305.92,
+        325.04,
+        344.16,
+        363.28
       ],
       "下坠期间伤害": [
         56.83,
@@ -750,21 +751,21 @@
     },
     "e": {
       "强化斥逐拳伤害": [
-        136.87,
-        139.07,
-        141.28,
-        144.15,
-        146.36,
-        148.56,
-        151.43,
-        154.3,
-        157.17,
-        160.04,
-        162.91,
-        165.78,
-        168.65,
-        171.52,
-        174.39
+        143.17,
+        145.75,
+        148.34,
+        151.7,
+        154.29,
+        156.87,
+        160.23,
+        163.59,
+        166.95,
+        170.31,
+        173.67,
+        177.03,
+        180.39,
+        183.75,
+        187.11
       ],
       "消耗生命值": [
         4.5,
@@ -890,7 +891,7 @@
         "固有天赋「公理终有辩诉之日」的「恩典之诫」转变为：",
         "莱欧斯利的生命值低于60%，或在冰牙突驰的寒烈的惩裁状态持续期间，斥逐拳的第五段攻击命中时，将获得「恩典之诫」，每2.5秒至多获得一次「恩典之诫」效果。",
         "此外，惩戒·凌跃拳获得以下强化：",
-        "·造成的伤害提升进一步提升至150%；",
+        "·造成的伤害提升进一步提升至200%；",
         "·命中时，若处于寒烈的惩裁状态下，该状态的持续时间延长4秒，在一次寒烈的惩裁状态持续期间，至多通过这种方式延长一次。",
         "需要解锁固有天赋「公理终有辩诉之日」。"
       ]
@@ -913,7 +914,7 @@
       "name": "予贞苦者以拯赎",
       "desc": [
         "惩戒·凌跃拳为莱欧斯利恢复生命值的回复量提升为50%生命值上限，需要解锁固有天赋「公理终有辩诉之日」。",
-        "此外，莱欧斯利受到治疗时，若此次治疗回复量溢出，将根据莱欧斯利是否处于当前场上产生不同的效果：处于当前场上时，莱欧斯利的攻击速度提升20%，持续4秒；处于队伍后台时，队伍中所有角色的攻击速度提升10%，持续6秒。上述这两种攻击速度提升效果无法叠加。"
+        "此外，莱欧斯利受到治疗时，若此次治疗回复量溢出，将根据莱欧斯利是否处于当前场上产生不同的效果：处于当前场上时，莱欧斯利的攻击速度提升20%，持续4秒；处于队伍后台时，队伍中所有自己的角色攻击速度提升10%，持续6秒。上述这两种攻击速度提升效果无法叠加。"
       ]
     },
     "5": {
@@ -941,7 +942,7 @@
     {
       "name": "公理终有辩诉之日",
       "desc": [
-        "莱欧斯利的生命值低于60%时，将获得「恩典之诫」，使下次普通攻击·迅烈倾霜拳的重击强化为惩戒·凌跃拳：不消耗体力，造成的伤害提升30%，并在命中后为莱欧斯利恢复生命值，回复量相当于莱欧斯利生命值上限的30%。",
+        "莱欧斯利的生命值低于60%时，将获得「恩典之诫」，使下次普通攻击·迅烈倾霜拳的重击强化为惩戒·凌跃拳：不消耗体力，造成的伤害提升50%，并在命中后为莱欧斯利恢复生命值，回复量相当于莱欧斯利生命值上限的30%。",
         "每5秒至多通过这种方式获得一次「恩典之诫」效果。"
       ]
     },

resources/meta/character/那维莱特/data.json

@@ -5,13 +5,13 @@
   "title": "谕告的潮音",
   "star": 5,
   "elem": "hydro",
-  "allegiance": "？？？",
+  "allegiance": "枫丹廷",
   "weapon": "catalyst",
-  "birth": "1-1",
-  "astro": "？？？",
-  "desc": "测试角色",
-  "cncv": "？？？",
-  "jpcv": "？？？",
+  "birth": "12-18",
+  "astro": "原海巨灵座",
+  "desc": "枫丹的最高审判官，因其无懈可击的「秉公无私」而闻名。",
+  "cncv": "桑毓泽",
+  "jpcv": "神谷浩史",
   "costume": false,
   "ver": 1,
   "baseAttr": {
@@ -23,7 +23,11 @@
     "key": "cdmg",
     "value": 38.4
   },
-  "talentId": {},
+  "talentId": {
+    "10871": "a",
+    "10872": "e",
+    "10875": "q"
+  },
   "talentCons": {
     "a": 3,
     "e": 0,

resources/meta/character/那维莱特/detail.json

@@ -10,7 +10,7 @@
         "轻挥权杖，驱动浪涛进行至多三段的攻击，造成水元素伤害。",
         "<h3>重击蓄力·诉论心证</h3>",
         "蓄力时，那维莱特汇聚源水之力，逐渐构成仲裁的徽记。在这种状态下，那维莱特能够进行移动与改变朝向，并吸收一定范围内的源水之滴。",
-        "每吸收一枚源水之滴，都加快徽记形成的速度，并为那维莱特恢复生命值。",
+        "每吸收一枚源水之滴，都会加快徽记形成的速度，并为那维莱特恢复生命值。",
         "停止蓄力时，若徽记尚不完满，将进行重击；若已经完满，则将转为进行重击·衡平推裁。",
         "<h3>重击</h3>",
         "消耗一定体力，以迸发的水环猛击敌人，造成水元素范围伤害。",
@@ -1205,20 +1205,20 @@
       "name": "汇聚如浪潮一般",
       "desc": [
         "队伍中自己的角色进行水下冲刺时，移动速度提升15%。",
-        "无法与效果完全相同的固定天赋叠加。"
+        "无法与效果完全相同的固有天赋叠加。"
       ]
     },
     {
       "name": "古海孑遗的权柄",
       "desc": [
-        "队伍中的角色对敌人触发蒸发、冻结、感电、绽放、水元素扩散或水元素结晶反应时，将为那维莱特产生持续30秒，至多叠加3层的「遗龙之荣」效果，使重击·衡平推裁造成原本110%/130%/160%的伤害。",
+        "队伍中的角色对敌人触发蒸发、冻结、感电、绽放、水元素扩散或水元素结晶反应时，将为那维莱特产生持续30秒，至多叠加3层的「遗龙之荣」效果，使重击·衡平推裁造成原本110%/125%/160%的伤害。",
         "每种元素反应产生的「遗龙之荣」分别独立存在。"
       ]
     },
     {
       "name": "至高仲裁的纪律",
       "desc": [
-        "基于当前生命值超过30%的部分，每1%使那维莱特获得0.6%水元素伤害加成，通过这种方式，至多提升30%。"
+        "基于当前生命值超出生命值上限30%的部分，每1%使那维莱特获得0.6%水元素伤害加成，通过这种方式，至多提升30%。"
       ]
     }
   ],

resources/meta/material/data.json

@@ -1274,7 +1274,7 @@
     "star": 4
   },
   "？？？": {
-    "id": "n113046",
+    "id": "n113054",
     "name": "？？？",
     "type": "weekly",
     "star": 5
@@ -2126,25 +2126,25 @@
     "star": 1
   },
   "奇械机芯齿轮": {
-    "id": 112085,
+    "id": "n112085",
     "name": "奇械机芯齿轮",
     "type": "normal",
     "star": 3,
     "items": {
       "啮合齿轮": {
-        "id": 112083,
+        "id": "n112083",
         "name": "啮合齿轮",
         "type": "normal",
         "star": 1
       },
       "机关正齿轮": {
-        "id": 112084,
+        "id": "n112084",
         "name": "机关正齿轮",
         "type": "normal",
         "star": 2
       },
       "奇械机芯齿轮": {
-        "id": 112085,
+        "id": "n112085",
         "name": "奇械机芯齿轮",
         "type": "normal",
         "star": 3
@@ -2481,5 +2481,23 @@
         "star": 4
       }
     }
+  },
+  "未能达成超越之水": {
+    "id": "n113057",
+    "name": "未能达成超越之水",
+    "type": "boss",
+    "star": 4
+  },
+  "湖光铃兰": {
+    "id": "n101238",
+    "name": "湖光铃兰",
+    "type": "specialty",
+    "star": 1
+  },
+  "苍晶螺": {
+    "id": "n101232",
+    "name": "苍晶螺",
+    "type": "specialty",
+    "star": 1
   }
 }

resources/meta/weapon/bow/测距规/data.json

@@ -3,7 +3,7 @@
   "name": "测距规",
   "affixTitle": "石匠号子",
   "star": 4,
-  "desc": "受到治疗或进行治疗时，将赋予一枚团结标记，持续30秒，至多拥有三枚团结标记。施放元素战技或元素爆发时，将消耗所有的团结标记，产生持续10秒的「抗争」效果：每枚消耗的团结标记提高3%攻击力与7%所有元素伤害加成。每15秒至多触发一次抗争效果；角色处于队伍后台时也能获得团结标记。",
+  "desc": "如今几乎绝迹的测量工具，具有发射箭矢的能力。",
   "attr": {
     "atk": {
       "1": 43.73,

resources/meta/weapon/catalyst/万世流涌大典/data.json

@@ -3,7 +3,7 @@
   "name": "万世流涌大典",
   "affixTitle": "万世的浪涛",
   "star": 5,
-  "desc": "生命值提升16%。当前生命值提升或降低时，重击造成的伤害提升12%。该效果持续4秒，至多叠加3次，每0.3秒至多触发一次；叠加至3层或3层的持续时间刷新时，恢复8点元素能量，每12秒至多通过这种方式恢复一次元素能量。",
+  "desc": "曾在水下的隐修会中代代流传的教谕书，如今已经无人知晓其存在。",
   "attr": {
     "atk": {
       "1": 44.34,

resources/meta/weapon/catalyst/无垠蔚蓝之歌/data.json

@@ -3,7 +3,7 @@
   "name": "无垠蔚蓝之歌",
   "affixTitle": "蔚蓝深空",
   "star": 4,
-  "desc": "普通攻击或重击命中敌人后的6秒内，普通攻击造成的伤害提升8%，重击造成的伤害提升6%。该效果至多叠加3次，每0.3秒至多触发一次。",
+  "desc": "一本装帧精美的诗集，其中收录了不少有关天空、蒲公英等蒙德人偏爱的诗歌。",
   "attr": {
     "atk": {
       "1": 43.73,

resources/meta/weapon/catalyst/金流监督/data.json

@@ -3,7 +3,7 @@
   "name": "金流监督",
   "affixTitle": "黄金的血潮",
   "star": 5,
-  "desc": "攻击力提升12%。当前生命值提升或降低时，普通攻击造成的伤害提升14%，重击造成的伤害提升12%。该效果持续4秒，至多叠加3层，每0.3秒至多触发一次；处于叠加3层的状态下时，攻击速度提升8%。",
+  "desc": "能够监控特定现象的悬浮仪器，废弃后被拾获者重新改造为其它用途。",
   "attr": {
     "atk": {
       "1": 47.54,

resources/meta/weapon/claymore/便携动力锯/data.json

@@ -3,7 +3,7 @@
   "name": "便携动力锯",
   "affixTitle": "船工号子",
   "star": 4,
-  "desc": "受到治疗或进行治疗时，将赋予一枚坚忍标记，持续30秒，至多拥有三枚坚忍标记。施放元素战技或元素爆发时，将消耗所有的坚忍标记，产生持续10秒的「奋起」效果：每枚消耗的坚忍标记提高40点元素精通，并在效果产生2秒后，每枚消耗的坚忍标记为装备者恢复2点元素能量。每15秒至多触发一次奋起效果；角色处于队伍后台时也能获得坚忍标记。",
+  "desc": "如今几乎绝迹的旧式动力锯，曾是深受工人信赖的切割工具。",
   "attr": {
     "atk": {
       "1": 41.07,

resources/meta/weapon/sword/data.json

@@ -202,5 +202,17 @@
     "name": "船坞长剑",
     "star": 4,
     "wid": "n11427"
+  },
+  "水仙十字之剑": {
+    "id": "11429",
+    "name": "水仙十字之剑",
+    "star": 4,
+    "wid": "n11429"
+  },
+  "静水流涌之辉": {
+    "id": "11513",
+    "name": "静水流涌之辉",
+    "star": 5,
+    "wid": "n11513"
   }
 }

resources/meta/weapon/sword/水仙十字之剑/data.json

@@ -0,0 +1,47 @@
+{
+  "id": "11429",
+  "name": "水仙十字之剑",
+  "affixTitle": "「圣剑」",
+  "star": 4,
+  "desc": "强大的理性与意志凭依的圣剑，足以创造、毁灭一个宇宙或一场梦。",
+  "attr": {
+    "atk": {
+      "1": 42.4,
+      "20": 108.93,
+      "40": 204.83,
+      "50": 265.86,
+      "60": 326.78,
+      "70": 387.66,
+      "80": 448.68,
+      "90": 509.61,
+      "20+": 134.83,
+      "40+": 230.83,
+      "50+": 291.76,
+      "60+": 352.68,
+      "70+": 413.66,
+      "80+": 474.58
+    },
+    "bonusKey": "atkPct",
+    "bonusData": {
+      "1": 9,
+      "20": 15.9,
+      "40": 23.18,
+      "50": 26.81,
+      "60": 30.45,
+      "70": 34.07,
+      "80": 37.71,
+      "90": 41.35,
+      "20+": 15.9,
+      "40+": 23.18,
+      "50+": 26.81,
+      "60+": 30.45,
+      "70+": 34.07,
+      "80+": 37.71
+    }
+  },
+  "materials": {},
+  "affixData": {
+    "text": "在数之不尽的故事中，能够配得上传奇勇者的武器，也是开启一切门扉迈过高潮前往命运终局的钥匙。",
+    "datas": {}
+  }
+}

resources/meta/weapon/sword/船坞长剑/data.json

@@ -3,7 +3,7 @@
   "name": "船坞长剑",
   "affixTitle": "船工号子",
   "star": 4,
-  "desc": "受到治疗或进行治疗时，将赋予一枚坚忍标记，持续30秒，至多拥有三枚坚忍标记。施放元素战技或元素爆发时，将消耗所有的坚忍标记，产生持续10秒的「奋起」效果：每枚消耗的坚忍标记提高40点元素精通，并在效果产生2秒后，每枚消耗的坚忍标记为装备者恢复2点元素能量。每15秒至多触发一次奋起效果；角色处于队伍后台时也能获得坚忍标记。",
+  "desc": "如今几乎绝迹的便利切割工具，能够随着使用将钝化的刀片换掉。",
   "attr": {
     "atk": {
       "1": 42.4,

resources/meta/weapon/sword/静水流涌之辉/data.json

@@ -0,0 +1,66 @@
+{
+  "id": "11513",
+  "name": "静水流涌之辉",
+  "affixTitle": "湖光的朝与暮",
+  "star": 5,
+  "desc": "萦绕着至纯之水的权杖，在遥远的昔日曾象征着海原之上至高的权威。",
+  "attr": {
+    "atk": {
+      "1": 44.34,
+      "20": 110.17,
+      "40": 209.82,
+      "50": 275.46,
+      "60": 341.46,
+      "70": 407.81,
+      "80": 474.55,
+      "90": 541.83,
+      "20+": 141.27,
+      "40+": 240.92,
+      "50+": 306.66,
+      "60+": 372.56,
+      "70+": 438.91,
+      "80+": 505.65
+    },
+    "bonusKey": "cdmg",
+    "bonusData": {
+      "1": 19.2,
+      "20": 33.93,
+      "40": 49.44,
+      "50": 57.2,
+      "60": 64.95,
+      "70": 72.69,
+      "80": 80.45,
+      "90": 88.2,
+      "20+": 33.93,
+      "40+": 49.44,
+      "50+": 57.2,
+      "60+": 64.95,
+      "70+": 72.69,
+      "80+": 80.45
+    }
+  },
+  "materials": {
+    "weapon": "纯圣露滴的真粹",
+    "monster": "初生的浊水幻灵",
+    "normal": "异色结晶石"
+  },
+  "affixData": {
+    "text": "装备者的当前生命值提升或降低时，元素战技造成的伤害提升$[0]，该效果持续6秒，至多叠加3次，每0.2秒至多触发一次；队伍中其他角色的当前生命值提升或降低时，装备者的生命值上限提升$[1]，该效果持续6秒，至多叠加2次，每0.2秒至多触发一次。装备者处于队伍后台时，依然能触发上述效果。",
+    "datas": {
+      "0": [
+        "8%",
+        "10%",
+        "12%",
+        "14%",
+        "16%"
+      ],
+      "1": [
+        "12%",
+        "15%",
+        "18%",
+        "21%",
+        "24%"
+      ]
+    }
+  }
+}