Skip to content

A
ar_volunteer
Commit 07744132 authored by Liang JingQiang's avatar Liang JingQiang
Browse files
Options

升级playmaker 1.8.5

parent 2fb79014
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4759 additions and 673 deletions
Assets/Cinemachine.meta 0 → 100644
View file @ 07744132
fileFormatVersion: 2
guid: dac162376b268e44d89994aa8245b8cc
folderAsset: yes
timeCreated: 1503759237
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/Cinemachine/PostFX.meta 0 → 100644
View file @ 07744132
fileFormatVersion: 2
guid: a0146581939166f4d9f57e26d48d5d17
folderAsset: yes
timeCreated: 1489096338
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/Cinemachine/PostFX/Editor.meta 0 → 100644
View file @ 07744132
fileFormatVersion: 2
guid: 8656080a6ad58f046abadcd6f2c0fb4f
folderAsset: yes
timeCreated: 1493832945
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/PlayMaker Utils/Wizards/LinkerWizard/LinkerWizardActions.unitypackage.meta → Assets/Cinemachine/PostFX/Editor/CinemachinePostFX.unitypackage.meta
View file @ 07744132
fileFormatVersion: 2
guid: e091444c3474345668560d07209c6d5a
guid: ab4f9ab0a5891fe43a07cb04dd00d91d
timeCreated: 1503821341
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
......
Assets/Cinemachine/Timeline.meta 0 → 100644
View file @ 07744132
fileFormatVersion: 2
guid: b82e7898c1221b74391cbf45d1d83c00
folderAsset: yes
timeCreated: 1489096338
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/Cinemachine/Timeline/LegacyTimelineAPI.unitypackage.meta 0 → 100644
View file @ 07744132
fileFormatVersion: 2
guid: 1e24085edff8e4e499582d8dcf099510
timeCreated: 1503821338
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/PlayMaker/Actions/Animator/GetAnimatorCurrentStateInfo.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2016. All rights reserved.
#if UNITY_5_3_OR_NEWER || UNITY_5
#define UNITY_5_OR_NEWER
#endif
using UnityEngine;
namespace HutongGames.PlayMaker.Actions
{
[ActionCategory(ActionCategory.Animator)]
[Tooltip("Gets the current State information on a specified layer")]
public class GetAnimatorCurrentStateInfo : FsmStateActionAnimatorBase
{
[RequiredField]
[CheckForComponent(typeof(Animator))]
[Tooltip("The target.")]
public FsmOwnerDefault gameObject;
[RequiredField]
[Tooltip("The layer's index")]
public FsmInt layerIndex;
[ActionSection("Results")]
[UIHint(UIHint.Variable)]
[Tooltip("The layer's name.")]
public FsmString name;
[UIHint(UIHint.Variable)]
[Tooltip("The layer's name Hash. Obsolete in Unity 5, use fullPathHash or shortPathHash instead, nameHash will be the same as shortNameHash for legacy")]
public FsmInt nameHash;
#if UNITY_5
[ActionCategory(ActionCategory.Animator)]
[Tooltip("Gets the current State information on a specified layer")]
public class GetAnimatorCurrentStateInfo : FsmStateActionAnimatorBase
{
[RequiredField]
[CheckForComponent(typeof(Animator))]
[Tooltip("The target.")]
public FsmOwnerDefault gameObject;
[RequiredField]
[Tooltip("The layer's index")]
public FsmInt layerIndex;
[ActionSection("Results")]
[UIHint(UIHint.Variable)]
[Tooltip("The layer's name.")]
public FsmString name;
[UIHint(UIHint.Variable)]
[Tooltip("The layer's name Hash. Obsolete in Unity 5, use fullPathHash or shortPathHash instead, nameHash will be the same as shortNameHash for legacy")]
public FsmInt nameHash;
#if UNITY_5_OR_NEWER
[UIHint(UIHint.Variable)]
[Tooltip("The full path hash for this state.")]
public FsmInt fullPathHash;
......@@ -35,100 +39,100 @@ namespace HutongGames.PlayMaker.Actions
[UIHint(UIHint.Variable)]
[Tooltip("The name Hash. Doest not include the parent layer's name")]
public FsmInt shortPathHash;
#endif
[UIHint(UIHint.Variable)]
[Tooltip("The layer's tag hash")]
public FsmInt tagHash;
[UIHint(UIHint.Variable)]
[Tooltip("Is the state looping. All animations in the state must be looping")]
public FsmBool isStateLooping;
[UIHint(UIHint.Variable)]
[Tooltip("The Current duration of the state. In seconds, can vary when the State contains a Blend Tree ")]
public FsmFloat length;
[UIHint(UIHint.Variable)]
[Tooltip("The integer part is the number of time a state has been looped. The fractional part is the % (0-1) of progress in the current loop")]
public FsmFloat normalizedTime;
[UIHint(UIHint.Variable)]
[Tooltip("The integer part is the number of time a state has been looped. This is extracted from the normalizedTime")]
public FsmInt loopCount;
[UIHint(UIHint.Variable)]
[Tooltip("The progress in the current loop. This is extracted from the normalizedTime")]
public FsmFloat currentLoopProgress;
#endif
private Animator _animator;
public override void Reset()
{
base.Reset();
gameObject = null;
layerIndex = null;
name = null;
nameHash = null;
#if UNITY_5
[UIHint(UIHint.Variable)]
[Tooltip("The layer's tag hash")]
public FsmInt tagHash;
[UIHint(UIHint.Variable)]
[Tooltip("Is the state looping. All animations in the state must be looping")]
public FsmBool isStateLooping;
[UIHint(UIHint.Variable)]
[Tooltip("The Current duration of the state. In seconds, can vary when the State contains a Blend Tree ")]
public FsmFloat length;
[UIHint(UIHint.Variable)]
[Tooltip("The integer part is the number of time a state has been looped. The fractional part is the % (0-1) of progress in the current loop")]
public FsmFloat normalizedTime;
[UIHint(UIHint.Variable)]
[Tooltip("The integer part is the number of time a state has been looped. This is extracted from the normalizedTime")]
public FsmInt loopCount;
[UIHint(UIHint.Variable)]
[Tooltip("The progress in the current loop. This is extracted from the normalizedTime")]
public FsmFloat currentLoopProgress;
private Animator _animator;
public override void Reset()
{
base.Reset();
gameObject = null;
layerIndex = null;
name = null;
nameHash = null;
#if UNITY_5_OR_NEWER
fullPathHash = null;
shortPathHash = null;
#endif
tagHash = null;
length = null;
normalizedTime = null;
isStateLooping = null;
loopCount = null;
currentLoopProgress = null;
everyFrame = false;
}
public override void OnEnter()
{
// get the animator component
var go = Fsm.GetOwnerDefaultTarget(gameObject);
if (go==null)
{
Finish();
return;
}
_animator = go.GetComponent<Animator>();
if (_animator==null)
{
Finish();
return;
}
GetLayerInfo();
if (!everyFrame)
{
Finish();
}
}
public override void OnActionUpdate()
{
GetLayerInfo();
#endif
}
tagHash = null;
length = null;
normalizedTime = null;
isStateLooping = null;
loopCount = null;
currentLoopProgress = null;
void GetLayerInfo()
{
if (_animator!=null)
{
AnimatorStateInfo _info = _animator.GetCurrentAnimatorStateInfo(layerIndex.Value);
#if UNITY_5
everyFrame = false;
}
public override void OnEnter()
{
// get the animator component
var go = Fsm.GetOwnerDefaultTarget(gameObject);
if (go == null)
{
Finish();
return;
}
_animator = go.GetComponent<Animator>();
if (_animator == null)
{
Finish();
return;
}
GetLayerInfo();
if (!everyFrame)
{
Finish();
}
}
public override void OnActionUpdate()
{
GetLayerInfo();
}
void GetLayerInfo()
{
if (_animator != null)
{
AnimatorStateInfo _info = _animator.GetCurrentAnimatorStateInfo(layerIndex.Value);
#if UNITY_5_OR_NEWER
if (!fullPathHash.IsNone)
{
fullPathHash.Value = _info.fullPathHash;
......@@ -141,46 +145,50 @@ namespace HutongGames.PlayMaker.Actions
{
nameHash.Value = _info.shortNameHash;
}
#else
if (!nameHash.IsNone)
{
nameHash.Value = _info.nameHash;
}
#endif
if (!name.IsNone)
{
name.Value = _animator.GetLayerName(layerIndex.Value);
}
#else
if (!nameHash.IsNone)
{
#if UNITY_5_OR_NEWER
nameHash.Value = _info.fullPathHash;
#else
nameHash.Value = _info.nameHash;
#endif
}
#endif
if (!tagHash.IsNone)
{
tagHash.Value = _info.tagHash;
}
if (!length.IsNone)
{
length.Value = _info.length;
}
if (!name.IsNone)
{
name.Value = _animator.GetLayerName(layerIndex.Value);
}
if (!isStateLooping.IsNone)
{
isStateLooping.Value = _info.loop;
}
if (!tagHash.IsNone)
{
tagHash.Value = _info.tagHash;
}
if (!normalizedTime.IsNone)
{
normalizedTime.Value = _info.normalizedTime;
}
if (!length.IsNone)
{
length.Value = _info.length;
}
if (!loopCount.IsNone || !currentLoopProgress.IsNone)
{
loopCount.Value = (int)System.Math.Truncate(_info.normalizedTime);
currentLoopProgress.Value = _info.normalizedTime-loopCount.Value;
}
}
}
}
if (!isStateLooping.IsNone)
{
isStateLooping.Value = _info.loop;
}
if (!normalizedTime.IsNone)
{
normalizedTime.Value = _info.normalizedTime;
}
if (!loopCount.IsNone || !currentLoopProgress.IsNone)
{
loopCount.Value = (int)System.Math.Truncate(_info.normalizedTime);
currentLoopProgress.Value = _info.normalizedTime - loopCount.Value;
}
}
}
}
}
\ No newline at end of file
Assets/PlayMaker/Actions/Animator/GetAnimatorLeftFootBottomHeight.cs
View file @ 07744132
......@@ -31,7 +31,12 @@ namespace HutongGames.PlayMaker.Actions
leftFootHeight = null;
everyFrame = false;
}
public override void OnPreprocess()
{
Fsm.HandleLateUpdate = true;
}
public override void OnEnter()
{
// get the animator component
......
Assets/PlayMaker/Actions/Animator/GetAnimatorNextStateInfo.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2016. All rights reserved.
#if UNITY_5_3_OR_NEWER || UNITY_5
#define UNITY_5_OR_NEWER
#endif
using UnityEngine;
namespace HutongGames.PlayMaker.Actions
{
[ActionCategory(ActionCategory.Animator)]
[Tooltip("Gets the next State information on a specified layer")]
public class GetAnimatorNextStateInfo : FsmStateActionAnimatorBase
{
[RequiredField]
[CheckForComponent(typeof(Animator))]
[Tooltip("The target. An Animator component is required")]
public FsmOwnerDefault gameObject;
[RequiredField]
[Tooltip("The layer's index")]
public FsmInt layerIndex;
[ActionSection("Results")]
[UIHint(UIHint.Variable)]
[Tooltip("The layer's name.")]
public FsmString name;
[UIHint(UIHint.Variable)]
[Tooltip("The layer's name Hash. Obsolete in Unity 5, use fullPathHash or shortPathHash instead, nameHash will be the same as shortNameHash for legacy")]
public FsmInt nameHash;
#if UNITY_5
[ActionCategory(ActionCategory.Animator)]
[Tooltip("Gets the next State information on a specified layer")]
public class GetAnimatorNextStateInfo : FsmStateActionAnimatorBase
{
[RequiredField]
[CheckForComponent(typeof(Animator))]
[Tooltip("The target. An Animator component is required")]
public FsmOwnerDefault gameObject;
[RequiredField]
[Tooltip("The layer's index")]
public FsmInt layerIndex;
[ActionSection("Results")]
[UIHint(UIHint.Variable)]
[Tooltip("The layer's name.")]
public FsmString name;
[UIHint(UIHint.Variable)]
[Tooltip("The layer's name Hash. Obsolete in Unity 5, use fullPathHash or shortPathHash instead, nameHash will be the same as shortNameHash for legacy")]
public FsmInt nameHash;
#if UNITY_5_OR_NEWER
[UIHint(UIHint.Variable)]
[Tooltip("The full path hash for this state.")]
public FsmInt fullPathHash;
......@@ -35,98 +39,98 @@ namespace HutongGames.PlayMaker.Actions
[UIHint(UIHint.Variable)]
[Tooltip("The name Hash. Doest not include the parent layer's name")]
public FsmInt shortPathHash;
#endif
[UIHint(UIHint.Variable)]
[Tooltip("The layer's tag hash")]
public FsmInt tagHash;
[UIHint(UIHint.Variable)]
[Tooltip("Is the state looping. All animations in the state must be looping")]
public FsmBool isStateLooping;
[UIHint(UIHint.Variable)]
[Tooltip("The Current duration of the state. In seconds, can vary when the State contains a Blend Tree ")]
public FsmFloat length;
[UIHint(UIHint.Variable)]
[Tooltip("The integer part is the number of time a state has been looped. The fractional part is the % (0-1) of progress in the current loop")]
public FsmFloat normalizedTime;
[UIHint(UIHint.Variable)]
[Tooltip("The integer part is the number of time a state has been looped. This is extracted from the normalizedTime")]
public FsmInt loopCount;
[UIHint(UIHint.Variable)]
[Tooltip("The progress in the current loop. This is extracted from the normalizedTime")]
public FsmFloat currentLoopProgress;
#endif
private Animator _animator;
public override void Reset()
{
base.Reset();
gameObject = null;
layerIndex = null;
name = null;
nameHash = null;
#if UNITY_5
[UIHint(UIHint.Variable)]
[Tooltip("The layer's tag hash")]
public FsmInt tagHash;
[UIHint(UIHint.Variable)]
[Tooltip("Is the state looping. All animations in the state must be looping")]
public FsmBool isStateLooping;
[UIHint(UIHint.Variable)]
[Tooltip("The Current duration of the state. In seconds, can vary when the State contains a Blend Tree ")]
public FsmFloat length;
[UIHint(UIHint.Variable)]
[Tooltip("The integer part is the number of time a state has been looped. The fractional part is the % (0-1) of progress in the current loop")]
public FsmFloat normalizedTime;
[UIHint(UIHint.Variable)]
[Tooltip("The integer part is the number of time a state has been looped. This is extracted from the normalizedTime")]
public FsmInt loopCount;
[UIHint(UIHint.Variable)]
[Tooltip("The progress in the current loop. This is extracted from the normalizedTime")]
public FsmFloat currentLoopProgress;
private Animator _animator;
public override void Reset()
{
base.Reset();
gameObject = null;
layerIndex = null;
name = null;
nameHash = null;
#if UNITY_5_OR_NEWER
fullPathHash = null;
shortPathHash = null;
#endif
tagHash = null;
length = null;
normalizedTime = null;
isStateLooping = null;
loopCount = null;
currentLoopProgress = null;
}
public override void OnEnter()
{
// get the animator component
var go = Fsm.GetOwnerDefaultTarget(gameObject);
if (go==null)
{
Finish();
return;
}
_animator = go.GetComponent<Animator>();
if (_animator==null)
{
Finish();
return;
}
GetLayerInfo();
if (!everyFrame)
{
Finish();
}
}
public override void OnActionUpdate()
{
GetLayerInfo();
}
void GetLayerInfo()
{
if (_animator!=null)
{
AnimatorStateInfo _info = _animator.GetNextAnimatorStateInfo(layerIndex.Value);
#if UNITY_5
#endif
tagHash = null;
length = null;
normalizedTime = null;
isStateLooping = null;
loopCount = null;
currentLoopProgress = null;
}
public override void OnEnter()
{
// get the animator component
var go = Fsm.GetOwnerDefaultTarget(gameObject);
if (go == null)
{
Finish();
return;
}
_animator = go.GetComponent<Animator>();
if (_animator == null)
{
Finish();
return;
}
GetLayerInfo();
if (!everyFrame)
{
Finish();
}
}
public override void OnActionUpdate()
{
GetLayerInfo();
}
void GetLayerInfo()
{
if (_animator != null)
{
AnimatorStateInfo _info = _animator.GetNextAnimatorStateInfo(layerIndex.Value);
#if UNITY_5_OR_NEWER
if (!fullPathHash.IsNone)
{
fullPathHash.Value = _info.fullPathHash;
......@@ -139,42 +143,46 @@ namespace HutongGames.PlayMaker.Actions
{
nameHash.Value = _info.shortNameHash;
}
#else
if (!nameHash.IsNone)
{
nameHash.Value = _info.nameHash;
}
#endif
if (!name.IsNone)
{
name.Value = _animator.GetLayerName(layerIndex.Value);
}
#else
if (!nameHash.IsNone)
{
#if UNITY_5_OR_NEWER
nameHash.Value = _info.fullPathHash;
#else
nameHash.Value = _info.nameHash;
#endif
}
#endif
if (!tagHash.IsNone)
{
tagHash.Value = _info.tagHash;
}
if (!length.IsNone)
{
length.Value = _info.length;
}
if (!isStateLooping.IsNone)
{
isStateLooping.Value = _info.loop;
}
if (!normalizedTime.IsNone)
{
normalizedTime.Value = _info.normalizedTime;
}
if (!name.IsNone)
{
name.Value = _animator.GetLayerName(layerIndex.Value);
}
if (!loopCount.IsNone || !currentLoopProgress.IsNone)
{
loopCount.Value = (int)System.Math.Truncate(_info.normalizedTime);
currentLoopProgress.Value = _info.normalizedTime-loopCount.Value;
}
}
}
if (!tagHash.IsNone)
{
tagHash.Value = _info.tagHash;
}
if (!length.IsNone)
{
length.Value = _info.length;
}
if (!isStateLooping.IsNone)
{
isStateLooping.Value = _info.loop;
}
if (!normalizedTime.IsNone)
{
normalizedTime.Value = _info.normalizedTime;
}
if (!loopCount.IsNone || !currentLoopProgress.IsNone)
{
loopCount.Value = (int)System.Math.Truncate(_info.normalizedTime);
currentLoopProgress.Value = _info.normalizedTime - loopCount.Value;
}
}
}
}
}
}
\ No newline at end of file
Assets/PlayMaker/Actions/Animator/GetAnimatorRightFootBottomHeight.cs
View file @ 07744132
......@@ -33,7 +33,12 @@ namespace HutongGames.PlayMaker.Actions
rightFootHeight = null;
everyFrame = false;
}
public override void OnPreprocess()
{
Fsm.HandleLateUpdate = true;
}
public override void OnEnter()
{
// get the animator component
......
Assets/PlayMaker/Actions/Animator/NavMeshAgentAnimatorSynchronizer.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2016. All rights reserved.
#if UNITY_5_5_OR_NEWER
using UnityEngine.AI;
#endif
using UnityEngine;
namespace HutongGames.PlayMaker.Actions
......@@ -9,13 +12,13 @@ namespace HutongGames.PlayMaker.Actions
public class NavMeshAgentAnimatorSynchronizer : FsmStateAction
{
[RequiredField]
[CheckForComponent(typeof(UnityEngine.AI.NavMeshAgent))]
[CheckForComponent(typeof(NavMeshAgent))]
[CheckForComponent(typeof(Animator))]
[Tooltip("The Agent target. An Animator component and a NavMeshAgent component are required")]
public FsmOwnerDefault gameObject;
private Animator _animator;
private UnityEngine.AI.NavMeshAgent _agent;
private NavMeshAgent _agent;
private Transform _trans;
......@@ -40,7 +43,7 @@ namespace HutongGames.PlayMaker.Actions
Finish();
return;
}
_agent = go.GetComponent<UnityEngine.AI.NavMeshAgent>();
_agent = go.GetComponent<NavMeshAgent>();
_animator = go.GetComponent<Animator>();
......
Assets/PlayMaker/Actions/Animator/SetAnimatorCullingMode.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2016. All rights reserved.
#if UNITY_5_3_OR_NEWER || UNITY_5 || UNITY_5_0
#define UNITY_5_OR_NEWER
#endif
using UnityEngine;
namespace HutongGames.PlayMaker.Actions
......@@ -58,7 +62,7 @@ namespace HutongGames.PlayMaker.Actions
return;
}
#if UNITY_5
#if UNITY_5_OR_NEWER
_animator.cullingMode = alwaysAnimate.Value?AnimatorCullingMode.AlwaysAnimate:AnimatorCullingMode.CullUpdateTransforms;
#else
_animator.cullingMode = alwaysAnimate.Value?AnimatorCullingMode.AlwaysAnimate:AnimatorCullingMode.BasedOnRenderers;
......
Assets/PlayMaker/Actions/Array/ArrayForEach.cs
View file @ 07744132
......@@ -72,7 +72,7 @@ namespace HutongGames.PlayMaker.Actions
public override void OnFixedUpdate()
{
runFsm.LateUpdate();
runFsm.FixedUpdate();
if (!runFsm.Finished)
{
return; // continue later
......
Assets/PlayMaker/Actions/CallMethod.cs
View file @ 07744132
......@@ -7,10 +7,6 @@ using System.Collections.Generic;
using Object = UnityEngine.Object;
using HutongGames.PlayMaker;
#if UNITY_EDITOR
using HutongGames.PlayMaker.Ecosystem.Utils;
#endif
namespace HutongGames.PlayMaker.Actions
{
[ActionCategory(ActionCategory.ScriptControl)]
......@@ -40,10 +36,6 @@ namespace HutongGames.PlayMaker.Actions
[Tooltip("Use the old manual editor UI.")]
public bool manualUI;
#if UNITY_EDITOR
public bool debug;
#endif
private FsmObject cachedBehaviour;
private FsmString cachedMethodName;
private Type cachedType;
......@@ -59,10 +51,6 @@ namespace HutongGames.PlayMaker.Actions
parameters = null;
storeResult = null;
everyFrame = false;
#if UNITY_EDITOR
debug = false;
#endif
}
public override void OnEnter()
......@@ -71,19 +59,6 @@ namespace HutongGames.PlayMaker.Actions
DoMethodCall();
#if UNITY_EDITOR
if (debug || LinkerData.DebugAll)
{
UnityEngine.Debug.Log("<Color=blue>CallMethod</Color> on "+this.Fsm.GameObjectName+":"+this.Fsm.Name+"\n" +
"<Color=red>TargetType</Color>\t\t"+ cachedType+"\n" +
"<Color=red>Assembly</Color>\t\t"+cachedType.Assembly.FullName+"\n" +
"<Color=red>Method</Color>\t\t\t"+cachedMethodInfo.Name+"\n" );
LinkerData.RegisterClassDependancy(cachedType,cachedType.ToString());
}
#endif
if (!everyFrame)
{
Finish();
......
Assets/PlayMaker/Actions/CallMethod.cs.meta
View file @ 07744132
......@@ -6,5 +6,3 @@ MonoImporter:
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/PlayMaker/Actions/CallStaticMethod.cs
View file @ 07744132
......@@ -5,10 +5,6 @@ using System.Reflection;
using UnityEngine;
using System.Collections.Generic;
#if UNITY_EDITOR
using HutongGames.PlayMaker.Ecosystem.Utils;
#endif
namespace HutongGames.PlayMaker.Actions
{
[ActionCategory(ActionCategory.ScriptControl)]
......@@ -41,23 +37,6 @@ namespace HutongGames.PlayMaker.Actions
private object[] parametersArray;
private string errorString;
#if UNITY_EDITOR
public bool debug;
#endif
public override void Reset()
{
className = null;
methodName = null;
parameters = null;
storeResult = null;
everyFrame = false;
#if UNITY_EDITOR
debug = false;
#endif
}
public override void OnEnter()
{
parametersArray = new object[parameters.Length];
......@@ -110,24 +89,7 @@ namespace HutongGames.PlayMaker.Actions
result = cachedMethodInfo.Invoke(null, parametersArray);
}
if (!storeResult.IsNone)
{
storeResult.SetValue(result);
}
#if UNITY_EDITOR
if (debug || LinkerData.DebugAll)
{
UnityEngine.Debug.Log("<Color=blue>CallStaticMethod</Color> on "+this.Fsm.GameObjectName+":"+this.Fsm.Name+"\n" +
"<Color=red>TargetType</Color>\t\t"+ cachedType+"\n" +
"<Color=red>Assembly</Color>\t\t"+cachedType.Assembly.FullName+"\n" +
"<Color=red>Method</Color>\t\t\t"+cachedMethodInfo.Name+"\n" );
LinkerData.RegisterClassDependancy(cachedType,cachedType.ToString());
}
#endif
storeResult.SetValue(result);
}
private bool DoCache()
......
Assets/PlayMaker/Actions/CallStaticMethod.cs.meta
View file @ 07744132
......@@ -6,5 +6,3 @@ MonoImporter:
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/PlayMaker/Actions/ComponentAction.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2013. All rights reserved.
// Unity 5.1 introduced a new networking library.
// Unless we define PLAYMAKER_LEGACY_NETWORK old network actions are disabled
#if !(UNITY_4_3 || UNITY_4_5 || UNITY_4_6 || UNITY_4_7 || UNITY_5_0 || PLAYMAKER_LEGACY_NETWORK)
#define UNITY_NEW_NETWORK
#endif
// Some platforms do not support networking (at least the old network library)
#if (UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#define PLATFORM_NOT_SUPPORTED
#endif
using UnityEngine;
namespace HutongGames.PlayMaker.Actions
......@@ -8,58 +19,65 @@ namespace HutongGames.PlayMaker.Actions
// Caches the component for performance
public abstract class ComponentAction<T> : FsmStateAction where T : Component
{
private GameObject cachedGameObject;
private T component;
/// <summary>
/// The cached GameObject. Call UpdateCache() first
/// </summary>
protected GameObject cachedGameObject;
/// <summary>
/// The cached component. Call UpdateCache() first
/// </summary>
protected T cachedComponent;
protected Rigidbody rigidbody
{
get { return component as Rigidbody; }
get { return cachedComponent as Rigidbody; }
}
protected Rigidbody2D rigidbody2d
{
get { return component as Rigidbody2D; }
get { return cachedComponent as Rigidbody2D; }
}
protected Renderer renderer
{
get { return component as Renderer; }
get { return cachedComponent as Renderer; }
}
protected Animation animation
{
get { return component as Animation; }
get { return cachedComponent as Animation; }
}
protected AudioSource audio
{
get { return component as AudioSource; }
get { return cachedComponent as AudioSource; }
}
protected Camera camera
{
get { return component as Camera; }
get { return cachedComponent as Camera; }
}
protected GUIText guiText
{
get { return component as GUIText; }
get { return cachedComponent as GUIText; }
}
protected GUITexture guiTexture
{
get { return component as GUITexture; }
get { return cachedComponent as GUITexture; }
}
protected Light light
{
get { return component as Light; }
get { return cachedComponent as Light; }
}
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if !(PLATFORM_NOT_SUPPORTED || UNITY_NEW_NETWORK || PLAYMAKER_NO_NETWORK)
protected NetworkView networkView
{
get { return component as NetworkView; }
get { return cachedComponent as NetworkView; }
}
#endif
protected bool UpdateCache(GameObject go)
......@@ -69,18 +87,18 @@ namespace HutongGames.PlayMaker.Actions
return false;
}
if (component == null || cachedGameObject != go)
if (cachedComponent == null || cachedGameObject != go)
{
component = go.GetComponent<T>();
cachedComponent = go.GetComponent<T>();
cachedGameObject = go;
if (component == null)
if (cachedComponent == null)
{
LogWarning("Missing component: " + typeof(T).FullName + " on: " + go.name);
}
}
return component != null;
return cachedComponent != null;
}
}
}
\ No newline at end of file
Assets/PlayMaker/Actions/ControllerSimpleMove.cs
View file @ 07744132
......@@ -20,7 +20,7 @@ namespace HutongGames.PlayMaker.Actions
[Tooltip("Multiply the movement vector by a speed factor.")]
public FsmFloat speed;
[Tooltip("Move in local or word space.")]
[Tooltip("Move in local or world space.")]
public Space space;
private GameObject previousGo; // remember so we can get new controller only when it changes.
......
Assets/PlayMaker/Actions/CreateObject.cs
View file @ 07744132
......@@ -26,12 +26,14 @@ namespace HutongGames.PlayMaker.Actions
[Tooltip("Optionally store the created object.")]
public FsmGameObject storeObject;
#if PLAYMAKER_LEGACY_NETWORK
[Tooltip("Use Network.Instantiate to create a Game Object on all clients in a networked game.")]
public FsmBool networkInstantiate;
[Tooltip("Usually 0. The group number allows you to group together network messages which allows you to filter them if so desired.")]
public FsmInt networkGroup;
#endif
public override void Reset()
{
gameObject = null;
......@@ -39,8 +41,10 @@ namespace HutongGames.PlayMaker.Actions
position = new FsmVector3 { UseVariable = true };
rotation = new FsmVector3 { UseVariable = true };
storeObject = null;
#if PLAYMAKER_LEGACY_NETWORK
networkInstantiate = false;
networkGroup = 0;
#endif
}
public override void OnEnter()
......@@ -76,7 +80,7 @@ namespace HutongGames.PlayMaker.Actions
}
}
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
GameObject newObject;
if (!networkInstantiate.Value)
......
Assets/PlayMaker/Actions/DontDestroyOnLoad.cs
View file @ 07744132
......@@ -22,8 +22,13 @@ namespace HutongGames.PlayMaker.Actions
{
// Have to get the root, since the game object will be destroyed if any of its parents are destroyed.
Object.DontDestroyOnLoad(Owner.transform.root.gameObject);
GameObject _go = Fsm.GetOwnerDefaultTarget(gameObject);
if (_go!=null)
{
Object.DontDestroyOnLoad( _go.transform.root.gameObject);
}
Finish();
}
}
......
Assets/PlayMaker/Actions/Editor/LookAtActionEditor.cs
View file @ 07744132
......@@ -47,7 +47,7 @@ namespace HutongGames.PlayMakerEditor
var goTargetTransform = goTarget.transform;
var worldTargetPos = goTargetTransform.TransformPoint(lookAtAction.targetPosition.Value);
lookAtAction.targetPosition.Value = goTargetTransform.InverseTransformPoint(Handles.PositionHandle(worldTargetPos, goTarget.transform.rotation));
lookAtAction.targetPosition.Value = goTargetTransform.InverseTransformPoint(Handles.PositionHandle(worldTargetPos, goTarget.transform.rotation));
Handles.color = new Color(1, 1, 1, 0.2f);
Handles.DrawLine(goTargetTransform.position, lookAtAction.GetLookAtPositionWithVertical());
}
......@@ -67,8 +67,11 @@ namespace HutongGames.PlayMakerEditor
// Lookat vector
Handles.DrawLine(goPosition, lookAtPosition);
#if UNITY_5_5_OR_NEWER
Handles.ConeHandleCap(0, goPosition + lookAtVector.normalized * (distance - arrowSize * 0.7f), lookAtRotation, arrowSize, EventType.Repaint); // fudge factor to position cap correctly
#else
Handles.ConeCap(0, goPosition + lookAtVector.normalized * (distance - arrowSize * 0.7f) , lookAtRotation, arrowSize); // fudge factor to position cap correctly
#endif
// Arc between vectors
Handles.color = new Color(1, 1, 1, 0.2f);
......
Assets/PlayMaker/Actions/Editor/MoveTowardsActionEditor.cs
View file @ 07744132
......@@ -61,8 +61,12 @@ namespace HutongGames.PlayMakerEditor
// Target vector
Handles.DrawLine(goPosition, lookAtPosition);
Handles.ConeCap(0, goPosition + lookAtVector.normalized * (distance - arrowSize * 0.7f), lookAtRotation, arrowSize); // fudge factor to position cap correctly
#if UNITY_5_5_OR_NEWER
Handles.ConeHandleCap(0, goPosition + lookAtVector.normalized * (distance - arrowSize * 0.7f), lookAtRotation, arrowSize, EventType.Repaint); // fudge factor to position cap correctly
#else
Handles.ConeCap(0, goPosition + lookAtVector.normalized * (distance - arrowSize * 0.7f), lookAtRotation, arrowSize); // fudge factor to position cap correctly
#endif
// Show vertical offset
if (moveTowardsAction.ignoreVertical.Value)
......
Assets/PlayMaker/Actions/FindChild.cs
View file @ 07744132
......@@ -43,7 +43,7 @@ namespace HutongGames.PlayMaker.Actions
return;
}
var transform = go.transform.FindChild(childName.Value);
var transform = go.transform.Find(childName.Value);
storeResult.Value = transform != null ? transform.gameObject : null;
}
}
......
Assets/PlayMaker/Actions/GetAngleToTarget.cs
View file @ 07744132
......@@ -39,6 +39,11 @@ namespace HutongGames.PlayMaker.Actions
everyFrame = false;
}
public override void OnPreprocess()
{
Fsm.HandleLateUpdate = true;
}
public override void OnLateUpdate()
{
DoGetAngleToTarget();
......
Assets/PlayMaker/Actions/GetProperty.cs
View file @ 07744132
......@@ -4,10 +4,6 @@
using UnityEngine;
#if UNITY_EDITOR
using HutongGames.PlayMaker.Ecosystem.Utils;
#endif
namespace HutongGames.PlayMaker.Actions
{
[ActionCategory(ActionCategory.UnityObject)]
......@@ -19,38 +15,16 @@ namespace HutongGames.PlayMaker.Actions
public FsmProperty targetProperty;
public bool everyFrame;
#if UNITY_EDITOR
public bool debug;
#endif
public override void Reset()
{
targetProperty = new FsmProperty { setProperty = false };
everyFrame = false;
#if UNITY_EDITOR
debug = false;
#endif
}
public override void OnEnter()
{
targetProperty.GetValue();
#if UNITY_EDITOR
if (debug || LinkerData.DebugAll )
{
UnityEngine.Debug.Log("<Color=blue>GetProperty</Color> on "+this.Fsm.GameObjectName+":"+this.Fsm.Name+"\n" +
"<Color=red>TargetType</Color>\t\t"+ targetProperty.TargetTypeName+"\n" +
"<Color=red>Assembly</Color>\t\t"+targetProperty.TargetType.Assembly.FullName+"\n" +
"<Color=red>Property</Color>\t\t\t"+targetProperty.PropertyName+" <"+ targetProperty.PropertyType+">\n" );
LinkerData.RegisterClassDependancy(targetProperty.TargetType,targetProperty.TargetTypeName);
}
#endif
if (!everyFrame)
{
Finish();
......
Assets/PlayMaker/Actions/GetProperty.cs.meta
View file @ 07744132
......@@ -6,5 +6,3 @@ MonoImporter:
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/PlayMaker/Actions/InvokeMethod.cs
View file @ 07744132
......@@ -9,11 +9,6 @@ using System.Reflection;
using UnityEngine;
#if UNITY_EDITOR
using HutongGames.PlayMaker.Ecosystem.Utils;
#endif
namespace HutongGames.PlayMaker.Actions
{
[ActionCategory(ActionCategory.ScriptControl)]
......@@ -55,10 +50,6 @@ namespace HutongGames.PlayMaker.Actions
#endif
#if UNITY_EDITOR
public bool debug;
#endif
public override void Reset()
{
gameObject = null;
......@@ -68,10 +59,6 @@ namespace HutongGames.PlayMaker.Actions
repeating = false;
repeatDelay = 1;
cancelOnExit = false;
#if UNITY_EDITOR
debug = false;
#endif
}
MonoBehaviour component;
......@@ -106,19 +93,6 @@ namespace HutongGames.PlayMaker.Actions
{
component.Invoke(methodName.Value, delay.Value);
}
#if UNITY_EDITOR
if (debug || LinkerData.DebugAll)
{
UnityEngine.Debug.Log("<Color=blue>InvokeMethod</Color> on "+this.Fsm.GameObjectName+":"+this.Fsm.Name+"\n" +
"<Color=red>TargetType</Color>\t\t"+ component.GetType()+"\n" +
"<Color=red>Assembly</Color>\t\t"+component.GetType().Assembly.FullName+"\n" +
"<Color=red>Method</Color>\t\t\t"+methodName.Value+"\n" );
LinkerData.RegisterClassDependancy(component.GetType(),component.GetType().ToString());
}
#endif
}
public override void OnExit()
......
Assets/PlayMaker/Actions/InvokeMethod.cs.meta
View file @ 07744132
......@@ -6,5 +6,3 @@ MonoImporter:
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/PlayMaker/Actions/LookAt.cs
View file @ 07744132
......@@ -51,6 +51,11 @@ namespace HutongGames.PlayMaker.Actions
everyFrame = true;
}
public override void OnPreprocess()
{
Fsm.HandleLateUpdate = true;
}
public override void OnEnter()
{
DoLookAt();
......
Assets/PlayMaker/Actions/Network/MasterServerClearHostList.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/MasterServerGetHostCount.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/MasterServerGetHostData.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/MasterServerGetNextHostData.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/MasterServerGetProperties.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/MasterServerRegisterHost.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/MasterServerRequestHostList.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/MasterServerSetProperties.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/MasterServerUnregisterHost.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkCloseConnection.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkConnect.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2013. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkDestroy.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkDisconnect.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkGetAveragePing.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkGetConnectedPlayerProperties.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2013. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkGetConnectionsCount.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkGetIsMessageQueueRunning.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkGetLastPing.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkGetLocalPlayerProperties.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2013. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkGetMaximumConnections.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkGetMessagePlayerProperties.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkGetMinimumAllocatableViewIDs.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkGetNetworkDisconnectionInfo.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkGetNetworkErrorInfo.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkGetNextConnectedPlayerProperties.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkGetSendRate.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkGetTime.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkHavePublicIpAddress.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using System;
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkInitializeServer.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2013. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using System;
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkInstantiate.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2013. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkIsClient.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkIsServer.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkPeerTypeSwitch.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2013. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkSetIsMessageQueueRunning.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkSetLevelPrefix.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkSetLogLevel.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using System;
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkSetMaxConnections.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkSetMinimumAllocatableViewIDs.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkSetSendRate.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkViewGetIsMine.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/NetworkViewRemoveRPCs.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using UnityEngine;
......
Assets/PlayMaker/Actions/Network/PlayMakerRPCProxy.cs
View file @ 07744132
......@@ -12,7 +12,7 @@
using UnityEngine;
using System.Collections;
[AddComponentMenu("PlayMaker/Misc/RPC Proxy")]
public class PlayMakerRPCProxy : MonoBehaviour
{
public PlayMakerFSM[] fsms;
......
Assets/PlayMaker/Actions/Network/StartServer.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2013. All rights reserved.
#if !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
#if PLAYMAKER_LEGACY_NETWORK && !(UNITY_FLASH || UNITY_NACL || UNITY_METRO || UNITY_WP8 || UNITY_WIIU || UNITY_PSM || UNITY_WEBGL || UNITY_PS3 || UNITY_PS4 || UNITY_XBOXONE)
using System;
using UnityEngine;
......
Assets/PlayMaker/Actions/Physics2D/SmoothLookAt2d.cs
View file @ 07744132
......@@ -53,6 +53,11 @@ namespace HutongGames.PlayMaker.Actions
finishTolerance = 1;
finishEvent = null;
}
public override void OnPreprocess()
{
Fsm.HandleLateUpdate = true;
}
public override void OnEnter()
{
......
Assets/PlayMaker/Actions/Quaternion/QuaternionBaseAction.cs
View file @ 07744132
......@@ -17,9 +17,17 @@ namespace HutongGames.PlayMaker.Actions
public override void Awake()
{
if (everyFrame && everyFrameOption == everyFrameOptions.FixedUpdate)
{
Fsm.HandleFixedUpdate = true;
if (everyFrame)
{
switch (everyFrameOption)
{
case everyFrameOptions.FixedUpdate:
Fsm.HandleFixedUpdate = true;
break;
case everyFrameOptions.LateUpdate:
Fsm.HandleLateUpdate = true;
break;
}
}
}
......
Assets/PlayMaker/Actions/Quaternion/QuaternionLookRotation.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2016. All rights reserved.
// (c) Copyright HutongGames, LLC 2010-2016. All rights reserved.
using UnityEngine;
......
Assets/PlayMaker/Actions/Rotate.cs
View file @ 07744132
......@@ -57,7 +57,8 @@ namespace HutongGames.PlayMaker.Actions
public override void OnPreprocess()
{
Fsm.HandleFixedUpdate = true;
if (fixedUpdate) Fsm.HandleFixedUpdate = true;
if (lateUpdate) Fsm.HandleLateUpdate = true;
}
public override void OnEnter()
......
Assets/PlayMaker/Actions/ScaleTime.cs
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2013. All rights reserved.
// (c) Copyright HutongGames, LLC 2010-2013. All rights reserved.
using UnityEngine;
......@@ -44,8 +44,11 @@ namespace HutongGames.PlayMaker.Actions
{
Time.timeScale = timeScale.Value;
//TODO: how to get the user set default value?
Time.fixedDeltaTime = 0.02f * Time.timeScale;
if (adjustFixedDeltaTime.Value)
{
//TODO: how to get the user set default value?
Time.fixedDeltaTime = 0.02f * Time.timeScale;
}
}
}
}
\ No newline at end of file
Assets/PlayMaker/Actions/SceneManager.meta 0 → 100644
View file @ 07744132
fileFormatVersion: 2
guid: a68bb0431436a4c7eafe8183cc97caa5
folderAsset: yes
timeCreated: 1476723470
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/PlayMaker/Actions/SceneManager/AllowSceneActivation.cs 0 → 100644
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2016. All rights reserved.
#if UNITY_5_3 || UNITY_5_3_OR_NEWER
using System;
using UnityEngine;
using UnityEngine.SceneManagement;
namespace HutongGames.PlayMaker.Actions
{
[ActionCategory(ActionCategory.Scene)]
[Tooltip("Allow scenes to be activated as soon as it is ready.")]
[Obsolete("Use LoadSceneAsynch instead")]
public class AllowSceneActivation : FsmStateAction
{
[RequiredField]
[UIHint(UIHint.Variable)]
[Tooltip("The name of the new scene. It cannot be empty or null, or same as the name of the existing scenes.")]
public FsmInt aSynchOperationHashCode;
[Tooltip("Allow the scene to be activated as soon as it's ready")]
public FsmBool allowSceneActivation;
[Tooltip("useful if activation will be set during update")]
public bool everyframe;
[ActionSection("Result")]
[Tooltip("The loading's progress.")]
[UIHint(UIHint.Variable)]
public FsmFloat progress;
[Tooltip("True when loading is done")]
[UIHint(UIHint.Variable)]
public FsmBool isDone;
[Tooltip("Event sent when scene loading is done")]
public FsmEvent doneEvent;
[Tooltip("Event sent when action could not be performed. Check Log for more information")]
public FsmEvent failureEvent;
public override void Reset()
{
aSynchOperationHashCode = null;
allowSceneActivation = null;
everyframe = false;
progress = null;
isDone = null;
doneEvent = null;
failureEvent = null;
}
public override void OnEnter()
{
DoAllowSceneActivation ();
if (!everyframe) {
Finish();
}
}
public override void OnUpdate()
{
DoAllowSceneActivation ();
}
void DoAllowSceneActivation()
{
if (aSynchOperationHashCode.IsNone ||
allowSceneActivation.IsNone ||
LoadSceneAsynch.aSyncOperationLUT==null ||
!LoadSceneAsynch.aSyncOperationLUT.ContainsKey(aSynchOperationHashCode.Value)
) {
Fsm.Event(failureEvent);
Finish();
return;
}
if (!progress.IsNone)
progress.Value = LoadSceneAsynch.aSyncOperationLUT [aSynchOperationHashCode.Value].progress;
if (!isDone.IsNone) {
isDone.Value = LoadSceneAsynch.aSyncOperationLUT [aSynchOperationHashCode.Value].isDone;
if (LoadSceneAsynch.aSyncOperationLUT [aSynchOperationHashCode.Value].isDone) {
LoadSceneAsynch.aSyncOperationLUT.Remove (aSynchOperationHashCode.Value);
Fsm.Event (doneEvent);
Finish ();
return;
}
}
LoadSceneAsynch.aSyncOperationLUT[aSynchOperationHashCode.Value].allowSceneActivation = allowSceneActivation.Value;
}
}
}
#endif
\ No newline at end of file
Assets/PlayMaker/Actions/SceneManager/AllowSceneActivation.cs.meta 0 → 100644
View file @ 07744132
fileFormatVersion: 2
guid: 911d2fa2643584b6db0943fe49dbfff4
timeCreated: 1476723484
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/PlayMaker/Actions/SceneManager/CreateScene.cs 0 → 100644
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2016. All rights reserved.
#if !UNITY_5_3_0 && !UNITY_5_3_1 && ( UNITY_5_3 || UNITY_5_3_OR_NEWER )
using System;
using UnityEngine;
using UnityEngine.SceneManagement;
namespace HutongGames.PlayMaker.Actions
{
[ActionCategory(ActionCategory.Scene)]
[Tooltip("Create an empty new scene with the given name additively. The path of the new scene will be empty")]
public class CreateScene : FsmStateAction
{
[RequiredField]
[Tooltip("The name of the new scene. It cannot be empty or null, or same as the name of the existing scenes.")]
public FsmString sceneName;
public override void Reset()
{
sceneName = null;
}
public override void OnEnter()
{
SceneManager.CreateScene(sceneName.Value);
Finish();
}
}
}
#endif
\ No newline at end of file
Assets/PlayMaker/Actions/SceneManager/CreateScene.cs.meta 0 → 100644
View file @ 07744132
fileFormatVersion: 2
guid: fba62adf50a5b4e649873bcc688cf19f
timeCreated: 1476723484
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/PlayMaker/Actions/SceneManager/Editor.meta 0 → 100644
View file @ 07744132
fileFormatVersion: 2
guid: 6ed292b8a927448abb08a49c44642eaa
folderAsset: yes
timeCreated: 1476723470
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/PlayMaker/Actions/SceneManager/Editor/GetSceneBuildIndexCustomEditor.cs 0 → 100644
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2016. All rights reserved.
#if UNITY_5_3 || UNITY_5_3_OR_NEWER
using UnityEngine;
using UnityEditor;
using HutongGames.PlayMaker.Actions;
using HutongGames.PlayMakerEditor;
[CustomActionEditor(typeof(GetSceneBuildIndex))]
public class GetSceneBuildIndexCustomEditor : GetSceneActionBaseCustomEditor
{
public override bool OnGUI()
{
bool changed = EditSceneReferenceField();
EditField("buildIndex");
EditSceneReferenceResultFields ();
return GUI.changed || changed;
}
}
#endif
\ No newline at end of file
Assets/PlayMaker/Actions/SceneManager/Editor/GetSceneBuildIndexCustomEditor.cs.meta 0 → 100644
View file @ 07744132
fileFormatVersion: 2
guid: 39fcf4e939f8c4b55a73e6d4b2c33890
timeCreated: 1476723484
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/PlayMaker/Actions/SceneManager/Editor/GetSceneIsDirtyCustomEditor.cs 0 → 100644
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2016. All rights reserved.
#if UNITY_5_3 || UNITY_5_3_OR_NEWER
using UnityEngine;
using UnityEditor;
using HutongGames.PlayMaker.Actions;
using HutongGames.PlayMakerEditor;
[CustomActionEditor(typeof(GetSceneIsDirty))]
public class GetSceneIsDirtyCustomEditor : GetSceneActionBaseCustomEditor
{
public override bool OnGUI()
{
bool changed = EditSceneReferenceField();
EditField("isDirty");
EditField("isDirtyEvent");
EditField("isNotDirtyEvent");
EditSceneReferenceResultFields();
return GUI.changed || changed;
}
}
#endif
\ No newline at end of file
Assets/PlayMaker/Actions/SceneManager/Editor/GetSceneIsDirtyCustomEditor.cs.meta 0 → 100644
View file @ 07744132
fileFormatVersion: 2
guid: cd2786161e0de4d9db05b192a7d20370
timeCreated: 1476723484
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/PlayMaker/Actions/SceneManager/Editor/GetSceneIsLoadedCustomEditor.cs 0 → 100644
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2016. All rights reserved.
#if UNITY_5_3 || UNITY_5_3_OR_NEWER
using UnityEngine;
using UnityEditor;
using HutongGames.PlayMaker.Actions;
using HutongGames.PlayMakerEditor;
[CustomActionEditor(typeof(GetSceneIsLoaded))]
public class GetSceneIsLoadedCustomEditor : GetSceneActionBaseCustomEditor
{
public override bool OnGUI()
{
bool changed = EditSceneReferenceField();
EditField("isLoaded");
EditField("isLoadedEvent");
EditField("isNotLoadedEvent");
EditSceneReferenceResultFields();
return GUI.changed || changed;
}
}
#endif
\ No newline at end of file
Assets/PlayMaker/Actions/SceneManager/Editor/GetSceneIsLoadedCustomEditor.cs.meta 0 → 100644
View file @ 07744132
fileFormatVersion: 2
guid: f456a637d9e9542738c7682e5b39dc3a
timeCreated: 1476723484
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/PlayMaker/Actions/SceneManager/Editor/GetSceneIsValidCustomEditor.cs 0 → 100644
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2016. All rights reserved.
#if UNITY_5_3 || UNITY_5_3_OR_NEWER
using UnityEngine;
using UnityEditor;
using HutongGames.PlayMaker.Actions;
using HutongGames.PlayMakerEditor;
[CustomActionEditor(typeof(GetSceneIsValid))]
public class GetSceneIsValidCustomEditor : GetSceneActionBaseCustomEditor
{
public override bool OnGUI()
{
bool changed = EditSceneReferenceField();
EditField("isValid");
EditField("isValidEvent");
EditField("isNotValidEvent");
EditSceneReferenceResultFields();
return GUI.changed || changed;
}
}
#endif
\ No newline at end of file
Assets/PlayMaker/Actions/SceneManager/Editor/GetSceneIsValidCustomEditor.cs.meta 0 → 100644
View file @ 07744132
fileFormatVersion: 2
guid: 90603514cf20149f78a2f93b5d50475c
timeCreated: 1476723484
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/PlayMaker/Actions/SceneManager/Editor/GetSceneNameCustomEditor.cs 0 → 100644
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2016. All rights reserved.
#if UNITY_5_3 || UNITY_5_3_OR_NEWER
using UnityEngine;
using UnityEditor;
using HutongGames.PlayMaker.Actions;
using HutongGames.PlayMakerEditor;
[CustomActionEditor(typeof(GetSceneName))]
public class GetSceneNameCustomEditor : GetSceneActionBaseCustomEditor
{
public override bool OnGUI()
{
bool changed = EditSceneReferenceField();
EditField("name");
EditSceneReferenceResultFields ();
return GUI.changed || changed;
}
}
#endif
\ No newline at end of file
Assets/PlayMaker/Actions/SceneManager/Editor/GetSceneNameCustomEditor.cs.meta 0 → 100644
View file @ 07744132
fileFormatVersion: 2
guid: ae6e38f5b5f754a2e9de33529519bef5
timeCreated: 1476723484
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/PlayMaker/Actions/SceneManager/Editor/GetScenePathCustomEditor.cs 0 → 100644
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2016. All rights reserved.
#if UNITY_5_3 || UNITY_5_3_OR_NEWER
using UnityEngine;
using UnityEditor;
using HutongGames.PlayMaker.Actions;
using HutongGames.PlayMakerEditor;
[CustomActionEditor(typeof(GetScenePath))]
public class GetScenePathCustomEditor : GetSceneActionBaseCustomEditor
{
public override bool OnGUI()
{
bool changed = EditSceneReferenceField();
EditField("path");
EditSceneReferenceResultFields ();
return GUI.changed || changed;
}
}
#endif
\ No newline at end of file
Assets/PlayMaker/Actions/SceneManager/Editor/GetScenePathCustomEditor.cs.meta 0 → 100644
View file @ 07744132
fileFormatVersion: 2
guid: 4df77c150640c4ce6b6b0bcbfc332a67
timeCreated: 1476723484
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/PlayMaker/Actions/SceneManager/Editor/GetSceneRootCountCustomEditor.cs 0 → 100644
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2016. All rights reserved.
#if UNITY_5_3 || UNITY_5_3_OR_NEWER
using UnityEngine;
using UnityEditor;
using HutongGames.PlayMaker.Actions;
using HutongGames.PlayMakerEditor;
[CustomActionEditor(typeof(GetSceneRootCount))]
public class GetSceneRootCountCustomEditor : GetSceneActionBaseCustomEditor
{
public override bool OnGUI()
{
bool changed = EditSceneReferenceField();
EditField("rootCount");
EditSceneReferenceResultFields ();
return GUI.changed || changed;
}
}
#endif
\ No newline at end of file
Assets/PlayMaker/Actions/SceneManager/Editor/GetSceneRootCountCustomEditor.cs.meta 0 → 100644
View file @ 07744132
fileFormatVersion: 2
guid: 1039d90d85fd64be39d369cd163b30d4
timeCreated: 1476723484
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/PlayMaker/Actions/SceneManager/Editor/GetSceneRootGameObjectsCustomEditor.cs 0 → 100644
View file @ 07744132
// (c) Copyright HutongGames, LLC 2010-2016. All rights reserved.
#if !UNITY_5_3_0 && !UNITY_5_3_1 && ( UNITY_5_3 || UNITY_5_3_OR_NEWER )
using UnityEngine;
using UnityEditor;
using HutongGames.PlayMaker.Actions;
using HutongGames.PlayMakerEditor;
[CustomActionEditor(typeof(GetSceneRootGameObjects))]
public class GetSceneRootGameObjectsCustomEditor : GetSceneActionBaseCustomEditor
{
public override bool OnGUI()
{
bool changed = EditSceneReferenceField();
EditField("rootGameObjects");
EditSceneReferenceResultFields ();
return GUI.changed || changed;
}
}
#endif
\ No newline at end of file
Assets/PlayMaker/Actions/SceneManager/Editor/GetSceneRootGameObjectsCustomEditor.cs.meta 0 → 100644
View file @ 07744132
fileFormatVersion: 2
guid: 80125b1787e8b41a1a10e3f12dd78eac
timeCreated: 1476723484
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/PlayMaker/Actions/SceneManager/Editor/Internal.meta 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/GetSceneBuildIndex.cs 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/GetSceneCount.cs 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/GetSceneCount.cs.meta 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/GetSceneIsDirty.cs 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/GetSceneIsDirty.cs.meta 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/GetSceneIsLoaded.cs 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/GetSceneIsLoaded.cs.meta 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/GetSceneIsValid.cs 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/GetSceneIsValid.cs.meta 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/GetSceneName.cs 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/GetSceneName.cs.meta 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/GetScenePath.cs 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/GetScenePath.cs.meta 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/GetSceneProperties.cs 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/GetSceneRootCount.cs 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/Internal.meta 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/LoadScene.cs 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/LoadScene.cs.meta 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/LoadSceneAsynch.cs 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/LoadSceneAsynch.cs.meta 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/MergeScenes.cs 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/MergeScenes.cs.meta 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/MoveGameObjectToScene.cs 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/SendSceneLoadedEvent.cs 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/SetActiveScene.cs 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/SetActiveScene.cs.meta 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/UnloadScene.cs 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/UnloadScene.cs.meta 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SceneManager/UnloadSceneAsynch.cs 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SetParent.cs
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SetPosition.cs
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SetProperty.cs
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SetRotation.cs
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SetScale.cs
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/SmoothLookAt.cs
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/StringCompare.cs
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/TakeScreenshot.cs
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/Translate.cs
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Actions/WWWObject.cs
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/ConditionalExpression.dll
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Editor/AssetGUIDs.cs
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Editor/PlayMakerDefines.cs
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Editor/PlayMakerEditor.dll
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Editor/PreUpdateChecker.cs
View file @ 07744132
This diff is collapsed.
Assets/PlayMaker/Readme.txt
View file @ 07744132
This diff is collapsed.
Assets/Plugins/PlayMaker/Metro/PlayMaker.dll
View file @ 07744132
This diff is collapsed.
Assets/Plugins/PlayMaker/PlayMaker.dll
View file @ 07744132
This diff is collapsed.
Assets/Plugins/PlayMaker/PlayMaker.dll.mdb
View file @ 07744132
This diff is collapsed.
Assets/Plugins/PlayMaker/PlayMaker.dll.meta
View file @ 07744132
This diff is collapsed.
Assets/Plugins/PlayMaker/WP8/PlayMaker.dll
View file @ 07744132
This diff is collapsed.
Assets/Plugins/PlayMaker/WebGL/PlayMaker.dll
View file @ 07744132
This diff is collapsed.
Assets/Plugins/WP8Screenshot.dll.mdb 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/Plugins/WP8Screenshot.dll.mdb.meta 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/Plugins/WP8Screenshot.dll.meta
View file @ 07744132
This diff is collapsed.
Assets/Plugins/iOS/iOSScreenshot.m.meta
View file @ 07744132
This diff is collapsed.
Assets/Scenes/HelloAR.unity
View file @ 07744132
This diff is collapsed.
Assets/StreamingAssets/t1.mp4 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/StreamingAssets/t1.mp4.meta 0 → 100644
View file @ 07744132
This diff is collapsed.
Assets/iTween/iTween.cs
View file @ 07744132
This diff is collapsed.
ProjectSettings/ProjectSettings.asset
View file @ 07744132
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment