LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-21 15:49:30 +08:00
Code Activity
7,997 Commits 12 Branches 0 Tags
1d2ce5db7f6f2ac8fbeb2e2d0660dd2fe5cde55c
Commit Graph

484 Commits

Author SHA1 Message Date
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
8a8fcaf56f Add: Chapter T 2023-11-24 00:45:23 +08:00
LA-DI-DA
b05dc58c11 Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-11-19 23:34:44 +08:00
Zuosizhu
94c5fb4858 Merge branch 'LmeSzinc:master' into 20230309 2023-11-17 08:01:26 +08:00
RilyLC
d84010bfb1 Fix:[TW]support server_support_status_fleet in campaign\gems_farming (#3285) 
* Fix:[TW]support server_support_status_fleet in campaign\gems_farming

* Fix:[TW]ship scan asset

* Fix:[TW]remove server_support in retirement and gems_farming

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-11-15 18:28:47 +08:00
LA-DI-DA
a935f7e416 Fix: checking ship's experience that were overwritten in the previous merge 2023-11-11 13:38:25 +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
LA-DI-DA
5faa7eb4d6 Add: click fleet advice when preparing hard mode map 2023-11-10 16:22:47 +08:00
LA-DI-DA
c95825269b Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-11-09 19:03:13 +08:00
LA-DI-DA
02691fc408 Rmv: remove ship in GemsFarming when in hard mode 2023-11-09 19:01:33 +08:00
Zuosizhu
8981d103c9 Merge branch 'LmeSzinc:master' into 20230309 2023-11-06 10:08:40 +08:00
LmeSzinc
d3c8221e14 Fix: Unknown stage name should not be considered as any chapter 2023-11-01 01:36:52 +08:00
LmeSzinc
ab014c86a7 Fix: handle story skip in emotion withdraw 2023-10-29 23:10:49 +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
LmeSzinc
f4277912cb Fix: Stage name convert 2023-10-29 01:58:31 +08:00
LA-DI-DA
b6fe697e66 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/config/argument/args.json
 2023-10-27 19:34:40 +08:00
LA-DI-DA
9c0d07ae66 Add(tmp): Tempesta and the Fountain of Youth 2023-10-27 15:54:14 +08:00
Zuosizhu
e2f7cd544f Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-20 01:01:54 +08:00
LA-DI-DA
26327087c9 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/shop/shop_reward.py
 2023-10-19 23:03:07 +08:00
LA-DI-DA
a65f53b966 Merge branch 'lme-alas/master' into smallkai 
# Conflicts:
#	module/map/assets.py
 2023-10-19 23:00:39 +08:00
Zuosizhu
526d26e6c6 Merge branch 'LmeSzinc:master' into 20230309 2023-10-19 22:53:32 +08:00
LmeSzinc
4969dc01b0 Upd: [CN] Fleet preparation 2023-10-19 22:02:24 +08:00
LmeSzinc
f23c960b97 Fix: Actively clear stuck records in combat 2023-10-14 21:03:58 +08:00
LA-DI-DA
9b7dc96de7 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/gg_handler/change_ship.py
 2023-10-05 19:36:52 +08:00
LA-DI-DA
96812cfbdf Fix: condition to change flagship in GemsFarming 2023-10-05 19:29:45 +08:00
LA-DI-DA
de2c563000 Add: research farming(half-finished) 2023-10-05 14:42:06 +08:00
LA-DI-DA
02a1cfe3fa Add: event auto farming 2023-10-03 12:37:51 +08:00
LA-DI-DA
3dd8c83253 Fix: exit dock when changing flagship and when GemsFarming is set to normal map 2023-10-01 14:37:39 +08:00
LA-DI-DA
b077bf9719 Add: change ship type for GemsFarming when set C or D map 2023-09-30 16:50:01 +08:00
LA-DI-DA
e92826c90a Bug fix 2023-09-16 21:03:38 +08:00
Zuosizhu
7fdba38b75 Fix: Get value error while creating new enemies 
(cherry picked from commit 41a17dd0d2)
 2023-09-15 08:51:24 +08:00
Zuosizhu
dfa815645d Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/campaign_status.py
#	module/config/argument/args.json
 2023-09-15 08:26:53 +08:00
LmeSzinc
686b7fb921 Fix: Adaptive OCR_OIL to handle black overlay 2023-09-14 22:44:28 +08:00
Zuosizhu
78d8ed1c5b Merge branch 'master_lme' 
# Conflicts:
#	assets/gui/css/light-alas.css
#	module/config/argument/args.json
#	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/webui/app.py
 2023-09-02 17:47:24 +08:00
LmeSzinc
100ba7a441 Fix: Disable OpsiShop before assets update 2023-09-01 00:54:51 +08:00
LmeSzinc
1a7d74493d Fix: Story stages before A1 2023-08-23 12:46:05 +08:00
Zuosizhu
6550a56b2b Merge branch 'master_lme' 
# Conflicts:
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2023-08-19 09:23:28 +08:00
LmeSzinc
b451096fb8 Add: Handle stories before event maps in chapter BD 2023-08-18 22:23:20 +08:00
LmeSzinc
b3c59c0cca Add: Handle stories before event maps 2023-08-18 13:25:51 +08:00
Zuosizhu
1e1661f4bb Merge branch 'LmeSzinc:master' into 20230309 2023-07-29 22:04:54 +08:00
LmeSzinc
61aca93cfb Add: Stage increase in TSS maps 2023-07-26 19:57:14 +08:00
梦念逍遥
5c054b6b20 Upd: World-spanning Arclight Rerun chapter TSS (#2912) 
* Upd: World-spanning Arclight Rerun chapter TSS

* Upd: addd tss config about MAP_IS_ONE_TIME_STAGE
 2023-07-25 12:35:28 +08:00
Zuosizhu
43b707eb61 Merge branch 'LmeSzinc:master' into 20230309 2023-07-21 00:07:23 +08:00
LmeSzinc
c13651130d Opt: Add fool-proof chapter converts 2023-07-20 23:45:42 +08:00