Merge branch 'hotfix/v3.2.4' into main

readyplayerme · Sep 28, 2023 · 987878b · 987878b
2 parents 13b8af4 + 3c608c5
commit 987878b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 15 deletions.
diff --git a/.github/latest.md b/.github/latest.md
@@ -2,4 +2,5 @@
 ## Changelog
 
 ### Fixed
-- an issue causing settings to be recreated when not needed @harrisonhough in [#123](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/123)
+- an issue causing WebView to be auto imported if removed @harrisonhough in [#126](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/126)
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.2.4] - 2023.09.28
+### Fixed
+- an issue causing WebView to be auto imported if removed @harrisonhough in [#126](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/126)
+
 ## [3.2.3] - 2023.09.11
 ### Fixed
 - an issue causing settings to be recreated when not needed @harrisonhough in [#123](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/123)

diff --git a/Editor/Module Management/ModuleInstaller.cs b/Editor/Module Management/ModuleInstaller.cs
@@ -24,8 +24,8 @@ public static class ModuleInstaller
         private const string PROGRESS_BAR_TITLE = "Ready Player Me";
         private const string GLTFAST_SYMBOL = "GLTFAST";
         private const string READY_PLAYER_ME_SYMBOL = "READY_PLAYER_ME";
-        private const string CORE_MODULE_NAME = "com.readyplayerme.core";
         private const string GLTFAST_NAME = "com.atteneder.gltfast";
+        private const string WEBVIEW_NAME = "webview";
 
         private const string MODULE_INSTALLATION_SUCCESS_MESSAGE =
             "All the modules are installed successfully. Ready Player Me avatar system is ready to use.";
@@ -34,7 +34,6 @@ public static class ModuleInstaller
         private const string INSTALLING_MODULES = "Installing modules...";
 
         private const float TIMEOUT_FOR_MODULE_INSTALLATION = 20f;
-        private const string AVATAR_LOADER_SUBSTRING = "avatarloader";
 
         private static bool modulesInstalled;
 
@@ -101,12 +100,6 @@ public static void AddModuleRequest(string identifier)
         {
             var startTime = Time.realtimeSinceStartup;
             AddRequest addRequest = Client.Add(identifier);
-
-            // reset first time setup flag to ensure setup guide window is displayed
-            if (identifier.Contains(AVATAR_LOADER_SUBSTRING))
-            {
-                ProjectPrefs.SetBool(ProjectPrefs.FIRST_TIME_SETUP_DONE, false);
-            }
             while (!addRequest.IsCompleted && Time.realtimeSinceStartup - startTime < TIMEOUT_FOR_MODULE_INSTALLATION)
                 Thread.Sleep(THREAD_SLEEP_TIME);
 
@@ -127,9 +120,13 @@ public static void AddModuleRequest(string identifier)
         private static ModuleInfo[] GetMissingModuleNames()
         {
             PackageInfo[] installed = GetPackageList();
-            IEnumerable<ModuleInfo> missing = ModuleList.Modules.Where(m => installed.All(i => m.name != i.name));
-
-            return missing.ToArray();
+            var missingModules = ModuleList.Modules.Where(m => installed.All(i => m.name != i.name)).ToList();
+
+            if(!missingModules.Any(module => module.name.Contains(GLTFAST_NAME)))
+            {
+                missingModules = missingModules.Where(module => !module.name.Contains(WEBVIEW_NAME)).ToList();
+            }
+            return missingModules.ToArray();
         }
 
         /// <summary>

diff --git a/README.md b/README.md
@@ -92,7 +92,7 @@ After the process is complete you project will have imported these packages:
         }
      ],
      "dependencies": {
-        "com.readyplayerme.core": "3.2.3"
+        "com.readyplayerme.core": "3.2.4"
        }
      }
      ```

diff --git a/Runtime/Data/ApplicationData.cs b/Runtime/Data/ApplicationData.cs
@@ -6,7 +6,7 @@ namespace ReadyPlayerMe.Core
 {
     public static class ApplicationData
     {
-        private const string SDK_VERSION = "v3.2.3";
+        private const string SDK_VERSION = "v3.2.4";
         private const string TAG = "ApplicationData";
         private const string DEFAULT_RENDER_PIPELINE = "Built-In Render Pipeline";
         private static readonly AppData Data;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.readyplayerme.core",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "displayName": "Ready Player Me Core",
   "description": "This Module contains all the core functionality required for using Ready Player Me avatars in Unity, including features such as: \n - Module management and automatic package setup logic\n - Avatar loading from .glb files\n - Avatar and 2D render requests\n - Optional Analytics\n - Custom editor windows\n - Sample scenes and assets",
   "unity": "2020.3",