Merge branch 'staging' into tree-cutting

log creation
tree cut event
2022-04-07 11:36:56 +00:00 · 2022-04-04 19:04:09 +03:00 · 2022-04-04 16:09:59 +03:00 · 2022-03-28 19:03:33 +03:00
45 changed files with 1195 additions and 40330 deletions
--- a/Assets/Oculus/SampleFramework/Core/CustomHands/CustomHandRight.prefab
+++ b/Assets/Oculus/SampleFramework/Core/CustomHands/CustomHandRight.prefab
@@ -474,7 +474,7 @@ GameObject:
  - component: {fileID: 13646088}
  m_Layer: 0
  m_Name: hands_coll:b_r_index3
-  m_TagString: Hand
+  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
@@ -502,8 +502,8 @@ CapsuleCollider:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 157110}
  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 1
+  m_IsTrigger: 0
+  m_Enabled: 0
  m_Radius: 0.01
  m_Height: 0.05
  m_Direction: 2
--- a/Files/Prefabs/Arlo/Axe.prefab
+++ b/Files/Prefabs/Arlo/Axe.prefab
@@ -0,0 +1,272 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &988253026175329073
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 155580, guid: 2ec0a21ef68f64a46864ad388da793c4, type: 3}
+      propertyPath: m_Name
+      value: Axe
+      objectReference: {fileID: 0}
+    - target: {fileID: 155580, guid: 2ec0a21ef68f64a46864ad388da793c4, type: 3}
+      propertyPath: m_TagString
+      value: Cutter
+      objectReference: {fileID: 0}
+    - target: {fileID: 451388, guid: 2ec0a21ef68f64a46864ad388da793c4, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 451388, guid: 2ec0a21ef68f64a46864ad388da793c4, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.1048176
+      objectReference: {fileID: 0}
+    - target: {fileID: 451388, guid: 2ec0a21ef68f64a46864ad388da793c4, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.032218672
+      objectReference: {fileID: 0}
+    - target: {fileID: 451388, guid: 2ec0a21ef68f64a46864ad388da793c4, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.81958795
+      objectReference: {fileID: 0}
+    - target: {fileID: 451388, guid: 2ec0a21ef68f64a46864ad388da793c4, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: -0.000000115202326
+      objectReference: {fileID: 0}
+    - target: {fileID: 451388, guid: 2ec0a21ef68f64a46864ad388da793c4, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.000000115202326
+      objectReference: {fileID: 0}
+    - target: {fileID: 451388, guid: 2ec0a21ef68f64a46864ad388da793c4, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 451388, guid: 2ec0a21ef68f64a46864ad388da793c4, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 451388, guid: 2ec0a21ef68f64a46864ad388da793c4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 451388, guid: 2ec0a21ef68f64a46864ad388da793c4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 451388, guid: 2ec0a21ef68f64a46864ad388da793c4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3328158, guid: 2ec0a21ef68f64a46864ad388da793c4, type: 3}
+      propertyPath: m_Mesh
+      value: 
+      objectReference: {fileID: 4300136, guid: 7374575f12d49ba459e91009f7a9ec62, type: 3}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2ec0a21ef68f64a46864ad388da793c4, type: 3}
+--- !u!1 &988253026175220877 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 155580, guid: 2ec0a21ef68f64a46864ad388da793c4,
+    type: 3}
+  m_PrefabInstance: {fileID: 988253026175329073}
+  m_PrefabAsset: {fileID: 0}
+--- !u!54 &8447640023250943431
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 988253026175220877}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 1
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!136 &8447640023250943427
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 988253026175220877}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 0.030867163
+  m_Height: 0.43418774
+  m_Direction: 1
+  m_Center: {x: 0.0036834013, y: 0.12670654, z: -0.0013518014}
+--- !u!114 &8447640023250943421
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 988253026175220877}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c93cfeee8cd29624bae7c5203dedb433, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &8447640023250943426
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 988253026175220877}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  outlineMode: 0
+  outlineColor: {r: 0.36489165, g: 0.9254902, b: 0.2470588, a: 1}
+  outlineWidth: 2
+  precomputeOutline: 0
+  bakeKeys: []
+  bakeValues: []
+--- !u!114 &8447640023250943429
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 988253026175220877}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_InteractionManager: {fileID: 0}
+  m_Colliders: []
+  m_InteractionLayerMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_InteractionLayers:
+    m_Bits: 1
+  m_SelectMode: 0
+  m_CustomReticle: {fileID: 0}
+  m_FirstHoverEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_LastHoverExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_HoverEntered:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 8447640023250943421}
+        m_TargetAssemblyTypeName: Hover, Assembly-CSharp
+        m_MethodName: HoverStart
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  m_HoverExited:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 8447640023250943421}
+        m_TargetAssemblyTypeName: Hover, Assembly-CSharp
+        m_MethodName: HoverEnd
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  m_FirstSelectEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_LastSelectExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_SelectEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_SelectExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Activated:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Deactivated:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnFirstHoverEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnLastHoverExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnHoverEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnHoverExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnSelectEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnSelectExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnSelectCanceled:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnActivate:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnDeactivate:
+    m_PersistentCalls:
+      m_Calls: []
+  m_AttachTransform: {fileID: 0}
+  m_AttachEaseInTime: 0.15
+  m_MovementType: 2
+  m_VelocityDamping: 1
+  m_VelocityScale: 1
+  m_AngularVelocityDamping: 1
+  m_AngularVelocityScale: 1
+  m_TrackPosition: 1
+  m_SmoothPosition: 0
+  m_SmoothPositionAmount: 5
+  m_TightenPosition: 0.5
+  m_TrackRotation: 1
+  m_SmoothRotation: 0
+  m_SmoothRotationAmount: 5
+  m_TightenRotation: 0.5
+  m_ThrowOnDetach: 1
+  m_ThrowSmoothingDuration: 0.25
+  m_ThrowSmoothingCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 1
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  m_ThrowVelocityScale: 1.5
+  m_ThrowAngularVelocityScale: 1
+  m_ForceGravityOnDetach: 0
+  m_RetainTransformParent: 1
+  m_AttachPointCompatibilityMode: 0
--- a/Assets/Scenes/Shumpei/GameScene.unity.meta
+++ b/Assets/Scenes/Shumpei/GameScene.unity.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 8fd0e18070efeda42bb8ab22afe4a9fb
-DefaultImporter:
+guid: 1931b899d98ae8543a827f11728cabe4
+PrefabImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/Files/Prefabs/Arlo/Cube.prefab
+++ b/Files/Prefabs/Arlo/Cube.prefab
@@ -281,7 +281,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  outlineMode: 0
-  outlineColor: {r: 0.9245283, g: 0.100302614, b: 0.100302614, a: 1}
+  outlineColor: {r: 1, g: 1, b: 1, a: 1}
  outlineWidth: 5
  precomputeOutline: 0
  bakeKeys: []
