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

5671 Commits

Author SHA1 Message Date
LA_DI_DA
8a2d536260 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
#	module/ui/page.py
 2024-03-29 21:14:59 +08:00
Zuosizhu
b6e6f60754 Merge branch 'LmeSzinc:master' into 20230309 2024-03-29 07:09:29 +08:00
LmeSzinc
6c4b477000 Fix: Continue gacha even if UR exchange point is full (#3582) 2024-03-29 03:28:29 +08:00
LmeSzinc
fe223d70bf Fix: Swapped RPG_RAID_EASY and RPG_RAID_NORMAL 2024-03-29 03:21:10 +08:00
LmeSzinc
8be7d9f794 Add: Enter stage in RPG raid 2024-03-29 02:27:36 +08:00
LmeSzinc
e8909f4d59 Add: UI switches in RPG raid 2024-03-29 02:17:47 +08:00
LmeSzinc
164fcc96c5 Add: Event entrance of From Zero to Hero (raid_20240328) 2024-03-28 23:47:42 +08:00
LmeSzinc
32e4571afc Upd: LOGIN_ANNOUNCE 2024-03-28 23:43:18 +08:00
LmeSzinc
6a23f82e6c Fix: [ALAS] Enhance auto device detection, ignore 127.0.0.1:7555 from MuMu 12 2024-03-21 19:34:08 +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
weeswelai
51fa384dc6 Upd: Modify check interval to 6 days to avoid missing rerun event furniture. 2024-03-21 18:13:07 +08:00
weeswelai
d702a3ec0a Upd: Make handle dorm popup the lowest priority 2024-03-21 18:13:07 +08:00
LmeSzinc
f076ba12ed Add: [ALAS] Proxy element props 2024-03-16 16:02:07 +08:00
LA_DI_DA
0dcfc6c95a Revert "Update config_updater.py and template" 
This reverts commit 4019f6735a.
 2024-03-16 13:19:52 +08:00
Zuosizhu
d67836f440 Merge branch 'LmeSzinc:master' into 20230309 2024-03-15 07:41:59 +08:00
LmeSzinc
8af7b7bba5 Upd: Config update 2024-03-15 00:25:52 +08:00
LmeSzinc
81c59dddd2 Merge branch 'dev' into war_archives_20200603_cn 2024-03-15 00:23:31 +08:00
RilyLC
12b612da44 Upd:[TW]Event:Daedalian Hymn Rerun (#3547) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2024-03-15 00:22:00 +08:00
梦念逍遥
d921c3a845 Upd: Event Virtual Tower Rerun (#3546) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2024-03-15 00:17:29 +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
guoh064
888d72b682 Fix: handle info bar which obstructs DORM_RED_DOT (#3528) 
* Upd: [CN, EN, JP] dorm asset DORM_RED_DOT

* Fix: handle info bar which obstructs DORM_RED_DOT
 2024-03-07 17:06:05 +08:00
LA_DI_DA
300a28148a Upd: default ship data 2024-03-04 22:36:21 +08:00
LA_DI_DA
3dba1cf7f9 Add: ship filter for GemsFarming 2024-03-04 22:35:19 +08:00
LA_DI_DA
fb93d4caf8 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
 2024-03-02 11:33:53 +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
LmeSzinc
ffb38e5d83 Add: Event entrance of Snowrealm Peregrination (event_20240229_cn) 2024-03-01 23:27:03 +08:00
LA_DI_DA
c5456814a5 Fix: force event daily, raids and coalitions to latest event 2024-03-01 20:32:58 +08:00
RilyLC
5daf97ff8d Upd:[TW]Event:Revelations of Dust (#3511) 
* Upd:[TW]Event:Revelations of Dust

* remove CN Event
 2024-02-29 21:33:41 +08:00
LA_DI_DA
5bbec80747 Merge branch 'zuosizhu-alas/20230309' into smallkai 2024-02-28 13:57:51 +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
dac4d62f17 Merge branch 'LmeSzinc:master' into 20230309 2024-02-23 00:58:31 +08:00
LmeSzinc
c5fb5a57c5 Revert "Fix: Handle bugged AP button before game devs get it fixed" 
This reverts commit b615ebf3
 2024-02-22 21:00:52 +08:00
LmeSzinc
b615ebf3cf Fix: Handle bugged AP button before game devs get it fixed 2024-02-22 16:36:32 +08:00
huangjiule
6af48d7be9 Update retirement.py (#3500) 
* Upd:[TW]Event assets (#3479)

* Upd:[TW]war_archives assets (#3490)

* Update retirement.py

选择更换任意白皮航母时，能够正确保留退役

---------

Co-authored-by: RilyLC <94281898+RilyLC@users.noreply.github.com>
 2024-02-22 16:30:00 +08:00
LA_DI_DA
c30ed73736 Add: confirm for clear all task 2024-02-19 17:38:06 +08:00
LA_DI_DA
6e1baa0965 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
 2024-02-18 17:43:53 +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
LA_DI_DA
142cc1696d Add: one click clear all task 2024-02-15 19:23:34 +08:00
LA_DI_DA
1a467113f9 Fix: reset general shop consume coins setting when setting is still bool 2024-02-15 18:16:28 +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