Merge branch 'main' of https://github.com/Hey-Mikelangelo/open-project-1 into pr-bash

4 年前 · 9d05162d
--- a/UOP1_Project/Assets/Prefabs/GameplayEssentials/CameraSystem.prefab
+++ b/UOP1_Project/Assets/Prefabs/GameplayEssentials/CameraSystem.prefab
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 5457523176376150323}
-  m_LocalRotation: {x: 0.22975291, y: -9.602319e-22, z: 2.8636668e-22, w: 0.973249}
+  m_LocalRotation: {x: 0.22975291, y: -0, z: -0, w: 0.973249}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  m_EditorClassIdentifier: 
  m_CollideAgainst:
    serializedVersion: 2
-    m_Bits: 2049
+    m_Bits: 10241
  m_IgnoreTag: 
  m_TransparentLayers:
    serializedVersion: 2
--- a/UOP1_Project/Assets/Prefabs/Nature/Trees/Tree.prefab
+++ b/UOP1_Project/Assets/Prefabs/Nature/Trees/Tree.prefab
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5988098909633967672
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1196795063792243136}
+  - component: {fileID: 2615550872687207979}
+  m_Layer: 13
+  m_Name: Leaves
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1196795063792243136
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5988098909633967672}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.53, y: 3.43, z: 0.24}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 6434799244096359547}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &2615550872687207979
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5988098909633967672}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 1.89
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!136 &4744890041706611347
 CapsuleCollider:
  m_ObjectHideFlags: 0
    type: 3}
  m_PrefabInstance: {fileID: 6829223592588061584}
  m_PrefabAsset: {fileID: 0}
+--- !u!4 &6434799244096359547 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0cc589ab20a19e14c9b7c52965ebd4eb,
+    type: 3}
+  m_PrefabInstance: {fileID: 6829223592588061584}
+  m_PrefabAsset: {fileID: 0}
--- a/UOP1_Project/Assets/Prefabs/Nature/Trees/Tree2.prefab
+++ b/UOP1_Project/Assets/Prefabs/Nature/Trees/Tree2.prefab
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!136 &7582380651766892676
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3206009959637394402}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 0.38
+  m_Height: 3.96
+  m_Direction: 1
+  m_Center: {x: 0, y: 1.48, z: 0}
+--- !u!1 &5085729515796560085
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8341260179520600969}
+  - component: {fileID: 3891764386928688621}
+  m_Layer: 13
+  m_Name: Leaves
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8341260179520600969
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5085729515796560085}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 3.6, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2825403755275319640}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &3891764386928688621
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5085729515796560085}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 1.79
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1001 &2359711122858188467
 PrefabInstance:
  m_ObjectHideFlags: 0
    - target: {fileID: 919132149155446097, guid: d1ad4c1691331f84483ea7dda70828ec,
        type: 3}
      propertyPath: m_Name
-      value: TreeMedium
+      value: Tree2
      objectReference: {fileID: 0}
    - target: {fileID: 919132149155446097, guid: d1ad4c1691331f84483ea7dda70828ec,
        type: 3}
+    - target: {fileID: 919132149155446097, guid: d1ad4c1691331f84483ea7dda70828ec,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+--- !u!1 &3206009959637394402 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d1ad4c1691331f84483ea7dda70828ec,
+    type: 3}
+  m_PrefabInstance: {fileID: 2359711122858188467}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &2825403755275319640 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d1ad4c1691331f84483ea7dda70828ec,
+    type: 3}
+  m_PrefabInstance: {fileID: 2359711122858188467}
+  m_PrefabAsset: {fileID: 0}
--- a/UOP1_Project/Assets/Prefabs/Nature/Trees/TreeBig.prefab
+++ b/UOP1_Project/Assets/Prefabs/Nature/Trees/TreeBig.prefab
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!136 &2688065103303381318
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3985924782578800889}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 1.3
+  m_Height: 6.41
+  m_Direction: 1
+  m_Center: {x: 0.25, y: 1.83, z: 0}
+--- !u!135 &6407317570148378413
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3985924782578800889}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 2.15
+  m_Center: {x: 0.19, y: 0, z: 0}
+--- !u!1 &7410546550891089040
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 736270486309377558}
+  - component: {fileID: 5957174725726031327}
+  - component: {fileID: 6239691750743247801}
+  - component: {fileID: 287855975843352950}
+  m_Layer: 13
+  m_Name: Leaves
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &736270486309377558
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7410546550891089040}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.06, y: 5.79, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4331066273685914179}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!136 &5957174725726031327
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7410546550891089040}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 1.26
+  m_Height: 7.17
+  m_Direction: 0
+  m_Center: {x: 0, y: 0, z: -0.19}
+--- !u!136 &6239691750743247801
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7410546550891089040}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 1.26
+  m_Height: 7.17
+  m_Direction: 0
+  m_Center: {x: 0, y: 0, z: -2.69}
+--- !u!136 &287855975843352950
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7410546550891089040}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 1.26
+  m_Height: 7.17
+  m_Direction: 0
+  m_Center: {x: 0, y: 0, z: 2.11}
 --- !u!1001 &4292406161015317928
 PrefabInstance:
  m_ObjectHideFlags: 0
      propertyPath: m_StaticEditorFlags
      value: 123
      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: ad449e335a49648d592056fd8b67a926,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+--- !u!1 &3985924782578800889 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: ad449e335a49648d592056fd8b67a926,
+    type: 3}
+  m_PrefabInstance: {fileID: 4292406161015317928}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &4331066273685914179 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ad449e335a49648d592056fd8b67a926,
+    type: 3}
+  m_PrefabInstance: {fileID: 4292406161015317928}
+  m_PrefabAsset: {fileID: 0}
--- a/UOP1_Project/Assets/Prefabs/Nature/Trees/Tree_Flat.prefab
+++ b/UOP1_Project/Assets/Prefabs/Nature/Trees/Tree_Flat.prefab
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3013778605057033789
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2008671436872607390}
+  - component: {fileID: 7645374413127756968}
+  m_Layer: 13
+  m_Name: Leaves
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2008671436872607390
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3013778605057033789}
+  m_LocalRotation: {x: -0, y: -0.34964705, z: -0, w: 0.93688154}
+  m_LocalPosition: {x: 1.66, y: 3.81, z: 1.03}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4331684663147366858}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: -40.931004, z: 0}
+--- !u!136 &7645374413127756968
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3013778605057033789}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 0.63
+  m_Height: 3.23
+  m_Direction: 0
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!136 &6240547564398072750
 CapsuleCollider:
  m_ObjectHideFlags: 0
  m_Radius: 0.46
  m_Height: 6.24
  m_Direction: 1
-  m_Center: {x: -0.03, y: 3.042519, z: -0.015630126}
+  m_Center: {x: -0.03, y: 2.42, z: -0.015630126}
+--- !u!1 &7636967023563285346
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 928237527671357369}
+  - component: {fileID: 4498040627373945602}
+  m_Layer: 13
+  m_Name: Leaves (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &928237527671357369
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7636967023563285346}
+  m_LocalRotation: {x: -0, y: 0.11348279, z: -0, w: 0.99354}
+  m_LocalPosition: {x: -0.89, y: 5.25, z: -0.57}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4331684663147366858}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 13.032001, z: 0}
+--- !u!136 &4498040627373945602
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7636967023563285346}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 1.12
+  m_Height: 5.5
+  m_Direction: 0
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1001 &4294047267957337633
 PrefabInstance:
  m_ObjectHideFlags: 0
    type: 3}
  m_PrefabInstance: {fileID: 4294047267957337633}
  m_PrefabAsset: {fileID: 0}
+--- !u!4 &4331684663147366858 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5a7f9fabb0c51e946ab0cfc2cd5b8151,
+    type: 3}
+  m_PrefabInstance: {fileID: 4294047267957337633}
+  m_PrefabAsset: {fileID: 0}
--- a/UOP1_Project/Assets/Prefabs/Nature/Trees/Tree_Mushroom.prefab
+++ b/UOP1_Project/Assets/Prefabs/Nature/Trees/Tree_Mushroom.prefab
  m_IsTrigger: 0
  m_Enabled: 1
  m_Radius: 0.31