--- a/Files/Prefabs/Arlo/Cuttable_Tree.prefab
+++ b/Files/Prefabs/Arlo/Cuttable_Tree.prefab
@@ -0,0 +1,120 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &7764649721870939927
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 553484814939433779}
+  - component: {fileID: 2788778943963466700}
+  - component: {fileID: 805464277792446453}
+  - component: {fileID: 835287666759116147}
+  - component: {fileID: 835287666759116144}
+  m_Layer: 0
+  m_Name: Cuttable_Tree
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &553484814939433779
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7764649721870939927}
+  m_LocalRotation: {x: -0, y: 0.2260852, z: -0, w: 0.97410756}
+  m_LocalPosition: {x: 0.795, y: 0, z: 0.716}
+  m_LocalScale: {x: 1.3, y: 1.3, z: 1.3}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 26.133, z: 0}
+--- !u!33 &2788778943963466700
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7764649721870939927}
+  m_Mesh: {fileID: 4300000, guid: 69f0af3a0a6c73b4ab4b89eb82cdc488, type: 3}
+--- !u!23 &805464277792446453
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7764649721870939927}
+  m_Enabled: 1
+  m_CastShadows: 2
+  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_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 93caadf4359ae8143aad35b3145d31af, 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: 0
+  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!136 &835287666759116147
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7764649721870939927}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  m_Radius: 0.28481784
+  m_Height: 1.6249858
+  m_Direction: 1
+  m_Center: {x: 0.013886826, y: 0.68723994, z: -0.043937884}
+--- !u!114 &835287666759116144
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7764649721870939927}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1ed5d27829838ec42b4be1d601b4dadc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  stumpPrefab: {fileID: 108507113624723981, guid: eebb56c82efbd8d4bb0eb6bd925a0e9d,
+    type: 3}
+  logPrefab: {fileID: 3057085693074020240, guid: 79529cede28e9b9499885b2d83b8adcf,
+    type: 3}
+  onCut:
+    m_PersistentCalls:
+      m_Calls: []
--- a/Files/Prefabs/Arlo/Cuttable_Tree.prefab.meta
+++ b/Files/Prefabs/Arlo/Cuttable_Tree.prefab.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: e45278868e3d39f45929cb5142b6c572
-DefaultImporter:
+guid: dbc6a20437aec3141aaf8a552c1bc24f
+PrefabImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/Files/Prefabs/Arlo/Log.prefab
+++ b/Files/Prefabs/Arlo/Log.prefab
@@ -0,0 +1,289 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3057085693074020240
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3057085693074115504}
+  - component: {fileID: 3057085693074918288}
+  - component: {fileID: 3057085693076015440}
+  - component: {fileID: 8478891420560098512}
+  - component: {fileID: 1868636573106052050}
+  - component: {fileID: -728432962252772913}
+  - component: {fileID: 1264022012566418942}
+  - component: {fileID: 759522315152862422}
+  m_Layer: 0
+  m_Name: Log
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3057085693074115504
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3057085693074020240}
+  m_LocalRotation: {x: 0, y: -0, z: 0.7071068, w: -0.7071068}
+  m_LocalPosition: {x: -0.6981036, y: 0.99629545, z: 2.16}
+  m_LocalScale: {x: 0.2, y: 0.5669, z: 0.2}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 270}
+--- !u!33 &3057085693074918288
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3057085693074020240}
+  m_Mesh: {fileID: 4300000, guid: 768be665aba8b4e4aae7a973ae9616cf, type: 3}
+--- !u!23 &3057085693076015440
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3057085693074020240}
+  m_Enabled: 1
+  m_CastShadows: 2
+  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_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 93caadf4359ae8143aad35b3145d31af, 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: 0
+  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!54 &8478891420560098512
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3057085693074020240}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 1
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!136 &1868636573106052050
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3057085693074020240}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 0.3296725
+  m_Height: 0.8131512
+  m_Direction: 1
+  m_Center: {x: -0.04072858, y: 0.4065756, z: 0}
+--- !u!114 &-728432962252772913
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3057085693074020240}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_InteractionManager: {fileID: 0}
+  m_Colliders: []
+  m_InteractionLayerMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_InteractionLayers:
+    m_Bits: 1
+  m_SelectMode: 0
+  m_CustomReticle: {fileID: 0}
+  m_FirstHoverEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_LastHoverExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_HoverEntered:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1264022012566418942}
+        m_TargetAssemblyTypeName: Hover, Assembly-CSharp
+        m_MethodName: HoverStart
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  m_HoverExited:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1264022012566418942}
+        m_TargetAssemblyTypeName: Hover, Assembly-CSharp
+        m_MethodName: HoverEnd
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  m_FirstSelectEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_LastSelectExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_SelectEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_SelectExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Activated:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Deactivated:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnFirstHoverEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnLastHoverExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnHoverEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnHoverExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnSelectEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnSelectExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnSelectCanceled:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnActivate:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnDeactivate:
+    m_PersistentCalls:
+      m_Calls: []
+  m_AttachTransform: {fileID: 0}
+  m_AttachEaseInTime: 0.15
+  m_MovementType: 2
+  m_VelocityDamping: 1
+  m_VelocityScale: 1
+  m_AngularVelocityDamping: 1
+  m_AngularVelocityScale: 1
+  m_TrackPosition: 1
+  m_SmoothPosition: 0
+  m_SmoothPositionAmount: 5
+  m_TightenPosition: 0.5
+  m_TrackRotation: 1
+  m_SmoothRotation: 0
+  m_SmoothRotationAmount: 5
+  m_TightenRotation: 0.5
+  m_ThrowOnDetach: 1
+  m_ThrowSmoothingDuration: 0.25
+  m_ThrowSmoothingCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 1
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  m_ThrowVelocityScale: 1.5
+  m_ThrowAngularVelocityScale: 1
+  m_ForceGravityOnDetach: 0
+  m_RetainTransformParent: 1
+  m_AttachPointCompatibilityMode: 0
+--- !u!114 &1264022012566418942
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3057085693074020240}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c93cfeee8cd29624bae7c5203dedb433, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &759522315152862422
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3057085693074020240}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  outlineMode: 0
+  outlineColor: {r: 1, g: 1, b: 1, a: 1}
+  outlineWidth: 2
+  precomputeOutline: 0
+  bakeKeys: []
+  bakeValues: []
--- a/Files/Prefabs/Arlo/Log.prefab.meta
+++ b/Files/Prefabs/Arlo/Log.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 79529cede28e9b9499885b2d83b8adcf
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Scripts/Arlo/CuttableTree.cs
+++ b/Files/Scripts/Arlo/CuttableTree.cs
@@ -0,0 +1,39 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Events;
+
+public class CuttableTree : MonoBehaviour
+{
+    private Quaternion rotation;
+    public GameObject stumpPrefab;
+    public GameObject logPrefab;
+
+    [SerializeField]
+    private UnityEvent onCut;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    void OnTriggerEnter(Collider other)
+    {
+        if (other.tag == "Cutter")
+        {
+            rotation = transform.rotation;
+            rotation *= Quaternion.AngleAxis(20, Vector3.up);
+            Instantiate(stumpPrefab, transform.position, rotation);
+            Instantiate(logPrefab, transform.position+new Vector3(0, 1, 0), rotation);
+            onCut.Invoke();
+            Destroy(gameObject);
+        }
+    }
+}
--- a/Files/Scripts/Shumpei/ControllLocomotion.cs.meta
+++ b/Files/Scripts/Shumpei/ControllLocomotion.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ca1db91ee57976944aa22ed347811963
+guid: 1ed5d27829838ec42b4be1d601b4dadc
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
--- a/Files/Scripts/Shumpei/ArmSwingLocomotion.cs
+++ b/Files/Scripts/Shumpei/ArmSwingLocomotion.cs
@@ -8,7 +8,6 @@ public class ArmSwingLocomotion : MonoBehaviour
    public GameObject RightHand;
    public GameObject CenterEyeCamera;
    public GameObject ForwardDirection;
