PaiGramTeam/miao-plugin
3
0
Fork 0
mirror of https://github.com/yoimiya-kokomi/miao-plugin.git synced 2024-11-16 04:35:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	resources/meta-gs/character/芙宁娜/icons/cons-3.webp
#	resources/meta-gs/character/芙宁娜/icons/cons-5.webp
This commit is contained in:
Kokomi 2023-10-25 03:49:22 +08:00
commit 4df65d4013
5 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/meta-gs/character/芙宁娜/icons/cons-2.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
resources/meta-gs/character/芙宁娜/icons/cons-3.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
resources/meta-gs/character/芙宁娜/icons/cons-5.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
resources/meta-gs/character/芙宁娜/icons/cons-6.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 14 KiB

2
resources/meta-gs/weapon/claymore/聊聊棒/data.json
View File

@ -3,7 +3,7 @@
"name": "聊聊棒",
"affixTitle": "「伶牙俐齿」",
"star": 4,
"desc": "承受火元素附着后的10秒内，攻击力提升16%，每12秒至多触发一次；承受水元素、冰元素或雷元素附着后的10秒内，所有元素伤害加成提升12%，每12秒至多触发一次。",
"desc": "一柄沉重的镶有黑曜石的大棒，有很强的说服力。",
"attr": {
"atk": {
"1": 43.73,