From 4db6b2fc9d591cde86240572be2c412fe6d42d7a Mon Sep 17 00:00:00 2001 From: Martin Johnson Date: Mon, 18 May 2020 15:57:26 -0400 Subject: [PATCH] Package creation --- Attributes.meta => AudioEvent.meta | 2 +- Editor.meta => AudioEvent/Editor.meta | 2 +- .../Editor}/CustomInspectors.meta | 2 +- .../CustomInspectors/AudioEventInspector.cs | 0 .../AudioEventInspector.cs.meta | 2 +- CustomTypes.meta => AudioEvent/Runtime.meta | 2 +- .../Runtime}/AudioEvent.cs | 0 .../Runtime}/AudioEvent.cs.meta | 2 +- .../Runtime}/SimpleAudioEvent.cs | 0 .../Runtime}/SimpleAudioEvent.cs.meta | 2 +- ScriptableObjects.meta => ObjectPool.meta | 2 +- {Utils => ObjectPool}/ObjectPool.cs | 0 {Utils => ObjectPool}/ObjectPool.cs.meta | 2 +- README.md | 21 ++++++++++++++++++- README.md.meta | 7 +++++++ RangedFloat.meta | 8 +++++++ RangedFloat/Editor.meta | 8 +++++++ .../Editor}/PropertyDrawers.meta | 2 +- .../PropertyDrawers/RangedFloatDrawer.cs | 0 .../PropertyDrawers/RangedFloatDrawer.cs.meta | 2 +- RangedFloat/Runtime.meta | 8 +++++++ .../Runtime}/MinMaxRangeAttribute.cs | 0 .../Runtime}/MinMaxRangeAttribute.cs.meta | 2 +- .../Runtime}/RangedFloat.cs | 0 .../Runtime}/RangedFloat.cs.meta | 2 +- ScriptableObjects/Audio.meta | 8 ------- UI.meta | 2 +- UI/Components.meta | 2 +- UI/Components/ComponentBase.cs.meta | 2 +- UI/Components/SliderComponent.cs.meta | 2 +- UI/Components/TextComponent.cs.meta | 2 +- Unity.johnsonutils.asmdef | 15 +++++++++++++ Unity.johnsonutils.asmdef.meta | 7 +++++++ Utils.meta | 8 ------- package.json | 11 ++++++++++ package.json.meta | 7 +++++++ 36 files changed, 109 insertions(+), 35 deletions(-) rename Attributes.meta => AudioEvent.meta (77%) rename Editor.meta => AudioEvent/Editor.meta (77%) rename {Editor => AudioEvent/Editor}/CustomInspectors.meta (77%) rename {Editor => AudioEvent/Editor}/CustomInspectors/AudioEventInspector.cs (100%) rename {Editor => AudioEvent/Editor}/CustomInspectors/AudioEventInspector.cs.meta (83%) rename CustomTypes.meta => AudioEvent/Runtime.meta (77%) rename {ScriptableObjects/Audio => AudioEvent/Runtime}/AudioEvent.cs (100%) rename {ScriptableObjects/Audio => AudioEvent/Runtime}/AudioEvent.cs.meta (83%) rename {ScriptableObjects/Audio => AudioEvent/Runtime}/SimpleAudioEvent.cs (100%) rename {ScriptableObjects/Audio => AudioEvent/Runtime}/SimpleAudioEvent.cs.meta (83%) rename ScriptableObjects.meta => ObjectPool.meta (77%) rename {Utils => ObjectPool}/ObjectPool.cs (100%) rename {Utils => ObjectPool}/ObjectPool.cs.meta (83%) create mode 100644 README.md.meta create mode 100644 RangedFloat.meta create mode 100644 RangedFloat/Editor.meta rename {Editor => RangedFloat/Editor}/PropertyDrawers.meta (77%) rename {Editor => RangedFloat/Editor}/PropertyDrawers/RangedFloatDrawer.cs (100%) rename {Editor => RangedFloat/Editor}/PropertyDrawers/RangedFloatDrawer.cs.meta (83%) create mode 100644 RangedFloat/Runtime.meta rename {Attributes => RangedFloat/Runtime}/MinMaxRangeAttribute.cs (100%) rename {Attributes => RangedFloat/Runtime}/MinMaxRangeAttribute.cs.meta (83%) rename {CustomTypes => RangedFloat/Runtime}/RangedFloat.cs (100%) rename {CustomTypes => RangedFloat/Runtime}/RangedFloat.cs.meta (83%) delete mode 100644 ScriptableObjects/Audio.meta create mode 100644 Unity.johnsonutils.asmdef create mode 100644 Unity.johnsonutils.asmdef.meta delete mode 100644 Utils.meta create mode 100644 package.json create mode 100644 package.json.meta diff --git a/Attributes.meta b/AudioEvent.meta similarity index 77% rename from Attributes.meta rename to AudioEvent.meta index 89b3187..9c7c3ca 100644 --- a/Attributes.meta +++ b/AudioEvent.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 618d1e8b8a58df14e81833e4c4623513 +guid: 1220f59d44ff1894fa44088749e66805 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Editor.meta b/AudioEvent/Editor.meta similarity index 77% rename from Editor.meta rename to AudioEvent/Editor.meta index 791e002..71d66d7 100644 --- a/Editor.meta +++ b/AudioEvent/Editor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1d1f2b5d5f1ea2d4ba6ac94a6adedf10 +guid: a96e7eb2ddb7a534abaeeb1cc2f568aa folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Editor/CustomInspectors.meta b/AudioEvent/Editor/CustomInspectors.meta similarity index 77% rename from Editor/CustomInspectors.meta rename to AudioEvent/Editor/CustomInspectors.meta index 53c90a9..ac156e3 100644 --- a/Editor/CustomInspectors.meta +++ b/AudioEvent/Editor/CustomInspectors.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bcaa3a57881b3d14fa27f5f5a72f5277 +guid: 71f62c415c75a764c96d4e1f3b86e51a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Editor/CustomInspectors/AudioEventInspector.cs b/AudioEvent/Editor/CustomInspectors/AudioEventInspector.cs similarity index 100% rename from Editor/CustomInspectors/AudioEventInspector.cs rename to AudioEvent/Editor/CustomInspectors/AudioEventInspector.cs diff --git a/Editor/CustomInspectors/AudioEventInspector.cs.meta b/AudioEvent/Editor/CustomInspectors/AudioEventInspector.cs.meta similarity index 83% rename from Editor/CustomInspectors/AudioEventInspector.cs.meta rename to AudioEvent/Editor/CustomInspectors/AudioEventInspector.cs.meta index f4ee843..062390a 100644 --- a/Editor/CustomInspectors/AudioEventInspector.cs.meta +++ b/AudioEvent/Editor/CustomInspectors/AudioEventInspector.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2bc328582b298304f957056327d58af5 +guid: 0373dd91d1668e041b7bf832d8bc1bdb MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/CustomTypes.meta b/AudioEvent/Runtime.meta similarity index 77% rename from CustomTypes.meta rename to AudioEvent/Runtime.meta index 26dd359..bf8ad97 100644 --- a/CustomTypes.meta +++ b/AudioEvent/Runtime.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 96bace79d06c3784ca7aad8ca4779faa +guid: 9bcc5f534b0cca64a9a36934a8dbf04a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/ScriptableObjects/Audio/AudioEvent.cs b/AudioEvent/Runtime/AudioEvent.cs similarity index 100% rename from ScriptableObjects/Audio/AudioEvent.cs rename to AudioEvent/Runtime/AudioEvent.cs diff --git a/ScriptableObjects/Audio/AudioEvent.cs.meta b/AudioEvent/Runtime/AudioEvent.cs.meta similarity index 83% rename from ScriptableObjects/Audio/AudioEvent.cs.meta rename to AudioEvent/Runtime/AudioEvent.cs.meta index d1c72de..371db85 100644 --- a/ScriptableObjects/Audio/AudioEvent.cs.meta +++ b/AudioEvent/Runtime/AudioEvent.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 44f3003e434a4ee45b919288a52a9091 +guid: 22fab10465bd9734099aa2aa507307b7 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/ScriptableObjects/Audio/SimpleAudioEvent.cs b/AudioEvent/Runtime/SimpleAudioEvent.cs similarity index 100% rename from ScriptableObjects/Audio/SimpleAudioEvent.cs rename to AudioEvent/Runtime/SimpleAudioEvent.cs diff --git a/ScriptableObjects/Audio/SimpleAudioEvent.cs.meta b/AudioEvent/Runtime/SimpleAudioEvent.cs.meta similarity index 83% rename from ScriptableObjects/Audio/SimpleAudioEvent.cs.meta rename to AudioEvent/Runtime/SimpleAudioEvent.cs.meta index 27fd342..8b6249e 100644 --- a/ScriptableObjects/Audio/SimpleAudioEvent.cs.meta +++ b/AudioEvent/Runtime/SimpleAudioEvent.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5a516b45b8d44414186cecdcb04aa13c +guid: b9efd6bfb94ac7a438475c81db125207 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/ScriptableObjects.meta b/ObjectPool.meta similarity index 77% rename from ScriptableObjects.meta rename to ObjectPool.meta index 2b43a13..e4055dd 100644 --- a/ScriptableObjects.meta +++ b/ObjectPool.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f6055e6a38ee2e14d96512a8d53b25c5 +guid: ed104cff818dd9643a0c648e14fd1f31 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Utils/ObjectPool.cs b/ObjectPool/ObjectPool.cs similarity index 100% rename from Utils/ObjectPool.cs rename to ObjectPool/ObjectPool.cs diff --git a/Utils/ObjectPool.cs.meta b/ObjectPool/ObjectPool.cs.meta similarity index 83% rename from Utils/ObjectPool.cs.meta rename to ObjectPool/ObjectPool.cs.meta index 7e0c926..765ec6c 100644 --- a/Utils/ObjectPool.cs.meta +++ b/ObjectPool/ObjectPool.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0279835920dc21e4bb18443d24dbcd81 +guid: 2a32ed5a87970504ab455fe01309c3d6 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/README.md b/README.md index 4391cc1..60f8af1 100644 --- a/README.md +++ b/README.md @@ -1 +1,20 @@ -Unity_Utils +Unity Utility + +Contains a growing list of utility used in prototypes and game development + + AudioEvent (ScriptableObject) + SimpleAudioEvent (ScriptableObject) + AudioEventInspector (CustomInspector) + + ObjectPool + GenericPool + + RangedFloat (CustomTypes) + MinMaxRangeAttribute (Attributes) + RangedFloatDrawer (PropertyDrawer) + + UI + components + Base + Slider + Text \ No newline at end of file diff --git a/README.md.meta b/README.md.meta new file mode 100644 index 0000000..2409896 --- /dev/null +++ b/README.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 763c15382e59a164ebdff5864aecb39e +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RangedFloat.meta b/RangedFloat.meta new file mode 100644 index 0000000..ce66796 --- /dev/null +++ b/RangedFloat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ac8f31b4b5810f4c90b404c9d3b97da +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RangedFloat/Editor.meta b/RangedFloat/Editor.meta new file mode 100644 index 0000000..fed90bb --- /dev/null +++ b/RangedFloat/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6d8cb581925ee804885a8ec82903d2b4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Editor/PropertyDrawers.meta b/RangedFloat/Editor/PropertyDrawers.meta similarity index 77% rename from Editor/PropertyDrawers.meta rename to RangedFloat/Editor/PropertyDrawers.meta index 983a554..5a7f1ce 100644 --- a/Editor/PropertyDrawers.meta +++ b/RangedFloat/Editor/PropertyDrawers.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 80c222b09cde6a24aa82c866ad1e378a +guid: e8cc4ef9992a5324d967ec33b1b45a83 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Editor/PropertyDrawers/RangedFloatDrawer.cs b/RangedFloat/Editor/PropertyDrawers/RangedFloatDrawer.cs similarity index 100% rename from Editor/PropertyDrawers/RangedFloatDrawer.cs rename to RangedFloat/Editor/PropertyDrawers/RangedFloatDrawer.cs diff --git a/Editor/PropertyDrawers/RangedFloatDrawer.cs.meta b/RangedFloat/Editor/PropertyDrawers/RangedFloatDrawer.cs.meta similarity index 83% rename from Editor/PropertyDrawers/RangedFloatDrawer.cs.meta rename to RangedFloat/Editor/PropertyDrawers/RangedFloatDrawer.cs.meta index 8381132..9a00415 100644 --- a/Editor/PropertyDrawers/RangedFloatDrawer.cs.meta +++ b/RangedFloat/Editor/PropertyDrawers/RangedFloatDrawer.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a5716b352e7c6fb48898f9a0f4e70e7e +guid: 51f16956506f22d4fa6beb4d34e1d305 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/RangedFloat/Runtime.meta b/RangedFloat/Runtime.meta new file mode 100644 index 0000000..250dd15 --- /dev/null +++ b/RangedFloat/Runtime.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 168620767289dab44bd06658329309f2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Attributes/MinMaxRangeAttribute.cs b/RangedFloat/Runtime/MinMaxRangeAttribute.cs similarity index 100% rename from Attributes/MinMaxRangeAttribute.cs rename to RangedFloat/Runtime/MinMaxRangeAttribute.cs diff --git a/Attributes/MinMaxRangeAttribute.cs.meta b/RangedFloat/Runtime/MinMaxRangeAttribute.cs.meta similarity index 83% rename from Attributes/MinMaxRangeAttribute.cs.meta rename to RangedFloat/Runtime/MinMaxRangeAttribute.cs.meta index 2097143..6dedfb0 100644 --- a/Attributes/MinMaxRangeAttribute.cs.meta +++ b/RangedFloat/Runtime/MinMaxRangeAttribute.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4996055a108bf1a40825fd570adfb82f +guid: 29292e9219556084ca741e3c38de8bdc MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/CustomTypes/RangedFloat.cs b/RangedFloat/Runtime/RangedFloat.cs similarity index 100% rename from CustomTypes/RangedFloat.cs rename to RangedFloat/Runtime/RangedFloat.cs diff --git a/CustomTypes/RangedFloat.cs.meta b/RangedFloat/Runtime/RangedFloat.cs.meta similarity index 83% rename from CustomTypes/RangedFloat.cs.meta rename to RangedFloat/Runtime/RangedFloat.cs.meta index 1975ba2..783f046 100644 --- a/CustomTypes/RangedFloat.cs.meta +++ b/RangedFloat/Runtime/RangedFloat.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c4aefb8a410bcae4a88de6f72ae1c873 +guid: 24e8535b0b8f8ee438da963a2d30a8d7 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/ScriptableObjects/Audio.meta b/ScriptableObjects/Audio.meta deleted file mode 100644 index 53dc1b1..0000000 --- a/ScriptableObjects/Audio.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f03ec7c8000ddc74c9884e0365fcd76a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UI.meta b/UI.meta index a336b1b..c206e6a 100644 --- a/UI.meta +++ b/UI.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 06ceabc78e09fb1449cafe1c18edc376 +guid: 62b9a4f94fa31be4b86d5a1d759f47d8 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/UI/Components.meta b/UI/Components.meta index 2c2f693..b0b8df3 100644 --- a/UI/Components.meta +++ b/UI/Components.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 81610042ba9649c478290c75afdd4aa6 +guid: 170d1dc9c78555242810089f9a3a199a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/UI/Components/ComponentBase.cs.meta b/UI/Components/ComponentBase.cs.meta index a1a99af..4dddf51 100644 --- a/UI/Components/ComponentBase.cs.meta +++ b/UI/Components/ComponentBase.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 05f1837e06532924aae74834640813db +guid: d961a027f07f54e4fa6d29c5a89cbdae MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/UI/Components/SliderComponent.cs.meta b/UI/Components/SliderComponent.cs.meta index 827ea05..b0aec6c 100644 --- a/UI/Components/SliderComponent.cs.meta +++ b/UI/Components/SliderComponent.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 87e3dcb517633be41a50388dccb8453e +guid: 495594b1395bddc46b61b4cd39db5b9e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/UI/Components/TextComponent.cs.meta b/UI/Components/TextComponent.cs.meta index bbbcef0..ddd3a1c 100644 --- a/UI/Components/TextComponent.cs.meta +++ b/UI/Components/TextComponent.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f98198e52cc782f419cbdc72e5da0149 +guid: 787c538390b3f55469e462126272a197 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Unity.johnsonutils.asmdef b/Unity.johnsonutils.asmdef new file mode 100644 index 0000000..4222b6d --- /dev/null +++ b/Unity.johnsonutils.asmdef @@ -0,0 +1,15 @@ +{ + "name": "johnsonutils", + "references": [ + "GUID:6055be8ebefd69e48b49212b09b47b2f" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Unity.johnsonutils.asmdef.meta b/Unity.johnsonutils.asmdef.meta new file mode 100644 index 0000000..bb521ab --- /dev/null +++ b/Unity.johnsonutils.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 81a2d0c288f3eb34abca706b734ef42c +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Utils.meta b/Utils.meta deleted file mode 100644 index 37cc2c7..0000000 --- a/Utils.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5edd6f06f0aa9d24fb11166e78450390 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/package.json b/package.json new file mode 100644 index 0000000..2561d24 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "name": "com.johnson-utils", + "version": "1.0.0", + "displayName": "Johnson Utils", + "description": "Utility used in prototypes and game dev", + "unity": "2019.3", + "author":{ + "name": "Martin Johnson", + "email": "martinjohnson@live.ca" + } +} \ No newline at end of file diff --git a/package.json.meta b/package.json.meta new file mode 100644 index 0000000..c463447 --- /dev/null +++ b/package.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3f5fd77dea328bc47b5c1f706630fddb +PackageManifestImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: