Skip to content

Commit

Permalink
Fix colliders on items (#1161)
Browse files Browse the repository at this point in the history
* Fix mug and nuke disk colliders

* Delete Temp.meta
  • Loading branch information
cosmiccoincidence authored Apr 1, 2023
1 parent d3e67e7 commit 9931c80
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 63 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ MeshCollider:
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 4300000, guid: 1f6a51ff914835744af4df4e1d477104, type: 2}
m_Mesh: {fileID: -7219886339314900476, guid: f2e09c49a35ed014b911729c7e30ec61, type: 3}
--- !u!114 &874141704920938506
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ GameObject:
- component: {fileID: 4166023753680569077}
- component: {fileID: 1026993963860473145}
- component: {fileID: 7647897630875670444}
- component: {fileID: 7807247313645579261}
- component: {fileID: 3401307552301717060}
m_Layer: 0
m_Name: Mesh
m_TagString: Untagged
Expand Down Expand Up @@ -85,47 +83,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2359780655884948970}
m_Mesh: {fileID: -2660545192345113805, guid: 7fc5df50928c6254ab6a553fe9207656, type: 3}
--- !u!95 &7807247313645579261
Animator:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2359780655884948970}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 95ee7a734e4e51842baf2ebbda1f514c, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &3401307552301717060
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2359780655884948970}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e8cac635f24954048aad3a6ff9110beb, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 2
_addedNetworkObject: {fileID: 4819234911439508660}
_networkObjectCache: {fileID: 4819234911439508660}
IgnoredParameters: []
_animator: {fileID: 7807247313645579261}
_smoothFloats: 1
_interpolation: 2
_clientAuthoritative: 1
_sendToOwner: 0
--- !u!1 &5406170708076973247
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -170,7 +127,7 @@ GameObject:
- component: {fileID: 4819234911439508660}
- component: {fileID: 6573417749823381685}
- component: {fileID: 6351433192589740835}
- component: {fileID: 4044200983548959999}
- component: {fileID: 6642158574034586935}
m_Layer: 10
m_Name: NuclearAuthenticationDisk
m_TagString: Untagged
Expand Down Expand Up @@ -210,11 +167,11 @@ MonoBehaviour:
_componentIndexCache: 0
_addedNetworkObject: {fileID: 4819234911439508660}
_networkObjectCache: {fileID: 4819234911439508660}
_itemId: 0
_itemId: 1
_name: Nuke card
_sprite: {fileID: 0}
_rigidbody: {fileID: 6351433192589740835}
_weight: 0
_weight: 1
Prefab: {fileID: 6891363543938182813}
AttachmentPoint: {fileID: 4619531351315044860}
AttachmentPointAlt: {fileID: 0}
Expand All @@ -236,14 +193,13 @@ MonoBehaviour:
_networkBehaviours:
- {fileID: 7012599125678195309}
- {fileID: 6573417749823381685}
- {fileID: 3401307552301717060}
<ParentNetworkObject>k__BackingField: {fileID: 0}
<ChildNetworkObjects>k__BackingField: []
_isNetworked: 1
_isGlobal: 0
_defaultDespawnType: 0
NetworkObserver: {fileID: 0}
<PrefabId>k__BackingField: 7
<PrefabId>k__BackingField: 24
_scenePathHash: 0
<SceneId>k__BackingField: 0
<AssetPathHash>k__BackingField: 5997849411404917733
Expand Down Expand Up @@ -319,8 +275,8 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!64 &4044200983548959999
MeshCollider:
--- !u!65 &6642158574034586935
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
Expand All @@ -329,7 +285,6 @@ MeshCollider:
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: -2660545192345113805, guid: 7fc5df50928c6254ab6a553fe9207656, type: 3}
serializedVersion: 2
m_Size: {x: 0.124979906, y: 0.07288182, z: 0.12554319}
m_Center: {x: 0.0025279187, y: 0.002431713, z: -0.003230758}
8 changes: 0 additions & 8 deletions Assets/Temp.meta

This file was deleted.

0 comments on commit 9931c80

Please sign in to comment.