diff --git a/Assets/DevTests/Animations/AlphaTests/Tests/balloon.fla b/Assets/DevTests/Animations/AlphaTests/Tests/balloon.fla deleted file mode 100644 index 4dacad0..0000000 Binary files a/Assets/DevTests/Animations/AlphaTests/Tests/balloon.fla and /dev/null differ diff --git a/Assets/DevTests/Animations/AlphaTests/Tests/balloon.fla.meta b/Assets/DevTests/Animations/AlphaTests/Tests/balloon.fla.meta deleted file mode 100644 index b1af63d..0000000 --- a/Assets/DevTests/Animations/AlphaTests/Tests/balloon.fla.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c6be5a3360fca467bb1a0d8929bec5fc -timeCreated: 1495943207 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/FlashExport/FlashExport.jsfl b/Assets/FlashTools/FlashExport/FlashExport.jsfl index 061a17a..c528e51 100644 --- a/Assets/FlashTools/FlashExport/FlashExport.jsfl +++ b/Assets/FlashTools/FlashExport/FlashExport.jsfl @@ -1,12 +1,5 @@ var script_dir = fl.scriptURI.replace('FlashExport.jsfl', ''); fl.runScript(script_dir + 'Internal/FTBase.jsfl'); fl.runScript(script_dir + 'Internal/FTMain.jsfl', "ft_main", { - profile_mode : true, - verbose_mode : true, - graphics_scale : 1.0, - revert_after_conversion : true, - optimize_static_items : true, - optimize_single_graphics : true, - optimize_big_items : true, - optimize_small_items : true + graphics_scale : 1.0 }); \ No newline at end of file diff --git a/Assets/FlashTools/FlashExport/FlashExport_HD.jsfl b/Assets/FlashTools/FlashExport/FlashExport_HD.jsfl index f5c3112..0f766f8 100644 --- a/Assets/FlashTools/FlashExport/FlashExport_HD.jsfl +++ b/Assets/FlashTools/FlashExport/FlashExport_HD.jsfl @@ -1,6 +1,5 @@ var script_dir = fl.scriptURI.replace('FlashExport_HD.jsfl', ''); fl.runScript(script_dir + 'Internal/FTBase.jsfl'); -fl.runScript(script_dir + 'Internal/FTMain.jsfl', - "ft_main", { - graphics_scale : 2.0 - }); \ No newline at end of file +fl.runScript(script_dir + 'Internal/FTMain.jsfl', "ft_main", { + graphics_scale : 2.0 +}); \ No newline at end of file diff --git a/Assets/FlashTools/FlashExport/FlashExport_SD.jsfl b/Assets/FlashTools/FlashExport/FlashExport_SD.jsfl index ac6e2c1..6d9d96f 100644 --- a/Assets/FlashTools/FlashExport/FlashExport_SD.jsfl +++ b/Assets/FlashTools/FlashExport/FlashExport_SD.jsfl @@ -1,6 +1,5 @@ var script_dir = fl.scriptURI.replace('FlashExport_SD.jsfl', ''); fl.runScript(script_dir + 'Internal/FTBase.jsfl'); -fl.runScript(script_dir + 'Internal/FTMain.jsfl', - "ft_main", { - graphics_scale : 0.5 - }); \ No newline at end of file +fl.runScript(script_dir + 'Internal/FTMain.jsfl', "ft_main", { + graphics_scale : 0.5 +}); \ No newline at end of file diff --git a/Assets/FlashTools/FlashExport/Internal/FTMain.jsfl b/Assets/FlashTools/FlashExport/Internal/FTMain.jsfl index 07948af..f4cf5b9 100644 --- a/Assets/FlashTools/FlashExport/Internal/FTMain.jsfl +++ b/Assets/FlashTools/FlashExport/Internal/FTMain.jsfl @@ -740,6 +740,16 @@ fttim.prepare_all_tweens = function (doc, timeline) { ft.type_assert(doc, Document); ft.type_assert(timeline, Timeline); + + var is_end_of_tween = function(frame_index, frames) { + while (--frame_index >= 0) { + var frame = frames[frame_index]; + if (fttim.is_keyframe(frame, frame_index)) { + return fttim.is_motion_tween_frame(frame) && frame.duration > 1; + } + } + return false; + }; ft.array_reverse_foreach(timeline.layers, function (layer, layer_index) { ft.array_foreach(layer.frames, function (frame, frame_index) { @@ -753,7 +763,7 @@ } else { throw "Animation uses shape tweens. To export this animation you should use Adobe Animate CC or higher!"; } - } else if (fttim.is_motion_tween_frame(frame)) { + } else if (fttim.is_motion_tween_frame(frame) || is_end_of_tween(frame_index, layer.frames)) { var has_shapes = ft.array_any(frame.elements, fttim.is_shape_element); if (has_shapes || frame.elements.length > 1) { ft.trace_fmt( diff --git a/ProjectStuff/FlashTools.org b/ProjectStuff/FlashTools.org index 6f129ff..0daaeb9 100644 --- a/ProjectStuff/FlashTools.org +++ b/ProjectStuff/FlashTools.org @@ -90,7 +90,7 @@ http://ru.esotericsoftware.com/forum/Submeshes-render-in-random-order-with-ortho **** DONE При автоплее с пустым клипом контроллер накапливает _tickTimer **** DONE Шейпы в классических твинах (да, это ошибка, но флеш её пропускает) не растеризуются **** TODO При множественном импорте ошибка в импорте по поводу удаление из-под носа ассета воспроизводится 100% -**** TODO Некорректно кончающиеся твинны плохо дружат с оптимизацией и растеризацией +**** DONE Некорректно кончающиеся твинны плохо дружат с оптимизацией и растеризацией **** TODO Скейл фильтров не заходит в группы ** DONE Версия 1.3.7 *** Баги