LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-18 18:49:30 +08:00
Code Activity
7,550 Commits 12 Branches 0 Tags
6a33eda8f2d618c46a62b4ea225a8a323051bf8d
Commit Graph

5287 Commits

Author SHA1 Message Date
LA-DI-DA
6a33eda8f2 Fix: lack of event option 2023-09-12 11:57:59 +08:00
LA-DI-DA
36528d6403 Adj: enable to show all event 2023-09-12 11:51:34 +08:00
LA-DI-DA
1156a76e77 Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-09-12 11:09:18 +08:00
LA-DI-DA
e9ae87d070 Fix: Accidentally deleted Event-3 2023-09-11 23:11:41 +08:00
LA-DI-DA
7a716a2e3c Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-09-11 21:48:50 +08:00
Zuosizhu
f8a35cec1c Merge branch 'master_lme' 
# Conflicts:
#	README.md
 2023-09-11 08:16:09 +08:00
LmeSzinc
2de0641d65 Fix: Click stories if STORY_ALLOW_SKIP=False 2023-09-10 19:55:36 +08:00
襟江带海
79d398968e add: analysis resource collection (#3107) 2023-09-10 19:53:50 +08:00
LmeSzinc
da02fd6066 Fix: Trying to fix story skip bug on game client 2023-09-10 16:20:39 +08:00
LmeSzinc
dd4cc0ea32 Fix: Skip stories in FleetSelector.open() (#3104) 2023-09-10 15:27:07 +08:00
guoh064
2b796483a5 Fix: End condition order in auto_search_combat of os_combat (#3103) 2023-09-10 14:45:02 +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
iceynano
fcc32b8fa7 Fix: Error caused by loop of Daily Emergency Module Development (#3096) 
* Fix: Error caused by empty build queue

* feat: add BUILD_QUEUE_EMPTY assets

* fix: use image_color_count() for identify images

* chore: remove useless asset

* fix: Avoid info_bar and use appear()

* Fix Error Caused By Wrong Logic

---------

Co-authored-by: SaarChaffee <saarchaffee@qq.com>
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-09-08 12:08:55 +08:00
Zuosizhu
f3af2347e9 Merge branch 'LmeSzinc:master' into 20230309 2023-09-08 08:06:00 +08:00
somegituser
17b13f6c6c add war_archive: Inverted orthant (#3089) 
新增作战档案：负象限作战
 2023-09-08 01:14:18 +08:00
LmeSzinc
078c6bb606 Revert "Upd: [EN] ACADEMY_CHECK" 
This reverts commit 6f2ea47c
 2023-09-08 01:10:52 +08:00
LA_DI_DA
8368cce3fb Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
 2023-09-03 19:13:52 +08:00
Zuosizhu
11dc3471aa Merge branch 'LmeSzinc:master' into 20230309 2023-09-03 09:53:28 +08:00
LmeSzinc
283ee7e687 Merge pull request #3079 from LmeSzinc/dev 
Bug fix
 2023-09-03 00:33:06 +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
LmeSzinc
b6e66b4a17 Fix: handle_fleet_emp_debuff in port (#3076) 2023-09-02 23:58:56 +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
c987eb68cb Upd: Assets update 2023-09-01 02:21:37 +08:00
LmeSzinc
471d77d6a3 Upd: [JP] STORAGE_USE 2023-09-01 01:22:01 +08:00
LmeSzinc
6f2ea47c70 Upd: [EN] ACADEMY_CHECK 2023-09-01 01:21:55 +08:00
LmeSzinc
100ba7a441 Fix: Disable OpsiShop before assets update 2023-09-01 00:54:51 +08:00
guoh064
37e852aadc Add: Crystal Fragment template/filter_string in Voucher Shop (#3068) 2023-09-01 00:46:05 +08:00
LmeSzinc
3aee6082c2 Fix: [TW] Increase threshold of BATTLE_PREPARATION_WITH_OVERLAY (#3058) 2023-08-31 10:43:33 +08:00
18870
736fd52407 Opt: Refine file name processing 
- Prevent bypassing disabled button through devtool
- Remove auto export on override import
 2023-08-31 03:26:48 +08:00
18870
23d845b69a Opt: Move New config to manage page 2023-08-29 21:08:29 +08:00
18870
a4bd13b2bc Add: Config import/export 2023-08-29 19:56:47 +08:00
LmeSzinc
8987c9253b Add: Disable multi-instances on phone cloud environment 2023-08-28 17:30:46 +08:00
LmeSzinc
ae8172e580 Fix: Revise serial as fool-proof 2023-08-28 00:03:41 +08:00
Zuosizhu
f55daeaf45 Opt: users are allowed not to push lua before script runs in case of unsuccessful pushes. 2023-08-27 22:14:28 +08:00
LmeSzinc
f86e37b16b Add: [ALAS][TW] Standardize zh-TW translation 2023-08-27 17:45:21 +08:00
LA_DI_DA
174ea3530b Add: more option for auto restart when alas get a error 2023-08-27 14:53:24 +08:00
hephooey
dfce73e8d3 Update tw assets for Frostfall (#3051) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-08-25 12:38:19 +08:00
Ian Lee
92b5cf85d2 Upd:[TW] Event:Frostfall (#3049) 2023-08-25 12:35:45 +08:00
LmeSzinc
1194bbb441 Fix: Handle random ocr error from OCR_DORM_FILL 2023-08-24 12:38:43 +08:00
LmeSzinc
ba03a9c870 Fix: META_AUTO_ATTACK_START is missing after entering _dossier_auto_attack() 2023-08-24 12:36:16 +08:00
Zuosizhu
ec48411c88 Merge branch 'LmeSzinc:master' into 20230309 2023-08-23 19:04:03 +08:00
LmeSzinc
15ef108d85 Opt: [EN] Operation coins in OpsiHazard1Leveling help text 2023-08-23 12:49:08 +08:00
LmeSzinc
1a7d74493d Fix: Story stages before A1 2023-08-23 12:46:05 +08:00
LmeSzinc
a06061c2c5 Fix: Handle serial startswith "127.0.0.1." as a fool-proof 2023-08-23 12:39:30 +08:00
LmeSzinc
46d07d1f45 Fix: Reset arrive timers after handle_map_cat_attack() 2023-08-20 00:15:33 +08:00
LmeSzinc
e30914c83b Fix: Unicode characters similar to ">" (#3027) 2023-08-19 23:29:13 +08:00
LmeSzinc
2aff41a96b Fix: Use the fleet of OpsiDaily in cross month daily 2023-08-19 22:27:16 +08:00
LmeSzinc
1622c63214 Fix: Update assets.py 2023-08-19 21:34:44 +08:00
LA-DI-DA
400550390b Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-08-19 10:46:52 +08:00
Zuosizhu
6550a56b2b Merge branch 'master_lme' 
# Conflicts:
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2023-08-19 09:23:28 +08:00