UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #437 from witcher112/master

Browse Source 
Unity 5 and Windows Phone building fixes
This commit is contained in:
John 2015-12-15 17:15:48 +08:00
commit ed35664230
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spine-csharp/src/SkeletonBinary.cs
View File

@ -86,7 +86,13 @@ namespace Spine {
using (var input = new BufferedStream(Microsoft.Xna.Framework.TitleContainer.OpenStream(path))) using (var input = new BufferedStream(Microsoft.Xna.Framework.TitleContainer.OpenStream(path)))
{ {
#else #else
using (var input = new BufferedStream(new FileStream(path, FileMode.Open))) { #if UNITY_WP8 || UNITY_WP8_1
using (var input = new FileStream(path, FileMode.Open))
{
#else
using (var input = new BufferedStream(new FileStream(path, FileMode.Open)))
{
#endif
#endif #endif
SkeletonData skeletonData = ReadSkeletonData(input); SkeletonData skeletonData = ReadSkeletonData(input);
skeletonData.name = Path.GetFileNameWithoutExtension(path); skeletonData.name = Path.GetFileNameWithoutExtension(path);

4
spine-unity/Assets/Examples/Scripts/RaggedySpineboy.cs
View File

@ -18,7 +18,11 @@ public class RaggedySpineboy : MonoBehaviour {
void AddRigidbody () { void AddRigidbody () {
var rb = gameObject.AddComponent<Rigidbody2D>(); var rb = gameObject.AddComponent<Rigidbody2D>();
#if UNITY_5_1
rb.freezeRotation = true;
#else
rb.fixedAngle = true; rb.fixedAngle = true;
#endif
naturalCollider.enabled = true; naturalCollider.enabled = true;
} }