Merge remote-tracking branch 'origin/master' into profile-v2

# Conflicts: # resources/meta-gs/character/芙宁娜/icons/cons-3.webp # resources/meta-gs/character/芙宁娜/icons/cons-5.webp
2024-11-21 22:48:13 +00:00 · 2023-10-25 03:49:22 +08:00 · 2023-10-25 03:49:22 +08:00 · 4df65d4013
commit 4df65d4013
parent ba16fb6d0c d326b9adef
5 changed files with 1 additions and 1 deletions
--- a/resources/meta-gs/character/芙宁娜/icons/cons-2.webp
+++ b/resources/meta-gs/character/芙宁娜/icons/cons-2.webp
--- a/resources/meta-gs/character/芙宁娜/icons/cons-3.webp
+++ b/resources/meta-gs/character/芙宁娜/icons/cons-3.webp
--- a/resources/meta-gs/character/芙宁娜/icons/cons-5.webp
+++ b/resources/meta-gs/character/芙宁娜/icons/cons-5.webp
--- a/resources/meta-gs/character/芙宁娜/icons/cons-6.webp
+++ b/resources/meta-gs/character/芙宁娜/icons/cons-6.webp
--- a/resources/meta-gs/weapon/claymore/聊聊棒/data.json
+++ b/resources/meta-gs/weapon/claymore/聊聊棒/data.json
@ -3,7 +3,7 @@
  "name": "聊聊棒",
  "affixTitle": "「伶牙俐齿」",
  "star": 4,
-  "desc": "承受火元素附着后的10秒内，攻击力提升16%，每12秒至多触发一次；承受水元素、冰元素或雷元素附着后的10秒内，所有元素伤害加成提升12%，每12秒至多触发一次。",
+  "desc": "一柄沉重的镶有黑曜石的大棒，有很强的说服力。",
  "attr": {
    "atk": {
      "1": 43.73,