瀏覽代碼

Merge branch '3.8' into 4.0-beta

Harald Csaszar 4 年之前
父節點
當前提交
2b21c8f8d2

+ 1 - 1
spine-monogame/example/ExampleGame.cs

@@ -294,7 +294,7 @@ namespace Spine {
 		}
 
 		protected override void Draw(GameTime gameTime) {
-			currentScreen.Render(gameTime.ElapsedGameTime.Milliseconds / 1000.0f);
+			currentScreen.Render((float)(gameTime.ElapsedGameTime.TotalMilliseconds / 1000.0));
 		}
 	}
 }

+ 7 - 4
spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SkeletonDataCompatibility.cs

@@ -167,11 +167,14 @@ namespace Spine.Unity {
 		}
 
 		public static bool IsJsonFile (TextAsset file) {
-			string fileText = file.text;
+			byte[] content = file.bytes;
 			const int maxCharsToCheck = 256;
-			int numCharsToCheck = Math.Min(fileText.Length, maxCharsToCheck);
-			for (int i = 0; i < numCharsToCheck; ++i) {
-				char c = fileText[i];
+			int numCharsToCheck = Math.Min(content.Length, maxCharsToCheck);
+			int i = 0;
+			if (content.Length >= 3 && content[0] == 0xEF && content[1] == 0xBB && content[2] == 0xBF) // skip potential BOM
+				i = 3;
+			for (; i < numCharsToCheck; ++i) {
+				char c = (char)content[i];
 				if (char.IsWhiteSpace(c))
 					continue;
 				return c == '{';

+ 1 - 1
spine-xna/example/src/ExampleGame.cs

@@ -192,7 +192,7 @@ namespace Spine {
 		protected override void Draw (GameTime gameTime) {
 			GraphicsDevice.Clear(Color.Black);
 
-			state.Update(gameTime.ElapsedGameTime.Milliseconds / 1000f);
+			state.Update((float)(gameTime.ElapsedGameTime.TotalMilliseconds / 1000.0));
 			state.Apply(skeleton);
 			skeleton.UpdateWorldTransform();
 			if (skeletonRenderer.Effect is BasicEffect) {