Compare commits
29 Commits
eb8048ccd6
...
sync_src
| Author | SHA1 | Date | |
|---|---|---|---|
|
baac90ecf0
|
|||
|
53ec298fed
|
|||
|
b4f18f78ff
|
|||
|
eb9af42f38
|
|||
|
c29d972c6c
|
|||
|
92b34d4760
|
|||
|
04853b6c31
|
|||
|
9604e8962a
|
|||
|
03380b2d71
|
|||
|
c27bd74050
|
|||
|
c3e9945b15
|
|||
|
1dd100ac04
|
|||
|
77dca70af1
|
|||
|
b8ecd0c9d6
|
|||
|
ceb24283f3
|
|||
|
d0c591af3a
|
|||
|
589b0b08ec
|
|||
|
299bd6c687
|
|||
|
e61afaf43b
|
|||
|
30e8c8b21b
|
|||
|
f7b165f589
|
|||
|
08959e5f1c
|
|||
|
e929a1efb1
|
|||
|
8e29d7d2c0
|
|||
|
d3a1a77d6a
|
|||
|
930c741de6
|
|||
|
2c19afdf26
|
|||
|
bbf3bf7c36
|
|||
|
5e4abc147e
|
@@ -16,6 +16,7 @@ The script is still under active development. The following features have been i
|
||||
- [x] **Club** Claim AP
|
||||
- [x] **Mailbox** Claim rewards
|
||||
- [x] **Bounty** Auto sweep
|
||||
- [x] **Scrimmage** Auto sweep
|
||||
- [x] **Tactical Challenge** Claim rewards / Auto battle
|
||||
|
||||
Supported servers:
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
- [x] **公会** 领取体力
|
||||
- [x] **邮箱** 领取奖励
|
||||
- [x] **悬赏通缉** 自动扫荡
|
||||
- [x] **学院交流会** 自动扫荡
|
||||
- [x] **战术对抗赛** 领取奖励 / 自动战斗
|
||||
|
||||
目前支持的服务器:
|
||||
@@ -27,8 +28,8 @@
|
||||
|
||||
若愿意提供其他服务器支持,请开 PR 或 Issue。
|
||||
|
||||
- **大小月卡**:未实现自动领取~~(因为没买过)~~,可能不影响使用。愿意提供图片的请开 Issue
|
||||
- **月卡的额外悬赏券和学院交流券**:不太清楚月卡领取额外券的机制~~(因为没买过)~~,可能影响相关任务使用券和体力的计算。愿意提供相关信息的请开
|
||||
- **大小月卡**:未实现自动领取,~~因为没买过~~,可能不影响使用。愿意提供图片的请开 Issue
|
||||
- **月卡的额外悬赏券和学院交流券**:不太清楚月卡领取额外券的机制,~~因为没买过~~,可能影响相关任务使用券和体力的计算。愿意提供相关信息的请开
|
||||
Issue
|
||||
|
||||
## 相关项目
|
||||
|
||||
@@ -38,6 +38,10 @@ class ArisuAutoSweeper(AzurLaneAutoScript):
|
||||
from tasks.bounty.bounty import Bounty
|
||||
Bounty(config=self.config, device=self.device).run()
|
||||
|
||||
def scrimmage(self):
|
||||
from tasks.scrimmage.scrimmage import Scrimmage
|
||||
Scrimmage(config=self.config, device=self.device).run()
|
||||
|
||||
def tactical_challenge(self):
|
||||
from tasks.tactical_challenge.tactical_challenge import TacticalChallenge
|
||||
TacticalChallenge(config=self.config, device=self.device).run()
|
||||
|
||||
@@ -285,7 +285,7 @@ pre.rich-traceback-code {
|
||||
*[style*="--header-icon--"] {
|
||||
margin: .25rem auto .25rem;
|
||||
border-radius: 1.5rem;
|
||||
height: 3.5em;
|
||||
height: 3em;
|
||||
}
|
||||
|
||||
*[style*="--header-text--"] {
|
||||
|
||||
|
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 7.3 KiB |
|
Before Width: | Height: | Size: 8.9 KiB After Width: | Height: | Size: 8.9 KiB |
|
After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 7.8 KiB After Width: | Height: | Size: 7.8 KiB |
|
After Width: | Height: | Size: 6.0 KiB |
|
Before Width: | Height: | Size: 7.8 KiB After Width: | Height: | Size: 7.8 KiB |
|
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 9.2 KiB |
|
Before Width: | Height: | Size: 8.9 KiB After Width: | Height: | Size: 8.9 KiB |
@@ -70,6 +70,9 @@
|
||||
"Command": "Bounty",
|
||||
"ServerUpdate": "04:00"
|
||||
},
|
||||
"Bounty": {
|
||||
"OnError": "skip"
|
||||
},
|
||||
"Highway": {
|
||||
"Stage": 1,
|
||||
"Count": 2
|
||||
@@ -83,6 +86,29 @@
|
||||
"Count": 2
|
||||
}
|
||||
},
|
||||
"Scrimmage": {
|
||||
"Scheduler": {
|
||||
"Enable": true,
|
||||
"NextRun": "2020-01-01 00:00:00",
|
||||
"Command": "Scrimmage",
|
||||
"ServerUpdate": "04:00"
|
||||
},
|
||||
"Scrimmage": {
|
||||
"OnError": "skip"
|
||||
},
|
||||
"Trinity": {
|
||||
"Stage": 1,
|
||||
"Count": 2
|
||||
},
|
||||
"Gehenna": {
|
||||
"Stage": 1,
|
||||
"Count": 2
|
||||
},
|
||||
"Millennium": {
|
||||
"Stage": 1,
|
||||
"Count": 2
|
||||
}
|
||||
},
|
||||
"TacticalChallenge": {
|
||||
"Scheduler": {
|
||||
"Enable": true,
|
||||
|
||||
@@ -179,20 +179,29 @@ def iter_assets():
|
||||
if image.attr != '':
|
||||
row = deep_get(data, keys=[image.module, image.assets, image.server, image.frame])
|
||||
row.load_image(image)
|
||||
# Apply `search` of the first frame to all
|
||||
# Set `search`
|
||||
for path, frames in deep_iter(data, depth=3):
|
||||
print(path, frames)
|
||||
# If `search` attribute is set in the first frame, apply to all
|
||||
first = frames[1]
|
||||
search = first.search if first.search else DataAssets.area_to_search(first.area)
|
||||
for frame in frames.values():
|
||||
frame.search = search
|
||||
if first.search:
|
||||
for frame in frames.values():
|
||||
frame.search = first.search
|
||||
else:
|
||||
for frame in frames.values():
|
||||
if frame.search:
|
||||
# Follow frame specific `search`
|
||||
pass
|
||||
else:
|
||||
# Generate `search` from `area`
|
||||
frame.search = DataAssets.area_to_search(frame.area)
|
||||
|
||||
return data
|
||||
|
||||
|
||||
def generate_code():
|
||||
all = iter_assets()
|
||||
for module, module_data in all.items():
|
||||
all_assets = iter_assets()
|
||||
for module, module_data in all_assets.items():
|
||||
path = os.path.join(AzurLaneConfig.ASSETS_MODULE, module.split('/', maxsplit=1)[0])
|
||||
output = os.path.join(path, 'assets.py')
|
||||
if os.path.exists(output):
|
||||
@@ -204,7 +213,7 @@ def generate_code():
|
||||
continue
|
||||
os.remove(prev)
|
||||
|
||||
for module, module_data in all.items():
|
||||
for module, module_data in all_assets.items():
|
||||
path = os.path.join(AzurLaneConfig.ASSETS_MODULE, module.split('/', maxsplit=1)[0])
|
||||
output = os.path.join(path, 'assets')
|
||||
gen = CodeGenerator()
|
||||
|
||||
@@ -74,7 +74,7 @@ class Button(Resource):
|
||||
threshold=threshold
|
||||
)
|
||||
|
||||
def match_template(self, image, similarity=0.85) -> bool:
|
||||
def match_template(self, image, similarity=0.85, direct_match=False) -> bool:
|
||||
"""
|
||||
Detects assets by template matching.
|
||||
|
||||
@@ -83,18 +83,45 @@ class Button(Resource):
|
||||
Args:
|
||||
image: Screenshot.
|
||||
similarity (float): 0-1.
|
||||
direct_match: True to ignore `self.search`
|
||||
|
||||
Returns:
|
||||
bool.
|
||||
"""
|
||||
image = crop(image, self.search, copy=False)
|
||||
if not direct_match:
|
||||
image = crop(image, self.search, copy=False)
|
||||
res = cv2.matchTemplate(self.image, image, cv2.TM_CCOEFF_NORMED)
|
||||
_, sim, _, point = cv2.minMaxLoc(res)
|
||||
|
||||
self._button_offset = np.array(point) + self.search[:2] - self.area[:2]
|
||||
return sim > similarity
|
||||
|
||||
def match_template_color(self, image, similarity=0.85, threshold=30) -> bool:
|
||||
def match_multi_template(self, image, similarity=0.85, direct_match=False):
|
||||
"""
|
||||
Detects assets by template matching, return multiple reults
|
||||
|
||||
Args:
|
||||
image: Screenshot.
|
||||
similarity (float): 0-1.
|
||||
direct_match: True to ignore `self.search`
|
||||
|
||||
Returns:
|
||||
list:
|
||||
"""
|
||||
if not direct_match:
|
||||
image = crop(image, self.search, copy=False)
|
||||
res = cv2.matchTemplate(self.image, image, cv2.TM_CCOEFF_NORMED)
|
||||
res = cv2.inRange(res, similarity, 1.)
|
||||
try:
|
||||
points = np.array(cv2.findNonZero(res))[:, 0, :]
|
||||
points += self.search[:2]
|
||||
return points.tolist()
|
||||
except IndexError:
|
||||
# Empty result
|
||||
# IndexError: too many indices for array: array is 0-dimensional, but 3 were indexed
|
||||
return []
|
||||
|
||||
def match_template_color(self, image, similarity=0.85, threshold=30, direct_match=False) -> bool:
|
||||
"""
|
||||
Template match first, color match then
|
||||
|
||||
@@ -102,11 +129,12 @@ class Button(Resource):
|
||||
image: Screenshot.
|
||||
similarity (float): 0-1.
|
||||
threshold (int): Default to 10.
|
||||
direct_match: True to ignore `self.search`
|
||||
|
||||
Returns:
|
||||
|
||||
bool.
|
||||
"""
|
||||
matched = self.match_template(image, similarity=similarity)
|
||||
matched = self.match_template(image, similarity=similarity, direct_match=direct_match)
|
||||
if not matched:
|
||||
return False
|
||||
|
||||
@@ -124,10 +152,10 @@ class ButtonWrapper(Resource):
|
||||
self.name = name
|
||||
self.data_buttons = kwargs
|
||||
self._matched_button: t.Optional[Button] = None
|
||||
self.resource_add(self.name)
|
||||
self.resource_add(f'{name}:{next(self.iter_buttons(), None)}')
|
||||
|
||||
def resource_release(self):
|
||||
del_cached_property(self, 'assets')
|
||||
del_cached_property(self, 'buttons')
|
||||
self._matched_button = None
|
||||
|
||||
def __str__(self):
|
||||
@@ -144,16 +172,25 @@ class ButtonWrapper(Resource):
|
||||
def __bool__(self):
|
||||
return True
|
||||
|
||||
def iter_buttons(self) -> t.Iterator[Button]:
|
||||
for _, assets in self.data_buttons.items():
|
||||
if isinstance(assets, Button):
|
||||
yield assets
|
||||
elif isinstance(assets, list):
|
||||
for asset in assets:
|
||||
yield asset
|
||||
|
||||
@cached_property
|
||||
def buttons(self) -> t.List[Button]:
|
||||
# for trial in [server.lang, 'share', 'cn']:
|
||||
for trial in [server.lang, 'share', 'jp']:
|
||||
assets = self.data_buttons.get(trial, None)
|
||||
if assets is not None:
|
||||
for trial in [server.lang, 'share', 'cn']:
|
||||
try:
|
||||
assets = self.data_buttons[trial]
|
||||
if isinstance(assets, Button):
|
||||
return [assets]
|
||||
elif isinstance(assets, list):
|
||||
return assets
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
raise ScriptError(f'ButtonWrapper({self}) on server {server.lang} has no fallback button')
|
||||
|
||||
@@ -164,16 +201,45 @@ class ButtonWrapper(Resource):
|
||||
return True
|
||||
return False
|
||||
|
||||
def match_template(self, image, similarity=0.85) -> bool:
|
||||
def match_template(self, image, similarity=0.85, direct_match=False) -> bool:
|
||||
for assets in self.buttons:
|
||||
if assets.match_template(image, similarity=similarity):
|
||||
if assets.match_template(image, similarity=similarity, direct_match=direct_match):
|
||||
self._matched_button = assets
|
||||
return True
|
||||
return False
|
||||
|
||||
def match_template_color(self, image, similarity=0.85, threshold=30) -> bool:
|
||||
def match_multi_template(self, image, similarity=0.85, threshold=5, direct_match=False):
|
||||
"""
|
||||
Detects assets by template matching, return multiple results
|
||||
|
||||
Args:
|
||||
image: Screenshot.
|
||||
similarity (float): 0-1.
|
||||
threshold:
|
||||
direct_match: True to ignore `self.search`
|
||||
|
||||
Returns:
|
||||
list[ClickButton]:
|
||||
"""
|
||||
ps = []
|
||||
for assets in self.buttons:
|
||||
if assets.match_template_color(image, similarity=similarity, threshold=threshold):
|
||||
ps += assets.match_multi_template(image, similarity=similarity, direct_match=direct_match)
|
||||
if not ps:
|
||||
return []
|
||||
|
||||
from module.base.utils.points import Points
|
||||
ps = Points(ps).group(threshold=threshold)
|
||||
area_list = [area_offset(self.area, p - self.area[:2]) for p in ps]
|
||||
button_list = [area_offset(self.button, p - self.area[:2]) for p in ps]
|
||||
return [
|
||||
ClickButton(area=info[0], button=info[1], name=f'{self.name}_result{i}')
|
||||
for i, info in enumerate(zip(area_list, button_list))
|
||||
]
|
||||
|
||||
def match_template_color(self, image, similarity=0.85, threshold=30, direct_match=False) -> bool:
|
||||
for assets in self.buttons:
|
||||
if assets.match_template_color(
|
||||
image, similarity=similarity, threshold=threshold, direct_match=direct_match):
|
||||
self._matched_button = assets
|
||||
return True
|
||||
return False
|
||||
@@ -222,18 +288,32 @@ class ButtonWrapper(Resource):
|
||||
"""
|
||||
if isinstance(button, ButtonWrapper):
|
||||
button = button.matched_button
|
||||
for b in self.buttons:
|
||||
for b in self.iter_buttons():
|
||||
b.load_offset(button)
|
||||
|
||||
def clear_offset(self):
|
||||
for b in self.buttons:
|
||||
for b in self.iter_buttons():
|
||||
b.clear_offset()
|
||||
|
||||
def load_search(self, area):
|
||||
"""
|
||||
Set `search` attribute.
|
||||
Note that this method is irreversible.
|
||||
|
||||
Args:
|
||||
area:
|
||||
"""
|
||||
for b in self.iter_buttons():
|
||||
b.search = area
|
||||
|
||||
|
||||
class ClickButton:
|
||||
def __init__(self, button, name='CLICK_BUTTON'):
|
||||
self.area = button
|
||||
self.button = button
|
||||
def __init__(self, area, button=None, name='CLICK_BUTTON'):
|
||||
self.area = area
|
||||
if button is None:
|
||||
self.button = area
|
||||
else:
|
||||
self.button = button
|
||||
self.name = name
|
||||
|
||||
def __str__(self):
|
||||
@@ -265,4 +345,4 @@ def match_template(image, template, similarity=0.85):
|
||||
"""
|
||||
res = cv2.matchTemplate(image, template, cv2.TM_CCOEFF_NORMED)
|
||||
_, sim, _, point = cv2.minMaxLoc(res)
|
||||
return sim > similarity
|
||||
return sim > similarity
|
||||
@@ -1,11 +1,11 @@
|
||||
import re
|
||||
|
||||
import module.config.server as server
|
||||
from module.base.decorator import cached_property, del_cached_property
|
||||
from module.base.decorator import cached_property
|
||||
|
||||
|
||||
def get_assets_from_file(file, regex):
|
||||
def get_assets_from_file(file):
|
||||
assets = set()
|
||||
regex = re.compile(r"file='(.*?)'")
|
||||
with open(file, 'r', encoding='utf-8') as f:
|
||||
for row in f.readlines():
|
||||
result = regex.search(row)
|
||||
@@ -20,11 +20,9 @@ class PreservedAssets:
|
||||
assets = set()
|
||||
assets |= get_assets_from_file(
|
||||
file='./tasks/base/assets/assets_base_page.py',
|
||||
regex=re.compile(r'^([A-Za-z][A-Za-z0-9_]+) = ')
|
||||
)
|
||||
assets |= get_assets_from_file(
|
||||
file='./tasks/base/assets/assets_base_popup.py',
|
||||
regex=re.compile(r'^([A-Za-z][A-Za-z0-9_]+) = ')
|
||||
)
|
||||
return assets
|
||||
|
||||
@@ -44,11 +42,13 @@ class Resource:
|
||||
|
||||
@classmethod
|
||||
def is_loaded(cls, obj):
|
||||
if hasattr(obj, '_image') and obj._image is None:
|
||||
return False
|
||||
elif hasattr(obj, 'image') and obj.image is None:
|
||||
return False
|
||||
return True
|
||||
if hasattr(obj, '_image') and obj._image is not None:
|
||||
return True
|
||||
if hasattr(obj, 'image') and obj.image is not None:
|
||||
return True
|
||||
if hasattr(obj, 'buttons') and obj.buttons is not None:
|
||||
return True
|
||||
return False
|
||||
|
||||
@classmethod
|
||||
def resource_show(cls):
|
||||
@@ -56,11 +56,16 @@ class Resource:
|
||||
logger.hr('Show resource')
|
||||
for key, obj in cls.instances.items():
|
||||
if cls.is_loaded(obj):
|
||||
continue
|
||||
logger.info(f'{obj}: {key}')
|
||||
logger.info(f'{obj}: {key}')
|
||||
|
||||
|
||||
def release_resources(next_task=''):
|
||||
# Release all OCR models
|
||||
# det models take 400MB
|
||||
if not next_task:
|
||||
from module.ocr.models import OCR_MODEL
|
||||
OCR_MODEL.resource_release()
|
||||
|
||||
# Release assets cache
|
||||
# module.ui has about 80 assets and takes about 3MB
|
||||
# Alas has about 800 assets, but they are not all loaded.
|
||||
@@ -74,4 +79,4 @@ def release_resources(next_task=''):
|
||||
obj.resource_release()
|
||||
|
||||
# Useless in most cases, but just call it
|
||||
# gc.collect()
|
||||
# gc.collect()
|
||||
@@ -283,6 +283,16 @@
|
||||
"display": "hide"
|
||||
}
|
||||
},
|
||||
"Bounty": {
|
||||
"OnError": {
|
||||
"type": "select",
|
||||
"value": "skip",
|
||||
"option": [
|
||||
"stop",
|
||||
"skip"
|
||||
]
|
||||
}
|
||||
},
|
||||
"Highway": {
|
||||
"Stage": {
|
||||
"type": "select",
|
||||
@@ -347,6 +357,91 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"Scrimmage": {
|
||||
"Scheduler": {
|
||||
"Enable": {
|
||||
"type": "checkbox",
|
||||
"value": true,
|
||||
"option": [
|
||||
true,
|
||||
false
|
||||
]
|
||||
},
|
||||
"NextRun": {
|
||||
"type": "datetime",
|
||||
"value": "2020-01-01 00:00:00",
|
||||
"validate": "datetime"
|
||||
},
|
||||
"Command": {
|
||||
"type": "input",
|
||||
"value": "Scrimmage",
|
||||
"display": "hide"
|
||||
},
|
||||
"ServerUpdate": {
|
||||
"type": "input",
|
||||
"value": "04:00",
|
||||
"display": "hide"
|
||||
}
|
||||
},
|
||||
"Scrimmage": {
|
||||
"OnError": {
|
||||
"type": "select",
|
||||
"value": "skip",
|
||||
"option": [
|
||||
"stop",
|
||||
"skip"
|
||||
]
|
||||
}
|
||||
},
|
||||
"Trinity": {
|
||||
"Stage": {
|
||||
"type": "select",
|
||||
"value": 1,
|
||||
"option": [
|
||||
1,
|
||||
2,
|
||||
3,
|
||||
4
|
||||
]
|
||||
},
|
||||
"Count": {
|
||||
"type": "input",
|
||||
"value": 2
|
||||
}
|
||||
},
|
||||
"Gehenna": {
|
||||
"Stage": {
|
||||
"type": "select",
|
||||
"value": 1,
|
||||
"option": [
|
||||
1,
|
||||
2,
|
||||
3,
|
||||
4
|
||||
]
|
||||
},
|
||||
"Count": {
|
||||
"type": "input",
|
||||
"value": 2
|
||||
}
|
||||
},
|
||||
"Millennium": {
|
||||
"Stage": {
|
||||
"type": "select",
|
||||
"value": 1,
|
||||
"option": [
|
||||
1,
|
||||
2,
|
||||
3,
|
||||
4
|
||||
]
|
||||
},
|
||||
"Count": {
|
||||
"type": "input",
|
||||
"value": 2
|
||||
}
|
||||
}
|
||||
},
|
||||
"TacticalChallenge": {
|
||||
"Scheduler": {
|
||||
"Enable": {
|
||||
|
||||
@@ -81,6 +81,11 @@ Cafe:
|
||||
AutoAdjust: true
|
||||
SecondCafe: true
|
||||
|
||||
Bounty:
|
||||
OnError:
|
||||
value: skip
|
||||
option: [ stop, skip ]
|
||||
|
||||
Highway:
|
||||
Stage:
|
||||
value: 1
|
||||
@@ -97,6 +102,27 @@ Schoolhouse:
|
||||
option: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
|
||||
Count: 2
|
||||
|
||||
Scrimmage:
|
||||
OnError:
|
||||
value: skip
|
||||
option: [ stop, skip ]
|
||||
|
||||
Trinity:
|
||||
Stage:
|
||||
value: 1
|
||||
option: [ 1, 2, 3, 4 ]
|
||||
Count: 2
|
||||
Gehenna:
|
||||
Stage:
|
||||
value: 1
|
||||
option: [ 1, 2, 3, 4 ]
|
||||
Count: 2
|
||||
Millennium:
|
||||
Stage:
|
||||
value: 1
|
||||
option: [ 1, 2, 3, 4 ]
|
||||
Count: 2
|
||||
|
||||
TacticalChallenge:
|
||||
PlayerSelect:
|
||||
value: 0
|
||||
|
||||
@@ -16,6 +16,9 @@ Circle:
|
||||
Bounty:
|
||||
Scheduler:
|
||||
Enable: true
|
||||
Scrimmage:
|
||||
Scheduler:
|
||||
Enable: true
|
||||
TacticalChallenge:
|
||||
Scheduler:
|
||||
Enable: true
|
||||
@@ -15,6 +15,7 @@
|
||||
"Mail",
|
||||
"Circle",
|
||||
"Bounty",
|
||||
"Scrimmage",
|
||||
"TacticalChallenge",
|
||||
"DataUpdate"
|
||||
]
|
||||
|
||||
@@ -31,9 +31,16 @@ Daily:
|
||||
- Scheduler
|
||||
Bounty:
|
||||
- Scheduler
|
||||
- Bounty
|
||||
- Highway
|
||||
- DesertRailroad
|
||||
- Schoolhouse
|
||||
Scrimmage:
|
||||
- Scheduler
|
||||
- Scrimmage
|
||||
- Trinity
|
||||
- Gehenna
|
||||
- Millennium
|
||||
TacticalChallenge:
|
||||
- Scheduler
|
||||
- TacticalChallenge
|
||||
|
||||
@@ -45,6 +45,9 @@ class GeneratedConfig:
|
||||
Cafe_AutoAdjust = True
|
||||
Cafe_SecondCafe = True
|
||||
|
||||
# Group `Bounty`
|
||||
Bounty_OnError = 'skip' # stop, skip
|
||||
|
||||
# Group `Highway`
|
||||
Highway_Stage = 1 # 1, 2, 3, 4, 5, 6, 7, 8, 9
|
||||
Highway_Count = 2
|
||||
@@ -57,6 +60,21 @@ class GeneratedConfig:
|
||||
Schoolhouse_Stage = 1 # 1, 2, 3, 4, 5, 6, 7, 8, 9
|
||||
Schoolhouse_Count = 2
|
||||
|
||||
# Group `Scrimmage`
|
||||
Scrimmage_OnError = 'skip' # stop, skip
|
||||
|
||||
# Group `Trinity`
|
||||
Trinity_Stage = 1 # 1, 2, 3, 4
|
||||
Trinity_Count = 2
|
||||
|
||||
# Group `Gehenna`
|
||||
Gehenna_Stage = 1 # 1, 2, 3, 4
|
||||
Gehenna_Count = 2
|
||||
|
||||
# Group `Millennium`
|
||||
Millennium_Stage = 1 # 1, 2, 3, 4
|
||||
Millennium_Count = 2
|
||||
|
||||
# Group `TacticalChallenge`
|
||||
TacticalChallenge_PlayerSelect = 0 # 0, 1, 2, 3
|
||||
|
||||
|
||||
@@ -8,7 +8,8 @@ class ManualConfig:
|
||||
|
||||
SCHEDULER_PRIORITY = """
|
||||
Restart
|
||||
> Cafe > Circle > Mail > DataUpdate > Bounty > TacticalChallenge
|
||||
> Cafe > Circle > Mail > DataUpdate > Bounty
|
||||
> Scrimmage > TacticalChallenge
|
||||
"""
|
||||
|
||||
"""
|
||||
|
||||
@@ -458,7 +458,8 @@ class ConfigUpdater:
|
||||
value = deep_get(old, keys=keys, default=data['value'])
|
||||
typ = data['type']
|
||||
display = data.get('display')
|
||||
if is_template or value is None or value == '' or typ == 'lock' or (display == 'hide' and typ != 'stored'):
|
||||
if (is_template or value is None or value == ''
|
||||
or typ in ['lock', 'state'] or (display == 'hide' and typ != 'stored')):
|
||||
value = data['value']
|
||||
value = parse_value(value, data=data)
|
||||
deep_set(new, keys=keys, value=value)
|
||||
|
||||
@@ -34,6 +34,10 @@
|
||||
"name": "Bounty",
|
||||
"help": ""
|
||||
},
|
||||
"Scrimmage": {
|
||||
"name": "Scrimmage",
|
||||
"help": ""
|
||||
},
|
||||
"TacticalChallenge": {
|
||||
"name": "Tactical Challenge",
|
||||
"help": ""
|
||||
@@ -213,6 +217,18 @@
|
||||
"help": "JP server only\nEnable auto switch to second floor and perform interaction"
|
||||
}
|
||||
},
|
||||
"Bounty": {
|
||||
"_info": {
|
||||
"name": "Bounty Settings",
|
||||
"help": ""
|
||||
},
|
||||
"OnError": {
|
||||
"name": "Error Handling",
|
||||
"help": "Perform the selected action when an error occurs (ticket not enough or any invalid setting)",
|
||||
"stop": "Stop script",
|
||||
"skip": "Skip current task"
|
||||
}
|
||||
},
|
||||
"Highway": {
|
||||
"_info": {
|
||||
"name": "Overpass",
|
||||
@@ -282,6 +298,72 @@
|
||||
"help": "Sweep the selected stage for X times"
|
||||
}
|
||||
},
|
||||
"Scrimmage": {
|
||||
"_info": {
|
||||
"name": "Scrimmage Settings",
|
||||
"help": ""
|
||||
},
|
||||
"OnError": {
|
||||
"name": "Error Handling",
|
||||
"help": "Perform the selected action when an error occurs (ticket not enough or any invalid setting)",
|
||||
"stop": "Stop script",
|
||||
"skip": "Skip current task"
|
||||
}
|
||||
},
|
||||
"Trinity": {
|
||||
"_info": {
|
||||
"name": "Trinity",
|
||||
"help": ""
|
||||
},
|
||||
"Stage": {
|
||||
"name": "Select Stage",
|
||||
"help": "",
|
||||
"1": "01 - Trinity A",
|
||||
"2": "02 - Trinity B",
|
||||
"3": "03 - Trinity C",
|
||||
"4": "04 - Trinity D"
|
||||
},
|
||||
"Count": {
|
||||
"name": "Sweep X times",
|
||||
"help": "Sweep the selected stage for X times"
|
||||
}
|
||||
},
|
||||
"Gehenna": {
|
||||
"_info": {
|
||||
"name": "Gehenna",
|
||||
"help": ""
|
||||
},
|
||||
"Stage": {
|
||||
"name": "Select Stage",
|
||||
"help": "",
|
||||
"1": "01 - Gehenna A",
|
||||
"2": "02 - Gehenna B",
|
||||
"3": "03 - Gehenna C",
|
||||
"4": "04 - Gehenna D"
|
||||
},
|
||||
"Count": {
|
||||
"name": "Sweep X times",
|
||||
"help": "Sweep the selected stage for X times"
|
||||
}
|
||||
},
|
||||
"Millennium": {
|
||||
"_info": {
|
||||
"name": "Millennium",
|
||||
"help": ""
|
||||
},
|
||||
"Stage": {
|
||||
"name": "Select Stage",
|
||||
"help": "",
|
||||
"1": "01 - Millennium A",
|
||||
"2": "02 - Millennium B",
|
||||
"3": "03 - Millennium C",
|
||||
"4": "04 - Millennium D"
|
||||
},
|
||||
"Count": {
|
||||
"name": "Sweep X times",
|
||||
"help": "Sweep the selected stage for X times"
|
||||
}
|
||||
},
|
||||
"TacticalChallenge": {
|
||||
"_info": {
|
||||
"name": "Tactical Challenge Settings",
|
||||
@@ -314,15 +396,15 @@
|
||||
"help": ""
|
||||
},
|
||||
"BountyTicket": {
|
||||
"name": "Bounty Ticket",
|
||||
"name": "Bounty",
|
||||
"help": ""
|
||||
},
|
||||
"ScrimmageTicket": {
|
||||
"name": "Scrimmage Ticket",
|
||||
"name": "Scrimmage",
|
||||
"help": ""
|
||||
},
|
||||
"TacticalChallengeTicket": {
|
||||
"name": "Tactical Challenge Ticket",
|
||||
"name": "Tactical Challenge",
|
||||
"help": ""
|
||||
}
|
||||
},
|
||||
|
||||
@@ -31,7 +31,11 @@
|
||||
"help": "社团 / 小组"
|
||||
},
|
||||
"Bounty": {
|
||||
"name": "通缉悬赏",
|
||||
"name": "悬赏通缉",
|
||||
"help": ""
|
||||
},
|
||||
"Scrimmage": {
|
||||
"name": "学院交流会",
|
||||
"help": ""
|
||||
},
|
||||
"TacticalChallenge": {
|
||||
@@ -213,6 +217,18 @@
|
||||
"help": "仅支持日服\n自动切换第二咖啡厅进行互动点击"
|
||||
}
|
||||
},
|
||||
"Bounty": {
|
||||
"_info": {
|
||||
"name": "悬赏通缉设置",
|
||||
"help": ""
|
||||
},
|
||||
"OnError": {
|
||||
"name": "错误处理",
|
||||
"help": "当出现票券不足或设置有误等错误时,执行该操作",
|
||||
"stop": "停止脚本运行",
|
||||
"skip": "跳过当前任务"
|
||||
}
|
||||
},
|
||||
"Highway": {
|
||||
"_info": {
|
||||
"name": "高架公路",
|
||||
@@ -282,6 +298,72 @@
|
||||
"help": "扫荡所选择关卡 X 次"
|
||||
}
|
||||
},
|
||||
"Scrimmage": {
|
||||
"_info": {
|
||||
"name": "学院交流会设置",
|
||||
"help": ""
|
||||
},
|
||||
"OnError": {
|
||||
"name": "错误处理",
|
||||
"help": "当出现票券不足或设置有误等错误时,执行该操作",
|
||||
"stop": "停止脚本运行",
|
||||
"skip": "跳过当前任务"
|
||||
}
|
||||
},
|
||||
"Trinity": {
|
||||
"_info": {
|
||||
"name": "三一",
|
||||
"help": ""
|
||||
},
|
||||
"Stage": {
|
||||
"name": "选择关卡",
|
||||
"help": "",
|
||||
"1": "01 - 三一 A",
|
||||
"2": "02 - 三一 B",
|
||||
"3": "03 - 三一 C",
|
||||
"4": "04 - 三一 D"
|
||||
},
|
||||
"Count": {
|
||||
"name": "扫荡次数",
|
||||
"help": "扫荡所选择关卡 X 次"
|
||||
}
|
||||
},
|
||||
"Gehenna": {
|
||||
"_info": {
|
||||
"name": "格黑娜",
|
||||
"help": ""
|
||||
},
|
||||
"Stage": {
|
||||
"name": "选择关卡",
|
||||
"help": "",
|
||||
"1": "01 - 格黑娜 A",
|
||||
"2": "02 - 格黑娜 B",
|
||||
"3": "03 - 格黑娜 C",
|
||||
"4": "04 - 格黑娜 D"
|
||||
},
|
||||
"Count": {
|
||||
"name": "扫荡次数",
|
||||
"help": "扫荡所选择关卡 X 次"
|
||||
}
|
||||
},
|
||||
"Millennium": {
|
||||
"_info": {
|
||||
"name": "千年",
|
||||
"help": ""
|
||||
},
|
||||
"Stage": {
|
||||
"name": "选择关卡",
|
||||
"help": "",
|
||||
"1": "01 - 千年 A",
|
||||
"2": "02 - 千年 B",
|
||||
"3": "03 - 千年 C",
|
||||
"4": "04 - 千年 D"
|
||||
},
|
||||
"Count": {
|
||||
"name": "扫荡次数",
|
||||
"help": "扫荡所选择关卡 X 次"
|
||||
}
|
||||
},
|
||||
"TacticalChallenge": {
|
||||
"_info": {
|
||||
"name": "战术对抗赛设置",
|
||||
@@ -314,15 +396,15 @@
|
||||
"help": ""
|
||||
},
|
||||
"BountyTicket": {
|
||||
"name": "悬赏通缉票券",
|
||||
"name": "悬赏通缉",
|
||||
"help": ""
|
||||
},
|
||||
"ScrimmageTicket": {
|
||||
"name": "学院交流会票券",
|
||||
"name": "学院交流会",
|
||||
"help": ""
|
||||
},
|
||||
"TacticalChallengeTicket": {
|
||||
"name": "战术对抗赛票券",
|
||||
"name": "战术对抗赛",
|
||||
"help": ""
|
||||
}
|
||||
},
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from pponnxcr import TextSystem as TextSystem_
|
||||
|
||||
from module.base.decorator import cached_property
|
||||
from module.base.decorator import cached_property, del_cached_property
|
||||
from module.exception import ScriptError
|
||||
|
||||
DIC_LANG_TO_MODEL = {
|
||||
@@ -56,6 +56,12 @@ class OcrModel:
|
||||
except AttributeError:
|
||||
raise ScriptError(f'OCR model under lang "{lang}" does not exists')
|
||||
|
||||
def resource_release(self):
|
||||
del_cached_property(self, 'zhs')
|
||||
del_cached_property(self, 'en')
|
||||
del_cached_property(self, 'ja')
|
||||
del_cached_property(self, 'zht')
|
||||
|
||||
@cached_property
|
||||
def zhs(self):
|
||||
return TextSystem('zhs')
|
||||
|
||||
@@ -89,12 +89,15 @@ def readable_time(before: str) -> str:
|
||||
elif diff < 60:
|
||||
# < 1 min
|
||||
return t("Gui.Dashboard.JustNow")
|
||||
elif diff < 3600:
|
||||
elif diff < 5400:
|
||||
# < 90 min
|
||||
return t("Gui.Dashboard.MinutesAgo", time=int(diff // 60))
|
||||
elif diff < 86400:
|
||||
elif diff < 129600:
|
||||
# < 36 hours
|
||||
return t("Gui.Dashboard.HoursAgo", time=int(diff // 3600))
|
||||
elif diff < 1296000:
|
||||
# < 15 days
|
||||
return t("Gui.Dashboard.DaysAgo", time=int(diff // 86400))
|
||||
else:
|
||||
# > 15 days
|
||||
# >= 15 days
|
||||
return t("Gui.Dashboard.LongTimeAgo")
|
||||
|
||||
@@ -9,17 +9,17 @@ from queue import Queue
|
||||
from typing import Callable, Generator, List
|
||||
|
||||
import pywebio
|
||||
from module.config.utils import deep_iter
|
||||
from module.logger import logger
|
||||
from module.webui.setting import State
|
||||
from pywebio.input import PASSWORD, input
|
||||
from pywebio.output import PopupSize, popup, put_html, toast
|
||||
from pywebio.session import eval_js
|
||||
from pywebio.session import info as session_info
|
||||
from pywebio.session import register_thread, run_js
|
||||
from rich.console import Console, ConsoleOptions
|
||||
from rich.console import Console
|
||||
from rich.terminal_theme import TerminalTheme
|
||||
|
||||
from module.config.utils import deep_iter
|
||||
from module.logger import logger
|
||||
from module.webui.setting import State
|
||||
|
||||
RE_DATETIME = (
|
||||
r"\d{4}\-(0\d|1[0-2])\-([0-2]\d|[3][0-1]) "
|
||||
@@ -455,7 +455,11 @@ def get_localstorage(key):
|
||||
|
||||
def re_fullmatch(pattern, string):
|
||||
if pattern == "datetime":
|
||||
pattern = RE_DATETIME
|
||||
try:
|
||||
datetime.datetime.fromisoformat(string)
|
||||
return True
|
||||
except ValueError:
|
||||
return False
|
||||
# elif:
|
||||
return re.fullmatch(pattern=pattern, string=string)
|
||||
|
||||
|
||||
@@ -33,13 +33,20 @@ class Bounty(BountyUI):
|
||||
task = list(self.bounty_info)
|
||||
if not task:
|
||||
logger.warning('Bounty enabled but no task set')
|
||||
self.error_handler()
|
||||
return task
|
||||
|
||||
def error_handler(self):
|
||||
action = self.config.Bounty_OnError
|
||||
if action == 'stop':
|
||||
raise RequestHumanTakeover
|
||||
elif action == 'skip':
|
||||
self.config.task_delay(server_update=True)
|
||||
self.config.task_stop()
|
||||
return task
|
||||
|
||||
@property
|
||||
def is_ticket_enough(self) -> bool:
|
||||
return self.config.stored.BountyTicket.value >= self.current_count
|
||||
return self.current_ticket >= self.current_count
|
||||
|
||||
@property
|
||||
def current_bounty(self):
|
||||
@@ -53,25 +60,31 @@ class Bounty(BountyUI):
|
||||
def current_count(self):
|
||||
return self.task[0][3]
|
||||
|
||||
@property
|
||||
def current_ticket(self):
|
||||
return self.config.stored.BountyTicket.value
|
||||
|
||||
def handle_bounty(self, status):
|
||||
match status:
|
||||
case BountyStatus.OCR:
|
||||
if self.get_ticket():
|
||||
if self.current_ticket == 0 or not self.task:
|
||||
return BountyStatus.FINISH
|
||||
return BountyStatus.SELECT
|
||||
case BountyStatus.SELECT:
|
||||
if not self.is_ticket_enough:
|
||||
logger.warning('Bounty ticket not enough')
|
||||
raise RequestHumanTakeover
|
||||
self.error_handler()
|
||||
if self.select_bounty(*self.current_bounty):
|
||||
return BountyStatus.ENTER
|
||||
case BountyStatus.ENTER:
|
||||
if self.enter_stage(self.current_stage):
|
||||
return BountyStatus.SWEEP
|
||||
else:
|
||||
self.error_handler()
|
||||
case BountyStatus.SWEEP:
|
||||
if self.do_sweep(self.current_count):
|
||||
self.task.pop(0)
|
||||
if not self.task:
|
||||
return BountyStatus.FINISH
|
||||
return BountyStatus.END
|
||||
return BountyStatus.ENTER
|
||||
case BountyStatus.END:
|
||||
|
||||
@@ -22,7 +22,7 @@ class BountyUI(UI):
|
||||
return False
|
||||
|
||||
def enter_stage(self, index: int) -> bool:
|
||||
if BOUNTY_LIST.select_index_enter(index, self):
|
||||
if BOUNTY_LIST.select_index_enter(self, index):
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ from module.base.button import Button, ButtonWrapper
|
||||
CHECK_GEHENNA = ButtonWrapper(
|
||||
name='CHECK_GEHENNA',
|
||||
jp=Button(
|
||||
file='./assets/jp/school_exchange/CHECK_GEHENNA.png',
|
||||
file='./assets/jp/scrimmage/CHECK_GEHENNA.png',
|
||||
area=(109, 149, 195, 177),
|
||||
search=(89, 129, 215, 197),
|
||||
color=(201, 205, 206),
|
||||
@@ -17,7 +17,7 @@ CHECK_GEHENNA = ButtonWrapper(
|
||||
CHECK_MILLENNIUM = ButtonWrapper(
|
||||
name='CHECK_MILLENNIUM',
|
||||
jp=Button(
|
||||
file='./assets/jp/school_exchange/CHECK_MILLENNIUM.png',
|
||||
file='./assets/jp/scrimmage/CHECK_MILLENNIUM.png',
|
||||
area=(108, 148, 254, 178),
|
||||
search=(88, 128, 274, 198),
|
||||
color=(202, 206, 208),
|
||||
@@ -25,10 +25,21 @@ CHECK_MILLENNIUM = ButtonWrapper(
|
||||
),
|
||||
en=None,
|
||||
)
|
||||
CHECK_SCRIMMAGE = ButtonWrapper(
|
||||
name='CHECK_SCRIMMAGE',
|
||||
jp=Button(
|
||||
file='./assets/jp/scrimmage/CHECK_SCRIMMAGE.png',
|
||||
area=(651, 90, 889, 130),
|
||||
search=(631, 70, 909, 150),
|
||||
color=(96, 119, 144),
|
||||
button=(651, 90, 889, 130),
|
||||
),
|
||||
en=None,
|
||||
)
|
||||
CHECK_TRINITY = ButtonWrapper(
|
||||
name='CHECK_TRINITY',
|
||||
jp=Button(
|
||||
file='./assets/jp/school_exchange/CHECK_TRINITY.png',
|
||||
file='./assets/jp/scrimmage/CHECK_TRINITY.png',
|
||||
area=(115, 148, 250, 178),
|
||||
search=(95, 128, 270, 198),
|
||||
color=(204, 208, 210),
|
||||
@@ -36,10 +47,21 @@ CHECK_TRINITY = ButtonWrapper(
|
||||
),
|
||||
en=None,
|
||||
)
|
||||
OCR_TICKET = ButtonWrapper(
|
||||
name='OCR_TICKET',
|
||||
jp=Button(
|
||||
file='./assets/jp/scrimmage/OCR_TICKET.png',
|
||||
area=(195, 85, 235, 113),
|
||||
search=(175, 65, 255, 133),
|
||||
color=(206, 211, 215),
|
||||
button=(195, 85, 235, 113),
|
||||
),
|
||||
en=None,
|
||||
)
|
||||
SELECT_GEHENNA = ButtonWrapper(
|
||||
name='SELECT_GEHENNA',
|
||||
jp=Button(
|
||||
file='./assets/jp/school_exchange/SELECT_GEHENNA.png',
|
||||
file='./assets/jp/scrimmage/SELECT_GEHENNA.png',
|
||||
area=(1125, 275, 1224, 310),
|
||||
search=(1105, 255, 1244, 330),
|
||||
color=(207, 217, 225),
|
||||
@@ -50,7 +72,7 @@ SELECT_GEHENNA = ButtonWrapper(
|
||||
SELECT_MILLENNIUM = ButtonWrapper(
|
||||
name='SELECT_MILLENNIUM',
|
||||
jp=Button(
|
||||
file='./assets/jp/school_exchange/SELECT_MILLENNIUM.png',
|
||||
file='./assets/jp/scrimmage/SELECT_MILLENNIUM.png',
|
||||
area=(1069, 381, 1217, 417),
|
||||
search=(1049, 361, 1237, 437),
|
||||
color=(206, 214, 222),
|
||||
@@ -61,7 +83,7 @@ SELECT_MILLENNIUM = ButtonWrapper(
|
||||
SELECT_TRINITY = ButtonWrapper(
|
||||
name='SELECT_TRINITY',
|
||||
jp=Button(
|
||||
file='./assets/jp/school_exchange/SELECT_TRINITY.png',
|
||||
file='./assets/jp/scrimmage/SELECT_TRINITY.png',
|
||||
area=(1074, 165, 1221, 204),
|
||||
search=(1054, 145, 1241, 224),
|
||||
color=(213, 221, 228),
|
||||
@@ -0,0 +1,144 @@
|
||||
from enum import Enum
|
||||
|
||||
from module.base.timer import Timer
|
||||
from module.exception import RequestHumanTakeover
|
||||
from module.logger import logger
|
||||
from tasks.base.assets.assets_base_page import BACK
|
||||
from tasks.base.page import page_school_exchange
|
||||
from tasks.scrimmage.assets.assets_scrimmage import *
|
||||
from tasks.scrimmage.ui import ScrimmageUI
|
||||
|
||||
|
||||
class ScrimmageStatus(Enum):
|
||||
OCR = 0
|
||||
SELECT = 1
|
||||
ENTER = 2
|
||||
SWEEP = 3
|
||||
END = 4
|
||||
FINISH = 5
|
||||
|
||||
|
||||
class Scrimmage(ScrimmageUI):
|
||||
@property
|
||||
def scrimmage_info(self):
|
||||
bounty = (SELECT_TRINITY, SELECT_GEHENNA, SELECT_MILLENNIUM)
|
||||
check = (CHECK_TRINITY, CHECK_GEHENNA, CHECK_MILLENNIUM)
|
||||
stage = (self.config.Trinity_Stage, self.config.Gehenna_Stage, self.config.Millennium_Stage)
|
||||
count = (self.config.Trinity_Count, self.config.Gehenna_Count, self.config.Millennium_Count)
|
||||
ap = (10 if stage == 1 else 15 for stage in stage)
|
||||
info = zip(bounty, check, stage, count, ap)
|
||||
return filter(lambda x: x[3] > 0, info)
|
||||
|
||||
@property
|
||||
def valid_task(self) -> list:
|
||||
task = list(self.scrimmage_info)
|
||||
if not task:
|
||||
logger.warning('Scrimmage enabled but no task set')
|
||||
self.error_handler()
|
||||
return task
|
||||
|
||||
def error_handler(self):
|
||||
action = self.config.Bounty_OnError
|
||||
if action == 'stop':
|
||||
raise RequestHumanTakeover
|
||||
elif action == 'skip':
|
||||
self.config.task_delay(server_update=True)
|
||||
self.config.task_stop()
|
||||
|
||||
@property
|
||||
def is_ticket_enough(self) -> bool:
|
||||
return self.current_ticket >= self.current_count
|
||||
|
||||
@property
|
||||
def is_ap_enough(self) -> bool:
|
||||
return self.current_ap >= self.current_task_ap
|
||||
|
||||
@property
|
||||
def current_scrimmage(self):
|
||||
return self.task[0][:2]
|
||||
|
||||
@property
|
||||
def current_stage(self):
|
||||
return self.task[0][2]
|
||||
|
||||
@property
|
||||
def current_count(self):
|
||||
return self.task[0][3]
|
||||
|
||||
@property
|
||||
def current_task_ap(self):
|
||||
return self.task[0][4]
|
||||
|
||||
@property
|
||||
def current_ticket(self):
|
||||
return self.config.stored.ScrimmageTicket.value
|
||||
|
||||
@property
|
||||
def current_ap(self):
|
||||
return self.config.stored.AP.value
|
||||
|
||||
def update_ap(self):
|
||||
ap = self.config.stored.AP
|
||||
ap_old = ap.value
|
||||
ap_new = ap_old - self.current_task_ap
|
||||
ap.set(ap_new, ap.total)
|
||||
logger.info(f'Set AP: {ap_old} -> {ap_new}')
|
||||
|
||||
def handle_scrimmage(self, status):
|
||||
match status:
|
||||
case ScrimmageStatus.OCR:
|
||||
if self.get_ticket():
|
||||
if self.current_ticket == 0 or not self.task:
|
||||
return ScrimmageStatus.FINISH
|
||||
return ScrimmageStatus.SELECT
|
||||
case ScrimmageStatus.SELECT:
|
||||
if not self.is_ticket_enough:
|
||||
logger.warning('Scrimmage ticket not enough')
|
||||
self.error_handler()
|
||||
if not self.is_ap_enough:
|
||||
logger.warning('AP not enough')
|
||||
self.error_handler()
|
||||
if self.select_scrimmage(*self.current_scrimmage):
|
||||
return ScrimmageStatus.ENTER
|
||||
case ScrimmageStatus.ENTER:
|
||||
if self.enter_stage(self.current_stage):
|
||||
return ScrimmageStatus.SWEEP
|
||||
else:
|
||||
self.error_handler()
|
||||
case ScrimmageStatus.SWEEP:
|
||||
if self.do_sweep(self.current_count):
|
||||
self.update_ap()
|
||||
self.task.pop(0)
|
||||
return ScrimmageStatus.END
|
||||
return ScrimmageStatus.ENTER
|
||||
case ScrimmageStatus.END:
|
||||
if self.appear(CHECK_SCRIMMAGE):
|
||||
return ScrimmageStatus.OCR
|
||||
self.click_with_interval(BACK, interval=2)
|
||||
case ScrimmageStatus.FINISH:
|
||||
return status
|
||||
case _:
|
||||
logger.warning(f'Invalid status: {status}')
|
||||
return status
|
||||
|
||||
def run(self):
|
||||
self.ui_ensure(page_school_exchange)
|
||||
self.task = self.valid_task
|
||||
action_timer = Timer(0.5, 1)
|
||||
status = ScrimmageStatus.OCR
|
||||
|
||||
while 1:
|
||||
self.device.screenshot()
|
||||
|
||||
if self.ui_additional():
|
||||
continue
|
||||
|
||||
if action_timer.reached_and_reset():
|
||||
logger.attr('Status', status)
|
||||
status = self.handle_scrimmage(status)
|
||||
|
||||
if status == ScrimmageStatus.FINISH:
|
||||
break
|
||||
|
||||
self.config.task_delay(server_update=True)
|
||||
self.config.task_call('DataUpdate')
|
||||
@@ -0,0 +1,48 @@
|
||||
from module.base.timer import Timer
|
||||
from module.logger import logger
|
||||
from module.ocr.ocr import DigitCounter
|
||||
from tasks.base.ui import UI
|
||||
from tasks.scrimmage.assets.assets_scrimmage import *
|
||||
from tasks.stage.list import StageList
|
||||
from tasks.stage.sweep import StageSweep
|
||||
|
||||
SCRIMMAGE_LIST = StageList('ScrimmageList')
|
||||
SCRIMMAGE_SWEEP = StageSweep('ScrimmageSweep', 6)
|
||||
|
||||
|
||||
class ScrimmageUI(UI):
|
||||
def select_scrimmage(self, dest_enter: ButtonWrapper, dest_check: ButtonWrapper):
|
||||
timer = Timer(5, 10).start()
|
||||
while 1:
|
||||
self.device.screenshot()
|
||||
self.appear_then_click(dest_enter, interval=1)
|
||||
if self.appear(dest_check):
|
||||
return True
|
||||
if timer.reached():
|
||||
return False
|
||||
|
||||
def enter_stage(self, index: int) -> bool:
|
||||
if SCRIMMAGE_LIST.select_index_enter(self, index, insight=False):
|
||||
return True
|
||||
return False
|
||||
|
||||
def do_sweep(self, num: int) -> bool:
|
||||
if SCRIMMAGE_SWEEP.do_sweep(self, num=num):
|
||||
return True
|
||||
return False
|
||||
|
||||
def get_ticket(self):
|
||||
"""
|
||||
Page:
|
||||
in: page_bounty
|
||||
"""
|
||||
if not self.appear(CHECK_SCRIMMAGE):
|
||||
logger.warning('OCR failed due to invalid page')
|
||||
return False
|
||||
ticket, _, total = DigitCounter(OCR_TICKET).ocr_single_line(self.device.image)
|
||||
if total == 0:
|
||||
logger.warning('Invalid ticket')
|
||||
return False
|
||||
logger.attr('ScrimmageTicket', ticket)
|
||||
self.config.stored.ScrimmageTicket.set(ticket)
|
||||
return True
|
||||
@@ -148,33 +148,37 @@ class StageList:
|
||||
|
||||
def select_index_enter(
|
||||
self,
|
||||
index: int,
|
||||
main: ModuleBase,
|
||||
index: int,
|
||||
insight: bool = True,
|
||||
sweepable: bool = True,
|
||||
offset: tuple[int, int] = (-20, -15),
|
||||
skip_first_screenshot: bool = True,
|
||||
interval: int = 2
|
||||
interval: int = 1.5
|
||||
) -> bool:
|
||||
# insight index, if failed, return False
|
||||
if insight and not self.insight_index(index, main, skip_first_screenshot):
|
||||
return False
|
||||
logger.info(f'Select index: {index}')
|
||||
click_interval = Timer(interval)
|
||||
load_index_interval = Timer(1)
|
||||
timeout = Timer(15, 10).start()
|
||||
while 1:
|
||||
if skip_first_screenshot:
|
||||
skip_first_screenshot = False
|
||||
else:
|
||||
main.device.screenshot()
|
||||
|
||||
if load_index_interval.reached_and_reset():
|
||||
# load index if not insight
|
||||
if load_index_interval.reached_and_reset() and not insight:
|
||||
self.load_stage_indexes(main=main)
|
||||
|
||||
# find box of index
|
||||
index_box = next(filter(lambda x: int(x.ocr_text) == index, self.current_indexes), None)
|
||||
|
||||
if index_box is None:
|
||||
logger.warning(f'No index {index} in {self.index_ocr.name}')
|
||||
return False
|
||||
continue
|
||||
|
||||
stage_item_box = area_pad((*offset, *area_size(self.stage_item)))
|
||||
search_box = area_offset(stage_item_box, index_box.box[:2])
|
||||
@@ -188,7 +192,7 @@ class StageList:
|
||||
|
||||
if not points:
|
||||
logger.warning(f'No clickable {self.enter.name}')
|
||||
return False
|
||||
continue
|
||||
|
||||
point = area_offset((0, 0, *area_size(self.enter.button)), points[0])
|
||||
click_button = ClickButton(area_offset(point, search_box[:2]), name=self.enter.name)
|
||||
@@ -196,3 +200,7 @@ class StageList:
|
||||
if click_interval.reached_and_reset():
|
||||
main.device.click(click_button)
|
||||
return True
|
||||
|
||||
if timeout.reached():
|
||||
logger.warning(f'{self.enter.name} failed')
|
||||
return False
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
from enum import Enum
|
||||
|
||||
from module.base.base import ModuleBase
|
||||
from module.base.timer import Timer
|
||||
from module.logger import logger
|
||||
from module.ocr.ocr import Digit
|
||||
from enum import Enum
|
||||
from tasks.stage.assets.assets_stage_sweep import *
|
||||
|
||||
|
||||
@@ -123,7 +124,7 @@ class StageSweep:
|
||||
main.device.screenshot()
|
||||
if not timer.reached_and_reset():
|
||||
continue
|
||||
ocr_result = self.num.detect_and_ocr(main.device.image)
|
||||
ocr_result = list(filter(lambda x: x.ocr_text.isdigit(), self.num.detect_and_ocr(main.device.image)))
|
||||
if not ocr_result:
|
||||
logger.warning(f'No valid num in {self.num.name}')
|
||||
continue
|
||||
|
||||
@@ -3,15 +3,9 @@ from enum import Enum
|
||||
|
||||
from module.base.timer import Timer
|
||||
from module.logger import logger
|
||||
from module.ocr.ocr import DigitCounter
|
||||
from module.ui.switch import Switch
|
||||
from tasks.base.page import page_tactical_challenge
|
||||
from tasks.base.ui import UI
|
||||
from tasks.tactical_challenge.assets.assets_tactical_challenge import *
|
||||
|
||||
SWITCH_SKIP = Switch('Skip_switch')
|
||||
SWITCH_SKIP.add_state('on', SKIP_ON)
|
||||
SWITCH_SKIP.add_state('off', SKIP_OFF)
|
||||
from tasks.tactical_challenge.ui import TacticalChallengeUI
|
||||
|
||||
|
||||
class TCStatus(Enum):
|
||||
@@ -31,50 +25,12 @@ class TCStatus(Enum):
|
||||
FINISHED = -1
|
||||
|
||||
|
||||
class TacticalChallenge(UI):
|
||||
class TacticalChallenge(TacticalChallengeUI):
|
||||
select_players = (PLAYER_SELECT_FIRST, PLAYER_SELECT_SECOND, PLAYER_SELECT_THIRD)
|
||||
|
||||
def _get_ticket(self):
|
||||
"""
|
||||
Page:
|
||||
in: page_tactical_challenge
|
||||
"""
|
||||
ocr = DigitCounter(OCR_TICKET).ocr_single_line(self.device.image)
|
||||
# number of tickets remaining
|
||||
ticket, _, total = ocr
|
||||
if total == 0:
|
||||
logger.warning('Invalid ticket')
|
||||
return False, 5
|
||||
logger.attr('Ticket', ticket)
|
||||
|
||||
return True, ticket
|
||||
|
||||
def _get_reward(self):
|
||||
if self.match_color(GET_REWARD_DAILY):
|
||||
self.device.click(GET_REWARD_DAILY)
|
||||
logger.info('Get tc daily reward')
|
||||
return True
|
||||
if self.match_color(GET_REWARD_CREDIT):
|
||||
self.device.click(GET_REWARD_CREDIT)
|
||||
logger.info('Get tc credit reward')
|
||||
return True
|
||||
if self.match_color(GOT_REWARD_DAILY) and self.match_color(GOT_REWARD_CREDIT):
|
||||
logger.info('Both tc reward got')
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
def _set_skip(self):
|
||||
"""
|
||||
Set skip switch to on
|
||||
:returns: True if switch is set, False if switch not found
|
||||
"""
|
||||
if not SWITCH_SKIP.appear(main=self):
|
||||
logger.info('Skip switch not found')
|
||||
return False
|
||||
SWITCH_SKIP.set('on', main=self)
|
||||
|
||||
return True
|
||||
@property
|
||||
def current_ticket(self):
|
||||
return self.config.stored.TacticalChallengeTicket.value
|
||||
|
||||
def _player_select(self, select):
|
||||
if select:
|
||||
@@ -85,15 +41,13 @@ class TacticalChallenge(UI):
|
||||
def _handle_challenge(self, status):
|
||||
match status:
|
||||
case TCStatus.REWARD:
|
||||
if self._get_reward():
|
||||
if self.get_reward():
|
||||
return TCStatus.OCR
|
||||
case TCStatus.OCR:
|
||||
is_valid, ticket = self._get_ticket()
|
||||
if not is_valid:
|
||||
return status
|
||||
if ticket == 0:
|
||||
return TCStatus.FINISHED
|
||||
return TCStatus.SELECT
|
||||
if self.get_ticket():
|
||||
if self.current_ticket == 0:
|
||||
return TCStatus.FINISHED
|
||||
return TCStatus.SELECT
|
||||
case TCStatus.SELECT:
|
||||
self.appear_then_click(self.select)
|
||||
if self.appear(PREPARE_CHALLENGE):
|
||||
@@ -103,7 +57,7 @@ class TacticalChallenge(UI):
|
||||
if not self.appear(PREPARE_CHALLENGE):
|
||||
return TCStatus.SKIP
|
||||
case TCStatus.SKIP:
|
||||
if not self._set_skip():
|
||||
if not self.set_skip():
|
||||
return TCStatus.SKIP
|
||||
return TCStatus.START
|
||||
case TCStatus.START:
|
||||
@@ -118,12 +72,10 @@ class TacticalChallenge(UI):
|
||||
case TCStatus.WIN | TCStatus.LOSE:
|
||||
if self.appear_then_click(CHALLENGE_WIN) or self.appear_then_click(CHALLENGE_LOSE):
|
||||
return status
|
||||
is_valid, ticket = self._get_ticket()
|
||||
if not is_valid:
|
||||
return status
|
||||
if ticket == 0:
|
||||
return TCStatus.FINISHED
|
||||
return TCStatus.FINAL
|
||||
if self.get_ticket():
|
||||
if self.current_ticket == 0:
|
||||
return TCStatus.FINISHED
|
||||
return TCStatus.FINAL
|
||||
case TCStatus.FINAL | TCStatus.FINISHED:
|
||||
return status
|
||||
case _:
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
from module.base.timer import Timer
|
||||
from module.logger import logger
|
||||
from module.ocr.ocr import DigitCounter
|
||||
from module.ui.switch import Switch
|
||||
from tasks.base.ui import UI
|
||||
from tasks.tactical_challenge.assets.assets_tactical_challenge import *
|
||||
|
||||
SWITCH_SKIP = Switch('Skip_switch')
|
||||
SWITCH_SKIP.add_state('on', SKIP_ON)
|
||||
SWITCH_SKIP.add_state('off', SKIP_OFF)
|
||||
|
||||
|
||||
class TacticalChallengeUI(UI):
|
||||
def get_ticket(self):
|
||||
"""
|
||||
Page:
|
||||
in: page_tactical_challenge
|
||||
"""
|
||||
ticket, _, total = DigitCounter(OCR_TICKET).ocr_single_line(self.device.image)
|
||||
if total == 0:
|
||||
logger.warning('Invalid ticket')
|
||||
return False
|
||||
logger.attr('TacticalChallengeTicket', ticket)
|
||||
self.config.stored.TacticalChallengeTicket.set(ticket)
|
||||
return True
|
||||
|
||||
def get_reward(self):
|
||||
timer = Timer(10, 10).start()
|
||||
while 1:
|
||||
self.device.screenshot()
|
||||
self.ui_additional()
|
||||
if self.match_color(GOT_REWARD_DAILY) and self.match_color(GOT_REWARD_CREDIT):
|
||||
return True
|
||||
if self.match_color(GET_REWARD_DAILY):
|
||||
self.device.click(GET_REWARD_DAILY)
|
||||
logger.info('Get daily reward')
|
||||
if self.match_color(GET_REWARD_CREDIT):
|
||||
self.device.click(GET_REWARD_CREDIT)
|
||||
logger.info('Get credit reward')
|
||||
if timer.reached():
|
||||
return False
|
||||
|
||||
def set_skip(self):
|
||||
"""
|
||||
Set skip switch to on
|
||||
Returns:
|
||||
True if switch is set, False if switch not found
|
||||
"""
|
||||
if not SWITCH_SKIP.appear(main=self):
|
||||
logger.info('Skip switch not found')
|
||||
return False
|
||||
SWITCH_SKIP.set('on', main=self)
|
||||
|
||||
return True
|
||||