sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-26 19:47:53 +08:00
Code Activity

Fix: daily_event typo (fixed #2525)

Browse Source
This commit is contained in:
LmeSzinc
2023-04-27 22:12:44 +08:00
parent 3b0cffa420
commit b5398cb97f
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/commission/commission.py
View File

@@ -125,7 +125,7 @@ class RewardCommission(UI, InfoHandler):
total = total[::-1] 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 == 'daily_event':
self.max_commission = 5 self.max_commission = 5
running_count = int( running_count = int(
np.sum([1 for c in total if c.status == 'running'])) np.sum([1 for c in total if c.status == 'running']))

22
module/commission/project.py
View File

@@ -1,4 +1,3 @@
import re
from datetime import datetime, timedelta from datetime import datetime, timedelta
import module.config.server as server import module.config.server as server
@@ -150,8 +149,8 @@ class Commission:
1: 'running', 1: 'running',
2: 'pending' 2: 'pending'
} }
color = get_color(self.image, area) color = np.array(get_color(self.image, area))
if self.genre == 'event_daily': if self.genre == 'daily_event':
color -= [50, 30, 20] color -= [50, 30, 20]
self.status = dic[int(np.argmax(color))] self.status = dic[int(np.argmax(color))]
@@ -194,8 +193,8 @@ class Commission:
1: 'running', 1: 'running',
2: 'pending' 2: 'pending'
} }
color = get_color(self.image, area) color = np.array(get_color(self.image, area))
if self.genre == 'event_daily': if self.genre == 'daily_event':
color -= [50, 30, 20] color -= [50, 30, 20]
self.status = dic[int(np.argmax(color))] self.status = dic[int(np.argmax(color))]
@@ -238,8 +237,8 @@ class Commission:
1: 'running', 1: 'running',
2: 'pending' 2: 'pending'
} }
color = get_color(self.image, area) color = np.array(get_color(self.image, area))
if self.genre == 'event_daily': if self.genre == 'daily_event':
color -= [50, 30, 20] color -= [50, 30, 20]
self.status = dic[int(np.argmax(color))] self.status = dic[int(np.argmax(color))]
@@ -282,8 +281,8 @@ class Commission:
1: 'running', 1: 'running',
2: 'pending' 2: 'pending'
} }
color = get_color(self.image, area) color = np.array(get_color(self.image, area))
if self.genre == 'event_daily': if self.genre == 'daily_event':
color -= [50, 30, 20] color -= [50, 30, 20]
self.status = dic[int(np.argmax(color))] self.status = dic[int(np.argmax(color))]
@@ -460,6 +459,11 @@ class Commission:
# area = area_offset((5, 5, 30, 30), self.area[0:2]) # area = area_offset((5, 5, 30, 30), self.area[0:2])
# return color_similar(color1=get_color(self.image, area), color2=(235, 173, 161)) # return color_similar(color1=get_color(self.image, area), color2=(235, 173, 161))
# 2023.04.27 Vacation Lane Rerun, pink yellow gradient like Idol Master event
area = area_offset((5, 5, 30, 30), self.area[0:2])
if color_similar(color1=get_color(self.image, area), color2=(235, 173, 161), threshold=30):
return True
return False return False
def convert_to_night(self): def convert_to_night(self):