Commit 86adc8ef authored by xytk's avatar xytk

提交代码

parent f8d0ae18
......@@ -75,31 +75,31 @@
"__id__": 5
},
{
"__id__": 8
"__id__": 7
},
{
"__id__": 17
"__id__": 16
},
{
"__id__": 35
"__id__": 34
},
{
"__id__": 45
"__id__": 44
}
],
"_active": true,
"_components": [
{
"__id__": 55
"__id__": 54
},
{
"__id__": 56
"__id__": 55
},
{
"__id__": 58
"__id__": 57
},
{
"__id__": 57
"__id__": 56
}
],
"_prefab": null,
......@@ -260,9 +260,6 @@
"_components": [
{
"__id__": 6
},
{
"__id__": 7
}
],
"_prefab": null,
......@@ -345,33 +342,6 @@
"_atlas": null,
"_id": "97/S6HDq9MeqgmV1Zwnhbb"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 5
},
"_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": 1280,
"_originalHeight": 720,
"_id": "d75RozUS9MLJKVefk+6RDi"
},
{
"__type__": "cc.Node",
"_name": "tittle",
......@@ -381,19 +351,19 @@
},
"_children": [
{
"__id__": 9
"__id__": 8
},
{
"__id__": 12
"__id__": 11
}
],
"_active": true,
"_components": [
{
"__id__": 15
"__id__": 14
},
{
"__id__": 16
"__id__": 15
}
],
"_prefab": null,
......@@ -449,16 +419,16 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 8
"__id__": 7
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 10
"__id__": 9
},
{
"__id__": 11
"__id__": 10
}
],
"_prefab": null,
......@@ -514,7 +484,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 9
"__id__": 8
},
"_enabled": true,
"_materials": [
......@@ -546,7 +516,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 9
"__id__": 8
},
"_enabled": true,
"_clip": null,
......@@ -562,16 +532,16 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 8
"__id__": 7
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 13
"__id__": 12
},
{
"__id__": 14
"__id__": 13
}
],
"_prefab": null,
......@@ -627,7 +597,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 12
"__id__": 11
},
"_enabled": true,
"_materials": [
......@@ -663,7 +633,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 12
"__id__": 11
},
"_enabled": true,
"_color": {
......@@ -676,28 +646,12 @@
"_width": 2,
"_id": "50d1cSC7NFzrszSyu+vdkW"
},
{
"__type__": "83c44u0rt9GionenYKXF9Ta",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 8
},
"_enabled": true,
"titleTextLabel": {
"__id__": 13
},
"audioSource": {
"__id__": 11
},
"_id": "c6IjBS3upM3ofigBlX7xTe"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 8
"__id__": 7
},
"_enabled": true,
"alignMode": 1,
......@@ -719,6 +673,22 @@
"_originalHeight": 0,
"_id": "05omO73qJOh5VXpxie3Z7r"
},
{
"__type__": "83c44u0rt9GionenYKXF9Ta",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 7
},
"_enabled": true,
"titleTextLabel": {
"__id__": 12
},
"audioSource": {
"__id__": 10
},
"_id": "c6IjBS3upM3ofigBlX7xTe"
},
{
"__type__": "cc.Node",
"_name": "middle",
......@@ -728,25 +698,25 @@
},
"_children": [
{
"__id__": 18
"__id__": 17
},
{
"__id__": 20
"__id__": 19
},
{
"__id__": 25
"__id__": 24
},
{
"__id__": 29
"__id__": 28
}
],
"_active": true,
"_components": [
{
"__id__": 33
"__id__": 32
},
{
"__id__": 34
"__id__": 33
}
],
"_prefab": null,
......@@ -802,13 +772,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 17
"__id__": 16
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 19
"__id__": 18
}
],
"_prefab": null,
......@@ -864,7 +834,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
"__id__": 17
},
"_enabled": true,
"_materials": [
......@@ -896,20 +866,20 @@
"_name": "dragonBone",
"_objFlags": 0,
"_parent": {
"__id__": 17
"__id__": 16
},
"_children": [
{
"__id__": 21
"__id__": 20
}
],
"_active": true,
"_components": [
{
"__id__": 23
"__id__": 22
},
{
"__id__": 24
"__id__": 23
}
],
"_prefab": null,
......@@ -965,13 +935,13 @@
"_name": "DEBUG_DRAW_NODE",
"_objFlags": 1024,
"_parent": {
"__id__": 20
"__id__": 19
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 22
"__id__": 21
}
],
"_prefab": null,
......@@ -1029,7 +999,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 21
"__id__": 20
},
"_enabled": true,
"_materials": [
......@@ -1062,7 +1032,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 20
"__id__": 19
},
"_enabled": true,
"alignMode": 1,
......@@ -1089,7 +1059,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 20
"__id__": 19
},
"_enabled": true,
"_clip": null,
......@@ -1105,19 +1075,19 @@
"_name": "picA",
"_objFlags": 0,
"_parent": {
"__id__": 17
"__id__": 16
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 26
"__id__": 25
},
{
"__id__": 27
"__id__": 26
},
{
"__id__": 28
"__id__": 27
}
],
"_prefab": null,
......@@ -1173,7 +1143,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 25
"__id__": 24
},
"_enabled": true,
"_materials": [
......@@ -1203,7 +1173,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 25
"__id__": 24
},
"_enabled": true,
"alignMode": 1,
......@@ -1230,7 +1200,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 25
"__id__": 24
},
"_enabled": true,
"_clip": null,
......@@ -1246,19 +1216,19 @@
"_name": "picC",
"_objFlags": 0,
"_parent": {
"__id__": 17
"__id__": 16
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 30
"__id__": 29
},
{
"__id__": 31
"__id__": 30
},
{
"__id__": 32
"__id__": 31
}
],
"_prefab": null,
......@@ -1314,7 +1284,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 29
"__id__": 28
},
"_enabled": true,
"_materials": [
......@@ -1344,7 +1314,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 29
"__id__": 28
},
"_enabled": true,
"alignMode": 1,
......@@ -1371,7 +1341,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 29
"__id__": 28
},
"_enabled": true,
"_clip": null,
......@@ -1387,17 +1357,17 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 17
"__id__": 16
},
"_enabled": true,
"dragonBoneAudioSource": {
"__id__": 24
"__id__": 23
},
"picAAudioSource": {
"__id__": 28
"__id__": 27
},
"picCAudioSource": {
"__id__": 32
"__id__": 31
},
"_id": "a2RsgrevxLALki66+UKTAy"
},
......@@ -1406,7 +1376,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 17
"__id__": 16
},
"_enabled": true,
"alignMode": 1,
......@@ -1437,19 +1407,19 @@
},
"_children": [
{
"__id__": 36
"__id__": 35
},
{
"__id__": 40
"__id__": 39
}
],
"_active": true,
"_components": [
{
"__id__": 43
"__id__": 42
},
{
"__id__": 44
"__id__": 43
}
],
"_prefab": null,
......@@ -1505,19 +1475,19 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 34
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 37
"__id__": 36
},
{
"__id__": 38
"__id__": 37
},
{
"__id__": 39
"__id__": 38
}
],
"_prefab": null,
......@@ -1573,7 +1543,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
"__id__": 35
},
"_enabled": true,
"_materials": [
......@@ -1609,7 +1579,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
"__id__": 35
},
"_enabled": true,
"_color": {
......@@ -1627,7 +1597,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
"__id__": 35
},
"_enabled": true,
"_clip": null,
......@@ -1643,16 +1613,16 @@
"_name": "doc",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 34
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 41
"__id__": 40
},
{
"__id__": 42
"__id__": 41
}
],
"_prefab": null,
......@@ -1708,7 +1678,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 39
},
"_enabled": true,
"_materials": [
......@@ -1740,7 +1710,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 39
},
"_enabled": true,
"_defaultClip": {
......@@ -1759,14 +1729,14 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 34
},
"_enabled": true,
"doc": {
"__id__": 40
"__id__": 39
},
"text": {
"__id__": 36
"__id__": 35
},
"_id": "624Q23nvtEgp2teq8h6WHj"
},
......@@ -1775,7 +1745,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 34
},
"_enabled": true,
"alignMode": 1,
......@@ -1806,13 +1776,13 @@
},
"_children": [
{
"__id__": 46
"__id__": 45
},
{
"__id__": 49
"__id__": 48
},
{
"__id__": 52
"__id__": 51
}
],
"_active": false,
......@@ -1870,11 +1840,11 @@
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 45
"__id__": 44
},
"_children": [
{
"__id__": 47
"__id__": 46
}
],
"_active": true,
......@@ -1932,13 +1902,13 @@
"_name": "BRLNSDB",
"_objFlags": 0,
"_parent": {
"__id__": 46
"__id__": 45
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 48
"__id__": 47
}
],
"_prefab": null,
......@@ -1994,7 +1964,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 47
"__id__": 46
},
"_enabled": true,
"_materials": [
......@@ -2030,11 +2000,11 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 45
"__id__": 44
},
"_children": [
{
"__id__": 50
"__id__": 49
}
],
"_active": true,
......@@ -2092,13 +2062,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 49
"__id__": 48
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 51
"__id__": 50
}
],
"_prefab": null,
......@@ -2154,7 +2124,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 50
"__id__": 49
},
"_enabled": true,
"_materials": [
......@@ -2186,11 +2156,11 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 45
"__id__": 44
},
"_children": [
{
"__id__": 53
"__id__": 52
}
],
"_active": true,
......@@ -2248,13 +2218,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 52
"__id__": 51
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 54
"__id__": 53
}
],
"_prefab": null,
......@@ -2310,7 +2280,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 53
"__id__": 52
},
"_enabled": true,
"_clip": {
......@@ -2349,25 +2319,25 @@
},
"_enabled": true,
"loadInAudioSource": {
"__id__": 57
"__id__": 56
},
"dragonBonesNode": {
"__id__": 20
"__id__": 19
},
"pic_a_sprite": {
"__id__": 26
"__id__": 25
},
"pic_c_sprite": {
"__id__": 30
"__id__": 29
},
"tittleJs": {
"__id__": 15
},
"middleJs": {
"__id__": 33
"__id__": 32
},
"bottomJs": {
"__id__": 43
"__id__": 42
},
"_id": "e687yyoRBIzZAOVRL8Sseh"
},
......
......@@ -177,9 +177,9 @@ cc.Class({
initView() {
this.initBg();
this.initPic();
this.initTile();
//this.initBtn();
this.initIcon();
this.loadDragonBones();
......@@ -216,10 +216,28 @@ cc.Class({
});
},
initTile(){
this.tittleJs.setTittleText(this.data.bt_text);
let dy = this._frameSize.y/2-104;
this.tittleJs.node.y = dy;
},
initBg() {
//等比缩放,底部对齐
const bgNode = cc.find('Canvas/bg');
bgNode.scale = this._mapScaleMin;
let screen_size = this._frameSize.width / this._frameSize.height
let design_size = this._designSize.width / this._designSize.height
if(screen_size<design_size){
bgNode.height = this._frameSize.height;
bgNode.width = this._frameSize.height * design_size;
}else{
bgNode.width = this._frameSize.width;
bgNode.height = this._frameSize.width / design_size;
let dy = (bgNode.height - this._frameSize.height)/2
bgNode.y = bgNode.y + dy;
}
// bgNode.scale = this._mapScaleMin;
},
pic1: null,
......
......@@ -14,7 +14,7 @@ export default class NewClass extends cc.Component {
start () {
this.audioSource.node.on(cc.Node.EventType.TOUCH_START,this.playSe,this);
// cc.view.getFrameSize
// cc.view.getFrameSize()
}
/**
* 设置标题文本
......
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