Commit c88a8908 authored by Lwd's avatar Lwd

commit

parent cc807d03
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 471 "__id__": 472
}, },
{ {
"__id__": 497 "__id__": 498
} }
], ],
"_active": false, "_active": false,
...@@ -81,14 +81,11 @@ ...@@ -81,14 +81,11 @@
"__id__": 5 "__id__": 5
}, },
{ {
"__id__": 464 "__id__": 465
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 466
},
{ {
"__id__": 467 "__id__": 467
}, },
...@@ -100,6 +97,9 @@ ...@@ -100,6 +97,9 @@
}, },
{ {
"__id__": 470 "__id__": 470
},
{
"__id__": 471
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -263,7 +263,7 @@ ...@@ -263,7 +263,7 @@
"__id__": 8 "__id__": 8
}, },
{ {
"__id__": 460 "__id__": 461
} }
], ],
"_active": true, "_active": true,
...@@ -453,6 +453,9 @@ ...@@ -453,6 +453,9 @@
}, },
{ {
"__id__": 459 "__id__": 459
},
{
"__id__": 460
} }
], ],
"_active": true, "_active": true,
...@@ -8371,7 +8374,7 @@ ...@@ -8371,7 +8374,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 180, "width": 180,
"height": 48.800000000000004 "height": 24.400000000000002
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -8534,7 +8537,7 @@ ...@@ -8534,7 +8537,7 @@
"_layoutSize": { "_layoutSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 180, "width": 180,
"height": 48.800000000000004 "height": 24.400000000000002
}, },
"_resize": 1, "_resize": 1,
"_N$layoutType": 3, "_N$layoutType": 3,
...@@ -8544,15 +8547,15 @@ ...@@ -8544,15 +8547,15 @@
"height": 40 "height": 40
}, },
"_N$startAxis": 0, "_N$startAxis": 0,
"_N$paddingLeft": 0, "_N$paddingLeft": 3,
"_N$paddingRight": 0, "_N$paddingRight": 0,
"_N$paddingTop": 0, "_N$paddingTop": 0,
"_N$paddingBottom": 0, "_N$paddingBottom": 0,
"_N$spacingX": 3, "_N$spacingX": 8,
"_N$spacingY": 0, "_N$spacingY": 0,
"_N$verticalDirection": 1, "_N$verticalDirection": 1,
"_N$horizontalDirection": 0, "_N$horizontalDirection": 0,
"_N$affectedByScale": true, "_N$affectedByScale": false,
"_id": "68lFomuRJB/q2GLPPOh+Ca" "_id": "68lFomuRJB/q2GLPPOh+Ca"
}, },
{ {
...@@ -9433,15 +9436,15 @@ ...@@ -9433,15 +9436,15 @@
"height": 40 "height": 40
}, },
"_N$startAxis": 0, "_N$startAxis": 0,
"_N$paddingLeft": 0, "_N$paddingLeft": 3,
"_N$paddingRight": 0, "_N$paddingRight": 0,
"_N$paddingTop": 0, "_N$paddingTop": 0,
"_N$paddingBottom": 0, "_N$paddingBottom": 0,
"_N$spacingX": 3, "_N$spacingX": 8,
"_N$spacingY": 0, "_N$spacingY": 0,
"_N$verticalDirection": 1, "_N$verticalDirection": 1,
"_N$horizontalDirection": 0, "_N$horizontalDirection": 0,
"_N$affectedByScale": true, "_N$affectedByScale": false,
"_id": "0bg3YmTudPp7FUCB7Yqw4S" "_id": "0bg3YmTudPp7FUCB7Yqw4S"
}, },
{ {
...@@ -10149,7 +10152,7 @@ ...@@ -10149,7 +10152,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 180, "width": 180,
"height": 48.800000000000004 "height": 60
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -10312,7 +10315,7 @@ ...@@ -10312,7 +10315,7 @@
"_layoutSize": { "_layoutSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 180, "width": 180,
"height": 48.800000000000004 "height": 60
}, },
"_resize": 1, "_resize": 1,
"_N$layoutType": 3, "_N$layoutType": 3,
...@@ -10322,15 +10325,15 @@ ...@@ -10322,15 +10325,15 @@
"height": 40 "height": 40
}, },
"_N$startAxis": 0, "_N$startAxis": 0,
"_N$paddingLeft": 0, "_N$paddingLeft": 3,
"_N$paddingRight": 0, "_N$paddingRight": 0,
"_N$paddingTop": 0, "_N$paddingTop": 0,
"_N$paddingBottom": 0, "_N$paddingBottom": 0,
"_N$spacingX": 3, "_N$spacingX": 8,
"_N$spacingY": 0, "_N$spacingY": 0,
"_N$verticalDirection": 1, "_N$verticalDirection": 1,
"_N$horizontalDirection": 0, "_N$horizontalDirection": 0,
"_N$affectedByScale": true, "_N$affectedByScale": false,
"_id": "6fTnUHRoFLSpSDUKSofhc2" "_id": "6fTnUHRoFLSpSDUKSofhc2"
}, },
{ {
...@@ -11038,7 +11041,7 @@ ...@@ -11038,7 +11041,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 180, "width": 180,
"height": 48.800000000000004 "height": 60
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -11201,7 +11204,7 @@ ...@@ -11201,7 +11204,7 @@
"_layoutSize": { "_layoutSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 180, "width": 180,
"height": 48.800000000000004 "height": 60
}, },
"_resize": 1, "_resize": 1,
"_N$layoutType": 3, "_N$layoutType": 3,
...@@ -11211,15 +11214,15 @@ ...@@ -11211,15 +11214,15 @@
"height": 40 "height": 40
}, },
"_N$startAxis": 0, "_N$startAxis": 0,
"_N$paddingLeft": 0, "_N$paddingLeft": 3,
"_N$paddingRight": 0, "_N$paddingRight": 0,
"_N$paddingTop": 0, "_N$paddingTop": 0,
"_N$paddingBottom": 0, "_N$paddingBottom": 0,
"_N$spacingX": 3, "_N$spacingX": 8,
"_N$spacingY": 0, "_N$spacingY": 0,
"_N$verticalDirection": 1, "_N$verticalDirection": 1,
"_N$horizontalDirection": 0, "_N$horizontalDirection": 0,
"_N$affectedByScale": true, "_N$affectedByScale": false,
"_id": "a56YJtVrxBRY63YG9FLOK9" "_id": "a56YJtVrxBRY63YG9FLOK9"
}, },
{ {
...@@ -12100,15 +12103,15 @@ ...@@ -12100,15 +12103,15 @@
"height": 40 "height": 40
}, },
"_N$startAxis": 0, "_N$startAxis": 0,
"_N$paddingLeft": 0, "_N$paddingLeft": 3,
"_N$paddingRight": 0, "_N$paddingRight": 0,
"_N$paddingTop": 0, "_N$paddingTop": 0,
"_N$paddingBottom": 0, "_N$paddingBottom": 0,
"_N$spacingX": 3, "_N$spacingX": 8,
"_N$spacingY": 0, "_N$spacingY": 0,
"_N$verticalDirection": 1, "_N$verticalDirection": 1,
"_N$horizontalDirection": 0, "_N$horizontalDirection": 0,
"_N$affectedByScale": true, "_N$affectedByScale": false,
"_id": "e5boprAeVL15vPycB/hmon" "_id": "e5boprAeVL15vPycB/hmon"
}, },
{ {
...@@ -12962,7 +12965,7 @@ ...@@ -12962,7 +12965,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 110, "width": 110,
"height": 61 "height": 48.800000000000004
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -13030,7 +13033,7 @@ ...@@ -13030,7 +13033,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 112, "width": 128,
"height": 321 "height": 321
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -13098,8 +13101,8 @@ ...@@ -13098,8 +13101,8 @@
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 45, "_alignFlags": 45,
"_left": 13, "_left": 5,
"_right": 13, "_right": 5,
"_top": 5, "_top": 5,
"_bottom": 8, "_bottom": 8,
"_verticalCenter": 0, "_verticalCenter": 0,
...@@ -13125,7 +13128,7 @@ ...@@ -13125,7 +13128,7 @@
"_layoutSize": { "_layoutSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 110, "width": 110,
"height": 61 "height": 48.800000000000004
}, },
"_resize": 1, "_resize": 1,
"_N$layoutType": 3, "_N$layoutType": 3,
...@@ -13977,7 +13980,7 @@ ...@@ -13977,7 +13980,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 112, "width": 128,
"height": 321 "height": 321
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -14045,8 +14048,8 @@ ...@@ -14045,8 +14048,8 @@
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 45, "_alignFlags": 45,
"_left": 13, "_left": 5,
"_right": 13, "_right": 5,
"_top": 5, "_top": 5,
"_bottom": 8, "_bottom": 8,
"_verticalCenter": 0, "_verticalCenter": 0,
...@@ -14866,7 +14869,7 @@ ...@@ -14866,7 +14869,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 112, "width": 128,
"height": 321 "height": 321
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -14934,8 +14937,8 @@ ...@@ -14934,8 +14937,8 @@
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 45, "_alignFlags": 45,
"_left": 13, "_left": 5,
"_right": 13, "_right": 5,
"_top": 5, "_top": 5,
"_bottom": 8, "_bottom": 8,
"_verticalCenter": 0, "_verticalCenter": 0,
...@@ -15755,7 +15758,7 @@ ...@@ -15755,7 +15758,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 112, "width": 128,
"height": 321 "height": 321
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -15823,8 +15826,8 @@ ...@@ -15823,8 +15826,8 @@
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 45, "_alignFlags": 45,
"_left": 13, "_left": 5,
"_right": 13, "_right": 5,
"_top": 5, "_top": 5,
"_bottom": 8, "_bottom": 8,
"_verticalCenter": 0, "_verticalCenter": 0,
...@@ -16644,7 +16647,7 @@ ...@@ -16644,7 +16647,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 112, "width": 128,
"height": 321 "height": 321
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -16712,8 +16715,8 @@ ...@@ -16712,8 +16715,8 @@
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 45, "_alignFlags": 45,
"_left": 13, "_left": 5,
"_right": 13, "_right": 5,
"_top": 5, "_top": 5,
"_bottom": 8, "_bottom": 8,
"_verticalCenter": 0, "_verticalCenter": 0,
...@@ -17533,7 +17536,7 @@ ...@@ -17533,7 +17536,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 112, "width": 128,
"height": 321 "height": 321
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -17601,8 +17604,8 @@ ...@@ -17601,8 +17604,8 @@
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 45, "_alignFlags": 45,
"_left": 13, "_left": 5,
"_right": 13, "_right": 5,
"_top": 5, "_top": 5,
"_bottom": 8, "_bottom": 8,
"_verticalCenter": 0, "_verticalCenter": 0,
...@@ -19889,6 +19892,64 @@ ...@@ -19889,6 +19892,64 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "94hVUpqTpDC5XJMsxrCvSP" "_id": "94hVUpqTpDC5XJMsxrCvSP"
}, },
{
"__type__": "cc.Node",
"_name": "itemFrame1",
"_objFlags": 0,
"_parent": {
"__id__": 8
},
"_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": 80,
"height": 45
},
"_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": "96nHVn2DRIqKcU3g7glNI/"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "mask", "_name": "mask",
...@@ -19900,10 +19961,10 @@ ...@@ -19900,10 +19961,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 461 "__id__": 462
}, },
{ {
"__id__": 462 "__id__": 463
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -19959,7 +20020,7 @@ ...@@ -19959,7 +20020,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 460 "__id__": 461
}, },
"_enabled": true, "_enabled": true,
"_id": "80PylZIy9EbJR4/AZl0xgK" "_id": "80PylZIy9EbJR4/AZl0xgK"
...@@ -19969,7 +20030,7 @@ ...@@ -19969,7 +20030,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 460 "__id__": 461
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -19978,7 +20039,7 @@ ...@@ -19978,7 +20039,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 463 "__id__": 464
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -20057,7 +20118,7 @@ ...@@ -20057,7 +20118,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 465 "__id__": 466
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -20113,7 +20174,7 @@ ...@@ -20113,7 +20174,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 464 "__id__": 465
}, },
"_enabled": true, "_enabled": true,
"eff_btn": { "eff_btn": {
...@@ -20203,6 +20264,9 @@ ...@@ -20203,6 +20264,9 @@
}, },
{ {
"__id__": 459 "__id__": 459
},
{
"__id__": 460
} }
], ],
"contentArr_2": [ "contentArr_2": [
...@@ -20259,7 +20323,7 @@ ...@@ -20259,7 +20323,7 @@
} }
], ],
"canvasView": { "canvasView": {
"__id__": 466 "__id__": 467
}, },
"isCanvas": true, "isCanvas": true,
"_id": "5eOVDDzARGnoMLcNXyk5ml" "_id": "5eOVDDzARGnoMLcNXyk5ml"
...@@ -20283,19 +20347,19 @@ ...@@ -20283,19 +20347,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 472 "__id__": 473
}, },
{ {
"__id__": 477 "__id__": 478
}, },
{ {
"__id__": 482 "__id__": 483
}, },
{ {
"__id__": 487 "__id__": 488
}, },
{ {
"__id__": 492 "__id__": 493
} }
], ],
"_active": true, "_active": true,
...@@ -20353,11 +20417,11 @@ ...@@ -20353,11 +20417,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 471 "__id__": 472
}, },
"_children": [ "_children": [
{ {
"__id__": 473 "__id__": 474
} }
], ],
"_active": true, "_active": true,
...@@ -20415,17 +20479,17 @@ ...@@ -20415,17 +20479,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 472 "__id__": 473
}, },
"_children": [ "_children": [
{ {
"__id__": 474 "__id__": 475
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 476 "__id__": 477
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -20481,13 +20545,13 @@ ...@@ -20481,13 +20545,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 473 "__id__": 474
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 475 "__id__": 476
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -20543,7 +20607,7 @@ ...@@ -20543,7 +20607,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 474 "__id__": 475
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -20575,7 +20639,7 @@ ...@@ -20575,7 +20639,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 473 "__id__": 474
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -20597,11 +20661,11 @@ ...@@ -20597,11 +20661,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 471 "__id__": 472
}, },
"_children": [ "_children": [
{ {
"__id__": 478 "__id__": 479
} }
], ],
"_active": true, "_active": true,
...@@ -20659,17 +20723,17 @@ ...@@ -20659,17 +20723,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 477 "__id__": 478
}, },
"_children": [ "_children": [
{ {
"__id__": 479 "__id__": 480
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 481 "__id__": 482
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -20725,13 +20789,13 @@ ...@@ -20725,13 +20789,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 478 "__id__": 479
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 480 "__id__": 481
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -20787,7 +20851,7 @@ ...@@ -20787,7 +20851,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 479 "__id__": 480
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -20819,7 +20883,7 @@ ...@@ -20819,7 +20883,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 478 "__id__": 479
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -20841,11 +20905,11 @@ ...@@ -20841,11 +20905,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 471 "__id__": 472
}, },
"_children": [ "_children": [
{ {
"__id__": 483 "__id__": 484
} }
], ],
"_active": true, "_active": true,
...@@ -20903,17 +20967,17 @@ ...@@ -20903,17 +20967,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 482 "__id__": 483
}, },
"_children": [ "_children": [
{ {
"__id__": 484 "__id__": 485
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 486 "__id__": 487
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -20969,13 +21033,13 @@ ...@@ -20969,13 +21033,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 483 "__id__": 484
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 485 "__id__": 486
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -21031,7 +21095,7 @@ ...@@ -21031,7 +21095,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 484 "__id__": 485
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -21063,7 +21127,7 @@ ...@@ -21063,7 +21127,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 483 "__id__": 484
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -21085,11 +21149,11 @@ ...@@ -21085,11 +21149,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 471 "__id__": 472
}, },
"_children": [ "_children": [
{ {
"__id__": 488 "__id__": 489
} }
], ],
"_active": true, "_active": true,
...@@ -21147,17 +21211,17 @@ ...@@ -21147,17 +21211,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 487 "__id__": 488
}, },
"_children": [ "_children": [
{ {
"__id__": 489 "__id__": 490
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 491 "__id__": 492
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -21213,13 +21277,13 @@ ...@@ -21213,13 +21277,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 488 "__id__": 489
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 490 "__id__": 491
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -21275,7 +21339,7 @@ ...@@ -21275,7 +21339,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 489 "__id__": 490
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -21307,7 +21371,7 @@ ...@@ -21307,7 +21371,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 488 "__id__": 489
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -21329,11 +21393,11 @@ ...@@ -21329,11 +21393,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 471 "__id__": 472
}, },
"_children": [ "_children": [
{ {
"__id__": 493 "__id__": 494
} }
], ],
"_active": true, "_active": true,
...@@ -21391,17 +21455,17 @@ ...@@ -21391,17 +21455,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 492 "__id__": 493
}, },
"_children": [ "_children": [
{ {
"__id__": 494 "__id__": 495
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 496 "__id__": 497
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -21457,13 +21521,13 @@ ...@@ -21457,13 +21521,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 493 "__id__": 494
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 495 "__id__": 496
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -21519,7 +21583,7 @@ ...@@ -21519,7 +21583,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 494 "__id__": 495
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -21551,7 +21615,7 @@ ...@@ -21551,7 +21615,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 493 "__id__": 494
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -21577,19 +21641,19 @@ ...@@ -21577,19 +21641,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 498 "__id__": 499
}, },
{ {
"__id__": 500 "__id__": 501
}, },
{ {
"__id__": 502 "__id__": 503
}, },
{ {
"__id__": 504 "__id__": 505
}, },
{ {
"__id__": 506 "__id__": 507
} }
], ],
"_active": true, "_active": true,
...@@ -21647,13 +21711,13 @@ ...@@ -21647,13 +21711,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 497 "__id__": 498
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 499 "__id__": 500
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -21709,7 +21773,7 @@ ...@@ -21709,7 +21773,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 498 "__id__": 499
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -21741,13 +21805,13 @@ ...@@ -21741,13 +21805,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 497 "__id__": 498
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 501 "__id__": 502
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -21803,7 +21867,7 @@ ...@@ -21803,7 +21867,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 500 "__id__": 501
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -21835,13 +21899,13 @@ ...@@ -21835,13 +21899,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 497 "__id__": 498
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 503 "__id__": 504
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -21897,7 +21961,7 @@ ...@@ -21897,7 +21961,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 502 "__id__": 503
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -21929,13 +21993,13 @@ ...@@ -21929,13 +21993,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 497 "__id__": 498
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 505 "__id__": 506
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -21991,7 +22055,7 @@ ...@@ -21991,7 +22055,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 504 "__id__": 505
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -22023,13 +22087,13 @@ ...@@ -22023,13 +22087,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 497 "__id__": 498
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 507 "__id__": 508
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -22085,7 +22149,7 @@ ...@@ -22085,7 +22149,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 506 "__id__": 507
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
......
...@@ -155,6 +155,10 @@ var game = cc.Class({ ...@@ -155,6 +155,10 @@ var game = cc.Class({
this.OptionType = g.data_mgr.getSheepfoldArr().length - 3; this.OptionType = g.data_mgr.getSheepfoldArr().length - 3;
}, },
getOptionType: function () {
return this.OptionType;
},
//更新界面信息 //更新界面信息
UpdataUi: function () { UpdataUi: function () {
//设置目标节点类型 //设置目标节点类型
......
...@@ -96,17 +96,35 @@ cc.Class({ ...@@ -96,17 +96,35 @@ cc.Class({
} }
g.speaker.inst.play_good(); g.speaker.inst.play_good();
if (g.game.inst.getOptionType() == 2) {
// newItem_temp.scale = 0.8;
// this.node.scale = this.node.scale * 0.8;
var newItem_temp = cc.instantiate(g.game.inst.Item_0[3]);
} else {
var newItem_temp = cc.instantiate(g.game.inst.Item_0[2]); var newItem_temp = cc.instantiate(g.game.inst.Item_0[2]);
}
// var newItem_temp = cc.instantiate(g.game.inst.Item_0[2]);
content.getChildByName("db").active = true; content.getChildByName("db").active = true;
content.getChildByName("db").getComponent(dragonBones.ArmatureDisplay).playAnimation("newAnimation", 1); content.getChildByName("db").getComponent(dragonBones.ArmatureDisplay).playAnimation("newAnimation", 1);
if (this.node.width >= 150) { if (this.node.width >= 150) {
if (g.game.inst.getOptionType() == 2) {
this.node.scale = 0.45;
this.node.x = 0;
} else {
this.node.scale = 0.6; this.node.scale = 0.6;
this.node.x = 0; this.node.x = 0;
} }
if (g.game.inst.OptionType == 2) { } else {
this.node.scale = this.node.scale * 0.8; if (g.game.inst.getOptionType() == 2) {
this.node.scale = 0.7;
this.node.x = 0;
} else {
this.node.scale = 0.9;
this.node.x = 0;
}
} }
this.node.parent = newItem_temp; this.node.parent = newItem_temp;
newItem_temp.parent = content.getChildByName("scrollView").getChildByName("view").getChildByName("content"); newItem_temp.parent = content.getChildByName("scrollView").getChildByName("view").getChildByName("content");
......
...@@ -14,7 +14,7 @@ g.data_mgr = { ...@@ -14,7 +14,7 @@ g.data_mgr = {
{ "id": "1623738000162o9u566", "word": "标题2" }, { "id": "1623738000162o9u566", "word": "标题2" },
{ "id": "3", "word": "标题3" }, { "id": "3", "word": "标题3" },
{ "id": "4", "word": "标题4" }, { "id": "4", "word": "标题4" },
// { "id": "4", "word": "标题4" }, { "id": "4", "word": "标题4" },
// { "id": "4", "word": "标题4" } // { "id": "4", "word": "标题4" }
], ],
"sheepArr": [ "sheepArr": [
...@@ -26,29 +26,27 @@ g.data_mgr = { ...@@ -26,29 +26,27 @@ g.data_mgr = {
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "4", "sheepfoldId": "4", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "4", "sheepfoldId": "4", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "4", "sheepfoldId": "4", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "4", "sheepfoldId": "4", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "4", "sheepfoldId": "4", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "sheepfoldId": "1623738000162o9u566", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png", "word": "fgsdfg" }, { "sheepfoldId": "1623738000162o9u566", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png", "word": "fgsdfg" },
{ "sheepfoldId": "162373800016117r8ti", "picUrl": "http://staging-teach.cdn.ireadabc.com/77d34b5a7f2895e9319d4485a84a1b2b.png", "word": "gdfa" }], { "sheepfoldId": "162373800016117r8ti", "picUrl": "http://staging-teach.cdn.ireadabc.com/77d34b5a7f2895e9319d4485a84a1b2b.png", "word": "gdfa" }],
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": true, "premultiplyAlpha": true,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 154, "width": 120,
"height": 86, "height": 63,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"item_bg2": { "item_bg2": {
......
{ {
"last-module-event-record-time": 1623132204392, "last-module-event-record-time": 1635251397112,
"migrate-history": [ "migrate-history": [
"cloud-function" "cloud-function"
], ],
......
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