Skip to content

Commit

Permalink
unity version update : editor version update from 2020.3.21f1 to 2021…
Browse files Browse the repository at this point in the history
….3.5f1
  • Loading branch information
etopuz committed Jun 29, 2022
1 parent 46f1d16 commit c69c654
Show file tree
Hide file tree
Showing 18 changed files with 2,102 additions and 276 deletions.
273 changes: 49 additions & 224 deletions Assets/Scenes/SampleScene.unity

Large diffs are not rendered by default.

Large diffs are not rendered by default.

27 changes: 27 additions & 0 deletions Assets/Sprites/0x72_DungeonTilesetII_v1.4/knights.png.meta

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

8 changes: 8 additions & 0 deletions Assets/StreamingAssets.meta

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

18 changes: 9 additions & 9 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"dependencies": {
"com.unity.2d.animation": "5.0.8",
"com.unity.2d.pixel-perfect": "4.0.1",
"com.unity.2d.psdimporter": "4.1.3",
"com.unity.2d.animation": "7.0.6",
"com.unity.2d.pixel-perfect": "5.0.1",
"com.unity.2d.psdimporter": "6.0.4",
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.spriteshape": "5.1.7",
"com.unity.2d.spriteshape": "7.0.4",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.2d.tilemap.extras": "1.8.3-preview",
"com.unity.collab-proxy": "1.13.5",
"com.unity.2d.tilemap.extras": "2.2.3",
"com.unity.collab-proxy": "1.15.18",
"com.unity.ide.visualstudio": "2.0.15",
"com.unity.mobile.android-logcat": "1.2.3",
"com.unity.mobile.notifications": "1.4.3",
"com.unity.mobile.android-logcat": "1.3.2",
"com.unity.mobile.notifications": "2.0.1",
"com.unity.test-framework": "1.1.31",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.4.8",
"com.unity.timeline": "1.6.4",
"com.unity.ugui": "1.0.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
Expand Down
61 changes: 36 additions & 25 deletions Packages/packages-lock.json
Original file line number Diff line number Diff line change
@@ -1,49 +1,50 @@
{
"dependencies": {
"com.unity.2d.animation": {
"version": "5.0.10",
"depth": 1,
"version": "7.0.6",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.2d.common": "4.0.4",
"com.unity.mathematics": "1.1.0",
"com.unity.2d.common": "6.0.3",
"com.unity.2d.sprite": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.uielements": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.2d.common": {
"version": "4.0.4",
"version": "6.0.3",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.modules.uielements": "1.0.0"
"com.unity.mathematics": "1.1.0",
"com.unity.modules.uielements": "1.0.0",
"com.unity.burst": "1.5.1"
},
"url": "https://packages.unity.com"
},
"com.unity.2d.path": {
"version": "4.0.2",
"version": "5.0.2",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.2d.pixel-perfect": {
"version": "4.0.1",
"version": "5.0.1",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.2d.psdimporter": {
"version": "4.1.3",
"version": "6.0.4",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.2d.common": "4.0.4",
"com.unity.2d.animation": "5.0.10",
"com.unity.2d.animation": "7.0.6",
"com.unity.2d.common": "6.0.3",
"com.unity.2d.sprite": "1.0.0"
},
"url": "https://packages.unity.com"
Expand All @@ -55,13 +56,13 @@
"dependencies": {}
},
"com.unity.2d.spriteshape": {
"version": "5.1.7",
"version": "7.0.4",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.mathematics": "1.1.0",
"com.unity.2d.common": "4.0.4",
"com.unity.2d.path": "4.0.2",
"com.unity.2d.common": "6.0.3",
"com.unity.2d.path": "5.0.2",
"com.unity.modules.physics2d": "1.0.0"
},
"url": "https://packages.unity.com"
Expand All @@ -73,7 +74,7 @@
"dependencies": {}
},
"com.unity.2d.tilemap.extras": {
"version": "1.8.3-preview",
"version": "2.2.3",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -84,12 +85,20 @@
},
"url": "https://packages.unity.com"
},
"com.unity.burst": {
"version": "1.6.5",
"depth": 2,
"source": "registry",
"dependencies": {
"com.unity.mathematics": "1.2.1"
},
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
"version": "1.13.5",
"version": "1.15.18",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.nuget.newtonsoft-json": "2.0.0",
"com.unity.services.core": "1.0.1"
},
"url": "https://packages.unity.com"
Expand All @@ -111,21 +120,21 @@
"url": "https://packages.unity.com"
},
"com.unity.mathematics": {
"version": "1.1.0",
"version": "1.2.6",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.mobile.android-logcat": {
"version": "1.2.3",
"version": "1.3.2",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.mobile.notifications": {
"version": "1.4.3",
"version": "2.0.1",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -134,18 +143,20 @@
"url": "https://packages.unity.com"
},
"com.unity.nuget.newtonsoft-json": {
"version": "2.0.0",
"depth": 1,
"version": "3.0.2",
"depth": 2,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.services.core": {
"version": "1.0.1",
"version": "1.4.0",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.modules.unitywebrequest": "1.0.0"
"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"
},
Expand All @@ -170,7 +181,7 @@
"url": "https://packages.unity.com"
},
"com.unity.timeline": {
"version": "1.4.8",
"version": "1.6.4",
"depth": 0,
"source": "registry",
"dependencies": {
Expand Down
14 changes: 14 additions & 0 deletions ProjectSettings/BurstAotSettings_Android.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"MonoBehaviour": {
"Version": 4,
"EnableBurstCompilation": true,
"EnableOptimisations": true,
"EnableSafetyChecks": false,
"EnableDebugInAllBuilds": false,
"CpuMinTargetX32": 0,
"CpuMaxTargetX32": 0,
"CpuMinTargetX64": 0,
"CpuMaxTargetX64": 0,
"OptimizeFor": 0
}
}
6 changes: 6 additions & 0 deletions ProjectSettings/CommonBurstAotSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"MonoBehaviour": {
"Version": 4,
"DisabledWarnings": ""
}
}
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: {}
Loading

0 comments on commit c69c654

Please sign in to comment.