Zuosizhu
d1174a7d88
Merge remote-tracking branch 'Lme/master' into unrefactor
...
# Conflicts:
# module/campaign/campaign_event.py
# module/campaign/os_run.py
# module/coalition/coalition.py
# module/config/argument/args.json
# module/config/argument/menu.json
# module/config/argument/task.yaml
# module/config/i18n/en-US.json
# module/config/i18n/ja-JP.json
# module/os/operation_siren.py
# module/os_handler/mission.py
# module/webui/app.py
2026-01-24 14:18:46 +08:00
LmeSzinc
43d3fa122c
Fix: drop skip_first_screenshot in set_top
2026-01-23 15:53:03 +08:00
LmeSzinc
475c2dd2bc
Chore: Use new syntax sugar in os_handler
2026-01-22 19:20:29 +08:00
0O0o0oOoO00
e453c4464a
Merge branch 'Lme/master' into dev
...
# Conflicts:
# module/config/argument/args.json
# module/shop/shop_reward.py
# module/shop/ui.py
# module/ui/assets.py
2025-08-25 23:46:48 +08:00
LmeSzinc
596babb1d3
Fix: OS_CHECK may get detected while handling stories
2025-08-23 23:04:56 +08:00
guoh064
fca3522391
Fix: wait for intermittent manjuu loading
2025-08-01 00:53:02 +09:00
0O0o0oOoO00
f64bc96bb2
Merge remote-tracking branch 'LmeSzinc/master' into dev
...
# Conflicts:
# config/deploy.template-AidLux-cn.yaml
# config/deploy.template-AidLux.yaml
# config/deploy.template-cn.yaml
# config/deploy.template-docker-cn.yaml
# config/deploy.template-docker.yaml
# config/deploy.template-linux-cn.yaml
# config/deploy.template-linux.yaml
# config/deploy.template.yaml
2025-06-17 13:19:30 +08:00
guoh064
3b65dfe6f0
Add: check manjuu loading in os_mission_overview_accept
2025-06-06 01:57:43 +08:00
xhqss
0339fe9dcc
Merge branch 'master_lme' into dev
...
# Conflicts:
# module/event_hospital/assets.py
2025-05-25 15:18:10 +08:00
LmeSzinc
a136b7d229
Fix: sync check function to ZONEMODE_REPEAT and MERCHANT_STOP ( #4810 )
2025-05-24 00:03:18 +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
1178c43d9a
Fix: Check strategy options with green tick instead of mean color ( #4810 )
2025-05-21 03:01:58 +08:00
LmeSzinc
191bfe6568
Fix: Handle os mission popup without black-blurred background
2025-05-13 22:01:46 +08:00
LmeSzinc
d751b11fd5
Fix: End condition should be at first
2025-05-13 21:55:10 +08:00
LmeSzinc
a5e85aec8f
Fix: Handle action point popup without black-blurred background
2025-05-12 18:57:36 +08:00
0O0o0oOoO00
f709cd559d
fix: STRATEGIC_SEARCH_DEVICE_STOP will mis-clicked and switch opsi global map
2025-05-11 19:34:32 +08:00
LmeSzinc
3505fedb6a
Fix: Avoid TooManyClickError when receiving abyssal progress rewards ( #3664 )
2025-04-24 23:51:55 +08:00
LmeSzinc
5b20d80b5b
Chore: Log what triggers the click on CLICK_SAFE_AREA
2025-04-24 23:43:28 +08:00
LmeSzinc
85b82ce755
Fix: Handle forced map event on the top of action point popup
2025-04-24 23:43:28 +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
xhqss
2ddc7fff1c
Merge branch 'master_lme'
...
# Conflicts:
# module/campaign/gems_farming.py
# module/config/config_manual.py
# module/handler/assets.py
# module/retire/retirement.py
# module/tactical/tactical_class.py
2025-01-16 08:52:42 +08:00
guoh064
ab9f2892dc
Upd: [JP] Opsi assets ( #4492 )
2025-01-06 18:31:52 +08:00
xhqss
e7f93d8efe
Merge branch 'master_lme'
...
# Conflicts:
# module/equipment/equipment.py
2024-12-20 23:51:48 +08:00
guoh064
8dbc3acc56
upd: [JP] yellow_coin color ( #4427 )
2024-12-13 09:52:28 +08:00
LmeSzinc
4ab8337324
Sync: [ALAS] Refactored Switch.set()
2024-12-11 11:46:19 +08:00
LmeSzinc
97f8367a00
Fix: Handle storage page in os_auto_search_quit()
2024-12-09 18:55:23 +08:00
LmeSzinc
ba5b853cb9
Refactor: Standardize the use of match_template_color()
2024-12-09 16:09:34 +08:00
LmeSzinc
164db6f4da
Chore: Rename "threshold" in template matching to "similarity"
...
to be differ from the "threshold" in color matching
2024-12-09 15:37:25 +08:00
xhqss
fad84bb0fa
Merge branch 'master_lme'
2024-11-15 17:14:11 +08:00
guoh064
227fed1665
upd: [JP] OCR_SHOP_YELLOW_COINS
2024-10-30 12:18:09 +08:00
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
guoh064
e89063bade
Jp font 20241011 ( #4272 )
...
* tmp: [JP] commission assets
* tmp: [JP] asset RESEARCH_COST_CHECKER
* tmp: [JP] assets in mail batch
* tmp: [JP] opsi get_zone_name color
* tmp: [JP] get_coin and get_oil color
* tmp: [JP] ash_collect_status and get_yellow_coins color
* upd: [JP] resize commission assets recognize size
2024-10-12 14:29:01 +08:00
LA_DI_DA
02fec1598d
Merge branch 'refs/heads/LmeSzinc/master' into dev
2024-08-31 11:05:57 +08:00
LmeSzinc
714c1ce455
Fix: Wait is_current_ap_visible with timeout
2024-08-20 02:33:25 +08:00
guoh064
6a10ddf8df
Fix: current ap blocked by info bar ( #4100 )
2024-08-20 02:25:44 +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
guoh064
c79d84e174
Opt: Check total ap to prevent meaningless ap box usage ( #4020 )
...
* Fix: predict_enemy_genre in event_20220526_cn rerun (#4005 )
* Opt: Check total ap to prevent meaningless ap box usage
---------
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com >
Co-authored-by: Air111 <54128005+Air111@users.noreply.github.com >
2024-08-17 00:43:25 +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
霞飛
79edef015f
fix: handle sidebar disappear ( #3930 )
...
* fix: handle OpsiShop disappear
* docs: add a condition to OpsiShop
* ref: remove useless loop
* fix: exception
* feat: skip to the next month if the new shop do not unlock
2024-06-28 12:18:08 +08:00
霞飛
ad6cb7fab0
chore: move functions and expand expressions
2024-06-22 21:43:55 +08:00
霞飛
62bc1ed7f7
ref: remove frequency config and not to judge coins at last day
2024-06-22 21:43:55 +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
b5a9816782
Fix: Re-crop OPSI IN_MAP, leave letters only ( #3871 )
2024-06-11 23:56:31 +08:00
LmeSzinc
eada57f97d
Pref: Reduce CPU usage during auto search daemon
2024-06-05 01:15:42 +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
Air111
608a4059a6
Fix: avoid continuous clicking AUTO_SEARCH_OS_MAP_OPTION_OFF
2024-05-23 01:16:12 +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
