Commit 96a38434 authored by limingzhe's avatar limingzhe

feat: 阶段性提交 缺少结束和文字

parent fda5d87e
{
"ver": "2.0.1",
"uuid": "f0680ae0-c079-45ef-abd7-9e63d90b982b",
"uuid": "ec2482d6-c025-479d-8dd4-145f25b6e330",
"downloadMode": 0,
"duration": 0.130612,
"duration": 5.112,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "4c3188d4-b6d4-4302-a821-d199472a7ce2",
"downloadMode": 0,
"duration": 2.592,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "1.1.2",
"uuid": "70bb3e3c-913c-470f-a950-6697b10955c4",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {},
"subMetas": {}
}
\ No newline at end of file
{"frameRate":24,"name":"hand","version":"5.5","compatibleVersion":"5.5","armature":[{"type":"Armature","frameRate":24,"name":"Armature","aabb":{"x":-320,"y":-320,"width":640.25,"height":640},"bone":[{"name":"root","transform":{"scX":0.5,"scY":0.5}},{"name":"bone","parent":"root","transform":{"x":146.4,"y":86.95}}],"slot":[{"name":"10","parent":"root","color":{"aM":50}},{"name":"9","parent":"root","color":{"aM":50}},{"name":"8","parent":"root","color":{"aM":50}},{"name":"7","parent":"root","color":{"aM":50}},{"name":"6","parent":"root","color":{"aM":50}},{"name":"5","parent":"root","color":{"aM":50}},{"name":"4","parent":"root","color":{"aM":50}},{"name":"3","parent":"root","color":{"aM":50}},{"name":"2","parent":"root","color":{"aM":50}},{"name":"1","parent":"root","color":{"aM":50}},{"name":"10_拷贝","parent":"root","color":{"aM":50}},{"name":"9_拷贝","parent":"root","color":{"aM":50}},{"name":"8_拷贝","parent":"root","color":{"aM":50}},{"name":"7_拷贝","parent":"root","color":{"aM":50}},{"name":"6_拷贝","parent":"root","color":{"aM":50}},{"name":"5_拷贝","parent":"root","color":{"aM":50}},{"name":"4_拷贝","parent":"root","color":{"aM":50}},{"name":"3_拷贝","parent":"root","color":{"aM":50}},{"name":"2_拷贝","parent":"root","color":{"aM":50}},{"displayIndex":1,"name":"图层16","parent":"bone"},{"name":"1_拷贝","parent":"root","color":{"aM":50}}],"skin":[{"slot":[{"name":"9_拷贝","display":[{"name":"手指引导培生/9"}]},{"name":"图层16","display":[{"name":"手指引导培生/图层16","transform":{"x":-10.4,"y":7.55}},{"name":"手指引导培生/图层16(2)","transform":{"x":-2.4,"y":-0.45,"scX":0.991,"scY":0.991}}]},{"name":"10_拷贝","display":[{"name":"手指引导培生/10"}]},{"name":"8","display":[{"name":"手指引导培生/8","transform":{"x":0.5,"scX":1.05,"scY":1.05}}]},{"name":"1","display":[{"name":"手指引导培生/1","transform":{"x":-0.5}}]},{"name":"9","display":[{"name":"手指引导培生/9","transform":{"x":0.5}}]},{"name":"2","display":[{"name":"手指引导培生/2","transform":{"y":-0.5}}]},{"name":"10","display":[{"name":"手指引导培生/10","transform":{"x":0.5}}]},{"name":"3","display":[{"name":"手指引导培生/3","transform":{"x":-0.5}}]},{"name":"4","display":[{"name":"手指引导培生/4","transform":{"x":1,"y":1.5}}]},{"name":"5","display":[{"name":"手指引导培生/5","transform":{"y":-0.5}}]},{"name":"1_拷贝","display":[{"name":"手指引导培生/1"}]},{"name":"7","display":[{"name":"手指引导培生/7","transform":{"x":-0.5,"scX":0.95,"scY":0.95}}]},{"name":"2_拷贝","display":[{"name":"手指引导培生/2"}]},{"name":"3_拷贝","display":[{"name":"手指引导培生/3"}]},{"name":"4_拷贝","display":[{"name":"手指引导培生/4"}]},{"name":"5_拷贝","display":[{"name":"手指引导培生/5"}]},{"name":"6_拷贝","display":[{"name":"手指引导培生/6"}]},{"name":"7_拷贝","display":[{"name":"手指引导培生/7","transform":{"scX":0.95,"scY":0.95}}]},{"name":"8_拷贝","display":[{"name":"手指引导培生/8","transform":{"scX":1.05,"scY":1.05}}]},{"name":"6","display":[{"name":"手指引导培生/6","transform":{"y":0.5}}]}]}],"animation":[{"duration":72,"playTimes":0,"name":"normal","bone":[{"name":"root","rotateFrame":[{"duration":72,"rotate":-0.33}]},{"name":"bone","translateFrame":[{"duration":14,"tweenEasing":0},{"duration":58,"x":-96.51,"y":-58.64}]}],"slot":[{"name":"10","displayFrame":[{"duration":37,"value":-1},{"duration":10},{"duration":25,"value":-1}],"colorFrame":[{"duration":37},{"duration":9,"tweenEasing":0},{"duration":26,"value":{"aM":0}}]},{"name":"9","displayFrame":[{"duration":35,"value":-1},{"duration":2},{"duration":35,"value":-1}]},{"name":"8","displayFrame":[{"duration":33,"value":-1},{"duration":2},{"duration":37,"value":-1}]},{"name":"7","displayFrame":[{"duration":31,"value":-1},{"duration":2},{"duration":39,"value":-1}]},{"name":"6","displayFrame":[{"duration":29,"value":-1},{"duration":2},{"duration":41,"value":-1}]},{"name":"5","displayFrame":[{"duration":27,"value":-1},{"duration":2},{"duration":43,"value":-1}]},{"name":"4","displayFrame":[{"duration":25,"value":-1},{"duration":2},{"duration":45,"value":-1}]},{"name":"3","displayFrame":[{"duration":23,"value":-1},{"duration":2},{"duration":47,"value":-1}]},{"name":"2","displayFrame":[{"duration":21,"value":-1},{"duration":2},{"duration":49,"value":-1}]},{"name":"1","displayFrame":[{"duration":19,"value":-1},{"duration":2},{"duration":51,"value":-1}]},{"name":"10_拷贝","displayFrame":[{"duration":50,"value":-1},{"duration":13},{"duration":9,"value":-1}],"colorFrame":[{"duration":51},{"duration":11,"tweenEasing":0},{"duration":10,"value":{"aM":0}}]},{"name":"9_拷贝","displayFrame":[{"duration":48,"value":-1},{"duration":2},{"duration":22,"value":-1}]},{"name":"8_拷贝","displayFrame":[{"duration":46,"value":-1},{"duration":2},{"duration":24,"value":-1}]},{"name":"7_拷贝","displayFrame":[{"duration":44,"value":-1},{"duration":2},{"duration":26,"value":-1}]},{"name":"6_拷贝","displayFrame":[{"duration":42,"value":-1},{"duration":2},{"duration":28,"value":-1}]},{"name":"5_拷贝","displayFrame":[{"duration":40,"value":-1},{"duration":2},{"duration":30,"value":-1}]},{"name":"4_拷贝","displayFrame":[{"duration":38,"value":-1},{"duration":2},{"duration":32,"value":-1}]},{"name":"2_拷贝","displayFrame":[{"duration":34,"value":-1},{"duration":2},{"duration":36,"value":-1}]},{"name":"图层16","displayFrame":[{"duration":17,"value":1},{"duration":3},{"duration":52,"value":1}],"colorFrame":[{"duration":3,"tweenEasing":0,"value":{"aM":0}},{"duration":17,"tweenEasing":0},{"duration":4,"tweenEasing":0},{"duration":48,"value":{"aM":0}}]},{"name":"1_拷贝","displayFrame":[{"duration":32,"value":-1},{"duration":2},{"duration":38,"value":-1}]},{"name":"3_拷贝","displayFrame":[{"duration":36,"value":-1},{"duration":2},{"duration":34,"value":-1}]}]}],"defaultActions":[{"gotoAndPlay":"normal"}],"canvas":{"width":320,"height":320}},{"type":"MovieClip","frameRate":24,"name":"MovieClip","bone":[{"name":"root"}],"defaultActions":[{}]}]}
\ No newline at end of file
{
"ver": "1.0.1",
"uuid": "70dd496c-d5bc-4462-be82-e042cc544707",
"subMetas": {}
}
\ No newline at end of file
{"name":"hand","imagePath":"hand_tex.png","height":2048,"SubTexture":[{"name":"手指引导培生/10","x":1,"height":640,"y":1,"width":640},{"name":"手指引导培生/9","x":1,"height":640,"y":643,"width":640},{"name":"手指引导培生/8","x":619,"height":582,"y":1285,"width":582},{"name":"手指引导培生/7","x":1,"height":616,"y":1285,"width":616},{"name":"手指引导培生/6","x":1203,"height":501,"y":1285,"width":501},{"name":"手指引导培生/5","x":643,"height":433,"y":1,"width":433},{"name":"手指引导培生/4","x":643,"height":365,"y":436,"width":365},{"name":"手指引导培生/3","x":643,"height":302,"y":803,"width":302},{"name":"手指引导培生/2","x":1203,"height":249,"y":1788,"width":249},{"name":"手指引导培生/1","x":1454,"height":224,"y":1788,"width":224},{"name":"手指引导培生/图层16","x":1680,"height":141,"y":1788,"width":139},{"name":"手指引导培生/图层16(2)","x":1821,"height":157,"y":1788,"width":119}],"width":2048}
\ No newline at end of file
{
"ver": "1.0.1",
"uuid": "e0131a72-9b9b-4c6d-a1dd-37027e163310",
"subMetas": {}
}
\ No newline at end of file
This diff is collapsed.
{
"ver": "2.3.5",
"uuid": "7e9de3bf-097b-45aa-9e50-58977af340b4",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 2048,
"height": 2048,
"platformSettings": {},
"subMetas": {
"hand_tex": {
"ver": "1.0.4",
"uuid": "ba532d53-bc5c-454f-a7c5-39c829598da6",
"rawTextureUuid": "7e9de3bf-097b-45aa-9e50-58977af340b4",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -53.5,
"offsetY": 5,
"trimX": 1,
"trimY": 1,
"width": 1939,
"height": 2036,
"rawWidth": 2048,
"rawHeight": 2048,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
export const defaultData = {"songArr":[{},{},{},{}],"lrcData":{"audio_url":"http://staging-teach.cdn.ireadabc.com/ec19a2c73ec4fca0bf0458c74381a702.mp3","fontSize":24,"lineHeight":32,"lyrics":[]},"stepArr":[{"text":"3"},{"text":"2"}],"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/8f13e0ae91bd088ed8981834af6e6eeb.json","name":"2_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/e8806bae67ed2715f853be1827983590.json","name":"2_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/7050b734813b887bf1f48f23bab6a6ac.png","name":"2_tex.png"}}
\ No newline at end of file
export const defaultData = {"songArr":[{},{},{},{}],"lrcData":{"audio_url":"http://staging-teach.cdn.ireadabc.com/16cebf8be768535b68df70b8d25a7462.mp3","fontSize":24,"lineHeight":32,"lyrics":[]},"stepArr":[{"text":"432","px":"0","X":"0.2","Y":"0.3"},{"text":"648","X":"0","Y":"0"}],"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/275aa8c510a1ee7b936ca837de00ca2a.json","name":"1_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/fec620437ee4d51e11e7fe7a524f06ea.json","name":"1_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/4fb895205ad5787e582cd65e517026d6.png","name":"1_tex.png"},"frame":"24"}
\ No newline at end of file
......@@ -421,4 +421,15 @@ export function onHomeworkFinish() {
} else {
console.log('onHomeworkFinish');
}
}
export function callMiddleLayerFunction(apiName, data, callback) {
const middleLayer = cc.find('middleLayer');
if (middleLayer) {
const middleLayerComponent = middleLayer.getComponent('middleLayer');
middleLayerComponent.callMiddleLayerFunction(apiName, data, callback);
} else {
console.log('callMiddleLayerFunction: ' + apiName);
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "ec77975a-6b54-44ca-bb95-421c1d5fbc1a",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 10,
"height": 10,
"platformSettings": {},
"subMetas": {
"black": {
"ver": "1.0.4",
"uuid": "f3411f52-ae6b-454b-b4c1-1d88deb3dd88",
"rawTextureUuid": "ec77975a-6b54-44ca-bb95-421c1d5fbc1a",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 10,
"height": 10,
"rawWidth": 10,
"rawHeight": 10,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "7237ba74-7e9c-450f-89eb-e6dc9119e474",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 448,
"height": 339,
"platformSettings": {},
"subMetas": {
"go_0": {
"ver": "1.0.4",
"uuid": "384e9427-1d84-4858-a393-395b2f7b6f76",
"rawTextureUuid": "7237ba74-7e9c-450f-89eb-e6dc9119e474",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 448,
"height": 339,
"rawWidth": 448,
"rawHeight": 339,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "0cc8b13f-d4c2-418b-8404-f81a4a63fc56",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 149,
"height": 267,
"platformSettings": {},
"subMetas": {
"go_1": {
"ver": "1.0.4",
"uuid": "ec0f6626-c124-408a-9c63-5da32f14a4c3",
"rawTextureUuid": "0cc8b13f-d4c2-418b-8404-f81a4a63fc56",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 149,
"height": 267,
"rawWidth": 149,
"rawHeight": 267,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "72e1055b-5094-4555-b6f0-51419d0f770f",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 183,
"height": 266,
"platformSettings": {},
"subMetas": {
"go_2": {
"ver": "1.0.4",
"uuid": "09270f4f-e995-49a2-b99b-ebc1a8b76f75",
"rawTextureUuid": "72e1055b-5094-4555-b6f0-51419d0f770f",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 183,
"height": 266,
"rawWidth": 183,
"rawHeight": 266,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "32118ee3-23be-41cf-b911-edde0196dc55",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 186,
"height": 269,
"platformSettings": {},
"subMetas": {
"go_3": {
"ver": "1.0.4",
"uuid": "16b8eddd-d941-4dad-8817-92a161b4d2b0",
"rawTextureUuid": "32118ee3-23be-41cf-b911-edde0196dc55",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 186,
"height": 269,
"rawWidth": 186,
"rawHeight": 269,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
......@@ -2,22 +2,12 @@
<div class="model-content">
<div style="width: 100%; margin-top: 15px; margin-bottom: 50px;" align="center">
<!-- <h2>标题设置</h2>
<div style="width: 50%; display: flex; justify-content: center; align-items: center;">
<input type="text" nz-input [(ngModel)]="item.title" (blur)="save()" style="width: 200px;margin-top: 5px">
<app-audio-recorder
style="margin-top: 5px; margin-left: 5px;"
[audioUrl]="item.title_audio_url"
(audioUploaded)="onAudioUploadSuccess($event, 'title_audio_url', item)"
></app-audio-recorder>
</div> -->
<nz-divider nzText="配置动画"></nz-divider>
<div style="margin-top: 20px; margin-bottom: 20px;">
<div style="margin-top: 20px; margin-bottom: 20px; display: flex; align-items: center; justify-content: center;">
<app-upload-dragon-bone
[skeJsonData]="item.skeJsonData"
......@@ -26,13 +16,31 @@
(save)="saveAnim($event)"
>
</app-upload-dragon-bone>
<span style="margin-left: 20px;">帧率:</span>
<input type="text" nz-input [(ngModel)]="item.frame" (blur)="save()" style="width: 50px;">
</div>
<div style="display: flex; align-items: center; justify-content: center; margin-top: 25px;">
</div>
<div *ngFor="let step of item.stepArr; let i = index" style="margin-top: 10px;">
<div style="width: 500px; display: flex; align-items: center; justify-content: center;">
<span style="width: 150px; text-align: right;"> step{{i+1}}(帧数):</span>
<input type="text" nz-input [(ngModel)]="step.text" (blur)="save()" style="width: 100px;">
<div style="width: 500px; display: flex; align-items: center; justify-content: center; padding: 5px; border: 2px solid #ccc; border-radius: 15px; ">
<span style="width: 100px; font-weight: 800; "> step{{i+1}}:</span>
<div style="display: flex; align-items: center; justify-content: center;">
<span>帧数:</span>
<input type="text" nz-input [(ngModel)]="step.text" (blur)="save()" style="width: 60px;">
</div>
<div style="display: flex; align-items: center; justify-content: center; margin-left: 25px;">
<span>手指 X:</span>
<input type="text" nz-input [(ngModel)]="step.X" (blur)="save()" style="width: 50px;">
</div>
<div style="display: flex; align-items: center; justify-content: center; margin-left: 15px;">
<span>Y:</span>
<input type="text" nz-input [(ngModel)]="step.Y" (blur)="save()" style="width: 50px;">
</div>
<button style=" margin-left: 15px" nz-button nzType="danger" (click)="deleteStep(i)">
x
......@@ -48,110 +56,12 @@
</div>
<!-- <div style="width: 100%;" align=center style="margin: 30px">
<span>
歌曲选择:
</span>
<nz-radio-group [(ngModel)]="curIndex">
<label nz-radio nzValue="0">歌曲-1</label>
<label nz-radio nzValue="1">歌曲-2</label>
<label nz-radio nzValue="2">歌曲-3</label>
<label nz-radio nzValue="3">歌曲-4</label>
</nz-radio-group>
</div> -->
<!-- <div *ngFor="let it of songArr; let i = index" align="center" style="padding-bottom: 1px;"> -->
<!-- <div *ngIf="i == curIndex" class="song-box" > -->
<nz-divider nzText="配置歌词"></nz-divider>
<app-lrc-editor [LRCData]="item.lrcData" (editFinished)="getLRC($event, item)">
</app-lrc-editor>
<!-- <nz-divider nzText="配置伴奏音频"></nz-divider>
<div style="padding: 0 20px;">
<app-audio-recorder
style="margin-top: 5px"
[audioUrl]="item.accompany_audio_url"
(audioUploaded)="onAudioUploadSuccess($event, 'accompany_audio_url', item)"
></app-audio-recorder>
</div> -->
<!-- <nz-divider nzText="配置音频图片"></nz-divider>
<div style="width: 50%; margin: auto;">
<app-upload-image-with-preview
[picUrl]="item.pic_url"
(imageUploaded)="onImageUploadSuccess($event, 'pic_url', item)"
></app-upload-image-with-preview>
</div> -->
<nz-divider nzText="配置歌词"></nz-divider>
<!-- </div> -->
<app-lrc-editor [LRCData]="item.lrcData" (editFinished)="getLRC($event, item)">
</app-lrc-editor>
<!-- </div> -->
<!-- <nz-divider nzText="显示配置"></nz-divider>
<div *ngIf="item.lrcData" style="padding: 20px">
<app-custom-hot-zone
[bgItem]="bgItem"
[hotZoneItemArr]="hotZoneItemArr"
[customTypeGroupArr]="customTypeGroupArr"
(save)="saveHotZone($event)"
>
</app-custom-hot-zone>
<div style="margin-top: 30px;">
<div style="display: flex; flex-wrap: wrap">
<div *ngFor="let it of picArr; let i = index" style="padding: 10px">
<div style="width: 230px; height: 240px; border: 1px solid #ccc; border-radius: 10px; padding: 5px; display: flex; align-items: center; flex-direction: column">
<div style="width: 230px; height: 40px; position: absolute;" align="right">
<button style="margin-top: 5px; margin-right: 5px" nz-button nzSize="small" nzType="danger" (click)="deletePic(i)">
<i nz-icon nzType="close" nzTheme="outline"></i>
</button>
</div>
<h3 align="center" style="margin-top: 5px">item-{{i + 1}}</h3>
<div style="width: 90%">
<app-upload-image-with-preview
[picUrl]="it.pic_url"
(imageUploaded)="onImageUploadSuccess($event, 'pic_url', it)"
></app-upload-image-with-preview>
</div>
<input type="text" nz-input [(ngModel)]="it.text" (blur)="save()" style="width: 80%;margin-top: 5px">
<app-audio-recorder
style="margin-top: 5px"
[audioUrl]="it.audio_url"
(audioUploaded)="onAudioUploadSuccess($event, 'audio_url', it)"
></app-audio-recorder>
</div>
</div>
</div>
</div>
</div> -->
</div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment