282 Commits

Author SHA1 Message Date
POLAR me
628814c4b6 feat(Oilkeep): 添加石油平衡功能
- 实现每日领取储藏室石油的功能
2024-12-26 04:23:59 +08:00
POLAR me
5cb17fdbf8 Merge branch 'master' into _master 2024-10-12 20:26:52 +08:00
coconutjuice
6b7ea0448c
Upd:Adds the Meowfficer maximum level option for enhance (#4267)
* Upd:Adds the Meowfficer maximum level option for enhance

* Upd:Move ocr and judgment logic out of the loop

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: yx800 <yoyo.duan@cfnet.com.cn>
2024-10-12 00:45:56 +08:00
POLAR me
a10bdcbdca
Merge branch 'LmeSzinc:master' into master 2024-08-17 11:13:40 +08:00
LmeSzinc
2ad7bed1b6 Add: [CN] Server 水仙行动 (fixed #4087) 2024-08-16 22:34:38 +08:00
POLAR me
0901555cfc
Merge pull request #38 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-07-28 14:20:31 +08:00
LmeSzinc
7d4b21b4fc Upd: [CN] New server 暴雨行动 (#4025) 2024-07-27 01:54:57 +08:00
POLAR me
65a3b30a45
Merge pull request #37 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-07-25 20:09:51 +08:00
LmeSzinc
2454d2aa2c Opt: Use MaaTouch as default control method 2024-07-25 02:19:45 +08:00
LmeSzinc
733bb89b2d Add: [ALAS] Add ldopengl setting 2024-07-25 02:16:34 +08:00
POLAR me
f04dbd2a8b
Merge branch 'LmeSzinc:master' into master 2024-07-19 00:30:31 +08:00
LmeSzinc
e66b2a84b0 Add: Claim mails in task freebies
- TODO: [JP][TW] Update mail assets
2024-07-18 22:48:40 +08:00
POLAR me
f71973691c
Merge pull request #34 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-07-12 09:33:21 +08:00
LmeSzinc
5ee7f9118e Add: Series 7 filter 2024-07-12 00:24:36 +08:00
POLAR me
19d810d389 Merge branch 'master' into _master 2024-06-29 01:49:50 +08:00
LmeSzinc
a8f8432842 Add: [CN] Assets for coalition_20240627 2024-06-28 01:18:59 +08:00
POLAR me
9525217da5 Merge branch 'master' into _master 2024-06-26 23:49:58 +08:00
LmeSzinc
b9730d4cd2 Opt: Add default filter in OpsiShop 2024-06-23 18:09:19 +08:00
霞飛
62bc1ed7f7 ref: remove frequency config and not to judge coins at last day 2024-06-22 21:43:55 +08:00
霞飛
0b97b40c46
Feature: New OpsiShop. (#3086)
* feat: New OpsiShop

* fix: use AdaptiveScroll

* feat: scan counter

* perf: calculate y value
2024-06-17 11:24:40 +08:00
Air111
a70d4c4675
Upd: add CommonDD option (#3786)
* Upd: add dd combination z20_or_z21

* Upd: add dd option favourite

* Opt: use fation to filter Z20 or Z21
2024-06-14 03:39:20 +08:00
W1NDes
fc72b34b2d 多次重启尝试再报错,直接抄了oxcc的代码, 2024-05-09 01:02:17 +08:00
POLAR me
f87eacaf41
Merge pull request #19 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-05-08 19:32:29 +08:00
Air111
c5073e5917
Upd: gui text (#3735) 2024-05-08 01:01:12 +08:00
POLAR me
2f90bf2b22
Merge pull request #13 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-04-15 21:40:22 +08:00
LmeSzinc
c928654a36 Del: Remove nemu_ipc controls cuz bad swipes on slow PCs 2024-04-13 23:33:49 +08:00
POLAR me
b8a0c792c9
Merge pull request #8 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-04-10 16:02:53 +08:00
ygrzxc
7d574dde8b
Add: Change the designated vanguard combination (#3520)
* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Translation for change the designated vanguard combination

* Add: Translation for change the designated vanguard combination

* Upd:Update dev's args.json

* Upd:Update dev's args.json

* Upd:Reduce template image size and Implement function

* Upd:Reduce template image size and Implement function

* Upd:Reduce template image size and Implement function

---------

Co-authored-by: y y <jaxvuav@163.com>
2024-04-08 22:49:30 +08:00
LmeSzinc
78adcbbc7d Opt: No android versions selecting in benchmark 2024-04-08 04:11:50 +08:00
LmeSzinc
2e81cb7dc1 Add: Click method nemu_ipc 2024-04-08 03:14:33 +08:00
LmeSzinc
501d0e6a7f Add: ScreenshotMethod option nemu_ipc 2024-03-28 19:17:16 +08:00
LmeSzinc
6987d60c96 Add: Alas.EmulatorInfo settings 2024-03-28 12:44:42 +08:00
POLAR me
e14435630d 回滚
回滚至alas-with-dashboard
2024-03-16 00:54:26 +08:00
POLAR me
30190c3987
Merge branch 'LmeSzinc:master' into master 2024-03-15 22:17:49 +08:00
guoh064
e148c9f2ae Upd: Shipyard argument (PR4 and DR3) 2024-01-31 22:06:56 +08:00
WINDes
6ea6eb3fc2 Merge branch 'master' into pr/3086 2024-01-29 04:26:27 +08:00
SaarChaffee
612daa3dfc
feat: Adapt to the new OS shop and new filter. 2024-01-14 19:27:55 +08:00
WINDes
10072baeed dashboard add 2023-12-28 20:36:54 +08:00
WINDes
d4aa52c258 back 2023-12-28 20:32:24 +08:00
WINDes
e9d520d9f0 fix 2023-12-28 20:22:04 +08:00
weeswelai
56fe530310 Add: Buy time-limited furniture in dorm. 2023-12-23 00:32:30 +08:00
W1NDes
cf43109062 Merge branch 'pr/3086' 2023-12-06 19:20:35 +08:00
W1NDes
5980a151ea Merge branch 'pr/2679' 2023-12-06 19:13:01 +08:00
LmeSzinc
75a58f5640 Opt: [ALAS] Turn type lock to type state 2023-10-28 22:03:47 +08:00
SaarChaffee
3f317c5176
feat: Better filter implement for OS shops. 2023-09-20 14:26:08 +08:00
yypsybs
fd9777940b Merge branch 'master' into dev-minigame-for-pr
# Conflicts:
#	module/ui/assets.py
2023-09-01 17:58:39 +08:00
guoh064
37e852aadc
Add: Crystal Fragment template/filter_string in Voucher Shop (#3068) 2023-09-01 00:46:05 +08:00
guoh064
425525d263
Merge branch 'dev' into os_collective 2023-08-28 05:50:28 +08:00
guoh064
d45aa205f2 Add: Config for os target 2023-08-04 13:00:44 +08:00
Tipsy Fisher
6fca29e79c
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-07-21 00:07:41 +08:00