LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-22 02:19:30 +08:00
Code Activity
9,493 Commits 12 Branches 0 Tags
6959896d375897dd9d755d1956d76d1a6cd2e14d
Commit Graph

6693 Commits

Author SHA1 Message Date
ZuoSiZhu
6959896d37 Revert "fix: disable global ship properties and factor of hook for retirement handler" 
This reverts commit 5d7a2d3c58.
 2025-05-22 01:58:23 +08:00
0O0o0oOoO00
5d7a2d3c58 fix: disable global ship properties and factor of hook for retirement handler 2025-05-21 21:03:59 +08:00
0O0o0oOoO00
1053aa427e fix: merge mistake of stop barrier 2025-05-21 14:07:57 +08:00
0O0o0oOoO00
8748eb237c fix: add event4-6 to scheduler 2025-05-21 14:02:07 +08:00
0O0o0oOoO00
16fa913b69 fix: merge mistake of more event 2025-05-21 13:17:53 +08:00
ZuoSiZhu
9b14a26dae fix: Dock merge error 2025-05-21 11:58:47 +08:00
ZuoSiZhu
78112d5e2b fix: Entrance of event_20250520 2025-05-21 09:31:48 +08:00
ZuoSiZhu
609e466be6 Reapply "Pref: [ALAS] faster get_bbox()" 
This reverts commit a0d04bc7ec.
 2025-05-21 04:28:29 +08:00
ZuoSiZhu
dee0c1484f Merge branch 'master_lme' into dev 
# Conflicts:
#	campaign/Readme.md
#	module/base/utils.py
#	module/coalition/assets.py
#	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/handler/login.py
#	module/retire/dock.py
#	module/retire/enhancement.py
#	module/shop/shop_reward.py
 2025-05-21 04:17:08 +08:00
ZuoSiZhu
a54650be0a opt: switch position of DockNew and DockOld for easier merge 2025-05-21 03:55:42 +08:00
ZuoSiZhu
a0d04bc7ec Revert "Pref: [ALAS] faster get_bbox()" 
This reverts commit bc1046c79f.
 2025-05-21 03:36:05 +08:00
