Skip to content

Commit 9b548da

Browse files
committed
Updated Examples/Overriding to minimal editor
1 parent 0c351df commit 9b548da

5 files changed

Lines changed: 74 additions & 37 deletions

File tree

Examples/OverridingScenesAndPrefabs/Packages/manifest.json

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
"dependencies": {
33
"com.unity.2d.sprite": "1.0.0",
44
"com.unity.2d.tilemap": "1.0.0",
5-
"com.unity.ads": "4.4.2",
6-
"com.unity.ai.navigation": "2.0.9",
7-
"com.unity.analytics": "3.8.1",
8-
"com.unity.collab-proxy": "2.10.0",
5+
"com.unity.ads": "4.19.0",
6+
"com.unity.ai.navigation": "2.0.13",
7+
"com.unity.analytics": "3.8.2",
8+
"com.unity.collab-proxy": "2.12.4",
99
"com.unity.feature.development": "1.0.2",
1010
"com.unity.ide.rider": "3.0.38",
11-
"com.unity.ide.visualstudio": "2.0.25",
12-
"com.unity.multiplayer.center": "1.0.0",
11+
"com.unity.ide.visualstudio": "2.0.26",
12+
"com.unity.multiplayer.center": "2.0.1",
1313
"com.unity.netcode.gameobjects": "https://github.com/Unity-Technologies/com.unity.netcode.gameobjects.git?path=com.unity.netcode.gameobjects#develop-3.x.x",
14-
"com.unity.purchasing": "4.12.2",
15-
"com.unity.services.multiplayer": "1.2.0",
16-
"com.unity.test-framework": "1.6.0",
17-
"com.unity.timeline": "1.8.9",
18-
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10",
19-
"com.unity.transport": "2.6.0",
20-
"com.unity.ugui": "2.0.0",
21-
"com.unity.visualscripting": "1.9.7",
22-
"com.unity.xr.legacyinputhelpers": "2.1.12",
14+
"com.unity.purchasing": "5.4.1",
15+
"com.unity.services.multiplayer": "2.2.4",
16+
"com.unity.test-framework": "1.8.0",
17+
"com.unity.timeline": "6.6.0",
18+
"com.unity.transport": "6.6.0",
19+
"com.unity.ugui": "2.6.0",
20+
"com.unity.visualscripting": "1.9.11",
21+
"com.unity.xr.legacyinputhelpers": "3.0.1",
2322
"com.unity.modules.accessibility": "1.0.0",
23+
"com.unity.modules.adaptiveperformance": "1.0.0",
2424
"com.unity.modules.ai": "1.0.0",
2525
"com.unity.modules.androidjni": "1.0.0",
2626
"com.unity.modules.animation": "1.0.0",
@@ -34,10 +34,13 @@
3434
"com.unity.modules.particlesystem": "1.0.0",
3535
"com.unity.modules.physics": "1.0.0",
3636
"com.unity.modules.physics2d": "1.0.0",
37+
"com.unity.modules.physicscore2d": "1.0.0",
3738
"com.unity.modules.screencapture": "1.0.0",
3839
"com.unity.modules.terrain": "1.0.0",
3940
"com.unity.modules.terrainphysics": "1.0.0",
41+
"com.unity.modules.tetgen": "1.0.0",
4042
"com.unity.modules.tilemap": "1.0.0",
43+
"com.unity.modules.timelinefoundation": "1.0.0",
4144
"com.unity.modules.ui": "1.0.0",
4245
"com.unity.modules.uielements": "1.0.0",
4346
"com.unity.modules.umbra": "1.0.0",
@@ -47,9 +50,9 @@
4750
"com.unity.modules.unitywebrequestaudio": "1.0.0",
4851
"com.unity.modules.unitywebrequesttexture": "1.0.0",
4952
"com.unity.modules.unitywebrequestwww": "1.0.0",
53+
"com.unity.modules.vectorgraphics": "1.0.0",
5054
"com.unity.modules.vehicles": "1.0.0",
5155
"com.unity.modules.video": "1.0.0",
52-
"com.unity.modules.vr": "1.0.0",
5356
"com.unity.modules.wind": "1.0.0",
5457
"com.unity.modules.xr": "1.0.0"
5558
}

