Commit aebd3ff3 authored by haiyoucuv's avatar haiyoucuv

背包奖品高亮

parent 1add4ae7
...@@ -25,35 +25,38 @@ ...@@ -25,35 +25,38 @@
"__id__": 8 "__id__": 8
}, },
{ {
"__id__": 16 "__id__": 14
}, },
{ {
"__id__": 24 "__id__": 22
}, },
{ {
"__id__": 32 "__id__": 30
}, },
{ {
"__id__": 42 "__id__": 38
}, },
{ {
"__id__": 54 "__id__": 48
}, },
{ {
"__id__": 64 "__id__": 60
},
{
"__id__": 70
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 74 "__id__": 80
}, },
{ {
"__id__": 76 "__id__": 82
} }
], ],
"_prefab": { "_prefab": {
"__id__": 81 "__id__": 88
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -86,7 +89,7 @@ ...@@ -86,7 +89,7 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg", "_name": "light",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
...@@ -146,6 +149,142 @@ ...@@ -146,6 +149,142 @@
"__prefab": { "__prefab": {
"__id__": 4 "__id__": 4
}, },
"_contentSize": {
"__type__": "cc.Size",
"width": 880,
"height": 200
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "7dg97c3XBGLJKLYTj0tCvH"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 6
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_spriteFrame": {
"__uuid__": "39eb0232-e57f-419f-acf1-e3976324e104@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": "f7WtDlVE5KY5Y+jeJ6BTGo"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "ed++qdGmtHCY0fv05lOxrs",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
"_name": "bg",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 1
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 9
},
{
"__id__": 11
}
],
"_prefab": {
"__id__": 13
},
"_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.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 8
},
"_enabled": true,
"__prefab": {
"__id__": 10
},
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 820, "width": 820,
...@@ -168,11 +307,11 @@ ...@@ -168,11 +307,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 8
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 6 "__id__": 12
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
...@@ -232,17 +371,17 @@ ...@@ -232,17 +371,17 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 9 "__id__": 15
}, },
{ {
"__id__": 11 "__id__": 17
}, },
{ {
"__id__": 13 "__id__": 19
} }
], ],
"_prefab": { "_prefab": {
"__id__": 15 "__id__": 21
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -279,11 +418,11 @@ ...@@ -279,11 +418,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 8 "__id__": 14
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 10 "__id__": 16
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -307,11 +446,11 @@ ...@@ -307,11 +446,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 8 "__id__": 14
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 12 "__id__": 18
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
...@@ -352,13 +491,13 @@ ...@@ -352,13 +491,13 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 8 "__id__": 14
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 14 "__id__": 20
}, },
"_alignFlags": 10, "_alignFlags": 2,
"_target": null, "_target": null,
"_left": 20, "_left": 20,
"_right": 0, "_right": 0,
...@@ -407,17 +546,17 @@ ...@@ -407,17 +546,17 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 17 "__id__": 23
}, },
{ {
"__id__": 19 "__id__": 25
}, },
{ {
"__id__": 21 "__id__": 27
} }
], ],
"_prefab": { "_prefab": {
"__id__": 23 "__id__": 29
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -454,11 +593,11 @@ ...@@ -454,11 +593,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 16 "__id__": 22
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 18 "__id__": 24
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -482,11 +621,11 @@ ...@@ -482,11 +621,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 16 "__id__": 22
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 20 "__id__": 26
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
...@@ -550,13 +689,13 @@ ...@@ -550,13 +689,13 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 16 "__id__": 22
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 22 "__id__": 28
}, },
"_alignFlags": 9, "_alignFlags": 8,
"_target": null, "_target": null,
"_left": 150, "_left": 150,
"_right": 0, "_right": 0,
...@@ -605,17 +744,17 @@ ...@@ -605,17 +744,17 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 25 "__id__": 31
}, },
{ {
"__id__": 27 "__id__": 33
}, },
{ {
"__id__": 29 "__id__": 35
} }
], ],
"_prefab": { "_prefab": {
"__id__": 31 "__id__": 37
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -652,11 +791,11 @@ ...@@ -652,11 +791,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 24 "__id__": 30
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 26 "__id__": 32
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -680,11 +819,11 @@ ...@@ -680,11 +819,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 24 "__id__": 30
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 28 "__id__": 34
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
...@@ -748,13 +887,13 @@ ...@@ -748,13 +887,13 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 24 "__id__": 30
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 30 "__id__": 36
}, },
"_alignFlags": 9, "_alignFlags": 8,
"_target": null, "_target": null,
"_left": 150, "_left": 150,
"_right": 0, "_right": 0,
...@@ -803,20 +942,20 @@ ...@@ -803,20 +942,20 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 33 "__id__": 39
}, },
{ {
"__id__": 35 "__id__": 41
}, },
{ {
"__id__": 37 "__id__": 43
}, },
{ {
"__id__": 39 "__id__": 45
} }
], ],
"_prefab": { "_prefab": {
"__id__": 41 "__id__": 47
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -853,11 +992,11 @@ ...@@ -853,11 +992,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 32 "__id__": 38
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 34 "__id__": 40
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -881,11 +1020,11 @@ ...@@ -881,11 +1020,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 32 "__id__": 38
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 36 "__id__": 42
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
...@@ -926,13 +1065,13 @@ ...@@ -926,13 +1065,13 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 32 "__id__": 38
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 38 "__id__": 44
}, },
"_alignFlags": 34, "_alignFlags": 2,
"_target": null, "_target": null,
"_left": 606.626, "_left": 606.626,
"_right": 60, "_right": 60,
...@@ -962,11 +1101,11 @@ ...@@ -962,11 +1101,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 32 "__id__": 38
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 40 "__id__": 46
}, },
"clickEvents": [], "clickEvents": [],
"_interactable": true, "_interactable": true,
...@@ -1037,23 +1176,23 @@ ...@@ -1037,23 +1176,23 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 43 "__id__": 49
}, },
{ {
"__id__": 45 "__id__": 51
}, },
{ {
"__id__": 47 "__id__": 53
}, },
{ {
"__id__": 49 "__id__": 55
}, },
{ {
"__id__": 51 "__id__": 57
} }
], ],
"_prefab": { "_prefab": {
"__id__": 53 "__id__": 59
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -1090,11 +1229,11 @@ ...@@ -1090,11 +1229,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 42 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 44 "__id__": 50
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -1118,11 +1257,11 @@ ...@@ -1118,11 +1257,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 42 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 46 "__id__": 52
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
...@@ -1163,13 +1302,13 @@ ...@@ -1163,13 +1302,13 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 42 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 48 "__id__": 54
}, },
"_alignFlags": 34, "_alignFlags": 2,
"_target": null, "_target": null,
"_left": 606.626, "_left": 606.626,
"_right": 60, "_right": 60,
...@@ -1199,11 +1338,11 @@ ...@@ -1199,11 +1338,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 42 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 50 "__id__": 56
}, },
"_alignFlags": 0, "_alignFlags": 0,
"_target": null, "_target": null,
...@@ -1235,11 +1374,11 @@ ...@@ -1235,11 +1374,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 42 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 52 "__id__": 58
}, },
"clickEvents": [], "clickEvents": [],
"_interactable": true, "_interactable": true,
...@@ -1310,20 +1449,20 @@ ...@@ -1310,20 +1449,20 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 55 "__id__": 61
}, },
{ {
"__id__": 57 "__id__": 63
}, },
{ {
"__id__": 59 "__id__": 65
}, },
{ {
"__id__": 61 "__id__": 67
} }
], ],
"_prefab": { "_prefab": {
"__id__": 63 "__id__": 69
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -1360,11 +1499,11 @@ ...@@ -1360,11 +1499,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 54 "__id__": 60
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 56 "__id__": 62
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -1388,11 +1527,11 @@ ...@@ -1388,11 +1527,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 54 "__id__": 60
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 58 "__id__": 64
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
...@@ -1433,13 +1572,13 @@ ...@@ -1433,13 +1572,13 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 54 "__id__": 60
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 60 "__id__": 66
}, },
"_alignFlags": 34, "_alignFlags": 2,
"_target": null, "_target": null,
"_left": 606.626, "_left": 606.626,
"_right": 60, "_right": 60,
...@@ -1469,11 +1608,11 @@ ...@@ -1469,11 +1608,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 54 "__id__": 60
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 62 "__id__": 68
}, },
"clickEvents": [], "clickEvents": [],
"_interactable": true, "_interactable": true,
...@@ -1544,20 +1683,20 @@ ...@@ -1544,20 +1683,20 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 65 "__id__": 71
}, },
{ {
"__id__": 67 "__id__": 73
}, },
{ {
"__id__": 69 "__id__": 75
}, },
{ {
"__id__": 71 "__id__": 77
} }
], ],
"_prefab": { "_prefab": {
"__id__": 73 "__id__": 79
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -1594,11 +1733,11 @@ ...@@ -1594,11 +1733,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 64 "__id__": 70
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 66 "__id__": 72
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -1622,11 +1761,11 @@ ...@@ -1622,11 +1761,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 64 "__id__": 70
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 68 "__id__": 74
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
...@@ -1667,13 +1806,13 @@ ...@@ -1667,13 +1806,13 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 64 "__id__": 70
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 70 "__id__": 76
}, },
"_alignFlags": 34, "_alignFlags": 2,
"_target": null, "_target": null,
"_left": 606.626, "_left": 606.626,
"_right": 60, "_right": 60,
...@@ -1703,11 +1842,11 @@ ...@@ -1703,11 +1842,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 64 "__id__": 70
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 72 "__id__": 78
}, },
"clickEvents": [], "clickEvents": [],
"_interactable": true, "_interactable": true,
...@@ -1776,12 +1915,12 @@ ...@@ -1776,12 +1915,12 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 75 "__id__": 81
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 820, "width": 820,
"height": 160 "height": 140
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1804,17 +1943,20 @@ ...@@ -1804,17 +1943,20 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 77 "__id__": 83
}, },
"skinNodeArr": [ "skinNodeArr": [
{ {
"__id__": 78 "__id__": 84
}, },
{ {
"__id__": 79 "__id__": 85
}, },
{ {
"__id__": 80 "__id__": 86
},
{
"__id__": 87
} }
], ],
"_genSkinNode": true, "_genSkinNode": true,
...@@ -1827,7 +1969,7 @@ ...@@ -1827,7 +1969,7 @@
{ {
"__type__": "SkinNode", "__type__": "SkinNode",
"node": { "node": {
"__id__": 32 "__id__": 38
}, },
"type": 0, "type": 0,
"color1": { "color1": {
...@@ -1858,7 +2000,7 @@ ...@@ -1858,7 +2000,7 @@
{ {
"__type__": "SkinNode", "__type__": "SkinNode",
"node": { "node": {
"__id__": 64 "__id__": 70
}, },
"type": 0, "type": 0,
"color1": { "color1": {
...@@ -1889,7 +2031,7 @@ ...@@ -1889,7 +2031,7 @@
{ {
"__type__": "SkinNode", "__type__": "SkinNode",
"node": { "node": {
"__id__": 42 "__id__": 48
}, },
"type": 0, "type": 0,
"color1": { "color1": {
...@@ -1917,6 +2059,37 @@ ...@@ -1917,6 +2059,37 @@
"node1": null, "node1": null,
"node2": null "node2": null
}, },
{
"__type__": "SkinNode",
"node": {
"__id__": 2
},
"type": 0,
"color1": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"color2": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"skin1": {
"__uuid__": "39eb0232-e57f-419f-acf1-e3976324e104@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"skin2": {
"__uuid__": "2da3f366-9972-4d8d-911d-cf5a4a60af8e@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"node1": null,
"node2": null
},
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
......
...@@ -25,20 +25,20 @@ ...@@ -25,20 +25,20 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 108 "__id__": 112
}, },
{ {
"__id__": 110 "__id__": 114
}, },
{ {
"__id__": 112 "__id__": 116
}, },
{ {
"__id__": 114 "__id__": 118
} }
], ],
"_prefab": { "_prefab": {
"__id__": 119 "__id__": 123
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -97,14 +97,14 @@ ...@@ -97,14 +97,14 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 103 "__id__": 107
}, },
{ {
"__id__": 105 "__id__": 109
} }
], ],
"_prefab": { "_prefab": {
"__id__": 107 "__id__": 111
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -1714,7 +1714,7 @@ ...@@ -1714,7 +1714,7 @@
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 12.5, "y": 0,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
...@@ -1754,8 +1754,8 @@ ...@@ -1754,8 +1754,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 820, "width": 880,
"height": 425 "height": 400
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1780,11 +1780,11 @@ ...@@ -1780,11 +1780,11 @@
"__prefab": { "__prefab": {
"__id__": 70 "__id__": 70
}, },
"_alignFlags": 20, "_alignFlags": 45,
"_target": null, "_target": null,
"_left": 0, "_left": 0,
"_right": 0, "_right": 0,
"_top": 84, "_top": 0,
"_bottom": 0, "_bottom": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
...@@ -1794,8 +1794,8 @@ ...@@ -1794,8 +1794,8 @@
"_isAbsBottom": true, "_isAbsBottom": true,
"_isAbsHorizontalCenter": true, "_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 0, "_originalWidth": 820,
"_originalHeight": 0, "_originalHeight": 425,
"_alignMode": 2, "_alignMode": 2,
"_lockFlags": 0, "_lockFlags": 0,
"_id": "" "_id": ""
...@@ -2068,7 +2068,7 @@ ...@@ -2068,7 +2068,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 820, "width": 880,
"height": 400 "height": 400
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -2094,11 +2094,11 @@ ...@@ -2094,11 +2094,11 @@
"__prefab": { "__prefab": {
"__id__": 86 "__id__": 86
}, },
"_alignFlags": 20, "_alignFlags": 21,
"_target": null, "_target": null,
"_left": 0, "_left": 0,
"_right": 0, "_right": 0,
"_top": 0, "_top": 180,
"_bottom": 20, "_bottom": 20,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
...@@ -2109,7 +2109,7 @@ ...@@ -2109,7 +2109,7 @@
"_isAbsHorizontalCenter": true, "_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 0, "_originalWidth": 0,
"_originalHeight": 0, "_originalHeight": 400,
"_alignMode": 2, "_alignMode": 2,
"_lockFlags": 0, "_lockFlags": 0,
"_id": "" "_id": ""
...@@ -2151,15 +2151,21 @@ ...@@ -2151,15 +2151,21 @@
}, },
{ {
"__id__": 100 "__id__": 100
},
{
"__id__": 102
},
{
"__id__": 104
} }
], ],
"_prefab": { "_prefab": {
"__id__": 102 "__id__": 106
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": -77.5, "y": -87.5,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
...@@ -2252,8 +2258,8 @@ ...@@ -2252,8 +2258,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 820, "width": 846,
"height": 425 "height": 424
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2278,11 +2284,11 @@ ...@@ -2278,11 +2284,11 @@
"__prefab": { "__prefab": {
"__id__": 93 "__id__": 93
}, },
"_alignFlags": 20, "_alignFlags": 45,
"_target": null, "_target": null,
"_left": 0, "_left": 27,
"_right": 0, "_right": 27,
"_top": 84, "_top": 0,
"_bottom": 0, "_bottom": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
...@@ -2292,8 +2298,8 @@ ...@@ -2292,8 +2298,8 @@
"_isAbsBottom": true, "_isAbsBottom": true,
"_isAbsHorizontalCenter": true, "_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 0, "_originalWidth": 820,
"_originalHeight": 0, "_originalHeight": 425,
"_alignMode": 2, "_alignMode": 2,
"_lockFlags": 0, "_lockFlags": 0,
"_id": "" "_id": ""
...@@ -2314,7 +2320,7 @@ ...@@ -2314,7 +2320,7 @@
"__prefab": { "__prefab": {
"__id__": 95 "__id__": 95
}, },
"mask": true, "mask": false,
"scrollEnabled": true, "scrollEnabled": true,
"scrollDirection": 1, "scrollDirection": 1,
"mode": 0, "mode": 0,
...@@ -2335,7 +2341,7 @@ ...@@ -2335,7 +2341,7 @@
{ {
"__type__": "_yx_editor_register_cell_info", "__type__": "_yx_editor_register_cell_info",
"prefab": { "prefab": {
"__uuid__": "8fb09e0b-1eb3-4b77-99fd-784445492b24", "__uuid__": "5420d619-9574-4e5e-806a-f2c54d4c1af7",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"identifier": "cell", "identifier": "cell",
...@@ -2368,8 +2374,8 @@ ...@@ -2368,8 +2374,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 820, "width": 900,
"height": 425 "height": 424
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2394,12 +2400,12 @@ ...@@ -2394,12 +2400,12 @@
"__prefab": { "__prefab": {
"__id__": 101 "__id__": 101
}, },
"_alignFlags": 20, "_alignFlags": 44,
"_target": null, "_target": null,
"_left": 0, "_left": 0,
"_right": 0, "_right": 0,
"_top": 0, "_top": 0,
"_bottom": 10, "_bottom": 0.5,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
...@@ -2408,7 +2414,7 @@ ...@@ -2408,7 +2414,7 @@
"_isAbsBottom": true, "_isAbsBottom": true,
"_isAbsHorizontalCenter": true, "_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 0, "_originalWidth": 850,
"_originalHeight": 0, "_originalHeight": 0,
"_alignMode": 2, "_alignMode": 2,
"_lockFlags": 0, "_lockFlags": 0,
...@@ -2418,6 +2424,74 @@ ...@@ -2418,6 +2424,74 @@
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "08cNJIoHRGT5pDcV12mg1Y" "fileId": "08cNJIoHRGT5pDcV12mg1Y"
}, },
{
"__type__": "cc.Mask",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 88
},
"_enabled": true,
"__prefab": {
"__id__": 103
},
"_type": 0,
"_inverted": false,
"_segments": 64,
"_alphaThreshold": 0.1,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "d6wtnJVHxDZqpE4Zq2fO5D"
},
{
"__type__": "cc.Graphics",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 88
},
"_enabled": true,
"__prefab": {
"__id__": 105
},
"_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
},
"_lineJoin": 2,
"_lineCap": 0,
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 0
},
"_miterLimit": 10,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "63GDoWejtED6vZ972naZRo"
},
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
...@@ -2441,7 +2515,7 @@ ...@@ -2441,7 +2515,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 104 "__id__": 108
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -2469,7 +2543,7 @@ ...@@ -2469,7 +2543,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 106 "__id__": 110
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
...@@ -2527,7 +2601,7 @@ ...@@ -2527,7 +2601,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 109 "__id__": 113
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -2555,7 +2629,7 @@ ...@@ -2555,7 +2629,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 111 "__id__": 115
}, },
"_alignFlags": 18, "_alignFlags": 18,
"_target": null, "_target": null,
...@@ -2591,7 +2665,7 @@ ...@@ -2591,7 +2665,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 113 "__id__": 117
}, },
"closeBtn": { "closeBtn": {
"__id__": 3 "__id__": 3
...@@ -2615,13 +2689,13 @@ ...@@ -2615,13 +2689,13 @@
"__id__": 32 "__id__": 32
}, },
"Prize_List": { "Prize_List": {
"__id__": 94 "__id__": 71
}, },
"None_list": { "None_list": {
"__id__": 75 "__id__": 75
}, },
"Tool_List": { "Tool_List": {
"__id__": 71 "__id__": 94
}, },
"_id": "" "_id": ""
}, },
...@@ -2639,17 +2713,17 @@ ...@@ -2639,17 +2713,17 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 115 "__id__": 119
}, },
"skinNodeArr": [ "skinNodeArr": [
{ {
"__id__": 116 "__id__": 120
}, },
{ {
"__id__": 117 "__id__": 121
}, },
{ {
"__id__": 118 "__id__": 122
} }
], ],
"_genSkinNode": true, "_genSkinNode": true,
......
...@@ -61,8 +61,8 @@ export class MyBagPanel extends Panel { ...@@ -61,8 +61,8 @@ export class MyBagPanel extends Panel {
this.tab = TAB.PRIZE; this.tab = TAB.PRIZE;
this.closeBtn.on(Button.EventType.CLICK, this.clickClose, this); this.closeBtn.on(Button.EventType.CLICK, this.clickClose, this);
this.prize_btn.on(Button.EventType.CLICK, this.clickSheng, this); this.prize_btn.on(Button.EventType.CLICK, this.clickPrize, this);
this.tool_btn.on(Button.EventType.CLICK, this.clickSingle, this); this.tool_btn.on(Button.EventType.CLICK, this.clickTool, this);
} }
...@@ -73,46 +73,46 @@ export class MyBagPanel extends Panel { ...@@ -73,46 +73,46 @@ export class MyBagPanel extends Panel {
} }
this.Prize_List.numberOfItems = () => this.prizeDate.length; this.Prize_List.numberOfItems = () => this.prizeDate.length;
this.Prize_List.onCellDisplay = this.onShengCellDisplay; this.Prize_List.onCellDisplay = this.onPrizeCellDisplay;
const shengLayout = new YXFlowLayout(); const prizeLayout = new YXFlowLayout();
shengLayout.itemSize = new Size(820, 160); prizeLayout.itemSize = new Size(880, 200);
this.Prize_List.layout = shengLayout; prizeLayout.verticalSpacing = -30;
this.Prize_List.layout = prizeLayout;
this.Prize_List.reloadData(); this.Prize_List.reloadData();
this.Tool_List.numberOfItems = () => this.toolDate.length; this.Tool_List.numberOfItems = () => this.toolDate.length;
this.Tool_List.onCellDisplay = this.onSingleCellDisplay; this.Tool_List.onCellDisplay = this.onToolCellDisplay;
const singleLayout = new YXFlowLayout(); const toolLayout = new YXFlowLayout();
singleLayout.itemSize = new Size(820, 160); toolLayout.itemSize = new Size(280, 368);
this.Tool_List.layout = singleLayout; toolLayout.priority = YXFlowLayout.Priority.LEFT;
toolLayout.verticalSpacing = -20;
this.Tool_List.layout = toolLayout;
this.Tool_List.reloadData(); this.Tool_List.reloadData();
showWaiting(true); showWaiting(true);
await Promise.all([ await Promise.all([
this.updateSheng(), this.updateTool(),
this.updateSingle(), this.updatePrize(),
]); ]);
hideWaiting(); hideWaiting();
} }
update(deltaTime: number) {
}
clickClose = () => { clickClose = () => {
this.hidePanel(); this.hidePanel();
}; };
// 点击奖品 // 点击奖品
clickSheng() { clickPrize() {
this.tab = TAB.PRIZE; this.tab = TAB.PRIZE;
// this.Prize.getChildByName(`goCheck`).active = true; // this.Prize.getChildByName(`goCheck`).active = true;
} }
// 道具 // 道具
clickSingle() { clickTool() {
if (!store.checkActTime()) return; if (!store.checkActTime()) return;
this.tab = TAB.TOOL; this.tab = TAB.TOOL;
...@@ -120,20 +120,20 @@ export class MyBagPanel extends Panel { ...@@ -120,20 +120,20 @@ export class MyBagPanel extends Panel {
/****** 数据 ******/ /****** 数据 ******/
// 刷新道具 // 刷新道具
async updateSheng() { async updateTool() {
const { success, data } = await sendWebNet(WebNetName.queryGameItem); const { success, data } = await sendWebNet(WebNetName.queryGameItem);
if (!success) return; if (!success) return;
this.prizeDate = data.spInfo; this.toolDate = data.spInfo;
this.Prize_List.reloadData(); this.Tool_List.reloadData();
this.Prize_List.node.active = this.prizeDate.length > 0; this.Tool_List.node.active = this.toolDate.length > 0;
} }
prizeIdType = {}; prizeIdType = {};
// 刷新奖品 // 刷新奖品
async updateSingle() { async updatePrize() {
const { success, data = [] } = await sendWebNet(WebNetName.prizeDetail); const { success, data = [] } = await sendWebNet(WebNetName.prizeDetail);
const { success: suc, data: d } = await sendWebNet(WebNetName.prizeType); const { success: suc, data: d } = await sendWebNet(WebNetName.prizeType);
...@@ -172,19 +172,19 @@ export class MyBagPanel extends Panel { ...@@ -172,19 +172,19 @@ export class MyBagPanel extends Panel {
this.None_list.active = true; this.None_list.active = true;
} }
this.toolDate = records; this.prizeDate = records;
this.Tool_List.reloadData(); this.Prize_List.reloadData();
this.Tool_List.node.active = this.toolDate.length > 0; this.Prize_List.node.active = this.prizeDate.length > 0;
} }
// 给每个cell设置数据 // 给每个cell设置数据
onShengCellDisplay = (cell: Node, indexPath: YXIndexPath, collectionView: YXCollectionView) => { onToolCellDisplay = (cell: Node, indexPath: YXIndexPath, collectionView: YXCollectionView) => {
const data = this.prizeDate[indexPath.item]; const data = this.toolDate[indexPath.item];
this.onCellDisplay(cell, data, TAB.TOOL); this.onCellDisplay(cell, data, TAB.TOOL);
}; };
onSingleCellDisplay = (cell: Node, indexPath: YXIndexPath, collectionView: YXCollectionView) => { onPrizeCellDisplay = (cell: Node, indexPath: YXIndexPath, collectionView: YXCollectionView) => {
const data = this.toolDate[indexPath.item]; const data = this.prizeDate[indexPath.item];
this.onCellDisplay(cell, data, TAB.PRIZE); this.onCellDisplay(cell, data, TAB.PRIZE);
}; };
...@@ -200,7 +200,8 @@ export class MyBagPanel extends Panel { ...@@ -200,7 +200,8 @@ export class MyBagPanel extends Panel {
prizeId = "", prizeId = "",
spNum = 0, spNum = 0,
spImg = "", spImg = "",
dressingStatus = 0 dressingStatus = 0,
lightFlag = false,
} = data; } = data;
const isPrize = type == TAB.PRIZE; const isPrize = type == TAB.PRIZE;
...@@ -224,6 +225,9 @@ export class MyBagPanel extends Panel { ...@@ -224,6 +225,9 @@ export class MyBagPanel extends Panel {
cell.getChildByName(`name`).getComponent(Label).string = strFormat(name || spName, 32); cell.getChildByName(`name`).getComponent(Label).string = strFormat(name || spName, 32);
cell.getChildByName(`time`).getComponent(Label).string = gmtCreate ? dateFormatter(gmtCreate, "yyyy.MM.dd hh:mm") : "剩余数量:" + spNum; cell.getChildByName(`time`).getComponent(Label).string = gmtCreate ? dateFormatter(gmtCreate, "yyyy.MM.dd hh:mm") : "剩余数量:" + spNum;
cell.getChildByName("img").getComponent(Sprite).spriteFrame = icon || spImg; cell.getChildByName("img").getComponent(Sprite).spriteFrame = icon || spImg;
cell.getChildByName("light").active = !!lightFlag;
}; };
clickToCheck = (url, id, prizeId) => { clickToCheck = (url, id, prizeId) => {
......
...@@ -138,7 +138,7 @@ class GameStore { ...@@ -138,7 +138,7 @@ class GameStore {
} }
if (score >= this.startInfo.slideScore) { if (score >= this.startInfo.slideScore) {
param.slideValue = await startNecCaptcha("1ee4615751874cbeaea4dd4681930f61", 3).catch(() => { param.slideValue = await startNecCaptcha("1ee4615751874cbeaea4dd4681930f61", 10).catch(() => {
showToast("校验失败"); showToast("校验失败");
changeScene(HomeScene); changeScene(HomeScene);
return false; return 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