ZuoSiZhu
99ae4c66d4 Add: cheat support for daemon 2025-05-21 03:30:02 +08:00
LmeSzinc
91b8bf856d Upd: [EN] BUILD_CHECK, it reverts back again (#4811) 2025-05-21 03:15:15 +08:00
LmeSzinc
8a52877333 Add: chapter SP 2025-05-21 03:02:53 +08:00
LmeSzinc
1178c43d9a Fix: Check strategy options with green tick instead of mean color (#4810) 2025-05-21 03:01:58 +08:00
LmeSzinc
14b4820523 Upd: [EN] BOX assets 2025-05-21 02:52:39 +08:00
LmeSzinc
9c83c0bbc3 Chore: Move BOX_ITEM_* to EQUIP_CONFIRM 
to be reused in retirement and enhancement
 2025-05-21 02:25:28 +08:00
LmeSzinc
3c5eea5fb0 Fix: Keep untracked enemies if MAP_HAS_MOVABLE_NORMAL_ENEMY 2025-05-21 01:48:29 +08:00
LmeSzinc
4bacd2b1f1 Fix: Equipments now get auto disassembled when you use boxes 
- TODO: [EN][JP][TW] update box assets
 2025-05-21 01:41:06 +08:00
LmeSzinc
653601aa4f Chore: Add MAP_CLEAR_PERCENTAGE_SHORT 2025-05-21 00:45:32 +08:00
LmeSzinc
fe1606bb0d Upd: [EN][JP] MISSION_EMPTY MISSION_UNFINISH 2025-05-20 23:55:12 +08:00
LmeSzinc
92a93eeaf1 Add: Event entrance of A Rose on the High Tower (event_20250520_cn) 2025-05-20 23:53:42 +08:00
LmeSzinc
bc1046c79f Pref: [ALAS] faster get_bbox() 2025-05-20 00:37:33 +08:00
0O0o0oOoO00
13eb3a079f fix: lack of KeepOil setting 2025-05-19 11:37:17 +08:00
霞飛
2f9d365fa7 Opt: a better limit when items need to be handled amount (#4802) 
* fix: a better limit when items need to be handled amount

* opt: loop control when handle amount
 2025-05-19 03:51:25 +08:00
LmeSzinc
2b05348f8d Fix: random background thingy that may mis-detected as medal (#4786) 2025-05-19 03:49:17 +08:00
LmeSzinc
d10f44300e Pref: dorm_feed_quit should reuse screenshot 2025-05-19 02:53:10 +08:00
LmeSzinc
3879b1546b Fix: Wait until mission list fully loaded 2025-05-19 02:52:34 +08:00
LmeSzinc
316966e60f Dev: [ALAS] add syntactic sugar to start a state loop 2025-05-19 02:49:21 +08:00
LmeSzinc
fad7c027a3 Fix: enter minigame ended at minigame menu (#4758) 2025-05-19 01:48:29 +08:00
0O0o0oOoO00
75267083c9 Merge branch 'feature/more' into dev 
# Conflicts:
#	alas.py
#	module/exception.py
 2025-05-18 22:03:42 +08:00
0O0o0oOoO00
6c36a0bf05 fix: call Restart after phone restarted 2025-05-18 21:38:31 +08:00
0O0o0oOoO00
d411b16ce8 add: wait time setting of phone and adb 2025-05-18 21:32:49 +08:00
0O0o0oOoO00
3fbc52eaea add: wait for cloud phone adb 2025-05-18 21:25:52 +08:00
0O0o0oOoO00
d06150f507 fix: delay phone restart task 2025-05-18 21:25:06 +08:00
0O0o0oOoO00
cdacf96a41 fix: chinac cloud restart 2025-05-18 21:20:19 +08:00
0O0o0oOoO00
79fa8f7052 fix: use post to request chinac api 2025-05-18 20:47:48 +08:00
0O0o0oOoO00
423ce223f9 add: restart chinac cloud phone 2025-05-18 20:43:18 +08:00
LmeSzinc
ef61702057 Upd: [TW] QUIT_Cyber and QUIT_New in different font weight (fixed #4798) 2025-05-18 16:16:05 +08:00
霞飛
04074db590 Merge pull request #4799 from SaarChaffee/fix-akashi-shop 
fix: no need to check counter in akashi shop
 2025-05-18 15:50:02 +08:00
LmeSzinc
7f54ae8234 Upd: [TW] ENHANCE_CONFIRM and ENHANCE_RECOMMEND 2025-05-18 03:12:30 +08:00
LmeSzinc
3069167d03 Merge pull request #4787 from SaarChaffee/fix-os-shop-counter 
Fix: os shop counter and amount will be bad sometimes
 2025-05-18 00:30:37 +08:00
guoh064
e2b7590bc8 Opt: allow entering page_mail from page_main (#4752) 2025-05-17 10:07:51 +08:00
LmeSzinc
d82baea7b9 Fix: Empty failed_zone list because failed function doesn't have return 2025-05-15 18:18:34 +08:00
LmeSzinc
be30dfcfc6 Fix: Handle EQUIP_CONFIRM without black-blurred background 2025-05-15 18:05:20 +08:00
LmeSzinc
1d617abb20 Fix: Sync bunch of popup handlers to all combat 2025-05-15 15:42:54 +08:00
霞飛
12342c8a3d doc: add function doc 2025-05-15 14:06:20 +08:00
霞飛
99a577dfcb fix: item fields typo 2025-05-15 14:05:33 +08:00
霞飛
95d732ab85 fix: argument typo 2025-05-15 13:13:06 +08:00
霞飛
7ee0460e68 fix: handle when shop amount is 0 2025-05-14 02:54:59 +08:00