LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 20:19:26 +08:00
Code Activity
8,551 Commits 12 Branches 0 Tags
af5bcafcc5ccccbbf8d1db5d86d9b3c8a73da621
Commit Graph

61 Commits

Author SHA1 Message Date
LA_DI_DA
573210af2b Merge branch 'refs/heads/lme-alas/master' into dev 
# Conflicts:
#	alas.py
#	module/os/fleet.py
 2024-06-22 20:31:35 +08:00
Air111
bb3f4964ec Opt: wait until navbar active is not None (#3832) 2024-06-03 00:05:23 +08:00
Zuosizhu
ce6cb8c4bf Fix: Dashboard won't refresh after gacha when using gacha tickets(PR =9) 2024-04-13 11:54:12 +08:00
Zuosizhu
b6e6f60754 Merge branch 'LmeSzinc:master' into 20230309 2024-03-29 07:09:29 +08:00
LmeSzinc
6c4b477000 Fix: Continue gacha even if UR exchange point is full (#3582) 2024-03-29 03:28:29 +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
iceynano
4573e1a089 Fix: Error caused by queue clean status flashback (#2841) 
* Fix: Error caused by queue clean status flashback

* Update gacha_reward.py
 2023-07-04 22:46:42 +08:00
Zuosizhu
b34d2afc1a Merge branch 'LmeSzinc:master' into 20230309 2023-06-30 19:51:52 +08:00
iceynano
ffe3988e72 Fix: Error caused by empty build queue (#2816) 
* Fix: Error caused by empty build queue

* feat: add BUILD_QUEUE_EMPTY assets

* fix: use image_color_count() for identify images

* chore: remove useless asset

* fix: Avoid info_bar and use appear()

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: SaarChaffee <saarchaffee@qq.com>
 2023-06-30 15:32:41 +08:00
Zuosizhu
d557cc4e7c Merge remote-tracking branch 'origin/20230309' 2023-06-15 00:29:19 +08:00
Zuosizhu
2b9890355a Fix: screenshot before gacha ocr in case emulator is running slow 2023-06-15 00:27:49 +08:00
Zuosizhu
0aeed89b72 Merge branch 'LmeSzinc:master' into 20230309 2023-05-30 12:31:00 +08:00
LmeSzinc
2010c80c98 Fix: Wishing pool no longer shows coins (#2631) 2023-05-28 15:24:06 +08:00
Zuosizhu
a001c6699d Fix: fail to ocr gems and coins in wishing well 2023-05-27 01:37:27 +08:00
Zuosizhu
4d1fd01511 Merge branch 'master_lme' 
# Conflicts:
#	assets/jp/gacha/BUILD_CUBE_COUNT.png
#	module/campaign/run.py
#	module/gacha/assets.py
 2023-05-15 17:22:33 +08:00
guoh064
736a839f08 Upd: [JP] Assets for BUILD_CUBE_COUNT (#2571) 2023-05-11 21:50:24 +08:00
Zuosizhu
0a419cb876 Refactor: the way to call LogRes 2023-02-14 02:21:43 +08:00
Zuosizhu
7435ea82c0 Fix: Cube log error. 2023-02-09 00:57:56 +08:00
Zuosizhu
c57f2b00e8 Fix: Cube count for jp. Modify: Alas title. 2023-02-01 05:20:53 +08:00
Zuosizhu
bb62c17259 Refactor: LogName of Dashboard. Icon of Alas 2023-02-01 02:41:44 +08:00
Zuosizhu
a102dd16c1 Fix: Not logging oil in OpSi. Reduntant codes. Template fix. 2023-01-31 04:03:13 +08:00
Zuosizhu
1071f2f3d0 Feature: Support for log resTime 2023-01-30 18:01:04 +08:00
Zuosizhu
ce93c097f6 Add: Resource Viewer 2023-01-17 00:55:34 +08:00
18870
37b23affbf Fix: Notify handle more error (#1664) 2022-09-19 13:22:01 +08:00
freesrz93
b68e8abb6a Fix: Wrong OCR result for build ticket count 
Fix: Wrong OCR result for build ticket count

Fix: Wrong OCR result for build ticket count (1)
 2022-08-06 19:39:57 +08:00
LmeSzinc
31afee78a9 Merge pull request #1386 from karegyudon/war_archive_Swirling_Cherry_Blossoms 
add war archive: Swirling Cherry Blossoms
 2022-07-21 22:02:14 +08:00
nEEtdo0d
deb09b96e5 Upd: [EN] clone BUILD_TICKET_COUNT, confirmed same area for OCR 2022-07-19 10:31:53 -04:00
LmeSzinc
0b5b6f5da8 Merge pull request #1360 from LmeSzinc/dev 
PR5 and research queue support
 2022-07-18 12:47:14 +08:00
freesrz93
9faa3c9269 Add: Use build tickets for event pool 2022-07-17 16:01:59 +08:00
freesrz93
46cfe79c47 Upd: [CN] BUILD_CUBE_COUNT 2022-07-17 12:00:03 +08:00
hgjazhgj
e779fd7e64 Fix: Misspelling & Line-end spaces 2022-06-25 20:04:45 +08:00
LmeSzinc
5e0f3872b5 Fix: Unable to exit gacha_flush_queue() when pulling wishing_well 2022-06-09 21:01:46 +08:00
LmeSzinc
405d349519 Fix: Missing attribute _shop_gold_coins in RewardShipyard and RewardGacha 2022-06-07 00:34:50 +08:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03:00
nEEtdo0d
e8cd48b096 Fix: func call typo; condition checking not valid 2022-04-12 23:02:37 -04:00
SaarChaffee
303dd90fdc change CRLF to LF 2022-04-09 23:31:09 +08:00
LmeSzinc
c1be41ffa5 Fix: Clicking at the PLUS button of gems when receiving ships from gacha 2022-03-02 20:41:54 +08:00
LmeSzinc
3503601ead Fix: Sidebar switching in gacha sidebar 
It mis-detected 5 nav items because of the background pattern of Kronshtadt
 2022-02-24 20:14:13 +08:00
nEEtdo0d
2b928a7ae8 Fix: shop infrastructure update; update currency call 2022-01-19 21:43:12 -05:00
nEEtdo0d
5eb9c03f11 Fix: gacha ui x-axis shift for plus/minus after update; adopt shipyard ocr trick 2021-12-09 11:31:06 -05:00
LmeSzinc
d5735604e1 Dev: Uniform comments of generated files 2021-12-07 23:29:33 +08:00
nEEtdo0d
4cb52b66a7 Merge branch 'master' into app 
# Updates EN VOTE_CANCEL
# Mitigates multi-click for submit-gacha in case of slow transition
 2021-10-14 11:41:21 -04:00
nEEtdo0d
674722609c Fix: Slow transitions can result in multi-clicks, inadvertently use drill due to same position as checked asset 2021-10-14 11:28:59 -04:00
LmeSzinc
6e2b418ddd Fix: AUTO_SEARCH_ON/OFF assets, handle vote popup 2021-10-14 17:37:02 +08:00
nEEtdo0d
777507dacd Fix: [JP] gacha assets, re-run button_extract 2021-10-11 10:12:03 -04:00
nEEtdo0d
5cb9ee1895 Fix: Resolve to allow upstream pull 2021-10-10 23:34:02 -04:00
Zorachristine
2ce81e992b Upd: [TW] Gacha assets 2021-10-09 20:12:57 +08:00
LmeSzinc
976ddb5ec7 Fix: Medal shop not entering gacha page 
- Remove old code of shop reward
 2021-10-07 03:02:45 +08:00
LmeSzinc
7c512fb6c6 Fix: gacha_bottom_navbar_ensure when left is None 2021-10-05 01:05:20 +08:00
LmeSzinc
af10c5df68 Fix: Sos loops if reached oil limit 
- Fix: gacha_bottom_navbar_ensure when left is None
 2021-10-04 00:46:23 +08:00