From ce239345949a2911a33f45de51c35923d62b86ff Mon Sep 17 00:00:00 2001
From: Harrison Hough <harrisonhough4@gmail.com>
Date: Wed, 10 Jan 2024 15:41:02 +0200
Subject: [PATCH] chore: update version and fix paths

---
 .../IntegrationGuide/IntegrationGuide.cs          | 15 ++++++++++-----
 Runtime/Core/Scripts/Data/ApplicationData.cs      |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Editor/Core/Scripts/UI/EditorWindows/IntegrationGuide/IntegrationGuide.cs b/Editor/Core/Scripts/UI/EditorWindows/IntegrationGuide/IntegrationGuide.cs
index a6191d93..2107df32 100644
--- a/Editor/Core/Scripts/UI/EditorWindows/IntegrationGuide/IntegrationGuide.cs
+++ b/Editor/Core/Scripts/UI/EditorWindows/IntegrationGuide/IntegrationGuide.cs
@@ -22,9 +22,9 @@ public class IntegrationGuide : EditorWindow
         private const string OPTIMIZE_THE_PERFORMANCE = "OptimizeThePerformance";
         private const string CORE_PACKAGE = "com.readyplayerme.core";
         private const string QUICKSTART_SAMPLE_NAME = "QuickStart";
-        private const string AVATAR_CREATOR_SAMPLE_NAME = "LegacyAvatarCreator";
-        private const string AVATAR_CREATOR_SAMPLE_SCENE_NAME = "Scenes/LegacyAvatarCreator";
-
+        private const string AVATAR_CREATOR_SAMPLE_NAME = "AvatarCreatorSamples";
+        private const string AVATAR_CREATOR_SAMPLE_SCENE_PATH = "LegacyAvatarCreator/Scenes/LegacyAvatarCreator";
+        private const string SAMPLES_FOLDER_PATH = "Assets/Ready Player Me/Core/Samples";
         [SerializeField] private VisualTreeAsset visualTreeAsset;
 
         [MenuItem("Tools/Ready Player Me/Integration Guide", priority = 12)]
@@ -75,7 +75,7 @@ private void RegisterButtons()
             rootVisualElement.Q<VisualElement>(INTEGRATE_AVATAR_CREATOR).Q<Button>("LoadSampleSceneButton").clicked += () =>
             {
                 AnalyticsEditorLogger.EventLogger.LogAvatarCreatorSampleImported();
-                LoadAndOpenSample(AVATAR_CREATOR_SAMPLE_NAME, AVATAR_CREATOR_SAMPLE_SCENE_NAME);
+                LoadAndOpenSample(AVATAR_CREATOR_SAMPLE_NAME, AVATAR_CREATOR_SAMPLE_SCENE_PATH);
             };
 
             rootVisualElement.Q<VisualElement>(OPTIMIZE_THE_PERFORMANCE).Q<Button>().clicked += () =>
@@ -105,8 +105,13 @@ private void LoadAndOpenSample(string sampleName, string scenePath)
 
         private bool LoadFromAssetsFolder(string sampleName, string scenePath)
         {
-            var folderPath = $"Assets/Ready Player Me/Core/Samples/{sampleName}";
+            var version = ApplicationData.GetData().UnityVersion;
 
+            var folderPath = $"{SAMPLES_FOLDER_PATH}/{sampleName}";
+            if (!Directory.Exists(folderPath))
+            {
+                folderPath = $"{SAMPLES_FOLDER_PATH}/{version}/{sampleName}";
+            }
             if (!Directory.Exists(folderPath)) return false;
             var fullScenePath = $"{folderPath}/{scenePath}.unity";
             if (!File.Exists(fullScenePath)) return false;
diff --git a/Runtime/Core/Scripts/Data/ApplicationData.cs b/Runtime/Core/Scripts/Data/ApplicationData.cs
index 59b0f4fd..a8ee071c 100644
--- a/Runtime/Core/Scripts/Data/ApplicationData.cs
+++ b/Runtime/Core/Scripts/Data/ApplicationData.cs
@@ -6,7 +6,7 @@ namespace ReadyPlayerMe.Core
 {
     public static class ApplicationData
     {
-        private const string SDK_VERSION = "v5.0.0";
+        private const string SDK_VERSION = "5.0.0";
         private const string TAG = "ApplicationData";
         private const string DEFAULT_RENDER_PIPELINE = "Built-In Render Pipeline";
         private static readonly AppData Data;