LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 20:09:25 +08:00
Code Activity
10,175 Commits 12 Branches 0 Tags
d86d75735869ea2bc23a6548c6f4e040256c380d
Commit Graph

69 Commits

Author SHA1 Message Date
xhqss
a09ecb2ee1 Merge branch 'master_lme' into dev 
# Conflicts:
#	module/config/argument/args.json
 2025-12-20 23:31:25 +08:00
LmeSzinc
63a2d7388f Upd: crop fleet clear assets to avoid collision with info_bar 2025-12-19 03:54:21 +08:00
xhqss
4137ff807c Merge branch 'master_lme' into dev 
# Conflicts:
#	module/config/argument/args.json
#	module/map/assets.py
#	module/shop/shop_reward.py
#	module/ui/assets.py
 2025-10-24 11:10:21 +08:00
LmeSzinc
b56ab2d555 Fix: Add W15 spesific FLEET_2_IN_USE that does not intersect with info_bar 2025-10-24 01:11:52 +08:00
LmeSzinc
ebe5ca794b Fix: [TW] FLEET_2_IN_USE should not intersect with info_bar 2025-10-24 00:48:42 +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
ac63403cb3 Fix: handle flare animation upon MAP_MODE_SWITCH_HARD 2025-09-13 02:19:14 +08:00
xhqss
fbe58bd329 Merge branch 'refs/heads/master_lme' 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/device/method/adb.py
#	module/device/screenshot.py
 2024-07-26 10:28:26 +08:00
LmeSzinc
5e05db05d0 Add: Switch mode in map preparation 2024-07-26 02:20:15 +08:00
Zuosizhu
b6e6f60754 Merge branch 'LmeSzinc:master' into 20230309 2024-03-29 07:09:29 +08:00
LmeSzinc
c59bddfc7e Upd: [TW] MAP_OFFENSIVE and SWITCH_OVER (#3544) 2024-03-21 18:21:15 +08:00
Zuosizhu
50aef0ec0f Fix: Same ships are black when changing hard mode flagships 2023-12-24 18:57:53 +08:00
Zuosizhu
7f9c64e284 Merge branch 'LmeSzinc:master' into 20230309 2023-11-10 14:33:24 +08:00
hephooey
99a4478563 [TW]: Update WITHDRAW and IN_MAP assets (#3276) 2023-11-10 10:53:29 +08:00
Zuosizhu
b842d27611 Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-26 00:04:07 +08:00
LmeSzinc
fb3d736bbb Fix: [JP] SUBMARINE_BAR 2023-10-22 21:51:52 +08:00
hephooey
12c3dfd159 [tw] Update WITHDRAW asset (#3217) 2023-10-22 16:14:17 +08:00
appleapple802
c5bd99ff4c Upd: [TW] map and handler assets 2023-10-21 12:34:05 +08:00
Zuosizhu
9e31b5eb43 Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-20 22:44:25 +08:00
LmeSzinc
e8340df57c Upd: [EN] _fleet_sidebar 2023-10-20 01:11:59 +08:00
LmeSzinc
d2302836ec Upd: [EN] Fleet preparation 2023-10-20 01:02:47 +08:00
Zuosizhu
e2f7cd544f Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-20 01:01:54 +08:00
LmeSzinc
0c93da2373 Upd: Sync FLEET_PREPARATION_CHECK 2023-10-20 00:03:28 +08:00
LmeSzinc
cc60e701fc Upd: [JP] Fleet preparation 2023-10-20 00:03:25 +08:00
LmeSzinc
ce13aaa8b7 Upd: [CN] _fleet_sidebar 2023-10-19 22:30:06 +08:00
LmeSzinc
4969dc01b0 Upd: [CN] Fleet preparation 2023-10-19 22:02:24 +08:00
Zuosizhu
dfa815645d Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/campaign_status.py
#	module/config/argument/args.json
 2023-09-15 08:26:53 +08:00
LmeSzinc
14c92519f8 Upd: [JP] FLEET_PREPARATION 2023-09-14 23:40:09 +08:00
Zuosizhu
53f44f3ff5 Merge branch 'master_lme' 
# Conflicts:
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2023-03-11 16:21:26 +08:00
LmeSzinc
4610d9babf Upd: [TW] FLEET_*_ADVICE 2023-03-11 03:56:46 +08:00
LmeSzinc
ac379b0143 Upd: [EN][JP] FLEET_*_ADVICE 2023-03-11 01:58:39 +08:00
LmeSzinc
cb1d4f24d3 Opt: Raise error when user running a hard mode but haven't prepared the fleets 2023-03-10 23:10:19 +08:00
Zuosizhu
db8aede987 Feature: Change flagship and vanguard in Event hard mode when GemsFarming 2023-02-24 18:37:14 +08:00
SaarChaffee
303dd90fdc change CRLF to LF 2022-04-09 23:31:09 +08:00
LmeSzinc
1bb2f48b0a Fix: Move MAP_CAT_ATTACK_MIRROR to map buff icons 
because EN has a different fleet position on the left
 2022-03-01 23:19:03 +08:00
LmeSzinc
7c90e4120a Fix: Handle the animation of being attacked by siren submarine in map 2022-02-25 19:13:02 +08:00
LmeSzinc
d5735604e1 Dev: Uniform comments of generated files 2021-12-07 23:29:33 +08:00
Cola
82f354da03 Fix: [TW] Submarine&Fleet assets 2021-11-25 13:31:47 +08:00
LmeSzinc
b554a39351 Refactor: Fleet switching and fleet reverse 
- Revert swipe limit of ensure_edge_insight
 2021-11-06 22:25:14 +08:00
Ray
b53f271179 Fix: [JP] update map/ FLEET_* & SUBMARINE_* assets 2021-10-19 14:40:22 +08:00
nEEtdo0d
4c2669d4de Fix: [EN] sub fleet not handled, map/SUBMARINE_* assets updated 2021-08-08 08:39:45 -04:00
Zorachristine
c3a104d138 Fix: [Tw] FLEET_PREPARATION assets 2021-06-10 22:29:55 +08:00
LmeSzinc
d9128d3f77 Fix: Re-implement hard mode detection 2021-06-10 17:46:55 +08:00
LmeSzinc
05ac576bf1 Fix: Update FLEET_PREPARATION_HARD_* (#470) 2021-06-10 17:00:15 +08:00
LmeSzinc
7ba14590a6 Fix: UI changes in fleet preparation 
EN, JP, TW need to update assets except *_IN_USE and check _fleet_sidebar
 2021-06-10 16:07:32 +08:00
noname94
f92234614d Fix: [JP] assets fix 2 after font changed 
Many assets with words need fixes after the font changed. Most functions should work now.
 2021-04-16 13:58:57 +09:00
noname94
625f03ae54 Fix: [TW] assets updated to fix #348 
Copied from CN folder.
 2021-02-14 13:53:30 +09:00
LmeSzinc
ae639e9409 Fix: Wrong detection of fleet_2.in_use() in fleet preparation 
if ship avatar background is loaded but ship itself is not loaded
 2021-02-13 23:16:01 +08:00
LmeSzinc
5113cf9d55 Opt: Avoid double-clicking CLEAR, and waiting for info_bar in in_use() (#341) 2021-02-13 00:17:02 +08:00
nEEtdo0d
b2f1b21e9b Add: [EN] AUTO_SEARCH_* assets, 
Verified AUTO_SEARCH_SET_* are at the same location as CN for EN,
likely other servers share this same trait
 2021-01-27 18:28:18 -05:00