Commit 71353c0b authored by yu's avatar yu

5.22调整

parent fd39dca4
...@@ -52,8 +52,11 @@ export default class NewClass extends cc.Component { ...@@ -52,8 +52,11 @@ export default class NewClass extends cc.Component {
this.cleanStar(); this.cleanStar();
this.bigStarArr = []; this.bigStarArr = [];
let size = cc.view.getCanvasSize();
let scale = (size.width / size.height) / (1280 / 720);
let baseX = this.position.x; let baseX = this.position.x;
if (scale > 1) baseX = baseX * (Math.floor(scale * 100) / 100);
let baseY = this.position.y; let baseY = this.position.y;
let disW = 80;// * this._mapScaleMin let disW = 80;// * this._mapScaleMin
// let disH = 80 * this._mapScaleMin; // let disH = 80 * this._mapScaleMin;
......
This diff is collapsed.
...@@ -57,11 +57,13 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -57,11 +57,13 @@ export default class SceneComponent extends MyCocosSceneComponent {
pg.event.on("mrbr05_click_right", () => { pg.event.on("mrbr05_click_right", () => {
this.roundIdx++; this.roundIdx++;
pg.event.emit("mouse_add", () => { }); pg.event.emit("mouse_add", () => { });
this.showGame();
}) })
pg.event.on("mouse_start_play_success", () => { pg.event.on("mouse_start_play_success", () => {
this.playLaba(); this.playLaba();
}) })
pg.event.on("mouse_num_game_end", () => {
this.showGame();
})
this.btn_laba = cc.find("btn_laba", this.node); this.btn_laba = cc.find("btn_laba", this.node);
this.btn_laba.on(cc.Node.EventType.TOUCH_END, this.playLaba, this); this.btn_laba.on(cc.Node.EventType.TOUCH_END, this.playLaba, this);
......
...@@ -63,7 +63,7 @@ export default class OptionItem extends cc.Component { ...@@ -63,7 +63,7 @@ export default class OptionItem extends cc.Component {
g_imgText.active = true; g_imgText.active = true;
let head = g_imgText.getChildByName("head"); let head = g_imgText.getChildByName("head");
let Label = g_imgText.getChildByName("Label"); let Label = g_imgText.getChildByName("Label");
pg.view.setNetImg(head, data.pic_url, { w: 245, h: 160 }); pg.view.setNetImg(head, data.pic_url, { w: 205, h: 135 });
Label.getComponent(cc.Label).string = data.text; Label.getComponent(cc.Label).string = data.text;
} }
private itemError(item) { private itemError(item) {
......
...@@ -12,7 +12,7 @@ export const defaultData = { ...@@ -12,7 +12,7 @@ export const defaultData = {
"questionType": "text", "questionType": "text",
"answerType": "text", "answerType": "text",
"answerArr": [{ "answerArr": [{
"text": "54333", "text": "gfdd",
"pic_url": "", "pic_url": "",
"answerRight": "1" "answerRight": "1"
}, { }, {
...@@ -50,15 +50,15 @@ export const defaultData = { ...@@ -50,15 +50,15 @@ export const defaultData = {
"questionType": "text", "questionType": "text",
"answerType": "picText", "answerType": "picText",
"answerArr": [{ "answerArr": [{
"text": "123", "text": "how",
"pic_url": "http://staging-teach.cdn.ireadabc.com/7780195055731416480edbc97072fe5b.png", "pic_url": "http://staging-teach.cdn.ireadabc.com/7780195055731416480edbc97072fe5b.png",
"answerRight": "0" "answerRight": "0"
}, { }, {
"text": "5435", "text": "hell",
"pic_url": "http://staging-teach.cdn.ireadabc.com/4286c34a3b69bf7baea3847ec04b05b7.png", "pic_url": "http://staging-teach.cdn.ireadabc.com/4286c34a3b69bf7baea3847ec04b05b7.png",
"answerRight": "0" "answerRight": "0"
}, { }, {
"text": "688", "text": "bbbb",
"pic_url": "http://staging-teach.cdn.ireadabc.com/2eb2c2a688d66ac6aa9cb6aaa81a0859.png", "pic_url": "http://staging-teach.cdn.ireadabc.com/2eb2c2a688d66ac6aa9cb6aaa81a0859.png",
"answerRight": "1" "answerRight": "1"
}, { }, {
...@@ -66,7 +66,8 @@ export const defaultData = { ...@@ -66,7 +66,8 @@ export const defaultData = {
"pic_url": "http://staging-teach.cdn.ireadabc.com/4dc62cd150d6cbb06febbb22bc5f6f37.png", "pic_url": "http://staging-teach.cdn.ireadabc.com/4dc62cd150d6cbb06febbb22bc5f6f37.png",
"answerRight": "0" "answerRight": "0"
} }
] ],
"audio_url": "http://staging-teach.cdn.ireadabc.com/fb08783926362bf64232e2ec6966011d.mp3"
} }
] ]
}, { }, {
...@@ -90,7 +91,8 @@ export const defaultData = { ...@@ -90,7 +91,8 @@ export const defaultData = {
"pic_url": "", "pic_url": "",
"answerRight": "1" "answerRight": "1"
} }
] ],
"audio_url": "http://staging-teach.cdn.ireadabc.com/fb08783926362bf64232e2ec6966011d.mp3"
} }
] ]
} }
......
...@@ -4589,6 +4589,8 @@ declare namespace cc { ...@@ -4589,6 +4589,8 @@ declare namespace cc {
!#zh 获取节点正前方(z 轴)面对的方向,返回值为世界坐标系下的归一化向量 */ !#zh 获取节点正前方(z 轴)面对的方向,返回值为世界坐标系下的归一化向量 */
forward: Vec3; forward: Vec3;
audioClip: any; audioClip: any;
starBig: any;
star: Node;
/** /**
@param name name @param name name
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