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

7388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LA-DI-DA
f93b3b3db5 Update setting help of ScreenshotInterval and CombatScreenshotInterval 2023-07-20 00:07:06 +08:00
LA-DI-DA
3e9c9ae764 Update README.md 2023-07-17 22:11:52 +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
77e35a4f94 Update deploy template 2023-07-17 20:01:14 +08:00
LA-DI-DA
2a7232bea8 Update alas.svg 2023-07-17 19:58:11 +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
LA-DI-DA
6cda4c02e5 Update README.md 2023-07-16 12:59:55 +08:00
Zuosizhu
33fc8314b4 Update README.md 2023-07-16 07:59:45 +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
543da19b8e Merge branch 'zuosizhu-alas/master' into wait 2023-07-15 10:21:30 +08:00
LA-DI-DA
d984ec5a2c Merge branch 'lme-alas/master' into wait 2023-07-15 10:21:26 +08:00
Zuosizhu
b5da0cc106 Merge branch 'LmeSzinc:master' into master 2023-07-15 06:48:33 +08:00
LmeSzinc
ab59c58ca4 Merge pull request #2879 from xzjjasper/master 
Upd: [TW] shop module updates
 2023-07-15 02:04:06 +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
2d79939806 Merge pull request #2878 from LmeSzinc/dev 
Bug fix
 2023-07-14 11:33:49 +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
2cd7f1df01 Fix: Add missing cost templates 2023-07-14 02:04:05 +08:00
LmeSzinc
c316f7618c Merge pull request #2875 from LmeSzinc/dev 
Bug fix
 2023-07-14 01:56:06 +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
Bookbug
3072424c47 Add: Blueprint assets of research S6 (#2872) 
* Add: Assets of research S6

* Add: Assets of research S6

* Del: Caps pic

* Del: Caps pic
 2023-07-13 23:02:25 +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
LmeSzinc
cc93296e60 Merge pull request #2843 from LmeSzinc/dev 
Bug fix
 2023-07-05 00:28:59 +08:00
LmeSzinc
90c359c6be Upd: Add merit shop templates 2023-07-04 22:58:18 +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
Zuosizhu
1bf0e4752c Merge branch 'LmeSzinc:master' into master 2023-07-04 00:32:08 +08:00
LA-DI-DA
511334ed84 Merge branch 'lme-alas/master' into wait 2023-07-02 17:28:05 +08:00
LmeSzinc
db85f04522 Merge pull request #2830 from LmeSzinc/dev 
Bug fix
 2023-07-02 16:58:06 +08:00
LmeSzinc
e045d14d3d Fix: Navigating to Odin in shipyard (#2611) 2023-07-02 16:56:05 +08:00
LmeSzinc
ca97f103bd Fix: Add pre-calculated HOMO_STORAGE in chapter 9 (#2811) 2023-07-02 16:24:50 +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
Zuosizhu
68a2ba7c12 Merge branch 'LmeSzinc:master' into 20230309 2023-07-01 20:57:27 +08:00
Zuosizhu
fde0e6f8a7 Merge branch 'LmeSzinc:master' into master 2023-07-01 20:56:47 +08:00