-  m_Height: 3
+  m_Height: 3.46
-  m_Center: {x: 0.06454709, y: 1.4155546, z: 0.036566973}
+  m_Center: {x: 0, y: 1.26, z: 0}
+--- !u!1 &9201311995933557795
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6319162084336413156}
+  - component: {fileID: 7369160983686299425}
+  m_Layer: 13
+  m_Name: Leaves
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6319162084336413156
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9201311995933557795}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 3.26, z: -0.05}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 8271441551491845698}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &7369160983686299425
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9201311995933557795}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 2.09
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1001 &8448938963756820905
 PrefabInstance:
  m_ObjectHideFlags: 0
    type: 3}
  m_PrefabInstance: {fileID: 8448938963756820905}
  m_PrefabAsset: {fileID: 0}
+--- !u!4 &8271441551491845698 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 23d0d9d63e18d7b49b634970d337728e,
+    type: 3}
+  m_PrefabInstance: {fileID: 8448938963756820905}
+  m_PrefabAsset: {fileID: 0}
--- a/UOP1_Project/Assets/Prefabs/Nature/Trees/Tree_Swirl.prefab
+++ b/UOP1_Project/Assets/Prefabs/Nature/Trees/Tree_Swirl.prefab
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4056575592252912706
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8392565229279509421}
+  - component: {fileID: 6594023889645658588}
+  m_Layer: 13
+  m_Name: Leaves (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8392565229279509421
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4056575592252912706}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.14, y: 1.39, z: 1.06}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 5915946319903924327}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!136 &6594023889645658588
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4056575592252912706}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 0.44
+  m_Height: 1.18
+  m_Direction: 1
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &5859954024079497084
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4246285384286348339}
+  - component: {fileID: 6423932013603045291}
+  m_Layer: 13
+  m_Name: Leaves
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4246285384286348339
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5859954024079497084}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.43, y: 3.46, z: -0.24}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 5915946319903924327}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!136 &6423932013603045291
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5859954024079497084}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 1.56
+  m_Height: 4.3
+  m_Direction: 1
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!136 &4770059545182144234
 CapsuleCollider:
  m_ObjectHideFlags: 0
  m_Material: {fileID: 0}
  m_IsTrigger: 0
  m_Enabled: 1
-  m_Radius: 0.53
-  m_Height: 4.707387
+  m_Radius: 0.16
+  m_Height: 3.1
-  m_Center: {x: -0, y: 2.2526865, z: -0.03677708}
+  m_Center: {x: -0, y: 1.22, z: 0}
 --- !u!1001 &6166290628584556428
 PrefabInstance:
  m_ObjectHideFlags: 0
    type: 3}
  m_PrefabInstance: {fileID: 6166290628584556428}
  m_PrefabAsset: {fileID: 0}
+--- !u!4 &5915946319903924327 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 19a41c41dbe106b438436bf1ac788e53,
+    type: 3}
+  m_PrefabInstance: {fileID: 6166290628584556428}
+  m_PrefabAsset: {fileID: 0}
--- a/UOP1_Project/ProjectSettings/DynamicsManager.asset
+++ b/UOP1_Project/ProjectSettings/DynamicsManager.asset
  m_ClothInterCollisionDistance: 0.1
  m_ClothInterCollisionStiffness: 0.2
  m_ContactsGeneration: 1
-  m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+  m_LayerCollisionMatrix: ffdfffffffdfffffffdfffffffffffffffdfffffffdfffffffffffffffffffffffdfffffffdfffffffdfffffffdfffffffdfffffc8c0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
  m_AutoSimulation: 1
  m_AutoSyncTransforms: 0
  m_ReuseCollisionCallbacks: 1
--- a/UOP1_Project/ProjectSettings/TagManager.asset
+++ b/UOP1_Project/ProjectSettings/TagManager.asset
  - HideWaterMask
  - OccludingObjects
  - OccludedTransparents
-  - 
+  - TreeLeaves
  - 
  - 
  -