diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts index 4b74114..46e8f57 100644 --- a/assets/Script/Map.ts +++ b/assets/Script/Map.ts @@ -7295,11 +7295,12 @@ export default class MapConroler extends cc.Component { const winStreak = winRoot && winRoot.getChildByName(cc.fx.GameConfig.isRainbowWinStreak() ? "WinStreak2" : "WinStreak"); if (!winStreak) return; if (cc.fx.GameConfig.isRainbowWinStreak()) { - const count = Math.min(10, cc.fx.GameConfig.GM_INFO.winStreak); + const count = Math.max(0, Math.min(10, cc.fx.GameConfig.GM_INFO.winStreak)); winStreak.getChildByName("hammer").active = false; winStreak.getChildByName("progress").getComponent(cc.Sprite).fillRange = count / 10; winStreak.getChildByName("open").active = count >= 10; this.numberToImageNodes2(count, 10, 5, "", winStreak.getChildByName("number"), true); + this.winPanel.initRainbowWinStreak(count); return; } winStreak.getChildByName("open").active = false; diff --git a/assets/Script/module/Tool/GameTool.ts b/assets/Script/module/Tool/GameTool.ts index 44487c5..a412df3 100644 --- a/assets/Script/module/Tool/GameTool.ts +++ b/assets/Script/module/Tool/GameTool.ts @@ -2591,6 +2591,7 @@ var GameTool = { console.error(`加载spine资源失败: ${spinePath}`, err); return; } + if (!cc.isValid(iconNode, true)) return; // 检查节点是否已经有spine组件 let spineComponent = iconNode.getComponent(sp.Skeleton); diff --git a/assets/win/prefab/Win.prefab b/assets/win/prefab/Win.prefab index 97018c1..8c3c5e0 100644 --- a/assets/win/prefab/Win.prefab +++ b/assets/win/prefab/Win.prefab @@ -36,23 +36,23 @@ "__id__": 361 }, { - "__id__": 415 + "__id__": 448 }, { - "__id__": 425 + "__id__": 458 } ], "_active": true, "_components": [ { - "__id__": 450 + "__id__": 483 }, { - "__id__": 451 + "__id__": 484 } ], "_prefab": { - "__id__": 452 + "__id__": 485 }, "_opacity": 255, "_color": { @@ -13214,9 +13214,6 @@ { "__id__": 370 }, - { - "__id__": 402 - }, { "__id__": 405 }, @@ -13225,12 +13222,21 @@ }, { "__id__": 411 + }, + { + "__id__": 414 + }, + { + "__id__": 417 + }, + { + "__id__": 435 } ], - "_active": false, + "_active": true, "_components": [], "_prefab": { - "__id__": 414 + "__id__": 447 }, "_opacity": 255, "_color": { @@ -13528,7 +13534,7 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -428.611, + -404.89, -89.698, 0, 0, @@ -13601,12 +13607,15 @@ }, { "__id__": 398 + }, + { + "__id__": 401 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 401 + "__id__": 404 }, "_opacity": 255, "_color": { @@ -13657,7 +13666,7 @@ }, { "__type__": "cc.Node", - "_name": "New Sprite", + "_name": "1", "_objFlags": 0, "_parent": { "__id__": 370 @@ -13694,15 +13703,15 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -326.682, + -312, -321.921, 0, 0, 0, 0, 1, - 0, - 0, + 1, + 1, 1 ] }, @@ -13734,9 +13743,7 @@ ], "_srcBlendFactor": 770, "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "38d48664-f448-4a76-8f70-3b8696474ad8" - }, + "_spriteFrame": null, "_type": 0, "_sizeMode": 1, "_fillType": 0, @@ -13764,7 +13771,7 @@ }, { "__type__": "cc.Node", - "_name": "New Sprite", + "_name": "2", "_objFlags": 0, "_parent": { "__id__": 370 @@ -13801,15 +13808,15 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -254.36, + -236, -321.921, 0, 0, 0, 0, 1, - 0, - 0, + 1, + 1, 1 ] }, @@ -13841,9 +13848,7 @@ ], "_srcBlendFactor": 770, "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "38d48664-f448-4a76-8f70-3b8696474ad8" - }, + "_spriteFrame": null, "_type": 0, "_sizeMode": 1, "_fillType": 0, @@ -13871,7 +13876,7 @@ }, { "__type__": "cc.Node", - "_name": "New Sprite", + "_name": "3", "_objFlags": 0, "_parent": { "__id__": 370 @@ -13908,15 +13913,15 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -180.365, + -160, -321.921, 0, 0, 0, 0, 1, - 0, - 0, + 1, + 1, 1 ] }, @@ -13948,9 +13953,7 @@ ], "_srcBlendFactor": 770, "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "38d48664-f448-4a76-8f70-3b8696474ad8" - }, + "_spriteFrame": null, "_type": 0, "_sizeMode": 1, "_fillType": 0, @@ -13978,7 +13981,7 @@ }, { "__type__": "cc.Node", - "_name": "New Sprite", + "_name": "4", "_objFlags": 0, "_parent": { "__id__": 370 @@ -14015,15 +14018,15 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -106.37, + -84, -321.921, 0, 0, 0, 0, 1, - 0, - 0, + 1, + 1, 1 ] }, @@ -14055,9 +14058,7 @@ ], "_srcBlendFactor": 770, "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "38d48664-f448-4a76-8f70-3b8696474ad8" - }, + "_spriteFrame": null, "_type": 0, "_sizeMode": 1, "_fillType": 0, @@ -14085,7 +14086,7 @@ }, { "__type__": "cc.Node", - "_name": "New Sprite", + "_name": "5", "_objFlags": 0, "_parent": { "__id__": 370 @@ -14122,15 +14123,15 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -32.793, + -8, -321.921, 0, 0, 0, 0, 1, - 0, - 0, + 1, + 1, 1 ] }, @@ -14162,9 +14163,7 @@ ], "_srcBlendFactor": 770, "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "38d48664-f448-4a76-8f70-3b8696474ad8" - }, + "_spriteFrame": null, "_type": 0, "_sizeMode": 1, "_fillType": 0, @@ -14192,7 +14191,7 @@ }, { "__type__": "cc.Node", - "_name": "New Sprite", + "_name": "6", "_objFlags": 0, "_parent": { "__id__": 370 @@ -14229,15 +14228,15 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 40.784, + 68, -321.921, 0, 0, 0, 0, 1, - 0, - 0, + 1, + 1, 1 ] }, @@ -14269,9 +14268,7 @@ ], "_srcBlendFactor": 770, "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "38d48664-f448-4a76-8f70-3b8696474ad8" - }, + "_spriteFrame": null, "_type": 0, "_sizeMode": 1, "_fillType": 0, @@ -14299,7 +14296,7 @@ }, { "__type__": "cc.Node", - "_name": "New Sprite", + "_name": "7", "_objFlags": 0, "_parent": { "__id__": 370 @@ -14336,15 +14333,15 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 115.197, + 144, -321.921, 0, 0, 0, 0, 1, - 0, - 0, + 1, + 1, 1 ] }, @@ -14376,9 +14373,7 @@ ], "_srcBlendFactor": 770, "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "38d48664-f448-4a76-8f70-3b8696474ad8" - }, + "_spriteFrame": null, "_type": 0, "_sizeMode": 1, "_fillType": 0, @@ -14406,7 +14401,7 @@ }, { "__type__": "cc.Node", - "_name": "New Sprite", + "_name": "8", "_objFlags": 0, "_parent": { "__id__": 370 @@ -14443,15 +14438,15 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 189.192, + 220, -321.921, 0, 0, 0, 0, 1, - 0, - 0, + 1, + 1, 1 ] }, @@ -14483,9 +14478,7 @@ ], "_srcBlendFactor": 770, "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "38d48664-f448-4a76-8f70-3b8696474ad8" - }, + "_spriteFrame": null, "_type": 0, "_sizeMode": 1, "_fillType": 0, @@ -14513,7 +14506,7 @@ }, { "__type__": "cc.Node", - "_name": "New Sprite", + "_name": "9", "_objFlags": 0, "_parent": { "__id__": 370 @@ -14550,15 +14543,15 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 262.768, + 296, -321.921, 0, 0, 0, 0, 1, - 0, - 0, + 1, + 1, 1 ] }, @@ -14590,9 +14583,7 @@ ], "_srcBlendFactor": 770, "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "38d48664-f448-4a76-8f70-3b8696474ad8" - }, + "_spriteFrame": null, "_type": 0, "_sizeMode": 1, "_fillType": 0, @@ -14620,7 +14611,7 @@ }, { "__type__": "cc.Node", - "_name": "New Sprite", + "_name": "10", "_objFlags": 0, "_parent": { "__id__": 370 @@ -14657,15 +14648,15 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 337.599, + 372, -321.921, 0, 0, 0, 0, 1, - 0, - 0, + 1, + 1, 1 ] }, @@ -14697,9 +14688,7 @@ ], "_srcBlendFactor": 770, "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "38d48664-f448-4a76-8f70-3b8696474ad8" - }, + "_spriteFrame": null, "_type": 0, "_sizeMode": 1, "_fillType": 0, @@ -14725,6 +14714,111 @@ "fileId": "9204j79sFKyIUi8Yo+hEzT", "sync": false }, + { + "__type__": "cc.Node", + "_name": "11", + "_objFlags": 0, + "_parent": { + "__id__": 370 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 402 + } + ], + "_prefab": { + "__id__": 403 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 76, + "height": 79 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 372, + -321.921, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 401 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": null, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "fd68/bLzpK6oUjWMh0A+CU", + "sync": false + }, { "__type__": "cc.PrefabInfo", "root": { @@ -14747,11 +14841,11 @@ "_active": true, "_components": [ { - "__id__": 403 + "__id__": 406 } ], "_prefab": { - "__id__": 404 + "__id__": 407 }, "_opacity": 255, "_color": { @@ -14805,7 +14899,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 402 + "__id__": 405 }, "_enabled": true, "_materials": [ @@ -14856,11 +14950,11 @@ "_active": true, "_components": [ { - "__id__": 406 + "__id__": 409 } ], "_prefab": { - "__id__": 407 + "__id__": 410 }, "_opacity": 255, "_color": { @@ -14914,7 +15008,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 405 + "__id__": 408 }, "_enabled": true, "_materials": [ @@ -14965,11 +15059,11 @@ "_active": true, "_components": [ { - "__id__": 409 + "__id__": 412 } ], "_prefab": { - "__id__": 410 + "__id__": 413 }, "_opacity": 255, "_color": { @@ -14994,7 +15088,7 @@ "ctor": "Float64Array", "array": [ -354.175, - -100.842, + -97.712, 0, 0, 0, @@ -15023,7 +15117,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 408 + "__id__": 411 }, "_enabled": true, "_materials": [ @@ -15074,11 +15168,11 @@ "_active": true, "_components": [ { - "__id__": 412 + "__id__": 415 } ], "_prefab": { - "__id__": 413 + "__id__": 416 }, "_opacity": 255, "_color": { @@ -15103,7 +15197,7 @@ "ctor": "Float64Array", "array": [ -346.903, - -100.842, + -97.712, 0, 0, 0, @@ -15132,7 +15226,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 411 + "__id__": 414 }, "_enabled": true, "_materials": [ @@ -15172,6 +15266,1111 @@ "fileId": "ecQe8jV5pMjI1XzsPO48am", "sync": false }, + { + "__type__": "cc.Node", + "_name": "reward", + "_objFlags": 0, + "_parent": { + "__id__": 361 + }, + "_children": [ + { + "__id__": 418 + }, + { + "__id__": 421 + }, + { + "__id__": 424 + }, + { + "__id__": 427 + }, + { + "__id__": 430 + } + ], + "_active": true, + "_components": [ + { + "__id__": 433 + } + ], + "_prefab": { + "__id__": 434 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 90, + "height": 90 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 371.351, + -33.568, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "star", + "_objFlags": 0, + "_parent": { + "__id__": 417 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 419 + } + ], + "_prefab": { + "__id__": 420 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 23, + "height": 23 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 49.041, + -9.001, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 418 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "4811aeda-f6b6-4e14-820a-1ada9e82b2f9" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "e0fc641d-6f8c-4b03-afaf-6da97dc138af" + }, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "45DnzR60hFnJzYn6itnjSo", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "star", + "_objFlags": 0, + "_parent": { + "__id__": 417 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 422 + } + ], + "_prefab": { + "__id__": 423 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 23, + "height": 23 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 32.59, + 30.418, + 0, + 0, + 0, + 0, + 1, + 0.9, + 0.9, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 421 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "5c1f19bf-a801-45e3-ada5-a54a0f3bb9c2" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "e0fc641d-6f8c-4b03-afaf-6da97dc138af" + }, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "5bFYsHQINPvoGJPKg4e2pt", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "star", + "_objFlags": 0, + "_parent": { + "__id__": 417 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 425 + } + ], + "_prefab": { + "__id__": 426 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 23, + "height": 23 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 38.266, + -23.356, + 0, + 0, + 0, + 0, + 1, + 0.6, + 0.6, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 424 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "5c1f19bf-a801-45e3-ada5-a54a0f3bb9c2" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "e0fc641d-6f8c-4b03-afaf-6da97dc138af" + }, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "0eSZAbqmBB26CNftAGOc19", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "star", + "_objFlags": 0, + "_parent": { + "__id__": 417 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 428 + } + ], + "_prefab": { + "__id__": 429 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 23, + "height": 23 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -46.47, + 11.828, + 0, + 0, + 0, + 0, + 1, + 0.9, + 0.9, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 427 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "654ba8fc-0a40-4005-bdba-137b1c6c40ba" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "e0fc641d-6f8c-4b03-afaf-6da97dc138af" + }, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "81nkJ7x+1G/4xP/Bq6F8mh", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "star", + "_objFlags": 0, + "_parent": { + "__id__": 417 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 431 + } + ], + "_prefab": { + "__id__": 432 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 22, + "height": 12 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + -49.544, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 430 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "39dfb39e-f68d-4244-bfd3-77ced0c61348" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "e0fc641d-6f8c-4b03-afaf-6da97dc138af" + }, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c72WWWKV1AbI5OXjopUM3h", + "sync": false + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 417 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "86012716-ac8b-49c2-9e5e-780f0e35ab29" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "e0fc641d-6f8c-4b03-afaf-6da97dc138af" + }, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "49fIXrF11OFoU61lQlc0/+", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "avatar", + "_objFlags": 0, + "_parent": { + "__id__": 361 + }, + "_children": [ + { + "__id__": 436 + } + ], + "_active": true, + "_components": [ + { + "__id__": 445 + } + ], + "_prefab": { + "__id__": 446 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 68, + "height": 89 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 371.351, + -143.347, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "mask", + "_objFlags": 0, + "_parent": { + "__id__": 435 + }, + "_children": [ + { + "__id__": 437 + }, + { + "__id__": 440 + } + ], + "_active": true, + "_components": [ + { + "__id__": 443 + } + ], + "_prefab": { + "__id__": 444 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 62, + "height": 62 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + -10.663, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "icon", + "_objFlags": 0, + "_parent": { + "__id__": 436 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 438 + } + ], + "_prefab": { + "__id__": 439 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 62, + "height": 62 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 437 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": null, + "_type": 0, + "_sizeMode": 0, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "38lWC87p9Irb9howG3FVZu", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "sp", + "_objFlags": 0, + "_parent": { + "__id__": 436 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 441 + } + ], + "_prefab": { + "__id__": 442 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 180, + "height": 180 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0.344, + 0.344, + 1.05 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "sp.Skeleton", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 440 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" + } + ], + "paused": false, + "defaultSkin": "default", + "defaultAnimation": "", + "_preCacheMode": 0, + "_cacheMode": 0, + "loop": true, + "premultipliedAlpha": false, + "timeScale": 1, + "_accTime": 0, + "_playCount": 0, + "_frameCache": null, + "_curFrame": null, + "_skeletonCache": null, + "_animationName": "008", + "_animationQueue": [], + "_headAniInfo": null, + "_playTimes": 0, + "_isAniComplete": true, + "_N$skeletonData": null, + "_N$_defaultCacheMode": 0, + "_N$debugSlots": false, + "_N$debugBones": false, + "_N$debugMesh": false, + "_N$useTint": false, + "_N$enableBatch": false, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "17i57cve9L4K3FqJNuP0Pf", + "sync": false + }, + { + "__type__": "cc.Mask", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 436 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_spriteFrame": null, + "_type": 1, + "_segments": 64, + "_N$alphaThreshold": 0, + "_N$inverted": false, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "db54e8JMJHfKRXIMBEdJh7", + "sync": false + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 435 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "3e55ba89-80a1-43ce-a5b3-a747b9a63773" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "e0fc641d-6f8c-4b03-afaf-6da97dc138af" + }, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "94B6MXb/lMaZcFGoOqk/2K", + "sync": false + }, { "__type__": "cc.PrefabInfo", "root": { @@ -15192,23 +16391,23 @@ }, "_children": [ { - "__id__": 416 + "__id__": 449 } ], "_active": false, "_components": [ { - "__id__": 420 + "__id__": 453 }, { - "__id__": 421 + "__id__": 454 }, { - "__id__": 422 + "__id__": 455 } ], "_prefab": { - "__id__": 424 + "__id__": 457 }, "_opacity": 255, "_color": { @@ -15262,20 +16461,20 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 415 + "__id__": 448 }, "_children": [], "_active": true, "_components": [ { - "__id__": 417 + "__id__": 450 }, { - "__id__": 418 + "__id__": 451 } ], "_prefab": { - "__id__": 419 + "__id__": 452 }, "_opacity": 50, "_color": { @@ -15329,7 +16528,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 416 + "__id__": 449 }, "_enabled": true, "_materials": [ @@ -15361,7 +16560,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 416 + "__id__": 449 }, "_enabled": true, "alignMode": 1, @@ -15399,7 +16598,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 415 + "__id__": 448 }, "_enabled": true, "alignMode": 1, @@ -15426,7 +16625,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 415 + "__id__": 448 }, "_enabled": true, "_id": "" @@ -15436,7 +16635,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 415 + "__id__": 448 }, "_enabled": true, "_normalMaterial": null, @@ -15445,7 +16644,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 423 + "__id__": 456 } ], "_N$interactable": true, @@ -15501,7 +16700,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 415 + "__id__": 448 }, "_id": "" }, @@ -15535,22 +16734,22 @@ }, "_children": [ { - "__id__": 426 + "__id__": 459 }, { - "__id__": 430 + "__id__": 463 }, { - "__id__": 433 + "__id__": 466 }, { - "__id__": 441 + "__id__": 474 } ], "_active": false, "_components": [], "_prefab": { - "__id__": 449 + "__id__": 482 }, "_opacity": 255, "_color": { @@ -15604,20 +16803,20 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 425 + "__id__": 458 }, "_children": [], "_active": true, "_components": [ { - "__id__": 427 + "__id__": 460 }, { - "__id__": 428 + "__id__": 461 } ], "_prefab": { - "__id__": 429 + "__id__": 462 }, "_opacity": 200, "_color": { @@ -15671,7 +16870,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 426 + "__id__": 459 }, "_enabled": true, "_materials": [ @@ -15703,7 +16902,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 426 + "__id__": 459 }, "_enabled": true, "_id": "" @@ -15724,17 +16923,17 @@ "_name": "special_tips", "_objFlags": 0, "_parent": { - "__id__": 425 + "__id__": 458 }, "_children": [], "_active": true, "_components": [ { - "__id__": 431 + "__id__": 464 } ], "_prefab": { - "__id__": 432 + "__id__": 465 }, "_opacity": 255, "_color": { @@ -15788,7 +16987,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 430 + "__id__": 463 }, "_enabled": true, "_materials": [ @@ -15831,21 +17030,21 @@ "_name": "specialCloseBtn", "_objFlags": 0, "_parent": { - "__id__": 425 + "__id__": 458 }, "_children": [ { - "__id__": 434 + "__id__": 467 } ], "_active": true, "_components": [ { - "__id__": 438 + "__id__": 471 } ], "_prefab": { - "__id__": 440 + "__id__": 473 }, "_opacity": 255, "_color": { @@ -15899,20 +17098,20 @@ "_name": "Background", "_objFlags": 512, "_parent": { - "__id__": 433 + "__id__": 466 }, "_children": [], "_active": true, "_components": [ { - "__id__": 435 + "__id__": 468 }, { - "__id__": 436 + "__id__": 469 } ], "_prefab": { - "__id__": 437 + "__id__": 470 }, "_opacity": 255, "_color": { @@ -15966,7 +17165,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 434 + "__id__": 467 }, "_enabled": true, "_materials": [ @@ -15998,7 +17197,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 434 + "__id__": 467 }, "_enabled": false, "alignMode": 0, @@ -16036,7 +17235,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 433 + "__id__": 466 }, "_enabled": true, "_normalMaterial": null, @@ -16045,7 +17244,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 439 + "__id__": 472 } ], "_N$interactable": true, @@ -16113,7 +17312,7 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 434 + "__id__": 467 }, "_id": "" }, @@ -16143,24 +17342,24 @@ "_name": "specialStartBtn", "_objFlags": 0, "_parent": { - "__id__": 425 + "__id__": 458 }, "_children": [ { - "__id__": 442 + "__id__": 475 } ], "_active": true, "_components": [ { - "__id__": 445 + "__id__": 478 }, { - "__id__": 447 + "__id__": 480 } ], "_prefab": { - "__id__": 448 + "__id__": 481 }, "_opacity": 255, "_color": { @@ -16214,17 +17413,17 @@ "_name": "bg", "_objFlags": 512, "_parent": { - "__id__": 441 + "__id__": 474 }, "_children": [], "_active": true, "_components": [ { - "__id__": 443 + "__id__": 476 } ], "_prefab": { - "__id__": 444 + "__id__": 477 }, "_opacity": 255, "_color": { @@ -16278,7 +17477,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 442 + "__id__": 475 }, "_enabled": true, "_materials": [ @@ -16321,7 +17520,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 441 + "__id__": 474 }, "_enabled": true, "_normalMaterial": null, @@ -16330,7 +17529,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 446 + "__id__": 479 } ], "_N$interactable": true, @@ -16386,7 +17585,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 441 + "__id__": 474 }, "_id": "" }, @@ -16405,7 +17604,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 441 + "__id__": 474 }, "_enabled": true, "_id": "" diff --git a/assets/win/script/WinPanel.ts b/assets/win/script/WinPanel.ts index fff6e9f..846618b 100644 --- a/assets/win/script/WinPanel.ts +++ b/assets/win/script/WinPanel.ts @@ -10,11 +10,63 @@ interface WinPanelActions { @ccclass export default class WinPanel extends cc.Component { private actions: WinPanelActions = null; + private rainbowStars: cc.Node[] = []; + private starTime = 0; + private avatarFrame: cc.SpriteFrame = null; bind(actions: WinPanelActions) { this.actions = actions || {}; } + initRainbowWinStreak(count: number) { + const streak = this.node.getChildByName("WinStreak2"); + if (!streak) return; + count = Math.max(0, Math.min(10, count)); + const reward = streak.getChildByName("reward"); + const avatar = streak.getChildByName("avatar"); + const milestone = count > 0 ? streak.getChildByName("hammer").getChildByName(String(count)) + : streak.getChildByName("progress"); + if (milestone) { + const position = milestone.convertToWorldSpaceAR(cc.v2()); + [reward, avatar].forEach(node => { + if (node) node.x = node.parent.convertToNodeSpaceAR(position).x; + }); + } + this.rainbowStars = reward ? reward.children.filter(node => node.name === "star") : []; + this.starTime = 0; + this.update(0); + + const mask = avatar && avatar.getChildByName("mask"); + if (!mask) return; + const icon = mask.getChildByName("icon"); + const spine = mask.getChildByName("sp"); + const selected = cc.fx.GameConfig.GM_INFO.useravatarIcon || "icon_0"; + const remote = selected.length > 10; + icon.active = remote; + spine.active = !remote; + if (remote) { + icon.getComponent(cc.Sprite).spriteFrame = null; + cc.assetManager.loadRemote(selected, { ext: '.png' }, (err, texture: cc.Texture2D) => { + if (err || !texture || !cc.isValid(this, true) || !cc.isValid(icon, true) + || cc.fx.GameConfig.GM_INFO.useravatarIcon !== selected) return; + if (!this.avatarFrame) this.avatarFrame = new cc.SpriteFrame(texture); + else this.avatarFrame.setTexture(texture); + icon.getComponent(cc.Sprite).spriteFrame = this.avatarFrame; + }); + } else { + cc.fx.GameTool.loadSpineSimple(spine, cc.fx.GameTool.getActionName(selected)); + } + } + + update(dt: number) { + if (!this.rainbowStars.length) return; + this.starTime = (this.starTime + dt) % 1.8; + this.rainbowStars.forEach((star, index) => { + const phase = (this.starTime / 1.8 - index / this.rainbowStars.length) * Math.PI * 2; + star.opacity = 40 + (Math.cos(phase) + 1) * 107.5; + }); + } + setSpecialTipsVisible(visible: boolean) { const specialTips = this.node.getChildByName("specialTips"); if (specialTips) { @@ -60,6 +112,7 @@ export default class WinPanel extends cc.Component { } onDestroy() { + if (this.avatarFrame) this.avatarFrame.destroy(); this.actions = null; } } diff --git a/assets/win/texture/winStreak/0.png b/assets/win/texture/winStreak/0.png deleted file mode 100644 index 64c0b3c..0000000 Binary files a/assets/win/texture/winStreak/0.png and /dev/null differ diff --git a/assets/win/texture/winStreak/0.png.meta b/assets/win/texture/winStreak/0.png.meta deleted file mode 100644 index afe0a1f..0000000 --- a/assets/win/texture/winStreak/0.png.meta +++ /dev/null @@ -1,38 +0,0 @@ -{ - "ver": "2.3.7", - "uuid": "f3805f89-9e23-4c41-b3ca-050af73d4219", - "importer": "texture", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 35, - "height": 46, - "platformSettings": {}, - "subMetas": { - "0": { - "ver": "1.0.6", - "uuid": "b3714d8c-d213-4379-91e1-f370e284be5a", - "importer": "sprite-frame", - "rawTextureUuid": "f3805f89-9e23-4c41-b3ca-050af73d4219", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 1, - "width": 35, - "height": 44, - "rawWidth": 35, - "rawHeight": 46, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/win/texture/winStreak/1.png b/assets/win/texture/winStreak/1.png deleted file mode 100644 index 9479985..0000000 Binary files a/assets/win/texture/winStreak/1.png and /dev/null differ diff --git a/assets/win/texture/winStreak/1.png.meta b/assets/win/texture/winStreak/1.png.meta deleted file mode 100644 index d5383f7..0000000 --- a/assets/win/texture/winStreak/1.png.meta +++ /dev/null @@ -1,38 +0,0 @@ -{ - "ver": "2.3.7", - "uuid": "4e99ab88-5530-41af-83cf-82cda085e440", - "importer": "texture", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 35, - "height": 46, - "platformSettings": {}, - "subMetas": { - "1": { - "ver": "1.0.6", - "uuid": "3e533b97-626b-4c94-a6f7-e31e9a356a70", - "importer": "sprite-frame", - "rawTextureUuid": "4e99ab88-5530-41af-83cf-82cda085e440", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": -0.5, - "offsetY": 0, - "trimX": 5, - "trimY": 2, - "width": 24, - "height": 42, - "rawWidth": 35, - "rawHeight": 46, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/win/texture/winStreak/2.png b/assets/win/texture/winStreak/2.png deleted file mode 100644 index 94cdd2f..0000000 Binary files a/assets/win/texture/winStreak/2.png and /dev/null differ diff --git a/assets/win/texture/winStreak/2.png.meta b/assets/win/texture/winStreak/2.png.meta deleted file mode 100644 index e86100f..0000000 --- a/assets/win/texture/winStreak/2.png.meta +++ /dev/null @@ -1,38 +0,0 @@ -{ - "ver": "2.3.7", - "uuid": "77e99e83-70aa-4390-aff3-c160db29bdea", - "importer": "texture", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 35, - "height": 46, - "platformSettings": {}, - "subMetas": { - "2": { - "ver": "1.0.6", - "uuid": "e1d1f0a1-007e-4a71-b8a7-86a97e7f70e7", - "importer": "sprite-frame", - "rawTextureUuid": "77e99e83-70aa-4390-aff3-c160db29bdea", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": -0.5, - "offsetY": 0.5, - "trimX": 1, - "trimY": 1, - "width": 32, - "height": 43, - "rawWidth": 35, - "rawHeight": 46, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/win/texture/winStreak/3.png b/assets/win/texture/winStreak/3.png deleted file mode 100644 index c640480..0000000 Binary files a/assets/win/texture/winStreak/3.png and /dev/null differ diff --git a/assets/win/texture/winStreak/3.png.meta b/assets/win/texture/winStreak/3.png.meta deleted file mode 100644 index c245f97..0000000 --- a/assets/win/texture/winStreak/3.png.meta +++ /dev/null @@ -1,38 +0,0 @@ -{ - "ver": "2.3.7", - "uuid": "5b4887ef-625f-455a-9a08-9579c48de5c7", - "importer": "texture", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 35, - "height": 46, - "platformSettings": {}, - "subMetas": { - "3": { - "ver": "1.0.6", - "uuid": "f5f8ad0d-8b38-49cc-885d-3a3b21eec337", - "importer": "sprite-frame", - "rawTextureUuid": "5b4887ef-625f-455a-9a08-9579c48de5c7", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": -0.5, - "offsetY": 0.5, - "trimX": 2, - "trimY": 1, - "width": 30, - "height": 43, - "rawWidth": 35, - "rawHeight": 46, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/win/texture/winStreak/4.png b/assets/win/texture/winStreak/4.png deleted file mode 100644 index 69849ad..0000000 Binary files a/assets/win/texture/winStreak/4.png and /dev/null differ diff --git a/assets/win/texture/winStreak/4.png.meta b/assets/win/texture/winStreak/4.png.meta deleted file mode 100644 index a3d07e6..0000000 --- a/assets/win/texture/winStreak/4.png.meta +++ /dev/null @@ -1,38 +0,0 @@ -{ - "ver": "2.3.7", - "uuid": "a6e62d2a-ecf7-4fa8-9be9-5dcf529884f2", - "importer": "texture", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 35, - "height": 46, - "platformSettings": {}, - "subMetas": { - "4": { - "ver": "1.0.6", - "uuid": "18182812-3ca3-47a3-8073-137a629a1dfc", - "importer": "sprite-frame", - "rawTextureUuid": "a6e62d2a-ecf7-4fa8-9be9-5dcf529884f2", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": -0.5, - "offsetY": 0, - "trimX": 0, - "trimY": 1, - "width": 34, - "height": 44, - "rawWidth": 35, - "rawHeight": 46, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/win/texture/winStreak/5.png b/assets/win/texture/winStreak/5.png deleted file mode 100644 index 322d652..0000000 Binary files a/assets/win/texture/winStreak/5.png and /dev/null differ diff --git a/assets/win/texture/winStreak/5.png.meta b/assets/win/texture/winStreak/5.png.meta deleted file mode 100644 index d827a90..0000000 --- a/assets/win/texture/winStreak/5.png.meta +++ /dev/null @@ -1,38 +0,0 @@ -{ - "ver": "2.3.7", - "uuid": "d605483a-f52e-4f68-902a-1c32a1863f6d", - "importer": "texture", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 35, - "height": 46, - "platformSettings": {}, - "subMetas": { - "5": { - "ver": "1.0.6", - "uuid": "ba0a5e0f-6ce3-40de-8059-2e01dfc00245", - "importer": "sprite-frame", - "rawTextureUuid": "d605483a-f52e-4f68-902a-1c32a1863f6d", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0.5, - "trimX": 2, - "trimY": 1, - "width": 31, - "height": 43, - "rawWidth": 35, - "rawHeight": 46, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/win/texture/winStreak/6.png b/assets/win/texture/winStreak/6.png deleted file mode 100644 index 7160c45..0000000 Binary files a/assets/win/texture/winStreak/6.png and /dev/null differ diff --git a/assets/win/texture/winStreak/6.png.meta b/assets/win/texture/winStreak/6.png.meta deleted file mode 100644 index 79595af..0000000 --- a/assets/win/texture/winStreak/6.png.meta +++ /dev/null @@ -1,38 +0,0 @@ -{ - "ver": "2.3.7", - "uuid": "a70346ba-d633-495d-aa0a-b07607fa852f", - "importer": "texture", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 35, - "height": 46, - "platformSettings": {}, - "subMetas": { - "6": { - "ver": "1.0.6", - "uuid": "b57a829a-28c7-4ee0-839c-c0837ce573c1", - "importer": "sprite-frame", - "rawTextureUuid": "a70346ba-d633-495d-aa0a-b07607fa852f", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": -0.5, - "offsetY": 0, - "trimX": 1, - "trimY": 1, - "width": 32, - "height": 44, - "rawWidth": 35, - "rawHeight": 46, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/win/texture/winStreak/7.png b/assets/win/texture/winStreak/7.png deleted file mode 100644 index 17c3542..0000000 Binary files a/assets/win/texture/winStreak/7.png and /dev/null differ diff --git a/assets/win/texture/winStreak/7.png.meta b/assets/win/texture/winStreak/7.png.meta deleted file mode 100644 index 5a511b7..0000000 --- a/assets/win/texture/winStreak/7.png.meta +++ /dev/null @@ -1,38 +0,0 @@ -{ - "ver": "2.3.7", - "uuid": "22fe2c13-b72e-4325-b6fd-1c53c9ff8e09", - "importer": "texture", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 35, - "height": 46, - "platformSettings": {}, - "subMetas": { - "7": { - "ver": "1.0.6", - "uuid": "e23a49ef-4a1b-453d-9efa-43411f32f6b6", - "importer": "sprite-frame", - "rawTextureUuid": "22fe2c13-b72e-4325-b6fd-1c53c9ff8e09", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0.5, - "trimX": 0, - "trimY": 1, - "width": 35, - "height": 43, - "rawWidth": 35, - "rawHeight": 46, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/win/texture/winStreak/8.png b/assets/win/texture/winStreak/8.png deleted file mode 100644 index 42855e4..0000000 Binary files a/assets/win/texture/winStreak/8.png and /dev/null differ diff --git a/assets/win/texture/winStreak/8.png.meta b/assets/win/texture/winStreak/8.png.meta deleted file mode 100644 index 7765657..0000000 --- a/assets/win/texture/winStreak/8.png.meta +++ /dev/null @@ -1,38 +0,0 @@ -{ - "ver": "2.3.7", - "uuid": "05ec4974-4d41-4d3c-8918-a9b4c95339fb", - "importer": "texture", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 35, - "height": 46, - "platformSettings": {}, - "subMetas": { - "8": { - "ver": "1.0.6", - "uuid": "8dfb15da-9370-400d-844a-239aaf7d2067", - "importer": "sprite-frame", - "rawTextureUuid": "05ec4974-4d41-4d3c-8918-a9b4c95339fb", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0.5, - "trimX": 1, - "trimY": 0, - "width": 33, - "height": 45, - "rawWidth": 35, - "rawHeight": 46, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/win/texture/winStreak/9.png b/assets/win/texture/winStreak/9.png deleted file mode 100644 index 5d3d6ec..0000000 Binary files a/assets/win/texture/winStreak/9.png and /dev/null differ diff --git a/assets/win/texture/winStreak/9.png.meta b/assets/win/texture/winStreak/9.png.meta deleted file mode 100644 index 6ed9dfe..0000000 --- a/assets/win/texture/winStreak/9.png.meta +++ /dev/null @@ -1,38 +0,0 @@ -{ - "ver": "2.3.7", - "uuid": "0f3e6c86-96f4-4de1-8ce3-24cedf381ca6", - "importer": "texture", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 35, - "height": 46, - "platformSettings": {}, - "subMetas": { - "9": { - "ver": "1.0.6", - "uuid": "bf15dca5-4a9d-483e-a4e6-3d187f7cb764", - "importer": "sprite-frame", - "rawTextureUuid": "0f3e6c86-96f4-4de1-8ce3-24cedf381ca6", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0.5, - "trimX": 1, - "trimY": 0, - "width": 33, - "height": 45, - "rawWidth": 35, - "rawHeight": 46, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/win/texture/winStreak/dangqianguog.png b/assets/win/texture/winStreak/dangqianguog.png deleted file mode 100644 index d5140ed..0000000 Binary files a/assets/win/texture/winStreak/dangqianguog.png and /dev/null differ diff --git a/assets/win/texture/winStreak/dangqianguog.png.meta b/assets/win/texture/winStreak/dangqianguog.png.meta deleted file mode 100644 index f75b4de..0000000 --- a/assets/win/texture/winStreak/dangqianguog.png.meta +++ /dev/null @@ -1,38 +0,0 @@ -{ - "ver": "2.3.7", - "uuid": "ff9277b0-7170-4072-85e6-996db9324bc8", - "importer": "texture", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 137, - "height": 154, - "platformSettings": {}, - "subMetas": { - "dangqianguog": { - "ver": "1.0.6", - "uuid": "a8252a6e-170b-45aa-8f9f-1dd84b11b22e", - "importer": "sprite-frame", - "rawTextureUuid": "ff9277b0-7170-4072-85e6-996db9324bc8", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 137, - "height": 154, - "rawWidth": 137, - "rawHeight": 154, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/win/texture/winStreak/mofapaiduizi.png b/assets/win/texture/winStreak/mofapaiduizi.png deleted file mode 100644 index 1ba7e81..0000000 Binary files a/assets/win/texture/winStreak/mofapaiduizi.png and /dev/null differ diff --git a/assets/win/texture/winStreak/mofapaiduizi.png.meta b/assets/win/texture/winStreak/mofapaiduizi.png.meta deleted file mode 100644 index 1c524ff..0000000 --- a/assets/win/texture/winStreak/mofapaiduizi.png.meta +++ /dev/null @@ -1,38 +0,0 @@ -{ - "ver": "2.3.7", - "uuid": "0b74bf9f-3ca2-4287-b219-b8d3d591f72c", - "importer": "texture", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 463, - "height": 82, - "platformSettings": {}, - "subMetas": { - "mofapaiduizi": { - "ver": "1.0.6", - "uuid": "ea1c93ff-58c2-44d7-a18e-d9104942e1a7", - "importer": "sprite-frame", - "rawTextureUuid": "0b74bf9f-3ca2-4287-b219-b8d3d591f72c", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 463, - "height": 82, - "rawWidth": 463, - "rawHeight": 82, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/win/texture/winStreak/progress.png b/assets/win/texture/winStreak/progress.png deleted file mode 100644 index 350081b..0000000 Binary files a/assets/win/texture/winStreak/progress.png and /dev/null differ diff --git a/assets/win/texture/winStreak/progress.png.meta b/assets/win/texture/winStreak/progress.png.meta deleted file mode 100644 index 05bf8d8..0000000 --- a/assets/win/texture/winStreak/progress.png.meta +++ /dev/null @@ -1,38 +0,0 @@ -{ - "ver": "2.3.7", - "uuid": "3f1f3765-fd89-4b4b-80fd-36e75572c02c", - "importer": "texture", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 768, - "height": 58, - "platformSettings": {}, - "subMetas": { - "progress": { - "ver": "1.0.6", - "uuid": "320a2cda-5216-42d7-95ce-7c19714254fd", - "importer": "sprite-frame", - "rawTextureUuid": "3f1f3765-fd89-4b4b-80fd-36e75572c02c", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 7, - "trimY": 7, - "width": 754, - "height": 44, - "rawWidth": 768, - "rawHeight": 58, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/win/texture/winStreak/progressBg.png b/assets/win/texture/winStreak/progressBg.png deleted file mode 100644 index c067f0d..0000000 Binary files a/assets/win/texture/winStreak/progressBg.png and /dev/null differ diff --git a/assets/win/texture/winStreak/progressBg.png.meta b/assets/win/texture/winStreak/progressBg.png.meta deleted file mode 100644 index 80f6c60..0000000 --- a/assets/win/texture/winStreak/progressBg.png.meta +++ /dev/null @@ -1,38 +0,0 @@ -{ - "ver": "2.3.7", - "uuid": "fb2dbd9f-67d1-447a-8274-719e59539bc4", - "importer": "texture", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 768, - "height": 58, - "platformSettings": {}, - "subMetas": { - "progressBg": { - "ver": "1.0.6", - "uuid": "a1befb72-bde4-4940-8cb7-df53f4f01c16", - "importer": "sprite-frame", - "rawTextureUuid": "fb2dbd9f-67d1-447a-8274-719e59539bc4", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 768, - "height": 58, - "rawWidth": 768, - "rawHeight": 58, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/win/texture/winStreak/touxiangk.png b/assets/win/texture/winStreak/touxiangk.png deleted file mode 100644 index 9b2ea86..0000000 Binary files a/assets/win/texture/winStreak/touxiangk.png and /dev/null differ diff --git a/assets/win/texture/winStreak/touxiangk.png.meta b/assets/win/texture/winStreak/touxiangk.png.meta deleted file mode 100644 index 56ea03b..0000000 --- a/assets/win/texture/winStreak/touxiangk.png.meta +++ /dev/null @@ -1,38 +0,0 @@ -{ - "ver": "2.3.7", - "uuid": "d1757b77-d056-4c82-b0b8-851a6cf3f195", - "importer": "texture", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 68, - "height": 89, - "platformSettings": {}, - "subMetas": { - "touxiangk": { - "ver": "1.0.6", - "uuid": "b78b30fa-b877-4fd9-9894-320fcb73a9a5", - "importer": "sprite-frame", - "rawTextureUuid": "d1757b77-d056-4c82-b0b8-851a6cf3f195", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 68, - "height": 89, - "rawWidth": 68, - "rawHeight": 89, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file