Skip to content

Commit

Permalink
Merge pull request #33 from monaverse/feature/unity-2022.2.3f1-upgrade
Browse files Browse the repository at this point in the history
Feature: Unity 2022.2.3f1 upgrade
  • Loading branch information
longda authored Feb 8, 2023
2 parents ee90416 + 25be24c commit 6a3e47d
Show file tree
Hide file tree
Showing 10 changed files with 104 additions and 37 deletions.
2 changes: 1 addition & 1 deletion Assets/Mona/Helpers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public static class Constants
public static readonly string SpacePath = "Assets/Scenes/Space.unity";
public static readonly string ArtifactsPath = "Assets/Scenes/Artifacts.unity";
public static readonly string PortalsPath = "Assets/Scenes/Portals.unity";
public static readonly string PlaygroundURL = "https://www.mona.gallery/playground";
public static readonly string PlaygroundURL = "https://monaverse.com/playground";
}

public class Helpers
Expand Down
4 changes: 2 additions & 2 deletions Assets/Mona/TemplateHelper/TemplateVersion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ namespace Mona
{
public static class TemplateInfo
{
public static readonly string Version = "1.4.2";
public static readonly string UnityVer = "2020.3.18";
public static readonly string Version = "2.0.0";
public static readonly string UnityVer = "2022.2.3";
}
}
#endif
2 changes: 1 addition & 1 deletion Assets/Scenes/Space.meta → Assets/VisualScripts.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file added Assets/VisualScripts/.gitkeep
Empty file.
2 changes: 1 addition & 1 deletion Assets/_MonaLibrary/MonaLibraryInfo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ https://docs.monaverse.com/resources/mona-library-submission

Library Assets must be submitted as a .UnityPackage (.zip, .rar, etc will not work)

