diff --git a/.gitignore b/.gitignore index 62e9dd2..9254df1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,29 @@ -.DS_Store -Temp -Library +# ---------------[ Unity generated ]------------------ # +Temp/ +Obj/ +UnityGenerated/ +Library/ +*.apk + +# ----[ Visual Studio / MonoDevelop generated ]------- # + +ExportedObj/ +*.svd *.userprefs *.csproj -*.sln *.pidb +*.suo +*.sln +*.user +*.unityproj +*.booproj + +# -------------[ OS generated ]------------------------ # +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +Icon? +ehthumbs.db +Thumbs.db \ No newline at end of file diff --git a/Assets/AssetStoreTools.meta b/Assets/AssetStoreTools.meta new file mode 100644 index 0000000..b708c9f --- /dev/null +++ b/Assets/AssetStoreTools.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: aa880cb0363be394988b49f2ac92498d +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/AssetStoreTools/Editor.meta b/Assets/AssetStoreTools/Editor.meta new file mode 100644 index 0000000..ba2e39e --- /dev/null +++ b/Assets/AssetStoreTools/Editor.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: ce88c8a85eb6beb4982a798c5149cd44 +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/AssetStoreTools/Editor/AssetStoreTools.dll.meta b/Assets/AssetStoreTools/Editor/AssetStoreTools.dll.meta new file mode 100644 index 0000000..3e0dd2e --- /dev/null +++ b/Assets/AssetStoreTools/Editor/AssetStoreTools.dll.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c7f8b18d1e2901c4e8e13c504f264fcc +MonoAssemblyImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + userData: diff --git a/Assets/AssetStoreTools/Editor/AssetStoreToolsExtra.dll.meta b/Assets/AssetStoreTools/Editor/AssetStoreToolsExtra.dll.meta new file mode 100644 index 0000000..53c691f --- /dev/null +++ b/Assets/AssetStoreTools/Editor/AssetStoreToolsExtra.dll.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: eed011c279133f441b6450acf4fc31ba +MonoAssemblyImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + userData: diff --git a/Assets/AssetStoreTools/Editor/DroidSansMono.ttf.meta b/Assets/AssetStoreTools/Editor/DroidSansMono.ttf.meta new file mode 100644 index 0000000..411b4f0 --- /dev/null +++ b/Assets/AssetStoreTools/Editor/DroidSansMono.ttf.meta @@ -0,0 +1,14 @@ +fileFormatVersion: 2 +guid: 2ac76bfe82ba7cd479426e6d7dff8ead +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + customCharacters: + fontRenderingMode: 0 + userData: diff --git a/Assets/AssetStoreTools/Editor/icon.png.meta b/Assets/AssetStoreTools/Editor/icon.png.meta new file mode 100644 index 0000000..a3caca8 --- /dev/null +++ b/Assets/AssetStoreTools/Editor/icon.png.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: 30a949e9b971c7a40a86ec38a74b94bc +TextureImporter: + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/Gizmos.meta b/Assets/Gizmos.meta new file mode 100644 index 0000000..027fc39 --- /dev/null +++ b/Assets/Gizmos.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 691f539eb01f6ca429114a2800f4dfd7 +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Gizmos/iTweenIcon.tif.meta b/Assets/Gizmos/iTweenIcon.tif.meta new file mode 100644 index 0000000..a744f27 --- /dev/null +++ b/Assets/Gizmos/iTweenIcon.tif.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: 3f17a7d799695f345a9b5aff9e489d16 +TextureImporter: + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/iTweenEditor.meta b/Assets/iTweenEditor.meta new file mode 100644 index 0000000..7b33bd8 --- /dev/null +++ b/Assets/iTweenEditor.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 484ccf2118bf7d94b94b42cc88d7a10d +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/iTweenEditor/AssetStore.meta b/Assets/iTweenEditor/AssetStore.meta new file mode 100644 index 0000000..1e8fb21 --- /dev/null +++ b/Assets/iTweenEditor/AssetStore.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 24a9dc5abeaabf74880afb989ef587bf +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/iTweenEditor/AssetStore/Screenshots.meta b/Assets/iTweenEditor/AssetStore/Screenshots.meta new file mode 100644 index 0000000..3c5ac5b --- /dev/null +++ b/Assets/iTweenEditor/AssetStore/Screenshots.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 181715e7fd17f4747b2860b369f9726b +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/iTweenEditor/AssetStore/Screenshots/screenshot1.png.meta b/Assets/iTweenEditor/AssetStore/Screenshots/screenshot1.png.meta new file mode 100644 index 0000000..34ecd44 --- /dev/null +++ b/Assets/iTweenEditor/AssetStore/Screenshots/screenshot1.png.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: 82eaae11574b5f94093b69bd82252172 +TextureImporter: + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/iTweenEditor/AssetStore/asset_store.json.meta b/Assets/iTweenEditor/AssetStore/asset_store.json.meta new file mode 100644 index 0000000..02e2201 --- /dev/null +++ b/Assets/iTweenEditor/AssetStore/asset_store.json.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: f7d63ce75b3022946a0747307cdb9376 +TextScriptImporter: + userData: diff --git a/Assets/iTweenEditor/AssetStore/big.png.meta b/Assets/iTweenEditor/AssetStore/big.png.meta new file mode 100644 index 0000000..aef7e14 --- /dev/null +++ b/Assets/iTweenEditor/AssetStore/big.png.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: 0f20d365e8ea7a34e9180dc25f7023bc +TextureImporter: + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/iTweenEditor/AssetStore/icon.png.meta b/Assets/iTweenEditor/AssetStore/icon.png.meta new file mode 100644 index 0000000..933f834 --- /dev/null +++ b/Assets/iTweenEditor/AssetStore/icon.png.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: cdd7f08e21c1bc745bcd392647f1742a +TextureImporter: + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/iTweenEditor/AssetStore/medium.png.meta b/Assets/iTweenEditor/AssetStore/medium.png.meta new file mode 100644 index 0000000..56a15a7 --- /dev/null +++ b/Assets/iTweenEditor/AssetStore/medium.png.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: ca2bcf179aa552a4d8a8c7e932c6545b +TextureImporter: + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/iTweenEditor/AssetStore/small.png.meta b/Assets/iTweenEditor/AssetStore/small.png.meta new file mode 100644 index 0000000..0114aed --- /dev/null +++ b/Assets/iTweenEditor/AssetStore/small.png.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: fde98c85d260229438f190e8c02ca943 +TextureImporter: + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/iTweenEditor/Editor.meta b/Assets/iTweenEditor/Editor.meta new file mode 100644 index 0000000..61f1211 --- /dev/null +++ b/Assets/iTweenEditor/Editor.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 957c8c3723de98c438bb0eb985dd4be1 +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/iTweenEditor/Editor/iTweenEventDataEditor.cs.meta b/Assets/iTweenEditor/Editor/iTweenEventDataEditor.cs.meta new file mode 100644 index 0000000..359c79b --- /dev/null +++ b/Assets/iTweenEditor/Editor/iTweenEventDataEditor.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d7719b439069bf742bbc593e98a3c3d4 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Assets/iTweenEditor/Editor/iTweenPathEditor.cs b/Assets/iTweenEditor/Editor/iTweenPathEditor.cs index bf1d385..b86142f 100644 --- a/Assets/iTweenEditor/Editor/iTweenPathEditor.cs +++ b/Assets/iTweenEditor/Editor/iTweenPathEditor.cs @@ -81,15 +81,26 @@ void OnSceneGUI(){ if(_target.enabled) { // dkoontz if(_target.nodes.Count > 0){ //allow path adjustment undo: - Undo.SetSnapshotTarget(_target,"Adjust iTween Path"); - + Undo.RecordObject(_target,"Adjust iTween Path"); + + //parent. + Handles.Label(_target.transform.position, "'" + _target.pathName + "' Parent", style); + + //path begin and end labels: - Handles.Label(_target.nodes[0], "'" + _target.pathName + "' Begin", style); - Handles.Label(_target.nodes[_target.nodes.Count-1], "'" + _target.pathName + "' End", style); - + Vector3 labb = _target.transform.TransformPoint(_target.nodes[0]); + Vector3 labe = _target.transform.TransformPoint(_target.nodes[_target.nodes.Count-1]); + Handles.Label(labb, "'" + _target.pathName + "' Begin", style); + Handles.Label(labe, "'" + _target.pathName + "' End", style); + //node handle display: - for (int i = 0; i < _target.nodes.Count; i++) { - _target.nodes[i] = Handles.PositionHandle(_target.nodes[i], Quaternion.identity); + for (int i = 0; i < _target.nodes.Count; i++) + { + Vector3 fp = _target.transform.TransformPoint(_target.nodes[i]); + //_target.nodes[i] = Handles.PositionHandle(fp, _target.transform.rotation); + + Vector3 ivp = Handles.PositionHandle(fp, _target.transform.rotation); + _target.nodes[i] = _target.transform.InverseTransformPoint(ivp); } } } // dkoontz diff --git a/Assets/iTweenEditor/Editor/iTweenPathEditor.cs.meta b/Assets/iTweenEditor/Editor/iTweenPathEditor.cs.meta new file mode 100644 index 0000000..1b4e8ba --- /dev/null +++ b/Assets/iTweenEditor/Editor/iTweenPathEditor.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a55ba16351a161b4793f70723f944e38 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Assets/iTweenEditor/Examples.meta b/Assets/iTweenEditor/Examples.meta new file mode 100644 index 0000000..1af486c --- /dev/null +++ b/Assets/iTweenEditor/Examples.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 63a80e069f0c0294ab0be4e3bad8162b +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/iTweenEditor/Examples/NewBehaviourScript.cs b/Assets/iTweenEditor/Examples/NewBehaviourScript.cs new file mode 100644 index 0000000..4388c45 --- /dev/null +++ b/Assets/iTweenEditor/Examples/NewBehaviourScript.cs @@ -0,0 +1,52 @@ +using UnityEngine; +using System.Collections; +using System.Collections.Generic; + +public class NewBehaviourScript : MonoBehaviour { + + public List pathname = new List(); + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + } + + void tweenstart() + { + iTweenEvent it = (iTweenEvent)gameObject.GetComponent(); + + foreach (iTweenPath itp in it.paths) + { + Debug.Log(itp.pathName); + + } + Debug.Log("tween tweenstart!!"); + } + + void tweenfinish() + { + iTweenEvent it = (iTweenEvent)gameObject.GetComponent(); + + foreach (iTweenPath itp in it.paths) + { + Debug.Log(itp.pathName); + + } + + //跑完換路徑. + if (it.Values.ContainsKey("path")) + { + if (it.Values["path"].GetType() == typeof(string)) + { + it.Values["path"] = "New Path 1"; + } + } + + it.Play(); + Debug.Log("tween finish!!"); + } +} diff --git a/Assets/iTweenEditor/Examples/NewBehaviourScript.cs.meta b/Assets/iTweenEditor/Examples/NewBehaviourScript.cs.meta new file mode 100644 index 0000000..6c17f2c --- /dev/null +++ b/Assets/iTweenEditor/Examples/NewBehaviourScript.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: af5e98d5e35c18546aef2af74cba276e +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Assets/iTweenEditor/Examples/Path Test.unity b/Assets/iTweenEditor/Examples/Path Test.unity index ed0872b..19a628c 100644 Binary files a/Assets/iTweenEditor/Examples/Path Test.unity and b/Assets/iTweenEditor/Examples/Path Test.unity differ diff --git a/Assets/iTweenEditor/Examples/Path Test.unity.meta b/Assets/iTweenEditor/Examples/Path Test.unity.meta new file mode 100644 index 0000000..963eb0f --- /dev/null +++ b/Assets/iTweenEditor/Examples/Path Test.unity.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: d014e5a25d420b440932825b62c65f93 +DefaultImporter: + userData: diff --git a/Assets/iTweenEditor/Examples/StartAndStopATween.unity.meta b/Assets/iTweenEditor/Examples/StartAndStopATween.unity.meta new file mode 100644 index 0000000..7f46c3b --- /dev/null +++ b/Assets/iTweenEditor/Examples/StartAndStopATween.unity.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: e865a12fecdb7064a84a29c105776a6e +DefaultImporter: + userData: diff --git a/Assets/iTweenEditor/Examples/StartAndStopTween.cs.meta b/Assets/iTweenEditor/Examples/StartAndStopTween.cs.meta new file mode 100644 index 0000000..4c4a407 --- /dev/null +++ b/Assets/iTweenEditor/Examples/StartAndStopTween.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 71dde84167cf0c64e820788223759545 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Assets/iTweenEditor/Gizmos.meta b/Assets/iTweenEditor/Gizmos.meta new file mode 100644 index 0000000..1fe8d3c --- /dev/null +++ b/Assets/iTweenEditor/Gizmos.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: a2ad30ff7d015bc42b1baa3349ed60d6 +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/iTweenEditor/Gizmos/iTweenIcon.tif.meta b/Assets/iTweenEditor/Gizmos/iTweenIcon.tif.meta new file mode 100644 index 0000000..9f653fc --- /dev/null +++ b/Assets/iTweenEditor/Gizmos/iTweenIcon.tif.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: 78b46f01290def945b6d115a103b7220 +TextureImporter: + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/iTweenEditor/Helper Classes.meta b/Assets/iTweenEditor/Helper Classes.meta new file mode 100644 index 0000000..2d9d7a8 --- /dev/null +++ b/Assets/iTweenEditor/Helper Classes.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 465155f9b35f51b4ab310c487bdc3c72 +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/iTweenEditor/Helper Classes/EventParamMappings.cs b/Assets/iTweenEditor/Helper Classes/EventParamMappings.cs index c7990df..3ba53ac 100644 --- a/Assets/iTweenEditor/Helper Classes/EventParamMappings.cs +++ b/Assets/iTweenEditor/Helper Classes/EventParamMappings.cs @@ -660,6 +660,7 @@ static EventParamMappings() { mappings[iTweenEvent.TweenType.ShakePosition]["x"] = typeof(float); mappings[iTweenEvent.TweenType.ShakePosition]["y"] = typeof(float); mappings[iTweenEvent.TweenType.ShakePosition]["z"] = typeof(float); + mappings[iTweenEvent.TweenType.ShakePosition]["islocal"] = typeof(bool); mappings[iTweenEvent.TweenType.ShakePosition]["space"] = typeof(Space); mappings[iTweenEvent.TweenType.ShakePosition]["orienttopath"] = typeof(bool); mappings[iTweenEvent.TweenType.ShakePosition]["looktarget"] = typeof(Vector3OrTransform); diff --git a/Assets/iTweenEditor/Helper Classes/EventParamMappings.cs.meta b/Assets/iTweenEditor/Helper Classes/EventParamMappings.cs.meta new file mode 100644 index 0000000..b46cb1d --- /dev/null +++ b/Assets/iTweenEditor/Helper Classes/EventParamMappings.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1188ae0909388a645a1634fa1d571699 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Assets/iTweenEditor/Helper Classes/Vector3OrTransform.cs.meta b/Assets/iTweenEditor/Helper Classes/Vector3OrTransform.cs.meta new file mode 100644 index 0000000..3faf54e --- /dev/null +++ b/Assets/iTweenEditor/Helper Classes/Vector3OrTransform.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 667c25031f744594fbcf07aff8e463fd +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Assets/iTweenEditor/Helper Classes/Vector3OrTransformArray.cs.meta b/Assets/iTweenEditor/Helper Classes/Vector3OrTransformArray.cs.meta new file mode 100644 index 0000000..db4df19 --- /dev/null +++ b/Assets/iTweenEditor/Helper Classes/Vector3OrTransformArray.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ed061a0857cbdf74a8547926dc8febcc +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Assets/iTweenEditor/README.txt b/Assets/iTweenEditor/README.txt index b7696ac..5e7a58d 100644 --- a/Assets/iTweenEditor/README.txt +++ b/Assets/iTweenEditor/README.txt @@ -1,9 +1,13 @@ -iTween Visual Editor version 0.6.0 +iTween Visual Editor version 0.6.1 After installation, if you have a Javascript based project it is highly recommended that you run the "Component/iTween/Prepare Visual Editor for Javascript Usage" command. This will copy files into your Plugins directory which is necessary for the visual editor events to be called from Javascript. C# based projects require no further configuration. Release History =============== +0.6.1 ==== + +Added Stop method to iTweenEvent. Improved display of boolean values. + 0.6.0 ==== Fixed warnings resulting from API changes in Unity 3.4. Fixed error where bool fields could pass the wrong value. Updated bundled iTween version to 2.0.45.1. Made initial delay field always show, even when 'Play Automatically' was not selected. diff --git a/Assets/iTweenEditor/README.txt.meta b/Assets/iTweenEditor/README.txt.meta new file mode 100644 index 0000000..16e249f --- /dev/null +++ b/Assets/iTweenEditor/README.txt.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: b6962acdd91f8224a85c73a455586855 +TextScriptImporter: + userData: diff --git a/Assets/iTweenEditor/iTween.cs b/Assets/iTweenEditor/iTween.cs index 44972ca..b2228c2 100644 --- a/Assets/iTweenEditor/iTween.cs +++ b/Assets/iTweenEditor/iTween.cs @@ -3865,7 +3865,7 @@ void GenerateShakePositionTargets(){ vector3s[3] = transform.eulerAngles; //root: - vector3s[0]=transform.position; + vector3s[0] = isLocal ? transform.localPosition : transform.position; //amount: if (tweenArguments.Contains("amount")) { diff --git a/Assets/iTweenEditor/iTween.cs.meta b/Assets/iTweenEditor/iTween.cs.meta new file mode 100644 index 0000000..ac305f8 --- /dev/null +++ b/Assets/iTweenEditor/iTween.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4740e8983828c7744b9f798874df89b5 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Assets/iTweenEditor/iTweenEvent.cs b/Assets/iTweenEditor/iTweenEvent.cs index d16650c..c210d4a 100755 --- a/Assets/iTweenEditor/iTweenEvent.cs +++ b/Assets/iTweenEditor/iTweenEvent.cs @@ -134,7 +134,7 @@ public Dictionary Values { bool[] bools; [SerializeField] - string[] strings; + public string[] strings; [SerializeField] Vector3[] vector3s; @@ -168,9 +168,9 @@ public Dictionary Values { [SerializeField] ArrayIndexes[] transformArrays; - + [SerializeField] - iTweenPath[] paths; + public iTweenPath[] paths; Dictionary values; bool stopped; @@ -209,8 +209,14 @@ IEnumerator StartEvent() { var optionsHash = new Hashtable(); foreach(var pair in Values) { - if("path" == pair.Key && pair.Value.GetType() == typeof(string)) optionsHash.Add(pair.Key, iTweenPath.GetPath((string)pair.Value)); - else optionsHash.Add(pair.Key, pair.Value); + if("path" == pair.Key && pair.Value.GetType() == typeof(string)) + { + optionsHash.Add(pair.Key, iTweenPath.GetPath((string)pair.Value)); + } + else + { + optionsHash.Add(pair.Key, pair.Value); + } } // We use the internalName to have a unique identifier to stop the tween diff --git a/Assets/iTweenEditor/iTweenEvent.cs.meta b/Assets/iTweenEditor/iTweenEvent.cs.meta new file mode 100644 index 0000000..f3e5650 --- /dev/null +++ b/Assets/iTweenEditor/iTweenEvent.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 514a3e9553204ae45827b00f7515ca00 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Assets/iTweenEditor/iTweenPath.cs b/Assets/iTweenEditor/iTweenPath.cs index 3ad44c9..99e47c5 100644 --- a/Assets/iTweenEditor/iTweenPath.cs +++ b/Assets/iTweenEditor/iTweenPath.cs @@ -12,23 +12,47 @@ public class iTweenPath : MonoBehaviour public static Dictionary paths = new Dictionary(); public bool initialized = false; public string initialName = ""; - + + void Update() + { + + + } + void OnEnable(){ - paths.Add(pathName.ToLower(), this); + //paths.Add(pathName.ToLower(), this); + paths[pathName.ToLower()] = this; } void OnDrawGizmosSelected(){ if(enabled) { // dkoontz - if(nodes.Count > 0){ - iTween.DrawPath(nodes.ToArray(), pathColor); + if(nodes.Count > 0) + { + List li = new List(); + for (int i = 0; i < nodes.Count; i++) + { + Vector3 v3 = transform.TransformPoint(nodes[i]); + li.Add(v3); + } + //iTween.DrawPath(nodes.ToArray(), pathColor); + iTween.DrawPath(li.ToArray(), pathColor); + } } // dkoontz } public static Vector3[] GetPath(string requestedName){ requestedName = requestedName.ToLower(); - if(paths.ContainsKey(requestedName)){ - return paths[requestedName].nodes.ToArray(); + if(paths.ContainsKey(requestedName)) + { + List outlist = new List(); + for (int i = 0; i < paths[requestedName].nodes.Count; i++) + { + Vector3 newval = paths[requestedName].transform.TransformPoint(paths[requestedName].nodes[i]); + outlist.Add(newval); + } + //return paths[requestedName].nodes.ToArray(); + return outlist.ToArray(); }else{ Debug.Log("No path with that name exists! Are you sure you wrote it correctly?"); return null; diff --git a/Assets/iTweenEditor/iTweenPath.cs.meta b/Assets/iTweenEditor/iTweenPath.cs.meta new file mode 100644 index 0000000..7fc017c --- /dev/null +++ b/Assets/iTweenEditor/iTweenPath.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d5d6e90fada9935498d6674da544dd05 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset new file mode 100644 index 0000000..afa86fb Binary files /dev/null and b/ProjectSettings/GraphicsSettings.asset differ diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset new file mode 100644 index 0000000..05162dd Binary files /dev/null and b/ProjectSettings/Physics2DSettings.asset differ diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index ec7448d..66a3036 100644 Binary files a/ProjectSettings/ProjectSettings.asset and b/ProjectSettings/ProjectSettings.asset differ