LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-20 23:29:27 +08:00
Code Activity
8,142 Commits 12 Branches 0 Tags
bb39cc05aed1aa287606d0b02b9ac3d52fa03172
Commit Graph

5701 Commits

Author SHA1 Message Date
LA_DI_DA
bb39cc05ae Add: sync config 2024-02-07 16:26:43 +08:00
LA_DI_DA
143f90a762 Add: one click to stop all running alas instances 2024-02-07 14:46:00 +08:00
LA_DI_DA
bc6ca1b38d Add: keep oil for event 2024-02-06 23:19:37 +08:00
LA_DI_DA
bfbe66ec4e Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	README.md
#	module/config/argument/args.json
 2024-02-06 21:51:57 +08:00
LA_DI_DA
259442c13b Merge branch 'zuosizhu-alas/20230309' into smallkai 2024-02-06 21:48:59 +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
LA_DI_DA
7973dc950d Upd: help of RestartEverytime in gg manager 2024-02-03 23:05:09 +08:00
LA_DI_DA
712c5be5dd Upd: args.json 2024-02-02 00:17:43 +08:00
LA_DI_DA
ec3d3848fa Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2024-02-02 00:12:39 +08:00
LA_DI_DA
f76fb04804 Fix: lack of event name 2024-02-02 00:07:42 +08:00
LA_DI_DA
f80870505b Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2024-02-01 16:07:58 +08:00
LA_DI_DA
bef5d22d1a Merge branch 'zuosizhu-alas/20230309' into smallkai 2024-02-01 15:52:19 +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
mulaikurisu
0067321df9 Merge remote-tracking branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/config/argument/args.json
 2024-01-31 18:40:47 +08:00
mulaikurisu
fc673c311a Upd: args.json 2024-01-31 18:38:02 +08:00
mulaikurisu
4983b42794 Fix: RAIDS and COALITIONS lock to the latest 2024-01-31 18:35:19 +08:00
mulaikurisu
4f60d70f9b Merge remote-tracking branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
 2024-01-31 18:27:04 +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
LA-DI-DA
7a34a686a6 Adj: flexible consume coins limit 2024-01-16 22:22:39 +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
LA-DI-DA
fb9dd37914 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2024-01-12 12:23:22 +08:00
LA-DI-DA
b5df205257 Fix: gg ui display incomplete 2024-01-12 12:19:04 +08:00
LA-DI-DA
1669d9ee5d Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/config/argument/args.json
 2024-01-12 10:41:40 +08:00
LA-DI-DA
0252b8bcc0 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
 2024-01-12 10:31:19 +08:00
Zuosizhu
c6f1e43f8b Fix: Handle retirement while changing ships in Hard Gems farming 2024-01-12 09:50:21 +08:00
LA-DI-DA
b335329c3c Rmv: lock limit of change ship's type 2024-01-12 00:32:29 +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