1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 16:29:26 +08:00
Commit Graph

755 Commits

Author SHA1 Message Date
ZuoSiZhu
b82b79988d Merge remote-tracking branch 'lme/master' into dev
# Conflicts:
#	module/config/argument/override.yaml
2025-03-14 00:57:23 +08:00
LmeSzinc
c5f1d6e18b Add: Tools to do event story 2025-03-10 23:02:16 +08:00
ZuoSiZhu
337ff1d550 Add: choice to do_nothing in type-changer 2025-03-01 15:09:25 +08:00
ZuoSiZhu
39c18d8103 Merge remote-tracking branch 'lme/master' into dev
# Conflicts:
#	deploy/AidLux/0.92/requirements.txt
#	module/campaign/campaign_event.py
#	module/os/map.py
#	module/os_ash/ash.py
#	module/webui/config.py
2025-02-28 11:01:23 +08:00
LmeSzinc
8109b8c0be Add: Event entrance of Paradiso of Shackled Light (event_20250227_cn) 2025-02-27 21:14:14 +08:00
ZuoSiZhu
ad5564cf2f Add: Meta record 2025-02-19 01:24:46 +08:00
LA_DI_DA
b48679be35 add: more dock filter option for Awaken 2025-02-16 16:39:43 +08:00
LA_DI_DA
7b70ee8f57 add: favourite setting of Awaken 2025-02-16 16:33:01 +08:00
LA_DI_DA
acc1107025 add: more awaken exe time 2025-02-15 14:01:35 +08:00
LmeSzinc
2e395ac8ea Upd: [TW] Event entrance of Windborne Steel Wings (event_20240815_cn) (#4585) 2025-02-13 12:50:32 +08:00
LmeSzinc
7627b91549 Upd: Config update 2025-02-06 22:34:38 +08:00
zhenghan123
b8dbed59f6 Add: event entrance for rerun event 20250206 (#4564)
* Update Readme.md

* Update args.json

* Update zh-CN.json

* Update args.json

* Update ja-JP.json

* Update en-US.json

* Update Readme.md

* Update Readme.md

* Update en-US.json
2025-02-06 22:25:17 +08:00
hephooey
419f2ed6d5 [TW] Event: Spring Fashion Festa (#4539) 2025-01-27 17:56:45 +08:00
xhqss
3f7bab2da8 UPD:config 2025-01-19 15:59:40 +08:00
xhqss
baa8d2ccd7 Merge branch 'master_lme'
# Conflicts:
#	README.md
#	module/ui_white/assets.py
2025-01-19 15:59:20 +08:00
LmeSzinc
5494a65dec Add: Purchase PR5 and DR4 blueprints in shipyard (#4522) 2025-01-17 23:03:07 +08:00
LmeSzinc
5db4cbaeef Add: Event entrance of Spring Fashion Festa (raid_20250116) 2025-01-17 12:46:34 +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
sui_feng
1053d490cf Add: War Archives 20220224 (#4512) 2025-01-15 23:24:48 +08:00
LmeSzinc
c98ea50b04 Del: Remove scrcpy screenshot 2025-01-10 02:29:58 +08:00
guoh064
78c90831c2 Add: event entrance for rerun event 20250109 (#4500) 2025-01-09 15:13:42 +08:00
LmeSzinc
6070785978 Upd: [TW] Raid entrance of Spring Festive Fiasco (raid_20240130) 2025-01-04 22:32:52 +08:00
LmeSzinc
da81498211 Add: Task Awaken to GUI 2025-01-04 22:19:30 +08:00
xhqss
03c826a066 upd config:event_20241219_cn 2024-12-20 23:52:13 +08:00
xhqss
e7f93d8efe Merge branch 'master_lme'
# Conflicts:
#	module/equipment/equipment.py
2024-12-20 23:51:48 +08:00
guoh064
a1d8e62b47 Add: event entrance of event_20231221_cn (tw event) 2024-12-20 11:27:26 +08:00
guoh064
fa78a951c2 Add: event entrance of event_20241219_cn 2024-12-20 11:27:26 +08:00
LmeSzinc
4eef4050ef Upd: [TW] Event event_20241121_cn 2024-11-30 03:02:54 +08:00
xhqss
775432486f upd config 2024-11-23 00:09:22 +08:00
xhqss
d8d70b2607 Merge branch 'master_lme' 2024-11-23 00:08:44 +08:00
LmeSzinc
ecf357acb5 Add: Event entrance of Dangerous Inventions Incoming (event_20241121_cn) 2024-11-22 18:37:38 +08:00
xhqss
bb1f92df80 upd config 2024-11-15 17:15:06 +08:00
xhqss
fad84bb0fa Merge branch 'master_lme' 2024-11-15 17:14:11 +08:00
guoh064
d5c7eaa688 Add: [TW] event_20240229_cn 2024-11-14 09:54:07 +08:00
guoh064
b689b59ebd Add: [CN, EN, JP] event_20220915_cn rerun 2024-11-14 09:51:31 +08:00
hephooey
0d0aff44c0 [TW]Event: Whence Flowers Bear No Fruit (#4347) 2024-11-05 11:34:03 +08:00
LA_DI_DA
07d61ec68b Merge branch 'refs/heads/LmeSzinc/master' into dev 2024-10-25 23:28:19 +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
3f6738af8c Add: event entrance of event_20241024_cn 2024-10-25 11:55:23 +08:00
guoh064
bd0fccbd31 Add: event entrance 20241017
* event_20220728_cn rerun in cn/en/jp
* coalition_20240627 in tw
2024-10-17 20:56:53 +08:00
guoh064
d35bfa0f5d Add: War Archives
* war_archives_20201012_cn
* war_archives_20210422_cn
* war_archives_20210916_cn
* war_archives_20211111_cn
* war_archives_20211229_cn
2024-10-17 20:56:53 +08:00
coconutjuice
6b7ea0448c Upd:Adds the Meowfficer maximum level option for enhance (#4267)
* Upd:Adds the Meowfficer maximum level option for enhance

* Upd:Move ocr and judgment logic out of the loop

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: yx800 <yoyo.duan@cfnet.com.cn>
2024-10-12 00:45:56 +08:00
julystone
589c4a1bf5 Fix: [Tw] TW event update· (#4221)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: julystone <july401@>
2024-09-20 21:53:25 +08:00
LA_DI_DA
e2cae00f23 upd: args.json 2024-09-14 15:51:53 +08:00
LmeSzinc
78a9191936 Upd: Config update 2024-09-14 15:07:04 +08:00
dragonheart107
67efb5df16 Add files via upload (#4187) 2024-09-14 00:36:51 +08:00
LA_DI_DA
a9afa5487a Merge branch 'refs/heads/LmeSzinc/master' into dev
# Conflicts:
#	module/webui/app.py
2024-09-13 23:09:32 +08:00
weeswelai
1c9534d7a4 Upd: Update event Ode of Everblooming Crimson(event_20240912_cn) 2024-09-13 18:38:43 +08:00
LA_DI_DA
02fec1598d Merge branch 'refs/heads/LmeSzinc/master' into dev 2024-08-31 11:05:57 +08:00
LmeSzinc
7428485487 Add: Event entrance of Whence Flowers Bear No Fruit (event_20240829_cn) 2024-08-30 18:57:36 +08:00