diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 9f150c2..af12b74 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -52,10 +52,8 @@ - - @@ -72,6 +70,8 @@ + + diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoCollisionEvent.cs b/Assets/IsoTools/PlayMaker/Actions/IsoCollisionEvent.cs index ceb4b0b..b9c3edc 100644 --- a/Assets/IsoTools/PlayMaker/Actions/IsoCollisionEvent.cs +++ b/Assets/IsoTools/PlayMaker/Actions/IsoCollisionEvent.cs @@ -1,5 +1,6 @@ using UnityEngine; using HutongGames.PlayMaker; +using IsoTools.PlayMaker.Internal; namespace IsoTools.PlayMaker.Actions { public enum IsoCollisionType { diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoConvertIsometricToScreen.cs b/Assets/IsoTools/PlayMaker/Actions/IsoConvertIsometricToScreen.cs index 405f2d8..4cd7cd5 100644 --- a/Assets/IsoTools/PlayMaker/Actions/IsoConvertIsometricToScreen.cs +++ b/Assets/IsoTools/PlayMaker/Actions/IsoConvertIsometricToScreen.cs @@ -1,5 +1,6 @@ using UnityEngine; using HutongGames.PlayMaker; +using IsoTools.PlayMaker.Internal; namespace IsoTools.PlayMaker.Actions { [ActionCategory("IsoTools")] diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoConvertScreenToIsometric.cs b/Assets/IsoTools/PlayMaker/Actions/IsoConvertScreenToIsometric.cs index d7ba2cd..29a300d 100644 --- a/Assets/IsoTools/PlayMaker/Actions/IsoConvertScreenToIsometric.cs +++ b/Assets/IsoTools/PlayMaker/Actions/IsoConvertScreenToIsometric.cs @@ -1,5 +1,6 @@ using UnityEngine; using HutongGames.PlayMaker; +using IsoTools.PlayMaker.Internal; namespace IsoTools.PlayMaker.Actions { [ActionCategory("IsoTools")] diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoGetMode.cs b/Assets/IsoTools/PlayMaker/Actions/IsoGetMode.cs index 53ebb7d..b7940a1 100644 --- a/Assets/IsoTools/PlayMaker/Actions/IsoGetMode.cs +++ b/Assets/IsoTools/PlayMaker/Actions/IsoGetMode.cs @@ -1,5 +1,6 @@ using UnityEngine; using HutongGames.PlayMaker; +using IsoTools.PlayMaker.Internal; namespace IsoTools.PlayMaker.Actions { [ActionCategory("IsoTools")] diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoGetMouseIsoPosition.cs b/Assets/IsoTools/PlayMaker/Actions/IsoGetMouseIsoPosition.cs index 7535084..2d3e3bc 100644 --- a/Assets/IsoTools/PlayMaker/Actions/IsoGetMouseIsoPosition.cs +++ b/Assets/IsoTools/PlayMaker/Actions/IsoGetMouseIsoPosition.cs @@ -1,5 +1,6 @@ using UnityEngine; using HutongGames.PlayMaker; +using IsoTools.PlayMaker.Internal; namespace IsoTools.PlayMaker.Actions { [ActionCategory("IsoTools")] diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoGetMouseIsoTilePosition.cs b/Assets/IsoTools/PlayMaker/Actions/IsoGetMouseIsoTilePosition.cs index 8a72e1e..060368d 100644 --- a/Assets/IsoTools/PlayMaker/Actions/IsoGetMouseIsoTilePosition.cs +++ b/Assets/IsoTools/PlayMaker/Actions/IsoGetMouseIsoTilePosition.cs @@ -1,5 +1,6 @@ using UnityEngine; using HutongGames.PlayMaker; +using IsoTools.PlayMaker.Internal; namespace IsoTools.PlayMaker.Actions { [ActionCategory("IsoTools")] diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoGetPosition.cs b/Assets/IsoTools/PlayMaker/Actions/IsoGetPosition.cs index f3d636b..83fc70a 100644 --- a/Assets/IsoTools/PlayMaker/Actions/IsoGetPosition.cs +++ b/Assets/IsoTools/PlayMaker/Actions/IsoGetPosition.cs @@ -1,5 +1,6 @@ using UnityEngine; using HutongGames.PlayMaker; +using IsoTools.PlayMaker.Internal; namespace IsoTools.PlayMaker.Actions { [ActionCategory("IsoTools")] diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoGetSize.cs b/Assets/IsoTools/PlayMaker/Actions/IsoGetSize.cs index f550b46..8f346a8 100644 --- a/Assets/IsoTools/PlayMaker/Actions/IsoGetSize.cs +++ b/Assets/IsoTools/PlayMaker/Actions/IsoGetSize.cs @@ -1,5 +1,6 @@ using UnityEngine; using HutongGames.PlayMaker; +using IsoTools.PlayMaker.Internal; namespace IsoTools.PlayMaker.Actions { [ActionCategory("IsoTools")] diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoGetTilePosition.cs b/Assets/IsoTools/PlayMaker/Actions/IsoGetTilePosition.cs index 355d6bf..b21eb01 100644 --- a/Assets/IsoTools/PlayMaker/Actions/IsoGetTilePosition.cs +++ b/Assets/IsoTools/PlayMaker/Actions/IsoGetTilePosition.cs @@ -1,5 +1,6 @@ using UnityEngine; using HutongGames.PlayMaker; +using IsoTools.PlayMaker.Internal; namespace IsoTools.PlayMaker.Actions { [ActionCategory("IsoTools")] diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoGetTouchIsoPosition.cs b/Assets/IsoTools/PlayMaker/Actions/IsoGetTouchIsoPosition.cs index b75fe8c..4fbfdf9 100644 --- a/Assets/IsoTools/PlayMaker/Actions/IsoGetTouchIsoPosition.cs +++ b/Assets/IsoTools/PlayMaker/Actions/IsoGetTouchIsoPosition.cs @@ -1,5 +1,6 @@ using UnityEngine; using HutongGames.PlayMaker; +using IsoTools.PlayMaker.Internal; namespace IsoTools.PlayMaker.Actions { [ActionCategory("IsoTools")] diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoGetTouchIsoTilePosition.cs b/Assets/IsoTools/PlayMaker/Actions/IsoGetTouchIsoTilePosition.cs index 96421c6..cfd3989 100644 --- a/Assets/IsoTools/PlayMaker/Actions/IsoGetTouchIsoTilePosition.cs +++ b/Assets/IsoTools/PlayMaker/Actions/IsoGetTouchIsoTilePosition.cs @@ -1,5 +1,6 @@ using UnityEngine; using HutongGames.PlayMaker; +using IsoTools.PlayMaker.Internal; namespace IsoTools.PlayMaker.Actions { [ActionCategory("IsoTools")] diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoGetWorldProps.cs b/Assets/IsoTools/PlayMaker/Actions/IsoGetWorldProps.cs index 449b564..48cc24c 100644 --- a/Assets/IsoTools/PlayMaker/Actions/IsoGetWorldProps.cs +++ b/Assets/IsoTools/PlayMaker/Actions/IsoGetWorldProps.cs @@ -1,5 +1,6 @@ using UnityEngine; using HutongGames.PlayMaker; +using IsoTools.PlayMaker.Internal; namespace IsoTools.PlayMaker.Actions { [ActionCategory("IsoTools")] diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoResize.cs b/Assets/IsoTools/PlayMaker/Actions/IsoResize.cs index d09be7f..a89888c 100644 --- a/Assets/IsoTools/PlayMaker/Actions/IsoResize.cs +++ b/Assets/IsoTools/PlayMaker/Actions/IsoResize.cs @@ -1,5 +1,6 @@ using UnityEngine; using HutongGames.PlayMaker; +using IsoTools.PlayMaker.Internal; namespace IsoTools.PlayMaker.Actions { [ActionCategory("IsoTools")] diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoSetMode.cs b/Assets/IsoTools/PlayMaker/Actions/IsoSetMode.cs index b3ccc59..c7afe8d 100644 --- a/Assets/IsoTools/PlayMaker/Actions/IsoSetMode.cs +++ b/Assets/IsoTools/PlayMaker/Actions/IsoSetMode.cs @@ -1,5 +1,6 @@ using UnityEngine; using HutongGames.PlayMaker; +using IsoTools.PlayMaker.Internal; namespace IsoTools.PlayMaker.Actions { [ActionCategory("IsoTools")] diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoSetPosition.cs b/Assets/IsoTools/PlayMaker/Actions/IsoSetPosition.cs index bcea4a3..92945be 100644 --- a/Assets/IsoTools/PlayMaker/Actions/IsoSetPosition.cs +++ b/Assets/IsoTools/PlayMaker/Actions/IsoSetPosition.cs @@ -1,5 +1,6 @@ using UnityEngine; using HutongGames.PlayMaker; +using IsoTools.PlayMaker.Internal; namespace IsoTools.PlayMaker.Actions { [ActionCategory("IsoTools")] diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoSetSize.cs b/Assets/IsoTools/PlayMaker/Actions/IsoSetSize.cs index cc86fe9..2eab3bf 100644 --- a/Assets/IsoTools/PlayMaker/Actions/IsoSetSize.cs +++ b/Assets/IsoTools/PlayMaker/Actions/IsoSetSize.cs @@ -1,5 +1,6 @@ using UnityEngine; using HutongGames.PlayMaker; +using IsoTools.PlayMaker.Internal; namespace IsoTools.PlayMaker.Actions { [ActionCategory("IsoTools")] diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoSetWorldProps.cs b/Assets/IsoTools/PlayMaker/Actions/IsoSetWorldProps.cs index a42ebd2..dd2c03d 100644 --- a/Assets/IsoTools/PlayMaker/Actions/IsoSetWorldProps.cs +++ b/Assets/IsoTools/PlayMaker/Actions/IsoSetWorldProps.cs @@ -1,5 +1,6 @@ using UnityEngine; using HutongGames.PlayMaker; +using IsoTools.PlayMaker.Internal; namespace IsoTools.PlayMaker.Actions { [ActionCategory("IsoTools")] diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoTranslate.cs b/Assets/IsoTools/PlayMaker/Actions/IsoTranslate.cs index ae549d0..9283e0b 100644 --- a/Assets/IsoTools/PlayMaker/Actions/IsoTranslate.cs +++ b/Assets/IsoTools/PlayMaker/Actions/IsoTranslate.cs @@ -1,5 +1,6 @@ using UnityEngine; using HutongGames.PlayMaker; +using IsoTools.PlayMaker.Internal; namespace IsoTools.PlayMaker.Actions { [ActionCategory("IsoTools")] diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoTriggerEvent.cs b/Assets/IsoTools/PlayMaker/Actions/IsoTriggerEvent.cs index d0c4349..205c832 100644 --- a/Assets/IsoTools/PlayMaker/Actions/IsoTriggerEvent.cs +++ b/Assets/IsoTools/PlayMaker/Actions/IsoTriggerEvent.cs @@ -1,5 +1,6 @@ using UnityEngine; using HutongGames.PlayMaker; +using IsoTools.PlayMaker.Internal; namespace IsoTools.PlayMaker.Actions { public enum IsoTriggerType { diff --git a/Assets/IsoTools/PlayMaker/Internal.meta b/Assets/IsoTools/PlayMaker/Internal.meta new file mode 100644 index 0000000..1c734f0 --- /dev/null +++ b/Assets/IsoTools/PlayMaker/Internal.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 97ae31775318b4db8ae3e82a85135302 +folderAsset: yes +timeCreated: 1450605779 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoComponentAction.cs b/Assets/IsoTools/PlayMaker/Internal/IsoComponentAction.cs similarity index 97% rename from Assets/IsoTools/PlayMaker/Actions/IsoComponentAction.cs rename to Assets/IsoTools/PlayMaker/Internal/IsoComponentAction.cs index 4eed628..c17075f 100644 --- a/Assets/IsoTools/PlayMaker/Actions/IsoComponentAction.cs +++ b/Assets/IsoTools/PlayMaker/Internal/IsoComponentAction.cs @@ -1,7 +1,7 @@ using UnityEngine; using HutongGames.PlayMaker; -namespace IsoTools.PlayMaker.Actions { +namespace IsoTools.PlayMaker.Internal { public abstract class IsoComponentAction : FsmStateAction where T : Component { T _cachedComponent; GameObject _cachedGameObject; diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoComponentAction.cs.meta b/Assets/IsoTools/PlayMaker/Internal/IsoComponentAction.cs.meta similarity index 100% rename from Assets/IsoTools/PlayMaker/Actions/IsoComponentAction.cs.meta rename to Assets/IsoTools/PlayMaker/Internal/IsoComponentAction.cs.meta diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoFSMEvents.cs b/Assets/IsoTools/PlayMaker/Internal/IsoFSMEvents.cs similarity index 95% rename from Assets/IsoTools/PlayMaker/Actions/IsoFSMEvents.cs rename to Assets/IsoTools/PlayMaker/Internal/IsoFSMEvents.cs index ba4f911..867c4b5 100644 --- a/Assets/IsoTools/PlayMaker/Actions/IsoFSMEvents.cs +++ b/Assets/IsoTools/PlayMaker/Internal/IsoFSMEvents.cs @@ -1,7 +1,7 @@ using UnityEngine; using HutongGames.PlayMaker; -namespace IsoTools.PlayMaker.Actions { +namespace IsoTools.PlayMaker.Internal { public class IsoFSMEvents : MonoBehaviour { IsoComponentAction _action = null; bool _started = false; diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoFSMEvents.cs.meta b/Assets/IsoTools/PlayMaker/Internal/IsoFSMEvents.cs.meta similarity index 100% rename from Assets/IsoTools/PlayMaker/Actions/IsoFSMEvents.cs.meta rename to Assets/IsoTools/PlayMaker/Internal/IsoFSMEvents.cs.meta