Fix colliders

2020-04-19 17:21:24 +03:00 · 2020-04-19 17:21:24 +03:00 · 05329adce6
commit 05329adce6
parent b301599974
4 changed files with 102 additions and 50 deletions
--- a/Assets/Prefabs/Environment/Campfire.prefab
+++ b/Assets/Prefabs/Environment/Campfire.prefab
@ -100,7 +100,7 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 664587661892241191}
-  - component: {fileID: 3740775333387538961}
+  - component: {fileID: 3313787702854768125}
  m_Layer: 0
  m_Name: Collider
  m_TagString: Untagged
@ -115,15 +115,15 @@ Transform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 4030757379513544979}
-  m_LocalRotation: {x: -0.7069834, y: 0, z: 0, w: 0.7072302}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 100, y: 100, z: 100}
+  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 8265150240760341263}
  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: -89.98, y: 0, z: 0}
--- !u!64 &3740775333387538961
-MeshCollider:
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &3313787702854768125
+BoxCollider:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@ -132,10 +132,9 @@ MeshCollider:
  m_Material: {fileID: 0}
  m_IsTrigger: 0
  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 1
-  m_CookingOptions: 14
-  m_Mesh: {fileID: -4095829847968280453, guid: 4facd75878c39c7499d4291e717cda98, type: 3}
+  serializedVersion: 2
+  m_Size: {x: 1, y: 0.2, z: 1}
+  m_Center: {x: 0, y: 0.041, z: 0}
 --- !u!1 &4797807552203538256
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Prefabs/Environment/Log.prefab
+++ b/Assets/Prefabs/Environment/Log.prefab
@ -1,5 +1,49 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &88365349353915788
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4554968707355299899}
+  - component: {fileID: 5409517528740176079}
+  m_Layer: 0
+  m_Name: Collider
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4554968707355299899
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 88365349353915788}
+  m_LocalRotation: {x: -0, y: -0.10402069, z: -0, w: 0.99457514}
+  m_LocalPosition: {x: 0.03, y: 0.27141744, z: -0.021}
+  m_LocalScale: {x: 3.4379, y: 0.54283494, z: 0.73788685}
+  m_Children: []
+  m_Father: {fileID: 1537215554624875642}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: -11.942, z: 0}
+--- !u!65 &5409517528740176079
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 88365349353915788}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &110889063446132937
 GameObject:
  m_ObjectHideFlags: 0
@ -28,23 +72,10 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 5208747214434309696}
+  - {fileID: 4554968707355299899}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!64 &863242262232210809
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9084453306067018835}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 1
-  m_CookingOptions: 14
-  m_Mesh: {fileID: 2534964839176971238, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, type: 3}
 --- !u!1001 &951274577046027610
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -134,12 +165,6 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, type: 3}
--- !u!1 &9084453306067018835 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 4ea0140474f39ac47bdd8b1bcc130ea2,
-    type: 3}
-  m_PrefabInstance: {fileID: 951274577046027610}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &5208747214434309696 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 4ea0140474f39ac47bdd8b1bcc130ea2,
--- a/Assets/Prefabs/Environment/stick.prefab
+++ b/Assets/Prefabs/Environment/stick.prefab
@ -1,19 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!64 &6294591651480027558
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 992576804869936758}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 1
-  m_CookingOptions: 14
-  m_Mesh: {fileID: 5385617091279237461, guid: 88768e5e916bdea47b890bb833348313, type: 3}
 --- !u!1 &2086008818391599545
 GameObject:
  m_ObjectHideFlags: 0
@ -45,6 +31,7 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 4295605565537018981}
+  - {fileID: 7722979984909929174}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -90,6 +77,50 @@ Rigidbody:
  m_Interpolate: 0
  m_Constraints: 0
  m_CollisionDetection: 0
+--- !u!1 &8445609960004857605
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7722979984909929174}
+  - component: {fileID: 8953589864355665736}
+  m_Layer: 10
+  m_Name: Collider
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7722979984909929174
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8445609960004857605}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.0027, z: 0.2278}
+  m_LocalScale: {x: 0.071112804, y: 0.06466763, z: 0.479739}
+  m_Children: []
+  m_Father: {fileID: 1830340994370403595}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &8953589864355665736
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8445609960004857605}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1001 &9144482413452185471
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -184,12 +215,6 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 88768e5e916bdea47b890bb833348313, type: 3}
--- !u!1 &992576804869936758 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 88768e5e916bdea47b890bb833348313,
-    type: 3}
-  m_PrefabInstance: {fileID: 9144482413452185471}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &4295605565537018981 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313,
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
@ -35,6 +35,9 @@ GraphicsSettings:
  - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
  - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
  - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
  m_PreloadedShaders: []
  m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
    type: 0}