LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 20:49:24 +08:00
Code Activity
7,843 Commits 12 Branches 0 Tags
9c0d07ae66bdfd7bb59f7ad47ca62a74b80fd2dc
Commit Graph

398 Commits

Author SHA1 Message Date
LA-DI-DA
dc69ce0d79 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/map/assets.py
 2023-10-22 12:07:37 +08:00
Zuosizhu
9e31b5eb43 Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-20 22:44:25 +08:00
LmeSzinc
e8340df57c Upd: [EN] _fleet_sidebar 2023-10-20 01:11:59 +08:00
LmeSzinc
d2302836ec Upd: [EN] Fleet preparation 2023-10-20 01:02:47 +08:00
Zuosizhu
e2f7cd544f Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-20 01:01:54 +08:00
LmeSzinc
b8f89def7d Fix: Submarine hard satisfied button 2023-10-20 00:40:05 +08:00
LmeSzinc
0c93da2373 Upd: Sync FLEET_PREPARATION_CHECK 2023-10-20 00:03:28 +08:00
LmeSzinc
cc60e701fc Upd: [JP] Fleet preparation 2023-10-20 00:03:25 +08:00
LA-DI-DA
5819212f96 Fix: lack of FLEET_ENTER_FLAGSHIP_HARD_* and FLEET_ENTER_HARD_* 2023-10-19 23:28:38 +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
LA-DI-DA
78fc586094 Revert "Fix(tmp): ui drift of map preparation" 
This reverts commit bfe3240c44.
 2023-10-19 23:00:27 +08:00
Zuosizhu
526d26e6c6 Merge branch 'LmeSzinc:master' into 20230309 2023-10-19 22:53:32 +08:00
LA-DI-DA
bfe3240c44 Fix(tmp): ui drift of map preparation 2023-10-19 22:47:36 +08:00
LmeSzinc
ce13aaa8b7 Upd: [CN] _fleet_sidebar 2023-10-19 22:30:06 +08:00
LmeSzinc
4969dc01b0 Upd: [CN] Fleet preparation 2023-10-19 22:02:24 +08:00
LmeSzinc
e41658ad43 Fix: Accidentally entered daily when entering map 2023-10-07 09:26:50 +08:00
LA-DI-DA
79e449a258 Add: handle retirement when map preparation after clicking MAP_PREPARATION 2023-09-16 12:28:28 +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
14c92519f8 Upd: [JP] FLEET_PREPARATION 2023-09-14 23:40:09 +08:00
Zuosizhu
ec48411c88 Merge branch 'LmeSzinc:master' into 20230309 2023-08-23 19:04:03 +08:00
LmeSzinc
46d07d1f45 Fix: Reset arrive timers after handle_map_cat_attack() 2023-08-20 00:15:33 +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
acfb08526d Fix: Lost siren tracking at J5 in B2D2 2023-08-19 01:01:22 +08:00
Zuosizhu
72730a4147 Merge branch 'LmeSzinc:master' into 20230309 2023-08-08 20:40:20 +08:00
LmeSzinc
b68a711d39 Fix: Handle map detection error caused by OPSI_MISSION_CHECK 2023-08-05 18:11:51 +08:00
Zuosizhu
c22157a548 Merge branch 'LmeSzinc:master' into 20230309 2023-08-04 00:20:16 +08:00
LmeSzinc
d389f75c5f Add: handle_map_walk_speedup() 2023-08-03 22:59:37 +08:00
Zuosizhu
1e1661f4bb Merge branch 'LmeSzinc:master' into 20230309 2023-07-29 22:04:54 +08:00
LmeSzinc
f948fd502f Fix: Handle empty HP when using emergency repair (#2925) 2023-07-25 12:48:47 +08:00
LmeSzinc
881007979a Fix: Handle GET_ADAPTABILITY in map detection (#2915) 2023-07-25 12:36:53 +08:00
Zuosizhu
8927df9389 Merge branch 'LmeSzinc:master' into 20230309 2023-07-21 10:03:50 +08:00
LmeSzinc
6f3d46d617 Fix: Rewrite fortress_data 2023-07-21 03:37:54 +08:00
Zuosizhu
0935b58ede Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/exercise/exercise.py
#	module/ui/ui.py
 2023-07-15 20:26:12 +08:00
LmeSzinc
27acff08af Fix: Handle GET_ITEMS_1 in perspective errors of OpSi (#2808) 2023-07-02 15:46:48 +08:00
Zuosizhu
b308b65cde Merge branch 'LmeSzinc:master' into 20230309 2023-06-02 03:55:50 +08:00
Zuosizhu
0aeed89b72 Merge branch 'LmeSzinc:master' into 20230309 2023-05-30 12:31:00 +08:00
LmeSzinc
18cba1f9d0 Chore: Remove the use of np.int 2023-05-30 10:28:51 +08:00
LmeSzinc
4d79738818 Fix: cost_2 sort is not working when FLEET_2 is empty but having fleet 2 on map (#2643) 2023-05-27 23:57:29 +08:00
Zuosizhu
987423a96f Merge branch 'LmeSzinc:master' into 20230309 2023-05-27 20:30:22 +08:00
LmeSzinc
ac6412d8c9 Fix: Handle MAP_PREPARATION at map detection 2023-05-26 11:58:12 +08:00
LmeSzinc
e420f4ed04 Upd: Magic map swipe multipliers 2023-05-26 03:01:09 +08:00
Zuosizhu
9a908c3757 Merge branch 'LmeSzinc:master' into 20230309 2023-05-16 22:08:54 +08:00
LmeSzinc
4f761b1e6f Upd: ALAS framework updates 2023-05-16 09:11:46 +08:00
Zuosizhu
fa276716d1 Merge branch 'master_lme' 
# Conflicts:
#	alas.py
 2023-04-20 01:25:28 +08:00
LmeSzinc
d1b1b0ac7d Opt: No map clear percentage waiting in SOS maps 2023-04-15 22:16:40 +08:00
Zuosizhu
cacc828f08 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/exercise/assets.py
#	module/exercise/exercise.py
 2023-04-12 15:25:30 +08:00
LmeSzinc
06b07ca003 Fix: Handle mysteries in strategy_open() 2023-04-11 23:41:20 +08:00
Zuosizhu
b5ac3cc06a Merge branch 'LmeSzinc:master' into 20230309 2023-04-07 15:46:07 +08:00
LmeSzinc
998a57bb09 Fix: Catch game died in camera update 2023-04-04 03:26:41 +08:00
Zuosizhu
53f44f3ff5 Merge branch 'master_lme' 
# Conflicts:
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2023-03-11 16:21:26 +08:00