LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-20 04:39:29 +08:00
Code Activity
7,809 Commits 12 Branches 0 Tags
f8ce1d0395f832ffd4265a19c1e8d8920fa0dcff
Commit Graph

5416 Commits

Author SHA1 Message Date
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
RilyLC
511f719240 Upd:[TW]Event:Winter Pathfinder (#3478) 2024-02-06 21:35:22 +08:00
Zuosizhu
73c29c9afd Merge branch 'LmeSzinc:master' into 20230309 2024-02-06 21:00:56 +08:00
LmeSzinc
19ee45b8f2 Merge pull request #3477 from LmeSzinc/dev 
Bug fix
 2024-02-06 20:42:21 +08:00
LmeSzinc
ae855a8a74 Fix: Handle missing / in dorm food ocr 2024-02-06 20:39:23 +08:00
LmeSzinc
1750f31199 Fix: Handle missing / in tactical skill ocr 2024-02-06 20:29:10 +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
weeswelai
b3521111f9 Upd: Update pt OCR recognition of Raid_20240130 2024-02-05 10:41:53 +08:00
Zuosizhu
edccf21374 Merge branch 'LmeSzinc:master' into 20230309 2024-01-31 22:10:18 +08:00
guoh064
e148c9f2ae Upd: Shipyard argument (PR4 and DR3) 2024-01-31 22:06:56 +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
1e70cabadf Merge branch 'master_lme' 
# Conflicts:
#	deploy/alas.py
 2024-01-31 09:13:04 +08:00
LmeSzinc
5a9e9f0a25 Merge pull request #3457 from LmeSzinc/dev 
Bug fix
 2024-01-30 00:49:34 +08:00
LmeSzinc
640365584d Fix: Handle missing / in StockCounter 2024-01-30 00:30:54 +08:00
Zuosizhu
f2ce895db0 Adj: Disable auto clear map for 15-3/15-4, for there's new mechanism 2024-01-27 09:24:17 +08:00
Zuosizhu
9dd7d5b2b6 Add: Campaign_15 
Adj: GemsFarming return to 15-1 if gg_on
 2024-01-27 00:32:31 +08:00
Zuosizhu
98f02c7fa5 Merge branch 'LmeSzinc:master' into 20230309 2024-01-26 00:25:15 +08:00
RilyLC
c4e3c8966d Upd:[TW]Event:Mirror Involution Rerun (#3449) 2024-01-25 21:32:31 +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
290456637c Fix: Allow enter map with is_combat_loading 2024-01-12 18:40:47 +08:00
LmeSzinc
26b2ad293a Fix: Slow OCR is detected as commission flashing bug 2024-01-12 18:29:25 +08:00
LmeSzinc
9e135993ce Upd: [EN] ACADEMY_CHECK 2024-01-12 18:00:35 +08:00
Zuosizhu
c6f1e43f8b Fix: Handle retirement while changing ships in Hard Gems farming 2024-01-12 09:50:21 +08:00
Zuosizhu
79956f8b66 Merge branch 'master_lme' 2024-01-11 16:59:27 +08:00
LmeSzinc
3eaaefb0ca Upd: [TW] Disable OpsiShop before rework done 2024-01-11 12:06:10 +08:00
guoh064
9a13bf1765 Upd: [TW] Event: Anthem of Remembrance 2024-01-11 11:32:04 +08:00
guoh064
c9ef2e0dca Upd: [CN, EN, JP] Event: Tower of Transcendence Rerun 2024-01-11 11:32:04 +08:00
LmeSzinc
593fa50df7 Opt: Remove vote handlers as they were removed for good 2024-01-11 11:00:48 +08:00
LmeSzinc
c3c4c03a5b Fix: Handle perspective error caused by GET_MISSION 2024-01-11 10:54:58 +08:00
LmeSzinc
8b871e8c30 Fix: Don't click MAINTENANCE_ANNOUNCE while interrupting auto search 2024-01-11 10:50:41 +08:00
LmeSzinc
944190c46e Upd: [EN] ACADEMY_CHECK 2024-01-06 01:51:48 +08:00
rilylc
fd5b29d02a Upd:[TW]Event:Khorovod of Dawn's Rime Rerun 2024-01-05 11:14:50 +08:00
LmeSzinc
6b67c4956d Fix: [ALAS] Scroll methods should all have returns 2024-01-02 03:57:00 +08:00
LmeSzinc
39f4c9cac4 Fix: [ALAS] Limit the length of screenshot deque 2024-01-01 22:17:06 +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
Zuosizhu
7638e6f43d Merge remote-tracking branch 'origin/20230309' 2023-12-29 14:39:18 +08:00
Zuosizhu
0a6d26ed66 Fix: Catch errors during handling RequestHumanTakeover in GemsFarming 2023-12-29 14:38:30 +08:00
Zuosizhu
9d7d0474ce Fix: Change Fleet_2's ships instead of fixed Fleet_1 when using 'fleet1_standby_fleet2_all' in GemsFarming (#3387) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-12-29 09:59:09 +08:00
SC23
17e41a8bff Fix: GUILD DISPATCH (#3392) 
* Fix_Gulid_DISPATCH

* Revert "Fix_Gulid_DISPATCH"

This reverts commit ba1f1f2ef5c3d56297f945e92ae2f73aaff8eb53.

* Fixed_Gulid_DISPATCH

* Fixed_GulidDISPATCH
 2023-12-29 09:47:30 +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
ecf3c28454 Merge branch 'LmeSzinc:master' into 20230309 2023-12-28 16:05:02 +08:00
Zuosizhu
9a2dd88b80 Fix: Change Fleet_2's ships instead of fixed Fleet_1 when using 'fleet1_standby_fleet2_all' in GemsFarming 2023-12-28 15:52:21 +08:00
LmeSzinc
046e20d45f Del: Remove config redirections because they were a long time ago 2023-12-28 02:45:39 +08:00