diff --git a/Assets/LowPolyDungeonsLite/Materials/LowPolyDungeonsLite_BG.mat b/Assets/LowPolyDungeonsLite/Materials/LowPolyDungeonsLite_BG.mat index 5ac3ee99b0a71f3c1eaddc1863e24ed01e93dea8..d4e5f4569889381f91f74ec7313ae2c6c7f8bb6e 100644 --- a/Assets/LowPolyDungeonsLite/Materials/LowPolyDungeonsLite_BG.mat +++ b/Assets/LowPolyDungeonsLite/Materials/LowPolyDungeonsLite_BG.mat @@ -15,14 +15,16 @@ MonoBehaviour: version: 4 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: LowPolyDungeonsLite_BG m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _GLOSSYREFLECTIONS_OFF + m_ValidKeywords: + - _GLOSSYREFLECTIONS_OFF + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -174,6 +176,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 diff --git a/Assets/Plugins/NaturePackLite/Materials/Nature_Texture_01.mat b/Assets/Plugins/NaturePackLite/Materials/Nature_Texture_01.mat index 62f163389b1644eee5e0df9db2fc811ad3f3bc42..c0d8fe0416fa32bfb641cb184b2780ec08ebdca0 100644 --- a/Assets/Plugins/NaturePackLite/Materials/Nature_Texture_01.mat +++ b/Assets/Plugins/NaturePackLite/Materials/Nature_Texture_01.mat @@ -2,14 +2,15 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Nature_Texture_01 m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -55,6 +56,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 @@ -75,3 +77,4 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Scenes/Worlds/MountainWorld.unity b/Assets/Scenes/Worlds/MountainWorld.unity index b22f19e75d01d59a74718af1faa58c86b64dd73b..3a5cd5c43dd6597c4e1d31277a77aaa45343b2b2 100644 --- a/Assets/Scenes/Worlds/MountainWorld.unity +++ b/Assets/Scenes/Worlds/MountainWorld.unity @@ -921,7 +921,6 @@ Transform: - {fileID: 1910182005} - {fileID: 51088444} - {fileID: 1179747911} - - {fileID: 2132214224} - {fileID: 762887268} - {fileID: 1550593821} - {fileID: 647185238} @@ -939,39 +938,6 @@ Transform: - {fileID: 540901408} - {fileID: 412161856} - {fileID: 741669492} - - {fileID: 626676254} - - {fileID: 278200358} - - {fileID: 1461481895} - - {fileID: 1362828174} - - {fileID: 1621801492} - - {fileID: 1126211019} - - {fileID: 2070919635} - - {fileID: 1900547350} - - {fileID: 1180479161} - - {fileID: 751994029} - - {fileID: 987111287} - - {fileID: 920660072} - - {fileID: 536781649} - - {fileID: 568782498} - - {fileID: 686070740} - - {fileID: 1242326909} - - {fileID: 1775959956} - - {fileID: 1008120749} - - {fileID: 1421264795} - - {fileID: 74768422} - - {fileID: 634264301} - - {fileID: 184309394} - - {fileID: 37373202} - - {fileID: 527945099} - - {fileID: 2065338604} - - {fileID: 950406430} - - {fileID: 1955412928} - - {fileID: 2064900955} - - {fileID: 748429164} - - {fileID: 375598691} - - {fileID: 571483764} - - {fileID: 362556664} - - {fileID: 313855521} - {fileID: 1126099770} - {fileID: 742815133} - {fileID: 1746507339} @@ -1268,7 +1234,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 6630375654688184054, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -1278,7 +1244,7 @@ PrefabInstance: - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_RootOrder - value: 109 + value: 20 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -1288,17 +1254,17 @@ PrefabInstance: - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.x - value: -93.68194 + value: 1.1611481 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.y - value: 8.884423 + value: 0.8818388 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.z - value: -5.7464585 + value: 6.076471 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -1484,27 +1450,27 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 1051380005} m_Modifications: - target: {fileID: 3726740952248020482, guid: 5fbfbee0f9885764383291c4c5e18668, type: 3} propertyPath: m_RootOrder - value: 88 + value: 28 objectReference: {fileID: 0} - target: {fileID: 3726740952248020482, guid: 5fbfbee0f9885764383291c4c5e18668, type: 3} propertyPath: m_LocalPosition.x - value: -66.70842 + value: 28.134666 objectReference: {fileID: 0} - target: {fileID: 3726740952248020482, guid: 5fbfbee0f9885764383291c4c5e18668, type: 3} propertyPath: m_LocalPosition.y - value: 7.0484114 + value: -0.9541731 objectReference: {fileID: 0} - target: {fileID: 3726740952248020482, guid: 5fbfbee0f9885764383291c4c5e18668, type: 3} propertyPath: m_LocalPosition.z - value: 11.098649 + value: 22.921577 objectReference: {fileID: 0} - target: {fileID: 3726740952248020482, guid: 5fbfbee0f9885764383291c4c5e18668, type: 3} @@ -1908,7 +1874,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 160 + value: 158 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -2062,27 +2028,27 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} propertyPath: m_RootOrder - value: 118 + value: 28 objectReference: {fileID: 0} - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} propertyPath: m_LocalPosition.x - value: -92.59 + value: 2.25309 objectReference: {fileID: 0} - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} propertyPath: m_LocalPosition.y - value: 8 + value: -0.0025844574 objectReference: {fileID: 0} - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} propertyPath: m_LocalPosition.z - value: -8.65 + value: 3.1729298 objectReference: {fileID: 0} - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} @@ -2892,7 +2858,7 @@ PrefabInstance: - target: {fileID: 3726740952248020482, guid: 5fbfbee0f9885764383291c4c5e18668, type: 3} propertyPath: m_RootOrder - value: 81 + value: 80 objectReference: {fileID: 0} - target: {fileID: 3726740952248020482, guid: 5fbfbee0f9885764383291c4c5e18668, type: 3} @@ -3140,7 +3106,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 374151818356740834, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -3150,22 +3116,22 @@ PrefabInstance: - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_RootOrder - value: 99 + value: 10 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.x - value: -90.66937 + value: 4.1737137 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.y - value: 8.891012 + value: 0.88842773 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.z - value: -10.063072 + value: 1.7598572 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -3386,7 +3352,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 4f49a178802889240940614840a8758e, type: 3} propertyPath: m_RootOrder - value: 28 + value: 27 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 4f49a178802889240940614840a8758e, type: 3} propertyPath: m_LocalPosition.x @@ -4339,7 +4305,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 159 + value: 157 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -4601,7 +4567,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 168 + value: 166 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -4845,7 +4811,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 374151818356740834, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -4855,22 +4821,22 @@ PrefabInstance: - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_RootOrder - value: 91 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.x - value: -90.229996 + value: 4.6130905 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.y - value: 8.886293 + value: 0.88370895 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.z - value: -10.504633 + value: 1.3182964 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -6046,27 +6012,27 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} propertyPath: m_RootOrder - value: 98 + value: 9 objectReference: {fileID: 0} - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} propertyPath: m_LocalPosition.x - value: -90.35272 + value: 4.490364 objectReference: {fileID: 0} - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} propertyPath: m_LocalPosition.y - value: 8 + value: -0.0025844574 objectReference: {fileID: 0} - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} propertyPath: m_LocalPosition.z - value: -10.249271 + value: 1.573658 objectReference: {fileID: 0} - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} @@ -6217,7 +6183,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 131 + value: 129 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -6706,7 +6672,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 374151818356740834, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -6716,22 +6682,22 @@ PrefabInstance: - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_RootOrder - value: 94 + value: 5 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.x - value: -90.07208 + value: 4.7710037 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.y - value: 8.876783 + value: 0.8741989 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.z - value: -1.5899885 + value: 10.232941 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -6785,7 +6751,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 146 + value: 144 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -7442,7 +7408,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 143 + value: 141 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -8868,7 +8834,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 374151818356740834, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -8878,22 +8844,22 @@ PrefabInstance: - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_RootOrder - value: 105 + value: 16 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.x - value: -93.20654 + value: 1.6365433 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.y - value: 8.89101 + value: 0.8884258 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.z - value: -8.581004 + value: 3.2419252 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -9812,7 +9778,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 147 + value: 145 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -9904,7 +9870,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 6630375654688184054, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -9914,7 +9880,7 @@ PrefabInstance: - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_RootOrder - value: 90 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -9934,17 +9900,17 @@ PrefabInstance: - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.x - value: -93.13086 + value: 1.7122269 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.y - value: 8 + value: -0.0025844574 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.z - value: -4.61 + value: 7.2129292 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -10095,7 +10061,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 123 + value: 121 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -10795,7 +10761,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 127 + value: 125 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -11548,7 +11514,7 @@ PrefabInstance: - target: {fileID: 8182354677883374721, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 940 objectReference: {fileID: 0} - target: {fileID: 8182354677883374721, guid: b07552db700124a4680401e6fb94c186, type: 3} @@ -12183,7 +12149,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 136 + value: 134 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -12769,6 +12735,52 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2138290628} m_PrefabAsset: {fileID: 0} +--- !u!1 &403256634 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 403256635} + - component: {fileID: 403256636} + m_Layer: 0 + m_Name: SimpleMessageDisply + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &403256635 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 403256634} + 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: 1277500336} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &403256636 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 403256634} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2e5490ec88fed3c4e839b1b471c80a2f, type: 3} + m_Name: + m_EditorClassIdentifier: + messagePanel: {fileID: 447506473} + messageText: {fileID: 936581421} --- !u!1001 &405443521 PrefabInstance: m_ObjectHideFlags: 0 @@ -13051,7 +13063,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 150 + value: 148 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -13137,27 +13149,27 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} propertyPath: m_RootOrder - value: 96 + value: 7 objectReference: {fileID: 0} - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} propertyPath: m_LocalPosition.x - value: -90.08 + value: 4.7630844 objectReference: {fileID: 0} - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} propertyPath: m_LocalPosition.y - value: 8 + value: -0.0025844574 objectReference: {fileID: 0} - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} propertyPath: m_LocalPosition.z - value: -1.52 + value: 10.302929 objectReference: {fileID: 0} - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} @@ -13288,7 +13300,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: f11b361fcc4b45f499732c9b50426d90, type: 3} propertyPath: m_RootOrder - value: 177 + value: 175 objectReference: {fileID: 0} - target: {fileID: 400000, guid: f11b361fcc4b45f499732c9b50426d90, type: 3} propertyPath: m_LocalScale.x @@ -14141,7 +14153,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 907737577407192764, guid: 3c94a574020d3de429d0c295b3a83db4, type: 3} @@ -14151,22 +14163,22 @@ PrefabInstance: - target: {fileID: 6062957040624609817, guid: 3c94a574020d3de429d0c295b3a83db4, type: 3} propertyPath: m_RootOrder - value: 121 + value: 31 objectReference: {fileID: 0} - target: {fileID: 6062957040624609817, guid: 3c94a574020d3de429d0c295b3a83db4, type: 3} propertyPath: m_LocalPosition.x - value: -89.91 + value: 4.9330826 objectReference: {fileID: 0} - target: {fileID: 6062957040624609817, guid: 3c94a574020d3de429d0c295b3a83db4, type: 3} propertyPath: m_LocalPosition.y - value: 7.9997687 + value: -0.0028157234 objectReference: {fileID: 0} - target: {fileID: 6062957040624609817, guid: 3c94a574020d3de429d0c295b3a83db4, type: 3} propertyPath: m_LocalPosition.z - value: -0.36999995 + value: 11.4529295 objectReference: {fileID: 0} - target: {fileID: 6062957040624609817, guid: 3c94a574020d3de429d0c295b3a83db4, type: 3} @@ -14294,6 +14306,83 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6308cb7062fac34e8e50600086b12a1, type: 3} +--- !u!1 &447506473 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 447506476} + - component: {fileID: 447506475} + - component: {fileID: 447506474} + m_Layer: 0 + m_Name: SimpleMessagePanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &447506474 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 447506473} + 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: 0.392} + 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 &447506475 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 447506473} + m_CullTransparentMesh: 1 +--- !u!224 &447506476 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 447506473} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.7135417, y: 0.7135417, z: 0.7135417} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 936581420} + m_Father: {fileID: 0} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 959.9999, y: 463.18243} + m_SizeDelta: {x: 1920, y: 926.3649} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &451269180 PrefabInstance: m_ObjectHideFlags: 0 @@ -14378,7 +14467,7 @@ PrefabInstance: - target: {fileID: 2559810838395413726, guid: e37d55d9adae8724c9dcf1dff5b67578, type: 3} propertyPath: m_RootOrder - value: 86 + value: 85 objectReference: {fileID: 0} - target: {fileID: 2559810838395413726, guid: e37d55d9adae8724c9dcf1dff5b67578, type: 3} @@ -14585,7 +14674,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 164 + value: 162 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -14754,7 +14843,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 6630375654688184054, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -14764,22 +14853,22 @@ PrefabInstance: - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_RootOrder - value: 113 + value: 24 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.x - value: -89.77142 + value: 5.071663 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.y - value: 8.891012 + value: 0.88842773 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.z - value: -10.995597 + value: 0.8273325 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -15088,6 +15177,68 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1008515251} m_PrefabAsset: {fileID: 0} +--- !u!1 &467697707 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 467697708} + m_Layer: 0 + m_Name: Brewing Tables + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &467697708 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 467697707} + 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: 278200358} + - {fileID: 1461481895} + - {fileID: 1362828174} + - {fileID: 1621801492} + - {fileID: 1126211019} + - {fileID: 2070919635} + - {fileID: 1900547350} + - {fileID: 1180479161} + - {fileID: 751994029} + - {fileID: 987111287} + - {fileID: 920660072} + - {fileID: 536781649} + - {fileID: 568782498} + - {fileID: 686070740} + - {fileID: 1242326909} + - {fileID: 1775959956} + - {fileID: 1008120749} + - {fileID: 1421264795} + - {fileID: 74768422} + - {fileID: 634264301} + - {fileID: 184309394} + - {fileID: 37373202} + - {fileID: 527945099} + - {fileID: 2065338604} + - {fileID: 950406430} + - {fileID: 1955412928} + - {fileID: 2064900955} + - {fileID: 748429164} + - {fileID: 375598691} + - {fileID: 362556664} + - {fileID: 313855521} + m_Father: {fileID: 1051380005} + m_RootOrder: 29 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &470667947 PrefabInstance: m_ObjectHideFlags: 0 @@ -15980,7 +16131,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 6630375654688184054, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -15990,22 +16141,22 @@ PrefabInstance: - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_RootOrder - value: 112 + value: 23 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.x - value: -92.65365 + value: 2.1894379 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.y - value: 8.89101 + value: 0.8884258 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.z - value: -8.046995 + value: 3.7759342 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -16415,7 +16566,7 @@ PrefabInstance: - target: {fileID: 3726740952248020482, guid: 5fbfbee0f9885764383291c4c5e18668, type: 3} propertyPath: m_RootOrder - value: 76 + value: 75 objectReference: {fileID: 0} - target: {fileID: 3726740952248020482, guid: 5fbfbee0f9885764383291c4c5e18668, type: 3} @@ -18608,32 +18759,32 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 1277500336} m_Modifications: - target: {fileID: 4957231571477918332, guid: 92d4430c1aabefa4691079bac409cbf9, type: 3} propertyPath: m_Name - value: Book_09 + value: Book objectReference: {fileID: 0} - target: {fileID: 5859313293803644140, guid: 92d4430c1aabefa4691079bac409cbf9, type: 3} propertyPath: m_RootOrder - value: 119 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5859313293803644140, guid: 92d4430c1aabefa4691079bac409cbf9, type: 3} propertyPath: m_LocalPosition.x - value: -93.38 + value: 1.463089 objectReference: {fileID: 0} - target: {fileID: 5859313293803644140, guid: 92d4430c1aabefa4691079bac409cbf9, type: 3} propertyPath: m_LocalPosition.y - value: 8.920037 + value: 0.9174528 objectReference: {fileID: 0} - target: {fileID: 5859313293803644140, guid: 92d4430c1aabefa4691079bac409cbf9, type: 3} propertyPath: m_LocalPosition.z - value: -5.92 + value: 5.9029293 objectReference: {fileID: 0} - target: {fileID: 5859313293803644140, guid: 92d4430c1aabefa4691079bac409cbf9, type: 3} @@ -19357,7 +19508,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: f11b361fcc4b45f499732c9b50426d90, type: 3} propertyPath: m_RootOrder - value: 174 + value: 172 objectReference: {fileID: 0} - target: {fileID: 400000, guid: f11b361fcc4b45f499732c9b50426d90, type: 3} propertyPath: m_LocalScale.x @@ -20426,7 +20577,7 @@ PrefabInstance: - target: {fileID: 8209778948206908569, guid: 5062c1312f2beb14694d90a058d444e4, type: 3} propertyPath: m_RootOrder - value: 80 + value: 79 objectReference: {fileID: 0} - target: {fileID: 8209778948206908569, guid: 5062c1312f2beb14694d90a058d444e4, type: 3} @@ -21231,7 +21382,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 156 + value: 154 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -21715,7 +21866,7 @@ PrefabInstance: - target: {fileID: 7321029070664364311, guid: 44b00c7db33473946ad48053b41e081f, type: 3} propertyPath: m_RootOrder - value: 73 + value: 72 objectReference: {fileID: 0} - target: {fileID: 7321029070664364311, guid: 44b00c7db33473946ad48053b41e081f, type: 3} @@ -22309,7 +22460,7 @@ RectTransform: m_Children: - {fileID: 394947341} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -23827,7 +23978,7 @@ PrefabInstance: - target: {fileID: 8209778948206908569, guid: 5062c1312f2beb14694d90a058d444e4, type: 3} propertyPath: m_RootOrder - value: 122 + value: 120 objectReference: {fileID: 0} - target: {fileID: 8209778948206908569, guid: 5062c1312f2beb14694d90a058d444e4, type: 3} @@ -25161,7 +25312,7 @@ PrefabInstance: - target: {fileID: 3726740952248020482, guid: 5fbfbee0f9885764383291c4c5e18668, type: 3} propertyPath: m_RootOrder - value: 71 + value: 70 objectReference: {fileID: 0} - target: {fileID: 3726740952248020482, guid: 5fbfbee0f9885764383291c4c5e18668, type: 3} @@ -25838,7 +25989,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 6630375654688184054, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -25848,7 +25999,7 @@ PrefabInstance: - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_RootOrder - value: 110 + value: 21 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -25858,17 +26009,17 @@ PrefabInstance: - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.x - value: -93.364586 + value: 1.4785004 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.y - value: 8.891011 + value: 0.8884268 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.z - value: -5.5848727 + value: 6.2380567 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -25992,7 +26143,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 374151818356740834, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -26002,22 +26153,22 @@ PrefabInstance: - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_RootOrder - value: 103 + value: 14 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.x - value: -92.37432 + value: 2.4687653 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.y - value: 8.891012 + value: 0.88842773 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.z - value: -3.8473728 + value: 7.9755564 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -26653,7 +26804,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 374151818356740834, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -26663,22 +26814,22 @@ PrefabInstance: - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_RootOrder - value: 101 + value: 12 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.x - value: -92.506226 + value: 2.3368607 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.y - value: 8.891011 + value: 0.8884268 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.z - value: -8.582001 + value: 3.2409286 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -26898,7 +27049,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 169 + value: 167 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -27095,7 +27246,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 126 + value: 124 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -27497,27 +27648,27 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} propertyPath: m_RootOrder - value: 93 + value: 4 objectReference: {fileID: 0} - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} propertyPath: m_LocalPosition.x - value: -92.568 + value: 2.2750854 objectReference: {fileID: 0} - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} propertyPath: m_LocalPosition.y - value: 8 + value: -0.0025844574 objectReference: {fileID: 0} - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} propertyPath: m_LocalPosition.z - value: -3.3854916 + value: 8.437438 objectReference: {fileID: 0} - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} @@ -27682,7 +27833,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 173 + value: 171 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -28423,32 +28574,32 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 1277500336} m_Modifications: - target: {fileID: 2508803079818082220, guid: 616fdaa7dbff40e4f91c695be15f9f4f, type: 3} propertyPath: m_Name - value: Pot_01 (1) + value: Brewing Pot objectReference: {fileID: 0} - target: {fileID: 5125010707129076267, guid: 616fdaa7dbff40e4f91c695be15f9f4f, type: 3} propertyPath: m_RootOrder - value: 70 + value: 4 objectReference: {fileID: 0} - target: {fileID: 5125010707129076267, guid: 616fdaa7dbff40e4f91c695be15f9f4f, type: 3} propertyPath: m_LocalPosition.x - value: -89.97 + value: 4.873085 objectReference: {fileID: 0} - target: {fileID: 5125010707129076267, guid: 616fdaa7dbff40e4f91c695be15f9f4f, type: 3} propertyPath: m_LocalPosition.y - value: 8.07 + value: 0.06741524 objectReference: {fileID: 0} - target: {fileID: 5125010707129076267, guid: 616fdaa7dbff40e4f91c695be15f9f4f, type: 3} propertyPath: m_LocalPosition.z - value: -5.95 + value: 5.8729296 objectReference: {fileID: 0} - target: {fileID: 5125010707129076267, guid: 616fdaa7dbff40e4f91c695be15f9f4f, type: 3} @@ -28682,7 +28833,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 134 + value: 132 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -29218,7 +29369,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 149 + value: 147 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -29308,7 +29459,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 128 + value: 126 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -29720,6 +29871,86 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5062c1312f2beb14694d90a058d444e4, type: 3} +--- !u!1 &936581419 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 936581420} + - component: {fileID: 936581422} + - component: {fileID: 936581421} + m_Layer: 5 + m_Name: MessageText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &936581420 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 936581419} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.4014596, y: 1.4014596, z: 1.4014596} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 447506476} + m_RootOrder: 0 + 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: -385.40125, y: -185.94904} + m_SizeDelta: {x: 480, y: 320} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &936581421 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 936581419} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: See here +--- !u!222 &936581422 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 936581419} + m_CullTransparentMesh: 1 --- !u!1001 &937462613 PrefabInstance: m_ObjectHideFlags: 0 @@ -30682,7 +30913,7 @@ PrefabInstance: - target: {fileID: 2559810838395413726, guid: e37d55d9adae8724c9dcf1dff5b67578, type: 3} propertyPath: m_RootOrder - value: 84 + value: 83 objectReference: {fileID: 0} - target: {fileID: 2559810838395413726, guid: e37d55d9adae8724c9dcf1dff5b67578, type: 3} @@ -31037,7 +31268,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 170 + value: 168 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -31409,7 +31640,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 141 + value: 139 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -33154,7 +33385,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 6630375654688184054, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -33164,22 +33395,22 @@ PrefabInstance: - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_RootOrder - value: 115 + value: 26 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.x - value: -89.40548 + value: 5.437607 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.y - value: 8.88909 + value: 0.8865051 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.z - value: -1.6425843 + value: 10.180346 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -33604,6 +33835,8 @@ Transform: - {fileID: 373820326} - {fileID: 1521500074} - {fileID: 110593674} + - {fileID: 626676254} + - {fileID: 467697708} m_Father: {fileID: 452910365} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -34516,7 +34749,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 148 + value: 146 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -34769,7 +35002,7 @@ PrefabInstance: - target: {fileID: 8209778948206908569, guid: 5062c1312f2beb14694d90a058d444e4, type: 3} propertyPath: m_RootOrder - value: 85 + value: 84 objectReference: {fileID: 0} - target: {fileID: 8209778948206908569, guid: 5062c1312f2beb14694d90a058d444e4, type: 3} @@ -34844,27 +35077,27 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 2559810838395413726, guid: e37d55d9adae8724c9dcf1dff5b67578, type: 3} propertyPath: m_RootOrder - value: 117 + value: 27 objectReference: {fileID: 0} - target: {fileID: 2559810838395413726, guid: e37d55d9adae8724c9dcf1dff5b67578, type: 3} propertyPath: m_LocalPosition.x - value: -91.608055 + value: 3.2350311 objectReference: {fileID: 0} - target: {fileID: 2559810838395413726, guid: e37d55d9adae8724c9dcf1dff5b67578, type: 3} propertyPath: m_LocalPosition.y - value: 8.45713 + value: 0.45454597 objectReference: {fileID: 0} - target: {fileID: 2559810838395413726, guid: e37d55d9adae8724c9dcf1dff5b67578, type: 3} propertyPath: m_LocalPosition.z - value: -1.5754917 + value: 10.2474375 objectReference: {fileID: 0} - target: {fileID: 2559810838395413726, guid: e37d55d9adae8724c9dcf1dff5b67578, type: 3} @@ -36288,7 +36521,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 129 + value: 127 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -36479,7 +36712,7 @@ PrefabInstance: - target: {fileID: 8209778948206908569, guid: 5062c1312f2beb14694d90a058d444e4, type: 3} propertyPath: m_RootOrder - value: 75 + value: 74 objectReference: {fileID: 0} - target: {fileID: 8209778948206908569, guid: 5062c1312f2beb14694d90a058d444e4, type: 3} @@ -36638,7 +36871,7 @@ PrefabInstance: - target: {fileID: 7321029070664364311, guid: 44b00c7db33473946ad48053b41e081f, type: 3} propertyPath: m_RootOrder - value: 87 + value: 86 objectReference: {fileID: 0} - target: {fileID: 7321029070664364311, guid: 44b00c7db33473946ad48053b41e081f, type: 3} @@ -39125,7 +39358,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 374151818356740834, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -39135,22 +39368,22 @@ PrefabInstance: - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_RootOrder - value: 92 + value: 3 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.x - value: -89.652214 + value: 5.190872 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.y - value: 8.89101 + value: 0.8884258 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.z - value: -10.418861 + value: 1.404068 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -39767,7 +40000,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 133 + value: 131 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -39857,7 +40090,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 138 + value: 136 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -40198,7 +40431,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 6630375654688184054, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -40208,7 +40441,7 @@ PrefabInstance: - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_RootOrder - value: 111 + value: 22 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -40218,17 +40451,17 @@ PrefabInstance: - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.x - value: -93.35402 + value: 1.4890671 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.y - value: 8.891012 + value: 0.88842773 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.z - value: -6.479407 + value: 5.3435225 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -40548,6 +40781,9 @@ Transform: - {fileID: 863312740} - {fileID: 48128439} - {fileID: 1477672327} + - {fileID: 2132214224} + - {fileID: 571483764} + - {fileID: 403256635} m_Father: {fileID: 452910365} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -40825,7 +41061,7 @@ PrefabInstance: - target: {fileID: 3726740952248020482, guid: 5fbfbee0f9885764383291c4c5e18668, type: 3} propertyPath: m_RootOrder - value: 77 + value: 76 objectReference: {fileID: 0} - target: {fileID: 3726740952248020482, guid: 5fbfbee0f9885764383291c4c5e18668, type: 3} @@ -43477,7 +43713,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 125 + value: 123 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -45120,7 +45356,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 139 + value: 137 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -45280,7 +45516,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 6630375654688184054, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -45290,7 +45526,7 @@ PrefabInstance: - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_RootOrder - value: 108 + value: 19 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -45300,17 +45536,17 @@ PrefabInstance: - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.x - value: -93.69492 + value: 1.1481628 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.y - value: 8.886338 + value: 0.8837538 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.z - value: -6.1422515 + value: 5.680678 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -45523,7 +45759,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 374151818356740834, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -45533,22 +45769,22 @@ PrefabInstance: - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_RootOrder - value: 106 + value: 17 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.x - value: -93.1724 + value: 1.6706848 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.y - value: 8.891012 + value: 0.88842773 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.z - value: -5.18312 + value: 6.6398096 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -46304,7 +46540,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 154 + value: 152 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -46774,7 +47010,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 140 + value: 138 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -46938,7 +47174,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 158 + value: 156 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -47123,7 +47359,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 157 + value: 155 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -47283,7 +47519,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 374151818356740834, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -47293,7 +47529,7 @@ PrefabInstance: - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_RootOrder - value: 97 + value: 8 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -47313,17 +47549,17 @@ PrefabInstance: - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.x - value: -92.45276 + value: 2.3903275 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.y - value: 8.89101 + value: 0.8884258 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.z - value: -3.0952656 + value: 8.727664 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -47465,7 +47701,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 374151818356740834, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -47475,22 +47711,22 @@ PrefabInstance: - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_RootOrder - value: 100 + value: 11 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.x - value: -91.87576 + value: 2.9673233 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.y - value: 8.891011 + value: 0.8884268 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.z - value: -9.279989 + value: 2.5429401 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -47777,7 +48013,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 6630375654688184054, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -47787,22 +48023,22 @@ PrefabInstance: - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_RootOrder - value: 107 + value: 18 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.x - value: -93.2593 + value: 1.583786 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.y - value: 8.891011 + value: 0.8884268 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.z - value: -6.3037915 + value: 5.519138 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -47858,27 +48094,27 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} propertyPath: m_RootOrder - value: 120 + value: 30 objectReference: {fileID: 0} - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} propertyPath: m_LocalPosition.x - value: -93.45 + value: 1.3930893 objectReference: {fileID: 0} - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} propertyPath: m_LocalPosition.y - value: 8 + value: -0.0025844574 objectReference: {fileID: 0} - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} propertyPath: m_LocalPosition.z - value: -6 + value: 5.8229294 objectReference: {fileID: 0} - target: {fileID: 568653527279986074, guid: c65426a375c90574a95eaaf4840e9481, type: 3} @@ -47938,7 +48174,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 6630375654688184054, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -47948,22 +48184,22 @@ PrefabInstance: - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_RootOrder - value: 114 + value: 25 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.x - value: -92.49651 + value: 2.3465729 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.y - value: 8.891012 + value: 0.88842773 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} propertyPath: m_LocalPosition.z - value: -2.506146 + value: 9.316784 objectReference: {fileID: 0} - target: {fileID: 6670234744341657123, guid: c79d59d66358e0f45a098f4b8a82f8be, type: 3} @@ -49103,7 +49339,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 374151818356740834, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -49113,22 +49349,22 @@ PrefabInstance: - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_RootOrder - value: 104 + value: 15 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.x - value: -93.346275 + value: 1.4968109 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.y - value: 8.891011 + value: 0.8884268 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.z - value: -3.8301213 + value: 7.9928083 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -49276,7 +49512,7 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 566253249} m_PrefabAsset: {fileID: 0} ---- !u!114 &1541358959 +--- !u!114 &1541358963 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -49285,9 +49521,10 @@ MonoBehaviour: m_GameObject: {fileID: 1541358955} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8013e0c9964f46248a4caeca39b84db7, type: 3} + m_Script: {fileID: 11500000, guid: 6e069b14486bbc94194ac70276198e09, type: 3} m_Name: m_EditorClassIdentifier: + newMaterial: {fileID: 2100000, guid: 2f12fcec4b3dcc0489472b3a9cfa44c1, type: 2} --- !u!1001 &1541414770 PrefabInstance: m_ObjectHideFlags: 0 @@ -49521,7 +49758,7 @@ PrefabInstance: - target: {fileID: 7321029070664364311, guid: 44b00c7db33473946ad48053b41e081f, type: 3} propertyPath: m_RootOrder - value: 72 + value: 71 objectReference: {fileID: 0} - target: {fileID: 7321029070664364311, guid: 44b00c7db33473946ad48053b41e081f, type: 3} @@ -49782,7 +50019,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 153 + value: 151 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -50635,7 +50872,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 142 + value: 140 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -51137,7 +51374,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 172 + value: 170 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -52021,7 +52258,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 145 + value: 143 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -52320,7 +52557,7 @@ PrefabInstance: - target: {fileID: 2559810838395413726, guid: e37d55d9adae8724c9dcf1dff5b67578, type: 3} propertyPath: m_RootOrder - value: 74 + value: 73 objectReference: {fileID: 0} - target: {fileID: 2559810838395413726, guid: e37d55d9adae8724c9dcf1dff5b67578, type: 3} @@ -53255,7 +53492,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 137 + value: 135 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -54176,7 +54413,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 163 + value: 161 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -54361,7 +54598,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 151 + value: 149 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -54487,7 +54724,7 @@ PrefabInstance: - target: {fileID: 8209778948206908569, guid: 5062c1312f2beb14694d90a058d444e4, type: 3} propertyPath: m_RootOrder - value: 79 + value: 78 objectReference: {fileID: 0} - target: {fileID: 8209778948206908569, guid: 5062c1312f2beb14694d90a058d444e4, type: 3} @@ -54567,7 +54804,7 @@ PrefabInstance: - target: {fileID: 7321029070664364311, guid: 44b00c7db33473946ad48053b41e081f, type: 3} propertyPath: m_RootOrder - value: 83 + value: 82 objectReference: {fileID: 0} - target: {fileID: 7321029070664364311, guid: 44b00c7db33473946ad48053b41e081f, type: 3} @@ -55360,7 +55597,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 124 + value: 122 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -55687,7 +55924,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 144 + value: 142 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -56229,7 +56466,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 167 + value: 165 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -58139,7 +58376,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 374151818356740834, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -58149,22 +58386,22 @@ PrefabInstance: - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_RootOrder - value: 95 + value: 6 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.x - value: -92.97447 + value: 1.8686142 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.y - value: 8.891012 + value: 0.88842773 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.z - value: -8.100251 + value: 3.7226782 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -59496,7 +59733,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 166 + value: 164 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -59752,7 +59989,7 @@ PrefabInstance: - target: {fileID: 8209778948206908569, guid: 5062c1312f2beb14694d90a058d444e4, type: 3} propertyPath: m_RootOrder - value: 78 + value: 77 objectReference: {fileID: 0} - target: {fileID: 8209778948206908569, guid: 5062c1312f2beb14694d90a058d444e4, type: 3} @@ -59831,7 +60068,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 162 + value: 160 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -59984,7 +60221,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 155 + value: 153 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -60539,7 +60776,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 165 + value: 163 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -61778,7 +62015,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 161 + value: 159 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -61874,7 +62111,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 132 + value: 130 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -62372,7 +62609,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 171 + value: 169 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -62965,7 +63202,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 175 + value: 173 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -63317,7 +63554,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: f11b361fcc4b45f499732c9b50426d90, type: 3} propertyPath: m_RootOrder - value: 176 + value: 174 objectReference: {fileID: 0} - target: {fileID: 400000, guid: f11b361fcc4b45f499732c9b50426d90, type: 3} propertyPath: m_LocalScale.x @@ -63568,7 +63805,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 135 + value: 133 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -64104,7 +64341,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 152 + value: 150 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -65983,7 +66220,7 @@ PrefabInstance: - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} propertyPath: m_RootOrder - value: 130 + value: 128 objectReference: {fileID: 0} - target: {fileID: 6603488554207994483, guid: 98f5378049f9b5745a77677f581b32b1, type: 3} @@ -67630,7 +67867,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 374151818356740834, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -67640,22 +67877,22 @@ PrefabInstance: - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_RootOrder - value: 102 + value: 13 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.x - value: -90.70074 + value: 4.1423492 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.y - value: 8.887765 + value: 0.8851805 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.z - value: -1.7557547 + value: 10.067175 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -68035,7 +68272,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 24715246} + m_TransformParent: {fileID: 467697708} m_Modifications: - target: {fileID: 374151818356740834, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -68045,7 +68282,7 @@ PrefabInstance: - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_RootOrder - value: 89 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -68065,17 +68302,17 @@ PrefabInstance: - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.x - value: -93.092995 + value: 1.7500916 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.y - value: 8.89101 + value: 0.8884258 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} propertyPath: m_LocalPosition.z - value: -6.842685 + value: 4.980244 objectReference: {fileID: 0} - target: {fileID: 8204406447206829204, guid: 0c837400ef1130c4196d20ee30637d9c, type: 3} @@ -68867,7 +69104,7 @@ PrefabInstance: - target: {fileID: 7321029070664364311, guid: 44b00c7db33473946ad48053b41e081f, type: 3} propertyPath: m_RootOrder - value: 82 + value: 81 objectReference: {fileID: 0} - target: {fileID: 7321029070664364311, guid: 44b00c7db33473946ad48053b41e081f, type: 3} diff --git a/Assets/Scripts/UI/SimpleMessageDisplay.cs b/Assets/Scripts/UI/SimpleMessageDisplay.cs new file mode 100644 index 0000000000000000000000000000000000000000..27a486314bbc57b0341d9114bfcad25cda49ddce --- /dev/null +++ b/Assets/Scripts/UI/SimpleMessageDisplay.cs @@ -0,0 +1,36 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +using System.Text; + +public class SimpleMessageDisplay : MonoBehaviour +{ + public GameObject messagePanel; + public Text messageText; + + void Start() + { + messagePanel.SetActive(false); + } + + void Update() + { + if (messagePanel.activeSelf && Input.GetKeyDown(KeyCode.Escape)) + { + CloseMessage(); + } + } + + public void ShowMessage(string message) + { + messageText.text = message; + messagePanel.SetActive(true); + } + + public void CloseMessage() + { + messagePanel.SetActive(false); + } +} + diff --git a/Assets/Scripts/UI/SimpleMessageDisplay.cs.meta b/Assets/Scripts/UI/SimpleMessageDisplay.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..0484ccf59ff3792517206f10b61c3f3c06aa48e0 --- /dev/null +++ b/Assets/Scripts/UI/SimpleMessageDisplay.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2e5490ec88fed3c4e839b1b471c80a2f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Utility/Prop Interaction/BookGlowAndInteract.cs b/Assets/Scripts/Utility/Prop Interaction/BookGlowAndInteract.cs new file mode 100644 index 0000000000000000000000000000000000000000..59e2c5b2fc7cebab4a84bbce39054b80bca52c30 --- /dev/null +++ b/Assets/Scripts/Utility/Prop Interaction/BookGlowAndInteract.cs @@ -0,0 +1,74 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BookGlowAndInteract : MonoBehaviour +{ + + // Drag and drop your materials in the Inspector + public Material newMaterial; + + private Renderer objectRenderer; + private Material originalMaterial; + + private int counter; + private bool clicked; + private bool active; + private SimpleMessageDisplay messageDisplay; + private BrewingPotInteract brewingPot; + + void Start() + { + objectRenderer = GetComponent<Renderer>(); + originalMaterial = objectRenderer.material; + counter = 0; + active = false; + clicked = false; + + messageDisplay = FindObjectOfType<SimpleMessageDisplay>(); + brewingPot = FindObjectOfType<BrewingPotInteract>(); + if (messageDisplay == null) + { + Debug.LogError("No SimpleMessageDisplay found!"); + } + if (brewingPot == null) + { + Debug.LogError("No Brewing Pot found!"); + } + } + + void Update() + { + if(counter > 120 && !clicked) { + if(active){ + objectRenderer.material = originalMaterial; + } else { + objectRenderer.material = newMaterial; + } + active = !active; + counter = 0; + } else { + counter++; + } + + // Check for mouse button click + if (Input.GetMouseButtonDown(0)) + { + // Perform a raycast + Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); + RaycastHit hit; + + if (Physics.Raycast(ray, out hit)) + { + // Check if the clicked object is this object + if (hit.transform == transform) + { + clicked = true; + objectRenderer.material = originalMaterial; + messageDisplay.ShowMessage("Hallllooooo\n \n \n Close with ESC"); + Debug.LogError("Hit registered Where text???!"); + } + } + } + } +} diff --git a/Assets/Scripts/Utility/Prop Interaction/ChangeMaterialOnClick.cs.meta b/Assets/Scripts/Utility/Prop Interaction/BookGlowAndInteract.cs.meta similarity index 100% rename from Assets/Scripts/Utility/Prop Interaction/ChangeMaterialOnClick.cs.meta rename to Assets/Scripts/Utility/Prop Interaction/BookGlowAndInteract.cs.meta diff --git a/Assets/Scripts/Utility/Prop Interaction/BrewingPotInteract.cs b/Assets/Scripts/Utility/Prop Interaction/BrewingPotInteract.cs index c78539e6f5074dc30f79cc82331dd024689d037f..82bd54d34525050a06def484ed7095b473594c5a 100644 --- a/Assets/Scripts/Utility/Prop Interaction/BrewingPotInteract.cs +++ b/Assets/Scripts/Utility/Prop Interaction/BrewingPotInteract.cs @@ -15,6 +15,7 @@ public class BrewingPotInteract : MonoBehaviour private int counter = 0; private Renderer objectRenderer; private bool finished = false; + private string lgs; // Start is called before the first frame update void Start() @@ -51,4 +52,8 @@ void OnMouseDown() Debug.LogError("ClickTracker: Instance is null"); } } + + public string getLGS(){ + return lgs; + } } diff --git a/Assets/Scripts/Utility/Prop Interaction/ChangeMaterialOnClick.cs b/Assets/Scripts/Utility/Prop Interaction/ChangeMaterialOnClick.cs deleted file mode 100644 index 791d0ae492829045d839911b1227a2f44c38d479..0000000000000000000000000000000000000000 --- a/Assets/Scripts/Utility/Prop Interaction/ChangeMaterialOnClick.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ChangeOnClick : MonoBehaviour -{ - -// Drag and drop your materials in the Inspector - public Material newMaterial; - - private Renderer objectRenderer; - private Material originalMaterial; - - void Start() - { - objectRenderer = GetComponent<Renderer>(); - originalMaterial = objectRenderer.material; - } - - void Update() - { - // Check for mouse button click - if (Input.GetMouseButtonDown(0)) - { - // Perform a raycast - Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); - RaycastHit hit; - - if (Physics.Raycast(ray, out hit)) - { - // Check if the clicked object is this object - if (hit.transform == transform) - { - // Change the material - if (objectRenderer.material == originalMaterial) - { - objectRenderer.material = newMaterial; - } - else - { - objectRenderer.material = originalMaterial; - } - } - } - } - } -}