Pull request #9: Obstacles

Merge in CEGJ/32bit_jam_conjure from Obstacles to Dev

* commit '8727aaceaa702b8efe0f762e43f92f5be06f8ddf':
  fix vanish unhook
  Rotator exist but cant go fast for collisions
  Added rotating object
  added magnitude to Vanisher inspector
  Shake obj before vanish
  Created vanish prefab
  Obj can vanish and reappear on interaction
  Added a blow zone
  Create path tracing prefab
This commit is contained in:
Soulaha 2022-10-24 01:36:46 +00:00
commit ede5429ff8
21 changed files with 6235 additions and 497 deletions

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d1558bd1d64999848ac885c752595324
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,263 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &507150367751830052
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 507150367751830053}
m_Layer: 0
m_Name: pos2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &507150367751830053
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 507150367751830052}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 10, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 507150368245936246}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &507150368010421230
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 507150368010421218}
- component: {fileID: 507150368010421217}
- component: {fileID: 507150368010421216}
- component: {fileID: 507150368010421231}
- component: {fileID: 507150368010421219}
- component: {fileID: 507150368010421221}
m_Layer: 6
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &507150368010421218
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 507150368010421230}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 507150368245936246}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &507150368010421217
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 507150368010421230}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &507150368010421216
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 507150368010421230}
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: 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!65 &507150368010421231
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 507150368010421230}
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!54 &507150368010421219
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 507150368010421230}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!114 &507150368010421221
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 507150368010421230}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 52f427abc109c03429b4475effc7056e, type: 3}
m_Name:
m_EditorClassIdentifier:
path:
- {fileID: 507150368626235129}
- {fileID: 507150367751830053}
- {fileID: 507150368476384141}
speed: 4
loop: 1
--- !u!1 &507150368245936245
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 507150368245936246}
m_Layer: 0
m_Name: MovingCube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &507150368245936246
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 507150368245936245}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 507150368010421218}
- {fileID: 507150368626235129}
- {fileID: 507150367751830053}
- {fileID: 507150368476384141}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &507150368476384140
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 507150368476384141}
m_Layer: 0
m_Name: pos3
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &507150368476384141
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 507150368476384140}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 5, y: 5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 507150368245936246}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &507150368626235128
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 507150368626235129}
m_Layer: 0
m_Name: pos1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &507150368626235129
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 507150368626235128}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 507150368245936246}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 9723b3e4256aab94e99ca1c7527bb38d
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -105,8 +105,8 @@ Rigidbody:
m_UseGravity: 1 m_UseGravity: 1
m_IsKinematic: 0 m_IsKinematic: 0
m_Interpolate: 0 m_Interpolate: 0
m_Constraints: 88 m_Constraints: 8
m_CollisionDetection: 0 m_CollisionDetection: 2
--- !u!114 &1772573266731274173 --- !u!114 &1772573266731274173
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -0,0 +1,341 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8185732857791692160
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8185732857791692161}
- component: {fileID: 8185732857791692172}
- component: {fileID: 8185732857791692175}
- component: {fileID: 8185732857791692174}
m_Layer: 6
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8185732857791692161
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8185732857791692160}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 4.8, z: 0}
m_LocalScale: {x: 1, y: 5.2375, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8185732859686289158}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &8185732857791692172
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8185732857791692160}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &8185732857791692175
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8185732857791692160}
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: 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!65 &8185732857791692174
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8185732857791692160}
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 &8185732858306452726
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8185732858306452727}
- component: {fileID: 8185732858306452722}
- component: {fileID: 8185732858306452725}
- component: {fileID: 8185732858306452724}
m_Layer: 6
m_Name: Sphere
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8185732858306452727
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8185732858306452726}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8185732859686289158}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &8185732858306452722
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8185732858306452726}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &8185732858306452725
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8185732858306452726}
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: 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!135 &8185732858306452724
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8185732858306452726}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.5
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &8185732858472026408
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8185732858472026409}
- component: {fileID: 8185732858472026388}
- component: {fileID: 8185732858472026391}
- component: {fileID: 8185732858472026390}
m_Layer: 6
m_Name: Cube_01
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8185732858472026409
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8185732858472026408}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -4.36, z: 0}
m_LocalScale: {x: 1, y: 5.2375, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8185732859686289158}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &8185732858472026388
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8185732858472026408}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &8185732858472026391
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8185732858472026408}
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: 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!65 &8185732858472026390
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8185732858472026408}
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 &8185732859686289177
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8185732859686289158}
- component: {fileID: 8185732859686289159}
m_Layer: 6
m_Name: Rotator
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8185732859686289158
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8185732859686289177}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 23.22, y: 15.62, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8185732857791692161}
- {fileID: 8185732858472026409}
- {fileID: 8185732858306452727}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8185732859686289159
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8185732859686289177}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7b2b8a83b829aea4993ad3e35b793597, type: 3}
m_Name:
m_EditorClassIdentifier:
rotSpeed: 50

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 3aef9205067d34c46bee46559d8e90dd
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,115 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &7967733336278028250
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7967733336278028253}
- component: {fileID: 7967733336278028254}
- component: {fileID: 7967733336278028255}
- component: {fileID: 7967733336278028252}
- component: {fileID: 7967733336278028241}
m_Layer: 6
m_Name: VanishingCube
m_TagString: Vanishing
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7967733336278028253
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7967733336278028250}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 20.08, y: 12.45, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &7967733336278028254
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7967733336278028250}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &7967733336278028255
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7967733336278028250}
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: 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!65 &7967733336278028252
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7967733336278028250}
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!114 &7967733336278028241
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7967733336278028250}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9701f1b28a113754d906bf5b88f98178, type: 3}
m_Name:
m_EditorClassIdentifier:
timeToVanish: 2
timeToAppear: 1
magnitude: 3

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: bb451447e74142046902fe2a6e583147
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

