Commit 4f290dc5 authored by liujiangnan's avatar liujiangnan

feat: 关闭逻辑改动

parent 35cc1e02
...@@ -4453,10 +4453,10 @@ ...@@ -4453,10 +4453,10 @@
"__id__": 94 "__id__": 94
}, },
{ {
"__id__": 98 "__id__": 96
}, },
{ {
"__id__": 100 "__id__": 104
}, },
{ {
"__id__": 108 "__id__": 108
...@@ -4522,201 +4522,6 @@ ...@@ -4522,201 +4522,6 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "0dInpaIdpGHaCIT1XY8u2G" "_id": "0dInpaIdpGHaCIT1XY8u2G"
}, },
{
"__type__": "cc.Node",
"_name": "btn_close",
"_objFlags": 0,
"_parent": {
"__id__": 93
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 95
},
{
"__id__": 96
},
{
"__id__": 97
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
467,
179.5,
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": "23ne9yLUlDr5yGhIzCRoSH"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 94
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "980c8ef8-5e87-4ed4-8910-cd830970d378"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "fegGDOxslCXrkiFWICIvBE"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 94
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 0,
"transition": 0,
"_N$normalColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"_N$hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$disabledColor": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"a": 255
},
"_N$normalSprite": null,
"_N$pressedSprite": null,
"pressedSprite": null,
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "d1ichWXgBGhoh6yqlYYlrs"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 94
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 33,
"_left": 0,
"_right": -15,
"_top": -23,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "7f+ymNiR5DC5oGJEBH9yvB"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "desc", "_name": "desc",
...@@ -4728,7 +4533,7 @@ ...@@ -4728,7 +4533,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 99 "__id__": 95
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4784,7 +4589,7 @@ ...@@ -4784,7 +4589,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 98 "__id__": 94
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4823,13 +4628,13 @@ ...@@ -4823,13 +4628,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 101 "__id__": 97
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 107 "__id__": 103
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4885,20 +4690,20 @@ ...@@ -4885,20 +4690,20 @@
"_name": "view", "_name": "view",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 100 "__id__": 96
}, },
"_children": [ "_children": [
{ {
"__id__": 102 "__id__": 98
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 105 "__id__": 101
}, },
{ {
"__id__": 106 "__id__": 102
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4954,16 +4759,16 @@ ...@@ -4954,16 +4759,16 @@
"_name": "content", "_name": "content",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 101 "__id__": 97
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 103 "__id__": 99
}, },
{ {
"__id__": 104 "__id__": 100
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5019,7 +4824,7 @@ ...@@ -5019,7 +4824,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 102 "__id__": 98
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -5051,7 +4856,7 @@ ...@@ -5051,7 +4856,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 102 "__id__": 98
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5078,7 +4883,7 @@ ...@@ -5078,7 +4883,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 101 "__id__": 97
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5098,7 +4903,7 @@ ...@@ -5098,7 +4903,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 101 "__id__": 97
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5125,7 +4930,7 @@ ...@@ -5125,7 +4930,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 100 "__id__": 96
}, },
"_enabled": true, "_enabled": true,
"horizontal": true, "horizontal": true,
...@@ -5137,10 +4942,10 @@ ...@@ -5137,10 +4942,10 @@
"scrollEvents": [], "scrollEvents": [],
"cancelInnerEvents": true, "cancelInnerEvents": true,
"_N$content": { "_N$content": {
"__id__": 102 "__id__": 98
}, },
"content": { "content": {
"__id__": 102 "__id__": 98
}, },
"scrollThreshold": 0.5, "scrollThreshold": 0.5,
"autoPageTurningThreshold": 100, "autoPageTurningThreshold": 100,
...@@ -5163,13 +4968,13 @@ ...@@ -5163,13 +4968,13 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 109 "__id__": 105
}, },
{ {
"__id__": 110 "__id__": 106
}, },
{ {
"__id__": 111 "__id__": 107
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5195,7 +5000,7 @@ ...@@ -5195,7 +5000,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-388.1, -890.1,
-108.6, -108.6,
0, 0,
0, 0,
...@@ -5225,7 +5030,7 @@ ...@@ -5225,7 +5030,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 108 "__id__": 104
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5257,7 +5062,7 @@ ...@@ -5257,7 +5062,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 108 "__id__": 104
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5284,7 +5089,7 @@ ...@@ -5284,7 +5089,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 108 "__id__": 104
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -5358,13 +5163,13 @@ ...@@ -5358,13 +5163,13 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 113 "__id__": 109
}, },
{ {
"__id__": 114 "__id__": 110
}, },
{ {
"__id__": 115 "__id__": 111
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5390,7 +5195,7 @@ ...@@ -5390,7 +5195,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
398.1, -103.9,
-108.6, -108.6,
0, 0,
0, 0,
...@@ -5420,7 +5225,7 @@ ...@@ -5420,7 +5225,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 112 "__id__": 108
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5452,7 +5257,7 @@ ...@@ -5452,7 +5257,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 112 "__id__": 108
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5479,7 +5284,7 @@ ...@@ -5479,7 +5284,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 112 "__id__": 108
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -5542,6 +5347,201 @@ ...@@ -5542,6 +5347,201 @@
"_N$target": null, "_N$target": null,
"_id": "9dqbzn5hFAd6+/om3/Gy9c" "_id": "9dqbzn5hFAd6+/om3/Gy9c"
}, },
{
"__type__": "cc.Node",
"_name": "btn_close",
"_objFlags": 0,
"_parent": {
"__id__": 93
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 113
},
{
"__id__": 114
},
{
"__id__": 115
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 218,
"height": 106
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-159.459,
-182.713,
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": "3dgM2PE81BAbNgMHdF8q3e"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 112
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "d08949e3-b952-4753-bb18-89f8f2082a4b"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "3aiPAEMmxDcpWBBfYJCZh1"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 112
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 36,
"_left": 0,
"_right": 50.459,
"_top": 0,
"_bottom": -29.212999999999994,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "f1w8R7nodIPLs0AV2P3kxF"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 112
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 0,
"transition": 0,
"_N$normalColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"_N$hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$disabledColor": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"a": 255
},
"_N$normalSprite": null,
"_N$pressedSprite": null,
"pressedSprite": null,
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "67RvkRGalFEbzjHpguo7Mi"
},
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
...@@ -6792,16 +6792,16 @@ ...@@ -6792,16 +6792,16 @@
"__id__": 87 "__id__": 87
}, },
"page_view": { "page_view": {
"__id__": 100 "__id__": 96
}, },
"tip_label": { "tip_label": {
"__id__": 98 "__id__": 94
}, },
"tip_left": { "tip_left": {
"__id__": 108 "__id__": 104
}, },
"tip_right": { "tip_right": {
"__id__": 112 "__id__": 108
}, },
"_id": "eaTVUpqahPfZeO9+sUI7RP" "_id": "eaTVUpqahPfZeO9+sUI7RP"
} }
......
...@@ -155,6 +155,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -155,6 +155,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
let pages = this.page_view.getComponent(cc.PageView).getPages(); let pages = this.page_view.getComponent(cc.PageView).getPages();
this.tip_left.active = pages.length > 0 && index > 0; this.tip_left.active = pages.length > 0 && index > 0;
this.tip_right.active = pages.length > 0 && index < pages.length - 1; this.tip_right.active = pages.length > 0 && index < pages.length - 1;
cc.find("s_group/startbg/btn_close", this.startNode).active = index === pages.length - 1;
let page = pages[index]; let page = pages[index];
if (page) if (page)
playAudioByUrl(page["data"].audio); playAudioByUrl(page["data"].audio);
......
{
"ver": "2.3.5",
"uuid": "4d51056a-2e8f-4f56-8d83-0e3a8cd2f912",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 234,
"height": 121,
"platformSettings": {},
"subMetas": {
"iknow": {
"ver": "1.0.4",
"uuid": "d08949e3-b952-4753-bb18-89f8f2082a4b",
"rawTextureUuid": "4d51056a-2e8f-4f56-8d83-0e3a8cd2f912",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": -0.5,
"trimX": 8,
"trimY": 8,
"width": 218,
"height": 106,
"rawWidth": 234,
"rawHeight": 121,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
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