Skip to content

Commit 6a3e47d

Browse files
longdalongda
authored
Merge pull request #33 from monaverse/feature/unity-2022.2.3f1-upgrade
Feature: Unity 2022.2.3f1 upgrade
2 parents ee90416 + 25be24c commit 6a3e47d

File tree

10 files changed

+104
-37
lines changed

10 files changed

+104
-37
lines changed

‎Assets/Mona/Helpers.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public static class Constants
1313
public static readonly string SpacePath = "Assets/Scenes/Space.unity";
1414
public static readonly string ArtifactsPath = "Assets/Scenes/Artifacts.unity";
1515
public static readonly string PortalsPath = "Assets/Scenes/Portals.unity";
16-
public static readonly string PlaygroundURL = "https://www.mona.gallery/playground";
16+
public static readonly string PlaygroundURL = "https://monaverse.com/playground";
1717
}
1818

1919
public class Helpers

‎Assets/Mona/TemplateHelper/TemplateVersion.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ namespace Mona
66
{
77
public static class TemplateInfo
88
{
9-
public static readonly string Version = "1.4.2";
10-
public static readonly string UnityVer = "2020.3.18";
9+
public static readonly string Version = "2.0.0";
10+
public static readonly string UnityVer = "2022.2.3";
1111
}
1212
}
1313
#endif

‎Assets/Scenes/Space.meta‎ renamed to ‎Assets/VisualScripts.meta‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/VisualScripts/.gitkeep‎

Whitespace-only changes.

‎Assets/_MonaLibrary/MonaLibraryInfo.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ https://docs.monaverse.com/resources/mona-library-submission
55

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

8-
When exporting package from unity do not include dependancies from the Mona Template as they will overwrite newer version on import.
8+
When exporting package from unity do not include dependencies from the Mona Template as they will overwrite newer version on import.

