1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-16 04:49:29 +08:00
Commit Graph

470 Commits

Author SHA1 Message Date
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
LmeSzinc
b181669c57 Fix: Handle action point popup during globe_update() 2024-04-03 23:53:24 +08:00
Zuosizhu
b6e6f60754 Merge branch 'LmeSzinc:master' into 20230309 2024-03-29 07:09:29 +08:00
LmeSzinc
ceca042afc Fix: [CN][JP] Handle bugged AUTO_SEARCH_OS_MAP_OPTION_OFF button
- TODO: [EN][TW] Update AUTO_SEARCH_OS_MAP_OPTION_OFF_DISABLED
2024-03-21 18:35:48 +08:00
LmeSzinc
c5fb5a57c5 Revert "Fix: Handle bugged AP button before game devs get it fixed"
This reverts commit b615ebf3
2024-02-22 21:00:52 +08:00
LmeSzinc
b615ebf3cf Fix: Handle bugged AP button before game devs get it fixed 2024-02-22 16:36:32 +08:00
Zuosizhu
79956f8b66 Merge branch 'master_lme' 2024-01-11 16:59:27 +08:00
LmeSzinc
8b871e8c30 Fix: Don't click MAINTENANCE_ANNOUNCE while interrupting auto search 2024-01-11 10:50:41 +08:00
Zuosizhu
526d26e6c6 Merge branch 'LmeSzinc:master' into 20230309 2023-10-19 22:53:32 +08:00
LmeSzinc
1c06c5e2b0 Fix: [EN] Missing letter "N" in NA Ocean * zones 2023-10-14 21:54:12 +08:00
Zuosizhu
07d5a9e79f Merge branch 'LmeSzinc:master' into 20230309 2023-09-16 07:53:31 +08:00
LmeSzinc
f68406f990 Fix: Disable STORY_ALLOW_SKIP in OpSi 2023-09-15 21:46:57 +08:00
Zuosizhu
f8a35cec1c Merge branch 'master_lme'
# Conflicts:
#	README.md
2023-09-11 08:16:09 +08:00
LmeSzinc
da02fd6066 Fix: Trying to fix story skip bug on game client 2023-09-10 16:20:39 +08:00
LmeSzinc
dd4cc0ea32 Fix: Skip stories in FleetSelector.open() (#3104) 2023-09-10 15:27:07 +08:00
Zuosizhu
11dc3471aa Merge branch 'LmeSzinc:master' into 20230309 2023-09-03 09:53:28 +08:00
LmeSzinc
b6e66b4a17 Fix: handle_fleet_emp_debuff in port (#3076) 2023-09-02 23:58:56 +08:00
Zuosizhu
ec48411c88 Merge branch 'LmeSzinc:master' into 20230309 2023-08-23 19:04:03 +08:00
LmeSzinc
2aff41a96b Fix: Use the fleet of OpsiDaily in cross month daily 2023-08-19 22:27:16 +08:00
Zuosizhu
b34d2afc1a Merge branch 'LmeSzinc:master' into 20230309 2023-06-30 19:51:52 +08:00
guoh064
4c48b019bc Add: continue cl1 if enabled after meowfficerfarming finished. (#2805) 2023-06-28 23:14:16 +08:00
Zuosizhu
fbcb8f5292 Merge branch 'LmeSzinc:master' into 20230309 2023-06-18 03:01:08 +08:00
guoh064
b929afeeea Opt: print loading only once in interrupting_auto_search (#2764)
* Opt: print loading only once in interrupting_auto_search

* Fix: status of is_loading after executed
2023-06-15 22:08:49 +08:00
Zuosizhu
8b8d8c9b67 Merge branch 'LmeSzinc:master' into 20230309 2023-06-14 22:05:37 +08:00
LmeSzinc
4f793e9001 Fix: Add minimum swipe distance in OpSi globe map 2023-06-11 19:09:08 +08:00
Zuosizhu
b308b65cde Merge branch 'LmeSzinc:master' into 20230309 2023-06-02 03:55:50 +08:00
LmeSzinc
a6bb4ba7f8 Fix: Handle map order during OpSi walk 2023-05-30 23:47:05 +08:00
Zuosizhu
0aeed89b72 Merge branch 'LmeSzinc:master' into 20230309 2023-05-30 12:31:00 +08:00
LmeSzinc
18cba1f9d0 Chore: Remove the use of np.int 2023-05-30 10:28:51 +08:00
SarContDeli
c5b126a3c9 Fix: ActionPointPreserve reset by error (#2665) 2023-05-30 09:19:45 +08:00
LmeSzinc
8e1a685f4b Fix: Remove nonsense multiplier 2023-05-30 09:19:13 +08:00
guoh064
9569435e58 Fix: result of map_rescan_current passed wrongly (#2657)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2023-05-28 19:54:22 +08:00
LmeSzinc
5fece23f34 Upd: Magic map swipe multipliers in OpSi 2023-05-28 18:03:17 +08:00
Zuosizhu
987423a96f Merge branch 'LmeSzinc:master' into 20230309 2023-05-27 20:30:22 +08:00
LmeSzinc
e420f4ed04 Upd: Magic map swipe multipliers 2023-05-26 03:01:09 +08:00
Zuosizhu
72e5e200ed Merge branch 'master_lme'
# Conflicts:
#	README.md
2023-05-26 00:26:23 +08:00
LmeSzinc
6487e460fa Fix: Re-fit OpSi globe swipes 2023-05-25 22:32:45 +08:00
Zuosizhu
dba6d7e4e4 Merge branch 'LmeSzinc:master' into 20230309 2023-05-25 13:54:56 +08:00
guoh064
7f8769cda8 Fix: scanning tower skip should only operate in cl1 zones. (#2609)
* Fix: scanning tower skip should only operate in cl1 zones.

* Fix: Change condition to is_in_task_cl1_leveling
2023-05-23 23:50:01 +08:00
guoh064
8610c5492b Fix: check rest ap condition when cl1 cannot run (#2586)
Co-authored-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
2023-05-21 21:36:06 +08:00
Zuosizhu
4d1fd01511 Merge branch 'master_lme'
# Conflicts:
#	assets/jp/gacha/BUILD_CUBE_COUNT.png
#	module/campaign/run.py
#	module/gacha/assets.py
2023-05-15 17:22:33 +08:00
LmeSzinc
dcfcd66dc3 Fix: Random loading screen hit EXP_INFO_C (#2567) 2023-05-12 22:10:50 +08:00
LmeSzinc
0a0c0ffc20 Fix: port_goto() loops between NY City and Gibraltar 2023-05-07 21:10:36 +08:00
Zuosizhu
18b824d3ba Merge branch 'LmeSzinc:master' into 20230309 2023-04-27 15:24:49 +08:00
guoh064
5024454b42 Fix: [JP] Opsi ocr fix (#2521)
* Opt: abspath in appdir of uiautomator2 cache

* Fix: [JP] Opsi port ocr hotfix

Fix wrong ocr of port Taranto from 'タフント' to 'タラント'.

---------

Co-authored-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
2023-04-27 12:25:42 +08:00
Zuosizhu
ee1ba9777e Merge branch 'LmeSzinc:master' into 20230309 2023-04-25 00:05:26 +08:00
LmeSzinc
ccf1464756 Fix: Handle port in os_map_goto_globe() 2023-04-22 00:16:00 +08:00
Zuosizhu
fa276716d1 Merge branch 'master_lme'
# Conflicts:
#	alas.py
2023-04-20 01:25:28 +08:00
LmeSzinc
2147059858 Opt: Rescan current map first perform full scan then 2023-04-19 22:24:08 +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