LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 12:49:25 +08:00
Code Activity

Opt: users are allowed not to push lua before script runs in case of unsuccessful pushes.

Browse Source
This commit is contained in:
Zuosizhu
2023-08-27 20:58:40 +08:00
parent ec48411c88
commit f55daeaf45
11 changed files with 69 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/template.json
View File

@@ -1940,6 +1940,7 @@
"GGPackageName": "com.",
"AutoRestartGG": false,
"RestartEverytime": true,
"RepushLua": true,
"GGMultiplyingFactor": 200,
"DisabledTask": "disable_all_dangerous_task"
},

47
module/config/argument/args.json
View File

@@ -1611,8 +1611,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230817_cn",
"event_20220414_cn",
"event_20230817_cn",
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
@@ -1932,8 +1932,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230817_cn",
"event_20220414_cn",
"event_20230817_cn",
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
@@ -2368,8 +2368,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230817_cn",
"event_20220414_cn",
"event_20230817_cn",
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
@@ -2804,6 +2804,17 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20220414_cn",
"event_20230817_cn",
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
"event_20220818_cn",
"event_20220428_cn",
"event_20210527_cn",
"event_20200603_cn",
"event_20230525_cn",
"event_20220526_cn",
"event_20201126_cn",
"event_20210819_cn",
"event_20211111_cn",
@@ -2823,23 +2834,15 @@
"event_20220915_cn",
"event_20210916_cn",
"event_20200903_en",
"event_20220818_cn",
"event_20220324_cn",
"event_20211028_cn",
"event_20220728_cn",
"event_20200917_cn",
"event_20201029_cn",
"event_20200820_cn",
"event_20201012_cn",
"event_20210527_cn",
"event_20220526_cn",
"event_20220428_cn",
"event_20220414_cn",
"event_20220407_tw",
"event_20220310_tw",
"event_20200603_cn",
"event_20220210_cn",
"event_20211125_cn",
"event_20211028_tw",
"event_20210722_cn",
"event_20200723_cn",
@@ -2861,10 +2864,10 @@
"event_20200227_cn"
],
"display": "disabled",
"cn": "event_20201126_cn",
"en": "event_20201126_cn",
"jp": "event_20201126_cn",
"tw": "event_20210819_cn"
"tw": "event_20220414_cn",
"cn": "event_20230817_cn",
"en": "event_20230817_cn",
"jp": "event_20230817_cn"
},
"Mode": {
"type": "select",
@@ -4148,8 +4151,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230817_cn",
"event_20220414_cn",
"event_20230817_cn",
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
@@ -4601,8 +4604,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230817_cn",
"event_20220414_cn",
"event_20230817_cn",
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
@@ -5054,8 +5057,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230817_cn",
"event_20220414_cn",
"event_20230817_cn",
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
@@ -5507,8 +5510,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230817_cn",
"event_20220414_cn",
"event_20230817_cn",
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
@@ -5950,8 +5953,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230817_cn",
"event_20220414_cn",
"event_20230817_cn",
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
@@ -9323,6 +9326,10 @@
"value": true,
"display": "disabled"
},
"RepushLua": {
"type": "checkbox",
"value": true
},
"GGMultiplyingFactor": {
"type": "input",
"value": 200

1
module/config/argument/argument.yaml
View File

@@ -699,6 +699,7 @@ GGHandler:
RestartEverytime:
value: true
display: disabled
RepushLua: true
GGMultiplyingFactor: 200
DisabledTask:
value: disable_all_dangerous_task

1
module/config/config_generated.py
View File

@@ -440,6 +440,7 @@ class GeneratedConfig:
GGHandler_GGPackageName = 'com.'
GGHandler_AutoRestartGG = False
GGHandler_RestartEverytime = True
GGHandler_RepushLua = True
GGHandler_GGMultiplyingFactor = 200
GGHandler_DisabledTask = 'disable_all_dangerous_task' # disable_all_dangerous_task, disable_guild_and_dangerous, disable_exercise, enable_all

4
module/config/config_updater.py
View File

@@ -165,9 +165,9 @@ class ConfigGenerator:
# Add dashboard to args
dashboard_and_task = {**self.task, **self.dashboard}
for path, groups in deep_iter(dashboard_and_task, depth=3):
if 'tasks' not in path:
if 'tasks' not in path and 'Dashboard' not in path:
continue
task = path[2]
task = path[2] if 'tasks' in path else path[0]
# Add storage to all task
groups.append('Storage')
for group in groups:

8
module/config/i18n/en-US.json
View File

@@ -646,8 +646,8 @@
"name": "Event Name",
"help": "Automatically selects to the latest event",
"campaign_main": "campaign_main",
"event_20230817_cn": "The Fools Scales",
"event_20220414_cn": "Aurora Noctis Rerun",
"event_20230817_cn": "The Fools Scales",
"event_20230803_cn": "Anthem of Remembrance",
"event_20211125_cn": "World-spanning Arclight Rerun",
"event_20200917_cn": "Dreamwakers Butterfly Rerun",
@@ -2462,6 +2462,10 @@
"name": "Restart Everytime Alas starts",
"help": "For sake of safety"
},
"RepushLua": {
"name": "GGHandler.RepushLua.name",
"help": "GGHandler.RepushLua.help"
},
"GGMultiplyingFactor": {
"name": "GG Multiplying Factor",
"help": "1 - 9999 Recommended"
@@ -2846,4 +2850,4 @@
"Clear": "Clear"
}
}
}
}

6
module/config/i18n/ja-JP.json
View File

