feat: 还原一部分挑战 数据页面 UI
@@ -1816,7 +1816,7 @@
|
||||
"a": 255
|
||||
},
|
||||
"_spriteFrame": {
|
||||
"__uuid__": "7ad02ee4-4166-4c57-8985-760cca1a41f8@f9941",
|
||||
"__uuid__": "5b988a03-f6a3-498f-b68d-d3b5786b1879@f9941",
|
||||
"__expectedType__": "cc.SpriteFrame"
|
||||
},
|
||||
"_type": 1,
|
||||
@@ -1883,6 +1883,8 @@
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "52Z4d22QhI1rhPunFg8yFm",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
},
|
||||
{
|
||||
|
||||
BIN
assets/resources/images/ButtonBlue.png
Normal file
|
After Width: | Height: | Size: 96 KiB |
134
assets/resources/images/ButtonBlue.png.meta
Normal file
@@ -0,0 +1,134 @@
|
||||
{
|
||||
"ver": "1.0.27",
|
||||
"importer": "image",
|
||||
"imported": true,
|
||||
"uuid": "efde35b8-ef68-4da1-b169-0177f2133092",
|
||||
"files": [
|
||||
".json",
|
||||
".png"
|
||||
],
|
||||
"subMetas": {
|
||||
"6c48a": {
|
||||
"importer": "texture",
|
||||
"uuid": "efde35b8-ef68-4da1-b169-0177f2133092@6c48a",
|
||||
"displayName": "ButtonBlue",
|
||||
"id": "6c48a",
|
||||
"name": "texture",
|
||||
"userData": {
|
||||
"wrapModeS": "clamp-to-edge",
|
||||
"wrapModeT": "clamp-to-edge",
|
||||
"imageUuidOrDatabaseUri": "efde35b8-ef68-4da1-b169-0177f2133092",
|
||||
"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": "efde35b8-ef68-4da1-b169-0177f2133092@f9941",
|
||||
"displayName": "ButtonBlue",
|
||||
"id": "f9941",
|
||||
"name": "spriteFrame",
|
||||
"userData": {
|
||||
"trimThreshold": 1,
|
||||
"rotated": false,
|
||||
"offsetX": 0,
|
||||
"offsetY": 0,
|
||||
"trimX": 0,
|
||||
"trimY": 0,
|
||||
"width": 666,
|
||||
"height": 235,
|
||||
"rawWidth": 666,
|
||||
"rawHeight": 235,
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 120,
|
||||
"borderRight": 120,
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
"pivotY": 0.5,
|
||||
"meshType": 0,
|
||||
"vertices": {
|
||||
"rawPosition": [
|
||||
-333,
|
||||
-117.5,
|
||||
0,
|
||||
333,
|
||||
-117.5,
|
||||
0,
|
||||
-333,
|
||||
117.5,
|
||||
0,
|
||||
333,
|
||||
117.5,
|
||||
0
|
||||
],
|
||||
"indexes": [
|
||||
0,
|
||||
1,
|
||||
2,
|
||||
2,
|
||||
1,
|
||||
3
|
||||
],
|
||||
"uv": [
|
||||
0,
|
||||
235,
|
||||
666,
|
||||
235,
|
||||
0,
|
||||
0,
|
||||
666,
|
||||
0
|
||||
],
|
||||
"nuv": [
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
1,
|
||||
1
|
||||
],
|
||||
"minPos": [
|
||||
-333,
|
||||
-117.5,
|
||||
0
|
||||
],
|
||||
"maxPos": [
|
||||
333,
|
||||
117.5,
|
||||
0
|
||||
]
|
||||
},
|
||||
"isUuid": true,
|
||||
"imageUuidOrDatabaseUri": "efde35b8-ef68-4da1-b169-0177f2133092@6c48a",
|
||||
"atlasUuid": "",
|
||||
"trimType": "auto"
|
||||
},
|
||||
"ver": "1.0.12",
|
||||
"imported": true,
|
||||
"files": [
|
||||
".json"
|
||||
],
|
||||
"subMetas": {}
|
||||
}
|
||||
},
|
||||
"userData": {
|
||||
"type": "sprite-frame",
|
||||
"hasAlpha": true,
|
||||
"fixAlphaTransparencyArtifacts": false,
|
||||
"redirect": "efde35b8-ef68-4da1-b169-0177f2133092@6c48a"
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 53 KiB After Width: | Height: | Size: 53 KiB |
|
Before Width: | Height: | Size: 116 KiB After Width: | Height: | Size: 116 KiB |
|
Before Width: | Height: | Size: 112 KiB After Width: | Height: | Size: 112 KiB |
BIN
assets/resources/images/FlatIcon/flatIconPeople.png
Normal file
|
After Width: | Height: | Size: 18 KiB |
134
assets/resources/images/FlatIcon/flatIconPeople.png.meta
Normal file
@@ -0,0 +1,134 @@
|
||||
{
|
||||
"ver": "1.0.27",
|
||||
"importer": "image",
|
||||
"imported": true,
|
||||
"uuid": "816b6f41-8274-4161-9a8f-195dd79dac2e",
|
||||
"files": [
|
||||
".json",
|
||||
".png"
|
||||
],
|
||||
"subMetas": {
|
||||
"6c48a": {
|
||||
"importer": "texture",
|
||||
"uuid": "816b6f41-8274-4161-9a8f-195dd79dac2e@6c48a",
|
||||
"displayName": "flatIconPeople",
|
||||
"id": "6c48a",
|
||||
"name": "texture",
|
||||
"userData": {
|
||||
"wrapModeS": "clamp-to-edge",
|
||||
"wrapModeT": "clamp-to-edge",
|
||||
"imageUuidOrDatabaseUri": "816b6f41-8274-4161-9a8f-195dd79dac2e",
|
||||
"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": "816b6f41-8274-4161-9a8f-195dd79dac2e@f9941",
|
||||
"displayName": "flatIconPeople",
|
||||
"id": "f9941",
|
||||
"name": "spriteFrame",
|
||||
"userData": {
|
||||
"trimThreshold": 1,
|
||||
"rotated": false,
|
||||
"offsetX": 0.5,
|
||||
"offsetY": -0.5,
|
||||
"trimX": 32,
|
||||
"trimY": 32,
|
||||
"width": 449,
|
||||
"height": 449,
|
||||
"rawWidth": 512,
|
||||
"rawHeight": 512,
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
"pivotY": 0.5,
|
||||
"meshType": 0,
|
||||
"vertices": {
|
||||
"rawPosition": [
|
||||
-224.5,
|
||||
-224.5,
|
||||
0,
|
||||
224.5,
|
||||
-224.5,
|
||||
0,
|
||||
-224.5,
|
||||
224.5,
|
||||
0,
|
||||
224.5,
|
||||
224.5,
|
||||
0
|
||||
],
|
||||
"indexes": [
|
||||
0,
|
||||
1,
|
||||
2,
|
||||
2,
|
||||
1,
|
||||
3
|
||||
],
|
||||
"uv": [
|
||||
32,
|
||||
480,
|
||||
481,
|
||||
480,
|
||||
32,
|
||||
31,
|
||||
481,
|
||||
31
|
||||
],
|
||||
"nuv": [
|
||||
0.0625,
|
||||
0.060546875,
|
||||
0.939453125,
|
||||
0.060546875,
|
||||
0.0625,
|
||||
0.9375,
|
||||
0.939453125,
|
||||
0.9375
|
||||
],
|
||||
"minPos": [
|
||||
-224.5,
|
||||
-224.5,
|
||||
0
|
||||
],
|
||||
"maxPos": [
|
||||
224.5,
|
||||
224.5,
|
||||
0
|
||||
]
|
||||
},
|
||||
"isUuid": true,
|
||||
"imageUuidOrDatabaseUri": "816b6f41-8274-4161-9a8f-195dd79dac2e@6c48a",
|
||||
"atlasUuid": "",
|
||||
"trimType": "auto"
|
||||
},
|
||||
"ver": "1.0.12",
|
||||
"imported": true,
|
||||
"files": [
|
||||
".json"
|
||||
],
|
||||
"subMetas": {}
|
||||
}
|
||||
},
|
||||
"userData": {
|
||||
"type": "sprite-frame",
|
||||
"hasAlpha": true,
|
||||
"fixAlphaTransparencyArtifacts": false,
|
||||
"redirect": "816b6f41-8274-4161-9a8f-195dd79dac2e@6c48a"
|
||||
}
|
||||
}
|
||||
BIN
assets/resources/images/ip/1_0030_head.png
Normal file
|
After Width: | Height: | Size: 96 KiB |
134
assets/resources/images/ip/1_0030_head.png.meta
Normal file
@@ -0,0 +1,134 @@
|
||||
{
|
||||
"ver": "1.0.27",
|
||||
"importer": "image",
|
||||
"imported": true,
|
||||
"uuid": "4d74de13-4f34-4bea-a040-68d2bc0655af",
|
||||
"files": [
|
||||
".json",
|
||||
".png"
|
||||
],
|
||||
"subMetas": {
|
||||
"6c48a": {
|
||||
"importer": "texture",
|
||||
"uuid": "4d74de13-4f34-4bea-a040-68d2bc0655af@6c48a",
|
||||
"displayName": "1_0030_head",
|
||||
"id": "6c48a",
|
||||
"name": "texture",
|
||||
"userData": {
|
||||
"wrapModeS": "clamp-to-edge",
|
||||
"wrapModeT": "clamp-to-edge",
|
||||
"imageUuidOrDatabaseUri": "4d74de13-4f34-4bea-a040-68d2bc0655af",
|
||||
"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": "4d74de13-4f34-4bea-a040-68d2bc0655af@f9941",
|
||||
"displayName": "1_0030_head",
|
||||
"id": "f9941",
|
||||
"name": "spriteFrame",
|
||||
"userData": {
|
||||
"trimThreshold": 1,
|
||||
"rotated": false,
|
||||
"offsetX": 0,
|
||||
"offsetY": 0,
|
||||
"trimX": 0,
|
||||
"trimY": 0,
|
||||
"width": 278,
|
||||
"height": 278,
|
||||
"rawWidth": 278,
|
||||
"rawHeight": 278,
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
"pivotY": 0.5,
|
||||
"meshType": 0,
|
||||
"vertices": {
|
||||
"rawPosition": [
|
||||
-139,
|
||||
-139,
|
||||
0,
|
||||
139,
|
||||
-139,
|
||||
0,
|
||||
-139,
|
||||
139,
|
||||
0,
|
||||
139,
|
||||
139,
|
||||
0
|
||||
],
|
||||
"indexes": [
|
||||
0,
|
||||
1,
|
||||
2,
|
||||
2,
|
||||
1,
|
||||
3
|
||||
],
|
||||
"uv": [
|
||||
0,
|
||||
278,
|
||||
278,
|
||||
278,
|
||||
0,
|
||||
0,
|
||||
278,
|
||||
0
|
||||
],
|
||||
"nuv": [
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
1,
|
||||
1
|
||||
],
|
||||
"minPos": [
|
||||
-139,
|
||||
-139,
|
||||
0
|
||||
],
|
||||
"maxPos": [
|
||||
139,
|
||||
139,
|
||||
0
|
||||
]
|
||||
},
|
||||
"isUuid": true,
|
||||
"imageUuidOrDatabaseUri": "4d74de13-4f34-4bea-a040-68d2bc0655af@6c48a",
|
||||
"atlasUuid": "",
|
||||
"trimType": "auto"
|
||||
},
|
||||
"ver": "1.0.12",
|
||||
"imported": true,
|
||||
"files": [
|
||||
".json"
|
||||
],
|
||||
"subMetas": {}
|
||||
}
|
||||
},
|
||||
"userData": {
|
||||
"type": "sprite-frame",
|
||||
"hasAlpha": false,
|
||||
"fixAlphaTransparencyArtifacts": false,
|
||||
"redirect": "4d74de13-4f34-4bea-a040-68d2bc0655af@6c48a"
|
||||
}
|
||||
}
|
||||
BIN
assets/resources/images/pagePK/ChallengeInfoMyRank.png
Normal file
|
After Width: | Height: | Size: 172 KiB |
134
assets/resources/images/pagePK/ChallengeInfoMyRank.png.meta
Normal file
@@ -0,0 +1,134 @@
|
||||
{
|
||||
"ver": "1.0.27",
|
||||
"importer": "image",
|
||||
"imported": true,
|
||||
"uuid": "c91c8eeb-794a-4b35-8e62-4b22d1b284d2",
|
||||
"files": [
|
||||
".json",
|
||||
".png"
|
||||
],
|
||||
"subMetas": {
|
||||
"6c48a": {
|
||||
"importer": "texture",
|
||||
"uuid": "c91c8eeb-794a-4b35-8e62-4b22d1b284d2@6c48a",
|
||||
"displayName": "ChallengeInfoMyRank",
|
||||
"id": "6c48a",
|
||||
"name": "texture",
|
||||
"userData": {
|
||||
"wrapModeS": "clamp-to-edge",
|
||||
"wrapModeT": "clamp-to-edge",
|
||||
"imageUuidOrDatabaseUri": "c91c8eeb-794a-4b35-8e62-4b22d1b284d2",
|
||||
"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": "c91c8eeb-794a-4b35-8e62-4b22d1b284d2@f9941",
|
||||
"displayName": "ChallengeInfoMyRank",
|
||||
"id": "f9941",
|
||||
"name": "spriteFrame",
|
||||
"userData": {
|
||||
"trimThreshold": 1,
|
||||
"rotated": false,
|
||||
"offsetX": 0,
|
||||
"offsetY": 0,
|
||||
"trimX": 0,
|
||||
"trimY": 0,
|
||||
"width": 1209,
|
||||
"height": 505,
|
||||
"rawWidth": 1209,
|
||||
"rawHeight": 505,
|
||||
"borderTop": 50,
|
||||
"borderBottom": 50,
|
||||
"borderLeft": 50,
|
||||
"borderRight": 50,
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
"pivotY": 0.5,
|
||||
"meshType": 0,
|
||||
"vertices": {
|
||||
"rawPosition": [
|
||||
-604.5,
|
||||
-252.5,
|
||||
0,
|
||||
604.5,
|
||||
-252.5,
|
||||
0,
|
||||
-604.5,
|
||||
252.5,
|
||||
0,
|
||||
604.5,
|
||||
252.5,
|
||||
0
|
||||
],
|
||||
"indexes": [
|
||||
0,
|
||||
1,
|
||||
2,
|
||||
2,
|
||||
1,
|
||||
3
|
||||
],
|
||||
"uv": [
|
||||
0,
|
||||
505,
|
||||
1209,
|
||||
505,
|
||||
0,
|
||||
0,
|
||||
1209,
|
||||
0
|
||||
],
|
||||
"nuv": [
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
1,
|
||||
1
|
||||
],
|
||||
"minPos": [
|
||||
-604.5,
|
||||
-252.5,
|
||||
0
|
||||
],
|
||||
"maxPos": [
|
||||
604.5,
|
||||
252.5,
|
||||
0
|
||||
]
|
||||
},
|
||||
"isUuid": true,
|
||||
"imageUuidOrDatabaseUri": "c91c8eeb-794a-4b35-8e62-4b22d1b284d2@6c48a",
|
||||
"atlasUuid": "",
|
||||
"trimType": "auto"
|
||||
},
|
||||
"ver": "1.0.12",
|
||||
"imported": true,
|
||||
"files": [
|
||||
".json"
|
||||
],
|
||||
"subMetas": {}
|
||||
}
|
||||
},
|
||||
"userData": {
|
||||
"type": "sprite-frame",
|
||||
"hasAlpha": true,
|
||||
"fixAlphaTransparencyArtifacts": false,
|
||||
"redirect": "c91c8eeb-794a-4b35-8e62-4b22d1b284d2@6c48a"
|
||||
}
|
||||
}
|
||||
BIN
assets/resources/images/pagePK/ChallengeInfoPanel.png
Normal file
|
After Width: | Height: | Size: 169 KiB |
134
assets/resources/images/pagePK/ChallengeInfoPanel.png.meta
Normal file
@@ -0,0 +1,134 @@
|
||||
{
|
||||
"ver": "1.0.27",
|
||||
"importer": "image",
|
||||
"imported": true,
|
||||
"uuid": "6ca9bc58-7930-4d6a-99dc-b3847b50fad5",
|
||||
"files": [
|
||||
".json",
|
||||
".png"
|
||||
],
|
||||
"subMetas": {
|
||||
"6c48a": {
|
||||
"importer": "texture",
|
||||
"uuid": "6ca9bc58-7930-4d6a-99dc-b3847b50fad5@6c48a",
|
||||
"displayName": "ChallengeInfoPanel",
|
||||
"id": "6c48a",
|
||||
"name": "texture",
|
||||
"userData": {
|
||||
"wrapModeS": "clamp-to-edge",
|
||||
"wrapModeT": "clamp-to-edge",
|
||||
"imageUuidOrDatabaseUri": "6ca9bc58-7930-4d6a-99dc-b3847b50fad5",
|
||||
"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": "6ca9bc58-7930-4d6a-99dc-b3847b50fad5@f9941",
|
||||
"displayName": "ChallengeInfoPanel",
|
||||
"id": "f9941",
|
||||
"name": "spriteFrame",
|
||||
"userData": {
|
||||
"trimThreshold": 1,
|
||||
"rotated": false,
|
||||
"offsetX": 0,
|
||||
"offsetY": 0,
|
||||
"trimX": 0,
|
||||
"trimY": 0,
|
||||
"width": 1209,
|
||||
"height": 505,
|
||||
"rawWidth": 1209,
|
||||
"rawHeight": 505,
|
||||
"borderTop": 50,
|
||||
"borderBottom": 50,
|
||||
"borderLeft": 50,
|
||||
"borderRight": 50,
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
"pivotY": 0.5,
|
||||
"meshType": 0,
|
||||
"vertices": {
|
||||
"rawPosition": [
|
||||
-604.5,
|
||||
-252.5,
|
||||
0,
|
||||
604.5,
|
||||
-252.5,
|
||||
0,
|
||||
-604.5,
|
||||
252.5,
|
||||
0,
|
||||
604.5,
|
||||
252.5,
|
||||
0
|
||||
],
|
||||
"indexes": [
|
||||
0,
|
||||
1,
|
||||
2,
|
||||
2,
|
||||
1,
|
||||
3
|
||||
],
|
||||
"uv": [
|
||||
0,
|
||||
505,
|
||||
1209,
|
||||
505,
|
||||
0,
|
||||
0,
|
||||
1209,
|
||||
0
|
||||
],
|
||||
"nuv": [
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
1,
|
||||
1
|
||||
],
|
||||
"minPos": [
|
||||
-604.5,
|
||||
-252.5,
|
||||
0
|
||||
],
|
||||
"maxPos": [
|
||||
604.5,
|
||||
252.5,
|
||||
0
|
||||
]
|
||||
},
|
||||
"isUuid": true,
|
||||
"imageUuidOrDatabaseUri": "6ca9bc58-7930-4d6a-99dc-b3847b50fad5@6c48a",
|
||||
"atlasUuid": "",
|
||||
"trimType": "auto"
|
||||
},
|
||||
"ver": "1.0.12",
|
||||
"imported": true,
|
||||
"files": [
|
||||
".json"
|
||||
],
|
||||
"subMetas": {}
|
||||
}
|
||||
},
|
||||
"userData": {
|
||||
"type": "sprite-frame",
|
||||
"hasAlpha": true,
|
||||
"fixAlphaTransparencyArtifacts": false,
|
||||
"redirect": "6ca9bc58-7930-4d6a-99dc-b3847b50fad5@6c48a"
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 165 KiB After Width: | Height: | Size: 165 KiB |
@@ -49,10 +49,10 @@
|
||||
"height": 1554,
|
||||
"rawWidth": 1399,
|
||||
"rawHeight": 1554,
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
"borderTop": 100,
|
||||
"borderBottom": 100,
|
||||
"borderLeft": 100,
|
||||
"borderRight": 100,
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
@@ -15,7 +15,7 @@
|
||||
"label": "removeSplash",
|
||||
"enable": true,
|
||||
"removeSplash": {
|
||||
"complete": false,
|
||||
"complete": true,
|
||||
"form": "https://creator-api.cocos.com/api/form/show?sid=51d0aa399094bb683b7737f0a16a459b"
|
||||
}
|
||||
}
|
||||
|
||||