From 1aa8f56f9b0a180ecc24ae3c46ce5812663d8f31 Mon Sep 17 00:00:00 2001 From: pharan Date: Mon, 28 Nov 2016 19:04:08 +0800 Subject: [PATCH] [csharp] Fix SkeletonBinary/SkeletonJson for Unity-WSA. --- spine-csharp/src/SkeletonBinary.cs | 5 ++--- spine-csharp/src/SkeletonJson.cs | 11 +++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/spine-csharp/src/SkeletonBinary.cs b/spine-csharp/src/SkeletonBinary.cs index acd464bc8..908ac444f 100644 --- a/spine-csharp/src/SkeletonBinary.cs +++ b/spine-csharp/src/SkeletonBinary.cs @@ -93,14 +93,13 @@ namespace Spine { #if WINDOWS_PHONE using (var input = new BufferedStream(Microsoft.Xna.Framework.TitleContainer.OpenStream(path))) { #else - using (var input = new BufferedStream(new FileStream(path, FileMode.Open))) { - #endif // WINDOWS_PHONE + using (var input = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read)) { + #endif SkeletonData skeletonData = ReadSkeletonData(input); skeletonData.name = Path.GetFileNameWithoutExtension(path); return skeletonData; } } - #endif // WINDOWS_STOREAPP public static readonly TransformMode[] TransformModeValues = { diff --git a/spine-csharp/src/SkeletonJson.cs b/spine-csharp/src/SkeletonJson.cs index eb9835014..bbcb973be 100644 --- a/spine-csharp/src/SkeletonJson.cs +++ b/spine-csharp/src/SkeletonJson.cs @@ -58,7 +58,7 @@ namespace Spine { Scale = 1; } - #if !(IS_UNITY) && WINDOWS_STOREAPP + #if !IS_UNITY && WINDOWS_STOREAPP private async Task ReadFile(string path) { var folder = Windows.ApplicationModel.Package.Current.InstalledLocation; var file = await folder.GetFileAsync(path).AsTask().ConfigureAwait(false); @@ -75,17 +75,16 @@ namespace Spine { #else public SkeletonData ReadSkeletonData (String path) { #if WINDOWS_PHONE - Stream stream = Microsoft.Xna.Framework.TitleContainer.OpenStream(path); - using (StreamReader reader = new StreamReader(stream)) { + using (var reader = new StreamReader(Microsoft.Xna.Framework.TitleContainer.OpenStream(path))) { #else - using (var reader = new StreamReader(path)) { - #endif // WINDOWS_PHONE + using (var reader = new StreamReader(new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read))) { + #endif SkeletonData skeletonData = ReadSkeletonData(reader); skeletonData.name = Path.GetFileNameWithoutExtension(path); return skeletonData; } } - #endif // WINDOWS_STOREAPP + #endif public SkeletonData ReadSkeletonData (TextReader reader) { if (reader == null) throw new ArgumentNullException("reader", "reader cannot be null.");