1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 04:59:25 +08:00
Commit Graph

490 Commits

Author SHA1 Message Date
Zuosizhu
934e05a87a Merge branch 'LmeSzinc:master' into 20230309 2023-10-04 17:10:01 +08:00
LmeSzinc
3c3462174a Upd: [JP] AUTO_SEARCH_SET_SUB_AUTO and AUTO_SEARCH_SET_SUB_STANDBY 2023-10-01 00:54:13 +08:00
Zuosizhu
a509b107bf Merge branch 'LmeSzinc:master' into 20230309 2023-09-22 08:15:14 +08:00
LmeSzinc
9a7c79732f Fix: [EN] Update AUTO_SEARCH_MENU_*.BUTTON.png 2023-09-22 02:28:01 +08:00
Zuosizhu
7bc96058c8 Merge branch 'master_lme'
# Conflicts:
#	deploy/Windows/config.py
#	deploy/Windows/git.py
#	deploy/Windows/logger.py
2023-09-20 18:52:47 +08:00
LmeSzinc
4b8d3add95 Fix: Binarilize story row colors 2023-09-19 22:16:16 +08:00
Zuosizhu
07d5a9e79f Merge branch 'LmeSzinc:master' into 20230309 2023-09-16 07:53:31 +08:00
LmeSzinc
802c1b6a08 Fix: Handle STORY_CLOSE after B3 2023-09-15 21:37:56 +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
7627a40bee Upd: [EN] AUTO_SEARCH_MENU_CONTINUE and AUTO_SEARCH_MENU_EXIT 2023-09-15 00:03:33 +08:00
LmeSzinc
4c4ac41f5e Fix: _story_option_buttons_2 parameters on complex background 2023-09-14 23:57:13 +08:00
LmeSzinc
c204aca18e Fix: Story skip 2023-09-14 23:32:18 +08:00
LmeSzinc
cb31947881 Fix: Larger _auto_search_menu_offset when MULTIPLE_SORTIE appears 2023-09-14 22:44:28 +08:00
Zuosizhu
f8a35cec1c Merge branch 'master_lme'
# Conflicts:
#	README.md
2023-09-11 08:16:09 +08:00
LmeSzinc
2de0641d65 Fix: Click stories if STORY_ALLOW_SKIP=False 2023-09-10 19:55:36 +08:00
LmeSzinc
da02fd6066 Fix: Trying to fix story skip bug on game client 2023-09-10 16:20:39 +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
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
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
2f771d8ca5 Refactor: [ALAS] Page class
Path findings in page class
2023-07-02 15:24:40 +08:00
Zuosizhu
68a2ba7c12 Merge branch 'LmeSzinc:master' into 20230309 2023-07-01 20:57:27 +08:00
nEEtdo0d
e88ae341f1 Upd: [EN] various assets for server; war_archive, os_ash, template, and handler 2023-06-30 18:00:33 -04:00
Zuosizhu
9a908c3757 Merge branch 'LmeSzinc:master' into 20230309 2023-05-16 22:08:54 +08:00
LmeSzinc
437dbe6171 Fix: [CN] Handle bilibili user agreement 2023-05-16 00:51:58 +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
LmeSzinc
ff8c80863a Upd: [TW] MAP_AMBUSH_EVADE (fixed #2444) 2023-04-04 01:40:23 +08:00
Zuosizhu
ccc991d098 Fix: redundant u2 restart 2023-03-29 23:52:11 +08:00
Zuosizhu
df1fcba2f8 Opt: restart u2 after GGStatus checked and before GG is set on to avoid U2 dies when using LDPlayer. 2023-03-29 23:36:16 +08:00
Zuosizhu
a69c30faa6 Merge remote-tracking branch 'origin/master' 2023-03-09 14:08:22 +08:00
Zuosizhu
0a80de07af Fix: Auto handle game server maintenance 2023-03-09 14:07:57 +08:00
Zuosizhu
2728b60d28 Merge branch 'LmeSzinc:master' into master 2023-03-09 00:54:24 +08:00
LmeSzinc
ddc3d7d5ee Fix: AUTO_SEARCH_MENU_CONTINUE disappeared after handle_2x_book_setting() (#2334) 2023-03-07 22:35:33 +08:00
Zuosizhu
cce684aa24 Add: Stop Alas or GemsFarming when auto search settings could not be set 2023-02-28 20:29:30 +08:00
Zuosizhu
db97b3806b Merge branch 'LmeSzinc:master' into master 2023-02-24 23:12:19 +08:00
LmeSzinc
db0431994c Fix: Handle another STORY_SKIP (#2284) 2023-02-24 21:25:36 +08:00
Zuosizhu
9f0ee98000 Fix: Restart ATX and UiAutomator at an incorrect situation 2023-02-24 21:01:00 +08:00
Zuosizhu
b072baa596 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/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/retire/retirement.py
2023-02-20 12:35:43 +08:00
LmeSzinc
01e71513a2 Fix: Use template matching on MAP_AMBUSH_ATTACK and MAP_AMBUSH_EVADE 2023-02-18 16:38:08 +08:00
LmeSzinc
d191d16649 Opt: Re-organise CalculateEmotion and IgnoreLowEmotionWarn 2023-02-18 01:19:04 +08:00
Zuosizhu
559547ffa2 Merge branch 'LmeSzinc:master' into master 2023-02-14 08:27:59 +08:00
LmeSzinc
b02069fd7f Fix: Handle game tips when entering mewofficer enhance 2023-02-14 00:21:32 +08:00
Zuosizhu
e3d77a62ca Fix: Set a timeout for restart atx, to fix no notify push if emulator died 2023-02-13 10:51:20 +08:00
Zuosizhu
db3bdfdeef Merge branch 'LmeSzinc:master' into master 2023-02-04 22:37:09 +08:00
LmeSzinc
f4babcabee Fix: Handle GET_SKIN when receiving battle pass rewards
TODO: [EN][JP][TW] Update GET_SKIN
2023-02-04 17:44:36 +08:00
梦念逍遥
6af466604d Merge branch 'LmeSzinc:master' into master 2023-02-01 20:09:17 +08:00