Merge branch 'main' into package
This commit is contained in:
commit
0fcee32f71
|
@ -47,13 +47,13 @@ namespace Syntriax.Modules.Trigger
|
||||||
}
|
}
|
||||||
|
|
||||||
#if UNITY_EDITOR
|
#if UNITY_EDITOR
|
||||||
private State.IStateEnable stateEnable = null;
|
private State.IStateEnable _stateEnable = null;
|
||||||
public State.IStateEnable StateEnable
|
public State.IStateEnable StateEnable
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
stateEnable = stateEnable ?? GetComponent<State.IStateEnable>() ?? gameObject.AddComponent<State.StateEnableMonoBehaviour>();
|
_stateEnable = _stateEnable ?? GetComponent<State.IStateEnable>() ?? gameObject.AddComponent<State.StateEnableMonoBehaviour>();
|
||||||
return stateEnable;
|
return _stateEnable;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -6,7 +6,7 @@ namespace Syntriax.Modules.Trigger
|
||||||
public interface ITrigger
|
public interface ITrigger
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// <see cref="IStateEnable"/> to switch on or off
|
/// <see cref="IStateEnable"/> to control the state of the <see cref="ITrigger"/> is on or off
|
||||||
/// </summary>
|
/// </summary>
|
||||||
IStateEnable StateEnable { get; }
|
IStateEnable StateEnable { get; }
|
||||||
|
|
||||||
|
|
|
@ -8,17 +8,17 @@ namespace Syntriax.Modules.Trigger
|
||||||
{
|
{
|
||||||
public Action<bool> OnTriggerStateChanged { get; set; } = null;
|
public Action<bool> OnTriggerStateChanged { get; set; } = null;
|
||||||
|
|
||||||
private IStateEnable stateEnable = null;
|
private IStateEnable _stateEnable = null;
|
||||||
public IStateEnable StateEnable
|
public IStateEnable StateEnable
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
if (stateEnable == null)
|
if (_stateEnable == null)
|
||||||
{
|
{
|
||||||
stateEnable = GetComponent<IStateEnable>() ?? gameObject.AddComponent<StateEnableMonoBehaviour>();
|
_stateEnable = GetComponent<IStateEnable>() ?? gameObject.AddComponent<StateEnableMonoBehaviour>();
|
||||||
stateEnable.OnEnabledChanged += OnEnabledChanged;
|
_stateEnable.OnEnabledChanged += OnEnabledChanged;
|
||||||
}
|
}
|
||||||
return stateEnable;
|
return _stateEnable;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "com.syntriax.trigger",
|
"name": "com.syntriax.trigger",
|
||||||
"version": "0.7.0",
|
"version": "0.7.1",
|
||||||
"displayName": "Trigger Module",
|
"displayName": "Trigger Module",
|
||||||
"unity": "2019.1",
|
"unity": "2019.1",
|
||||||
"documentationUrl": "https://git.syntriax.com/Syntriax/Trigger.git",
|
"documentationUrl": "https://git.syntriax.com/Syntriax/Trigger.git",
|
||||||
|
|
Loading…
Reference in New Issue