When exporting package from unity do not include dependancies from the Mona Template as they will overwrite newer version on import.
When exporting package from unity do not include dependencies from the Mona Template as they will overwrite newer version on import.
14 changes: 8 additions & 6 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
{
"dependencies": {
"com.unity.collab-proxy": "1.9.0",
"com.unity.ai.navigation": "1.1.1",
"com.unity.collab-proxy": "1.17.7",
"com.unity.editorcoroutines": "1.0.0",
"com.unity.ide.rider": "2.0.7",
"com.unity.ide.visualstudio": "2.0.11",
"com.unity.ide.vscode": "1.2.3",
"com.unity.test-framework": "1.1.29",
"com.unity.ide.rider": "3.0.17",
"com.unity.ide.visualstudio": "2.0.17",
"com.unity.ide.vscode": "1.2.5",
"com.unity.test-framework": "1.1.33",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.4.8",
"com.unity.timeline": "1.7.2",
"com.unity.ugui": "1.0.0",
"com.unity.visualscripting": "1.8.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",
Expand Down
66 changes: 47 additions & 19 deletions Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,22 @@
"source": "embedded",
"dependencies": {}
},
"com.unity.ai.navigation": {
"version": "1.1.1",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.modules.ai": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
"version": "1.9.0",
"version": "1.17.7",
"depth": 0,
"source": "registry",
"dependencies": {},
"dependencies": {
"com.unity.services.core": "1.0.1"
},
"url": "https://packages.unity.com"
},
"com.unity.editorcoroutines": {
Expand All @@ -28,16 +39,16 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
"version": "2.0.7",
"version": "3.0.17",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.test-framework": "1.1.1"
"com.unity.ext.nunit": "1.0.6"
},
"url": "https://packages.unity.com"
},
"com.unity.ide.visualstudio": {
"version": "2.0.11",
"version": "2.0.17",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -46,14 +57,32 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.vscode": {
"version": "1.2.3",
"version": "1.2.5",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.nuget.newtonsoft-json": {
"version": "3.0.2",
"depth": 2,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.services.core": {
"version": "1.7.0",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.nuget.newtonsoft-json": "3.0.2",
"com.unity.modules.androidjni": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.test-framework": {
"version": "1.1.29",
"version": "1.1.33",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -73,7 +102,7 @@
"url": "https://packages.unity.com"
},
"com.unity.timeline": {
"version": "1.4.8",
"version": "1.7.2",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -93,6 +122,16 @@
"com.unity.modules.imgui": "1.0.0"
}
},
"com.unity.visualscripting": {
"version": "1.8.0",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.ugui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.modules.ai": {
"version": "1.0.0",
"depth": 0,
Expand Down Expand Up @@ -225,17 +264,6 @@
"version": "1.0.0",
"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.uielementsnative": "1.0.0"
}
},
"com.unity.modules.uielementsnative": {
"version": "1.0.0",
"depth": 1,
"source": "builtin",
"dependencies": {
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
Expand Down
35 changes: 35 additions & 0 deletions ProjectSettings/MemorySettings.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!387306366 &1
MemorySettings:
m_ObjectHideFlags: 0
m_EditorMemorySettings:
m_MainAllocatorBlockSize: -1
m_ThreadAllocatorBlockSize: -1
m_MainGfxBlockSize: -1
m_ThreadGfxBlockSize: -1
m_CacheBlockSize: -1
m_TypetreeBlockSize: -1
m_ProfilerBlockSize: -1
m_ProfilerEditorBlockSize: -1
m_BucketAllocatorGranularity: -1
m_BucketAllocatorBucketsCount: -1
m_BucketAllocatorBlockSize: -1
m_BucketAllocatorBlockCount: -1
m_ProfilerBucketAllocatorGranularity: -1
m_ProfilerBucketAllocatorBucketsCount: -1
m_ProfilerBucketAllocatorBlockSize: -1
m_ProfilerBucketAllocatorBlockCount: -1
m_TempAllocatorSizeMain: -1
m_JobTempAllocatorBlockSize: -1
m_BackgroundJobTempAllocatorBlockSize: -1
m_JobTempAllocatorReducedBlockSize: -1
m_TempAllocatorSizeGIBakingWorker: -1
m_TempAllocatorSizeNavMeshWorker: -1
m_TempAllocatorSizeAudioWorker: -1
m_TempAllocatorSizeCloudWorker: -1
m_TempAllocatorSizeGfx: -1
m_TempAllocatorSizeJobWorker: -1
m_TempAllocatorSizeBackgroundWorker: -1
m_TempAllocatorSizePreloadManager: -1
m_PlatformMemorySettings: {}
4 changes: 2 additions & 2 deletions ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
m_EditorVersion: 2020.3.18f1
m_EditorVersionWithRevision: 2020.3.18f1 (a7d1c678663c)
m_EditorVersion: 2022.2.3f1
m_EditorVersionWithRevision: 2022.2.3f1 (55531d7fa82e)
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,22 @@
<p align="center">Start building your own custom Mona Space using our official template</p>

## ⬇️ Unity Version
This template requires the ```Unity 2020.3.18``` version. You can download it here:
https://unity3d.com/unity/whats-new/2020.3.18
This template requires the ```Unity 2022.2.3f1``` version. You can download it here:
https://unity.com/releases/editor/whats-new/2022.2.3

Be sure to also install ```WebGL Build Support```.


## 📃 Documentation

The official documentation website is [docs.mona.gallery](https://docs.mona.gallery/get-started).
The official documentation website is [docs.monaverse.com](https://docs.monaverse.com/create/building-spaces/get-started).

Mona [Video tutorials here](https://docs.mona.gallery/video-tutorials)
Mona [Video tutorials here](https://docs.monaverse.com/create/resources/mona-tutorials)


## 💬 Support

For support, join our [Discord support channel](https://discord.gg/gcrGHzTerU)

## ⚙️ Template version
1.4.2
2.0.0

0 comments on commit 6a3e47d

Please sign in to comment.