From 897701835330764f027d889e78d3878852dd5088 Mon Sep 17 00:00:00 2001 From: Xaver Date: Tue, 17 Jun 2025 17:44:17 +0200 Subject: [PATCH] inviswalls and colliders --- .../Assets/Prefabs/Forest/SplitLog.prefab | 22 + .../Trees/normal/Christmas_Tree_Dark.prefab | 24 + .../Trees/normal/Christmas_Tree_Light.prefab | 24 + .../normal/Christmas_Tree_MidDark_New.prefab | 24 + .../Prefabs/Trees/normal/Pine_Tree.prefab | 33 +- .../Trees/snow/Christmas_Tree_Dark.prefab | 24 + .../Trees/snow/Christmas_Tree_Light.prefab | 24 + .../snow/Christmas_Tree_MidDark_New.prefab | 24 + .../Prefabs/Trees/snow/Pine_Tree.prefab | 33 +- .../Assets/Prefabs/game/CameraHolder.prefab | 221 ++- blueberryPeak/Assets/Scenes/Beach.unity | 359 +++++ blueberryPeak/Assets/Scenes/Forest.unity | 929 ++++++++++++- blueberryPeak/Assets/Scenes/Market.unity | 1197 ++++++++++++++++- blueberryPeak/Assets/Scenes/Peak.unity | 468 +++++++ blueberryPeak/Assets/Scripts/DialogManager.cs | 3 + .../Assets/Scripts/PlayerInteraction.cs | 3 +- .../Assets/Scripts/PlayerMovement.cs | 9 +- .../Quests/DialogFiles/LunaBeaver.json | 122 ++ ...stQuest.json.meta => LunaBeaver.json.meta} | 2 +- .../Scripts/Quests/DialogFiles/LunaBird.json | 298 ++++ .../Quests/DialogFiles/LunaBird.json.meta | 7 + .../Scripts/Quests/DialogFiles/LunaFish.json | 94 ++ .../Quests/DialogFiles/LunaFish.json.meta | 7 + .../Quests/DialogFiles/LunaSquirrel.json | 106 ++ .../Quests/DialogFiles/LunaSquirrel.json.meta | 7 + .../Scripts/Quests/DialogFiles/TestQuest.json | 42 - .../Assets/Scripts/Quests/QuestGiver.cs | 2 +- 27 files changed, 3942 insertions(+), 166 deletions(-) create mode 100644 blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBeaver.json rename blueberryPeak/Assets/Scripts/Quests/DialogFiles/{TestQuest.json.meta => LunaBeaver.json.meta} (75%) create mode 100644 blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBird.json create mode 100644 blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBird.json.meta create mode 100644 blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaFish.json create mode 100644 blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaFish.json.meta create mode 100644 blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaSquirrel.json create mode 100644 blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaSquirrel.json.meta delete mode 100644 blueberryPeak/Assets/Scripts/Quests/DialogFiles/TestQuest.json diff --git a/blueberryPeak/Assets/Prefabs/Forest/SplitLog.prefab b/blueberryPeak/Assets/Prefabs/Forest/SplitLog.prefab index fbead96..bbb0204 100644 --- a/blueberryPeak/Assets/Prefabs/Forest/SplitLog.prefab +++ b/blueberryPeak/Assets/Prefabs/Forest/SplitLog.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7274217447149220641} + - component: {fileID: 2562352019218800988} m_Layer: 0 m_Name: SplitLog m_TagString: Untagged @@ -32,6 +33,27 @@ Transform: - {fileID: 356283655953051202} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!65 &2562352019218800988 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2528860896519804872} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 2.6555903} + m_Center: {x: 3.3833672e-17, y: 0, z: -0.060119152} --- !u!1001 &250934278415092137 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/blueberryPeak/Assets/Prefabs/Trees/normal/Christmas_Tree_Dark.prefab b/blueberryPeak/Assets/Prefabs/Trees/normal/Christmas_Tree_Dark.prefab index e52194f..c43b275 100644 --- a/blueberryPeak/Assets/Prefabs/Trees/normal/Christmas_Tree_Dark.prefab +++ b/blueberryPeak/Assets/Prefabs/Trees/normal/Christmas_Tree_Dark.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 9177461735404041097} - component: {fileID: 5256614767206890540} - component: {fileID: 8005086826645719270} + - component: {fileID: 6133019214620861465} m_Layer: 0 m_Name: Christmas_Tree_Dark m_TagString: Untagged @@ -86,3 +87,26 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!136 &6133019214620861465 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8365212550460025139} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.17436019 + m_Height: 3 + m_Direction: 1 + m_Center: {x: 0.034239173, y: 1.5, z: -0.012282416} diff --git a/blueberryPeak/Assets/Prefabs/Trees/normal/Christmas_Tree_Light.prefab b/blueberryPeak/Assets/Prefabs/Trees/normal/Christmas_Tree_Light.prefab index af48596..cdded06 100644 --- a/blueberryPeak/Assets/Prefabs/Trees/normal/Christmas_Tree_Light.prefab +++ b/blueberryPeak/Assets/Prefabs/Trees/normal/Christmas_Tree_Light.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 9014401998805048963} - component: {fileID: 5383575405449416998} - component: {fileID: 7877563238077392364} + - component: {fileID: 7317910927069402356} m_Layer: 0 m_Name: Christmas_Tree_Light m_TagString: Untagged @@ -86,3 +87,26 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!136 &7317910927069402356 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8525954521814844473} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.15878439 + m_Height: 3 + m_Direction: 1 + m_Center: {x: 0.008954525, y: 1.5, z: -0.034225464} diff --git a/blueberryPeak/Assets/Prefabs/Trees/normal/Christmas_Tree_MidDark_New.prefab b/blueberryPeak/Assets/Prefabs/Trees/normal/Christmas_Tree_MidDark_New.prefab index cc87f26..43851e4 100644 --- a/blueberryPeak/Assets/Prefabs/Trees/normal/Christmas_Tree_MidDark_New.prefab +++ b/blueberryPeak/Assets/Prefabs/Trees/normal/Christmas_Tree_MidDark_New.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 188868778669148300} - component: {fileID: 3832885104988096297} - component: {fileID: 1357223941497910243} + - component: {fileID: 5896488685849714964} m_Layer: 0 m_Name: Christmas_Tree_MidDark_New m_TagString: Untagged @@ -86,3 +87,26 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!136 &5896488685849714964 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 708524794035622454} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.16509342 + m_Height: 3 + m_Direction: 1 + m_Center: {x: -0.0008983612, y: 1.5, z: -0.034113646} diff --git a/blueberryPeak/Assets/Prefabs/Trees/normal/Pine_Tree.prefab b/blueberryPeak/Assets/Prefabs/Trees/normal/Pine_Tree.prefab index e6260b6..d42e62b 100644 --- a/blueberryPeak/Assets/Prefabs/Trees/normal/Pine_Tree.prefab +++ b/blueberryPeak/Assets/Prefabs/Trees/normal/Pine_Tree.prefab @@ -75,5 +75,36 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 70cd02a54e5db4630bf113e02076cd59, type: 3} + insertIndex: -1 + addedObject: {fileID: 4042721832226159892} m_SourcePrefab: {fileID: 100100000, guid: 70cd02a54e5db4630bf113e02076cd59, type: 3} +--- !u!1 &119775285696500936 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 70cd02a54e5db4630bf113e02076cd59, type: 3} + m_PrefabInstance: {fileID: 966285097575819673} + m_PrefabAsset: {fileID: 0} +--- !u!136 &4042721832226159892 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 119775285696500936} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.93196565 + m_Height: 40.020283 + m_Direction: 1 + m_Center: {x: 0.021784231, y: 19.010145, z: -0.057993934} diff --git a/blueberryPeak/Assets/Prefabs/Trees/snow/Christmas_Tree_Dark.prefab b/blueberryPeak/Assets/Prefabs/Trees/snow/Christmas_Tree_Dark.prefab index 3da6f2e..b10b1c6 100644 --- a/blueberryPeak/Assets/Prefabs/Trees/snow/Christmas_Tree_Dark.prefab +++ b/blueberryPeak/Assets/Prefabs/Trees/snow/Christmas_Tree_Dark.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 9177461735404041097} - component: {fileID: 5256614767206890540} - component: {fileID: 8005086826645719270} + - component: {fileID: 5805809125093346424} m_Layer: 0 m_Name: Christmas_Tree_Dark m_TagString: Untagged @@ -86,3 +87,26 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!136 &5805809125093346424 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8365212550460025139} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.15303415 + m_Height: 3 + m_Direction: 1 + m_Center: {x: 0.0342391, y: 1.5, z: -0.0031434} diff --git a/blueberryPeak/Assets/Prefabs/Trees/snow/Christmas_Tree_Light.prefab b/blueberryPeak/Assets/Prefabs/Trees/snow/Christmas_Tree_Light.prefab index 7e8c488..e6528e8 100644 --- a/blueberryPeak/Assets/Prefabs/Trees/snow/Christmas_Tree_Light.prefab +++ b/blueberryPeak/Assets/Prefabs/Trees/snow/Christmas_Tree_Light.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 9014401998805048963} - component: {fileID: 5383575405449416998} - component: {fileID: 7877563238077392364} + - component: {fileID: 1046240918352631049} m_Layer: 0 m_Name: Christmas_Tree_Light m_TagString: Untagged @@ -86,3 +87,26 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!136 &1046240918352631049 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8525954521814844473} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.15878391 + m_Height: 3 + m_Direction: 1 + m_Center: {x: 0.0028629303, y: 1.5, z: -0.034225464} diff --git a/blueberryPeak/Assets/Prefabs/Trees/snow/Christmas_Tree_MidDark_New.prefab b/blueberryPeak/Assets/Prefabs/Trees/snow/Christmas_Tree_MidDark_New.prefab index db941d2..ac96ca2 100644 --- a/blueberryPeak/Assets/Prefabs/Trees/snow/Christmas_Tree_MidDark_New.prefab +++ b/blueberryPeak/Assets/Prefabs/Trees/snow/Christmas_Tree_MidDark_New.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 188868778669148300} - component: {fileID: 3832885104988096297} - component: {fileID: 1357223941497910243} + - component: {fileID: 3523649746160262469} m_Layer: 0 m_Name: Christmas_Tree_MidDark_New m_TagString: Untagged @@ -86,3 +87,26 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!136 &3523649746160262469 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 708524794035622454} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.15597057 + m_Height: 3 + m_Direction: 1 + m_Center: {x: 0.008224487, y: 1.5, z: -0.034113646} diff --git a/blueberryPeak/Assets/Prefabs/Trees/snow/Pine_Tree.prefab b/blueberryPeak/Assets/Prefabs/Trees/snow/Pine_Tree.prefab index c1e7c85..09d5fe7 100644 --- a/blueberryPeak/Assets/Prefabs/Trees/snow/Pine_Tree.prefab +++ b/blueberryPeak/Assets/Prefabs/Trees/snow/Pine_Tree.prefab @@ -75,5 +75,36 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 70cd02a54e5db4630bf113e02076cd59, type: 3} + insertIndex: -1 + addedObject: {fileID: 4946738101097512433} m_SourcePrefab: {fileID: 100100000, guid: 70cd02a54e5db4630bf113e02076cd59, type: 3} +--- !u!1 &119775285696500936 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 70cd02a54e5db4630bf113e02076cd59, type: 3} + m_PrefabInstance: {fileID: 966285097575819673} + m_PrefabAsset: {fileID: 0} +--- !u!136 &4946738101097512433 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 119775285696500936} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.898245 + m_Height: 40.020283 + m_Direction: 1 + m_Center: {x: -0.02133017, y: 19.010145, z: -0.057993934} diff --git a/blueberryPeak/Assets/Prefabs/game/CameraHolder.prefab b/blueberryPeak/Assets/Prefabs/game/CameraHolder.prefab index 497db3f..89bd48d 100644 --- a/blueberryPeak/Assets/Prefabs/game/CameraHolder.prefab +++ b/blueberryPeak/Assets/Prefabs/game/CameraHolder.prefab @@ -1,5 +1,141 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &3333808583931087485 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8960059289900263566} + - component: {fileID: 3076680716901496902} + - component: {fileID: 1938335015179532135} + m_Layer: 5 + m_Name: DialogText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8960059289900263566 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3333808583931087485} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2.5, y: 12.72, z: 0.9783394} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7216170279624163166} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.5, y: 0} + m_SizeDelta: {x: 201, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3076680716901496902 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3333808583931087485} + m_CullTransparentMesh: 1 +--- !u!114 &1938335015179532135 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3333808583931087485} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 9.25 + m_fontSizeBase: 9.25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -15.273689, y: 4.582691, z: -16.257828, w: 4.1798687} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &6371432655844756945 GameObject: m_ObjectHideFlags: 0 @@ -32,6 +168,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3383800440793820032} + - {fileID: 7216170279624163166} m_Father: {fileID: 2666620144834527649} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -57,7 +194,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 + m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 @@ -131,13 +268,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6966946482204079541} serializedVersion: 2 - m_LocalRotation: {x: 0.082553804, y: -0.7022712, z: 0.082553804, w: 0.7022712} + 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: 2666620144834527649} - m_LocalEulerAnglesHint: {x: 13.409, y: -90, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &4965917414565539174 Camera: m_ObjectHideFlags: 0 @@ -169,7 +306,7 @@ Camera: y: 0 width: 1 height: 1 - near clip plane: 0.3 + near clip plane: 0 far clip plane: 1000 field of view: 60 orthographic: 1 @@ -287,6 +424,82 @@ MonoBehaviour: bOverrideScalingFactor: 0 scalingFactor: -1 listenerId: 0 +--- !u!1 &8043979312732847817 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7216170279624163166} + - component: {fileID: 819606537412303385} + - component: {fileID: 7281867144935006246} + m_Layer: 5 + m_Name: DialogPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7216170279624163166 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8043979312732847817} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.000030517585} + m_LocalScale: {x: 1.02, y: 0.15999998, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8960059289900263566} + m_Father: {fileID: 7619316063441429832} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 45.989944} + m_SizeDelta: {x: 0, y: 575} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &819606537412303385 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8043979312732847817} + m_CullTransparentMesh: 1 +--- !u!114 &7281867144935006246 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8043979312732847817} + 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.6117647} + 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!1 &8080420989084569541 GameObject: m_ObjectHideFlags: 0 diff --git a/blueberryPeak/Assets/Scenes/Beach.unity b/blueberryPeak/Assets/Scenes/Beach.unity index e2b33a0..ec44563 100644 --- a/blueberryPeak/Assets/Scenes/Beach.unity +++ b/blueberryPeak/Assets/Scenes/Beach.unity @@ -1445,6 +1445,114 @@ Transform: m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3} m_PrefabInstance: {fileID: 236544349} m_PrefabAsset: {fileID: 0} +--- !u!1 &242296953 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 242296954} + - component: {fileID: 242296957} + - component: {fileID: 242296956} + - component: {fileID: 242296955} + m_Layer: 0 + m_Name: Cube (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &242296954 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 242296953} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -8.77} + m_LocalScale: {x: 50.53, y: 45.06, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 599894788} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &242296955 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 242296953} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &242296956 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 242296953} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &242296957 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 242296953} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &243830499 PrefabInstance: m_ObjectHideFlags: 0 @@ -3494,6 +3602,40 @@ Transform: m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3} m_PrefabInstance: {fileID: 587655659} m_PrefabAsset: {fileID: 0} +--- !u!1 &599894787 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 599894788} + m_Layer: 0 + m_Name: InvisibleWalls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &599894788 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 599894787} + serializedVersion: 2 + 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: 242296954} + - {fileID: 1303478300} + - {fileID: 1785526875} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &627030201 PrefabInstance: m_ObjectHideFlags: 0 @@ -7090,6 +7232,114 @@ Transform: m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3} m_PrefabInstance: {fileID: 1287831706} m_PrefabAsset: {fileID: 0} +--- !u!1 &1303478299 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1303478300} + - component: {fileID: 1303478303} + - component: {fileID: 1303478302} + - component: {fileID: 1303478301} + m_Layer: 0 + m_Name: Cube (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1303478300 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1303478299} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0.4663866, z: 0, w: 0.884581} + m_LocalPosition: {x: -16.6, y: 0, z: -0.4} + m_LocalScale: {x: 75.8, y: 45.06, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 599894788} + m_LocalEulerAnglesHint: {x: 0, y: 55.6, z: 0} +--- !u!65 &1303478301 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1303478299} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1303478302 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1303478299} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1303478303 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1303478299} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1316996589 PrefabInstance: m_ObjectHideFlags: 0 @@ -10143,6 +10393,114 @@ MonoBehaviour: pointA: {fileID: 839212091} pointB: {fileID: 825585977} speed: 3 +--- !u!1 &1785526874 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1785526875} + - component: {fileID: 1785526878} + - component: {fileID: 1785526877} + - component: {fileID: 1785526876} + m_Layer: 0 + m_Name: Cube (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1785526875 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1785526874} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0.42103577, z: 0, w: 0.90704405} + m_LocalPosition: {x: 19.84, y: 0, z: 0.5} + m_LocalScale: {x: 75.8, y: 45.06, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 599894788} + m_LocalEulerAnglesHint: {x: 0, y: -49.8, z: 0} +--- !u!65 &1785526876 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1785526874} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1785526877 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1785526874} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1785526878 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1785526874} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1794261971 PrefabInstance: m_ObjectHideFlags: 0 @@ -12799,3 +13157,4 @@ SceneRoots: - {fileID: 1436752009} - {fileID: 4910437401304687815} - {fileID: 1530957962} + - {fileID: 599894788} diff --git a/blueberryPeak/Assets/Scenes/Forest.unity b/blueberryPeak/Assets/Scenes/Forest.unity index 890b333..84af56d 100644 --- a/blueberryPeak/Assets/Scenes/Forest.unity +++ b/blueberryPeak/Assets/Scenes/Forest.unity @@ -192,19 +192,19 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1444560706} + m_TransformParent: {fileID: 898922893} m_Modifications: - target: {fileID: 119775285696500936, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} propertyPath: m_Name - value: Pine_Tree (5) + value: BarrierTree objectReference: {fileID: 0} - target: {fileID: 784284187896041074, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} propertyPath: m_LocalScale.x - value: 0.23362783 + value: 0.23362787 objectReference: {fileID: 0} - target: {fileID: 784284187896041074, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} propertyPath: m_LocalScale.y - value: 0.29872596 + value: 0.29872602 objectReference: {fileID: 0} - target: {fileID: 784284187896041074, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} propertyPath: m_LocalScale.z @@ -212,39 +212,39 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 784284187896041074, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} propertyPath: m_LocalPosition.x - value: -4.77 + value: 0 objectReference: {fileID: 0} - target: {fileID: 784284187896041074, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} propertyPath: m_LocalPosition.y - value: 1.04 + value: 0 objectReference: {fileID: 0} - target: {fileID: 784284187896041074, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} propertyPath: m_LocalPosition.z - value: -16.7 + value: 0 objectReference: {fileID: 0} - target: {fileID: 784284187896041074, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} propertyPath: m_LocalRotation.w - value: 0.67863286 + value: 1 objectReference: {fileID: 0} - target: {fileID: 784284187896041074, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} propertyPath: m_LocalRotation.x - value: -0.67863286 + value: 0 objectReference: {fileID: 0} - target: {fileID: 784284187896041074, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} propertyPath: m_LocalRotation.y - value: 0.19863899 + value: 0 objectReference: {fileID: 0} - target: {fileID: 784284187896041074, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} propertyPath: m_LocalRotation.z - value: 0.19863899 + value: 0 objectReference: {fileID: 0} - target: {fileID: 784284187896041074, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -90 + value: 0 objectReference: {fileID: 0} - target: {fileID: 784284187896041074, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 32.63 + value: 0 objectReference: {fileID: 0} - target: {fileID: 784284187896041074, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -627,6 +627,194 @@ Transform: m_CorrespondingSourceObject: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} m_PrefabInstance: {fileID: 193403859} m_PrefabAsset: {fileID: 0} +--- !u!1 &243848964 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 243848965} + - component: {fileID: 243848968} + - component: {fileID: 243848967} + - component: {fileID: 243848966} + m_Layer: 0 + m_Name: Beaver + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &243848965 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 243848964} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.45, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 274103194} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &243848966 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 243848964} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &243848967 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 243848964} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &243848968 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 243848964} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &274103191 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 274103194} + - component: {fileID: 274103193} + - component: {fileID: 274103192} + m_Layer: 0 + m_Name: Beaver + m_TagString: Interactable + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!135 &274103192 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 274103191} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 1.54 + m_Center: {x: 0, y: 1.8, z: 0} +--- !u!114 &274103193 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 274103191} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a504573bd52d6f5dfa9a6c6fd707e406, type: 3} + m_Name: + m_EditorClassIdentifier: + questFile: {fileID: 4900000, guid: 0229d31aee1eb443783bbf30201078cb, type: 3} + reward: {fileID: 0} + requiredItem: {fileID: 0} + isActive: 0 + isCompleted: 0 + quest: + id: 0 + initial: [] + reminder: [] + success: [] + repetition: [] +--- !u!4 &274103194 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 274103191} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.11, y: 0, z: -18.43} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 243848965} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &333271331 PrefabInstance: m_ObjectHideFlags: 0 @@ -1381,6 +1569,59 @@ Transform: m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} m_PrefabInstance: {fileID: 550910493} m_PrefabAsset: {fileID: 0} +--- !u!1 &551090796 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 551090797} + - component: {fileID: 551090798} + m_Layer: 0 + m_Name: Extra + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &551090797 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 551090796} + serializedVersion: 2 + 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: 898922893} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &551090798 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 551090796} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 7.0107155, y: 15.263462, z: 1} + m_Center: {x: -3.0053856, y: 10.412518, z: 0} --- !u!1 &563910144 GameObject: m_ObjectHideFlags: 0 @@ -3125,6 +3366,61 @@ Transform: m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} m_PrefabInstance: {fileID: 887714951} m_PrefabAsset: {fileID: 0} +--- !u!1 &898922891 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 898922893} + - component: {fileID: 898922892} + m_Layer: 0 + m_Name: BarrierTree + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &898922892 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 898922891} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 2.76, y: 12.99, z: 1} + m_Center: {x: 0, y: 5.42, z: 0} +--- !u!4 &898922893 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 898922891} + serializedVersion: 2 + m_LocalRotation: {x: -0.67863286, y: 0.19863899, z: 0.19863899, w: 0.67863286} + m_LocalPosition: {x: -18.2, y: 1.8245008, z: 5.869999} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 53999858} + - {fileID: 551090797} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: -90, y: 32.63, z: 0} --- !u!1001 &942015656 PrefabInstance: m_ObjectHideFlags: 0 @@ -3774,6 +4070,114 @@ Transform: m_CorrespondingSourceObject: {fileID: 9014401998805048963, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} m_PrefabInstance: {fileID: 1071451952} m_PrefabAsset: {fileID: 0} +--- !u!1 &1077462186 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1077462187} + - component: {fileID: 1077462190} + - component: {fileID: 1077462189} + - component: {fileID: 1077462188} + m_Layer: 0 + m_Name: Cube (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1077462187 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1077462186} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: -25.5, y: 0, z: 0} + m_LocalScale: {x: 75.8, y: 45.06, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1281333575} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!65 &1077462188 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1077462186} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1077462189 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1077462186} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1077462190 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1077462186} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1087822592 PrefabInstance: m_ObjectHideFlags: 0 @@ -4354,6 +4758,41 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1281333574 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1281333575} + m_Layer: 0 + m_Name: InvisibleWalls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1281333575 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1281333574} + serializedVersion: 2 + 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: 1709260917} + - {fileID: 1430545972} + - {fileID: 1077462187} + - {fileID: 2107814143} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1374272611 PrefabInstance: m_ObjectHideFlags: 0 @@ -4664,6 +5103,114 @@ Transform: m_CorrespondingSourceObject: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} m_PrefabInstance: {fileID: 1428768545} m_PrefabAsset: {fileID: 0} +--- !u!1 &1430545971 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1430545972} + - component: {fileID: 1430545975} + - component: {fileID: 1430545974} + - component: {fileID: 1430545973} + m_Layer: 0 + m_Name: Cube (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1430545972 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1430545971} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -30.2} + m_LocalScale: {x: 50.53, y: 45.06, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1281333575} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1430545973 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1430545971} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1430545974 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1430545971} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1430545975 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1430545971} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1435111727 PrefabInstance: m_ObjectHideFlags: 0 @@ -4839,7 +5386,6 @@ Transform: - {fileID: 775777396} - {fileID: 783394337} - {fileID: 419751204} - - {fileID: 53999858} - {fileID: 616950971} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5882,6 +6428,83 @@ Transform: m_CorrespondingSourceObject: {fileID: 7274217447149220641, guid: b2cd0c3d7aa1945b1b8b02709ff5b14d, type: 3} m_PrefabInstance: {fileID: 819841648} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1612429704 +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 (1) + objectReference: {fileID: 0} + - target: {fileID: 2620713896011995392, guid: 157ff23549611354485c3446833dc2bf, type: 3} + propertyPath: m_Size.y + value: 7.89 + 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: Peak + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 157ff23549611354485c3446833dc2bf, type: 3} --- !u!1 &1616741001 GameObject: m_ObjectHideFlags: 0 @@ -6063,6 +6686,114 @@ Transform: m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} m_PrefabInstance: {fileID: 1690376387} m_PrefabAsset: {fileID: 0} +--- !u!1 &1709260916 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1709260917} + - component: {fileID: 1709260920} + - component: {fileID: 1709260919} + - component: {fileID: 1709260918} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1709260917 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1709260916} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 30.3} + m_LocalScale: {x: 50.53, y: 45.06, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1281333575} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1709260918 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1709260916} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1709260919 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1709260916} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1709260920 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1709260916} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1729171725 PrefabInstance: m_ObjectHideFlags: 0 @@ -7503,6 +8234,114 @@ Transform: m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} m_PrefabInstance: {fileID: 2078530823} m_PrefabAsset: {fileID: 0} +--- !u!1 &2107814142 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2107814143} + - component: {fileID: 2107814146} + - component: {fileID: 2107814145} + - component: {fileID: 2107814144} + m_Layer: 0 + m_Name: Cube (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2107814143 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107814142} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 25.5, y: 0, z: 0} + m_LocalScale: {x: 75.8, y: 45.06, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1281333575} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!65 &2107814144 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107814142} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &2107814145 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107814142} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &2107814146 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107814142} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &2109581611 PrefabInstance: m_ObjectHideFlags: 0 @@ -7746,63 +8585,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b2cd0c3d7aa1945b1b8b02709ff5b14d, type: 3} ---- !u!1001 &5772547694885153690 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 101707232274501756, guid: 4d27e29e881eb4590bfff0a320de15d9, type: 3} - propertyPath: m_LocalPosition.x - value: -0.146 - objectReference: {fileID: 0} - - target: {fileID: 101707232274501756, guid: 4d27e29e881eb4590bfff0a320de15d9, type: 3} - propertyPath: m_LocalPosition.y - value: 1.09 - objectReference: {fileID: 0} - - target: {fileID: 101707232274501756, guid: 4d27e29e881eb4590bfff0a320de15d9, type: 3} - propertyPath: m_LocalPosition.z - value: -19.21 - objectReference: {fileID: 0} - - target: {fileID: 101707232274501756, guid: 4d27e29e881eb4590bfff0a320de15d9, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 101707232274501756, guid: 4d27e29e881eb4590bfff0a320de15d9, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 101707232274501756, guid: 4d27e29e881eb4590bfff0a320de15d9, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 101707232274501756, guid: 4d27e29e881eb4590bfff0a320de15d9, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 101707232274501756, guid: 4d27e29e881eb4590bfff0a320de15d9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 101707232274501756, guid: 4d27e29e881eb4590bfff0a320de15d9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 101707232274501756, guid: 4d27e29e881eb4590bfff0a320de15d9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 754905977713106395, guid: 4d27e29e881eb4590bfff0a320de15d9, type: 3} - propertyPath: m_Name - value: Beaver - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d27e29e881eb4590bfff0a320de15d9, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -7814,7 +8596,8 @@ SceneRoots: - {fileID: 1499332851} - {fileID: 1444560706} - {fileID: 775973532} - - {fileID: 5772547694885153690} + - {fileID: 898922893} + - {fileID: 274103194} - {fileID: 1116867940} - {fileID: 1598453987} - {fileID: 1819051216} @@ -7823,3 +8606,5 @@ SceneRoots: - {fileID: 1772744957} - {fileID: 335597220} - {fileID: 691592292} + - {fileID: 1612429704} + - {fileID: 1281333575} diff --git a/blueberryPeak/Assets/Scenes/Market.unity b/blueberryPeak/Assets/Scenes/Market.unity index 14d4cf6..9d020aa 100644 --- a/blueberryPeak/Assets/Scenes/Market.unity +++ b/blueberryPeak/Assets/Scenes/Market.unity @@ -181,6 +181,26 @@ Transform: m_CorrespondingSourceObject: {fileID: 9014401998805048963, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} m_PrefabInstance: {fileID: 44069944} m_PrefabAsset: {fileID: 0} +--- !u!1 &57388603 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8080420989084569541, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} + m_PrefabInstance: {fileID: 6256147545252888024} + m_PrefabAsset: {fileID: 0} +--- !u!114 &57388605 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 57388603} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 82c6be17482ec2847b23775deb9b5ca7, type: 3} + m_Name: + m_EditorClassIdentifier: + dialogPanel: {fileID: 6256147545252888026} + dialogText: {fileID: 6256147545252888025} + playerMovement: {fileID: 404785616} --- !u!1 &116783384 GameObject: m_ObjectHideFlags: 0 @@ -415,6 +435,116 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &268294289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 268294290} + - component: {fileID: 268294293} + - component: {fileID: 268294292} + - component: {fileID: 268294291} + m_Layer: 0 + m_Name: Capsule + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &268294290 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268294289} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.45, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1575696559} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &268294291 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268294289} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &268294292 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268294289} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &268294293 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268294289} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &269692911 PrefabInstance: m_ObjectHideFlags: 0 @@ -477,6 +607,114 @@ Transform: m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} m_PrefabInstance: {fileID: 269692911} m_PrefabAsset: {fileID: 0} +--- !u!1 &270748699 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 270748700} + - component: {fileID: 270748703} + - component: {fileID: 270748702} + - component: {fileID: 270748701} + m_Layer: 0 + m_Name: Cube (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &270748700 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 270748699} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: -15.4, y: 0, z: 0} + m_LocalScale: {x: 75.8, y: 45.06, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1924588774} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!65 &270748701 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 270748699} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &270748702 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 270748699} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &270748703 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 270748699} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &298430448 stripped Transform: m_CorrespondingSourceObject: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} @@ -722,6 +960,17 @@ Transform: m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} m_PrefabInstance: {fileID: 387076977} m_PrefabAsset: {fileID: 0} +--- !u!114 &404785616 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} + m_PrefabInstance: {fileID: 2071877021} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 23256d9e6183ca49ab546e357a0a1717, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &426013450 PrefabInstance: m_ObjectHideFlags: 0 @@ -1242,6 +1491,114 @@ Transform: m_CorrespondingSourceObject: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} m_PrefabInstance: {fileID: 385903562} m_PrefabAsset: {fileID: 0} +--- !u!1 &654607685 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 654607686} + - component: {fileID: 654607689} + - component: {fileID: 654607688} + - component: {fileID: 654607687} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &654607686 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 654607685} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 25.3} + m_LocalScale: {x: 50.53, y: 45.06, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1924588774} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &654607687 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 654607685} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &654607688 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 654607685} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &654607689 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 654607685} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &658155166 GameObject: m_ObjectHideFlags: 0 @@ -1589,6 +1946,116 @@ Transform: m_CorrespondingSourceObject: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} m_PrefabInstance: {fileID: 704862451} m_PrefabAsset: {fileID: 0} +--- !u!1 &705331248 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 705331249} + - component: {fileID: 705331252} + - component: {fileID: 705331251} + - component: {fileID: 705331250} + m_Layer: 0 + m_Name: Capsule + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &705331249 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705331248} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.45, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2021140265} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &705331250 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705331248} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &705331251 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705331248} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &705331252 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705331248} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &710338005 PrefabInstance: m_ObjectHideFlags: 0 @@ -2774,6 +3241,114 @@ Transform: m_CorrespondingSourceObject: {fileID: 784284187896041074, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} m_PrefabInstance: {fileID: 1113811735} m_PrefabAsset: {fileID: 0} +--- !u!1 &1132674173 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1132674174} + - component: {fileID: 1132674177} + - component: {fileID: 1132674176} + - component: {fileID: 1132674175} + m_Layer: 0 + m_Name: Cube (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1132674174 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1132674173} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 15.462, y: 0, z: 0} + m_LocalScale: {x: 75.8, y: 45.06, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1924588774} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!65 &1132674175 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1132674173} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1132674176 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1132674173} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1132674177 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1132674173} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1173434708 PrefabInstance: m_ObjectHideFlags: 0 @@ -3409,6 +3984,84 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} +--- !u!1 &1330236063 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1330236064} + - component: {fileID: 1330236066} + - component: {fileID: 1330236065} + m_Layer: 0 + m_Name: Bird + m_TagString: Interactable + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1330236064 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1330236063} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -8.61, y: 0, z: -6.3} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1802239649} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &1330236065 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1330236063} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 1.54 + m_Center: {x: 0, y: 1.8, z: 0} +--- !u!114 &1330236066 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1330236063} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a504573bd52d6f5dfa9a6c6fd707e406, type: 3} + m_Name: + m_EditorClassIdentifier: + questFile: {fileID: 4900000, guid: 4f09ef4e15dca4f47a1e6364a686f127, type: 3} + reward: {fileID: 0} + requiredItem: {fileID: 0} + isActive: 0 + isCompleted: 0 + quest: + id: 0 + initial: [] + reminder: [] + success: [] + repetition: [] --- !u!1001 &1358425461 PrefabInstance: m_ObjectHideFlags: 0 @@ -3709,6 +4362,84 @@ Transform: m_CorrespondingSourceObject: {fileID: 9014401998805048963, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} m_PrefabInstance: {fileID: 1573882007} m_PrefabAsset: {fileID: 0} +--- !u!1 &1575696556 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1575696559} + - component: {fileID: 1575696558} + - component: {fileID: 1575696557} + m_Layer: 0 + m_Name: Squirrel + m_TagString: Interactable + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!135 &1575696557 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1575696556} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 1.54 + m_Center: {x: 0, y: 1.8, z: 0} +--- !u!114 &1575696558 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1575696556} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a504573bd52d6f5dfa9a6c6fd707e406, type: 3} + m_Name: + m_EditorClassIdentifier: + questFile: {fileID: 4900000, guid: e99c9ddbbcf904ca28c095daf53ae532, type: 3} + reward: {fileID: 0} + requiredItem: {fileID: 0} + isActive: 0 + isCompleted: 0 + quest: + id: 0 + initial: [] + reminder: [] + success: [] + repetition: [] +--- !u!4 &1575696559 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1575696556} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.424, y: 0, z: -7.835} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 268294290} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1592753487 GameObject: m_ObjectHideFlags: 0 @@ -3919,6 +4650,114 @@ Transform: m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} m_PrefabInstance: {fileID: 1634734485} m_PrefabAsset: {fileID: 0} +--- !u!1 &1649460262 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1649460263} + - component: {fileID: 1649460266} + - component: {fileID: 1649460265} + - component: {fileID: 1649460264} + m_Layer: 0 + m_Name: Cube (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1649460263 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1649460262} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -25.2} + m_LocalScale: {x: 50.53, y: 45.06, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1924588774} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1649460264 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1649460262} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1649460265 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1649460262} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1649460266 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1649460262} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1660756549 stripped Transform: m_CorrespondingSourceObject: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} @@ -4241,6 +5080,116 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b8057f4bb05b243d38e8bf9d6ad8e86e, type: 3} +--- !u!1 &1802239648 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1802239649} + - component: {fileID: 1802239652} + - component: {fileID: 1802239651} + - component: {fileID: 1802239650} + m_Layer: 0 + m_Name: Capsule + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1802239649 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1802239648} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.45, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1330236064} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &1802239650 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1802239648} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1802239651 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1802239648} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1802239652 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1802239648} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1823004389 PrefabInstance: m_ObjectHideFlags: 0 @@ -4673,6 +5622,41 @@ Transform: m_CorrespondingSourceObject: {fileID: 9014401998805048963, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} m_PrefabInstance: {fileID: 1909325124} m_PrefabAsset: {fileID: 0} +--- !u!1 &1924588773 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1924588774} + m_Layer: 0 + m_Name: InvisibleWalls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1924588774 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1924588773} + serializedVersion: 2 + 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: 654607686} + - {fileID: 1649460263} + - {fileID: 270748700} + - {fileID: 1132674174} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1955319717 GameObject: m_ObjectHideFlags: 0 @@ -5112,6 +6096,84 @@ Transform: - {fileID: 981290116} m_Father: {fileID: 1997102453} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2021140262 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2021140265} + - component: {fileID: 2021140264} + - component: {fileID: 2021140263} + m_Layer: 0 + m_Name: Fish + m_TagString: Interactable + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!135 &2021140263 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2021140262} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 1.54 + m_Center: {x: 0, y: 1.8, z: 0} +--- !u!114 &2021140264 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2021140262} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a504573bd52d6f5dfa9a6c6fd707e406, type: 3} + m_Name: + m_EditorClassIdentifier: + questFile: {fileID: 4900000, guid: dc05ef38ff775416bac92e1c083637a2, type: 3} + reward: {fileID: 0} + requiredItem: {fileID: 0} + isActive: 0 + isCompleted: 0 + quest: + id: 0 + initial: [] + reminder: [] + success: [] + repetition: [] +--- !u!4 &2021140265 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2021140262} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.349, y: 0, z: -7.362} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 705331249} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2056916129 PrefabInstance: m_ObjectHideFlags: 0 @@ -5240,7 +6302,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} propertyPath: m_LocalPosition.y - value: 1.608 + value: 1.63 objectReference: {fileID: 0} - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} propertyPath: m_LocalPosition.z @@ -5278,6 +6340,10 @@ PrefabInstance: propertyPath: windSpeedStep value: 40 objectReference: {fileID: 0} + - target: {fileID: 3123357398500628543, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} + propertyPath: dialogManagerObject + value: + objectReference: {fileID: 57388603} - target: {fileID: 3243503616957313541, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} propertyPath: initWindSpeed value: 40 @@ -5290,6 +6356,14 @@ PrefabInstance: propertyPath: cameraTransform value: objectReference: {fileID: 1755022767} + - target: {fileID: 4006268237752810497, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} + propertyPath: m_positionOffsetData.positionOffset.x + value: -0.20454216 + objectReference: {fileID: 0} + - target: {fileID: 4006268237752810497, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} + propertyPath: m_positionOffsetData.positionOffset.z + value: -0.09521139 + objectReference: {fileID: 0} - target: {fileID: 5083671953233951116, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -5444,7 +6518,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3360928438094827899, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} propertyPath: m_LocalPosition.x - value: -6.83 + value: -4.17 objectReference: {fileID: 0} - target: {fileID: 3360928438094827899, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} propertyPath: m_LocalPosition.y @@ -5452,7 +6526,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3360928438094827899, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} propertyPath: m_LocalPosition.z - value: -8.92 + value: -9.26 objectReference: {fileID: 0} - target: {fileID: 3360928438094827899, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} propertyPath: m_LocalRotation.w @@ -5482,6 +6556,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7733776328927737520, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} + propertyPath: m_LocalScale.x + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 7733776328927737520, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} + propertyPath: m_LocalScale.y + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 7733776328927737520, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} + propertyPath: m_LocalScale.z + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 7733776328927737520, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -5495,9 +6585,25 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1953931530962366070, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} + propertyPath: m_LocalScale.x + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 1953931530962366070, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} + propertyPath: m_LocalScale.y + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 1953931530962366070, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} + propertyPath: m_LocalScale.z + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 1953931530962366070, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4452929253159274350, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} propertyPath: m_LocalPosition.x - value: -11.35 + value: -9.86 objectReference: {fileID: 0} - target: {fileID: 4452929253159274350, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} propertyPath: m_LocalPosition.y @@ -5505,7 +6611,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4452929253159274350, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} propertyPath: m_LocalPosition.z - value: -6.39 + value: -7.18 objectReference: {fileID: 0} - target: {fileID: 4452929253159274350, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} propertyPath: m_LocalRotation.w @@ -5592,43 +6698,34 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4965917414565539174, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} - propertyPath: near clip plane - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8080420989084569541, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} propertyPath: m_Name - value: Camera - objectReference: {fileID: 0} - - target: {fileID: 8538518650932330681, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8538518650932330681, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8538518650932330681, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8538518650932330681, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8538518650932330681, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8538518650932330681, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: Manager objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8080420989084569541, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} + insertIndex: -1 + addedObject: {fileID: 57388605} m_SourcePrefab: {fileID: 100100000, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} +--- !u!114 &6256147545252888025 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1938335015179532135, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} + m_PrefabInstance: {fileID: 6256147545252888024} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &6256147545252888026 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8043979312732847817, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} + m_PrefabInstance: {fileID: 6256147545252888024} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7216438787318960321 PrefabInstance: m_ObjectHideFlags: 0 @@ -5637,13 +6734,29 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1299149962522586620, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} + propertyPath: m_LocalScale.x + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 1299149962522586620, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} + propertyPath: m_LocalScale.y + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 1299149962522586620, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} + propertyPath: m_LocalScale.z + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 1299149962522586620, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2798492699886383226, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} propertyPath: m_Name value: MarketStandBlue objectReference: {fileID: 0} - target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} propertyPath: m_LocalPosition.x - value: -1.96 + value: 1.63 objectReference: {fileID: 0} - target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} propertyPath: m_LocalPosition.y @@ -5651,11 +6764,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} propertyPath: m_LocalPosition.z - value: -9.07 + value: -9.01 objectReference: {fileID: 0} - target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} propertyPath: m_LocalRotation.w - value: 0.7012205 + value: 0.7678365 objectReference: {fileID: 0} - target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} propertyPath: m_LocalRotation.x @@ -5663,7 +6776,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} propertyPath: m_LocalRotation.y - value: 0.71294445 + value: 0.6406459 objectReference: {fileID: 0} - target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} propertyPath: m_LocalRotation.z @@ -5675,7 +6788,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 90.95 + value: 79.68 objectReference: {fileID: 0} - target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -5707,3 +6820,7 @@ SceneRoots: - {fileID: 677342064} - {fileID: 816337134} - {fileID: 1250080611} + - {fileID: 1330236064} + - {fileID: 1575696559} + - {fileID: 2021140265} + - {fileID: 1924588774} diff --git a/blueberryPeak/Assets/Scenes/Peak.unity b/blueberryPeak/Assets/Scenes/Peak.unity index 68db916..18aa1a8 100644 --- a/blueberryPeak/Assets/Scenes/Peak.unity +++ b/blueberryPeak/Assets/Scenes/Peak.unity @@ -1503,6 +1503,114 @@ Transform: m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 36ba7f99c754f45c0b7f382f63c8b54c, type: 3} m_PrefabInstance: {fileID: 597221909} m_PrefabAsset: {fileID: 0} +--- !u!1 &604329780 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 604329781} + - component: {fileID: 604329784} + - component: {fileID: 604329783} + - component: {fileID: 604329782} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &604329781 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 604329780} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 30.3} + m_LocalScale: {x: 50.53, y: 45.06, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1027602859} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &604329782 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 604329780} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &604329783 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 604329780} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &604329784 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 604329780} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &616424948 PrefabInstance: m_ObjectHideFlags: 0 @@ -2123,6 +2231,41 @@ Transform: m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 36ba7f99c754f45c0b7f382f63c8b54c, type: 3} m_PrefabInstance: {fileID: 931172133} m_PrefabAsset: {fileID: 0} +--- !u!1 &1027602858 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1027602859} + m_Layer: 0 + m_Name: InvisibleWalls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1027602859 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1027602858} + serializedVersion: 2 + 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: 604329781} + - {fileID: 1714753778} + - {fileID: 2016189709} + - {fileID: 1416190714} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1042051011 PrefabInstance: m_ObjectHideFlags: 0 @@ -2722,6 +2865,114 @@ Transform: m_CorrespondingSourceObject: {fileID: 9014401998805048963, guid: 40f1ff2a9b7ed447d95885bbefdd1f5f, type: 3} m_PrefabInstance: {fileID: 1391465289} m_PrefabAsset: {fileID: 0} +--- !u!1 &1416190713 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1416190714} + - component: {fileID: 1416190717} + - component: {fileID: 1416190716} + - component: {fileID: 1416190715} + m_Layer: 0 + m_Name: Cube (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1416190714 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1416190713} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 25.461, y: 0, z: 0} + m_LocalScale: {x: 75.8, y: 45.06, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1027602859} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!65 &1416190715 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1416190713} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1416190716 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1416190713} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1416190717 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1416190713} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1423366822 PrefabInstance: m_ObjectHideFlags: 0 @@ -3298,6 +3549,114 @@ Transform: m_CorrespondingSourceObject: {fileID: 9014401998805048963, guid: 40f1ff2a9b7ed447d95885bbefdd1f5f, type: 3} m_PrefabInstance: {fileID: 1675312030} m_PrefabAsset: {fileID: 0} +--- !u!1 &1714753777 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1714753778} + - component: {fileID: 1714753781} + - component: {fileID: 1714753780} + - component: {fileID: 1714753779} + m_Layer: 0 + m_Name: Cube (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1714753778 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1714753777} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -30.3} + m_LocalScale: {x: 50.53, y: 45.06, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1027602859} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1714753779 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1714753777} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1714753780 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1714753777} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1714753781 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1714753777} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1781056007 PrefabInstance: m_ObjectHideFlags: 0 @@ -3608,6 +3967,114 @@ Transform: m_CorrespondingSourceObject: {fileID: 9014401998805048963, guid: 40f1ff2a9b7ed447d95885bbefdd1f5f, type: 3} m_PrefabInstance: {fileID: 1901515375} m_PrefabAsset: {fileID: 0} +--- !u!1 &2016189708 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2016189709} + - component: {fileID: 2016189712} + - component: {fileID: 2016189711} + - component: {fileID: 2016189710} + m_Layer: 0 + m_Name: Cube (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2016189709 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2016189708} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: -25.3, y: 0, z: 0} + m_LocalScale: {x: 75.8, y: 45.06, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1027602859} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!65 &2016189710 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2016189708} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &2016189711 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2016189708} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &2016189712 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2016189708} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &2023203982 PrefabInstance: m_ObjectHideFlags: 0 @@ -3799,3 +4266,4 @@ SceneRoots: - {fileID: 109876465} - {fileID: 1491684656} - {fileID: 1933470188998383616} + - {fileID: 1027602859} diff --git a/blueberryPeak/Assets/Scripts/DialogManager.cs b/blueberryPeak/Assets/Scripts/DialogManager.cs index 04da933..a0d0445 100644 --- a/blueberryPeak/Assets/Scripts/DialogManager.cs +++ b/blueberryPeak/Assets/Scripts/DialogManager.cs @@ -6,6 +6,7 @@ public class DialogManager : MonoBehaviour { public GameObject dialogPanel; public TextMeshProUGUI dialogText; // Use TextMeshProUGUI instead of Text + public PlayerMovement playerMovement; private void Start() { @@ -17,10 +18,12 @@ public class DialogManager : MonoBehaviour print("should be showing dialog"); dialogText.text = message; dialogPanel.SetActive(true); + playerMovement.moveAllowed = false; } public void HideDialog() { dialogPanel.SetActive(false); + playerMovement.moveAllowed = true; } } diff --git a/blueberryPeak/Assets/Scripts/PlayerInteraction.cs b/blueberryPeak/Assets/Scripts/PlayerInteraction.cs index a927151..c7efc9d 100644 --- a/blueberryPeak/Assets/Scripts/PlayerInteraction.cs +++ b/blueberryPeak/Assets/Scripts/PlayerInteraction.cs @@ -1,4 +1,4 @@ -using System; + using System; using System.Collections.Generic; using Unity.VisualScripting; using UnityEngine; @@ -28,7 +28,6 @@ public class PlayerInteraction : MonoBehaviour DialogAction.action.performed += onDialogContinue; dialogManager = dialogManagerObject.GetComponent(); - } void OnInteract(InputAction.CallbackContext context) diff --git a/blueberryPeak/Assets/Scripts/PlayerMovement.cs b/blueberryPeak/Assets/Scripts/PlayerMovement.cs index 4097f44..fbb0610 100644 --- a/blueberryPeak/Assets/Scripts/PlayerMovement.cs +++ b/blueberryPeak/Assets/Scripts/PlayerMovement.cs @@ -20,6 +20,8 @@ public class PlayerMovement : MonoBehaviour private Vector3 inputDirection = Vector3.zero; private CharacterController controller; + public bool moveAllowed = true; + void Start() { controller = GetComponent(); @@ -31,8 +33,11 @@ public class PlayerMovement : MonoBehaviour void OnMovement(InputAction.CallbackContext context) { - Vector2 inputVector = context.ReadValue(); - inputDirection = new Vector3(inputVector.x, 0, inputVector.y); + if (moveAllowed) + { + Vector2 inputVector = context.ReadValue(); + inputDirection = new Vector3(inputVector.x, 0, inputVector.y); + } } void OnMovementStop(InputAction.CallbackContext context) diff --git a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBeaver.json b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBeaver.json new file mode 100644 index 0000000..467ecc5 --- /dev/null +++ b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBeaver.json @@ -0,0 +1,122 @@ +{ + "initial": [ + { + "speaker": "Beaver", + "text": "Hmmm..." + }, + { + "speaker": "Beaver", + "text": "YEAH...! Yeah..." + }, + { + "speaker": "Beaver", + "text": "Oh! Hi there. Didn't see you! I'm hard at work. The Timber ain't gonna cut itself." + }, + { + "speaker": "Luna", + "text": "Oh wow" + }, + { + "speaker": "Luna", + "text": "That's... a lotta wood you got there!" + }, + { + "speaker": "Beaver", + "text": "What are you doing alone here anyways?" + }, + { + "speaker": "Beaver", + "text": "Aren't you a bit too young to play in the woods, by yourself?" + }, + { + "speaker": "Luna", + "text": "Nah" + }, + { + "speaker": "Luna", + "text": "Anyways, I'm on my way up to Blueberry Peak for MR. Smiths famous Blueberry Pie!" + }, + { + "speaker": "Beaver", + "text": "Oh well good luck to you then." + }, + { + "speaker": "Beaver", + "text": "There's a huge Log blocking the way up" + }, + { + "speaker": "Beaver", + "text": "I could help you, but my boss will shout at me if I won't finish picking up all that wood around the Forest." + }, + { + "speaker": "Beaver", + "text": "If you could help me to pick up all of those twigs, you'd be a huge help!" + }, + { + "speaker": "Luna", + "text": "Sure old man" + }, + { + "speaker": "Luna", + "text": "I can do that" + }, + { + "speaker": "Beaver", + "text": "OLD?!?!?" + }, + { + "speaker": "Beaver", + "text": "I'm only 65 years of age!" + } + ], + "reminder": [ + { + "speaker": "Beaver", + "text": "Have you found all of those twigs?" + }, + { + "speaker": "Luna", + "text": "Uhm... right!" + }, + { + "speaker": "Beaver", + "text": "Come back when you got 'em." + }, + { + "speaker": "Beaver", + "text": "Then we'll see what we can do about that log!" + }, + { + "speaker": "Luna", + "text": "Can do!" + } + ], + "success": [ + { + "speaker": "Beaver", + "text": "Oh damn" + }, + { + "speaker": "Beaver", + "text": "You were fast" + }, + { + "speaker": "Luna", + "text": "Everything for MR. Smiths Pie!" + }, + { + "speaker": "Beaver", + "text": "It is really good isn't it" + }, + { + "speaker": "Beaver", + "text": "Now let's see about that log!" + } + ], + "successRepetition": [ + { + "speaker": "Beaver", + "text": "Thanks again for helping me with those twigs!" + } + ] +} \ No newline at end of file diff --git a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/TestQuest.json.meta b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBeaver.json.meta similarity index 75% rename from blueberryPeak/Assets/Scripts/Quests/DialogFiles/TestQuest.json.meta rename to blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBeaver.json.meta index 7f5e87d..3afecd3 100644 --- a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/TestQuest.json.meta +++ b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBeaver.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 60bb20fabd0d82a699c11fced68a823e +guid: 0229d31aee1eb443783bbf30201078cb TextScriptImporter: externalObjects: {} userData: diff --git a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBird.json b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBird.json new file mode 100644 index 0000000..4381440 --- /dev/null +++ b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBird.json @@ -0,0 +1,298 @@ +{ + "initial": [ + { + "speaker": "Bird", + "text": "Hello hello hello" + }, + { + "speaker": "Bird", + "text": "What can I do for you my little Orange friend?" + }, + { + "speaker": "Luna", + "text": "Uhm..." + }, + { + "speaker": "Luna", + "text": "Nothing really" + }, + { + "speaker": "Luna", + "text": "What do you sell?" + }, + { + "speaker": "Bird", + "text": "Oh little ol' me?" + }, + { + "speaker": "Bird", + "text": "I do not sell any wares, my friend" + }, + { + "speaker": "Bird", + "text": "I sell luxury" + }, + { + "speaker": "Bird", + "text": "I sell status" + }, + { + "speaker": "Bird", + "text": "I SELL" + }, + { + "speaker": "Bird", + "text": "DIAMONDS!!!!" + }, + { + "speaker": "Luna", + "text": "cool cool" + }, + { + "speaker": "Luna", + "text": "What do they do?" + }, + { + "speaker": "Bird", + "text": "..." + }, + { + "speaker": "Bird", + "text": "No...nothing." + }, + { + "speaker": "Luna", + "text": "So why would I buy this diamond?" + }, + { + "speaker": "Bird", + "text": "Shiny" + }, + { + "speaker": "Luna", + "text": "I... see..." + } + ], + "reminder": [ +{ + "speaker": "Bird", + "text": "Hello hello hello" + }, + { + "speaker": "Bird", + "text": "What can I do for you my little Orange friend?" + }, + { + "speaker": "Luna", + "text": "Uhm..." + }, + { + "speaker": "Luna", + "text": "Nothing really" + }, + { + "speaker": "Luna", + "text": "What do you sell?" + }, + { + "speaker": "Bird", + "text": "Oh little ol' me?" + }, + { + "speaker": "Bird", + "text": "I do not sell any wares, my friend" + }, + { + "speaker": "Bird", + "text": "I sell luxury" + }, + { + "speaker": "Bird", + "text": "I sell status" + }, + { + "speaker": "Bird", + "text": "I SELL" + }, + { + "speaker": "Bird", + "text": "DIAMONDS!!!!" + }, + { + "speaker": "Luna", + "text": "cool cool" + }, + { + "speaker": "Luna", + "text": "What do they do?" + }, + { + "speaker": "Bird", + "text": "..." + }, + { + "speaker": "Bird", + "text": "No...nothing." + }, + { + "speaker": "Luna", + "text": "So why would I buy this diamond?" + }, + { + "speaker": "Bird", + "text": "Shiny" + }, + { + "speaker": "Luna", + "text": "I... see..." + } +], + "success": [ +{ + "speaker": "Bird", + "text": "Hello hello hello" + }, + { + "speaker": "Bird", + "text": "What can I do for you my little Orange friend?" + }, + { + "speaker": "Luna", + "text": "Uhm..." + }, + { + "speaker": "Luna", + "text": "Nothing really" + }, + { + "speaker": "Luna", + "text": "What do you sell?" + }, + { + "speaker": "Bird", + "text": "Oh little ol' me?" + }, + { + "speaker": "Bird", + "text": "I do not sell any wares, my friend" + }, + { + "speaker": "Bird", + "text": "I sell luxury" + }, + { + "speaker": "Bird", + "text": "I sell status" + }, + { + "speaker": "Bird", + "text": "I SELL" + }, + { + "speaker": "Bird", + "text": "DIAMONDS!!!!" + }, + { + "speaker": "Luna", + "text": "cool cool" + }, + { + "speaker": "Luna", + "text": "What do they do?" + }, + { + "speaker": "Bird", + "text": "..." + }, + { + "speaker": "Bird", + "text": "No...nothing." + }, + { + "speaker": "Luna", + "text": "So why would I buy this diamond?" + }, + { + "speaker": "Bird", + "text": "Shiny" + }, + { + "speaker": "Luna", + "text": "I... see..." + } +], + "successRepetition": [ +{ + "speaker": "Bird", + "text": "Hello hello hello" + }, + { + "speaker": "Bird", + "text": "What can I do for you my little Orange friend?" + }, + { + "speaker": "Luna", + "text": "Uhm..." + }, + { + "speaker": "Luna", + "text": "Nothing really" + }, + { + "speaker": "Luna", + "text": "What do you sell?" + }, + { + "speaker": "Bird", + "text": "Oh little ol' me?" + }, + { + "speaker": "Bird", + "text": "I do not sell any wares, my friend" + }, + { + "speaker": "Bird", + "text": "I sell luxury" + }, + { + "speaker": "Bird", + "text": "I sell status" + }, + { + "speaker": "Bird", + "text": "I SELL" + }, + { + "speaker": "Bird", + "text": "DIAMONDS!!!!" + }, + { + "speaker": "Luna", + "text": "cool cool" + }, + { + "speaker": "Luna", + "text": "What do they do?" + }, + { + "speaker": "Bird", + "text": "..." + }, + { + "speaker": "Bird", + "text": "No...nothing." + }, + { + "speaker": "Luna", + "text": "So why would I buy this diamond?" + }, + { + "speaker": "Bird", + "text": "Shiny" + }, + { + "speaker": "Luna", + "text": "I... see..." + } +] +} \ No newline at end of file diff --git a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBird.json.meta b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBird.json.meta new file mode 100644 index 0000000..e896e41 --- /dev/null +++ b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBird.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4f09ef4e15dca4f47a1e6364a686f127 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaFish.json b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaFish.json new file mode 100644 index 0000000..b4651db --- /dev/null +++ b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaFish.json @@ -0,0 +1,94 @@ +{ + "initial": [ + { + "speaker": "Luna", + "text": "That's weird" + }, + { + "speaker": "Fish", + "text": "What do you mean?" + }, + { + "speaker": "Luna", + "text": "Like you're a fish... right?" + }, + { + "speaker": "Fish", + "text": "Yeah?" + }, + { + "speaker": "Fish", + "text": "What about it?" + }, + { + "speaker": "Luna", + "text": "What are you selling over there?" + }, + { + "speaker": "Fish", + "text": "Carp!" + }, + { + "speaker": "Luna", + "text": "Okay" + }, + { + "speaker": "Luna", + "text": "So could you tell me what carp are?" + }, + { + "speaker": "Fish", + "text": "Food?" + }, + { + "speaker": "Luna", + "text": "Yeah, but I'm a fox right?" + }, + { + "speaker": "Fish", + "text": "Clearly, yeah" + }, + { + "speaker": "Luna", + "text": "Over there is a Bird, a Squirrel, and you are a Fish" + }, + { + "speaker": "Fish", + "text": "Get to the point my guy" + }, + { + "speaker": "Luna", + "text": "Carp are fish" + }, + { + "speaker": "Fish", + "text": "On god?" + }, + { + "speaker": "Luna", + "text": "Y-...yeah." + }, + { + "speaker": "Fish", + "text": "..." + } + ], + "reminder": [ + { + "speaker": "Fish", + "text": "..." + } + ], + "success": [ + { + "speaker": "Fish", + "text": "..." + } + ], + "successRepetition": [ + { + "speaker": "Fish", + "text": "..." + } + ] +} \ No newline at end of file diff --git a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaFish.json.meta b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaFish.json.meta new file mode 100644 index 0000000..7ec5062 --- /dev/null +++ b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaFish.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: dc05ef38ff775416bac92e1c083637a2 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaSquirrel.json b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaSquirrel.json new file mode 100644 index 0000000..0c9bb77 --- /dev/null +++ b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaSquirrel.json @@ -0,0 +1,106 @@ +{ + "initial": [ + { + "speaker": "Squirrel", + "text": "You! You over there" + }, + { + "speaker": "Luna", + "text": "Me?" + }, + { + "speaker": "Squirrel", + "text": "No the other Fox behind you" + }, + { + "speaker": "Luna", + "text": "Oh ok" + }, + { + "speaker": "Squirrel", + "text": "Are you kidding?" + }, + { + "speaker": "Squirrel", + "text": "Yeah YOU, you see?" + }, + { + "speaker": "Luna", + "text": "What do you need?" + }, + { + "speaker": "Squirrel", + "text": "See, I'm in a bit of a dilemma, you see?" + }, + { + "speaker": "Squirrel", + "text": "I'm selling fruits, you see?" + }, + { + "speaker": "Luna", + "text": "Yeah... I see?" + }, + { + "speaker": "Squirrel", + "text": "Great!" + }, + { + "speaker": "Squirrel", + "text": "But my Blueberries are running low, you see?" + }, + { + "speaker": "Luna", + "text": "Could you stop that?" + }, + { + "speaker": "Squirrel", + "text": "Bring me 10 Blueberries! There over there they are, you see?" + }, + { + "speaker": "Luna", + "text": "Stop dude. It's getting annoying." + }, + { + "speaker": "Squirrel", + "text": "Just run over them and your pockets will fill with them, they're so ripe!" + }, + { + "speaker": "Squirrel", + "text": "Go over and you will see!" + }, + { + "speaker": "Luna", + "text": "If you stop the \"seeing thing sure\"." + } + ], + "reminder": [ + { + "speaker": "Squirrel", + "text": "See me, when you've got 10 Blueberries!" + }, + { + "speaker": "Luna", + "text": "I see!" + } + ], + "success": [ + { + "speaker": "Squirrel", + "text": "Ahhhh, I see you've found the Berries!" + }, + { + "speaker": "Luna", + "text": "Yup got for you all 10 Berries you've asked me for!" + } + ], + "successRepetition": [ + { + "speaker": "Squirrel", + "text": "See, thanks again for getting those Berries for me!" + }, + { + "speaker": "Luna", + "text": "You see, no big deal for me!" + } + ] +} \ No newline at end of file diff --git a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaSquirrel.json.meta b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaSquirrel.json.meta new file mode 100644 index 0000000..059bcdb --- /dev/null +++ b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaSquirrel.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e99c9ddbbcf904ca28c095daf53ae532 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/TestQuest.json b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/TestQuest.json deleted file mode 100644 index 43645d3..0000000 --- a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/TestQuest.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "initialDialog": [ - { - "speaker": "QuestGiver", - "text": "Hello there! I seem to have misplaced my glasses. Could you help me find them?" - }, - { - "speaker": "Player", - "text": "Sure, I can help you with that. Where did you last see them?" - }, - { - "speaker": "QuestGiver", - "text": "I think I lost them in the forest." - } - ], - "reminderDialog": [ - { - "speaker": "QuestGiver", - "text": "Have you found my glasses yet?" - }, - { - "speaker": "Player", - "text": "Not yet, but I'm still looking." - } - ], - "successDialog": [ - { - "speaker": "QuestGiver", - "text": "Thank you so much for finding my glasses! Here is your reward." - }, - { - "speaker": "Player", - "text": "You're welcome! I'm glad I could help." - } - ], - "repetitionDialog": [ - { - "speaker": "QuestGiver", - "text": "Thank you for finding my Glasses" - } - ] -} \ No newline at end of file diff --git a/blueberryPeak/Assets/Scripts/Quests/QuestGiver.cs b/blueberryPeak/Assets/Scripts/Quests/QuestGiver.cs index 219eee2..c390100 100644 --- a/blueberryPeak/Assets/Scripts/Quests/QuestGiver.cs +++ b/blueberryPeak/Assets/Scripts/Quests/QuestGiver.cs @@ -92,7 +92,7 @@ public class QuestGiver : MonoBehaviour else { // If the quest is active but not completed, return the reminder dialog - CheckInventory(GameObject.Find("Luna").GetComponent().GetInventoryItems()); + CheckInventory(GameObject.FindGameObjectsWithTag("Player")[0].GetComponent().GetInventoryItems()); return quest.reminder; } }