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

26 Commits

Author SHA1 Message Date
LA_DI_DA
573210af2b Merge branch 'refs/heads/lme-alas/master' into dev
# Conflicts:
#	alas.py
#	module/os/fleet.py
2024-06-22 20:31:35 +08:00
LmeSzinc
eada57f97d Pref: Reduce CPU usage during auto search daemon 2024-06-05 01:15:42 +08:00
Zuosizhu
69aebdcf30 Merge branch 'master_lme'
# Conflicts:
#	config/template.json
#	deploy/Windows/app.py
#	deploy/Windows/config.py
#	deploy/Windows/emulator.py
#	deploy/Windows/git.py
#	deploy/Windows/logger.py
#	deploy/Windows/template.yaml
#	module/campaign/gems_farming.py
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/device/device.py
#	module/device/emulator.py
#	module/device/method/droidcast.py
#	module/device/platform/emulator_base.py
#	module/device/platform/emulator_windows.py
#	module/device/platform/platform_windows.py
#	module/handler/auto_search.py
2024-04-10 12:22:40 +08:00
guoh064
b81818f030 Opt: load offsets of auto search settings at fleet preparation stage (#3612) 2024-04-08 22:47:44 +08:00
Zuosizhu
9dd7d5b2b6 Add: Campaign_15
Adj: GemsFarming return to 15-1 if gg_on
2024-01-27 00:32:31 +08:00
LmeSzinc
e8340df57c Upd: [EN] _fleet_sidebar 2023-10-20 01:11:59 +08:00
LmeSzinc
ce13aaa8b7 Upd: [CN] _fleet_sidebar 2023-10-19 22:30:06 +08:00
LmeSzinc
4969dc01b0 Upd: [CN] Fleet preparation 2023-10-19 22:02:24 +08:00
LmeSzinc
cb31947881 Fix: Larger _auto_search_menu_offset when MULTIPLE_SORTIE appears 2023-09-14 22:44:28 +08:00
LmeSzinc
65f166ad12 Refactor: Use numpy image cache instead of pillow image 2022-01-23 23:03:55 +08:00
lonelyzerg
e047031887 Change sub_auto_summon to sub_auto_call, add en and tw translation 2021-11-06 08:54:06 -05:00
lonelyzerg
dea996596d Add translation for subs, modified logging for auto search selction 2021-11-06 06:56:31 -05:00
lonelyzerg
5b444b73a6 Add Submarine Auto Search Selection 2021-11-06 06:35:13 -05:00
LmeSzinc
3249190d61 Opt: Longer wait on stage bonus drops, still a poor implementation 2021-10-25 17:49:49 +08:00
LmeSzinc
6a4064e57f Merge branch 'master' into app
# Conflicts:
#	module/config/event.py
2021-10-14 22:07:50 +08:00
LmeSzinc
21c25ebf3e Fix: Retry selecting auto search options if it's not loaded that fast 2021-10-14 21:56:57 +08:00
LmeSzinc
15d1aae6b3 Opt: Wait campaign bonus show up 2021-10-14 20:48:35 +08:00
LmeSzinc
fe99f712b2 Upd: Campaign bonus drop screenshots 2021-10-14 17:51:36 +08:00
LmeSzinc
5931c01a49 Merge branch 'master' into gems_farming 2021-07-10 15:47:33 +08:00
LmeSzinc
f1d8f4fba3 Fix: Handle button moving in auto search menu 2021-07-10 11:38:27 +08:00
LmeSzinc
e6facc606a Opt: Cache ButtonGrid.buttons and add move() crop() 2021-06-29 23:04:19 +08:00
LmeSzinc
7ba14590a6 Fix: UI changes in fleet preparation
EN, JP, TW need to update assets except *_IN_USE and check _fleet_sidebar
2021-06-10 16:07:32 +08:00
noname94
d37041ee6e Add: [JP] assets for guild and OS
GUILD_BOSS_ENTER and GUILD_OPERATIONS_JOIN still missing.
Also fixed map name detection in OS and _fleet_sidebar of auto search.
2021-02-10 18:38:20 +09:00
LmeSzinc
8e84099073 Fix: [EN] Fleet side bar server difference 2021-01-28 12:27:00 +08:00
LmeSzinc
5ac50e6910 Add: Support auto search 2021-01-28 00:35:15 +08:00
LmeSzinc
8e9e62bb27 Add: Entrance of auto search, but not fully supported yet
- Add: Option ENABLE_FLEET_REVERSE_IN_HARD
2021-01-22 23:50:44 +08:00