Commit 9c1d6f64 authored by 陈子煜's avatar 陈子煜

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	assets/Bundles/HomeScene/HomeScene.scene
#	assets/Scripts/Scenes/HomeScene.ts
parents dafcf9d1 6871096d
...@@ -42,14 +42,14 @@ ...@@ -42,14 +42,14 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": -8, "offsetX": 0,
"offsetY": -4, "offsetY": 0,
"trimX": 27, "trimX": 0,
"trimY": 40, "trimY": 0,
"width": 1224, "width": 1224,
"height": 595, "height": 595,
"rawWidth": 1294, "rawWidth": 1224,
"rawHeight": 667, "rawHeight": 595,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
...@@ -83,24 +83,24 @@ ...@@ -83,24 +83,24 @@
3 3
], ],
"uv": [ "uv": [
27, 0,
627, 595,
1251, 1224,
627, 595,
27, 0,
32, 0,
1251, 1224,
32 0
], ],
"nuv": [ "nuv": [
0.020865533230293665, 0,
0.047976011994003, 0,
0.9667697063369397, 1,
0.047976011994003, 0,
0.020865533230293665, 0,
0.9400299850074962, 1,
0.9667697063369397, 1,
0.9400299850074962 1
], ],
"minPos": [ "minPos": [
-612, -612,
......
...@@ -22,22 +22,22 @@ ...@@ -22,22 +22,22 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 8 "__id__": 10
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 16 "__id__": 18
} }
], ],
"_prefab": { "_prefab": {
"__id__": 18 "__id__": 20
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 50, "x": 0,
"y": -50, "y": 0,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
...@@ -79,15 +79,18 @@ ...@@ -79,15 +79,18 @@
}, },
{ {
"__id__": 5 "__id__": 5
},
{
"__id__": 7
} }
], ],
"_prefab": { "_prefab": {
"__id__": 7 "__id__": 9
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 25,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
...@@ -186,6 +189,42 @@ ...@@ -186,6 +189,42 @@
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "c28bWe7x9K7LYG81m3c0je" "fileId": "c28bWe7x9K7LYG81m3c0je"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 8
},
"_alignFlags": 17,
"_target": null,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_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": "8fC9QrTS5HFr5rtMwYqycV"
},
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
...@@ -210,23 +249,23 @@ ...@@ -210,23 +249,23 @@
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 9
},
{ {
"__id__": 11 "__id__": 11
}, },
{ {
"__id__": 13 "__id__": 13
},
{
"__id__": 15
} }
], ],
"_prefab": { "_prefab": {
"__id__": 15 "__id__": 17
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": -79.09699999999998, "y": -50.120000000000005,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
...@@ -258,11 +297,11 @@ ...@@ -258,11 +297,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 8 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 10 "__id__": 12
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -286,11 +325,11 @@ ...@@ -286,11 +325,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 8 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 12 "__id__": 14
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
...@@ -357,17 +396,17 @@ ...@@ -357,17 +396,17 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 8 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 14 "__id__": 16
}, },
"_alignFlags": 1, "_alignFlags": 1,
"_target": null, "_target": null,
"_left": 0, "_left": 0,
"_right": 0, "_right": 0,
"_top": 113.97699999999998, "_top": 110,
"_bottom": 0, "_bottom": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
...@@ -410,12 +449,12 @@ ...@@ -410,12 +449,12 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 17 "__id__": 19
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 100, "width": 100,
"height": 100 "height": 150
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -437,6 +476,7 @@ ...@@ -437,6 +476,7 @@
"__id__": 0 "__id__": 0
}, },
"fileId": "37Q9JdyMlO7qcpn+8hIDo0", "fileId": "37Q9JdyMlO7qcpn+8hIDo0",
"instance": null,
"targetOverrides": null "targetOverrides": null
} }
] ]
\ No newline at end of file
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
], ],
"subMetas": {}, "subMetas": {},
"userData": { "userData": {
"maxWidth": 2048, "maxWidth": 1024,
"maxHeight": 2048, "maxHeight": 1024,
"padding": 2, "padding": 2,
"allowRotation": true, "allowRotation": true,
"forceSquared": false, "forceSquared": false,
......
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "ad1cf62b-2b06-4a86-a4f8-681c8494cb62",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "ad1cf62b-2b06-4a86-a4f8-681c8494cb62@6c48a",
"displayName": "标签",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "ad1cf62b-2b06-4a86-a4f8-681c8494cb62",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "ad1cf62b-2b06-4a86-a4f8-681c8494cb62@f9941",
"displayName": "标签",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 100,
"height": 44,
"rawWidth": 100,
"rawHeight": 44,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-50,
-22,
0,
50,
-22,
0,
-50,
22,
0,
50,
22,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
44,
100,
44,
0,
0,
100,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-50,
-22,
0
],
"maxPos": [
50,
22,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "ad1cf62b-2b06-4a86-a4f8-681c8494cb62@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "ad1cf62b-2b06-4a86-a4f8-681c8494cb62@6c48a"
}
}
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
"_priority": 1073741824, "_priority": 1073741824,
"_fov": 45, "_fov": 45,
"_fovAxis": 0, "_fovAxis": 0,
"_orthoHeight": 1077.0170777988615, "_orthoHeight": 897.0108303249098,
"_near": 1, "_near": 1,
"_far": 2000, "_far": 2000,
"_color": { "_color": {
...@@ -478,7 +478,7 @@ ...@@ -478,7 +478,7 @@
"y": -180, "y": -180,
"z": -12.000012657215834 "z": -12.000012657215834
}, },
"_id": "98rxkyhApNhqn3+LbxX5VH" "_id": "e5yCjA/fBHQqB0Ynz3XmQ/"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
...@@ -500,7 +500,7 @@ ...@@ -500,7 +500,7 @@
"x": 0, "x": 0,
"y": 1 "y": 1
}, },
"_id": "3a0W1D9BBAv5Ni8BWWzzB6" "_id": "aep5EZeoFDNKlALem7PtqZ"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -536,7 +536,7 @@ ...@@ -536,7 +536,7 @@
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_useGrayscale": false, "_useGrayscale": false,
"_atlas": null, "_atlas": null,
"_id": "8flbNv1XJFcZL0Cc4AOC5g" "_id": "56XdQn5DNLpru3gZCxTHuC"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -584,7 +584,7 @@ ...@@ -584,7 +584,7 @@
"y": -180, "y": -180,
"z": -11.00000220913452 "z": -11.00000220913452
}, },
"_id": "60YBGTwTVP45ta/1edo20Q" "_id": "95Epc+aRNJtbk++8rW293G"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
...@@ -606,7 +606,7 @@ ...@@ -606,7 +606,7 @@
"x": 0, "x": 0,
"y": 1 "y": 1
}, },
"_id": "e4lM77rNVHcLpotdm+SWUr" "_id": "f3nohNwk9CYrezNbl/59VD"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -642,7 +642,7 @@ ...@@ -642,7 +642,7 @@
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_useGrayscale": false, "_useGrayscale": false,
"_atlas": null, "_atlas": null,
"_id": "a5yoqfeAFA2L4yyFAzdSTd" "_id": "90lPl+nVdDSabEAZTXBAFV"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -690,7 +690,7 @@ ...@@ -690,7 +690,7 @@
"y": -180, "y": -180,
"z": -64.00000614258742 "z": -64.00000614258742
}, },
"_id": "77R0QzzEhNUJ7rC+0VCAMq" "_id": "fciGIB1udHUJxd72cAVPWE"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
...@@ -712,7 +712,7 @@ ...@@ -712,7 +712,7 @@
"x": 0, "x": 0,
"y": 1 "y": 1
}, },
"_id": "63K0aRok9LW6tsw56bFxYv" "_id": "eehDHpEM5G5agLMWMA5Sre"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -748,7 +748,7 @@ ...@@ -748,7 +748,7 @@
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_useGrayscale": false, "_useGrayscale": false,
"_atlas": null, "_atlas": null,
"_id": "6bSsZFzRJHBbSregdk0Maf" "_id": "b0qGl0MRpIG5c302aFTvyK"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -796,7 +796,7 @@ ...@@ -796,7 +796,7 @@
"y": 180, "y": 180,
"z": 25.99999385741257 "z": 25.99999385741257
}, },
"_id": "47ztUoTQpHsZecNOtKq660" "_id": "feimniHO9HoYMwQId7pwTr"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
...@@ -818,7 +818,7 @@ ...@@ -818,7 +818,7 @@
"x": 0, "x": 0,
"y": 1 "y": 1
}, },
"_id": "5dXdoCdsRNybjhPXbM8IVM" "_id": "760O/SJ79HwreRPPbJXhlu"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -854,7 +854,7 @@ ...@@ -854,7 +854,7 @@
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_useGrayscale": false, "_useGrayscale": false,
"_atlas": null, "_atlas": null,
"_id": "74Nn+sAgFJEacadLXVwMcd" "_id": "daRP4utA1MzaBacM0BhGFz"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
...@@ -5253,12 +5253,6 @@ ...@@ -5253,12 +5253,6 @@
"rankBtn": { "rankBtn": {
"__id__": 25 "__id__": 25
}, },
"blessBagBtn": {
"__id__": 123
},
"PropBtn": {
"__id__": 108
},
"userName": { "userName": {
"__id__": 70 "__id__": 70
}, },
......
This diff is collapsed.
...@@ -25,14 +25,14 @@ ...@@ -25,14 +25,14 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 28 "__id__": 36
}, },
{ {
"__id__": 30 "__id__": 38
} }
], ],
"_prefab": { "_prefab": {
"__id__": 32 "__id__": 40
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -77,25 +77,28 @@ ...@@ -77,25 +77,28 @@
}, },
{ {
"__id__": 11 "__id__": 11
},
{
"__id__": 19
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 19 "__id__": 27
}, },
{ {
"__id__": 21 "__id__": 29
}, },
{ {
"__id__": 23 "__id__": 31
}, },
{ {
"__id__": 25 "__id__": 33
} }
], ],
"_prefab": { "_prefab": {
"__id__": 27 "__id__": 35
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -254,7 +257,7 @@ ...@@ -254,7 +257,7 @@
"__id__": 9 "__id__": 9
}, },
"tag": 0, "tag": 0,
"_group": 2, "_group": 8,
"_density": 1, "_density": 1,
"_sensor": true, "_sensor": true,
"_friction": 0.2, "_friction": 0.2,
...@@ -380,7 +383,7 @@ ...@@ -380,7 +383,7 @@
"enabledContactListener": true, "enabledContactListener": true,
"bullet": false, "bullet": false,
"awakeOnLoad": true, "awakeOnLoad": true,
"_group": 2, "_group": 8,
"_type": 1, "_type": 1,
"_allowSleep": true, "_allowSleep": true,
"_gravityScale": 1, "_gravityScale": 1,
...@@ -412,7 +415,7 @@ ...@@ -412,7 +415,7 @@
"__id__": 17 "__id__": 17
}, },
"tag": 0, "tag": 0,
"_group": 2, "_group": 8,
"_density": 1, "_density": 1,
"_sensor": true, "_sensor": true,
"_friction": 0.2, "_friction": 0.2,
...@@ -442,6 +445,164 @@ ...@@ -442,6 +445,164 @@
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
}, },
{
"__type__": "cc.Node",
"_name": "吃道具范围",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 2
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 20
},
{
"__id__": 22
},
{
"__id__": 24
}
],
"_prefab": {
"__id__": 26
},
"_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": 1,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 19
},
"_enabled": true,
"__prefab": {
"__id__": 21
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "07vCx7z2RHNpPOyXbNfe5e"
},
{
"__type__": "cc.RigidBody2D",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 19
},
"_enabled": true,
"__prefab": {
"__id__": 23
},
"enabledContactListener": true,
"bullet": false,
"awakeOnLoad": true,
"_group": 8,
"_type": 1,
"_allowSleep": true,
"_gravityScale": 1,
"_linearDamping": 0,
"_angularDamping": 0,
"_linearVelocity": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_angularVelocity": 0,
"_fixedRotation": false,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "52DT6mYTRPqrIzAWE8fNCi"
},
{
"__type__": "cc.CircleCollider2D",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 19
},
"_enabled": true,
"__prefab": {
"__id__": 25
},
"tag": 0,
"_group": 8,
"_density": 1,
"_sensor": true,
"_friction": 0.2,
"_restitution": 0,
"_offset": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_radius": 65,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "81GxMtI51HtY6lVTNIhomV"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "5dmSIF9GZBfYbWRTDXiyYx",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
"_name": "", "_name": "",
...@@ -452,7 +613,7 @@ ...@@ -452,7 +613,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 20 "__id__": 28
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -480,7 +641,7 @@ ...@@ -480,7 +641,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 22 "__id__": 30
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
...@@ -522,12 +683,12 @@ ...@@ -522,12 +683,12 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 24 "__id__": 32
}, },
"enabledContactListener": true, "enabledContactListener": true,
"bullet": false, "bullet": false,
"awakeOnLoad": true, "awakeOnLoad": true,
"_group": 2, "_group": 8,
"_type": 1, "_type": 1,
"_allowSleep": true, "_allowSleep": true,
"_gravityScale": 1, "_gravityScale": 1,
...@@ -556,10 +717,10 @@ ...@@ -556,10 +717,10 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 26 "__id__": 34
}, },
"tag": 0, "tag": 0,
"_group": 2, "_group": 8,
"_density": 1, "_density": 1,
"_sensor": true, "_sensor": true,
"_friction": 0.2, "_friction": 0.2,
...@@ -599,7 +760,7 @@ ...@@ -599,7 +760,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 29 "__id__": 37
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -627,7 +788,7 @@ ...@@ -627,7 +788,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 31 "__id__": 39
}, },
"head": { "head": {
"__id__": 2 "__id__": 2
......
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"ver": "1.0.27", "ver": "1.0.27",
"importer": "image", "importer": "image",
"imported": true, "imported": true,
"uuid": "ce259195-d60f-4500-af25-cf991cc1799e", "uuid": "91db920b-9a31-4d63-a1ba-7e08c6d2c492",
"files": [ "files": [
".json", ".json",
".png" ".png"
...@@ -10,14 +10,14 @@ ...@@ -10,14 +10,14 @@
"subMetas": { "subMetas": {
"6c48a": { "6c48a": {
"importer": "texture", "importer": "texture",
"uuid": "ce259195-d60f-4500-af25-cf991cc1799e@6c48a", "uuid": "91db920b-9a31-4d63-a1ba-7e08c6d2c492@6c48a",
"displayName": "奖励品1", "displayName": "奖励品",
"id": "6c48a", "id": "6c48a",
"name": "texture", "name": "texture",
"userData": { "userData": {
"wrapModeS": "clamp-to-edge", "wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge", "wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "ce259195-d60f-4500-af25-cf991cc1799e", "imageUuidOrDatabaseUri": "91db920b-9a31-4d63-a1ba-7e08c6d2c492",
"isUuid": true, "isUuid": true,
"visible": false, "visible": false,
"minfilter": "linear", "minfilter": "linear",
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
}, },
"f9941": { "f9941": {
"importer": "sprite-frame", "importer": "sprite-frame",
"uuid": "ce259195-d60f-4500-af25-cf991cc1799e@f9941", "uuid": "91db920b-9a31-4d63-a1ba-7e08c6d2c492@f9941",
"displayName": "奖励品1", "displayName": "奖励品",
"id": "f9941", "id": "f9941",
"name": "spriteFrame", "name": "spriteFrame",
"userData": { "userData": {
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
] ]
}, },
"isUuid": true, "isUuid": true,
"imageUuidOrDatabaseUri": "ce259195-d60f-4500-af25-cf991cc1799e@6c48a", "imageUuidOrDatabaseUri": "91db920b-9a31-4d63-a1ba-7e08c6d2c492@6c48a",
"atlasUuid": "" "atlasUuid": ""
}, },
"ver": "1.0.12", "ver": "1.0.12",
...@@ -129,6 +129,6 @@ ...@@ -129,6 +129,6 @@
"type": "sprite-frame", "type": "sprite-frame",
"hasAlpha": true, "hasAlpha": true,
"fixAlphaTransparencyArtifacts": false, "fixAlphaTransparencyArtifacts": false,
"redirect": "ce259195-d60f-4500-af25-cf991cc1799e@6c48a" "redirect": "91db920b-9a31-4d63-a1ba-7e08c6d2c492@6c48a"
} }
} }
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "length", "_name": "rank",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
...@@ -92,8 +92,8 @@ ...@@ -92,8 +92,8 @@
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 206.97799999999995, "x": -311.627,
"y": 1.1368683772161603e-13, "y": -0.1999999999999318,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 270, "width": 16.6845703125,
"height": 50.4 "height": 50.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "9ecsZFTlVLYodszU2jCcwg" "fileId": "6avPcoO59FS5LSYlL93oGO"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
"b": 0, "b": 0,
"a": 255 "a": 255
}, },
"_string": "超过xx长度的玩家数", "_string": "1",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 30, "_actualFontSize": 30,
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "688U9sYXJI85JrKZ68pxlH" "fileId": "abdqjtGXtJnYl0DKkEhSUD"
}, },
{ {
"__type__": "cc.Widget", "__type__": "cc.Widget",
...@@ -227,11 +227,11 @@ ...@@ -227,11 +227,11 @@
"__prefab": { "__prefab": {
"__id__": 8 "__id__": 8
}, },
"_alignFlags": 8, "_alignFlags": 9,
"_target": null, "_target": null,
"_left": 471.97799999999995, "_left": 80.03071484374999,
"_right": 0, "_right": 0,
"_top": 0, "_top": -6.750155989720952e-14,
"_bottom": 0, "_bottom": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "f48ev5ZiZKio+z89L+JPnO" "fileId": "c8TCeIRD5BP4M130pL/3YZ"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "da0euZuE1HaYwFfn35L7eZ", "fileId": "19UcNA0AZLQogeRF6vASaC",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
...@@ -290,7 +290,7 @@ ...@@ -290,7 +290,7 @@
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -140, "x": -80,
"y": 1.1368683772161603e-13, "y": 1.1368683772161603e-13,
"z": 0 "z": 0
}, },
...@@ -343,7 +343,7 @@ ...@@ -343,7 +343,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "0aDCBp/nBH5avdETc722TH" "fileId": "bdtUCfF4FNEJe0bl9+j+Te"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -411,7 +411,7 @@ ...@@ -411,7 +411,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "16n1hv1yxIsIWt/pc48t8G" "fileId": "1dcfSMEgdA+oYvQyD9v2IN"
}, },
{ {
"__type__": "cc.Widget", "__type__": "cc.Widget",
...@@ -427,7 +427,7 @@ ...@@ -427,7 +427,7 @@
}, },
"_alignFlags": 8, "_alignFlags": 8,
"_target": null, "_target": null,
"_left": 230, "_left": 290,
"_right": 0, "_right": 0,
"_top": 0, "_top": 0,
"_bottom": 0, "_bottom": 0,
...@@ -447,7 +447,7 @@ ...@@ -447,7 +447,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "d6PKYyfX9BAZme/edu97eo" "fileId": "f0dKHTzl9GD7P7ElKIHK75"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -457,14 +457,14 @@ ...@@ -457,14 +457,14 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "60Ma3Z8CBDZ4ltTvumb0ql", "fileId": "97U6ox/IBNaq4gCOkWrtCc",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "rank", "_name": "length",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
...@@ -488,8 +488,8 @@ ...@@ -488,8 +488,8 @@
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -340, "x": 206.97799999999995,
"y": -0.1999999999999993, "y": 1.1368683772161603e-13,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
...@@ -529,7 +529,7 @@ ...@@ -529,7 +529,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 60, "width": 270,
"height": 50.4 "height": 50.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -541,7 +541,7 @@ ...@@ -541,7 +541,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "99UkYPjyBPo6BMY+EZrvT8" "fileId": "5erpOthtNJjrstPS7ppmvp"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -565,7 +565,7 @@ ...@@ -565,7 +565,7 @@
"b": 0, "b": 0,
"a": 255 "a": 255
}, },
"_string": "排行", "_string": "超过xx长度的玩家数",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 30, "_actualFontSize": 30,
...@@ -609,7 +609,7 @@ ...@@ -609,7 +609,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "9cyjxJ+FlPMawHb9j5ctTe" "fileId": "62TdxJRTpHaIUhEjq0HWtl"
}, },
{ {
"__type__": "cc.Widget", "__type__": "cc.Widget",
...@@ -623,9 +623,9 @@ ...@@ -623,9 +623,9 @@
"__prefab": { "__prefab": {
"__id__": 24 "__id__": 24
}, },
"_alignFlags": 9, "_alignFlags": 8,
"_target": null, "_target": null,
"_left": 30, "_left": 471.97799999999995,
"_right": 0, "_right": 0,
"_top": 0, "_top": 0,
"_bottom": 0, "_bottom": 0,
...@@ -645,7 +645,7 @@ ...@@ -645,7 +645,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "d6RucsS9BFda2VSLyU7wME" "fileId": "45mZhbgmBGZp5atNM0YhlU"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -655,7 +655,7 @@ ...@@ -655,7 +655,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "42UxMRUB1KpY2W70MmutuD", "fileId": "a5kFYO5f9HzYhjzOjvm2Xn",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
......
...@@ -92,8 +92,8 @@ ...@@ -92,8 +92,8 @@
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -212.127, "x": -235.5,
"y": -1.6999999999999318, "y": 0,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 16.6845703125, "width": 63.3837890625,
"height": 50.4 "height": 50.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -145,10 +145,10 @@ ...@@ -145,10 +145,10 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "b4ugP7eY1LS4fQ0SuQ2YHk" "fileId": "e4JFNhYSlBibE/E7Ru5unj"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Widget",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
...@@ -159,6 +159,42 @@ ...@@ -159,6 +159,42 @@
"__prefab": { "__prefab": {
"__id__": 6 "__id__": 6
}, },
"_alignFlags": 10,
"_target": null,
"_left": 33.30810546875,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_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": "92ANvFidhCvKtxMh+7zEv7"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 8
},
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
"_dstBlendFactor": 4, "_dstBlendFactor": 4,
...@@ -169,7 +205,7 @@ ...@@ -169,7 +205,7 @@
"b": 0, "b": 0,
"a": 255 "a": 255
}, },
"_string": "1", "_string": "label",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 30, "_actualFontSize": 30,
...@@ -213,43 +249,7 @@ ...@@ -213,43 +249,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "46Ju95znxMWKUtvIHqevZZ" "fileId": "64cCQe+WdAkbI5Qbz9MvXn"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 8
},
"_alignFlags": 9,
"_target": null,
"_left": 80.03071484374999,
"_right": 0,
"_top": -6.750155989720952e-14,
"_bottom": 0,
"_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": "50XE2kSHtPoqHVAl3nBP53"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "78kE6VX99I54juzgggDrSw", "fileId": "aeGurxoslOjZTn0PsVo8vD",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
...@@ -290,8 +290,8 @@ ...@@ -290,8 +290,8 @@
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 19.5, "x": -134.94499999999994,
"y": 1.1368683772161603e-13, "y": 0,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
...@@ -331,22 +331,22 @@ ...@@ -331,22 +331,22 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 60, "width": 63.3837890625,
"height": 50.4 "height": 50.4
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
"x": 0.5, "x": 0,
"y": 0.5 "y": 0.5
}, },
"_id": "" "_id": ""
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "182kTjp35Bg6r683Z1rtGK" "fileId": "4cLneOSadMlKWfUwa9Dlni"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Widget",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
...@@ -357,6 +357,42 @@ ...@@ -357,6 +357,42 @@
"__prefab": { "__prefab": {
"__id__": 14 "__id__": 14
}, },
"_alignFlags": 9,
"_target": null,
"_left": 165.55500000000006,
"_right": 0,
"_top": -1.6999999999999993,
"_bottom": 0,
"_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": "a7b55bUqxED60p/a/INwY/"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
},
"_enabled": true,
"__prefab": {
"__id__": 16
},
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
"_dstBlendFactor": 4, "_dstBlendFactor": 4,
...@@ -367,7 +403,7 @@ ...@@ -367,7 +403,7 @@
"b": 0, "b": 0,
"a": 255 "a": 255
}, },
"_string": "省份", "_string": "label",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 30, "_actualFontSize": 30,
...@@ -411,43 +447,7 @@ ...@@ -411,43 +447,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "adLN57OfxBwbMVCA3FdOpa" "fileId": "63mfnWMBJOdocwUnvORvv1"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
},
"_enabled": true,
"__prefab": {
"__id__": 16
},
"_alignFlags": 8,
"_target": null,
"_left": 290,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_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": "5bLK9akQVK+ZPui6b9LgzT"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -457,7 +457,7 @@ ...@@ -457,7 +457,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "871pE7dPBJaa7XidfwnOsp", "fileId": "d71zOgndtM6a6MoD+t+Pue",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
...@@ -488,8 +488,8 @@ ...@@ -488,8 +488,8 @@
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 306.47799999999995, "x": 190.20885937499997,
"y": 1.1368683772161603e-13, "y": 0,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
...@@ -529,7 +529,7 @@ ...@@ -529,7 +529,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 270, "width": 63.3837890625,
"height": 50.4 "height": 50.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -541,10 +541,10 @@ ...@@ -541,10 +541,10 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "35DjRK3LZPtYbwqB2KlEtw" "fileId": "50JknmajhAJbgqmir58/Ec"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Widget",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
...@@ -555,6 +555,42 @@ ...@@ -555,6 +555,42 @@
"__prefab": { "__prefab": {
"__id__": 22 "__id__": 22
}, },
"_alignFlags": 8,
"_target": null,
"_left": 459.01696484375,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_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": "499Wuy86NJ8I1xdrfTphVm"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 18
},
"_enabled": true,
"__prefab": {
"__id__": 24
},
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
"_dstBlendFactor": 4, "_dstBlendFactor": 4,
...@@ -565,7 +601,7 @@ ...@@ -565,7 +601,7 @@
"b": 0, "b": 0,
"a": 255 "a": 255
}, },
"_string": "超过xx长度的玩家数", "_string": "label",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 30, "_actualFontSize": 30,
...@@ -609,43 +645,7 @@ ...@@ -609,43 +645,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "6dk85x6ulPtbcUkK97It3K" "fileId": "76egWYpxVHmrC1qPoI2xs5"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 18
},
"_enabled": true,
"__prefab": {
"__id__": 24
},
"_alignFlags": 8,
"_target": null,
"_left": 471.97799999999995,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_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": "f1ambxKf1KPbWt6VLgCXFm"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -655,7 +655,7 @@ ...@@ -655,7 +655,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "caIrtNL+pJfq253sm009/6", "fileId": "7bUkqgPWNHwLXEfr3mYE8/",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
......
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "90ddf9b0-b0fc-4f3a-85b8-e7c91a8ad2dd",
"files": [],
"subMetas": {},
"userData": {
"isBundle": true
}
}
{ {
"ver": "4.0.24", "ver": "1.2.0",
"importer": "typescript", "importer": "directory",
"imported": true, "imported": true,
"uuid": "fdc2e6d8-9a05-4472-8389-06b3a181ffa5", "uuid": "eb63cd04-3d3e-4c2f-a3ad-c570925dbea5",
"files": [], "files": [],
"subMetas": {}, "subMetas": {},
"userData": {} "userData": {}
......
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "ffe9e8fa-9ab3-4eb2-9f8d-c5558b9303ea",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "ffe9e8fa-9ab3-4eb2-9f8d-c5558b9303ea@6c48a",
"displayName": "close_btn",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "ffe9e8fa-9ab3-4eb2-9f8d-c5558b9303ea",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "ffe9e8fa-9ab3-4eb2-9f8d-c5558b9303ea@f9941",
"displayName": "close_btn",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 58,
"height": 58,
"rawWidth": 58,
"rawHeight": 58,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-29,
-29,
0,
29,
-29,
0,
-29,
29,
0,
29,
29,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
58,
58,
58,
0,
0,
58,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-29,
-29,
0
],
"maxPos": [
29,
29,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "ffe9e8fa-9ab3-4eb2-9f8d-c5558b9303ea@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "ffe9e8fa-9ab3-4eb2-9f8d-c5558b9303ea@6c48a"
}
}
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "9222001a-8b8e-4ac4-9f85-92ddf1bba7d8",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "9222001a-8b8e-4ac4-9f85-92ddf1bba7d8@6c48a",
"displayName": "day1_bg",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "9222001a-8b8e-4ac4-9f85-92ddf1bba7d8",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "9222001a-8b8e-4ac4-9f85-92ddf1bba7d8@f9941",
"displayName": "day1_bg",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 180,
"height": 216,
"rawWidth": 180,
"rawHeight": 216,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-90,
-108,
0,
90,
-108,
0,
-90,
108,
0,
90,
108,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
216,
180,
216,
0,
0,
180,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-90,
-108,
0
],
"maxPos": [
90,
108,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "9222001a-8b8e-4ac4-9f85-92ddf1bba7d8@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "9222001a-8b8e-4ac4-9f85-92ddf1bba7d8@6c48a"
}
}
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"ver": "1.0.27", "ver": "1.0.27",
"importer": "image", "importer": "image",
"imported": true, "imported": true,
"uuid": "31aefadb-7170-4150-bcf0-df0851c8e734", "uuid": "0d7901c5-302b-43fd-a668-2f25c2197b80",
"files": [ "files": [
".json", ".json",
".png" ".png"
...@@ -10,14 +10,14 @@ ...@@ -10,14 +10,14 @@
"subMetas": { "subMetas": {
"6c48a": { "6c48a": {
"importer": "texture", "importer": "texture",
"uuid": "31aefadb-7170-4150-bcf0-df0851c8e734@6c48a", "uuid": "0d7901c5-302b-43fd-a668-2f25c2197b80@6c48a",
"displayName": "奖励品2-10", "displayName": "sign_btn",
"id": "6c48a", "id": "6c48a",
"name": "texture", "name": "texture",
"userData": { "userData": {
"wrapModeS": "clamp-to-edge", "wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge", "wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "31aefadb-7170-4150-bcf0-df0851c8e734", "imageUuidOrDatabaseUri": "0d7901c5-302b-43fd-a668-2f25c2197b80",
"isUuid": true, "isUuid": true,
"visible": false, "visible": false,
"minfilter": "linear", "minfilter": "linear",
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
}, },
"f9941": { "f9941": {
"importer": "sprite-frame", "importer": "sprite-frame",
"uuid": "31aefadb-7170-4150-bcf0-df0851c8e734@f9941", "uuid": "0d7901c5-302b-43fd-a668-2f25c2197b80@f9941",
"displayName": "奖励品2-10", "displayName": "sign_btn",
"id": "f9941", "id": "f9941",
"name": "spriteFrame", "name": "spriteFrame",
"userData": { "userData": {
...@@ -47,9 +47,9 @@ ...@@ -47,9 +47,9 @@
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 200, "width": 200,
"height": 300, "height": 88,
"rawWidth": 200, "rawWidth": 200,
"rawHeight": 300, "rawHeight": 88,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
...@@ -62,16 +62,16 @@ ...@@ -62,16 +62,16 @@
"vertices": { "vertices": {
"rawPosition": [ "rawPosition": [
-100, -100,
-150, -44,
0, 0,
100, 100,
-150, -44,
0, 0,
-100, -100,
150, 44,
0, 0,
100, 100,
150, 44,
0 0
], ],
"indexes": [ "indexes": [
...@@ -84,9 +84,9 @@ ...@@ -84,9 +84,9 @@
], ],
"uv": [ "uv": [
0, 0,
300, 88,
200, 200,
300, 88,
0, 0,
0, 0,
200, 200,
...@@ -104,17 +104,17 @@ ...@@ -104,17 +104,17 @@
], ],
"minPos": [ "minPos": [
-100, -100,
-150, -44,
0 0
], ],
"maxPos": [ "maxPos": [
100, 100,
150, 44,
0 0
] ]
}, },
"isUuid": true, "isUuid": true,
"imageUuidOrDatabaseUri": "31aefadb-7170-4150-bcf0-df0851c8e734@6c48a", "imageUuidOrDatabaseUri": "0d7901c5-302b-43fd-a668-2f25c2197b80@6c48a",
"atlasUuid": "" "atlasUuid": ""
}, },
"ver": "1.0.12", "ver": "1.0.12",
...@@ -129,6 +129,6 @@ ...@@ -129,6 +129,6 @@
"type": "sprite-frame", "type": "sprite-frame",
"hasAlpha": true, "hasAlpha": true,
"fixAlphaTransparencyArtifacts": false, "fixAlphaTransparencyArtifacts": false,
"redirect": "31aefadb-7170-4150-bcf0-df0851c8e734@6c48a" "redirect": "0d7901c5-302b-43fd-a668-2f25c2197b80@6c48a"
} }
} }
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -14,6 +14,7 @@ import ExchangeSuccess from "db://assets/Scripts/Panels/ExchangeSuccess"; ...@@ -14,6 +14,7 @@ import ExchangeSuccess from "db://assets/Scripts/Panels/ExchangeSuccess";
import { RankScence } from "./RankScene"; import { RankScence } from "./RankScene";
import {BlessingBagPage} from "db://assets/Scripts/Scenes/BlessingBagPage"; import {BlessingBagPage} from "db://assets/Scripts/Scenes/BlessingBagPage";
import {PropPage} from "db://assets/Scripts/Scenes/PropPage"; import {PropPage} from "db://assets/Scripts/Scenes/PropPage";
import { AudioMgr } from "../../core_tgx/base/AudioMgr";
const { ccclass, property } = _decorator; const { ccclass, property } = _decorator;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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