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

461 Commits

Author SHA1 Message Date
xhqss
0339fe9dcc Merge branch 'master_lme' into dev
# Conflicts:
#	module/event_hospital/assets.py
2025-05-25 15:18:10 +08:00
LmeSzinc
1bbd26c2b4 Fix: Inconsistent map_allow_submarine after choosing fleet_2 (#4824) 2025-05-24 00:29:03 +08:00
ZuoSiZhu
dee0c1484f Merge branch 'master_lme' into dev
# Conflicts:
#	campaign/Readme.md
#	module/base/utils.py
#	module/coalition/assets.py
#	module/config/argument/args.json
#	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/handler/login.py
#	module/retire/dock.py
#	module/retire/enhancement.py
#	module/shop/shop_reward.py
2025-05-21 04:17:08 +08:00
LmeSzinc
3c5eea5fb0 Fix: Keep untracked enemies if MAP_HAS_MOVABLE_NORMAL_ENEMY 2025-05-21 01:48:29 +08:00
LmeSzinc
c8b6f11382 Fix: When handing GAME_TIPS in perspective error it should check app_is_running 2025-05-11 18:28:45 +08:00
ZuoSiZhu
166b49f8f0 Merge branch 'master_lme' into dev
# Conflicts:
#	alas.py
#	module/config/config_manual.py
#	module/ui/page.py
#	module/ui/ui.py
2025-03-28 08:34:41 +08:00
ZuoSiZhu
58a217d98f Merge branch 'master_lme' into dev
# Conflicts:
#	module/webui/app.py
#	module/webui/config.py
2025-03-28 00:23:16 +08:00
LmeSzinc
34e22491f8 Add: Fleet recommend 2025-03-28 00:19:33 +08:00
LmeSzinc
a55d7504f7 Fix: Override to disable submarine if stage don't allow submarine (#4668) 2025-03-20 18:06:22 +08:00
xhqss
baa8d2ccd7 Merge branch 'master_lme'
# Conflicts:
#	README.md
#	module/ui_white/assets.py
2025-01-19 15:59:20 +08:00
LmeSzinc
22fedfefab Chore: Comments in catch_camera_repositioning 2025-01-17 12:37:49 +08:00
xhqss
e7f93d8efe Merge branch 'master_lme'
# Conflicts:
#	module/equipment/equipment.py
2024-12-20 23:51:48 +08:00
LmeSzinc
ba5b853cb9 Refactor: Standardize the use of match_template_color() 2024-12-09 16:09:34 +08:00
LA_DI_DA
02fec1598d Merge branch 'refs/heads/LmeSzinc/master' into dev 2024-08-31 11:05:57 +08:00
LmeSzinc
782c8d0752 Opt: Skip waiting map clear percentage in SP 2024-08-30 23:04:36 +08:00
LmeSzinc
80baf3ee0c Opt: Ignore enemy filter if MAP_HAS_MOVABLE_NORMAL_ENEMY (#4095) 2024-08-20 02:19:52 +08:00
LmeSzinc
edbbc7b8cb Fix: Avoid turning_optimize in event maps 2024-08-20 02:14:00 +08:00
LA_DI_DA
89be3580ec Merge branch 'refs/heads/LmeSzinc/master' into dev
# Conflicts:
#	module/ui/page.py
2024-08-17 21:48:52 +08:00
LmeSzinc
95eb23de32 Opt: Show Map_clear_percentage as percentage instead of full float 2024-08-17 00:29:55 +08:00
Zuosizhu
1d85336ba4 Merge remote-tracking branch 'refs/remotes/Lme/master' into dev
# Conflicts:
#	module/device/method/adb.py
#	module/device/screenshot.py
2024-07-26 08:04:44 +08:00
LmeSzinc
5e05db05d0 Add: Switch mode in map preparation 2024-07-26 02:20:15 +08:00
Zuosizhu
1e31cb6de5 Merge branch 'master_lme' into AlasGGdev
# Conflicts:
#	module/campaign/gems_farming.py
#	module/coalition/coalition.py
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/os/operation_siren.py
#	module/os_handler/os_status.py
2024-06-28 16:01:16 +08:00
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
霞飛
0b97b40c46 Feature: New OpsiShop. (#3086)
* feat: New OpsiShop

* fix: use AdaptiveScroll

* feat: scan counter

* perf: calculate y value
2024-06-17 11:24:40 +08:00
LmeSzinc
58202c6a40 Pref: Reuse image array to improve memory performance 2024-06-05 01:15:41 +08:00
xhqss
c0c4913353 Merge branch '20230309' into smallkai
# Conflicts:
#	module/config/i18n/zh-CN.json
2024-05-23 08:25:21 +08:00
Zuosizhu
ddcfbb0a97 Merge branch 'master_lme'
# Conflicts:
#	README.md
#	deploy/adb.py
#	deploy/pip.py
#	module/daily/equipment.py
2024-05-23 02:31:29 +08:00
LmeSzinc
ecfd5d50bf Upd: [CN] Support UI in 2024.05.21 2024-05-23 01:16:41 +08:00
LmeSzinc
65fe0c1ebd Fix: center_offset hasn't been calculated if map detection failed 2024-05-19 23:06:52 +08:00
Zuosizhu
af1f0a9056 Merge branch 'LmeSzinc:master' into 20230309 2024-05-03 12:58:36 +08:00
LmeSzinc
499639f657 Fix: Predict swipe end 2024-04-30 17:42:56 +08:00
Zuosizhu
77e7276902 Merge branch 'lme_master'
# Conflicts:
#	module/equipment/equipment_change.py
2024-04-30 11:12:03 +08:00
LmeSzinc
cdcdd16118 Fix: info_bar covers map clear percentage 2024-04-28 16:32:18 +08:00
LA_DI_DA
7b81250ec9 Merge branch 'zuosizhu-alas/20230309' into smallkai
# Conflicts:
#	campaign/Readme.md
#	module/config/argument/args.json
2024-04-27 15:56:34 +08:00
Zuosizhu
8fd3c7eedd Merge branch 'master_lme_to_merge'
# Conflicts:
#	assets/cn/equipment/FLEET_DETAIL_CHECK.png
#	assets/en/equipment/FLEET_DETAIL_CHECK.png
#	assets/jp/equipment/FLEET_DETAIL_CHECK.png
#	assets/tw/equipment/FLEET_DETAIL_CHECK.png
#	deploy/docker/requirements.txt
#	deploy/git.py
#	module/campaign/gems_farming.py
#	module/equipment/assets.py
#	module/equipment/equipment_change.py
#	requirements-in.txt
#	requirements.txt
2024-04-27 13:00:39 +08:00
LmeSzinc
cba28a8aac Fix: Full scan wasn't early stopped cuz mixed use of siren and boss 2024-04-26 13:37:25 +08:00
Zuosizhu
bdc7d43c97 Merge branch 'dev-revert-gemsfarming'
# Conflicts:
#	assets/cn/handler/MOB_MOVE_CANCEL.png
#	module/device/method/utils.py
#	module/handler/fast_forward.py
2024-04-20 15:16:09 +08:00
LmeSzinc
d512c4dadf Opt: Remove meaningless sleep from stone age 2024-04-20 02:50:12 +08:00
Zuosizhu
0b2f9ed81c Merge branch 'dev'
# Conflicts:
#	campaign/campaign_main/campaign_15_1.py
#	campaign/campaign_main/campaign_15_2.py
#	campaign/campaign_main/campaign_15_3.py
#	campaign/campaign_main/campaign_15_4.py
2024-04-19 02:17:51 +08:00
guoh064
27693a6762 Add: 15图开荒/周回 (#3563)
* Add: W15 maps extracted

* Add: template for Special Carrier in W15

* Add: method mob_move

* Fix: MapDetectionError in strategy mob move

* Fix: adjacent grid judge condition

* Fix: should focus on location before moving

* Fix: should update view before further operation

* Fix: wait for STRATEGY_OPENED after executing mob move

* Fix: offset for assets in _mob_move()

* Opt: judge if movable before moving camera

* Add: W15 mechanism

* Opt: Rename Special Carrier asset name

* Fix: offset for MOB_MOVE_1/MOB_MOVE_2

* Fix: separate MOB_MOVE_1 and MOB_MOVE_2

* Fix: should use appear_then_click in strategy_mob_move_enter

* Fix: function import in campaign_15_base.py

* Fix: missing assets import

* Fix: missing offset in strategy_mob_move_cancel()

* Fix: should move only once in a campaign

* Temp: modify special carrier filter string to 3E

* Fix: missing self. before 'moved' variable

* Revert "Fix: missing self. before 'moved' variable"

This reverts commit 00f70e0ab55e422898cb90c5d5e54d4e7c989511.

* Revert "Fix: should move only once in a campaign"

This reverts commit b588f5bb07dfc4511f39fa0797fbe160f356d604.

* Fix: force goto special carrier

* Fix: missing return True in battle function

* Fix: enlarge offset of MOB_MOVE_ICON

* Fix: typo in campaing_15_3

* Fix: update view after moving mob

* Fix: should use full_scan_movable since mob moved

* Fix: missing map_data_init() in campaign_15_4.py

* Fix: battle 4 should be done by mob fleet

* Revert "Fix: battle 4 should be done by mob fleet"

This reverts commit 0e2af1ec817b7bc89fe123f03a33ea9ad955973f.

* Fix: should switch to fleet_1 after battle_3

* Add: battle function when using clear mode

* Fix: missing import

* Fix: colliding Config class

* Fix: Config.when should contain all cases

* Opt: pick ammo after third battle in clear mode of 15-4

* Del: old assets CarrierSpecial

* Fix: remake of CarrierSpecial template

* Add: UI mask for W15

* Fix: missing ASSETS import

* Fix: change full_scan_movable() to predict()

* Fix: predict should be done after each move

* Opt: camera_data in W15

* Del: remove predict

* Add: map info process after mob move

* Add: support for multi bosses in _expected_end() for W15

* Opt: show map after moving

* Del: remove redundant import in fleet.py

* Opt: using clear_chosen_enemy() instead of goto() directly

* Fix: should first take screenshot before strategy enter/confirm/cancel

* Add: asset TEMPLATE_SIREN_BOSS

* Opt: Handle first stages of BOSS as Siren in 15-3/15-4

* Fix: missing override map_data

* Add: ignore is_boss prediction for siren boss in 15-3/15-4

* Fix: should not use decorator Config with battle_x functions

* Opt: camera data in 15-4

* Opt: directly overwrite map info into original map_data

* Fix: missing indent block in campaign_15_4.py

* Fix: expect 15-3/15-4 first bosses as siren

* Revert "Add: ignore is_boss prediction for siren boss in 15-3/15-4"

This reverts commit 1104631f92e5df0672dce8c7acaa1eb122731746.

* Revert "Add: asset TEMPLATE_SIREN_BOSS"

This reverts commit a29d6b6b9bfb9d79963adb404ce2091cbfafb810.

* Revert "Add: support for multi bosses in _expected_end() for W15"

This reverts commit 8d357abe5bab79a643e23e8513cefa87d31cb3e8.

* Del: redundent map config

* Fix: recover boss grids

* Del: redundant clear_siren()

* Del: redundant clear_siren() in battle_6

* Add: template for mob move icon

* Opt: enlarge reinforcement fleet mask area for W15

* Opt: method _mob_move

* Upd: TEMPLATE_MOB_MOVE_ICON

* Fix: should have cool time between clicks of grid

* Revert "Upd: TEMPLATE_MOB_MOVE_ICON"

This reverts commit b3f2dcbc88dbe166470905f33d041b91c2192f57.

* Upd: TEMPLATE_MOB_MOVE_ICON

* Upd: TEMPLATE_MOB_MOVE_ICON

* Upd: predict_mob_move_icon

* Fix: 15-2 camera spawn point

* Fix: should update view using self.device.image

* Revert "Upd: TEMPLATE_MOB_MOVE_ICON"

This reverts commit 92a12596a8f271ec64e249ecb58779d9b64ecea6.

* Del: redundant assets MOB_MOVE_ICON.png

* Fix: using map_is_clear_mode to get real value of clear mode

* Opt: check mob_movable before moving

* Opt: Refactor _mob_move

* Fix: camera_sight in W15

* Opt: move sight to further point in _mob_move
2024-04-19 01:29:17 +08:00
xhqss
765eeed754 Merge branch '20230309' into smallkai 2024-04-11 22:12:34 +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
LA_DI_DA
8a2d536260 Merge branch 'zuosizhu-alas/20230309' into smallkai
# Conflicts:
#	module/config/argument/args.json
#	module/ui/page.py
2024-03-29 21:14:59 +08:00
Zuosizhu
b6e6f60754 Merge branch 'LmeSzinc:master' into 20230309 2024-03-29 07:09:29 +08:00
LmeSzinc
c59bddfc7e Upd: [TW] MAP_OFFENSIVE and SWITCH_OVER (#3544) 2024-03-21 18:21:15 +08:00
mulaikurisu
4f60d70f9b Merge remote-tracking branch 'zuosizhu-alas/20230309' into smallkai
# Conflicts:
#	module/config/argument/args.json
2024-01-31 18:27:04 +08:00
Zuosizhu
356496af2c Merge branch 'LmeSzinc:master' into 20230309 2024-01-24 00:47:13 +08:00
LmeSzinc
290456637c Fix: Allow enter map with is_combat_loading 2024-01-12 18:40:47 +08:00
LA-DI-DA
0252b8bcc0 Merge branch 'zuosizhu-alas/20230309' into smallkai
# Conflicts:
#	module/config/argument/args.json
2024-01-12 10:31:19 +08:00