Commit 616c336e authored by 李维's avatar 李维

迁移工程

dfzx_cocos_pinjuzi
parent 18f1fef8
No preview for this file type
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "e976091a-1c92-4be8-bdef-e61b8d23d13d", "uuid": "c053a3d9-073e-4b78-a27b-e50a754b4c1c",
"isBundle": true, "isBundle": true,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
"compressionType": { "compressionType": {},
"ios": "default", "optimizeHotUpdate": {},
"android": "default" "inlineSpriteFrames": {},
},
"optimizeHotUpdate": {
"ios": false,
"android": false
},
"inlineSpriteFrames": {
"ios": false,
"android": false
},
"isRemoteBundle": { "isRemoteBundle": {
"ios": true, "ios": true,
"android": true "android": true
......
{
"ver": "1.1.2",
"uuid": "0853b105-45c9-46d0-a122-eb6fb49db712",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {},
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "58d7c08f-0cf4-47da-a6b1-d60f3afbfb49",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 351,
"height": 322,
"platformSettings": {},
"subMetas": {
"btn_tigan": {
"ver": "1.0.4",
"uuid": "38aa9cac-d06b-4bfa-a22b-df04ae95efda",
"rawTextureUuid": "58d7c08f-0cf4-47da-a6b1-d60f3afbfb49",
"trimType": "custom",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 351,
"height": 322,
"rawWidth": 351,
"rawHeight": 322,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "d2ae84c8-c286-4aec-a989-684e81b9917c",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 351,
"height": 322,
"platformSettings": {},
"subMetas": {
"btn_tigan1": {
"ver": "1.0.4",
"uuid": "64fdf44b-1aea-4b18-b26a-ad94bf42285a",
"rawTextureUuid": "d2ae84c8-c286-4aec-a989-684e81b9917c",
"trimType": "custom",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 351,
"height": 322,
"rawWidth": 351,
"rawHeight": 322,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "84c5cb04-139d-4ee9-ab3a-cde28aad4a13",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 351,
"height": 322,
"platformSettings": {},
"subMetas": {
"btn_tigan2": {
"ver": "1.0.4",
"uuid": "d4d3f810-5c67-4861-8e63-4e6583fc43f8",
"rawTextureUuid": "84c5cb04-139d-4ee9-ab3a-cde28aad4a13",
"trimType": "custom",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 351,
"height": 322,
"rawWidth": 351,
"rawHeight": 322,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "ec035607-33ce-4f0a-b5b2-d972b2ace0c6",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 351,
"height": 322,
"platformSettings": {},
"subMetas": {
"btn_tigan3": {
"ver": "1.0.4",
"uuid": "107ec14e-3795-4d83-9748-ff2d5e9e2a86",
"rawTextureUuid": "ec035607-33ce-4f0a-b5b2-d972b2ace0c6",
"trimType": "custom",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 351,
"height": 322,
"rawWidth": 351,
"rawHeight": 322,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"__type__": "cc.AnimationClip",
"_name": "sound",
"_objFlags": 0,
"_native": "",
"_duration": 0.35,
"sample": 60,
"speed": 1,
"wrapMode": 2,
"curveData": {
"paths": {},
"comps": {
"cc.Sprite": {
"spriteFrame": [
{
"frame": 0,
"value": {
"__uuid__": "38aa9cac-d06b-4bfa-a22b-df04ae95efda"
}
},
{
"frame": 0.08333333333333333,
"value": {
"__uuid__": "64fdf44b-1aea-4b18-b26a-ad94bf42285a"
}
},
{
"frame": 0.16666666666666666,
"value": {
"__uuid__": "d4d3f810-5c67-4861-8e63-4e6583fc43f8"
}
},
{
"frame": 0.25,
"value": {
"__uuid__": "107ec14e-3795-4d83-9748-ff2d5e9e2a86"
}
},
{
"frame": 0.3333333333333333,
"value": {
"__uuid__": "38aa9cac-d06b-4bfa-a22b-df04ae95efda"
}
}
]
}
}
},
"events": []
}
\ No newline at end of file
{
"ver": "2.1.0",
"uuid": "d8df8975-dae2-49fb-aa9f-4adf99b022c1",
"subMetas": {}
}
\ No newline at end of file
This diff is collapsed.
{ {
"ver": "1.2.9", "ver": "1.2.9",
"uuid": "5e0a03aa-9b9e-4076-b508-7dbf209bb115", "uuid": "62556a48-851a-4906-826d-cb5337f96dc9",
"asyncLoadAssets": false, "asyncLoadAssets": false,
"autoReleaseAssets": true, "autoReleaseAssets": false,
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
This diff is collapsed.
{ {
"ver": "1.1.0", "ver": "1.1.0",
"uuid": "658306f6-13a7-4a67-a84a-514e0a1ac965", "uuid": "14e3de9f-d793-4d52-81b0-de06648c037c",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
assets/JJ_Game_05/texture/bg.png

5.46 KB | W: | H:

assets/JJ_Game_05/texture/bg.png

15 KB | W: | H:

assets/JJ_Game_05/texture/bg.png
assets/JJ_Game_05/texture/bg.png
assets/JJ_Game_05/texture/bg.png
assets/JJ_Game_05/texture/bg.png
  • 2-up
  • Swipe
  • Onion skin
assets/JJ_Game_05/texture/ques_bg.png

3.17 KB | W: | H:

assets/JJ_Game_05/texture/ques_bg.png

3.14 KB | W: | H:

assets/JJ_Game_05/texture/ques_bg.png
assets/JJ_Game_05/texture/ques_bg.png
assets/JJ_Game_05/texture/ques_bg.png
assets/JJ_Game_05/texture/ques_bg.png
  • 2-up
  • Swipe
  • Onion skin
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "4cf2a4cf-5fdf-47db-8128-be4c34ff9508", "uuid": "cd39852f-8815-4b51-a7e5-80c2c48c058f",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 154, "width": 308,
"height": 158, "height": 107,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"ques_bg": { "ques_bg": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "aa32f2f8-31f1-4c05-9f05-132d557bd18b", "uuid": "6170c931-659e-467a-8c2a-131d7447341c",
"rawTextureUuid": "4cf2a4cf-5fdf-47db-8128-be4c34ff9508", "rawTextureUuid": "cd39852f-8815-4b51-a7e5-80c2c48c058f",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 154, "width": 308,
"height": 158, "height": 107,
"rawWidth": 154, "rawWidth": 308,
"rawHeight": 158, "rawHeight": 107,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
{
"ver": "2.3.5",
"uuid": "71ccc922-4ffe-420f-bc11-56e87336cbd9",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 351,
"height": 322,
"platformSettings": {},
"subMetas": {
"sound_bg": {
"ver": "1.0.4",
"uuid": "2e1a9184-b7f8-44cc-90a1-62f93c4317a6",
"rawTextureUuid": "71ccc922-4ffe-420f-bc11-56e87336cbd9",
"trimType": "custom",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 351,
"height": 322,
"rawWidth": 351,
"rawHeight": 322,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
<div class="position-relative"> <div class="position-relative" style="display: flex;">
<nz-upload class="p-image-uploader" [nzDisabled]="disableUpload" <nz-upload class="p-image-uploader" [nzDisabled]="disableUpload"
[nzShowUploadList]="false" [nzShowUploadList]="false"
nzAccept = "image/*" nzAccept = "image/*"
...@@ -28,10 +28,15 @@ ...@@ -28,10 +28,15 @@
</div> </div>
</div> </div>
</nz-upload> </nz-upload>
<div class="p-btn-delete" *ngIf="canDelete"
<!-- <button nz-button><i nz-icon nzType="upload"></i><span>Upload</span></button> -->
<button nz-button
nzType="danger"
*ngIf="canDelete"
nz-popconfirm nzTitle="Are you sure ?" nz-popconfirm nzTitle="Are you sure ?"
(nzOnConfirm)="onDelete()" (nzOnConfirm)="onDelete()"
> >
<i nz-icon nzType="close" nzTheme="outline"></i> <i nz-icon nzType="close" nzTheme="outline"></i>
</div> </button>
</div> </div>
...@@ -13,7 +13,7 @@ export class UploadImageWithPreviewComponent implements OnDestroy, OnChanges { ...@@ -13,7 +13,7 @@ export class UploadImageWithPreviewComponent implements OnDestroy, OnChanges {
@Input() @Input()
picUrl; picUrl;
@Input() @Input()
canDelete = false; canDelete = true;
@Output() @Output()
imageUploaded = new EventEmitter(); imageUploaded = new EventEmitter();
@Output() @Output()
...@@ -88,7 +88,9 @@ export class UploadImageWithPreviewComponent implements OnDestroy, OnChanges { ...@@ -88,7 +88,9 @@ export class UploadImageWithPreviewComponent implements OnDestroy, OnChanges {
} }
onDelete() { onDelete() {
this.delete.emit(); // this.delete.emit();
this.imageUploaded.emit({});
} }
checkSelectFile(file) { checkSelectFile(file) {
const isImg = ['image/jpeg', 'image/png', 'image/jpeg', 'image/gif', 'image/bmp'].includes(file.type); const isImg = ['image/jpeg', 'image/png', 'image/jpeg', 'image/gif', 'image/bmp'].includes(file.type);
...@@ -120,6 +122,7 @@ export class UploadImageWithPreviewComponent implements OnDestroy, OnChanges { ...@@ -120,6 +122,7 @@ export class UploadImageWithPreviewComponent implements OnDestroy, OnChanges {
file['height'] = height; file['height'] = height;
file['width'] = width; file['width'] = width;
img.remove(); img.remove();
this.imageUploaded.emit(file.response); this.imageUploaded.emit(file.response);
// this.resService.updateImage(id, {width, height}).then( () => { // this.resService.updateImage(id, {width, height}).then( () => {
// this.imageUploaded.emit({res_id: id, id, name, hash, url}); // this.imageUploaded.emit({res_id: id, id, name, hash, url});
......
...@@ -38,9 +38,9 @@ ...@@ -38,9 +38,9 @@
</div> </div>
<div style="display: flex; align-items: center; justify-content: center; margin-top: 20px; font-size: 15px; font-weight: 500;"> <div style="display: flex; align-items: center; justify-content: center; margin-top: 20px; font-size: 15px; font-weight: 500;">
<span style="margin-right: 5px">单词: </span> <span style="margin-right: 5px">句子: </span>
<div *ngFor="let op of it.optionArr"> <div *ngFor="let op of it.optionArr">
{{op.text}} {{op.text}} &nbsp;
</div> </div>
<!-- <input style="width: 220px; margin-left: 10px;" type="text" nz-input [(ngModel)]="it.word" (blur)="save()"> --> <!-- <input style="width: 220px; margin-left: 10px;" type="text" nz-input [(ngModel)]="it.word" (blur)="save()"> -->
</div> </div>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<button nz-button nzType="dashed" (click)="addOptionBtnClick(it)" style="margin-top: 10px; margin-left: 30px;"> <button nz-button nzType="dashed" (click)="addOptionBtnClick(it)" style="margin-top: 10px; margin-left: 30px;">
<i nz-icon nzType="plus-circle" nzTheme="outline"></i> <i nz-icon nzType="plus-circle" nzTheme="outline"></i>
添加单词字母 添加句子单词
</button> </button>
<div style="display: flex; align-items: center; justify-content: center; flex-wrap: wrap; margin: 10px; margin-bottom: 20px;"> <div style="display: flex; align-items: center; justify-content: center; flex-wrap: wrap; margin: 10px; margin-bottom: 20px;">
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<div style="display: flex; align-items: center;"> <div style="display: flex; align-items: center;">
<input style="width: 70px;" type="text" nz-input [(ngModel)]="op.text" (blur)="save()"> <input style="width: 120px;" type="text" nz-input [(ngModel)]="op.text" (blur)="save()">
<label nz-checkbox [(ngModel)]="op.isEmpty" (ngModelChange)="save()" style="margin-left: 5px;">挖空</label> <label nz-checkbox [(ngModel)]="op.isEmpty" (ngModelChange)="save()" style="margin-left: 5px;">挖空</label>
<button nz-button nzType="danger" (click)="onBtnDeleteOption(j, it.optionArr)"> <button nz-button nzType="danger" (click)="onBtnDeleteOption(j, it.optionArr)">
X X
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<button nz-button nzType="dashed" (click)="addWrongBtnClick(it)" style="margin-top: 10px; margin-left: 30px;"> <button nz-button nzType="dashed" (click)="addWrongBtnClick(it)" style="margin-top: 10px; margin-left: 30px;">
<i nz-icon nzType="plus-circle" nzTheme="outline"></i> <i nz-icon nzType="plus-circle" nzTheme="outline"></i>
添加干扰字母 添加干扰单词
</button> </button>
<div style="display: flex; align-items: center; justify-content: center; flex-wrap: wrap; margin: 10px; margin-bottom: 20px;"> <div style="display: flex; align-items: center; justify-content: center; flex-wrap: wrap; margin: 10px; margin-bottom: 20px;">
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
<div style="display: flex; align-items: center;"> <div style="display: flex; align-items: center;">
<input style="width: 50px; margin-right: 5px;" type="text" nz-input [(ngModel)]="op.text" (blur)="save()"> <input style="width: 120px; margin-right: 5px;" type="text" nz-input [(ngModel)]="op.text" (blur)="save()">
<div style="margin-right: 5px;"> <div style="margin-right: 5px;">
<app-audio-recorder <app-audio-recorder
......
...@@ -10,7 +10,7 @@ import { JsonPipe } from '@angular/common'; ...@@ -10,7 +10,7 @@ import { JsonPipe } from '@angular/common';
export class FormComponent implements OnInit, OnChanges, OnDestroy { export class FormComponent implements OnInit, OnChanges, OnDestroy {
// 储存数据用 // 储存数据用
saveKey = "dfzx_cocos_pindanci"; saveKey = "dfzx_cocos_pinjuzi";
// 储存对象 // 储存对象
item; item;
......
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