Commit 9940b93f authored by yu's avatar yu

10.17调整

parent 840f4ea2
......@@ -156,11 +156,14 @@ export default class SceneComponent extends MyCocosSceneComponent {
clearInterval(this.recordIntervalId);
}
}, 150);
// this.showCountAction(3).then(() => {
// stop = true;
// this.onTouchRecordEnd();
// this.showMikeBgAction();
// });
let record_count = cc.find("record_count", this.img_record).getComponent(cc.Sprite);
record_count.fillRange = 0;
cc.Tween.stopAllByTarget(record_count);
let question = Game.getIns().getCurrentPage();
cc.tween(record_count).to(question.duration, { fillRange: -1 })
.call(() => {
this.onTouchRecordEnd();
}).start();
}
private labaIntervalId;
......
......@@ -7,8 +7,8 @@
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 225,
"height": 166,
"width": 226,
"height": 163,
"platformSettings": {},
"subMetas": {
"btn_record1": {
......@@ -18,14 +18,14 @@
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -1,
"offsetY": 10,
"trimX": 0,
"trimY": 3,
"offsetX": -0.5,
"offsetY": 11.5,
"trimX": 1,
"trimY": 2,
"width": 223,
"height": 140,
"rawWidth": 225,
"rawHeight": 166,
"height": 136,
"rawWidth": 226,
"rawHeight": 163,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
......
......@@ -7,8 +7,8 @@
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 225,
"height": 166,
"width": 226,
"height": 163,
"platformSettings": {},
"subMetas": {
"btn_record2": {
......@@ -18,14 +18,14 @@
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -1,
"offsetY": -11,
"offsetX": -1.5,
"offsetY": -11.5,
"trimX": 1,
"trimY": 24,
"trimY": 25,
"width": 221,
"height": 140,
"rawWidth": 225,
"rawHeight": 166,
"height": 136,
"rawWidth": 226,
"rawHeight": 163,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
......
......@@ -7,8 +7,8 @@
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 225,
"height": 166,
"width": 226,
"height": 163,
"platformSettings": {},
"subMetas": {
"btn_record3": {
......@@ -18,14 +18,14 @@
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -1,
"offsetY": -11,
"offsetX": -1.5,
"offsetY": -11.5,
"trimX": 1,
"trimY": 24,
"trimY": 25,
"width": 221,
"height": 140,
"rawWidth": 225,
"rawHeight": 166,
"height": 136,
"rawWidth": 226,
"rawHeight": 163,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
......
......@@ -7,8 +7,8 @@
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 225,
"height": 166,
"width": 226,
"height": 163,
"platformSettings": {},
"subMetas": {
"btn_voice1": {
......@@ -18,14 +18,14 @@
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -1,
"offsetY": 11,
"trimX": 0,
"offsetX": -0.5,
"offsetY": 11.5,
"trimX": 1,
"trimY": 2,
"width": 223,
"height": 140,
"rawWidth": 225,
"rawHeight": 166,
"height": 136,
"rawWidth": 226,
"rawHeight": 163,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
......
......@@ -7,8 +7,8 @@
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 225,
"height": 166,
"width": 226,
"height": 163,
"platformSettings": {},
"subMetas": {
"btn_voice2": {
......@@ -18,14 +18,14 @@
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -1,
"offsetY": -10,
"offsetX": -1.5,
"offsetY": -11.5,
"trimX": 1,
"trimY": 23,
"trimY": 25,
"width": 221,
"height": 140,
"rawWidth": 225,
"rawHeight": 166,
"height": 136,
"rawWidth": 226,
"rawHeight": 163,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
......
......@@ -7,8 +7,8 @@
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 225,
"height": 166,
"width": 226,
"height": 163,
"platformSettings": {},
"subMetas": {
"btn_voice3": {
......@@ -18,14 +18,14 @@
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -1,
"offsetY": -10,
"offsetX": -1.5,
"offsetY": -11.5,
"trimX": 1,
"trimY": 23,
"trimY": 25,
"width": 221,
"height": 140,
"rawWidth": 225,
"rawHeight": 166,
"height": 136,
"rawWidth": 226,
"rawHeight": 163,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
......
{
"ver": "2.3.5",
"uuid": "180e160f-b5ee-4fa2-9e52-5fb09a9d3511",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 136,
"height": 136,
"platformSettings": {},
"subMetas": {
"record_count": {
"ver": "1.0.4",
"uuid": "4ef5ee81-79ff-49da-b215-bdddf5ea6b80",
"rawTextureUuid": "180e160f-b5ee-4fa2-9e52-5fb09a9d3511",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 136,
"height": 136,
"rawWidth": 136,
"rawHeight": 136,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
......@@ -160,14 +160,14 @@
</div>
<div style="margin:0 20px">
<button class="btn-red" nz-button nzType="default" nzDanger (click)="removeQuestion(i)">删除题目</button>
<button *ngIf="item.questions.length < 4" class="btn-blue" style="margin-top: 10px;" nz-button
<button class="btn-blue" style="margin-top: 10px;" nz-button
nzType="default" nzDanger (click)="copyQuestion(i)">复制题目</button>
</div>
</div>
</div>
<div style="margin-top: 20px;">
<button *ngIf="item.questions.length < 4" class="btn-blue" style="width: 1000px; height: 50px;" nz-button
<button class="btn-blue" style="width: 1000px; height: 50px;" nz-button
nzType="default" nzDanger (click)="addQuestion()">+增加题目</button>
</div>
</div>
......
......@@ -50,7 +50,7 @@ export class FormComponent extends ComponentBase implements OnInit, OnChanges, O
}
addQuestion() {
if (this.item.questions.length == 6) return;
// if (this.item.questions.length == 6) return;
this.item.questions.push({
type: 'img',
audio: '',
......
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