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
Zuosizhu
b308b65cde
Merge branch 'LmeSzinc:master' into 20230309
2023-06-02 03:55:50 +08:00
LmeSzinc
d63a03ed6d
Fix: Strategy search settings exited accidentally
2023-05-30 23:50:52 +08:00
Zuosizhu
987423a96f
Merge branch 'LmeSzinc:master' into 20230309
2023-05-27 20:30:22 +08:00
LmeSzinc
ff794e6437
Fix: Handle get items in strategy_search_enter()
2023-05-26 11:59:06 +08:00
Zuosizhu
dba6d7e4e4
Merge branch 'LmeSzinc:master' into 20230309
2023-05-25 13:54:56 +08:00
LmeSzinc
b3628b2a4a
Fix: Missing B to 8 digit replacement
2023-05-22 12:10:12 +08:00
Zuosizhu
fa276716d1
Merge branch 'master_lme'
...
# Conflicts:
# alas.py
2023-04-20 01:25:28 +08:00
LmeSzinc
cb2b398546
Fix: Reset timeout timer in action_point_safe_get()
2023-04-19 20:54:38 +08:00
guoh064
64db1406a0
Fix: Handle 2 Infobars covering action_point ocr ( #2503 )
2023-04-19 20:48:20 +08:00
LmeSzinc
7bb5c15788
Fix: Recheck AP boxes when having OCR error
2023-04-14 19:08:44 +08:00
Zuosizhu
038483cac3
Merge branch 'LmeSzinc:master' into 20230309
2023-04-13 20:37:10 +08:00
LmeSzinc
9560913ef1
Fix: Recheck AP boxes when having OCR error
2023-04-13 18:46:06 +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
LmeSzinc
26851c1473
Fix: Don't wait tasks of tomorrow
2023-04-11 21:47:03 +08:00
LmeSzinc
942f8f54cf
Fix: Handle AUTO_SEARCH_REWARD in zone_init()
2023-04-09 00:12:54 +08:00
Zuosizhu
b5ac3cc06a
Merge branch 'LmeSzinc:master' into 20230309
2023-04-07 15:46:07 +08:00
LmeSzinc
b7c4de3725
Fix: Handle item info in _storage_item_use()
2023-04-04 03:41:43 +08:00
