LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-16 22:19:30 +08:00
Code Activity
9,684 Commits 12 Branches 0 Tags
f1cfd90deb98dead6cb6f66ea4e94e5facee0519
Commit Graph

54 Commits

Author SHA1 Message Date
0O0o0oOoO00
fe63274fe7 Adj: remove the minimum oil limit of coalition 2025-07-09 18:28:57 +08:00
0O0o0oOoO00
171520adfb Merge remote-tracking branch 'LmeSzinc/master' into dev 
# Conflicts:
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/ui/ui.py
 2025-06-28 23:09:47 +08:00
LmeSzinc
9e256ce249 Fix: NEONCITY UI back and home 2025-06-28 19:36:07 +08:00
dragonheart107
9b63eaee7c Fix: assets for EN and JP 2025-06-27 22:18:08 +02:00
LmeSzinc
f000dd0997 Fix: Close coalition preparation before switching task 2025-06-27 04:57:12 +08:00
LmeSzinc
7a773a4c02 Fix: Check empty fleets in coalition 2025-06-27 00:32:14 +08:00
LmeSzinc
cd86ef82ec Fix: Swapped switch states 2025-06-27 00:24:56 +08:00
LmeSzinc
f6f7b7779d Upd: UI page switching 2025-06-27 00:10:44 +08:00
LmeSzinc
118d80f61a Add: Assets for coalition NEONCITY 2025-06-26 23:49:31 +08:00
ZuoSiZhu
dee0c1484f Merge branch 'master_lme' into dev 
# Conflicts:
#	campaign/Readme.md
#	module/base/utils.py
#	module/coalition/assets.py
#	module/config/argument/args.json
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/handler/login.py
#	module/retire/dock.py
#	module/retire/enhancement.py
#	module/shop/shop_reward.py
 2025-05-21 04:17:08 +08:00
LmeSzinc
55ce5df582 Fix: Stop clicking BATTLE_STATUS after coalition reward 2025-04-19 21:55:09 +08:00
LmeSzinc
1a0b027db3 Fix: [EN][JP] Rename Frostfall assets 2025-04-18 23:24:04 +08:00
LmeSzinc
15cf552963 Upd: Swap FROSTFALL_TC2 too 2025-04-18 19:47:00 +08:00
xhqss
f35c9d289f Brute-force porting of LME updates to the event_20250417 branch 2025-04-18 00:07:46 +08:00
LmeSzinc
62d260db02 Upd: FROSTFALL_TC3 and FROSTFALL_SP are swapped 2025-04-17 22:27:13 +08:00
xhqss
e7f93d8efe Merge branch 'master_lme' 
# Conflicts:
#	module/equipment/equipment.py
 2024-12-20 23:51:48 +08:00
LmeSzinc
4ab8337324 Sync: [ALAS] Refactored Switch.set() 2024-12-11 11:46:19 +08:00
LA_DI_DA
a2e6986dcd Merge branch 'refs/heads/LmeSzinc/master' into dev 
# Conflicts:
#	module/campaign/campaign_status.py
#	module/exercise/combat.py
#	module/retire/dock.py
#	module/retire/enhancement.py
 2024-10-25 12:01:29 +08:00
Air111
98e6d1397c Upd: [TW] Assets for COALITION_ACADEMY 2024-10-20 22:36:01 +08:00
LA_DI_DA
5ab8cfdee5 Merge branch 'refs/heads/lme-alas/master' into dev 
# Conflicts:
#	README.md
 2024-07-06 19:17:11 +08:00
LmeSzinc
a6cc863c01 Fix: No fleet mode in coalition_20240627 easy 2024-07-01 17:02:22 +08:00
LmeSzinc
674f79ef4d fix: handle gulid popup (#3950) 2024-07-01 13:39:04 +08:00
Zuosizhu
1e31cb6de5 Merge branch 'master_lme' into AlasGGdev 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/coalition/coalition.py
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/os/operation_siren.py
#	module/os_handler/os_status.py
 2024-06-28 16:01:16 +08:00
guoh064
3f0a6908c6 Upd: [JP] Assets for page_coalition 2024-06-28 12:16:25 +08:00
guoh064
ee8e2ff57f Add: [JP] Assets for coalition_20240627 2024-06-28 12:16:25 +08:00
LmeSzinc
c45c80c147 Add: [EN] Assets for coalition_20240627 2024-06-28 03:00:47 +08:00
LmeSzinc
7fba50035c Upd: [EN] Assets for page_coalition 2024-06-28 02:42:38 +08:00
LmeSzinc
38874e2982 Fix: No pt check in combat preparation 2024-06-28 02:00:06 +08:00
LmeSzinc
9bdfdb6447 Fix: Override mode in CoalitionSp 2024-06-28 01:54:38 +08:00
LmeSzinc
a8f8432842 Add: [CN] Assets for coalition_20240627 2024-06-28 01:18:59 +08:00
LmeSzinc
752d4ea043 Add: UI switches to page_coalition 2024-06-28 00:28:03 +08:00
LA-DI-DA
a65f53b966 Merge branch 'lme-alas/master' into smallkai 
# Conflicts:
#	module/map/assets.py
 2023-10-19 23:00:39 +08:00
LmeSzinc
4969dc01b0 Upd: [CN] Fleet preparation 2023-10-19 22:02:24 +08:00
LmeSzinc
f23c960b97 Fix: Actively clear stuck records in combat 2023-10-14 21:03:58 +08:00
Zuosizhu
78d8ed1c5b Merge branch 'master_lme' 
# Conflicts:
#	assets/gui/css/light-alas.css
#	module/config/argument/args.json
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/webui/app.py
 2023-09-02 17:47:24 +08:00
hephooey
dfce73e8d3 Update tw assets for Frostfall (#3051) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-08-25 12:38:19 +08:00
Zuosizhu
b5ac3cc06a Merge branch 'LmeSzinc:master' into 20230309 2023-04-07 15:46:07 +08:00
LmeSzinc
2cce729a60 Fix: Force emotion control to over prevent_yellow_face in single coalitions 2023-04-04 02:21:15 +08:00
Zuosizhu
5688408f59 Fix: Not logging Coalition PT 
(cherry picked from commit fa73aa561c)
 2023-03-25 12:04:46 +08:00
LmeSzinc
e7b937f97b Fix: click_last.reset() 2023-03-24 23:31:11 +08:00
hgjazhgj
d708edce1b Fix: emotion_reduce when Coalition_Fleet=='multi' (#2399) 2023-03-24 22:50:05 +08:00
Bookbug
28b0b52b46 Fix: [JP] Asset problem caused by UI hotfix (#2400) 2023-03-24 22:46:18 +08:00
LmeSzinc
663d9d6799 Upd: [EN][JP] COALITION_REWARD_CONFIRM 2023-03-24 14:08:05 +08:00
LmeSzinc
9a1e76c366 Fix: Catch ScriptEnd raised from emotion control 2023-03-24 13:52:06 +08:00
bookbug666
2b8dd3895a Add: Assets of Coalition 2023-03-24 11:46:44 +08:00
LmeSzinc
6dd541e050 Opt: Skip transitions between battles 2023-03-24 05:59:47 +08:00
LmeSzinc
58eab7a1b6 Fix: battle_count is never reset 2023-03-24 05:43:51 +08:00
LmeSzinc
14870c6807 Fix: ui switches to page_coalition 2023-03-24 05:31:26 +08:00
LmeSzinc
303737584d Upd: [JP] Coalition assets 
TODO: Update FLEET_SWITCH_*
 2023-03-24 05:07:20 +08:00
LmeSzinc
4eadbe1f80 Upd: [EN] Coalition assets 2023-03-24 05:01:48 +08:00