PaiGramTeam/PaiGram
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/PaiGram.git synced 2024-11-22 07:07:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

⚡️ 抽卡记录支持显示欧吉非

Browse Source
This commit is contained in:
xtaodada 2022-10-09 14:54:07 +08:00
parent e54e3803f5
commit ccd1eaab8d
Signed by: xtaodada
GPG Key ID: 4CBB3F4FA8C85659
3 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
modules/apihelper/gacha_log.py
View File

@ -445,7 +445,7 @@ class GachaLog:
five_star_up = len([i for i in all_five if i.isUp])
five_star_big = len([i for i in all_five if i.isBig])
# 五星平均
five_star_avg = round(total / five_star, 2) if five_star != 0 else 0
five_star_avg = round((total - no_five_star) / five_star, 2) if five_star != 0 else 0
# 小保底不歪
small_protect = (
round((five_star_up - five_star_big) / (five_star - five_star_big) * 100.0, 1)
@ -455,7 +455,7 @@ class GachaLog:
# 五星常驻
five_star_const = five_star - five_star_up
# UP 平均
up_avg = round(total / five_star_up, 2) if five_star_up != 0 else 0
up_avg = round((total - no_five_star) / five_star_up, 2) if five_star_up != 0 else 0
# UP 花费原石
up_cost = sum(i.count * 160 for i in all_five if i.isUp)
up_cost = f"{round(up_cost / 10000, 2)}w" if up_cost >= 10000 else up_cost
@ -481,13 +481,13 @@ class GachaLog:
# 总共五星
five_star = len(all_five)
# 五星平均
five_star_avg = round(total / five_star, 2) if five_star != 0 else 0
five_star_avg = round((total - no_five_star) / five_star, 2) if five_star != 0 else 0
# 五星武器
five_star_weapon = len([i for i in all_five if i.type == "武器"])
# 总共四星
four_star = len(all_four)
# 四星平均
four_star_avg = round(total / four_star, 2) if four_star != 0 else 0
four_star_avg = round((total - no_four_star) / four_star, 2) if four_star != 0 else 0
# 四星最多
four_star_name_list = [i.name for i in all_four]
four_star_max = max(four_star_name_list, key=four_star_name_list.count)
@ -514,13 +514,13 @@ class GachaLog:
# 总共五星
five_star = len(all_five)
# 五星平均
five_star_avg = round(total / five_star, 2) if five_star != 0 else 0
five_star_avg = round((total - no_five_star) / five_star, 2) if five_star != 0 else 0
# 四星武器
four_star_weapon = len([i for i in all_four if i.type == "武器"])
# 总共四星
four_star = len(all_four)
# 四星平均
four_star_avg = round(total / four_star, 2) if four_star != 0 else 0
four_star_avg = round((total - no_four_star) / four_star, 2) if four_star != 0 else 0
# 四星最多
four_star_name_list = [i.name for i in all_four]
four_star_max = max(four_star_name_list, key=four_star_name_list.count)
@ -540,6 +540,32 @@ class GachaLog:
],
]
@staticmethod
def count_fortune(pool_name: str, summon_data, weapon: bool = False):
"""
角色 武器
欧 50以下 45以下
吉 50-60 45-55
中 60-70 55-65
非 70以上 65以上
"""
data = [45, 55, 65] if weapon else [50, 60, 70]
for i in summon_data:
for j in i:
if j.get("lable") == "五星平均":
num = j.get("num", 0)
if num == 0:
return pool_name
elif num <= data[0]:
return f"{pool_name} · 欧"
elif num <= data[1]:
return f"{pool_name} · 吉"
elif num <= data[2]:
return f"{pool_name} · 普通"
else:
return f"{pool_name} · 非"
return pool_name
@staticmethod
async def get_analysis(user_id: int, client: Client, pool: BannerType, assets: AssetsService):
"""
@ -563,10 +589,13 @@ class GachaLog:
summon_data = None
if pool == BannerType.CHARACTER1:
summon_data = GachaLog.get_301_pool_data(total, all_five, no_five_star, no_four_star)
pool_name = GachaLog.count_fortune(pool_name, summon_data)
elif pool == BannerType.WEAPON:
summon_data = GachaLog.get_302_pool_data(total, all_five, all_four, no_five_star, no_four_star)
pool_name = GachaLog.count_fortune(pool_name, summon_data, True)
elif pool == BannerType.PERMANENT:
summon_data = GachaLog.get_200_pool_data(total, all_five, all_four, no_five_star, no_four_star)
pool_name = GachaLog.count_fortune(pool_name, summon_data)
last_time = data[0].time.strftime("%Y-%m-%d %H:%M")
first_time = data[-1].time.strftime("%Y-%m-%d %H:%M")
return {

2
resources/genshin/gacha_log/example.html
View File

@ -26,7 +26,7 @@
</div>
<h2 class="day_text">
81抽
<span class="label label_301">角色祈愿池</span>
<span class="label label_301">角色祈愿池 · 欧</span>
</h2>
<img class="genshin_logo" src="./../../bot/help/background/genshin.png" alt=""/>
</div>

2
resources/genshin/gacha_log/gacha_log.html
View File

@ -27,7 +27,7 @@
</div>
<h2 class="day_text">
{{ allNum }}抽
<span class="label label_{{type}}">{{ typeName }}池</span>
<span class="label label_{{type}}">{{ typeName }}</span>
</h2>
<img class="genshin_logo" src="./../../bot/help/background/genshin.png" alt=""/>
</div>