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

cleaned up scripts a little bit

Browse Source
This commit is contained in:
slevy14
2023-04-17 16:47:12 -07:00
parent 275763628b
commit cb059613f9
7 changed files with 170 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

274
Assets/Scenes/GrappleScene.unity
View File

@@ -188,17 +188,6 @@ MonoBehaviour:
player: {fileID: 5885597207104481991, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
spawnPoint: {fileID: 1159415542}
deathCanvas: {fileID: 880696833}
--- !u!114 &129360812 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3465910379319867675, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
m_PrefabInstance: {fileID: 1407172085}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6e8c21a2613bf4423a2f49601a3310e3, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &193907867
GameObject:
m_ObjectHideFlags: 0
@@ -1364,7 +1353,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 519420028}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -25.56, y: -10.43, z: -10}
m_LocalPosition: {x: -24.31, y: -10.73, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -2325,82 +2314,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
propertyPath: m_NotificationBehavior
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
propertyPath: m_ActionEvents.Array.size
value: 4
objectReference: {fileID: 0}
- target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
propertyPath: m_ActionEvents.Array.data[0].m_ActionId
value: 183693a0-ab31-4f85-a4ef-b43b8a80fa77
objectReference: {fileID: 0}
- target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
propertyPath: m_ActionEvents.Array.data[1].m_ActionId
value: 2116b59e-20ee-4f7c-a656-aad81b0ae23a
objectReference: {fileID: 0}
- target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
propertyPath: m_ActionEvents.Array.data[2].m_ActionId
value: 00940c0e-3199-4943-a074-8cde87588db2
objectReference: {fileID: 0}
- target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
propertyPath: m_ActionEvents.Array.data[3].m_ActionId
value: 5a10231f-97fe-4bfb-89d8-4ac906d76de6
objectReference: {fileID: 0}
- target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
propertyPath: m_ActionEvents.Array.data[0].m_ActionName
value: Player/Move[/Keyboard/w,/Keyboard/s,/Keyboard/a,/Keyboard/d]
objectReference: {fileID: 0}
- target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
propertyPath: m_ActionEvents.Array.data[1].m_ActionName
value: Player/Grapple[/Keyboard/l]
objectReference: {fileID: 0}
- target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
propertyPath: m_ActionEvents.Array.data[2].m_ActionName
value: Player/ThrowTambourine[/Keyboard/k]
objectReference: {fileID: 0}
- target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
propertyPath: m_ActionEvents.Array.data[3].m_ActionName
value: Player/Jump[/Keyboard/space]
objectReference: {fileID: 0}
- target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1787574353}
- target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnGrapple
objectReference: {fileID: 0}
- target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: PlayerMovement, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 3465910379319867675, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
propertyPath: m_camera
value:
objectReference: {fileID: 519420031}
- target: {fileID: 5559747613460074786, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
propertyPath: launcher
value:
objectReference: {fileID: 2001713740}
- target: {fileID: 5885597207104481986, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
propertyPath: m_RootOrder
value: 13
@@ -2452,10 +2369,7 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 5885597207104481991, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
insertIndex: 7
addedObject: {fileID: 1787574362}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
--- !u!1 &1411598161
GameObject:
@@ -3259,60 +3173,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1767983939}
m_CullTransparentMesh: 1
--- !u!1 &1787574352 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5885597207104481991, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
m_PrefabInstance: {fileID: 1407172085}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1787574353 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5559747613460074786, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
m_PrefabInstance: {fileID: 1407172085}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1787574352}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7b873819f9a3f36ef898a0403972da28, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1787574354 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
m_PrefabInstance: {fileID: 1407172085}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1787574352}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1787574362
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1787574352}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b0115312556794123a3cafad4b83d0a7, type: 3}
m_Name:
m_EditorClassIdentifier:
moveSpeed: 0
jumpSpeed: 0
airSpeed: 0
playerInput: {fileID: 1787574354}
groundLayer:
serializedVersion: 2
m_Bits: 64
boxSize: {x: 0, y: 0}
maxDistanceFromGround: 0
launcher: {fileID: 2001713740}
hasTambourine: 1
grapplingGun: {fileID: 129360812}
grapplingRope: {fileID: 2119213706}
playerController: {fileID: 1787574353}
stateController: {fileID: 0}
--- !u!1 &1796403731
GameObject:
m_ObjectHideFlags: 0
@@ -10177,43 +10037,79 @@ CompositeCollider2D:
Y: -63125000
m_CompositePaths:
m_Paths:
- - {x: 21, y: -18.882843}
- {x: 21, y: -11.117158}
- {x: 20.882843, y: -11}
- {x: -18.882843, y: -11}
- {x: -19, y: -11.117158}
- {x: -19, y: -16.882843}
- {x: -19.117157, y: -17}
- {x: -27.882841, y: -17}
- {x: -28, y: -16.882843}
- {x: -28, y: -11.117158}
- {x: -28.117159, y: -11}
- {x: -36.882843, y: -11}
- {x: -37, y: -10.882842}
- {x: -37, y: 10.882842}
- {x: -37.117157, y: 11}
- {x: -38, y: 10.882842}
- {x: -38, y: -18.882843}
- {x: -37.882843, y: -19}
- {x: 20.882843, y: -19}
- - {x: -21.117157, y: -6.25}
- {x: -20.882843, y: -6}
- {x: 8.882842, y: -6}
- {x: 9, y: -5.882843}
- {x: 9, y: -1.8268197}
- {x: 2.2543635, y: -4.018818}
- {x: 0.5492318, y: -4.3823714}
- {x: -0.1171574, y: -5}
- {x: -8.882842, y: -5}
- {x: -9.117158, y: -3}
- {x: -34.882843, y: -3}
- {x: -35, y: -3.1171572}
- {x: -35, y: -5.882843}
- {x: -34.882843, y: -6}
- {x: -26.117157, y: -6}
- {x: -25.882843, y: -6.25}
- - {x: 21, y: -11}
- {x: -19, y: -11}
- {x: -19, y: -17}
- {x: -28, y: -17}
- {x: -28, y: -11}
- {x: -37, y: -11}
- {x: -37, y: 11}
- {x: -38, y: 11}
- {x: -38, y: -19}
- {x: 21, y: -19}
- - {x: -25, y: -6.25}
- {x: -24.8125, y: -6.3125}
- {x: -24.09375, y: -6.3125}
- {x: -24, y: -6.25}
- {x: -23.8125, y: -6.3125}
- {x: -23.09375, y: -6.3125}
- {x: -23, y: -6.25}
- {x: -22.8125, y: -6.3125}
- {x: -22.09375, y: -6.3125}
- {x: -22, y: -6.25}
- {x: -21.8125, y: -6.3125}
- {x: -21.09375, y: -6.3125}
- {x: -21, y: -6.25}
- {x: -21, y: -6}
- {x: 9, y: -6}
- {x: 9, y: -1.6875}
- {x: 8.75, y: -1.6875}
- {x: 8.343751, y: -1.78125}
- {x: 8.343751, y: -2}
- {x: 8.0625, y: -2}
- {x: 8, y: -2.0625}
- {x: 8, y: -2.09375}
- {x: 7.375, y: -2.09375}
- {x: 7, y: -2.3125}
- {x: 7, y: -2.34375}
- {x: 6.9687505, y: -2.34375}
- {x: 6.5625, y: -2.375}
- {x: 6, y: -2.6875}
- {x: 5.75, y: -2.6875}
- {x: 5.34375, y: -2.78125}
- {x: 5.34375, y: -3}
- {x: 5.0625, y: -3}
- {x: 5, y: -3.0625}
- {x: 5, y: -3.09375}
- {x: 4.375, y: -3.09375}
- {x: 4, y: -3.3125}
- {x: 4, y: -3.34375}
- {x: 3.96875, y: -3.34375}
- {x: 3.5625, y: -3.375}
- {x: 3, y: -3.6875}
- {x: 2.75, y: -3.6875}
- {x: 2.34375, y: -3.78125}
- {x: 2.34375, y: -4}
- {x: 2.0625, y: -4}
- {x: 2, y: -4.0625}
- {x: 2, y: -4.09375}
- {x: 1.375, y: -4.09375}
- {x: 1, y: -4.3125}
- {x: 1, y: -4.34375}
- {x: 0.96875, y: -4.34375}
- {x: 0.5625, y: -4.375}
- {x: 0, y: -4.6875}
- {x: 0, y: -5}
- {x: -9, y: -5}
- {x: -9, y: -3}
- {x: -35, y: -3}
- {x: -35, y: -6}
- {x: -26, y: -6}
- {x: -26, y: -6.25}
- {x: -25.8125, y: -6.3125}
- {x: -25.09375, y: -6.3125}
m_VertexDistance: 0.11
m_OffsetDistance: 0.2
m_OffsetDistance: 0
m_UseDelaunayMesh: 1
m_CompositeGameObject: {fileID: 1818375521}
--- !u!50 &1818375527
@@ -10585,17 +10481,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2001713740 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6559806128767475056, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
m_PrefabInstance: {fileID: 1407172085}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b49ff353512cc43728014da636fce388, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2026489080
GameObject:
m_ObjectHideFlags: 0
@@ -10708,14 +10593,3 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5e69412b9141e4bdeaaaf00f6dce7b82, type: 3}
--- !u!114 &2119213706 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7648135587659148198, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
m_PrefabInstance: {fileID: 1407172085}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 06317215013e44d0fb7902fbc1c5e84e, type: 3}
m_Name:
m_EditorClassIdentifier: