summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Packages/manifest.json6
-rw-r--r--Packages/packages-lock.json22
-rw-r--r--ProjectSettings/BurstAotSettings_WebGL.json15
-rw-r--r--ProjectSettings/CommonBurstAotSettings.json2
-rw-r--r--ProjectSettings/EditorBuildSettings.asset4
-rw-r--r--ProjectSettings/ProjectSettings.asset12
-rw-r--r--ProjectSettings/ProjectVersion.txt4
-rw-r--r--UserSettings/Layouts/default-2021.dwlt70
8 files changed, 80 insertions, 55 deletions
diff --git a/Packages/manifest.json b/Packages/manifest.json
index 9c5fa2b..1bfa957 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,11 +1,11 @@
{
"dependencies": {
- "com.unity.collab-proxy": "1.17.2",
- "com.unity.ide.rider": "3.0.15",
+ "com.unity.collab-proxy": "1.17.7",
+ "com.unity.ide.rider": "3.0.16",
"com.unity.ide.visualstudio": "2.0.16",
"com.unity.ide.vscode": "1.2.5",
"com.unity.probuilder": "5.0.6",
- "com.unity.render-pipelines.universal": "12.1.7",
+ "com.unity.render-pipelines.universal": "12.1.8",
"com.unity.test-framework": "1.1.31",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.6.4",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 20cec87..341f580 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -1,7 +1,7 @@
{
"dependencies": {
"com.unity.burst": {
- "version": "1.7.3",
+ "version": "1.8.2",
"depth": 1,
"source": "registry",
"dependencies": {
@@ -10,7 +10,7 @@
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
- "version": "1.17.2",
+ "version": "1.17.7",
"depth": 0,
"source": "registry",
"dependencies": {
@@ -26,7 +26,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
- "version": "3.0.15",
+ "version": "3.0.16",
"depth": 0,
"source": "registry",
"dependencies": {
@@ -76,7 +76,7 @@
"url": "https://packages.unity.com"
},
"com.unity.render-pipelines.core": {
- "version": "12.1.7",
+ "version": "12.1.8",
"depth": 1,
"source": "builtin",
"dependencies": {
@@ -86,14 +86,14 @@
}
},
"com.unity.render-pipelines.universal": {
- "version": "12.1.7",
+ "version": "12.1.8",
"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.mathematics": "1.2.1",
- "com.unity.burst": "1.7.3",
- "com.unity.render-pipelines.core": "12.1.7",
- "com.unity.shadergraph": "12.1.7"
+ "com.unity.burst": "1.8.2",
+ "com.unity.render-pipelines.core": "12.1.8",
+ "com.unity.shadergraph": "12.1.8"
}
},
"com.unity.searcher": {
@@ -104,7 +104,7 @@
"url": "https://packages.unity.com"
},
"com.unity.services.core": {
- "version": "1.4.2",
+ "version": "1.6.0",
"depth": 1,
"source": "registry",
"dependencies": {
@@ -122,11 +122,11 @@
"url": "https://packages.unity.com"
},
"com.unity.shadergraph": {
- "version": "12.1.7",
+ "version": "12.1.8",
"depth": 1,
"source": "builtin",
"dependencies": {
- "com.unity.render-pipelines.core": "12.1.7",
+ "com.unity.render-pipelines.core": "12.1.8",
"com.unity.searcher": "4.9.1"
}
},
diff --git a/ProjectSettings/BurstAotSettings_WebGL.json b/ProjectSettings/BurstAotSettings_WebGL.json
new file mode 100644
index 0000000..d8ec3ab
--- /dev/null
+++ b/ProjectSettings/BurstAotSettings_WebGL.json
@@ -0,0 +1,15 @@
+{
+ "MonoBehaviour": {
+ "Version": 4,
+ "EnableBurstCompilation": true,
+ "EnableOptimisations": true,
+ "EnableSafetyChecks": false,
+ "EnableDebugInAllBuilds": false,
+ "EnableArmv9SecurityFeatures": false,
+ "CpuMinTargetX32": 0,
+ "CpuMaxTargetX32": 0,
+ "CpuMinTargetX64": 0,
+ "CpuMaxTargetX64": 0,
+ "OptimizeFor": 0
+ }
+}
diff --git a/ProjectSettings/CommonBurstAotSettings.json b/ProjectSettings/CommonBurstAotSettings.json
index 3dffdba..0293daf 100644
--- a/ProjectSettings/CommonBurstAotSettings.json
+++ b/ProjectSettings/CommonBurstAotSettings.json
@@ -1,6 +1,6 @@
{
"MonoBehaviour": {
- "Version": 3,
+ "Version": 4,
"DisabledWarnings": ""
}
}
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index ea88784..eefc6bd 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -6,6 +6,6 @@ EditorBuildSettings:
serializedVersion: 2
m_Scenes:
- enabled: 1
- path: Assets/Scenes/SampleScene.unity
- guid: 99c9720ab356a0642a771bea13969a05
+ path: Assets/Scenes/PlanetTest.unity
+ guid: 7d73cc7be00753c729200e2a93f183c6
m_configObjects: {}
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index aa75fae..6a09c77 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -498,6 +498,7 @@ PlayerSettings:
m_Kind: 1
m_SubKind:
m_BuildTargetBatching: []
+ m_BuildTargetShaderSettings: []
m_BuildTargetGraphicsJobs: []
m_BuildTargetGraphicsJobMode: []
m_BuildTargetGraphicsAPIs:
@@ -507,7 +508,12 @@ PlayerSettings:
- m_BuildTarget: AndroidPlayer
m_APIs: 0b00000008000000
m_Automatic: 0
+ - m_BuildTarget: WebGLSupport
+ m_APIs: 0b000000
+ m_Automatic: 0
m_BuildTargetVRSettings: []
+ m_DefaultShaderChunkSizeInMB: 16
+ m_DefaultShaderChunkCount: 0
openGLRequireES31: 0
openGLRequireES31AEP: 0
openGLRequireES32: 0
@@ -668,6 +674,7 @@ PlayerSettings:
switchNetworkInterfaceManagerInitializeEnabled: 1
switchPlayerConnectionEnabled: 1
switchUseNewStyleFilepaths: 0
+ switchUseLegacyFmodPriorities: 1
switchUseMicroSleepForYield: 1
switchEnableRamDiskSupport: 0
switchMicroSleepForYieldTime: 25
@@ -762,11 +769,12 @@ PlayerSettings:
webGLTemplate: APPLICATION:Default
webGLAnalyzeBuildSize: 0
webGLUseEmbeddedResources: 0
- webGLCompressionFormat: 0
+ webGLCompressionFormat: 1
webGLWasmArithmeticExceptions: 0
webGLLinkerTarget: 1
webGLThreadsSupport: 0
webGLDecompressionFallback: 0
+ webGLPowerPreference: 2
scriptingDefineSymbols: {}
additionalCompilerArguments: {}
platformArchitecture: {}
@@ -778,6 +786,7 @@ PlayerSettings:
allowUnsafeCode: 0
useDeterministicCompilation: 1
enableRoslynAnalyzers: 1
+ selectedPlatform: 2
additionalIl2CppArgs:
scriptingRuntimeVersion: 1
gcIncremental: 0
@@ -856,6 +865,7 @@ PlayerSettings:
m_VersionName:
apiCompatibilityLevel: 6
activeInputHandler: 0
+ windowsGamepadBackendHint: 0
cloudProjectId:
framebufferDepthMemorylessMode: 0
qualitySettingsNames: []
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
index 8d9054d..3643b02 100644
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.9f1
-m_EditorVersionWithRevision: 2021.3.9f1 (ad3870b89536)
+m_EditorVersion: 2021.3.16f1
+m_EditorVersionWithRevision: 2021.3.16f1 (4016570cf34f)
diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt
index 0bb38b0..4c5a702 100644
--- a/UserSettings/Layouts/default-2021.dwlt
+++ b/UserSettings/Layouts/default-2021.dwlt
@@ -119,7 +119,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
- controlID: 68
+ controlID: 18
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -144,7 +144,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
- controlID: 69
+ controlID: 19
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -169,7 +169,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
- controlID: 25
+ controlID: 72
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -351,9 +351,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
- m_SelectedIDs: 3c180000
+ m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 32fbffff
+ m_ExpandedIDs: e2beffffeabfffff0cc4fffff6c6ffff00c8ffff14cbffff9cd0ffffb0d1ffff8ed6ffff0ef5ffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -603,9 +603,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
- m_Target: {x: 149.38414, y: -23.7836, z: -30.029102}
+ m_Target: {x: 86.28845, y: -8.151901, z: -123.68263}
speed: 2
- m_Value: {x: 149.38414, y: -23.7836, z: -30.029102}
+ m_Value: {x: 86.28845, y: -8.151901, z: -123.68263}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -652,13 +652,13 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
- m_Target: {x: 0.10261801, y: 0.76433706, z: -0.1256649, w: 0.6241654}
+ m_Target: {x: 0.058633894, y: 0.93131196, z: -0.17327498, w: 0.31513727}
speed: 2
- m_Value: {x: 0.10261208, y: 0.7642929, z: -0.12565763, w: 0.62412935}
+ m_Value: {x: 0.058630504, y: 0.93125814, z: -0.17326497, w: 0.31511906}
m_Size:
- m_Target: 181.82893
+ m_Target: 198.56174
speed: 2
- m_Value: 181.82893
+ m_Value: 198.56174
m_Ortho:
m_Target: 0
speed: 2
@@ -704,10 +704,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 297
+ x: 1955
y: 82
- width: 921
- height: 485
+ width: 1107
+ height: 600
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -718,7 +718,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
- m_TargetSize: {x: 921, y: 464}
+ m_TargetSize: {x: 1107, y: 579}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
@@ -733,10 +733,10 @@ MonoBehaviour:
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
- m_HBaseRangeMin: -460.5
- m_HBaseRangeMax: 460.5
- m_VBaseRangeMin: -232
- m_VBaseRangeMax: 232
+ m_HBaseRangeMin: -553.5
+ m_HBaseRangeMax: 553.5
+ m_VBaseRangeMin: -289.5
+ m_VBaseRangeMax: 289.5
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@@ -754,23 +754,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
- width: 921
- height: 464
+ width: 1107
+ height: 579
m_Scale: {x: 1, y: 1}
- m_Translation: {x: 460.5, y: 232}
+ m_Translation: {x: 553.5, y: 289.5}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
- x: -460.5
- y: -232
- width: 921
- height: 464
+ x: -553.5
+ y: -289.5
+ width: 1107
+ height: 579
m_MinimalGUI: 1
m_defaultScale: 1
- m_LastWindowPixelSize: {x: 921, y: 485}
+ m_LastWindowPixelSize: {x: 1107, y: 600}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
@@ -818,22 +818,22 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- - Assets/Scripts
+ - Assets/Scenes
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- - Assets/Scripts
+ - Assets/Scenes
m_LastFoldersGridSize: -1
- m_LastProjectPath: /home/tradam/unity/Magnet Run 3D
+ m_LastProjectPath: /home/tradam/unity/Magnet_Run
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
- scrollPos: {x: 0, y: 120}
- m_SelectedIDs: ee700000
- m_LastClickedID: 28910
- m_ExpandedIDs: 00000000166f0000186f00001a6f00001c6f000000ca9a3bffffff7f
+ scrollPos: {x: 0, y: 79}
+ m_SelectedIDs: 8a7f0000
+ m_LastClickedID: 32650
+ m_ExpandedIDs: 00000000827f000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -861,7 +861,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 00000000166f0000186f00001a6f00001c6f0000
+ m_ExpandedIDs:
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
generated by cgit v1.2.3 (git 2.39.1) at 2026-04-14 12:20:53 +0000