-    public GameObject Player;

    private Vector3 PositionPreviousFrameLeftHand;
    private Vector3 PositionPreviousFrameRightHand;
@@ -23,7 +22,7 @@ public class ArmSwingLocomotion : MonoBehaviour
    // Start is called before the first frame update
    void Start()
    {
-        PlayerPositionPreviousFrame = Player.transform.position;
+        PlayerPositionPreviousFrame = transform.position;
        PositionPreviousFrameLeftHand = LeftHand.transform.position;
        PlayerPositionPreviousFrame = RightHand.transform.position;
    }
@@ -34,13 +33,13 @@ public class ArmSwingLocomotion : MonoBehaviour



-        /*float Yrot = CenterEyeCamera.transform.eulerAngles.y;
-        ForwardDirection.transform.eulerAngles = new Vector3(0, Yrot, 0);*/
+        float Yrot = CenterEyeCamera.transform.eulerAngles.y;
+        ForwardDirection.transform.eulerAngles = new Vector3(0, Yrot, 0);

        PositionCurrentFrameLeftHand = LeftHand.transform.position;
        PositionCurrentFrameRightHand = RightHand.transform.position;

-        PlayerPositionCurrentFrame = Player.transform.position;
+        PlayerPositionCurrentFrame = transform.position;

        //Debug.Log("Previous" + PositionPreviousFrameLeftHand);
        //Debug.Log("Current" + PositionCurrentFrameLeftHand);
