LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 16:59:25 +08:00
Code Activity
8,062 Commits 12 Branches 0 Tags
c3c08ff9e8909174fa8dc25509f62bd4f0aabe86
Commit Graph

310 Commits

Author SHA1 Message Date
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
LmeSzinc
9322a3f054 Fix: Skip TB guidance if user didn't have their game settings correctly set (#2449) 2023-04-04 03:41:43 +08:00
Zuosizhu
fb67ae3ab7 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	module/campaign/campaign_event.py
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/config_manual.py
#	module/config/config_updater.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
 2023-03-24 16:33:37 +08:00
LmeSzinc
0c26b7a001 Upd: [EN] MISSION_OVERVIEW_CHECK 2023-03-17 00:49:43 +08:00
Zuosizhu
aa91c7a814 Merge branch 'master_lme' 
# Conflicts:
#	campaign/Readme.md
#	module/campaign/gems_farming.py
 2023-03-17 00:44:12 +08:00
LmeSzinc
e9f6781524 Fix: Handle DST in is_in_opsi_explore() 2023-03-15 22:52:21 +08:00
Zuosizhu
aabc691fb1 Merge branch 'master_lme' 2023-03-14 19:14:40 +08:00
LmeSzinc
3a12b9e95e Fix: Handle AUTO_SEARCH_REWARD in question_goto() 2023-03-12 01:10:35 +08:00
LmeSzinc
d5797cb153 Fix: Handle AUTO_SEARCH_REWARD when switching fleet lock 2023-03-11 23:46:47 +08:00
Zuosizhu
2bc586ce57 Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/campaign_event.py
#	module/campaign/campaign_status.py
 2023-03-04 03:11:41 +08:00
LmeSzinc
23eb719c78 Fix: Handle AUTO_SEARCH_REWARD in order_enter() 2023-03-03 02:48:02 +08:00
Zuosizhu
b6ee9a46b6 Merge branch 'LmeSzinc:master' into master 2023-03-02 21:00:17 +08:00
LmeSzinc
de1785ab91 Fix: Handle AUTO_SEARCH_REWARD in storage_enter() (fixed #2315) 2023-03-02 20:24:25 +08:00
Zuosizhu
58082e29e0 Merge branch 'LmeSzinc:master' into master 2023-02-27 14:18:41 +08:00
nEEtdo0d
27085dbcfd Upd: [EN] DORM_FURNITURE_CONFIRM, ACTION_POINT_REMAIN_OS 2023-02-26 14:45:24 -05:00
Zuosizhu
b072baa596 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/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/retire/retirement.py
 2023-02-20 12:35:43 +08:00
LmeSzinc
8c7781c541 Upd: [EN] Swap STRATEGIC_SEARCH_SUBMIT ON/OFF 
No idea why AL swapped them but we just follow
 2023-02-19 20:41:58 +08:00
LmeSzinc
f5f093c67f Opt: Remove OpsiAshBeacon.AshAttack since it should always be True 2023-02-17 23:50:30 +08:00
Zuosizhu
e1811c1ac0 Fix: value log error 2023-02-14 08:10:18 +08:00