diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index af12b74..e58182b 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -51,7 +51,6 @@ - @@ -69,7 +68,8 @@ - + + diff --git a/Assets/IsoTools/Examples/Scenes/Scene07.unity b/Assets/IsoTools/Examples/Scenes/Scene07.unity index d96e290..71402d4 100644 --- a/Assets/IsoTools/Examples/Scenes/Scene07.unity +++ b/Assets/IsoTools/Examples/Scenes/Scene07.unity @@ -1590,13 +1590,13 @@ MonoBehaviour: transitions: [] actionData: actionNames: - - IsoTools.PlayMaker.Actions.IsoTriggerEvent + - IsoTools.PlayMaker.Events.IsoTriggerEvent customNames: - actionEnabled: 01 actionIsOpen: 01 actionStartIndex: 00000000 - actionHashCodes: 0e080104 + actionHashCodes: 8802cd00 unityObjectParams: [] fsmGameObjectParams: - useVariable: 1 @@ -1800,7 +1800,7 @@ MonoBehaviour: watermark: password: locked: 0 - preprocessed: 1 + preprocessed: 0 ExposedEvents: [] RestartOnEnable: 1 EnableDebugFlow: 0 diff --git a/Assets/IsoTools/PlayMaker/Events.meta b/Assets/IsoTools/PlayMaker/Events.meta new file mode 100644 index 0000000..fe18090 --- /dev/null +++ b/Assets/IsoTools/PlayMaker/Events.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: a4729de6bf87e4d60a76f269eb903bc6 +folderAsset: yes +timeCreated: 1450606069 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoCollisionEvent.cs b/Assets/IsoTools/PlayMaker/Events/IsoCollisionEvent.cs similarity index 98% rename from Assets/IsoTools/PlayMaker/Actions/IsoCollisionEvent.cs rename to Assets/IsoTools/PlayMaker/Events/IsoCollisionEvent.cs index b9c3edc..5b96c3f 100644 --- a/Assets/IsoTools/PlayMaker/Actions/IsoCollisionEvent.cs +++ b/Assets/IsoTools/PlayMaker/Events/IsoCollisionEvent.cs @@ -2,7 +2,7 @@ using HutongGames.PlayMaker; using IsoTools.PlayMaker.Internal; -namespace IsoTools.PlayMaker.Actions { +namespace IsoTools.PlayMaker.Events { public enum IsoCollisionType { IsoCollisionEnter, IsoCollisionExit diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoCollisionEvent.cs.meta b/Assets/IsoTools/PlayMaker/Events/IsoCollisionEvent.cs.meta similarity index 100% rename from Assets/IsoTools/PlayMaker/Actions/IsoCollisionEvent.cs.meta rename to Assets/IsoTools/PlayMaker/Events/IsoCollisionEvent.cs.meta diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoTriggerEvent.cs b/Assets/IsoTools/PlayMaker/Events/IsoTriggerEvent.cs similarity index 98% rename from Assets/IsoTools/PlayMaker/Actions/IsoTriggerEvent.cs rename to Assets/IsoTools/PlayMaker/Events/IsoTriggerEvent.cs index 205c832..543ef98 100644 --- a/Assets/IsoTools/PlayMaker/Actions/IsoTriggerEvent.cs +++ b/Assets/IsoTools/PlayMaker/Events/IsoTriggerEvent.cs @@ -2,7 +2,7 @@ using HutongGames.PlayMaker; using IsoTools.PlayMaker.Internal; -namespace IsoTools.PlayMaker.Actions { +namespace IsoTools.PlayMaker.Events { public enum IsoTriggerType { IsoTriggerEnter, IsoTriggerExit diff --git a/Assets/IsoTools/PlayMaker/Actions/IsoTriggerEvent.cs.meta b/Assets/IsoTools/PlayMaker/Events/IsoTriggerEvent.cs.meta similarity index 100% rename from Assets/IsoTools/PlayMaker/Actions/IsoTriggerEvent.cs.meta rename to Assets/IsoTools/PlayMaker/Events/IsoTriggerEvent.cs.meta