mirror of
https://github.com/storytold/artcraft.git
synced 2026-11-04 01:18:34 +00:00
Merge branch 'feature/load-char' of github.com:storytold/GottaGoFast into feature/load-ui
This commit is contained in:
commit
fcedf4e142
1 file changed
+5
-2
@@ -53,6 +53,8 @@ export class StoryTellerProxyTimeline {
|
||||
audio: await this.getItemsDict(this.audio_engine.clips),
|
||||
lipsync: await this.getItemsDict(this.lipsync_engine.clips),
|
||||
}
|
||||
console.log(timeline_json)
|
||||
|
||||
return timeline_json;
|
||||
}
|
||||
|
||||
@@ -64,8 +66,8 @@ export class StoryTellerProxyTimeline {
|
||||
let clip = new ClipUI(
|
||||
element.version, element.type,
|
||||
element.group, element.name,
|
||||
element.clip_uuid,
|
||||
element.media_id, element.object_uuid,
|
||||
element.media_id, element.clip_uuid,
|
||||
element.object_uuid,
|
||||
element.object_name,
|
||||
element.start_offset, element.ending_offset);
|
||||
new_clips.push(clip);
|
||||
@@ -126,6 +128,7 @@ export class StoryTellerProxyTimeline {
|
||||
this.lipsync_engine.clips = await this.loadLipsyncClips(timeline['lipsync']);
|
||||
this.animation_engine.clips = await this.loadAnimationClips(timeline['animation']);
|
||||
|
||||
console.log(this.timeline.timeline_items)
|
||||
|
||||
this.timeline.updateUI()
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user