LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-21 05:19:28 +08:00
Code Activity
7,931 Commits 12 Branches 0 Tags
ce6cb8c4bfd1f105b054e4eaafeeaa2a8be99ee4
Commit Graph

1786 Commits

Author SHA1 Message Date
Zuosizhu
f5b3d11eac Merge branch 'LmeSzinc:master' into 20230309 2024-04-11 23:14:52 +08:00
LmeSzinc
dba2309f9d Upd: [CN] Add TEMPLATE_STAGE_CLEAR_SMALL to handle bugged game client 2024-04-11 21:59:29 +08:00
LmeSzinc
92a9761d1b Upd: [CN] Smaller SWITCH_2_EX to handle game client bug 2024-04-11 21:48:58 +08:00
Zuosizhu
69aebdcf30 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	deploy/Windows/app.py
#	deploy/Windows/config.py
#	deploy/Windows/emulator.py
#	deploy/Windows/git.py
#	deploy/Windows/logger.py
#	deploy/Windows/template.yaml
#	module/campaign/gems_farming.py
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	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/device/device.py
#	module/device/emulator.py
#	module/device/method/droidcast.py
#	module/device/platform/emulator_base.py
#	module/device/platform/emulator_windows.py
#	module/device/platform/platform_windows.py
#	module/handler/auto_search.py
 2024-04-10 12:22:40 +08:00
