diff --git a/Assets/Data/Settings/DefaultSettings.asset b/Assets/Data/Settings/DefaultSettings.asset index 45b117e3..3d02c7c7 100644 --- a/Assets/Data/Settings/DefaultSettings.asset +++ b/Assets/Data/Settings/DefaultSettings.asset @@ -32,6 +32,9 @@ MonoBehaviour: endlessDescenderClampXMin: -3.5 endlessDescenderClampXMax: 3.5 endlessDescenderSpeedExponent: 0.97 + interactableLayerMask: + serializedVersion: 2 + m_Bits: 1024 combinationRules: - itemA: {fileID: 11400000, guid: 33e7ca06b22108d4e802486e08bcdfd1, type: 2} itemB: {fileID: 11400000, guid: 8b2616beb14825a46b9b1ed85ad3cb25, type: 2} diff --git a/Assets/Prefabs/Characters/PlayerCharacter.prefab b/Assets/Prefabs/Characters/PlayerCharacter.prefab index f5b60b41..8656a2a6 100644 --- a/Assets/Prefabs/Characters/PlayerCharacter.prefab +++ b/Assets/Prefabs/Characters/PlayerCharacter.prefab @@ -181,7 +181,7 @@ MonoBehaviour: rotationSpeed: 360 slowdownDistance: 3 pickNextWaypointDist: 4 - endReachedDistance: 1 + endReachedDistance: 0.2 alwaysDrawGizmos: 1 slowWhenNotFacingTarget: 1 whenCloseToDestination: 0 diff --git a/Assets/Prefabs/Items/BasePickup.prefab b/Assets/Prefabs/Items/BasePickup.prefab index 90a4eccd..6a6f278a 100644 --- a/Assets/Prefabs/Items/BasePickup.prefab +++ b/Assets/Prefabs/Items/BasePickup.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: 3070149615425714466} - component: {fileID: 7616859841301711022} - component: {fileID: 592045584872845087} - m_Layer: 0 + m_Layer: 10 m_Name: BasePickup m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Prefabs/Items/ExamplePickup.prefab b/Assets/Prefabs/Items/ExamplePickup.prefab index d0c0c64a..33af487e 100644 --- a/Assets/Prefabs/Items/ExamplePickup.prefab +++ b/Assets/Prefabs/Items/ExamplePickup.prefab @@ -98,11 +98,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: m_Name - value: TestApple + value: TestAss objectReference: {fileID: 0} - target: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: m_Layer - value: 6 + value: 10 objectReference: {fileID: 0} - target: {fileID: 7494677664706785084, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: m_Size.x diff --git a/Assets/Prefabs/Levels/BaseLevelSwitch.prefab b/Assets/Prefabs/Levels/BaseLevelSwitch.prefab index dde07a35..9af3d88a 100644 --- a/Assets/Prefabs/Levels/BaseLevelSwitch.prefab +++ b/Assets/Prefabs/Levels/BaseLevelSwitch.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: 841695541655102207} - component: {fileID: 4981092805118965486} - component: {fileID: 1397300447834037203} - m_Layer: 0 + m_Layer: 10 m_Name: BaseLevelSwitch m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Scenes/Levels/AppleHillsOverworld.unity b/Assets/Scenes/Levels/AppleHillsOverworld.unity index 116288c0..b5579b92 100644 --- a/Assets/Scenes/Levels/AppleHillsOverworld.unity +++ b/Assets/Scenes/Levels/AppleHillsOverworld.unity @@ -23569,10 +23569,6 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} - - target: {fileID: 7393789300602426170, guid: 301b4e0735896334f8f6fb9a68a7e419, type: 3} - propertyPath: endReachedDistance - value: 0.2 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index 8688e0b6..a360e127 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -440950,7 +440950,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1443463278548606047, guid: e660bbbe18c2a044f9f066822a6fd703, type: 3} propertyPath: m_Layer - value: 0 + value: 10 objectReference: {fileID: 0} - target: {fileID: 4092047856540417737, guid: e660bbbe18c2a044f9f066822a6fd703, type: 3} propertyPath: m_LocalPosition.x