From 1f6e10fb3e7a217dd5d8730b78b7a81ea4398e59 Mon Sep 17 00:00:00 2001 From: Adam Reifsneider Date: Sun, 12 Jul 2020 12:03:07 -0400 Subject: [PATCH] score/timer --- BOX-BUX/Assets/Art/Audio/Music.meta | 8 --- BOX-BUX/Assets/Demigiant/DOTween.meta | 8 --- .../CFX Prefabs (Mobile)/Electric.meta | 8 --- .../Explosions/Firework Variants.meta | 8 --- .../Fire/Color Variants.meta | 8 --- .../Fire/Flames Looped/Color Variants.meta | 8 --- .../Hits/Color Variants.meta | 8 --- .../Misc/Tornado Variants.meta | 8 --- .../Smoke/Color Variants.meta | 8 --- .../Texts (drag-drop to prefabs).meta | 8 --- .../CFX Prefabs (Mobile)/Water.meta | 8 --- .../CFX Prefabs/Electric.meta | 8 --- .../Explosions/Firework Variants.meta | 8 --- .../CFX Prefabs/Fire/Color Variants.meta | 8 --- .../Fire/Flames Looped/Color Variants.meta | 8 --- .../CFX Prefabs/Hits/Color Variants.meta | 8 --- .../CFX Prefabs/Misc/Tornado Variants.meta | 8 --- .../CFX Prefabs/Smoke/Color Variants.meta | 8 --- .../Texts (drag-drop to prefabs).meta | 8 --- .../CFX Prefabs/Water.meta | 8 --- .../Cartoon FX (legacy)/Demo/Assets.meta | 8 --- .../Cartoon FX (legacy)/Demo/UI Canvas.meta | 8 --- .../Cartoon FX (legacy)/Editor.meta | 8 --- .../Materials (Mobile)/Animated.meta | 8 --- .../Materials (Mobile)/Decals.meta | 8 --- .../Materials (Mobile)/Electric.meta | 8 --- .../Materials (Mobile)/Fire.meta | 8 --- .../Materials (Mobile)/Misc.meta | 8 --- .../Materials (Mobile)/Stretched.meta | 8 --- .../Materials (Mobile)/Texts.meta | 8 --- .../Materials (Mobile)/Water.meta | 8 --- .../Materials/Animated.meta | 8 --- .../Cartoon FX (legacy)/Materials/Decals.meta | 8 --- .../Materials/Electric.meta | 8 --- .../Cartoon FX (legacy)/Materials/Fire.meta | 8 --- .../Materials/Stretched.meta | 8 --- .../Cartoon FX (legacy)/Materials/Texts.meta | 8 --- .../Cartoon FX (legacy)/Materials/Water.meta | 8 --- .../JMO Assets/Cartoon FX (legacy)/Mesh.meta | 8 --- .../Cartoon FX (legacy)/Scripts.meta | 8 --- .../Cartoon FX (legacy)/Shaders.meta | 8 --- .../Cartoon FX (legacy)/Spawn System.meta | 8 --- .../Textures (Mobile).meta | 8 --- .../Cartoon FX Easy Editor/Editor.meta | 8 --- .../CFXR Assets/Editor.meta | 8 --- .../CFXR Assets/Meshes.meta | 8 --- .../Cartoon FX Remaster/CFXR Assets/Misc.meta | 8 --- .../CFXR Prefabs/Electric/Variants.meta | 8 --- .../CFXR Prefabs/Explosions/Variants.meta | 8 --- .../CFXR Prefabs/Fire/Variants.meta | 8 --- .../CFXR Prefabs/Impacts/Variants.meta | 8 --- .../CFXR Prefabs/Liquids/Variants.meta | 8 --- .../CFXR Prefabs/Misc/Variants.meta | 8 --- .../CFXR Prefabs/Texts.meta | 8 --- .../Demo Assets/Kino Bloom/Editor.meta | 8 --- .../Demo Assets/Kino Bloom/Shader.meta | 8 --- .../Cartoon FX Remaster/Demo Assets/UI.meta | 8 --- BOX-BUX/Assets/Scripts/DeliveryZone.cs | 34 ++++++++--- BOX-BUX/Assets/Scripts/HudText.cs | 61 +++++++++++++++++++ BOX-BUX/Assets/Scripts/HudText.cs.meta | 11 ++++ 60 files changed, 96 insertions(+), 466 deletions(-) delete mode 100644 BOX-BUX/Assets/Art/Audio/Music.meta delete mode 100644 BOX-BUX/Assets/Demigiant/DOTween.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Electric.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Explosions/Firework Variants.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Fire/Color Variants.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Fire/Flames Looped/Color Variants.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Hits/Color Variants.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Misc/Tornado Variants.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Smoke/Color Variants.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Texts (drag-drop to prefabs).meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Water.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Electric.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Explosions/Firework Variants.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Fire/Color Variants.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Fire/Flames Looped/Color Variants.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Hits/Color Variants.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Misc/Tornado Variants.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Smoke/Color Variants.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Texts (drag-drop to prefabs).meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Water.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Demo/Assets.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Demo/UI Canvas.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Editor.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Animated.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Decals.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Electric.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Fire.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Misc.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Stretched.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Texts.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Water.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Animated.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Decals.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Electric.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Fire.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Stretched.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Texts.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Water.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Mesh.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Scripts.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Shaders.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Spawn System.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Textures (Mobile).meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX Easy Editor/Editor.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Editor.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Meshes.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Misc.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Electric/Variants.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Explosions/Variants.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Fire/Variants.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Impacts/Variants.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Liquids/Variants.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Misc/Variants.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Texts.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/Demo Assets/Kino Bloom/Editor.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/Demo Assets/Kino Bloom/Shader.meta delete mode 100644 BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/Demo Assets/UI.meta create mode 100644 BOX-BUX/Assets/Scripts/HudText.cs create mode 100644 BOX-BUX/Assets/Scripts/HudText.cs.meta diff --git a/BOX-BUX/Assets/Art/Audio/Music.meta b/BOX-BUX/Assets/Art/Audio/Music.meta deleted file mode 100644 index dd3c3be..0000000 --- a/BOX-BUX/Assets/Art/Audio/Music.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 92b654d09da7e8d4a8858f27f8735b47 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/Demigiant/DOTween.meta b/BOX-BUX/Assets/Demigiant/DOTween.meta deleted file mode 100644 index bf1a5a3..0000000 --- a/BOX-BUX/Assets/Demigiant/DOTween.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c08151fa8fa8834429c932c7837ac1a4 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Electric.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Electric.meta deleted file mode 100644 index 78aacda..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Electric.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: db01c8701c516db41b7113638dde6f1f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Explosions/Firework Variants.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Explosions/Firework Variants.meta deleted file mode 100644 index 24099ca..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Explosions/Firework Variants.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 525f524828245db498ddc8c14032068c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Fire/Color Variants.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Fire/Color Variants.meta deleted file mode 100644 index 282d5b6..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Fire/Color Variants.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6a392311e9ccfc044ad789a9c61dadbd -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Fire/Flames Looped/Color Variants.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Fire/Flames Looped/Color Variants.meta deleted file mode 100644 index aed0905..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Fire/Flames Looped/Color Variants.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a94955e0e8acf664fa47dcdd8fadbcd1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Hits/Color Variants.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Hits/Color Variants.meta deleted file mode 100644 index 04f1c09..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Hits/Color Variants.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c333b80bc7b953c4bafcef3080787dd9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Misc/Tornado Variants.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Misc/Tornado Variants.meta deleted file mode 100644 index 258fdbc..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Misc/Tornado Variants.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a1bfd8f73e23a6d4abb6e453e1184f75 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Smoke/Color Variants.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Smoke/Color Variants.meta deleted file mode 100644 index 33f3ad5..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Smoke/Color Variants.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 332a6d80f9203334dbfd604c227f0d34 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Texts (drag-drop to prefabs).meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Texts (drag-drop to prefabs).meta deleted file mode 100644 index 9da974a..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Texts (drag-drop to prefabs).meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e1ef2c4d18bd38a4ba669af163c06cc0 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Water.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Water.meta deleted file mode 100644 index 62b2ae2..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs (Mobile)/Water.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f772864f0ad41714da96ed5908b9a302 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Electric.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Electric.meta deleted file mode 100644 index 9faab88..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Electric.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 715add6d7a2eff443bf0aee3cf26e7fc -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Explosions/Firework Variants.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Explosions/Firework Variants.meta deleted file mode 100644 index 36aa58a..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Explosions/Firework Variants.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4db7b5c86e1084c44a4f4b1fd7fc7abb -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Fire/Color Variants.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Fire/Color Variants.meta deleted file mode 100644 index 44de042..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Fire/Color Variants.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a724289c48c39e74b8a259759e469b8d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Fire/Flames Looped/Color Variants.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Fire/Flames Looped/Color Variants.meta deleted file mode 100644 index c1c1bfd..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Fire/Flames Looped/Color Variants.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a7af7ed682d7f5d459331ffabd3ce6e9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Hits/Color Variants.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Hits/Color Variants.meta deleted file mode 100644 index d8f9939..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Hits/Color Variants.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b0196b5b454b16e4f82505795d3eafd1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Misc/Tornado Variants.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Misc/Tornado Variants.meta deleted file mode 100644 index 1329434..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Misc/Tornado Variants.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7da5e484627cc8141b4605f7ecda0830 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Smoke/Color Variants.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Smoke/Color Variants.meta deleted file mode 100644 index d4e308c..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Smoke/Color Variants.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d71eb2673da5be64d8a2d8a5174e0309 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Texts (drag-drop to prefabs).meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Texts (drag-drop to prefabs).meta deleted file mode 100644 index 15cda0c..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Texts (drag-drop to prefabs).meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2327785b24320434d8b9f8fea9a33511 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Water.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Water.meta deleted file mode 100644 index b4692d4..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/CFX Prefabs/Water.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9a0951bf364e35942af0d443697d3c10 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Demo/Assets.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Demo/Assets.meta deleted file mode 100644 index 37c989f..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Demo/Assets.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 77c7c470de5b6524b8b4a870abf405d0 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Demo/UI Canvas.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Demo/UI Canvas.meta deleted file mode 100644 index 6fec5bc..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Demo/UI Canvas.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e9d55d43b1e68cc40a16c4de3455b729 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Editor.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Editor.meta deleted file mode 100644 index 27480b0..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1c06db755524ed9449ee94db9ff27e20 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Animated.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Animated.meta deleted file mode 100644 index 361d034..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Animated.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bf787969d080ec94182b479ed95dfb27 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Decals.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Decals.meta deleted file mode 100644 index ea93990..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Decals.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 19687c00fde06104e995b529cdf8efa5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Electric.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Electric.meta deleted file mode 100644 index b60cfba..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Electric.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 66ce208f3078599459e2e6d5c0a36e96 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Fire.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Fire.meta deleted file mode 100644 index 3b65d59..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Fire.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2039ce03a147df04e9b4b9266daaa182 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Misc.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Misc.meta deleted file mode 100644 index 0b6f72e..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Misc.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fad808d1c1f3e3041be3728d71f41d5a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Stretched.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Stretched.meta deleted file mode 100644 index 242fb44..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Stretched.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 318fdea3fabcd21468dc44d4caf4f054 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Texts.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Texts.meta deleted file mode 100644 index 869c20f..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Texts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2cd5c181e740ae348a7374a4eafe44da -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Water.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Water.meta deleted file mode 100644 index fbeb818..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials (Mobile)/Water.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 28bd2f4844b9e4f4bad709cc6f9bc3b8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Animated.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Animated.meta deleted file mode 100644 index 7970d4d..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Animated.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a55c4f7a0bc0aa04d91e8e6b1d798218 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Decals.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Decals.meta deleted file mode 100644 index da6d41b..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Decals.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 05095e699911bcf42860b275e498b4a6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Electric.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Electric.meta deleted file mode 100644 index 0582352..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Electric.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1f52f6a732ec6f34ea3830a49c4c0422 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Fire.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Fire.meta deleted file mode 100644 index 3cafd82..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Fire.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 84aeebfa852fbf64b9c8e32d5f345f60 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Stretched.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Stretched.meta deleted file mode 100644 index 2974564..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Stretched.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 771d3645550472249bc1cc99fa503338 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Texts.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Texts.meta deleted file mode 100644 index 2d102d8..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Texts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d8045472e51b84843b5326c829954048 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Water.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Water.meta deleted file mode 100644 index c6147a7..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Materials/Water.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5e450b84228debd4487329c4918504ff -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Mesh.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Mesh.meta deleted file mode 100644 index a5a8a4a..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Mesh.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b902967ed7e36ae43be8ab05afdabb8a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Scripts.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Scripts.meta deleted file mode 100644 index 589e670..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Scripts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 223e077284a06094ab8488db9e6eaa1a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Shaders.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Shaders.meta deleted file mode 100644 index bcc9105..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Shaders.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b88b04a40932a8d4780f970b19327f80 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Spawn System.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Spawn System.meta deleted file mode 100644 index e3f4f55..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Spawn System.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3757dbc77362c5d46bffca284b1aa823 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Textures (Mobile).meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Textures (Mobile).meta deleted file mode 100644 index a163971..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX (legacy)/Textures (Mobile).meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 67302048cb0a5e44c8d850f417193811 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX Easy Editor/Editor.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX Easy Editor/Editor.meta deleted file mode 100644 index f815ed2..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX Easy Editor/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ef74fe7f8dfc6894481d107231650819 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Editor.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Editor.meta deleted file mode 100644 index 9e4b36e..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1a426d2ed10d55c47b7aee95ace55b60 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Meshes.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Meshes.meta deleted file mode 100644 index 4185c33..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Meshes.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 869785f887ca9d74f972d5727c91e1c8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Misc.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Misc.meta deleted file mode 100644 index 565be86..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Misc.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 511d08169e7685b469a01a86e4e1646b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Electric/Variants.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Electric/Variants.meta deleted file mode 100644 index a44d1c1..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Electric/Variants.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9c34388b855b6194889320770c3cfe08 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Explosions/Variants.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Explosions/Variants.meta deleted file mode 100644 index 44b03d9..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Explosions/Variants.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0d819365bf7b27346b5e1956766baa49 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Fire/Variants.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Fire/Variants.meta deleted file mode 100644 index 0cd8764..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Fire/Variants.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8e505e699a1699f42b6e4f824c3db9a4 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Impacts/Variants.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Impacts/Variants.meta deleted file mode 100644 index 109d695..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Impacts/Variants.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 57a00135ff6e1ed4393a67e25cb3c077 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Liquids/Variants.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Liquids/Variants.meta deleted file mode 100644 index 5cc8cd2..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Liquids/Variants.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 148fe92d65164ef419d7a1735386aff0 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Misc/Variants.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Misc/Variants.meta deleted file mode 100644 index 105b856..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Misc/Variants.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2462d80b3fdc774448a0ad6ebd68c84c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Texts.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Texts.meta deleted file mode 100644 index e7db250..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/CFXR Prefabs/Texts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 814bc711f8a7cd84c92ecdf993bf1c9f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/Demo Assets/Kino Bloom/Editor.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/Demo Assets/Kino Bloom/Editor.meta deleted file mode 100644 index 2ea852a..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/Demo Assets/Kino Bloom/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0e7e3e77db40c4cba83bb3a6ab440084 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/Demo Assets/Kino Bloom/Shader.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/Demo Assets/Kino Bloom/Shader.meta deleted file mode 100644 index 6241b97..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/Demo Assets/Kino Bloom/Shader.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f44dd1607e93a4131a4003b39c363e93 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/Demo Assets/UI.meta b/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/Demo Assets/UI.meta deleted file mode 100644 index 65057b6..0000000 --- a/BOX-BUX/Assets/JMO Assets/Cartoon FX Remaster/Demo Assets/UI.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3de6a36d99e99fe459f61a0d9cf3a7c1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BOX-BUX/Assets/Scripts/DeliveryZone.cs b/BOX-BUX/Assets/Scripts/DeliveryZone.cs index 26ecd6f..330e7c8 100644 --- a/BOX-BUX/Assets/Scripts/DeliveryZone.cs +++ b/BOX-BUX/Assets/Scripts/DeliveryZone.cs @@ -12,11 +12,18 @@ public class Order public ColorType colorGoal; public MaterialType materialGoal; public ShapeType shapeGoal; + public SizeType sizeGoal; } public List orders; private Order currentOrder; private bool wonPrinted = false; + private HudText score; + + private void Start() + { + score = FindObjectOfType(); + } private void Update() { @@ -26,7 +33,7 @@ private void Update() { currentOrder = orders[0]; orders.RemoveAt(0); - Debug.Log("GOAL: " + currentOrder.materialGoal + ", " + currentOrder.colorGoal + ", " + currentOrder.shapeGoal); + Debug.Log("GOAL: " + currentOrder.materialGoal + ", " + currentOrder.colorGoal + ", " + currentOrder.shapeGoal + ", " + currentOrder.sizeGoal); } else if (!wonPrinted) { @@ -38,22 +45,29 @@ private void Update() public void OnTriggerEnter(Collider other) { - Triggerable triggerable = other.GetComponent(); - if (triggerable == null) + Triggerable box = other.GetComponent(); + if (box == null) { return; } - if (triggerable.GetShapeType() == currentOrder.shapeGoal - && triggerable.GetMaterialType() == currentOrder.materialGoal - && triggerable.GetColorType() == currentOrder.colorGoal) + if (box.GetShapeType() == currentOrder.shapeGoal + && box.GetMaterialType() == currentOrder.materialGoal + && box.GetColorType() == currentOrder.colorGoal + && box.GetSizeType() == currentOrder.sizeGoal) { - Debug.Log("GIANT ENEMY GOAL GOT"); - Destroy(triggerable.asPickable().gameObject); - currentOrder = null; + Deliver(box.asPickable()); } else { - Debug.Log("TRY FLIPPING OVER FOR TONS OF DAMAGE"); + Debug.Log("TRY FLIPPING OVER FOR MASSIVE DAMAGE"); } } + + private void Deliver(Pickable box) + { + Debug.Log("GIANT ENEMY GOAL GOT"); + score.OnDelivered(box); + Destroy(box.gameObject); + currentOrder = null; + } } diff --git a/BOX-BUX/Assets/Scripts/HudText.cs b/BOX-BUX/Assets/Scripts/HudText.cs new file mode 100644 index 0000000..fa4b6a5 --- /dev/null +++ b/BOX-BUX/Assets/Scripts/HudText.cs @@ -0,0 +1,61 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; +using UnityEngine.UI; +using UnityEngine.UIElements; + +public class HudText : MonoBehaviour +{ + public int minScore = 100; + public int secondsTimer = 120; + public int secondScoreMultipler = 10; + private float countdown; + private int totalScore; + private Text scoreText; + private Text timerText; + + private void Start() + { + var texts = GetComponentsInChildren(); + timerText = texts.Single(t => t.name == "Timer"); + scoreText = texts.Single(t => t.name == "Score"); + UpdateScoreText(); + BeginTimer(); + } + + private void Update() + { + if (countdown > 0) + { + countdown -= Time.deltaTime; + } + UpdateTimerText(); + } + + public void OnDelivered(Triggerable box) + { + totalScore += Convert.ToInt32(countdown) * secondScoreMultipler + minScore; + UpdateScoreText(); + BeginTimer(); + } + + private void BeginTimer() + { + countdown = secondsTimer; + } + + private void UpdateScoreText() + { + scoreText.text = "Score: " + totalScore; + } + + private void UpdateTimerText() + { + int seconds = Convert.ToInt32(countdown); + int minutes = seconds / 60; + seconds %= 60; + timerText.text = "Time: " + minutes + ":" + (seconds != 0 ? seconds.ToString() : "00"); + } +} diff --git a/BOX-BUX/Assets/Scripts/HudText.cs.meta b/BOX-BUX/Assets/Scripts/HudText.cs.meta new file mode 100644 index 0000000..487c3c9 --- /dev/null +++ b/BOX-BUX/Assets/Scripts/HudText.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 68af74098a40dbb4ab7cfff101bb7bae +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: