From d7a5a44d419b9a90331b9409b4aba758e2d743e3 Mon Sep 17 00:00:00 2001 From: Perfare Date: Sat, 6 Aug 2016 18:20:25 +0800 Subject: [PATCH] try to fix "PlayerSettings" on Unity 5.3.x --- Unity Studio/ExportOptions.Designer.cs | 4 ++-- Unity Studio/Properties/AssemblyInfo.cs | 2 +- Unity Studio/Unity Classes/PlayerSettings.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Unity Studio/ExportOptions.Designer.cs b/Unity Studio/ExportOptions.Designer.cs index 7ac3736..f5b9674 100644 --- a/Unity Studio/ExportOptions.Designer.cs +++ b/Unity Studio/ExportOptions.Designer.cs @@ -368,9 +368,9 @@ this.converttexture.CheckState = System.Windows.Forms.CheckState.Checked; this.converttexture.Location = new System.Drawing.Point(8, 20); this.converttexture.Name = "converttexture"; - this.converttexture.Size = new System.Drawing.Size(198, 16); + this.converttexture.Size = new System.Drawing.Size(192, 16); this.converttexture.TabIndex = 1; - this.converttexture.Text = "Convert Texture (If possible)"; + this.converttexture.Text = "Convert Texture (If support)"; this.converttexture.UseVisualStyleBackColor = true; // // ExportOptions diff --git a/Unity Studio/Properties/AssemblyInfo.cs b/Unity Studio/Properties/AssemblyInfo.cs index 7d58340..69f6ae0 100644 --- a/Unity Studio/Properties/AssemblyInfo.cs +++ b/Unity Studio/Properties/AssemblyInfo.cs @@ -6,7 +6,7 @@ using System.Runtime.InteropServices; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Unity Studio")] -[assembly: AssemblyDescription("- Compatible with all Unity versions from 2.5.0 to 5.3.6\r\n- Compatible with Web, PC, iOS, Android, PS3, Xbox 360, OSX and Linux games/apps\r\n- Automatically merges .split\r\n- 3D objets exported to FBX\r\n- Able to load audio streams from resources files\r\n- Real-time preview window and export function for textures, audio clips, shaders and fonts\r\n - Textures: DDS (Alpha8, ARGB4444, RGB24, RGBA32, ARGB32, RGB565, DXT1, DXT5, RGBA4444, BGRA32)\r\n PVR (YUY2, PVRTC_RGB2, PVRTC_RGBA2, PVRTC_RGB4, PVRTC_RGBA4, ETC_RGB4, ETC2_RGB, ETC2_RGBA1, ETC2_RGBA8, EAC_R, EAC_R_SIGNED, EAC_RG, EAC_RG_SIGNED)\r\n KTX (ATC_RGB4, ATC_RGBA8)\r\n ASTC (ASTC_RGB_4x4, ASTC_RGB_5x5, ASTC_RGB_6x6, ASTC_RGB_8x8, ASTC_RGB_10x10, ASTC_RGB_12x12, ASTC_RGBA_4x4, ASTC_RGBA_5x5, ASTC_RGBA_6x6, ASTC_RGBA_8x8, ASTC_RGBA_10x10, ASTC_RGBA_12x12)\r\n - Audio clips: mp3, ogg, wav, xbox wav, fsb\r\n - Shader files are exported in plain-text\r\n - Fonts: ttf, otf")] +[assembly: AssemblyDescription("- Compatible with all Unity versions from 2.5.0 to 5.4.0\r\n- Compatible with Web, PC, iOS, Android, PS3, Xbox 360, OSX and Linux games/apps\r\n- Automatically merges .split\r\n- 3D objets exported to FBX\r\n- Able to load audio streams from resources files\r\n- Real-time preview window and export function for textures, audio clips, shaders and fonts\r\n - Textures: DDS (Alpha8, ARGB4444, RGB24, RGBA32, ARGB32, RGB565, DXT1, DXT5, RGBA4444, BGRA32)\r\n PVR (YUY2, PVRTC_RGB2, PVRTC_RGBA2, PVRTC_RGB4, PVRTC_RGBA4, ETC_RGB4, ETC2_RGB, ETC2_RGBA1, ETC2_RGBA8, EAC_R, EAC_R_SIGNED, EAC_RG, EAC_RG_SIGNED)\r\n KTX (ATC_RGB4, ATC_RGBA8)\r\n ASTC (ASTC_RGB_4x4, ASTC_RGB_5x5, ASTC_RGB_6x6, ASTC_RGB_8x8, ASTC_RGB_10x10, ASTC_RGB_12x12, ASTC_RGBA_4x4, ASTC_RGBA_5x5, ASTC_RGBA_6x6, ASTC_RGBA_8x8, ASTC_RGBA_10x10, ASTC_RGBA_12x12)\r\n - Audio clips: mp3, ogg, wav, xbox wav, fsb\r\n - Shader files are exported in plain-text\r\n - Fonts: ttf, otf")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Unity Studio")] diff --git a/Unity Studio/Unity Classes/PlayerSettings.cs b/Unity Studio/Unity Classes/PlayerSettings.cs index 86c24d8..5b593f9 100644 --- a/Unity Studio/Unity Classes/PlayerSettings.cs +++ b/Unity Studio/Unity Classes/PlayerSettings.cs @@ -30,7 +30,7 @@ namespace Unity_Studio if ((sourceFile.version[0] == 5 && sourceFile.version[1] < 1) || (sourceFile.version[0] == 4 && sourceFile.version[1] == 6 && sourceFile.version[2] >= 3)) { int targetIOSGraphics = a_Stream.ReadInt32(); } - if (sourceFile.version[0] == 5 && (sourceFile.version[1] > 2 || (sourceFile.version[1] == 2 && sourceFile.version[2] >= 1))) + if (sourceFile.version[0] == 5 && sourceFile.version[1] == 2 && sourceFile.version[2] >= 1) { bool useOnDemandResources = a_Stream.ReadBoolean(); a_Stream.AlignStream(4); } int targetResolution = a_Stream.ReadInt32();