@@ -53,7 +52,7 @@ public class ArmSwingLocomotion : MonoBehaviour

        if (Time.timeSinceLevelLoad > 1f)
        {
-            Player.transform.position += ForwardDirection.transform.forward * HandSpeed * Speed * Time.deltaTime;
+            transform.position += ForwardDirection.transform.forward * HandSpeed * Speed * Time.deltaTime;
        }

        PositionPreviousFrameLeftHand = PositionCurrentFrameLeftHand;
--- a/Files/Scripts/Shumpei/ChangeButtonColor.cs
+++ b/Files/Scripts/Shumpei/ChangeButtonColor.cs
@@ -1,38 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class ChangeButtonColor : MonoBehaviour
-{
-    [SerializeField] private Color enterColor = Color.white;
-    [SerializeField] private Color exitColor = Color.white;
-
-    private MeshCollider _collider;
-    private MeshRenderer _renderer;
-
-    // Start is called before the first frame update
-    void Start()
-    {
-        _collider = GetComponent<MeshCollider>();
-        _renderer = GetComponent<MeshRenderer>();
-    }
-
-    private void OnTriggerEnter(Collider other)
-    {
-        if (other.tag == "Hand")
-        {
-            _renderer.material.color = enterColor;
-            Debug.Log("Touched!");
-
-        }
-    }
-
-    private void OnTriggerExit(Collider other)
-    {
-        if (other.tag == "Hand")
-        {
-            _renderer.material.color = exitColor;
-
-        }
-    }
-}
--- a/Files/Scripts/Shumpei/ChangeButtonColor.cs.meta
+++ b/Files/Scripts/Shumpei/ChangeButtonColor.cs.meta
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: a16108a6f7081d14f9f5a046ac04b8c2
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/ChangeButtonColorLocomotion.cs
+++ b/Files/Scripts/Shumpei/ChangeButtonColorLocomotion.cs
@@ -1,33 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class ChangeButtonColorLocomotion : MonoBehaviour
-{
-    [SerializeField] private Color enterColor = Color.white;
-    [SerializeField] private Color exitColor = Color.white;
-
-    private MeshCollider _collider;
-    private MeshRenderer _renderer;
-
-    // Start is called before the first frame update
-    void Start()
-    {
-        _collider = GetComponent<MeshCollider>();
-        _renderer = GetComponent<MeshRenderer>();
-    }
-
-    private void OnTriggerEnter(Collider other)
-    {
-        if (other.tag == "Hand")
-        {
-            if(_renderer.material.color != enterColor)
-                _renderer.material.color = enterColor;
-            else
-                _renderer.material.color = exitColor;
-
-        }
-    }
-
-
-}
--- a/Files/Scripts/Shumpei/ChangeButtonColorLocomotion.cs.meta
+++ b/Files/Scripts/Shumpei/ChangeButtonColorLocomotion.cs.meta
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: ae634ea4fe8cb874487372a3d7c595bf
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/ControllLocomotion.cs
+++ b/Files/Scripts/Shumpei/ControllLocomotion.cs
@@ -1,22 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class ControllLocomotion : MonoBehaviour
-{
-    public GameObject XRorigin;
-    public GameObject ArmSwingButton;
-    public GameObject JoyStickButton;
-
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-}
--- a/Files/Scripts/Shumpei/EnableArmSwing.cs
+++ b/Files/Scripts/Shumpei/EnableArmSwing.cs
@@ -1,32 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class EnableArmSwing : MonoBehaviour
-{
-
-    private MeshCollider _collider;
-    private MeshRenderer _renderer;
-
-    public GameObject Player;
-    // Start is called before the first frame update
-    void Start()
-    {
-        _collider = GetComponent<MeshCollider>();
-        _renderer = GetComponent<MeshRenderer>();
-        Player.GetComponent<ArmSwingLocomotion>().enabled = false;
-
-    }
-
-    private void OnTriggerEnter(Collider other)
-    {
-        if (other.tag == "Hand")
-        {
-            if(Player.GetComponent<ArmSwingLocomotion>().enabled == true)
-                Player.GetComponent<ArmSwingLocomotion>().enabled = false;
-            else
-                Player.GetComponent<ArmSwingLocomotion>().enabled = true;
-
-        }
-    }
-}
--- a/Files/Scripts/Shumpei/EnableArmSwing.cs.meta
+++ b/Files/Scripts/Shumpei/EnableArmSwing.cs.meta
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 696a55bfea145fa4b9029ff2d359c16d
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/EnableDash.cs
+++ b/Files/Scripts/Shumpei/EnableDash.cs
@@ -1,32 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class EnableDash : MonoBehaviour
-{
-
-    private MeshCollider _collider;
-    private MeshRenderer _renderer;
-
-    public GameObject Player;
-    // Start is called before the first frame update
-    void Start()
-    {
-        _collider = GetComponent<MeshCollider>();
-        _renderer = GetComponent<MeshRenderer>();
-        Player.GetComponent<Dash>().enabled = false;
-
-    }
-
-    private void OnTriggerEnter(Collider other)
-    {
-        if (other.tag == "Hand")
-        {
-            if (Player.GetComponent<Dash>().enabled == true)
-                Player.GetComponent<Dash>().enabled = false;
-            else
-                Player.GetComponent<Dash>().enabled = true;
-
-        }
-    }
-}
--- a/Files/Scripts/Shumpei/EnableDash.cs.meta
+++ b/Files/Scripts/Shumpei/EnableDash.cs.meta
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 84e3386cbd3fd2c418ecf357af19ba5f
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/EnableJoyStick.cs
+++ b/Files/Scripts/Shumpei/EnableJoyStick.cs
@@ -1,28 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class EnableJoyStick : MonoBehaviour
-{
-
-    private MeshCollider _collider;
-    private MeshRenderer _renderer;
-
-    public GameObject LocomotionSystem;
-    // Start is called before the first frame update
-    void Start()
-    {
-        _collider = GetComponent<MeshCollider>();
-        _renderer = GetComponent<MeshRenderer>();
-        LocomotionSystem.SetActive(false);
-
-    }
-
-    private void OnTriggerEnter(Collider other)
-    {
-        if (other.tag == "Hand")
-        {
-            LocomotionSystem.SetActive(!LocomotionSystem.activeSelf);
-        }
-    }
-}
--- a/Files/Scripts/Shumpei/EnableJoyStick.cs.meta
+++ b/Files/Scripts/Shumpei/EnableJoyStick.cs.meta
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: a63e1d5bde5a60c45aa409546e55b920
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/EnterGameScene.cs
+++ b/Files/Scripts/Shumpei/EnterGameScene.cs
@@ -1,16 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.SceneManagement;
-
-public class EnterGameScene : MonoBehaviour
-{
-
-    private void OnTriggerEnter(Collider other)
-    {
-        if (other.tag == "Player")
-        {
-            SceneManager.LoadScene("GameScene");
-        }
-    }
-}
--- a/Files/Scripts/Shumpei/EnterGameScene.cs.meta
+++ b/Files/Scripts/Shumpei/EnterGameScene.cs.meta
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: f1114a137d02f184db2b6291d9d31cb5
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/ForwardDirection.cs
+++ b/Files/Scripts/Shumpei/ForwardDirection.cs
@@ -1,20 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class ForwardDirection : MonoBehaviour
-{
-    public GameObject CenterEyeCamera;
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        float Yrot = CenterEyeCamera.transform.eulerAngles.y;
-        transform.eulerAngles = new Vector3(0, Yrot, 0);
-    }
-}
--- a/Files/Scripts/Shumpei/ForwardDirection.cs.meta
+++ b/Files/Scripts/Shumpei/ForwardDirection.cs.meta
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 01869e86b22555a449cd53043f5c4afa
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/LocomotionSettingButton.cs
+++ b/Files/Scripts/Shumpei/LocomotionSettingButton.cs
@@ -1,26 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class LocomotionSettingButton : MonoBehaviour
-{
-
-    private MeshCollider _collider;
-
-    public GameObject LocomotionPanel;
-    // Start is called before the first frame update
-    void Start()
-    {
-        _collider = GetComponent<MeshCollider>();
-        LocomotionPanel.SetActive(false);
-    }
-
-    private void OnTriggerEnter(Collider other)
-    {
-        if (other.tag == "Hand")
-        {
-            LocomotionPanel.SetActive(!LocomotionPanel.activeSelf);
-
-        }
-    }
-}
--- a/Files/Scripts/Shumpei/LocomotionSettingButton.cs.meta
+++ b/Files/Scripts/Shumpei/LocomotionSettingButton.cs.meta
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 8ac280753a1d95a43a1fbcfd69708d7a
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/PauseMenu.cs
+++ b/Files/Scripts/Shumpei/PauseMenu.cs
@@ -1,18 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class PauseMenu : MonoBehaviour
-{
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-}
--- a/Files/Scripts/Shumpei/PauseMenu.cs.meta
+++ b/Files/Scripts/Shumpei/PauseMenu.cs.meta
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 5a2662b3abecb914cad356619e832f13
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/Player.cs
+++ b/Files/Scripts/Shumpei/Player.cs
@@ -1,24 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class Player : MonoBehaviour
-{
-    /*public int level;
-    public int health;*/
-    public void SavePlayer()
-    {
-        SaveSystem.SavePlayer(this);
-    }
-
-    public void LoadPlayer()
-    {
-        PlayerData data = SaveSystem.LoadPlayer();
-
-        Vector3 position;
-        position.x = data.position[0];
-        position.y = data.position[1];
-        position.z = data.position[2];
-        transform.position = position;
-    }
-}
--- a/Files/Scripts/Shumpei/Player.cs.meta
+++ b/Files/Scripts/Shumpei/Player.cs.meta
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 6ff82a98832d12249b30083bc9ae2dd3
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/PlayerData.cs
+++ b/Files/Scripts/Shumpei/PlayerData.cs
@@ -1,22 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-[System.Serializable]
-public class PlayerData 
-{
-    /*public int level;
-    public int health;*/
-    public float[] position;
-
-    public PlayerData(Player player)
-    {
-        /*level = player.level;
-        health = player.health;*/
-
-        position = new float[3];
-        position[0] = player.transform.position.x;
-        position[1] = player.transform.position.y;
-        position[2] = player.transform.position.z;
-    }
-}
--- a/Files/Scripts/Shumpei/PlayerData.cs.meta
+++ b/Files/Scripts/Shumpei/PlayerData.cs.meta
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 9cdb4de85d282744083c6d9cee4fef3c
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/SaveSystem.cs
+++ b/Files/Scripts/Shumpei/SaveSystem.cs
@@ -1,42 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using System.IO;
-using System.Runtime.Serialization.Formatters.Binary;
-
-public static class SaveSystem
-{
-    public static void SavePlayer(Player player)
-    {
-        BinaryFormatter formatter = new BinaryFormatter();
-        string path = Application.persistentDataPath + "/player.data";
-        FileStream stream = new FileStream(path, FileMode.Create);
-
-        PlayerData data = new PlayerData(player);
-
-        formatter.Serialize(stream, data);
-        stream.Close();
-    }
-
-    public static PlayerData LoadPlayer ()
-    {
-        string path = Application.persistentDataPath + "/player.data";
-        if (File.Exists(path))
-        {
-            BinaryFormatter formatter = new BinaryFormatter();
-            FileStream stream = new FileStream(path, FileMode.Open);
-
-            PlayerData data = formatter.Deserialize(stream) as PlayerData;
-            stream.Close();
-
-            return data;
-        }
-
-        else
-        {
-            Debug.Log("Save File not found in " + path);
-            return null;
-        }
-    }
-    
-}
--- a/Files/Scripts/Shumpei/SaveSystem.cs.meta
+++ b/Files/Scripts/Shumpei/SaveSystem.cs.meta
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 49c2ebd233ef7a547b12ce163244e30a
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/TriggerDoorController.cs
+++ b/Files/Scripts/Shumpei/TriggerDoorController.cs
@@ -6,8 +6,8 @@ public class TriggerDoorController : MonoBehaviour
 {
    [SerializeField] private Animator myDoor = null;

-    [SerializeField] private bool Trigger = false;
-    //[SerializeField] private bool closeTrigger = false;
+    [SerializeField] private bool openTrigger = false;
+    [SerializeField] private bool closeTrigger = false;

    [SerializeField] private string doorOpen = "DoorOpen";
    [SerializeField] private string doorClose = "DoorClose";
@@ -19,26 +19,17 @@ public class TriggerDoorController : MonoBehaviour
        if (other.CompareTag("Player"))
        {
            Debug.Log("col");
-            if (Trigger)
+            if (openTrigger)
            {
                Debug.Log("open");
                myDoor.Play(doorOpen, 0, 0.0f);
+                gameObject.SetActive(false);
            }

-            /*else if (closeTrigger)
-            {
-                myDoor.Play(doorClose, 0, 0.0f);
-            }*/
-        }
-    }
-
-    public void OnTriggerExit(Collider other)
-    {
-        if (other.CompareTag("Player"))
-        {
-            if (Trigger)
+            else if (closeTrigger)
            {
                myDoor.Play(doorClose, 0, 0.0f);
+                gameObject.SetActive(false);
            }
        }
    }
