Unity 3.5 is no longer supported. Verified works with Unity 4.2.

This commit is contained in:
NathanSweet 2013-08-03 10:33:56 +02:00
parent 4bed95f1b0
commit f9d538d6e7
67 changed files with 54 additions and 71 deletions

4
.gitignore vendored
View File

@ -48,9 +48,7 @@ spine-unity/*.sln
*.pidb
Assembly-*.csproj
Assembly-*.pidb
spine-unity4
spine-unity3
spine-unity4-tk2d
spine-unity-test*
spine-corona/spine-lua/
!spine-corona/spine-lua/Place spine-lua here.txt

View File

@ -1,2 +1,5 @@
fileFormatVersion: 2
guid: 89dad76e10ea944ee9f29109535294be
folderAsset: yes
DefaultImporter:
userData:

View File

@ -1,2 +1,5 @@
fileFormatVersion: 2
guid: 65ba3309ea8c447678ade95f3fa398da
folderAsset: yes
DefaultImporter:
userData:

View File

@ -1,2 +1,5 @@
fileFormatVersion: 2
guid: 3ac78ae082927411cba77d73efde27d4
folderAsset: yes
DefaultImporter:
userData:

View File

@ -5,3 +5,4 @@ MonoImporter:
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:

View File

@ -5,3 +5,4 @@ MonoImporter:
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:

View File

@ -5,3 +5,4 @@ MonoImporter:
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:

View File

@ -5,3 +5,4 @@ MonoImporter:
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:

View File

@ -1,2 +1,5 @@
fileFormatVersion: 2
guid: c6674329008ae4c65a7b7e8f1b2a6523
folderAsset: yes
DefaultImporter:
userData:

View File

@ -5,3 +5,4 @@ MonoImporter:
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:

View File

@ -172,8 +172,11 @@ public class SkeletonComponent : MonoBehaviour {
}
public virtual void OnDisable () {
if (Application.isEditor)
#region Unity Editor
#if UNITY_EDITOR
Clear();
#endif
#endregion
}
public virtual void Reset () {

View File

@ -5,3 +5,4 @@ MonoImporter:
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:

View File

@ -5,3 +5,4 @@ MonoImporter:
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:

View File

@ -1,2 +1,5 @@
fileFormatVersion: 2
guid: 1b62d1da83172ed4f9bfc9077b196f79
folderAsset: yes
DefaultImporter:
userData:

View File

@ -1,2 +1,5 @@
fileFormatVersion: 2
guid: b41395738f68d4fbba8311d333db62b1
folderAsset: yes
DefaultImporter:
userData:

View File

@ -1,2 +1,5 @@
fileFormatVersion: 2
guid: 1e8a610c9e01c3648bac42585e5fc676
ShaderImporter:
defaultTextures: []
userData:

View File

@ -1,2 +1,5 @@
fileFormatVersion: 2
guid: e6712a5a0c05f9f4092f9a3197925e99
folderAsset: yes
DefaultImporter:
userData:

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 97269dddd903cfd469a75f320a0cef8f

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 4e70126bb9873e841b4935b7275730cc

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 618309bc7071d724ca2dbfd70e14feef

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 78ac5e44b15e8a7418ea5313951ea050

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 3f474a0bd32d8d448afdbe538067b5a7

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: a8b1d5a7e1dcd0e42aee4a2ec763e0d0

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: e85fe6096a7d7004b8ad22a2b4aa2e39

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 2150a1de0cb69654980ea6c7bdf4fc52

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: eebba971021a8e44c99cb6d95adbc156

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 3babdb6353ace324fb48964ac5f1f482

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 99868dbcfd4678842b017a745dfcf3c0

View File

@ -1,4 +0,0 @@
fileFormatVersion: 2
guid: c42e48410176c3b43ac8ba8fbb1256d2
DefaultImporter:
userData:

View File

@ -1,40 +0,0 @@
/*******************************************************************************
* Copyright (c) 2013, Esoteric Software
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
using UnityEngine;
using System.Collections;
public class Spineboy : MonoBehaviour {
public void Start () {
SkeletonAnimation skeletonAnimation = GetComponent<SkeletonAnimation>();
skeletonAnimation.state.SetAnimation("walk", true);
}
public void OnMouseDown () {
SkeletonAnimation skeletonAnimation = GetComponent<SkeletonAnimation>();
skeletonAnimation.state.SetAnimation("jump", false);
skeletonAnimation.state.AddAnimation("walk", true);
}
}

View File

@ -1,2 +1,5 @@
fileFormatVersion: 2
guid: 63d11713f97bfe54bb06572e24050ecb
folderAsset: yes
DefaultImporter:
userData:

View File

@ -1,2 +1,4 @@
fileFormatVersion: 2
guid: 7d22747254815624999fd0ab7e8f851c
TextScriptImporter:
userData:

View File

@ -1,2 +1,4 @@
fileFormatVersion: 2
guid: 06f2130f3bf8d4f499a15c55bdcda650
TextScriptImporter:
userData:

View File

@ -19,6 +19,7 @@ TextureImporter:
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 1024
textureSettings:
@ -29,5 +30,7 @@ TextureImporter:
nPOTScale: 1
lightmap: 0
compressionQuality: 50
alphaIsTransparency: 0
textureType: -1
buildTargetSettings: []
userData:

View File

@ -1,2 +1,4 @@
fileFormatVersion: 2
guid: a42989bcd9f91aa49a56dc67cf27b96a
TextScriptImporter:
userData:

View File

@ -1,2 +1,4 @@
fileFormatVersion: 2
guid: b84c2137744fea946bde0d5cd51e4e3d
TextScriptImporter:
userData:

View File

@ -30,6 +30,7 @@ TextureImporter:
nPOTScale: 1
lightmap: 0
compressionQuality: 50
alphaIsTransparency: 0
textureType: -1
buildTargetSettings: []
userData:

View File

@ -1,4 +1,5 @@
fileFormatVersion: 2
guid: 6982507deb28dc243803f492193a3d7f
folderAsset: yes
DefaultImporter:
userData:

View File

@ -1,4 +1,5 @@
fileFormatVersion: 2
guid: a4b271fee35e1594889476a6104cf898
folderAsset: yes
DefaultImporter:
userData: