1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-22 21:09:29 +08:00
Commit Graph

7007 Commits

Author SHA1 Message Date
Zuosizhu
1eef741b73 Fix: medal shop 2025-10-12 16:18:32 +08:00
Zuosizhu
26db9292c8 Fix: shit shop 2025-10-12 16:06:44 +08:00
Zuosizhu
f8dc506dad Fix: shit 2025-10-12 12:43:32 +08:00
Zuosizhu
65df98ba36 Fix: shop 2025-10-12 12:35:42 +08:00
Zuosizhu
0d849aa003 Fix: shop_core 2025-10-12 11:49:27 +08:00
Zuosizhu
3f3c8ca291 Upd: args.json 2025-10-12 11:33:24 +08:00
Zuosizhu
31c99d8953 Merge remote-tracking branch 'Lme/master' into dev
# Conflicts:
#	module/campaign/os_run.py
#	module/config/argument/args.json
#	module/os/operation_siren.py
#	module/retire/assets.py
#	module/shop/shop_reward.py
#	module/shop/ui.py
#	module/ui/assets.py
2025-10-12 11:28:13 +08:00
Zuosizhu
f64f777631 Upd: assets 2025-10-12 01:28:32 +08:00
LmeSzinc
80fe33d9c4 Upd: [JP] shop navigation assets
- TODO: update FREE_SUPPLY_PACK
2025-10-11 01:12:31 +08:00
LmeSzinc
40876858ae Upd: [TW] Neoncity assets
TODO: add NEONCITY_SWITCH_SINGLE, NEONCITY_SWITCH_MULTI (#5201)
2025-10-11 01:03:04 +08:00
LmeSzinc
c0f6c52597 Fix: reverted local remote in _adb_reverse_transport (#5200) 2025-10-11 00:54:31 +08:00
LmeSzinc
4347616d55 Opt: call cl1 if enabled if meowfficerfarming ends with enough yellow coins (#5020)
* Opt: call cl1 if enabled if meowfficerfarming ends with enough yellow coins

* Revert "Add: continue cl1 if enabled after meowfficerfarming finished. (#2805)"

This reverts commit 4c48b019bc.
2025-10-11 00:42:05 +08:00
nEEtdo0d
a61e93942d Upd: [EN] UI, ShopUI, Freebies assets (#5202) 2025-10-10 21:20:18 +08:00
下面我簡單喵兩句
04cea16725 Upd:[TW]Event:The Neon City Investigator (#5201)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: tonyhom <tonyhom0727@gmail.com>
2025-10-10 21:19:12 +08:00
LmeSzinc
2267203305 Upd: ShopUI from #5197 2025-10-09 21:59:37 +08:00
LmeSzinc
470babfe80 Refactor: shop ui navigation 2025-10-09 21:44:27 +08:00
LmeSzinc
5df0383395 Tmp: Disable shop before assets updated 2025-10-09 21:16:08 +08:00
LmeSzinc
a1b9fffb16 Chore: Cleanup code and assets of old UI 2025-10-09 21:12:33 +08:00
LmeSzinc
f5b92dae34 Upd: [CN] MUNITIONS_CHECK 2025-10-09 19:17:06 +08:00
LmeSzinc
073464a298 Opt: clear interval of pages after collecting data keys 2025-10-09 18:38:26 +08:00
LmeSzinc
e1b5ff7ba2 Upd: [CN] SUPPLY_PACK_CHECK 2025-10-09 18:33:35 +08:00
LmeSzinc
21c83983d6 Fix: Expand search area of FREE_SUPPLY_PACK
so we don't need to bother minor shift
2025-10-09 18:28:26 +08:00
LmeSzinc
f9eff1fe2d Fix: [ALAS] adb reverse 2025-10-09 18:10:49 +08:00
0O0o0oOoO00
d67aaab662 add: luahook api retry 2025-10-04 18:46:47 +08:00
Zuosizhu
0c9b424fc2 Upd: GUILD_DISPATCH_FLEET_UNFILLED.png 2025-10-01 14:01:55 +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
Zuosizhu
e8947aa534 Revert "Fix: temporary fix for OutOfMemory"
This reverts commit 48f7ce2637.
2025-09-28 20:03:23 +08:00
weeswelai
cdad6ed32e Upd: Update shop_tab_250814 for server CN, TW 2025-09-28 14:11:56 +08:00
Zuosizhu
48f7ce2637 Fix: temporary fix for OutOfMemory 2025-09-28 13:04:13 +08:00
LmeSzinc
9a819b738d Fix: Battle UI Ninja in _at_low_hp 2025-09-27 01:47:50 +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
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
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
下面我簡單喵兩句
ba08e8e494 Upd:[TW]Event:A Dance for Amahara Above 2025-09-19 20:28:49 +08:00
silvergundam
da25e5c919 Fix: action point limit to maxsize 2025-09-14 02:19:03 +08:00
0O0o0oOoO00
f65933e89a Merge branch 'Lme/master' into dev
# Conflicts:
#	README.md
#	module/config/argument/args.json
2025-09-13 23:04:47 +08:00
LmeSzinc
44b3ae1884 Opt: Avoid extra clicking MAP_MODE_SWITCH_HARD on appear animation 2025-09-13 20:53:12 +08:00
LmeSzinc
bd217b739b Fix: Shorten ASIDE_SWITCH_20241219 unknown_timer 2025-09-13 20:39:11 +08:00
LmeSzinc
4b5039fabf Chore: Expose Switch timers 2025-09-13 20:34:22 +08:00
LmeSzinc
8f79452fd3 Fix: [ALAS] Handle copy-pasted serial 5555,16384 to be fool-proof 2025-09-13 20:25:58 +08:00
sui_feng
4d5c855e3a Fix: FAST_FORWARD for minor icon shift (#5131) 2025-09-13 20:17:26 +08:00