--- a/Files/Scripts/Shumpei/XRGUI.cs
+++ b/Files/Scripts/Shumpei/XRGUI.cs
@@ -1,45 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using TMPro;
-using UnityEngine.UI;
-
-public class XRGUI : MonoBehaviour
-{
-    [SerializeField]
-    private Button SettingsButton;
-
-    [SerializeField]
-    private Button LoadButton;
-
-    [SerializeField]
-    private Button ExitButton;
-
-    // Start is called before the first frame update
-    void Start()
-    {
-        SettingsButton.onClick.AddListener(() =>
-        {
-
-        });
-
-        LoadButton.onClick.AddListener(() =>
-        {
-
-        });
-
-
-        ExitButton.onClick.AddListener(() =>
-        {
-            Debug.Log("Clicked");
-                UnityEditor.EditorApplication.isPlaying = false;
-        });
-    }
-
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-}
--- a/Files/Scripts/Shumpei/XRGUI.cs.meta
+++ b/Files/Scripts/Shumpei/XRGUI.cs.meta
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 37cfb6899ccd00b4280ac4eb92f84851
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scenes/Arlo/Playground.unity
+++ b/Assets/Scenes/Arlo/Playground.unity
@@ -1081,6 +1081,144 @@ GameObject:
    type: 3}
  m_PrefabInstance: {fileID: 1215167316}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &544882774
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 1.3997931
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 2.784592
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7345399166452899443, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_Name
+      value: Cube (1)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c89fd30ca0b56fb41a415d285d87b219, type: 3}
+--- !u!1001 &557616436
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 553484814939433779, guid: dbc6a20437aec3141aaf8a552c1bc24f,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 553484814939433779, guid: dbc6a20437aec3141aaf8a552c1bc24f,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.9495367
+      objectReference: {fileID: 0}
+    - target: {fileID: 553484814939433779, guid: dbc6a20437aec3141aaf8a552c1bc24f,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.00032841458
+      objectReference: {fileID: 0}
+    - target: {fileID: 553484814939433779, guid: dbc6a20437aec3141aaf8a552c1bc24f,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 1.3804929
+      objectReference: {fileID: 0}
+    - target: {fileID: 553484814939433779, guid: dbc6a20437aec3141aaf8a552c1bc24f,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.97410756
+      objectReference: {fileID: 0}
+    - target: {fileID: 553484814939433779, guid: dbc6a20437aec3141aaf8a552c1bc24f,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 553484814939433779, guid: dbc6a20437aec3141aaf8a552c1bc24f,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.2260852
+      objectReference: {fileID: 0}
+    - target: {fileID: 553484814939433779, guid: dbc6a20437aec3141aaf8a552c1bc24f,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 553484814939433779, guid: dbc6a20437aec3141aaf8a552c1bc24f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 553484814939433779, guid: dbc6a20437aec3141aaf8a552c1bc24f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 26.133
+      objectReference: {fileID: 0}
+    - target: {fileID: 553484814939433779, guid: dbc6a20437aec3141aaf8a552c1bc24f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7764649721870939927, guid: dbc6a20437aec3141aaf8a552c1bc24f,
+        type: 3}
+      propertyPath: m_Name
+      value: Cuttable_Tree
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: dbc6a20437aec3141aaf8a552c1bc24f, type: 3}
 --- !u!1001 &580328763
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -1272,7 +1410,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &599916906
 MonoBehaviour:
@@ -1600,7 +1738,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 0
+  m_RootOrder: 11
  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
 --- !u!114 &705507996
 MonoBehaviour:
@@ -1622,80 +1760,6 @@ MonoBehaviour:
  m_ShadowLayerMask: 1
  m_LightCookieSize: {x: 1, y: 1}
  m_LightCookieOffset: {x: 0, y: 0}
--- !u!1001 &781522734
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 1.3685592
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.10000024
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 3.2603176
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7345399166452899443, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_Name
-      value: Cube (1)
-      objectReference: {fileID: 0}
-    - target: {fileID: 9064848381942311599, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 033ccc1e24564204e939d5aebbf2014f, type: 2}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: d427f0f5ff0359f4c92a56ed37a11542, type: 3}
 --- !u!1 &886414983 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 788300690735002878, guid: d424f1b7b8f6a784c95e4f2d5872728e,
@@ -1902,6 +1966,75 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 1388963128}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1396052405
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 988253026175220877, guid: 1931b899d98ae8543a827f11728cabe4,
+        type: 3}
+      propertyPath: m_Name
+      value: Axe
+      objectReference: {fileID: 0}
+    - target: {fileID: 988253026175434765, guid: 1931b899d98ae8543a827f11728cabe4,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 988253026175434765, guid: 1931b899d98ae8543a827f11728cabe4,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.16538823
+      objectReference: {fileID: 0}
+    - target: {fileID: 988253026175434765, guid: 1931b899d98ae8543a827f11728cabe4,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.03221891
+      objectReference: {fileID: 0}
+    - target: {fileID: 988253026175434765, guid: 1931b899d98ae8543a827f11728cabe4,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.98838687
+      objectReference: {fileID: 0}
+    - target: {fileID: 988253026175434765, guid: 1931b899d98ae8543a827f11728cabe4,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: -0.000000115202326
+      objectReference: {fileID: 0}
+    - target: {fileID: 988253026175434765, guid: 1931b899d98ae8543a827f11728cabe4,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.000000115202326
+      objectReference: {fileID: 0}
+    - target: {fileID: 988253026175434765, guid: 1931b899d98ae8543a827f11728cabe4,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 988253026175434765, guid: 1931b899d98ae8543a827f11728cabe4,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 988253026175434765, guid: 1931b899d98ae8543a827f11728cabe4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 988253026175434765, guid: 1931b899d98ae8543a827f11728cabe4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 988253026175434765, guid: 1931b899d98ae8543a827f11728cabe4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 1931b899d98ae8543a827f11728cabe4, type: 3}
 --- !u!1 &1474726999
 GameObject:
  m_ObjectHideFlags: 0
@@ -2081,7 +2214,7 @@ Transform:
  - {fileID: 1738326077}
  - {fileID: 1713108173}
  m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 10
  m_LocalEulerAnglesHint: {x: 0, y: 115.775, z: 0}
 --- !u!1 &1520828248
 GameObject:
@@ -2269,7 +2402,7 @@ Transform:
  m_Children:
  - {fileID: 508810528}
  m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 8
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1578543177
 MonoBehaviour:
@@ -2283,75 +2416,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: f121a54614abe5f4990620bfd6a1c96c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
--- !u!1001 &1613035696
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 1.851648
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 3.287318
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7345399166452899443, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_Name
-      value: Cube (2)
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: d427f0f5ff0359f4c92a56ed37a11542, type: 3}
 --- !u!4 &1636948867 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 6178336183725213671, guid: d424f1b7b8f6a784c95e4f2d5872728e,
@@ -2462,7 +2526,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 9
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1651537456
 MonoBehaviour:
@@ -3246,83 +3310,83 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 10
+  m_RootOrder: 12
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1932930975 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 6178336183725213671, guid: d424f1b7b8f6a784c95e4f2d5872728e,
-    type: 3}
-  m_PrefabInstance: {fileID: 136117052}
-  m_PrefabAsset: {fileID: 0}
--- !u!1001 &1956637259
+--- !u!1001 &1841330314
 PrefabInstance:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
        type: 3}
      propertyPath: m_RootOrder
-      value: 1
+      value: 3
      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
        type: 3}
      propertyPath: m_LocalPosition.x
-      value: 2.3626857
+      value: 1.967169
      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: 0.09999976
+      value: 0.1
      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
        type: 3}
      propertyPath: m_LocalPosition.z
-      value: 3.2854726
+      value: 1.7124462
      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
        type: 3}
      propertyPath: m_LocalRotation.w
      value: 1
      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
        type: 3}
      propertyPath: m_LocalRotation.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
        type: 3}
      propertyPath: m_LocalRotation.y
      value: -0
      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
        type: 3}
      propertyPath: m_LocalRotation.z
      value: -0
      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 7345399166452899443, guid: d427f0f5ff0359f4c92a56ed37a11542,
