merge master to dev (#573) (#574)

Browse Source

* 修改白术、心海圣遗物评分权重。

* 添加白术伤害计算方式

* 添加白术伤害计算方式

* 添加白术伤害计算方式

* 卡维评分权重



* 删除文件 artis-mark.js

* 卡维评分权重



* test

* 删除文件 test.js

* test_2

* test_2

* 删除文件

* 绮良良评分权重

* 香菱6命增伤修正

* 香菱6命增伤修正

* 卡维伤害

* 卡维伤害计算修正

* 修改托马圣遗物评分权重：增加精通权重

* 3.7卡池更新



* 3.7上半卡池更新 (#568)



* 修正妮露组队伤害问题；修改奶妈系角色排名依据，修改久岐忍、珐露珊评分规则 (#571)

* 添加绮良良相关图片资源 (#572)

---------

Signed-off-by: DokiAlex <gzzalex0207@outlook.com>
Signed-off-by: touchscale <11134128+touchscale_admin@user.noreply.gitee.com>
Co-authored-by: terry.huang <terry.huang@ringcentral.com>
Co-authored-by: Kokomi <4964418+yoimiya-kokomi@user.noreply.gitee.com>
Co-authored-by: DokiAlex <gzzalex0207@outlook.com>
Co-authored-by: terry.huang <T@140627>
Co-authored-by: touchscale <11134128+touchscale_admin@user.noreply.gitee.com>
Co-authored-by: Qielanyinyin <75341397+Qielanyinyin@users.noreply.github.com>
Co-authored-by: Aluxes <39981645+AshenAshes@users.noreply.github.com>
Co-authored-by: DokiAlex <57402050+VeritasAlex@users.noreply.github.com>

...

This commit is contained in:

Kokomi 2023-05-27 04:41:59 +08:00 committed by GitHub

parent ff1dca2d7b

commit 7962ed67a5

No known key found for this signature in database

GPG Key ID: 4AEE18F83AFDEB23

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available