From 07e89f62bdc7d17d54ddf4b707cf822492cb15b9 Mon Sep 17 00:00:00 2001
From: Tinki <Muffinanator69@gmail.com>
Date: Mon, 22 Feb 2021 21:50:26 +0000
Subject: [PATCH] Fixed Pickup Logic Error
Can no longer pick up previous object when not in front of player
---
Assets/Scenes/SampleScene.unity | 992 ++++----------------------------
Assets/Script/HoldableObject.cs | 44 +-
2 files changed, 142 insertions(+), 894 deletions(-)
diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity
index 2eb43e7..4a78aaf 100644
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -695,7 +695,7 @@ RectTransform:
m_Children:
- {fileID: 317084719}
m_Father: {fileID: 0}
- m_RootOrder: 16
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -732,7 +732,7 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: f40d03fde121fe447ba55447e74e3a63,
type: 3}
propertyPath: m_RootOrder
- value: 17
+ value: 6
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f40d03fde121fe447ba55447e74e3a63,
type: 3}
@@ -846,86 +846,6 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -7536197502440859042, guid: 4b56a3686f4feb74c9cb5d61e9cc5126, type: 3}
---- !u!1001 &297981288
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_RootOrder
- value: 9
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: 11.151077
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 1.921195
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: 14.441916
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346308, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_Materials.Array.data[0]
- value:
- objectReference: {fileID: 2100000, guid: d9154e6af0230cc4cabc0bb4da4db0d9, type: 2}
- - target: {fileID: 3056552613199346310, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_Name
- value: HoldableObject (3)
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346310, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents:
- - {fileID: 3056552613195421783, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3}
- m_SourcePrefab: {fileID: 100100000, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3}
--- !u!1 &317084716
GameObject:
m_ObjectHideFlags: 0
@@ -1022,7 +942,27 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 4300014, guid: 4b56a3686f4feb74c9cb5d61e9cc5126, type: 3}
---- !u!1001 &350317124
+--- !u!1 &362566895 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 8780991266774210924, guid: 4b56a3686f4feb74c9cb5d61e9cc5126,
+ type: 3}
+ m_PrefabInstance: {fileID: 403838210}
+ m_PrefabAsset: {fileID: 0}
+--- !u!64 &362566899
+MeshCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 362566895}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 4
+ m_Convex: 0
+ m_CookingOptions: 30
+ m_Mesh: {fileID: 3253625272854683596, guid: 4b56a3686f4feb74c9cb5d61e9cc5126, type: 3}
+--- !u!1001 &370012837
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@@ -1032,22 +972,22 @@ PrefabInstance:
- target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
type: 3}
propertyPath: m_RootOrder
- value: 2
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
type: 3}
propertyPath: m_LocalPosition.x
- value: -1.7862201
+ value: -6.454338
objectReference: {fileID: 0}
- target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
type: 3}
propertyPath: m_LocalPosition.y
- value: 18.635675
+ value: -0.49999917
objectReference: {fileID: 0}
- target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
type: 3}
propertyPath: m_LocalPosition.z
- value: -32.66235
+ value: 3.1379228
objectReference: {fileID: 0}
- target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
type: 3}
@@ -1092,36 +1032,11 @@ PrefabInstance:
- target: {fileID: 3056552613199346310, guid: a8f5f999b2a8ed248b35381c313567ed,
type: 3}
propertyPath: m_Name
- value: HoldableObject (10)
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346310, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_IsActive
- value: 0
+ value: HoldableObject (1)
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 3056552613195421783, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3}
---- !u!1 &362566895 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 8780991266774210924, guid: 4b56a3686f4feb74c9cb5d61e9cc5126,
- type: 3}
- m_PrefabInstance: {fileID: 403838210}
- m_PrefabAsset: {fileID: 0}
---- !u!64 &362566899
-MeshCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 362566895}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 4
- m_Convex: 0
- m_CookingOptions: 30
- m_Mesh: {fileID: 3253625272854683596, guid: 4b56a3686f4feb74c9cb5d61e9cc5126, type: 3}
--- !u!1 &383923248 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -6555939818481701757, guid: 4b56a3686f4feb74c9cb5d61e9cc5126,
@@ -1249,7 +1164,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400010, guid: 4b56a3686f4feb74c9cb5d61e9cc5126, type: 3}
propertyPath: m_RootOrder
- value: 14
+ value: 4
objectReference: {fileID: 0}
- target: {fileID: 400010, guid: 4b56a3686f4feb74c9cb5d61e9cc5126, type: 3}
propertyPath: m_LocalPosition.x
@@ -1626,7 +1541,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 1
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &718610513
GameObject:
@@ -1697,7 +1612,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 718610513}
- m_LocalRotation: {x: 0.33100694, y: 0.000000016236429, z: -0.0000000056954317, w: 0.9436283}
+ m_LocalRotation: {x: 0.33100694, y: -0.000000016236429, z: 0.0000000056954317, w: 0.9436283}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
@@ -1791,67 +1706,7 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 4161536008881476496, guid: 4b56a3686f4feb74c9cb5d61e9cc5126, type: 3}
---- !u!1 &867524899 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 7437329584474614271, guid: 4b56a3686f4feb74c9cb5d61e9cc5126,
- type: 3}
- m_PrefabInstance: {fileID: 403838210}
- m_PrefabAsset: {fileID: 0}
---- !u!64 &867524903
-MeshCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 867524899}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 4
- m_Convex: 0
- m_CookingOptions: 30
- m_Mesh: {fileID: 4945516097113431008, guid: 4b56a3686f4feb74c9cb5d61e9cc5126, type: 3}
---- !u!1 &879201040 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: -6858560958186188142, guid: 4b56a3686f4feb74c9cb5d61e9cc5126,
- type: 3}
- m_PrefabInstance: {fileID: 403838210}
- m_PrefabAsset: {fileID: 0}
---- !u!64 &879201044
-MeshCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 879201040}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 4
- m_Convex: 0
- m_CookingOptions: 30
- m_Mesh: {fileID: -6838491695027492344, guid: 4b56a3686f4feb74c9cb5d61e9cc5126, type: 3}
---- !u!1 &890680341 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: -7530364652562782957, guid: 4b56a3686f4feb74c9cb5d61e9cc5126,
- type: 3}
- m_PrefabInstance: {fileID: 403838210}
- m_PrefabAsset: {fileID: 0}
---- !u!64 &890680345
-MeshCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 890680341}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 4
- m_Convex: 0
- m_CookingOptions: 30
- m_Mesh: {fileID: -4727905894713668129, guid: 4b56a3686f4feb74c9cb5d61e9cc5126, type: 3}
---- !u!1001 &931863967
+--- !u!1001 &860676451
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@@ -1861,22 +1716,22 @@ PrefabInstance:
- target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
type: 3}
propertyPath: m_RootOrder
- value: 3
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
type: 3}
propertyPath: m_LocalPosition.x
- value: -18.53541
+ value: -1.6538181
objectReference: {fileID: 0}
- target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
type: 3}
propertyPath: m_LocalPosition.y
- value: 1.921198
+ value: -0.4999985
objectReference: {fileID: 0}
- target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
type: 3}
propertyPath: m_LocalPosition.z
- value: 30.37217
+ value: 6.6932554
objectReference: {fileID: 0}
- target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
type: 3}
@@ -1921,16 +1776,71 @@ PrefabInstance:
- target: {fileID: 3056552613199346310, guid: a8f5f999b2a8ed248b35381c313567ed,
type: 3}
propertyPath: m_Name
- value: HoldableObject (9)
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346310, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_IsActive
- value: 0
+ value: HoldableObject
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 3056552613195421783, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3}
+--- !u!1 &867524899 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 7437329584474614271, guid: 4b56a3686f4feb74c9cb5d61e9cc5126,
+ type: 3}
+ m_PrefabInstance: {fileID: 403838210}
+ m_PrefabAsset: {fileID: 0}
+--- !u!64 &867524903
+MeshCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 867524899}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 4
+ m_Convex: 0
+ m_CookingOptions: 30
+ m_Mesh: {fileID: 4945516097113431008, guid: 4b56a3686f4feb74c9cb5d61e9cc5126, type: 3}
+--- !u!1 &879201040 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: -6858560958186188142, guid: 4b56a3686f4feb74c9cb5d61e9cc5126,
+ type: 3}
+ m_PrefabInstance: {fileID: 403838210}
+ m_PrefabAsset: {fileID: 0}
+--- !u!64 &879201044
+MeshCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 879201040}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 4
+ m_Convex: 0
+ m_CookingOptions: 30
+ m_Mesh: {fileID: -6838491695027492344, guid: 4b56a3686f4feb74c9cb5d61e9cc5126, type: 3}
+--- !u!1 &890680341 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: -7530364652562782957, guid: 4b56a3686f4feb74c9cb5d61e9cc5126,
+ type: 3}
+ m_PrefabInstance: {fileID: 403838210}
+ m_PrefabAsset: {fileID: 0}
+--- !u!64 &890680345
+MeshCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 890680341}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 4
+ m_Convex: 0
+ m_CookingOptions: 30
+ m_Mesh: {fileID: -4727905894713668129, guid: 4b56a3686f4feb74c9cb5d61e9cc5126, type: 3}
--- !u!1 &963194225
GameObject:
m_ObjectHideFlags: 0
@@ -2010,7 +1920,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 963194225}
- m_LocalRotation: {x: 0.33100694, y: 0.000000016236429, z: -0.0000000056954317, w: 0.9436283}
+ m_LocalRotation: {x: 0.33100694, y: -0.000000016236429, z: 0.0000000056954317, w: 0.9436283}
m_LocalPosition: {x: -4.1, y: 11.61, z: -6.9}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
@@ -2192,246 +2102,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 995224227}
m_CullTransparentMesh: 0
---- !u!1001 &999681529
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_RootOrder
- value: 4
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: 8.87507
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 1.921198
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: 33.301933
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346308, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_Materials.Array.data[0]
- value:
- objectReference: {fileID: 2100000, guid: d9154e6af0230cc4cabc0bb4da4db0d9, type: 2}
- - target: {fileID: 3056552613199346310, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_Name
- value: HoldableObject (8)
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346310, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents:
- - {fileID: 3056552613195421783, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3}
- m_SourcePrefab: {fileID: 100100000, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3}
---- !u!1001 &1011205059
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_RootOrder
- value: 10
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: -6.164624
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 3.5219858
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: -11.559553
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346308, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_Materials.Array.data[0]
- value:
- objectReference: {fileID: 2100000, guid: d9154e6af0230cc4cabc0bb4da4db0d9, type: 2}
- - target: {fileID: 3056552613199346310, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_Name
- value: HoldableObject (2)
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346310, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents:
- - {fileID: 3056552613195421783, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3}
- m_SourcePrefab: {fileID: 100100000, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3}
---- !u!1001 &1057633701
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_RootOrder
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: -20.636843
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 18.64313
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: -32.198383
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346308, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_Materials.Array.data[0]
- value:
- objectReference: {fileID: 2100000, guid: d9154e6af0230cc4cabc0bb4da4db0d9, type: 2}
- - target: {fileID: 3056552613199346310, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_Name
- value: HoldableObject (6)
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346310, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents:
- - {fileID: 3056552613195421783, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3}
- m_SourcePrefab: {fileID: 100100000, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3}
--- !u!1 &1125545178 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -516098083770646512, guid: f40d03fde121fe447ba55447e74e3a63,
@@ -2472,86 +2142,6 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -648000658904150906, guid: 4b56a3686f4feb74c9cb5d61e9cc5126, type: 3}
---- !u!1001 &1220087016
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_RootOrder
- value: 8
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: 33.644203
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 1.9211931
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: 5.6644955
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346308, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_Materials.Array.data[0]
- value:
- objectReference: {fileID: 2100000, guid: d9154e6af0230cc4cabc0bb4da4db0d9, type: 2}
- - target: {fileID: 3056552613199346310, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_Name
- value: HoldableObject (4)
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346310, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents:
- - {fileID: 3056552613195421783, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3}
- m_SourcePrefab: {fileID: 100100000, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3}
--- !u!1 &1297064273 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3037541289051416521, guid: 4b56a3686f4feb74c9cb5d61e9cc5126,
@@ -2570,108 +2160,28 @@ MeshCollider:
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
- m_CookingOptions: 30
- m_Mesh: {fileID: 4620488412998191514, guid: 4b56a3686f4feb74c9cb5d61e9cc5126, type: 3}
---- !u!1 &1305017260 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 100002, guid: 4b56a3686f4feb74c9cb5d61e9cc5126,
- type: 3}
- m_PrefabInstance: {fileID: 403838210}
- m_PrefabAsset: {fileID: 0}
---- !u!64 &1305017264
-MeshCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1305017260}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 4
- m_Convex: 0
- m_CookingOptions: 30
- m_Mesh: {fileID: 4300008, guid: 4b56a3686f4feb74c9cb5d61e9cc5126, type: 3}
---- !u!1001 &1326837643
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_RootOrder
- value: 5
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: -28.952986
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 1.9211893
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: -16.310425
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346308, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_Materials.Array.data[0]
- value:
- objectReference: {fileID: 2100000, guid: d9154e6af0230cc4cabc0bb4da4db0d9, type: 2}
- - target: {fileID: 3056552613199346310, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_Name
- value: HoldableObject (7)
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346310, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents:
- - {fileID: 3056552613195421783, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3}
- m_SourcePrefab: {fileID: 100100000, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3}
+ m_CookingOptions: 30
+ m_Mesh: {fileID: 4620488412998191514, guid: 4b56a3686f4feb74c9cb5d61e9cc5126, type: 3}
+--- !u!1 &1305017260 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 100002, guid: 4b56a3686f4feb74c9cb5d61e9cc5126,
+ type: 3}
+ m_PrefabInstance: {fileID: 403838210}
+ m_PrefabAsset: {fileID: 0}
+--- !u!64 &1305017264
+MeshCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1305017260}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 4
+ m_Convex: 0
+ m_CookingOptions: 30
+ m_Mesh: {fileID: 4300008, guid: 4b56a3686f4feb74c9cb5d61e9cc5126, type: 3}
--- !u!1 &1367486312
GameObject:
m_ObjectHideFlags: 0
@@ -2810,7 +2320,7 @@ Transform:
- {fileID: 1482850054}
- {fileID: 1639425698}
m_Father: {fileID: 0}
- m_RootOrder: 15
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1367486315
MonoBehaviour:
@@ -3109,7 +2619,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1482850052}
- m_LocalRotation: {x: 0.33100694, y: 0.000000016236429, z: -0.0000000056954317, w: 0.9436283}
+ m_LocalRotation: {x: 0.33100694, y: -0.000000016236429, z: 0.0000000056954317, w: 0.9436283}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
@@ -3117,86 +2627,6 @@ Transform:
m_Father: {fileID: 1367486314}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &1502253664
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_RootOrder
- value: 11
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: -11.836518
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 1.9211894
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: -14.597895
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346308, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_Materials.Array.data[0]
- value:
- objectReference: {fileID: 2100000, guid: d9154e6af0230cc4cabc0bb4da4db0d9, type: 2}
- - target: {fileID: 3056552613199346310, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_Name
- value: HoldableObject (1)
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346310, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents:
- - {fileID: 3056552613195421783, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3}
- m_SourcePrefab: {fileID: 100100000, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3}
--- !u!1 &1535995570 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -1767115005182477744, guid: f40d03fde121fe447ba55447e74e3a63,
@@ -3281,7 +2711,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 19
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1639425696
GameObject:
@@ -3352,7 +2782,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1639425696}
- m_LocalRotation: {x: 0.33100694, y: -0.000000016236429, z: 0.0000000056954317, w: 0.9436283}
+ m_LocalRotation: {x: 0.33100694, y: 0.000000016236429, z: -0.0000000056954317, w: 0.9436283}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
@@ -3360,86 +2790,6 @@ Transform:
m_Father: {fileID: 1367486314}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &1640433290
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_RootOrder
- value: 7
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: 2.4390054
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 1.9211864
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: -31.21309
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346308, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_Materials.Array.data[0]
- value:
- objectReference: {fileID: 2100000, guid: d9154e6af0230cc4cabc0bb4da4db0d9, type: 2}
- - target: {fileID: 3056552613199346310, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_Name
- value: HoldableObject (5)
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346310, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents:
- - {fileID: 3056552613195421783, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3}
- m_SourcePrefab: {fileID: 100100000, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3}
--- !u!1 &1676520445 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -6708337514810829996, guid: 4b56a3686f4feb74c9cb5d61e9cc5126,
@@ -3646,96 +2996,6 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -350127968736254282, guid: 4b56a3686f4feb74c9cb5d61e9cc5126, type: 3}
---- !u!1001 &1964494303
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 3056552613195421783, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: gooTex
- value:
- objectReference: {fileID: 8400000, guid: fca03971f2f4a4942b4879f5aad6a1b7, type: 2}
- - target: {fileID: 3056552613195421783, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: brushMaterial
- value:
- objectReference: {fileID: 2100000, guid: 2b93d62d4525db844a9bbdf89747e9cf, type: 2}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_RootOrder
- value: 12
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 3.06
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: -6.11
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346308, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_Materials.Array.data[0]
- value:
- objectReference: {fileID: 2100000, guid: d9154e6af0230cc4cabc0bb4da4db0d9, type: 2}
- - target: {fileID: 3056552613199346310, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_Name
- value: HoldableObject
- objectReference: {fileID: 0}
- - target: {fileID: 3056552613199346310, guid: a8f5f999b2a8ed248b35381c313567ed,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents:
- - {fileID: 3056552613195421783, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3}
- m_SourcePrefab: {fileID: 100100000, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3}
--- !u!1 &1989412308 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -3988011134886246042, guid: 4b56a3686f4feb74c9cb5d61e9cc5126,
@@ -3820,7 +3080,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 18
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2012797667 stripped
GameObject:
@@ -3937,7 +3197,7 @@ PrefabInstance:
- target: {fileID: 2263208524393207166, guid: b4ba6cbe0ccf7bf4a8e955a550e7e525,
type: 3}
propertyPath: m_RootOrder
- value: 13
+ value: 3
objectReference: {fileID: 0}
- target: {fileID: 2263208524393207166, guid: b4ba6cbe0ccf7bf4a8e955a550e7e525,
type: 3}
diff --git a/Assets/Script/HoldableObject.cs b/Assets/Script/HoldableObject.cs
index 33e3bf8..4d0d7a8 100644
--- a/Assets/Script/HoldableObject.cs
+++ b/Assets/Script/HoldableObject.cs
@@ -13,6 +13,7 @@ public class HoldableObject : MonoBehaviour
public float headheight;
bool canGrab;
+ bool pickedUp = false;
public SetControls setControls;
@@ -28,53 +29,38 @@ public class HoldableObject : MonoBehaviour
if (canGrab)
{
- if (Input.GetKeyDown(KeyCode.E) || setControls.pickup)
+ if (Input.GetKey(KeyCode.E) || setControls.pickup)
{
- if (currentObject != null)
- Drop();
-
+ if(pickedUp == false)
+ {
PickUp();
-
- if (currentObject == null)
+ } else if (pickedUp == true)
{
- Debug.Log("There is no object to pickup!");
+ Drop();
}
}
}
}
- //Draw Ray Gizmos
- void OnDrawGizmosSelected()
- {
- //Vector3 direction = transform.TransformDirection(Vector3.forward) * distance;
- //Gizmos.DrawRay(transform.position, direction);
- }
-
private void CheckObject()
{
RaycastHit hit;
- //Vector3 direction = transform.TransformDirection(Vector3.forward);
- //Ray ray = new Ray(transform.position, direction);
-
bool isHit = Physics.BoxCast(transform.position, transform.lossyScale / 2, transform.forward, out hit, transform.rotation, distance);
Debug.DrawRay(transform.position, transform.TransformDirection(Vector3.forward) * distance, Color.green);
-
- //if (Physics.Raycast(ray, out hit, distance))
- if (isHit)
+
+ if (isHit && hit.transform.tag == "HoldableObject")
{
//Debug.Log(hit.transform.name);
Debug.DrawLine(transform.position, hit.transform.position, Color.red);
- if (hit.transform.tag == "HoldableObject" /*&& Input.GetKeyDown(KeyCode.E) || Input.GetButtonDown("B Button")*/)
- {
- //Debug.Log("I can pick this up!");
- canGrab = true;
- objectPosition = hit.transform.gameObject;
- }
- else
- canGrab = false;
+ canGrab = true;
+ objectPosition = hit.transform.gameObject;
+ }
+ else
+ {
+ canGrab = false;
}
}
@@ -87,6 +73,7 @@ public class HoldableObject : MonoBehaviour
currentObject.transform.parent = equipPosition;
currentObject.transform.localEulerAngles = new Vector3(0f, 180f, 0f);
currentObject.GetComponent<Rigidbody>().isKinematic = true;
+ pickedUp = true;
Debug.Log("I picked it up!");
}
@@ -98,5 +85,6 @@ public class HoldableObject : MonoBehaviour
objectPosition = null;
currentObject = null;
Debug.Log("I dropped it");
+ pickedUp = false;
}
}
--
GitLab