‎Packages/manifest.json‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
{
22
"dependencies": {
3-
"com.unity.collab-proxy": "1.9.0",
3+
"com.unity.ai.navigation": "1.1.1",
4+
"com.unity.collab-proxy": "1.17.7",
45
"com.unity.editorcoroutines": "1.0.0",
5-
"com.unity.ide.rider": "2.0.7",
6-
"com.unity.ide.visualstudio": "2.0.11",
7-
"com.unity.ide.vscode": "1.2.3",
8-
"com.unity.test-framework": "1.1.29",
6+
"com.unity.ide.rider": "3.0.17",
7+
"com.unity.ide.visualstudio": "2.0.17",
8+
"com.unity.ide.vscode": "1.2.5",
9+
"com.unity.test-framework": "1.1.33",
910
"com.unity.textmeshpro": "3.0.6",
10-
"com.unity.timeline": "1.4.8",
11+
"com.unity.timeline": "1.7.2",
1112
"com.unity.ugui": "1.0.0",
13+
"com.unity.visualscripting": "1.8.0",
1214
"com.unity.modules.ai": "1.0.0",
1315
"com.unity.modules.androidjni": "1.0.0",
1416
"com.unity.modules.animation": "1.0.0",

‎Packages/packages-lock.json‎

Lines changed: 47 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,22 @@
66
"source": "embedded",
77
"dependencies": {}
88
},
9+
"com.unity.ai.navigation": {
10+
"version": "1.1.1",
11+
"depth": 0,
12+
"source": "registry",
13+
"dependencies": {
14+
"com.unity.modules.ai": "1.0.0"
15+
},
16+
"url": "https://packages.unity.com"
17+
},
918
"com.unity.collab-proxy": {
10-
"version": "1.9.0",
19+
"version": "1.17.7",
1120
"depth": 0,
1221
"source": "registry",
13-
"dependencies": {},
22+
"dependencies": {
23+
"com.unity.services.core": "1.0.1"
24+
},
1425
"url": "https://packages.unity.com"
1526
},
1627
"com.unity.editorcoroutines": {
@@ -28,16 +39,16 @@
2839
"url": "https://packages.unity.com"
2940
},
3041
"com.unity.ide.rider": {
31-
"version": "2.0.7",
42+
"version": "3.0.17",
3243
"depth": 0,
3344
"source": "registry",
3445
"dependencies": {
35-
"com.unity.test-framework": "1.1.1"
46+
"com.unity.ext.nunit": "1.0.6"
3647
},
3748
"url": "https://packages.unity.com"
3849
},
3950
"com.unity.ide.visualstudio": {
40-
"version": "2.0.11",
51+
"version": "2.0.17",
4152
"depth": 0,
4253
"source": "registry",
4354
"dependencies": {
@@ -46,14 +57,32 @@
4657
"url": "https://packages.unity.com"
4758
},
4859
"com.unity.ide.vscode": {
49-
"version": "1.2.3",
60+
"version": "1.2.5",
5061
"depth": 0,
5162
"source": "registry",
5263
"dependencies": {},
5364
"url": "https://packages.unity.com"
5465
},
66+
"com.unity.nuget.newtonsoft-json": {
67+
"version": "3.0.2",
68+
"depth": 2,
69+
"source": "registry",
70+
"dependencies": {},
71+
"url": "https://packages.unity.com"
72+
},
73+
"com.unity.services.core": {
74+
"version": "1.7.0",
75+
"depth": 1,
76+
"source": "registry",
77+
"dependencies": {
78+
"com.unity.modules.unitywebrequest": "1.0.0",
79+
"com.unity.nuget.newtonsoft-json": "3.0.2",
80+
"com.unity.modules.androidjni": "1.0.0"
81+
},
82+
"url": "https://packages.unity.com"
83+
},
5584
"com.unity.test-framework": {
56-
"version": "1.1.29",
85+
"version": "1.1.33",
5786
"depth": 0,
5887
"source": "registry",
5988
"dependencies": {
@@ -73,7 +102,7 @@
73102
"url": "https://packages.unity.com"
74103
},
75104
"com.unity.timeline": {
76-
"version": "1.4.8",
105+
"version": "1.7.2",
77106
"depth": 0,
78107
"source": "registry",
79108
"dependencies": {
@@ -93,6 +122,16 @@
93122
"com.unity.modules.imgui": "1.0.0"
94123
}
95124
},
125+
"com.unity.visualscripting": {
126+
"version": "1.8.0",
127+
"depth": 0,
128+
"source": "registry",
129+
"dependencies": {
130+
"com.unity.ugui": "1.0.0",
131+
"com.unity.modules.jsonserialize": "1.0.0"
132+
},
133+
"url": "https://packages.unity.com"
134+
},
96135
"com.unity.modules.ai": {
97136
"version": "1.0.0",
98137
"depth": 0,
@@ -225,17 +264,6 @@
225264
"version": "1.0.0",
226265
"depth": 0,
227266
"source": "builtin",
228-
"dependencies": {
229-
"com.unity.modules.ui": "1.0.0",
230-
"com.unity.modules.imgui": "1.0.0",
231-
"com.unity.modules.jsonserialize": "1.0.0",
232-
"com.unity.modules.uielementsnative": "1.0.0"
233-
}
234-
},
235-
"com.unity.modules.uielementsnative": {
236-
"version": "1.0.0",
237-
"depth": 1,
238-
"source": "builtin",
239267
"dependencies": {
240268
"com.unity.modules.ui": "1.0.0",
241269
"com.unity.modules.imgui": "1.0.0",

‎ProjectSettings/MemorySettings.asset‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!387306366 &1
4+
MemorySettings:
5+
m_ObjectHideFlags: 0
6+
m_EditorMemorySettings:
7+
m_MainAllocatorBlockSize: -1
8+
m_ThreadAllocatorBlockSize: -1
9+
m_MainGfxBlockSize: -1
10+
m_ThreadGfxBlockSize: -1
11+
m_CacheBlockSize: -1
12+
m_TypetreeBlockSize: -1
13+
m_ProfilerBlockSize: -1
14+
m_ProfilerEditorBlockSize: -1
15+
m_BucketAllocatorGranularity: -1
16+
m_BucketAllocatorBucketsCount: -1
17+
m_BucketAllocatorBlockSize: -1
18+
m_BucketAllocatorBlockCount: -1
19+
m_ProfilerBucketAllocatorGranularity: -1
20+
m_ProfilerBucketAllocatorBucketsCount: -1
21+
m_ProfilerBucketAllocatorBlockSize: -1
22+
m_ProfilerBucketAllocatorBlockCount: -1
23+
m_TempAllocatorSizeMain: -1
24+
m_JobTempAllocatorBlockSize: -1
25+
m_BackgroundJobTempAllocatorBlockSize: -1
26+
m_JobTempAllocatorReducedBlockSize: -1
27+
m_TempAllocatorSizeGIBakingWorker: -1
28+
m_TempAllocatorSizeNavMeshWorker: -1
29+
m_TempAllocatorSizeAudioWorker: -1
30+
m_TempAllocatorSizeCloudWorker: -1
31+
m_TempAllocatorSizeGfx: -1
32+
m_TempAllocatorSizeJobWorker: -1
33+
m_TempAllocatorSizeBackgroundWorker: -1
34+
m_TempAllocatorSizePreloadManager: -1
35+
m_PlatformMemorySettings: {}

‎ProjectSettings/ProjectVersion.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2020.3.18f1
2-
m_EditorVersionWithRevision: 2020.3.18f1 (a7d1c678663c)
1+
m_EditorVersion: 2022.2.3f1
2+
m_EditorVersionWithRevision: 2022.2.3f1 (55531d7fa82e)

‎README.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,22 @@
22
<p align="center">Start building your own custom Mona Space using our official template</p>
33

44
## ⬇️ Unity Version
5-
This template requires the ```Unity 2020.3.18``` version. You can download it here:
6-
https://unity3d.com/unity/whats-new/2020.3.18
5+
This template requires the ```Unity 2022.2.3f1``` version. You can download it here:
6+
https://unity.com/releases/editor/whats-new/2022.2.3
7+
8+
Be sure to also install ```WebGL Build Support```.
79

810

911
## 📃 Documentation
1012

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

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

1517

1618
## 💬 Support
1719

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

2022
## ⚙️ Template version
21-
1.4.2
23+
2.0.0

0 commit comments

Comments
 (0)