LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-16 08:19:27 +08:00
Code Activity
7,388 Commits 12 Branches 0 Tags
f93b3b3db5c94a3ee40afc59cd3ee419eef215b0
Commit Graph

363 Commits

Author SHA1 Message Date
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
xzjjasper
065d4a8bce Upd: [TW] assets of shop module 2023-07-14 12:03:38 +08:00
LmeSzinc
77cea4d7dd Upd: [CN][EN][JP] Assets of page_munition 2023-07-14 00:31:55 +08:00
LmeSzinc
85bea51b60 Upd: Assets for entering supply pack 2023-07-14 00:31:52 +08:00
LmeSzinc
e045d14d3d Fix: Navigating to Odin in shipyard (#2611) 2023-07-02 16:56:05 +08:00
LmeSzinc
945598f552 Add: [ALAS] Returns in Scroll.set() 2023-07-02 15:28:39 +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
Bookbug
e3d902a650 Add: [JP] Raid assets of Reflections of the Oasis (#2822) 2023-07-01 14:47:52 +08:00
Zuosizhu
b34d2afc1a Merge branch 'LmeSzinc:master' into 20230309 2023-06-30 19:51:52 +08:00
LmeSzinc
b3f1461e37 Upd: [EN] Raid assets of Reflections of the Oasis 2023-06-30 16:16:24 +08:00
LmeSzinc
2c39f195f8 Add: [CN] Raid assets of Reflections of the Oasis 2023-06-30 16:05:15 +08:00
Zuosizhu
1acc700629 Merge branch 'LmeSzinc:master' into 20230309 2023-06-10 02:53:17 +08:00
LmeSzinc
f71d6d0a69 Upd: [EN] ACADEMY_CHECK 2023-06-10 02:41:03 +08:00
Zuosizhu
0aeed89b72 Merge branch 'LmeSzinc:master' into 20230309 2023-05-30 12:31:00 +08:00
LmeSzinc
ccb26acd99 Fix: Comment links of page_raid temporarily 
since this event shares the same title with raid
 2023-05-28 19:56:07 +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
ee1ba9777e Merge branch 'LmeSzinc:master' into 20230309 2023-04-25 00:05:26 +08:00
guoh064
c85e69f0ce Fix: Change LOGIN_ANNOUNCE to MAINTENANCE_ANNOUNCE in ui_additional (#2509) 
* Add: Handle LOGIN_ANNOUNCE in ui_additional

* Fix: Handle MAINTENANCE_ANNOUNCE in ui_additioal
 2023-04-21 00:50:59 +08:00
Zuosizhu
fa276716d1 Merge branch 'master_lme' 
# Conflicts:
#	alas.py
 2023-04-20 01:25:28 +08:00
guoh064
d86e8907a2 Add: Handle LOGIN_ANNOUNCE in ui_additional (#2494) 2023-04-14 23:14:44 +08:00
Zuosizhu
b5ac3cc06a Merge branch 'LmeSzinc:master' into 20230309 2023-04-07 15:46:07 +08:00
LmeSzinc
61c45028b1 Fix: Handle 2 rows of items at login 2023-04-04 03:41:43 +08:00
Zuosizhu
fb67ae3ab7 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	module/campaign/campaign_event.py
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/config_manual.py
#	module/config/config_updater.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
 2023-03-24 16:33:37 +08:00
LmeSzinc
14870c6807 Fix: ui switches to page_coalition 2023-03-24 05:31:26 +08:00
LmeSzinc
b2de4b83d7 Merge branch 'master' into dev 
# Conflicts:
#	campaign/Readme.md
#	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
 2023-03-24 05:11:15 +08:00
LmeSzinc
ebb28c056d Fix: Handle MEOWFFICER_BUY in ui switching 2023-03-24 03:17:05 +08:00
LmeSzinc
ff3f76897a Fix: Handle COALITION_FLEET_PREPARATION in ui switching 2023-03-24 03:14:16 +08:00
xzjjasper
802bb6c26e Upd: [TW] raid assets 2023-03-23 21:52:41 +08:00
Zuosizhu
aabc691fb1 Merge branch 'master_lme' 2023-03-14 19:14:40 +08:00
LmeSzinc
d5797cb153 Fix: Handle AUTO_SEARCH_REWARD when switching fleet lock 2023-03-11 23:46:47 +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
Alexanded
26885555e1 Upd: [EN] FLEET_CHECK 2023-03-10 00:08:18 +03:00
Zuosizhu
2728b60d28 Merge branch 'LmeSzinc:master' into master 2023-03-09 00:54:24 +08:00
LmeSzinc
a18baea780 Fix: Prevent clicking GET_SHIP when switching from page_main (#2320) 2023-03-07 23:39:49 +08:00
Zuosizhu
2bc586ce57 Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/campaign_event.py
#	module/campaign/campaign_status.py
 2023-03-04 03:11:41 +08:00
LmeSzinc
2d2d605bbf Fix: Prevent clicking GET_SHIP after MAIN_GOTO_REWARD (#2320) 2023-03-03 18:51:48 +08:00
Zuosizhu
a94d7b58a5 Merge branch 'master_lme' 
# Conflicts:
#	module/ui/ui.py
 2023-02-26 17:35:50 +08:00
LmeSzinc
cca3de7e77 Fix: Handle EXERCISE_PREPARATION in ui switches 2023-02-26 17:20:37 +08:00
LmeSzinc
7908aa397e Fix: Increase unknown ui timeout 
GET_SHIP interval is 5s, timeout should longer than it
 2023-02-25 22:40:19 +08:00
Zuosizhu
d07264269e Merge branch master from "github.com/LmeSzinc/AzurLaneAutoScript" 2023-01-31 00:01:24 +08:00
LmeSzinc
0884cc40c5 Upd: [CN] CAMPAIGN_MENU_NO_EVENT 2023-01-30 16:05:18 +08:00
LmeSzinc
674331e2d1 Merge branch 'master' into dev 2023-01-29 23:56:31 +08:00
LmeSzinc
2472ccbdc2 Merge pull request #2096 from bookbug666/event_checker 
Add: Auto disable event task when no event (#1396)
 2023-01-29 14:42:58 +08:00
Zuosizhu
8d144bb220 Merge branch 'master' of http://github.com/LmeSzinc/AzurLaneAutoScript 2023-01-29 03:13:59 +08:00
LmeSzinc
98e59763d8 Opt: Scroll swipe outside of screen (#2180) 2023-01-29 02:30:35 +08:00
LmeSzinc
847c1a476e Fix: Over-swipe a Scroll when it's going to reach the edge 2023-01-28 17:25:30 +08:00
LmeSzinc
64b39e83a9 Upd: [JP] PLAYER_CHECK (fixed #1882) 2023-01-28 16:16:51 +08:00
Zuosizhu
3ff90bc0c6 Remake: Encapsulation of GG Handler 
* Remake: Encapsulation of GG Handler

* Fix: Unstoppable restart
 2023-01-28 15:46:53 +08:00