1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 14:39:25 +08:00
Commit Graph

9727 Commits

Author SHA1 Message Date
0O0o0oOoO00
3e7c13df3b fix: use daemon thread to start scheduler watcher 2025-08-08 17:56:32 +08:00
0O0o0oOoO00
ea42b6a59f opt: request extend task deadline before entering battle loop 2025-08-08 17:09:13 +08:00
0O0o0oOoO00
368d6c443e fix: delay warning time before execute a battle 2025-08-08 12:42:59 +08:00
0O0o0oOoO00
b8eac480eb fix: delay warning time after trigger time limit once 2025-08-07 20:12:11 +08:00
0O0o0oOoO00
a4e13fc3dd fix: use os._exit to exit process in scheduler watcher thread 2025-08-07 19:46:05 +08:00
0O0o0oOoO00
cd7d75624b add: clear task when no task 2025-08-07 18:50:14 +08:00
0O0o0oOoO00
10a62a79b5 add: add scheduler watcher to tasks 2025-08-06 18:12:49 +08:00
0O0o0oOoO00
bc44134e33 add: add scheduler watcher to alas task scheduler 2025-08-05 23:54:45 +08:00
0O0o0oOoO00
f96c626ab2 add: scheduler watcher base framework 2025-08-05 23:31:22 +08:00
guoh064
fca3522391 Fix: wait for intermittent manjuu loading 2025-08-01 00:53:02 +09:00
0O0o0oOoO00
3ee810000c upd: update net proto 2025-07-31 18:00:51 +08:00
guoh064
1ac5298fb0 tmp: goto event 20221124 cn correctly 2025-07-26 13:30:49 +09:00
0O0o0oOoO00
05a6574b74 del: duplicate fields in task.yaml 2025-07-25 19:32:40 +08:00
Zuosizhu
b8d12c405f Merge branch 'master_lme' into brocore_dev
# Conflicts:
#	config/template.json
#	module/awaken/awaken.py
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/argument/menu.json
#	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
2025-07-25 11:46:23 +08:00
LmeSzinc
7392b668fe Merge pull request #4976 from LmeSzinc/dev
Bug fix
2025-07-25 02:02:51 +08:00
LmeSzinc
77f362f8bd Upd: [EN] ALCHEMIST_MATERIAL_CONFIRM 2025-07-25 02:01:42 +08:00
LmeSzinc
4bd51e41f8 Upd: button extract (fixed #4975) 2025-07-25 01:54:40 +08:00
LmeSzinc
d415492eba Merge pull request #4974 from LmeSzinc/dev
Bug fix
2025-07-25 01:26:04 +08:00
LmeSzinc
becf0ec1d9 Fix: Able to do stage loop TS 2025-07-25 01:09:15 +08:00
LmeSzinc
7e6487487b Merge pull request #4973 from LmeSzinc/dev
Add: The Alchemist and the Tower of Horizons (event_20250724_cn)
2025-07-25 00:50:17 +08:00
LmeSzinc
0d38332185 Fix: loop stage TS 2025-07-25 00:49:49 +08:00
LmeSzinc
8bde7017d3 Upd: Handle event stories in event_20250724_cn 2025-07-25 00:41:53 +08:00
LmeSzinc
b13e92694b Add: Chapter TS 2025-07-25 00:17:30 +08:00
LmeSzinc
6188bd069c Add: Chapter SP 2025-07-24 23:41:15 +08:00
LmeSzinc
021cc4e26d Add: Chapter T 2025-07-24 23:35:47 +08:00
LmeSzinc
7a5af7874b Dev: Convert siren names in The Alchemist and the Tower of Horizons 2025-07-24 23:28:53 +08:00
LmeSzinc
ada6e09798 Upd: Event entrance of The Alchemist and the Tower of Horizons (event_20250724_cn) 2025-07-24 21:52:16 +08:00
LmeSzinc
726f61b10a Upd: Move coalition back after event 2025-07-24 21:48:01 +08:00
LmeSzinc
f061f518b3 Upd: [CN] channel server com.bilibili.blhx.honor 2025-07-24 21:45:20 +08:00
LmeSzinc
3560c8debe Upd: [TW] Event Substellar Crepuscule (event_20241219_cn) (#4970) 2025-07-24 21:39:24 +08:00
sui-feng-cb
1d22dd4d2e Fix: Avoid clicking EXP_INFO_B in chapter A and chapter C 2025-07-24 21:31:08 +08:00
sui-feng-cb
6b49b92185 Add: war_archives_20220428_cn 2025-07-24 21:31:08 +08:00
0O0o0oOoO00
9b74b79c01 add: add 8th research to ResearchFarming 2025-07-22 17:16:09 +08:00
0O0o0oOoO00
89f3e4e20f fix: prevent infinite instance restart loop 2025-07-18 13:33:22 +08:00
LmeSzinc
310ccbae81 Bug fix (#4965)
* Fix: handle get items in research queue quit

* Fix: missing interval

* Opt: Awaken Favourite Ships Only (#4957)

* Feature: Add 121 strategy for 15-4 | 给15-4添加121策略 (#4946)

* Add 15-4 121 strategy

* Assign a different CampaignMap::name so load_campaign can differentiate 15-4 and 15-4(121)

* Fix campaign map name again to prevent unnecessary reloading

* Inherit map

* Fix: [ALAS] remove warnings from multiscreen devices

* Fix: [ALAS] Worker might graceful exited after killing

it cleaned up itself, so main thread can't delete it

* Fix: [CN] PRIVATE_QUARTERS_INTERACT button (#4964)

---------

Co-authored-by: sui_feng <115386623+sui-feng-cb@users.noreply.github.com>
Co-authored-by: MetricVoid <21335640+Metric-Void@users.noreply.github.com>
2025-07-17 22:45:02 +08:00
HexatomicRing
4f0f2a2c87 Fix: Emulator no respond (#4947)
* Fix Leidian Emulator no respond

* [fix] assets name

* [fix] Avoid clearing stuck record
2025-07-17 22:44:28 +08:00
sui_feng
eef5249d18 Fix: [CN] PRIVATE_QUARTERS_INTERACT button (#4964) 2025-07-17 22:42:33 +08:00
LmeSzinc
09a3727166 Fix: [ALAS] Worker might graceful exited after killing
it cleaned up itself, so main thread can't delete it
2025-07-17 22:38:27 +08:00
LmeSzinc
bd73e038cf Fix: [ALAS] remove warnings from multiscreen devices 2025-07-17 22:38:17 +08:00
0O0o0oOoO00
f1cfd90deb fix: conflict between exit when server is under maintenance and instance restart 2025-07-17 17:14:36 +08:00
MetricVoid
f99d149388 Feature: Add 121 strategy for 15-4 | 给15-4添加121策略 (#4946)
* Add 15-4 121 strategy

* Assign a different CampaignMap::name so load_campaign can differentiate 15-4 and 15-4(121)

* Fix campaign map name again to prevent unnecessary reloading

* Inherit map
2025-07-16 12:43:28 +08:00
sui_feng
64070437f0 Opt: Awaken Favourite Ships Only (#4957) 2025-07-16 12:24:08 +08:00
LmeSzinc
ca5f8a0d1b Fix: missing interval 2025-07-14 00:12:43 +08:00
LmeSzinc
75ed59c318 Fix: handle get items in research queue quit 2025-07-14 00:10:50 +08:00
0O0o0oOoO00
acd749852f fix: when merging "more", there is a lack of exiting the instance during server maintenance 2025-07-13 22:22:11 +08:00
Zuosizhu
de303b492e Merge branch 'master_lme' into brocore_dev
# Conflicts:
#	module/config/argument/override.yaml
#	module/research/selector.py
#	module/ui/ui.py
#	module/webui/app.py
2025-07-11 23:03:05 +08:00
LmeSzinc
627d698763 Bug fix (#4948)
* Merge pull request #4945 from guoh064/private_quarters

Add: [JP] assets for private quarters

* Fix: PQ home button moved (#4942)

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>

* Fix: find_emulator_instance may return None

---------

Co-authored-by: guoh064 <50830808+guoh064@users.noreply.github.com>
Co-authored-by: dragonheart107 <153553566+dragonheart107@users.noreply.github.com>
2025-07-11 22:20:35 +08:00
LmeSzinc
77569a4532 Fix: find_emulator_instance may return None 2025-07-11 22:05:37 +08:00
dragonheart107
4c016a7830 Fix: PQ home button moved (#4942)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2025-07-11 21:49:37 +08:00
guoh064
a94dee218a Merge pull request #4945 from guoh064/private_quarters
Add: [JP] assets for private quarters
2025-07-11 21:48:03 +08:00