[Unity] Fix for Unity UWP/Windows Phone

This commit is contained in:
John 2015-12-30 14:58:09 +08:00
parent 8006c7b4b9
commit 81eb9c49b4

View File

@ -53,7 +53,9 @@ namespace Spine {
Scale = 1; Scale = 1;
} }
#if WINDOWS_STOREAPP #if !(UNITY_5 || UNITY_4 || UNITY_WSA || UNITY_WP8 || UNITY_WP8_1)
#if WINDOWS_STOREAPP
private async Task<SkeletonData> ReadFile(string path) { private async Task<SkeletonData> ReadFile(string path) {
var folder = Windows.ApplicationModel.Package.Current.InstalledLocation; var folder = Windows.ApplicationModel.Package.Current.InstalledLocation;
var file = await folder.GetFileAsync(path).AsTask().ConfigureAwait(false); var file = await folder.GetFileAsync(path).AsTask().ConfigureAwait(false);
@ -67,20 +69,22 @@ namespace Spine {
public SkeletonData ReadSkeletonData (String path) { public SkeletonData ReadSkeletonData (String path) {
return this.ReadFile(path).Result; return this.ReadFile(path).Result;
} }
#else #else
public SkeletonData ReadSkeletonData (String path) { public SkeletonData ReadSkeletonData (String path) {
#if WINDOWS_PHONE #if WINDOWS_PHONE
Stream stream = Microsoft.Xna.Framework.TitleContainer.OpenStream(path); Stream stream = Microsoft.Xna.Framework.TitleContainer.OpenStream(path);
using (StreamReader reader = new StreamReader(stream)) { using (StreamReader reader = new StreamReader(stream)) {
#else #else
using (StreamReader reader = new StreamReader(path)) { using (StreamReader reader = new StreamReader(path)) {
#endif #endif // WINDOWS_PHONE
SkeletonData skeletonData = ReadSkeletonData(reader); SkeletonData skeletonData = ReadSkeletonData(reader);
skeletonData.name = Path.GetFileNameWithoutExtension(path); skeletonData.name = Path.GetFileNameWithoutExtension(path);
return skeletonData; return skeletonData;
} }
} }
#endif
#endif // WINDOWS_STOREAPP
#endif // !UNITY
public SkeletonData ReadSkeletonData (TextReader reader) { public SkeletonData ReadSkeletonData (TextReader reader) {
if (reader == null) throw new ArgumentNullException("reader cannot be null."); if (reader == null) throw new ArgumentNullException("reader cannot be null.");