Commit 07744132 authored by Liang JingQiang's avatar Liang JingQiang

升级playmaker 1.8.5

parent 2fb79014
fileFormatVersion: 2
guid: dac162376b268e44d89994aa8245b8cc
folderAsset: yes
timeCreated: 1503759237
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: a0146581939166f4d9f57e26d48d5d17
folderAsset: yes
timeCreated: 1489096338
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 8656080a6ad58f046abadcd6f2c0fb4f
folderAsset: yes
timeCreated: 1493832945
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2 fileFormatVersion: 2
guid: e091444c3474345668560d07209c6d5a guid: ab4f9ab0a5891fe43a07cb04dd00d91d
timeCreated: 1503821341
licenseType: Pro
DefaultImporter: DefaultImporter:
userData: userData:
assetBundleName: assetBundleName:
......
fileFormatVersion: 2
guid: b82e7898c1221b74391cbf45d1d83c00
folderAsset: yes
timeCreated: 1489096338
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 1e24085edff8e4e499582d8dcf099510
timeCreated: 1503821338
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
// (c) Copyright HutongGames, LLC 2010-2016. All rights reserved. // (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; using UnityEngine;
namespace HutongGames.PlayMaker.Actions namespace HutongGames.PlayMaker.Actions
{ {
[ActionCategory(ActionCategory.Animator)] [ActionCategory(ActionCategory.Animator)]
[Tooltip("Gets the current State information on a specified layer")] [Tooltip("Gets the current State information on a specified layer")]
public class GetAnimatorCurrentStateInfo : FsmStateActionAnimatorBase public class GetAnimatorCurrentStateInfo : FsmStateActionAnimatorBase
{ {
[RequiredField] [RequiredField]
[CheckForComponent(typeof(Animator))] [CheckForComponent(typeof(Animator))]
[Tooltip("The target.")] [Tooltip("The target.")]
public FsmOwnerDefault gameObject; public FsmOwnerDefault gameObject;
[RequiredField] [RequiredField]
[Tooltip("The layer's index")] [Tooltip("The layer's index")]
public FsmInt layerIndex; public FsmInt layerIndex;
[ActionSection("Results")] [ActionSection("Results")]
[UIHint(UIHint.Variable)] [UIHint(UIHint.Variable)]
[Tooltip("The layer's name.")] [Tooltip("The layer's name.")]
public FsmString name; public FsmString name;
[UIHint(UIHint.Variable)] [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")] [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; public FsmInt nameHash;
#if UNITY_5 #if UNITY_5_OR_NEWER
[UIHint(UIHint.Variable)] [UIHint(UIHint.Variable)]
[Tooltip("The full path hash for this state.")] [Tooltip("The full path hash for this state.")]
public FsmInt fullPathHash; public FsmInt fullPathHash;
...@@ -35,100 +39,100 @@ namespace HutongGames.PlayMaker.Actions ...@@ -35,100 +39,100 @@ namespace HutongGames.PlayMaker.Actions
[UIHint(UIHint.Variable)] [UIHint(UIHint.Variable)]
[Tooltip("The name Hash. Doest not include the parent layer's name")] [Tooltip("The name Hash. Doest not include the parent layer's name")]
public FsmInt shortPathHash; public FsmInt shortPathHash;
#endif #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;
private Animator _animator; [UIHint(UIHint.Variable)]
[Tooltip("The layer's tag hash")]
public override void Reset() public FsmInt tagHash;
{
base.Reset(); [UIHint(UIHint.Variable)]
[Tooltip("Is the state looping. All animations in the state must be looping")]
gameObject = null; public FsmBool isStateLooping;
layerIndex = null;
[UIHint(UIHint.Variable)]
name = null; [Tooltip("The Current duration of the state. In seconds, can vary when the State contains a Blend Tree ")]
nameHash = null; public FsmFloat length;
#if UNITY_5 [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; fullPathHash = null;
shortPathHash = null; shortPathHash = null;
#endif #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();
} tagHash = null;
length = null;
normalizedTime = null;
isStateLooping = null;
loopCount = null;
currentLoopProgress = null;
everyFrame = false;
void GetLayerInfo() }
{
if (_animator!=null) public override void OnEnter()
{ {
AnimatorStateInfo _info = _animator.GetCurrentAnimatorStateInfo(layerIndex.Value); // get the animator component
var go = Fsm.GetOwnerDefaultTarget(gameObject);
#if UNITY_5
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) if (!fullPathHash.IsNone)
{ {
fullPathHash.Value = _info.fullPathHash; fullPathHash.Value = _info.fullPathHash;
...@@ -141,46 +145,50 @@ namespace HutongGames.PlayMaker.Actions ...@@ -141,46 +145,50 @@ namespace HutongGames.PlayMaker.Actions
{ {
nameHash.Value = _info.shortNameHash; nameHash.Value = _info.shortNameHash;
} }
#else #else
if (!nameHash.IsNone) if (!nameHash.IsNone)
{ {
nameHash.Value = _info.nameHash; #if UNITY_5_OR_NEWER
} nameHash.Value = _info.fullPathHash;
#endif #else
nameHash.Value = _info.nameHash;
#endif
if (!name.IsNone) }
{ #endif
name.Value = _animator.GetLayerName(layerIndex.Value);
}
if (!tagHash.IsNone)
{
tagHash.Value = _info.tagHash;
}
if (!length.IsNone) if (!name.IsNone)
{ {
length.Value = _info.length; name.Value = _animator.GetLayerName(layerIndex.Value);
} }
if (!isStateLooping.IsNone) if (!tagHash.IsNone)
{ {
isStateLooping.Value = _info.loop; tagHash.Value = _info.tagHash;
} }
if (!normalizedTime.IsNone) if (!length.IsNone)
{ {
normalizedTime.Value = _info.normalizedTime; length.Value = _info.length;
} }
if (!loopCount.IsNone || !currentLoopProgress.IsNone) if (!isStateLooping.IsNone)
{ {
loopCount.Value = (int)System.Math.Truncate(_info.normalizedTime); isStateLooping.Value = _info.loop;
currentLoopProgress.Value = _info.normalizedTime-loopCount.Value; }
}
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
...@@ -31,7 +31,12 @@ namespace HutongGames.PlayMaker.Actions ...@@ -31,7 +31,12 @@ namespace HutongGames.PlayMaker.Actions
leftFootHeight = null; leftFootHeight = null;
everyFrame = false; everyFrame = false;
} }
public override void OnPreprocess()
{
Fsm.HandleLateUpdate = true;
}
public override void OnEnter() public override void OnEnter()
{ {
// get the animator component // get the animator component
......
// (c) Copyright HutongGames, LLC 2010-2016. All rights reserved. // (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; using UnityEngine;
namespace HutongGames.PlayMaker.Actions namespace HutongGames.PlayMaker.Actions
{ {
[ActionCategory(ActionCategory.Animator)] [ActionCategory(ActionCategory.Animator)]
[Tooltip("Gets the next State information on a specified layer")] [Tooltip("Gets the next State information on a specified layer")]
public class GetAnimatorNextStateInfo : FsmStateActionAnimatorBase public class GetAnimatorNextStateInfo : FsmStateActionAnimatorBase
{ {
[RequiredField] [RequiredField]
[CheckForComponent(typeof(Animator))] [CheckForComponent(typeof(Animator))]
[Tooltip("The target. An Animator component is required")] [Tooltip("The target. An Animator component is required")]
public FsmOwnerDefault gameObject; public FsmOwnerDefault gameObject;
[RequiredField] [RequiredField]
[Tooltip("The layer's index")] [Tooltip("The layer's index")]
public FsmInt layerIndex; public FsmInt layerIndex;
[ActionSection("Results")] [ActionSection("Results")]
[UIHint(UIHint.Variable)] [UIHint(UIHint.Variable)]
[Tooltip("The layer's name.")] [Tooltip("The layer's name.")]
public FsmString name; public FsmString name;
[UIHint(UIHint.Variable)] [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")] [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; public FsmInt nameHash;
#if UNITY_5 #if UNITY_5_OR_NEWER
[UIHint(UIHint.Variable)] [UIHint(UIHint.Variable)]
[Tooltip("The full path hash for this state.")] [Tooltip("The full path hash for this state.")]
public FsmInt fullPathHash; public FsmInt fullPathHash;
...@@ -35,98 +39,98 @@ namespace HutongGames.PlayMaker.Actions ...@@ -35,98 +39,98 @@ namespace HutongGames.PlayMaker.Actions
[UIHint(UIHint.Variable)] [UIHint(UIHint.Variable)]
[Tooltip("The name Hash. Doest not include the parent layer's name")] [Tooltip("The name Hash. Doest not include the parent layer's name")]
public FsmInt shortPathHash; public FsmInt shortPathHash;
#endif #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;
private Animator _animator;
[UIHint(UIHint.Variable)]
public override void Reset() [Tooltip("The layer's tag hash")]
{ public FsmInt tagHash;
base.Reset();
[UIHint(UIHint.Variable)]
gameObject = null; [Tooltip("Is the state looping. All animations in the state must be looping")]
layerIndex = null; public FsmBool isStateLooping;
name = null; [UIHint(UIHint.Variable)]
nameHash = null; [Tooltip("The Current duration of the state. In seconds, can vary when the State contains a Blend Tree ")]
public FsmFloat length;
#if UNITY_5
[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; fullPathHash = null;
shortPathHash = null; shortPathHash = null;
#endif #endif
tagHash = null; tagHash = null;
length = null; length = null;
normalizedTime = null; normalizedTime = null;
isStateLooping = null; isStateLooping = null;
loopCount = null; loopCount = null;
currentLoopProgress = null; currentLoopProgress = null;
} }
public override void OnEnter() public override void OnEnter()
{ {
// get the animator component // get the animator component
var go = Fsm.GetOwnerDefaultTarget(gameObject); var go = Fsm.GetOwnerDefaultTarget(gameObject);
if (go==null) if (go == null)
{ {
Finish(); Finish();
return; return;
} }
_animator = go.GetComponent<Animator>(); _animator = go.GetComponent<Animator>();
if (_animator==null) if (_animator == null)
{ {
Finish(); Finish();
return; return;
} }
GetLayerInfo(); GetLayerInfo();
if (!everyFrame) if (!everyFrame)
{ {
Finish(); Finish();
} }
} }
public override void OnActionUpdate() public override void OnActionUpdate()
{ {
GetLayerInfo(); GetLayerInfo();
} }
void GetLayerInfo() void GetLayerInfo()
{ {
if (_animator!=null) if (_animator != null)
{ {
AnimatorStateInfo _info = _animator.GetNextAnimatorStateInfo(layerIndex.Value); AnimatorStateInfo _info = _animator.GetNextAnimatorStateInfo(layerIndex.Value);
#if UNITY_5 #if UNITY_5_OR_NEWER
if (!fullPathHash.IsNone) if (!fullPathHash.IsNone)
{ {
fullPathHash.Value = _info.fullPathHash; fullPathHash.Value = _info.fullPathHash;
...@@ -139,42 +143,46 @@ namespace HutongGames.PlayMaker.Actions ...@@ -139,42 +143,46 @@ namespace HutongGames.PlayMaker.Actions
{ {
nameHash.Value = _info.shortNameHash; nameHash.Value = _info.shortNameHash;
} }
#else #else
if (!nameHash.IsNone) if (!nameHash.IsNone)
{ {
nameHash.Value = _info.nameHash; #if UNITY_5_OR_NEWER
} nameHash.Value = _info.fullPathHash;
#endif #else
nameHash.Value = _info.nameHash;
if (!name.IsNone) #endif
{ }
name.Value = _animator.GetLayerName(layerIndex.Value); #endif
}
if (!tagHash.IsNone) if (!name.IsNone)
{ {
tagHash.Value = _info.tagHash; name.Value = _animator.GetLayerName(layerIndex.Value);
} }
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) if (!tagHash.IsNone)
{ {
loopCount.Value = (int)System.Math.Truncate(_info.normalizedTime); tagHash.Value = _info.tagHash;
currentLoopProgress.Value = _info.normalizedTime-loopCount.Value; }
} 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
...@@ -33,7 +33,12 @@ namespace HutongGames.PlayMaker.Actions ...@@ -33,7 +33,12 @@ namespace HutongGames.PlayMaker.Actions
rightFootHeight = null; rightFootHeight = null;
everyFrame = false; everyFrame = false;
} }
public override void OnPreprocess()
{
Fsm.HandleLateUpdate = true;
}
public override void OnEnter() public override void OnEnter()
{ {
// get the animator component // get the animator component
......
// (c) Copyright HutongGames, LLC 2010-2016. All rights reserved. // (c) Copyright HutongGames, LLC 2010-2016. All rights reserved.
#if UNITY_5_5_OR_NEWER
using UnityEngine.AI;
#endif
using UnityEngine; using UnityEngine;
namespace HutongGames.PlayMaker.Actions namespace HutongGames.PlayMaker.Actions
...@@ -9,13 +12,13 @@ namespace HutongGames.PlayMaker.Actions ...@@ -9,13 +12,13 @@ namespace HutongGames.PlayMaker.Actions
public class NavMeshAgentAnimatorSynchronizer : FsmStateAction public class NavMeshAgentAnimatorSynchronizer : FsmStateAction
{ {
[RequiredField] [RequiredField]
[CheckForComponent(typeof(UnityEngine.AI.NavMeshAgent))] [CheckForComponent(typeof(NavMeshAgent))]
[CheckForComponent(typeof(Animator))] [CheckForComponent(typeof(Animator))]
[Tooltip("The Agent target. An Animator component and a NavMeshAgent component are required")] [Tooltip("The Agent target. An Animator component and a NavMeshAgent component are required")]
public FsmOwnerDefault gameObject; public FsmOwnerDefault gameObject;
private Animator _animator; private Animator _animator;
private UnityEngine.AI.NavMeshAgent _agent; private NavMeshAgent _agent;
private Transform _trans; private Transform _trans;
...@@ -40,7 +43,7 @@ namespace HutongGames.PlayMaker.Actions ...@@ -40,7 +43,7 @@ namespace HutongGames.PlayMaker.Actions
Finish(); Finish();
return; return;
} }
_agent = go.GetComponent<UnityEngine.AI.NavMeshAgent>(); _agent = go.GetComponent<NavMeshAgent>();
_animator = go.GetComponent<Animator>(); _animator = go.GetComponent<Animator>();
......
// (c) Copyright HutongGames, LLC 2010-2016. All rights reserved. // (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; using UnityEngine;
namespace HutongGames.PlayMaker.Actions namespace HutongGames.PlayMaker.Actions
...@@ -58,7 +62,7 @@ namespace HutongGames.PlayMaker.Actions ...@@ -58,7 +62,7 @@ namespace HutongGames.PlayMaker.Actions
return; return;
} }
#if UNITY_5 #if UNITY_5_OR_NEWER
_animator.cullingMode = alwaysAnimate.Value?AnimatorCullingMode.AlwaysAnimate:AnimatorCullingMode.CullUpdateTransforms; _animator.cullingMode = alwaysAnimate.Value?AnimatorCullingMode.AlwaysAnimate:AnimatorCullingMode.CullUpdateTransforms;
#else #else
_animator.cullingMode = alwaysAnimate.Value?AnimatorCullingMode.AlwaysAnimate:AnimatorCullingMode.BasedOnRenderers; _animator.cullingMode = alwaysAnimate.Value?AnimatorCullingMode.AlwaysAnimate:AnimatorCullingMode.BasedOnRenderers;
......
...@@ -72,7 +72,7 @@ namespace HutongGames.PlayMaker.Actions ...@@ -72,7 +72,7 @@ namespace HutongGames.PlayMaker.Actions
public override void OnFixedUpdate() public override void OnFixedUpdate()
{ {
runFsm.LateUpdate(); runFsm.FixedUpdate();
if (!runFsm.Finished) if (!runFsm.Finished)
{ {
return; // continue later return; // continue later
......
...@@ -7,10 +7,6 @@ using System.Collections.Generic; ...@@ -7,10 +7,6 @@ using System.Collections.Generic;
using Object = UnityEngine.Object; using Object = UnityEngine.Object;
using HutongGames.PlayMaker; using HutongGames.PlayMaker;
#if UNITY_EDITOR
using HutongGames.PlayMaker.Ecosystem.Utils;
#endif
namespace HutongGames.PlayMaker.Actions namespace HutongGames.PlayMaker.Actions
{ {
[ActionCategory(ActionCategory.ScriptControl)] [ActionCategory(ActionCategory.ScriptControl)]
...@@ -40,10 +36,6 @@ namespace HutongGames.PlayMaker.Actions ...@@ -40,10 +36,6 @@ namespace HutongGames.PlayMaker.Actions
[Tooltip("Use the old manual editor UI.")] [Tooltip("Use the old manual editor UI.")]
public bool manualUI; public bool manualUI;
#if UNITY_EDITOR
public bool debug;
#endif
private FsmObject cachedBehaviour; private FsmObject cachedBehaviour;
private FsmString cachedMethodName; private FsmString cachedMethodName;
private Type cachedType; private Type cachedType;
...@@ -59,10 +51,6 @@ namespace HutongGames.PlayMaker.Actions ...@@ -59,10 +51,6 @@ namespace HutongGames.PlayMaker.Actions
parameters = null; parameters = null;
storeResult = null; storeResult = null;
everyFrame = false; everyFrame = false;
#if UNITY_EDITOR
debug = false;
#endif
} }
public override void OnEnter() public override void OnEnter()
...@@ -71,19 +59,6 @@ namespace HutongGames.PlayMaker.Actions ...@@ -71,19 +59,6 @@ namespace HutongGames.PlayMaker.Actions
DoMethodCall(); 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) if (!everyFrame)
{ {
Finish(); Finish();
......
...@@ -6,5 +6,3 @@ MonoImporter: ...@@ -6,5 +6,3 @@ MonoImporter:
executionOrder: 0 executionOrder: 0
icon: {instanceID: 0} icon: {instanceID: 0}
userData: userData:
assetBundleName:
assetBundleVariant:
...@@ -5,10 +5,6 @@ using System.Reflection; ...@@ -5,10 +5,6 @@ using System.Reflection;
using UnityEngine; using UnityEngine;
using System.Collections.Generic; using System.Collections.Generic;
#if UNITY_EDITOR
using HutongGames.PlayMaker.Ecosystem.Utils;
#endif
namespace HutongGames.PlayMaker.Actions namespace HutongGames.PlayMaker.Actions
{ {
[ActionCategory(ActionCategory.ScriptControl)] [ActionCategory(ActionCategory.ScriptControl)]
...@@ -41,23 +37,6 @@ namespace HutongGames.PlayMaker.Actions ...@@ -41,23 +37,6 @@ namespace HutongGames.PlayMaker.Actions
private object[] parametersArray; private object[] parametersArray;
private string errorString; 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() public override void OnEnter()
{ {
parametersArray = new object[parameters.Length]; parametersArray = new object[parameters.Length];
...@@ -110,24 +89,7 @@ namespace HutongGames.PlayMaker.Actions ...@@ -110,24 +89,7 @@ namespace HutongGames.PlayMaker.Actions
result = cachedMethodInfo.Invoke(null, parametersArray); result = cachedMethodInfo.Invoke(null, parametersArray);
} }
storeResult.SetValue(result);
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
} }
private bool DoCache() private bool DoCache()
......
...@@ -6,5 +6,3 @@ MonoImporter: ...@@ -6,5 +6,3 @@ MonoImporter:
executionOrder: 0 executionOrder: 0
icon: {instanceID: 0} icon: {instanceID: 0}
userData: userData:
assetBundleName:
assetBundleVariant:
// (c) Copyright HutongGames, LLC 2010-2013. All rights reserved. // (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; using UnityEngine;
namespace HutongGames.PlayMaker.Actions namespace HutongGames.PlayMaker.Actions
...@@ -8,58 +19,65 @@ namespace HutongGames.PlayMaker.Actions ...@@ -8,58 +19,65 @@ namespace HutongGames.PlayMaker.Actions
// Caches the component for performance // Caches the component for performance
public abstract class ComponentAction<T> : FsmStateAction where T : Component public abstract class ComponentAction<T> : FsmStateAction where T : Component
{ {
private GameObject cachedGameObject; /// <summary>
private T component; /// The cached GameObject. Call UpdateCache() first
/// </summary>
protected GameObject cachedGameObject;
/// <summary>
/// The cached component. Call UpdateCache() first
/// </summary>
protected T cachedComponent;
protected Rigidbody rigidbody protected Rigidbody rigidbody
{ {
get { return component as Rigidbody; } get { return cachedComponent as Rigidbody; }
} }
protected Rigidbody2D rigidbody2d protected Rigidbody2D rigidbody2d
{ {
get { return component as Rigidbody2D; } get { return cachedComponent as Rigidbody2D; }
} }
protected Renderer renderer protected Renderer renderer
{ {
get { return component as Renderer; } get { return cachedComponent as Renderer; }
} }
protected Animation animation protected Animation animation
{ {
get { return component as Animation; } get { return cachedComponent as Animation; }
} }
protected AudioSource audio protected AudioSource audio
{ {
get { return component as AudioSource; } get { return cachedComponent as AudioSource; }
} }
protected Camera camera protected Camera camera
{ {
get { return component as Camera; } get { return cachedComponent as Camera; }
} }
protected GUIText guiText protected GUIText guiText
{ {
get { return component as GUIText; } get { return cachedComponent as GUIText; }
} }
protected GUITexture guiTexture protected GUITexture guiTexture
{ {
get { return component as GUITexture; } get { return cachedComponent as GUITexture; }
} }
protected Light light 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 protected NetworkView networkView
{ {
get { return component as NetworkView; } get { return cachedComponent as NetworkView; }
} }
#endif #endif
protected bool UpdateCache(GameObject go) protected bool UpdateCache(GameObject go)
...@@ -69,18 +87,18 @@ namespace HutongGames.PlayMaker.Actions ...@@ -69,18 +87,18 @@ namespace HutongGames.PlayMaker.Actions
return false; return false;
} }
if (component == null || cachedGameObject != go) if (cachedComponent == null || cachedGameObject != go)
{ {
component = go.GetComponent<T>(); cachedComponent = go.GetComponent<T>();
cachedGameObject = go; cachedGameObject = go;
if (component == null) if (cachedComponent == null)
{ {
LogWarning("Missing component: " + typeof(T).FullName + " on: " + go.name); LogWarning("Missing component: " + typeof(T).FullName + " on: " + go.name);
} }
} }
return component != null; return cachedComponent != null;
} }
} }
} }
\ No newline at end of file
...@@ -20,7 +20,7 @@ namespace HutongGames.PlayMaker.Actions ...@@ -20,7 +20,7 @@ namespace HutongGames.PlayMaker.Actions
[Tooltip("Multiply the movement vector by a speed factor.")] [Tooltip("Multiply the movement vector by a speed factor.")]
public FsmFloat speed; public FsmFloat speed;
[Tooltip("Move in local or word space.")] [Tooltip("Move in local or world space.")]
public Space space; public Space space;
private GameObject previousGo; // remember so we can get new controller only when it changes. private GameObject previousGo; // remember so we can get new controller only when it changes.
......
...@@ -26,12 +26,14 @@ namespace HutongGames.PlayMaker.Actions ...@@ -26,12 +26,14 @@ namespace HutongGames.PlayMaker.Actions
[Tooltip("Optionally store the created object.")] [Tooltip("Optionally store the created object.")]
public FsmGameObject storeObject; public FsmGameObject storeObject;
#if PLAYMAKER_LEGACY_NETWORK
[Tooltip("Use Network.Instantiate to create a Game Object on all clients in a networked game.")] [Tooltip("Use Network.Instantiate to create a Game Object on all clients in a networked game.")]
public FsmBool networkInstantiate; 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.")] [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; public FsmInt networkGroup;
#endif
public override void Reset() public override void Reset()
{ {
gameObject = null; gameObject = null;
...@@ -39,8 +41,10 @@ namespace HutongGames.PlayMaker.Actions ...@@ -39,8 +41,10 @@ namespace HutongGames.PlayMaker.Actions
position = new FsmVector3 { UseVariable = true }; position = new FsmVector3 { UseVariable = true };
rotation = new FsmVector3 { UseVariable = true }; rotation = new FsmVector3 { UseVariable = true };
storeObject = null; storeObject = null;
#if PLAYMAKER_LEGACY_NETWORK
networkInstantiate = false; networkInstantiate = false;
networkGroup = 0; networkGroup = 0;
#endif
} }
public override void OnEnter() public override void OnEnter()
...@@ -76,7 +80,7 @@ namespace HutongGames.PlayMaker.Actions ...@@ -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; GameObject newObject;
if (!networkInstantiate.Value) if (!networkInstantiate.Value)
......
...@@ -22,8 +22,13 @@ namespace HutongGames.PlayMaker.Actions ...@@ -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. // 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(); Finish();
} }
} }
......
...@@ -47,7 +47,7 @@ namespace HutongGames.PlayMakerEditor ...@@ -47,7 +47,7 @@ namespace HutongGames.PlayMakerEditor
var goTargetTransform = goTarget.transform; var goTargetTransform = goTarget.transform;
var worldTargetPos = goTargetTransform.TransformPoint(lookAtAction.targetPosition.Value); 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.color = new Color(1, 1, 1, 0.2f);
Handles.DrawLine(goTargetTransform.position, lookAtAction.GetLookAtPositionWithVertical()); Handles.DrawLine(goTargetTransform.position, lookAtAction.GetLookAtPositionWithVertical());
} }
...@@ -67,8 +67,11 @@ namespace HutongGames.PlayMakerEditor ...@@ -67,8 +67,11 @@ namespace HutongGames.PlayMakerEditor
// Lookat vector // Lookat vector
Handles.DrawLine(goPosition, lookAtPosition); 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 Handles.ConeCap(0, goPosition + lookAtVector.normalized * (distance - arrowSize * 0.7f) , lookAtRotation, arrowSize); // fudge factor to position cap correctly
#endif
// Arc between vectors // Arc between vectors
Handles.color = new Color(1, 1, 1, 0.2f); Handles.color = new Color(1, 1, 1, 0.2f);
......
...@@ -61,8 +61,12 @@ namespace HutongGames.PlayMakerEditor ...@@ -61,8 +61,12 @@ namespace HutongGames.PlayMakerEditor
// Target vector // Target vector
Handles.DrawLine(goPosition, lookAtPosition); 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 // Show vertical offset
if (moveTowardsAction.ignoreVertical.Value) if (moveTowardsAction.ignoreVertical.Value)
......
...@@ -43,7 +43,7 @@ namespace HutongGames.PlayMaker.Actions ...@@ -43,7 +43,7 @@ namespace HutongGames.PlayMaker.Actions
return; return;
} }
var transform = go.transform.FindChild(childName.Value); var transform = go.transform.Find(childName.Value);
storeResult.Value = transform != null ? transform.gameObject : null; storeResult.Value = transform != null ? transform.gameObject : null;
} }
} }
......
...@@ -39,6 +39,11 @@ namespace HutongGames.PlayMaker.Actions ...@@ -39,6 +39,11 @@ namespace HutongGames.PlayMaker.Actions
everyFrame = false; everyFrame = false;
} }
public override void OnPreprocess()
{
Fsm.HandleLateUpdate = true;
}
public override void OnLateUpdate() public override void OnLateUpdate()
{ {
DoGetAngleToTarget(); DoGetAngleToTarget();
......
...@@ -4,10 +4,6 @@ ...@@ -4,10 +4,6 @@
using UnityEngine; using UnityEngine;
#if UNITY_EDITOR
using HutongGames.PlayMaker.Ecosystem.Utils;
#endif
namespace HutongGames.PlayMaker.Actions namespace HutongGames.PlayMaker.Actions
{ {
[ActionCategory(ActionCategory.UnityObject)] [ActionCategory(ActionCategory.UnityObject)]
...@@ -19,38 +15,16 @@ namespace HutongGames.PlayMaker.Actions ...@@ -19,38 +15,16 @@ namespace HutongGames.PlayMaker.Actions
public FsmProperty targetProperty; public FsmProperty targetProperty;
public bool everyFrame; public bool everyFrame;
#if UNITY_EDITOR
public bool debug;
#endif
public override void Reset() public override void Reset()
{ {
targetProperty = new FsmProperty { setProperty = false }; targetProperty = new FsmProperty { setProperty = false };
everyFrame = false; everyFrame = false;
#if UNITY_EDITOR
debug = false;
#endif
} }
public override void OnEnter() public override void OnEnter()
{ {
targetProperty.GetValue(); 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) if (!everyFrame)
{ {
Finish(); Finish();
......
...@@ -6,5 +6,3 @@ MonoImporter: ...@@ -6,5 +6,3 @@ MonoImporter:
executionOrder: 0 executionOrder: 0
icon: {instanceID: 0} icon: {instanceID: 0}
userData: userData:
assetBundleName:
assetBundleVariant:
...@@ -9,11 +9,6 @@ using System.Reflection; ...@@ -9,11 +9,6 @@ using System.Reflection;
using UnityEngine; using UnityEngine;
#if UNITY_EDITOR
using HutongGames.PlayMaker.Ecosystem.Utils;
#endif
namespace HutongGames.PlayMaker.Actions namespace HutongGames.PlayMaker.Actions
{ {
[ActionCategory(ActionCategory.ScriptControl)] [ActionCategory(ActionCategory.ScriptControl)]
...@@ -55,10 +50,6 @@ namespace HutongGames.PlayMaker.Actions ...@@ -55,10 +50,6 @@ namespace HutongGames.PlayMaker.Actions
#endif #endif
#if UNITY_EDITOR
public bool debug;
#endif
public override void Reset() public override void Reset()
{ {
gameObject = null; gameObject = null;
...@@ -68,10 +59,6 @@ namespace HutongGames.PlayMaker.Actions ...@@ -68,10 +59,6 @@ namespace HutongGames.PlayMaker.Actions
repeating = false; repeating = false;
repeatDelay = 1; repeatDelay = 1;
cancelOnExit = false; cancelOnExit = false;
#if UNITY_EDITOR
debug = false;
#endif
} }
MonoBehaviour component; MonoBehaviour component;
...@@ -106,19 +93,6 @@ namespace HutongGames.PlayMaker.Actions ...@@ -106,19 +93,6 @@ namespace HutongGames.PlayMaker.Actions
{ {
component.Invoke(methodName.Value, delay.Value); 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() public override void OnExit()
......
...@@ -6,5 +6,3 @@ MonoImporter: ...@@ -6,5 +6,3 @@ MonoImporter:
executionOrder: 0 executionOrder: 0
icon: {instanceID: 0} icon: {instanceID: 0}
userData: userData:
assetBundleName:
assetBundleVariant:
...@@ -51,6 +51,11 @@ namespace HutongGames.PlayMaker.Actions ...@@ -51,6 +51,11 @@ namespace HutongGames.PlayMaker.Actions
everyFrame = true; everyFrame = true;
} }
public override void OnPreprocess()
{
Fsm.HandleLateUpdate = true;
}
public override void OnEnter() public override void OnEnter()
{ {
DoLookAt(); DoLookAt();
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2013. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2013. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2013. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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 System;
using UnityEngine; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2013. All rights reserved. // (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 System;
using UnityEngine; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2013. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2013. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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 System;
using UnityEngine; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
// (c) Copyright HutongGames, LLC 2010-2012. All rights reserved. // (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; using UnityEngine;
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
using UnityEngine; using UnityEngine;
using System.Collections; using System.Collections;
[AddComponentMenu("PlayMaker/Misc/RPC Proxy")]
public class PlayMakerRPCProxy : MonoBehaviour public class PlayMakerRPCProxy : MonoBehaviour
{ {
public PlayMakerFSM[] fsms; public PlayMakerFSM[] fsms;
......
// (c) Copyright HutongGames, LLC 2010-2013. All rights reserved. // (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 System;
using UnityEngine; using UnityEngine;
......
...@@ -53,6 +53,11 @@ namespace HutongGames.PlayMaker.Actions ...@@ -53,6 +53,11 @@ namespace HutongGames.PlayMaker.Actions
finishTolerance = 1; finishTolerance = 1;
finishEvent = null; finishEvent = null;
} }
public override void OnPreprocess()
{
Fsm.HandleLateUpdate = true;
}
public override void OnEnter() public override void OnEnter()
{ {
......
...@@ -17,9 +17,17 @@ namespace HutongGames.PlayMaker.Actions ...@@ -17,9 +17,17 @@ namespace HutongGames.PlayMaker.Actions
public override void Awake() public override void Awake()
{ {
if (everyFrame && everyFrameOption == everyFrameOptions.FixedUpdate) if (everyFrame)
{ {
Fsm.HandleFixedUpdate = true; switch (everyFrameOption)
{
case everyFrameOptions.FixedUpdate:
Fsm.HandleFixedUpdate = true;
break;
case everyFrameOptions.LateUpdate:
Fsm.HandleLateUpdate = true;
break;
}
} }
} }
......
// (c) Copyright HutongGames, LLC 2010-2016. All rights reserved. // (c) Copyright HutongGames, LLC 2010-2016. All rights reserved.
using UnityEngine; using UnityEngine;
......
...@@ -57,7 +57,8 @@ namespace HutongGames.PlayMaker.Actions ...@@ -57,7 +57,8 @@ namespace HutongGames.PlayMaker.Actions
public override void OnPreprocess() public override void OnPreprocess()
{ {
Fsm.HandleFixedUpdate = true; if (fixedUpdate) Fsm.HandleFixedUpdate = true;
if (lateUpdate) Fsm.HandleLateUpdate = true;
} }
public override void OnEnter() public override void OnEnter()
......
// (c) Copyright HutongGames, LLC 2010-2013. All rights reserved. // (c) Copyright HutongGames, LLC 2010-2013. All rights reserved.
using UnityEngine; using UnityEngine;
...@@ -44,8 +44,11 @@ namespace HutongGames.PlayMaker.Actions ...@@ -44,8 +44,11 @@ namespace HutongGames.PlayMaker.Actions
{ {
Time.timeScale = timeScale.Value; Time.timeScale = timeScale.Value;
//TODO: how to get the user set default value? if (adjustFixedDeltaTime.Value)
Time.fixedDeltaTime = 0.02f * Time.timeScale; {
//TODO: how to get the user set default value?
Time.fixedDeltaTime = 0.02f * Time.timeScale;
}
} }
} }
} }
\ No newline at end of file
fileFormatVersion: 2
guid: a68bb0431436a4c7eafe8183cc97caa5
folderAsset: yes
timeCreated: 1476723470
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
// (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
fileFormatVersion: 2
guid: 911d2fa2643584b6db0943fe49dbfff4
timeCreated: 1476723484
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
// (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
fileFormatVersion: 2
guid: fba62adf50a5b4e649873bcc688cf19f
timeCreated: 1476723484
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 6ed292b8a927448abb08a49c44642eaa
folderAsset: yes
timeCreated: 1476723470
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
// (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
fileFormatVersion: 2
guid: 39fcf4e939f8c4b55a73e6d4b2c33890
timeCreated: 1476723484
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
// (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
fileFormatVersion: 2
guid: cd2786161e0de4d9db05b192a7d20370
timeCreated: 1476723484
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
// (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
fileFormatVersion: 2
guid: f456a637d9e9542738c7682e5b39dc3a
timeCreated: 1476723484
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
// (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
fileFormatVersion: 2
guid: 90603514cf20149f78a2f93b5d50475c
timeCreated: 1476723484
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
// (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
fileFormatVersion: 2
guid: ae6e38f5b5f754a2e9de33529519bef5
timeCreated: 1476723484
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
// (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
fileFormatVersion: 2
guid: 4df77c150640c4ce6b6b0bcbfc332a67
timeCreated: 1476723484
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
// (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
fileFormatVersion: 2
guid: 1039d90d85fd64be39d369cd163b30d4
timeCreated: 1476723484
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
// (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
fileFormatVersion: 2
guid: 80125b1787e8b41a1a10e3f12dd78eac
timeCreated: 1476723484
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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