LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-23 07:39:28 +08:00
Code Activity
10,113 Commits 12 Branches 0 Tags
8c6cc62cdcd98d46016812b59e152b447dd16daa
Commit Graph

7111 Commits

Author SHA1 Message Date
xhqss
8c6cc62cdc UPD:without event 2025-12-19 15:15:18 +08:00
xhqss
a5dc9328c9 Merge branch 'master_lme' into dev 
# Conflicts:
#	module/coalition/coalition.py
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/config_generated.py
#	module/os_shop/shop.py
 2025-12-19 15:13:21 +08:00
LmeSzinc
90e438e75e Fix: [ALAS] Add retry on first nemuipc connect 2025-12-19 00:20:12 +08:00
LmeSzinc
2dca300d2c Upd: [EN] POPUP_CONFIRM_WHITE_BATTLEPASS (fixed #5381) 2025-12-12 19:24:41 +08:00
LmeSzinc
c376d36c24 Fix: [EN] TEMPLATE_RONDO_AT_RAINBOWS_END 2025-12-12 19:24:41 +08:00
whjhs1010203
c02c11d725 Upd:[TW]event 20251023 update (#5383) 
Co-authored-by: whjhs1010203 <26708256+whjhs1010203@users.noreply.github.com>
 2025-12-12 19:23:05 +08:00
whjhs1010203
9261630f77 Upd:[tw] research E (#5382) 
Co-authored-by: whjhs1010203 <26708256+whjhs1010203@users.noreply.github.com>
 2025-12-12 19:22:49 +08:00
LmeSzinc
32d36cd06d Fix: No submarine in hard campaign if team not prepared 2025-12-09 12:40:52 +08:00
LmeSzinc
fbb936f081 Del: Remove ship equipment change as lack of maintenance 2025-12-09 12:39:28 +08:00
LmeSzinc
b4ba9e5fd0 Fix: fleet_selector.get() might return 0 2025-12-09 12:28:43 +08:00
LmeSzinc
1b3d690176 Merge pull request #5366 from guoh064/opsi_view_reset 
Opt: reset opsi fleet view when current view is bad
 2025-12-09 12:25:21 +08:00
MikuSoft
1297908d89 Add:[CN] assets combat ui ShadowPuppetry (#5377) 2025-12-09 12:24:33 +08:00
guoh064
fda137f62b Upd: [JP] asset POPUP_CONFIRM_WHITE_BATTLEPASS (#5365) 2025-12-09 12:19:50 +08:00
Zuosizhu
2d1d1cd164 Adj: Check furniture everyday. Fuck Lme 2025-12-04 18:26:56 +08:00
guoh064
5bde6242f9 Opt: reset opsi fleet view when cannot find current fleet in current view in OSFleet.question_goto() 2025-12-03 20:26:39 +08:00
guoh064
21c92d95e3 Opt: reset opsi fleet view when homo_loca stuck in OSFleet.question_goto() 2025-12-03 20:21:59 +08:00
LmeSzinc
b7301482c7 Fix: Retry on default coalition PT 999999 2025-12-01 01:07:21 +08:00
LmeSzinc
265e33b93c Add: [ALAS] Syntactic sugar for state machine with timeout 2025-12-01 01:00:41 +08:00
LmeSzinc
ed154c1920 Upd: Config update 2025-12-01 00:33:02 +08:00
xzjjasper
d11dce42cc Add: [TW] assets for coalition_20251127 (#5354) 
* Add: [EN] assets for coalition_20251120 (#5347)

* Add: [TW] assets for coalition_20251127

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: guoh064 <50830808+guoh064@users.noreply.github.com>
 2025-12-01 00:29:57 +08:00
guoh064
fa55a850fe Fix: handle get ship in coalition_20251120 (#5350) 
* Add: [EN] assets for coalition_20251120 (#5347)

* Fix: handle get ship in coalition_20251120

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2025-12-01 00:26:52 +08:00
Zuosizhu
7725fd03be Fix: Coalition should choose events 2025-11-28 10:58:36 +08:00
Zuosizhu
5120649acb Merge remote-tracking branch 'Lme/master' into dev 
# Conflicts:
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/i18n/en-US.json
 2025-11-27 21:53:49 +08:00
guoh064
83f103daa2 Add: [EN] assets for coalition_20251120 (#5347) 2025-11-27 02:08:42 +08:00
LmeSzinc
98c513baff Tmp: Move date a live collab event entrance upwards 2025-11-26 14:31:28 +08:00
guoh064
369a12abfb Fix: ui misclick in coalition_20251120 2025-11-25 12:53:26 +08:00
guoh064
ae9d64c81f Del: redundant config redirect 2025-11-24 20:58:12 +08:00
guoh064
be012c843d Upd: [CN] assets for coalition_20251120 2025-11-23 22:54:11 +08:00
guoh064
5b5c549d30 Fix: trigger_stop_condition for coalition_20251120 2025-11-23 02:15:30 +08:00
guoh064
ba594e769a Tmp: event pt ocr for coalition_20251120 2025-11-23 02:11:05 +08:00
guoh064
58ddb01976 Tmp: general config modification for coalition_20251120 2025-11-23 01:56:21 +08:00
guoh064
a07c99fe85 Add: [JP] coalition_20251120 2025-11-23 01:42:38 +08:00
guoh064
c04f9ce964 Add: config for coalition_20251120 2025-11-23 00:33:39 +08:00
LmeSzinc
eac6ed2cf0 Upd: [TW] Rondo at Rainbow's End Rerun (fixed #5326) 2025-11-21 03:32:21 +08:00
whjhs1010203
a36d36c0d9 Upd: [TW]private_quarters update new_jersey (#5329) 
* Upd: [TW] PRIVATE_QUARTERS update

* Upd: [TW] PRIVATE_QUARTERS update i18n

---------

Co-authored-by: whjhs1010203 <26708256+whjhs1010203@users.noreply.github.com>
 2025-11-21 03:04:07 +08:00
xhqss
fccfd3ee82 UPD:config_event_20230914_cn 2025-11-18 16:30:40 +08:00
xhqss
d0677cd3c6 Merge branch 'master_lme' into dev 
# Conflicts:
#	module/config/argument/args.json
 2025-11-18 16:30:05 +08:00
whjhs1010203
9563e149dc Upd: [TW] PRIVATE_QUARTERS_CHECK (#5317) 
Co-authored-by: whjhs1010203 <26708256+whjhs1010203@users.noreply.github.com>
 2025-11-16 00:21:42 +08:00
ArecaSapling
51934ff3f6 Upd: Effulgence Before Eclipse Rerun (event_20230914_cn) (#5315) 2025-11-13 17:53:06 +08:00
whjhs1010203
a680c07706 Upd: [tw] PRIVATE_QUARTERS i18n help 2025-11-13 17:52:00 +08:00
whjhs1010203
df6bc4b69c Upd: [tw] PRIVATE_QUARTERS 2025-11-13 17:52:00 +08:00
guoh064
1a29d642a0 Upd: [JP] USE_DATA_KEY_NOTIFIED asset (#5303) 2025-11-13 17:50:50 +08:00
xhqss
e28b717bd1 UPD:config_event_20250227_cn 2025-11-07 18:12:55 +08:00
xhqss
ad07ec150b Merge branch 'master_lme' into dev 
# Conflicts:
#	module/config/argument/args.json
#	module/shop/ui.py
 2025-11-07 18:11:22 +08:00
LmeSzinc
c235247eb4 Upd: [TW] Event Paradiso of Shackled Light (fixed #5294) 2025-11-07 16:21:24 +08:00
LmeSzinc
b44e62f973 Fix: [JP] Randomly missing Katakana 'ー' in liverpool (fixed #5295) 2025-11-07 16:12:03 +08:00
ArecaSapling
02b459c6af Upd: Event Anthem of Remembrance Rerun (event_20230803_cn) (#5297) 2025-11-07 16:07:33 +08:00
sui-feng-cb
b14ab02c97 Upd: [CN] USE_DATA_KEY_NOTIFIED asset 2025-11-06 17:11:57 +08:00
sui-feng-cb
d90390202b Add: war_archives_20220915_cn 2025-11-06 17:11:47 +08:00
LmeSzinc
cd18378ad4 Fix: Avoid clicking GET_SHIP after entering page_meowfficer 2025-11-04 23:06:01 +08:00