霞飛
09fe301597 fix: ship template assets bit error (#3618) 2024-04-09 11:23:16 +08:00
ygrzxc
7d574dde8b Add: Change the designated vanguard combination (#3520) 
* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Translation for change the designated vanguard combination

* Add: Translation for change the designated vanguard combination

* Upd:Update dev's args.json

* Upd:Update dev's args.json

* Upd:Reduce template image size and Implement function

* Upd:Reduce template image size and Implement function

* Upd:Reduce template image size and Implement function

---------

Co-authored-by: y y <jaxvuav@163.com>
 2024-04-08 22:49:30 +08:00
LmeSzinc
df408fad9d Upd: [EN] DORM_FEED_ENTER 2024-04-05 17:48:34 +08:00
guoh064
894e0c4c82 Opt: reset dorm view before dorm_collect (#3510) 2024-04-03 23:42:20 +08:00
guoh064
555fb2ad29 Upd: Assets FORMATION to adapt to W15 2024-04-03 17:24:40 +08:00
Zuosizhu
1039db5968 Merge branch 'LmeSzinc:master' into 20230309 2024-03-30 14:40:51 +08:00
LmeSzinc
de1bcde054 Upd: [EN] BATTLE_PREPARATION 2024-03-29 09:23:46 +08:00
Zuosizhu
b6e6f60754 Merge branch 'LmeSzinc:master' into 20230309 2024-03-29 07:09:29 +08:00
LmeSzinc
c98a5a7ad9 Upd: [EN] BATTLE_PREPARATION 
it's 5 frames now - -
 2024-03-29 03:23:20 +08:00
LmeSzinc
fe223d70bf Fix: Swapped RPG_RAID_EASY and RPG_RAID_NORMAL 2024-03-29 03:21:10 +08:00
LmeSzinc
e8909f4d59 Add: UI switches in RPG raid 2024-03-29 02:17:47 +08:00
LmeSzinc
32e4571afc Upd: LOGIN_ANNOUNCE 2024-03-28 23:43:18 +08:00
RilyLC
7a01eadcd2 Upd:[TW]Event:Reflections of the Oasis (#3574) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2024-03-21 19:33:21 +08:00
LmeSzinc
d1a9ce771d Upd: [CN] MISSION_POPUP_ACK and MISSION_POPUP_GO (#3530) 2024-03-21 18:44:49 +08:00
LmeSzinc
ceca042afc Fix: [CN][JP] Handle bugged AUTO_SEARCH_OS_MAP_OPTION_OFF button 
- TODO: [EN][TW] Update AUTO_SEARCH_OS_MAP_OPTION_OFF_DISABLED
 2024-03-21 18:35:48 +08:00
LmeSzinc
c59bddfc7e Upd: [TW] MAP_OFFENSIVE and SWITCH_OVER (#3544) 2024-03-21 18:21:15 +08:00
Zuosizhu
d67836f440 Merge branch 'LmeSzinc:master' into 20230309 2024-03-15 07:41:59 +08:00
guoh064
b0b54a4b68 Add: War Archives The Way Home in the Night 2024-03-11 22:57:37 +08:00
guoh064
4ba1d50ec7 Add: War Archives The Solomon Ranger 2024-03-11 22:47:32 +08:00
guoh064
0ddd253514 Add: War Archives Prelude under the Moon 2024-03-11 22:26:33 +08:00
guoh064
caeb091ce6 Add: War Archives Counterattack within the Fjord 2024-03-11 21:26:35 +08:00
Zuosizhu
dd0d415b67 Merge branch 'LmeSzinc:master' into 20230309 2024-03-02 09:01:48 +08:00
LmeSzinc
0a59b8efb5 Add: Chapter SP 2024-03-02 03:34:24 +08:00
guoh064
56a93de7b0 Upd: [CN, EN, JP] dorm asset DORM_RED_DOT (#3506) 2024-02-23 21:59:15 +08:00
somegituser
4f779f66b2 add: war archive Khorovod of Dawn's Rime (#3505) 
新增作战档案：破晓冰华
 2024-02-23 21:58:52 +08:00
Zuosizhu
f7a193a8c0 Merge branch 'LmeSzinc:master' into 20230309 2024-02-18 16:36:23 +08:00
RilyLC
adaf2a6160 Upd:[TW]war_archives assets (#3490) 2024-02-18 01:37:15 +08:00
Zuosizhu
f8ce1d0395 Merge branch 'LmeSzinc:master' into 20230309 2024-02-07 01:42:58 +08:00
RilyLC
7968771265 Upd:[TW]Event assets (#3479) 2024-02-07 00:00:41 +08:00
Zuosizhu
73c29c9afd Merge branch 'LmeSzinc:master' into 20230309 2024-02-06 21:00:56 +08:00
LmeSzinc
a8a5f5b888 Upd: [EN][JP] Sync DORMMENU assets 2024-02-06 19:22:22 +08:00
yypsybs
8156a60b0c Upd: Dorm menu assets CN 2024-02-06 19:18:57 +08:00
yypsybs
40825c0a42 Upd: Dorm menu assets CN 2024-02-06 18:56:46 +08:00
Zuosizhu
edccf21374 Merge branch 'LmeSzinc:master' into 20230309 2024-01-31 22:10:18 +08:00
weeswelai
01dadb5456 Upd: Update raid_20240130 assets for CN sever. 2024-01-31 22:06:43 +08:00
Zuosizhu
62712d1864 Merge branch 'LmeSzinc:master' into 20230309 2024-01-31 13:10:56 +08:00
LmeSzinc
c651c250ec Merge branch 'dev' 
# Conflicts:
#	campaign/Readme.md
 2024-01-31 12:17:49 +08:00
weeswelai
b04b349206 Add: Add raid event Spring Festive Fiasco(raid_20240130) 2024-01-31 10:57:34 +08:00
Zuosizhu
356496af2c Merge branch 'LmeSzinc:master' into 20230309 2024-01-24 00:47:13 +08:00
somegituser
d29f93c1c1 add: wararchive Dreamwaker's Butterfly & Mirror Involution 
新增作战档案: 蝶海梦花&镜位螺旋
 2024-01-23 14:05:05 +08:00
LmeSzinc
9e135993ce Upd: [EN] ACADEMY_CHECK 2024-01-12 18:00:35 +08:00
Zuosizhu
79956f8b66 Merge branch 'master_lme' 2024-01-11 16:59:27 +08:00
LmeSzinc
944190c46e Upd: [EN] ACADEMY_CHECK 2024-01-06 01:51:48 +08:00
Zuosizhu
9934be19fe Merge branch 'master_lme' 
# Conflicts:
#	module/config/config.py
#	submodule/AlasFpyBridge/module/config/config.py
 2023-12-29 14:46:10 +08:00
LmeSzinc
94348e7b9f Revert "Upd: [EN] ACADEMY_CHECK" 
Well I hate them changing things back and forth
 2023-12-29 00:21:35 +08:00
Zuosizhu
50aef0ec0f Fix: Same ships are black when changing hard mode flagships 2023-12-24 18:57:53 +08:00