Commit 3e7f6297 authored by 陈子煜's avatar 陈子煜

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	assets/Scripts/Scenes/HomeScene.ts
#	assets/Start/Start.ts
parents ae0fbd23 40917e94
......@@ -185,7 +185,7 @@
"_priority": 1073741824,
"_fov": 45,
"_fovAxis": 0,
"_orthoHeight": 406,
"_orthoHeight": 897.0108303249098,
"_near": 1,
"_far": 2000,
"_color": {
......@@ -478,7 +478,7 @@
"y": -180,
"z": -12.000012657215834
},
"_id": "fdvqQDUxpOLJ0rhXLRo9zZ"
"_id": "862inAURhGc6/a5pdr+6E7"
},
{
"__type__": "cc.UITransform",
......@@ -500,7 +500,7 @@
"x": 0,
"y": 1
},
"_id": "12thVjbmlEDboOejGnRXNX"
"_id": "aawpMD3ItDYpGy3/WFLKWq"
},
{
"__type__": "cc.Sprite",
......@@ -536,7 +536,7 @@
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": "5fQlXait1Jg5w/kZjZVqhK"
"_id": "a5NOBxC8VOyKg6POw1HhC8"
},
{
"__type__": "cc.Node",
......@@ -584,7 +584,7 @@
"y": -180,
"z": -11.00000220913452
},
"_id": "55I6NzpHhFEpXutaDmZthD"
"_id": "d7EQDYWQtAirNFX/hsQFtt"
},
{
"__type__": "cc.UITransform",
......@@ -606,7 +606,7 @@
"x": 0,
"y": 1
},
"_id": "e1j1d2y/1I/5HYVlJxtxyo"
"_id": "b0u8i9HxpAL49LWvlO9zuT"
},
{
"__type__": "cc.Sprite",
......@@ -642,7 +642,7 @@
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": "b01Hm5w3hNuIuoJcuK5aw6"
"_id": "84eRsEvblK/KU1fKYLh+xu"
},
{
"__type__": "cc.Node",
......@@ -690,7 +690,7 @@
"y": -180,
"z": -64.00000614258742
},
"_id": "1bGvYlT+ZFKYxAkaWqX5zq"
"_id": "04a9sAqy9P65K057mAJIw9"
},
{
"__type__": "cc.UITransform",
......@@ -712,7 +712,7 @@
"x": 0,
"y": 1
},
"_id": "1chqaPZMlCZrjZXPt7V3aH"
"_id": "4bBNy0JDlBHI3zOTOkg2fJ"
},
{
"__type__": "cc.Sprite",
......@@ -748,7 +748,7 @@
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": "cekF8/UiRJeKkeEUFNB8PY"
"_id": "66PlNAbyFBnrg17Bdhi6RW"
},
{
"__type__": "cc.Node",
......@@ -796,7 +796,7 @@
"y": 180,
"z": 25.99999385741257
},
"_id": "3cjT5U+D5PH69HnyySWgGC"
"_id": "8e5ShR1PpHUrVnS11KvScn"
},
{
"__type__": "cc.UITransform",
......@@ -818,7 +818,7 @@
"x": 0,
"y": 1
},
"_id": "77jz7V3tdFWJ2QQI8SV8fA"
"_id": "20kKVhuNFDvr6/16/ez1Oz"
},
{
"__type__": "cc.Sprite",
......@@ -854,7 +854,7 @@
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": "51J7S31vhN17XqwOzds1+A"
"_id": "bfxmQi//dAB6i6paIlUNYs"
},
{
"__type__": "cc.UITransform",
......
This diff is collapsed.
{"ver":"1.2.0","importer":"directory","imported":true,"uuid":"9786f6de-2902-4260-b34f-b2976d065d17","files":[],"subMetas":{},"userData":{}}
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "28dd6412-f8d8-4cc9-8194-79574c02fc9e",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "28dd6412-f8d8-4cc9-8194-79574c02fc9e@6c48a",
"displayName": "jiangli_bg",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "28dd6412-f8d8-4cc9-8194-79574c02fc9e",
"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": "28dd6412-f8d8-4cc9-8194-79574c02fc9e@f9941",
"displayName": "jiangli_bg",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 508,
"height": 580,
"rawWidth": 508,
"rawHeight": 580,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-254,
-290,
0,
254,
-290,
0,
-254,
290,
0,
254,
290,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
580,
508,
580,
0,
0,
508,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-254,
-290,
0
],
"maxPos": [
254,
290,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "28dd6412-f8d8-4cc9-8194-79574c02fc9e@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "28dd6412-f8d8-4cc9-8194-79574c02fc9e@6c48a"
}
}
......@@ -2,22 +2,22 @@
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "a252240b-634d-4618-b243-4a87a05c4c89",
"uuid": "40bfc9f0-b025-4d07-a7ee-ff83b2e1c324",
"files": [
".jpg",
".json"
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "a252240b-634d-4618-b243-4a87a05c4c89@6c48a",
"displayName": "bg",
"uuid": "40bfc9f0-b025-4d07-a7ee-ff83b2e1c324@6c48a",
"displayName": "return_btn",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "a252240b-634d-4618-b243-4a87a05c4c89",
"imageUuidOrDatabaseUri": "40bfc9f0-b025-4d07-a7ee-ff83b2e1c324",
"isUuid": true,
"visible": false,
"minfilter": "linear",
......@@ -34,8 +34,8 @@
},
"f9941": {
"importer": "sprite-frame",
"uuid": "a252240b-634d-4618-b243-4a87a05c4c89@f9941",
"displayName": "bg",
"uuid": "40bfc9f0-b025-4d07-a7ee-ff83b2e1c324@f9941",
"displayName": "return_btn",
"id": "f9941",
"name": "spriteFrame",
"userData": {
......@@ -46,10 +46,10 @@
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 1624,
"height": 750,
"rawWidth": 1624,
"rawHeight": 750,
"width": 60,
"height": 60,
"rawWidth": 60,
"rawHeight": 60,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
......@@ -61,17 +61,17 @@
"meshType": 0,
"vertices": {
"rawPosition": [
-812,
-375,
-30,
-30,
0,
812,
-375,
30,
-30,
0,
-812,
375,
-30,
30,
0,
812,
375,
30,
30,
0
],
"indexes": [
......@@ -84,12 +84,12 @@
],
"uv": [
0,
750,
1624,
750,
60,
60,
60,
0,
0,
1624,
60,
0
],
"nuv": [
......@@ -103,18 +103,18 @@
1
],
"minPos": [
-812,
-375,
-30,
-30,
0
],
"maxPos": [
812,
375,
30,
30,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "a252240b-634d-4618-b243-4a87a05c4c89@6c48a",
"imageUuidOrDatabaseUri": "40bfc9f0-b025-4d07-a7ee-ff83b2e1c324@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
......@@ -127,8 +127,8 @@
},
"userData": {
"type": "sprite-frame",
"hasAlpha": false,
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "a252240b-634d-4618-b243-4a87a05c4c89@6c48a"
"redirect": "40bfc9f0-b025-4d07-a7ee-ff83b2e1c324@6c48a"
}
}
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "be86612d-c09f-4ea6-9998-58ed69b7df34",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "be86612d-c09f-4ea6-9998-58ed69b7df34@6c48a",
"displayName": "share_btn",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "be86612d-c09f-4ea6-9998-58ed69b7df34",
"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": "be86612d-c09f-4ea6-9998-58ed69b7df34@f9941",
"displayName": "share_btn",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 80,
"height": 80,
"rawWidth": 80,
"rawHeight": 80,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-40,
-40,
0,
40,
-40,
0,
-40,
40,
0,
40,
40,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
80,
80,
80,
0,
0,
80,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-40,
-40,
0
],
"maxPos": [
40,
40,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "be86612d-c09f-4ea6-9998-58ed69b7df34@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "be86612d-c09f-4ea6-9998-58ed69b7df34@6c48a"
}
}
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "ce728a6d-4bf2-4e79-a351-2f7b9df547b5",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "ce728a6d-4bf2-4e79-a351-2f7b9df547b5@6c48a",
"displayName": "tab",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "ce728a6d-4bf2-4e79-a351-2f7b9df547b5",
"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": "ce728a6d-4bf2-4e79-a351-2f7b9df547b5@f9941",
"displayName": "tab",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 450,
"height": 60,
"rawWidth": 450,
"rawHeight": 60,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-225,
-30,
0,
225,
-30,
0,
-225,
30,
0,
225,
30,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
60,
450,
60,
0,
0,
450,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-225,
-30,
0
],
"maxPos": [
225,
30,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "ce728a6d-4bf2-4e79-a351-2f7b9df547b5@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "ce728a6d-4bf2-4e79-a351-2f7b9df547b5@6c48a"
}
}
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "f4b548ed-80f6-434c-a7c7-34396f90243b",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "f4b548ed-80f6-434c-a7c7-34396f90243b@6c48a",
"displayName": "个人_bg",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "f4b548ed-80f6-434c-a7c7-34396f90243b",
"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": "f4b548ed-80f6-434c-a7c7-34396f90243b@f9941",
"displayName": "个人_bg",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 607,
"height": 580,
"rawWidth": 607,
"rawHeight": 580,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-303.5,
-290,
0,
303.5,
-290,
0,
-303.5,
290,
0,
303.5,
290,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
580,
607,
580,
0,
0,
607,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-303.5,
-290,
0
],
"maxPos": [
303.5,
290,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "f4b548ed-80f6-434c-a7c7-34396f90243b@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "f4b548ed-80f6-434c-a7c7-34396f90243b@6c48a"
}
}
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "fe0a29df-11be-42ca-8382-aa8080fb6536",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "fe0a29df-11be-42ca-8382-aa8080fb6536@6c48a",
"displayName": "个人_title",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "fe0a29df-11be-42ca-8382-aa8080fb6536",
"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": "fe0a29df-11be-42ca-8382-aa8080fb6536@f9941",
"displayName": "个人_title",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 526,
"height": 23,
"rawWidth": 526,
"rawHeight": 23,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-263,
-11.5,
0,
263,
-11.5,
0,
-263,
11.5,
0,
263,
11.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
23,
526,
23,
0,
0,
526,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-263,
-11.5,
0
],
"maxPos": [
263,
11.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "fe0a29df-11be-42ca-8382-aa8080fb6536@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "fe0a29df-11be-42ca-8382-aa8080fb6536@6c48a"
}
}
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "096b06d3-d07d-4852-8063-499d6320308f",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "096b06d3-d07d-4852-8063-499d6320308f@6c48a",
"displayName": "个人榜",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "096b06d3-d07d-4852-8063-499d6320308f",
"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": "096b06d3-d07d-4852-8063-499d6320308f@f9941",
"displayName": "个人榜",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 150,
"height": 60,
"rawWidth": 150,
"rawHeight": 60,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-75,
-30,
0,
75,
-30,
0,
-75,
30,
0,
75,
30,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
60,
150,
60,
0,
0,
150,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-75,
-30,
0
],
"maxPos": [
75,
30,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "096b06d3-d07d-4852-8063-499d6320308f@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "096b06d3-d07d-4852-8063-499d6320308f@6c48a"
}
}
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "ce259195-d60f-4500-af25-cf991cc1799e",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "ce259195-d60f-4500-af25-cf991cc1799e@6c48a",
"displayName": "奖励品1",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "ce259195-d60f-4500-af25-cf991cc1799e",
"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": "ce259195-d60f-4500-af25-cf991cc1799e@f9941",
"displayName": "奖励品1",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 200,
"height": 300,
"rawWidth": 200,
"rawHeight": 300,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-100,
-150,
0,
100,
-150,
0,
-100,
150,
0,
100,
150,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
300,
200,
300,
0,
0,
200,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-100,
-150,
0
],
"maxPos": [
100,
150,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "ce259195-d60f-4500-af25-cf991cc1799e@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "ce259195-d60f-4500-af25-cf991cc1799e@6c48a"
}
}
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "31aefadb-7170-4150-bcf0-df0851c8e734",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "31aefadb-7170-4150-bcf0-df0851c8e734@6c48a",
"displayName": "奖励品2-10",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "31aefadb-7170-4150-bcf0-df0851c8e734",
"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": "31aefadb-7170-4150-bcf0-df0851c8e734@f9941",
"displayName": "奖励品2-10",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 200,
"height": 300,
"rawWidth": 200,
"rawHeight": 300,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-100,
-150,
0,
100,
-150,
0,
-100,
150,
0,
100,
150,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
300,
200,
300,
0,
0,
200,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-100,
-150,
0
],
"maxPos": [
100,
150,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "31aefadb-7170-4150-bcf0-df0851c8e734@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "31aefadb-7170-4150-bcf0-df0851c8e734@6c48a"
}
}
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "e1cb309d-5f47-4fe2-999e-6d7c2a33442d",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "e1cb309d-5f47-4fe2-999e-6d7c2a33442d@6c48a",
"displayName": "好友_title",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "e1cb309d-5f47-4fe2-999e-6d7c2a33442d",
"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": "e1cb309d-5f47-4fe2-999e-6d7c2a33442d@f9941",
"displayName": "好友_title",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 646,
"height": 23,
"rawWidth": 646,
"rawHeight": 23,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-323,
-11.5,
0,
323,
-11.5,
0,
-323,
11.5,
0,
323,
11.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
23,
646,
23,
0,
0,
646,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-323,
-11.5,
0
],
"maxPos": [
323,
11.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "e1cb309d-5f47-4fe2-999e-6d7c2a33442d@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "e1cb309d-5f47-4fe2-999e-6d7c2a33442d@6c48a"
}
}
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "d2971b34-ae03-4952-a068-638f5b0a8c30",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "d2971b34-ae03-4952-a068-638f5b0a8c30@6c48a",
"displayName": "好友_省_bg",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "d2971b34-ae03-4952-a068-638f5b0a8c30",
"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": "d2971b34-ae03-4952-a068-638f5b0a8c30@f9941",
"displayName": "好友_省_bg",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 800,
"height": 580,
"rawWidth": 800,
"rawHeight": 580,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-400,
-290,
0,
400,
-290,
0,
-400,
290,
0,
400,
290,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
580,
800,
580,
0,
0,
800,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-400,
-290,
0
],
"maxPos": [
400,
290,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "d2971b34-ae03-4952-a068-638f5b0a8c30@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "d2971b34-ae03-4952-a068-638f5b0a8c30@6c48a"
}
}
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "580b0593-0fe0-4f06-9290-5ee7a3768525",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "580b0593-0fe0-4f06-9290-5ee7a3768525@6c48a",
"displayName": "好友榜",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "580b0593-0fe0-4f06-9290-5ee7a3768525",
"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": "580b0593-0fe0-4f06-9290-5ee7a3768525@f9941",
"displayName": "好友榜",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 150,
"height": 60,
"rawWidth": 150,
"rawHeight": 60,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-75,
-30,
0,
75,
-30,
0,
-75,
30,
0,
75,
30,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
60,
150,
60,
0,
0,
150,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-75,
-30,
0
],
"maxPos": [
75,
30,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "580b0593-0fe0-4f06-9290-5ee7a3768525@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "580b0593-0fe0-4f06-9290-5ee7a3768525@6c48a"
}
}
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "295ddd44-06b5-410b-9224-6dd570088a0b",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "295ddd44-06b5-410b-9224-6dd570088a0b@6c48a",
"displayName": "排行榜",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "295ddd44-06b5-410b-9224-6dd570088a0b",
"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": "295ddd44-06b5-410b-9224-6dd570088a0b@f9941",
"displayName": "排行榜",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 141,
"height": 45,
"rawWidth": 141,
"rawHeight": 45,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-70.5,
-22.5,
0,
70.5,
-22.5,
0,
-70.5,
22.5,
0,
70.5,
22.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
45,
141,
45,
0,
0,
141,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-70.5,
-22.5,
0
],
"maxPos": [
70.5,
22.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "295ddd44-06b5-410b-9224-6dd570088a0b@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "295ddd44-06b5-410b-9224-6dd570088a0b@6c48a"
}
}
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "8374adaf-7568-4759-ac27-a9059850eab6",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "8374adaf-7568-4759-ac27-a9059850eab6@6c48a",
"displayName": "省榜",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "8374adaf-7568-4759-ac27-a9059850eab6",
"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": "8374adaf-7568-4759-ac27-a9059850eab6@f9941",
"displayName": "省榜",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 150,
"height": 60,
"rawWidth": 150,
"rawHeight": 60,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-75,
-30,
0,
75,
-30,
0,
-75,
30,
0,
75,
30,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
60,
150,
60,
0,
0,
150,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-75,
-30,
0
],
"maxPos": [
75,
30,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "8374adaf-7568-4759-ac27-a9059850eab6@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "8374adaf-7568-4759-ac27-a9059850eab6@6c48a"
}
}
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "57de2980-105c-4e6e-af66-576e9ba6aadb",
"files": [],
"subMetas": {},
"userData": {}
}
This diff is collapsed.
{
"ver": "1.1.50",
"importer": "prefab",
"imported": true,
"uuid": "f2cd6405-891e-4415-8a85-fdb7f5935c90",
"files": [
".json"
],
"subMetas": {},
"userData": {
"syncNodeName": "FriendRankItem"
}
}
This diff is collapsed.
{
"ver": "1.1.50",
"importer": "prefab",
"imported": true,
"uuid": "92c2f72c-0d07-4d46-bc66-5d8dc679d5f6",
"files": [
".json"
],
"subMetas": {},
"userData": {
"syncNodeName": "SingleRankItem"
}
}
......@@ -11,7 +11,7 @@ import gameStore from "../store/gameStore";
import GameResultPanel from "../Panels/GameResultPanel";
import GamePosterPanel from "../Panels/GamePosterPanel";
import ExchangeSuccess from "db://assets/Scripts/Panels/ExchangeSuccess";
import {BlessingBagPage} from "db://assets/Scripts/Scenes/BlessingBagPage";
import { RankScence } from "./RankScene";
const { ccclass, property } = _decorator;
......@@ -19,65 +19,63 @@ const { ccclass, property } = _decorator;
@ccclass('HomeScene')
export class HomeScene extends Scene {
static bundle: string = "HomeScene";
static skin: string = "HomeScene";
// static group: string[] = ["HomeScene"];
static bundle: string = "HomeScene";
static skin: string = "HomeScene";
// static group: string[] = ["HomeScene"];
@property(Node) startBtn: Node = null;
@property(Node) ruleBtn: Node = null;
@property(Node) rankBtn: Node = null;
@property(Node) startBtn: Node = null;
@property(Node) ruleBtn: Node = null;
@property(Node) rankBtn: Node = null;
@property(Label) userName: Label;
@property(Label) pointNum: Label;
@property(Label) fuDaiText: Label;
@property(Label) signTxt: Label;
@property(Label) userName: Label;
@property(Label) pointNum: Label;
@property(Label) fuDaiText: Label;
@property(Label) signTxt: Label;
onLoad() {
this.startBtn.on(Button.EventType.CLICK, this.clickStart, this);
this.ruleBtn.on(Button.EventType.CLICK, this.clickRule, this);
this.rankBtn.on(Button.EventType.CLICK, this.clickRank, this);
}
onLoad() {
this.startBtn.on(Button.EventType.CLICK, this.clickStart, this);
this.ruleBtn.on(Button.EventType.CLICK, this.clickRule, this);
this.rankBtn.on(Button.EventType.CLICK, this.clickRank, this);
}
async start() {
async start() {
await store.updateIndex();
await store.updateIndex();
// showPanel(GamePosterPanel);
// showPanel(GamePosterPanel);
UIMgr.ins.preloadScene(MainGame);
UIMgr.ins.preloadScene(MainGame);
}
}
@render
render() {
const {
nickname = "",
creditsNum = 0,
} = store.homeInfo || {};
@render
render() {
const {
nickname = "",
creditsNum = 0,
} = store.homeInfo || {};
this.userName.string = nickname;
this.pointNum.string = `${creditsNum}`;
this.userName.string = nickname;
this.pointNum.string = `${creditsNum}`;
}
}
clickStart = _asyncThrottle(async () => {
await gameStore.startGame();
changeScene(MainGame);
clickStart = _asyncThrottle(async () => {
await gameStore.startGame();
changeScene(MainGame);
});
});
clickRule = _asyncThrottle(async () => {
// showPanel(RulePanel);
});
clickRule = _asyncThrottle(async () => {
// showPanel(RulePanel);
});
clickRank = _asyncThrottle(async () => {
await changeScene(RankScence);
});
clickRank = _asyncThrottle(() => {
showPanel(RankPanel);
});
clickBack = _asyncThrottle(() => {
});
clickBack = _asyncThrottle(() => {
});
}
......@@ -15,7 +15,6 @@ export class FastBtn extends Component {
// 设置是否处于加速状态
set isFast(value: boolean) {
this._isFast = value;
console.log(this.node, this.uuid);
this.node.emit("fast", value);
}
......
......@@ -228,7 +228,7 @@ export class Snake extends Component {
// 食物吃掉的动画
Tween.stopAllByTarget(otherCollider.node);
tween(otherCollider.node)
.to(0.3, {
.to(0.188, {
position: this.head.getPosition(),
scale: v3(0, 0)
})
......@@ -493,7 +493,7 @@ export class Snake extends Component {
this.clearMagnet();
this.magnetEffectNode.active = true;
this.magnetEffectNode.getComponent(Animation).play();
this.eatCollider.radius = 220;
this.eatCollider.radius = 240;
this.magnetTw = tween(this)
.delay(10)
.call(() => {
......
import { _decorator, Component, Node } from 'cc';
import { _decorator, Button, Component, Label, Node, } from 'cc';
import { observer } from '../store/decorators';
import Scene from '../../Module/Scene';
import { changeScene } from '../../Module/UIFast';
import { _asyncThrottle } from '../Utils/Utils';
import { HomeScene } from './HomeScene';
import { sendWebNet, WebNetName } from '../Utils/WebNet/WebNet';
import { YXCollectionView, YXIndexPath } from '../../Component/YXList/lib';
const { ccclass, property } = _decorator;
enum TAB {
SHENG = "SHENG", // 省榜
SINGLE = "SINGLE", // 个人榜
FRIEND = "FRIEND", // 好友榜
}
@observer
@ccclass('RankScence')
export class RankScence extends Component {
start() {
export class RankScence extends Scene {
static bundle: string = "RankScene";
static skin: string = "RankScene";
}
update(deltaTime: number) {
@property(Node) backBtn: Node = null;
@property(Node) shareBtn: Node = null;
@property(Node) Sheng: Node = null;
@property(Node) Single: Node = null;
@property(Node) Friend: Node = null;
@property(Node) sheng_yes: Node = null;
@property(Node) sheng_no: Node = null;
@property(Node) single_yes: Node = null;
@property(Node) single_no: Node = null;
@property(Node) friend_yes: Node = null;
@property(Node) friend_no: Node = null;
@property(YXCollectionView) Sheng_List: YXCollectionView = null;
@property(YXCollectionView) Single_List: YXCollectionView = null;
@property(YXCollectionView) Friend_List: YXCollectionView = null;
@property(Node) Sheng_MY: Node = null;
@property(Node) Single_MY: Node = null;
@property(Node) Friend_MY: Node = null;
private _tab: TAB = TAB.SINGLE;
set tab(tab: TAB) { // 设置tab切换
this._tab = tab;
const isSheng = tab == TAB.SHENG;
const isSingle = tab == TAB.SINGLE;
const isFriend = tab == TAB.FRIEND;
this.sheng_yes.active = isSheng;
this.sheng_no.active = !isSheng;
this.single_yes.active = isSingle;
this.single_no.active = !isSingle;
this.friend_yes.active = isFriend;
this.friend_no.active = !isFriend;
// this.listBg.setScale(isDaily ? 1 : -1, 1, 1);
this.Sheng.active = isSheng;
this.Single.active = isSingle;
this.Friend.active = isFriend;
}
get tab() {
return this._tab;
}
shengDate: any[] = [];
singleDate: any[] = [];
friendDate: any[] = [];
onLoad() {
this.tab = TAB.SINGLE;
this.backBtn.on(Button.EventType.CLICK, this.clickBackHome, this);
this.shareBtn.on(Button.EventType.CLICK, this.clickShare, this);
this.sheng_no.on(Button.EventType.CLICK, this.clickSheng, this);
this.single_no.on(Button.EventType.CLICK, this.clickSingle, this);
this.friend_no.on(Button.EventType.CLICK, this.clickFriend, this);
}
start() {
}
update(deltaTime: number) {
}
// 返回首页
clickBackHome = _asyncThrottle(async () => {
await changeScene(HomeScene);
});
// 分享按钮
clickShare = _asyncThrottle(async () => {
console.log("EDEN_TODO 记得分享按钮");
});
// 点击省榜
clickSheng() {
this.tab = TAB.SHENG;
}
// 个人榜
clickSingle() {
this.tab = TAB.SINGLE;
}
// 好友榜
clickFriend() {
this.tab = TAB.FRIEND;
}
/****** 数据 ******/
// 刷新省榜
async updateSheng() {
const { success, data } = await sendWebNet(WebNetName.shengRank);
if (!success) return;
this.shengDate = data.rankList;
this.Sheng_List.reloadData();
this.onCellDisplay(this.Sheng_MY, data.myRank);
this.Sheng_List.node.active = this.shengDate.length > 0;
// this.dailyNoOne.active = this.dailyData.length <= 0; // 如果没有数据隐藏
}
// 刷新个人榜
async updateSingle() {
const { success, data } = await sendWebNet(WebNetName.singleRank);
if (!success) return;
this.shengDate = data.rankList;
this.Sheng_List.reloadData();
this.onCellDisplay(this.Sheng_MY, data.myRank);
this.Sheng_List.node.active = this.shengDate.length > 0;
}
// 刷新好友榜
async updateFriend() {
const { success, data } = await sendWebNet(WebNetName.friendRank);
if (!success) return;
this.shengDate = data.rankList;
this.Sheng_List.reloadData();
this.onCellDisplay(this.Sheng_MY, data.myRank);
this.Sheng_List.node.active = this.shengDate.length > 0;
}
// 给每个cell设置数据
onDailyCellDisplay = (cell: Node, indexPath: YXIndexPath, collectionView: YXCollectionView) => {
const data = this.shengDate[indexPath.item];
this.onCellDisplay(cell, data);
}
onCellDisplay = (cell: Node, data) => {
let { rank, nickname, score } = data;
let rankTxt = rank;
if (!rank) {
if (score) {
rankTxt = "1000+";
} else {
rankTxt = "-";
}
} else {
if (rank > 1000) {
rankTxt = "1000+";
}
}
cell.getChildByName(`rank`).getComponent(Label).string = rankTxt;
cell.getChildByName(`sheng`).getComponent(Label).string = nickname || "***";
cell.getChildByName(`length`).getComponent(Label).string = score || "0";
}
}
......@@ -33,7 +33,12 @@ export enum WebNetName {
/**
* 排行榜
*/
rank = "rank/index.do",
// 省份榜
shengRank = "rank/provinceRank.do",
// 个人榜
singleRank = "rank/personRank.do",
// 好友榜
friendRank = "rank/friendRank.do",
/**
* 获取规则
......
......@@ -184,7 +184,7 @@
"_priority": 65535,
"_fov": 45,
"_fovAxis": 0,
"_orthoHeight": 519.611404435058,
"_orthoHeight": 897.0108303249098,
"_near": 1,
"_far": 2000,
"_color": {
......
......@@ -53,6 +53,7 @@ export class Start extends Component{
store.updateFrontVariable();
}
onDestroy() {
......@@ -99,6 +100,7 @@ export class Start extends Component{
const list = await getPreLoadList(pkg, this.setProgress, 0.05, 0.2);
await preload(list, this.setProgress, 0.2, 1);
await changeScene(HomeScene);
}
......
......@@ -20,9 +20,9 @@
"contourBleed": true,
"paddingBleed": true,
"filterUnused": false,
"removeTextureInBundle": false,
"removeImageInBundle": false,
"removeSpriteAtlasInBundle": false,
"removeTextureInBundle": true,
"removeImageInBundle": true,
"removeSpriteAtlasInBundle": true,
"compressSettings": {},
"textureSetting": {
"wrapModeS": "repeat",
......
......@@ -7,7 +7,7 @@
"actEndTime": 1733282900000,
"currentTime": 1733282100000,
"avatar": "non qui in aliqua",
"nickname": "贪吃的小铭铭",
"nickname": "贪吃的小铭铭1",
"rankInfos": [
{
"index": 1,
......
{
"code": "Duis qui fugiat commodo",
"data": {
"yesterdayResult": {
"province": "cillum quis",
"sendCount": 15485762.475336611,
"targetNum": 10011448.055213675,
"prizeImage": "mollit laboris in voluptate",
"prizeName": "proident aute laboris"
},
"myRankInfo": {
"index": -67073150.019215435,
"score": 36610340.32358265,
"province": "proident consectetur elit laborum"
},
"rankInfos": [
{
"index": -88006441.16930388,
"province": "Excepteur amet anim",
"score": -67411554.13146958,
"meFlag": false
},
{
"index": 2456764.582839772,
"province": "Duis cupidatat",
"score": -42589572.49602235,
"meFlag": true
},
{
"index": 46197656.46831074,
"province": "dolore incididunt occaecat aute dolor",
"score": -29194134.455088034,
"meFlag": false
},
{
"index": 51643491.79377967,
"province": "sit dolore pariatur aliqua",
"score": -6053517.590959549,
"meFlag": false
},
{
"index": 28904987.53365454,
"province": "magna",
"score": -18757410.305489495,
"meFlag": false
}
],
"todayAwardConfig": {
"prizeName": "sint esse",
"prizeImage": "voluptate amet qui Duis ut",
"sendCount": -23378091.637414843
},
"currentTime": -15471057.395400003,
"endTime": -93020033.20255613,
"provinceEntryScore": -64956682.172647625
},
"message": "do dolor ipsum eu Excepteur",
"success": false
}
\ No newline at end of file
......@@ -7,7 +7,7 @@
"enable": true,
"customSplash": {
"complete": true,
"form": "https://creator-api.cocos.com/api/form/show?sid=441e6f8e3e7ba0c9581ed7936daee45d"
"form": "https://creator-api.cocos.com/api/form/show?sid=70540cf45afa7a2c72a42f171972359f"
}
},
"removeSplash": {
......@@ -16,7 +16,7 @@
"enable": true,
"removeSplash": {
"complete": true,
"form": "https://creator-api.cocos.com/api/form/show?sid=441e6f8e3e7ba0c9581ed7936daee45d"
"form": "https://creator-api.cocos.com/api/form/show?sid=70540cf45afa7a2c72a42f171972359f"
}
}
}
......
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