mirror of
https://projects.caleb-brown.dev/UDRI-XRT/UDRIGEEKCup2024.git
synced 2025-01-22 07:08:51 -05:00
Merge pull request 'Spear/Bomb placement' (#25) from feature/Placing-Spears-Bombs into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/25
This commit is contained in:
Caleb Brown
commit
24c8635300
@ -146,7 +146,7 @@ BoxCollider:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1788447733110926119}
|
||||
m_Material: {fileID: 0}
|
||||
m_Material: {fileID: 13400000, guid: dc3bbfd9125f2e347bb9f1c735f06a6d, type: 2}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
@ -231,6 +231,89 @@ Transform:
|
||||
- {fileID: 1536981585306734180}
|
||||
m_Father: {fileID: 1636375453069323652}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &3166801514016656370
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1770734278426066368}
|
||||
- component: {fileID: 8616603219355859362}
|
||||
- component: {fileID: 2551241035375866597}
|
||||
m_Layer: 0
|
||||
m_Name: Cube
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1770734278426066368
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3166801514016656370}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7431987605114579495}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &8616603219355859362
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3166801514016656370}
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!23 &2551241035375866597
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3166801514016656370}
|
||||
m_Enabled: 0
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!1 &3606839954148240477
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -413,6 +496,55 @@ Transform:
|
||||
- {fileID: 1332815015800040919}
|
||||
m_Father: {fileID: 1636375453069323652}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &6576664350566874012
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7431987605114579495}
|
||||
- component: {fileID: 5352733153903146815}
|
||||
m_Layer: 0
|
||||
m_Name: BombSpawner
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7431987605114579495
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6576664350566874012}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0.66, y: 1.58, z: 2.18}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1770734278426066368}
|
||||
m_Father: {fileID: 1636375453069323652}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &5352733153903146815
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6576664350566874012}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: b9732855f00e46e4384b94135940ca5e, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
minTimeToSpawn: 1
|
||||
maxTimeToSpawn: 5
|
||||
spawningObject: {fileID: 2419579388047602335, guid: c5a8f57575aacb64984560694a4962a8,
|
||||
type: 3}
|
||||
--- !u!1 &7064439830208491882
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -792,6 +924,7 @@ Transform:
|
||||
- {fileID: 8034144999164062389}
|
||||
- {fileID: 1918621446678392666}
|
||||
- {fileID: 915456421977757450}
|
||||
- {fileID: 7431987605114579495}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
|
||||
--- !u!1001 &708547114002958811
|
||||
|
||||
@ -414,7 +414,6 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 3326712357909623868}
|
||||
- component: {fileID: 83835649525950447}
|
||||
- component: {fileID: 794368612076738499}
|
||||
m_Layer: 6
|
||||
m_Name: Floor
|
||||
m_TagString: Untagged
|
||||
@ -458,44 +457,189 @@ BoxCollider:
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 9.516679, y: 7.8316584, z: 0.34393713}
|
||||
m_Center: {x: -0.23675013, y: -0.63225657, z: -0.16532663}
|
||||
--- !u!114 &794368612076738499
|
||||
--- !u!1 &2485615166349740287
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2485615166349966815}
|
||||
- component: {fileID: 2485615166350701447}
|
||||
- component: {fileID: 2485615166352206195}
|
||||
- component: {fileID: 2493453749786061117}
|
||||
m_Layer: 0
|
||||
m_Name: SM_Trap_Spears_Grate_01
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &2485615166349966815
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2485615166349740287}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 3791814457788830351}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &2485615166350701447
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2485615166349740287}
|
||||
m_Mesh: {fileID: 4300000, guid: 1ecec6c7087f42d4498ad35df0d1a96a, type: 3}
|
||||
--- !u!23 &2485615166352206195
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2485615166349740287}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: 42b64fdb315e3054ea757d8d1c4bcfa7, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 0
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!64 &2493453749786061117
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2485615166349740287}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 0
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 0
|
||||
serializedVersion: 5
|
||||
m_Convex: 1
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: 43763233955543394, guid: 934661d6befa93542862d89b4b2efeaa, type: 2}
|
||||
--- !u!1 &3160096426850143935
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3791814457788830351}
|
||||
- component: {fileID: 5292311596356232144}
|
||||
- component: {fileID: 6838559119320193505}
|
||||
m_Layer: 0
|
||||
m_Name: SpearTrap1
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &3791814457788830351
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3160096426850143935}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0.021, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 6779930256290643908}
|
||||
- {fileID: 2485615166349966815}
|
||||
m_Father: {fileID: 2022335937194353601}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &5292311596356232144
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2341108321183187393}
|
||||
m_GameObject: {fileID: 3160096426850143935}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 9a6ab7cbc45164d19b20476265c251c2, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 9194ad1b3673a7e4cb889b5f359e7968, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_developerDescription:
|
||||
_unityEventResponse:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 83835649525950447}
|
||||
m_TargetAssemblyTypeName: UnityEngine.Collider, UnityEngine
|
||||
m_MethodName: set_enabled
|
||||
m_Mode: 0
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
_actionResponses: []
|
||||
_conditions: []
|
||||
_operator: 0
|
||||
_replayEventBufferOnRegister: 1
|
||||
_eventReference:
|
||||
_usage: 2
|
||||
_event: {fileID: 0}
|
||||
_eventInstancer: {fileID: 0}
|
||||
_variable: {fileID: 11400000, guid: c06694055e7ae4003afe2a672d2eefb0, type: 2}
|
||||
_variableInstancer: {fileID: 0}
|
||||
trapTransform: {fileID: 6779930256290643908}
|
||||
timeToTriggeredPositionSeconds: 0.05
|
||||
trapForce: 400
|
||||
--- !u!54 &6838559119320193505
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3160096426850143935}
|
||||
serializedVersion: 4
|
||||
m_Mass: 1
|
||||
m_Drag: 0
|
||||
m_AngularDrag: 0.05
|
||||
m_CenterOfMass: {x: 0, y: 0, z: 0}
|
||||
m_InertiaTensor: {x: 1, y: 1, z: 1}
|
||||
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ImplicitCom: 1
|
||||
m_ImplicitTensor: 1
|
||||
m_UseGravity: 0
|
||||
m_IsKinematic: 1
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
--- !u!1 &3385517515702562529
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -825,6 +969,112 @@ BoxCollider:
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 9.516679, y: 0.32116082, z: 1.0132122}
|
||||
m_Center: {x: -0.23675013, y: -0.0022117498, z: 0.49380526}
|
||||
--- !u!1 &6779930256290911968
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6779930256290643908}
|
||||
- component: {fileID: 6779930256289941400}
|
||||
- component: {fileID: 6779930256288897210}
|
||||
- component: {fileID: 6841762197158210104}
|
||||
m_Layer: 0
|
||||
m_Name: SM_Trap_Spears_01
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &6779930256290643908
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6779930256290911968}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: -0.5, z: 0}
|
||||
m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 3791814457788830351}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &6779930256289941400
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6779930256290911968}
|
||||
m_Mesh: {fileID: 4300000, guid: ed0763b60f006b24b94165d33ef72639, type: 3}
|
||||
--- !u!23 &6779930256288897210
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6779930256290911968}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: 42b64fdb315e3054ea757d8d1c4bcfa7, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 0
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!64 &6841762197158210104
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6779930256290911968}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 1
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 5
|
||||
m_Convex: 1
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: 43515474539484474, guid: c8f63325df0dc43438718b0c1e304075, type: 2}
|
||||
--- !u!1 &6982859884402800296
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1002,6 +1252,56 @@ Transform:
|
||||
- {fileID: 138377805131740993}
|
||||
m_Father: {fileID: 8935256399111493289}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &8173542664977145518
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2022335937194353601}
|
||||
- component: {fileID: 5502924115426816639}
|
||||
m_Layer: 0
|
||||
m_Name: TripleSpearTrap (1)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &2022335937194353601
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8173542664977145518}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0.7071068, y: -0, z: 0.7071068, w: 0}
|
||||
m_LocalPosition: {x: -0.888, y: 5.528, z: 0.338}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 3791814457788830351}
|
||||
m_Father: {fileID: 8935256399111493289}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: -90, z: 180}
|
||||
--- !u!114 &5502924115426816639
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8173542664977145518}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4524cf338e22a7f4eb5a7770cfa0f14b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Traps:
|
||||
- {fileID: 5292311596356232144}
|
||||
trapUpTimeSeconds: 0.5
|
||||
secondsBetweenTraps: 0.1
|
||||
secondsBetweenCycles: 3
|
||||
--- !u!1 &8315921948237161897
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1303,6 +1603,9 @@ Transform:
|
||||
- {fileID: 3721742445277367395}
|
||||
- {fileID: 2920066772154810048}
|
||||
- {fileID: 6518963546412968841}
|
||||
- {fileID: 3987555519327459730}
|
||||
- {fileID: 7517752195387755193}
|
||||
- {fileID: 2022335937194353601}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
|
||||
--- !u!1 &9177841558424855058
|
||||
@ -3727,6 +4030,90 @@ Transform:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4066125610744287784}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &4202929346861893141
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 8935256399111493289}
|
||||
m_Modifications:
|
||||
- target: {fileID: 164717498750426386, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: trapUpTimeSeconds
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 164717498750426386, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: secondsBetweenCycles
|
||||
value: 0.6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4573722480825020867, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: TripleSpearTrap (2)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5910875775871257772, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0.95
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5910875775871257772, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5.79
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5910875775871257772, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -0.044
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5910875775871257772, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5910875775871257772, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5910875775871257772, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.70710677
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5910875775871257772, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0.70710677
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5910875775871257772, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: -90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5910875775871257772, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: -90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5910875775871257772, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: -90
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 121350421bed33542bd698b5be4e88de, type: 3}
|
||||
--- !u!4 &7517752195387755193 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5910875775871257772, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4202929346861893141}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &4458612205976670866
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -5444,6 +5831,80 @@ Transform:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6951487986547132677}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &7300619414606304574
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 8935256399111493289}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4573722480825020867, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: TripleSpearTrap
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5910875775871257772, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -2.8461044
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5910875775871257772, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 4.6830406
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5910875775871257772, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -0.044
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5910875775871257772, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5910875775871257772, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5910875775871257772, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5910875775871257772, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5910875775871257772, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5910875775871257772, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5910875775871257772, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 121350421bed33542bd698b5be4e88de, type: 3}
|
||||
--- !u!4 &3987555519327459730 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5910875775871257772, guid: 121350421bed33542bd698b5be4e88de,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7300619414606304574}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &7408955396508348284
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -18,14 +18,44 @@ namespace MAVRIC.GEEKCup.Obstacles
|
||||
public ParticleSystem.ShapeModule editableShape;
|
||||
|
||||
public bool primed;
|
||||
private bool isBlowingUp;
|
||||
private bool primeTimedOut;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
StartCoroutine(Timeout());
|
||||
IEnumerator Timeout()
|
||||
{
|
||||
yield return new WaitForSeconds(2.5f);
|
||||
BombBlowUp();
|
||||
}
|
||||
}
|
||||
|
||||
private void OnCollisionEnter(Collision collision)
|
||||
{
|
||||
if(primeTimedOut) return;
|
||||
if (!primed)
|
||||
{
|
||||
primed = true;
|
||||
primeTimedOut = true;
|
||||
|
||||
StartCoroutine(TimeOut());
|
||||
|
||||
IEnumerator TimeOut()
|
||||
{
|
||||
yield return new WaitForSeconds(0.1f);
|
||||
primeTimedOut = false;
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
BombBlowUp();
|
||||
}
|
||||
|
||||
private void BombBlowUp()
|
||||
{
|
||||
if (isBlowingUp) return;
|
||||
isBlowingUp = true;
|
||||
ParticleSystem.gameObject.SetActive(true);
|
||||
|
||||
editableShape = ParticleSystem.shape;
|
||||
|
||||
@ -53,9 +53,9 @@ MonoBehaviour:
|
||||
modelObject: {fileID: 574622137581127472}
|
||||
explosionCollider: {fileID: 2062151216756559112}
|
||||
ParticleSystem: {fileID: 2338365619017100808}
|
||||
maxExplosionRadius: 50
|
||||
maxExplosionRadius: 35
|
||||
maxDonutRadius: 10
|
||||
primed: 0
|
||||
primeCount: 1
|
||||
--- !u!54 &3892836975496304009
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -9,6 +9,6 @@ PhysicMaterial:
|
||||
m_Name: BombMatPhysic
|
||||
dynamicFriction: 0.6
|
||||
staticFriction: 0.6
|
||||
bounciness: 0.6
|
||||
bounciness: 1
|
||||
frictionCombine: 0
|
||||
bounceCombine: 0
|
||||
|
||||
@ -9,6 +9,6 @@ PhysicMaterial:
|
||||
m_Name: FairwayCoursePhysics
|
||||
dynamicFriction: 0.6
|
||||
staticFriction: 0.6
|
||||
bounciness: 0
|
||||
bounciness: 0.6
|
||||
frictionCombine: 3
|
||||
bounceCombine: 0
|
||||
|
||||
@ -1257,6 +1257,16 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 7996369175356688129}
|
||||
m_Modifications:
|
||||
- target: {fileID: 167750929553450816, guid: 0c2d73280f95e463cb0a553c52a488a7,
|
||||
type: 3}
|
||||
propertyPath: maxTimeToSpawn
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 167750929553450816, guid: 0c2d73280f95e463cb0a553c52a488a7,
|
||||
type: 3}
|
||||
propertyPath: minTimeToSpawn
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 495058795846670109, guid: 0c2d73280f95e463cb0a553c52a488a7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -1307,6 +1317,17 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1071230023525651534, guid: 0c2d73280f95e463cb0a553c52a488a7,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1071230023525651534, guid: 0c2d73280f95e463cb0a553c52a488a7,
|
||||
type: 3}
|
||||
propertyPath: m_Material
|
||||
value:
|
||||
objectReference: {fileID: 13400000, guid: dc3bbfd9125f2e347bb9f1c735f06a6d,
|
||||
type: 2}
|
||||
- target: {fileID: 2506878890429512572, guid: 0c2d73280f95e463cb0a553c52a488a7,
|
||||
type: 3}
|
||||
propertyPath: m_Mesh
|
||||
|
||||
Loading…
Reference in New Issue
Block a user