From 6ee18886c8af3858de5e97599b23086823d9f320 Mon Sep 17 00:00:00 2001 From: chai Date: Wed, 27 Jan 2021 16:30:19 +0800 Subject: =?UTF-8?q?*=E6=9B=B4=E6=96=B0Behaviour=20Designer=E7=89=88?= =?UTF-8?q?=E6=9C=AC=EF=BC=8C=E5=9C=A8=E6=9C=80=E4=B8=8B=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9C=89BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Runtime/Basic Tasks/ParticleSystem/Clear.cs.meta | 16 ++++++++-------- .../Runtime/Basic Tasks/ParticleSystem/GetDuration.cs | 4 ++++ .../Basic Tasks/ParticleSystem/GetDuration.cs.meta | 16 ++++++++-------- .../Basic Tasks/ParticleSystem/GetEmissionRate.cs | 2 +- .../Basic Tasks/ParticleSystem/GetEmissionRate.cs.meta | 16 ++++++++-------- .../Basic Tasks/ParticleSystem/GetEnableEmission.cs | 2 +- .../Basic Tasks/ParticleSystem/GetEnableEmission.cs.meta | 16 ++++++++-------- .../Basic Tasks/ParticleSystem/GetGravityModifier.cs | 6 ++++-- .../ParticleSystem/GetGravityModifier.cs.meta | 16 ++++++++-------- .../Runtime/Basic Tasks/ParticleSystem/GetLoop.cs | 4 ++++ .../Runtime/Basic Tasks/ParticleSystem/GetLoop.cs.meta | 16 ++++++++-------- .../Basic Tasks/ParticleSystem/GetMaxParticles.cs | 4 ++++ .../Basic Tasks/ParticleSystem/GetMaxParticles.cs.meta | 16 ++++++++-------- .../Basic Tasks/ParticleSystem/GetParticleCount.cs.meta | 16 ++++++++-------- .../Basic Tasks/ParticleSystem/GetPlaybackSpeed.cs | 2 +- .../Basic Tasks/ParticleSystem/GetPlaybackSpeed.cs.meta | 16 ++++++++-------- .../Runtime/Basic Tasks/ParticleSystem/GetTime.cs.meta | 16 ++++++++-------- .../Runtime/Basic Tasks/ParticleSystem/IsAlive.cs.meta | 16 ++++++++-------- .../Runtime/Basic Tasks/ParticleSystem/IsPaused.cs.meta | 16 ++++++++-------- .../Runtime/Basic Tasks/ParticleSystem/IsPlaying.cs.meta | 16 ++++++++-------- .../Runtime/Basic Tasks/ParticleSystem/IsStopped.cs.meta | 16 ++++++++-------- .../Runtime/Basic Tasks/ParticleSystem/Pause.cs.meta | 16 ++++++++-------- .../Runtime/Basic Tasks/ParticleSystem/Play.cs.meta | 16 ++++++++-------- .../Basic Tasks/ParticleSystem/SetEmissionRate.cs | 2 +- .../Basic Tasks/ParticleSystem/SetEmissionRate.cs.meta | 16 ++++++++-------- .../Basic Tasks/ParticleSystem/SetEnableEmission.cs | 2 +- .../Basic Tasks/ParticleSystem/SetEnableEmission.cs.meta | 16 ++++++++-------- .../Basic Tasks/ParticleSystem/SetGravityModifier.cs | 10 ++++++---- .../ParticleSystem/SetGravityModifier.cs.meta | 16 ++++++++-------- .../Runtime/Basic Tasks/ParticleSystem/SetLoop.cs | 9 +++++++-- .../Runtime/Basic Tasks/ParticleSystem/SetLoop.cs.meta | 16 ++++++++-------- .../Basic Tasks/ParticleSystem/SetMaxParticles.cs | 8 ++++++-- .../Basic Tasks/ParticleSystem/SetMaxParticles.cs.meta | 16 ++++++++-------- .../Basic Tasks/ParticleSystem/SetPlaybackSpeed.cs | 4 ++-- .../Basic Tasks/ParticleSystem/SetPlaybackSpeed.cs.meta | 16 ++++++++-------- .../Runtime/Basic Tasks/ParticleSystem/SetStartColor.cs | 9 +++++++-- .../Basic Tasks/ParticleSystem/SetStartColor.cs.meta | 16 ++++++++-------- .../Runtime/Basic Tasks/ParticleSystem/SetStartDelay.cs | 9 +++++++-- .../Basic Tasks/ParticleSystem/SetStartDelay.cs.meta | 16 ++++++++-------- .../Basic Tasks/ParticleSystem/SetStartLifetime.cs | 9 +++++++-- .../Basic Tasks/ParticleSystem/SetStartLifetime.cs.meta | 16 ++++++++-------- .../Basic Tasks/ParticleSystem/SetStartRotation.cs | 9 +++++++-- .../Basic Tasks/ParticleSystem/SetStartRotation.cs.meta | 16 ++++++++-------- .../Runtime/Basic Tasks/ParticleSystem/SetStartSize.cs | 9 +++++++-- .../Basic Tasks/ParticleSystem/SetStartSize.cs.meta | 16 ++++++++-------- .../Runtime/Basic Tasks/ParticleSystem/SetStartSpeed.cs | 9 +++++++-- .../Basic Tasks/ParticleSystem/SetStartSpeed.cs.meta | 16 ++++++++-------- .../Runtime/Basic Tasks/ParticleSystem/SetTime.cs.meta | 16 ++++++++-------- .../Runtime/Basic Tasks/ParticleSystem/Simulate.cs.meta | 16 ++++++++-------- .../Runtime/Basic Tasks/ParticleSystem/Stop.cs.meta | 16 ++++++++-------- 50 files changed, 332 insertions(+), 277 deletions(-) (limited to 'Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem') diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/Clear.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/Clear.cs.meta index 63db0e0c..0d63507c 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/Clear.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/Clear.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: de273e542591d5946a8728190438ae27 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: de273e542591d5946a8728190438ae27 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetDuration.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetDuration.cs index 304497d5..11b464f6 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetDuration.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetDuration.cs @@ -31,7 +31,11 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityParticleSystem return TaskStatus.Failure; } +#if UNITY_5_0 || UNITY_5_1 || UNITY_5_2 || UNITY_5_3 || UNITY_5_4 + storeResult.Value = particleSystem.duration; +#else storeResult.Value = particleSystem.main.duration; +#endif return TaskStatus.Success; } diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetDuration.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetDuration.cs.meta index f41e7cee..f7358036 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetDuration.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetDuration.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: 02a4d610e82f1854c87701c4d51957fb -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: 02a4d610e82f1854c87701c4d51957fb +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetEmissionRate.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetEmissionRate.cs index c13c0470..fa9cacfd 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetEmissionRate.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetEmissionRate.cs @@ -31,7 +31,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityParticleSystem return TaskStatus.Failure; } -#if !(UNITY_4_6 || UNITY_4_7 || UNITY_5_0 || UNITY_5_1 || UNITY_5_2) +#if !(UNITY_5_0 || UNITY_5_1 || UNITY_5_2) Debug.Log("Warning: GetEmissionRate is not used in Unity 5.3 or later."); #else storeResult.Value = particleSystem.emissionRate; diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetEmissionRate.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetEmissionRate.cs.meta index 1658d847..cc913cac 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetEmissionRate.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetEmissionRate.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: 3adb98115d27ec64da9b5f56391570be -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: 3adb98115d27ec64da9b5f56391570be +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetEnableEmission.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetEnableEmission.cs index f0a01b0e..a8fb895f 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetEnableEmission.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetEnableEmission.cs @@ -31,7 +31,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityParticleSystem return TaskStatus.Failure; } -#if !(UNITY_4_6 || UNITY_4_7 || UNITY_5_0 || UNITY_5_1 || UNITY_5_2) +#if !(UNITY_5_0 || UNITY_5_1 || UNITY_5_2) storeResult.Value = particleSystem.emission.enabled; #else storeResult.Value = particleSystem.enableEmission; diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetEnableEmission.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetEnableEmission.cs.meta index e894a6e4..0b610196 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetEnableEmission.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetEnableEmission.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: 81dc1a241a2c872409a7919742df7581 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: 81dc1a241a2c872409a7919742df7581 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetGravityModifier.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetGravityModifier.cs index d967061a..e62f6cf9 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetGravityModifier.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetGravityModifier.cs @@ -1,3 +1,4 @@ +#if UNITY_5_0 || UNITY_5_1 || UNITY_5_2 || UNITY_5_3 || UNITY_5_4 using UnityEngine; namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityParticleSystem @@ -31,7 +32,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityParticleSystem return TaskStatus.Failure; } - storeResult.Value = particleSystem.main.gravityModifierMultiplier; + storeResult.Value = particleSystem.duration; return TaskStatus.Success; } @@ -42,4 +43,5 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityParticleSystem storeResult = 0; } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetGravityModifier.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetGravityModifier.cs.meta index 3412f534..f90ded87 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetGravityModifier.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetGravityModifier.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: 7001d2ab41ef4e64190afc7f9bce1876 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: 7001d2ab41ef4e64190afc7f9bce1876 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetLoop.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetLoop.cs index aea4858e..25c0f4d8 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetLoop.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetLoop.cs @@ -31,7 +31,11 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityParticleSystem return TaskStatus.Failure; } +#if UNITY_5_0 || UNITY_5_1 || UNITY_5_2 || UNITY_5_3 || UNITY_5_4 + storeResult.Value = particleSystem.loop; +#else storeResult.Value = particleSystem.main.loop; +#endif return TaskStatus.Success; } diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetLoop.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetLoop.cs.meta index bfa703a0..f2956bbc 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetLoop.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetLoop.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: 82f4ee8cf50887a4488fe6d0da18afc0 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: 82f4ee8cf50887a4488fe6d0da18afc0 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetMaxParticles.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetMaxParticles.cs index 7e71ccc0..55bdbf91 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetMaxParticles.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetMaxParticles.cs @@ -31,7 +31,11 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityParticleSystem return TaskStatus.Failure; } +#if UNITY_5_0 || UNITY_5_1 || UNITY_5_2 || UNITY_5_3 || UNITY_5_4 + storeResult.Value = particleSystem.maxParticles; +#else storeResult.Value = particleSystem.main.maxParticles; +#endif return TaskStatus.Success; } diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetMaxParticles.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetMaxParticles.cs.meta index 8e026028..cfff2dd9 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetMaxParticles.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetMaxParticles.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: 429771af65df81c49aaf4b34630473fe -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: 429771af65df81c49aaf4b34630473fe +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetParticleCount.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetParticleCount.cs.meta index c1cfbc05..ec3fba0a 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetParticleCount.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetParticleCount.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: f32e2ff9de4ff7b47a256ac3b51123c6 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: f32e2ff9de4ff7b47a256ac3b51123c6 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetPlaybackSpeed.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetPlaybackSpeed.cs index 37b3e620..94b0a689 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetPlaybackSpeed.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetPlaybackSpeed.cs @@ -31,7 +31,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityParticleSystem return TaskStatus.Failure; } - storeResult.Value = particleSystem.main.simulationSpeed; + storeResult.Value = particleSystem.playbackSpeed; return TaskStatus.Success; } diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetPlaybackSpeed.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetPlaybackSpeed.cs.meta index 12e27063..a053e818 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetPlaybackSpeed.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetPlaybackSpeed.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: f8f29f170ac706b498e7c933136d8036 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: f8f29f170ac706b498e7c933136d8036 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetTime.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetTime.cs.meta index 0cd924dc..8a1d8551 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetTime.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/GetTime.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: 9b15c7efbf98f7649adf8dd4474b0579 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: 9b15c7efbf98f7649adf8dd4474b0579 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/IsAlive.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/IsAlive.cs.meta index aa294a13..725336ec 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/IsAlive.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/IsAlive.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: 3d554784e9a9fa040a2446402ba3f10e -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: 3d554784e9a9fa040a2446402ba3f10e +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/IsPaused.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/IsPaused.cs.meta index 00a5c85f..cce6df0d 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/IsPaused.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/IsPaused.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: e4e9ab132f20dfa4095b3c90303ebf74 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: e4e9ab132f20dfa4095b3c90303ebf74 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/IsPlaying.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/IsPlaying.cs.meta index d3f13e4d..9f3cb6a8 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/IsPlaying.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/IsPlaying.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: 654b51e99f64bfb489e12866a569f00e -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: 654b51e99f64bfb489e12866a569f00e +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/IsStopped.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/IsStopped.cs.meta index d0a054fb..61219cd7 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/IsStopped.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/IsStopped.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: c719a7379c22b184380b4e63ccdfd064 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: c719a7379c22b184380b4e63ccdfd064 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/Pause.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/Pause.cs.meta index d6e60239..da4922e6 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/Pause.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/Pause.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: c9c9cc56691817b49af4fd1cfbc3e363 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: c9c9cc56691817b49af4fd1cfbc3e363 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/Play.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/Play.cs.meta index 276c73c4..3d9a8d42 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/Play.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/Play.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: a8ffb889d35074d4fb08d8502155c0b2 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: a8ffb889d35074d4fb08d8502155c0b2 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetEmissionRate.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetEmissionRate.cs index c0d7a6d4..a18c1266 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetEmissionRate.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetEmissionRate.cs @@ -30,7 +30,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityParticleSystem return TaskStatus.Failure; } -#if !(UNITY_4_6 || UNITY_4_7 || UNITY_5_0 || UNITY_5_1 || UNITY_5_2) +#if !(UNITY_5_0 || UNITY_5_1 || UNITY_5_2) Debug.Log("Warning: SetEmissionRate is not used in Unity 5.3 or later."); #else particleSystem.emissionRate = emissionRate.Value; diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetEmissionRate.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetEmissionRate.cs.meta index ac56602a..2b47f82e 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetEmissionRate.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetEmissionRate.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: a8300eee629ad77419f2eb91477a0b62 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: a8300eee629ad77419f2eb91477a0b62 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetEnableEmission.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetEnableEmission.cs index 1c47207e..99b2e0b8 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetEnableEmission.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetEnableEmission.cs @@ -30,7 +30,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityParticleSystem return TaskStatus.Failure; } -#if !(UNITY_4_6 || UNITY_4_7 || UNITY_5_0 || UNITY_5_1 || UNITY_5_2) +#if !(UNITY_5_0 || UNITY_5_1 || UNITY_5_2) var emission = particleSystem.emission; emission.enabled = enable.Value; #else diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetEnableEmission.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetEnableEmission.cs.meta index d5d77a69..f3d412e2 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetEnableEmission.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetEnableEmission.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: f7c295b4d24628146a885d21bf699993 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: f7c295b4d24628146a885d21bf699993 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetGravityModifier.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetGravityModifier.cs index 1082989d..835992d8 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetGravityModifier.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetGravityModifier.cs @@ -1,3 +1,4 @@ +#if UNITY_5_0 || UNITY_5_1 || UNITY_5_2 || UNITY_5_3 || UNITY_5_4 using UnityEngine; namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityParticleSystem @@ -29,9 +30,9 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityParticleSystem Debug.LogWarning("ParticleSystem is null"); return TaskStatus.Failure; } - ParticleSystem.MainModule main = particleSystem.main; - main.gravityModifierMultiplier = gravityModifier.Value; - //particleSystem.main = main; + + particleSystem.gravityModifier = gravityModifier.Value; + return TaskStatus.Success; } @@ -41,4 +42,5 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityParticleSystem gravityModifier = 0; } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetGravityModifier.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetGravityModifier.cs.meta index 8337a101..1ab4f880 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetGravityModifier.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetGravityModifier.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: c1a6694791042df4ea2097a2508bd8de -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: c1a6694791042df4ea2097a2508bd8de +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetLoop.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetLoop.cs index 8706fe53..d7ddc25b 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetLoop.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetLoop.cs @@ -29,8 +29,13 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityParticleSystem Debug.LogWarning("ParticleSystem is null"); return TaskStatus.Failure; } - ParticleSystem.MainModule main = particleSystem.main; - main.loop = loop.Value; + +#if UNITY_5_0 || UNITY_5_1 || UNITY_5_2 || UNITY_5_3 || UNITY_5_4 + particleSystem.loop = loop.Value; +#else + ParticleSystem.MainModule mainParticleSystem = particleSystem.main; + mainParticleSystem.loop = loop.Value; +#endif return TaskStatus.Success; } diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetLoop.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetLoop.cs.meta index 169ffad8..3b3736b6 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetLoop.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetLoop.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: b9fa90adc0377cc4592de00e410a4060 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: b9fa90adc0377cc4592de00e410a4060 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetMaxParticles.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetMaxParticles.cs index a1d8730a..1febd125 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetMaxParticles.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetMaxParticles.cs @@ -29,8 +29,12 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityParticleSystem Debug.LogWarning("ParticleSystem is null"); return TaskStatus.Failure; } - ParticleSystem.MainModule main = particleSystem.main; - main.maxParticles = maxParticles.Value; +#if UNITY_5_0 || UNITY_5_1 || UNITY_5_2 || UNITY_5_3 || UNITY_5_4 + particleSystem.maxParticles = maxParticles.Value; +#else + ParticleSystem.MainModule mainParticleSystem = particleSystem.main; + mainParticleSystem.maxParticles = maxParticles.Value; +#endif return TaskStatus.Success; } diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetMaxParticles.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetMaxParticles.cs.meta index 8549f671..d580519a 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetMaxParticles.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetMaxParticles.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: eadca930ad32a404886060ee43e4d802 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: eadca930ad32a404886060ee43e4d802 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetPlaybackSpeed.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetPlaybackSpeed.cs index 0e3d23db..2555a0b0 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetPlaybackSpeed.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetPlaybackSpeed.cs @@ -29,8 +29,8 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityParticleSystem Debug.LogWarning("ParticleSystem is null"); return TaskStatus.Failure; } - ParticleSystem.MainModule main = particleSystem.main; - main.simulationSpeed = playbackSpeed.Value; + + particleSystem.playbackSpeed = playbackSpeed.Value; return TaskStatus.Success; } diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetPlaybackSpeed.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetPlaybackSpeed.cs.meta index 1c0afbdb..16007fa1 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetPlaybackSpeed.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetPlaybackSpeed.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: 8f4d79e34ac8820458a2813895d3962d -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: 8f4d79e34ac8820458a2813895d3962d +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartColor.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartColor.cs index 0af7d9bb..0876771b 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartColor.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartColor.cs @@ -29,8 +29,13 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityParticleSystem Debug.LogWarning("ParticleSystem is null"); return TaskStatus.Failure; } - ParticleSystem.MainModule main = particleSystem.main; - main.startColor = startColor.Value; + +#if UNITY_5_0 || UNITY_5_1 || UNITY_5_2 || UNITY_5_3 || UNITY_5_4 + particleSystem.startColor = startColor.Value; +#else + ParticleSystem.MainModule mainParticleSystem = particleSystem.main; + mainParticleSystem.startColor = startColor.Value; +#endif return TaskStatus.Success; } diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartColor.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartColor.cs.meta index 12432173..ca6b403e 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartColor.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartColor.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: f91be163d0c01ec42bf120c267dcceea -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: f91be163d0c01ec42bf120c267dcceea +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartDelay.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartDelay.cs index f814e540..48ba5390 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartDelay.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartDelay.cs @@ -29,8 +29,13 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityParticleSystem Debug.LogWarning("ParticleSystem is null"); return TaskStatus.Failure; } - ParticleSystem.MainModule main = particleSystem.main; - main.startDelayMultiplier = startDelay.Value; + +#if UNITY_5_0 || UNITY_5_1 || UNITY_5_2 || UNITY_5_3 || UNITY_5_4 + particleSystem.startDelay = startDelay.Value; +#else + ParticleSystem.MainModule mainParticleSystem = particleSystem.main; + mainParticleSystem.startDelay = startDelay.Value; +#endif return TaskStatus.Success; } diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartDelay.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartDelay.cs.meta index fb4c01f5..52923748 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartDelay.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartDelay.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: 532026cf3b430c840897e66bdde5006e -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: 532026cf3b430c840897e66bdde5006e +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartLifetime.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartLifetime.cs index 0bfec7a7..0f982345 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartLifetime.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartLifetime.cs @@ -29,8 +29,13 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityParticleSystem Debug.LogWarning("ParticleSystem is null"); return TaskStatus.Failure; } - ParticleSystem.MainModule main = particleSystem.main; - main.startLifetimeMultiplier = startLifetime.Value; + +#if UNITY_5_0 || UNITY_5_1 || UNITY_5_2 || UNITY_5_3 || UNITY_5_4 + particleSystem.startLifetime = startLifetime.Value; +#else + ParticleSystem.MainModule mainParticleSystem = particleSystem.main; + mainParticleSystem.startLifetime = startLifetime.Value; +#endif return TaskStatus.Success; } diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartLifetime.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartLifetime.cs.meta index 361689aa..cc4506dc 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartLifetime.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartLifetime.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: 311b9ed850b4e2243ae44487b9ece819 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: 311b9ed850b4e2243ae44487b9ece819 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartRotation.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartRotation.cs index 404acbf3..668082fa 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartRotation.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartRotation.cs @@ -29,8 +29,13 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityParticleSystem Debug.LogWarning("ParticleSystem is null"); return TaskStatus.Failure; } - ParticleSystem.MainModule main = particleSystem.main; - main.startRotationMultiplier = startRotation.Value; + +#if UNITY_5_0 || UNITY_5_1 || UNITY_5_2 || UNITY_5_3 || UNITY_5_4 + particleSystem.startRotation = startRotation.Value; +#else + ParticleSystem.MainModule mainParticleSystem = particleSystem.main; + mainParticleSystem.startRotation = startRotation.Value; +#endif return TaskStatus.Success; } diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartRotation.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartRotation.cs.meta index c995958e..b2eb21fd 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartRotation.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartRotation.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: ae611ab09913de6438aeb81d7a621c51 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: ae611ab09913de6438aeb81d7a621c51 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartSize.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartSize.cs index bb6667e5..04b0e376 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartSize.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartSize.cs @@ -29,8 +29,13 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityParticleSystem Debug.LogWarning("ParticleSystem is null"); return TaskStatus.Failure; } - ParticleSystem.MainModule main = particleSystem.main; - main.startSizeMultiplier = startSize.Value; + +#if UNITY_5_0 || UNITY_5_1 || UNITY_5_2 || UNITY_5_3 || UNITY_5_4 + particleSystem.startSize = startSize.Value; +#else + ParticleSystem.MainModule mainParticleSystem = particleSystem.main; + mainParticleSystem.startSize = startSize.Value; +#endif return TaskStatus.Success; } diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartSize.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartSize.cs.meta index d697099c..7dc39bf2 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartSize.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartSize.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: d7be6a1da3f4f7a418e5739a6cc6e78e -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: d7be6a1da3f4f7a418e5739a6cc6e78e +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartSpeed.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartSpeed.cs index 6e9b155c..9b834618 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartSpeed.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartSpeed.cs @@ -29,8 +29,13 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityParticleSystem Debug.LogWarning("ParticleSystem is null"); return TaskStatus.Failure; } - ParticleSystem.MainModule main = particleSystem.main; - main.startSpeedMultiplier = startSpeed.Value; + +#if UNITY_5_0 || UNITY_5_1 || UNITY_5_2 || UNITY_5_3 || UNITY_5_4 + particleSystem.startSpeed = startSpeed.Value; +#else + ParticleSystem.MainModule mainParticleSystem = particleSystem.main; + mainParticleSystem.startSpeed = startSpeed.Value; +#endif return TaskStatus.Success; } diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartSpeed.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartSpeed.cs.meta index f87bf954..ed294e2e 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartSpeed.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetStartSpeed.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: b7716318475d3854a96729d1a7540d4a -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: b7716318475d3854a96729d1a7540d4a +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetTime.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetTime.cs.meta index 2788eb15..9ca5aa93 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetTime.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/SetTime.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: 103e78e9c755fe3469e63115eb1c0d80 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: 103e78e9c755fe3469e63115eb1c0d80 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/Simulate.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/Simulate.cs.meta index c703cb24..d1234fd2 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/Simulate.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/Simulate.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: 24d79d661acf61e44918320624b49dd5 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: 24d79d661acf61e44918320624b49dd5 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/Stop.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/Stop.cs.meta index 695ec19d..7c2dc1d0 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/Stop.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/ParticleSystem/Stop.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: fd83617024d6bff44824a83b472db8e6 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: fd83617024d6bff44824a83b472db8e6 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: -- cgit v1.1-26-g67d0