diff --git a/Assets/FlashTools/Examples/Animations/Tests/1_colormode.fla b/Assets/FlashTools/Examples/Animations/Tests/1_colormode.fla new file mode 100644 index 0000000..c536717 Binary files /dev/null and b/Assets/FlashTools/Examples/Animations/Tests/1_colormode.fla differ diff --git a/Assets/FlashTools/Examples/Animations/Tests/1_colormode.fla.meta b/Assets/FlashTools/Examples/Animations/Tests/1_colormode.fla.meta new file mode 100644 index 0000000..f6c7c0a --- /dev/null +++ b/Assets/FlashTools/Examples/Animations/Tests/1_colormode.fla.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3d31ec251a7eb4df4aeead593293c369 +timeCreated: 1456901559 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/FlashAnimFtaPostprocessor.cs b/Assets/FlashTools/Scripts/Internal/Editor/FlashAnimFtaPostprocessor.cs index afe7a80..7731f66 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/FlashAnimFtaPostprocessor.cs +++ b/Assets/FlashTools/Scripts/Internal/Editor/FlashAnimFtaPostprocessor.cs @@ -51,10 +51,11 @@ namespace FlashTools.Internal { // ----------------------------- static FlashAnimData LoadFlashAnimDocFromFtaRootElem(XElement root_elem, FlashAnimData data) { - data.FrameRate = SafeLoadIntFromElemAttr(root_elem, "frame_rate", data.FrameRate); LoadFlashAnimStageFromFtaRootElem (root_elem, data); LoadFlashAnimLibraryFromFtaRootElem(root_elem, data); LoadFlashAnimStringsFromFtaRootElem(root_elem, data); + data.FrameRate = SafeLoadIntFromElemAttr( + root_elem, "frame_rate", data.FrameRate); return data; } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index bea5e38..a75d6f2 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -169,7 +169,13 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 resolutionDialogBanner: {fileID: 0} - m_BuildTargetIcons: [] + m_BuildTargetIcons: + - m_BuildTarget: + m_Icons: + - serializedVersion: 2 + m_Icon: {fileID: 0} + m_Width: 128 + m_Height: 128 m_BuildTargetBatching: [] m_BuildTargetGraphicsAPIs: [] webPlayerTemplate: APPLICATION:Default