sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-16 03:27:24 +08:00
Code Activity

Merge pull request #1511 from VirtualTowel/master

Browse Source 
Add: Suffix of Comission Supported
This commit is contained in:
LmeSzinc
2022-08-11 23:05:45 +08:00
committed by GitHub
parent 1efab11a59 b642413e2a
commit bd38608851
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module/commission/commission.py
View File

@@ -114,6 +114,9 @@ class RewardCommission(UI, InfoHandler):
""" """
# Count Commission # Count Commission
total = daily.add_by_eq(urgent) total = daily.add_by_eq(urgent)
# Commissions with higher suffix are always below those with smaller suffix
# Reverse the commission list to choose commissions with higher suffix first
total = total[::-1]
self.max_commission = 4 self.max_commission = 4
for comm in total: for comm in total:
if comm.genre == 'event_daily': if comm.genre == 'event_daily':

2
module/commission/project.py
View File

@@ -326,6 +326,8 @@ class Commission:
return False return False
if self.repeat_count != other.repeat_count: if self.repeat_count != other.repeat_count:
return False return False
if self.genre in ['extra_oil', 'night_oil'] and self.suffix != other.suffix:
return False
return True return True