Commit bfbf2cfd authored by haiyoucuv's avatar haiyoucuv

Merge remote-tracking branch 'origin/master'

parents e25b3082 b2a35c2c
......@@ -22,32 +22,32 @@
"__id__": 2
},
{
"__id__": 40
"__id__": 28
},
{
"__id__": 42
},
{
"__id__": 50
"__id__": 66
},
{
"__id__": 60
"__id__": 76
}
],
"_active": true,
"_components": [
{
"__id__": 74
"__id__": 86
},
{
"__id__": 76
},
{
"__id__": 78
"__id__": 88
},
{
"__id__": 80
"__id__": 90
}
],
"_prefab": {
"__id__": 82
"__id__": 92
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -80,7 +80,7 @@
},
{
"__type__": "cc.Node",
"_name": "bg",
"_name": "svga",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
......@@ -94,19 +94,19 @@
"_active": true,
"_components": [
{
"__id__": 35
"__id__": 23
},
{
"__id__": 37
"__id__": 25
}
],
"_prefab": {
"__id__": 39
"__id__": 27
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": -16.06400000000002,
"y": 0,
"z": 0
},
"_lrot": {
......@@ -134,7 +134,7 @@
},
{
"__type__": "cc.Node",
"_name": "getPrizeBg",
"_name": "aniNode",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
......@@ -143,27 +143,23 @@
"_children": [
{
"__id__": 4
}
],
"_active": true,
"_components": [
{
"__id__": 28
},
{
"__id__": 30
"__id__": 10
},
{
"__id__": 32
"__id__": 16
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 34
"__id__": 22
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 42.00300000000004,
"x": -812,
"y": 375,
"z": 0
},
"_lrot": {
......@@ -176,7 +172,7 @@
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"y": -1,
"z": 1
},
"_mobility": 0,
......@@ -191,49 +187,42 @@
},
{
"__type__": "cc.Node",
"_name": "ScrollView",
"_name": "img_14329",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 3
},
"_children": [
{
"__id__": 5
}
],
"_children": [],
"_active": true,
"_components": [
{
"__id__": 21
},
{
"__id__": 23
"__id__": 5
},
{
"__id__": 25
"__id__": 7
}
],
"_prefab": {
"__id__": 27
"__id__": 9
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": -31.966999999999985,
"x": -1503,
"y": 126,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
"z": 1,
"w": 0
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"x": -2,
"y": 2,
"z": 1
},
"_mobility": 0,
......@@ -246,33 +235,109 @@
},
"_id": ""
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 4
},
"_enabled": true,
"__prefab": {
"__id__": 6
},
"_contentSize": {
"__type__": "cc.Size",
"width": 750,
"height": 249
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0,
"y": 1
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "04I8movZRGh6it4HdZK1pz"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 4
},
"_enabled": true,
"__prefab": {
"__id__": 8
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_spriteFrame": null,
"_type": 0,
"_fillType": 0,
"_sizeMode": 1,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "54zfr8gEFFqIGzHDHuOZOv"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "c2wbIoZDpPQ6wEtGhKXe/Y",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
"_name": "view",
"_name": "img_14329",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 4
"__id__": 3
},
"_children": [
{
"__id__": 6
}
],
"_children": [],
"_active": true,
"_components": [
{
"__id__": 14
},
{
"__id__": 16
"__id__": 11
},
{
"__id__": 18
"__id__": 13
}
],
"_prefab": {
"__id__": 20
"__id__": 15
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -303,29 +368,109 @@
},
"_id": ""
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
},
"_enabled": true,
"__prefab": {
"__id__": 12
},
"_contentSize": {
"__type__": "cc.Size",
"width": 750,
"height": 249
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0,
"y": 1
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "bb5sfZQpBOFrc3nMQn14Qk"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
},
"_enabled": true,
"__prefab": {
"__id__": 14
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 0
},
"_spriteFrame": null,
"_type": 0,
"_fillType": 0,
"_sizeMode": 1,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "9aG3DRxaRJ/4eox648dQMw"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "c479oPyi5HzZRBRrOmLcir",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
"_name": "content",
"_name": "psd_362",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 5
"__id__": 3
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 7
},
{
"__id__": 9
"__id__": 17
},
{
"__id__": 11
"__id__": 19
}
],
"_prefab": {
"__id__": 13
"__id__": 21
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -362,101 +507,82 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 6
"__id__": 16
},
"_enabled": true,
"__prefab": {
"__id__": 8
"__id__": 18
},
"_contentSize": {
"__type__": "cc.Size",
"width": -30,
"height": 120
"width": 1624,
"height": 400
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
"x": 0,
"y": 1
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "96NtpGOmhNUYek+fvo0Uhp"
"fileId": "4ejjbbgQdLL7jUIuY06yOL"
},
{
"__type__": "cc.Widget",
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 6
"__id__": 16
},
"_enabled": true,
"__prefab": {
"__id__": 10
"__id__": 20
},
"_alignFlags": 21,
"_target": null,
"_left": 16.015625,
"_right": 515,
"_top": 90,
"_bottom": 90,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 800,
"_originalHeight": 400,
"_alignMode": 2,
"_lockFlags": 0,
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 0
},
"_spriteFrame": null,
"_type": 0,
"_fillType": 0,
"_sizeMode": 1,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "d64Wyg7QVAjq/m3hx1pTlZ"
"fileId": "a5coQFfaVI1pWBSmPWokHj"
},
{
"__type__": "cc.Layout",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 6
},
"_enabled": true,
"__prefab": {
"__id__": 12
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"_resizeMode": 1,
"_layoutType": 1,
"_cellSize": {
"__type__": "cc.Size",
"width": 40,
"height": 40
"asset": {
"__id__": 0
},
"_startAxis": 0,
"_paddingLeft": 0,
"_paddingRight": 0,
"_paddingTop": 0,
"_paddingBottom": 0,
"_spacingX": 30,
"_spacingY": 30,
"_verticalDirection": 1,
"_horizontalDirection": 0,
"_constraint": 0,
"_constraintNum": 2,
"_affectedByScale": false,
"_isAlign": false,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "69jVUK9C1CNKPX7eAHwk2D"
"fileId": "e5NKXwjkdCXoIxPe8qkE5x",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.PrefabInfo",
......@@ -466,7 +592,7 @@
"asset": {
"__id__": 0
},
"fileId": "ecey1hU/JDg6aDjG7EHPsg",
"fileId": "23zb/MgLhN95e+ctY/L9Tn",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
......@@ -477,16 +603,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 5
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 15
"__id__": 24
},
"_contentSize": {
"__type__": "cc.Size",
"width": 900,
"height": 300
"width": 1624,
"height": 750
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -497,75 +623,32 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "57v+327elESo60MHwGZX/o"
},
{
"__type__": "cc.Mask",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 5
},
"_enabled": true,
"__prefab": {
"__id__": 17
},
"_type": 0,
"_inverted": false,
"_segments": 64,
"_alphaThreshold": 0.1,
"_id": ""
"fileId": "f8drSFx51IcLJkeVb++Pv1"
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "33HqT+f+RPW6pqNKXdeyc/"
},
{
"__type__": "cc.Graphics",
"__type__": "7c5ffhlHDpBpoDQ8wfKN7pu",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 5
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 19
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_lineWidth": 1,
"_strokeColor": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
"__id__": 26
},
"_lineJoin": 2,
"_lineCap": 0,
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 0
"_svga": {
"__uuid__": "cdfd993d-77ef-42a9-a643-e959ebe14f9b",
"__expectedType__": "cc.Asset"
},
"_miterLimit": 10,
"autoPlay": true,
"_loop": false,
"_fps": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "d9DkD3TRpP+aG4laqwFpU7"
"fileId": "49VO/0B81NUZUK9RayCFdi"
},
{
"__type__": "cc.PrefabInfo",
......@@ -575,124 +658,117 @@
"asset": {
"__id__": 0
},
"fileId": "ccbfsJeqFGHrHU36j8Nsph",
"fileId": "bbyEmzBP5DroAthmMbZWh9",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.UITransform",
"_name": "",
"__type__": "cc.Node",
"_name": "bg",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 4
},
"_enabled": true,
"__prefab": {
"__id__": 22
},
"_contentSize": {
"__type__": "cc.Size",
"width": 900,
"height": 300
"_parent": {
"__id__": 1
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
"_children": [
{
"__id__": 29
}
],
"_active": true,
"_components": [
{
"__id__": 37
},
{
"__id__": 39
}
],
"_prefab": {
"__id__": 41
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "4eaOao0HpPlLyAXxew1tk6"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 4
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": -16.06400000000002,
"z": 0
},
"_enabled": true,
"__prefab": {
"__id__": 24
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_spriteFrame": null,
"_type": 1,
"_fillType": 0,
"_sizeMode": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0
"y": 0,
"z": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "1eCT2uk2dINa3bykNrbuEW"
},
{
"__type__": "cc.ScrollView",
"_name": "",
"__type__": "cc.Node",
"_name": "getPrizeBg",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 4
"_parent": {
"__id__": 28
},
"_enabled": true,
"__prefab": {
"__id__": 26
"_children": [],
"_active": true,
"_components": [
{
"__id__": 30
},
{
"__id__": 32
},
{
"__id__": 34
}
],
"_prefab": {
"__id__": 36
},
"bounceDuration": 0.23,
"brake": 0.75,
"elastic": true,
"inertia": true,
"horizontal": true,
"vertical": false,
"cancelInnerEvents": true,
"scrollEvents": [],
"_content": {
"__id__": 6
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 42.00300000000004,
"z": 0
},
"_horizontalScrollBar": null,
"_verticalScrollBar": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "59nfFPxHlKLZARUWkEbnZU"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"asset": {
"__id__": 0
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"fileId": "f3QVge9LZCAJaRXpOJqCqy",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.UITransform",
......@@ -700,11 +776,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 3
"__id__": 29
},
"_enabled": true,
"__prefab": {
"__id__": 29
"__id__": 31
},
"_contentSize": {
"__type__": "cc.Size",
......@@ -728,11 +804,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 3
"__id__": 29
},
"_enabled": true,
"__prefab": {
"__id__": 31
"__id__": 33
},
"_customMaterial": null,
"_srcBlendFactor": 2,
......@@ -773,11 +849,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 3
"__id__": 29
},
"_enabled": true,
"__prefab": {
"__id__": 33
"__id__": 35
},
"_alignFlags": 40,
"_target": null,
......@@ -822,11 +898,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 2
"__id__": 28
},
"_enabled": true,
"__prefab": {
"__id__": 36
"__id__": 38
},
"_contentSize": {
"__type__": "cc.Size",
......@@ -850,11 +926,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 2
"__id__": 28
},
"_enabled": true,
"__prefab": {
"__id__": 38
"__id__": 40
},
"_alignFlags": 45,
"_target": null,
......@@ -895,35 +971,146 @@
},
{
"__type__": "cc.Node",
"_name": "happyBtn",
"_name": "ScrollView",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 1
},
"_children": [
{
"__id__": 43
}
],
"_active": true,
"_components": [
{
"__id__": 59
},
{
"__id__": 61
},
{
"__id__": 63
}
],
"_prefab": {
"__id__": 65
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": -6.027999999999963,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.Node",
"_name": "view",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 42
},
"_children": [
{
"__id__": 44
}
],
"_active": true,
"_components": [
{
"__id__": 52
},
{
"__id__": 54
},
{
"__id__": 56
}
],
"_prefab": {
"__id__": 58
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.Node",
"_name": "content",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 1
"__id__": 43
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 41
},
{
"__id__": 43
},
{
"__id__": 45
},
{
"__id__": 47
},
{
"__id__": 49
}
],
"_prefab": {
"__id__": 49
"__id__": 51
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -146,
"y": -267.66499999999996,
"x": 0,
"y": 0,
"z": 0
},
"_lrot": {
......@@ -955,16 +1142,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 40
"__id__": 44
},
"_enabled": true,
"__prefab": {
"__id__": 42
"__id__": 46
},
"_contentSize": {
"__type__": "cc.Size",
"width": 240,
"height": 88
"width": -30,
"height": 120
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -975,52 +1162,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "416IhhQ5FLobbvwPbSDGlr"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 40
},
"_enabled": true,
"__prefab": {
"__id__": 44
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_spriteFrame": {
"__uuid__": "d19dc2a0-a131-4895-bdde-a45660291bf3@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_fillType": 0,
"_sizeMode": 1,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "c7jRdwVk5BQJgd+Ssdqo1L"
"fileId": "96NtpGOmhNUYek+fvo0Uhp"
},
{
"__type__": "cc.Widget",
......@@ -1028,18 +1170,18 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 40
"__id__": 44
},
"_enabled": true,
"__prefab": {
"__id__": 46
"__id__": 48
},
"_alignFlags": 12,
"_alignFlags": 21,
"_target": null,
"_left": 546,
"_right": 0,
"_top": 0,
"_bottom": 63.33499999999998,
"_left": 16.015625,
"_right": 515,
"_top": 90,
"_bottom": 90,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
......@@ -1048,73 +1190,53 @@
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_originalWidth": 800,
"_originalHeight": 400,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "f4LhMcGI1KDbSjVek1zIvD"
"fileId": "d64Wyg7QVAjq/m3hx1pTlZ"
},
{
"__type__": "cc.Button",
"__type__": "cc.Layout",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 40
"__id__": 44
},
"_enabled": true,
"__prefab": {
"__id__": 48
},
"clickEvents": [],
"_interactable": true,
"_transition": 3,
"_normalColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_hoverColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"_pressedColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_disabledColor": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"a": 255
"__id__": 50
},
"_normalSprite": null,
"_hoverSprite": null,
"_pressedSprite": null,
"_disabledSprite": null,
"_duration": 0.05,
"_zoomScale": 0.9,
"_target": {
"__id__": 40
"_resizeMode": 1,
"_layoutType": 1,
"_cellSize": {
"__type__": "cc.Size",
"width": 40,
"height": 40
},
"_startAxis": 0,
"_paddingLeft": 0,
"_paddingRight": 0,
"_paddingTop": 0,
"_paddingBottom": 0,
"_spacingX": 30,
"_spacingY": 30,
"_verticalDirection": 1,
"_horizontalDirection": 0,
"_constraint": 0,
"_constraintNum": 2,
"_affectedByScale": false,
"_isAlign": false,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "78BfyAzJhPXLq5Km9ekR4Y"
"fileId": "69jVUK9C1CNKPX7eAHwk2D"
},
{
"__type__": "cc.PrefabInfo",
......@@ -1124,83 +1246,136 @@
"asset": {
"__id__": 0
},
"fileId": "10pm2nUc1P6bCBC1Sh6gY0",
"fileId": "ecey1hU/JDg6aDjG7EHPsg",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
"_name": "shareBtn",
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 1
"node": {
"__id__": 43
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 51
},
{
"__id__": 53
},
{
"__id__": 55
},
{
"__id__": 57
}
],
"_prefab": {
"__id__": 59
"_enabled": true,
"__prefab": {
"__id__": 53
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 154,
"y": -267.66499999999996,
"z": 0
"_contentSize": {
"__type__": "cc.Size",
"width": 900,
"height": 300
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "57v+327elESo60MHwGZX/o"
},
{
"__type__": "cc.Mask",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 43
},
"_enabled": true,
"__prefab": {
"__id__": 55
},
"_type": 0,
"_inverted": false,
"_segments": 64,
"_alphaThreshold": 0.1,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "33HqT+f+RPW6pqNKXdeyc/"
},
{
"__type__": "cc.Graphics",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 43
},
"_enabled": true,
"__prefab": {
"__id__": 57
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_lineWidth": 1,
"_strokeColor": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
"_lineJoin": 2,
"_lineCap": 0,
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 0
},
"_miterLimit": 10,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "d9DkD3TRpP+aG4laqwFpU7"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "ccbfsJeqFGHrHU36j8Nsph",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 50
"__id__": 42
},
"_enabled": true,
"__prefab": {
"__id__": 52
"__id__": 60
},
"_contentSize": {
"__type__": "cc.Size",
"width": 240,
"height": 88
"width": 900,
"height": 300
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1211,7 +1386,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "17eAlgcO1DyL1Ec0USMxcN"
"fileId": "4eaOao0HpPlLyAXxew1tk6"
},
{
"__type__": "cc.Sprite",
......@@ -1219,11 +1394,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 50
"__id__": 42
},
"_enabled": true,
"__prefab": {
"__id__": 54
"__id__": 62
},
"_customMaterial": null,
"_srcBlendFactor": 2,
......@@ -1235,13 +1410,10 @@
"b": 255,
"a": 255
},
"_spriteFrame": {
"__uuid__": "809ef008-42a0-4d93-9583-a1b878a53d8f@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_spriteFrame": null,
"_type": 1,
"_fillType": 0,
"_sizeMode": 1,
"_sizeMode": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
......@@ -1256,101 +1428,38 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "bepf9HFvZK34u+fERvwaxi"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 50
},
"_enabled": true,
"__prefab": {
"__id__": 56
},
"_alignFlags": 36,
"_target": null,
"_left": 692,
"_right": 538,
"_top": 0,
"_bottom": 63.33499999999998,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "fbH1HU4uxI0JKnn6Tg4I5C"
"fileId": "1eCT2uk2dINa3bykNrbuEW"
},
{
"__type__": "cc.Button",
"__type__": "cc.ScrollView",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 50
"__id__": 42
},
"_enabled": true,
"__prefab": {
"__id__": 58
},
"clickEvents": [],
"_interactable": true,
"_transition": 3,
"_normalColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_hoverColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
"__id__": 64
},
"_pressedColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_disabledColor": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"a": 255
},
"_normalSprite": null,
"_hoverSprite": null,
"_pressedSprite": null,
"_disabledSprite": null,
"_duration": 0.05,
"_zoomScale": 0.9,
"_target": {
"__id__": 50
"bounceDuration": 0.23,
"brake": 0.75,
"elastic": true,
"inertia": true,
"horizontal": true,
"vertical": false,
"cancelInnerEvents": true,
"scrollEvents": [],
"_content": {
"__id__": 44
},
"_horizontalScrollBar": null,
"_verticalScrollBar": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "4dB1ZOQ9RBJZUjTwxBBiPy"
"fileId": "59nfFPxHlKLZARUWkEbnZU"
},
{
"__type__": "cc.PrefabInfo",
......@@ -1360,36 +1469,42 @@
"asset": {
"__id__": 0
},
"fileId": "98g0ef/K1BXrQ6wvP86wq2",
"fileId": "f3QVge9LZCAJaRXpOJqCqy",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
"_name": "aniNode",
"_name": "happyBtn",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 1
},
"_children": [
"_children": [],
"_active": true,
"_components": [
{
"__id__": 61
"__id__": 67
},
{
"__id__": 67
"__id__": 69
},
{
"__id__": 71
},
{
"__id__": 73
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 73
"__id__": 75
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -812,
"y": 375,
"x": -146,
"y": -267.66499999999996,
"z": 0
},
"_lrot": {
......@@ -1402,7 +1517,7 @@
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": -1,
"y": 1,
"z": 1
},
"_mobility": 0,
......@@ -1416,124 +1531,171 @@
"_id": ""
},
{
"__type__": "cc.Node",
"_name": "img_14329",
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 60
"node": {
"__id__": 66
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 62
},
{
"__id__": 64
}
],
"_prefab": {
"_enabled": true,
"__prefab": {
"__id__": 68
},
"_contentSize": {
"__type__": "cc.Size",
"width": 240,
"height": 88
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "416IhhQ5FLobbvwPbSDGlr"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 66
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -1300.3997802734375,
"y": 126,
"z": 0
"_enabled": true,
"__prefab": {
"__id__": 70
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 1,
"w": 0
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_lscale": {
"__type__": "cc.Vec3",
"x": -2,
"y": 2,
"z": 1
"_spriteFrame": {
"__uuid__": "d19dc2a0-a131-4895-bdde-a45660291bf3@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 180,
"y": 180,
"z": 0
"_type": 0,
"_fillType": 0,
"_sizeMode": 1,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.UITransform",
"__type__": "cc.CompPrefabInfo",
"fileId": "c7jRdwVk5BQJgd+Ssdqo1L"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 61
"__id__": 66
},
"_enabled": true,
"__prefab": {
"__id__": 63
},
"_contentSize": {
"__type__": "cc.Size",
"width": 750,
"height": 249
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0,
"y": 1
"__id__": 72
},
"_alignFlags": 12,
"_target": null,
"_left": 546,
"_right": 0,
"_top": 0,
"_bottom": 63.33499999999998,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "e0xSK0eBBHi7jSAm+vO9SA"
"fileId": "f4LhMcGI1KDbSjVek1zIvD"
},
{
"__type__": "cc.Sprite",
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 61
"__id__": 66
},
"_enabled": true,
"__prefab": {
"__id__": 65
"__id__": 74
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"clickEvents": [],
"_interactable": true,
"_transition": 3,
"_normalColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_spriteFrame": null,
"_type": 0,
"_fillType": 0,
"_sizeMode": 1,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
"_hoverColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"_pressedColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_disabledColor": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"a": 255
},
"_normalSprite": null,
"_hoverSprite": null,
"_pressedSprite": null,
"_disabledSprite": null,
"_duration": 0.05,
"_zoomScale": 0.9,
"_target": {
"__id__": 66
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "629aKeSnpBhJKsJzccQ2Ul"
"fileId": "78BfyAzJhPXLq5Km9ekR4Y"
},
{
"__type__": "cc.PrefabInfo",
......@@ -1543,57 +1705,63 @@
"asset": {
"__id__": 0
},
"fileId": "dfN6bqe2tMMJKWq0FTC5KS",
"fileId": "10pm2nUc1P6bCBC1Sh6gY0",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
"_name": "img_14329",
"_name": "shareBtn",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 60
"__id__": 1
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 68
"__id__": 77
},
{
"__id__": 79
},
{
"__id__": 81
},
{
"__id__": 70
"__id__": 83
}
],
"_prefab": {
"__id__": 72
"__id__": 85
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 1536,
"y": 126,
"x": 154,
"y": -267.66499999999996,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 1,
"w": 0
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": -2,
"y": 2,
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 180,
"y": 180,
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
......@@ -1604,27 +1772,27 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 67
"__id__": 76
},
"_enabled": true,
"__prefab": {
"__id__": 69
"__id__": 78
},
"_contentSize": {
"__type__": "cc.Size",
"width": 750,
"height": 249
"width": 240,
"height": 88
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0,
"y": 1
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "67+bumw0tLOaxsCzidlVUb"
"fileId": "17eAlgcO1DyL1Ec0USMxcN"
},
{
"__type__": "cc.Sprite",
......@@ -1632,11 +1800,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 67
"__id__": 76
},
"_enabled": true,
"__prefab": {
"__id__": 71
"__id__": 80
},
"_customMaterial": null,
"_srcBlendFactor": 2,
......@@ -1646,9 +1814,12 @@
"r": 255,
"g": 255,
"b": 255,
"a": 0
"a": 255
},
"_spriteFrame": {
"__uuid__": "809ef008-42a0-4d93-9583-a1b878a53d8f@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_spriteFrame": null,
"_type": 0,
"_fillType": 0,
"_sizeMode": 1,
......@@ -1666,20 +1837,101 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "7ecxndk91Ccox4U9UbPhfN"
"fileId": "bepf9HFvZK34u+fERvwaxi"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 76
},
"asset": {
"__id__": 0
"_enabled": true,
"__prefab": {
"__id__": 82
},
"fileId": "ddGQri72VKP6ZxLXmMFlwy",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
"_alignFlags": 36,
"_target": null,
"_left": 692,
"_right": 538,
"_top": 0,
"_bottom": 63.33499999999998,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "fbH1HU4uxI0JKnn6Tg4I5C"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 76
},
"_enabled": true,
"__prefab": {
"__id__": 84
},
"clickEvents": [],
"_interactable": true,
"_transition": 3,
"_normalColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_hoverColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"_pressedColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_disabledColor": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"a": 255
},
"_normalSprite": null,
"_hoverSprite": null,
"_pressedSprite": null,
"_disabledSprite": null,
"_duration": 0.05,
"_zoomScale": 0.9,
"_target": {
"__id__": 76
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "4dB1ZOQ9RBJZUjTwxBBiPy"
},
{
"__type__": "cc.PrefabInfo",
......@@ -1689,7 +1941,7 @@
"asset": {
"__id__": 0
},
"fileId": "cdzoHNGB1Ewq6xrdFgqHpy",
"fileId": "98g0ef/K1BXrQ6wvP86wq2",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
......@@ -1704,7 +1956,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 75
"__id__": 87
},
"_contentSize": {
"__type__": "cc.Size",
......@@ -1732,7 +1984,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 77
"__id__": 89
},
"_alignFlags": 45,
"_target": null,
......@@ -1768,48 +2020,32 @@
},
"_enabled": true,
"__prefab": {
"__id__": 79
"__id__": 91
},
"share": {
"__id__": 50
"__id__": 76
},
"happy": {
"__id__": 40
"__id__": 66
},
"prizePrefab": {
"__uuid__": "eb3f43be-dd96-4477-93f0-6c998ce40cfb",
"__expectedType__": "cc.Prefab"
},
"content": {
"__id__": 6
"__id__": 44
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "4eu9cu9cBBMrivH/BB5IzG"
},
{
"__type__": "7c5ffhlHDpBpoDQ8wfKN7pu",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 1
"svga": {
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 81
"bg": {
"__id__": 28
},
"_svga": null,
"autoPlay": true,
"_loop": false,
"_fps": 30,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "bdgO3gPWVG2otJeF68dLd8"
"fileId": "4eu9cu9cBBMrivH/BB5IzG"
},
{
"__type__": "cc.PrefabInfo",
......
......@@ -434,8 +434,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 2.5470000000000255,
"y": 0.47900000000004184,
"x": 15.000999999999976,
"y": 0.478999999999985,
"z": 0
},
"_lrot": {
......@@ -475,7 +475,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 35.59375,
"width": 17.796875,
"height": 50.4
},
"_anchorPoint": {
......@@ -511,7 +511,7 @@
"b": 255,
"a": 255
},
"_string": "25",
"_string": "0",
"_horizontalAlign": 1,
"_verticalAlign": 1,
"_actualFontSize": 32,
......@@ -1221,6 +1221,8 @@
"__id__": 0
},
"fileId": "aflVw5/2dP+rzU7TMNhCDd",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
......
......@@ -30,6 +30,9 @@ export default class ExchangeSuccess extends Panel {
this.prizeName.string = item.optionName;
this.prize.spriteFrame = item.optionImg;
await sendWebNetWithToken(WebNetName.propExchange)
}
clickLook() {
......@@ -40,7 +43,7 @@ export default class ExchangeSuccess extends Panel {
clickClose = async () => {
this.hidePanel()
await sendWebNetWithToken(WebNetName.propExchange)
}
}
......@@ -26,6 +26,9 @@ export default class GetPrize extends Panel {
@property(Node) content: Node = null;
@property(Node) svga: Node = null;
@property(Node) bg: Node = null;
onLoad() {
this.happy.on(Button.EventType.CLICK, this.clickHappy, this);
this.share.on(Button.EventType.CLICK, this.clickShare, this);
......@@ -34,8 +37,8 @@ export default class GetPrize extends Panel {
async start() {
const {data = this.data} = this.data
console.log(data,112233)
console.log(data.prizeName,22222)
console.log(data, 112233)
console.log(data.prizeName, 22222)
data.map((item, index) => {
const prize = instantiate(this.prizePrefab)
......@@ -49,12 +52,25 @@ export default class GetPrize extends Panel {
const numBg = prize.getChildByName("numBg")
const num = numBg.getChildByName("num")
num.getComponent(Label).string = `X${item.sendCount}`
})
this.bg.active = false;
this.svga.active = true
setTimeout(()=>{
this.bg.active = true
this.svga.active = false
},1000)
})
}
change(){
this.bg.active = true
this.svga.active = false
}
clickShare() {
showPanel(SharePop, {
prizeName: this.data[0].prizeName,
......
......@@ -194,6 +194,10 @@ export class BlessingBagPage extends Scene {
if (item.code == "task_invite"){
Label_task_name.getComponent(Label).string = item.title
const activeBtn = EarnList.getChildByName("active_btn")
const activeLabel = activeBtn.getChildByName("ActiveLabel")
activeLabel.getComponent(Label).string = "去邀请"
}else{
Label_task_name.getComponent(Label).string = `${item.title}(${item.completedSize}/${item.intervalLimitSize})`
}
......
......@@ -98,14 +98,14 @@
</style>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/src/assets/plugin/zepto.min.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/src/assets/plugin/declare-process.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/src/assets/plugin/jszip.min.v3.10.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/src/assets/plugin/rem.min.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/src/assets/plugin/zepto.min.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/src/assets/plugin/declare-process.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/src/assets/plugin/jszip.min.v3.10.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/src/assets/plugin/rem.min.js"></script>
<script src="//res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/style.css" />-->
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/custom.css" />-->
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/style.css" />-->
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/custom.css" />-->
<!-- <script src="//yun-duiba-credits-test.duibatest.com.cn/TNGD_GAMES/libs/eruda.min.js"></script>-->
<!-- <script>eruda.init()</script>-->
......@@ -118,20 +118,20 @@
</div>
<!-- Polyfills bundle. -->
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/src/polyfills.bundle.js" charset="utf-8"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/src/polyfills.bundle.js" charset="utf-8"></script>
<!-- SystemJS support. -->
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/src/system.bundle.js" charset="utf-8"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/src/system.bundle.js" charset="utf-8"></script>
<!-- Import map -->
<!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>-->
<!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>-->
<script type="systemjs-importmap" charset="utf-8">
{"imports":{"cc":"//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/cocos-js/cc.js"}}
{"imports":{"cc":"//yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/cocos-js/cc.js"}}
</script>
<script>
System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/index.js').catch(function (err) {
System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/index.js').catch(function (err) {
console.error(err);
})
</script>
......
......@@ -45,8 +45,8 @@
"progress": 1,
"state": "success",
"stage": "build",
"message": "2024-12-12 15:25:18 build success in 54 s!",
"detailMessage": "Asset DB is resume!\r",
"message": "2024-12-12 16:30:31 build success in 1 min 14 s!",
"detailMessage": "%c兑吧发布插件 >> 版本号:1733992156174\rcolor: green\r",
"options": {
"name": "cocos-template-3d",
"server": "",
......@@ -109,7 +109,7 @@
"__version__": "1.3.8",
"logDest": "project://temp/builder/log/web-mobile2024-11-6 15-39.log"
},
"time": "2024-12-12 15:24:24",
"time": "2024-12-12 16:29:16",
"dirty": false
}
}
......
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