diff --git a/resource/tasks/UiTheme/Depot.json b/resource/tasks/UiTheme/Depot.json index 53e9da6eb8..1de470c742 100644 --- a/resource/tasks/UiTheme/Depot.json +++ b/resource/tasks/UiTheme/Depot.json @@ -20,7 +20,8 @@ "DepotJieGarden", "DepotAveMujica", "DepotTogether", - "DepotLoneTrail" + "DepotLoneTrail", + "DepotReconstruct" ], "onErrorNext": ["Depot-Entry@SwitchTheme@ToggleSettingsMenu"] }, @@ -83,5 +84,9 @@ "DepotLoneTrail": { "baseTask": "DepotDefault", "template": ["LoneTrail/Day/DepotEnter.png", "LoneTrail/Night/DepotEnter.png"] + }, + "DepotReconstruct": { + "baseTask": "DepotDefault", + "template": "Reconstruct/DepotEnter.png" } } diff --git a/resource/tasks/UiTheme/Friends.json b/resource/tasks/UiTheme/Friends.json index 11df5a7481..e4a4e2fc01 100644 --- a/resource/tasks/UiTheme/Friends.json +++ b/resource/tasks/UiTheme/Friends.json @@ -20,7 +20,8 @@ "FriendsJieGarden", "FriendsAveMujica", "FriendsTogether", - "FriendsLoneTrail" + "FriendsLoneTrail", + "FriendsReconstruct" ], "onErrorNext": ["Friends-Entry@SwitchTheme@ToggleSettingsMenu"] }, @@ -84,5 +85,9 @@ "FriendsLoneTrail": { "baseTask": "FriendsDefault", "template": ["LoneTrail/Day/Friends.png", "LoneTrail/Night/Friends.png"] + }, + "FriendsReconstruct": { + "baseTask": "FriendsDefault", + "template": "Reconstruct/Friends.png" } } diff --git a/resource/tasks/UiTheme/Gacha.json b/resource/tasks/UiTheme/Gacha.json index 5f8a667a49..610b999e6d 100644 --- a/resource/tasks/UiTheme/Gacha.json +++ b/resource/tasks/UiTheme/Gacha.json @@ -20,7 +20,8 @@ "GachaJieGarden", "GachaAveMujica", "GachaTogether", - "GachaLoneTrail" + "GachaLoneTrail", + "GachaReconstruct" ], "onErrorNext": ["Gacha-Entry@SwitchTheme@ToggleSettingsMenu"] }, @@ -83,5 +84,9 @@ "GachaLoneTrail": { "baseTask": "GachaDefault", "template": ["LoneTrail/Day/GachaEnter.png", "LoneTrail/Night/GachaEnter.png"] + }, + "GachaReconstruct": { + "baseTask": "GachaDefault", + "template": "Reconstruct/GachaEnter.png" } } diff --git a/resource/tasks/UiTheme/Infrast.json b/resource/tasks/UiTheme/Infrast.json index 23bb72cb6a..eaf2d937b9 100644 --- a/resource/tasks/UiTheme/Infrast.json +++ b/resource/tasks/UiTheme/Infrast.json @@ -20,7 +20,8 @@ "InfrastJieGarden", "InfrastAveMujica", "InfrastTogether", - "InfrastLoneTrail" + "InfrastLoneTrail", + "InfrastReconstruct" ], "onErrorNext": ["Infrast-Entry@SwitchTheme@ToggleSettingsMenu"] }, @@ -83,5 +84,9 @@ "InfrastLoneTrail": { "baseTask": "InfrastDefault", "template": ["LoneTrail/Day/EnterInfrast.png", "LoneTrail/Night/EnterInfrast.png"] + }, + "InfrastReconstruct": { + "baseTask": "InfrastDefault", + "template": "Reconstruct/EnterInfrast.png" } } diff --git a/resource/tasks/UiTheme/Mall.json b/resource/tasks/UiTheme/Mall.json index 78681503a8..c9b7046082 100644 --- a/resource/tasks/UiTheme/Mall.json +++ b/resource/tasks/UiTheme/Mall.json @@ -20,7 +20,8 @@ "MallJieGarden", "MallAveMujica", "MallTogether", - "MallLoneTrail" + "MallLoneTrail", + "MallReconstruct" ], "onErrorNext": ["Mall-Entry@SwitchTheme@ToggleSettingsMenu"] }, @@ -83,5 +84,9 @@ "MallLoneTrail": { "baseTask": "MallDefault", "template": ["LoneTrail/Day/Mall.png", "LoneTrail/Night/Mall.png"] + }, + "MallReconstruct": { + "baseTask": "MallDefault", + "template": "Reconstruct/Mall.png" } } diff --git a/resource/tasks/UiTheme/OperBox.json b/resource/tasks/UiTheme/OperBox.json index ae5924245a..213c580fdd 100644 --- a/resource/tasks/UiTheme/OperBox.json +++ b/resource/tasks/UiTheme/OperBox.json @@ -20,7 +20,8 @@ "OperBoxJieGarden", "OperBoxAveMujica", "OperBoxTogether", - "OperBoxLoneTrail" + "OperBoxLoneTrail", + "OperBoxReconstruct" ], "onErrorNext": ["OperBox-Entry@SwitchTheme@ToggleSettingsMenu"] }, @@ -83,5 +84,9 @@ "OperBoxLoneTrail": { "baseTask": "OperBoxDefault", "template": ["LoneTrail/Day/OperBoxEnter.png", "LoneTrail/Night/OperBoxEnter.png"] + }, + "OperBoxReconstruct": { + "baseTask": "OperBoxDefault", + "template": "Reconstruct/OperBoxEnter.png" } } diff --git a/resource/tasks/UiTheme/Recruit.json b/resource/tasks/UiTheme/Recruit.json index 70b4447d3e..1a2bdc3d4a 100644 --- a/resource/tasks/UiTheme/Recruit.json +++ b/resource/tasks/UiTheme/Recruit.json @@ -20,7 +20,8 @@ "RecruitJieGarden", "RecruitAveMujica", "RecruitTogether", - "RecruitLoneTrail" + "RecruitLoneTrail", + "RecruitReconstruct" ], "onErrorNext": ["Recruit-Entry@SwitchTheme@ToggleSettingsMenu"] }, @@ -83,5 +84,9 @@ "RecruitLoneTrail": { "baseTask": "RecruitDefault", "template": ["LoneTrail/Day/Recruit.png", "LoneTrail/Night/Recruit.png"] + }, + "RecruitReconstruct": { + "baseTask": "RecruitDefault", + "template": "Reconstruct/Recruit.png" } } diff --git a/resource/tasks/UiTheme/Task.json b/resource/tasks/UiTheme/Task.json index 2ac01248ca..1ba5d6e237 100644 --- a/resource/tasks/UiTheme/Task.json +++ b/resource/tasks/UiTheme/Task.json @@ -20,7 +20,8 @@ "TaskJieGarden", "TaskAveMujica", "TaskTogether", - "TaskLoneTrail" + "TaskLoneTrail", + "TaskReconstruct" ], "onErrorNext": ["Task-Entry@SwitchTheme@ToggleSettingsMenu"] }, @@ -85,5 +86,9 @@ "TaskLoneTrail": { "baseTask": "TaskDefault", "template": ["LoneTrail/Day/Task.png", "LoneTrail/Night/Task.png"] + }, + "TaskReconstruct": { + "baseTask": "TaskDefault", + "template": "Reconstruct/Task.png" } } diff --git a/resource/tasks/UiTheme/Terminal.json b/resource/tasks/UiTheme/Terminal.json index cbd06b7c0c..822b275d4b 100644 --- a/resource/tasks/UiTheme/Terminal.json +++ b/resource/tasks/UiTheme/Terminal.json @@ -21,7 +21,8 @@ "TerminalJieGarden", "TerminalAveMujica", "TerminalTogether", - "TerminalLoneTrail" + "TerminalLoneTrail", + "TerminalReconstruct" ], "onErrorNext": ["Terminal-Entry@SwitchTheme@ToggleSettingsMenu"] }, @@ -84,5 +85,9 @@ "TerminalLoneTrail": { "baseTask": "TerminalDefault", "template": ["LoneTrail/Day/Terminal.png", "LoneTrail/Night/Terminal.png"] + }, + "TerminalReconstruct": { + "baseTask": "TerminalDefault", + "template": "Reconstruct/Terminal.png" } } diff --git a/resource/template/UiTheme/Reconstruct/DepotEnter.png b/resource/template/UiTheme/Reconstruct/DepotEnter.png new file mode 100644 index 0000000000..5fc85435e6 Binary files /dev/null and b/resource/template/UiTheme/Reconstruct/DepotEnter.png differ diff --git a/resource/template/UiTheme/Reconstruct/EnterInfrast.png b/resource/template/UiTheme/Reconstruct/EnterInfrast.png new file mode 100644 index 0000000000..6e6c6408f1 Binary files /dev/null and b/resource/template/UiTheme/Reconstruct/EnterInfrast.png differ diff --git a/resource/template/UiTheme/Reconstruct/Friends.png b/resource/template/UiTheme/Reconstruct/Friends.png new file mode 100644 index 0000000000..4180bc14d2 Binary files /dev/null and b/resource/template/UiTheme/Reconstruct/Friends.png differ diff --git a/resource/template/UiTheme/Reconstruct/GachaEnter.png b/resource/template/UiTheme/Reconstruct/GachaEnter.png new file mode 100644 index 0000000000..d2bb867aab Binary files /dev/null and b/resource/template/UiTheme/Reconstruct/GachaEnter.png differ diff --git a/resource/template/UiTheme/Reconstruct/Mall.png b/resource/template/UiTheme/Reconstruct/Mall.png new file mode 100644 index 0000000000..f0a7c7c1a9 Binary files /dev/null and b/resource/template/UiTheme/Reconstruct/Mall.png differ diff --git a/resource/template/UiTheme/Reconstruct/OperBoxEnter.png b/resource/template/UiTheme/Reconstruct/OperBoxEnter.png new file mode 100644 index 0000000000..31094613b3 Binary files /dev/null and b/resource/template/UiTheme/Reconstruct/OperBoxEnter.png differ diff --git a/resource/template/UiTheme/Reconstruct/Recruit.png b/resource/template/UiTheme/Reconstruct/Recruit.png new file mode 100644 index 0000000000..449ccbfd5f Binary files /dev/null and b/resource/template/UiTheme/Reconstruct/Recruit.png differ diff --git a/resource/template/UiTheme/Reconstruct/Task.png b/resource/template/UiTheme/Reconstruct/Task.png new file mode 100644 index 0000000000..b2fea06143 Binary files /dev/null and b/resource/template/UiTheme/Reconstruct/Task.png differ diff --git a/resource/template/UiTheme/Reconstruct/Terminal.png b/resource/template/UiTheme/Reconstruct/Terminal.png new file mode 100644 index 0000000000..67262d8262 Binary files /dev/null and b/resource/template/UiTheme/Reconstruct/Terminal.png differ diff --git a/tools/GetImageFromROI/updater.py b/tools/GetImageFromROI/updater.py index d5a0f384f0..0027194674 100644 --- a/tools/GetImageFromROI/updater.py +++ b/tools/GetImageFromROI/updater.py @@ -70,7 +70,7 @@ def update_ui_theme_tasks(): def move_generated_images(): for image_path in dst_path.rglob("*.png"): rel_path = image_path.relative_to(dst_path) - target_path = template_path / rel_path + target_path = template_path / "UiTheme" / rel_path if not target_path.parent.exists(): target_path.parent.mkdir(parents=True, exist_ok=True)