Commit e1939784 authored by Tt's avatar Tt

修改完成

parent 477bddc7
{
"ver": "2.0.1",
"uuid": "99b1bd59-893c-4753-ac49-607f8a0d91aa",
"downloadMode": 0,
"duration": 1.184417,
"subMetas": {}
}
\ No newline at end of file
This diff is collapsed.
...@@ -50,7 +50,9 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -50,7 +50,9 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.layout_finish = pg.view.find(this, 'layout_finish') this.layout_finish = pg.view.find(this, 'layout_finish')
this.initBlocks(); this.initBlocks();
} }
onDestory() {
pg.event.clear();
}
initListener() { initListener() {
} }
...@@ -106,9 +108,9 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -106,9 +108,9 @@ export default class SceneComponent extends MyCocosSceneComponent {
let db = start_ske.getComponent(dragonBones.ArmatureDisplay); let db = start_ske.getComponent(dragonBones.ArmatureDisplay);
let anis = db.getAnimationNames(db.armatureName); let anis = db.getAnimationNames(db.armatureName);
db.playAnimation(anis[0], 0); db.playAnimation(anis[0], 0);
cc.tween(start_ske).by(1, { x: -500 }).call(() => { cc.tween(start_ske).by(.5, { x: -500 }).call(() => {
pg.audio.playAudioByUrl(GameNGT14.getIns().startAudio).then(() => { pg.audio.playAudioByUrl(GameNGT14.getIns().startAudio).then(() => {
cc.tween(start_ske).delay(1).by(1, { x: 500 }).call(() => { cc.tween(start_ske).delay(1).by(.5, { x: 500 }).call(() => {
this.layout_start.active = false; this.layout_start.active = false;
// this.playLaba(); // this.playLaba();
resolve(''); resolve('');
...@@ -190,7 +192,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -190,7 +192,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
let list: Array<Option> = data.getList(); let list: Array<Option> = data.getList();
list.forEach(option => { list.forEach(option => {
let blocks = option.getList(); let blocks = option.getList();
let showCenter = blocks.length == 1 && (blocks[0].type == BLOCK_TYPE.IMG || blocks[0].type == BLOCK_TYPE.TXT); let showCenter = blocks.length == 1 && (blocks[0].type == BLOCK_TYPE.IMG);//|| blocks[0].type == BLOCK_TYPE.TXT
let onlyImg = list.length == 1 && showCenter; let onlyImg = list.length == 1 && showCenter;
//确定使用的单双行 //确定使用的单双行
let lay = this.getLayByOption(option, base, { onlyImg, showCenter }); let lay = this.getLayByOption(option, base, { onlyImg, showCenter });
...@@ -373,7 +375,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -373,7 +375,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
let item = e.target; let item = e.target;
let location = e.getLocation(); let location = e.getLocation();
cc.Tween.stopAllByTarget(item); cc.Tween.stopAllByTarget(item);
let pos = location.sub(cc.v2(1920 / 2, 1080 / 2)); let pos = location.sub(cc.v2(cc.winSize.width / 2, cc.winSize.height / 2));
item.x = pos.x; item.x = pos.x;
item.y = pos.y; item.y = pos.y;
} }
...@@ -384,6 +386,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -384,6 +386,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
let data: string = target.data; let data: string = target.data;
this.setTouchPos(e); this.setTouchPos(e);
this.touching = data; this.touching = data;
this.playLocalAudio('drop_start')
} }
onItemTouchMove(e) { onItemTouchMove(e) {
let target: cc.Node = e.target; let target: cc.Node = e.target;
......
...@@ -57,8 +57,11 @@ export default class Ngt_star_14 extends cc.Component { ...@@ -57,8 +57,11 @@ export default class Ngt_star_14 extends cc.Component {
this.bigStarArr = []; this.bigStarArr = [];
let size = cc.view.getCanvasSize();
let scale = (1920 / 1080) / (size.width / size.height);
let baseX = this.position.x; let baseX = this.position.x;
let baseY = this.position.y; let baseY = this.position.y * scale + 15;
if (scale <= 1) baseY = this.position.y;
let disW = 80;// * this._mapScaleMin let disW = 80;// * this._mapScaleMin
// let disH = 80 * this._mapScaleMin; // let disH = 80 * this._mapScaleMin;
let disScale = 1; let disScale = 1;
......
...@@ -2,13 +2,18 @@ export const defaultData = { ...@@ -2,13 +2,18 @@ export const defaultData = {
"questions": [{ "questions": [{
"parts": [ "parts": [
{ {
"id": "1666687632465177361", "answer": "want", "options": [{ "blocks": [{ "type": "txt", "txt": "", "line": "", "img": "", "tag": "", "text": "Dave _____ want?" }] }] "id": "166668702213640281", "answer": "freedom", "options": [{
"blocks": [
{
"type": "img", "txt": "", "line": "", "img": "", "tag": "", "image": "http://staging-teach.cdn.ireadabc.com/19ac75d2de5455d268eaef8184bf805b.png"
}]
}, { "blocks": [{ "type": "txt", "txt": "", "line": "", "img": "", "tag": "", "text": "_____ do you go to the park?" }] }, { "blocks": [{ "type": "txt", "txt": "", "line": "", "img": "", "tag": "", "text": "On saturdays freedow" }] }]
}, },
{ {
"id": "1666687612725869271", "answer": "fish", "options": [{ "blocks": [{ "type": "img", "txt": "", "line": "", "img": "", "tag": "", "image": "http://staging-teach.cdn.ireadabc.com/3f0f2572da257eedbec51f8d05e2a7d8.png" }] }] "id": "1666687632465177361", "answer": "want", "options": [{ "blocks": [{ "type": "txt", "txt": "", "line": "", "img": "", "tag": "", "text": "Dave _____ want?" }] }]
}, },
{ {
"id": "166668702213640281", "answer": "freedom", "options": [{ "blocks": [{ "type": "img", "txt": "", "line": "", "img": "", "tag": "", "image": "http://staging-teach.cdn.ireadabc.com/19ac75d2de5455d268eaef8184bf805b.png" }] }, { "blocks": [{ "type": "txt", "txt": "", "line": "", "img": "", "tag": "", "text": "_____ do you go to the park?" }] }, { "blocks": [{ "type": "txt", "txt": "", "line": "", "img": "", "tag": "", "text": "On saturdays freedow" }] }] "id": "1666687612725869271", "answer": "fish", "options": [{ "blocks": [{ "type": "img", "txt": "", "line": "", "img": "", "tag": "", "image": "http://staging-teach.cdn.ireadabc.com/3f0f2572da257eedbec51f8d05e2a7d8.png" }] }]
}, },
{ {
"id": "1666687646496548891", "answer": "red", "options": [{ "blocks": [{ "type": "txt", "txt": "", "line": "", "img": "", "tag": "", "text": "The fish color is _____ answer red." }] }] "id": "1666687646496548891", "answer": "red", "options": [{ "blocks": [{ "type": "txt", "txt": "", "line": "", "img": "", "tag": "", "text": "The fish color is _____ answer red." }] }]
......
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