fums/ofb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change: Fixed some of the colliders on geometry, and removed an old grapple point

Browse Source
This commit is contained in:
Nicholas Novak
2023-05-07 00:09:04 -07:00
parent 4135171a79
commit f5beaf0fe9
1 changed files with 100 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

194
Assets/Scenes/MushroomForest.unity
View File

@@ -184,7 +184,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
propertyPath: m_RootOrder
value: 34
value: 33
objectReference: {fileID: 0}
- target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
propertyPath: m_LocalPosition.x
@@ -399,11 +399,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
propertyPath: m_LocalPosition.x
value: -26
value: -23.1
objectReference: {fileID: 0}
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
propertyPath: m_LocalPosition.y
value: 35.8
value: 31.5
objectReference: {fileID: 0}
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
propertyPath: m_LocalPosition.z
@@ -538,7 +538,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 22
m_RootOrder: 21
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &272640804
GameObject:
@@ -631,7 +631,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 18
m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &277557301
PrefabInstance:
@@ -825,7 +825,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 19
m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &353472570
GameObject:
@@ -971,7 +971,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 24
m_RootOrder: 23
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &377548165
GameObject:
@@ -1055,7 +1055,7 @@ Transform:
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 30
m_RootOrder: 29
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &380422480
GameObject:
@@ -1148,7 +1148,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 20
m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &404810523
PrefabInstance:
@@ -1354,7 +1354,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 23
m_RootOrder: 22
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &440397388
BoxCollider2D:
@@ -1432,7 +1432,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 17
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &599868449
BoxCollider2D:
@@ -1589,7 +1589,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 16
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &625004206
GameObject:
@@ -1717,7 +1717,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 40
m_RootOrder: 39
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &708704664
GameObject:
@@ -1861,6 +1861,7 @@ Transform:
m_Children:
- {fileID: 1809671261}
- {fileID: 168704917}
- {fileID: 1755104000}
m_Father: {fileID: 0}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2008,7 +2009,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 31
m_RootOrder: 30
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &881612903
PrefabInstance:
@@ -2276,7 +2277,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 37
m_RootOrder: 36
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -4528,7 +4529,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
propertyPath: m_RootOrder
value: 26
value: 25
objectReference: {fileID: 0}
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
propertyPath: m_LocalPosition.x
@@ -6084,7 +6085,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 29
m_RootOrder: 28
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 16.086}
--- !u!1001 &1300684579
PrefabInstance:
@@ -6269,7 +6270,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 38
m_RootOrder: 37
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -23.922}
--- !u!1 &1464762821
GameObject:
@@ -6417,71 +6418,6 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
--- !u!1001 &1510697823
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 367295637452716247, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
propertyPath: m_Name
value: GrappleBox (1)
objectReference: {fileID: 0}
- target: {fileID: 1025473297745678352, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
propertyPath: m_Radius
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
propertyPath: m_RootOrder
value: 13
objectReference: {fileID: 0}
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
propertyPath: m_LocalPosition.x
value: 6.0668344
objectReference: {fileID: 0}
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
propertyPath: m_LocalPosition.y
value: 45.00944
objectReference: {fileID: 0}
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
propertyPath: m_LocalPosition.z
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
--- !u!1 &1581570628
GameObject:
m_ObjectHideFlags: 0
@@ -6558,7 +6494,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 28
m_RootOrder: 27
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1612458169
PrefabInstance:
@@ -6635,7 +6571,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
propertyPath: m_RootOrder
value: 14
value: 13
objectReference: {fileID: 0}
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
propertyPath: m_LocalPosition.x
@@ -6826,7 +6762,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 25
m_RootOrder: 24
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1689909171
GameObject:
@@ -6997,7 +6933,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 39
m_RootOrder: 38
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -7018,7 +6954,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
propertyPath: m_RootOrder
value: 33
value: 32
objectReference: {fileID: 0}
- target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
propertyPath: m_LocalPosition.x
@@ -7069,6 +7005,76 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
--- !u!1001 &1755103999
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 784959645}
m_Modifications:
- target: {fileID: 3694183975375614525, guid: d89768fad21a147d59156c6b9503b913, type: 3}
propertyPath: m_Name
value: DeathZone (2)
objectReference: {fileID: 0}
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
propertyPath: m_RootOrder
value: -1
objectReference: {fileID: 0}
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
propertyPath: m_LocalScale.x
value: 64.7
objectReference: {fileID: 0}
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
propertyPath: m_LocalPosition.x
value: 8.5
objectReference: {fileID: 0}
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
propertyPath: m_LocalPosition.y
value: 49.2
objectReference: {fileID: 0}
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
propertyPath: m_LocalPosition.z
value: -1.6646442
objectReference: {fileID: 0}
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d89768fad21a147d59156c6b9503b913, type: 3}
--- !u!4 &1755104000 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
m_PrefabInstance: {fileID: 1755103999}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1757844132
PrefabInstance:
m_ObjectHideFlags: 0
@@ -7091,7 +7097,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
propertyPath: m_RootOrder
value: 27
value: 26
objectReference: {fileID: 0}
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
propertyPath: m_LocalPosition.x
@@ -19756,7 +19762,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
propertyPath: m_RootOrder
value: 36
value: 35
objectReference: {fileID: 0}
- target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
propertyPath: m_LocalPosition.x
@@ -19902,7 +19908,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 15
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1932598057
GameObject:
@@ -19995,7 +20001,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 21
m_RootOrder: 20
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1997830446
PrefabInstance:
@@ -20015,7 +20021,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
propertyPath: m_RootOrder
value: 35
value: 34
objectReference: {fileID: 0}
- target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
propertyPath: m_LocalPosition.x
@@ -20076,7 +20082,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
propertyPath: m_RootOrder
value: 32
value: 31
objectReference: {fileID: 0}
- target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
propertyPath: m_LocalPosition.x