Commit 71353c0b authored by yu's avatar yu

5.22调整

parent fd39dca4
......@@ -52,8 +52,11 @@ export default class NewClass extends cc.Component {
this.cleanStar();
this.bigStarArr = [];
let size = cc.view.getCanvasSize();
let scale = (size.width / size.height) / (1280 / 720);
let baseX = this.position.x;
if (scale > 1) baseX = baseX * (Math.floor(scale * 100) / 100);
let baseY = this.position.y;
let disW = 80;// * this._mapScaleMin
// let disH = 80 * this._mapScaleMin;
......
......@@ -87,13 +87,13 @@
"__id__": 17
},
{
"__id__": 23
"__id__": 18
},
{
"__id__": 37
"__id__": 24
},
{
"__id__": 58
"__id__": 38
},
{
"__id__": 59
......@@ -759,6 +759,64 @@
"_originalHeight": 720,
"_id": "56RNdTwRJFjLH5FSKtay12"
},
{
"__type__": "cc.Node",
"_name": "layout",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [],
"_active": true,
"_components": [],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 720
},
"_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": "993yCys49KoZWz8uKUUDXI"
},
{
"__type__": "cc.Node",
"_name": "top",
......@@ -768,16 +826,16 @@
},
"_children": [
{
"__id__": 18
"__id__": 19
}
],
"_active": true,
"_components": [
{
"__id__": 21
"__id__": 22
},
{
"__id__": 22
"__id__": 23
}
],
"_prefab": null,
......@@ -833,16 +891,16 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 17
"__id__": 18
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 19
"__id__": 20
},
{
"__id__": 20
"__id__": 21
}
],
"_prefab": null,
......@@ -898,7 +956,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
"__id__": 19
},
"_enabled": true,
"_materials": [
......@@ -933,7 +991,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
"__id__": 19
},
"_enabled": true,
"_color": {
......@@ -951,7 +1009,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 17
"__id__": 18
},
"_enabled": true,
"_materials": [
......@@ -983,7 +1041,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 17
"__id__": 18
},
"_enabled": true,
"alignMode": 1,
......@@ -1014,31 +1072,31 @@
},
"_children": [
{
"__id__": 24
"__id__": 25
},
{
"__id__": 26
"__id__": 27
},
{
"__id__": 28
"__id__": 29
},
{
"__id__": 30
"__id__": 31
},
{
"__id__": 32
"__id__": 33
}
],
"_active": true,
"_components": [
{
"__id__": 34
},
{
"__id__": 35
},
{
"__id__": 36
},
{
"__id__": 37
}
],
"_prefab": null,
......@@ -1094,13 +1152,13 @@
"_name": "btn_laba_off",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 24
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 25
"__id__": 26
}
],
"_prefab": null,
......@@ -1156,7 +1214,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 25
},
"_enabled": true,
"_materials": [
......@@ -1188,13 +1246,13 @@
"_name": "btn_laba_on",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 24
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 27
"__id__": 28
}
],
"_prefab": null,
......@@ -1250,7 +1308,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 26
"__id__": 27
},
"_enabled": true,
"_materials": [
......@@ -1282,13 +1340,13 @@
"_name": "img_1",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 24
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 29
"__id__": 30
}
],
"_prefab": null,
......@@ -1344,7 +1402,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 29
},
"_enabled": true,
"_materials": [
......@@ -1376,13 +1434,13 @@
"_name": "img_2",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 24
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 31
"__id__": 32
}
],
"_prefab": null,
......@@ -1438,7 +1496,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 30
"__id__": 31
},
"_enabled": true,
"_materials": [
......@@ -1470,13 +1528,13 @@
"_name": "img_3",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 24
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 33
"__id__": 34
}
],
"_prefab": null,
......@@ -1532,7 +1590,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 32
"__id__": 33
},
"_enabled": true,
"_materials": [
......@@ -1564,7 +1622,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
"__id__": 24
},
"_enabled": true,
"_materials": [
......@@ -1596,7 +1654,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
"__id__": 24
},
"_enabled": true,
"alignMode": 1,
......@@ -1623,7 +1681,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
"__id__": 24
},
"_enabled": true,
"_normalMaterial": null,
......@@ -1695,25 +1753,25 @@
},
"_children": [
{
"__id__": 38
"__id__": 39
},
{
"__id__": 40
"__id__": 41
},
{
"__id__": 42
"__id__": 43
},
{
"__id__": 46
"__id__": 47
},
{
"__id__": 54
"__id__": 55
}
],
"_active": true,
"_components": [
{
"__id__": 57
"__id__": 58
}
],
"_prefab": null,
......@@ -1769,13 +1827,13 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 37
"__id__": 38
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 39
"__id__": 40
}
],
"_prefab": null,
......@@ -1831,7 +1889,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 38
"__id__": 39
},
"_enabled": true,
"_materials": [
......@@ -1863,13 +1921,13 @@
"_name": "checkmark",
"_objFlags": 512,
"_parent": {
"__id__": 37
"__id__": 38
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 41
"__id__": 42
}
],
"_prefab": null,
......@@ -1925,7 +1983,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 41
},
"_enabled": true,
"_materials": [
......@@ -1957,17 +2015,17 @@
"_name": "g_img",
"_objFlags": 0,
"_parent": {
"__id__": 37
"__id__": 38
},
"_children": [
{
"__id__": 43
"__id__": 44
}
],
"_active": false,
"_components": [
{
"__id__": 45
"__id__": 46
}
],
"_prefab": null,
......@@ -2023,13 +2081,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 42
"__id__": 43
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 44
"__id__": 45
}
],
"_prefab": null,
......@@ -2085,7 +2143,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
"__id__": 44
},
"_enabled": true,
"_materials": [
......@@ -2117,7 +2175,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
"__id__": 43
},
"_enabled": true,
"_materials": [
......@@ -2149,17 +2207,17 @@
"_name": "g_imgText",
"_objFlags": 0,
"_parent": {
"__id__": 37
"__id__": 38
},
"_children": [
{
"__id__": 47
"__id__": 48
},
{
"__id__": 49
"__id__": 50
},
{
"__id__": 51
"__id__": 52
}
],
"_active": false,
......@@ -2217,13 +2275,13 @@
"_name": "New Sprite",
"_objFlags": 0,
"_parent": {
"__id__": 46
"__id__": 47
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 48
"__id__": 49
}
],
"_prefab": null,
......@@ -2279,7 +2337,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 47
"__id__": 48
},
"_enabled": true,
"_materials": [
......@@ -2311,13 +2369,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 46
"__id__": 47
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 50
"__id__": 51
}
],
"_prefab": null,
......@@ -2373,7 +2431,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 49
"__id__": 50
},
"_enabled": true,
"_materials": [
......@@ -2405,16 +2463,16 @@
"_name": "Label",
"_objFlags": 0,
"_parent": {
"__id__": 46
"__id__": 47
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 52
"__id__": 53
},
{
"__id__": 53
"__id__": 54
}
],
"_prefab": null,
......@@ -2470,7 +2528,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 51
"__id__": 52
},
"_enabled": true,
"_materials": [
......@@ -2482,8 +2540,8 @@
"_dstBlendFactor": 771,
"_string": "Orange",
"_N$string": "Orange",
"_fontSize": 50,
"_lineHeight": 50,
"_fontSize": 60,
"_lineHeight": 60,
"_enableWrapText": true,
"_N$file": {
"__uuid__": "6803f51f-9cdb-4610-bf64-0e423061bfd1"
......@@ -2505,7 +2563,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 51
"__id__": 52
},
"_enabled": true,
"_color": {
......@@ -2523,16 +2581,16 @@
"_name": "g_label",
"_objFlags": 0,
"_parent": {
"__id__": 37
"__id__": 38
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 55
"__id__": 56
},
{
"__id__": 56
"__id__": 57
}
],
"_prefab": null,
......@@ -2547,7 +2605,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 300,
"height": 69
"height": 87.9
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -2588,7 +2646,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
"__id__": 55
},
"_enabled": true,
"_materials": [
......@@ -2600,8 +2658,8 @@
"_dstBlendFactor": 771,
"_string": "",
"_N$string": "",
"_fontSize": 50,
"_lineHeight": 50,
"_fontSize": 80,
"_lineHeight": 80,
"_enableWrapText": true,
"_N$file": {
"__uuid__": "6803f51f-9cdb-4610-bf64-0e423061bfd1"
......@@ -2623,7 +2681,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
"__id__": 55
},
"_enabled": true,
"_color": {
......@@ -2641,7 +2699,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 37
"__id__": 38
},
"_enabled": true,
"errorClip": {
......@@ -2655,64 +2713,6 @@
},
"_id": "0fzNKIi75ER5v+Pm25SnqN"
},
{
"__type__": "cc.Node",
"_name": "layout",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [],
"_active": true,
"_components": [],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 720
},
"_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": "993yCys49KoZWz8uKUUDXI"
},
{
"__type__": "cc.Node",
"_name": "mouse_end",
......@@ -4228,7 +4228,7 @@
},
"_enabled": true,
"item": {
"__id__": 37
"__id__": 38
},
"_id": "eaTVUpqahPfZeO9+sUI7RP"
}
......
......@@ -57,11 +57,13 @@ export default class SceneComponent extends MyCocosSceneComponent {
pg.event.on("mrbr05_click_right", () => {
this.roundIdx++;
pg.event.emit("mouse_add", () => { });
this.showGame();
})
pg.event.on("mouse_start_play_success", () => {
this.playLaba();
})
pg.event.on("mouse_num_game_end", () => {
this.showGame();
})
this.btn_laba = cc.find("btn_laba", this.node);
this.btn_laba.on(cc.Node.EventType.TOUCH_END, this.playLaba, this);
......
......@@ -63,7 +63,7 @@ export default class OptionItem extends cc.Component {
g_imgText.active = true;
let head = g_imgText.getChildByName("head");
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;
}
private itemError(item) {
......
......@@ -12,7 +12,7 @@ export const defaultData = {
"questionType": "text",
"answerType": "text",
"answerArr": [{
"text": "54333",
"text": "gfdd",
"pic_url": "",
"answerRight": "1"
}, {
......@@ -50,15 +50,15 @@ export const defaultData = {
"questionType": "text",
"answerType": "picText",
"answerArr": [{
"text": "123",
"text": "how",
"pic_url": "http://staging-teach.cdn.ireadabc.com/7780195055731416480edbc97072fe5b.png",
"answerRight": "0"
}, {
"text": "5435",
"text": "hell",
"pic_url": "http://staging-teach.cdn.ireadabc.com/4286c34a3b69bf7baea3847ec04b05b7.png",
"answerRight": "0"
}, {
"text": "688",
"text": "bbbb",
"pic_url": "http://staging-teach.cdn.ireadabc.com/2eb2c2a688d66ac6aa9cb6aaa81a0859.png",
"answerRight": "1"
}, {
......@@ -66,7 +66,8 @@ export const defaultData = {
"pic_url": "http://staging-teach.cdn.ireadabc.com/4dc62cd150d6cbb06febbb22bc5f6f37.png",
"answerRight": "0"
}
]
],
"audio_url": "http://staging-teach.cdn.ireadabc.com/fb08783926362bf64232e2ec6966011d.mp3"
}
]
}, {
......@@ -90,7 +91,8 @@ export const defaultData = {
"pic_url": "",
"answerRight": "1"
}
]
],
"audio_url": "http://staging-teach.cdn.ireadabc.com/fb08783926362bf64232e2ec6966011d.mp3"
}
]
}
......
......@@ -4589,6 +4589,8 @@ declare namespace cc {
!#zh 获取节点正前方(z 轴)面对的方向,返回值为世界坐标系下的归一化向量 */
forward: Vec3;
audioClip: any;
starBig: any;
star: Node;
/**
@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