diff --git a/blender/Models/Squirrel Base Color.png b/blender/Models/Squirrel Base Color.png new file mode 100644 index 0000000..4f05a26 --- /dev/null +++ b/blender/Models/Squirrel Base Color.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31e91f9fc4d8e168e3c0a7835cad34521968959f8477a005f43fd24ef37ddc39 +size 36908 diff --git a/blender/Models/Squirrel.blend b/blender/Models/Squirrel.blend new file mode 100644 index 0000000..5e8ee06 --- /dev/null +++ b/blender/Models/Squirrel.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07a55c0d197847298cf8902ab5c7a8e34104131980c316715015be8779840180 +size 776122 diff --git a/blender/Models/Squirrel.fbx b/blender/Models/Squirrel.fbx new file mode 100644 index 0000000..aba839e --- /dev/null +++ b/blender/Models/Squirrel.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8bd7dae0050c01130d0a07d50fc5d006292182f8ca64c4c6b034d98cf54825d +size 175212 diff --git a/blueberryPeak/Assets/Prefabs/Stick.prefab b/blueberryPeak/Assets/Prefabs/Stick.prefab new file mode 100644 index 0000000..aef648a --- /dev/null +++ b/blueberryPeak/Assets/Prefabs/Stick.prefab @@ -0,0 +1,116 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1735147224235397921 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2194414921720918247} + m_Layer: 0 + m_Name: Stick + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2194414921720918247 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1735147224235397921} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 9.569107, y: 0.5700012, z: -2.4602785} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2814733181455701747} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &2343360094618611992 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2194414921720918247} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalScale.x + value: 3.93 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalScale.y + value: 63.8454 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalScale.z + value: 3.9300003 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: bc894c0fbd1ce4f98b88e2907faf8b02, type: 2} + - target: {fileID: 919132149155446097, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_Name + value: Model + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} +--- !u!4 &2814733181455701747 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + m_PrefabInstance: {fileID: 2343360094618611992} + m_PrefabAsset: {fileID: 0} diff --git a/blueberryPeak/Assets/Prefabs/Stick.prefab.meta b/blueberryPeak/Assets/Prefabs/Stick.prefab.meta new file mode 100644 index 0000000..2cb7e40 --- /dev/null +++ b/blueberryPeak/Assets/Prefabs/Stick.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a18767e7dba904ad48463d5962ebab56 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Prefabs/game/SceneSwitcher.prefab b/blueberryPeak/Assets/Prefabs/game/SceneSwitcher.prefab index b0ad882..fcb35ce 100644 --- a/blueberryPeak/Assets/Prefabs/game/SceneSwitcher.prefab +++ b/blueberryPeak/Assets/Prefabs/game/SceneSwitcher.prefab @@ -32,7 +32,8 @@ Transform: m_LocalPosition: {x: 16.3, y: 0.9, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 5520807787140062782} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5762019935787128362 @@ -50,7 +51,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2264011724657500812} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -121,4 +122,71 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b0d37cd57e83a8946b89c6d8daf07b7f, type: 3} m_Name: m_EditorClassIdentifier: - switchToScene: flo_s_scene + switchToScene: Market +--- !u!1001 &6284028772717831202 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1745689670249651042} + m_Modifications: + - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4134798691638650340, guid: d0370f51c6ba845828372ca749564589, type: 3} + propertyPath: m_Size.y + value: 6.11 + objectReference: {fileID: 0} + - target: {fileID: 6251478765960268385, guid: d0370f51c6ba845828372ca749564589, type: 3} + propertyPath: m_Name + value: Path + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 4134798691638650340, guid: d0370f51c6ba845828372ca749564589, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d0370f51c6ba845828372ca749564589, type: 3} +--- !u!4 &5520807787140062782 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3} + m_PrefabInstance: {fileID: 6284028772717831202} + m_PrefabAsset: {fileID: 0} diff --git a/blueberryPeak/Assets/Scenes/Beach.unity b/blueberryPeak/Assets/Scenes/Beach.unity index badcc95..e2b33a0 100644 --- a/blueberryPeak/Assets/Scenes/Beach.unity +++ b/blueberryPeak/Assets/Scenes/Beach.unity @@ -3975,73 +3975,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3} m_PrefabInstance: {fileID: 670741753} m_PrefabAsset: {fileID: 0} ---- !u!1001 &675381403 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1530957963} - m_Modifications: - - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4134798691638650340, guid: d0370f51c6ba845828372ca749564589, type: 3} - propertyPath: m_Size.y - value: 6.11 - objectReference: {fileID: 0} - - target: {fileID: 6251478765960268385, guid: d0370f51c6ba845828372ca749564589, type: 3} - propertyPath: m_Name - value: Path - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 4134798691638650340, guid: d0370f51c6ba845828372ca749564589, type: 3} - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d0370f51c6ba845828372ca749564589, type: 3} ---- !u!4 &675381404 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3} - m_PrefabInstance: {fileID: 675381403} - m_PrefabAsset: {fileID: 0} --- !u!1001 &689541243 PrefabInstance: m_ObjectHideFlags: 0 @@ -8352,29 +8285,17 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2620713896011995392, guid: 157ff23549611354485c3446833dc2bf, type: 3} propertyPath: m_Size.y - value: 3.87 + value: 5 objectReference: {fileID: 0} - - target: {fileID: 3629119434639352391, guid: 157ff23549611354485c3446833dc2bf, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7419702660099155392, guid: 157ff23549611354485c3446833dc2bf, type: 3} - propertyPath: switchToScene - value: Market + - target: {fileID: 2620713896011995392, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_Size.z + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} - insertIndex: -1 - addedObject: {fileID: 675381404} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 157ff23549611354485c3446833dc2bf, type: 3} ---- !u!4 &1530957963 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} - m_PrefabInstance: {fileID: 1530957962} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1536064767 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/blueberryPeak/Assets/Scenes/Forest.unity b/blueberryPeak/Assets/Scenes/Forest.unity index eda8af5..890b333 100644 --- a/blueberryPeak/Assets/Scenes/Forest.unity +++ b/blueberryPeak/Assets/Scenes/Forest.unity @@ -2116,6 +2116,75 @@ Transform: m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} m_PrefabInstance: {fileID: 684707837} m_PrefabAsset: {fileID: 0} +--- !u!1001 &691592292 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalScale.z + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalPosition.x + value: 24.52 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalPosition.y + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalPosition.z + value: -0.04 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2264011724657500812, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_Name + value: SceneSwitcher + objectReference: {fileID: 0} + - target: {fileID: 2620713896011995392, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_Size.y + value: 7.89 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 157ff23549611354485c3446833dc2bf, type: 3} --- !u!1001 &697533470 PrefabInstance: m_ObjectHideFlags: 0 @@ -6412,7 +6481,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} propertyPath: m_LocalPosition.x - value: 23.15 + value: 21.3 objectReference: {fileID: 0} - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} propertyPath: m_LocalPosition.y @@ -7753,3 +7822,4 @@ SceneRoots: - {fileID: 1255997130} - {fileID: 1772744957} - {fileID: 335597220} + - {fileID: 691592292} diff --git a/blueberryPeak/Assets/Scenes/Garden.unity b/blueberryPeak/Assets/Scenes/Garden.unity index 92b9e0c..01b6135 100644 --- a/blueberryPeak/Assets/Scenes/Garden.unity +++ b/blueberryPeak/Assets/Scenes/Garden.unity @@ -7385,6 +7385,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} +--- !u!4 &109876466 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8538518650932330681, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} + m_PrefabInstance: {fileID: 109876465} + m_PrefabAsset: {fileID: 0} --- !u!1001 &110163595 PrefabInstance: m_ObjectHideFlags: 0 @@ -71068,6 +71073,67 @@ Transform: m_CorrespondingSourceObject: {fileID: 2753717890117520180, guid: 9258e009dc43248ecade10786ec23385, type: 3} m_PrefabInstance: {fileID: 1297855720} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1301368587 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} + propertyPath: m_LocalPosition.x + value: 10.15 + objectReference: {fileID: 0} + - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} + propertyPath: m_LocalPosition.y + value: 1.48 + objectReference: {fileID: 0} + - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} + propertyPath: m_LocalPosition.z + value: -2.8 + objectReference: {fileID: 0} + - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} + propertyPath: cameraTransform + value: + objectReference: {fileID: 109876466} + - target: {fileID: 7563270112099016041, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} + propertyPath: m_Name + value: Fox + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} --- !u!1001 &1301551071 PrefabInstance: m_ObjectHideFlags: 0 @@ -120740,63 +120806,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 6951157000161419228, guid: 27dab0d35dec74c019e40f6fac96264d, type: 3} m_PrefabInstance: {fileID: 2146998433} m_PrefabAsset: {fileID: 0} ---- !u!1001 &7443379002385320554 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3175039246732224973, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} - propertyPath: m_Name - value: Stick - objectReference: {fileID: 0} - - target: {fileID: 8584199766321833120, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} - propertyPath: m_LocalPosition.x - value: 9.569107 - objectReference: {fileID: 0} - - target: {fileID: 8584199766321833120, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} - propertyPath: m_LocalPosition.y - value: 0.5700012 - objectReference: {fileID: 0} - - target: {fileID: 8584199766321833120, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} - propertyPath: m_LocalPosition.z - value: -2.4602785 - objectReference: {fileID: 0} - - target: {fileID: 8584199766321833120, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8584199766321833120, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8584199766321833120, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8584199766321833120, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8584199766321833120, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8584199766321833120, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8584199766321833120, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -120807,4 +120816,4 @@ SceneRoots: - {fileID: 1420526773} - {fileID: 1744853879} - {fileID: 109876465} - - {fileID: 7443379002385320554} + - {fileID: 1301368587} diff --git a/blueberryPeak/Assets/Scenes/Market.unity b/blueberryPeak/Assets/Scenes/Market.unity index ad1dc64..14d4cf6 100644 --- a/blueberryPeak/Assets/Scenes/Market.unity +++ b/blueberryPeak/Assets/Scenes/Market.unity @@ -1776,6 +1776,79 @@ Transform: m_CorrespondingSourceObject: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} m_PrefabInstance: {fileID: 893033526} m_PrefabAsset: {fileID: 0} +--- !u!1001 &816337134 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalScale.z + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalPosition.x + value: 14.51 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalPosition.y + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalPosition.z + value: -0.04 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2264011724657500812, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_Name + value: SceneSwitcher + objectReference: {fileID: 0} + - target: {fileID: 2620713896011995392, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_Size.y + value: 7.89 + objectReference: {fileID: 0} + - target: {fileID: 7419702660099155392, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: switchToScene + value: Beach + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 157ff23549611354485c3446833dc2bf, type: 3} --- !u!1001 &837716097 PrefabInstance: m_ObjectHideFlags: 0 @@ -2934,6 +3007,79 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} +--- !u!1001 &1250080611 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalScale.z + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalPosition.x + value: -14.54 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalPosition.y + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalPosition.z + value: -0.04 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2264011724657500812, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_Name + value: SceneSwitcher (1) + objectReference: {fileID: 0} + - target: {fileID: 2620713896011995392, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_Size.y + value: 7.89 + objectReference: {fileID: 0} + - target: {fileID: 7419702660099155392, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: switchToScene + value: Forest + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 157ff23549611354485c3446833dc2bf, type: 3} --- !u!4 &1271999374 stripped Transform: m_CorrespondingSourceObject: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} @@ -5298,7 +5444,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3360928438094827899, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} propertyPath: m_LocalPosition.x - value: -7.69 + value: -6.83 objectReference: {fileID: 0} - target: {fileID: 3360928438094827899, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} propertyPath: m_LocalPosition.y @@ -5306,7 +5452,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3360928438094827899, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} propertyPath: m_LocalPosition.z - value: -9.02 + value: -8.92 objectReference: {fileID: 0} - target: {fileID: 3360928438094827899, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} propertyPath: m_LocalRotation.w @@ -5355,7 +5501,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4452929253159274350, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} propertyPath: m_LocalPosition.y - value: 1.25 + value: 1.16 objectReference: {fileID: 0} - target: {fileID: 4452929253159274350, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} propertyPath: m_LocalPosition.z @@ -5497,15 +5643,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} propertyPath: m_LocalPosition.x - value: 1.02 + value: -1.96 objectReference: {fileID: 0} - target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} propertyPath: m_LocalPosition.y - value: 5.98 + value: 1.16 objectReference: {fileID: 0} - target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} propertyPath: m_LocalPosition.z - value: -8.95 + value: -9.07 objectReference: {fileID: 0} - target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} propertyPath: m_LocalRotation.w @@ -5559,3 +5705,5 @@ SceneRoots: - {fileID: 1558625457} - {fileID: 257359672} - {fileID: 677342064} + - {fileID: 816337134} + - {fileID: 1250080611} diff --git a/blueberryPeak/Assets/Scripts/SceneSwitcher.cs b/blueberryPeak/Assets/Scripts/SceneSwitcher.cs index a2e5474..c9f4a4a 100644 --- a/blueberryPeak/Assets/Scripts/SceneSwitcher.cs +++ b/blueberryPeak/Assets/Scripts/SceneSwitcher.cs @@ -14,8 +14,10 @@ public class SceneSwitcher : MonoBehaviour void OnTriggerEnter(Collider other) { - // switch to scene - SceneManager.LoadScene(switchToScene); - Debug.Log($"Switched to scene: {switchToScene}"); + if (other.CompareTag("Player")) + { + SceneManager.LoadScene(switchToScene); + Debug.Log($"Switched to scene: {switchToScene}"); + } } } \ No newline at end of file