LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-19 18:09:28 +08:00
Code Activity
9,611 Commits 12 Branches 0 Tags
bff32b75e7eb316b48ea7f05a0ee8cf00a2b3ca5
Commit Graph

2079 Commits

Author SHA1 Message Date
0O0o0oOoO00
f64bc96bb2 Merge remote-tracking branch 'LmeSzinc/master' into dev 
# Conflicts:
#	config/deploy.template-AidLux-cn.yaml
#	config/deploy.template-AidLux.yaml
#	config/deploy.template-cn.yaml
#	config/deploy.template-docker-cn.yaml
#	config/deploy.template-docker.yaml
#	config/deploy.template-linux-cn.yaml
#	config/deploy.template-linux.yaml
#	config/deploy.template.yaml
 2025-06-17 13:19:30 +08:00
LmeSzinc
d1015d9e39 Upd: [TW] BOX assets (#4879) 2025-06-14 01:31:41 +08:00
dragonheart107
86eaac9375 Merge pull request #4866 from dragonheart107/assets 
Fix: Meta-sync asset change for EN
 2025-06-10 17:56:24 +08:00
guoh064
7cef54d350 Add: check leveling in cl1 daily 2025-06-08 13:08:19 +09:00
ZuoSiZhu
573582a452 fix: color of icon stop_all change with style 2025-06-08 02:15:31 +08:00
guoh064
3b65dfe6f0 Add: check manjuu loading in os_mission_overview_accept 2025-06-06 01:57:43 +08:00
LmeSzinc
938d98a243 Fix: handle insufficient fund in guild operation 2025-06-06 01:39:18 +08:00
0O0o0oOoO00
45ac6bdf45 Merge remote-tracking branch 'LmeSzinc/master' into dev 
# Conflicts:
#	module/retire/assets.py
#	module/retire/dock.py
 2025-06-05 23:53:43 +08:00
dragonheart107
4172356a9a Upd: [EN] DOCK_SELECTED (#4850) 2025-05-30 22:09:46 +08:00
guoh064
bea88a6280 tmp: [JP] asset SUPPLY_PACK_CHECK (#4849) 2025-05-30 22:04:16 +08:00
guoh064
fe44724016 tmp: [JP] asset DOCK_CHECK 2025-05-29 22:29:54 +08:00
LmeSzinc
98f14f41fe Upd: [TW] Add BOX_USE 
assets already update in previous commit
 2025-05-27 00:16:39 +08:00
LmeSzinc
8426330813 Fix: [TW] Keep disassemble as before 2025-05-27 00:00:53 +08:00
xhqss
0339fe9dcc Merge branch 'master_lme' into dev 
# Conflicts:
#	module/event_hospital/assets.py
 2025-05-25 15:18:10 +08:00
LmeSzinc
7b2bee4ba7 Fix: [TW] handle clue popup with text only (#4819) 2025-05-24 23:36:12 +08:00
LmeSzinc
4a625e8990 Fix: TEMPLATE_MOONLIT_OVERTURE is not defined in assets 2025-05-24 23:12:01 +08:00
LmeSzinc
9acdac8089 Chore: cleanup unused assets 2025-05-24 23:08:43 +08:00
LmeSzinc
c4189ee9e1 Upd: [TW] hospital assets (#4819) 2025-05-23 20:57:31 +08:00
xhqss
791f4bfd5a Merge branch 'master' into dev 2025-05-23 00:03:44 +08:00
LmeSzinc
06fc46147f Upd: Battle UI Seaside 2025-05-22 00:30:26 +08:00
LmeSzinc
242b964981 Upd: [JP] BOX assets (#4814) 2025-05-21 23:44:58 +08:00
LmeSzinc
c226228d98 Upd: [EN] EQUIP_CONFIRM_2 2025-05-21 23:22:23 +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
91b8bf856d Upd: [EN] BUILD_CHECK, it reverts back again (#4811) 2025-05-21 03:15:15 +08:00
LmeSzinc
8a52877333 Add: chapter SP 2025-05-21 03:02:53 +08:00
LmeSzinc
14b4820523 Upd: [EN] BOX assets 2025-05-21 02:52:39 +08:00
LmeSzinc
9c83c0bbc3 Chore: Move BOX_ITEM_* to EQUIP_CONFIRM 
to be reused in retirement and enhancement
 2025-05-21 02:25:28 +08:00
LmeSzinc
4bacd2b1f1 Fix: Equipments now get auto disassembled when you use boxes 
- TODO: [EN][JP][TW] update box assets
 2025-05-21 01:41:06 +08:00
LmeSzinc
fe1606bb0d Upd: [EN][JP] MISSION_EMPTY MISSION_UNFINISH 2025-05-20 23:55:12 +08:00
LmeSzinc
3879b1546b Fix: Wait until mission list fully loaded 2025-05-19 02:52:34 +08:00
LmeSzinc
fad7c027a3 Fix: enter minigame ended at minigame menu (#4758) 2025-05-19 01:48:29 +08:00
0O0o0oOoO00
75267083c9 Merge branch 'feature/more' into dev 
# Conflicts:
#	alas.py
#	module/exception.py
 2025-05-18 22:03:42 +08:00
LmeSzinc
ef61702057 Upd: [TW] QUIT_Cyber and QUIT_New in different font weight (fixed #4798) 2025-05-18 16:16:05 +08:00
LmeSzinc
7f54ae8234 Upd: [TW] ENHANCE_CONFIRM and ENHANCE_RECOMMEND 2025-05-18 03:12:30 +08:00
0O0o0oOoO00
f709cd559d fix: STRATEGIC_SEARCH_DEVICE_STOP will mis-clicked and switch opsi global map 2025-05-11 19:34:32 +08:00
LmeSzinc
535a6ad243 Fix: More IDLE buttons to handle 2025-05-11 01:34:10 +08:00
LmeSzinc
b4930d486e Upd: [EN] ENHANCE_CONFIRM ENHANCE_RECOMMEND 2025-05-11 00:12:00 +08:00
LmeSzinc
5611f6a726 Upd: [EN] BUILD_CHECK 2025-05-11 00:00:15 +08:00
sui_feng
978167218d Merge pull request #4750 from sui-feng-cb/war_archives_update 
Add: war_archives_20220526_cn
 2025-04-25 00:00:02 +08:00
LA-DI-DA
62c33f27e0 Merge the remaining functions in MoreAlas 2025-04-24 23:30:50 +08:00
LmeSzinc
e50c984211 Fix: Re-compress assets/jp/combat_ui/QUIT.png to fixup git hashing 2025-04-21 12:35:05 +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
LmeSzinc
ea4a73ff24 Fix: Skip NPC character when entering first ship in dock (#4725, #3678) 2025-04-11 01:46:06 +08:00
LmeSzinc
18c7480e58 Upd: Battle UI Devil 2025-04-09 22:51:08 +08:00
silvergundam
73eaab8ace Merge remote-tracking branch 'lme/master' into dev 2025-04-03 11:57:44 +08:00
iceynano
3133eaa2f7 Add: Event Reaction (#4706) 
* Add: Event Reaction

* Update widgets.py

* Update widgets.py

* Update widgets.py

* Update widgets.py

* Update widgets.py
 2025-04-01 00:56:05 +08:00
POLAR me
758430b7a9 update(event_hospital): 添加秘密档案奖励收集按钮和逻辑 2025-03-31 00:13:01 +08:00