Merge remote-tracking branch 'origin/ci/upgrade-unity/from-6000.0.27f…

…1-to-6000.0.31f1' into 6000.0-4gb-memory-limit
JohannesDeml · Dec 16, 2024 · 2a2dca4 · 2a2dca4
2 parents 4873342 + daa2d85
commit 2a2dca4
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/Assets/Plugins/WebGL/WebTools/WebToolPlugins.jslib b/Assets/Plugins/WebGL/WebTools/WebToolPlugins.jslib
@@ -88,41 +88,53 @@ var WebGlPlugins =
 
     _GetTotalMemorySize: function()
     {
-        if(typeof TOTAL_MEMORY !== 'undefined') {
+        if(typeof HEAP8 !== 'undefined') {
+            return HEAP8.length;
+        }
+        if(typeof TOTAL_MEMORY !== 'undefined') {  // Legacy support
             return TOTAL_MEMORY;
         }
 
-        console.warn("Problem with retrieving unity value. TOTAL_MEMORY: " + typeof TOTAL_MEMORY);
+        console.warn("Problem with retrieving total memory size");
         return -1;
     },
 
     _GetTotalStackSize: function()
     {
-        if(typeof TOTAL_STACK !== 'undefined') {
+        if(typeof Module !== 'undefined' && typeof Module.STACK_SIZE !== 'undefined') {
+            return Module.STACK_SIZE;
+        }
+        if(typeof TOTAL_STACK !== 'undefined') {  // Legacy support
             return TOTAL_STACK;
         }
 
-        console.warn("Problem with retrieving unity value. TOTAL_STACK: " + typeof TOTAL_STACK);
+        console.warn("Problem with retrieving stack size");
         return -1;
     },
 
     _GetStaticMemorySize: function()
     {
-        if(typeof STATICTOP !== 'undefined' && typeof STATIC_BASE !== 'undefined') {
+        if(typeof Module !== 'undefined' && typeof Module.staticAlloc !== 'undefined') {
+            return Module.staticAlloc;
+        }
+        if(typeof STATICTOP !== 'undefined' && typeof STATIC_BASE !== 'undefined') {  // Legacy support
             return STATICTOP - STATIC_BASE;
         }
 
-        console.warn("Problem with retrieving unity value. STATICTOP: " + typeof STATICTOP + ", STATIC_BASE: " + typeof STATIC_BASE);
+        console.warn("Problem with retrieving static memory size");
         return -1;
     },
 
     _GetDynamicMemorySize: function()
     {
-        if(typeof HEAP32 !== 'undefined' && typeof DYNAMICTOP_PTR !== 'undefined' && typeof DYNAMIC_BASE !== 'undefined') {
+        if(typeof Module !== 'undefined' && typeof Module.dynamicAlloc !== 'undefined') {
+            return Module.dynamicAlloc;
+        }
+        if(typeof HEAP32 !== 'undefined' && typeof DYNAMICTOP_PTR !== 'undefined' && typeof DYNAMIC_BASE !== 'undefined') {  // Legacy support
             return HEAP32[DYNAMICTOP_PTR >> 2] - DYNAMIC_BASE;
         }
 
-        console.warn("Problem with retrieving unity value. HEAP32: " + typeof HEAP32 + ", DYNAMICTOP_PTR: " + typeof DYNAMICTOP_PTR + ", DYNAMIC_BASE: " + typeof DYNAMIC_BASE);
+        console.warn("Problem with retrieving dynamic memory size");
         return -1;
     }
 };

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "com.jd.guidresolver": "1.1.0",
-    "com.unity.ai.navigation": "2.0.4",
+    "com.unity.ai.navigation": "2.0.5",
     "com.unity.connect.share": "4.2.3",
     "com.unity.ide.rider": "3.0.34",
     "com.unity.ide.visualstudio": "2.0.22",

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -10,7 +10,7 @@
       "url": "https://package.openupm.com"
     },
     "com.unity.ai.navigation": {
-      "version": "2.0.4",
+      "version": "2.0.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {

diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 6000.0.27f1
-m_EditorVersionWithRevision: 6000.0.27f1 (27c554a2199c)
+m_EditorVersion: 6000.0.31f1
+m_EditorVersionWithRevision: 6000.0.31f1 (a206c360e2a8)