Examples/OverridingScenesAndPrefabs/ProjectSettings/PackageManagerSettings.asset

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,27 @@ MonoBehaviour:
1818
m_SeeAllPackageVersions: 0
1919
m_DismissPreviewPackagesInUse: 0
2020
oneTimeWarningShown: 0
21-
oneTimeDeprecatedPopUpShown: 0
22-
m_Registries:
23-
- m_Id: main
21+
oneTimePackageErrorsPopUpShown: 0
22+
m_MainRegistry:
23+
m_Id: main
2424
m_Name:
2525
m_Url: https://packages.unity.com
2626
m_Scopes: []
2727
m_IsDefault: 1
28+
m_IsUnityRegistry: 1
2829
m_Capabilities: 7
2930
m_ConfigSource: 0
3031
m_Compliance:
3132
m_Status: 0
3233
m_Violations: []
34+
m_ScopedRegistries: []
3335
m_UserSelectedRegistryName:
3436
m_UserAddingNewScopedRegistry: 0
3537
m_RegistryInfoDraft:
3638
m_Modified: 0
3739
m_ErrorMessage:
38-
m_UserModificationsInstanceId: -892
39-
m_OriginalInstanceId: -894
40+
m_UserModificationsEntityId:
41+
m_rawData: 1099511629078
42+
m_OriginalEntityId:
43+
m_rawData: 1099511629079
4044
m_LoadAssets: 0
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!176606843 &1
4+
PhysicsCoreProjectSettings2D:
5+
m_ObjectHideFlags: 0
6+
m_PhysicsCoreSettings: {fileID: 0}

