From 74f27e1dbc0f1df003ede55da644036d4e3c25bc Mon Sep 17 00:00:00 2001 From: Dom Harris Date: Sun, 10 Jan 2021 17:41:15 +0000 Subject: [PATCH] obstacle spawner shit --- Assets/Materials/Enemy.mat | 2 +- Assets/Prefabs/Obstacle.prefab | 98 +++++++++++++++++++ Assets/Prefabs/Obstacle.prefab.meta | 7 ++ Assets/Scenes/Chief's Sandbox.unity | 143 ++++++++++++++++++++++++++++ Assets/Weapons/Obstacle.asset | 125 ++++++++++++++++++++++++ Assets/Weapons/Obstacle.asset.meta | 8 ++ 6 files changed, 382 insertions(+), 1 deletion(-) create mode 100644 Assets/Prefabs/Obstacle.prefab create mode 100644 Assets/Prefabs/Obstacle.prefab.meta create mode 100644 Assets/Weapons/Obstacle.asset create mode 100644 Assets/Weapons/Obstacle.asset.meta diff --git a/Assets/Materials/Enemy.mat b/Assets/Materials/Enemy.mat index b2ac44a..058ff04 100644 --- a/Assets/Materials/Enemy.mat +++ b/Assets/Materials/Enemy.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 + m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: diff --git a/Assets/Prefabs/Obstacle.prefab b/Assets/Prefabs/Obstacle.prefab new file mode 100644 index 0000000..a4d1d2c --- /dev/null +++ b/Assets/Prefabs/Obstacle.prefab @@ -0,0 +1,98 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1738226812227614583 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1738226812227614580} + - component: {fileID: 1738226812227614581} + - component: {fileID: 1738226812227614582} + - component: {fileID: -4901459127090716512} + m_Layer: 7 + m_Name: Obstacle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1738226812227614580 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1738226812227614583} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.1, y: 0.05, z: 0.6} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1738226812227614581 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1738226812227614583} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1738226812227614582 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1738226812227614583} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + 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!114 &-4901459127090716512 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1738226812227614583} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 990644fedd5c4b99befe1da660313b53, type: 3} + m_Name: + m_EditorClassIdentifier: + xMin: -10.1 + xMax: 10.1 diff --git a/Assets/Prefabs/Obstacle.prefab.meta b/Assets/Prefabs/Obstacle.prefab.meta new file mode 100644 index 0000000..afbbbfb --- /dev/null +++ b/Assets/Prefabs/Obstacle.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a2fc4fe02da6b4c9dad4201dd60e32cc +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Chief's Sandbox.unity b/Assets/Scenes/Chief's Sandbox.unity index e0528d5..576454c 100644 --- a/Assets/Scenes/Chief's Sandbox.unity +++ b/Assets/Scenes/Chief's Sandbox.unity @@ -288,6 +288,75 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3147f962613cca54f8a0b78929a2854b, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &532372215 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 532372218} + - component: {fileID: 532372217} + - component: {fileID: 532372216} + m_Layer: 0 + m_Name: ObstacleSpawner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &532372216 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 532372215} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f8399031f014bee928b07d26fe8ee4c, type: 3} + m_Name: + m_EditorClassIdentifier: + spawnOnBeat: 1 + xMin: -10 + xMax: 10 +--- !u!114 &532372217 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 532372215} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1226902ebd2674aefa463e6dc0e75ad7, type: 3} + m_Name: + m_EditorClassIdentifier: + bulletPool: {fileID: 1061155885} + weapon: {fileID: 11400000, guid: 3b5089173dc14483fbd118af334cc1cb, type: 2} + bulletPos: {fileID: 532372218} + input: {fileID: 532372216} + OnFire: + m_PersistentCalls: + m_Calls: [] + OnBulletCollide: + m_PersistentCalls: + m_Calls: [] +--- !u!4 &532372218 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 532372215} + m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} + m_LocalPosition: {x: 0, y: -2, z: 200} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!1 &726912288 GameObject: m_ObjectHideFlags: 0 @@ -557,6 +626,52 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1061155884 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1061155886} + - component: {fileID: 1061155885} + m_Layer: 0 + m_Name: ObstaclePool + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1061155885 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1061155884} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9463c7c973b354f1c882567f52337aed, type: 3} + m_Name: + m_EditorClassIdentifier: + numObjects: 3000 + prefab: {fileID: 1738226812227614580, guid: a2fc4fe02da6b4c9dad4201dd60e32cc, type: 3} + numToSpawnPerFrame: 10 +--- !u!4 &1061155886 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1061155884} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -2, z: 30} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1077224733 PrefabInstance: m_ObjectHideFlags: 0 @@ -1425,10 +1540,38 @@ PrefabInstance: propertyPath: bpm value: 90 objectReference: {fileID: 0} + - target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3} + propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3} + propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3} propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 186457106} + - target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3} + propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 532372216} + - target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3} + propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3} + propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: OnBeat + objectReference: {fileID: 0} + - target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3} + propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: BeatSpawner, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3} + propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 2145967175348613561, guid: 88246464365fd0745b75edfcff208598, type: 3} propertyPath: m_Name value: Audio diff --git a/Assets/Weapons/Obstacle.asset b/Assets/Weapons/Obstacle.asset new file mode 100644 index 0000000..53a751d --- /dev/null +++ b/Assets/Weapons/Obstacle.asset @@ -0,0 +1,125 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2bc932693ed0a470d9cf39b1c3168afb, type: 3} + m_Name: Obstacle + m_EditorClassIdentifier: + fireRate: 3 + bulletSpeed: + m_Mode: 0 + m_CurveMultiplier: 1 + m_CurveMin: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_CurveMax: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_ConstantMin: 20 + m_ConstantMax: 60 + bulletLifetime: + m_Mode: 0 + m_CurveMultiplier: 0 + m_CurveMin: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_CurveMax: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_ConstantMin: 15 + m_ConstantMax: 5 + bulletSize: + m_Mode: 0 + m_CurveMultiplier: 0 + m_CurveMin: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_CurveMax: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_ConstantMin: 0 + m_ConstantMax: 3 + damage: 1 + collidesWith: + serializedVersion: 2 + m_Bits: 64 + accuracy: 0 + zone: + numToSpawn: 1 + offset: {x: 0, y: 0, z: 0} + spawnType: 0 + spawnDir: 0 + spawnPlane: 1 + width: 0 + height: 0 + surfaceOnly: 1 + evenDistribution: 1 + numSides: 3 + numPerSide: 10 + flipVertical: 0 + radius: 0 + arc: 360 + composite: [] + manualFire: 1 + behaviour: {fileID: 11400000, guid: bb1cb2a77c68c42d4900953d18b23a49, type: 2} diff --git a/Assets/Weapons/Obstacle.asset.meta b/Assets/Weapons/Obstacle.asset.meta new file mode 100644 index 0000000..2f99863 --- /dev/null +++ b/Assets/Weapons/Obstacle.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3b5089173dc14483fbd118af334cc1cb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: