diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index bf63c5f..7a31508 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -5,3 +5,4 @@ When doing so, make sure to: - Follow similar code style which is used in other scripts. - Add test cases under [ScriptableEventAttributeTestSource](../Packages/com.chark.scriptable-events/Tests/Editor/ScriptableEventAttributeTestSource.cs) and [ScriptableEventTestSource](../Packages/com.chark.scriptable-events/Tests/Runtime/ScriptableEventTestSource.cs) when adding new event types. - Add tests for additional features, for example how [SimpleScriptableEventTest](../Packages/com.chark.scriptable-events/Tests/Runtime/SimpleScriptableEventTest.cs) does it for an additional method that is not covered in [ScriptableEventTest](../Packages/com.chark.scriptable-events/Tests/Runtime/ScriptableEventTest.cs). +- Update documentation and samples if necessary. diff --git a/.github/README.md b/.github/README.md index 8eb9649..3063d10 100644 --- a/.github/README.md +++ b/.github/README.md @@ -1,4 +1,5 @@ # Scriptable Events + [![Unity 2020.3+](https://img.shields.io/badge/unity-2020.3%2B-blue.svg)](https://unity3d.com/get-unity/download) [![Actions Status](https://github.com/chark/scriptable-events/workflows/CI/badge.svg)](https://github.com/chark/scriptable-events/actions) [![openupm](https://img.shields.io/npm/v/com.chark.scriptable-events?label=openupm®istry_uri=https://package.openupm.com)](https://openupm.com/packages/com.chark.scriptable-events/) @@ -11,6 +12,7 @@ Minimalistic and extensible event system implemented via `ScriptableObject`, ins

## Features + - Designer friendly - Default event and listener implementations for common use-cases - Code generation tools which can be used to create custom event and inspector scripts @@ -19,6 +21,7 @@ Minimalistic and extensible event system implemented via `ScriptableObject`, ins - Odin Inspector support ## Installation + This package can be installed via [OpenUPM](https://openupm.com/packages/com.chark.scriptable-events/): ```text openupm add com.chark.scriptable-events @@ -29,12 +32,17 @@ Or via the Unity Package Manager by [Installing from a Git URL](https://docs.uni https://github.com/chark/scriptable-events.git#upm ``` -Alternatively, you can also install it by adding the following line to `Packages/manifest.json`: -```text -"com.chark.scriptable-events": "https://github.com/chark/scriptable-events.git#upm" +Alternatively, manually install by adding the following entry to `Packages/manifest.json`: +```json +{ + "com.chark.scriptable-events": "https://github.com/chark/scriptable-events.git#upm" +} ``` +If you'd like to install a specific release, replace `upm` suffix with version number, e.g., `v3.0.0`. You can find all releases [here](https://github.com/chark/scriptable-events/releases). + ## Links + - [Documentation](../Packages/com.chark.scriptable-events/Documentation~/README.md) - [Contributing](CONTRIBUTING.md) - [Changelog](../Packages/com.chark.scriptable-events/CHANGELOG.md) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2a8962c..7011e79 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: strategy: matrix: unityVersion: - - 2020.3.25f1 + - 2020.3.48f1 steps: @@ -56,7 +56,7 @@ jobs: # Test - name: Run Tests - uses: game-ci/unity-test-runner@v2 + uses: game-ci/unity-test-runner@v3.0.0 id: tests env: UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} @@ -68,5 +68,5 @@ jobs: uses: actions/upload-artifact@v2 if: always() with: - name: Test Restuls + name: Test Results path: ${{ steps.tests.outputs.artifactsPath }} diff --git a/.github/workflows/upm.yml b/.github/workflows/upm.yml index f450186..0c6b5b3 100644 --- a/.github/workflows/upm.yml +++ b/.github/workflows/upm.yml @@ -3,23 +3,44 @@ on: workflow_dispatch: inputs: branch: - description: 'Branch' + description: 'Branch' required: true default: 'upm' jobs: - split-upm: - name: Split UPM branch + deploy-upm: + name: Deploy to UPM branch runs-on: ubuntu-latest + + env: + PACKAGE_DIR: Packages/com.chark.scriptable-events + SAMPLE_SRC_DIR: Samples + SAMPLE_DST_DIR: Samples~ + steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: split upm branch - run: | - git branch -d ${{ github.event.inputs.branch }} &> /dev/null || echo the branch not found - git subtree split -P "$PKG_ROOT" -b ${{ github.event.inputs.branch }} - git checkout ${{ github.event.inputs.branch }} - git push -f -u origin ${{ github.event.inputs.branch }} - env: - PKG_ROOT: Packages/com.chark.scriptable-events + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Create '${{ github.event.inputs.branch }}' branch from '${{ env.PACKAGE_DIR }}' directory + run: | + git branch -d '${{ github.event.inputs.branch }}' &> /dev/null || echo '${{ github.event.inputs.branch }} branch not found' + git subtree split -P '${{ env.PACKAGE_DIR }}' -b '${{ github.event.inputs.branch }}' + git checkout '${{ github.event.inputs.branch }}' + + - name: Move '${{ env.SAMPLE_SRC_DIR }}' directory to '${{ env.SAMPLE_DST_DIR }}' + run: | + rm -f '${{ env.SAMPLE_SRC_DIR }}.meta' + git mv '${{ env.SAMPLE_SRC_DIR }}' '${{ env.SAMPLE_DST_DIR }}' + + git config --global user.name 'github-bot' + git config --global user.email 'github-bot@users.noreply.github.com' + + git add '${{ env.SAMPLE_SRC_DIR }}.meta' + git add '${{ env.SAMPLE_DST_DIR }}' + + git commit -m "Move '${{ env.SAMPLE_SRC_DIR }}' directory to '${{ env.SAMPLE_DST_DIR }}'" + + - name: Push '${{ github.event.inputs.branch }}' branch + run: | + git push -f -u origin '${{ github.event.inputs.branch }}' diff --git a/LICENSE.md b/LICENSE.md index cb33b4f..5169581 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 CHARK +Copyright (c) 2023 CHARK Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Packages/com.chark.scriptable-events/CHANGELOG.md b/Packages/com.chark.scriptable-events/CHANGELOG.md index 8c0fc4d..24ea119 100644 --- a/Packages/com.chark.scriptable-events/CHANGELOG.md +++ b/Packages/com.chark.scriptable-events/CHANGELOG.md @@ -1,18 +1,44 @@ # Changelog + All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [2.2.0] - 2022-08-04 +## [v3.0.0](https://github.com/chark/scriptable-events/compare/v2.2.0...v3.0.0) - 2023-10-05 + +This release tidies up this package, so it is consistent with other packages published by CHARK. Additionally, this release includes a set of **breaking changes** which will affect you if you're upgrading from previous versions. + +### Changes + +- Renamed `BaseScriptableEvent` to `ScriptableEvent`. +- Renamed `BaseScriptableEventListener` to `ScriptableEventListener`. +- Renamed `BaseScriptableEventEditor` to `ScriptableEventEditor`. +- Renamed `BaseScriptableEventListenerEditor` to `ScriptableEventListenerEditor`. +- Updated all built-in `BaseScriptableEvent` and `ScriptableEvent` implementations to use `sealed` keyword to prevent inheriting built-in event and listener implementations. +- Updated namespaces to use `CHARK.` prefix. +- Updated menu items to use `CHARK/` prefix. +- Updated assemblies to use `CHARK.` (instead of `Chark.`) prefix in their names. +- Updated assemblies to use GUIDs instead of assembly names when referencing other assemblies. +- Updated samples as they broke after changing class names and namespaces. +- Updated script generation logic to accomodate namespace and naming changes. +- Updated Documentation to include, namespace, menu item and renaming changes. Additionally, some information regarding addressables was added as well. +- Updated Script Creator window to generate more restricted classes, with `sealed` and `internal` keywords instead of just `public`. + +## [v2.2.0](https://github.com/chark/scriptable-events/compare/v2.1.0...v2.2.0) - 2022-08-04 + Multi events. +### Changed + - `BaseScriptableEventListener` now supports multiple events. This should be a non-breaking change. Migration from `scriptableEvent` to a list of `scriptableEvents` is done via `ISerializationCallbackReceiver` which is implemented in `BaseScriptableEventListener`. -## [2.1.0] - 2022-02-05 +## [v2.1.0](https://github.com/chark/scriptable-events/compare/v2.0.0...v2.1.0) - 2022-02-05 + Quality of life improvements. ### Added + - Utility window to help in creation of Scriptable Events. It can be found via _Right Click > Create > Scriptable Event > Custom Scriptable Event_ (at the very bottom). - `ScriptableEventConstants` class which can be used to order custom events more neatly. - `BaseScriptableEvent` class (without `TArg`) which is inherited by all events and is used internally to draw inspector GUIs. @@ -25,6 +51,7 @@ Quality of life improvements. - Odin Inspector support via the use of `#if ODIN_INSPECTOR`. ### Changed + - Renamed Scriptable Event creation menu from _Scriptable **Events**_ to _Scriptable **Event**_. - Moved Scriptable Event menus below _Folder_ and _Script_ creation menu items so the package is less intrusive. - All existing events now use `ScriptableEventConstants` to define their menu order. @@ -36,15 +63,18 @@ Quality of life improvements. - Reworked all samples to be more consistent. - Updated usage documentation to follow new samples and showcase event creation. -## [2.0.0] - 2021-07-07 +## [v2.0.0](https://github.com/chark/scriptable-events/compare/v1.0.1...v2.0.0) - 2021-07-07 + This release contains major breaking changes and migrates from 2019 (LTS) to 2020 (LTS) in order to utilise generics. ### Added + - `BaseScriptableEventEditor` by default applies to all `BaseScriptableEvent` assets. `BaseScriptableEventEditor` (with a generic type) should be used only if `Raise` button functionality is required. - Additional listener info including listener counts (see below "Added Listeners" label on `IScriptableEvent` assets). - Events, listeners and editors (except editors for `Collision*` types) for `long`, `double`, `Quaternion`, `Collider`, `Collider2D`, `Collision`, `Collision2D` types. ### Changed + - All public `BaseScriptableEvent` methods apart from `Raise` were renamed to have a `*Listener` suffix. - Each listener now uses a generic `BaseScriptableEvent` field instead of a concrete implementation. The additional argument for the event type as well as the `UnityEvent` type is no longer required. - All events have been moved to `ScriptableEvents.Events` namespace to avoid clashing with Unity namespaces. @@ -53,20 +83,24 @@ This release contains major breaking changes and migrates from 2019 (LTS) to 202 - Order of components and scriptable events in menus. ### Removed + - `IScriptableEvent` interface as it had no use and only added boilerplate. - `Listeners` property from `BaseScriptableEvent`. - All `UnityEvent` implementations. - Duplicate listener check under `BaseScriptableEvent`. -## [1.0.1] - 2021-02-07 +## [v1.0.1](https://github.com/chark/scriptable-events/compare/v1.0.0...v1.0.1) - 2021-02-07 ### Changed + - Fixed naming of GameObject event listener file. Now it should appear as expected in the editor. -## [1.0.0] - 2021-02-01 +## [v1.0.0](https://github.com/chark/scriptable-events/compare/v1.0.0) - 2021-02-01 + Initial release, here we list changes made after moving away from [Unity Scriptable Objects](https://github.com/chark/unity-scriptable-objects). ### Changed + - Naming of events, `*GameEvent` -> `*ScriptableEvent`. - Rewrote event, listener and inspector GUI APIs. - Rewrote test code. diff --git a/Packages/com.chark.scriptable-events/Documentation~/README.md b/Packages/com.chark.scriptable-events/Documentation~/README.md index 65ec469..67c529b 100644 --- a/Packages/com.chark.scriptable-events/Documentation~/README.md +++ b/Packages/com.chark.scriptable-events/Documentation~/README.md @@ -9,28 +9,36 @@ # Documentation ## Samples + All features shown here can be imported as samples via [Unity Package Manager] from the [Samples~] directory. When stuck, make sure to investigate the corresponding sample: +

## Getting started + The simplest use case of _Scriptable Events_ is when a system needs to be notified that something has happened without providing any context. To do so, the following elements are necessary: + - _Simple Scriptable Event_ asset which contains listeners and is used to `Raise` the event - _Simple Scriptable Event Listener_ component which reacts to the event ### How to Raise Events -First, create a _Simple Scriptable Event_ asset by right-clicking in the _Project Window_ and selecting _Create/Scriptable Event/Simple Scriptable Event_. The event asset can be renamed and placed anywhere in the project: + +First, create a _Simple Scriptable Event_ asset by right-clicking in the _Project Window_ and selecting _Create/CHARK/Scriptable Event/Simple Scriptable Event_. The event asset can be renamed and placed anywhere in the project: +

Next, create a new _GameObject_ in the scene and add a _Simple Scriptable Event Listener_ component: +

-Afterwards, do the following: +Afterward, do the following: + - Add event asset into the _Scriptable Events_ field - Note that you can more than one event of the same type - In case of multiple events, the listener will be triggered when any of those events get raised @@ -43,6 +51,7 @@ For example, if you wanted to turn off a light, the listener setup might be as f

Now that the listener is ready, the event needs to be raised. This can be done in multiple ways: + - Using a [Unity Event] and selecting, adding a `ScriptableEvent` asset and selecting the `SimpleScriptableEvent.Raise()` method - Clicking the _Raise_ button in on the event asset - Clicking the _Raise_ button next to a specific listener on the event asset @@ -53,9 +62,11 @@ Now that the listener is ready, the event needs to be raised. This can be done i

### How to Trigger Events in Custom Components + In most cases events will be raised from custom components. The recommended way to do so is to define a [Unity Event] field and raise the event through it. This approach will give the most flexibility but will be harder to debug: + ```cs -using ScriptableEvents.Events; +using CHARK.ScriptableEvents.Events; using UnityEngine; public class TriggerEvent : MonoBehaviour @@ -71,8 +82,9 @@ public class TriggerEvent : MonoBehaviour ``` Alternatively, the event asset can be directly referenced and the `SimpleScriptableEvent.Raise` method can be called to trigger it. This provides better traceability but is less flexible than the [Unity Event] approach: + ```cs -using ScriptableEvents.Events; +using CHARK.ScriptableEvents.Events; using UnityEngine; public class TriggerEvent : MonoBehaviour @@ -88,21 +100,26 @@ public class TriggerEvent : MonoBehaviour ``` ## Passing Arguments + Often systems will require some context when they're being invoked. To solve this, this package provides a set of events with commonly used types which can be used to carry information. ### How to Raise Events with Arguments -To create an event asset which carries information, right-click in the _Project Window_ and select an event with a specific type from _Create/Scriptable Event/*_ menu: + +To create an event asset which carries information, right-click in the _Project Window_ and select an event with a specific type from _Create/CHARK/Scriptable Event/*_ menu: +

Next, a listener for this specific event type must be added into the scene. Each _Scriptable Event_ type contains a corresponding listener component. These typed event listeners work the same way as _Simple Scriptable Event Listener_ components. The only difference is that you must select a **dynamic** method when raising the event from a [Unity Event], otherwise the event will always receive the same value: +

To raise the event, follow the same steps as with _Simple Scriptable Event_. Again, make sure to select a **dynamic** `Raise` method: +

@@ -110,7 +127,9 @@ To raise the event, follow the same steps as with _Simple Scriptable Event_. Aga A more concrete example of this can be seen in [Events With Arguments] sample. ### How to Raise Events with Arguments in Custom Components + When raising events with arguments in code, it is also recommended to use [Unity Event] fields. However, when defining the event field, type information needs to be specified as well: + ```cs using UnityEngine; using UnityEngine.Events; @@ -131,8 +150,9 @@ public class TriggerEvent : MonoBehaviour ``` Alternatively, the event asset can be referenced and the `SimpleScriptableEvent.Raise(TArg)` method can be called to raise the event: + ```cs -using ScriptableEvents.Events; +using CHARK.ScriptableEvents.Events; using UnityEngine; public class TriggerEvent : MonoBehaviour @@ -142,7 +162,7 @@ public class TriggerEvent : MonoBehaviour // Also works: // [SerializeField] - // private BaseScriptableEvent scriptableEvent; + // private ScriptableEvent scriptableEvent; private void Start() { @@ -155,7 +175,9 @@ public class TriggerEvent : MonoBehaviour ``` ## Creating Custom Events + In some cases using the built-in events and listeners is not sufficient. This can happen when your systems need to handle custom data types, and you want to carry a large chunk of information in one burst. To integrate a custom data type into the Scriptable Event system, the following scripts are necessary: + - The custom data type script - _Scriptable Event_ asset script - _Scriptable Event Listener_ script (optional if subscribing manually) @@ -164,6 +186,7 @@ In some cases using the built-in events and listeners is not sufficient. This ca To simplify script creation workflow, this package provides a _Script Creator_ tool which can be used to automate this process. To demonstrate this tool, lets assume that we need to integrate the data type which looks like the following and exists in a script named `LightRandomizationEventArgs.cs`: + ```cs public class LightRandomizationEventArgs { @@ -173,7 +196,7 @@ public class LightRandomizationEventArgs } ``` -Then we need to tell the _Script Creator_ that this script should be used as a base for our events and listeners. To do so, right-click this script and select _Create/Scriptable Event/Custom Scriptable Event_: +Then we need to tell the _Script Creator_ that this script should be used as a base for our events and listeners. To do so, right-click this script and select _Create/CHARK/Scriptable Event/Custom Scriptable Event_:

@@ -191,51 +214,57 @@ The _Script Creator_ window provides a set of options which can be used to tailo Having said that, if we made some adjustments and clicked the **Create** button in this specific example, we would end up with the following scripts (as seen in [Custom Events] sample). ### Scriptable Event Script + The event itself, this script creates the actual Scriptable Event asset: + ```cs using UnityEngine; -namespace ScriptableEvents.Events +namespace CHARK.ScriptableEvents.Events { [CreateAssetMenu( fileName = "LightRandomizationScriptableEvent", menuName = ScriptableEventConstants.MenuNameCustom + "/Light Randomization Scriptable Event", order = ScriptableEventConstants.MenuOrderCustom + 0 )] - public class LightRandomizationScriptableEvent : BaseScriptableEvent + public class LightRandomizationScriptableEvent : ScriptableEvent { } } ``` ### Scriptable Event Listener Script + The listener which is triggered by the event asset: + ```cs using UnityEngine; -namespace ScriptableEvents.Events +namespace CHARK.ScriptableEvents.Events { [AddComponentMenu( ScriptableEventConstants.MenuNameCustom + "/Light Randomization Scriptable Event Listener", ScriptableEventConstants.MenuOrderCustom + 0 )] - public class LightRandomizationScriptableEventListener : BaseScriptableEventListener + public class LightRandomizationScriptableEventListener : ScriptableEventListener { } } ``` ### Scriptable Event Editor Script + Finally, the optional editor script, which adds the _Raise_ button functionality to the custom event. However, note that the code here is just a placeholder, you will have to construct the UI to input the event arguments manually: + ```cs -using ScriptableEvents.Editor; +using CHARK.ScriptableEvents.Editor; using UnityEditor; using UnityEngine; -namespace ScriptableEvents.Editor.Events +namespace CHARK.ScriptableEvents.Editor.Events { [CustomEditor(typeof(LightRandomizationScriptableEvent))] - public class LightRandomizationScriptableEventEditor : BaseScriptableEventEditor + public class LightRandomizationScriptableEventEditor : ScriptableEventEditor { protected override LightRandomizationEventArgs DrawArgField(LightRandomizationEventArgs value) { @@ -248,15 +277,16 @@ namespace ScriptableEvents.Editor.Events ``` The input fields for this specific example, to have the _Raise_ functionality, can be added in the following way (as seen in [Custom Events] sample): + ```cs -using ScriptableEvents.Editor; +using CHARK.ScriptableEvents.Editor; using UnityEditor; using UnityEngine; -namespace ScriptableEvents.Editor.Events +namespace CHARK.ScriptableEvents.Editor.Events { [CustomEditor(typeof(LightRandomizationScriptableEvent))] - public class LightRandomizationScriptableEventEditor : BaseScriptableEventEditor + public class LightRandomizationScriptableEventEditor : ScriptableEventEditor { protected override LightRandomizationEventArgs DrawArgField(LightRandomizationEventArgs value) { @@ -278,16 +308,18 @@ namespace ScriptableEvents.Editor.Events } ``` -Finally, in order to create the event asset for the newly generated script, select _Create/Scriptable Events (custom)/Light Randomization Scriptable Event Listener_: +Finally, in order to create the event asset for the newly generated script, select _Create/CHARK/Scriptable Events (custom)/Light Randomization Scriptable Event Listener_:

