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

76 Commits

Author SHA1 Message Date
Zuosizhu
d1174a7d88 Merge remote-tracking branch 'Lme/master' into unrefactor 
# Conflicts:
#	module/campaign/campaign_event.py
#	module/campaign/os_run.py
#	module/coalition/coalition.py
#	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/os/operation_siren.py
#	module/os_handler/mission.py
#	module/webui/app.py
 2026-01-24 14:18:46 +08:00
LmeSzinc
6d47f626d1 Opt: Disable event if current event type is raid or coalition 2026-01-23 17:39:46 +08:00
LmeSzinc
0b8d1a5b57 Fix: Empty fleet check should after switching fleet mode 2026-01-23 17:26:14 +08:00
guoh064
e01b77c6e5 Fix: more clear _coalition_has_oil_icon usage (#5473) 2026-01-23 17:25:15 +08:00
LmeSzinc
afbdd261e6 Fix: Handle coalition fleet reuse popup 2026-01-23 16:32:38 +08:00
LmeSzinc
f314caa862 Upd: [EN][JP] Coalition FASHION assets 2026-01-23 16:24:56 +08:00
LmeSzinc
b65a951ce4 Add: FASHION Coalition assets 2026-01-23 02:40:22 +08:00
xhqss
a5dc9328c9 Merge branch 'master_lme' into dev 
# Conflicts:
#	module/coalition/coalition.py
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/config_generated.py
#	module/os_shop/shop.py
 2025-12-19 15:13:21 +08:00
LmeSzinc
b7301482c7 Fix: Retry on default coalition PT 999999 2025-12-01 01:07:21 +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
Zuosizhu
5120649acb Merge remote-tracking branch 'Lme/master' into dev 
# Conflicts:
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/i18n/en-US.json
 2025-11-27 21:53:49 +08:00
guoh064
83f103daa2 Add: [EN] assets for coalition_20251120 (#5347) 2025-11-27 02:08:42 +08:00
guoh064
369a12abfb Fix: ui misclick in coalition_20251120 2025-11-25 12:53:26 +08:00
guoh064
be012c843d Upd: [CN] assets for coalition_20251120 2025-11-23 22:54:11 +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
a07c99fe85 Add: [JP] coalition_20251120 2025-11-23 01:42:38 +08:00
xhqss
90c881fda0 Merge branch 'master_lme' into dev 
# Conflicts:
#	module/coalition/coalition.py
#	module/config/argument/args.json
#	module/ui/assets.py
 2025-10-17 00:30:43 +08:00
whjhs1010203
59e5a39d64 Fix: Can't get oil amount for TW server (#5217) 
* Fix: Can't get oil amount for TW server

* fix condition

forgot parameter

* delete unnecessary part

remove return main page
 2025-10-15 18:21:37 +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
LmeSzinc
40876858ae Upd: [TW] Neoncity assets 
TODO: add NEONCITY_SWITCH_SINGLE, NEONCITY_SWITCH_MULTI (#5201)
 2025-10-11 01:03:04 +08:00
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