diff --git a/Game/Assets/ProBuilder Data.meta b/Game/Assets/ProBuilder Data.meta
new file mode 100644
index 0000000..a00a553
--- /dev/null
+++ b/Game/Assets/ProBuilder Data.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1704aa6d83030224fb637dbbc1384e5c
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Game/Assets/ProBuilder Data/Default Color Palette.asset b/Game/Assets/ProBuilder Data/Default Color Palette.asset
new file mode 100644
index 0000000..add1094
--- /dev/null
+++ b/Game/Assets/ProBuilder Data/Default Color Palette.asset
@@ -0,0 +1,31 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ 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: dda436a9c8bbd4d109478acf25cd48d8, type: 3}
+ m_Name: Default Color Palette
+ m_EditorClassIdentifier:
+ m_Colors:
+ - {r: 0, g: 0.122, b: 0.247, a: 1}
+ - {r: 0, g: 0.455, b: 0.851, a: 1}
+ - {r: 0.498, g: 0.859, b: 1, a: 1}
+ - {r: 0.224, g: 0.8, b: 0.8, a: 1}
+ - {r: 0.239, g: 0.6, b: 0.439, a: 1}
+ - {r: 0.18, g: 0.8, b: 0.251, a: 1}
+ - {r: 0.004, g: 1, b: 0.439, a: 1}
+ - {r: 1, g: 0.863, b: 0, a: 1}
+ - {r: 1, g: 0.522, b: 0.106, a: 1}
+ - {r: 1, g: 0.255, b: 0.212, a: 1}
+ - {r: 0.522, g: 0.078, b: 0.294, a: 1}
+ - {r: 0.941, g: 0.071, b: 0.745, a: 1}
+ - {r: 0.694, g: 0.051, b: 0.788, a: 1}
+ - {r: 0.067, g: 0.067, b: 0.067, a: 1}
+ - {r: 0.667, g: 0.667, b: 0.667, a: 1}
+ - {r: 0.867, g: 0.867, b: 0.867, a: 1}
diff --git a/Game/Assets/ProBuilder Data/Default Color Palette.asset.meta b/Game/Assets/ProBuilder Data/Default Color Palette.asset.meta
new file mode 100644
index 0000000..a2f6ddd
--- /dev/null
+++ b/Game/Assets/ProBuilder Data/Default Color Palette.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0a5da8c8c878dbd4496fb5a1a0ff9141
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Game/Assets/Scenes/House.unity b/Game/Assets/Scenes/House.unity
index 19d6164..285dacd 100644
--- a/Game/Assets/Scenes/House.unity
+++ b/Game/Assets/Scenes/House.unity
@@ -1226,6 +1226,11 @@ RectTransform:
m_AnchoredPosition: {x: 73.082, y: 21.19}
m_SizeDelta: {x: 796.4, y: 427.6}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!4 &16220492 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
+ m_PrefabInstance: {fileID: 439826051}
+ m_PrefabAsset: {fileID: 0}
--- !u!43 &16849512
Mesh:
m_ObjectHideFlags: 0
@@ -3701,6 +3706,11 @@ Mesh:
offset: 0
size: 0
path:
+--- !u!4 &59949343 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
+ m_PrefabInstance: {fileID: 1494110193}
+ m_PrefabAsset: {fileID: 0}
--- !u!43 &61206350
Mesh:
m_ObjectHideFlags: 0
@@ -24250,6 +24260,40 @@ MonoBehaviour:
m_SelectedFaces:
m_SelectedEdges: []
m_SelectedVertices:
+--- !u!1 &360765237
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 360765238}
+ m_Layer: 0
+ m_Name: Doors
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &360765238
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 360765237}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -150.98816, y: -9.839733, z: 13715.85}
+ m_LocalScale: {x: 16.91716, y: 16.91716, z: 16.91716}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 1903723543}
+ - {fileID: 59949343}
+ - {fileID: 16220492}
+ m_Father: {fileID: 1688857688}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!43 &361008533
Mesh:
m_ObjectHideFlags: 0
@@ -25263,42 +25307,6 @@ Mesh:
offset: 0
size: 0
path:
---- !u!1 &379765887
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 379765888}
- m_Layer: 5
- m_Name: Fill Area
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &379765888
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 379765887}
- 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:
- - {fileID: 604283524}
- m_Father: {fileID: 611091768}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0.25}
- m_AnchorMax: {x: 1, y: 0.75}
- m_AnchoredPosition: {x: -0.1493988, y: 0}
- m_SizeDelta: {x: -10.2987, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
--- !u!43 &380900677
Mesh:
m_ObjectHideFlags: 0
@@ -27842,7 +27850,7 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
- m_TransformParent: {fileID: 0}
+ m_TransformParent: {fileID: 360765238}
m_Modifications:
- target: {fileID: 4879809269147637565, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
propertyPath: m_Name
@@ -27854,15 +27862,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
propertyPath: m_LocalPosition.x
- value: 78.706
+ value: 2.1011505
objectReference: {fileID: 0}
- target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
propertyPath: m_LocalPosition.y
- value: 21.035625
+ value: -0.22273254
objectReference: {fileID: 0}
- target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
propertyPath: m_LocalPosition.z
- value: 1068.9393
+ value: 2.8238525
objectReference: {fileID: 0}
- target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
propertyPath: m_LocalRotation.w
@@ -27897,6 +27905,77 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
+--- !u!1 &442074720
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 442074722}
+ - component: {fileID: 442074721}
+ - component: {fileID: 442074723}
+ m_Layer: 0
+ m_Name: MessgaeTrigger
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!65 &442074721
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 442074720}
+ m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_LayerOverridePriority: 0
+ m_IsTrigger: 0
+ m_ProvidesContacts: 0
+ m_Enabled: 1
+ serializedVersion: 3
+ m_Size: {x: 1, y: 1, z: 1}
+ m_Center: {x: 0, y: 0, z: 0}
+--- !u!4 &442074722
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 442074720}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -1.1677933, y: -0.403059, z: -1.8348389}
+ m_LocalScale: {x: 1.9004138, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 2031915432}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &442074723
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 442074720}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0dd9f95621cce5d4389410717683d6be, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ storyPanelUI: {fileID: 620624014}
+ storyText: {fileID: 1214791149}
+ message: The house is so messy... I'll get scolded later if I don't clean up the
+ house...
+ displayDuration: 7
--- !u!43 &445289567
Mesh:
m_ObjectHideFlags: 0
@@ -40264,81 +40343,6 @@ Mesh:
offset: 0
size: 0
path:
---- !u!1 &604283523
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 604283524}
- - component: {fileID: 604283526}
- - component: {fileID: 604283525}
- m_Layer: 5
- m_Name: Fill
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &604283524
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 604283523}
- 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: 379765888}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 10, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &604283525
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 604283523}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0.68229544, g: 0.8301887, b: 0.512994, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
---- !u!222 &604283526
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 604283523}
- m_CullTransparentMesh: 1
--- !u!43 &604353483
Mesh:
m_ObjectHideFlags: 0
@@ -41198,95 +41202,6 @@ Mesh:
offset: 0
size: 0
path:
---- !u!1 &611091767
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 611091768}
- - component: {fileID: 611091769}
- m_Layer: 5
- m_Name: Slider
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &611091768
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 611091767}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1.6460289, y: 1.6460289, z: 1.6460289}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 1414998835}
- - {fileID: 379765888}
- m_Father: {fileID: 637352836}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0.5}
- m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0.9998495, y: 104}
- m_SizeDelta: {x: 160.4619, y: 44.0223}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &611091769
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 611091767}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Navigation:
- m_Mode: 3
- m_WrapAround: 0
- m_SelectOnUp: {fileID: 0}
- m_SelectOnDown: {fileID: 0}
- m_SelectOnLeft: {fileID: 0}
- m_SelectOnRight: {fileID: 0}
- m_Transition: 1
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
- m_ColorMultiplier: 1
- m_FadeDuration: 0.1
- m_SpriteState:
- m_HighlightedSprite: {fileID: 0}
- m_PressedSprite: {fileID: 0}
- m_SelectedSprite: {fileID: 0}
- m_DisabledSprite: {fileID: 0}
- m_AnimationTriggers:
- m_NormalTrigger: Normal
- m_HighlightedTrigger: Highlighted
- m_PressedTrigger: Pressed
- m_SelectedTrigger: Selected
- m_DisabledTrigger: Disabled
- m_Interactable: 1
- m_TargetGraphic: {fileID: 0}
- m_FillRect: {fileID: 604283524}
- m_HandleRect: {fileID: 0}
- m_Direction: 0
- m_MinValue: 0
- m_MaxValue: 1
- m_WholeNumbers: 0
- m_Value: 0
- m_OnValueChanged:
- m_PersistentCalls:
- m_Calls: []
--- !u!43 &611098094
Mesh:
m_ObjectHideFlags: 0
@@ -43393,126 +43308,6 @@ MonoBehaviour:
m_SelectedFaces:
m_SelectedEdges: []
m_SelectedVertices:
---- !u!1 &637352835
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 637352836}
- - component: {fileID: 637352840}
- - component: {fileID: 637352839}
- - component: {fileID: 637352838}
- - component: {fileID: 637352837}
- m_Layer: 5
- m_Name: Sweeping Progress
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &637352836
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 637352835}
- m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068}
- m_LocalPosition: {x: 0, y: 0, z: 0.433}
- m_LocalScale: {x: 0.0019571194, y: 0.0019571194, z: 0.0019571194}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 611091768}
- m_Father: {fileID: 2031915432}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 3.01, y: 0.46584702}
- m_SizeDelta: {x: 704, y: 295}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &637352837
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 637352835}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 3abe37e4351124346aa2369f40796ac8, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- target: {fileID: 1850242033}
- followSpeed: 5
- offset: {x: 0, y: -0.2, z: 0.7}
- followRotation: 1
- maxPitchAngle: 30
---- !u!114 &637352838
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 637352835}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_IgnoreReversedGraphics: 1
- m_BlockingObjects: 0
- m_BlockingMask:
- serializedVersion: 2
- m_Bits: 4294967295
---- !u!114 &637352839
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 637352835}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_UiScaleMode: 0
- m_ReferencePixelsPerUnit: 100
- m_ScaleFactor: 1
- m_ReferenceResolution: {x: 800, y: 600}
- m_ScreenMatchMode: 0
- m_MatchWidthOrHeight: 0
- m_PhysicalUnit: 3
- m_FallbackScreenDPI: 96
- m_DefaultSpriteDPI: 96
- m_DynamicPixelsPerUnit: 1
- m_PresetInfoIsWorld: 1
---- !u!223 &637352840
-Canvas:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 637352835}
- m_Enabled: 1
- serializedVersion: 3
- m_RenderMode: 2
- m_Camera: {fileID: 1025466342}
- m_PlaneDistance: 0.5
- m_PixelPerfect: 0
- m_ReceivesEvents: 1
- m_OverrideSorting: 0
- m_OverridePixelPerfect: 0
- m_SortingBucketNormalizedSize: 0
- m_VertexColorAlwaysGammaSpace: 0
- m_AdditionalShaderChannelsFlag: 0
- m_UpdateRectTransformForStandalone: 0
- m_SortingLayerID: 0
- m_SortingOrder: 0
- m_TargetDisplay: 0
--- !u!1001 &638620852
PrefabInstance:
m_ObjectHideFlags: 0
@@ -90401,7 +90196,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &1295692143
Transform:
m_ObjectHideFlags: 0
@@ -96566,81 +96361,6 @@ Mesh:
offset: 0
size: 0
path:
---- !u!1 &1414998834
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1414998835}
- - component: {fileID: 1414998837}
- - component: {fileID: 1414998836}
- m_Layer: 5
- m_Name: Background
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1414998835
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1414998834}
- 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: 611091768}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0.25}
- m_AnchorMax: {x: 1, y: 0.75}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1414998836
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1414998834}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
---- !u!222 &1414998837
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1414998834}
- m_CullTransparentMesh: 1
--- !u!1001 &1419701687
PrefabInstance:
m_ObjectHideFlags: 0
@@ -100385,7 +100105,7 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
- m_TransformParent: {fileID: 0}
+ m_TransformParent: {fileID: 360765238}
m_Modifications:
- target: {fileID: 4879809269147637565, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
propertyPath: m_Name
@@ -100393,15 +100113,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
propertyPath: m_LocalPosition.x
- value: 75.001
+ value: -1.6038513
objectReference: {fileID: 0}
- target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
propertyPath: m_LocalPosition.y
- value: 21.02518
+ value: -0.23317719
objectReference: {fileID: 0}
- target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
propertyPath: m_LocalPosition.z
- value: 1064.674
+ value: -1.4415283
objectReference: {fileID: 0}
- target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
propertyPath: m_LocalRotation.w
@@ -109918,6 +109638,7 @@ Transform:
- {fileID: 180415044}
- {fileID: 570555392}
- {fileID: 947795177}
+ - {fileID: 360765238}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!43 &1692208744
@@ -110865,23 +110586,27 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
- m_TransformParent: {fileID: 0}
+ m_TransformParent: {fileID: 360765238}
m_Modifications:
- target: {fileID: 4879809269147637565, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
propertyPath: m_Name
value: Door_Reza
objectReference: {fileID: 0}
+ - target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.025189944
+ objectReference: {fileID: 0}
- target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
propertyPath: m_LocalPosition.x
- value: 75.084
+ value: -1.5208511
objectReference: {fileID: 0}
- target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
propertyPath: m_LocalPosition.y
- value: 21.02518
+ value: -0.23317719
objectReference: {fileID: 0}
- target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
propertyPath: m_LocalPosition.z
- value: 1067.313
+ value: 1.1975098
objectReference: {fileID: 0}
- target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
propertyPath: m_LocalRotation.w
@@ -110889,7 +110614,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
propertyPath: m_LocalRotation.y
@@ -110897,7 +110622,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
propertyPath: m_LocalRotation.z
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -125909,6 +125634,11 @@ Mesh:
offset: 0
size: 0
path:
+--- !u!4 &1903723543 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3}
+ m_PrefabInstance: {fileID: 1708288444}
+ m_PrefabAsset: {fileID: 0}
--- !u!43 &1913327701
Mesh:
m_ObjectHideFlags: 0
@@ -138363,7 +138093,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &2031915432
Transform:
m_ObjectHideFlags: 0
@@ -138377,8 +138107,8 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
+ - {fileID: 442074722}
- {fileID: 1843684145}
- - {fileID: 637352836}
- {fileID: 1295692143}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -151018,7 +150748,4 @@ SceneRoots:
- {fileID: 533820784}
- {fileID: 2057524443}
- {fileID: 745726886}
- - {fileID: 1708288444}
- - {fileID: 1494110193}
- - {fileID: 439826051}
- {fileID: 2031915432}
diff --git a/Game/Assets/Scripts/BedroomTask.cs b/Game/Assets/Scripts/BedroomTask.cs
index 992cdf0..562f1f9 100644
--- a/Game/Assets/Scripts/BedroomTask.cs
+++ b/Game/Assets/Scripts/BedroomTask.cs
@@ -208,7 +208,6 @@ public class BedroomTask : MonoBehaviour
storyPanelUI.SetActive(true);
StartCoroutine(HideMessageAfterSeconds(storyPanelUI, 10f));
}
-
// Function to hide the UI after a delay
private IEnumerator HideMessageAfterSeconds(GameObject uiElement, float delay)
diff --git a/Game/Assets/Scripts/BroomSweeping.cs b/Game/Assets/Scripts/BroomSweeping.cs
index d012d73..c356184 100644
--- a/Game/Assets/Scripts/BroomSweeping.cs
+++ b/Game/Assets/Scripts/BroomSweeping.cs
@@ -1,3 +1,9 @@
+/*
+Author: Reza
+Date: 7/2/25
+Description: Detects dirt and sweeps them up
+*/
+
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
diff --git a/Game/Assets/Scripts/GameManager.cs b/Game/Assets/Scripts/GameManager.cs
index 18625fe..95d7fc8 100644
--- a/Game/Assets/Scripts/GameManager.cs
+++ b/Game/Assets/Scripts/GameManager.cs
@@ -7,6 +7,7 @@ Description: To keep track of tasks, which level the player is at, and game mech
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
+using TMPro;
public class GameManager : MonoBehaviour
{
@@ -20,6 +21,13 @@ public class GameManager : MonoBehaviour
/// singleton pattern: define instance field for accessing the singleton elsewhere
///
public static GameManager Instance;
+
+ ///
+ /// Trackable Task Completions
+ ///
+ private bool bedroomCleaned = false;
+ private bool teethBrushed = false;
+ private bool floorSweeped = false;
///
/// enforces singleton behaviour; sets doesn't destroy on load and checks for multiple instances
@@ -40,14 +48,6 @@ public class GameManager : MonoBehaviour
Destroy(gameObject);
}
}
-
- ///
- /// trackable game tasks (Reza)
- ///
- private bool bedroomCleaned = false;
- private bool teethBrushed = false;
- private bool floorSweeped = false;
-
// Start is called before the first frame update
void Start()
@@ -70,4 +70,5 @@ public class GameManager : MonoBehaviour
{
teethBrushed = true;
}
+
}
diff --git a/Game/Assets/Scripts/MessageTrigger.cs b/Game/Assets/Scripts/MessageTrigger.cs
new file mode 100644
index 0000000..bdc1749
--- /dev/null
+++ b/Game/Assets/Scripts/MessageTrigger.cs
@@ -0,0 +1,49 @@
+/*
+Author: Reza
+Date: 7/2/25
+Description: General script for any message triggering areas
+*/
+
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using TMPro;
+
+public class MessageTrigger : MonoBehaviour
+{
+ // Defines UI references
+ [Header("UI References")]
+ public GameObject storyPanelUI;
+ public TMP_Text storyText;
+
+ [Header("Message Settings")]
+ // Custom message for this trigger
+ [TextArea(3, 5)] public string message;
+
+ // How long the message stays on screen
+ public float displayDuration = 5f;
+
+ // Has message been triggered already or not
+ private bool messageTriggered = false;
+
+ private void OnTriggerEnter(Collider other)
+ {
+ // Shows up only if message has not been triggered and ensures only player triggers it
+ if (!messageTriggered && other.CompareTag("Player"))
+ {
+ storyPanelUI.SetActive(true);
+ storyText.text = message;
+ StartCoroutine(HideMessageAfterSeconds(displayDuration));
+
+ // Prevents message triggering again
+ messageTriggered = true;
+ }
+ }
+
+ private IEnumerator HideMessageAfterSeconds(float delay)
+ {
+ // Waits for delay to end and hides the UI
+ yield return new WaitForSeconds(delay);
+ storyPanelUI.SetActive(false);
+ }
+}
diff --git a/Game/Assets/Scripts/MessageTrigger.cs.meta b/Game/Assets/Scripts/MessageTrigger.cs.meta
new file mode 100644
index 0000000..4e963dd
--- /dev/null
+++ b/Game/Assets/Scripts/MessageTrigger.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0dd9f95621cce5d4389410717683d6be
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Game/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/Game/ProjectSettings/Packages/com.unity.probuilder/Settings.json
index 2cc78c8..6b486ad 100644
--- a/Game/ProjectSettings/Packages/com.unity.probuilder/Settings.json
+++ b/Game/ProjectSettings/Packages/com.unity.probuilder/Settings.json
@@ -146,6 +146,11 @@
"key": "log.path",
"value": "{\"m_Value\":\"ProBuilderLog.txt\"}"
},
+ {
+ "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+ "key": "VertexColorPalette.previousColorPalette",
+ "value": "{\"m_Value\":\"Assets/ProBuilder Data/Default Color Palette.asset\"}"
+ },
{
"type": "System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "ShapeBuilder.ActiveShapeIndex",