+    - target: {fileID: 7345399166452899443, guid: c89fd30ca0b56fb41a415d285d87b219,
        type: 3}
      propertyPath: m_Name
      value: Cube (3)
      objectReference: {fileID: 0}
    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: d427f0f5ff0359f4c92a56ed37a11542, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: c89fd30ca0b56fb41a415d285d87b219, type: 3}
+--- !u!4 &1932930975 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 6178336183725213671, guid: d424f1b7b8f6a784c95e4f2d5872728e,
+    type: 3}
+  m_PrefabInstance: {fileID: 136117052}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1986139475
 GameObject:
  m_ObjectHideFlags: 0
@@ -3572,8 +3636,77 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 7
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1993143051
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 1.7056782
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.09999976
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 2.23206
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7345399166452899443, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_Name
+      value: Cube (2)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c89fd30ca0b56fb41a415d285d87b219, type: 3}
 --- !u!1 &2028755710 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 788300690735002878, guid: d424f1b7b8f6a784c95e4f2d5872728e,
@@ -3609,6 +3742,75 @@ BoxCollider:
  serializedVersion: 2
  m_Size: {x: 1.0000001, y: 1, z: 1.0000001}
  m_Center: {x: 0.00000047683716, y: 0, z: -0.00000047683716}
+--- !u!1001 &2046212302
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.43407255
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1.367
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 3.45
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7345399166452899443, guid: c89fd30ca0b56fb41a415d285d87b219,
+        type: 3}
+      propertyPath: m_Name
+      value: Cube
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c89fd30ca0b56fb41a415d285d87b219, type: 3}
 --- !u!1001 &2055143132
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -4328,82 +4530,3 @@ Rigidbody:
  m_Interpolate: 0
  m_Constraints: 0
  m_CollisionDetection: 0
