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

634 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
rilylc
fd5b29d02a Upd:[TW]Event:Khorovod of Dawn's Rime Rerun 2024-01-05 11:14:50 +08:00
LA-DI-DA
891cdc9794 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-12-23 11:09:52 +08:00
LA-DI-DA
c45954c4b0 Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 
# Conflicts:
#	module/device/device.py
 2023-12-23 11:07:19 +08:00
Zuosizhu
ac2b891229 Merge branch 'LmeSzinc:master' into 20230309 2023-12-23 09:15:12 +08:00
weeswelai
56fe530310 Add: Buy time-limited furniture in dorm. 2023-12-23 00:32:30 +08:00
LA-DI-DA
2e08b76ff1 Add: one click login 2023-12-22 21:06:25 +08:00
Zuosizhu
8d2c52c94a Merge branch 'master_lme' 
# Conflicts:
#	README.md
 2023-12-22 18:02:19 +08:00
LmeSzinc
1f3260d8a7 Add: Event entrance of Light-Chasing Sea of Stars (event_20231221_cn) 2023-12-21 23:33:32 +08:00
RilyLC
ed2a244891 Upd:[TW]Event:Parallel Superimposition (#3361) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-12-21 21:51:48 +08:00
LA-DI-DA
1673a9d61d Add: switch account 2023-12-20 22:26:36 +08:00
Zuosizhu
bb50753c29 Merge branch 'master_lme' 
# Conflicts:
#	module/device/device.py
 2023-12-16 00:39:48 +08:00
RilyLC
1da39e500e Upd:[TW]Event:The Ninja Scrolls: Azur Flash (#3323) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-11-30 16:13:57 +08:00
LA-DI-DA
1e41b28aa3 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-11-24 17:04:42 +08:00
LA-DI-DA
824b353f3d Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
 2023-11-24 17:00:55 +08:00
Zuosizhu
395090785f Merge branch 'LmeSzinc:master' into 20230309 2023-11-24 07:58:05 +08:00
LmeSzinc
530128ea49 Add: Event entrance of The Ninja Scrolls: Azur Flash (event_20231123_cn) 2023-11-24 00:43:34 +08:00
RilyLC
f7461e3ad1 Upd:[TW]Event:Northern Overture Rerun (#3306) 2023-11-23 22:41:47 +08:00
LA-DI-DA
8ecebef114 Add: higher priority option for OpsiHazard1Leveling 2023-11-11 12:31:58 +08:00
LA-DI-DA
649f4819ef Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-11-10 16:57:59 +08:00
LA-DI-DA
03f56ac4f0 Merge branch 'zuosizhu-alas/master' 2023-11-10 16:54:55 +08:00
Zuosizhu
7f9c64e284 Merge branch 'LmeSzinc:master' into 20230309 2023-11-10 14:33:24 +08:00
Jiahao Yuan
114ffbdc9b Upd: campaign (#3274) 2023-11-10 11:28:11 +08:00
LA-DI-DA
d0599ffeb3 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-29 12:18:18 +08:00
LA-DI-DA
5a8182256e Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
#	module/config/argument/override.yaml
 2023-10-29 12:03:28 +08:00
LA-DI-DA
5326fe7940 Revert "Add(tmp): Tempesta and the Fountain of Youth" 
This reverts commit 9c0d07ae
 2023-10-29 11:59:30 +08:00
Zuosizhu
8815928c27 Merge branch 'LmeSzinc:master' into 20230309 2023-10-29 07:01:00 +08:00