diff --git a/.gitignore b/.gitignore index f8a174e..3a425c5 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,4 @@ zzTestBuilds *.pdb UnityTests.Unity5BETA -Unity_Marketing_Pamphlet.pdf \ No newline at end of file +biz \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/UnityVS.meta b/UnityTests.Unity5/Assets/UnityVS.meta deleted file mode 100644 index 9e28a46..0000000 --- a/UnityTests.Unity5/Assets/UnityVS.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 02fe78e962405814a83b8ba6c9471d32 -folderAsset: yes -timeCreated: 1439628445 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/UnityVS/Editor.meta b/UnityTests.Unity5/Assets/UnityVS/Editor.meta deleted file mode 100644 index 0d09b28..0000000 --- a/UnityTests.Unity5/Assets/UnityVS/Editor.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 6e71a3e2fb5854e43823a9da25b68e21 -folderAsset: yes -timeCreated: 1439628445 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll b/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll deleted file mode 100644 index e2f5f17..0000000 Binary files a/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll and /dev/null differ diff --git a/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll.meta b/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll.meta deleted file mode 100644 index 6a2e6d4..0000000 --- a/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll.meta +++ /dev/null @@ -1 +0,0 @@ -guid: 38d405c119fcc7c4e83d4a478a40ff2f diff --git a/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll b/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll deleted file mode 100644 index c7cd0a9..0000000 Binary files a/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll and /dev/null differ diff --git a/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll.meta b/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll.meta deleted file mode 100644 index 19d28ec..0000000 --- a/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll.meta +++ /dev/null @@ -1 +0,0 @@ -guid: 4ad02dc83da735c4e8d945332b9202f6 diff --git a/UnityTests.Unity5/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll b/UnityTests.Unity5/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll deleted file mode 100644 index e9018e2..0000000 Binary files a/UnityTests.Unity5/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll and /dev/null differ diff --git a/UnityTests.Unity5/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta b/UnityTests.Unity5/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta deleted file mode 100644 index 1378fd7..0000000 --- a/UnityTests.Unity5/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta +++ /dev/null @@ -1,20 +0,0 @@ -fileFormatVersion: 2 -guid: 42c12149efdc035458bffa42058b9a04 -timeCreated: 1439628452 -licenseType: Free -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - platformData: - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_DOTween Examples/Shake.unity b/UnityTests.Unity5/Assets/_DOTween Examples/Shake.unity new file mode 100644 index 0000000..dc34ea3 Binary files /dev/null and b/UnityTests.Unity5/Assets/_DOTween Examples/Shake.unity differ diff --git a/UnityTests.Unity5/Assets/_DOTween Examples/Shake.unity.meta b/UnityTests.Unity5/Assets/_DOTween Examples/Shake.unity.meta new file mode 100644 index 0000000..f8daca9 --- /dev/null +++ b/UnityTests.Unity5/Assets/_DOTween Examples/Shake.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aee9a8210ca82c3439f4dd5bc03d2506 +timeCreated: 1496055090 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_DOTween Examples/ShakeExample.cs b/UnityTests.Unity5/Assets/_DOTween Examples/ShakeExample.cs new file mode 100644 index 0000000..6006632 --- /dev/null +++ b/UnityTests.Unity5/Assets/_DOTween Examples/ShakeExample.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using DG.Tweening; +using UnityEngine; + +public class ShakeExample : MonoBehaviour +{ + public Transform target; + public Tween shakeTween; + + void Start() + { + // Create the tween (using default values) + shakeTween = target.DOShakePosition(1.5f).SetAutoKill(false).Pause(); + } + + // Called by UI button + public void Shake() + { + shakeTween.Restart(); + } +} \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/_DOTween Examples/ShakeExample.cs.meta b/UnityTests.Unity5/Assets/_DOTween Examples/ShakeExample.cs.meta new file mode 100644 index 0000000..9995ed0 --- /dev/null +++ b/UnityTests.Unity5/Assets/_DOTween Examples/ShakeExample.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 2b1c898c63fb9874d93e1dbafd15dd0b +timeCreated: 1496055165 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_Tests/TempTests.cs b/UnityTests.Unity5/Assets/_Tests/TempTests.cs index e6e5fbb..3ade694 100644 --- a/UnityTests.Unity5/Assets/_Tests/TempTests.cs +++ b/UnityTests.Unity5/Assets/_Tests/TempTests.cs @@ -10,31 +10,9 @@ using UnityEngine; public class TempTests : BrainBase { public Transform target; - Tween myTween; - bool aBool; void Start() { - DOTween.Init(); - this.StartCoroutine(COUpdate()); - } - - IEnumerator COUpdate() - { - yield return null; - yield return null; - target.DOMoveX(2, 7); - yield return null; - // for (int i = 0; i < 1000; ++i) target.DOMoveX(2, 7).OnComplete(ACallback); - // for (int i = 0; i < 1000; ++i) target.DOMoveX(2, 7).OnComplete(()=> aBool = true); - target.DOMoveX(2, 7).OnComplete(()=> aBool = true); - // myTween.Kill(); - // myTween = target.DOMoveX(2, 1); - // myTween.OnComplete(ACallback); - } - - void ACallback() - { - Debug.Log("DO SOMETHING"); + target.DOShakeScale(2, 0.15f, 10, 90f, true); } } \ No newline at end of file diff --git a/UnityTests.Unity5/ProjectSettings/ProjectVersion.txt b/UnityTests.Unity5/ProjectSettings/ProjectVersion.txt index ca09a3d..6e4d03d 100644 --- a/UnityTests.Unity5/ProjectSettings/ProjectVersion.txt +++ b/UnityTests.Unity5/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 5.6.0f3 +m_EditorVersion: 5.6.1f1