--- !u!1001 &1644364210736311408
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 1644364212353669389, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_InteractionManager
-      value: 
-      objectReference: {fileID: 1989791150}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0.602
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 1.612
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 3.614
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6028983200900377696, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7345399166452899443, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_Name
-      value: Cube
-      objectReference: {fileID: 0}
-    - target: {fileID: 9064848381942311599, guid: d427f0f5ff0359f4c92a56ed37a11542,
-        type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 033ccc1e24564204e939d5aebbf2014f, type: 2}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: d427f0f5ff0359f4c92a56ed37a11542, type: 3}
--- a/Assets/Scenes/Shumpei/GameScene.unity
+++ b/Assets/Scenes/Shumpei/GameScene.unity
--- a/Assets/Scenes/Shumpei/MenuScene.unity
+++ b/Assets/Scenes/Shumpei/MenuScene.unity
--- a/Assets/Scenes/Shumpei/SampleScene.unity
+++ b/Assets/Scenes/Shumpei/SampleScene.unity
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -6,14 +6,11 @@ EditorBuildSettings:
  serializedVersion: 2
  m_Scenes:
  - enabled: 0
-    path: Assets/SimpleNaturePack/Scenes/DO_NOT_TOUCH.unity
+    path: Assets/Scenes/DO_NOT_TOUCH.unity
    guid: 9fc0d4010bbf28b4594072e72b8655ab
  - enabled: 1
    path: Assets/Scenes/JoonasP/SampleScene.unity
    guid: 84eaff0e1a543c244920ec3c1b11b50f
-  - enabled: 1
-    path: Assets/Scenes/Shumpei/GameScene.unity
-    guid: 8fd0e18070efeda42bb8ab22afe4a9fb
  m_configObjects:
    Unity.XR.Oculus.Settings: {fileID: 11400000, guid: bfa1182bd221b4ca89619141f66f1260,
      type: 2}
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -8,7 +8,6 @@ TagManager:
  - Throwable
  - Bullet
  - IceBolt
-  - Hand
  layers:
  - Default
  - TransparentFX
Author	SHA1	Message	Date
jonasty	0719c15400	Merge branch 'staging' into tree-cutting	2022-04-07 11:36:56 +00:00
arlo	bf6bbc6723	log creation	2022-04-04 19:04:09 +03:00
arlo	51d75b196d	tree cut event	2022-04-04 16:09:59 +03:00
arlo	8e50da0a93	added cuttable_tree and axe prefabs	2022-03-28 19:03:33 +03:00