27
Assets/Rotator.cs Normal file
View File

@ -0,0 +1,27 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Rotator : MonoBehaviour
{
[SerializeField]
private float rotSpeed;
private Vector3 EulerRot;
[SerializeField]
private List<Rigidbody> bodies;
private Rigidbody rb;
// Start is called before the first frame update
void Start()
{
bodies.AddRange(GetComponentsInChildren<Rigidbody>());
rb = GetComponent<Rigidbody>();
EulerRot = new Vector3(0, 0, rotSpeed);
}
// Update is called once per frame
void FixedUpdate()
{
rb.MoveRotation(rb.rotation * Quaternion.Euler(EulerRot * Time.fixedDeltaTime));
}
}

11
Assets/Rotator.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 7b2b8a83b829aea4993ad3e35b793597
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,30 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class BlowZone : MonoBehaviour
{
private Rigidbody playerRb;
private ParticleSystem particles;
[SerializeField]
private Vector3 dir;
[SerializeField]
private float force;
// Start is called before the first frame update
void Start()
{
particles = GetComponent<ParticleSystem>();
var mainPart = particles.main;
mainPart.startSpeedMultiplier = force/3;
}
private void OnTriggerStay(Collider other) {
if(other.tag.Equals("Player")){
if(playerRb == null){
playerRb = other.gameObject.GetComponent<Rigidbody>();
}
playerRb.AddForce(transform.forward * force);
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 73f152023ce29ca458361e87d637a999
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -56,7 +56,6 @@ public class CharacterMovement : MonoBehaviour
} }
if (canWalk || canJump) if (canWalk || canJump)
{ {
Debug.Log("test");
//The walk is actually handled here //The walk is actually handled here
if (!stopWalk) if (!stopWalk)
{ {

View File

@ -42,6 +42,8 @@ public class GrappleHook : MonoBehaviour
private bool grappled = false, grappling = false, boosted = false, changingLength = false, isStunned = false; private bool grappled = false, grappling = false, boosted = false, changingLength = false, isStunned = false;
float changingLengthDir = 0; float changingLengthDir = 0;
private Vector3 currGrappleEndPos; private Vector3 currGrappleEndPos;
private GameObject hookedTo; // The obj we are hooked to
public GameObject HookedTo{get => hookedTo; set => hookedTo = value;}
#region private methods #region private methods
void Start() void Start()
@ -60,7 +62,7 @@ public class GrappleHook : MonoBehaviour
} }
if(grappled){ if(grappled){
DrawRope(Time.deltaTime); UpdateRope(Time.deltaTime);
if(boosted){ if(boosted){
joint.maxDistance -= grappleBoostSpeed * Time.deltaTime; joint.maxDistance -= grappleBoostSpeed * Time.deltaTime;
@ -92,20 +94,21 @@ public class GrappleHook : MonoBehaviour
} }
} }
private void DrawRope(float deltaTime){ private void UpdateRope(float deltaTime){
// TODO animate a wiggle on the rope // TODO animate a wiggle on the rope
if(!grappled)return; if(!grappled)return;
lr.SetPosition(0, gunPos.position); lr.SetPosition(0, gunPos.position);
Vector3 endPoint; Vector3 endPoint;
if(hit.rigidbody != null){ endPoint = hookedTo.transform.TransformPoint(hitPosLocal);
endPoint = hit.transform.TransformPoint(hitPosLocal);
}else{
endPoint = hit.point;
}
currGrappleEndPos = Vector3.Lerp(currGrappleEndPos, endPoint, deltaTime * grappleDrawingSpeed); currGrappleEndPos = Vector3.Lerp(currGrappleEndPos, endPoint, deltaTime * grappleDrawingSpeed);
lr.SetPosition(1, currGrappleEndPos); lr.SetPosition(1, currGrappleEndPos);
if(!lr.enabled)lr.enabled = true; if(!lr.enabled)lr.enabled = true;
if(hit.rigidbody != null){
joint.connectedAnchor = hitPosLocal;
}else{
joint.connectedAnchor = endPoint;
}
} }
private void StartGrapple(RaycastHit hit){ private void StartGrapple(RaycastHit hit){
@ -120,12 +123,13 @@ public class GrappleHook : MonoBehaviour
joint.anchor = transform.InverseTransformPoint(gunPos.position); joint.anchor = transform.InverseTransformPoint(gunPos.position);
joint.autoConfigureConnectedAnchor = false; joint.autoConfigureConnectedAnchor = false;
joint.maxDistance = hit.distance * 0.9f; joint.maxDistance = hit.distance * 0.9f;
hitPosLocal = hit.transform.InverseTransformPoint(hit.point);
if(hit.rigidbody != null){ if(hit.rigidbody != null){
Rigidbody hitRb = hit.rigidbody; Rigidbody hitRb = hit.rigidbody;
joint.connectedBody = hitRb; joint.connectedBody = hitRb;
joint.connectedAnchor = hit.transform.InverseTransformPoint(hit.point); joint.connectedAnchor = hitPosLocal;
joint.enableCollision = true; joint.enableCollision = true;
hitPosLocal = hit.transform.InverseTransformPoint(hit.point);
}else{ }else{
joint.connectedAnchor = hit.point; joint.connectedAnchor = hit.point;
} }
@ -133,6 +137,10 @@ public class GrappleHook : MonoBehaviour
joint.damper = grappleDamper; joint.damper = grappleDamper;
joint.massScale = 4.5f; joint.massScale = 4.5f;
if(hit.transform.tag.Equals("Vanishing")){
hit.transform.gameObject.GetComponent<Vanisher>().Begin(this);
}
hookedTo = hit.transform.gameObject;
currGrappleEndPos = transform.position; currGrappleEndPos = transform.position;
} }
@ -142,6 +150,7 @@ public class GrappleHook : MonoBehaviour
lr.enabled = false; lr.enabled = false;
boosted = false; boosted = false;
Destroy(joint); Destroy(joint);
hookedTo = this.gameObject;
} }
private Vector2 WorldToUI(Vector3 point){ private Vector2 WorldToUI(Vector3 point){
@ -169,6 +178,11 @@ public void Stun(float duration){
EndGrapple(); EndGrapple();
Invoke("UnStun", duration); Invoke("UnStun", duration);
} }
public void Unhook(GameObject hookedObj){
if(hookedObj.Equals(hookedTo))
EndGrapple();
}
#endregion #endregion
#region InputActions #region InputActions

View File

@ -7,7 +7,6 @@ public class PathTracer : MonoBehaviour
[SerializeField] [SerializeField]
private List<Transform> path; private List<Transform> path;
private Vector3 currTargetPos; private Vector3 currTargetPos;
[SerializeField]
private int currTargetIndex; private int currTargetIndex;
[SerializeField] [SerializeField]
private float speed; private float speed;

View File

@ -10,7 +10,6 @@ public class TriggerZone : MonoBehaviour
private bool onEnter = true, onStay = false, OnExit = false; private bool onEnter = true, onStay = false, OnExit = false;
// Start is called before the first frame update // Start is called before the first frame update
private void OnTriggerEnter(Collider other) { private void OnTriggerEnter(Collider other) {
Debug.Log("Enter");
if(!onEnter)return; if(!onEnter)return;
if(other.gameObject.tag.Equals("Player")){ if(other.gameObject.tag.Equals("Player")){
linkedObj.TriggerEvent(); linkedObj.TriggerEvent();
@ -25,7 +24,6 @@ public class TriggerZone : MonoBehaviour
} }
private void OnTriggerExit(Collider other) { private void OnTriggerExit(Collider other) {
Debug.Log("Exit");
if(!OnExit)return; if(!OnExit)return;
if(other.gameObject.tag.Equals("Player")){ if(other.gameObject.tag.Equals("Player")){
linkedObj.TriggerEvent(); linkedObj.TriggerEvent();

View File

@ -0,0 +1,67 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Vanisher : MonoBehaviour
{
[SerializeField]
private float timeToVanish;
[SerializeField]
private float timeToAppear;
[SerializeField]
private float magnitude;
private float timer = 0;
private GrappleHook grapple;
private bool isVanishing = false;
private Vector3 originalPos;
//TODO represent obj is breaking
private void Start() {
originalPos = transform.localPosition;
}
private void Update() {
timer += Time.deltaTime;
if(isVanishing){//Shake
float speed = timer / timeToVanish;
float x = Random.Range(-.5f, .5f) * speed * magnitude/100;
float y = Random.Range(-.5f, .5f) * speed * magnitude/100;
transform.localPosition += new Vector3(x, y, originalPos.z);
}
}
public void Begin(GrappleHook grapple){
this.grapple = grapple;
if(isVanishing)return;
Invoke("Vanish", timeToVanish);
isVanishing = true;
originalPos = transform.localPosition;
timer = 0;
}
private void Vanish(){
grapple?.Unhook(this.gameObject);
gameObject.SetActive(false);
Invoke("Appear", timeToAppear);
isVanishing = false;
timer = 0;
transform.localPosition = originalPos;
}
private void Appear(){
gameObject.SetActive(true);
}
private void OnCollisionEnter(Collision other) {
if(other.gameObject.tag.Equals("Player")){
Begin(other.gameObject.GetComponent<GrappleHook>());
}
}
private void OnCollisionExit(Collision other) {
if(other.gameObject.tag.Equals("Player")){
if(!grapple.HookedTo.Equals(this.gameObject)){
grapple = null;
}
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 9701f1b28a113754d906bf5b88f98178
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -3,7 +3,8 @@
--- !u!78 &1 --- !u!78 &1
TagManager: TagManager:
serializedVersion: 2 serializedVersion: 2
tags: [] tags:
- Vanishing
layers: layers:
- Default - Default
- TransparentFX - TransparentFX