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

8414 Commits

Author SHA1 Message Date
0O0o0oOoO00
04c43fbc09 Merge remote-tracking branch 'LmeSzinc/master' into refactor
# Conflicts:
#	module/config/argument/args.json
2025-10-01 19:43:59 +08:00
LmeSzinc
e06c24f222 Merge pull request #5185 from LmeSzinc/dev
Bug fix
2025-10-01 03:44:23 +08:00
LmeSzinc
5b68cf7afe Upd: Shop UI update 250814 for server tw (#5184)
* Upd: Update shop_tab_250814 for server CN, TW

* Upd: Update shop UI, supply pack for server TW

* Del: Delete old shop ui assets

* Upd: Update supply pack run for server TW
2025-10-01 03:42:07 +08:00
weeswelai
1cddb09f85 Upd: Update supply pack run for server TW 2025-10-01 03:35:17 +08:00
LmeSzinc
5e6df53e90 Fix: Double check background color of GUILD_DISPATCH_FLEET (#5173) 2025-10-01 03:25:00 +08:00
weeswelai
01c6e5fd0f Del: Delete old shop ui assets 2025-10-01 02:44:01 +08:00
sui_feng
9f6dfd1bf3 Fix: OCR_COIN from page_main in shipyard_reward (#5176) 2025-10-01 02:42:59 +08:00
weeswelai
1f909110a5 Upd: Update shop UI, supply pack for server TW 2025-10-01 02:42:22 +08:00
0O0o0oOoO00
70e3f37b0a fix: remove buying some shit item from os shop 2025-09-29 20:16:34 +08:00
0O0o0oOoO00
98472a304f fix: repeatedly adding instance to the instance watcher 2025-09-29 19:26:54 +08:00
weeswelai
cdad6ed32e Upd: Update shop_tab_250814 for server CN, TW 2025-09-28 14:11:56 +08:00
LmeSzinc
9a819b738d Fix: Battle UI Ninja in _at_low_hp 2025-09-27 01:47:50 +08:00
LmeSzinc
dbf4028739 Merge pull request #5170 from LmeSzinc/dev
Bug fix
2025-09-27 01:02:34 +08:00
LmeSzinc
4f6ab60db7 Upd: Battle UI Ninja 2025-09-27 00:56:18 +08:00
LmeSzinc
dbff1d9efb Fix: handle both blue (folded) and orange (expanded) EQUIPMENT_OPEN 2025-09-26 23:23:46 +08:00
LmeSzinc
812af729b5 Bug fix (#5162)
* Fix: Fallback nemu_ipc and ldopengl if not running on windows

* Merge pull request #5157 from tonyhom/bug_fix/tw/enhance-slot-image

Fix: [TW] Recapture img "EMPTY_ENHANCE_SLOT_PLUS.png"

---------

Co-authored-by: tonyhom <tonyhom0727@gmail.com>
2025-09-25 12:25:44 +08:00
tonyhom
16da32793b Merge pull request #5157 from tonyhom/bug_fix/tw/enhance-slot-image
Fix: [TW] Recapture img "EMPTY_ENHANCE_SLOT_PLUS.png"
2025-09-25 12:10:39 +08:00
0O0o0oOoO00
bc7213001d add: get task name when notify user that the task disabled 2025-09-23 23:43:42 +08:00
LmeSzinc
56f832e533 Fix: Fallback nemu_ipc and ldopengl if not running on windows 2025-09-23 01:37:09 +08:00
LmeSzinc
ba39fe8c3f Merge pull request #5155 from LmeSzinc/dev
Bug fix
2025-09-22 04:51:31 +08:00
LmeSzinc
c5908433bf Fix: fleet role settings is unlocked after clear mode 2025-09-22 04:48:43 +08:00
LmeSzinc
076996a76a Fix: Fixup submarine spawn point on init scan (#5117)
If a grid is_submarine, the lower grid may detected as is_fleet, because they have the same ammo icon
2025-09-22 04:29:46 +08:00
LmeSzinc
e0f719b4d2 Upd: Shop templates (#5140) 2025-09-22 03:05:01 +08:00
LmeSzinc
451c549cc4 Fix: Disable MAP_WALK_USE_CURRENT_FLEET at B3 D3 2025-09-22 02:31:50 +08:00
0O0o0oOoO00
f4cd7a70ff add: flexible coin consumption settings 2025-09-21 20:22:26 +08:00
0O0o0oOoO00
474f9aeb03 upd: update description of CloseTask 2025-09-21 14:03:40 +08:00
0O0o0oOoO00
26cc11c9de add: disable task which has caused many errors already 2025-09-21 13:48:20 +08:00
0O0o0oOoO00
52b060ec18 fix: incorrect config path of NoYellowCoinLimit in OpsiHazard1Leveling 2025-09-21 13:09:32 +08:00
0O0o0oOoO00
43391df352 fix: translate NoOpsiMeowfficerFarming and NoYellowCoinLimit of OpsiHazard1Leveling 2025-09-20 22:19:54 +08:00
0O0o0oOoO00
e232b7503e add: migrate one click to stop all running instance 2025-09-20 22:12:42 +08:00
0O0o0oOoO00
089095dff1 add: migrate NoOpsiMeowfficerFarming and NoYellowCoinLimit for OpsiHazard1Leveling 2025-09-20 22:02:16 +08:00
LmeSzinc
db5267067f Merge pull request #5149 from appleapple802/dev
Upd:[TW]Event:A Dance for Amahara Above
2025-09-19 20:52:45 +08:00
下面我簡單喵兩句
ba08e8e494 Upd:[TW]Event:A Dance for Amahara Above 2025-09-19 20:28:49 +08:00
0O0o0oOoO00
64ac9ab9fe add: migrate higher priority of OpsiHazard1Leveling 2025-09-18 22:50:00 +08:00
0O0o0oOoO00
eaca620c8b adj: do not generate assets.py when don't have resource 2025-09-16 23:18:57 +08:00
0O0o0oOoO00
87f392cabc add: migrate detect others' login 2025-09-16 23:13:11 +08:00
0O0o0oOoO00
19a843b1f0 ref: use specialized counter to count failed tasks 2025-09-16 19:15:31 +08:00
0O0o0oOoO00
42e6f89ccd fix: check tasks when disable event 2025-09-16 18:35:38 +08:00
0O0o0oOoO00
31c042d9be fix: use module.equipment.fleet_equipment.OCR_FLEET_INDEX to ocr 2025-09-16 17:58:24 +08:00
0O0o0oOoO00
747ad051ed fix: redirect _ship_detail_enter and _fleet_detail_enter to its real mode 2025-09-16 17:49:48 +08:00
0O0o0oOoO00
6e2173f074 fix: use CampaignRun.run directly 2025-09-16 12:44:39 +08:00
0O0o0oOoO00
9c50966a00 add: redirect gemsfarming to 15-2 after pt finished 2025-09-16 00:21:33 +08:00
0O0o0oOoO00
e4323b6c77 add: migrate exercise delay implementation 2025-09-15 18:01:01 +08:00
0O0o0oOoO00
5e4e00eacb fix: try to add alas instance itself to watcher when start 2025-09-15 17:31:15 +08:00
0O0o0oOoO00
394ac8bd04 fix: check instance state 2025-09-15 17:30:22 +08:00
0O0o0oOoO00
66301a68f5 fix: log oil resources when battle 2025-09-14 20:26:49 +08:00
0O0o0oOoO00
45e2df51ca fix: use datetime.datetime 2025-09-14 19:51:40 +08:00
0O0o0oOoO00
eeb41afcb5 fix: use my OCR_COIN to get coin 2025-09-14 19:34:31 +08:00
0O0o0oOoO00
f5cfb2c215 add: migrate dashboard update logic 2025-09-14 19:25:40 +08:00
0O0o0oOoO00
2acd12679b add: migrate dashboard ui 2025-09-14 18:45:47 +08:00