Examples/OverridingScenesAndPrefabs/ProjectSettings/ProjectSettings.asset

Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--- !u!129 &1
44
PlayerSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 28
6+
serializedVersion: 30
77
productGUID: 6859c206e4885eb4d9a885722be3daa1
88
AndroidProfiler: 0
99
AndroidFilterTouchesWhenObscured: 0
@@ -41,7 +41,6 @@ PlayerSettings:
4141
height: 1
4242
m_SplashScreenLogos: []
4343
m_VirtualRealitySplashScreen: {fileID: 0}
44-
m_HolographicTrackingLossScreen: {fileID: 0}
4544
defaultScreenWidth: 1920
4645
defaultScreenHeight: 1080
4746
defaultScreenWidthWeb: 960
@@ -55,7 +54,7 @@ PlayerSettings:
5554
mipStripping: 0
5655
numberOfMipsStripped: 0
5756
numberOfMipsStrippedPerMipmapLimitGroup: {}
58-
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
57+
m_StackTraceTypes: 010000000100000001000000010000000100000001000000i
5958
iosShowActivityIndicatorOnLoading: -1
6059
androidShowActivityIndicatorOnLoading: -1
6160
iosUseCustomAppBackgroundBehavior: 0
@@ -66,10 +65,16 @@ PlayerSettings:
6665
useOSAutorotation: 1
6766
use32BitDisplayBuffer: 1
6867
preserveFramebufferAlpha: 0
68+
adjustIOSFPSUsingThermalState: 1
69+
thermalStateSeriousIOSFPS: 30
70+
thermalStateCriticalIOSFPS: 15
6971
disableDepthAndStencilBuffers: 0
7072
androidStartInFullscreen: 1
7173
androidRenderOutsideSafeArea: 1
7274
androidUseSwappy: 1
75+
androidRequestedVisibleInsets: 0
76+
androidSystemBarsBehavior: 2
77+
androidDisplayOptions: 1
7378
androidBlitType: 0
7479
androidResizeableActivity: 1
7580
androidDefaultWindowWidth: 1920
@@ -83,9 +88,11 @@ PlayerSettings:
8388
defaultIsNativeResolution: 1
8489
macRetinaSupport: 1
8590
runInBackground: 1
91+
callOnDisableOnAssetBundleUnload: 1
8692
muteOtherAudioSources: 0
8793
Prepare IOS For Recording: 0
8894
Force IOS Speakers When Recording: 0
95+
audioSpatialExperience: 0
8996
deferSystemGesturesMode: 0
9097
hideHomeButton: 0
9198
submitAnalytics: 1
@@ -112,6 +119,7 @@ PlayerSettings:
112119
xboxEnableGuest: 0
113120
xboxEnablePIXSampling: 0
114121
metalFramebufferOnly: 0
122+
metalUseMetalDisplayLink: 0
115123
xboxOneResolution: 0
116124
xboxOneSResolution: 0
117125
xboxOneXResolution: 3
@@ -132,6 +140,7 @@ PlayerSettings:
132140
switchNVNMaxPublicSamplerIDCount: 0
133141
switchMaxWorkerMultiple: 8
134142
switchNVNGraphicsFirmwareMemory: 32
143+
switchGraphicsJobsSyncAfterKick: 1
135144
vulkanNumSwapchainBuffers: 3
136145
vulkanEnableSetSRGBWrite: 0
137146
vulkanEnablePreTransform: 0
@@ -144,18 +153,16 @@ PlayerSettings:
144153
preloadedAssets: []
145154
metroInputSource: 0
146155
wsaTransparentSwapchain: 0
147-
m_HolographicPauseOnTrackingLoss: 1
148156
xboxOneDisableKinectGpuReservation: 1
149157
xboxOneEnable7thCore: 1
150158
vrSettings:
151159
enable360StereoCapture: 0
152-
isWsaHolographicRemotingEnabled: 0
153160
enableFrameTimingStats: 0
154161
enableOpenGLProfilerGPURecorders: 1
155162
allowHDRDisplaySupport: 0
156163
useHDRDisplay: 0
157164
hdrBitDepth: 0
158-
m_ColorGamuts: 00000000
165+
m_ColorGamuts: 00000000i
159166
targetPixelDensity: 30
160167
resolutionScalingMode: 0
161168
resetResolutionOnWindowResize: 0
@@ -171,9 +178,10 @@ PlayerSettings:
171178
tvOS: 0
172179
overrideDefaultApplicationIdentifier: 0
173180
AndroidBundleVersionCode: 1
174-
AndroidMinSdkVersion: 23
181+
AndroidMinSdkVersion: 26
175182
AndroidTargetSdkVersion: 0
176183
AndroidPreferredInstallLocation: 1
184+
AndroidPreferredDataLocation: 1
177185
aotOptions:
178186
stripEngineCode: 1
179187
iPhoneStrippingLevel: 0
@@ -188,13 +196,14 @@ PlayerSettings:
188196
VertexChannelCompressionMask: 4054
189197
iPhoneSdkVersion: 988
190198
iOSSimulatorArchitecture: 0
191-
iOSTargetOSVersionString: 13.0
199+
iOSTargetOSVersionString: 15.0
192200
tvOSSdkVersion: 0
193201
tvOSSimulatorArchitecture: 0
194202
tvOSRequireExtendedGameController: 0
195-
tvOSTargetOSVersionString: 13.0
203+
tvOSTargetOSVersionString: 15.0
196204
VisionOSSdkVersion: 0
197205
VisionOSTargetOSVersionString: 1.0
206+
xcodeProjectType: 0
198207
uIPrerenderedIcon: 0
199208
uIRequiresPersistentWiFi: 0
200209
uIRequiresFullScreen: 1
@@ -271,6 +280,9 @@ PlayerSettings:
271280
AndroidBuildApkPerCpuArchitecture: 0
272281
AndroidTVCompatibility: 0
273282
AndroidIsGame: 1
283+
androidAppCategory: 3
284+
useAndroidAppCategory: 1
285+
androidAppCategoryOther:
274286
AndroidEnableTango: 0
275287
androidEnableBanner: 1
276288
androidUseLowAccuracyLocation: 0
@@ -384,8 +396,10 @@ PlayerSettings:
384396
m_BuildTargetShaderSettings: []
385397
m_BuildTargetGraphicsJobs: []
386398
m_BuildTargetGraphicsJobMode: []
387-
m_BuildTargetGraphicsAPIs: []
388-
m_BuildTargetVRSettings: []
399+
m_BuildTargetGraphicsAPIs:
400+
- m_BuildTarget: WindowsStandaloneSupport
401+
m_APIs: 0200000012000000i
402+
m_Automatic: 0
389403
m_DefaultShaderChunkSizeInMB: 16
390404
m_DefaultShaderChunkCount: 0
391405
openGLRequireES31: 0
@@ -398,6 +412,7 @@ PlayerSettings:
398412
iPhone: 1
399413
tvOS: 1
400414
m_BuildTargetGroupLightmapEncodingQuality: []
415+
m_BuildTargetGroupHDRCubemapEncodingQuality: []
401416
m_BuildTargetGroupLightmapSettings: []
402417
m_BuildTargetGroupLoadStoreDebugModeSettings: []
403418
m_BuildTargetNormalMapEncoding: []
@@ -413,7 +428,7 @@ PlayerSettings:
413428
locationUsageDescription:
414429
microphoneUsageDescription:
415430
bluetoothUsageDescription:
416-
macOSTargetOSVersion: 11.0
431+
macOSTargetOSVersion: 12.0
417432
switchNMETAOverride:
418433
switchNetLibKey:
419434
switchSocketMemoryPoolSize: 6144
@@ -559,6 +574,8 @@ PlayerSettings:
559574
switchMicroSleepForYieldTime: 25
560575
switchRamDiskSpaceSize: 12
561576
switchUpgradedPlayerSettingsToNMETA: 0
577+
switchCaStoreSource: 0
578+
switchCaStoreFilePath:
562579
ps4NPAgeRating: 12
563580
ps4NPTitleSecret:
564581
ps4NPTrophyPackPath:
@@ -661,18 +678,20 @@ PlayerSettings:
661678
webGLMemoryLinearGrowthStep: 16
662679
webGLMemoryGeometricGrowthStep: 0.2
663680
webGLMemoryGeometricGrowthCap: 96
664-
webGLEnableWebGPU: 0
665681
webGLPowerPreference: 2
666682
webGLWebAssemblyTable: 0
667683
webGLWebAssemblyBigInt: 0
668684
webGLCloseOnQuit: 0
669685
webWasm2023: 0
686+
webEnableSubmoduleStrippingCompatibility: 0
687+
webProgressiveAssetLoading: 0
670688
scriptingDefineSymbols: {}
671689
additionalCompilerArguments: {}
672690
platformArchitecture: {}
673691
scriptingBackend: {}
674692
il2cppCompilerConfiguration: {}
675693
il2cppCodeGeneration: {}
694+
il2cppLTOMode: {}
676695
il2cppStacktraceInformation: {}
677696
managedStrippingLevel: {}
678697
incrementalIl2cppBuild: {}
@@ -683,6 +702,7 @@ PlayerSettings:
683702
scriptingRuntimeVersion: 1
684703
gcIncremental: 1
685704
gcWBarrierValidation: 0
705+
managedCodeVariant: {}
686706
apiCompatibilityLevelPerPlatform: {}
687707
editorAssembliesCompatibilityLevel: 1
688708
m_RenderingPath: 1
@@ -742,7 +762,6 @@ PlayerSettings:
742762
XboxOneXTitleMemory: 8
743763
XboxOneOverrideIdentityName:
744764
XboxOneOverrideIdentityPublisher:
745-
vrEditorSettings: {}
746765
cloudServicesEnabled:
747766
Purchasing: 0
748767
Unity Ads: 0
@@ -767,6 +786,7 @@ PlayerSettings:
767786
captureStartupLogs: {}
768787
activeInputHandler: 0
769788
windowsGamepadBackendHint: 0
789+
enableDirectStorage: 0
770790
cloudProjectId:
771791
framebufferDepthMemorylessMode: 0
772792
qualitySettingsNames: []
@@ -780,3 +800,7 @@ PlayerSettings:
780800
insecureHttpOption: 0
781801
androidVulkanDenyFilterList: []
782802
androidVulkanAllowFilterList: []
803+
androidVulkanDeviceFilterListAsset: {fileID: 0}
804+
d3d12DeviceFilterListAsset: {fileID: 0}
805+
webGPUDeviceFilterListAsset: {fileID: 0}
806+
allowedHttpConnections: 3
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 6000.0.61f1
2-
m_EditorVersionWithRevision: 6000.0.61f1 (74a0adb02c31)
1+
m_EditorVersion: 6000.6.0b5
2+
m_EditorVersionWithRevision: 6000.6.0b5 (b5238eaafb35)

0 commit comments

Comments
 (0)