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
Zuosizhu
055720dd52
Merge branch 'master_lme'
...
# Conflicts:
# deploy/config.py
2024-04-26 03:18:16 +08:00
LmeSzinc
d64d4b2587
Fix: Handle map events when entering storage
2024-04-23 00:13:31 +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
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
LA-DI-DA
527d067e3f
Fix: unstoppable loop of entering strategic search setting page when opsi_hazard1_leveling
2023-10-25 00:27:30 +08:00
Zuosizhu
a509b107bf
Merge branch 'LmeSzinc:master' into 20230309
2023-09-22 08:15:14 +08:00
霞飛
67fe02a680
fix[TW]: Akashi shop buttom grid ( #3147 )
2023-09-21 10:26:30 +08:00
Zuosizhu
dfa815645d
Merge branch 'master_lme'
...
# Conflicts:
# module/campaign/campaign_status.py
# module/config/argument/args.json
2023-09-15 08:26:53 +08:00
LmeSzinc
90771baca9
Fix: Handle AUTO_SEARCH_REWARD in strategy_search_enter()
2023-09-14 22:44:28 +08:00
Zuosizhu
f8a35cec1c
Merge branch 'master_lme'
...
# Conflicts:
# README.md
2023-09-11 08:16:09 +08:00
霞飛
6a1f3f574e
Fix(JP): Asset of SHOP_BUY_CONFIRM ( #3097 )
...
* Fix(JP): asset of SHOP_BUY_CONFIRM
* fix: use gif template instead
2023-09-10 14:44:47 +08:00
Zuosizhu
11dc3471aa
Merge branch 'LmeSzinc:master' into 20230309
2023-09-03 09:53:28 +08:00
霞飛
b19fbbbc91
Fix: OS shop in Akashi ( #3078 )
...
* Fix: OS shop in Akashi
* Fix: OS shop's price area in Akashi
2023-09-03 00:32:14 +08:00
Zuosizhu
78d8ed1c5b
Merge branch 'master_lme'
...
# Conflicts:
# assets/gui/css/light-alas.css
# 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/webui/app.py
2023-09-02 17:47:24 +08:00
LmeSzinc
471d77d6a3
Upd: [JP] STORAGE_USE
2023-09-01 01:22:01 +08:00
Zuosizhu
0935b58ede
Merge branch 'master_lme'
...
# Conflicts:
# module/campaign/gems_farming.py
# module/exercise/exercise.py
# module/ui/ui.py
2023-07-15 20:26:12 +08:00
guoh064
b72eecf277
Fix: Avoid stuck on energy storage device ( #2825 )
...
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com >
2023-07-02 15:36:37 +08:00
Zuosizhu
1acc700629
Merge branch 'LmeSzinc:master' into 20230309
2023-06-10 02:53:17 +08:00
LmeSzinc
bbf798ab1b
Fix: Confirm if strategy search scroll disappeared
2023-06-10 01:58:47 +08:00