## Manually Subscribing to Events + It is recommended to use pre-defined and custom listener components to subscribe to events via the Editor. However, when traceability is important, subscribing to events manually via non-listener components is preferable. There are two approaches that can be used to subscribe to an event manually, the first one is implementing `IScriptableEventListener` and calling `AddListener(this)` (don't forget to call `RemoveListener(this)` to avoid memory leaks): + ```cs public class CustomEventListener : MonoBehaviour, IScriptableEventListener { @@ -296,7 +328,7 @@ public class CustomEventListener : MonoBehaviour, IScriptableEventListener scriptableEvent; + // private ScriptableEvent scriptableEvent; private void OnEnable() { @@ -316,6 +348,7 @@ public class CustomEventListener : MonoBehaviour, IScriptableEventListener)` overload (again don't forget to call the `RemoveListener(Action)` to avoid memory leaks): + ```cs public class CustomEventListener : MonoBehaviour { @@ -324,7 +357,7 @@ public class CustomEventListener : MonoBehaviour // Also works: // [SerializeField] - // private BaseScriptableEvent scriptableEvent; + // private ScriptableEvent scriptableEvent; private void OnEnable() { @@ -344,3 +377,7 @@ public class CustomEventListener : MonoBehaviour ``` Note that when using these approaches to subscribe to events, some functionality in the custom Editor inspectors that are included in this package might not work. For example, the functionality to click on `UnityEngine.Object` references in _Scriptable Event_ assets, as it relies on the listeners being of type `UnityEngine.Object`. + +## Addressables + +Officially Scriptable Events do not support addressables. You may experience issues if you try to use the same event asset between scenes loaded by addressables. To read more about this and possible workarounds, see [this issue](https://github.com/chark/scriptable-events/issues/26). diff --git a/Packages/com.chark.scriptable-events/Editor/AssemblyInfo.cs b/Packages/com.chark.scriptable-events/Editor/AssemblyInfo.cs index b9a1fcd..69b10e3 100644 --- a/Packages/com.chark.scriptable-events/Editor/AssemblyInfo.cs +++ b/Packages/com.chark.scriptable-events/Editor/AssemblyInfo.cs @@ -1,3 +1,3 @@ using System.Runtime.CompilerServices; -[assembly:InternalsVisibleTo("Chark.ScriptableEvents.Editor.Tests")] +[assembly:InternalsVisibleTo("CHARK.ScriptableEvents.Editor.Tests")] diff --git a/Packages/com.chark.scriptable-events/Editor/CHARK.ScriptableEvents.Editor.asmdef b/Packages/com.chark.scriptable-events/Editor/CHARK.ScriptableEvents.Editor.asmdef new file mode 100644 index 0000000..a30a307 --- /dev/null +++ b/Packages/com.chark.scriptable-events/Editor/CHARK.ScriptableEvents.Editor.asmdef @@ -0,0 +1,18 @@ +{ + "name": "CHARK.ScriptableEvents.Editor", + "rootNamespace": "CHARK.ScriptableEvents", + "references": [ + "GUID:d8ff72fdf1f9b014ab4291157a56a767" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Packages/com.chark.scriptable-events/Editor/Chark.ScriptableEvents.Editor.asmdef.meta b/Packages/com.chark.scriptable-events/Editor/CHARK.ScriptableEvents.Editor.asmdef.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Editor/Chark.ScriptableEvents.Editor.asmdef.meta rename to Packages/com.chark.scriptable-events/Editor/CHARK.ScriptableEvents.Editor.asmdef.meta diff --git a/Packages/com.chark.scriptable-events/Editor/Chark.ScriptableEvents.Editor.asmdef b/Packages/com.chark.scriptable-events/Editor/Chark.ScriptableEvents.Editor.asmdef deleted file mode 100644 index 1b82b1d..0000000 --- a/Packages/com.chark.scriptable-events/Editor/Chark.ScriptableEvents.Editor.asmdef +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "Chark.ScriptableEvents.Editor", - "rootNamespace": "ScriptableEvents", - "references": [ - "Chark.ScriptableEvents" - ], - "includePlatforms": [ - "Editor" - ] -} diff --git a/Packages/com.chark.scriptable-events/Editor/Events/BoolScriptableEventEditor.cs b/Packages/com.chark.scriptable-events/Editor/Events/BoolScriptableEventEditor.cs index c4b2049..16c4142 100644 --- a/Packages/com.chark.scriptable-events/Editor/Events/BoolScriptableEventEditor.cs +++ b/Packages/com.chark.scriptable-events/Editor/Events/BoolScriptableEventEditor.cs @@ -1,10 +1,10 @@ -using ScriptableEvents.Events; +using CHARK.ScriptableEvents.Events; using UnityEditor; -namespace ScriptableEvents.Editor.Events +namespace CHARK.ScriptableEvents.Editor.Events { [CustomEditor(typeof(BoolScriptableEvent))] - public class BoolScriptableEventEditor : BaseScriptableEventEditor + public class BoolScriptableEventEditor : ScriptableEventEditor { protected override bool DrawArgField(bool value) { diff --git a/Packages/com.chark.scriptable-events/Editor/Events/Collider2DScriptableEventEditor.cs b/Packages/com.chark.scriptable-events/Editor/Events/Collider2DScriptableEventEditor.cs index f2c0a4d..a5f460f 100644 --- a/Packages/com.chark.scriptable-events/Editor/Events/Collider2DScriptableEventEditor.cs +++ b/Packages/com.chark.scriptable-events/Editor/Events/Collider2DScriptableEventEditor.cs @@ -1,11 +1,11 @@ -using ScriptableEvents.Events; +using CHARK.ScriptableEvents.Events; using UnityEditor; using UnityEngine; -namespace ScriptableEvents.Editor.Events +namespace CHARK.ScriptableEvents.Editor.Events { [CustomEditor(typeof(Collider2DScriptableEvent))] - public class Collider2DScriptableEventEditor : BaseScriptableEventEditor + public class Collider2DScriptableEventEditor : ScriptableEventEditor { protected override Collider2D DrawArgField(Collider2D value) { diff --git a/Packages/com.chark.scriptable-events/Editor/Events/ColliderScriptableEventEditor.cs b/Packages/com.chark.scriptable-events/Editor/Events/ColliderScriptableEventEditor.cs index 43ec092..c244124 100644 --- a/Packages/com.chark.scriptable-events/Editor/Events/ColliderScriptableEventEditor.cs +++ b/Packages/com.chark.scriptable-events/Editor/Events/ColliderScriptableEventEditor.cs @@ -1,11 +1,11 @@ -using ScriptableEvents.Events; +using CHARK.ScriptableEvents.Events; using UnityEditor; using UnityEngine; -namespace ScriptableEvents.Editor.Events +namespace CHARK.ScriptableEvents.Editor.Events { [CustomEditor(typeof(ColliderScriptableEvent))] - public class ColliderScriptableEventEditor : BaseScriptableEventEditor + public class ColliderScriptableEventEditor : ScriptableEventEditor { protected override Collider DrawArgField(Collider value) { diff --git a/Packages/com.chark.scriptable-events/Editor/Events/ColorScriptableEventEditor.cs b/Packages/com.chark.scriptable-events/Editor/Events/ColorScriptableEventEditor.cs index 86fa6ac..b133ad1 100644 --- a/Packages/com.chark.scriptable-events/Editor/Events/ColorScriptableEventEditor.cs +++ b/Packages/com.chark.scriptable-events/Editor/Events/ColorScriptableEventEditor.cs @@ -1,11 +1,11 @@ -using ScriptableEvents.Events; +using CHARK.ScriptableEvents.Events; using UnityEditor; using UnityEngine; -namespace ScriptableEvents.Editor.Events +namespace CHARK.ScriptableEvents.Editor.Events { [CustomEditor(typeof(ColorScriptableEvent))] - public class ColorScriptableEventEditor : BaseScriptableEventEditor + public class ColorScriptableEventEditor : ScriptableEventEditor { protected override Color DrawArgField(Color value) { diff --git a/Packages/com.chark.scriptable-events/Editor/Events/DefaultScriptableEventEditor.cs b/Packages/com.chark.scriptable-events/Editor/Events/DefaultScriptableEventEditor.cs index fdafb54..64dad8a 100644 --- a/Packages/com.chark.scriptable-events/Editor/Events/DefaultScriptableEventEditor.cs +++ b/Packages/com.chark.scriptable-events/Editor/Events/DefaultScriptableEventEditor.cs @@ -1,12 +1,12 @@ using UnityEditor; -namespace ScriptableEvents.Editor.Events +namespace CHARK.ScriptableEvents.Editor.Events { /// /// Default editor for Scriptable Events which don't have an explicit editor. /// - [CustomEditor(typeof(BaseScriptableEvent), true, isFallback = true)] - internal class DefaultScriptableEventEditor : BaseScriptableEventEditor + [CustomEditor(typeof(ScriptableEvent), true, isFallback = true)] + internal class DefaultScriptableEventEditor : ScriptableEventEditor { } } diff --git a/Packages/com.chark.scriptable-events/Editor/Events/DoubleScriptableEventEditor.cs b/Packages/com.chark.scriptable-events/Editor/Events/DoubleScriptableEventEditor.cs index b057cd3..80b8b85 100644 --- a/Packages/com.chark.scriptable-events/Editor/Events/DoubleScriptableEventEditor.cs +++ b/Packages/com.chark.scriptable-events/Editor/Events/DoubleScriptableEventEditor.cs @@ -1,10 +1,10 @@ -using ScriptableEvents.Events; +using CHARK.ScriptableEvents.Events; using UnityEditor; -namespace ScriptableEvents.Editor.Events +namespace CHARK.ScriptableEvents.Editor.Events { [CustomEditor(typeof(DoubleScriptableEvent))] - public class DoubleScriptableEventEditor : BaseScriptableEventEditor + public class DoubleScriptableEventEditor : ScriptableEventEditor { protected override double DrawArgField(double value) { diff --git a/Packages/com.chark.scriptable-events/Editor/Events/FloatScriptableEventEditor.cs b/Packages/com.chark.scriptable-events/Editor/Events/FloatScriptableEventEditor.cs index 7ffc71e..5a2e461 100644 --- a/Packages/com.chark.scriptable-events/Editor/Events/FloatScriptableEventEditor.cs +++ b/Packages/com.chark.scriptable-events/Editor/Events/FloatScriptableEventEditor.cs @@ -1,10 +1,10 @@ -using ScriptableEvents.Events; +using CHARK.ScriptableEvents.Events; using UnityEditor; -namespace ScriptableEvents.Editor.Events +namespace CHARK.ScriptableEvents.Editor.Events { [CustomEditor(typeof(FloatScriptableEvent))] - public class FloatScriptableEventEditor : BaseScriptableEventEditor + public class FloatScriptableEventEditor : ScriptableEventEditor { protected override float DrawArgField(float value) { diff --git a/Packages/com.chark.scriptable-events/Editor/Events/GameObjectScriptableEventEditor.cs b/Packages/com.chark.scriptable-events/Editor/Events/GameObjectScriptableEventEditor.cs index 8cb3b44..dc96f1c 100644 --- a/Packages/com.chark.scriptable-events/Editor/Events/GameObjectScriptableEventEditor.cs +++ b/Packages/com.chark.scriptable-events/Editor/Events/GameObjectScriptableEventEditor.cs @@ -1,11 +1,11 @@ -using ScriptableEvents.Events; +using CHARK.ScriptableEvents.Events; using UnityEditor; using UnityEngine; -namespace ScriptableEvents.Editor.Events +namespace CHARK.ScriptableEvents.Editor.Events { [CustomEditor(typeof(GameObjectScriptableEvent))] - public class GameObjectScriptableEventEditor : BaseScriptableEventEditor + public class GameObjectScriptableEventEditor : ScriptableEventEditor { protected override GameObject DrawArgField(GameObject value) { diff --git a/Packages/com.chark.scriptable-events/Editor/Events/IntScriptableEventEditor.cs b/Packages/com.chark.scriptable-events/Editor/Events/IntScriptableEventEditor.cs index 3c33e35..df4186a 100644 --- a/Packages/com.chark.scriptable-events/Editor/Events/IntScriptableEventEditor.cs +++ b/Packages/com.chark.scriptable-events/Editor/Events/IntScriptableEventEditor.cs @@ -1,10 +1,10 @@ -using ScriptableEvents.Events; +using CHARK.ScriptableEvents.Events; using UnityEditor; -namespace ScriptableEvents.Editor.Events +namespace CHARK.ScriptableEvents.Editor.Events { [CustomEditor(typeof(IntScriptableEvent))] - public class IntScriptableEventEditor : BaseScriptableEventEditor + public class IntScriptableEventEditor : ScriptableEventEditor { protected override int DrawArgField(int value) { diff --git a/Packages/com.chark.scriptable-events/Editor/Events/LongScriptableEventEditor.cs b/Packages/com.chark.scriptable-events/Editor/Events/LongScriptableEventEditor.cs index ccc1657..9a3898d 100644 --- a/Packages/com.chark.scriptable-events/Editor/Events/LongScriptableEventEditor.cs +++ b/Packages/com.chark.scriptable-events/Editor/Events/LongScriptableEventEditor.cs @@ -1,10 +1,10 @@ -using ScriptableEvents.Events; +using CHARK.ScriptableEvents.Events; using UnityEditor; -namespace ScriptableEvents.Editor.Events +namespace CHARK.ScriptableEvents.Editor.Events { [CustomEditor(typeof(LongScriptableEvent))] - public class LongScriptableEventEditor : BaseScriptableEventEditor + public class LongScriptableEventEditor : ScriptableEventEditor { protected override long DrawArgField(long value) { diff --git a/Packages/com.chark.scriptable-events/Editor/Events/QuaternionScriptableEventEditor.cs b/Packages/com.chark.scriptable-events/Editor/Events/QuaternionScriptableEventEditor.cs index 860474a..30921e1 100644 --- a/Packages/com.chark.scriptable-events/Editor/Events/QuaternionScriptableEventEditor.cs +++ b/Packages/com.chark.scriptable-events/Editor/Events/QuaternionScriptableEventEditor.cs @@ -1,11 +1,11 @@ -using ScriptableEvents.Events; +using CHARK.ScriptableEvents.Events; using UnityEditor; using UnityEngine; -namespace ScriptableEvents.Editor.Events +namespace CHARK.ScriptableEvents.Editor.Events { [CustomEditor(typeof(QuaternionScriptableEvent))] - public class QuaternionScriptableEventEditor : BaseScriptableEventEditor + public class QuaternionScriptableEventEditor : ScriptableEventEditor { protected override Quaternion DrawArgField(Quaternion value) { diff --git a/Packages/com.chark.scriptable-events/Editor/Events/SimpleScriptableEventEditor.cs b/Packages/com.chark.scriptable-events/Editor/Events/SimpleScriptableEventEditor.cs index bb2d5f0..45c18f2 100644 --- a/Packages/com.chark.scriptable-events/Editor/Events/SimpleScriptableEventEditor.cs +++ b/Packages/com.chark.scriptable-events/Editor/Events/SimpleScriptableEventEditor.cs @@ -1,10 +1,10 @@ -using ScriptableEvents.Events; +using CHARK.ScriptableEvents.Events; using UnityEditor; -namespace ScriptableEvents.Editor.Events +namespace CHARK.ScriptableEvents.Editor.Events { [CustomEditor(typeof(SimpleScriptableEvent))] - public class SimpleScriptableEventEditor : BaseScriptableEventEditor + public class SimpleScriptableEventEditor : ScriptableEventEditor { protected override SimpleArg DrawArgField(SimpleArg value) { diff --git a/Packages/com.chark.scriptable-events/Editor/Events/StringScriptableEventEditor.cs b/Packages/com.chark.scriptable-events/Editor/Events/StringScriptableEventEditor.cs index d8ddf5d..ca8e4bd 100644 --- a/Packages/com.chark.scriptable-events/Editor/Events/StringScriptableEventEditor.cs +++ b/Packages/com.chark.scriptable-events/Editor/Events/StringScriptableEventEditor.cs @@ -1,10 +1,10 @@ -using ScriptableEvents.Events; +using CHARK.ScriptableEvents.Events; using UnityEditor; -namespace ScriptableEvents.Editor.Events +namespace CHARK.ScriptableEvents.Editor.Events { [CustomEditor(typeof(StringScriptableEvent))] - public class StringScriptableEventEditor : BaseScriptableEventEditor + public class StringScriptableEventEditor : ScriptableEventEditor { protected override string DrawArgField(string value) { diff --git a/Packages/com.chark.scriptable-events/Editor/Events/TransformScriptableEventEditor.cs b/Packages/com.chark.scriptable-events/Editor/Events/TransformScriptableEventEditor.cs index fd5f24f..a9e1abf 100644 --- a/Packages/com.chark.scriptable-events/Editor/Events/TransformScriptableEventEditor.cs +++ b/Packages/com.chark.scriptable-events/Editor/Events/TransformScriptableEventEditor.cs @@ -1,11 +1,11 @@ -using ScriptableEvents.Events; +using CHARK.ScriptableEvents.Events; using UnityEditor; using UnityEngine; -namespace ScriptableEvents.Editor.Events +namespace CHARK.ScriptableEvents.Editor.Events { [CustomEditor(typeof(TransformScriptableEvent))] - public class TransformScriptableEventEditor : BaseScriptableEventEditor + public class TransformScriptableEventEditor : ScriptableEventEditor { protected override Transform DrawArgField(Transform value) { diff --git a/Packages/com.chark.scriptable-events/Editor/Events/Vector2ScriptableEventEditor.cs b/Packages/com.chark.scriptable-events/Editor/Events/Vector2ScriptableEventEditor.cs index 416d6f1..51838c3 100644 --- a/Packages/com.chark.scriptable-events/Editor/Events/Vector2ScriptableEventEditor.cs +++ b/Packages/com.chark.scriptable-events/Editor/Events/Vector2ScriptableEventEditor.cs @@ -1,11 +1,11 @@ -using ScriptableEvents.Events; +using CHARK.ScriptableEvents.Events; using UnityEditor; using UnityEngine; -namespace ScriptableEvents.Editor.Events +namespace CHARK.ScriptableEvents.Editor.Events { [CustomEditor(typeof(Vector2ScriptableEvent))] - public class Vector2ScriptableEventEditor : BaseScriptableEventEditor + public class Vector2ScriptableEventEditor : ScriptableEventEditor { protected override Vector2 DrawArgField(Vector2 value) { diff --git a/Packages/com.chark.scriptable-events/Editor/Events/Vector3ScriptableEventEditor.cs b/Packages/com.chark.scriptable-events/Editor/Events/Vector3ScriptableEventEditor.cs index 0683759..8c2bafb 100644 --- a/Packages/com.chark.scriptable-events/Editor/Events/Vector3ScriptableEventEditor.cs +++ b/Packages/com.chark.scriptable-events/Editor/Events/Vector3ScriptableEventEditor.cs @@ -1,11 +1,11 @@ -using ScriptableEvents.Events; +using CHARK.ScriptableEvents.Events; using UnityEditor; using UnityEngine; -namespace ScriptableEvents.Editor.Events +namespace CHARK.ScriptableEvents.Editor.Events { [CustomEditor(typeof(Vector3ScriptableEvent))] - public class Vector3ScriptableEventEditor : BaseScriptableEventEditor + public class Vector3ScriptableEventEditor : ScriptableEventEditor { protected override Vector3 DrawArgField(Vector3 value) { diff --git a/Packages/com.chark.scriptable-events/Editor/Icons/IconPostProcessor.cs b/Packages/com.chark.scriptable-events/Editor/Icons/IconPostProcessor.cs index 9a896f9..57257d3 100644 --- a/Packages/com.chark.scriptable-events/Editor/Icons/IconPostProcessor.cs +++ b/Packages/com.chark.scriptable-events/Editor/Icons/IconPostProcessor.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using System.Reflection; -using ScriptableEvents.Editor.States; +using CHARK.ScriptableEvents.Editor.States; using UnityEditor; using UnityEditor.Callbacks; -namespace ScriptableEvents.Editor.Icons +namespace CHARK.ScriptableEvents.Editor.Icons { /// /// Applies icons to Scriptable Event and Listener assets. diff --git a/Packages/com.chark.scriptable-events/Editor/Icons/IconUtils.cs b/Packages/com.chark.scriptable-events/Editor/Icons/IconUtils.cs index 1008cd8..2b6df48 100644 --- a/Packages/com.chark.scriptable-events/Editor/Icons/IconUtils.cs +++ b/Packages/com.chark.scriptable-events/Editor/Icons/IconUtils.cs @@ -3,7 +3,7 @@ using UnityEditor; using Object = UnityEngine.Object; -namespace ScriptableEvents.Editor.Icons +namespace CHARK.ScriptableEvents.Editor.Icons { /// /// Utilities to set icons for Scriptable Events and Listeners. Inspired by: diff --git a/Packages/com.chark.scriptable-events/Editor/ScriptCreation/ScriptBuilder.cs b/Packages/com.chark.scriptable-events/Editor/ScriptCreation/ScriptBuilder.cs index 1a5c797..b94cdc4 100644 --- a/Packages/com.chark.scriptable-events/Editor/ScriptCreation/ScriptBuilder.cs +++ b/Packages/com.chark.scriptable-events/Editor/ScriptCreation/ScriptBuilder.cs @@ -3,7 +3,7 @@ using UnityEditor; using UnityEngine; -namespace ScriptableEvents.Editor.ScriptCreation +namespace CHARK.ScriptableEvents.Editor.ScriptCreation { /// /// Creates custom scriptable event scripts from template files. diff --git a/Packages/com.chark.scriptable-events/Editor/ScriptCreation/ScriptCreatorEditorWindow.cs b/Packages/com.chark.scriptable-events/Editor/ScriptCreation/ScriptCreatorEditorWindow.cs index 55aee0f..b8dcf3d 100644 --- a/Packages/com.chark.scriptable-events/Editor/ScriptCreation/ScriptCreatorEditorWindow.cs +++ b/Packages/com.chark.scriptable-events/Editor/ScriptCreation/ScriptCreatorEditorWindow.cs @@ -1,10 +1,10 @@ using System; using System.Linq; -using ScriptableEvents.Editor.States; +using CHARK.ScriptableEvents.Editor.States; using UnityEditor; using UnityEngine; -namespace ScriptableEvents.Editor.ScriptCreation +namespace CHARK.ScriptableEvents.Editor.ScriptCreation { /// /// Editor window for creating custom Scriptable Event and Listener scripts. @@ -310,7 +310,7 @@ private void CreateScripts() private void CreateEventScript() { - var baseNamespace = typeof(BaseScriptableEvent<>); + var baseNamespace = typeof(ScriptableEvent<>); var scriptContent = new ScriptBuilder("EventTemplate") .AddSubstitute("EVENT_NAMESPACE", eventNamespace) @@ -341,7 +341,7 @@ private void SaveEventScript(string content) private void CreateListenerScript() { - var baseNamespace = typeof(BaseScriptableEvent<>); + var baseNamespace = typeof(ScriptableEvent<>); var scriptContent = new ScriptBuilder("ListenerTemplate") .AddSubstitute("LISTENER_NAMESPACE", listenerNamespace) @@ -370,7 +370,7 @@ private void SaveListenerScript(string content) private void CreateEditorScript() { - var baseNamespace = typeof(BaseScriptableEventEditor); + var baseNamespace = typeof(ScriptableEventEditor); var scriptContent = new ScriptBuilder("EditorTemplate") .AddSubstitute("EDITOR_NAMESPACE", editorNamespace) diff --git a/Packages/com.chark.scriptable-events/Editor/ScriptCreation/ScriptCreatorEditorWindowGUI.cs b/Packages/com.chark.scriptable-events/Editor/ScriptCreation/ScriptCreatorEditorWindowGUI.cs index 4b62270..c9033fa 100644 --- a/Packages/com.chark.scriptable-events/Editor/ScriptCreation/ScriptCreatorEditorWindowGUI.cs +++ b/Packages/com.chark.scriptable-events/Editor/ScriptCreation/ScriptCreatorEditorWindowGUI.cs @@ -4,7 +4,7 @@ using UnityEngine; using Object = UnityEngine.Object; -namespace ScriptableEvents.Editor.ScriptCreation +namespace CHARK.ScriptableEvents.Editor.ScriptCreation { /// /// Utilities to draw editor window GUI in . diff --git a/Packages/com.chark.scriptable-events/Editor/ScriptCreation/ScriptUtils.cs b/Packages/com.chark.scriptable-events/Editor/ScriptCreation/ScriptUtils.cs index 2052082..5e62756 100644 --- a/Packages/com.chark.scriptable-events/Editor/ScriptCreation/ScriptUtils.cs +++ b/Packages/com.chark.scriptable-events/Editor/ScriptCreation/ScriptUtils.cs @@ -1,6 +1,6 @@ using System.IO; -namespace ScriptableEvents.Editor.ScriptCreation +namespace CHARK.ScriptableEvents.Editor.ScriptCreation { /// /// Utilities to persist custom C# scripts. diff --git a/Packages/com.chark.scriptable-events/Editor/ScriptCreation/Templates/EditorTemplate.txt b/Packages/com.chark.scriptable-events/Editor/ScriptCreation/Templates/EditorTemplate.txt index 28ff76e..cf09214 100644 --- a/Packages/com.chark.scriptable-events/Editor/ScriptCreation/Templates/EditorTemplate.txt +++ b/Packages/com.chark.scriptable-events/Editor/ScriptCreation/Templates/EditorTemplate.txt @@ -3,7 +3,7 @@ namespace ${EDITOR_NAMESPACE} { [CustomEditor(typeof(${EVENT_NAME}))] - public class ${EDITOR_NAME} : BaseScriptableEventEditor<${EVENT_ARG_NAME}> + internal sealed class ${EDITOR_NAME} : ScriptableEventEditor<${EVENT_ARG_NAME}> { protected override ${EVENT_ARG_NAME} DrawArgField(${EVENT_ARG_NAME} value) { diff --git a/Packages/com.chark.scriptable-events/Editor/ScriptCreation/Templates/EventTemplate.txt b/Packages/com.chark.scriptable-events/Editor/ScriptCreation/Templates/EventTemplate.txt index 348e535..1ae614d 100644 --- a/Packages/com.chark.scriptable-events/Editor/ScriptCreation/Templates/EventTemplate.txt +++ b/Packages/com.chark.scriptable-events/Editor/ScriptCreation/Templates/EventTemplate.txt @@ -7,7 +7,7 @@ namespace ${EVENT_NAMESPACE} menuName = ScriptableEventConstants.MenuNameCustom + "/${EVENT_MENU_NAME}", order = ScriptableEventConstants.MenuOrderCustom + ${EVENT_MENU_ORDER} )] - public class ${EVENT_NAME} : BaseScriptableEvent<${EVENT_ARG_NAME}> + internal sealed class ${EVENT_NAME} : ScriptableEvent<${EVENT_ARG_NAME}> { } } diff --git a/Packages/com.chark.scriptable-events/Editor/ScriptCreation/Templates/ListenerTemplate.txt b/Packages/com.chark.scriptable-events/Editor/ScriptCreation/Templates/ListenerTemplate.txt index 42324f7..68cfe48 100644 --- a/Packages/com.chark.scriptable-events/Editor/ScriptCreation/Templates/ListenerTemplate.txt +++ b/Packages/com.chark.scriptable-events/Editor/ScriptCreation/Templates/ListenerTemplate.txt @@ -6,7 +6,7 @@ namespace ${LISTENER_NAMESPACE} ScriptableEventConstants.MenuNameCustom + "/${LISTENER_MENU_NAME}", ScriptableEventConstants.MenuOrderCustom + ${LISTENER_MENU_ORDER} )] - public class ${LISTENER_NAME} : BaseScriptableEventListener<${EVENT_ARG_NAME}> + internal sealed class ${LISTENER_NAME} : ScriptableEventListener<${EVENT_ARG_NAME}> { } } diff --git a/Packages/com.chark.scriptable-events/Editor/BaseScriptableEventEditor.cs b/Packages/com.chark.scriptable-events/Editor/ScriptableEventEditor.cs similarity index 91% rename from Packages/com.chark.scriptable-events/Editor/BaseScriptableEventEditor.cs rename to Packages/com.chark.scriptable-events/Editor/ScriptableEventEditor.cs index c16edd6..3256bdb 100644 --- a/Packages/com.chark.scriptable-events/Editor/BaseScriptableEventEditor.cs +++ b/Packages/com.chark.scriptable-events/Editor/ScriptableEventEditor.cs @@ -2,7 +2,7 @@ using UnityEngine; using Object = UnityEngine.Object; -namespace ScriptableEvents.Editor +namespace CHARK.ScriptableEvents.Editor { /// /// Base editor for Scriptable Events with an argument. This is used when explicitly defining @@ -11,11 +11,11 @@ namespace ScriptableEvents.Editor /// /// Event argument type /// - public abstract class BaseScriptableEventEditor : BaseScriptableEventEditor + public abstract class ScriptableEventEditor : ScriptableEventEditor { #region Private Fields - private BaseScriptableEvent scriptableEvent; + private ScriptableEvent scriptableEvent; private TArg argValue; #endregion @@ -26,7 +26,7 @@ internal override void SetupEditor() { base.SetupEditor(); - scriptableEvent = target as BaseScriptableEvent; + scriptableEvent = target as ScriptableEvent; } #endregion @@ -105,7 +105,7 @@ private void DrawRaiseListener(int listenerIndex) /// Base editor for all Scriptable Events. /// [CanEditMultipleObjects] - public abstract class BaseScriptableEventEditor + public abstract class ScriptableEventEditor #if ODIN_INSPECTOR : Sirenix.OdinInspector.Editor.OdinEditor #else @@ -115,7 +115,7 @@ public abstract class BaseScriptableEventEditor #region Private Fields // Target scriptable event fields. - private BaseScriptableEvent baseScriptableEvent; + private ScriptableEvent scriptableEvent; private MonoScript monoScript; // Serialized properties. @@ -169,8 +169,8 @@ public override void OnInspectorGUI() EditorGUILayout.Space(); ScriptableEventEditorGUI.DrawListenersLabel(); ScriptableEventEditorGUI.DrawListenerStats( - baseScriptableEvent.ListenerCount, - baseScriptableEvent.Listeners + scriptableEvent.ListenerCount, + scriptableEvent.Listeners ); OnDrawListeners(); @@ -189,7 +189,7 @@ public override void OnInspectorGUI() /// internal virtual void SetupEditor() { - SetupBaseScriptableEvent(); + SetupScriptableEvent(); SetupMonoScript(); SetupSerializedProperties(); } @@ -223,7 +223,7 @@ internal virtual void OnDrawProperties() internal virtual void OnDrawListeners() { var listenerIndex = 0; - foreach (var listener in baseScriptableEvent.Listeners) + foreach (var listener in scriptableEvent.Listeners) { OnDrawListener(listener, listenerIndex); listenerIndex++; @@ -250,14 +250,14 @@ internal virtual void OnDrawListener(object listener, int listenerIndex) #region Private Setup Methods - private void SetupBaseScriptableEvent() + private void SetupScriptableEvent() { - baseScriptableEvent = target as BaseScriptableEvent; + scriptableEvent = target as ScriptableEvent; } private void SetupMonoScript() { - monoScript = MonoScript.FromScriptableObject(baseScriptableEvent); + monoScript = MonoScript.FromScriptableObject(scriptableEvent); } private void SetupSerializedProperties() diff --git a/Packages/com.chark.scriptable-events/Editor/BaseScriptableEventEditor.cs.meta b/Packages/com.chark.scriptable-events/Editor/ScriptableEventEditor.cs.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Editor/BaseScriptableEventEditor.cs.meta rename to Packages/com.chark.scriptable-events/Editor/ScriptableEventEditor.cs.meta diff --git a/Packages/com.chark.scriptable-events/Editor/ScriptableEventEditorGUI.cs b/Packages/com.chark.scriptable-events/Editor/ScriptableEventEditorGUI.cs index 0cc0232..549bb12 100644 --- a/Packages/com.chark.scriptable-events/Editor/ScriptableEventEditorGUI.cs +++ b/Packages/com.chark.scriptable-events/Editor/ScriptableEventEditorGUI.cs @@ -4,11 +4,11 @@ using UnityEngine; using Object = UnityEngine.Object; -namespace ScriptableEvents.Editor +namespace CHARK.ScriptableEvents.Editor { /// - /// Utilities to draw inspector GUIs in and - /// . + /// Utilities to draw inspector GUIs in and + /// . /// internal static class ScriptableEventEditorGUI { diff --git a/Packages/com.chark.scriptable-events/Editor/ScriptableEventGUI.cs b/Packages/com.chark.scriptable-events/Editor/ScriptableEventGUI.cs index c7e2ba3..1d7a71f 100644 --- a/Packages/com.chark.scriptable-events/Editor/ScriptableEventGUI.cs +++ b/Packages/com.chark.scriptable-events/Editor/ScriptableEventGUI.cs @@ -3,7 +3,7 @@ using UnityEngine; using Object = UnityEngine.Object; -namespace ScriptableEvents.Editor +namespace CHARK.ScriptableEvents.Editor { /// /// General utilities to draw inspector GUIs. diff --git a/Packages/com.chark.scriptable-events/Editor/BaseScriptableEventListenerEditor.cs b/Packages/com.chark.scriptable-events/Editor/ScriptableEventListenerEditor.cs similarity index 85% rename from Packages/com.chark.scriptable-events/Editor/BaseScriptableEventListenerEditor.cs rename to Packages/com.chark.scriptable-events/Editor/ScriptableEventListenerEditor.cs index 2c3c7b3..b9442ce 100644 --- a/Packages/com.chark.scriptable-events/Editor/BaseScriptableEventListenerEditor.cs +++ b/Packages/com.chark.scriptable-events/Editor/ScriptableEventListenerEditor.cs @@ -1,13 +1,13 @@ using UnityEditor; -namespace ScriptableEvents.Editor +namespace CHARK.ScriptableEvents.Editor { /// /// Default editor for Scriptable Event Listeners which don't an explicit editor. /// [CanEditMultipleObjects] - [CustomEditor(typeof(BaseScriptableEventListener), true)] - internal class BaseScriptableEventListenerEditor + [CustomEditor(typeof(ScriptableEventListener), true)] + internal class ScriptableEventListenerEditor #if ODIN_INSPECTOR : Sirenix.OdinInspector.Editor.OdinEditor #else @@ -17,7 +17,7 @@ internal class BaseScriptableEventListenerEditor #region Private Fields // Target scriptable event listener fields. - private BaseScriptableEventListener baseScriptableEventListener; + private ScriptableEventListener scriptableEventListener; private MonoScript monoScript; // Serialized properties. @@ -73,19 +73,19 @@ public override void OnInspectorGUI() private void SetupEditor() { - SetupBaseScriptableEventsListener(); + SetupScriptableEventsListener(); SetupMonoScript(); SetupSerializedProperties(); } - private void SetupBaseScriptableEventsListener() + private void SetupScriptableEventsListener() { - baseScriptableEventListener = target as BaseScriptableEventListener; + scriptableEventListener = target as ScriptableEventListener; } private void SetupMonoScript() { - monoScript = MonoScript.FromMonoBehaviour(baseScriptableEventListener); + monoScript = MonoScript.FromMonoBehaviour(scriptableEventListener); } private void SetupSerializedProperties() diff --git a/Packages/com.chark.scriptable-events/Editor/BaseScriptableEventListenerEditor.cs.meta b/Packages/com.chark.scriptable-events/Editor/ScriptableEventListenerEditor.cs.meta similarity index 97% rename from Packages/com.chark.scriptable-events/Editor/BaseScriptableEventListenerEditor.cs.meta rename to Packages/com.chark.scriptable-events/Editor/ScriptableEventListenerEditor.cs.meta index 836b09d..3027b55 100644 --- a/Packages/com.chark.scriptable-events/Editor/BaseScriptableEventListenerEditor.cs.meta +++ b/Packages/com.chark.scriptable-events/Editor/ScriptableEventListenerEditor.cs.meta @@ -1,3 +1,3 @@ -fileFormatVersion: 2 -guid: 7427262c25d84c4f9c3dba86a00bfeb1 +fileFormatVersion: 2 +guid: 7427262c25d84c4f9c3dba86a00bfeb1 timeCreated: 1642809043 \ No newline at end of file diff --git a/Packages/com.chark.scriptable-events/Editor/States/IconState.cs b/Packages/com.chark.scriptable-events/Editor/States/IconState.cs index 8daf3ca..864a3de 100644 --- a/Packages/com.chark.scriptable-events/Editor/States/IconState.cs +++ b/Packages/com.chark.scriptable-events/Editor/States/IconState.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -namespace ScriptableEvents.Editor.States +namespace CHARK.ScriptableEvents.Editor.States { /// /// Holds state used in . diff --git a/Packages/com.chark.scriptable-events/Editor/States/ScriptCreatorState.cs b/Packages/com.chark.scriptable-events/Editor/States/ScriptCreatorState.cs index f8efa9f..5b51ba2 100644 --- a/Packages/com.chark.scriptable-events/Editor/States/ScriptCreatorState.cs +++ b/Packages/com.chark.scriptable-events/Editor/States/ScriptCreatorState.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace ScriptableEvents.Editor.States +namespace CHARK.ScriptableEvents.Editor.States { /// /// Holds state used in diff --git a/Packages/com.chark.scriptable-events/Editor/States/ScriptableEventEditorState.cs b/Packages/com.chark.scriptable-events/Editor/States/ScriptableEventEditorState.cs index fb31538..9527cbe 100644 --- a/Packages/com.chark.scriptable-events/Editor/States/ScriptableEventEditorState.cs +++ b/Packages/com.chark.scriptable-events/Editor/States/ScriptableEventEditorState.cs @@ -1,7 +1,7 @@ using UnityEditor; using UnityEngine; -namespace ScriptableEvents.Editor.States +namespace CHARK.ScriptableEvents.Editor.States { /// /// Retrieves and persists state used in editor tools. diff --git a/Packages/com.chark.scriptable-events/LICENSE.md b/Packages/com.chark.scriptable-events/LICENSE.md index cb33b4f..5169581 100644 --- a/Packages/com.chark.scriptable-events/LICENSE.md +++ b/Packages/com.chark.scriptable-events/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 CHARK +Copyright (c) 2023 CHARK Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Packages/com.chark.scriptable-events/Runtime/AssemblyInfo.cs b/Packages/com.chark.scriptable-events/Runtime/AssemblyInfo.cs index ad0c6d2..62b7394 100644 --- a/Packages/com.chark.scriptable-events/Runtime/AssemblyInfo.cs +++ b/Packages/com.chark.scriptable-events/Runtime/AssemblyInfo.cs @@ -1,6 +1,6 @@ using System.Runtime.CompilerServices; -[assembly:InternalsVisibleTo("Chark.ScriptableEvents.Editor")] +[assembly:InternalsVisibleTo("CHARK.ScriptableEvents.Editor")] -[assembly:InternalsVisibleTo("Chark.ScriptableEvents.Editor.Tests")] -[assembly:InternalsVisibleTo("Chark.ScriptableEvents.Tests")] +[assembly:InternalsVisibleTo("CHARK.ScriptableEvents.Editor.Tests")] +[assembly:InternalsVisibleTo("CHARK.ScriptableEvents.Tests")] diff --git a/Packages/com.chark.scriptable-events/Runtime/CHARK.ScriptableEvents.asmdef b/Packages/com.chark.scriptable-events/Runtime/CHARK.ScriptableEvents.asmdef new file mode 100644 index 0000000..d4d9e0c --- /dev/null +++ b/Packages/com.chark.scriptable-events/Runtime/CHARK.ScriptableEvents.asmdef @@ -0,0 +1,14 @@ +{ + "name": "CHARK.ScriptableEvents", + "rootNamespace": "CHARK.ScriptableEvents", + "references": [], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Packages/com.chark.scriptable-events/Runtime/Chark.ScriptableEvents.asmdef.meta b/Packages/com.chark.scriptable-events/Runtime/CHARK.ScriptableEvents.asmdef.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Runtime/Chark.ScriptableEvents.asmdef.meta rename to Packages/com.chark.scriptable-events/Runtime/CHARK.ScriptableEvents.asmdef.meta diff --git a/Packages/com.chark.scriptable-events/Runtime/Chark.ScriptableEvents.asmdef b/Packages/com.chark.scriptable-events/Runtime/Chark.ScriptableEvents.asmdef deleted file mode 100644 index efffc5c..0000000 --- a/Packages/com.chark.scriptable-events/Runtime/Chark.ScriptableEvents.asmdef +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "Chark.ScriptableEvents", - "rootNamespace": "ScriptableEvents" -} diff --git a/Packages/com.chark.scriptable-events/Runtime/Events/BoolScriptableEvent.cs b/Packages/com.chark.scriptable-events/Runtime/Events/BoolScriptableEvent.cs index 5015e95..789d206 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Events/BoolScriptableEvent.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Events/BoolScriptableEvent.cs @@ -1,13 +1,13 @@ using UnityEngine; -namespace ScriptableEvents.Events +namespace CHARK.ScriptableEvents.Events { [CreateAssetMenu( fileName = "BoolScriptableEvent", menuName = ScriptableEventConstants.MenuNameBase + "/Bool Scriptable Event", order = ScriptableEventConstants.MenuOrderPrimitiveEvent + 0 )] - public class BoolScriptableEvent : BaseScriptableEvent + public sealed class BoolScriptableEvent : ScriptableEvent { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Events/Collider2DScriptableEvent.cs b/Packages/com.chark.scriptable-events/Runtime/Events/Collider2DScriptableEvent.cs index 99098f5..878ee6d 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Events/Collider2DScriptableEvent.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Events/Collider2DScriptableEvent.cs @@ -1,13 +1,13 @@ using UnityEngine; -namespace ScriptableEvents.Events +namespace CHARK.ScriptableEvents.Events { [CreateAssetMenu( fileName = "Collider2DScriptableEvent", menuName = ScriptableEventConstants.MenuNameBase + "/Collider 2D Scriptable Event", order = ScriptableEventConstants.MenuOrderUnityObjectEvent + 0 )] - public class Collider2DScriptableEvent : BaseScriptableEvent + public sealed class Collider2DScriptableEvent : ScriptableEvent { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Events/ColliderScriptableEvent.cs b/Packages/com.chark.scriptable-events/Runtime/Events/ColliderScriptableEvent.cs index edf16a7..49c455b 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Events/ColliderScriptableEvent.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Events/ColliderScriptableEvent.cs @@ -1,13 +1,13 @@ using UnityEngine; -namespace ScriptableEvents.Events +namespace CHARK.ScriptableEvents.Events { [CreateAssetMenu( fileName = "ColliderScriptableEvent", menuName = ScriptableEventConstants.MenuNameBase + "/Collider Scriptable Event", order = ScriptableEventConstants.MenuOrderUnityObjectEvent + 1 )] - public class ColliderScriptableEvent : BaseScriptableEvent + public sealed class ColliderScriptableEvent : ScriptableEvent { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Events/Collision2DScriptableEvent.cs b/Packages/com.chark.scriptable-events/Runtime/Events/Collision2DScriptableEvent.cs index 56809f1..3537177 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Events/Collision2DScriptableEvent.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Events/Collision2DScriptableEvent.cs @@ -1,13 +1,13 @@ using UnityEngine; -namespace ScriptableEvents.Events +namespace CHARK.ScriptableEvents.Events { [CreateAssetMenu( fileName = "Collision2DScriptableEvent", menuName = ScriptableEventConstants.MenuNameBase + "/Collision 2D Scriptable Event", order = ScriptableEventConstants.MenuOrderUnityPrimitiveEvent + 2 )] - public class Collision2DScriptableEvent : BaseScriptableEvent + public sealed class Collision2DScriptableEvent : ScriptableEvent { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Events/CollisionScriptableEvent.cs b/Packages/com.chark.scriptable-events/Runtime/Events/CollisionScriptableEvent.cs index d98c74e..fe3f67e 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Events/CollisionScriptableEvent.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Events/CollisionScriptableEvent.cs @@ -1,13 +1,13 @@ using UnityEngine; -namespace ScriptableEvents.Events +namespace CHARK.ScriptableEvents.Events { [CreateAssetMenu( fileName = "CollisionScriptableEvent", menuName = ScriptableEventConstants.MenuNameBase + "/Collision Scriptable Event", order = ScriptableEventConstants.MenuOrderUnityPrimitiveEvent + 3 )] - public class CollisionScriptableEvent : BaseScriptableEvent + public sealed class CollisionScriptableEvent : ScriptableEvent { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Events/ColorScriptableEvent.cs b/Packages/com.chark.scriptable-events/Runtime/Events/ColorScriptableEvent.cs index 7408958..0b397b2 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Events/ColorScriptableEvent.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Events/ColorScriptableEvent.cs @@ -1,13 +1,13 @@ using UnityEngine; -namespace ScriptableEvents.Events +namespace CHARK.ScriptableEvents.Events { [CreateAssetMenu( fileName = "ColorScriptableEvent", menuName = ScriptableEventConstants.MenuNameBase + "/Color Scriptable Event", order = ScriptableEventConstants.MenuOrderUnityPrimitiveEvent + 5 )] - public class ColorScriptableEvent : BaseScriptableEvent + public sealed class ColorScriptableEvent : ScriptableEvent { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Events/DoubleScriptableEvent.cs b/Packages/com.chark.scriptable-events/Runtime/Events/DoubleScriptableEvent.cs index e304388..093099c 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Events/DoubleScriptableEvent.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Events/DoubleScriptableEvent.cs @@ -1,13 +1,13 @@ using UnityEngine; -namespace ScriptableEvents.Events +namespace CHARK.ScriptableEvents.Events { [CreateAssetMenu( fileName = "DoubleScriptableEvent", menuName = ScriptableEventConstants.MenuNameBase + "/Double Scriptable Event", order = ScriptableEventConstants.MenuOrderPrimitiveEvent + 4 )] - public class DoubleScriptableEvent : BaseScriptableEvent + public sealed class DoubleScriptableEvent : ScriptableEvent { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Events/FloatScriptableEvent.cs b/Packages/com.chark.scriptable-events/Runtime/Events/FloatScriptableEvent.cs index f9f5c42..c7de1b1 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Events/FloatScriptableEvent.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Events/FloatScriptableEvent.cs @@ -1,13 +1,13 @@ using UnityEngine; -namespace ScriptableEvents.Events +namespace CHARK.ScriptableEvents.Events { [CreateAssetMenu( fileName = "FloatScriptableEvent", menuName = ScriptableEventConstants.MenuNameBase + "/Float Scriptable Event", order = ScriptableEventConstants.MenuOrderPrimitiveEvent + 3 )] - public class FloatScriptableEvent : BaseScriptableEvent + public sealed class FloatScriptableEvent : ScriptableEvent { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Events/GameObjectScriptableEvent.cs b/Packages/com.chark.scriptable-events/Runtime/Events/GameObjectScriptableEvent.cs index 7ded009..d403914 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Events/GameObjectScriptableEvent.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Events/GameObjectScriptableEvent.cs @@ -1,13 +1,13 @@ using UnityEngine; -namespace ScriptableEvents.Events +namespace CHARK.ScriptableEvents.Events { [CreateAssetMenu( fileName = "GameObjectScriptableEvent", menuName = ScriptableEventConstants.MenuNameBase + "/Game Object Scriptable Event", order = ScriptableEventConstants.MenuOrderUnityObjectEvent + 2 )] - public class GameObjectScriptableEvent : BaseScriptableEvent + public sealed class GameObjectScriptableEvent : ScriptableEvent { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Events/IntScriptableEvent.cs b/Packages/com.chark.scriptable-events/Runtime/Events/IntScriptableEvent.cs index 1409ae6..ae04c8d 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Events/IntScriptableEvent.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Events/IntScriptableEvent.cs @@ -1,13 +1,13 @@ using UnityEngine; -namespace ScriptableEvents.Events +namespace CHARK.ScriptableEvents.Events { [CreateAssetMenu( fileName = "IntScriptableEvent", menuName = ScriptableEventConstants.MenuNameBase + "/Int Scriptable Event", order = ScriptableEventConstants.MenuOrderPrimitiveEvent + 1 )] - public class IntScriptableEvent : BaseScriptableEvent + public sealed class IntScriptableEvent : ScriptableEvent { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Events/LongScriptableEvent.cs b/Packages/com.chark.scriptable-events/Runtime/Events/LongScriptableEvent.cs index 2106a94..e0d1733 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Events/LongScriptableEvent.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Events/LongScriptableEvent.cs @@ -1,13 +1,13 @@ using UnityEngine; -namespace ScriptableEvents.Events +namespace CHARK.ScriptableEvents.Events { [CreateAssetMenu( fileName = "LongScriptableEvent", menuName = ScriptableEventConstants.MenuNameBase + "/Long Scriptable Event", order = ScriptableEventConstants.MenuOrderPrimitiveEvent + 2 )] - public class LongScriptableEvent : BaseScriptableEvent + public sealed class LongScriptableEvent : ScriptableEvent { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Events/QuaternionScriptableEvent.cs b/Packages/com.chark.scriptable-events/Runtime/Events/QuaternionScriptableEvent.cs index 9dc1df1..d13d394 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Events/QuaternionScriptableEvent.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Events/QuaternionScriptableEvent.cs @@ -1,13 +1,13 @@ using UnityEngine; -namespace ScriptableEvents.Events +namespace CHARK.ScriptableEvents.Events { [CreateAssetMenu( fileName = "QuaternionScriptableEvent", menuName = ScriptableEventConstants.MenuNameBase + "/Quaternion Scriptable Event", order = ScriptableEventConstants.MenuOrderUnityPrimitiveEvent + 4 )] - public class QuaternionScriptableEvent : BaseScriptableEvent + public sealed class QuaternionScriptableEvent : ScriptableEvent { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Events/SimpleArg.cs b/Packages/com.chark.scriptable-events/Runtime/Events/SimpleArg.cs index ec0aa71..fdb2d01 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Events/SimpleArg.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Events/SimpleArg.cs @@ -1,4 +1,4 @@ -namespace ScriptableEvents.Events +namespace CHARK.ScriptableEvents.Events { public class SimpleArg { diff --git a/Packages/com.chark.scriptable-events/Runtime/Events/SimpleScriptableEvent.cs b/Packages/com.chark.scriptable-events/Runtime/Events/SimpleScriptableEvent.cs index 043dfea..16d9e5f 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Events/SimpleScriptableEvent.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Events/SimpleScriptableEvent.cs @@ -1,13 +1,13 @@ using UnityEngine; -namespace ScriptableEvents.Events +namespace CHARK.ScriptableEvents.Events { [CreateAssetMenu( fileName = "SimpleScriptableEvent", menuName = ScriptableEventConstants.MenuNameBase + "/Simple Scriptable Event", order = ScriptableEventConstants.MenuOrderSimpleEvent + 0 )] - public class SimpleScriptableEvent : BaseScriptableEvent + public sealed class SimpleScriptableEvent : ScriptableEvent { /// /// Raise this event without an argument. diff --git a/Packages/com.chark.scriptable-events/Runtime/Events/StringScriptableEvent.cs b/Packages/com.chark.scriptable-events/Runtime/Events/StringScriptableEvent.cs index 1630946..310c2de 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Events/StringScriptableEvent.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Events/StringScriptableEvent.cs @@ -1,13 +1,13 @@ using UnityEngine; -namespace ScriptableEvents.Events +namespace CHARK.ScriptableEvents.Events { [CreateAssetMenu( fileName = "StringScriptableEvent", menuName = ScriptableEventConstants.MenuNameBase + "/String Scriptable Event", order = ScriptableEventConstants.MenuOrderPrimitiveEvent + 5 )] - public class StringScriptableEvent : BaseScriptableEvent + public sealed class StringScriptableEvent : ScriptableEvent { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Events/TransformScriptableEvent.cs b/Packages/com.chark.scriptable-events/Runtime/Events/TransformScriptableEvent.cs index adf1473..853c89a 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Events/TransformScriptableEvent.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Events/TransformScriptableEvent.cs @@ -1,13 +1,13 @@ using UnityEngine; -namespace ScriptableEvents.Events +namespace CHARK.ScriptableEvents.Events { [CreateAssetMenu( fileName = "TransformScriptableEvent", menuName = ScriptableEventConstants.MenuNameBase + "/Transform Scriptable Event", order = ScriptableEventConstants.MenuOrderUnityObjectEvent + 3 )] - public class TransformScriptableEvent : BaseScriptableEvent + public sealed class TransformScriptableEvent : ScriptableEvent { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Events/Vector2ScriptableEvent.cs b/Packages/com.chark.scriptable-events/Runtime/Events/Vector2ScriptableEvent.cs index 9e1d474..c286f40 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Events/Vector2ScriptableEvent.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Events/Vector2ScriptableEvent.cs @@ -1,13 +1,13 @@ using UnityEngine; -namespace ScriptableEvents.Events +namespace CHARK.ScriptableEvents.Events { [CreateAssetMenu( fileName = "Vector2ScriptableEvent", menuName = ScriptableEventConstants.MenuNameBase + "/Vector2 Scriptable Event", order = ScriptableEventConstants.MenuOrderUnityPrimitiveEvent + 0 )] - public class Vector2ScriptableEvent : BaseScriptableEvent + public sealed class Vector2ScriptableEvent : ScriptableEvent { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Events/Vector3ScriptableEvent.cs b/Packages/com.chark.scriptable-events/Runtime/Events/Vector3ScriptableEvent.cs index fb8b536..f92e8e1 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Events/Vector3ScriptableEvent.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Events/Vector3ScriptableEvent.cs @@ -1,13 +1,13 @@ using UnityEngine; -namespace ScriptableEvents.Events +namespace CHARK.ScriptableEvents.Events { [CreateAssetMenu( fileName = "Vector3ScriptableEvent", menuName = ScriptableEventConstants.MenuNameBase + "/Vector3 Scriptable Event", order = ScriptableEventConstants.MenuOrderUnityPrimitiveEvent + 1 )] - public class Vector3ScriptableEvent : BaseScriptableEvent + public sealed class Vector3ScriptableEvent : ScriptableEvent { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/IScriptableEventListener.cs b/Packages/com.chark.scriptable-events/Runtime/IScriptableEventListener.cs index ab5c19d..bf2276e 100644 --- a/Packages/com.chark.scriptable-events/Runtime/IScriptableEventListener.cs +++ b/Packages/com.chark.scriptable-events/Runtime/IScriptableEventListener.cs @@ -1,4 +1,4 @@ -namespace ScriptableEvents +namespace CHARK.ScriptableEvents { public interface IScriptableEventListener { diff --git a/Packages/com.chark.scriptable-events/Runtime/Listeners/BoolScriptableEventListener.cs b/Packages/com.chark.scriptable-events/Runtime/Listeners/BoolScriptableEventListener.cs index 02db8bd..fe171f8 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Listeners/BoolScriptableEventListener.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Listeners/BoolScriptableEventListener.cs @@ -1,12 +1,12 @@ using UnityEngine; -namespace ScriptableEvents.Listeners +namespace CHARK.ScriptableEvents.Listeners { [AddComponentMenu( ScriptableEventConstants.MenuNameBase + "/Bool Scriptable Event Listener", ScriptableEventConstants.MenuOrderPrimitiveEvent + 0 )] - public class BoolScriptableEventListener : BaseScriptableEventListener + public sealed class BoolScriptableEventListener : ScriptableEventListener { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Listeners/Collider2DScriptableEventListener.cs b/Packages/com.chark.scriptable-events/Runtime/Listeners/Collider2DScriptableEventListener.cs index 6693c62..936a06d 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Listeners/Collider2DScriptableEventListener.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Listeners/Collider2DScriptableEventListener.cs @@ -1,12 +1,12 @@ using UnityEngine; -namespace ScriptableEvents.Listeners +namespace CHARK.ScriptableEvents.Listeners { [AddComponentMenu( ScriptableEventConstants.MenuNameBase + "/Collider 2D Scriptable Event Listener", ScriptableEventConstants.MenuOrderUnityObjectEvent + 0 )] - public class Collider2DScriptableEventListener : BaseScriptableEventListener + public sealed class Collider2DScriptableEventListener : ScriptableEventListener { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Listeners/ColliderScriptableEventListener.cs b/Packages/com.chark.scriptable-events/Runtime/Listeners/ColliderScriptableEventListener.cs index ef9aa68..7621275 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Listeners/ColliderScriptableEventListener.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Listeners/ColliderScriptableEventListener.cs @@ -1,12 +1,12 @@ using UnityEngine; -namespace ScriptableEvents.Listeners +namespace CHARK.ScriptableEvents.Listeners { [AddComponentMenu( ScriptableEventConstants.MenuNameBase + "/Collider Scriptable Event Listener", ScriptableEventConstants.MenuOrderUnityObjectEvent + 1 )] - public class ColliderScriptableEventListener : BaseScriptableEventListener + public sealed class ColliderScriptableEventListener : ScriptableEventListener { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Listeners/Collision2DScriptableEventListener.cs b/Packages/com.chark.scriptable-events/Runtime/Listeners/Collision2DScriptableEventListener.cs index 91aa5d0..d1517a8 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Listeners/Collision2DScriptableEventListener.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Listeners/Collision2DScriptableEventListener.cs @@ -1,12 +1,12 @@ using UnityEngine; -namespace ScriptableEvents.Listeners +namespace CHARK.ScriptableEvents.Listeners { [AddComponentMenu( ScriptableEventConstants.MenuNameBase + "/Collision 2D Scriptable Event Listener", ScriptableEventConstants.MenuOrderUnityPrimitiveEvent + 2 )] - public class Collision2DScriptableEventListener : BaseScriptableEventListener + public sealed class Collision2DScriptableEventListener : ScriptableEventListener { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Listeners/CollisionScriptableEventListener.cs b/Packages/com.chark.scriptable-events/Runtime/Listeners/CollisionScriptableEventListener.cs index 8f1d812..503c9d6 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Listeners/CollisionScriptableEventListener.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Listeners/CollisionScriptableEventListener.cs @@ -1,12 +1,12 @@ using UnityEngine; -namespace ScriptableEvents.Listeners +namespace CHARK.ScriptableEvents.Listeners { [AddComponentMenu( ScriptableEventConstants.MenuNameBase + "/Collision Scriptable Event Listener", ScriptableEventConstants.MenuOrderUnityPrimitiveEvent + 3 )] - public class CollisionScriptableEventListener : BaseScriptableEventListener + public sealed class CollisionScriptableEventListener : ScriptableEventListener { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Listeners/ColorScriptableEventListener.cs b/Packages/com.chark.scriptable-events/Runtime/Listeners/ColorScriptableEventListener.cs index 13cbcb3..486edf7 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Listeners/ColorScriptableEventListener.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Listeners/ColorScriptableEventListener.cs @@ -1,12 +1,12 @@ using UnityEngine; -namespace ScriptableEvents.Listeners +namespace CHARK.ScriptableEvents.Listeners { [AddComponentMenu( ScriptableEventConstants.MenuNameBase + "/Color Scriptable Event Listener", ScriptableEventConstants.MenuOrderUnityPrimitiveEvent + 5 )] - public class ColorScriptableEventListener : BaseScriptableEventListener + public sealed class ColorScriptableEventListener : ScriptableEventListener { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Listeners/DoubleScriptableEventListener.cs b/Packages/com.chark.scriptable-events/Runtime/Listeners/DoubleScriptableEventListener.cs index 6f1b0ee..65ac745 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Listeners/DoubleScriptableEventListener.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Listeners/DoubleScriptableEventListener.cs @@ -1,12 +1,12 @@ using UnityEngine; -namespace ScriptableEvents.Listeners +namespace CHARK.ScriptableEvents.Listeners { [AddComponentMenu( ScriptableEventConstants.MenuNameBase + "/Double Scriptable Event Listener", ScriptableEventConstants.MenuOrderPrimitiveEvent + 4 )] - public class DoubleScriptableEventListener : BaseScriptableEventListener + public sealed class DoubleScriptableEventListener : ScriptableEventListener { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Listeners/FloatScriptableEventListener.cs b/Packages/com.chark.scriptable-events/Runtime/Listeners/FloatScriptableEventListener.cs index 1d7ba18..8541131 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Listeners/FloatScriptableEventListener.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Listeners/FloatScriptableEventListener.cs @@ -1,12 +1,12 @@ using UnityEngine; -namespace ScriptableEvents.Listeners +namespace CHARK.ScriptableEvents.Listeners { [AddComponentMenu( ScriptableEventConstants.MenuNameBase + "/Float Scriptable Event Listener", ScriptableEventConstants.MenuOrderPrimitiveEvent + 3 )] - public class FloatScriptableEventListener : BaseScriptableEventListener + public sealed class FloatScriptableEventListener : ScriptableEventListener { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Listeners/GameObjectScriptableEventListener.cs b/Packages/com.chark.scriptable-events/Runtime/Listeners/GameObjectScriptableEventListener.cs index 87b40a2..c19e997 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Listeners/GameObjectScriptableEventListener.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Listeners/GameObjectScriptableEventListener.cs @@ -1,13 +1,12 @@ using UnityEngine; -namespace ScriptableEvents.Listeners +namespace CHARK.ScriptableEvents.Listeners { [AddComponentMenu( ScriptableEventConstants.MenuNameBase + "/Game Object Scriptable Event Listener", ScriptableEventConstants.MenuOrderUnityObjectEvent + 2 )] - public class GameObjectScriptableEventListener - : BaseScriptableEventListener + public sealed class GameObjectScriptableEventListener : ScriptableEventListener { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Listeners/IntScriptableEventListener.cs b/Packages/com.chark.scriptable-events/Runtime/Listeners/IntScriptableEventListener.cs index dc76fef..2fd4e2a 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Listeners/IntScriptableEventListener.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Listeners/IntScriptableEventListener.cs @@ -1,12 +1,12 @@ using UnityEngine; -namespace ScriptableEvents.Listeners +namespace CHARK.ScriptableEvents.Listeners { [AddComponentMenu( ScriptableEventConstants.MenuNameBase + "/Int Scriptable Event Listener", ScriptableEventConstants.MenuOrderPrimitiveEvent + 1 )] - public class IntScriptableEventListener : BaseScriptableEventListener + public sealed class IntScriptableEventListener : ScriptableEventListener { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Listeners/LongScriptableEventListener.cs b/Packages/com.chark.scriptable-events/Runtime/Listeners/LongScriptableEventListener.cs index 4ba22eb..6640262 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Listeners/LongScriptableEventListener.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Listeners/LongScriptableEventListener.cs @@ -1,12 +1,12 @@ using UnityEngine; -namespace ScriptableEvents.Listeners +namespace CHARK.ScriptableEvents.Listeners { [AddComponentMenu( ScriptableEventConstants.MenuNameBase + "/Long Scriptable Event Listener", ScriptableEventConstants.MenuOrderPrimitiveEvent + 2 )] - public class LongScriptableEventListener : BaseScriptableEventListener + public sealed class LongScriptableEventListener : ScriptableEventListener { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Listeners/QuaternionScriptableEventListener.cs b/Packages/com.chark.scriptable-events/Runtime/Listeners/QuaternionScriptableEventListener.cs index 15219e5..787ebbc 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Listeners/QuaternionScriptableEventListener.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Listeners/QuaternionScriptableEventListener.cs @@ -1,12 +1,12 @@ using UnityEngine; -namespace ScriptableEvents.Listeners +namespace CHARK.ScriptableEvents.Listeners { [AddComponentMenu( ScriptableEventConstants.MenuNameBase + "/Quaternion Scriptable Event Listener", ScriptableEventConstants.MenuOrderUnityPrimitiveEvent + 4 )] - public class QuaternionScriptableEventListener : BaseScriptableEventListener + public sealed class QuaternionScriptableEventListener : ScriptableEventListener { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Listeners/SimpleScriptableEventListener.cs b/Packages/com.chark.scriptable-events/Runtime/Listeners/SimpleScriptableEventListener.cs index da80a61..1173539 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Listeners/SimpleScriptableEventListener.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Listeners/SimpleScriptableEventListener.cs @@ -1,13 +1,13 @@ -using ScriptableEvents.Events; +using CHARK.ScriptableEvents.Events; using UnityEngine; -namespace ScriptableEvents.Listeners +namespace CHARK.ScriptableEvents.Listeners { [AddComponentMenu( ScriptableEventConstants.MenuNameBase + "/Simple Scriptable Event Listener", ScriptableEventConstants.MenuOrderSimpleEvent + 0 )] - public class SimpleScriptableEventListener : BaseScriptableEventListener + public sealed class SimpleScriptableEventListener : ScriptableEventListener { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Listeners/StringScriptableEventListener.cs b/Packages/com.chark.scriptable-events/Runtime/Listeners/StringScriptableEventListener.cs index ac0657f..ba2cf4c 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Listeners/StringScriptableEventListener.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Listeners/StringScriptableEventListener.cs @@ -1,12 +1,12 @@ using UnityEngine; -namespace ScriptableEvents.Listeners +namespace CHARK.ScriptableEvents.Listeners { [AddComponentMenu( ScriptableEventConstants.MenuNameBase + "/String Scriptable Event Listener", ScriptableEventConstants.MenuOrderPrimitiveEvent + 5 )] - public class StringScriptableEventListener : BaseScriptableEventListener + public sealed class StringScriptableEventListener : ScriptableEventListener { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Listeners/TransformScriptableEventListener.cs b/Packages/com.chark.scriptable-events/Runtime/Listeners/TransformScriptableEventListener.cs index cb5fbd3..c27a973 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Listeners/TransformScriptableEventListener.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Listeners/TransformScriptableEventListener.cs @@ -1,12 +1,12 @@ using UnityEngine; -namespace ScriptableEvents.Listeners +namespace CHARK.ScriptableEvents.Listeners { [AddComponentMenu( ScriptableEventConstants.MenuNameBase + "/Transform Scriptable Event Listener", ScriptableEventConstants.MenuOrderUnityObjectEvent + 3 )] - public class TransformScriptableEventListener : BaseScriptableEventListener + public sealed class TransformScriptableEventListener : ScriptableEventListener { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Listeners/Vector2ScriptableEventListener.cs b/Packages/com.chark.scriptable-events/Runtime/Listeners/Vector2ScriptableEventListener.cs index cc2b6ed..d4fe8c1 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Listeners/Vector2ScriptableEventListener.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Listeners/Vector2ScriptableEventListener.cs @@ -1,12 +1,12 @@ using UnityEngine; -namespace ScriptableEvents.Listeners +namespace CHARK.ScriptableEvents.Listeners { [AddComponentMenu( ScriptableEventConstants.MenuNameBase + "/Vector2 Scriptable Event Listener", ScriptableEventConstants.MenuOrderUnityPrimitiveEvent + 0 )] - public class Vector2ScriptableEventListener : BaseScriptableEventListener + public sealed class Vector2ScriptableEventListener : ScriptableEventListener { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/Listeners/Vector3ScriptableEventListener.cs b/Packages/com.chark.scriptable-events/Runtime/Listeners/Vector3ScriptableEventListener.cs index 7f8c1bd..04f2fc2 100644 --- a/Packages/com.chark.scriptable-events/Runtime/Listeners/Vector3ScriptableEventListener.cs +++ b/Packages/com.chark.scriptable-events/Runtime/Listeners/Vector3ScriptableEventListener.cs @@ -1,12 +1,12 @@ using UnityEngine; -namespace ScriptableEvents.Listeners +namespace CHARK.ScriptableEvents.Listeners { [AddComponentMenu( ScriptableEventConstants.MenuNameBase + "/Vector3 Scriptable Event Listener", ScriptableEventConstants.MenuOrderUnityPrimitiveEvent + 1 )] - public class Vector3ScriptableEventListener : BaseScriptableEventListener + public sealed class Vector3ScriptableEventListener : ScriptableEventListener { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/BaseScriptableEvent.cs b/Packages/com.chark.scriptable-events/Runtime/ScriptableEvent.cs similarity index 97% rename from Packages/com.chark.scriptable-events/Runtime/BaseScriptableEvent.cs rename to Packages/com.chark.scriptable-events/Runtime/ScriptableEvent.cs index 946801f..aaf1173 100644 --- a/Packages/com.chark.scriptable-events/Runtime/BaseScriptableEvent.cs +++ b/Packages/com.chark.scriptable-events/Runtime/ScriptableEvent.cs @@ -5,7 +5,7 @@ using UnityEngine.Serialization; using Object = UnityEngine.Object; -namespace ScriptableEvents +namespace CHARK.ScriptableEvents { /// /// Base Scriptable Event which accepts an argument, used as a base by all event Scriptable @@ -14,7 +14,7 @@ namespace ScriptableEvents /// /// Type of data which is passed as an argument to this event /// - public abstract class BaseScriptableEvent : BaseScriptableEvent + public abstract class ScriptableEvent : ScriptableEvent { #region Editor @@ -254,7 +254,7 @@ private Object GetLogContext(Action listener) /// scripts. /// [ScriptableIcon(ScriptableIconType.Event)] - public abstract class BaseScriptableEvent : ScriptableObject + public abstract class ScriptableEvent : ScriptableObject { #region Internal Properties diff --git a/Packages/com.chark.scriptable-events/Runtime/BaseScriptableEvent.cs.meta b/Packages/com.chark.scriptable-events/Runtime/ScriptableEvent.cs.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Runtime/BaseScriptableEvent.cs.meta rename to Packages/com.chark.scriptable-events/Runtime/ScriptableEvent.cs.meta diff --git a/Packages/com.chark.scriptable-events/Runtime/ScriptableEventConstants.cs b/Packages/com.chark.scriptable-events/Runtime/ScriptableEventConstants.cs index d028ca9..f374bed 100644 --- a/Packages/com.chark.scriptable-events/Runtime/ScriptableEventConstants.cs +++ b/Packages/com.chark.scriptable-events/Runtime/ScriptableEventConstants.cs @@ -1,4 +1,4 @@ -namespace ScriptableEvents +namespace CHARK.ScriptableEvents { /// /// Constants used in the ScriptableEvent package to reduce duplication. @@ -24,7 +24,7 @@ public static class ScriptableEventConstants /// /// Prefix of 'Create' event menus. /// - internal const string MenuNameBase = "Scriptable Event"; + internal const string MenuNameBase = "CHARK/Scriptable Event"; /// /// Menu order of event assets which use simple arguments. diff --git a/Packages/com.chark.scriptable-events/Runtime/BaseScriptableEventListener.cs b/Packages/com.chark.scriptable-events/Runtime/ScriptableEventListener.cs similarity index 73% rename from Packages/com.chark.scriptable-events/Runtime/BaseScriptableEventListener.cs rename to Packages/com.chark.scriptable-events/Runtime/ScriptableEventListener.cs index 2258571..4f4806c 100644 --- a/Packages/com.chark.scriptable-events/Runtime/BaseScriptableEventListener.cs +++ b/Packages/com.chark.scriptable-events/Runtime/ScriptableEventListener.cs @@ -3,7 +3,7 @@ using UnityEngine; using UnityEngine.Events; -namespace ScriptableEvents +namespace CHARK.ScriptableEvents { /// /// Base Scriptable Event Listener which accepts an argument, used as a base by all internal @@ -12,19 +12,20 @@ namespace ScriptableEvents /// /// Type of data which is passed as an argument to this listener /// - public abstract class BaseScriptableEventListener - : BaseScriptableEventListener, IScriptableEventListener, ISerializationCallbackReceiver + public abstract class ScriptableEventListener + : ScriptableEventListener, IScriptableEventListener, ISerializationCallbackReceiver { #region Editor + [HideInInspector] [SerializeField] [Obsolete] [Tooltip("ScriptableEvent that triggers the On Raised UnityEvent")] - private BaseScriptableEvent scriptableEvent; + private ScriptableEvent scriptableEvent; [SerializeField] [Tooltip("List of ScriptableEvents that trigger the On Raised UnityEvent")] - private List> scriptableEvents = new List>(); + private List> scriptableEvents = new List>(); [Space] [SerializeField] @@ -38,12 +39,12 @@ private void OnEnable() { // No null or empty check - a listener can exist with that is listening to nothing. // This also avoids issues on initialisation - scriptableEvents.ForEach(scriptableEvent => scriptableEvent.AddListener(this)); + scriptableEvents.ForEach(@event => @event.AddListener(this)); } private void OnDisable() { - scriptableEvents.ForEach(scriptableEvent => scriptableEvent.RemoveListener(this)); + scriptableEvents.ForEach(@event => @event.RemoveListener(this)); } #endregion @@ -62,14 +63,18 @@ public void OnBeforeSerialize() { return; } - if (scriptableEvent!=false) + +#pragma warning disable CS0612 // Type or member is obsolete + if (scriptableEvent != false) { if (!scriptableEvents.Contains(scriptableEvent)) { scriptableEvents.Add(scriptableEvent); } + scriptableEvent = null; } +#pragma warning restore CS0612 // Type or member is obsolete } public void OnAfterDeserialize() @@ -84,7 +89,7 @@ public void OnAfterDeserialize() /// in internal editor scripts. /// [ScriptableIcon(ScriptableIconType.Listener)] - public abstract class BaseScriptableEventListener : MonoBehaviour + public abstract class ScriptableEventListener : MonoBehaviour { } } diff --git a/Packages/com.chark.scriptable-events/Runtime/BaseScriptableEventListener.cs.meta b/Packages/com.chark.scriptable-events/Runtime/ScriptableEventListener.cs.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Runtime/BaseScriptableEventListener.cs.meta rename to Packages/com.chark.scriptable-events/Runtime/ScriptableEventListener.cs.meta diff --git a/Packages/com.chark.scriptable-events/Runtime/ScriptableIcon.cs b/Packages/com.chark.scriptable-events/Runtime/ScriptableIcon.cs index 93692ad..63be7a3 100644 --- a/Packages/com.chark.scriptable-events/Runtime/ScriptableIcon.cs +++ b/Packages/com.chark.scriptable-events/Runtime/ScriptableIcon.cs @@ -1,18 +1,18 @@ using System; -namespace ScriptableEvents +namespace CHARK.ScriptableEvents { internal enum ScriptableIconType { Event, - Listener + Listener, } /// /// Used to tag assets (mono scripts) which must have an icon. /// [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)] - internal class ScriptableIcon : Attribute + internal sealed class ScriptableIcon : Attribute { #region Internal Properties diff --git a/Packages/com.chark.scriptable-events/Samples.meta b/Packages/com.chark.scriptable-events/Samples.meta new file mode 100644 index 0000000..a527d8b --- /dev/null +++ b/Packages/com.chark.scriptable-events/Samples.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4bd533604fb5af04ca00350fcdcd6292 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.chark.scriptable-events/Samples/CHARK.ScriptableEvents.Samples.asmdef b/Packages/com.chark.scriptable-events/Samples/CHARK.ScriptableEvents.Samples.asmdef new file mode 100644 index 0000000..d9d644e --- /dev/null +++ b/Packages/com.chark.scriptable-events/Samples/CHARK.ScriptableEvents.Samples.asmdef @@ -0,0 +1,17 @@ +{ + "name": "CHARK.ScriptableEvents.Samples", + "rootNamespace": "CHARK.ScriptableEvents", + "references": [ + "GUID:d8ff72fdf1f9b014ab4291157a56a767", + "GUID:87b8abe4ff9fd7e42aa654cc986d3202" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Packages/com.chark.scriptable-events/Samples~/Chark.ScriptableEvents.Samples.asmdef.meta b/Packages/com.chark.scriptable-events/Samples/CHARK.ScriptableEvents.Samples.asmdef.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/Chark.ScriptableEvents.Samples.asmdef.meta rename to Packages/com.chark.scriptable-events/Samples/CHARK.ScriptableEvents.Samples.asmdef.meta diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents.meta b/Packages/com.chark.scriptable-events/Samples/CustomEvents.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents.meta rename to Packages/com.chark.scriptable-events/Samples/CustomEvents.meta diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Prefabs.meta b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Prefabs.meta similarity index 77% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/Prefabs.meta rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/Prefabs.meta index ec7f94f..9f00372 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Prefabs.meta +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Prefabs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ffca3c23c24fd1c4a8c688ff0767a52e +guid: 99d89f553646db74fbc46a18ae9dfbc1 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Prefabs/LightHandler.prefab b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Prefabs/LightHandler.prefab similarity index 95% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/Prefabs/LightHandler.prefab rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/Prefabs/LightHandler.prefab index cdc586a..c4e8ed7 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Prefabs/LightHandler.prefab +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Prefabs/LightHandler.prefab @@ -289,7 +289,7 @@ GameObject: m_Component: - component: {fileID: 8325368634440203029} - component: {fileID: 8325368634440203031} - - component: {fileID: 8325368634440203030} + - component: {fileID: -1451942269863958815} m_Layer: 0 m_Name: LightHandler m_TagString: Untagged @@ -324,16 +324,30 @@ MonoBehaviour: m_GameObject: {fileID: 8325368634440203028} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d9fc3b731d1a38549a0bc9c5008c4ddf, type: 3} + m_Script: {fileID: 11500000, guid: 94fcec3630648444ea6290c96065a05f, type: 3} m_Name: m_EditorClassIdentifier: - scriptableEvent: {fileID: 11400000, guid: 124303561f1805d43b120e0ca4ab14db, type: 2} +--- !u!114 &-1451942269863958815 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8325368634440203028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 023e9019d7c3f604fa65c27041d7bbc9, type: 3} + m_Name: + m_EditorClassIdentifier: + scriptableEvent: {fileID: 0} + scriptableEvents: + - {fileID: 11400000, guid: abd92e07deed9a74a9d80d07a6a3dcc2, type: 2} onRaised: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 8325368634440203030} - m_TargetAssemblyTypeName: ScriptableEvents.Samples.CustomEvents.LightHandler, - Chark.ScriptableEvents.Samples + - m_Target: {fileID: 8325368634440203031} + m_TargetAssemblyTypeName: CHARK.ScriptableEvents.Samples.CustomEvents.LightHandler, + CHARK.ScriptableEvents.Samples m_MethodName: HandleLightRandomization m_Mode: 0 m_Arguments: @@ -344,18 +358,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &8325368634440203030 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8325368634440203028} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6007d7f80aac5f469eb577948215aa7, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &8325368635017290188 GameObject: m_ObjectHideFlags: 0 diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Prefabs/LightHandler.prefab.meta b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Prefabs/LightHandler.prefab.meta similarity index 74% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/Prefabs/LightHandler.prefab.meta rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/Prefabs/LightHandler.prefab.meta index 6ac7ca2..d626ecb 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Prefabs/LightHandler.prefab.meta +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Prefabs/LightHandler.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 58df33ff242d81f4e8b83b56fa1a9a73 +guid: e355dc79d9d4c9b4fac925e996c6c150 PrefabImporter: externalObjects: {} userData: diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Prefabs/UI.prefab b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Prefabs/UI.prefab similarity index 96% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/Prefabs/UI.prefab rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/Prefabs/UI.prefab index 3a92497..a8dcc84 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Prefabs/UI.prefab +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Prefabs/UI.prefab @@ -123,8 +123,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 9008442619944084030} - m_TargetAssemblyTypeName: ScriptableEvents.Samples.CustomEvents.LightRandomizationTrigger, - Chark.ScriptableEvents.Samples + m_TargetAssemblyTypeName: CHARK.ScriptableEvents.Samples.CustomEvents.LightRandomizationTrigger, + CHARK.ScriptableEvents.Samples m_MethodName: RandomizeLights m_Mode: 1 m_Arguments: @@ -144,7 +144,7 @@ MonoBehaviour: m_GameObject: {fileID: 9008442619944084417} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2e141cf35eea50d4da8bd6f9c60011b1, type: 3} + m_Script: {fileID: 11500000, guid: 922263424603e2b4f828281078bad424, type: 3} m_Name: m_EditorClassIdentifier: minIntensity: 0 @@ -181,9 +181,9 @@ MonoBehaviour: onRandomizeLights: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 11400000, guid: 124303561f1805d43b120e0ca4ab14db, type: 2} - m_TargetAssemblyTypeName: ScriptableEvents.BaseScriptableEvent`1[[ScriptableEvents.Samples.CustomEvents.LightRandomizationEventArgs, - Chark.ScriptableEvents.Samples + - m_Target: {fileID: 11400000, guid: abd92e07deed9a74a9d80d07a6a3dcc2, type: 2} + m_TargetAssemblyTypeName: CHARK.ScriptableEvents.ScriptableEvent`1[[CHARK.ScriptableEvents.Samples.CustomEvents.LightRandomizationEventArgs, + CHARK.ScriptableEvents.Samples m_MethodName: Raise m_Mode: 0 m_Arguments: diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Prefabs/UI.prefab.meta b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Prefabs/UI.prefab.meta similarity index 74% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/Prefabs/UI.prefab.meta rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/Prefabs/UI.prefab.meta index 4767ce7..e27be1f 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Prefabs/UI.prefab.meta +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Prefabs/UI.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cd43fa2c64e3dbe409d63e47124119c4 +guid: 2779843a92ad29248bedd34408fe1126 PrefabImporter: externalObjects: {} userData: diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scenes.meta b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scenes.meta similarity index 77% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scenes.meta rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/Scenes.meta index 42ec14b..0bdc659 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scenes.meta +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scenes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 613ff84025c0c9e45bd1ff21784359dc +guid: 3854224eb69dfcf4c94bdbb59d80faa6 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scenes/CustomEventsScene.unity b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scenes/CustomEventsScene.unity similarity index 95% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scenes/CustomEventsScene.unity rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/Scenes/CustomEventsScene.unity index 9b159f2..854b6fa 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scenes/CustomEventsScene.unity +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scenes/CustomEventsScene.unity @@ -600,6 +600,75 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 582751312} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &679721458 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8325368634440203028, guid: e355dc79d9d4c9b4fac925e996c6c150, + type: 3} + propertyPath: m_Name + value: LightHandler + objectReference: {fileID: 0} + - target: {fileID: 8325368634440203029, guid: e355dc79d9d4c9b4fac925e996c6c150, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8325368634440203029, guid: e355dc79d9d4c9b4fac925e996c6c150, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8325368634440203029, guid: e355dc79d9d4c9b4fac925e996c6c150, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8325368634440203029, guid: e355dc79d9d4c9b4fac925e996c6c150, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8325368634440203029, guid: e355dc79d9d4c9b4fac925e996c6c150, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8325368634440203029, guid: e355dc79d9d4c9b4fac925e996c6c150, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8325368634440203029, guid: e355dc79d9d4c9b4fac925e996c6c150, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8325368634440203029, guid: e355dc79d9d4c9b4fac925e996c6c150, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8325368634440203029, guid: e355dc79d9d4c9b4fac925e996c6c150, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8325368634440203029, guid: e355dc79d9d4c9b4fac925e996c6c150, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8325368634440203029, guid: e355dc79d9d4c9b4fac925e996c6c150, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e355dc79d9d4c9b4fac925e996c6c150, type: 3} --- !u!1 &838718601 GameObject: m_ObjectHideFlags: 0 @@ -1156,7 +1225,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1337377219 GameObject: @@ -2192,203 +2261,134 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1958019296} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &2081766996 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2081766997} - m_Layer: 0 - m_Name: Room - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &2081766997 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2081766996} - 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: - - {fileID: 1410783767} - - {fileID: 1815458322} - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &8325368634092903956 +--- !u!1001 &2028959202 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 8325368634440203028, guid: 58df33ff242d81f4e8b83b56fa1a9a73, - type: 3} - propertyPath: m_Name - value: LightHandler - objectReference: {fileID: 0} - - target: {fileID: 8325368634440203029, guid: 58df33ff242d81f4e8b83b56fa1a9a73, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 8325368634440203029, guid: 58df33ff242d81f4e8b83b56fa1a9a73, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8325368634440203029, guid: 58df33ff242d81f4e8b83b56fa1a9a73, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8325368634440203029, guid: 58df33ff242d81f4e8b83b56fa1a9a73, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8325368634440203029, guid: 58df33ff242d81f4e8b83b56fa1a9a73, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8325368634440203029, guid: 58df33ff242d81f4e8b83b56fa1a9a73, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8325368634440203029, guid: 58df33ff242d81f4e8b83b56fa1a9a73, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8325368634440203029, guid: 58df33ff242d81f4e8b83b56fa1a9a73, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8325368634440203029, guid: 58df33ff242d81f4e8b83b56fa1a9a73, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8325368634440203029, guid: 58df33ff242d81f4e8b83b56fa1a9a73, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8325368634440203029, guid: 58df33ff242d81f4e8b83b56fa1a9a73, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 58df33ff242d81f4e8b83b56fa1a9a73, type: 3} ---- !u!1001 &9008442621470398780 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 9008442619944084418, guid: cd43fa2c64e3dbe409d63e47124119c4, + - target: {fileID: 9008442619944084418, guid: 2779843a92ad29248bedd34408fe1126, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9008442619944084418, guid: cd43fa2c64e3dbe409d63e47124119c4, + - target: {fileID: 9008442619944084418, guid: 2779843a92ad29248bedd34408fe1126, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9008442619944084418, guid: cd43fa2c64e3dbe409d63e47124119c4, + - target: {fileID: 9008442619944084418, guid: 2779843a92ad29248bedd34408fe1126, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9008442619944084418, guid: cd43fa2c64e3dbe409d63e47124119c4, + - target: {fileID: 9008442619944084418, guid: 2779843a92ad29248bedd34408fe1126, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9008442619944084418, guid: cd43fa2c64e3dbe409d63e47124119c4, + - target: {fileID: 9008442619944084418, guid: 2779843a92ad29248bedd34408fe1126, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9008442619944084418, guid: cd43fa2c64e3dbe409d63e47124119c4, + - target: {fileID: 9008442619944084418, guid: 2779843a92ad29248bedd34408fe1126, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9008442619960634908, guid: cd43fa2c64e3dbe409d63e47124119c4, + - target: {fileID: 9008442619960634908, guid: 2779843a92ad29248bedd34408fe1126, type: 3} propertyPath: m_Name value: UI objectReference: {fileID: 0} - - target: {fileID: 9008442619960634909, guid: cd43fa2c64e3dbe409d63e47124119c4, + - target: {fileID: 9008442619960634909, guid: 2779843a92ad29248bedd34408fe1126, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 9008442619960634909, guid: cd43fa2c64e3dbe409d63e47124119c4, + - target: {fileID: 9008442619960634909, guid: 2779843a92ad29248bedd34408fe1126, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9008442619960634909, guid: cd43fa2c64e3dbe409d63e47124119c4, + - target: {fileID: 9008442619960634909, guid: 2779843a92ad29248bedd34408fe1126, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9008442619960634909, guid: cd43fa2c64e3dbe409d63e47124119c4, + - target: {fileID: 9008442619960634909, guid: 2779843a92ad29248bedd34408fe1126, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 9008442619960634909, guid: cd43fa2c64e3dbe409d63e47124119c4, + - target: {fileID: 9008442619960634909, guid: 2779843a92ad29248bedd34408fe1126, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 9008442619960634909, guid: cd43fa2c64e3dbe409d63e47124119c4, + - target: {fileID: 9008442619960634909, guid: 2779843a92ad29248bedd34408fe1126, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9008442619960634909, guid: cd43fa2c64e3dbe409d63e47124119c4, + - target: {fileID: 9008442619960634909, guid: 2779843a92ad29248bedd34408fe1126, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9008442619960634909, guid: cd43fa2c64e3dbe409d63e47124119c4, + - target: {fileID: 9008442619960634909, guid: 2779843a92ad29248bedd34408fe1126, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 9008442619960634909, guid: cd43fa2c64e3dbe409d63e47124119c4, + - target: {fileID: 9008442619960634909, guid: 2779843a92ad29248bedd34408fe1126, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9008442619960634909, guid: cd43fa2c64e3dbe409d63e47124119c4, + - target: {fileID: 9008442619960634909, guid: 2779843a92ad29248bedd34408fe1126, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9008442619960634909, guid: cd43fa2c64e3dbe409d63e47124119c4, + - target: {fileID: 9008442619960634909, guid: 2779843a92ad29248bedd34408fe1126, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cd43fa2c64e3dbe409d63e47124119c4, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 2779843a92ad29248bedd34408fe1126, type: 3} +--- !u!1 &2081766996 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2081766997} + m_Layer: 0 + m_Name: Room + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 4294967295 + m_IsActive: 1 +--- !u!4 &2081766997 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2081766996} + 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: + - {fileID: 1410783767} + - {fileID: 1815458322} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scenes/CustomEventsScene.unity.meta b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scenes/CustomEventsScene.unity.meta similarity index 74% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scenes/CustomEventsScene.unity.meta rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/Scenes/CustomEventsScene.unity.meta index 207f645..aaab402 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scenes/CustomEventsScene.unity.meta +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scenes/CustomEventsScene.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3f2b2adc9d9d8774cbcd4ac3c8a20144 +guid: 7b554e7ba60d55c4dabbacbcb29733d7 DefaultImporter: externalObjects: {} userData: diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/ScriptableEvents.meta b/Packages/com.chark.scriptable-events/Samples/CustomEvents/ScriptableEvents.meta similarity index 77% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/ScriptableEvents.meta rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/ScriptableEvents.meta index b620493..de090ab 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/ScriptableEvents.meta +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/ScriptableEvents.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8f332a26da79b3141992456e2c417024 +guid: d168da57424b001409eb9b401feadad6 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/ScriptableEvents/RandomizeLightsClickedEvent.asset b/Packages/com.chark.scriptable-events/Samples/CustomEvents/ScriptableEvents/RandomizeLightsClickedEvent.asset similarity index 71% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/ScriptableEvents/RandomizeLightsClickedEvent.asset rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/ScriptableEvents/RandomizeLightsClickedEvent.asset index f526eab..7f5e429 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/ScriptableEvents/RandomizeLightsClickedEvent.asset +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/ScriptableEvents/RandomizeLightsClickedEvent.asset @@ -9,11 +9,9 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9e3fa7767af2d4c4cbf41d0d4f11146a, type: 3} + m_Script: {fileID: 11500000, guid: 38344ae4ccc85c7488d49e382944fb01, type: 3} m_Name: RandomizeLightsClickedEvent m_EditorClassIdentifier: - description: 'Raised when RandomizeLightsButton is clicked - -' + description: isSuppressExceptions: 0 isDebug: 0 diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/ScriptableEvents/RandomizeLightsClickedEvent.asset.meta b/Packages/com.chark.scriptable-events/Samples/CustomEvents/ScriptableEvents/RandomizeLightsClickedEvent.asset.meta similarity index 79% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/ScriptableEvents/RandomizeLightsClickedEvent.asset.meta rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/ScriptableEvents/RandomizeLightsClickedEvent.asset.meta index 8db1f23..0684c3b 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/ScriptableEvents/RandomizeLightsClickedEvent.asset.meta +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/ScriptableEvents/RandomizeLightsClickedEvent.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 124303561f1805d43b120e0ca4ab14db +guid: abd92e07deed9a74a9d80d07a6a3dcc2 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts.meta b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts.meta similarity index 77% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts.meta rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts.meta index bf43b43..da812e3 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts.meta +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 499ff43f6c4ae914b9e16ab06099c5b5 +guid: bcede577bf450254b84fd47d60c64f25 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/Editor.meta b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/Editor.meta similarity index 77% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/Editor.meta rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/Editor.meta index d3f81a0..606b8ec 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/Editor.meta +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/Editor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 59cd59303ecf33945bdecdcbceafd444 +guid: 07321f9a5f52e2e4089f4b9dce6df330 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/Editor/LightRandomizationScriptableEventEditor.cs b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/Editor/LightRandomizationScriptableEventEditor.cs similarity index 77% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/Editor/LightRandomizationScriptableEventEditor.cs rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/Editor/LightRandomizationScriptableEventEditor.cs index 3e5de93..e34bff1 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/Editor/LightRandomizationScriptableEventEditor.cs +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/Editor/LightRandomizationScriptableEventEditor.cs @@ -1,11 +1,11 @@ -using ScriptableEvents.Editor; +using CHARK.ScriptableEvents.Editor; using UnityEditor; using UnityEngine; -namespace ScriptableEvents.Samples.CustomEvents.Editor +namespace CHARK.ScriptableEvents.Samples.CustomEvents.Editor { [CustomEditor(typeof(LightRandomizationScriptableEvent))] - public class LightRandomizationScriptableEventEditor : BaseScriptableEventEditor + public class LightRandomizationScriptableEventEditor : ScriptableEventEditor { protected override LightRandomizationEventArgs DrawArgField( LightRandomizationEventArgs value diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/Editor/LightRandomizationScriptableEventEditor.cs.meta b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/Editor/LightRandomizationScriptableEventEditor.cs.meta similarity index 83% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/Editor/LightRandomizationScriptableEventEditor.cs.meta rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/Editor/LightRandomizationScriptableEventEditor.cs.meta index 8628a93..4d48ea0 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/Editor/LightRandomizationScriptableEventEditor.cs.meta +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/Editor/LightRandomizationScriptableEventEditor.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f677207623f5b9e44a4a8e44a09a837c +guid: 3248ccc0868ac1445ac486a1307c6e86 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightHandler.cs b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightHandler.cs similarity index 90% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightHandler.cs rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightHandler.cs index 27f4331..a578ded 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightHandler.cs +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightHandler.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace ScriptableEvents.Samples.CustomEvents +namespace CHARK.ScriptableEvents.Samples.CustomEvents { public class LightHandler : MonoBehaviour { diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightHandler.cs.meta b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightHandler.cs.meta similarity index 83% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightHandler.cs.meta rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightHandler.cs.meta index dd8a46a..67534a0 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightHandler.cs.meta +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightHandler.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c6007d7f80aac5f469eb577948215aa7 +guid: 94fcec3630648444ea6290c96065a05f MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationEventArgs.cs b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationEventArgs.cs similarity index 76% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationEventArgs.cs rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationEventArgs.cs index a1117de..77c9926 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationEventArgs.cs +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationEventArgs.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace ScriptableEvents.Samples.CustomEvents +namespace CHARK.ScriptableEvents.Samples.CustomEvents { public class LightRandomizationEventArgs { diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationEventArgs.cs.meta b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationEventArgs.cs.meta similarity index 53% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationEventArgs.cs.meta rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationEventArgs.cs.meta index 575fd4b..e91dc3e 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationEventArgs.cs.meta +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationEventArgs.cs.meta @@ -1,3 +1,3 @@ -fileFormatVersion: 2 -guid: ef6a8b5652dc7274ea53906f221f2922 +fileFormatVersion: 2 +guid: bccbf7f50edfa6745a5adf665b49ac6a timeCreated: 1642886414 \ No newline at end of file diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationScriptableEvent.cs b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationScriptableEvent.cs similarity index 65% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationScriptableEvent.cs rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationScriptableEvent.cs index fd138fc..9a5df06 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationScriptableEvent.cs +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationScriptableEvent.cs @@ -1,13 +1,13 @@ using UnityEngine; -namespace ScriptableEvents.Samples.CustomEvents +namespace CHARK.ScriptableEvents.Samples.CustomEvents { [CreateAssetMenu( fileName = "LightRandomizationScriptableEvent", menuName = ScriptableEventConstants.MenuNameCustom + "/Light Randomization Scriptable Event", order = ScriptableEventConstants.MenuOrderCustom + 0 )] - public class LightRandomizationScriptableEvent : BaseScriptableEvent + public class LightRandomizationScriptableEvent : ScriptableEvent { } } diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationScriptableEvent.cs.meta b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationScriptableEvent.cs.meta similarity index 83% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationScriptableEvent.cs.meta rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationScriptableEvent.cs.meta index e3ff474..22cdcb5 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationScriptableEvent.cs.meta +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationScriptableEvent.cs.meta @@ -1,11 +1,11 @@ -fileFormatVersion: 2 -guid: 9e3fa7767af2d4c4cbf41d0d4f11146a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 2800000, guid: fb3d335bd064415ba5e3beb1db2f6f9c, type: 3} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 38344ae4ccc85c7488d49e382944fb01 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 2800000, guid: fb3d335bd064415ba5e3beb1db2f6f9c, type: 3} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationScriptableEventListener.cs b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationScriptableEventListener.cs similarity index 56% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationScriptableEventListener.cs rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationScriptableEventListener.cs index 17b739c..1be63bd 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationScriptableEventListener.cs +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationScriptableEventListener.cs @@ -1,12 +1,12 @@ using UnityEngine; -namespace ScriptableEvents.Samples.CustomEvents +namespace CHARK.ScriptableEvents.Samples.CustomEvents { [AddComponentMenu( ScriptableEventConstants.MenuNameCustom + "/Light Randomization Scriptable Event Listener", ScriptableEventConstants.MenuOrderCustom + 0 )] - public class LightRandomizationScriptableEventListener : BaseScriptableEventListener + public class LightRandomizationScriptableEventListener : ScriptableEventListener { } } diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationScriptableEventListener.cs.meta b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationScriptableEventListener.cs.meta similarity index 83% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationScriptableEventListener.cs.meta rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationScriptableEventListener.cs.meta index 3fedc22..7b63b5a 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationScriptableEventListener.cs.meta +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationScriptableEventListener.cs.meta @@ -1,11 +1,11 @@ -fileFormatVersion: 2 -guid: d9fc3b731d1a38549a0bc9c5008c4ddf -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 2800000, guid: 20d040fb73264abc95c7bbdb11383750, type: 3} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 023e9019d7c3f604fa65c27041d7bbc9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 2800000, guid: 20d040fb73264abc95c7bbdb11383750, type: 3} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationTrigger.cs b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationTrigger.cs similarity index 96% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationTrigger.cs rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationTrigger.cs index 833276b..6ce8091 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationTrigger.cs +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationTrigger.cs @@ -2,7 +2,7 @@ using UnityEngine.Events; using Random = UnityEngine.Random; -namespace ScriptableEvents.Samples.CustomEvents +namespace CHARK.ScriptableEvents.Samples.CustomEvents { public class LightRandomizationTrigger : MonoBehaviour { diff --git a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationTrigger.cs.meta b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationTrigger.cs.meta similarity index 83% rename from Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationTrigger.cs.meta rename to Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationTrigger.cs.meta index 809a8b1..d015023 100644 --- a/Packages/com.chark.scriptable-events/Samples~/CustomEvents/Scripts/LightRandomizationTrigger.cs.meta +++ b/Packages/com.chark.scriptable-events/Samples/CustomEvents/Scripts/LightRandomizationTrigger.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2e141cf35eea50d4da8bd6f9c60011b1 +guid: 922263424603e2b4f828281078bad424 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Packages/com.chark.scriptable-events/Samples~/EventsWithArguments.meta b/Packages/com.chark.scriptable-events/Samples/EventsWithArguments.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/EventsWithArguments.meta rename to Packages/com.chark.scriptable-events/Samples/EventsWithArguments.meta diff --git a/Packages/com.chark.scriptable-events/Samples~/EventsWithArguments/Prefabs.meta b/Packages/com.chark.scriptable-events/Samples/EventsWithArguments/Prefabs.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/EventsWithArguments/Prefabs.meta rename to Packages/com.chark.scriptable-events/Samples/EventsWithArguments/Prefabs.meta diff --git a/Packages/com.chark.scriptable-events/Samples~/EventsWithArguments/Prefabs/LightDimmer.prefab b/Packages/com.chark.scriptable-events/Samples/EventsWithArguments/Prefabs/LightDimmer.prefab similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/EventsWithArguments/Prefabs/LightDimmer.prefab rename to Packages/com.chark.scriptable-events/Samples/EventsWithArguments/Prefabs/LightDimmer.prefab diff --git a/Packages/com.chark.scriptable-events/Samples~/EventsWithArguments/Prefabs/LightDimmer.prefab.meta b/Packages/com.chark.scriptable-events/Samples/EventsWithArguments/Prefabs/LightDimmer.prefab.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/EventsWithArguments/Prefabs/LightDimmer.prefab.meta rename to Packages/com.chark.scriptable-events/Samples/EventsWithArguments/Prefabs/LightDimmer.prefab.meta diff --git a/Packages/com.chark.scriptable-events/Samples~/EventsWithArguments/Prefabs/UI.prefab b/Packages/com.chark.scriptable-events/Samples/EventsWithArguments/Prefabs/UI.prefab similarity index 97% rename from Packages/com.chark.scriptable-events/Samples~/EventsWithArguments/Prefabs/UI.prefab rename to Packages/com.chark.scriptable-events/Samples/EventsWithArguments/Prefabs/UI.prefab index b8ad114..d4e0037 100644 --- a/Packages/com.chark.scriptable-events/Samples~/EventsWithArguments/Prefabs/UI.prefab +++ b/Packages/com.chark.scriptable-events/Samples/EventsWithArguments/Prefabs/UI.prefab @@ -55,8 +55,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -124,8 +124,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Navigation: m_Mode: 3 m_WrapAround: 0 @@ -166,7 +166,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11400000, guid: f9c9e9a59c2179e4284dd39c4a734ea5, type: 2} - m_TargetAssemblyTypeName: ScriptableEvents.BaseScriptableEvent`1[[System.Single, + m_TargetAssemblyTypeName: CHARK.ScriptableEvents.ScriptableEvent`1[[System.Single, mscorlib m_MethodName: Raise m_Mode: 0 @@ -175,7 +175,7 @@ MonoBehaviour: m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: + m_StringArgument: m_BoolArgument: 0 m_CallState: 2 --- !u!1 &228067509855269808 @@ -233,8 +233,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -308,8 +308,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -370,8 +370,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} m_sendNavigationEvents: 1 m_DragThreshold: 10 @@ -385,8 +385,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -500,8 +500,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 @@ -523,8 +523,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 m_BlockingObjects: 0 m_BlockingMask: diff --git a/Packages/com.chark.scriptable-events/Samples~/EventsWithArguments/Prefabs/UI.prefab.meta b/Packages/com.chark.scriptable-events/Samples/EventsWithArguments/Prefabs/UI.prefab.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/EventsWithArguments/Prefabs/UI.prefab.meta rename to Packages/com.chark.scriptable-events/Samples/EventsWithArguments/Prefabs/UI.prefab.meta diff --git a/Packages/com.chark.scriptable-events/Samples~/EventsWithArguments/Scenes.meta b/Packages/com.chark.scriptable-events/Samples/EventsWithArguments/Scenes.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/EventsWithArguments/Scenes.meta rename to Packages/com.chark.scriptable-events/Samples/EventsWithArguments/Scenes.meta diff --git a/Packages/com.chark.scriptable-events/Samples~/EventsWithArguments/Scenes/EventsWithArgumentsScene.unity b/Packages/com.chark.scriptable-events/Samples/EventsWithArguments/Scenes/EventsWithArgumentsScene.unity similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/EventsWithArguments/Scenes/EventsWithArgumentsScene.unity rename to Packages/com.chark.scriptable-events/Samples/EventsWithArguments/Scenes/EventsWithArgumentsScene.unity diff --git a/Packages/com.chark.scriptable-events/Samples~/EventsWithArguments/Scenes/EventsWithArgumentsScene.unity.meta b/Packages/com.chark.scriptable-events/Samples/EventsWithArguments/Scenes/EventsWithArgumentsScene.unity.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/EventsWithArguments/Scenes/EventsWithArgumentsScene.unity.meta rename to Packages/com.chark.scriptable-events/Samples/EventsWithArguments/Scenes/EventsWithArgumentsScene.unity.meta diff --git a/Packages/com.chark.scriptable-events/Samples~/EventsWithArguments/ScriptableEvents.meta b/Packages/com.chark.scriptable-events/Samples/EventsWithArguments/ScriptableEvents.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/EventsWithArguments/ScriptableEvents.meta rename to Packages/com.chark.scriptable-events/Samples/EventsWithArguments/ScriptableEvents.meta diff --git a/Packages/com.chark.scriptable-events/Samples~/EventsWithArguments/ScriptableEvents/LightIntensitySliderMovedEvent.asset b/Packages/com.chark.scriptable-events/Samples/EventsWithArguments/ScriptableEvents/LightIntensitySliderMovedEvent.asset similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/EventsWithArguments/ScriptableEvents/LightIntensitySliderMovedEvent.asset rename to Packages/com.chark.scriptable-events/Samples/EventsWithArguments/ScriptableEvents/LightIntensitySliderMovedEvent.asset diff --git a/Packages/com.chark.scriptable-events/Samples~/EventsWithArguments/ScriptableEvents/LightIntensitySliderMovedEvent.asset.meta b/Packages/com.chark.scriptable-events/Samples/EventsWithArguments/ScriptableEvents/LightIntensitySliderMovedEvent.asset.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/EventsWithArguments/ScriptableEvents/LightIntensitySliderMovedEvent.asset.meta rename to Packages/com.chark.scriptable-events/Samples/EventsWithArguments/ScriptableEvents/LightIntensitySliderMovedEvent.asset.meta diff --git a/Packages/com.chark.scriptable-events/Samples~/SimpleEvents.meta b/Packages/com.chark.scriptable-events/Samples/SimpleEvents.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/SimpleEvents.meta rename to Packages/com.chark.scriptable-events/Samples/SimpleEvents.meta diff --git a/Packages/com.chark.scriptable-events/Samples~/SimpleEvents/Prefabs.meta b/Packages/com.chark.scriptable-events/Samples/SimpleEvents/Prefabs.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/SimpleEvents/Prefabs.meta rename to Packages/com.chark.scriptable-events/Samples/SimpleEvents/Prefabs.meta diff --git a/Packages/com.chark.scriptable-events/Samples~/SimpleEvents/Prefabs/LightSwitch.prefab b/Packages/com.chark.scriptable-events/Samples/SimpleEvents/Prefabs/LightSwitch.prefab similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/SimpleEvents/Prefabs/LightSwitch.prefab rename to Packages/com.chark.scriptable-events/Samples/SimpleEvents/Prefabs/LightSwitch.prefab diff --git a/Packages/com.chark.scriptable-events/Samples~/SimpleEvents/Prefabs/LightSwitch.prefab.meta b/Packages/com.chark.scriptable-events/Samples/SimpleEvents/Prefabs/LightSwitch.prefab.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/SimpleEvents/Prefabs/LightSwitch.prefab.meta rename to Packages/com.chark.scriptable-events/Samples/SimpleEvents/Prefabs/LightSwitch.prefab.meta diff --git a/Packages/com.chark.scriptable-events/Samples~/SimpleEvents/Prefabs/UI.prefab b/Packages/com.chark.scriptable-events/Samples/SimpleEvents/Prefabs/UI.prefab similarity index 96% rename from Packages/com.chark.scriptable-events/Samples~/SimpleEvents/Prefabs/UI.prefab rename to Packages/com.chark.scriptable-events/Samples/SimpleEvents/Prefabs/UI.prefab index c780c37..39e9bf2 100644 --- a/Packages/com.chark.scriptable-events/Samples~/SimpleEvents/Prefabs/UI.prefab +++ b/Packages/com.chark.scriptable-events/Samples/SimpleEvents/Prefabs/UI.prefab @@ -42,8 +42,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} m_sendNavigationEvents: 1 m_DragThreshold: 10 @@ -57,8 +57,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -121,8 +121,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 @@ -200,8 +200,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 @@ -281,8 +281,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.78431374} m_RaycastTarget: 1 @@ -311,8 +311,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Navigation: m_Mode: 3 m_WrapAround: 0 @@ -354,7 +354,7 @@ MonoBehaviour: m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: + m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 3181439717707370880} @@ -366,12 +366,12 @@ MonoBehaviour: m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: + m_StringArgument: m_BoolArgument: 1 m_CallState: 2 - m_Target: {fileID: 11400000, guid: 7551791cf073e3845a19313ae0efa6d8, type: 2} - m_TargetAssemblyTypeName: ScriptableEvents.Events.SimpleScriptableEvent, - Chark.ScriptableEvents + m_TargetAssemblyTypeName: CHARK.ScriptableEvents.Events.SimpleScriptableEvent, + CHARK.ScriptableEvents m_MethodName: Raise m_Mode: 1 m_Arguments: @@ -379,7 +379,7 @@ MonoBehaviour: m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: + m_StringArgument: m_BoolArgument: 1 m_CallState: 2 --- !u!1 &3181439717418443984 @@ -484,8 +484,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 @@ -507,8 +507,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 m_BlockingObjects: 0 m_BlockingMask: @@ -571,8 +571,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.78431374} m_RaycastTarget: 1 @@ -601,8 +601,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Navigation: m_Mode: 3 m_WrapAround: 0 @@ -644,7 +644,7 @@ MonoBehaviour: m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: + m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 3181439717140355964} @@ -656,12 +656,12 @@ MonoBehaviour: m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: + m_StringArgument: m_BoolArgument: 1 m_CallState: 2 - m_Target: {fileID: 11400000, guid: bfe999f93da56d24cb0e1881bde6e29d, type: 2} - m_TargetAssemblyTypeName: ScriptableEvents.Events.SimpleScriptableEvent, - Chark.ScriptableEvents + m_TargetAssemblyTypeName: CHARK.ScriptableEvents.Events.SimpleScriptableEvent, + CHARK.ScriptableEvents m_MethodName: Raise m_Mode: 1 m_Arguments: @@ -669,7 +669,7 @@ MonoBehaviour: m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: + m_StringArgument: m_BoolArgument: 1 m_CallState: 2 --- !u!1 &3181439718867852058 @@ -720,8 +720,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Padding: m_Left: 4 m_Right: 4 diff --git a/Packages/com.chark.scriptable-events/Samples~/SimpleEvents/Prefabs/UI.prefab.meta b/Packages/com.chark.scriptable-events/Samples/SimpleEvents/Prefabs/UI.prefab.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/SimpleEvents/Prefabs/UI.prefab.meta rename to Packages/com.chark.scriptable-events/Samples/SimpleEvents/Prefabs/UI.prefab.meta diff --git a/Packages/com.chark.scriptable-events/Samples~/SimpleEvents/Scenes.meta b/Packages/com.chark.scriptable-events/Samples/SimpleEvents/Scenes.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/SimpleEvents/Scenes.meta rename to Packages/com.chark.scriptable-events/Samples/SimpleEvents/Scenes.meta diff --git a/Packages/com.chark.scriptable-events/Samples~/SimpleEvents/Scenes/SimpleEvents.unity b/Packages/com.chark.scriptable-events/Samples/SimpleEvents/Scenes/SimpleEvents.unity similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/SimpleEvents/Scenes/SimpleEvents.unity rename to Packages/com.chark.scriptable-events/Samples/SimpleEvents/Scenes/SimpleEvents.unity diff --git a/Packages/com.chark.scriptable-events/Samples~/SimpleEvents/Scenes/SimpleEvents.unity.meta b/Packages/com.chark.scriptable-events/Samples/SimpleEvents/Scenes/SimpleEvents.unity.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/SimpleEvents/Scenes/SimpleEvents.unity.meta rename to Packages/com.chark.scriptable-events/Samples/SimpleEvents/Scenes/SimpleEvents.unity.meta diff --git a/Packages/com.chark.scriptable-events/Samples~/SimpleEvents/ScriptableEvents.meta b/Packages/com.chark.scriptable-events/Samples/SimpleEvents/ScriptableEvents.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/SimpleEvents/ScriptableEvents.meta rename to Packages/com.chark.scriptable-events/Samples/SimpleEvents/ScriptableEvents.meta diff --git a/Packages/com.chark.scriptable-events/Samples~/SimpleEvents/ScriptableEvents/TurnOffLightsClickedEvent.asset b/Packages/com.chark.scriptable-events/Samples/SimpleEvents/ScriptableEvents/TurnOffLightsClickedEvent.asset similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/SimpleEvents/ScriptableEvents/TurnOffLightsClickedEvent.asset rename to Packages/com.chark.scriptable-events/Samples/SimpleEvents/ScriptableEvents/TurnOffLightsClickedEvent.asset diff --git a/Packages/com.chark.scriptable-events/Samples~/SimpleEvents/ScriptableEvents/TurnOffLightsClickedEvent.asset.meta b/Packages/com.chark.scriptable-events/Samples/SimpleEvents/ScriptableEvents/TurnOffLightsClickedEvent.asset.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/SimpleEvents/ScriptableEvents/TurnOffLightsClickedEvent.asset.meta rename to Packages/com.chark.scriptable-events/Samples/SimpleEvents/ScriptableEvents/TurnOffLightsClickedEvent.asset.meta diff --git a/Packages/com.chark.scriptable-events/Samples~/SimpleEvents/ScriptableEvents/TurnOnLightsClickedEvent.asset b/Packages/com.chark.scriptable-events/Samples/SimpleEvents/ScriptableEvents/TurnOnLightsClickedEvent.asset similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/SimpleEvents/ScriptableEvents/TurnOnLightsClickedEvent.asset rename to Packages/com.chark.scriptable-events/Samples/SimpleEvents/ScriptableEvents/TurnOnLightsClickedEvent.asset diff --git a/Packages/com.chark.scriptable-events/Samples~/SimpleEvents/ScriptableEvents/TurnOnLightsClickedEvent.asset.meta b/Packages/com.chark.scriptable-events/Samples/SimpleEvents/ScriptableEvents/TurnOnLightsClickedEvent.asset.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Samples~/SimpleEvents/ScriptableEvents/TurnOnLightsClickedEvent.asset.meta rename to Packages/com.chark.scriptable-events/Samples/SimpleEvents/ScriptableEvents/TurnOnLightsClickedEvent.asset.meta diff --git a/Packages/com.chark.scriptable-events/Samples~/Chark.ScriptableEvents.Samples.asmdef b/Packages/com.chark.scriptable-events/Samples~/Chark.ScriptableEvents.Samples.asmdef deleted file mode 100644 index a4d45c5..0000000 --- a/Packages/com.chark.scriptable-events/Samples~/Chark.ScriptableEvents.Samples.asmdef +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "Chark.ScriptableEvents.Samples", - "rootNamespace": "ScriptableEvents", - "references": [ - "Chark.ScriptableEvents", - "Chark.ScriptableEvents.Editor" - ] -} diff --git a/Packages/com.chark.scriptable-events/Tests/Editor/CHARK.ScriptableEvents.Editor.Tests.asmdef b/Packages/com.chark.scriptable-events/Tests/Editor/CHARK.ScriptableEvents.Editor.Tests.asmdef new file mode 100644 index 0000000..8376053 --- /dev/null +++ b/Packages/com.chark.scriptable-events/Tests/Editor/CHARK.ScriptableEvents.Editor.Tests.asmdef @@ -0,0 +1,25 @@ +{ + "name": "CHARK.ScriptableEvents.Editor.Tests", + "rootNamespace": "CHARK.ScriptableEvents", + "references": [ + "GUID:d8ff72fdf1f9b014ab4291157a56a767", + "GUID:87b8abe4ff9fd7e42aa654cc986d3202", + "GUID:27619889b8ba8c24980f49ee34dbb44a", + "GUID:0acc523941302664db1f4e527237feb3" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": true, + "precompiledReferences": [ + "nunit.framework.dll" + ], + "autoReferenced": false, + "defineConstraints": [ + "UNITY_INCLUDE_TESTS" + ], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Packages/com.chark.scriptable-events/Tests/Editor/Chark.ScriptableEvents.Editor.Tests.asmdef.meta b/Packages/com.chark.scriptable-events/Tests/Editor/CHARK.ScriptableEvents.Editor.Tests.asmdef.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Tests/Editor/Chark.ScriptableEvents.Editor.Tests.asmdef.meta rename to Packages/com.chark.scriptable-events/Tests/Editor/CHARK.ScriptableEvents.Editor.Tests.asmdef.meta diff --git a/Packages/com.chark.scriptable-events/Tests/Editor/Chark.ScriptableEvents.Editor.Tests.asmdef b/Packages/com.chark.scriptable-events/Tests/Editor/Chark.ScriptableEvents.Editor.Tests.asmdef deleted file mode 100644 index 8f21a22..0000000 --- a/Packages/com.chark.scriptable-events/Tests/Editor/Chark.ScriptableEvents.Editor.Tests.asmdef +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "Chark.ScriptableEvents.Editor.Tests", - "rootNamespace": "ScriptableEvents", - "references": [ - "Chark.ScriptableEvents", - "Chark.ScriptableEvents.Editor" - ], - "includePlatforms": [ - "Editor" - ], - "optionalUnityReferences": [ - "TestAssemblies" - ] -} diff --git a/Packages/com.chark.scriptable-events/Tests/Editor/IconUtilsTest.cs b/Packages/com.chark.scriptable-events/Tests/Editor/IconUtilsTest.cs index 0531cb2..25fb79a 100644 --- a/Packages/com.chark.scriptable-events/Tests/Editor/IconUtilsTest.cs +++ b/Packages/com.chark.scriptable-events/Tests/Editor/IconUtilsTest.cs @@ -1,10 +1,10 @@ using System.IO; +using CHARK.ScriptableEvents.Editor.Icons; using NUnit.Framework; -using ScriptableEvents.Editor.Icons; using UnityEditor; using UnityEngine; -namespace ScriptableEvents.Tests.Editor +namespace CHARK.ScriptableEvents.Tests.Editor { [TestFixture] internal class IconUtilsTest diff --git a/Packages/com.chark.scriptable-events/Tests/Editor/ScriptBuilderTest.cs b/Packages/com.chark.scriptable-events/Tests/Editor/ScriptBuilderTest.cs index 7ef3dd1..7f1960c 100644 --- a/Packages/com.chark.scriptable-events/Tests/Editor/ScriptBuilderTest.cs +++ b/Packages/com.chark.scriptable-events/Tests/Editor/ScriptBuilderTest.cs @@ -1,7 +1,7 @@ +using CHARK.ScriptableEvents.Editor.ScriptCreation; using NUnit.Framework; -using ScriptableEvents.Editor.ScriptCreation; -namespace ScriptableEvents.Tests.Editor +namespace CHARK.ScriptableEvents.Tests.Editor { [TestFixture] internal class ScriptBuilderTest @@ -10,7 +10,7 @@ internal class ScriptBuilderTest public void ShouldCreateScriptFromEventTemplate() { var expectedContent = @" - using ScriptableEvents; + using CHARK.ScriptableEvents; using TestEventArg.Namespace; using UnityEngine; @@ -21,7 +21,7 @@ namespace TestEvent.Namespace menuName = ScriptableEventConstants.MenuNameCustom + ""/TestEventMenuName"", order = ScriptableEventConstants.MenuOrderCustom + 123 )] - public class TestEventName : BaseScriptableEvent + internal sealed class TestEventName : ScriptableEvent { } } @@ -40,7 +40,7 @@ public class TestEventName : BaseScriptableEvent // Already exists in namespace, should be skipped. .AddImport("TestEventArg.Namespace") .AddImport("TestEvent.Namespace") - .AddImport("ScriptableEvents") + .AddImport("CHARK.ScriptableEvents") .Build(); Assert.AreEqual(NormaliseCRs(expectedContent), NormaliseCRs(scriptContent)); @@ -50,7 +50,7 @@ public class TestEventName : BaseScriptableEvent public void ShouldCreateScriptFromListenerTemplate() { var expectedContent = @" - using ScriptableEvents; + using CHARK.ScriptableEvents; using TestEventArg.Namespace; using UnityEngine; @@ -60,7 +60,7 @@ namespace TestListener.Namespace ScriptableEventConstants.MenuNameCustom + ""/TestListenerMenuName"", ScriptableEventConstants.MenuOrderCustom + 123 )] - public class TestListenerName : BaseScriptableEventListener + internal sealed class TestListenerName : ScriptableEventListener { } } @@ -78,7 +78,7 @@ public class TestListenerName : BaseScriptableEventListener // Already exists in namespace, should be skipped. .AddImport("TestListener.Namespace") .AddImport("TestEventArg.Namespace") - .AddImport("ScriptableEvents") + .AddImport("CHARK.ScriptableEvents") .Build(); Assert.AreEqual(NormaliseCRs(expectedContent), NormaliseCRs(scriptContent)); @@ -88,7 +88,7 @@ public class TestListenerName : BaseScriptableEventListener public void ShouldCreateScriptFromEditorTemplate() { var expectedContent = @" - using ScriptableEvents.Editor; + using CHARK.ScriptableEvents.Editor; using TestEvent.Namespace; using TestEventArg.Namespace; using UnityEditor; @@ -96,7 +96,7 @@ public void ShouldCreateScriptFromEditorTemplate() namespace TestEditor.Namespace { [CustomEditor(typeof(TestEvent))] - public class TestEditor : BaseScriptableEventEditor + internal sealed class TestEditor : ScriptableEventEditor { protected override TestEventArg DrawArgField(TestEventArg value) { @@ -120,7 +120,7 @@ protected override TestEventArg DrawArgField(TestEventArg value) .AddImport("TestEditor.Namespace") .AddImport("TestEventArg.Namespace") .AddImport("TestEvent.Namespace") - .AddImport("ScriptableEvents.Editor") + .AddImport("CHARK.ScriptableEvents.Editor") .Build(); Assert.AreEqual(NormaliseCRs(expectedContent), NormaliseCRs(scriptContent)); @@ -134,6 +134,5 @@ private static string NormaliseCRs(string source) { return source.Replace("\r\n", "\n").Replace("\r", "\n"); } - } } diff --git a/Packages/com.chark.scriptable-events/Tests/Editor/ScriptUtilsTest.cs b/Packages/com.chark.scriptable-events/Tests/Editor/ScriptUtilsTest.cs index f5e98e1..19b8463 100644 --- a/Packages/com.chark.scriptable-events/Tests/Editor/ScriptUtilsTest.cs +++ b/Packages/com.chark.scriptable-events/Tests/Editor/ScriptUtilsTest.cs @@ -1,8 +1,8 @@ using System.IO; +using CHARK.ScriptableEvents.Editor.ScriptCreation; using NUnit.Framework; -using ScriptableEvents.Editor.ScriptCreation; -namespace ScriptableEvents.Tests.Editor +namespace CHARK.ScriptableEvents.Tests.Editor { [TestFixture] internal class ScriptUtilsTest diff --git a/Packages/com.chark.scriptable-events/Tests/Editor/ScriptableEventAttributeTest.cs b/Packages/com.chark.scriptable-events/Tests/Editor/ScriptableEventAttributeTest.cs index 912b494..46230e6 100644 --- a/Packages/com.chark.scriptable-events/Tests/Editor/ScriptableEventAttributeTest.cs +++ b/Packages/com.chark.scriptable-events/Tests/Editor/ScriptableEventAttributeTest.cs @@ -3,7 +3,7 @@ using NUnit.Framework; using UnityEngine; -namespace ScriptableEvents.Tests.Editor +namespace CHARK.ScriptableEvents.Tests.Editor { [TestFixtureSource(typeof(ScriptableEventAttributeTestSource))] internal class ScriptableEventAttributeTest diff --git a/Packages/com.chark.scriptable-events/Tests/Editor/ScriptableEventAttributeTestSource.cs b/Packages/com.chark.scriptable-events/Tests/Editor/ScriptableEventAttributeTestSource.cs index b3baaf6..61fd18c 100644 --- a/Packages/com.chark.scriptable-events/Tests/Editor/ScriptableEventAttributeTestSource.cs +++ b/Packages/com.chark.scriptable-events/Tests/Editor/ScriptableEventAttributeTestSource.cs @@ -1,8 +1,8 @@ using System.Collections; -using ScriptableEvents.Events; -using ScriptableEvents.Listeners; +using CHARK.ScriptableEvents.Events; +using CHARK.ScriptableEvents.Listeners; -namespace ScriptableEvents.Tests.Editor +namespace CHARK.ScriptableEvents.Tests.Editor { internal class ScriptableEventAttributeTestSource : IEnumerable { diff --git a/Packages/com.chark.scriptable-events/Tests/Editor/ScriptableEventEditorStateTest.cs b/Packages/com.chark.scriptable-events/Tests/Editor/ScriptableEventEditorStateTest.cs index f0923e3..e1643af 100644 --- a/Packages/com.chark.scriptable-events/Tests/Editor/ScriptableEventEditorStateTest.cs +++ b/Packages/com.chark.scriptable-events/Tests/Editor/ScriptableEventEditorStateTest.cs @@ -1,17 +1,13 @@ using System.Linq; +using CHARK.ScriptableEvents.Editor.States; using NUnit.Framework; -using ScriptableEvents.Editor.States; using UnityEditor; -namespace ScriptableEvents.Tests.Editor +namespace CHARK.ScriptableEvents.Tests.Editor { [TestFixture] internal class ScriptableEventEditorStateTest { - #region Private Fields - - #endregion - #region Public Methods [SetUp] diff --git a/Packages/com.chark.scriptable-events/Tests/Runtime/CHARK.ScriptableEvents.Tests.asmdef b/Packages/com.chark.scriptable-events/Tests/Runtime/CHARK.ScriptableEvents.Tests.asmdef new file mode 100644 index 0000000..62be5e2 --- /dev/null +++ b/Packages/com.chark.scriptable-events/Tests/Runtime/CHARK.ScriptableEvents.Tests.asmdef @@ -0,0 +1,22 @@ +{ + "name": "CHARK.ScriptableEvents.Tests", + "rootNamespace": "CHARK.ScriptableEvents", + "references": [ + "GUID:d8ff72fdf1f9b014ab4291157a56a767", + "GUID:27619889b8ba8c24980f49ee34dbb44a", + "GUID:0acc523941302664db1f4e527237feb3" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": true, + "precompiledReferences": [ + "nunit.framework.dll" + ], + "autoReferenced": false, + "defineConstraints": [ + "UNITY_INCLUDE_TESTS" + ], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Packages/com.chark.scriptable-events/Tests/Runtime/Chark.ScriptableEvents.Tests.asmdef.meta b/Packages/com.chark.scriptable-events/Tests/Runtime/CHARK.ScriptableEvents.Tests.asmdef.meta similarity index 100% rename from Packages/com.chark.scriptable-events/Tests/Runtime/Chark.ScriptableEvents.Tests.asmdef.meta rename to Packages/com.chark.scriptable-events/Tests/Runtime/CHARK.ScriptableEvents.Tests.asmdef.meta diff --git a/Packages/com.chark.scriptable-events/Tests/Runtime/Chark.ScriptableEvents.Tests.asmdef b/Packages/com.chark.scriptable-events/Tests/Runtime/Chark.ScriptableEvents.Tests.asmdef deleted file mode 100644 index 4a89dcb..0000000 --- a/Packages/com.chark.scriptable-events/Tests/Runtime/Chark.ScriptableEvents.Tests.asmdef +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "Chark.ScriptableEvents.Tests", - "rootNamespace": "ScriptableEvents", - "references": [ - "Chark.ScriptableEvents" - ], - "optionalUnityReferences": [ - "TestAssemblies" - ] -} diff --git a/Packages/com.chark.scriptable-events/Tests/Runtime/MockScriptableEventListener.cs b/Packages/com.chark.scriptable-events/Tests/Runtime/MockScriptableEventListener.cs index 2181200..e44db3a 100644 --- a/Packages/com.chark.scriptable-events/Tests/Runtime/MockScriptableEventListener.cs +++ b/Packages/com.chark.scriptable-events/Tests/Runtime/MockScriptableEventListener.cs @@ -1,6 +1,6 @@ using System; -namespace ScriptableEvents.Tests.Runtime +namespace CHARK.ScriptableEvents.Tests.Runtime { internal class MockScriptableEventListener : IScriptableEventListener { diff --git a/Packages/com.chark.scriptable-events/Tests/Runtime/ReflectionUtils.cs b/Packages/com.chark.scriptable-events/Tests/Runtime/ReflectionUtils.cs index bb1a6ac..6325db3 100644 --- a/Packages/com.chark.scriptable-events/Tests/Runtime/ReflectionUtils.cs +++ b/Packages/com.chark.scriptable-events/Tests/Runtime/ReflectionUtils.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Reflection; -namespace ScriptableEvents.Tests.Runtime +namespace CHARK.ScriptableEvents.Tests.Runtime { internal static class ReflectionUtils { @@ -23,7 +23,7 @@ internal static void SetField(this object obj, string name, object value) field.SetValue(obj, value); } /// - /// Add an item to a field of type List + /// Add an item to a field of type . /// internal static void AddToListField(this object obj, string name, T value) { diff --git a/Packages/com.chark.scriptable-events/Tests/Runtime/ScriptableEventTest.cs b/Packages/com.chark.scriptable-events/Tests/Runtime/ScriptableEventTest.cs index 97e1749..df59a2e 100644 --- a/Packages/com.chark.scriptable-events/Tests/Runtime/ScriptableEventTest.cs +++ b/Packages/com.chark.scriptable-events/Tests/Runtime/ScriptableEventTest.cs @@ -6,7 +6,7 @@ using UnityEngine.Events; using UnityEngine.TestTools; -namespace ScriptableEvents.Tests.Runtime +namespace CHARK.ScriptableEvents.Tests.Runtime { [TestFixtureSource(typeof(ScriptableEventTestSource))] internal class ScriptableEventTest< @@ -14,8 +14,8 @@ internal class ScriptableEventTest< TScriptableEventListener, TArg > - where TScriptableEvent : BaseScriptableEvent - where TScriptableEventListener : BaseScriptableEventListener + where TScriptableEvent : ScriptableEvent + where TScriptableEventListener : ScriptableEventListener { #region Private Fields @@ -159,8 +159,8 @@ private void SetupScriptableEventListener() // Note: the type for scriptableEvents is NOT TScriptableEvent, it is BaseScriptableEvent // If treated as TScriptableEvent, casting fails. - scriptableEventListener.AddToListField>("scriptableEvents", scriptableEvent); - scriptableEventListener.AddToListField>("scriptableEvents", scriptableEvent2); + scriptableEventListener.AddToListField>("scriptableEvents", scriptableEvent); + scriptableEventListener.AddToListField>("scriptableEvents", scriptableEvent2); scriptableEventListener.SetField("onRaised", unityEvent); // Add listener by triggering OnEnabled. diff --git a/Packages/com.chark.scriptable-events/Tests/Runtime/ScriptableEventTestSource.cs b/Packages/com.chark.scriptable-events/Tests/Runtime/ScriptableEventTestSource.cs index ab4c5b0..4070be8 100644 --- a/Packages/com.chark.scriptable-events/Tests/Runtime/ScriptableEventTestSource.cs +++ b/Packages/com.chark.scriptable-events/Tests/Runtime/ScriptableEventTestSource.cs @@ -1,11 +1,11 @@ using System.Collections; +using CHARK.ScriptableEvents.Events; +using CHARK.ScriptableEvents.Listeners; using NUnit.Framework; using NUnit.Framework.Internal; -using ScriptableEvents.Events; -using ScriptableEvents.Listeners; using UnityEngine; -namespace ScriptableEvents.Tests.Runtime +namespace CHARK.ScriptableEvents.Tests.Runtime { internal class ScriptableEventTestSource : IEnumerable { @@ -125,8 +125,8 @@ private static TestFixtureParameters CreateTestCase< TScriptableEventListener, TArg >(TArg arg) - where TScriptableEvent : BaseScriptableEvent - where TScriptableEventListener : BaseScriptableEventListener + where TScriptableEvent : ScriptableEvent + where TScriptableEventListener : ScriptableEventListener { var attribute = new TestFixtureAttribute(arg) { diff --git a/Packages/com.chark.scriptable-events/Tests/Runtime/SimpleScriptableEventTest.cs b/Packages/com.chark.scriptable-events/Tests/Runtime/SimpleScriptableEventTest.cs index 9047d83..5931429 100644 --- a/Packages/com.chark.scriptable-events/Tests/Runtime/SimpleScriptableEventTest.cs +++ b/Packages/com.chark.scriptable-events/Tests/Runtime/SimpleScriptableEventTest.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using System.Linq; +using CHARK.ScriptableEvents.Events; using NUnit.Framework; -using ScriptableEvents.Events; using UnityEngine; -namespace ScriptableEvents.Tests.Runtime +namespace CHARK.ScriptableEvents.Tests.Runtime { [TestFixture] internal class SimpleScriptableEventTest diff --git a/Packages/manifest.json b/Packages/manifest.json index 78a21ed..8034c40 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,10 +1,10 @@ { "dependencies": { - "com.unity.ide.rider": "2.0.7", - "com.unity.ide.visualstudio": "2.0.12", - "com.unity.ide.vscode": "1.2.4", + "com.unity.ide.rider": "3.0.21", + "com.unity.ide.visualstudio": "2.0.18", + "com.unity.ide.vscode": "1.2.5", "com.unity.package-validation-suite": "0.23.4-preview", - "com.unity.test-framework": "1.1.30", + "com.unity.test-framework": "1.1.33", "com.unity.ugui": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.audio": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 6ed2c4e..be969f6 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -14,16 +14,16 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "2.0.7", + "version": "3.0.21", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.1" + "com.unity.ext.nunit": "1.0.6" }, "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.12", + "version": "2.0.18", "depth": 0, "source": "registry", "dependencies": { @@ -32,7 +32,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { - "version": "1.2.4", + "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, @@ -57,7 +57,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.30", + "version": "1.1.33", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index eeb9d72..2cf22c0 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 22 + serializedVersion: 23 productGUID: 00ddff59f725876489595b1824af96fe AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -134,7 +134,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 2.1.0 + bundleVersion: 3.0.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -150,6 +150,7 @@ PlayerSettings: m_ColorGamuts: 0000000003000000 targetPixelDensity: 30 resolutionScalingMode: 0 + resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: @@ -490,8 +491,11 @@ PlayerSettings: switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 + switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 + switchRamDiskSpaceSize: 12 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -648,6 +652,7 @@ PlayerSettings: metroFTAName: metroFTAFileTypes: [] metroProtocolName: + vcxProjDefaultLanguage: XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -691,6 +696,7 @@ PlayerSettings: m_VersionName: apiCompatibilityLevel: 6 activeInputHandler: 0 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 4c9401b..da76706 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.25f1 -m_EditorVersionWithRevision: 2020.3.25f1 (9b9180224418) +m_EditorVersion: 2020.3.48f1 +m_EditorVersionWithRevision: 2020.3.48f1 (b805b124c6b7)