LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-17 01:59:28 +08:00
Code Activity
7,412 Commits 12 Branches 0 Tags
b032b8e52bb5f5e3d2ca67f9af85fe23c70c6e89
Commit Graph

5194 Commits

Author SHA1 Message Date
LA-DI-DA
b032b8e52b Add shabi small game 2023-07-23 01:39:32 +08:00
LA-DI-DA
4019f6735a Update config_updater.py and template 2023-07-21 21:58:57 +08:00
LA-DI-DA
46f85afe26 Add something special 2023-07-21 21:48:43 +08:00
LA-DI-DA
d6abebc108 Add something special 2023-07-21 21:14:10 +08:00
LA-DI-DA
877660eb1b Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-07-21 18:58:28 +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
43b707eb61 Merge branch 'LmeSzinc:master' into 20230309 2023-07-21 00:07:23 +08:00
LmeSzinc
c13651130d Opt: Add fool-proof chapter converts 2023-07-20 23:45:42 +08:00
LmeSzinc
4ef7d12973 Add: Event entrance of World-spanning Arclight Rerun (event_20230720_cn) 2023-07-20 23:10:00 +08:00
LA-DI-DA
d392dadf51 Add something special 2023-07-20 22:37:00 +08:00
LmeSzinc
c2f744c5ff Upd: [JP] SERIES_DETAIL (#2900) 2023-07-20 22:35:28 +08:00
LmeSzinc
b5d93a9e1a Fix: [JP] Handle info_bar in research detect (#2890) 2023-07-20 22:34:03 +08:00
LmeSzinc
8ace0e22d2 Fix: Handler pickup banner in research series 2023-07-20 22:34:00 +08:00
LmeSzinc
8b246421bf Fix: Missing cached_property decorator on shop_guild_items (fixed #2898) 2023-07-20 14:36:48 +08:00
LA-DI-DA
f93b3b3db5 Update setting help of ScreenshotInterval and CombatScreenshotInterval 2023-07-20 00:07:06 +08:00
LmeSzinc
7460deb799 Upd: Merge shop/guild and shop/guild_cn 2023-07-19 00:12:30 +08:00
LmeSzinc
76107e8682 Fix: Handle RETIRE_EQUIP_CONFIRM during _equip_view_swipe() 2023-07-18 23:22:12 +08:00
SarContDeli
048268b406 Add: Consume spilled Coins 2023-07-18 23:20:50 +08:00
LA-DI-DA
1bcf997e40 Extend the timeout period of non-combat continuous screenshots 2023-07-17 22:09:07 +08:00
LA-DI-DA
84b2dde422 Merge branch 'wait' into smallkai 
# Conflicts:
#	README.md
#	alas.py
#	assets/cn/gg_handler/BUTTON_GG_ENTER_POS.png
#	assets/cn/gg_handler/BUTTON_GG_TAB_SEARCH_POS.png
#	assets/gui/css/alas.css
#	config/template.json
#	module/campaign/assets.py
#	module/campaign/campaign_event.py
#	module/config/argument/args.json
#	module/config/argument/task.yaml
#	module/config/config_updater.py
#	module/config/i18n/ja-JP.json
#	module/log_res/log_res.py
 2023-07-17 18:45:43 +08:00
xzjjasper
c892b3be22 Fix: [TW] SHOP_CHECK 2023-07-16 16:23:58 +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
LA-DI-DA
d984ec5a2c Merge branch 'lme-alas/master' into wait 2023-07-15 10:21:26 +08:00
xzjjasper
d7765f408e Upd: [TW] shop module 2023-07-14 12:15:49 +08:00
xzjjasper
065d4a8bce Upd: [TW] assets of shop module 2023-07-14 12:03:38 +08:00
LmeSzinc
fb68f93bfe Fix: MEDAL_SHOP_SCROLL.drag_threshold 2023-07-14 11:21:35 +08:00
LmeSzinc
1ab1994aa2 Fix: Wrong return in get_research_series_jp() (#2876) 2023-07-14 11:20:38 +08:00
LmeSzinc
044038254a Upd: Shop module 
- Assume TW is unchanged
 2023-07-14 01:43:19 +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
Ian Lee
91e4100dc4 Upd: [TW] Event:Operation Convergence (#2871) 
* Upd: [TW] Event: Counterattack Within the Fjord Rerun

* Update Readme.md

* Update args.json

* Update zh-TW.json

* [TW] Event: Counterattack Within the Fjord Rerun

* Update Readme.md

* Update Readme.md

* 刪除資料夾

* Upd: [TW] Event: Rondo at Rainbow's End

* Upd: [TW] Event:Operation Convergence

* Upd: [TW] Event:Operation Convergence

* Upd: [TW] Event:Operation Convergence
 2023-07-13 23:02:49 +08:00
LmeSzinc
8ca8d81814 Add: PR6 gui settings 2023-07-13 22:59:12 +08:00
LmeSzinc
6122248ad2 Add: PR6 presets and filters 
- Refactor get_research_series() by hgj
 2023-07-13 22:37:58 +08:00
LA-DI-DA
86d08ca387 Merge branch 'lme-alas/master' into wait 2023-07-13 19:27:52 +08:00
LmeSzinc
5af6dce001 Tmp: Disable shop tasks until assets are updated 2023-07-13 13:49:15 +08:00
LmeSzinc
54d4920a63 Fix: Handle RAID_REWARDS at raid ocr (#2838) 2023-07-07 00:38:10 +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
Horizon101011
70987e1712 Fix: Retire get stuck if nothing can be retired (#2837) 2023-07-04 18:34:24 +08:00
LA-DI-DA
511334ed84 Merge branch 'lme-alas/master' into wait 2023-07-02 17:28:05 +08:00
LmeSzinc
e045d14d3d Fix: Navigating to Odin in shipyard (#2611) 2023-07-02 16:56:05 +08:00
LmeSzinc
a6a845a36a Fix: Delay OpsiArchive at AP limit (#2785) 2023-07-02 15:59:02 +08:00
LmeSzinc
85ec86ba1c Fix: Check exp_info first if battle_status has been clicked (#2774) 2023-07-02 15:54:26 +08:00
LmeSzinc
27acff08af Fix: Handle GET_ITEMS_1 in perspective errors of OpSi (#2808) 2023-07-02 15:46:48 +08:00
Tarin_Chan
b9e5134464 Fix: add RAID_REWARDS.png to fix raid reward problem (#2829) 
* Add files via upload

* Update raid.py

更改了逻辑
特别感谢Alas群 莱森·何Horizon101011 的帮助

* Update raid.py

趁没人看见修点丢人bug

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-07-02 15:38:44 +08:00
guoh064
b72eecf277 Fix: Avoid stuck on energy storage device (#2825) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-07-02 15:36:37 +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
LmeSzinc
11d094c025 Fix: [ALAS] Handle None in interval_clear() 2023-07-02 15:20:37 +08:00
LmeSzinc
64f4f72c01 Fix: [ALAS] Remove the use of np.float 2023-07-02 15:20:34 +08:00