MOD!
This commit is contained in:
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 183370
|
||||
packageName: Feel
|
||||
packageVersion: 5.7
|
||||
assetPath: Assets/Feel/MMTools/Accessories/MMActivation/MMActivationOnStart.cs
|
||||
uploadId: 779587
|
||||
packageVersion: 5.8
|
||||
assetPath: Assets/OtherPlugins/Feel/MMTools/Accessories/MMActivation/MMActivationOnStart.cs
|
||||
uploadId: 799856
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 183370
|
||||
packageName: Feel
|
||||
packageVersion: 5.7
|
||||
assetPath: Assets/Feel/MMTools/Accessories/MMActivation/MMApplicationPlatformActivation.cs
|
||||
uploadId: 779587
|
||||
packageVersion: 5.8
|
||||
assetPath: Assets/OtherPlugins/Feel/MMTools/Accessories/MMActivation/MMApplicationPlatformActivation.cs
|
||||
uploadId: 799856
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 183370
|
||||
packageName: Feel
|
||||
packageVersion: 5.7
|
||||
assetPath: Assets/Feel/MMTools/Accessories/MMActivation/MMAutoExecution.cs
|
||||
uploadId: 779587
|
||||
packageVersion: 5.8
|
||||
assetPath: Assets/OtherPlugins/Feel/MMTools/Accessories/MMActivation/MMAutoExecution.cs
|
||||
uploadId: 799856
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 183370
|
||||
packageName: Feel
|
||||
packageVersion: 5.7
|
||||
assetPath: Assets/Feel/MMTools/Accessories/MMActivation/MMConditionalActivation.cs
|
||||
uploadId: 779587
|
||||
packageVersion: 5.8
|
||||
assetPath: Assets/OtherPlugins/Feel/MMTools/Accessories/MMActivation/MMConditionalActivation.cs
|
||||
uploadId: 799856
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 183370
|
||||
packageName: Feel
|
||||
packageVersion: 5.7
|
||||
assetPath: Assets/Feel/MMTools/Accessories/MMActivation/MMDontDestroyOnLoad.cs
|
||||
uploadId: 779587
|
||||
packageVersion: 5.8
|
||||
assetPath: Assets/OtherPlugins/Feel/MMTools/Accessories/MMActivation/MMDontDestroyOnLoad.cs
|
||||
uploadId: 799856
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 183370
|
||||
packageName: Feel
|
||||
packageVersion: 5.7
|
||||
assetPath: Assets/Feel/MMTools/Accessories/MMActivation/MMInputExecution.cs
|
||||
uploadId: 779587
|
||||
packageVersion: 5.8
|
||||
assetPath: Assets/OtherPlugins/Feel/MMTools/Accessories/MMActivation/MMInputExecution.cs
|
||||
uploadId: 799856
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 183370
|
||||
packageName: Feel
|
||||
packageVersion: 5.7
|
||||
assetPath: Assets/Feel/MMTools/Accessories/MMActivation/MMOnMouse.cs
|
||||
uploadId: 779587
|
||||
packageVersion: 5.8
|
||||
assetPath: Assets/OtherPlugins/Feel/MMTools/Accessories/MMActivation/MMOnMouse.cs
|
||||
uploadId: 799856
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 183370
|
||||
packageName: Feel
|
||||
packageVersion: 5.7
|
||||
assetPath: Assets/Feel/MMTools/Accessories/MMActivation/MMParentingOnStart.cs
|
||||
uploadId: 779587
|
||||
packageVersion: 5.8
|
||||
assetPath: Assets/OtherPlugins/Feel/MMTools/Accessories/MMActivation/MMParentingOnStart.cs
|
||||
uploadId: 799856
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 183370
|
||||
packageName: Feel
|
||||
packageVersion: 5.7
|
||||
assetPath: Assets/Feel/MMTools/Accessories/MMActivation/MMPeriodicExecution.cs
|
||||
uploadId: 779587
|
||||
packageVersion: 5.8
|
||||
assetPath: Assets/OtherPlugins/Feel/MMTools/Accessories/MMActivation/MMPeriodicExecution.cs
|
||||
uploadId: 799856
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 183370
|
||||
packageName: Feel
|
||||
packageVersion: 5.7
|
||||
assetPath: Assets/Feel/MMTools/Accessories/MMActivation/MMPlatformActivation.cs
|
||||
uploadId: 779587
|
||||
packageVersion: 5.8
|
||||
assetPath: Assets/OtherPlugins/Feel/MMTools/Accessories/MMActivation/MMPlatformActivation.cs
|
||||
uploadId: 799856
|
||||
|
||||
@@ -122,6 +122,7 @@ namespace MoreMountains.Tools
|
||||
}
|
||||
}
|
||||
|
||||
#if MM_PHYSICS2D
|
||||
/// <summary>
|
||||
/// On trigger enter 2D, we start our countdown if needed
|
||||
/// </summary>
|
||||
@@ -145,6 +146,7 @@ namespace MoreMountains.Tools
|
||||
StartChangeState();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/// <summary>
|
||||
/// Returns true if the target matches our settings, false otherwise
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 183370
|
||||
packageName: Feel
|
||||
packageVersion: 5.7
|
||||
assetPath: Assets/Feel/MMTools/Accessories/MMActivation/MMTimedActivation.cs
|
||||
uploadId: 779587
|
||||
packageVersion: 5.8
|
||||
assetPath: Assets/OtherPlugins/Feel/MMTools/Accessories/MMActivation/MMTimedActivation.cs
|
||||
uploadId: 799856
|
||||
|
||||
@@ -15,6 +15,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 183370
|
||||
packageName: Feel
|
||||
packageVersion: 5.7
|
||||
assetPath: Assets/Feel/MMTools/Accessories/MMActivation/MMTimedDestruction.cs
|
||||
uploadId: 779587
|
||||
packageVersion: 5.8
|
||||
assetPath: Assets/OtherPlugins/Feel/MMTools/Accessories/MMActivation/MMTimedDestruction.cs
|
||||
uploadId: 799856
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 183370
|
||||
packageName: Feel
|
||||
packageVersion: 5.7
|
||||
assetPath: Assets/Feel/MMTools/Accessories/MMActivation/MMToggleActive.cs
|
||||
uploadId: 779587
|
||||
packageVersion: 5.8
|
||||
assetPath: Assets/OtherPlugins/Feel/MMTools/Accessories/MMActivation/MMToggleActive.cs
|
||||
uploadId: 799856
|
||||
|
||||
@@ -28,6 +28,7 @@ namespace MoreMountains.Tools
|
||||
|
||||
// Collision 2D ------------------------------------------------------------------------------------
|
||||
|
||||
#if MM_PHYSICS2D
|
||||
protected virtual void OnCollisionEnter2D (Collision2D collision)
|
||||
{
|
||||
if (Collision2DLayerMask.MMContains (collision.gameObject))
|
||||
@@ -77,6 +78,7 @@ namespace MoreMountains.Tools
|
||||
OnTrigger2DStayEvent.Invoke();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// Collision ------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -15,6 +15,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 183370
|
||||
packageName: Feel
|
||||
packageVersion: 5.7
|
||||
assetPath: Assets/Feel/MMTools/Accessories/MMActivation/MMTriggerAndCollision.cs
|
||||
uploadId: 779587
|
||||
packageVersion: 5.8
|
||||
assetPath: Assets/OtherPlugins/Feel/MMTools/Accessories/MMActivation/MMTriggerAndCollision.cs
|
||||
uploadId: 799856
|
||||
|
||||
@@ -40,6 +40,8 @@ namespace MoreMountains.Tools
|
||||
|
||||
// Collision 2D ------------------------------------------------------------------------------------
|
||||
|
||||
#if MM_PHYSICS2D
|
||||
|
||||
protected abstract void OnCollisionEnter2D_(Collision2D collision);
|
||||
void OnCollisionEnter2D (Collision2D collision)
|
||||
{
|
||||
@@ -96,6 +98,8 @@ namespace MoreMountains.Tools
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
// Collision ------------------------------------------------------------------------------------
|
||||
|
||||
protected abstract void OnCollisionEnter_ (Collision c);
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 183370
|
||||
packageName: Feel
|
||||
packageVersion: 5.7
|
||||
assetPath: Assets/Feel/MMTools/Accessories/MMActivation/MMTriggerAndCollisionFilter.cs
|
||||
uploadId: 779587
|
||||
packageVersion: 5.8
|
||||
assetPath: Assets/OtherPlugins/Feel/MMTools/Accessories/MMActivation/MMTriggerAndCollisionFilter.cs
|
||||
uploadId: 799856
|
||||
|
||||
@@ -18,6 +18,8 @@ namespace MoreMountains.Tools
|
||||
|
||||
// Trigger 2D ------------------------------------------------------------------------------------
|
||||
|
||||
#if MM_PHYSICS2D
|
||||
|
||||
protected abstract void OnTriggerEnter2D_(Collider2D collider);
|
||||
void OnTriggerEnter2D (Collider2D collider)
|
||||
{
|
||||
@@ -45,6 +47,7 @@ namespace MoreMountains.Tools
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
// Trigger ------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 183370
|
||||
packageName: Feel
|
||||
packageVersion: 5.7
|
||||
assetPath: Assets/Feel/MMTools/Accessories/MMActivation/MMTriggerFilter.cs
|
||||
uploadId: 779587
|
||||
packageVersion: 5.8
|
||||
assetPath: Assets/OtherPlugins/Feel/MMTools/Accessories/MMActivation/MMTriggerFilter.cs
|
||||
uploadId: 799856
|
||||
|
||||
Reference in New Issue
Block a user