From c34cd631281bc2f8460f722408256e6e542f6595 Mon Sep 17 00:00:00 2001 From: Tore Bergebakken Date: Fri, 20 Dec 2024 20:07:39 +0100 Subject: [PATCH] Add brick barrel --- Assets/Audio/Bonk/Thud.asset | 2 + Assets/Models/Props/Brick.fbx | Bin 0 -> 15948 bytes Assets/Models/Props/Brick.fbx.meta | 108 +++ Assets/Prefabs/Gamestate/StaticInfo.prefab | 1 + Assets/Prefabs/GunParts/BrickBarrel.prefab | 697 ++++++++++++++++++ .../Prefabs/GunParts/BrickBarrel.prefab.meta | 12 + Assets/Scenes/Menu.unity | 2 +- .../ScriptableObjects/Items/BrickBarrel.asset | 22 + .../Items/BrickBarrel.asset.meta | 8 + 9 files changed, 851 insertions(+), 1 deletion(-) create mode 100644 Assets/Models/Props/Brick.fbx create mode 100644 Assets/Models/Props/Brick.fbx.meta create mode 100644 Assets/Prefabs/GunParts/BrickBarrel.prefab create mode 100644 Assets/Prefabs/GunParts/BrickBarrel.prefab.meta create mode 100644 Assets/ScriptableObjects/Items/BrickBarrel.asset create mode 100644 Assets/ScriptableObjects/Items/BrickBarrel.asset.meta diff --git a/Assets/Audio/Bonk/Thud.asset b/Assets/Audio/Bonk/Thud.asset index d9dccd4b1..3fe67e58d 100644 --- a/Assets/Audio/Bonk/Thud.asset +++ b/Assets/Audio/Bonk/Thud.asset @@ -33,3 +33,5 @@ MonoBehaviour: volumeRange: min: 0.94019204 max: 1 + is3D: 1 + shouldPlayInSplitscreen: 1 diff --git a/Assets/Models/Props/Brick.fbx b/Assets/Models/Props/Brick.fbx new file mode 100644 index 0000000000000000000000000000000000000000..f39bd1603c61718d4b765ed9ba7eeac287c3898a GIT binary patch literal 15948 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 dev:Assets/TextMesh Pro/Sprites/EmojiOne Attribution.txt.meta + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity index 79aca600f..832b44c34 100644 --- a/Assets/Scenes/Menu.unity +++ b/Assets/Scenes/Menu.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 785370674} - m_IndirectSpecularColor: {r: 0.059093103, g: 0.21698886, b: 0.4942782, a: 1} + m_IndirectSpecularColor: {r: 0.99999905, g: 0, b: 0.99999905, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: diff --git a/Assets/ScriptableObjects/Items/BrickBarrel.asset b/Assets/ScriptableObjects/Items/BrickBarrel.asset new file mode 100644 index 000000000..aa5bd201d --- /dev/null +++ b/Assets/ScriptableObjects/Items/BrickBarrel.asset @@ -0,0 +1,22 @@ +%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: d766409d2bfa0674da668e696cd73b7b, type: 3} + m_Name: BrickBarrel + m_EditorClassIdentifier: + id: Brick + displayName: Brick + secretName: rockthrower + displayDescription: Shoots bricks that deal more damage the faster you move + extendedDescription: + loreDescription: + augmentType: 1 + augment: {fileID: 8762663949210455680, guid: 89f4fd8568fd75fd0911ae54ab2cf37b, type: 3} diff --git a/Assets/ScriptableObjects/Items/BrickBarrel.asset.meta b/Assets/ScriptableObjects/Items/BrickBarrel.asset.meta new file mode 100644 index 000000000..f8de3a05c --- /dev/null +++ b/Assets/ScriptableObjects/Items/BrickBarrel.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1e4128bbd81375cd49500eb1e9304766 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: