LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 11:19:26 +08:00
Code Activity
8,771 Commits 12 Branches 0 Tags
01562da545836100a28097a6279ed32a50375dad
Commit Graph

8771 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LmeSzinc
4012541412 Bug fix (#5394) 
* Upd: [CN, EN, JP] TEMPLATE_COMBAT_LOADING (#5393)

* Fix: [ALAS] Add retry on first nemuipc connect

---------

Co-authored-by: guoh064 <50830808+guoh064@users.noreply.github.com>
 2025-12-19 00:21:17 +08:00
LmeSzinc
90e438e75e Fix: [ALAS] Add retry on first nemuipc connect 2025-12-19 00:20:12 +08:00
guoh064
f3509c0de4 Upd: [CN, EN, JP] TEMPLATE_COMBAT_LOADING (#5393) 2025-12-19 00:19:52 +08:00
LmeSzinc
8d9e54b4de Bug fix (#5384) 
* Upd:[tw] research E (#5382)

Co-authored-by: whjhs1010203 <26708256+whjhs1010203@users.noreply.github.com>

* Upd:[TW]event 20251023 update (#5383)

Co-authored-by: whjhs1010203 <26708256+whjhs1010203@users.noreply.github.com>

* Fix: [EN] TEMPLATE_RONDO_AT_RAINBOWS_END

* Upd: [EN] POPUP_CONFIRM_WHITE_BATTLEPASS (fixed #5381)

---------

Co-authored-by: whjhs1010203 <r2682233@gmail.com>
Co-authored-by: whjhs1010203 <26708256+whjhs1010203@users.noreply.github.com>
 2025-12-12 19:29:42 +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
7ab1865ebe Merge pull request #5378 from LmeSzinc/dev 
Bug fix
 2025-12-10 12:11:57 +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
f52789fbad Refactor: LuaLoader._load_file() (#5374) 2025-12-09 12:24:23 +08:00
guoh064
fda137f62b Upd: [JP] asset POPUP_CONFIRM_WHITE_BATTLEPASS (#5365) 2025-12-09 12:19:50 +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
0O0o0oOoO00
138b5c9591 Merge remote-tracking branch 'LmeSzinc/master' into refactor 
# Conflicts:
#	module/config/argument/args.json
 2025-12-01 23:24:19 +08:00
LmeSzinc
b9ed5b134e Bug fix (#5358) 
* 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>

* 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>

* Upd: Config update

* Add: [ALAS] Syntactic sugar for state machine with timeout

* Fix: Retry on default coalition PT 999999

---------

Co-authored-by: guoh064 <50830808+guoh064@users.noreply.github.com>
Co-authored-by: xzjjasper <67013667+xzjjasper@users.noreply.github.com>
 2025-12-01 01:24:37 +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
0O0o0oOoO00
86b8bab0d7 fix: flagship and vanguard filter 2025-11-29 22:13:45 +08:00
guoh064
83f103daa2 Add: [EN] assets for coalition_20251120 (#5347) 2025-11-27 02:08:42 +08:00
0O0o0oOoO00
bc8666976f Merge remote-tracking branch 'LmeSzinc/master' into refactor 
# Conflicts:
#	module/config/argument/args.json
 2025-11-26 17:09:45 +08:00
LmeSzinc
7503cf2111 Merge pull request #5345 from LmeSzinc/dev 
Dev
 2025-11-26 14:32:54 +08:00
LmeSzinc
98c513baff Tmp: Move date a live collab event entrance upwards 2025-11-26 14:31:28 +08:00
LmeSzinc
45183a10d5 Fix: Enemy spawn point in A1 C1 (#5332) 2025-11-26 14:19:03 +08:00
LmeSzinc
ead86cdfc2 Merge pull request #5338 from guoh064/coalition_20251120_cn 
Add: Coalition 20251120
 2025-11-26 13:53:05 +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
0O0o0oOoO00
2fbc993ce6 fix: do not register lua debug hook when creating LuaStatePauser 2025-11-23 23:55:23 +08:00
0O0o0oOoO00
7ed871e9b3 add: infinite battle crack 2025-11-23 23:43:23 +08:00
guoh064
be012c843d Upd: [CN] assets for coalition_20251120 2025-11-23 22:54:11 +08:00
0O0o0oOoO00
ccb78ec341 add: operate cracker without pause 2025-11-23 15:31:17 +08:00
0O0o0oOoO00
1515e14bd4 fix: set pause when disable all crack 2025-11-23 15:11:13 +08:00
0O0o0oOoO00
547fcccd9c fix: use std::binary_semaphore as lock for pausing lua state 2025-11-23 15:09:32 +08:00
0O0o0oOoO00
47080b8626 fix: move cracker operation to try catch block 2025-11-23 14:43:51 +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
0O0o0oOoO00
4d00273ba3 fix: call lua operation at lua state pause thread 2025-11-22 14:57:58 +08:00
0O0o0oOoO00
c306e5841d add: delay 0.5s after pause triggered 2025-11-21 22:39:57 +08:00
0O0o0oOoO00
c448c49ef7 fix: disable all crack before apply crack config 2025-11-21 22:25:21 +08:00
0O0o0oOoO00
bd6aeb6fef add: pause lua state when setting fast stage move duration 2025-11-21 22:24:42 +08:00