diff --git a/UnityGoesBruh/Assets/Prefabs/Generall2.prefab b/UnityGoesBruh/Assets/Prefabs/Generall2.prefab index 6814752ff1961e1e150dbb9b17ab7b6ff09382d1..d3c034869823c1113ebf96591757c22c6d5031e0 100644 --- a/UnityGoesBruh/Assets/Prefabs/Generall2.prefab +++ b/UnityGoesBruh/Assets/Prefabs/Generall2.prefab @@ -1213,6 +1213,178 @@ Transform: m_Father: {fileID: 747370227523907481} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2898569245075651003 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6467069673216126751} + - component: {fileID: 8586956318594844409} + - component: {fileID: 834210339992642776} + m_Layer: 0 + m_Name: Kouise + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6467069673216126751 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2898569245075651003} + m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 8.886} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5143368942493631915} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 8.41, y: -1.694} + m_SizeDelta: {x: 20, y: 5} + m_Pivot: {x: 0, y: 0} +--- !u!23 &8586956318594844409 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2898569245075651003} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &834210339992642776 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2898569245075651003} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Sample text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 2 + m_fontSizeBase: 2 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: -0.13054323, z: 17.922043, w: 2.8244746} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 8586956318594844409} + m_maskType: 0 --- !u!1 &3046955457035047664 GameObject: m_ObjectHideFlags: 0 @@ -2793,6 +2965,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 6467069673216126751} - {fileID: 3090960592840140365} - {fileID: 5563660788799506312} - {fileID: 3569037324223347565} @@ -2857,6 +3030,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1830644942908338429} + - component: {fileID: 8647215772343961142} m_Layer: 0 m_Name: Generall2 m_TagString: Untagged @@ -2891,6 +3065,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8647215772343961142 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7241490489200913861} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4acf37e0a57dd8803900614ec32ff2a6, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7386681566971862393 GameObject: m_ObjectHideFlags: 0 @@ -3634,7 +3820,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4180469323904254, guid: 1f1181424ea20d64ea8a1054356fb358, type: 3} propertyPath: m_RootOrder - value: 20 + value: 21 objectReference: {fileID: 0} - target: {fileID: 4180469323904254, guid: 1f1181424ea20d64ea8a1054356fb358, type: 3} propertyPath: m_LocalScale.x @@ -3803,7 +3989,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4874838289759418, guid: 08521dc67da0f464d8e02468d5dfa443, type: 3} propertyPath: m_RootOrder - value: 13 + value: 14 objectReference: {fileID: 0} - target: {fileID: 4874838289759418, guid: 08521dc67da0f464d8e02468d5dfa443, type: 3} propertyPath: m_LocalPosition.x @@ -4153,7 +4339,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 463376, guid: e15828603e27c5e42b39860e4f55da70, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 463376, guid: e15828603e27c5e42b39860e4f55da70, type: 3} propertyPath: m_LocalPosition.x @@ -4405,9 +4591,13 @@ PrefabInstance: propertyPath: m_Name value: Barbell (1) objectReference: {fileID: 0} + - target: {fileID: 4374089948894025485, guid: 04436bb5515d84f4baa22f0741a3f2a5, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 4374089948894025485, guid: 04436bb5515d84f4baa22f0741a3f2a5, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 04436bb5515d84f4baa22f0741a3f2a5, type: 3} @@ -4901,7 +5091,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4136596486665026, guid: a8c0ffcd92f66401780885a74ce3a767, type: 3} propertyPath: m_RootOrder - value: 18 + value: 19 objectReference: {fileID: 0} - target: {fileID: 4136596486665026, guid: a8c0ffcd92f66401780885a74ce3a767, type: 3} propertyPath: m_LocalPosition.x @@ -11861,13 +12051,17 @@ PrefabInstance: propertyPath: m_Name value: Laptop_On objectReference: {fileID: 0} + - target: {fileID: 1382680370001608, guid: 112cc81e36e745449bf229e4dbb3e073, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 1382680370001608, guid: 112cc81e36e745449bf229e4dbb3e073, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4225381643663648, guid: 112cc81e36e745449bf229e4dbb3e073, type: 3} propertyPath: m_RootOrder - value: 19 + value: 20 objectReference: {fileID: 0} - target: {fileID: 4225381643663648, guid: 112cc81e36e745449bf229e4dbb3e073, type: 3} propertyPath: m_LocalScale.x @@ -11923,6 +12117,39 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 112cc81e36e745449bf229e4dbb3e073, type: 3} +--- !u!1 &2828780355271631581 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1382680370001608, guid: 112cc81e36e745449bf229e4dbb3e073, type: 3} + m_PrefabInstance: {fileID: 2829722042492458005} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1329055994 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2828780355271631581} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &2529342219744104735 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2828780355271631581} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4acf37e0a57dd8803900614ec32ff2a6, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!4 &2831132227565399349 stripped Transform: m_CorrespondingSourceObject: {fileID: 4225381643663648, guid: 112cc81e36e745449bf229e4dbb3e073, type: 3} @@ -12809,15 +13036,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c4edc23c2fd7ea049b0db0690c93932f, type: 3} propertyPath: m_LocalPosition.x - value: 2.1655176 + value: 2.166 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c4edc23c2fd7ea049b0db0690c93932f, type: 3} propertyPath: m_LocalPosition.y - value: 0.0422679 + value: 0.087 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c4edc23c2fd7ea049b0db0690c93932f, type: 3} propertyPath: m_LocalPosition.z - value: -0.28123653 + value: -0.281 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c4edc23c2fd7ea049b0db0690c93932f, type: 3} propertyPath: m_LocalRotation.w @@ -12936,7 +13163,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 445452, guid: 46b4a6d1f34c0b2b080e60d07dac1000, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 445452, guid: 46b4a6d1f34c0b2b080e60d07dac1000, type: 3} propertyPath: m_LocalPosition.x @@ -13296,7 +13523,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: c03a6c397607c84439753a0506e06e04, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 400000, guid: c03a6c397607c84439753a0506e06e04, type: 3} propertyPath: m_LocalPosition.x @@ -14250,7 +14477,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 463376, guid: e15828603e27c5e42b39860e4f55da70, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 463376, guid: e15828603e27c5e42b39860e4f55da70, type: 3} propertyPath: m_LocalPosition.x @@ -15359,7 +15586,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 3bfbdc734e9c13841add85180e90c4c0, type: 3} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 3bfbdc734e9c13841add85180e90c4c0, type: 3} propertyPath: m_LocalPosition.x @@ -16729,7 +16956,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4996593761235138, guid: 683ef653b4b09b94993b7fd393c95978, type: 3} propertyPath: m_RootOrder - value: 9 + value: 10 objectReference: {fileID: 0} - target: {fileID: 4996593761235138, guid: 683ef653b4b09b94993b7fd393c95978, type: 3} propertyPath: m_LocalScale.x @@ -17219,9 +17446,13 @@ PrefabInstance: propertyPath: m_Name value: bowlBroth objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 04dc961e304dc024a9ab5ee4deae52eb, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 04dc961e304dc024a9ab5ee4deae52eb, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4607668393258877731, guid: 04dc961e304dc024a9ab5ee4deae52eb, type: 3} propertyPath: m_StaticEditorFlags @@ -17234,6 +17465,53 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 04dc961e304dc024a9ab5ee4deae52eb, type: 3} m_PrefabInstance: {fileID: 4795500365182362425} m_PrefabAsset: {fileID: 0} +--- !u!1 &5641994372791557736 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 04dc961e304dc024a9ab5ee4deae52eb, type: 3} + m_PrefabInstance: {fileID: 4795500365182362425} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1250348002 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5641994372791557736} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &1250348003 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5641994372791557736} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -4878373955733152121, guid: 04dc961e304dc024a9ab5ee4deae52eb, type: 3} +--- !u!114 &8892378296197889439 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5641994372791557736} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4acf37e0a57dd8803900614ec32ff2a6, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &4805029663486180115 PrefabInstance: m_ObjectHideFlags: 0 @@ -18311,7 +18589,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4996593761235138, guid: 683ef653b4b09b94993b7fd393c95978, type: 3} propertyPath: m_RootOrder - value: 10 + value: 11 objectReference: {fileID: 0} - target: {fileID: 4996593761235138, guid: 683ef653b4b09b94993b7fd393c95978, type: 3} propertyPath: m_LocalScale.x @@ -18993,6 +19271,35 @@ GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 0237a2cb93d223a4aad5e45d098bbaaa, type: 3} m_PrefabInstance: {fileID: 5209169083506745227} m_PrefabAsset: {fileID: 0} +--- !u!54 &695018081 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4939259667140371162} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!65 &695018080 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4939259667140371162} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.65250915, y: 0.09883292, z: 0.6895586} + m_Center: {x: -0.010937393, y: 0.031438526, z: 0.012467399} --- !u!114 &5784376219271743178 MonoBehaviour: m_ObjectHideFlags: 0 @@ -19256,7 +19563,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4406544723037318, guid: 9d79a38f83fd64d7890b96cd421bf2a8, type: 3} propertyPath: m_RootOrder - value: 14 + value: 15 objectReference: {fileID: 0} - target: {fileID: 4406544723037318, guid: 9d79a38f83fd64d7890b96cd421bf2a8, type: 3} propertyPath: m_LocalPosition.x @@ -19882,7 +20189,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 493122, guid: 9050f6c8a29d61f49ac1b3052875c968, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 493122, guid: 9050f6c8a29d61f49ac1b3052875c968, type: 3} propertyPath: m_LocalPosition.x @@ -21635,7 +21942,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 463376, guid: e15828603e27c5e42b39860e4f55da70, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 463376, guid: e15828603e27c5e42b39860e4f55da70, type: 3} propertyPath: m_LocalPosition.x @@ -21850,7 +22157,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4808682210020090, guid: 2ff7704997af3ca468ea39420cfd35ec, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 4808682210020090, guid: 2ff7704997af3ca468ea39420cfd35ec, type: 3} propertyPath: m_LocalScale.x @@ -23931,6 +24238,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 19904334, guid: 3517d6179b17d7d41b2ab3881cb2cd67, type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3517d6179b17d7d41b2ab3881cb2cd67, type: 3} --- !u!4 &6759599613822938538 stripped @@ -24148,6 +24459,85 @@ Transform: m_CorrespondingSourceObject: {fileID: 463376, guid: e15828603e27c5e42b39860e4f55da70, type: 3} m_PrefabInstance: {fileID: 6827282833177668576} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6827637268546499658 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8535902751792838402} + m_Modifications: + - target: {fileID: 52700093869001826, guid: d0d2e930c7085374ba87fc7dd5f1ffc9, type: 3} + propertyPath: password + value: coucou + objectReference: {fileID: 0} + - target: {fileID: 877002334532806995, guid: d0d2e930c7085374ba87fc7dd5f1ffc9, type: 3} + propertyPath: _keypad + value: + objectReference: {fileID: 7575308648312536499} + - target: {fileID: 4472951535351020906, guid: d0d2e930c7085374ba87fc7dd5f1ffc9, type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4472951535351020906, guid: d0d2e930c7085374ba87fc7dd5f1ffc9, type: 3} + propertyPath: m_LocalPosition.x + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4472951535351020906, guid: d0d2e930c7085374ba87fc7dd5f1ffc9, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4472951535351020906, guid: d0d2e930c7085374ba87fc7dd5f1ffc9, type: 3} + propertyPath: m_LocalPosition.z + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 4472951535351020906, guid: d0d2e930c7085374ba87fc7dd5f1ffc9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4472951535351020906, guid: d0d2e930c7085374ba87fc7dd5f1ffc9, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4472951535351020906, guid: d0d2e930c7085374ba87fc7dd5f1ffc9, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4472951535351020906, guid: d0d2e930c7085374ba87fc7dd5f1ffc9, type: 3} + propertyPath: m_LocalRotation.z + value: 1.2455814e-10 + objectReference: {fileID: 0} + - target: {fileID: 4472951535351020906, guid: d0d2e930c7085374ba87fc7dd5f1ffc9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4472951535351020906, guid: d0d2e930c7085374ba87fc7dd5f1ffc9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4472951535351020906, guid: d0d2e930c7085374ba87fc7dd5f1ffc9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4472951535351179906, guid: d0d2e930c7085374ba87fc7dd5f1ffc9, type: 3} + propertyPath: m_Name + value: Water Door + objectReference: {fileID: 0} + - target: {fileID: 9177875983258415858, guid: d0d2e930c7085374ba87fc7dd5f1ffc9, type: 3} + propertyPath: _tmpText + value: + objectReference: {fileID: 834210339992642776} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d0d2e930c7085374ba87fc7dd5f1ffc9, type: 3} +--- !u!4 &6977129510827985184 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4472951535351020906, guid: d0d2e930c7085374ba87fc7dd5f1ffc9, type: 3} + m_PrefabInstance: {fileID: 6827637268546499658} + m_PrefabAsset: {fileID: 0} +--- !u!1 &7575308648312536499 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4026293931702635001, guid: d0d2e930c7085374ba87fc7dd5f1ffc9, type: 3} + m_PrefabInstance: {fileID: 6827637268546499658} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6842287659242911824 PrefabInstance: m_ObjectHideFlags: 0 @@ -24247,7 +24637,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4406544723037318, guid: 9d79a38f83fd64d7890b96cd421bf2a8, type: 3} propertyPath: m_RootOrder - value: 16 + value: 17 objectReference: {fileID: 0} - target: {fileID: 4406544723037318, guid: 9d79a38f83fd64d7890b96cd421bf2a8, type: 3} propertyPath: m_LocalPosition.x @@ -24385,18 +24775,6 @@ PrefabInstance: propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} - - target: {fileID: 562972203521073626, guid: 892640a281714254891583d95510e770, type: 3} - propertyPath: m_LocalScale.x - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 562972203521073626, guid: 892640a281714254891583d95510e770, type: 3} - propertyPath: m_LocalScale.y - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 562972203521073626, guid: 892640a281714254891583d95510e770, type: 3} - propertyPath: m_LocalScale.z - value: 60 - objectReference: {fileID: 0} - target: {fileID: 562972203521073626, guid: 892640a281714254891583d95510e770, type: 3} propertyPath: m_LocalPosition.x value: -4.782 @@ -24439,33 +24817,20 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3570032773129049033, guid: 892640a281714254891583d95510e770, type: 3} propertyPath: m_Name - value: fridge_01 + value: Fridge objectReference: {fileID: 0} - m_RemovedComponents: [] + - target: {fileID: 4327683627888175407, guid: 892640a281714254891583d95510e770, type: 3} + propertyPath: _pizza + value: + objectReference: {fileID: 4939259667140371162} + m_RemovedComponents: + - {fileID: 2994637751124839367, guid: 892640a281714254891583d95510e770, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 892640a281714254891583d95510e770, type: 3} --- !u!4 &6343063205038900811 stripped Transform: m_CorrespondingSourceObject: {fileID: 562972203521073626, guid: 892640a281714254891583d95510e770, type: 3} m_PrefabInstance: {fileID: 6905991148921890705} m_PrefabAsset: {fileID: 0} ---- !u!1 &7952318694454408280 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3570032773129049033, guid: 892640a281714254891583d95510e770, type: 3} - m_PrefabInstance: {fileID: 6905991148921890705} - m_PrefabAsset: {fileID: 0} ---- !u!65 &1747432514056222450 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7952318694454408280} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.023006484, y: 0.025795227, z: 0.051469114} - m_Center: {x: 0.000000029802322, y: -0.001082225, z: 0.025734557} --- !u!1001 &6906242581004437263 PrefabInstance: m_ObjectHideFlags: 0 @@ -24487,7 +24852,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4217735132095886, guid: 2c6cc31bf35264ce197c644db6a7b6a0, type: 3} propertyPath: m_RootOrder - value: 15 + value: 16 objectReference: {fileID: 0} - target: {fileID: 4217735132095886, guid: 2c6cc31bf35264ce197c644db6a7b6a0, type: 3} propertyPath: m_LocalPosition.x @@ -25401,76 +25766,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5721615037810485184, guid: 9acfba27bd450114591c17a9304927fc, type: 3} m_PrefabInstance: {fileID: 7126767506551350275} m_PrefabAsset: {fileID: 0} ---- !u!1001 &7130762999398017336 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8535902751792838402} - m_Modifications: - - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} - propertyPath: m_LocalPosition.x - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} - propertyPath: m_LocalPosition.z - value: 16 - objectReference: {fileID: 0} - - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} - propertyPath: m_LocalRotation.z - value: 1.2455814e-10 - objectReference: {fileID: 0} - - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 154865629601839088, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} - propertyPath: m_Name - value: Water Door - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} ---- !u!4 &6977129510827985184 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} - m_PrefabInstance: {fileID: 7130762999398017336} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7135156764839798574 PrefabInstance: m_ObjectHideFlags: 0 @@ -25936,7 +26231,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4996593761235138, guid: 683ef653b4b09b94993b7fd393c95978, type: 3} propertyPath: m_RootOrder - value: 11 + value: 12 objectReference: {fileID: 0} - target: {fileID: 4996593761235138, guid: 683ef653b4b09b94993b7fd393c95978, type: 3} propertyPath: m_LocalScale.x @@ -26652,7 +26947,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4406544723037318, guid: 9d79a38f83fd64d7890b96cd421bf2a8, type: 3} propertyPath: m_RootOrder - value: 17 + value: 18 objectReference: {fileID: 0} - target: {fileID: 4406544723037318, guid: 9d79a38f83fd64d7890b96cd421bf2a8, type: 3} propertyPath: m_LocalPosition.x @@ -29441,7 +29736,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4351349087935228, guid: ba04b8d03f30146f58b58231278be18f, type: 3} propertyPath: m_RootOrder - value: 12 + value: 13 objectReference: {fileID: 0} - target: {fileID: 4351349087935228, guid: ba04b8d03f30146f58b58231278be18f, type: 3} propertyPath: m_LocalPosition.x @@ -29670,7 +29965,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: e528381f299d2ce4db9f7e803942a77c, type: 3} propertyPath: m_RootOrder - value: 6 + value: 7 objectReference: {fileID: 0} - target: {fileID: 400000, guid: e528381f299d2ce4db9f7e803942a77c, type: 3} propertyPath: m_LocalPosition.x diff --git a/UnityGoesBruh/Assets/Prefabs/LowPolyOfficeProps_LITE/Prefabs/Chair_Conference_Purple.prefab b/UnityGoesBruh/Assets/Prefabs/LowPolyOfficeProps_LITE/Prefabs/Chair_Conference_Purple.prefab index d5fb6f10581fb98bae102065ce9b1a182c0b3eeb..5a4aa64dcba4edb0d045b6caf1f0d51f530c40df 100644 --- a/UnityGoesBruh/Assets/Prefabs/LowPolyOfficeProps_LITE/Prefabs/Chair_Conference_Purple.prefab +++ b/UnityGoesBruh/Assets/Prefabs/LowPolyOfficeProps_LITE/Prefabs/Chair_Conference_Purple.prefab @@ -1,28 +1,19 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1129059477481692} - m_IsPrefabParent: 1 --- !u!1 &1129059477481692 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 4239798713943006} - component: {fileID: 33965970503478232} - component: {fileID: 23356115249767132} - component: {fileID: 65039357455602526} - m_Layer: 0 + - component: {fileID: 3542806028254629391} + m_Layer: 6 m_Name: Chair_Conference_Purple m_TagString: Untagged m_Icon: {fileID: 0} @@ -31,29 +22,46 @@ GameObject: m_IsActive: 1 --- !u!4 &4239798713943006 Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1129059477481692} m_LocalRotation: {x: 0.000000021855694, 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: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33965970503478232 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129059477481692} + m_Mesh: {fileID: 4300000, guid: 8be606ea3a619eb4e9ebd68041a447e3, type: 3} --- !u!23 &23356115249767132 MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1129059477481692} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 16cb512cb0149e644a3e5929b3266a44, type: 2} m_StaticBatchInfo: @@ -63,9 +71,11 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 1 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -74,18 +84,13 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!33 &33965970503478232 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1129059477481692} - m_Mesh: {fileID: 4300000, guid: 8be606ea3a619eb4e9ebd68041a447e3, type: 3} + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &65039357455602526 BoxCollider: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1129059477481692} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -93,3 +98,15 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 0.54470736, y: 0.8170257, z: 0.482822} m_Center: {x: 0, y: 0.40851286, z: -0.009905316} +--- !u!114 &3542806028254629391 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129059477481692} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4acf37e0a57dd8803900614ec32ff2a6, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/UnityGoesBruh/Assets/Prefabs/MainDoor Keypad.prefab b/UnityGoesBruh/Assets/Prefabs/MainDoor Keypad.prefab new file mode 100644 index 0000000000000000000000000000000000000000..cee47ece88dcf25593f634ab6f309f8e94aeedff --- /dev/null +++ b/UnityGoesBruh/Assets/Prefabs/MainDoor Keypad.prefab @@ -0,0 +1,149 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &4338423024462110066 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_LocalPosition.x + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_LocalPosition.z + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_LocalRotation.z + value: 1.2455814e-10 + objectReference: {fileID: 0} + - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 154865629601839088, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_Name + value: MainDoor Keypad + objectReference: {fileID: 0} + - target: {fileID: 3188095702880300766, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188095702884870954, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7263798166549037244, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} +--- !u!4 &4472951535351020906 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + m_PrefabInstance: {fileID: 4338423024462110066} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8607797709366171543 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4472951535351020906} + m_Modifications: + - target: {fileID: 588660922915349861, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} + propertyPath: task + value: "R\xE9solvez l'\xE9nigme" + objectReference: {fileID: 0} + - target: {fileID: 588660922915349861, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} + propertyPath: location + value: Corridor / Lab + objectReference: {fileID: 0} + - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} + propertyPath: m_LocalPosition.x + value: 2.8 + objectReference: {fileID: 0} + - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} + propertyPath: m_LocalPosition.z + value: -0.12 + objectReference: {fileID: 0} + - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4653712199150427758, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} + propertyPath: m_Name + value: Keypad + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} diff --git a/UnityGoesBruh/Assets/Prefabs/MainDoor Keypad.prefab.meta b/UnityGoesBruh/Assets/Prefabs/MainDoor Keypad.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..402db81ba830947c4f54af7fe5c62b20bc94c6ec --- /dev/null +++ b/UnityGoesBruh/Assets/Prefabs/MainDoor Keypad.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d0d2e930c7085374ba87fc7dd5f1ffc9 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityGoesBruh/Assets/Prefabs/MainDoor Variant 2 Variant.prefab b/UnityGoesBruh/Assets/Prefabs/MainDoor Variant 2 Variant.prefab index 54065f7011ae79e36f8b80d2d5cbe259f0c7c130..c305193e96cc6be65619dfde357a6b3b2912b0cb 100644 --- a/UnityGoesBruh/Assets/Prefabs/MainDoor Variant 2 Variant.prefab +++ b/UnityGoesBruh/Assets/Prefabs/MainDoor Variant 2 Variant.prefab @@ -1,87 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &4343504450965252080 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 7550749944775378032} - m_Modifications: - - target: {fileID: 588660922915349861, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} - propertyPath: m_LocalPosition.x - value: 1.681 - objectReference: {fileID: 0} - - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} - propertyPath: m_LocalPosition.y - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} - propertyPath: m_LocalPosition.z - value: -0.592 - objectReference: {fileID: 0} - - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} - propertyPath: m_LocalRotation.w - value: 0.38268343 - objectReference: {fileID: 0} - - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} - propertyPath: m_LocalRotation.y - value: 0.92387956 - objectReference: {fileID: 0} - - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 135 - objectReference: {fileID: 0} - - target: {fileID: 2722893037708101250, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4653712199150427758, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} - propertyPath: m_Name - value: Keypad - objectReference: {fileID: 0} - - target: {fileID: 8632890440510610421, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} - propertyPath: password - value: 1234 - objectReference: {fileID: 0} - - target: {fileID: 8632890440510610421, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} - propertyPath: _password - value: 1234 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} ---- !u!1 &8994379910116014494 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4653712199150427758, guid: 4ecd379a6157d530cabeb8e314dc48b7, type: 3} - m_PrefabInstance: {fileID: 4343504450965252080} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7705542867559720040 PrefabInstance: m_ObjectHideFlags: 0 @@ -151,20 +69,48 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3188095702880300766, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} propertyPath: m_Enabled - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3188095702882535372, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_LocalPosition.x + value: 1.9 objectReference: {fileID: 0} - target: {fileID: 3188095702882535372, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} propertyPath: m_LocalPosition.y - value: -10 + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3188095702882535372, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_LocalPosition.z + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3188095702882535372, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_LocalRotation.w + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3188095702882535372, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188095702882535372, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3188095702882535372, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3188095702882535372, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 270 objectReference: {fileID: 0} - target: {fileID: 3188095702884870954, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} propertyPath: m_Enabled - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3467367347062617121, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} propertyPath: _keypad value: - objectReference: {fileID: 8994379910116014494} + objectReference: {fileID: 0} - target: {fileID: 3467367347062617121, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} propertyPath: _console value: @@ -199,7 +145,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7263798166549037244, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} propertyPath: m_Enabled - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} @@ -208,8 +154,3 @@ GameObject: m_CorrespondingSourceObject: {fileID: 5575983579714275511, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} m_PrefabInstance: {fileID: 7705542867559720040} m_PrefabAsset: {fileID: 0} ---- !u!4 &7550749944775378032 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 154865629601603608, guid: 089e6e526292e96409dbbe8ee969709d, type: 3} - m_PrefabInstance: {fileID: 7705542867559720040} - m_PrefabAsset: {fileID: 0} diff --git a/UnityGoesBruh/Assets/Prefabs/WallNoFloor.prefab b/UnityGoesBruh/Assets/Prefabs/WallNoFloor.prefab index 76b5bf040e28349df7299d69f3ab6e4f29163a14..d5b36fa91d57a32d02cc01ab859b31393aecd60e 100644 --- a/UnityGoesBruh/Assets/Prefabs/WallNoFloor.prefab +++ b/UnityGoesBruh/Assets/Prefabs/WallNoFloor.prefab @@ -97,6 +97,25 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1c5be98324a12b642af44ca5b727eccf, type: 3} +--- !u!1 &3657835559679100339 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4056210076852586987, guid: 1c5be98324a12b642af44ca5b727eccf, type: 3} + m_PrefabInstance: {fileID: 759335500159880280} + m_PrefabAsset: {fileID: 0} +--- !u!64 &4746524608941441814 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3657835559679100339} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300000, guid: f3bf6b5a90134a44c9aa28b43b484d59, type: 3} --- !u!4 &5120328416728950347 stripped Transform: m_CorrespondingSourceObject: {fileID: 5586359154977024531, guid: 1c5be98324a12b642af44ca5b727eccf, type: 3} diff --git a/UnityGoesBruh/Assets/Prefabs/Wall_Window.prefab b/UnityGoesBruh/Assets/Prefabs/Wall_Window.prefab index c732ac2c947c1ac950f411bb4496abcd0dd60464..9915fbd5cde62eab84712201b8a1635e933d0a8a 100644 --- a/UnityGoesBruh/Assets/Prefabs/Wall_Window.prefab +++ b/UnityGoesBruh/Assets/Prefabs/Wall_Window.prefab @@ -90,6 +90,25 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f3bf6b5a90134a44c9aa28b43b484d59, type: 3} +--- !u!1 &4056210076852586987 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: f3bf6b5a90134a44c9aa28b43b484d59, type: 3} + m_PrefabInstance: {fileID: 4056210076852621131} + m_PrefabAsset: {fileID: 0} +--- !u!64 &5308365508624096446 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4056210076852586987} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300000, guid: f3bf6b5a90134a44c9aa28b43b484d59, type: 3} --- !u!4 &4056210076853016011 stripped Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: f3bf6b5a90134a44c9aa28b43b484d59, type: 3} @@ -157,3 +176,22 @@ Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 459b4de4eb731864c8a8bec5b721f907, type: 3} m_PrefabInstance: {fileID: 5537054219297020008} m_PrefabAsset: {fileID: 0} +--- !u!1 &5537054219297054408 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 459b4de4eb731864c8a8bec5b721f907, type: 3} + m_PrefabInstance: {fileID: 5537054219297020008} + m_PrefabAsset: {fileID: 0} +--- !u!64 &4658570529656910207 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5537054219297054408} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300000, guid: 459b4de4eb731864c8a8bec5b721f907, type: 3} diff --git a/UnityGoesBruh/Assets/Prefabs/kitchen_creation_kit/Prefabs/fridge_01.prefab b/UnityGoesBruh/Assets/Prefabs/kitchen_creation_kit/Prefabs/fridge_01.prefab index 226aee1c28cb8577c9a0f663b35dec27767c2c55..aaa54aecf666e0727b24e5b68b19b2872c802388 100644 --- a/UnityGoesBruh/Assets/Prefabs/kitchen_creation_kit/Prefabs/fridge_01.prefab +++ b/UnityGoesBruh/Assets/Prefabs/kitchen_creation_kit/Prefabs/fridge_01.prefab @@ -145,7 +145,12 @@ GameObject: - component: {fileID: 8830171850782137324} - component: {fileID: 3006042700707145493} - component: {fileID: 4327683627888175407} - - component: {fileID: 904887007758104164} + - component: {fileID: 3530466117727239210} + - component: {fileID: 188784253108996420} + - component: {fileID: 4608872461685545337} + - component: {fileID: 5013102103426248172} + - component: {fileID: 5401657602922822744} + - component: {fileID: 2994637751124839367} m_Layer: 0 m_Name: fridge_01 m_TagString: Untagged @@ -160,15 +165,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3570032773129049033} - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: -8.130408, y: -1.4552737, z: -5.2744474} - m_LocalScale: {x: 50, y: 50, z: 50} + m_LocalScale: {x: 60, y: 60, z: 60} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3787971219686963448} m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!33 &8830171850782137324 MeshFilter: m_ObjectHideFlags: 0 @@ -240,8 +245,23 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _door: {fileID: 3371050157414563290} ---- !u!64 &904887007758104164 -MeshCollider: + _pizza: {fileID: 0} +--- !u!114 &3530466117727239210 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3570032773129049033} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21173f3695845ee40a529f3316f7ac9b, type: 3} + m_Name: + m_EditorClassIdentifier: + task: Sauvez la pizza + location: Bedroom / Hall +--- !u!65 &188784253108996420 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -250,7 +270,59 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300000, guid: 8856dbe0a9879694f8c375c54b52101d, type: 3} + serializedVersion: 2 + m_Size: {x: 0.0012176442, y: 0.021911431, z: 0.051469095} + m_Center: {x: 0.01089442, y: 0.00015346766, z: 0.02573395} +--- !u!65 &4608872461685545337 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3570032773129049033} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.0009861707, y: 0.02184084, z: 0.05146912} + m_Center: {x: -0.011010149, y: 0.00018880129, z: 0.025734557} +--- !u!65 &5013102103426248172 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3570032773129049033} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.019814212, y: 0.018518437, z: 0.027233621} + m_Center: {x: -0.000008472204, y: -0.00013456434, z: 0.018854603} +--- !u!65 &5401657602922822744 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3570032773129049033} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.023006484, y: 0.025795229, z: 0.017901573} + m_Center: {x: 0, y: -0.0010822547, z: 0.04251855} +--- !u!114 &2994637751124839367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3570032773129049033} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21173f3695845ee40a529f3316f7ac9b, type: 3} + m_Name: + m_EditorClassIdentifier: + task: + location: diff --git a/UnityGoesBruh/Assets/Scenes/Level.unity b/UnityGoesBruh/Assets/Scenes/Level.unity index 4818d67f9736bcf527bb7d72d9979b6789f4a653..9d76b6fd2b0b6a839656ff41e3e26fd2153d21a0 100644 --- a/UnityGoesBruh/Assets/Scenes/Level.unity +++ b/UnityGoesBruh/Assets/Scenes/Level.unity @@ -237,9 +237,39 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &420896859 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 420896860} + m_Layer: 0 + m_Name: + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &420896860 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 420896859} + 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: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &607042335 GameObject: m_ObjectHideFlags: 0 @@ -290,6 +320,55 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &638912595 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 638912597} + - component: {fileID: 638912596} + m_Layer: 0 + m_Name: ScriptHolder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &638912596 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 638912595} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0e9c5a4cf28dbd284752636f496de1, type: 3} + m_Name: + m_EditorClassIdentifier: + _miniGames: + - {fileID: 1536038025} + - {fileID: 1838215257} + _task: {fileID: 79591660} + _location: {fileID: 146755055} +--- !u!4 &638912597 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 638912595} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.046457, y: 2.5449736, z: -11.55583} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &667618030 GameObject: m_ObjectHideFlags: 0 @@ -390,6 +469,11 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1536038025 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7952318694454408280, guid: 67a51bbee122bdc46bc2291445bdaf75, type: 3} + m_PrefabInstance: {fileID: 2052166820} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1586382633 PrefabInstance: m_ObjectHideFlags: 0 @@ -401,6 +485,14 @@ PrefabInstance: propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} + - target: {fileID: 4298483535738884810, guid: c734a74a53239c312bd0365490ad11b2, type: 3} + propertyPath: m_LocalScale.x + value: 1.0000004 + objectReference: {fileID: 0} + - target: {fileID: 4298483535738884810, guid: c734a74a53239c312bd0365490ad11b2, type: 3} + propertyPath: m_LocalScale.z + value: 1.0000004 + objectReference: {fileID: 0} - target: {fileID: 4298483535738884810, guid: c734a74a53239c312bd0365490ad11b2, type: 3} propertyPath: m_LocalPosition.x value: -20.5 @@ -453,6 +545,10 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} + - target: {fileID: 8760120472564191211, guid: c734a74a53239c312bd0365490ad11b2, type: 3} + propertyPath: _interactionDistance + value: 3 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c734a74a53239c312bd0365490ad11b2, type: 3} --- !u!1 &1838215257 stripped @@ -511,21 +607,9 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -0.743 objectReference: {fileID: 0} - - target: {fileID: 3041995853781567233, guid: 67a51bbee122bdc46bc2291445bdaf75, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3545123442442539357, guid: 67a51bbee122bdc46bc2291445bdaf75, type: 3} - propertyPath: m_LightProbeUsage - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7241490489200913861, guid: 67a51bbee122bdc46bc2291445bdaf75, type: 3} propertyPath: m_Name value: Generall2 objectReference: {fileID: 0} - - target: {fileID: 8151341730306923083, guid: 67a51bbee122bdc46bc2291445bdaf75, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 67a51bbee122bdc46bc2291445bdaf75, type: 3} diff --git a/UnityGoesBruh/Assets/Scripts/Fridge/FridgeController.cs b/UnityGoesBruh/Assets/Scripts/Fridge/FridgeController.cs index eb9a2f4489d76222ee6ae8a0d7257dd4cf0a0ef0..37aefe03cfe1f3f13b503c709e4de57a3db15393 100644 --- a/UnityGoesBruh/Assets/Scripts/Fridge/FridgeController.cs +++ b/UnityGoesBruh/Assets/Scripts/Fridge/FridgeController.cs @@ -3,16 +3,25 @@ using System.Collections.Generic; using UnityEngine; using TMPro; using Assets.Scripts.Simon_Say; +using System; public class FridgeController : MonoBehaviour { [SerializeField] private GameObject _door; + [SerializeField] + private GameObject _pizza; + private Action onSuccess; + + private Vector3 _defaultPizzaPosition; + private Quaternion _defaultPizzaRotation; + // Start is called before the first frame update void Start() { - this._door.GetComponent<FridgeDoorInteractable>().AddObserver(OnButtonPressed); + this._defaultPizzaPosition = _pizza.transform.position; + this._defaultPizzaRotation = _pizza.transform.rotation; } // Update is called once per frame @@ -21,7 +30,24 @@ public class FridgeController : MonoBehaviour } - void OnButtonPressed(string buttonName) + private void OnTriggerEnter(Collider other) + { + if (other.gameObject == this._pizza) + { + onSuccess(); + } + } + + //The function that is called when the player win + public void OnSuccess(Action onSuccess) + { + this.onSuccess = onSuccess; + } + + //Reset the glass + public void Reset() { + this._pizza.transform.position = _defaultPizzaPosition; + this._pizza.transform.rotation = _defaultPizzaRotation; } } diff --git a/UnityGoesBruh/Assets/Scripts/Game/Logic.cs b/UnityGoesBruh/Assets/Scripts/Game/Logic.cs index d064e6faeeef449673368156b4fa9da97c9e0b7d..138a4083f3f807e3305fe204fab12969f2f79289 100644 --- a/UnityGoesBruh/Assets/Scripts/Game/Logic.cs +++ b/UnityGoesBruh/Assets/Scripts/Game/Logic.cs @@ -30,6 +30,7 @@ public class Logic : MonoBehaviour, MiniGameObserver public void OnWin(MiniGame miniGame) { _curMiniGame.enabled = false; + ChooseRandomMiniGame(); } @@ -60,6 +61,7 @@ public class Logic : MonoBehaviour, MiniGameObserver StopCoroutine(_timerCoroutine); } _curMiniGame = _miniGames[Random.Range(0, _miniGames.Length)].GetComponent<MiniGame>(); + _curMiniGame.enabled = true; _task.text = _curMiniGame.Task; _location.text = _curMiniGame.Location; diff --git a/UnityGoesBruh/Assets/Scripts/Game/MinigameScript/Breakable.cs b/UnityGoesBruh/Assets/Scripts/Game/MinigameScript/Breakable.cs index 82d6fcdc2f8dcaf69247f8a21727db77fcece8d2..2f0f446b7ba667c212c20982afc3f2f7b91903b2 100644 --- a/UnityGoesBruh/Assets/Scripts/Game/MinigameScript/Breakable.cs +++ b/UnityGoesBruh/Assets/Scripts/Game/MinigameScript/Breakable.cs @@ -15,8 +15,6 @@ namespace Game.MinigameScript { _beakableGlassController = this.GetComponent<BreakableGlassController>(); _beakableGlassController.OnSuccess(OnWin); - - Debug.Log(_beakableGlassController.ToString()); } public override void StartScript() diff --git a/UnityGoesBruh/Assets/Scripts/Game/MinigameScript/Fridge.cs b/UnityGoesBruh/Assets/Scripts/Game/MinigameScript/Fridge.cs new file mode 100644 index 0000000000000000000000000000000000000000..8892d9f37b088cbfe73e7377336ddfb1ab82bdfb --- /dev/null +++ b/UnityGoesBruh/Assets/Scripts/Game/MinigameScript/Fridge.cs @@ -0,0 +1,37 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using System; + + +namespace Game.MinigameScript +{ + public class Fridge : MiniGame + { + //The fridge minigame + private FridgeController _fridgeController; + + private void Start() + { + _fridgeController = this.GetComponent<FridgeController>(); + _fridgeController.OnSuccess(OnWin); + } + + public override void StartScript() + { + _fridgeController.enabled = true; + _fridgeController.Reset(); + } + + public override void OnWin() + { + _fridgeController.enabled = false; + NotifyWin(); + } + + public override void OnLose() + { + NotifyLose(); + } + } +} \ No newline at end of file diff --git a/UnityGoesBruh/Assets/Scripts/Game/MinigameScript/Fridge.cs.meta b/UnityGoesBruh/Assets/Scripts/Game/MinigameScript/Fridge.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..9c1d969af3d373a5a076ccfb97d57a7515c18f22 --- /dev/null +++ b/UnityGoesBruh/Assets/Scripts/Game/MinigameScript/Fridge.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 21173f3695845ee40a529f3316f7ac9b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityGoesBruh/Assets/Scripts/Game/MinigameScript/MiniGame.cs b/UnityGoesBruh/Assets/Scripts/Game/MinigameScript/MiniGame.cs index dfecfcd1489b6575566e5c39f7bf4e9b6ba6ba4b..aa23fd830ed5f939deb5295ad65d33a8f418de38 100644 --- a/UnityGoesBruh/Assets/Scripts/Game/MinigameScript/MiniGame.cs +++ b/UnityGoesBruh/Assets/Scripts/Game/MinigameScript/MiniGame.cs @@ -17,6 +17,7 @@ public abstract class MiniGame : MonoBehaviour public void AddObserver(MiniGameObserver miniGameObserver) { _observers.Add(miniGameObserver); + } public abstract void StartScript();