Commit 5ec68f3c authored by yu's avatar yu

1

parent 92a53a1c
......@@ -12,6 +12,7 @@ const { ccclass, property } = cc._decorator;
export default class LayerBack extends cc.Component {
private btn_back: cc.Node;
private img_npc_voice: cc.Node;
private bg_forbid: cc.Node;
onLoad() {
this.initView();
this.initEvent();
......@@ -20,6 +21,7 @@ export default class LayerBack extends cc.Component {
initView() {
this.bg_forbid = pg.view.find(this, 'bg_forbid')
this.btn_back = pg.view.find(this, 'btn_back')
this.label_title = pg.view.find(this, 'label_title')
this.img_npc_voice = pg.view.find(this.label_title, 'img_npc_voice')
......@@ -39,6 +41,7 @@ export default class LayerBack extends cc.Component {
pg.event.on('npc_layer_back_init', (data) => {
this.updateView(data);
if (!this.npcAudio) {
pg.view.visible(this.bg_forbid, false)
pg.event.emit('npc_voice_play_voice_end');
} else {
this.playVoiceStart();
......@@ -56,6 +59,7 @@ export default class LayerBack extends cc.Component {
this.schedule(this.playVoiceRunning, 0.3)
pg.audio.playAudioByUrl(this.npcAudio, () => {
this.playVoiceEnd();
pg.view.visible(this.bg_forbid, false)
pg.event.emit('npc_voice_play_voice_end')
}, (audioId) => {
this.audioId = audioId;
......
......@@ -21,20 +21,23 @@
"__id__": 2
},
{
"__id__": 7
"__id__": 6
},
{
"__id__": 11
}
],
"_active": true,
"_components": [
{
"__id__": 22
"__id__": 27
},
{
"__id__": 23
"__id__": 28
}
],
"_prefab": {
"__id__": 24
"__id__": 29
},
"_opacity": 255,
"_color": {
......@@ -85,7 +88,7 @@
},
{
"__type__": "cc.Node",
"_name": "btn_back",
"_name": "bg_forbid",
"_objFlags": 0,
"_parent": {
"__id__": 1
......@@ -98,13 +101,128 @@
},
{
"__id__": 4
}
],
"_prefab": {
"__id__": 5
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1920,
"height": 1080
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": ""
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 2
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": ""
},
{
"__type__": "cc.BlockInputEvents",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 2
},
"_enabled": true,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "0b87ca13-07e1-4237-ab3b-7f27c69deb2d"
},
"fileId": "07DTTDThBNdJCrgpsUtJSh",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "btn_back",
"_objFlags": 0,
"_parent": {
"__id__": 1
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 7
},
{
"__id__": 8
},
{
"__id__": 5
"__id__": 9
}
],
"_prefab": {
"__id__": 6
"__id__": 10
},
"_opacity": 255,
"_color": {
......@@ -158,7 +276,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 2
"__id__": 6
},
"_enabled": true,
"_materials": [
......@@ -190,7 +308,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 2
"__id__": 6
},
"_enabled": true,
"_normalMaterial": null,
......@@ -258,7 +376,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 2
"__id__": 6
},
"_enabled": true,
"alignMode": 1,
......@@ -300,17 +418,20 @@
},
"_children": [
{
"__id__": 8
"__id__": 12
}
],
"_active": true,
"_components": [
{
"__id__": 20
"__id__": 24
},
{
"__id__": 25
}
],
"_prefab": {
"__id__": 21
"__id__": 26
},
"_opacity": 255,
"_color": {
......@@ -364,27 +485,27 @@
"_name": "img_npc_voice",
"_objFlags": 0,
"_parent": {
"__id__": 7
"__id__": 11
},
"_children": [
{
"__id__": 9
"__id__": 13
},
{
"__id__": 12
"__id__": 16
},
{
"__id__": 15
"__id__": 19
}
],
"_active": true,
"_components": [
{
"__id__": 18
"__id__": 22
}
],
"_prefab": {
"__id__": 19
"__id__": 23
},
"_opacity": 255,
"_color": {
......@@ -438,17 +559,17 @@
"_name": "p1",
"_objFlags": 0,
"_parent": {
"__id__": 8
"__id__": 12
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 10
"__id__": 14
}
],
"_prefab": {
"__id__": 11
"__id__": 15
},
"_opacity": 255,
"_color": {
......@@ -502,7 +623,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 9
"__id__": 13
},
"_enabled": true,
"_materials": [
......@@ -545,17 +666,17 @@
"_name": "p2",
"_objFlags": 0,
"_parent": {
"__id__": 8
"__id__": 12
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 13
"__id__": 17
}
],
"_prefab": {
"__id__": 14
"__id__": 18
},
"_opacity": 255,
"_color": {
......@@ -609,7 +730,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 12
"__id__": 16
},
"_enabled": true,
"_materials": [
......@@ -652,17 +773,17 @@
"_name": "p3",
"_objFlags": 0,
"_parent": {
"__id__": 8
"__id__": 12
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 16
"__id__": 20
}
],
"_prefab": {
"__id__": 17
"__id__": 21
},
"_opacity": 255,
"_color": {
......@@ -716,7 +837,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 15
"__id__": 19
},
"_enabled": true,
"_materials": [
......@@ -759,7 +880,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 8
"__id__": 12
},
"_enabled": true,
"alignMode": 2,
......@@ -797,7 +918,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 7
"__id__": 11
},
"_enabled": true,
"_materials": [
......@@ -827,6 +948,33 @@
"_N$cacheMode": 0,
"_id": ""
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 11
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 1,
"_left": 0,
"_right": 0,
"_top": 67.39999999999998,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
......
......@@ -69,3 +69,4 @@ export default class LayerCoin extends cc.Component {
......@@ -57,3 +57,4 @@ export default class LayerEnding extends cc.Component {
......@@ -39,13 +39,16 @@ export default class Candy extends cc.Component {
ch.y = 0;
let ju = cc.jumpBy(0.5, cc.v2(x, y), this.jumpHeight, 1);
let call = cc.callFunc(() => {
if (idx == this.node.children.length - 1)
if (idx == this.node.children.length - 1) {
pg.event.emit("camdy_action_end", this.node);
if (this.isHide) this.node.active = !this.isHide;
let light = cc.find("pic_light", this.node);
cc.tween(light).to(1, { opacity: 0 }).start();
}
// if (this.isHide) this.node.active = !this.isHide;
})
// ch.runAction(ju);
cc.tween(ch).sequence(ju, call).start();
cc.tween(ch).delay(0.5).to(0.2, { opacity: 0 }).start();
})
......@@ -59,3 +62,4 @@ export default class Candy extends cc.Component {
......@@ -55,3 +55,4 @@ export default class ImgVoice extends cc.Component {
......@@ -200,3 +200,4 @@ export default class LayerRecord extends cc.Component {
......@@ -111,3 +111,4 @@ export default class LayerRight extends cc.Component {
......@@ -4,7 +4,7 @@ export let imageZize = {
}
export class OptionJigsaw {
export class Option {
type;
txt;
picUrl;
......@@ -17,11 +17,11 @@ export class OptionJigsaw {
this.data = data;
this.type = data.type;
this.txt = data.text;
this.picUrl = data.image;
this.picUrl = data.pic_url;
this.audioUrl = data.optionAudio;
}
}
export class ItemJigsaw {
export class Item {
public page;
public audio;
public image;
......@@ -29,26 +29,42 @@ export class ItemJigsaw {
public voice;
public time;
public id;
public hotZoneItemArr;
count: number;
constructor(data, page) {
// this.audio = data.audio;
this.image = data.pic_url;
// this.voice = data.voice;
// this.time = data.time;
this.id = page;
// this.optionList = data.options.map(o => {
// return new Option(o, id++);
// })
// this.optionList.sort(function () {
// return (0.5 - Math.random());
// });
// for (let i = 0; i < this.optionList.length; i++) {
// this.optionList[i].count = i;
// }
this.page = page;
this.audio = data.audioUrl;
this.image = data.bgItem.url;
this.hotZoneItemArr = [];
for (let i = 0; i < data.hotZoneItemArr.length; i++) {
let d = data.hotZoneItemArr[i];
this.hotZoneItemArr.push(new Option(d, i));
}
this.changepoints(data);
}
// this.page = page;
public pointsArr;
private changepoints(data) {
let scX = imageZize.width / data.bgItem.rect.width;
let scY = imageZize.height / data.bgItem.rect.height;
let px = data.bgItem.rect.x;
let py = data.bgItem.rect.y;
this.pointsArr = [];
let arr = [];
data.hotZoneItemArr.forEach((item, idx) => {
let p = item.rect;
arr[idx] = {
x: (p.x + (p.width / 2)) * scX,// - px
y: -((p.y + (p.height / 2)) * scY)// - py
}
})
this.pointsArr = arr.concat();
}
}
export default class GameJigsaw {
......@@ -58,7 +74,7 @@ export default class GameJigsaw {
return GameJigsaw.ins;
}
private data: any;
public lists: Array<ItemJigsaw>
public lists: Array<Item>
public title: string;
public titleAudio: string;
public image: string;
......@@ -82,7 +98,7 @@ export default class GameJigsaw {
public init(data) {
this.start = false;
this.lists = [];
this.data = data.hotZoneItemArr;
this.data = data.questions;
this.aniEnter = data.imgAni;
this.endImgAni = data.endImgAni;
this.title = data.title;
......@@ -95,7 +111,6 @@ export default class GameJigsaw {
this.tipSwitch = data.tipSwitch;
this.endImgTitle = data.endImgTitle;
this.jumpIdx = data.jumpIdx || -1;
this.changepoints(data);
}
public start: boolean;
public page: number;
......@@ -105,13 +120,13 @@ export default class GameJigsaw {
this.lists = [];
for (let i = 0; i < this.data.length; i++) {
let data = this.data[i];
this.lists.push(new ItemJigsaw(data, i));
this.lists.push(new Item(data, i + 1));
}
this.lists.sort(function () {
return (0.5 - Math.random());
});
}
checkSuccess(arr: OptionJigsaw[]) {
checkSuccess(arr: Option[]) {
let data = this.getCurrentPage();
let options = data.optionList.concat();
options.sort((A, B) => A.id - B.id)
......@@ -122,23 +137,7 @@ export default class GameJigsaw {
}
return true;
}
public pointsArr;
private changepoints(data) {
let scX = imageZize.width / data.bgItem.rect.width;
let scY = imageZize.height / data.bgItem.rect.height;
let px = data.bgItem.rect.x;
let py = data.bgItem.rect.y;
this.pointsArr = [];
let arr = [];
data.hotZoneItemArr.forEach((item, idx) => {
let p = item.rect;
arr[idx] = {
x: (p.x + (p.width / 2)) * scX,// - px
y: -((p.y + (p.height / 2)) * scY)// - py
}
})
this.pointsArr = arr.concat();
}
getTotalLabel() {
let data = this.getCurrentPage();
......@@ -149,10 +148,10 @@ export default class GameJigsaw {
return str;
}
getDataByPage(page): ItemJigsaw {
getDataByPage(page): Item {
return this.lists.filter(li => li.page == page)[0]
}
getCurrentPage(): ItemJigsaw {
getCurrentPage(): Item {
let page = this.page;
return this.lists.filter(li => li.page == page)[0]
}
......@@ -190,3 +189,4 @@ let win: any = window;
win.Game = GameJigsaw;
......@@ -102,25 +102,25 @@
"__id__": 116
},
{
"__id__": 140
"__id__": 145
},
{
"__id__": 162
"__id__": 167
},
{
"__id__": 207
"__id__": 212
}
],
"_active": true,
"_components": [
{
"__id__": 246
"__id__": 251
},
{
"__id__": 247
"__id__": 252
},
{
"__id__": 248
"__id__": 253
}
],
"_prefab": null,
......@@ -5062,20 +5062,23 @@
"__id__": 117
},
{
"__id__": 122
"__id__": 121
},
{
"__id__": 126
}
],
"_active": true,
"_components": [
{
"__id__": 137
"__id__": 142
},
{
"__id__": 138
"__id__": 143
}
],
"_prefab": {
"__id__": 139
"__id__": 144
},
"_opacity": 255,
"_color": {
......@@ -5122,11 +5125,11 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "7cuShTPdZAsLSXsQ6mgK6F"
"_id": "65zeHRfWNHbJfxxjrLvRTP"
},
{
"__type__": "cc.Node",
"_name": "btn_back",
"_name": "bg_forbid",
"_objFlags": 0,
"_parent": {
"__id__": 116
......@@ -5139,13 +5142,128 @@
},
{
"__id__": 119
}
],
"_prefab": {
"__id__": 120
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1920,
"height": 1080
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "2ayIdngQBOSaRS37PgBMXi"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 117
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "6aHwjtCppNIpmb1p9Vp4Kd"
},
{
"__type__": "cc.BlockInputEvents",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 117
},
"_enabled": true,
"_id": "c2L8w/actDK5ZZAc2oDGrp"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 116
},
"asset": {
"__uuid__": "0b87ca13-07e1-4237-ab3b-7f27c69deb2d"
},
"fileId": "07DTTDThBNdJCrgpsUtJSh",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "btn_back",
"_objFlags": 0,
"_parent": {
"__id__": 116
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 122
},
{
"__id__": 120
"__id__": 123
},
{
"__id__": 124
}
],
"_prefab": {
"__id__": 121
"__id__": 125
},
"_opacity": 255,
"_color": {
......@@ -5192,14 +5310,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "351thQy2pJWLnA2/5I4LgK"
"_id": "6cz+VdUk5I3oHBzlQqC3qQ"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 117
"__id__": 121
},
"_enabled": true,
"_materials": [
......@@ -5224,14 +5342,14 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "04EUZJ0kZI2Y/gEvf4IaTe"
"_id": "6avIi7+25KRpK3PHrY+MKM"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 117
"__id__": 121
},
"_enabled": true,
"_normalMaterial": null,
......@@ -5292,14 +5410,14 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "dbS/gi8n9CJqHG91bnNoVh"
"_id": "d5iglxWihJn7FptuEH6UVt"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 117
"__id__": 121
},
"_enabled": true,
"alignMode": 1,
......@@ -5319,7 +5437,7 @@
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "34ElcZPh5IoraR0bINyfKK"
"_id": "b8ZDnQ+htGF5bCVtNLJd1j"
},
{
"__type__": "cc.PrefabInfo",
......@@ -5341,17 +5459,20 @@
},
"_children": [
{
"__id__": 123
"__id__": 127
}
],
"_active": true,
"_components": [
{
"__id__": 135
"__id__": 139
},
{
"__id__": 140
}
],
"_prefab": {
"__id__": 136
"__id__": 141
},
"_opacity": 255,
"_color": {
......@@ -5398,34 +5519,34 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "66xQf+IVNJmpawPHk6pAvc"
"_id": "9cnB/TZqtF8aSYqsJMdR6x"
},
{
"__type__": "cc.Node",
"_name": "img_npc_voice",
"_objFlags": 0,
"_parent": {
"__id__": 122
"__id__": 126
},
"_children": [
{
"__id__": 124
"__id__": 128
},
{
"__id__": 127
"__id__": 131
},
{
"__id__": 130
"__id__": 134
}
],
"_active": true,
"_components": [
{
"__id__": 133
"__id__": 137
}
],
"_prefab": {
"__id__": 134
"__id__": 138
},
"_opacity": 255,
"_color": {
......@@ -5472,24 +5593,24 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "ecUzmLvttPL6Jdz3rbcowb"
"_id": "66nuGQq91Bt5PDiv78sCTM"
},
{
"__type__": "cc.Node",
"_name": "p1",
"_objFlags": 0,
"_parent": {
"__id__": 123
"__id__": 127
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 125
"__id__": 129
}
],
"_prefab": {
"__id__": 126
"__id__": 130
},
"_opacity": 255,
"_color": {
......@@ -5536,14 +5657,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "8bWoJplVZLu52bz9fL/IJy"
"_id": "b9FNvhqndOHZ7w9Le5pCy1"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 124
"__id__": 128
},
"_enabled": true,
"_materials": [
......@@ -5568,7 +5689,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "06UOhzFqJHL6W0blBQoz/W"
"_id": "57oh8d6hBCNav+ZuWuSZc5"
},
{
"__type__": "cc.PrefabInfo",
......@@ -5586,17 +5707,17 @@
"_name": "p2",
"_objFlags": 0,
"_parent": {
"__id__": 123
"__id__": 127
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 128
"__id__": 132
}
],
"_prefab": {
"__id__": 129
"__id__": 133
},
"_opacity": 255,
"_color": {
......@@ -5643,14 +5764,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "6aVgcbtW5AqpZmIe0Z/VG2"
"_id": "c2MKFR2uFD+bwWhoPYfL/t"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 127
"__id__": 131
},
"_enabled": true,
"_materials": [
......@@ -5675,7 +5796,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "5fjTxyQSFB3rC0+0XwGItx"
"_id": "dcsbGwzWxIl6p8mgxqDd9a"
},
{
"__type__": "cc.PrefabInfo",
......@@ -5693,17 +5814,17 @@
"_name": "p3",
"_objFlags": 0,
"_parent": {
"__id__": 123
"__id__": 127
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 131
"__id__": 135
}
],
"_prefab": {
"__id__": 132
"__id__": 136
},
"_opacity": 255,
"_color": {
......@@ -5750,14 +5871,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "4dYPmylYhHi79QiGQV4w77"
"_id": "e4F/ZhQ6NPFaKCkcE8yqqE"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 130
"__id__": 134
},
"_enabled": true,
"_materials": [
......@@ -5782,7 +5903,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "d3kLDyU21AsqXOFBVnOEz+"
"_id": "6ezXS18h9H+pKJyYD2PiS/"
},
{
"__type__": "cc.PrefabInfo",
......@@ -5800,7 +5921,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 123
"__id__": 127
},
"_enabled": true,
"alignMode": 2,
......@@ -5820,7 +5941,7 @@
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "afNUOZRThC5LB/aDJUQ+3x"
"_id": "5ftj6JHUVNj5ATqMJdjJ1l"
},
{
"__type__": "cc.PrefabInfo",
......@@ -5838,7 +5959,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 122
"__id__": 126
},
"_enabled": true,
"_materials": [
......@@ -5866,7 +5987,34 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "8ccsTykYNJcLvI9x7JEKlc"
"_id": "138922vqZI5LzifYrvZJHA"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 126
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 1,
"_left": 0,
"_right": 0,
"_top": 67.39999999999998,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "27itUvXDZF66/kRTGFumoD"
},
{
"__type__": "cc.PrefabInfo",
......@@ -5904,7 +6052,7 @@
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "7983eBOSZEZZvtwpjto+Eq"
"_id": "e7NHm9MfRBDKHVC3uNr/2n"
},
{
"__type__": "7ab71itR/hJz4giCFo5yFB1",
......@@ -5914,7 +6062,7 @@
"__id__": 116
},
"_enabled": true,
"_id": "c5RdodialFfaooU+L2UZUr"
"_id": "e04AUacyREUoIaiYrpZS4J"
},
{
"__type__": "cc.PrefabInfo",
......@@ -5936,20 +6084,20 @@
},
"_children": [
{
"__id__": 141
"__id__": 146
},
{
"__id__": 155
"__id__": 160
}
],
"_active": true,
"_components": [
{
"__id__": 160
"__id__": 165
}
],
"_prefab": {
"__id__": 161
"__id__": 166
},
"_opacity": 255,
"_color": {
......@@ -6003,26 +6151,26 @@
"_name": "layout_center",
"_objFlags": 0,
"_parent": {
"__id__": 140
"__id__": 145
},
"_children": [
{
"__id__": 142
"__id__": 147
},
{
"__id__": 145
"__id__": 150
},
{
"__id__": 148
"__id__": 153
},
{
"__id__": 151
"__id__": 156
}
],
"_active": false,
"_components": [],
"_prefab": {
"__id__": 154
"__id__": 159
},
"_opacity": 255,
"_color": {
......@@ -6076,17 +6224,17 @@
"_name": "bg_gray",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 146
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 143
"__id__": 148
}
],
"_prefab": {
"__id__": 144
"__id__": 149
},
"_opacity": 102,
"_color": {
......@@ -6140,7 +6288,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 142
"__id__": 147
},
"_enabled": true,
"_materials": [
......@@ -6170,7 +6318,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 140
"__id__": 145
},
"asset": {
"__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747"
......@@ -6183,17 +6331,17 @@
"_name": "aniNode1",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 146
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 146
"__id__": 151
}
],
"_prefab": {
"__id__": 147
"__id__": 152
},
"_opacity": 255,
"_color": {
......@@ -6247,7 +6395,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 145
"__id__": 150
},
"_enabled": true,
"_materials": [
......@@ -6285,7 +6433,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 140
"__id__": 145
},
"asset": {
"__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747"
......@@ -6298,17 +6446,17 @@
"_name": "aniNode2",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 146
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 149
"__id__": 154
}
],
"_prefab": {
"__id__": 150
"__id__": 155
},
"_opacity": 255,
"_color": {
......@@ -6362,7 +6510,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 148
"__id__": 153
},
"_enabled": true,
"_materials": [
......@@ -6398,7 +6546,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 140
"__id__": 145
},
"asset": {
"__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747"
......@@ -6411,17 +6559,17 @@
"_name": "aniNode3",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 146
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 152
"__id__": 157
}
],
"_prefab": {
"__id__": 153
"__id__": 158
},
"_opacity": 255,
"_color": {
......@@ -6475,7 +6623,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 151
"__id__": 156
},
"_enabled": true,
"_materials": [
......@@ -6513,7 +6661,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 140
"__id__": 145
},
"asset": {
"__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747"
......@@ -6524,7 +6672,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 140
"__id__": 145
},
"asset": {
"__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747"
......@@ -6537,17 +6685,17 @@
"_name": "res",
"_objFlags": 0,
"_parent": {
"__id__": 140
"__id__": 145
},
"_children": [
{
"__id__": 156
"__id__": 161
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 159
"__id__": 164
},
"_opacity": 255,
"_color": {
......@@ -6601,17 +6749,17 @@
"_name": "coin",
"_objFlags": 0,
"_parent": {
"__id__": 155
"__id__": 160
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 157
"__id__": 162
}
],
"_prefab": {
"__id__": 158
"__id__": 163
},
"_opacity": 255,
"_color": {
......@@ -6665,7 +6813,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 156
"__id__": 161
},
"_enabled": true,
"_clip": {
......@@ -6682,7 +6830,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 140
"__id__": 145
},
"asset": {
"__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747"
......@@ -6693,7 +6841,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 140
"__id__": 145
},
"asset": {
"__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747"
......@@ -6706,7 +6854,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 140
"__id__": 145
},
"_enabled": true,
"_id": "2aSUIwikpOH6HSKdzsS3Ma"
......@@ -6714,7 +6862,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 140
"__id__": 145
},
"asset": {
"__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747"
......@@ -6731,29 +6879,29 @@
},
"_children": [
{
"__id__": 163
"__id__": 168
},
{
"__id__": 177
"__id__": 182
},
{
"__id__": 186
"__id__": 191
},
{
"__id__": 195
"__id__": 200
}
],
"_active": true,
"_components": [
{
"__id__": 204
"__id__": 209
},
{
"__id__": 205
"__id__": 210
}
],
"_prefab": {
"__id__": 206
"__id__": 211
},
"_opacity": 255,
"_color": {
......@@ -6807,26 +6955,26 @@
"_name": "voice",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 167
},
"_children": [
{
"__id__": 164
"__id__": 169
},
{
"__id__": 167
"__id__": 172
},
{
"__id__": 170
"__id__": 175
},
{
"__id__": 173
"__id__": 178
}
],
"_active": false,
"_components": [],
"_prefab": {
"__id__": 176
"__id__": 181
},
"_opacity": 255,
"_color": {
......@@ -6880,17 +7028,17 @@
"_name": "excellent",
"_objFlags": 0,
"_parent": {
"__id__": 163
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 165
"__id__": 170
}
],
"_prefab": {
"__id__": 166
"__id__": 171
},
"_opacity": 255,
"_color": {
......@@ -6944,7 +7092,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 164
"__id__": 169
},
"_enabled": true,
"_clip": {
......@@ -6961,7 +7109,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 162
"__id__": 167
},
"asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
......@@ -6974,17 +7122,17 @@
"_name": "good",
"_objFlags": 0,
"_parent": {
"__id__": 163
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 168
"__id__": 173
}
],
"_prefab": {
"__id__": 169
"__id__": 174
},
"_opacity": 255,
"_color": {
......@@ -7038,7 +7186,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 167
"__id__": 172
},
"_enabled": true,
"_clip": {
......@@ -7055,7 +7203,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 162
"__id__": 167
},
"asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
......@@ -7068,17 +7216,17 @@
"_name": "tryagain",
"_objFlags": 0,
"_parent": {
"__id__": 163
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 171
"__id__": 176
}
],
"_prefab": {
"__id__": 172
"__id__": 177
},
"_opacity": 255,
"_color": {
......@@ -7132,7 +7280,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 170
"__id__": 175
},
"_enabled": true,
"_clip": {
......@@ -7149,7 +7297,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 162
"__id__": 167
},
"asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
......@@ -7162,17 +7310,17 @@
"_name": "ani",
"_objFlags": 0,
"_parent": {
"__id__": 163
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 174
"__id__": 179
}
],
"_prefab": {
"__id__": 175
"__id__": 180
},
"_opacity": 255,
"_color": {
......@@ -7226,7 +7374,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 173
"__id__": 178
},
"_enabled": true,
"_clip": {
......@@ -7243,7 +7391,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 162
"__id__": 167
},
"asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
......@@ -7254,7 +7402,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 162
"__id__": 167
},
"asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
......@@ -7267,24 +7415,24 @@
"_name": "layout_excellent",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 167
},
"_children": [
{
"__id__": 178
"__id__": 183
},
{
"__id__": 181
"__id__": 186
}
],
"_active": false,
"_components": [
{
"__id__": 184
"__id__": 189
}
],
"_prefab": {
"__id__": 185
"__id__": 190
},
"_opacity": 255,
"_color": {
......@@ -7338,17 +7486,17 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 177
"__id__": 182
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 179
"__id__": 184
}
],
"_prefab": {
"__id__": 180
"__id__": 185
},
"_opacity": 150,
"_color": {
......@@ -7402,7 +7550,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 178
"__id__": 183
},
"_enabled": true,
"_materials": [
......@@ -7432,7 +7580,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 162
"__id__": 167
},
"asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
......@@ -7445,17 +7593,17 @@
"_name": "AniNode",
"_objFlags": 0,
"_parent": {
"__id__": 177
"__id__": 182
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 182
"__id__": 187
}
],
"_prefab": {
"__id__": 183
"__id__": 188
},
"_opacity": 255,
"_color": {
......@@ -7509,7 +7657,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 181
"__id__": 186
},
"_enabled": true,
"_materials": [
......@@ -7547,7 +7695,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 162
"__id__": 167
},
"asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
......@@ -7560,7 +7708,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 177
"__id__": 182
},
"_enabled": true,
"alignMode": 1,
......@@ -7585,7 +7733,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 162
"__id__": 167
},
"asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
......@@ -7598,24 +7746,24 @@
"_name": "layout_good",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 167
},
"_children": [
{
"__id__": 187
"__id__": 192
},
{
"__id__": 190
"__id__": 195
}
],
"_active": false,
"_components": [
{
"__id__": 193
"__id__": 198
}
],
"_prefab": {
"__id__": 194
"__id__": 199
},
"_opacity": 255,
"_color": {
......@@ -7669,17 +7817,17 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 186
"__id__": 191
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 188
"__id__": 193
}
],
"_prefab": {
"__id__": 189
"__id__": 194
},
"_opacity": 150,
"_color": {
......@@ -7733,7 +7881,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 187
"__id__": 192
},
"_enabled": true,
"_materials": [
......@@ -7763,7 +7911,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 162
"__id__": 167
},
"asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
......@@ -7776,17 +7924,17 @@
"_name": "AniNode",
"_objFlags": 0,
"_parent": {
"__id__": 186
"__id__": 191
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 191
"__id__": 196
}
],
"_prefab": {
"__id__": 192
"__id__": 197
},
"_opacity": 255,
"_color": {
......@@ -7840,7 +7988,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 190
"__id__": 195
},
"_enabled": true,
"_materials": [
......@@ -7878,7 +8026,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 162
"__id__": 167
},
"asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
......@@ -7891,7 +8039,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 186
"__id__": 191
},
"_enabled": true,
"alignMode": 1,
......@@ -7916,7 +8064,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 162
"__id__": 167
},
"asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
......@@ -7929,24 +8077,24 @@
"_name": "layout_tryagain",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 167
},
"_children": [
{
"__id__": 196
"__id__": 201
},
{
"__id__": 199
"__id__": 204
}
],
"_active": false,
"_components": [
{
"__id__": 202
"__id__": 207
}
],
"_prefab": {
"__id__": 203
"__id__": 208
},
"_opacity": 255,
"_color": {
......@@ -8000,17 +8148,17 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 195
"__id__": 200
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 197
"__id__": 202
}
],
"_prefab": {
"__id__": 198
"__id__": 203
},
"_opacity": 150,
"_color": {
......@@ -8064,7 +8212,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 196
"__id__": 201
},
"_enabled": true,
"_materials": [
......@@ -8094,7 +8242,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 162
"__id__": 167
},
"asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
......@@ -8107,17 +8255,17 @@
"_name": "AniNode",
"_objFlags": 0,
"_parent": {
"__id__": 195
"__id__": 200
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 200
"__id__": 205
}
],
"_prefab": {
"__id__": 201
"__id__": 206
},
"_opacity": 255,
"_color": {
......@@ -8171,7 +8319,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 199
"__id__": 204
},
"_enabled": true,
"_materials": [
......@@ -8209,7 +8357,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 162
"__id__": 167
},
"asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
......@@ -8222,7 +8370,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 195
"__id__": 200
},
"_enabled": true,
"alignMode": 1,
......@@ -8247,7 +8395,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 162
"__id__": 167
},
"asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
......@@ -8260,7 +8408,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 162
"__id__": 167
},
"_enabled": true,
"alignMode": 1,
......@@ -8287,7 +8435,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 162
"__id__": 167
},
"_enabled": true,
"_id": "51GFKQ5chJcJKhZhDPhWFp"
......@@ -8295,7 +8443,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 162
"__id__": 167
},
"asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
......@@ -8312,20 +8460,20 @@
},
"_children": [
{
"__id__": 208
"__id__": 213
},
{
"__id__": 239
"__id__": 244
}
],
"_active": true,
"_components": [
{
"__id__": 244
"__id__": 249
}
],
"_prefab": {
"__id__": 245
"__id__": 250
},
"_opacity": 255,
"_color": {
......@@ -8379,35 +8527,35 @@
"_name": "layer_center",
"_objFlags": 0,
"_parent": {
"__id__": 207
"__id__": 212
},
"_children": [
{
"__id__": 209
"__id__": 214
},
{
"__id__": 212
"__id__": 217
},
{
"__id__": 214
"__id__": 219
},
{
"__id__": 217
"__id__": 222
},
{
"__id__": 220
"__id__": 225
},
{
"__id__": 223
"__id__": 228
},
{
"__id__": 226
"__id__": 231
}
],
"_active": false,
"_components": [],
"_prefab": {
"__id__": 238
"__id__": 243
},
"_opacity": 255,
"_color": {
......@@ -8461,17 +8609,17 @@
"_name": "gray_cover",
"_objFlags": 0,
"_parent": {
"__id__": 208
"__id__": 213
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 210
"__id__": 215
}
],
"_prefab": {
"__id__": 211
"__id__": 216
},
"_opacity": 102,
"_color": {
......@@ -8525,7 +8673,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 209
"__id__": 214
},
"_enabled": true,
"_materials": [
......@@ -8555,7 +8703,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 207
"__id__": 212
},
"asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
......@@ -8568,13 +8716,13 @@
"_name": "layer_middle",
"_objFlags": 0,
"_parent": {
"__id__": 208
"__id__": 213
},
"_children": [],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 213
"__id__": 218
},
"_opacity": 255,
"_color": {
......@@ -8626,7 +8774,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 207
"__id__": 212
},
"asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
......@@ -8639,17 +8787,17 @@
"_name": "replay_btn",
"_objFlags": 0,
"_parent": {
"__id__": 208
"__id__": 213
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 215
"__id__": 220
}
],
"_prefab": {
"__id__": 216
"__id__": 221
},
"_opacity": 255,
"_color": {
......@@ -8703,7 +8851,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 214
"__id__": 219
},
"_enabled": true,
"_materials": [
......@@ -8733,7 +8881,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 207
"__id__": 212
},
"asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
......@@ -8746,17 +8894,17 @@
"_name": "bg_light",
"_objFlags": 0,
"_parent": {
"__id__": 208
"__id__": 213
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 218
"__id__": 223
}
],
"_prefab": {
"__id__": 219
"__id__": 224
},
"_opacity": 255,
"_color": {
......@@ -8810,7 +8958,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 217
"__id__": 222
},
"_enabled": true,
"_materials": [
......@@ -8840,7 +8988,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 207
"__id__": 212
},
"asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
......@@ -8853,17 +9001,17 @@
"_name": "finish_cat",
"_objFlags": 0,
"_parent": {
"__id__": 208
"__id__": 213
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 221
"__id__": 226
}
],
"_prefab": {
"__id__": 222
"__id__": 227
},
"_opacity": 255,
"_color": {
......@@ -8917,7 +9065,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 220
"__id__": 225
},
"_enabled": true,
"_materials": [
......@@ -8955,7 +9103,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 207
"__id__": 212
},
"asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
......@@ -8968,17 +9116,17 @@
"_name": "next_btn",
"_objFlags": 0,
"_parent": {
"__id__": 208
"__id__": 213
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 224
"__id__": 229
}
],
"_prefab": {
"__id__": 225
"__id__": 230
},
"_opacity": 255,
"_color": {
......@@ -9032,7 +9180,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 223
"__id__": 228
},
"_enabled": true,
"_materials": [
......@@ -9062,7 +9210,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 207
"__id__": 212
},
"asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
......@@ -9075,27 +9223,27 @@
"_name": "finish_box",
"_objFlags": 0,
"_parent": {
"__id__": 208
"__id__": 213
},
"_children": [
{
"__id__": 227
"__id__": 232
},
{
"__id__": 230
"__id__": 235
},
{
"__id__": 233
"__id__": 238
}
],
"_active": true,
"_components": [
{
"__id__": 236
"__id__": 241
}
],
"_prefab": {
"__id__": 237
"__id__": 242
},
"_opacity": 255,
"_color": {
......@@ -9149,17 +9297,17 @@
"_name": "result_text",
"_objFlags": 0,
"_parent": {
"__id__": 226
"__id__": 231
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 228
"__id__": 233
}
],
"_prefab": {
"__id__": 229
"__id__": 234
},
"_opacity": 255,
"_color": {
......@@ -9213,7 +9361,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 227
"__id__": 232
},
"_enabled": true,
"_materials": [
......@@ -9244,7 +9392,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 207
"__id__": 212
},
"asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
......@@ -9257,17 +9405,17 @@
"_name": "coin",
"_objFlags": 0,
"_parent": {
"__id__": 226
"__id__": 231
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 231
"__id__": 236
}
],
"_prefab": {
"__id__": 232
"__id__": 237
},
"_opacity": 255,
"_color": {
......@@ -9321,7 +9469,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 230
"__id__": 235
},
"_enabled": true,
"_materials": [
......@@ -9351,7 +9499,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 207
"__id__": 212
},
"asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
......@@ -9364,17 +9512,17 @@
"_name": "coin_num",
"_objFlags": 0,
"_parent": {
"__id__": 226
"__id__": 231
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 234
"__id__": 239
}
],
"_prefab": {
"__id__": 235
"__id__": 240
},
"_opacity": 255,
"_color": {
......@@ -9428,7 +9576,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 233
"__id__": 238
},
"_enabled": true,
"_materials": [
......@@ -9459,7 +9607,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 207
"__id__": 212
},
"asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
......@@ -9472,7 +9620,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 226
"__id__": 231
},
"_enabled": true,
"_materials": [
......@@ -9502,7 +9650,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 207
"__id__": 212
},
"asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
......@@ -9513,7 +9661,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 207
"__id__": 212
},
"asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
......@@ -9526,17 +9674,17 @@
"_name": "res",
"_objFlags": 0,
"_parent": {
"__id__": 207
"__id__": 212
},
"_children": [
{
"__id__": 240
"__id__": 245
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 243
"__id__": 248
},
"_opacity": 255,
"_color": {
......@@ -9590,17 +9738,17 @@
"_name": "ending",
"_objFlags": 0,
"_parent": {
"__id__": 239
"__id__": 244
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 241
"__id__": 246
}
],
"_prefab": {
"__id__": 242
"__id__": 247
},
"_opacity": 255,
"_color": {
......@@ -9654,7 +9802,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 240
"__id__": 245
},
"_enabled": true,
"_clip": {
......@@ -9671,7 +9819,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 207
"__id__": 212
},
"asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
......@@ -9682,7 +9830,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 207
"__id__": 212
},
"asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
......@@ -9695,7 +9843,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 207
"__id__": 212
},
"_enabled": true,
"_id": "9fpJ2rqgNGSZ0a4xQTpvJ7"
......@@ -9703,7 +9851,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 207
"__id__": 212
},
"asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
......
import { asyncDelay, exchangeNodePos, getSprNode, onHomeworkFinish, onHomeworkStart, playAudio } from "../script/util_hy05_pintu";
import { MyCocosSceneComponent } from "../script/MyCocosSceneComponent_hy05_pintu";
import GameJigsaw, { imageZize, ItemJigsaw, OptionJigsaw } from "./Gamehy05_pintu";
import GameJigsaw, { imageZize, Item, Option } from "./Gamehy05_pintu";
import pg from "./pg_hy05_pintu";
const { ccclass, property } = cc._decorator;
......@@ -63,7 +63,6 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent {
this.flyAction();
this.startGame();
pg.view.setNetImg(this.img_bg, GameJigsaw.getIns().image, { w: imageZize.width, h: imageZize.height });
}
initEvent() {
......@@ -79,7 +78,7 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent {
});
pg.event.on('npc_voice_play_voice_end', () => {
})
pg.event.emit('npc_layer_back_init', this.data)
......@@ -155,7 +154,6 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent {
private currentCards: cc.Node[];
//开始游戏
startGame() {
GameJigsaw.getIns().reset();
this.nextPage();
}
nextPage() {
......@@ -163,21 +161,22 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent {
this.cards = [];
this.currentCards = [];
this.cardBgs = [];
let data = GameJigsaw.getIns().list;
let data = GameJigsaw.getIns().getCurrentPage();
//自动创建卡片
this.right_layout.active = true;
this.createCrads(data);
pg.view.setNetImg(this.img_bg, data.image, { w: imageZize.width, h: imageZize.height });
}
//创建卡片
private cards: cc.Node[];
private cardBgs: cc.Node[];
createCrads(list) {
createCrads(data: Item) {
this.right_layout.removeAllChildren();
// this.cleanLayoutSort();
this.layout_sort.removeAllChildren();
let count = 0;
list.forEach((li, idx) => {
data.hotZoneItemArr.forEach((li, idx) => {
let item = cc.instantiate(this.node_card);
this.right_layout.addChild(item);
li.count = count;
......@@ -185,7 +184,7 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent {
count++;
})
count = 0;
let pos = GameJigsaw.getIns().pointsArr;
let pos = data.pointsArr;
pos.forEach((li, idx) => {
let item = cc.instantiate(this.sort_card);
this.layout_sort.addChild(item);
......@@ -201,7 +200,7 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent {
}
private initTopCard(item, data, idx) {
let img = cc.find("img", item);
pg.view.setNetImg(img, data.image, { w: 118, h: 118 }, false);
pg.view.setNetImg(img, data.picUrl, { w: 118, h: 118 }, false);
img.x = idx % 2 == 0 ? -107 : 107
item.active = true;
item.y = 0;
......@@ -314,8 +313,7 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent {
// }, 1000);
if (this.checkRoundEnd()) {
GameJigsaw.getIns().addPage();
pg.event.emit("gameOver");
this.checkGameOver();
}
} else {
this.playLocalAudio("error");
......@@ -353,6 +351,19 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent {
return this.currentCards.every(card => !!card);
}
private checkGameOver() {
let audio = GameJigsaw.getIns().getCurrentPage().audio;
let over = GameJigsaw.getIns().addPage();
pg.audio.playAudioByUrl(audio).then(async () => {
await asyncDelay(1);
if (!over) {
pg.event.emit("gameOver");
} else {
this.nextPage();
}
});
}
gameOver() {
pg.event.once('layer_right_show_excellent_end', () => {
pg.event.emit('layer_coin_show_coin', 3) //1 2 3硬币数量
......@@ -388,3 +399,4 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent {
......@@ -587,3 +587,4 @@ let pg = {
export default pg;
......@@ -179,3 +179,4 @@ export class MyCocosSceneComponent extends cc.Component {
}
export const defaultData = {
"npcTitle": "pintu",
"npcAudio": "http://staging-teach.cdn.ireadabc.com/449e65975d358514cc3494f9f67bc012_l.mp3",
"npcAudioName": "cape.mp3",
"tipSwitch": 1,
"tipType": "page",
"tipBg": "",
"tipPage": [{
"title": "",
"audio": ""
}
"title": "",
"audio": ""
}
],
"title": "",
"audio": "",
......@@ -15,43 +18,37 @@ export const defaultData = {
"points": "",
"questionScore": 0,
"questions": [{
"options": [{
"type": "img",
"image": "",
"audio": "",
"text": "",
"time": "",
"right": false
}, {
"type": "img",
"image": "",
"audio": "",
"text": "",
"time": "",
"right": false
}, {
"type": "img",
"image": "",
"audio": "",
"text": "",
"time": "",
"right": false
}
],
"type": "img"
}
],
"bgItem": {
"url": "http://staging-teach.cdn.ireadabc.com/1553dfbd077983ec0c42e03c28ded825.png",
"rect": {
"x": 0,
"y": 62.27,
"width": 904,
"height": 567.45
"options": [{
"audio": "",
"hotZoneItemArr": [],
"bgItem": "",
"right": false
}, {
"audio": "",
"hotZoneItemArr": [],
"bgItem": "",
"right": false
}, {
"audio": "",
"hotZoneItemArr": [],
"bgItem": "",
"right": false
}
},
"hotZoneItemArr": [{
"id": "1686815485086",
],
"type": "img",
"audioUrl": "http://staging-teach.cdn.ireadabc.com/36067f9e2415d59fa37c3795a3929087_l.mp3",
"audioName": "bear_3.mp3",
"bgItem": {
"url": "http://staging-teach.cdn.ireadabc.com/1553dfbd077983ec0c42e03c28ded825.png",
"rect": {
"x": 0,
"y": 62.27,
"width": 904,
"height": 567.45
}
},
"hotZoneItemArr": [{
"id": "1688889611322",
"index": 0,
"pic_url": "http://staging-teach.cdn.ireadabc.com/43529c2ca99eb66d78fd920d863559a9.png",
"itemType": "pic",
......@@ -70,12 +67,12 @@ export const defaultData = {
"ontColor": "#8f3758",
"rect": {
"x": 311.77,
"y": 143.51,
"y": 143.5,
"width": 280.46,
"height": 280.46
}
}, {
"id": "1686815494742",
"id": "1688889615595",
"index": 1,
"pic_url": "http://staging-teach.cdn.ireadabc.com/47041db332a1ba4cd5050abf729b817d.png",
"itemType": "pic",
......@@ -93,13 +90,13 @@ export const defaultData = {
"fontName": "ahronbd-1",
"ontColor": "#8f3758",
"rect": {
"x": 489.77,
"y": 330.5,
"x": 490.77,
"y": 331.5,
"width": 280.46,
"height": 280.46
}
}, {
"id": "1686815513031",
"id": "1688889616169",
"index": 2,
"pic_url": "http://staging-teach.cdn.ireadabc.com/ce34627cca00e3eb7d869c95086d2a85.png",
"itemType": "pic",
......@@ -118,12 +115,12 @@ export const defaultData = {
"ontColor": "#8f3758",
"rect": {
"x": -33.23,
"y": 140.5,
"y": 143.5,
"width": 280.46,
"height": 280.46
}
}, {
"id": "1686815513951",
"id": "1688889617242",
"index": 3,
"pic_url": "http://staging-teach.cdn.ireadabc.com/feba2ef37c412aa71a46c3c5f20abda2.png",
"itemType": "pic",
......@@ -133,27 +130,115 @@ export const defaultData = {
"imgSizeH": 300,
"mapScale": 0.70625,
"dragDot": {
"x": 452,
"y": 346
"x": 320,
"y": 166
},
"gIdx": "0",
"fontSize": 50,
"fontName": "ahronbd-1",
"ontColor": "#8f3758",
"rect": {
"x": 129.77,
"x": 128.77,
"y": -47.5,
"width": 280.46,
"height": 280.46
}
}
]
}, {
"options": [],
"type": "img",
"bgItem": {
"url": "http://staging-teach.cdn.ireadabc.com/1553dfbd077983ec0c42e03c28ded825.png",
"rect": {
"x": 0,
"y": 2.64,
"width": 1094,
"height": 686.72
}
},
"hotZoneItemArr": [{
"id": "1688889777085",
"index": 0,
"pic_url": "http://staging-teach.cdn.ireadabc.com/43529c2ca99eb66d78fd920d863559a9.png",
"itemType": "pic",
"fontScale": 0.8546875,
"imgScale": 1.1313340227507755,
"imgSizeW": 300,
"imgSizeH": 300,
"mapScale": 0.8546875,
"dragDot": {
"x": 547,
"y": 346
},
"gIdx": "0",
"fontSize": 50,
"fontName": "ahronbd-1",
"ontColor": "#8f3758",
"rect": {
"x": 377.3,
"y": 173.66,
"width": 339.4,
"height": 339.4
}
}, {
"id": "1688889778564",
"index": 1,
"pic_url": "http://staging-teach.cdn.ireadabc.com/47041db332a1ba4cd5050abf729b817d.png",
"itemType": "pic",
"fontScale": 0.8546875,
"imgScale": 1.1313340227507755,
"imgSizeW": 300,
"imgSizeH": 300,
"mapScale": 0.8546875,
"dragDot": {
"x": 547,
"y": 346
},
"gIdx": "0",
"fontSize": 50,
"fontName": "ahronbd-1",
"ontColor": "#8f3758",
"rect": {
"x": 592.3,
"y": 398.66,
"width": 339.4,
"height": 339.4
}
}, {
"id": "1688889788878",
"index": 2,
"pic_url": "http://staging-teach.cdn.ireadabc.com/feba2ef37c412aa71a46c3c5f20abda2.png",
"itemType": "pic",
"fontScale": 0.8546875,
"imgScale": 1.1313340227507755,
"imgSizeW": 300,
"imgSizeH": 300,
"mapScale": 0.8546875,
"dragDot": {
"x": 547,
"y": 346
},
"gIdx": "0",
"fontSize": 50,
"fontName": "ahronbd-1",
"ontColor": "#8f3758",
"rect": {
"x": 155.3,
"y": -60.34,
"width": 339.4,
"height": 339.4
}
}
],
"audioUrl": "http://staging-teach.cdn.ireadabc.com/36067f9e2415d59fa37c3795a3929087_l.mp3",
"audioName": "bear_3.mp3"
}
],
"questionText": "",
"npcTitle": "hi fiddler",
"npcAudio": "http://staging-teach.cdn.ireadabc.com/449e65975d358514cc3494f9f67bc012_l.mp3",
"npcAudioName": "cape.mp3"
"bgItem": "",
"hotZoneItemArr": [],
"questionText": ""
}
......@@ -444,3 +444,4 @@ export function onHomeworkStart(cb) {
}
......@@ -89,78 +89,56 @@
<span>{{ item.npcAudioName}}</span>
</div>
</div>
<!-- <span style="margin-right: 20px;font-size: 18px;font-weight: bold;">提示开关 </span>
<nz-radio-group [ngModel]="item.tipSwitch" (ngModelChange)="customRadioChange($event, item,'tipSwitch')"
style="font-size: 20px;display: flex; align-items: center; justify-content: left; flex-wrap: wrap;">
<label nz-radio nzValue="1">开</label>
<label nz-radio nzValue="0">关</label>
</nz-radio-group> -->
<!--
<div *ngIf="item.tipSwitch == 1">
<span style="font-size: 20px;">提示动画: </span>
<app-upload-dragon-bone style="width: 100%" (save)="onDragonBoneSave($event,item)"
[skeJsonData]="item.imgAni.ske" [texJsonData]="item.imgAni.tex" [texPngData]="item.imgAni.png">
</app-upload-dragon-bone>
<div>
<span style="font-size: 20px;">提示背景: </span>
<div style="width:300px">
<app-upload-image-with-preview [picUrl]="item.tipBg"
(imageUploaded)="onImageUploadSuccess($event,'tipBg', item)"></app-upload-image-with-preview>
</div>
</div>
<div>
<span style="font-size: 20px;">提示内容: </span>
<input *ngIf="item.tipType == 'scroll'" type="text" nz-input [(ngModel)]="item.title" (blur)="save()">
<div *ngIf="item.tipType == 'page'">
<div *ngFor="let page of item.tipPage; let m = index" style="margin-bottom: 5px; ">
<div style="display: flex;">
<div style="font-size: 20px;line-height:32px">页{{m+1}}</div>
<input style="width:700px;margin-left: 10px;" type="text" nz-input [(ngModel)]="page.title"
(blur)="save()">
<div style="margin-left: 20px;">
<app-audio-recorder [audioUrl]="page.audio"
(audioUploaded)="onAudioUploadSuccess($event, 'audio',page)">
</div>
<div style="margin: 20px;width: 1300px;">
<div *ngFor="let question of item.questions; let i = index">
<div style="display: flex;margin-top: 20px;">
<div class="border-solid" style="min-width: 1300px;">
<div class="word-type-title">
题目{{i+1}}
</div>
<div class="option-audio">
<div class="word-input-title">
结束音频:
</div>
<div style="display: flex">
<div>
<app-audio-recorder [audioUrl]="question.audioUrl"
(audioUploaded)="onAudioUploadSuccess($event, 'audioUrl', question,'audioName')">
</app-audio-recorder>
</div>
<button class="btn-red" style="width: 100px; height: 32px;margin-left: 20px;" nz-button nzType="default"
nzDanger (click)="removePage(m)">删除</button>
<div style="margin: 5px">
<span>
{{ question.audioName}}
</span>
</div>
</div>
<div class="border-dashed" style="margin: 20px;width: 1200px;">
<h2>热区配置:</h2>
<app-custom-hot-zone [bgItem]="question.bgItem" [hotZoneItemArr]="question.hotZoneItemArr"
[customTypeGroupArr]="customTypeGroupArr" (save)="saveHotZone(question, $event)">
</app-custom-hot-zone>
</div>
</div>
<button class="btn-blue" style="width: 150px; height: 32px;" nz-button nzType="default" nzDanger
(click)="addPage()">+增加提示内容</button>
</div>
<div style="margin:0 20px">
<button class="btn-red" nz-button nzType="default" nzDanger (click)="removequestion(i)">删除题目</button>
</div>
</div>
</div> -->
<!--
<div>
<span style="font-size: 20px;">游戏背景: </span>
<div style="width:300px">
<app-upload-image-with-preview [picUrl]="item.image"
(imageUploaded)="onImageUploadSuccess($event,'image', item)"></app-upload-image-with-preview>
<div style="margin-top: 20px;">
<button class="btn-blue" style="width: 1300px; height: 50px;" nz-button nzType="default" nzDanger
(click)="addquestion()">+增加题目</button>
</div>
</div>
<div style="display: flex; align-items: center; ">
<h2> 题目分值: </h2>
</div>
<input type="text" nz-input [(ngModel)]="item.questionScore" (blur)="save()">
<span style="font-size: 20px;">结束动画: </span>
<app-upload-dragon-bone style="width: 100%" (save)="onDragonBoneSave($event,item)"
[skeJsonData]="item.endImgAni.ske" [texJsonData]="item.endImgAni.tex" [texPngData]="item.endImgAni.png">
</app-upload-dragon-bone>
<span style="font-size: 20px;">结束动画文本: </span>
<input type="text" nz-input [(ngModel)]="item.endImgTitle" (blur)="save()">
<div style="display: flex; align-items: center; ">
<h2> 跳转页面: </h2>
</div>
<input type="text" nz-input [(ngModel)]="item.jumpIdx" (blur)="save()">
</div> -->
<div class="border-dashed" style="margin: 20px;width: 1000px;">
<h2>热区配置:</h2>
<app-custom-hot-zone [bgItem]="item.bgItem" [hotZoneItemArr]="item.hotZoneItemArr"
[customTypeGroupArr]="customTypeGroupArr" (save)="saveHotZone(item, $event)">
</app-custom-hot-zone>
</div>
</div>
......
......@@ -176,11 +176,9 @@ export class FormComponent extends ComponentBase implements OnInit, OnChanges, O
addoption(i) {
this.item.questions[i].options.push({
type: "img",
image: "",
audio: "",
text: "",
time: "",
hotZoneItemArr: [],
bgItem: "",
right: false
});
this.save();
......
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