@@ -646,8 +646,8 @@
"name": "Campaign.Event.name",
"help": "Campaign.Event.help",
"campaign_main": "campaign_main",
"event_20230817_cn": "愚者の天秤",
"event_20220414_cn": "極夜照らす幻光（復刻）",
"event_20230817_cn": "愚者の天秤",
"event_20230803_cn": "燃ゆる聖都の回想曲",
"event_20211125_cn": "弧光は交わる世界にて（復刻）",
"event_20200917_cn": "刹那觀る胡蝶の夢（復刻）",
@@ -2462,6 +2462,10 @@
"name": "GGHandler.RestartEverytime.name",
"help": "GGHandler.RestartEverytime.help"
},
"RepushLua": {
"name": "GGHandler.RepushLua.name",
"help": "GGHandler.RepushLua.help"
},
"GGMultiplyingFactor": {
"name": "GGHandler.GGMultiplyingFactor.name",
"help": "GGHandler.GGMultiplyingFactor.help"

8
module/config/i18n/zh-CN.json
View File

@@ -646,8 +646,8 @@
"name": "活动名称",
"help": "自动选择至最新的活动",
"campaign_main": "主线图",
"event_20230817_cn": "愚者的天平",
"event_20220414_cn": "复刻永夜幻光",
"event_20230817_cn": "愚者的天平",
"event_20230803_cn": "奏响鸢尾之歌",
"event_20211125_cn": "复刻交汇世界的弧光",
"event_20200917_cn": "复刻蝶海梦花",
@@ -2462,6 +2462,10 @@
"name": "每次启动Alas时重启",
"help": "打开以初始化倍率属性。如果你没有手动操作的坏习惯，可以关闭此选项。\n但是有坏习惯的人太多了，于是强制打开。"
},
"RepushLua": {
"name": "重新推送Lua",
"help": "有时推送时会失败，若出现此情况可尝试开关此选项。"
},
"GGMultiplyingFactor": {
"name": "倍率",
"help": "建议数值1-9999，没做数字检查，乱输后果自负"
@@ -2846,4 +2850,4 @@
"Clear": "清除"
}
}
}
}

8
module/config/i18n/zh-TW.json
View File

@@ -646,8 +646,8 @@
"name": "活動名稱",
"help": "自動選擇至最新的活動圖",
"campaign_main": "主線圖",
"event_20230817_cn": "The Fools Scales",
"event_20220414_cn": "復刻-永夜幻光",
"event_20230817_cn": "The Fools Scales",
"event_20230803_cn": "Anthem of Remembrance",
"event_20211125_cn": "復刻-交匯世界的弧光",
"event_20200917_cn": "復刻-蝶海夢花",
@@ -2462,6 +2462,10 @@
"name": "每次啟動Alas時重啓",
"help": "打開以初始化倍率内容。 如果你沒有手動操作的壞習慣，可以關閉此選項"
},
"RepushLua": {
"name": "GGHandler.RepushLua.name",
"help": "GGHandler.RepushLua.help"
},
"GGMultiplyingFactor": {
"name": "倍率",
"help": "建議數值1-9999，沒做數位檢查，亂輸入後果自負"
@@ -2846,4 +2850,4 @@
"Clear": "清除"
}
}
}
}

2
module/gg_handler/gg_handler.py
View File

@@ -56,9 +56,9 @@ class GGHandler:
Args:
mode: bool
"""
logger.hr('Enabling GG')
gg_package_name = deep_get(self.config.data, keys='GameManager.GGHandler.GGPackageName')
if mode:
logger.hr('Enabling GG')
# if self.method == 'screenshot' or gg_package_name == 'com.':
# GGScreenshot(config=self.config, device=self.device) \
# .gg_set(mode=True, factor=self.factor)

24
module/gg_handler/gg_u2.py
View File

@@ -128,16 +128,18 @@ class GGU2(Base):
_set = False
_confirmed = False
import os
os.popen(f'"toolkit/Lib/site-packages/adbutils/binaries/adb.exe" -s'
f' {self.device.serial} shell mkdir /sdcard/Notes')
self.device.sleep(0.5)
os.popen(f'"toolkit/Lib/site-packages/adbutils/binaries/adb.exe" -s'
f' {self.device.serial} shell rm /sdcard/Notes/Multiplier.lua')
self.device.sleep(0.5)
os.popen(f'"toolkit/Lib/site-packages/adbutils/binaries/adb.exe" -s'
f' {self.device.serial} push "bin/Lua/Multiplier.lua" /sdcard/Notes/Multiplier.lua')
self.device.sleep(0.5)
logger.info('Lua Pushed')
_repush = deep_get(self.config.data, keys='GameManager.GGHandler.RepushLua')
if _repush:
os.popen(f'"toolkit/Lib/site-packages/adbutils/binaries/adb.exe" -s'
f' {self.device.serial} shell mkdir /sdcard/Notes')
self.device.sleep(0.5)
os.popen(f'"toolkit/Lib/site-packages/adbutils/binaries/adb.exe" -s'
f' {self.device.serial} shell rm /sdcard/Notes/Multiplier.lua')
self.device.sleep(0.5)
os.popen(f'"toolkit/Lib/site-packages/adbutils/binaries/adb.exe" -s'
f' {self.device.serial} push "bin/Lua/Multiplier.lua" /sdcard/Notes/Multiplier.lua')
self.device.sleep(0.5)
logger.info('Lua Pushed')
while 1:
self.device.sleep(1)
if self.d(resourceId=f"{self.gg_package_name}:id/file").exists:
@@ -153,7 +155,7 @@ class GGU2(Base):
self.device.sleep(0.5)
if self.d(resourceId=f"{self.gg_package_name}:id/edit").exists:
self.d(resourceId=f"{self.gg_package_name}:id/edit").send_keys(f"{self.factor}")
logger.info('Factor Set')
logger.info(f'Factor Set: {self.factor}')
self.device.sleep(0.5)
_set = True
if _set and self.d.xpath('//*[@text="确定"]').exists: