From 6b87ccfc6dc970c19687e379888557ee96a7ab7f Mon Sep 17 00:00:00 2001 From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com> Date: Wed, 8 Jan 2025 19:42:51 +0100 Subject: [PATCH 1/2] Add sounds to bumper and gate prefabs --- Assets/Resources/Prefabs/Bumper.prefab | 31 +++++++++++++++++++++----- Assets/Resources/Prefabs/Gate.prefab | 26 ++++++++++++++++++--- 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/Assets/Resources/Prefabs/Bumper.prefab b/Assets/Resources/Prefabs/Bumper.prefab index 0581b42..7219656 100644 --- a/Assets/Resources/Prefabs/Bumper.prefab +++ b/Assets/Resources/Prefabs/Bumper.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 8936098568141045026} - component: {fileID: 197865258511769274} - component: {fileID: 1813312543483188556} + - component: {fileID: -2537744256043000155} m_Layer: 0 m_Name: Bumper m_TagString: Untagged @@ -25,6 +26,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 642515788050218447} + serializedVersion: 2 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} @@ -35,7 +37,6 @@ Transform: - {fileID: 4692158973604816267} - {fileID: 1531995019314066998} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &197865258511769274 MonoBehaviour: @@ -72,11 +73,31 @@ MonoBehaviour: m_EditorClassIdentifier: PhysicsMaterial: {fileID: 0} ShowColliderMesh: 0 + ShowColliderOctree: 0 ShowAabbs: 0 Threshold: 1 Force: 15 Scatter: 0 HitEvent: 1 + _isKinematic: 0 +--- !u!114 &-2537744256043000155 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 642515788050218447} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b1b4677b6b0e8bc419afb6cd7a22cf3a, type: 3} + m_Name: + m_EditorClassIdentifier: + _soundAsset: {fileID: 11400000, guid: 02a8bdb34c86f49488fbcbfcf58a0773, type: 2} + _interrupt: 0 + _volume: 1 + _startWhen: 0 + _stopWhen: 0 + _coilName: Bumper --- !u!1 &2782857395794746971 GameObject: m_ObjectHideFlags: 0 @@ -102,13 +123,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2782857395794746971} + serializedVersion: 2 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: 8936098568141045026} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2359243178753486241 MeshFilter: @@ -186,13 +207,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4831611243493218810} + serializedVersion: 2 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: 8936098568141045026} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1444557444949114789 MonoBehaviour: @@ -284,13 +305,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5455811174752170985} + serializedVersion: 2 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: 8936098568141045026} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1716153097323987918 MonoBehaviour: @@ -379,13 +400,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5797145664016368702} + serializedVersion: 2 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: 8936098568141045026} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8432009188270271620 MeshFilter: diff --git a/Assets/Resources/Prefabs/Gate.prefab b/Assets/Resources/Prefabs/Gate.prefab index 8a106cb..3e8a46a 100644 --- a/Assets/Resources/Prefabs/Gate.prefab +++ b/Assets/Resources/Prefabs/Gate.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 7014708109448554416} - component: {fileID: 3468265542873711340} - component: {fileID: 3496935618586042827} + - component: {fileID: 8042227773724765875} m_Layer: 0 m_Name: Gate m_TagString: Gate @@ -25,6 +26,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4689510019247135382} + serializedVersion: 2 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} @@ -33,7 +35,6 @@ Transform: - {fileID: 6622806185196320941} - {fileID: 2980705729845053989} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3468265542873711340 MonoBehaviour: @@ -71,6 +72,7 @@ MonoBehaviour: m_EditorClassIdentifier: PhysicsMaterial: {fileID: 0} ShowColliderMesh: 0 + ShowColliderOctree: 0 ShowAabbs: 0 _angleMax: 90 _angleMin: 0 @@ -79,6 +81,24 @@ MonoBehaviour: Friction: 0.02 GravityFactor: 0.25 _twoWay: 0 +--- !u!114 &8042227773724765875 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4689510019247135382} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8636086609386b04ea0fb6c9091f243b, type: 3} + m_Name: + m_EditorClassIdentifier: + _soundAsset: {fileID: 11400000, guid: 4a2249d0e5085344b92c6c998b2f3b97, type: 2} + _interrupt: 0 + _volume: 1 + _startWhen: 0 + _stopWhen: 0 + _switchName: gate_switch --- !u!1 &6497995796854627700 GameObject: m_ObjectHideFlags: 0 @@ -104,13 +124,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6497995796854627700} + serializedVersion: 2 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: 7014708109448554416} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5934777780303694896 MeshFilter: @@ -188,13 +208,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6797621395313525970} + serializedVersion: 2 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: 7014708109448554416} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8205464296606553136 MonoBehaviour: From 943b97777f81b1e8d21c1c888d1f521cfa025948 Mon Sep 17 00:00:00 2001 From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com> Date: Wed, 8 Jan 2025 19:42:56 +0100 Subject: [PATCH 2/2] Migrate prefabs that make sound from main repo --- .../Resources/Prefabs/DropTargetBank.prefab | 52 ++++ .../Prefabs/DropTargetBank.prefab.meta | 7 + Assets/Resources/Prefabs/Flipper.prefab | 240 ++++++++++++++++++ Assets/Resources/Prefabs/Flipper.prefab.meta | 7 + Assets/Resources/Prefabs/Plunger.prefab | 239 +++++++++++++++++ Assets/Resources/Prefabs/Plunger.prefab.meta | 7 + Assets/Resources/Prefabs/Slingshot.prefab | 159 ++++++++++++ .../Resources/Prefabs/Slingshot.prefab.meta | 7 + Assets/Resources/Prefabs/Trough.prefab | 100 ++++++++ Assets/Resources/Prefabs/Trough.prefab.meta | 7 + Runtime/PrefabProvider.cs | 6 + 11 files changed, 831 insertions(+) create mode 100644 Assets/Resources/Prefabs/DropTargetBank.prefab create mode 100644 Assets/Resources/Prefabs/DropTargetBank.prefab.meta create mode 100644 Assets/Resources/Prefabs/Flipper.prefab create mode 100644 Assets/Resources/Prefabs/Flipper.prefab.meta create mode 100644 Assets/Resources/Prefabs/Plunger.prefab create mode 100644 Assets/Resources/Prefabs/Plunger.prefab.meta create mode 100644 Assets/Resources/Prefabs/Slingshot.prefab create mode 100644 Assets/Resources/Prefabs/Slingshot.prefab.meta create mode 100644 Assets/Resources/Prefabs/Trough.prefab create mode 100644 Assets/Resources/Prefabs/Trough.prefab.meta diff --git a/Assets/Resources/Prefabs/DropTargetBank.prefab b/Assets/Resources/Prefabs/DropTargetBank.prefab new file mode 100644 index 0000000..605a9d9 --- /dev/null +++ b/Assets/Resources/Prefabs/DropTargetBank.prefab @@ -0,0 +1,52 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6315943650588709701 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1547207884189045889} + - component: {fileID: 3547369771264680983} + m_Layer: 0 + m_Name: DropTargetBank + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1547207884189045889 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6315943650588709701} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3547369771264680983 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6315943650588709701} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0807d76d30f7a44ec9b4905761134eb9, type: 3} + m_Name: + m_EditorClassIdentifier: + _isLocked: 0 + _editorLayer: 0 + _editorLayerName: + _editorLayerVisibility: 1 + BankSize: 1 + DropTargets: + - {fileID: 0} diff --git a/Assets/Resources/Prefabs/DropTargetBank.prefab.meta b/Assets/Resources/Prefabs/DropTargetBank.prefab.meta new file mode 100644 index 0000000..32472b2 --- /dev/null +++ b/Assets/Resources/Prefabs/DropTargetBank.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ff459eb2d7e068f4db484466ab0c8734 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Flipper.prefab b/Assets/Resources/Prefabs/Flipper.prefab new file mode 100644 index 0000000..6934155 --- /dev/null +++ b/Assets/Resources/Prefabs/Flipper.prefab @@ -0,0 +1,240 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &204147209793461234 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6818887475746504221} + - component: {fileID: 6048673509915073221} + - component: {fileID: 4778019510121147183} + m_Layer: 0 + m_Name: Rubber + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6818887475746504221 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204147209793461234} + serializedVersion: 2 + 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: 4440381279647306322} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6048673509915073221 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204147209793461234} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8e6fc321830c03547890119a04997404, type: 3} + m_Name: + m_EditorClassIdentifier: + _instanceID: 51956 +--- !u!33 &4778019510121147183 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204147209793461234} + m_Mesh: {fileID: 0} +--- !u!1 &3134944213418037488 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5879026712924827105} + - component: {fileID: 555621075297325882} + - component: {fileID: 8383588224779965405} + m_Layer: 0 + m_Name: Base + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5879026712924827105 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3134944213418037488} + serializedVersion: 2 + 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: 4440381279647306322} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &555621075297325882 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3134944213418037488} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 89e3c1c147bb7a049b0510709f1ad9f2, type: 3} + m_Name: + m_EditorClassIdentifier: + _instanceID: 51936 +--- !u!33 &8383588224779965405 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3134944213418037488} + m_Mesh: {fileID: 0} +--- !u!1 &8904124417643437867 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4440381279647306322} + - component: {fileID: 2330311059251221068} + - component: {fileID: 8750544366699972018} + - component: {fileID: 6325522255454740499} + m_Layer: 0 + m_Name: Flipper + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4440381279647306322 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8904124417643437867} + serializedVersion: 2 + 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: 5879026712924827105} + - {fileID: 6818887475746504221} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2330311059251221068 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8904124417643437867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 545ad741f74d2444faf5d2882fba6b69, type: 3} + m_Name: + m_EditorClassIdentifier: + _isLocked: 0 + _editorLayer: 0 + _editorLayerName: + _editorLayerVisibility: 1 + Position: {x: 0, y: 0} + _startAngle: 121 + EndAngle: 70 + _surface: {fileID: 0} + IsEnabled: 1 + IsDualWound: 0 + _height: 50 + _baseRadius: 21.5 + _endRadius: 13 + FlipperRadiusMin: 0 + FlipperRadiusMax: 130 + _rubberThickness: 7 + _rubberHeight: 19 + _rubberWidth: 24 + InstantiateAsPrefab: 0 + _originalRotateZ: 0 +--- !u!114 &8750544366699972018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8904124417643437867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a6867661ef306b40958372e88a16b2a, type: 3} + m_Name: + m_EditorClassIdentifier: + PhysicsMaterial: {fileID: 0} + ShowColliderMesh: 1 + ShowColliderOctree: 0 + ShowAabbs: 0 + Mass: 1 + Strength: 2200 + Elasticity: 0.8 + ElasticityFalloff: 0.43 + Friction: 0.6 + Return: 0.058 + RampUp: 3 + TorqueDamping: 0.75 + TorqueDampingAngle: 6 + Scatter: 0 + FlipperCorrection: {fileID: 11400000, guid: f8799be363ab20a459dd185669ece8aa, type: 2} + useFlipperTricksPhysics: 0 + SOSRampUp: 2.5 + SOSEM: 0.85 + EOSReturn: 0.055 + EOSTNew: 0.8 + EOSANew: 1 + EOSRampup: 0 + Overshoot: 3 + BumpOnRelease: 0.4 + useFlipperLiveCatch: 0 + LiveCatchDistanceMin: 40 + LiveCatchDistanceMax: 100 + LiveCatchMinimalBallSpeed: 6 + LiveCatchFullTime: 16 + LiveCatchPerfectTime: 8 + LiveCatchMinmalBounceSpeedMultiplier: 0.1 + LiveCatchInaccurateBounceSpeedMultiplier: 1 +--- !u!114 &6325522255454740499 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8904124417643437867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b1b4677b6b0e8bc419afb6cd7a22cf3a, type: 3} + m_Name: + m_EditorClassIdentifier: + _soundAsset: {fileID: 11400000, guid: e410f0a19022a1a49b7a2dd9226ae7d1, type: 2} + _interrupt: 0 + _volume: 1 + _startWhen: 0 + _stopWhen: 0 + _coilName: main_coil diff --git a/Assets/Resources/Prefabs/Flipper.prefab.meta b/Assets/Resources/Prefabs/Flipper.prefab.meta new file mode 100644 index 0000000..87d8d37 --- /dev/null +++ b/Assets/Resources/Prefabs/Flipper.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6896a8c320698df4c83b3f5dfbcfb73e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Plunger.prefab b/Assets/Resources/Prefabs/Plunger.prefab new file mode 100644 index 0000000..abedabe --- /dev/null +++ b/Assets/Resources/Prefabs/Plunger.prefab @@ -0,0 +1,239 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3492958815385962431 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2688967276888975725} + - component: {fileID: 8461769246571476234} + - component: {fileID: 4360165373544367127} + - component: {fileID: 758323825446027854} + - component: {fileID: 6875191637992584632} + m_Layer: 0 + m_Name: Plunger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2688967276888975725 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3492958815385962431} + serializedVersion: 2 + 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: 2983885423002777819} + - {fileID: 1501205072833867318} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8461769246571476234 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3492958815385962431} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c1591b5a0bc15604fb622d417b509185, type: 3} + m_Name: + m_EditorClassIdentifier: + _isLocked: 0 + _editorLayer: 0 + _editorLayerName: + _editorLayerVisibility: 1 + Position: {x: 0, y: 0} + Width: 25 + Height: 20 + ZAdjust: 0 + _surface: {fileID: 0} + analogPlungerAction: {fileID: 0} +--- !u!114 &4360165373544367127 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3492958815385962431} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2b804d1deff43db4482e740209bb910a, type: 3} + m_Name: + m_EditorClassIdentifier: + PhysicsMaterial: {fileID: 0} + ShowColliderMesh: 1 + ShowColliderOctree: 0 + ShowAabbs: 0 + SpeedPull: 0.5 + SpeedFire: 80 + Stroke: 80 + ScatterVelocity: 0 + IsMechPlunger: 0 + IsAutoPlunger: 0 + MechStrength: 85 + MomentumXfer: 1 + ParkPosition: 0.16666667 +--- !u!114 &758323825446027854 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3492958815385962431} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b1b4677b6b0e8bc419afb6cd7a22cf3a, type: 3} + m_Name: + m_EditorClassIdentifier: + _soundAsset: {fileID: 11400000, guid: 29e4e44178845b941a136cf944a6b484, type: 2} + _interrupt: 0 + _volume: 1 + _startWhen: 0 + _stopWhen: 0 + _coilName: c_pull +--- !u!114 &6875191637992584632 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3492958815385962431} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b1b4677b6b0e8bc419afb6cd7a22cf3a, type: 3} + m_Name: + m_EditorClassIdentifier: + _soundAsset: {fileID: 11400000, guid: 1db86f03e09f46740a32096157585e5d, type: 2} + _interrupt: 0 + _volume: 1 + _startWhen: 1 + _stopWhen: 0 + _coilName: c_pull +--- !u!1 &3501041183407321805 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1501205072833867318} + - component: {fileID: 6684065896369603595} + - component: {fileID: 6796775350825094537} + m_Layer: 0 + m_Name: Spring + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1501205072833867318 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3501041183407321805} + serializedVersion: 2 + 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: 2688967276888975725} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6684065896369603595 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3501041183407321805} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8506b0486aacff543b92dd7de914f936, type: 3} + m_Name: + m_EditorClassIdentifier: + _instanceID: 53948 + SpringDiam: 0.77 + SpringGauge: 1.38 + SpringLoops: 8 + SpringEndLoops: 2.5 +--- !u!33 &6796775350825094537 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3501041183407321805} + m_Mesh: {fileID: 0} +--- !u!1 &7745742471233074297 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2983885423002777819} + - component: {fileID: 4093808313367734439} + - component: {fileID: 8559785420684526687} + m_Layer: 0 + m_Name: Rod + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2983885423002777819 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7745742471233074297} + serializedVersion: 2 + 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: 2688967276888975725} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4093808313367734439 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7745742471233074297} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e7622b4c6837354c8190ee471830c31, type: 3} + m_Name: + m_EditorClassIdentifier: + _instanceID: 53944 + RodDiam: 0.6 + RingGap: 2 + RingDiam: 0.94 + RingWidth: 3 + TipShape: 0 .34; 2 .6; 3 .64; 5 .7; 7 .84; 8 .88; 9 .9; 11 .92; 14 .92; 39 .84 +--- !u!33 &8559785420684526687 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7745742471233074297} + m_Mesh: {fileID: 0} diff --git a/Assets/Resources/Prefabs/Plunger.prefab.meta b/Assets/Resources/Prefabs/Plunger.prefab.meta new file mode 100644 index 0000000..41b20ac --- /dev/null +++ b/Assets/Resources/Prefabs/Plunger.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9a5c4350786ab81488bdb6371f80ac0e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Slingshot.prefab b/Assets/Resources/Prefabs/Slingshot.prefab new file mode 100644 index 0000000..8bf860c --- /dev/null +++ b/Assets/Resources/Prefabs/Slingshot.prefab @@ -0,0 +1,159 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6110464775177654975 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1604346372501559456} + - component: {fileID: 8345816335357486725} + - component: {fileID: 4498014268656306279} + - component: {fileID: 1260714541426936682} + - component: {fileID: 5827375821255558141} + m_Layer: 0 + m_Name: Slingshot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1604346372501559456 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6110464775177654975} + serializedVersion: 2 + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8345816335357486725 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6110464775177654975} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8840a3e9d44a5a443a20087784eae747, type: 3} + m_Name: + m_EditorClassIdentifier: + SlingshotSurface: {fileID: 0} + RubberOn: {fileID: 0} + RubberOff: {fileID: 0} + CoilArm: {fileID: 0} + CoilArmStartAngle: 0 + CoilArmEndAngle: 0 + CoilArmRotationAxis: 0 + AnimationDuration: 70 + AnimationCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 3.535 + outSlope: 0 + tangentMode: 0 + weightedMode: 3 + inWeight: 0.03333336 + outWeight: 0.5416666 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + _isLocked: 0 +--- !u!33 &4498014268656306279 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6110464775177654975} + m_Mesh: {fileID: 0} +--- !u!23 &1260714541426936682 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6110464775177654975} + 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: 257 + m_RendererPriority: 0 + m_Materials: + - {fileID: 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 &5827375821255558141 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6110464775177654975} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8636086609386b04ea0fb6c9091f243b, type: 3} + m_Name: + m_EditorClassIdentifier: + _soundAsset: {fileID: 11400000, guid: a13a0ebac95142a4d838dddbb8fbe85e, type: 2} + _interrupt: 0 + _volume: 1 + _startWhen: 0 + _stopWhen: 0 + _switchName: slingshot_switch diff --git a/Assets/Resources/Prefabs/Slingshot.prefab.meta b/Assets/Resources/Prefabs/Slingshot.prefab.meta new file mode 100644 index 0000000..c2d9ecc --- /dev/null +++ b/Assets/Resources/Prefabs/Slingshot.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ebe1b6ab290c59443b0d2a998864d660 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Trough.prefab b/Assets/Resources/Prefabs/Trough.prefab new file mode 100644 index 0000000..cf3fece --- /dev/null +++ b/Assets/Resources/Prefabs/Trough.prefab @@ -0,0 +1,100 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6315943650588709701 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1547207884189045889} + - component: {fileID: 7359774814775038696} + - component: {fileID: 4964707666747543329} + - component: {fileID: 2596899900856616474} + m_Layer: 0 + m_Name: Trough + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1547207884189045889 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6315943650588709701} + serializedVersion: 2 + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7359774814775038696 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6315943650588709701} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 426f115d8fbd6914bb7c67e1cc410097, type: 3} + m_Name: + m_EditorClassIdentifier: + _isLocked: 0 + _editorLayer: 0 + _editorLayerName: + _editorLayerVisibility: 1 + Type: 1 + _playfieldEntrySwitch: {fileID: 0} + PlayfieldEntrySwitchItem: + PlayfieldExitKicker: {fileID: 0} + PlayfieldExitKickerItem: + Ball: {fileID: 0} + BallCount: 6 + SwitchCount: 6 + JamSwitch: 0 + RollTime: 300 + TransitionTime: 50 + KickTime: 100 +--- !u!114 &4964707666747543329 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6315943650588709701} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8636086609386b04ea0fb6c9091f243b, type: 3} + m_Name: + m_EditorClassIdentifier: + _soundAsset: {fileID: 11400000, guid: 249faf8343847964c8a56371a8c737b1, type: 2} + _interrupt: 0 + _volume: 1 + _startWhen: 0 + _stopWhen: 0 + _switchName: ball_switch_6 +--- !u!114 &2596899900856616474 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6315943650588709701} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b1b4677b6b0e8bc419afb6cd7a22cf3a, type: 3} + m_Name: + m_EditorClassIdentifier: + _soundAsset: {fileID: 11400000, guid: 793216df1889fdd4e93ea22639af1b78, type: 2} + _interrupt: 0 + _volume: 1 + _startWhen: 0 + _stopWhen: 0 + _coilName: eject_coil diff --git a/Assets/Resources/Prefabs/Trough.prefab.meta b/Assets/Resources/Prefabs/Trough.prefab.meta new file mode 100644 index 0000000..5fe038b --- /dev/null +++ b/Assets/Resources/Prefabs/Trough.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 672c3430e888c944fa0938233efe4cd1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/PrefabProvider.cs b/Runtime/PrefabProvider.cs index 3a7ad34..a7be60b 100644 --- a/Runtime/PrefabProvider.cs +++ b/Runtime/PrefabProvider.cs @@ -114,5 +114,11 @@ public GameObject CreateDropTarget(int type) throw new ArgumentException(nameof(type), $"Unknown drop target type {type}."); } } + + public GameObject CreateFlipper() => UnityEngine.Resources.Load("Prefabs/Flipper"); + + public GameObject CreatePlunger() => UnityEngine.Resources.Load("Prefabs/Plunger"); + + public GameObject CreateTrough() => UnityEngine.Resources.Load("Prefabs/Trough"); } }