BlackMATov/unity-flash-tools
1
0
Fork 0
mirror of https://github.com/BlackMATov/unity-flash-tools.git synced 2025-12-16 14:11:19 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix life after death and little view stuff

Browse Source
This commit is contained in:
Matvey Cherevko
2016-12-05 23:31:45 +07:00
parent 0d9cd6603e
commit 3fa3bf5564
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/FlashTools/Scripts/Editor/FTEditor/Editors/SwfClipEditor.cs
View File

@@ -26,9 +26,9 @@ namespace FTEditor.Editors {
: 0; : 0;
} }
string GetClipsFrameCountStr() { string GetClipsFrameCountForView() {
return _clips.Aggregate(string.Empty, (acc, clip) => { return _clips.Aggregate(string.Empty, (acc, clip) => {
var frame_count = clip.frameCount > 0 ? clip.frameCount - 1 : 0; var frame_count = clip.frameCount;
var frame_count_str = frame_count.ToString(); var frame_count_str = frame_count.ToString();
return string.IsNullOrEmpty(acc) return string.IsNullOrEmpty(acc)
? frame_count_str ? frame_count_str
@@ -36,9 +36,9 @@ namespace FTEditor.Editors {
}); });
} }
string GetClipsCurrentFrameStr() { string GetClipsCurrentFrameForView() {
return _clips.Aggregate(string.Empty, (acc, clip) => { return _clips.Aggregate(string.Empty, (acc, clip) => {
var current_frame = clip.currentFrame; var current_frame = clip.currentFrame + 1;
var current_frame_str = current_frame.ToString(); var current_frame_str = current_frame.ToString();
return string.IsNullOrEmpty(acc) return string.IsNullOrEmpty(acc)
? current_frame_str ? current_frame_str
@@ -120,7 +120,7 @@ namespace FTEditor.Editors {
} }
GUILayout.Label(string.Format( GUILayout.Label(string.Format(
"{0}/{1}", "{0}/{1}",
GetClipsCurrentFrameStr(), GetClipsFrameCountStr())); GetClipsCurrentFrameForView(), GetClipsFrameCountForView()));
if ( GUILayout.Button(new GUIContent(">", "to next frame")) ) { if ( GUILayout.Button(new GUIContent(">", "to next frame")) ) {
AllClipsForeachWithUndo(p => p.ToNextFrame()); AllClipsForeachWithUndo(p => p.ToNextFrame());
} }

10
Assets/FlashTools/Scripts/FTRuntime/SwfClipController.cs
View File

@@ -352,20 +352,18 @@ namespace FTRuntime {
_clip = GetComponent<SwfClip>(); _clip = GetComponent<SwfClip>();
} }
void Start() {
if ( autoPlay && Application.isPlaying ) {
Play(false);
}
}
void OnEnable() { void OnEnable() {
var swf_manager = SwfManager.GetInstance(true); var swf_manager = SwfManager.GetInstance(true);
if ( swf_manager ) { if ( swf_manager ) {
swf_manager.AddController(this); swf_manager.AddController(this);
} }
if ( autoPlay && Application.isPlaying ) {
Play(false);
}
} }
void OnDisable() { void OnDisable() {
Stop(false);
var swf_manager = SwfManager.GetInstance(false); var swf_manager = SwfManager.GetInstance(false);
if ( swf_manager ) { if ( swf_manager ) {
swf_manager.RemoveController(this); swf_manager.RemoveController(this);