From 38c7f9fef91a88b93b8fec98965515cdc14b3a57 Mon Sep 17 00:00:00 2001 From: katboi01 Date: Sat, 16 Nov 2024 11:05:43 +0100 Subject: [PATCH] fixed screenshot save location for Android --- Assets/Scripts/Screenshot.cs | 10 ++++++++-- Assets/Scripts/uGIF/CaptureToGIFCustom.cs | 10 ++++++++-- ProjectSettings/ProjectSettings.asset | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Assets/Scripts/Screenshot.cs b/Assets/Scripts/Screenshot.cs index 9ec121b..1087408 100644 --- a/Assets/Scripts/Screenshot.cs +++ b/Assets/Scripts/Screenshot.cs @@ -26,9 +26,15 @@ public class Screenshot : MonoBehaviour height = height == -1 ? Screen.height : height; var image = GrabFrame(camera, width, height, UmaViewerUI.Instance.SSTransparent.isOn); - string fileName = Application.dataPath + "/../Screenshots/" + string.Format("UmaViewer_{0}", DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss-fff")); +#if UNITY_ANDROID && !UNITY_EDITOR + string fileDirectory = Application.persistentDataPath + "/../Screenshots/"; +#else + string fileDirectory = Application.dataPath + "/../Screenshots/"; +#endif + + string fileName = fileDirectory + string.Format("UmaViewer_{0}", DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss-fff")); byte[] pngShot = ImageConversion.EncodeToPNG(image); - Directory.CreateDirectory(Application.dataPath + "/../Screenshots"); + Directory.CreateDirectory(fileDirectory); //fixes "/../" in path var fullpath = Path.GetFullPath($"{fileName}.png"); File.WriteAllBytes(fullpath, pngShot); diff --git a/Assets/Scripts/uGIF/CaptureToGIFCustom.cs b/Assets/Scripts/uGIF/CaptureToGIFCustom.cs index 04f7875..085fd5f 100644 --- a/Assets/Scripts/uGIF/CaptureToGIFCustom.cs +++ b/Assets/Scripts/uGIF/CaptureToGIFCustom.cs @@ -37,8 +37,14 @@ namespace uGIF IEnumerator WaitForBytes() { while(bytes == null) yield return new WaitForEndOfFrame(); - string fileName = Application.dataPath + "/../Screenshots/" + string.Format("UmaViewer_{0}", DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss-fff")); - Directory.CreateDirectory(Application.dataPath + "/../Screenshots"); + +#if UNITY_ANDROID && !UNITY_EDITOR + string fileDirectory = Application.persistentDataPath + "/../Screenshots/"; +#else + string fileDirectory = Application.dataPath + "/../Screenshots/"; +#endif + string fileName = fileDirectory + string.Format("UmaViewer_{0}", DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss-fff")); + Directory.CreateDirectory(fileDirectory); //fixes "/../" in path var fullpath = Path.GetFullPath($"{fileName}.gif"); File.WriteAllBytes(fullpath, bytes); diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index b081d7c..52721cb 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -134,7 +134,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 2.1.17 + bundleVersion: 2.1.18 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0