diff --git a/assets/Scene/HomeScene.fire b/assets/Scene/HomeScene.fire index eae8fbe..ba48d4d 100644 --- a/assets/Scene/HomeScene.fire +++ b/assets/Scene/HomeScene.fire @@ -3748,7 +3748,7 @@ }, { "__type__": "cc.Node", - "_name": "第关字_1", + "_name": "diguan", "_objFlags": 0, "_parent": { "__id__": 67 @@ -3823,7 +3823,9 @@ ], "_srcBlendFactor": 770, "_dstBlendFactor": 771, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "c281f2f9-2807-4bb8-99d4-7539f1ee9a72" + }, "_type": 0, "_sizeMode": 1, "_fillType": 0, @@ -3835,7 +3837,9 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_atlas": null, + "_atlas": { + "__uuid__": "98eb2872-691f-4fc7-b827-c7f6dd98d242" + }, "_id": "7arxCXkSJE1Zb0xW1mnRKN" }, { diff --git a/assets/Script/Block.ts b/assets/Script/Block.ts index 1aa3d1b..f8c2d4d 100644 --- a/assets/Script/Block.ts +++ b/assets/Script/Block.ts @@ -176,6 +176,7 @@ export default class Block extends cc.Component { this.type = block_Info.type; this.color = block_Info.color; this.blockId = block_Info.id; + console.log("方块类型",this.type,"方块颜色",this.color,"方块ID",this.blockId); // if(posX&&posY){ // this.posX = posX; // this.posY = posY; diff --git a/assets/UI/UI/pop/homeUi.plist b/assets/UI/UI/pop/homeUi.plist index cb9a435..82e746f 100644 --- a/assets/UI/UI/pop/homeUi.plist +++ b/assets/UI/UI/pop/homeUi.plist @@ -15,7 +15,7 @@ spriteSourceSize {76,82} textureRect - {{719,411},{76,82}} + {{163,237},{76,82}} textureRotated @@ -30,9 +30,9 @@ spriteSourceSize {312,62} textureRect - {{601,99},{312,62}} + {{99,1},{312,62}} textureRotated - + coins.png @@ -45,9 +45,9 @@ spriteSourceSize {70,71} textureRect - {{922,439},{70,71}} + {{949,405},{70,71}} textureRotated - + day.png @@ -60,7 +60,22 @@ spriteSourceSize {200,216} textureRect - {{523,163},{200,216}} + {{201,1},{200,216}} + textureRotated + + + diguan.png + + aliases + + spriteOffset + {0,0} + spriteSize + {234,36} + spriteSourceSize + {234,36} + textureRect + {{163,1},{234,36}} textureRotated @@ -75,9 +90,9 @@ spriteSourceSize {314,96} textureRect - {{601,1},{314,96}} + {{1,1},{314,96}} textureRotated - + effect.png @@ -90,7 +105,7 @@ spriteSourceSize {116,122} textureRect - {{353,357},{116,122}} + {{911,157},{116,122}} textureRotated @@ -105,7 +120,7 @@ spriteSourceSize {116,122} textureRect - {{741,163},{116,122}} + {{911,281},{116,122}} textureRotated @@ -120,7 +135,7 @@ spriteSourceSize {116,122} textureRect - {{741,287},{116,122}} + {{419,157},{116,122}} textureRotated @@ -135,9 +150,9 @@ spriteSourceSize {116,122} textureRect - {{471,365},{116,122}} + {{537,157},{116,122}} textureRotated - + rank.png @@ -150,9 +165,9 @@ spriteSourceSize {154,174} textureRect - {{1,357},{154,174}} + {{1,317},{154,174}} textureRotated - + set.png @@ -165,9 +180,9 @@ spriteSourceSize {154,174} textureRect - {{177,357},{154,174}} + {{157,315},{154,174}} textureRotated - + start.png @@ -180,7 +195,7 @@ spriteSourceSize {520,198} textureRect - {{1,157},{520,198}} + {{389,293},{520,198}} textureRotated @@ -195,7 +210,7 @@ spriteSourceSize {150,65} textureRect - {{859,163},{150,65}} + {{313,315},{150,65}} textureRotated @@ -210,7 +225,7 @@ spriteSourceSize {154,598} textureRect - {{1,1},{154,598}} + {{403,1},{154,598}} textureRotated @@ -225,7 +240,7 @@ spriteSourceSize {98,98} textureRect - {{917,1},{94,90}} + {{247,219},{94,90}} textureRotated @@ -240,7 +255,7 @@ spriteSourceSize {72,36} textureRect - {{884,439},{72,36}} + {{911,405},{72,36}} textureRotated @@ -255,9 +270,9 @@ spriteSourceSize {73,38} textureRect - {{917,97},{73,38}} + {{339,219},{73,38}} textureRotated - + yinyuezi.png @@ -270,7 +285,7 @@ spriteSourceSize {72,38} textureRect - {{844,439},{72,38}} + {{379,219},{72,38}} textureRotated @@ -285,9 +300,9 @@ spriteSourceSize {116,122} textureRect - {{595,365},{116,122}} + {{655,157},{116,122}} textureRotated - + zhendong2.png @@ -300,9 +315,9 @@ spriteSourceSize {74,39} textureRect - {{803,411},{74,39}} + {{313,467},{74,39}} textureRotated - + zhendongs.png @@ -315,7 +330,7 @@ spriteSourceSize {116,122} textureRect - {{859,315},{116,122}} + {{773,157},{116,122}} textureRotated @@ -331,9 +346,9 @@ realTextureFileName homeUi.png size - {1008,512} + {1028,507} smartupdate - $TexturePacker:SmartUpdate:ec131fc8aa4cafb305ae2304af0a15bd:974d7383b7a66edb95080b3874b43d18:857892d324edade16f98a344005c60d5$ + $TexturePacker:SmartUpdate:951cc1f8b1bcb48791139ab3baa4e022:d1d55e407d8ecf16cfcabc2fa509e769:857892d324edade16f98a344005c60d5$ textureFileName homeUi.png diff --git a/assets/UI/UI/pop/homeUi.plist.meta b/assets/UI/UI/pop/homeUi.plist.meta index c0bef1c..14c55e7 100644 --- a/assets/UI/UI/pop/homeUi.plist.meta +++ b/assets/UI/UI/pop/homeUi.plist.meta @@ -4,8 +4,8 @@ "importer": "asset", "rawTextureUuid": "3561ddde-7a87-4cfd-9609-637005f4602b", "size": { - "width": 1008, - "height": 512 + "width": 1028, + "height": 507 }, "type": "Texture Packer", "subMetas": { @@ -19,8 +19,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 719, - "trimY": 411, + "trimX": 163, + "trimY": 237, "width": 76, "height": 82, "rawWidth": 76, @@ -39,11 +39,11 @@ "rawTextureUuid": "3561ddde-7a87-4cfd-9609-637005f4602b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 601, - "trimY": 99, + "trimX": 99, + "trimY": 1, "width": 312, "height": 62, "rawWidth": 312, @@ -62,11 +62,11 @@ "rawTextureUuid": "3561ddde-7a87-4cfd-9609-637005f4602b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 922, - "trimY": 439, + "trimX": 949, + "trimY": 405, "width": 70, "height": 71, "rawWidth": 70, @@ -85,11 +85,11 @@ "rawTextureUuid": "3561ddde-7a87-4cfd-9609-637005f4602b", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 523, - "trimY": 163, + "trimX": 201, + "trimY": 1, "width": 200, "height": 216, "rawWidth": 200, @@ -101,6 +101,29 @@ "spriteType": "normal", "subMetas": {} }, + "diguan.png": { + "ver": "1.0.6", + "uuid": "c281f2f9-2807-4bb8-99d4-7539f1ee9a72", + "importer": "sprite-frame", + "rawTextureUuid": "3561ddde-7a87-4cfd-9609-637005f4602b", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 163, + "trimY": 1, + "width": 234, + "height": 36, + "rawWidth": 234, + "rawHeight": 36, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, "dijiguan.png": { "ver": "1.0.6", "uuid": "e080aa54-03de-469f-9954-14b4b1d22c18", @@ -108,10 +131,10 @@ "rawTextureUuid": "3561ddde-7a87-4cfd-9609-637005f4602b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 601, + "trimX": 1, "trimY": 1, "width": 314, "height": 96, @@ -134,8 +157,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 353, - "trimY": 357, + "trimX": 911, + "trimY": 157, "width": 116, "height": 122, "rawWidth": 116, @@ -157,8 +180,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 741, - "trimY": 163, + "trimX": 911, + "trimY": 281, "width": 116, "height": 122, "rawWidth": 116, @@ -180,8 +203,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 741, - "trimY": 287, + "trimX": 419, + "trimY": 157, "width": 116, "height": 122, "rawWidth": 116, @@ -200,11 +223,11 @@ "rawTextureUuid": "3561ddde-7a87-4cfd-9609-637005f4602b", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 471, - "trimY": 365, + "trimX": 537, + "trimY": 157, "width": 116, "height": 122, "rawWidth": 116, @@ -223,11 +246,11 @@ "rawTextureUuid": "3561ddde-7a87-4cfd-9609-637005f4602b", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, "trimX": 1, - "trimY": 357, + "trimY": 317, "width": 154, "height": 174, "rawWidth": 154, @@ -246,11 +269,11 @@ "rawTextureUuid": "3561ddde-7a87-4cfd-9609-637005f4602b", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 177, - "trimY": 357, + "trimX": 157, + "trimY": 315, "width": 154, "height": 174, "rawWidth": 154, @@ -272,8 +295,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 157, + "trimX": 389, + "trimY": 293, "width": 520, "height": 198, "rawWidth": 520, @@ -295,8 +318,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 859, - "trimY": 163, + "trimX": 313, + "trimY": 315, "width": 150, "height": 65, "rawWidth": 150, @@ -318,7 +341,7 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1, + "trimX": 403, "trimY": 1, "width": 154, "height": 598, @@ -341,8 +364,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 917, - "trimY": 1, + "trimX": 247, + "trimY": 219, "width": 94, "height": 90, "rawWidth": 98, @@ -364,8 +387,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 884, - "trimY": 439, + "trimX": 911, + "trimY": 405, "width": 72, "height": 36, "rawWidth": 72, @@ -384,11 +407,11 @@ "rawTextureUuid": "3561ddde-7a87-4cfd-9609-637005f4602b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 917, - "trimY": 97, + "trimX": 339, + "trimY": 219, "width": 73, "height": 38, "rawWidth": 73, @@ -410,8 +433,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 844, - "trimY": 439, + "trimX": 379, + "trimY": 219, "width": 72, "height": 38, "rawWidth": 72, @@ -430,11 +453,11 @@ "rawTextureUuid": "3561ddde-7a87-4cfd-9609-637005f4602b", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 595, - "trimY": 365, + "trimX": 655, + "trimY": 157, "width": 116, "height": 122, "rawWidth": 116, @@ -453,11 +476,11 @@ "rawTextureUuid": "3561ddde-7a87-4cfd-9609-637005f4602b", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 803, - "trimY": 411, + "trimX": 313, + "trimY": 467, "width": 74, "height": 39, "rawWidth": 74, @@ -479,8 +502,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 859, - "trimY": 315, + "trimX": 773, + "trimY": 157, "width": 116, "height": 122, "rawWidth": 116, diff --git a/assets/UI/UI/pop/homeUi.png b/assets/UI/UI/pop/homeUi.png index f95c7d4..ce68498 100644 Binary files a/assets/UI/UI/pop/homeUi.png and b/assets/UI/UI/pop/homeUi.png differ diff --git a/assets/UI/UI/pop/homeUi.png.meta b/assets/UI/UI/pop/homeUi.png.meta index be65614..ce0d1f3 100644 --- a/assets/UI/UI/pop/homeUi.png.meta +++ b/assets/UI/UI/pop/homeUi.png.meta @@ -8,8 +8,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 512, - "height": 1008, + "width": 1028, + "height": 507, "platformSettings": {}, "subMetas": {} } \ No newline at end of file diff --git a/assets/res/font/font.png.meta b/assets/res/font/font.png.meta index 8506a23..d49cbc3 100644 --- a/assets/res/font/font.png.meta +++ b/assets/res/font/font.png.meta @@ -8,8 +8,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 252, - "height": 1783, + "width": 251, + "height": 1862, "platformSettings": {}, "subMetas": {} } \ No newline at end of file