diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 3eae68f5..9cfd9980 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -465,7 +465,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1e332d4501ad787469e15b96f8a4a7fc, type: 3} m_Name: m_EditorClassIdentifier: - ResultText: {fileID: 1852618930} + displayManager: {fileID: 332003134} --- !u!1 &383296243 GameObject: m_ObjectHideFlags: 0 @@ -713,8 +713,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.0000000018626, y: 0} - m_SizeDelta: {x: 5.3211, y: 2.9793} + m_AnchoredPosition: {x: -0.0000074804, y: 0} + m_SizeDelta: {x: 18.248, y: 2.9793} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &497729917 MonoBehaviour: @@ -736,7 +736,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Play + m_text: Play Synth Riders m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -950,8 +950,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -0.21802, y: 0.14237} - m_SizeDelta: {x: 0.43605, y: 0.1733} + m_AnchoredPosition: {x: 0.02015, y: 0.337} + m_SizeDelta: {x: 0.9124, y: 0.1733} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &867290210 MonoBehaviour: @@ -1264,7 +1264,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1116074849 RectTransform: m_ObjectHideFlags: 0 @@ -1278,7 +1278,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1396730355} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1570,8 +1570,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 1.3 - m_fontSizeBase: 1.3 + m_fontSize: 1.6 + m_fontSizeBase: 1.6 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 6 @@ -1648,6 +1648,7 @@ RectTransform: m_LocalScale: {x: 0.05, y: 0.050000004, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1450649885} - {fileID: 1116074849} - {fileID: 1852618929} m_Father: {fileID: 1562907173} @@ -1772,7 +1773,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0.020152, y: 0.3548} + m_AnchoredPosition: {x: 0.020145, y: 0.554} m_SizeDelta: {x: 0.91239, y: 0.1609} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1414726938 @@ -1948,6 +1949,141 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1416211313} m_CullTransparentMesh: 1 +--- !u!1 &1450649884 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1450649885} + - component: {fileID: 1450649887} + - component: {fileID: 1450649886} + m_Layer: 0 + m_Name: txtTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1450649885 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1450649884} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1396730355} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.1513, y: 3.877} + m_SizeDelta: {x: 18.438, y: 4.4199} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1450649886 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1450649884} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: SR Quest Downloader + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 1.5 + m_fontSizeBase: 1.5 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 6 + m_fontSizeMax: 18 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -0.055011746, y: 0.05731893, z: -0.0221262, w: -0.058979873} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1450649887 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1450649884} + m_CullTransparentMesh: 1 --- !u!1 &1534894641 GameObject: m_ObjectHideFlags: 0 @@ -2331,7 +2467,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1852618929 RectTransform: m_ObjectHideFlags: 0 @@ -2345,7 +2481,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1396730355} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2486,8 +2622,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0.2514, y: 0.14237} - m_SizeDelta: {x: 0.4499, y: 0.1733} + m_AnchoredPosition: {x: 0.020155996, y: 0.12} + m_SizeDelta: {x: 0.91239, y: 0.1733} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1879712639 MonoBehaviour: diff --git a/Assets/Scripts/DisplayManager.cs b/Assets/Scripts/DisplayManager.cs index 111b4b7a..c17b2aea 100644 --- a/Assets/Scripts/DisplayManager.cs +++ b/Assets/Scripts/DisplayManager.cs @@ -7,39 +7,19 @@ public class DisplayManager : MonoBehaviour { - public TextMeshProUGUI LastModifiedText; - public TextMeshProUGUI ResultText; public TextMeshProUGUI DebugText; public TextMeshProUGUI ErrorText; - private readonly string lastModifiedLabel = "Last Modified: "; - private readonly string resultLabel = "Result: "; - private List debugBuffer = new List(); private List errorBuffer = new List(); private void Awake() { - LastModifiedText.SetText(lastModifiedLabel + Preferences.GetLastDownloadedTimeMs()); - LastModifiedText.gameObject.SetActive(true); - - ResultText.SetText(resultLabel); - ResultText.gameObject.SetActive(true); - DebugText.gameObject.SetActive(true); ErrorText.gameObject.SetActive(true); } - private void SetError(string message) - { - ResultText.SetText("Error: " + message); - ResultText.color = Color.red; - ResultText.gameObject.SetActive(true); - - LastModifiedText.gameObject.SetActive(false); - } - public void ClearLogs() { debugBuffer.Clear(); DebugText.SetText(""); diff --git a/Assets/Scripts/DownloadManager.cs b/Assets/Scripts/DownloadManager.cs index 09acb1fb..ca75a650 100644 --- a/Assets/Scripts/DownloadManager.cs +++ b/Assets/Scripts/DownloadManager.cs @@ -152,7 +152,7 @@ private IEnumerator ExtractSynthriderzZip(string zipPath, string synthDirectory) /// Move synth custom content from the Downloads folder to custom content directories. /// Extracts zip files that look like they were downloaded from synthriderz.com private IEnumerator MoveDownloadedFiles() { - displayManager.ResultText.SetText("Moving custom songs from Download folder..."); + displayManager.DebugLog("Trying to move custom content from Download folder..."); if (isMovingFiles) { displayManager.DebugLog("Already moving! Ignoring..."); diff --git a/Assets/Scripts/Preferences.cs b/Assets/Scripts/Preferences.cs deleted file mode 100644 index 464ff1ac..00000000 --- a/Assets/Scripts/Preferences.cs +++ /dev/null @@ -1,15 +0,0 @@ -using UnityEngine; - -public class Preferences { - - private static string KEY_LAST_DOWNLOADED_TIME_MS = "lastDownloadedTimeMs"; - public static int DEFAULT_LAST_DOWNLOADED_TIME_MS = 0; - - public static void SetLastDownloadedTimeMs(int lastDownloadedTimeMs) { - PlayerPrefs.SetInt(KEY_LAST_DOWNLOADED_TIME_MS, lastDownloadedTimeMs); - } - - public static int GetLastDownloadedTimeMs() { - return PlayerPrefs.GetInt(KEY_LAST_DOWNLOADED_TIME_MS, DEFAULT_LAST_DOWNLOADED_TIME_MS); - } -} \ No newline at end of file diff --git a/Assets/Scripts/Preferences.cs.meta b/Assets/Scripts/Preferences.cs.meta deleted file mode 100644 index 06a3c68b..00000000 --- a/Assets/Scripts/Preferences.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: be4cefb61e753d74c89277fada37c6c9 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/SynthLauncher.cs b/Assets/Scripts/SynthLauncher.cs index 847a3fd5..a1ef39b5 100644 --- a/Assets/Scripts/SynthLauncher.cs +++ b/Assets/Scripts/SynthLauncher.cs @@ -5,12 +5,46 @@ public class SynthLauncher : MonoBehaviour { - public TextMeshProUGUI ResultText; + public DisplayManager displayManager; public void LaunchSynthRiders() { - ResultText.SetText("Launching Synth Riders..."); + displayManager.DebugLog("Launching Synth Riders..."); + SendLaunchIntent("com.kluge.SynthRiders"); + } + /// Adapted from https://forum.unity.com/threads/android-ios-launch-from-within-a-unity-app-another-unity-app.222709/?_ga=2.89812563.95253068.1605723327-1322877492.1590351887#post-2308076 + private void SendLaunchIntent(string bundleId) { + displayManager.DebugLog("Getting current package manager..."); + AndroidJavaClass up = new AndroidJavaClass("com.unity3d.player.UnityPlayer"); + AndroidJavaObject ca = up.GetStatic("currentActivity"); + AndroidJavaObject packageManager = ca.Call("getPackageManager"); + bool didLaunch = false; + try + { + displayManager.DebugLog("Creating launch intent"); + AndroidJavaObject launchIntent = packageManager.Call("getLaunchIntentForPackage", bundleId); + + displayManager.DebugLog("Trying to start activity..."); + ca.Call("startActivity",launchIntent); + + didLaunch = true; + launchIntent.Dispose(); + } + catch (System.Exception e) + { + displayManager.ErrorLog($"Failed to create or send launch intent for bundle {bundleId}: {e.Message}"); + } + finally { + displayManager.DebugLog("Clean up..."); + packageManager.Dispose(); + ca.Dispose(); + up.Dispose(); + } + + if (didLaunch) { + Application.Quit(0); + } } } diff --git a/OVRAssetBundles/OVRMasterBundle/OVRMasterBundle b/OVRAssetBundles/OVRMasterBundle/OVRMasterBundle index 21aa36a8..da323e7a 100644 Binary files a/OVRAssetBundles/OVRMasterBundle/OVRMasterBundle and b/OVRAssetBundles/OVRMasterBundle/OVRMasterBundle differ diff --git a/OVRAssetBundles/OVRMasterBundle/OVRMasterBundle.manifest b/OVRAssetBundles/OVRMasterBundle/OVRMasterBundle.manifest index 3ed47206..f7df6268 100644 --- a/OVRAssetBundles/OVRMasterBundle/OVRMasterBundle.manifest +++ b/OVRAssetBundles/OVRMasterBundle/OVRMasterBundle.manifest @@ -1,5 +1,5 @@ ManifestFileVersion: 0 -CRC: 353322661 +CRC: 186336972 AssetBundleManifest: AssetBundleInfos: Info_0: diff --git a/OVRAssetBundles/OVRMasterBundle/scene_mainscene b/OVRAssetBundles/OVRMasterBundle/scene_mainscene index d4483c4c..65e3f6f7 100644 Binary files a/OVRAssetBundles/OVRMasterBundle/scene_mainscene and b/OVRAssetBundles/OVRMasterBundle/scene_mainscene differ diff --git a/OVRAssetBundles/OVRMasterBundle/scene_mainscene.manifest b/OVRAssetBundles/OVRMasterBundle/scene_mainscene.manifest index 3f51db8e..0e3bcefc 100644 --- a/OVRAssetBundles/OVRMasterBundle/scene_mainscene.manifest +++ b/OVRAssetBundles/OVRMasterBundle/scene_mainscene.manifest @@ -1,12 +1,12 @@ ManifestFileVersion: 0 -CRC: 919200127 +CRC: 3461131709 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 94e74f261be4387375c4fa73a9d301b5 + Hash: 10d964ce9fe19b3a8500a0013a27e04f TypeTreeHash: serializedVersion: 2 - Hash: 0ece19c8a7be81e74d2e05ffdd5d5073 + Hash: 8519e98deb2049fdfcd50d49f7c00c9f HashAppended: 0 ClassTypes: - Class: 1 diff --git a/OVRAssetBundles/Temp/OVRMasterBundle b/OVRAssetBundles/Temp/OVRMasterBundle index 21aa36a8..da323e7a 100644 Binary files a/OVRAssetBundles/Temp/OVRMasterBundle and b/OVRAssetBundles/Temp/OVRMasterBundle differ diff --git a/OVRAssetBundles/Temp/SceneLoadData.txt b/OVRAssetBundles/Temp/SceneLoadData.txt index 162bea85..73b3dc66 100644 --- a/OVRAssetBundles/Temp/SceneLoadData.txt +++ b/OVRAssetBundles/Temp/SceneLoadData.txt @@ -1,2 +1,2 @@ -1673722063 +1673724630 MainScene