diff --git a/assets/bundle1/images/FailedDialog.png.meta b/assets/bundle1/images/FailedDialog.png.meta index 57bd43f..a6dfd8b 100644 --- a/assets/bundle1/images/FailedDialog.png.meta +++ b/assets/bundle1/images/FailedDialog.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 750, - "height": 1334, + "offsetX": 27, + "offsetY": 105, + "trimX": 132, + "trimY": 260, + "width": 540, + "height": 604, "rawWidth": 750, "rawHeight": 1334, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -375, - -667, + -270, + -302, 0, - 375, - -667, + 270, + -302, 0, - -375, - 667, + -270, + 302, 0, - 375, - 667, + 270, + 302, 0 ], "indexes": [ @@ -82,40 +82,40 @@ 3 ], "uv": [ - 0, - 1334, - 750, - 1334, - 0, - 0, - 750, - 0 + 132, + 1074, + 672, + 1074, + 132, + 470, + 672, + 470 ], "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 + 0.176, + 0.3523238380809595, + 0.896, + 0.3523238380809595, + 0.176, + 0.8050974512743628, + 0.896, + 0.8050974512743628 ], "minPos": [ - -375, - -667, + -270, + -302, 0 ], "maxPos": [ - 375, - 667, + 270, + 302, 0 ] }, "isUuid": true, "imageUuidOrDatabaseUri": "7f9ff6b4-469e-4cef-8422-8f8f93399f82@6c48a", "atlasUuid": "", - "trimType": "none" + "trimType": "auto" }, "ver": "1.0.12", "imported": true, diff --git a/assets/resources/anim/bonus/bonus.anim b/assets/resources/anim/bonus/bonus.anim index 32d8c67..25894e8 100644 --- a/assets/resources/anim/bonus/bonus.anim +++ b/assets/resources/anim/bonus/bonus.anim @@ -11,7 +11,7 @@ "speed": 1, "wrapMode": 2, "enableTrsBlending": false, - "_duration": 0.35, + "_duration": 0.7666666666666667, "_hash": 500763545, "_tracks": [ { @@ -65,27 +65,52 @@ 0.08333333333333333, 0.16666666666666666, 0.25, - 0.3333333333333333 + 0.3333333333333333, + 0.4166666666666667, + 0.5, + 0.5833333333333334, + 0.6666666666666666, + 0.75 ], "_values": [ { - "__uuid__": "ef0a4723-ab8e-481f-9567-e9b2a1400181@f9941", + "__uuid__": "0c8fa9a5-4398-4f07-8a30-43d095c86166@f9941", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "3cbd569e-fed7-4498-87b4-11444552dfb5@f9941", + "__uuid__": "1a0ba48e-decf-45ed-ad1c-b4ffe4bb026d@f9941", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "4d9cec20-8b34-46e7-9251-59272d42b227@f9941", + "__uuid__": "2ad61ce1-f066-4425-a0e9-6fef6e2281d8@f9941", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "67702aaf-c444-4d4c-8605-026cdbe6fee5@f9941", + "__uuid__": "ba49cb33-892c-4393-92e8-0db572e356f7@f9941", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "05946790-3cbd-42a1-a3b9-523d0e99ea3a@f9941", + "__uuid__": "d625ba79-123b-4b31-a00a-09cbfde00949@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "628a9965-98f2-44bf-95cb-478d5d400c78@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "fe6c28cf-53fa-4578-9298-fde0bc90a247@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "c73fa3bc-7317-4e1a-b957-f74339d6c61e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "ce18bf0f-d214-4424-912b-2a6f6e3b1730@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "14a1172b-f70b-4323-9649-15d9e2eb7904@f9941", "__expectedType__": "cc.SpriteFrame" } ] diff --git a/assets/resources/anim/bonus/合成 1_00000.png b/assets/resources/anim/bonus/合成 1_00000.png new file mode 100644 index 0000000..8e4fc6b Binary files /dev/null and b/assets/resources/anim/bonus/合成 1_00000.png differ diff --git a/assets/resources/anim/bonus/合成 1_00000.png.meta b/assets/resources/anim/bonus/合成 1_00000.png.meta new file mode 100644 index 0000000..84b8b6a --- /dev/null +++ b/assets/resources/anim/bonus/合成 1_00000.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "0c8fa9a5-4398-4f07-8a30-43d095c86166", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "0c8fa9a5-4398-4f07-8a30-43d095c86166@6c48a", + "displayName": "合成 1_00000", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "0c8fa9a5-4398-4f07-8a30-43d095c86166", + "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": "0c8fa9a5-4398-4f07-8a30-43d095c86166@f9941", + "displayName": "合成 1_00000", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 720, + "height": 1280, + "rawWidth": 720, + "rawHeight": 1280, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -360, + -640, + 0, + 360, + -640, + 0, + -360, + 640, + 0, + 360, + 640, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 1280, + 720, + 1280, + 0, + 0, + 720, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -360, + -640, + 0 + ], + "maxPos": [ + 360, + 640, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c8fa9a5-4398-4f07-8a30-43d095c86166@6c48a", + "atlasUuid": "", + "trimType": "none" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "0c8fa9a5-4398-4f07-8a30-43d095c86166@6c48a" + } +} diff --git a/assets/resources/anim/bonus/合成 1_00001.png b/assets/resources/anim/bonus/合成 1_00001.png new file mode 100644 index 0000000..db1c40e Binary files /dev/null and b/assets/resources/anim/bonus/合成 1_00001.png differ diff --git a/assets/resources/anim/bonus/合成 1_00001.png.meta b/assets/resources/anim/bonus/合成 1_00001.png.meta new file mode 100644 index 0000000..727240c --- /dev/null +++ b/assets/resources/anim/bonus/合成 1_00001.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "1a0ba48e-decf-45ed-ad1c-b4ffe4bb026d", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "1a0ba48e-decf-45ed-ad1c-b4ffe4bb026d@6c48a", + "displayName": "合成 1_00001", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "1a0ba48e-decf-45ed-ad1c-b4ffe4bb026d", + "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": "1a0ba48e-decf-45ed-ad1c-b4ffe4bb026d@f9941", + "displayName": "合成 1_00001", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 720, + "height": 1280, + "rawWidth": 720, + "rawHeight": 1280, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -360, + -640, + 0, + 360, + -640, + 0, + -360, + 640, + 0, + 360, + 640, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 1280, + 720, + 1280, + 0, + 0, + 720, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -360, + -640, + 0 + ], + "maxPos": [ + 360, + 640, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "1a0ba48e-decf-45ed-ad1c-b4ffe4bb026d@6c48a", + "atlasUuid": "", + "trimType": "none" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "1a0ba48e-decf-45ed-ad1c-b4ffe4bb026d@6c48a" + } +} diff --git a/assets/resources/anim/bonus/合成 1_00002.png b/assets/resources/anim/bonus/合成 1_00002.png new file mode 100644 index 0000000..ac79bfb Binary files /dev/null and b/assets/resources/anim/bonus/合成 1_00002.png differ diff --git a/assets/resources/anim/bonus/合成 1_00002.png.meta b/assets/resources/anim/bonus/合成 1_00002.png.meta new file mode 100644 index 0000000..f51931f --- /dev/null +++ b/assets/resources/anim/bonus/合成 1_00002.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "2ad61ce1-f066-4425-a0e9-6fef6e2281d8", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "2ad61ce1-f066-4425-a0e9-6fef6e2281d8@6c48a", + "displayName": "合成 1_00002", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "2ad61ce1-f066-4425-a0e9-6fef6e2281d8", + "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": "2ad61ce1-f066-4425-a0e9-6fef6e2281d8@f9941", + "displayName": "合成 1_00002", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 720, + "height": 1280, + "rawWidth": 720, + "rawHeight": 1280, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -360, + -640, + 0, + 360, + -640, + 0, + -360, + 640, + 0, + 360, + 640, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 1280, + 720, + 1280, + 0, + 0, + 720, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -360, + -640, + 0 + ], + "maxPos": [ + 360, + 640, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "2ad61ce1-f066-4425-a0e9-6fef6e2281d8@6c48a", + "atlasUuid": "", + "trimType": "none" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "2ad61ce1-f066-4425-a0e9-6fef6e2281d8@6c48a" + } +} diff --git a/assets/resources/anim/bonus/合成 1_00003.png b/assets/resources/anim/bonus/合成 1_00003.png new file mode 100644 index 0000000..93d9556 Binary files /dev/null and b/assets/resources/anim/bonus/合成 1_00003.png differ diff --git a/assets/resources/anim/bonus/合成 1_00003.png.meta b/assets/resources/anim/bonus/合成 1_00003.png.meta new file mode 100644 index 0000000..2b85745 --- /dev/null +++ b/assets/resources/anim/bonus/合成 1_00003.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "ba49cb33-892c-4393-92e8-0db572e356f7", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "ba49cb33-892c-4393-92e8-0db572e356f7@6c48a", + "displayName": "合成 1_00003", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "ba49cb33-892c-4393-92e8-0db572e356f7", + "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": "ba49cb33-892c-4393-92e8-0db572e356f7@f9941", + "displayName": "合成 1_00003", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 720, + "height": 1280, + "rawWidth": 720, + "rawHeight": 1280, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -360, + -640, + 0, + 360, + -640, + 0, + -360, + 640, + 0, + 360, + 640, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 1280, + 720, + 1280, + 0, + 0, + 720, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -360, + -640, + 0 + ], + "maxPos": [ + 360, + 640, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "ba49cb33-892c-4393-92e8-0db572e356f7@6c48a", + "atlasUuid": "", + "trimType": "none" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "ba49cb33-892c-4393-92e8-0db572e356f7@6c48a" + } +} diff --git a/assets/resources/anim/bonus/合成 1_00004.png b/assets/resources/anim/bonus/合成 1_00004.png new file mode 100644 index 0000000..ca34abb Binary files /dev/null and b/assets/resources/anim/bonus/合成 1_00004.png differ diff --git a/assets/resources/anim/bonus/合成 1_00004.png.meta b/assets/resources/anim/bonus/合成 1_00004.png.meta new file mode 100644 index 0000000..5cf5398 --- /dev/null +++ b/assets/resources/anim/bonus/合成 1_00004.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "d625ba79-123b-4b31-a00a-09cbfde00949", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "d625ba79-123b-4b31-a00a-09cbfde00949@6c48a", + "displayName": "合成 1_00004", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "d625ba79-123b-4b31-a00a-09cbfde00949", + "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": "d625ba79-123b-4b31-a00a-09cbfde00949@f9941", + "displayName": "合成 1_00004", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 720, + "height": 1280, + "rawWidth": 720, + "rawHeight": 1280, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -360, + -640, + 0, + 360, + -640, + 0, + -360, + 640, + 0, + 360, + 640, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 1280, + 720, + 1280, + 0, + 0, + 720, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -360, + -640, + 0 + ], + "maxPos": [ + 360, + 640, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "d625ba79-123b-4b31-a00a-09cbfde00949@6c48a", + "atlasUuid": "", + "trimType": "none" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "d625ba79-123b-4b31-a00a-09cbfde00949@6c48a" + } +} diff --git a/assets/resources/anim/bonus/合成 1_00005.png b/assets/resources/anim/bonus/合成 1_00005.png new file mode 100644 index 0000000..c6be803 Binary files /dev/null and b/assets/resources/anim/bonus/合成 1_00005.png differ diff --git a/assets/resources/anim/bonus/合成 1_00005.png.meta b/assets/resources/anim/bonus/合成 1_00005.png.meta new file mode 100644 index 0000000..0f356af --- /dev/null +++ b/assets/resources/anim/bonus/合成 1_00005.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "628a9965-98f2-44bf-95cb-478d5d400c78", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "628a9965-98f2-44bf-95cb-478d5d400c78@6c48a", + "displayName": "合成 1_00005", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "628a9965-98f2-44bf-95cb-478d5d400c78", + "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": "628a9965-98f2-44bf-95cb-478d5d400c78@f9941", + "displayName": "合成 1_00005", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 720, + "height": 1280, + "rawWidth": 720, + "rawHeight": 1280, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -360, + -640, + 0, + 360, + -640, + 0, + -360, + 640, + 0, + 360, + 640, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 1280, + 720, + 1280, + 0, + 0, + 720, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -360, + -640, + 0 + ], + "maxPos": [ + 360, + 640, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "628a9965-98f2-44bf-95cb-478d5d400c78@6c48a", + "atlasUuid": "", + "trimType": "none" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "628a9965-98f2-44bf-95cb-478d5d400c78@6c48a" + } +} diff --git a/assets/resources/anim/bonus/合成 1_00006.png b/assets/resources/anim/bonus/合成 1_00006.png new file mode 100644 index 0000000..a9606b8 Binary files /dev/null and b/assets/resources/anim/bonus/合成 1_00006.png differ diff --git a/assets/resources/anim/bonus/合成 1_00006.png.meta b/assets/resources/anim/bonus/合成 1_00006.png.meta new file mode 100644 index 0000000..f92ef4b --- /dev/null +++ b/assets/resources/anim/bonus/合成 1_00006.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "fe6c28cf-53fa-4578-9298-fde0bc90a247", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "fe6c28cf-53fa-4578-9298-fde0bc90a247@6c48a", + "displayName": "合成 1_00006", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "fe6c28cf-53fa-4578-9298-fde0bc90a247", + "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": "fe6c28cf-53fa-4578-9298-fde0bc90a247@f9941", + "displayName": "合成 1_00006", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 720, + "height": 1280, + "rawWidth": 720, + "rawHeight": 1280, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -360, + -640, + 0, + 360, + -640, + 0, + -360, + 640, + 0, + 360, + 640, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 1280, + 720, + 1280, + 0, + 0, + 720, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -360, + -640, + 0 + ], + "maxPos": [ + 360, + 640, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "fe6c28cf-53fa-4578-9298-fde0bc90a247@6c48a", + "atlasUuid": "", + "trimType": "none" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "fe6c28cf-53fa-4578-9298-fde0bc90a247@6c48a" + } +} diff --git a/assets/resources/anim/bonus/合成 1_00007.png b/assets/resources/anim/bonus/合成 1_00007.png new file mode 100644 index 0000000..a7fc7d5 Binary files /dev/null and b/assets/resources/anim/bonus/合成 1_00007.png differ diff --git a/assets/resources/anim/bonus/合成 1_00007.png.meta b/assets/resources/anim/bonus/合成 1_00007.png.meta new file mode 100644 index 0000000..2d5c63a --- /dev/null +++ b/assets/resources/anim/bonus/合成 1_00007.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "c73fa3bc-7317-4e1a-b957-f74339d6c61e", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "c73fa3bc-7317-4e1a-b957-f74339d6c61e@6c48a", + "displayName": "合成 1_00007", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "c73fa3bc-7317-4e1a-b957-f74339d6c61e", + "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": "c73fa3bc-7317-4e1a-b957-f74339d6c61e@f9941", + "displayName": "合成 1_00007", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 720, + "height": 1280, + "rawWidth": 720, + "rawHeight": 1280, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -360, + -640, + 0, + 360, + -640, + 0, + -360, + 640, + 0, + 360, + 640, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 1280, + 720, + 1280, + 0, + 0, + 720, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -360, + -640, + 0 + ], + "maxPos": [ + 360, + 640, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "c73fa3bc-7317-4e1a-b957-f74339d6c61e@6c48a", + "atlasUuid": "", + "trimType": "none" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "c73fa3bc-7317-4e1a-b957-f74339d6c61e@6c48a" + } +} diff --git a/assets/resources/anim/bonus/合成 1_00008.png b/assets/resources/anim/bonus/合成 1_00008.png new file mode 100644 index 0000000..bcbe403 Binary files /dev/null and b/assets/resources/anim/bonus/合成 1_00008.png differ diff --git a/assets/resources/anim/bonus/合成 1_00008.png.meta b/assets/resources/anim/bonus/合成 1_00008.png.meta new file mode 100644 index 0000000..23c525d --- /dev/null +++ b/assets/resources/anim/bonus/合成 1_00008.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "ce18bf0f-d214-4424-912b-2a6f6e3b1730", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "ce18bf0f-d214-4424-912b-2a6f6e3b1730@6c48a", + "displayName": "合成 1_00008", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "ce18bf0f-d214-4424-912b-2a6f6e3b1730", + "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": "ce18bf0f-d214-4424-912b-2a6f6e3b1730@f9941", + "displayName": "合成 1_00008", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 720, + "height": 1280, + "rawWidth": 720, + "rawHeight": 1280, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -360, + -640, + 0, + 360, + -640, + 0, + -360, + 640, + 0, + 360, + 640, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 1280, + 720, + 1280, + 0, + 0, + 720, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -360, + -640, + 0 + ], + "maxPos": [ + 360, + 640, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "ce18bf0f-d214-4424-912b-2a6f6e3b1730@6c48a", + "atlasUuid": "", + "trimType": "none" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "ce18bf0f-d214-4424-912b-2a6f6e3b1730@6c48a" + } +} diff --git a/assets/resources/anim/bonus/合成 1_00009.png b/assets/resources/anim/bonus/合成 1_00009.png new file mode 100644 index 0000000..a047efb Binary files /dev/null and b/assets/resources/anim/bonus/合成 1_00009.png differ diff --git a/assets/resources/anim/bonus/合成 1_00009.png.meta b/assets/resources/anim/bonus/合成 1_00009.png.meta new file mode 100644 index 0000000..24fb344 --- /dev/null +++ b/assets/resources/anim/bonus/合成 1_00009.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "14a1172b-f70b-4323-9649-15d9e2eb7904", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "14a1172b-f70b-4323-9649-15d9e2eb7904@6c48a", + "displayName": "合成 1_00009", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "14a1172b-f70b-4323-9649-15d9e2eb7904", + "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": "14a1172b-f70b-4323-9649-15d9e2eb7904@f9941", + "displayName": "合成 1_00009", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 720, + "height": 1280, + "rawWidth": 720, + "rawHeight": 1280, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -360, + -640, + 0, + 360, + -640, + 0, + -360, + 640, + 0, + 360, + 640, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 1280, + 720, + 1280, + 0, + 0, + 720, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -360, + -640, + 0 + ], + "maxPos": [ + 360, + 640, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "14a1172b-f70b-4323-9649-15d9e2eb7904@6c48a", + "atlasUuid": "", + "trimType": "none" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "14a1172b-f70b-4323-9649-15d9e2eb7904@6c48a" + } +} diff --git a/assets/scenes/main.scene b/assets/scenes/main.scene index 8895211..fd68805 100644 --- a/assets/scenes/main.scene +++ b/assets/scenes/main.scene @@ -1957,7 +1957,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 11.748, - "y": -197.824, + "y": 17.002, "z": 0 }, "_lrot": { @@ -2026,12 +2026,12 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "ef0a4723-ab8e-481f-9567-e9b2a1400181@f9941", + "__uuid__": "0c8fa9a5-4398-4f07-8a30-43d095c86166@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, - "_sizeMode": 0, + "_sizeMode": 1, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -2201,8 +2201,8 @@ "_prefab": null, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 0, + "x": 24.255, + "y": -62.369, "z": 0 }, "_lrot": { @@ -2214,9 +2214,9 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 + "x": 0.8, + "y": 0.8, + "z": 0.702 }, "_mobility": 0, "_layer": 33554432, @@ -2249,8 +2249,8 @@ "_prefab": null, "_lpos": { "__type__": "cc.Vec3", - "x": -12.844, - "y": -143.518, + "x": -29.706, + "y": -257.335, "z": 0 }, "_lrot": { @@ -2362,8 +2362,8 @@ "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 750, - "height": 1334 + "width": 540, + "height": 604 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4337,13 +4337,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": -21.9, - "y": -18 + "x": -16.1, + "y": 7.4 }, "_size": { "__type__": "cc.Size", - "width": 109, - "height": 172.3 + "width": 97.4, + "height": 121.5 }, "_id": "3ca3euVMhBkrOMELnKR9Zg" }, diff --git a/assets/scripts/PlayerController.ts b/assets/scripts/PlayerController.ts index 3abd950..5486032 100644 --- a/assets/scripts/PlayerController.ts +++ b/assets/scripts/PlayerController.ts @@ -424,6 +424,8 @@ export class PlayerController extends Component { onBeginContact(selfCollider: Collider2D, otherCollider: Collider2D) { console.log('碰撞检测', selfCollider.node.name, otherCollider.node.name); + // 禁用碰撞器,防止重复触发 + otherCollider.enabled = false; if (otherCollider.node.name.startsWith('guai_')) { this.handleAttack(otherCollider); } else if (otherCollider.node.name.startsWith('box_')) { @@ -920,7 +922,7 @@ export class PlayerController extends Component { this.hideActivePopup(); }; - this.scheduleOnce(this.pendingPopupHide, 3); + // this.scheduleOnce(this.pendingPopupHide, 3); } /**