diff --git a/Assets/Materials/Environment/Lamp Metal.mat b/Assets/Materials/Environment/Lamp Metal.mat new file mode 100644 index 0000000..341c910 --- /dev/null +++ b/Assets/Materials/Environment/Lamp Metal.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Lamp Metal + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.603 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.473 + - _GlossyReflections: 1 + - _Metallic: 1 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.8018868, g: 0.7981043, b: 0.7981043, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Environment/Lamp Metal.mat.meta b/Assets/Materials/Environment/Lamp Metal.mat.meta new file mode 100644 index 0000000..995a9b9 --- /dev/null +++ b/Assets/Materials/Environment/Lamp Metal.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ff3ca534769e99b428e81eb2a5dea4bf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Environment/Neon.mat b/Assets/Materials/Environment/Neon.mat new file mode 100644 index 0000000..dc6fca1 --- /dev/null +++ b/Assets/Materials/Environment/Neon.mat @@ -0,0 +1,81 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Neon + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: + - _EMISSION + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Environment/Neon.mat.meta b/Assets/Materials/Environment/Neon.mat.meta new file mode 100644 index 0000000..f42bb02 --- /dev/null +++ b/Assets/Materials/Environment/Neon.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 270dc0d593aecc2458523ba699539374 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Blender/Lamp.blend b/Assets/Models/Blender/Lamp.blend new file mode 100644 index 0000000..ebf48de --- /dev/null +++ b/Assets/Models/Blender/Lamp.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a039c011fc16f4f9a62688d95ed5436729deeeeacd91c2bd38c99d0d9649ab09 +size 1059896 diff --git a/Assets/Models/Blender/Lamp.blend.meta b/Assets/Models/Blender/Lamp.blend.meta new file mode 100644 index 0000000..b073b45 --- /dev/null +++ b/Assets/Models/Blender/Lamp.blend.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: 2d215d829a7ab10408170d7036d2728a +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Lamp.prefab b/Assets/Models/Lamp.prefab new file mode 100644 index 0000000..acf40b6 --- /dev/null +++ b/Assets/Models/Lamp.prefab @@ -0,0 +1,234 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8204050755593518889 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5906488120577768863} + - component: {fileID: 9061793449119975879} + m_Layer: 0 + m_Name: Light Probe Group + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5906488120577768863 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8204050755593518889} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 905368309636460435} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!220 &9061793449119975879 +LightProbeGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8204050755593518889} + m_Enabled: 1 + m_SourcePositions: + - {x: 1, y: 1, z: 1} + - {x: 1, y: 1, z: -1} + - {x: 1, y: -1, z: 1} + - {x: 1, y: -1, z: -1} + - {x: -1, y: 1, z: 1} + - {x: -1, y: 1, z: -1} + - {x: -1, y: -1, z: 1} + - {x: -1, y: -1, z: -1} + m_Dering: 1 +--- !u!1001 &800016562671814776 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -9003323146575883303, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: ff3ca534769e99b428e81eb2a5dea4bf, type: 2} + - target: {fileID: -8679921383154817045, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_LocalPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_LocalPosition.y + value: 2.9227364 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_LocalPosition.z + value: 1.2158056 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8419465703271776077, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_ReceiveGI + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8419465703271776077, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8419465703271776077, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 270dc0d593aecc2458523ba699539374, type: 2} + - target: {fileID: -7918335002988649766, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: ff3ca534769e99b428e81eb2a5dea4bf, type: 2} + - target: {fileID: -4961664530838682413, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4564064360762451390, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_ReceiveGI + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4564064360762451390, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4564064360762451390, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 270dc0d593aecc2458523ba699539374, type: 2} + - target: {fileID: -4455396708265769338, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_ReceiveGI + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4455396708265769338, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4455396708265769338, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 270dc0d593aecc2458523ba699539374, type: 2} + - target: {fileID: -2268138116939433651, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: ff3ca534769e99b428e81eb2a5dea4bf, type: 2} + - target: {fileID: -1439730007547781893, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 270dc0d593aecc2458523ba699539374, type: 2} + - target: {fileID: -1408706405884843382, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -1213771675399198530, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_LightProbeUsage + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -1213771675399198530, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -1213771675399198530, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: ff3ca534769e99b428e81eb2a5dea4bf, type: 2} + - target: {fileID: -1204400004561546477, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_ReceiveGI + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -1204400004561546477, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -1204400004561546477, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 270dc0d593aecc2458523ba699539374, type: 2} + - target: {fileID: -596781384023856508, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -241587437493983680, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: ff3ca534769e99b428e81eb2a5dea4bf, type: 2} + - target: {fileID: 882129737928793925, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: ff3ca534769e99b428e81eb2a5dea4bf, type: 2} + - target: {fileID: 919132149155446097, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_Name + value: Lamp + objectReference: {fileID: 0} + - target: {fileID: 1129496810705857465, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 270dc0d593aecc2458523ba699539374, type: 2} + - target: {fileID: 2786534777698132407, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: ff3ca534769e99b428e81eb2a5dea4bf, type: 2} + - target: {fileID: 6647133609140836343, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7071182760956848314, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 270dc0d593aecc2458523ba699539374, type: 2} + - target: {fileID: 7202271454713460447, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 270dc0d593aecc2458523ba699539374, type: 2} + - target: {fileID: 7339356831882890532, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: ff3ca534769e99b428e81eb2a5dea4bf, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} +--- !u!4 &905368309636460435 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2d215d829a7ab10408170d7036d2728a, type: 3} + m_PrefabInstance: {fileID: 800016562671814776} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Models/Lamp.prefab.meta b/Assets/Models/Lamp.prefab.meta new file mode 100644 index 0000000..5fa844b --- /dev/null +++ b/Assets/Models/Lamp.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6e95f7c4a8765e544ab90d851dac3bdd +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index e8f0836..334a079 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -481,7 +481,7 @@ GameObject: - component: {fileID: 105728219} - component: {fileID: 105728218} - component: {fileID: 105728217} - m_Layer: 0 + m_Layer: 6 m_Name: Roof m_TagString: Untagged m_Icon: {fileID: 0} @@ -2629,13 +2629,13 @@ GameObject: m_Component: - component: {fileID: 307382641} - component: {fileID: 307382642} - m_Layer: 0 + m_Layer: 6 m_Name: Point Light m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 2147483647 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &307382641 Transform: m_ObjectHideFlags: 0 @@ -2700,7 +2700,7 @@ Light: m_RenderMode: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 55 m_RenderingLayerMask: 1 m_Lightmapping: 1 m_LightShadowCasterMode: 0 @@ -2723,13 +2723,13 @@ GameObject: m_Component: - component: {fileID: 374561119} - component: {fileID: 374561120} - m_Layer: 0 + m_Layer: 6 m_Name: Point Light (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 2147483647 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &374561119 Transform: m_ObjectHideFlags: 0 @@ -2738,7 +2738,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 374561118} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 9, y: -0.25, z: -2} + m_LocalPosition: {x: 11.029, y: -0.369, z: -2.31} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2758,7 +2758,7 @@ Light: m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 0.5 - m_Range: 10 + m_Range: 5 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 m_CookieSize: 10 @@ -2794,9 +2794,9 @@ Light: m_RenderMode: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 0 m_RenderingLayerMask: 1 - m_Lightmapping: 1 + m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 @@ -2996,7 +2996,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5262755222010251265, guid: 481a02167edfebe44883f5868f8a27f9, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 5262755222010251265, guid: 481a02167edfebe44883f5868f8a27f9, type: 3} propertyPath: m_LocalScale.x @@ -3066,7 +3066,7 @@ GameObject: - component: {fileID: 466555365} - component: {fileID: 466555364} - component: {fileID: 466555363} - m_Layer: 0 + m_Layer: 6 m_Name: Wall South m_TagString: Untagged m_Icon: {fileID: 0} @@ -3495,7 +3495,7 @@ GameObject: - component: {fileID: 544536301} - component: {fileID: 544536300} - component: {fileID: 544536299} - m_Layer: 0 + m_Layer: 6 m_Name: Wall North m_TagString: Untagged m_Icon: {fileID: 0} @@ -4931,7 +4931,7 @@ GameObject: - component: {fileID: 671271524} - component: {fileID: 671271523} - component: {fileID: 671271522} - m_Layer: 0 + m_Layer: 6 m_Name: Wall East m_TagString: Untagged m_Icon: {fileID: 0} @@ -5931,7 +5931,7 @@ Transform: - {fileID: 1387559935} - {fileID: 1688009003} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &917205804 GameObject: @@ -5943,13 +5943,13 @@ GameObject: m_Component: - component: {fileID: 917205805} - component: {fileID: 917205806} - m_Layer: 0 + m_Layer: 6 m_Name: Point Light (2) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 2147483647 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &917205805 Transform: m_ObjectHideFlags: 0 @@ -6014,7 +6014,7 @@ Light: m_RenderMode: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 55 m_RenderingLayerMask: 1 m_Lightmapping: 1 m_LightShadowCasterMode: 0 @@ -6776,7 +6776,7 @@ Transform: m_Children: - {fileID: 1075331068} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1163077229 stripped Transform: @@ -6792,7 +6792,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1173886246} - m_Layer: 0 + m_Layer: 6 m_Name: Environment (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -6820,7 +6820,7 @@ Transform: - {fileID: 1837151161} - {fileID: 671271521} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1180503447 PrefabInstance: @@ -7628,13 +7628,13 @@ GameObject: m_Component: - component: {fileID: 1426600054} - component: {fileID: 1426600055} - m_Layer: 0 + m_Layer: 6 m_Name: Point Light (3) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 2147483647 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1426600054 Transform: m_ObjectHideFlags: 0 @@ -7699,7 +7699,7 @@ Light: m_RenderMode: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 55 m_RenderingLayerMask: 1 m_Lightmapping: 1 m_LightShadowCasterMode: 0 @@ -7747,7 +7747,7 @@ Transform: - {fileID: 788326936} - {fileID: 1809453288} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1520507909 PrefabInstance: @@ -7894,7 +7894,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1569061804 PrefabInstance: @@ -7905,7 +7905,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4992710803060700830, guid: 6c618d1810b18b345ae5bcf11f31c2bc, type: 3} propertyPath: m_RootOrder - value: 6 + value: 7 objectReference: {fileID: 0} - target: {fileID: 4992710803060700830, guid: 6c618d1810b18b345ae5bcf11f31c2bc, type: 3} propertyPath: m_LocalPosition.x @@ -8159,7 +8159,7 @@ Transform: - {fileID: 1695254331} - {fileID: 1180503448} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!43 &1759620593 Mesh: @@ -8335,7 +8335,7 @@ GameObject: m_Component: - component: {fileID: 1796368674} - component: {fileID: 1796368675} - m_Layer: 0 + m_Layer: 6 m_Name: Sun m_TagString: Untagged m_Icon: {fileID: 0} @@ -8438,7 +8438,7 @@ GameObject: - component: {fileID: 1837151164} - component: {fileID: 1837151163} - component: {fileID: 1837151162} - m_Layer: 0 + m_Layer: 6 m_Name: Wall West m_TagString: Untagged m_Icon: {fileID: 0} @@ -8952,7 +8952,7 @@ GameObject: - component: {fileID: 1941597271} - component: {fileID: 1941597270} - component: {fileID: 1941597269} - m_Layer: 0 + m_Layer: 6 m_Name: Outer m_TagString: Untagged m_Icon: {fileID: 0} @@ -9993,7 +9993,7 @@ GameObject: - component: {fileID: 1962807159} - component: {fileID: 1962807158} - component: {fileID: 1962807157} - m_Layer: 0 + m_Layer: 6 m_Name: Floor m_TagString: Untagged m_Icon: {fileID: 0} @@ -10822,7 +10822,7 @@ Transform: - {fileID: 2002266328} - {fileID: 655794545} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &4346386838405480863 PrefabInstance: @@ -10901,3 +10901,208 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ade54c247559a342b46db33bb0c5fdf, type: 3} +--- !u!1001 &8736913158087471388 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 339737609472615361, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_ReceiveGI + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 339737609472615361, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 339737609472615361, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 566137449918936361, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_Name + value: Lamp + objectReference: {fileID: 0} + - target: {fileID: 566137449918936361, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 628500568225425116, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 722335982897201163, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 841728444775672662, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 905368309636460435, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 905368309636460435, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_LocalPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 905368309636460435, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_LocalPosition.y + value: 3.838 + objectReference: {fileID: 0} + - target: {fileID: 905368309636460435, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_LocalPosition.z + value: 1.2158056 + objectReference: {fileID: 0} + - target: {fileID: 905368309636460435, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 905368309636460435, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 905368309636460435, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 905368309636460435, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 905368309636460435, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 905368309636460435, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 905368309636460435, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1376796152799995174, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1543221962706441474, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 2671313993901793236, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2996239615046512494, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 4123164175114094307, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 4153182292139869816, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 4362931202395196719, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 5023941543357612988, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 5507479221540006767, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 5725498410725239884, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5857648804557519741, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 5906488120577768863, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6240286657729780393, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6278175493833134665, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7042994272131191435, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7430719468338107523, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_ReceiveGI + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7430719468338107523, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7430719468338107523, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7559750924719767207, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_ReceiveGI + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7559750924719767207, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7559750924719767207, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7582893621260148930, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_ReceiveGI + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7582893621260148930, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7582893621260148930, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7864332079199610508, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 8333090075436019566, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 8801305363446604324, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 8975133716385833964, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8985519457477424964, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 9024500076960541003, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} diff --git a/Assets/Scenes/FabLab/Fablab.lighting b/Assets/Scenes/FabLab/Fablab.lighting index 38ebf92..f25791c 100644 --- a/Assets/Scenes/FabLab/Fablab.lighting +++ b/Assets/Scenes/FabLab/Fablab.lighting @@ -15,7 +15,7 @@ LightingSettings: m_BounceScale: 1 m_AlbedoBoost: 1 m_IndirectOutputScale: 1 - m_UsingShadowmask: 1 + m_UsingShadowmask: 0 m_BakeBackend: 2 m_LightmapMaxSize: 1024 m_BakeResolution: 40 @@ -26,10 +26,10 @@ LightingSettings: m_CompAOExponent: 1 m_CompAOExponentDirect: 0 m_ExtractAO: 0 - m_MixedBakeMode: 2 + m_MixedBakeMode: 0 m_LightmapsBakeMode: 1 m_FilterMode: 1 - m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_LightmapParameters: {fileID: 15200, guid: 0000000000000000f000000000000000, type: 0} m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_RealtimeResolution: 2 diff --git a/Packages/manifest.json b/Packages/manifest.json index bd9e270..6a3c71d 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -7,6 +7,7 @@ "com.unity.ide.visualstudio": "2.0.17", "com.unity.ide.vscode": "1.2.5", "com.unity.probuilder": "5.0.6", + "com.unity.render-pipelines.universal": "12.1.8", "com.unity.test-framework": "1.1.33", "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 25c1e17..f39ac5f 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -7,6 +7,15 @@ "dependencies": {}, "url": "https://registry.spoiledcat.com" }, + "com.unity.burst": { + "version": "1.8.2", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.mathematics": "1.2.1" + }, + "url": "https://packages.unity.com" + }, "com.unity.collab-proxy": { "version": "1.17.7", "depth": 0, @@ -78,6 +87,13 @@ }, "url": "https://packages.unity.com" }, + "com.unity.mathematics": { + "version": "1.2.6", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.nuget.newtonsoft-json": { "version": "3.0.2", "depth": 2, @@ -103,6 +119,34 @@ }, "url": "https://packages.unity.com" }, + "com.unity.render-pipelines.core": { + "version": "12.1.8", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.render-pipelines.universal": { + "version": "12.1.8", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.mathematics": "1.2.1", + "com.unity.burst": "1.8.2", + "com.unity.render-pipelines.core": "12.1.8", + "com.unity.shadergraph": "12.1.8" + } + }, + "com.unity.searcher": { + "version": "4.9.1", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.services.core": { "version": "1.6.0", "depth": 1, @@ -121,6 +165,15 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.shadergraph": { + "version": "12.1.8", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.render-pipelines.core": "12.1.8", + "com.unity.searcher": "4.9.1" + } + }, "com.unity.sysroot": { "version": "2.0.5", "depth": 1, diff --git a/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/ProjectSettings/Packages/com.unity.probuilder/Settings.json index 2af3333..d5fa89d 100644 --- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json +++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json @@ -91,7 +91,7 @@ { "type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "editor.selectMode", - "value": "{\"m_Value\":8}" + "value": "{\"m_Value\":1}" }, { "type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e4943c6..1fd7d64 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -805,7 +805,20 @@ PlayerSettings: webGLThreadsSupport: 0 webGLDecompressionFallback: 0 webGLPowerPreference: 2 - scriptingDefineSymbols: {} + scriptingDefineSymbols: + Android: UNITY_POST_PROCESSING_STACK_V2 + EmbeddedLinux: UNITY_POST_PROCESSING_STACK_V2 + GameCoreXboxOne: UNITY_POST_PROCESSING_STACK_V2 + Lumin: UNITY_POST_PROCESSING_STACK_V2 + Nintendo Switch: UNITY_POST_PROCESSING_STACK_V2 + PS4: UNITY_POST_PROCESSING_STACK_V2 + PS5: UNITY_POST_PROCESSING_STACK_V2 + Stadia: UNITY_POST_PROCESSING_STACK_V2 + Standalone: UNITY_POST_PROCESSING_STACK_V2 + WebGL: UNITY_POST_PROCESSING_STACK_V2 + Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2 + XboxOne: UNITY_POST_PROCESSING_STACK_V2 + tvOS: UNITY_POST_PROCESSING_STACK_V2 additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1c92a78..fb89f63 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -3,7 +3,8 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - SamplesInfoPanel layers: - Default - TransparentFX @@ -11,7 +12,7 @@ TagManager: - - Water - UI - - + - Static Lighting - - - diff --git a/ProjectSettings/URPProjectSettings.asset b/ProjectSettings/URPProjectSettings.asset new file mode 100644 index 0000000..c1f118a --- /dev/null +++ b/ProjectSettings/URPProjectSettings.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} + m_Name: + m_EditorClassIdentifier: + m_LastMaterialVersion: 5