1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 14:39:25 +08:00
Commit Graph

18 Commits

Author SHA1 Message Date
LA_DI_DA
a2e6986dcd Merge branch 'refs/heads/LmeSzinc/master' into dev
# Conflicts:
#	module/campaign/campaign_status.py
#	module/exercise/combat.py
#	module/retire/dock.py
#	module/retire/enhancement.py
2024-10-25 12:01:29 +08:00
LmeSzinc
32f118f653 Upd: Exercise HP daemon on new battle UI theme
Signed-off-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
2024-09-25 14:27:49 +08:00
LA_DI_DA
15dbb46cc3 Merge branch 'refs/heads/LmeSzinc/master' into dev
# Conflicts:
#	module/config/argument/args.json
#	module/exercise/combat.py
#	module/os/map.py
2024-09-15 18:06:15 +08:00
LmeSzinc
d1eeb02bd2 Add: Support Battle UI theme 2024-09-15 04:34:14 +08:00
LA_DI_DA
0101eaf3e3 fix: Adapt to new APIs from upstream
# fuck LmeSzinc/AzurLaneAutoScript#3556
# fuck @Air111
2024-05-19 19:59:03 +08:00
Air111
2507b0fa6b Upd: Flagship changing (#3556)
* Upd: Flagship changing asset

* Upd: Equipment enter

* Upd: Fleet detail check

* Refactor: equipment changing

* Upd: asset exercise/EQUIP_ENTER

* Refactor: rename equipment functions

* Fix: avoid GameTooManyClickError when EQUIPMENT_SCROLL disappears

* Upd: [CN] assets EQUIP_1/2/3

* Fix: skip first screenshot in equipment.py
2024-04-19 01:40:40 +08:00
Zuosizhu
72e5e200ed Merge branch 'master_lme'
# Conflicts:
#	README.md
2023-05-26 00:26:23 +08:00
LmeSzinc
c6df09e170 Upd: EXP_INFO_* and the exercise one 2023-05-25 21:45:19 +08:00
Zuosizhu
cacc828f08 Merge branch 'master_lme'
# Conflicts:
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/exercise/assets.py
#	module/exercise/exercise.py
2023-04-12 15:25:30 +08:00
guoh064
74c67976cc Del: Unused asset OCR_PERIOD_DAY 2023-04-05 12:29:21 +08:00
guoh064
956543672c New: Asset for exercise period ocr 2023-03-30 21:32:31 +08:00
guoh064
d69af8955f Opt: Clear exercise attempts after final recovery 2023-03-30 20:47:38 +08:00
Zuosizhu
5c00ce0d4f Fix: lost asset for OCR_EXERCISE_TIME_REMAIN 2023-03-08 23:39:46 +08:00
LmeSzinc
3a91da8ca6 Fix: Avoid entering shop after exercise (#272) 2020-12-23 16:35:20 +08:00
LmeSzinc
7d1e52b252 Fix: [CN][EN] HP area in exercise 2020-09-07 22:26:56 +08:00
noname94
ec8a0816a4 Fix: HP areas of exercise 2020-09-07 22:50:19 +09:00
LmeSzinc
e690be1c85 Fix: OCR in exercises
- Fix digit ocr when detecting empty image
2020-07-15 04:33:39 +08:00
LmeSzinc
2f1f999ce5 Add: multi-server support 2020-05-25 22:05:42 +08:00