diff --git a/assets/Scene/GameScene.fire b/assets/Scene/GameScene.fire index 5b9fe38..0bc8149 100644 --- a/assets/Scene/GameScene.fire +++ b/assets/Scene/GameScene.fire @@ -17,7 +17,7 @@ "__id__": 2 }, { - "__id__": 784 + "__id__": 808 } ], "_active": false, @@ -81,28 +81,28 @@ "__id__": 7 }, { - "__id__": 663 + "__id__": 687 }, { - "__id__": 761 + "__id__": 785 }, { - "__id__": 774 + "__id__": 798 } ], "_active": true, "_components": [ { - "__id__": 780 + "__id__": 804 }, { - "__id__": 781 + "__id__": 805 }, { - "__id__": 782 + "__id__": 806 }, { - "__id__": 783 + "__id__": 807 } ], "_prefab": null, @@ -360,7 +360,7 @@ "__id__": 11 }, { - "__id__": 640 + "__id__": 664 }, { "__id__": 285 @@ -378,7 +378,7 @@ "_active": true, "_components": [ { - "__id__": 662 + "__id__": 686 } ], "_prefab": null, @@ -574,7 +574,7 @@ "__id__": 32 }, { - "__id__": 634 + "__id__": 658 }, { "__id__": 114 @@ -583,7 +583,7 @@ "_active": true, "_components": [ { - "__id__": 639 + "__id__": 663 } ], "_prefab": null, @@ -15690,32 +15690,32 @@ }, "_children": [ { - "__id__": 567 + "__id__": 591 }, { - "__id__": 576 + "__id__": 600 }, { - "__id__": 589 + "__id__": 613 }, { - "__id__": 603 + "__id__": 627 }, { - "__id__": 623 + "__id__": 647 } ], "_active": true, "_components": [ { - "__id__": 631 + "__id__": 655 }, { - "__id__": 632 + "__id__": 656 } ], "_prefab": { - "__id__": 633 + "__id__": 657 }, "_opacity": 255, "_color": { @@ -15748,7 +15748,7 @@ 1, 1, 1, - 1 + 0 ] }, "_eulerAngles": { @@ -15798,6 +15798,9 @@ }, { "__id__": 327 + }, + { + "__id__": 567 } ], "_active": false, @@ -16180,7 +16183,7 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 237.8, + 237.79999999999995, 899.812, 0, 0, @@ -16189,7 +16192,7 @@ 1, 1, 1, - 1 + 0 ] }, "_eulerAngles": { @@ -27492,6 +27495,873 @@ "handler": "homeBtn", "customEventData": "" }, + { + "__type__": "cc.Node", + "_name": "ConfirmBox", + "_objFlags": 0, + "_parent": { + "__id__": 328 + }, + "_children": [ + { + "__id__": 568 + }, + { + "__id__": 572 + }, + { + "__id__": 575 + }, + { + "__id__": 578 + }, + { + "__id__": 581 + } + ], + "_active": false, + "_components": [ + { + "__id__": 589 + } + ], + "_prefab": { + "__id__": 590 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 0, + "height": 0 + }, + "_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": "d03LoOwNBLf5R+fpApkvGq" + }, + { + "__type__": "cc.Node", + "_name": "New Sprite(Splash)", + "_objFlags": 0, + "_parent": { + "__id__": 567 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 569 + }, + { + "__id__": 570 + } + ], + "_prefab": { + "__id__": 571 + }, + "_opacity": 120, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 3000, + "height": 3000 + }, + "_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": "ffi/gsWHVE1YyqXES33m6B" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 568 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91" + }, + "_type": 0, + "_sizeMode": 0, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "8cRMiif/hNN6iaAbdMtd8R" + }, + { + "__type__": "cc.BlockInputEvents", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 568 + }, + "_enabled": true, + "_id": "0cWfLxbfNFBZzGrLwHUf5+" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 567 + }, + "asset": { + "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" + }, + "fileId": "47UiHH16RKK6j+4cK469um", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "bg", + "_objFlags": 0, + "_parent": { + "__id__": 567 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 573 + } + ], + "_prefab": { + "__id__": 574 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 994, + "height": 1462 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0.5, + 0.5, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "2avOBz+mtGb6tL1Eg7MGNy" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 572 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "71f0494c-f638-4d7a-a826-a9407bf2b27c" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "7fxodCmFxI25tv/Q3gonMf" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 567 + }, + "asset": { + "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" + }, + "fileId": "eeHwB6Bq5CSbRJy0kYMgo0", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "title", + "_objFlags": 0, + "_parent": { + "__id__": 567 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 576 + } + ], + "_prefab": { + "__id__": 577 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 160, + "height": 50.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 330.904, + 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": "d6kwU3WEdEsrswJy4c6EIR" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 575 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "复活购买", + "_N$string": "复活购买", + "_fontSize": 40, + "_lineHeight": 40, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_styleFlags": 0, + "_underlineHeight": 0, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "4030ygK0pPmq6IRckdgSAM" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 567 + }, + "asset": { + "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" + }, + "fileId": "fa+8dDqrdLTrl/Ji8K9LMX", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "New Label", + "_objFlags": 0, + "_parent": { + "__id__": 567 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 579 + } + ], + "_prefab": { + "__id__": 580 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 0, + "b": 0, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 320, + "height": 195.6 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 89.865, + 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": "090Nw5Cm9FSYsQ2LBMwJE3" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 578 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "网络异常\n请检查网络连接后\n再次领取", + "_N$string": "网络异常\n请检查网络连接后\n再次领取", + "_fontSize": 40, + "_lineHeight": 60, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_styleFlags": 0, + "_underlineHeight": 0, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "956tKbRpJIsI8EEgoDMLFr" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 567 + }, + "asset": { + "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" + }, + "fileId": "9149ix6q1AZ4VyIjmSGbdM", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "New Sprite", + "_objFlags": 0, + "_parent": { + "__id__": 567 + }, + "_children": [ + { + "__id__": 582 + } + ], + "_active": true, + "_components": [ + { + "__id__": 585 + }, + { + "__id__": 586 + } + ], + "_prefab": { + "__id__": 588 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 519, + "height": 168 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -3.21, + -77.027, + 0, + 0, + 0, + 0, + 1, + 0.4, + 0.4, + 0 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "74z/HZBGpHUqjgRfwGluZG" + }, + { + "__type__": "cc.Node", + "_name": "New Label", + "_objFlags": 0, + "_parent": { + "__id__": 581 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 583 + } + ], + "_prefab": { + "__id__": 584 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 182.23, + "height": 100.8 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 13.174, + 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": "92FO6nOHVL6LZfCzCt48oI" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 582 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "领 取", + "_N$string": "领 取", + "_fontSize": 80, + "_lineHeight": 80, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_styleFlags": 0, + "_underlineHeight": 0, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "b0c3VmNTtPOo7I0h6ClxF0" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 567 + }, + "asset": { + "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" + }, + "fileId": "1f0NO1uLNIxrx1dYb9rOaL", + "sync": false + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 581 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "d9be6eea-569b-46da-bb80-0d9c8b8f5263" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "c1ytcQTtxK8LYcPR6vAyNA" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 581 + }, + "_enabled": true, + "_normalMaterial": null, + "_grayMaterial": null, + "duration": 0.1, + "zoomScale": 1.1, + "clickEvents": [ + { + "__id__": 587 + } + ], + "_N$interactable": true, + "_N$enableAutoGrayEffect": false, + "_N$transition": 3, + "transition": 3, + "_N$normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_N$hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_N$normalSprite": null, + "_N$pressedSprite": null, + "pressedSprite": null, + "_N$hoverSprite": null, + "hoverSprite": null, + "_N$disabledSprite": null, + "_N$target": { + "__id__": 581 + }, + "_id": "acZHZ834VK7KnYnoNpfRpv" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 327 + }, + "component": "", + "_componentId": "cf225n91VpHwZ91/vYIoSJh", + "handler": "againGet", + "customEventData": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 567 + }, + "asset": { + "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" + }, + "fileId": "58sKElg7lE9I935Fpq7n8Y", + "sync": false + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 567 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 45, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_id": "28dA6g5klD64jFnL+Csfh0" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 567 + }, + "asset": { + "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" + }, + "fileId": "", + "sync": false + }, { "__type__": "cc.Node", "_name": "tishik", @@ -27501,20 +28371,20 @@ }, "_children": [ { - "__id__": 568 + "__id__": 592 }, { - "__id__": 571 + "__id__": 595 } ], "_active": true, "_components": [ { - "__id__": 574 + "__id__": 598 } ], "_prefab": { - "__id__": 575 + "__id__": 599 }, "_opacity": 255, "_color": { @@ -27568,17 +28438,17 @@ "_name": "jixuc", "_objFlags": 0, "_parent": { - "__id__": 567 + "__id__": 591 }, "_children": [], "_active": true, "_components": [ { - "__id__": 569 + "__id__": 593 } ], "_prefab": { - "__id__": 570 + "__id__": 594 }, "_opacity": 255, "_color": { @@ -27632,7 +28502,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 568 + "__id__": 592 }, "_enabled": true, "_materials": [ @@ -27677,17 +28547,17 @@ "_name": "mmm", "_objFlags": 0, "_parent": { - "__id__": 567 + "__id__": 591 }, "_children": [], "_active": true, "_components": [ { - "__id__": 572 + "__id__": 596 } ], "_prefab": { - "__id__": 573 + "__id__": 597 }, "_opacity": 255, "_color": { @@ -27741,7 +28611,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 571 + "__id__": 595 }, "_enabled": true, "_materials": [ @@ -27786,7 +28656,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 567 + "__id__": 591 }, "_enabled": true, "_materials": [ @@ -27835,20 +28705,20 @@ }, "_children": [ { - "__id__": 577 + "__id__": 601 } ], "_active": true, "_components": [ { - "__id__": 585 + "__id__": 609 }, { - "__id__": 586 + "__id__": 610 } ], "_prefab": { - "__id__": 588 + "__id__": 612 }, "_opacity": 255, "_color": { @@ -27902,20 +28772,20 @@ "_name": "price", "_objFlags": 0, "_parent": { - "__id__": 576 + "__id__": 600 }, "_children": [ { - "__id__": 578 + "__id__": 602 }, { - "__id__": 581 + "__id__": 605 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 584 + "__id__": 608 }, "_opacity": 255, "_color": { @@ -27969,17 +28839,17 @@ "_name": "cost_6", "_objFlags": 0, "_parent": { - "__id__": 577 + "__id__": 601 }, "_children": [], "_active": true, "_components": [ { - "__id__": 579 + "__id__": 603 } ], "_prefab": { - "__id__": 580 + "__id__": 604 }, "_opacity": 255, "_color": { @@ -28033,7 +28903,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 578 + "__id__": 602 }, "_enabled": true, "_materials": [ @@ -28078,17 +28948,17 @@ "_name": "cost_10", "_objFlags": 0, "_parent": { - "__id__": 577 + "__id__": 601 }, "_children": [], "_active": true, "_components": [ { - "__id__": 582 + "__id__": 606 } ], "_prefab": { - "__id__": 583 + "__id__": 607 }, "_opacity": 255, "_color": { @@ -28142,7 +29012,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 581 + "__id__": 605 }, "_enabled": true, "_materials": [ @@ -28198,7 +29068,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 576 + "__id__": 600 }, "_enabled": true, "_materials": [ @@ -28232,7 +29102,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 576 + "__id__": 600 }, "_enabled": true, "_normalMaterial": null, @@ -28241,7 +29111,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 587 + "__id__": 611 } ], "_N$interactable": true, @@ -28331,22 +29201,22 @@ }, "_children": [ { - "__id__": 590 + "__id__": 614 }, { - "__id__": 593 + "__id__": 617 }, { - "__id__": 596 + "__id__": 620 }, { - "__id__": 599 + "__id__": 623 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 602 + "__id__": 626 }, "_opacity": 255, "_color": { @@ -28400,17 +29270,17 @@ "_name": "scoin_1", "_objFlags": 0, "_parent": { - "__id__": 589 + "__id__": 613 }, "_children": [], "_active": true, "_components": [ { - "__id__": 591 + "__id__": 615 } ], "_prefab": { - "__id__": 592 + "__id__": 616 }, "_opacity": 255, "_color": { @@ -28422,8 +29292,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 47, - "height": 63 + "width": 25, + "height": 53 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -28464,7 +29334,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 590 + "__id__": 614 }, "_enabled": true, "_materials": [ @@ -28509,17 +29379,17 @@ "_name": "scoin_0", "_objFlags": 0, "_parent": { - "__id__": 589 + "__id__": 613 }, "_children": [], "_active": true, "_components": [ { - "__id__": 594 + "__id__": 618 } ], "_prefab": { - "__id__": 595 + "__id__": 619 }, "_opacity": 255, "_color": { @@ -28532,7 +29402,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 47, - "height": 63 + "height": 51 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -28573,7 +29443,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 593 + "__id__": 617 }, "_enabled": true, "_materials": [ @@ -28618,17 +29488,17 @@ "_name": "scoin_0", "_objFlags": 0, "_parent": { - "__id__": 589 + "__id__": 613 }, "_children": [], "_active": true, "_components": [ { - "__id__": 597 + "__id__": 621 } ], "_prefab": { - "__id__": 598 + "__id__": 622 }, "_opacity": 255, "_color": { @@ -28641,7 +29511,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 47, - "height": 63 + "height": 51 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -28682,7 +29552,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 596 + "__id__": 620 }, "_enabled": true, "_materials": [ @@ -28727,17 +29597,17 @@ "_name": "scoin_0", "_objFlags": 0, "_parent": { - "__id__": 589 + "__id__": 613 }, "_children": [], "_active": true, "_components": [ { - "__id__": 600 + "__id__": 624 } ], "_prefab": { - "__id__": 601 + "__id__": 625 }, "_opacity": 255, "_color": { @@ -28750,7 +29620,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 47, - "height": 63 + "height": 51 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -28791,7 +29661,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 599 + "__id__": 623 }, "_enabled": true, "_materials": [ @@ -28851,28 +29721,28 @@ }, "_children": [ { - "__id__": 604 + "__id__": 628 }, { - "__id__": 607 + "__id__": 631 }, { - "__id__": 610 + "__id__": 634 }, { - "__id__": 613 + "__id__": 637 }, { - "__id__": 616 + "__id__": 640 }, { - "__id__": 619 + "__id__": 643 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 622 + "__id__": 646 }, "_opacity": 255, "_color": { @@ -28926,17 +29796,17 @@ "_name": "x", "_objFlags": 0, "_parent": { - "__id__": 603 + "__id__": 627 }, "_children": [], "_active": true, "_components": [ { - "__id__": 605 + "__id__": 629 } ], "_prefab": { - "__id__": 606 + "__id__": 630 }, "_opacity": 255, "_color": { @@ -28990,7 +29860,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 604 + "__id__": 628 }, "_enabled": true, "_materials": [ @@ -29035,17 +29905,17 @@ "_name": "mul1", "_objFlags": 0, "_parent": { - "__id__": 603 + "__id__": 627 }, "_children": [], "_active": true, "_components": [ { - "__id__": 608 + "__id__": 632 } ], "_prefab": { - "__id__": 609 + "__id__": 633 }, "_opacity": 255, "_color": { @@ -29057,7 +29927,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 33, + "width": 25, "height": 37 }, "_anchorPoint": { @@ -29099,7 +29969,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 607 + "__id__": 631 }, "_enabled": true, "_materials": [ @@ -29144,17 +30014,17 @@ "_name": "x", "_objFlags": 0, "_parent": { - "__id__": 603 + "__id__": 627 }, "_children": [], "_active": true, "_components": [ { - "__id__": 611 + "__id__": 635 } ], "_prefab": { - "__id__": 612 + "__id__": 636 }, "_opacity": 255, "_color": { @@ -29208,7 +30078,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 610 + "__id__": 634 }, "_enabled": true, "_materials": [ @@ -29253,17 +30123,17 @@ "_name": "mul1", "_objFlags": 0, "_parent": { - "__id__": 603 + "__id__": 627 }, "_children": [], "_active": true, "_components": [ { - "__id__": 614 + "__id__": 638 } ], "_prefab": { - "__id__": 615 + "__id__": 639 }, "_opacity": 255, "_color": { @@ -29275,7 +30145,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 33, + "width": 25, "height": 37 }, "_anchorPoint": { @@ -29317,7 +30187,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 613 + "__id__": 637 }, "_enabled": true, "_materials": [ @@ -29362,17 +30232,17 @@ "_name": "x", "_objFlags": 0, "_parent": { - "__id__": 603 + "__id__": 627 }, "_children": [], "_active": true, "_components": [ { - "__id__": 617 + "__id__": 641 } ], "_prefab": { - "__id__": 618 + "__id__": 642 }, "_opacity": 255, "_color": { @@ -29426,7 +30296,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 616 + "__id__": 640 }, "_enabled": true, "_materials": [ @@ -29471,17 +30341,17 @@ "_name": "mul1", "_objFlags": 0, "_parent": { - "__id__": 603 + "__id__": 627 }, "_children": [], "_active": true, "_components": [ { - "__id__": 620 + "__id__": 644 } ], "_prefab": { - "__id__": 621 + "__id__": 645 }, "_opacity": 255, "_color": { @@ -29493,7 +30363,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 33, + "width": 25, "height": 37 }, "_anchorPoint": { @@ -29535,7 +30405,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 619 + "__id__": 643 }, "_enabled": true, "_materials": [ @@ -29595,16 +30465,16 @@ }, "_children": [ { - "__id__": 624 + "__id__": 648 }, { - "__id__": 627 + "__id__": 651 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 630 + "__id__": 654 }, "_opacity": 255, "_color": { @@ -29658,17 +30528,17 @@ "_name": "month_2", "_objFlags": 0, "_parent": { - "__id__": 623 + "__id__": 647 }, "_children": [], "_active": true, "_components": [ { - "__id__": 625 + "__id__": 649 } ], "_prefab": { - "__id__": 626 + "__id__": 650 }, "_opacity": 255, "_color": { @@ -29680,8 +30550,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 40, - "height": 46 + "width": 38, + "height": 44 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -29722,7 +30592,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 624 + "__id__": 648 }, "_enabled": true, "_materials": [ @@ -29767,17 +30637,17 @@ "_name": "month_0", "_objFlags": 0, "_parent": { - "__id__": 623 + "__id__": 647 }, "_children": [], "_active": true, "_components": [ { - "__id__": 628 + "__id__": 652 } ], "_prefab": { - "__id__": 629 + "__id__": 653 }, "_opacity": 255, "_color": { @@ -29790,7 +30660,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 40, - "height": 46 + "height": 44 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -29831,7 +30701,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 627 + "__id__": 651 }, "_enabled": true, "_materials": [ @@ -29947,16 +30817,16 @@ }, "_children": [ { - "__id__": 635 + "__id__": 659 } ], "_active": false, "_components": [ { - "__id__": 637 + "__id__": 661 }, { - "__id__": 638 + "__id__": 662 } ], "_prefab": null, @@ -30012,13 +30882,13 @@ "_name": "skeleton", "_objFlags": 0, "_parent": { - "__id__": 634 + "__id__": 658 }, "_children": [], "_active": true, "_components": [ { - "__id__": 636 + "__id__": 660 } ], "_prefab": null, @@ -30074,7 +30944,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 635 + "__id__": 659 }, "_enabled": true, "_materials": [ @@ -30116,7 +30986,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 634 + "__id__": 658 }, "_enabled": true, "_materials": [ @@ -30146,7 +31016,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 634 + "__id__": 658 }, "_enabled": true, "alignMode": 1, @@ -30204,19 +31074,19 @@ }, "_children": [ { - "__id__": 641 + "__id__": 665 }, { - "__id__": 645 + "__id__": 669 } ], "_active": false, "_components": [ { - "__id__": 660 + "__id__": 684 }, { - "__id__": 661 + "__id__": 685 } ], "_prefab": null, @@ -30272,19 +31142,19 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 640 + "__id__": 664 }, "_children": [], "_active": true, "_components": [ { - "__id__": 642 + "__id__": 666 }, { - "__id__": 643 + "__id__": 667 }, { - "__id__": 644 + "__id__": 668 } ], "_prefab": null, @@ -30340,7 +31210,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 641 + "__id__": 665 }, "_enabled": true, "_materials": [ @@ -30372,7 +31242,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 641 + "__id__": 665 }, "_enabled": true, "alignMode": 1, @@ -30399,7 +31269,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 641 + "__id__": 665 }, "_enabled": true, "_id": "1e62ukhsJObKLFucCNzfwm" @@ -30409,23 +31279,23 @@ "_name": "newmode", "_objFlags": 0, "_parent": { - "__id__": 640 + "__id__": 664 }, "_children": [ { - "__id__": 646 + "__id__": 670 }, { - "__id__": 648 + "__id__": 672 }, { - "__id__": 650 + "__id__": 674 }, { - "__id__": 652 + "__id__": 676 }, { - "__id__": 658 + "__id__": 682 } ], "_active": true, @@ -30483,13 +31353,13 @@ "_name": "bg", "_objFlags": 0, "_parent": { - "__id__": 645 + "__id__": 669 }, "_children": [], "_active": true, "_components": [ { - "__id__": 647 + "__id__": 671 } ], "_prefab": null, @@ -30545,7 +31415,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 646 + "__id__": 670 }, "_enabled": true, "_materials": [ @@ -30577,13 +31447,13 @@ "_name": "light", "_objFlags": 0, "_parent": { - "__id__": 645 + "__id__": 669 }, "_children": [], "_active": true, "_components": [ { - "__id__": 649 + "__id__": 673 } ], "_prefab": null, @@ -30639,7 +31509,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 648 + "__id__": 672 }, "_enabled": true, "_materials": [ @@ -30671,13 +31541,13 @@ "_name": "icon", "_objFlags": 0, "_parent": { - "__id__": 645 + "__id__": 669 }, "_children": [], "_active": true, "_components": [ { - "__id__": 651 + "__id__": 675 } ], "_prefab": null, @@ -30733,7 +31603,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 650 + "__id__": 674 }, "_enabled": true, "_materials": [ @@ -30763,20 +31633,20 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 645 + "__id__": 669 }, "_children": [ { - "__id__": 653 + "__id__": 677 } ], "_active": true, "_components": [ { - "__id__": 655 + "__id__": 679 }, { - "__id__": 656 + "__id__": 680 } ], "_prefab": null, @@ -30832,13 +31702,13 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 652 + "__id__": 676 }, "_children": [], "_active": true, "_components": [ { - "__id__": 654 + "__id__": 678 } ], "_prefab": null, @@ -30894,7 +31764,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 653 + "__id__": 677 }, "_enabled": true, "_materials": [ @@ -30926,7 +31796,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 652 + "__id__": 676 }, "_enabled": true, "_materials": [ @@ -30958,7 +31828,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 652 + "__id__": 676 }, "_enabled": true, "_normalMaterial": null, @@ -30967,7 +31837,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 657 + "__id__": 681 } ], "_N$interactable": true, @@ -31023,14 +31893,14 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 652 + "__id__": 676 }, "_id": "2bhrCpcRxImqyWzBaIVVCd" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 640 + "__id__": 664 }, "component": "", "_componentId": "7fe14dRFQZKSKKAoEn4S7OU", @@ -31042,13 +31912,13 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 645 + "__id__": 669 }, "_children": [], "_active": true, "_components": [ { - "__id__": 659 + "__id__": 683 } ], "_prefab": null, @@ -31104,7 +31974,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 658 + "__id__": 682 }, "_enabled": true, "_materials": [ @@ -31136,7 +32006,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 640 + "__id__": 664 }, "_enabled": true, "alignMode": 1, @@ -31163,7 +32033,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 640 + "__id__": 664 }, "_enabled": true, "label": null, @@ -31206,19 +32076,19 @@ }, "_children": [ { - "__id__": 664 + "__id__": 688 }, { - "__id__": 667 + "__id__": 691 }, { - "__id__": 718 + "__id__": 742 } ], "_active": false, "_components": [ { - "__id__": 760 + "__id__": 784 } ], "_prefab": null, @@ -31274,16 +32144,16 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 663 + "__id__": 687 }, "_children": [], "_active": true, "_components": [ { - "__id__": 665 + "__id__": 689 }, { - "__id__": 666 + "__id__": 690 } ], "_prefab": null, @@ -31339,7 +32209,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 664 + "__id__": 688 }, "_enabled": true, "_materials": [ @@ -31371,7 +32241,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 664 + "__id__": 688 }, "_enabled": true, "_id": "14MNfl+ahOhqeYjELowhPw" @@ -31381,44 +32251,44 @@ "_name": "pause", "_objFlags": 0, "_parent": { - "__id__": 663 + "__id__": 687 }, "_children": [ { - "__id__": 668 + "__id__": 692 }, { - "__id__": 670 + "__id__": 694 }, { - "__id__": 674 + "__id__": 698 }, { - "__id__": 678 + "__id__": 702 }, { - "__id__": 685 - }, - { - "__id__": 687 - }, - { - "__id__": 691 - }, - { - "__id__": 693 - }, - { - "__id__": 695 - }, - { - "__id__": 697 - }, - { - "__id__": 704 + "__id__": 709 }, { "__id__": 711 + }, + { + "__id__": 715 + }, + { + "__id__": 717 + }, + { + "__id__": 719 + }, + { + "__id__": 721 + }, + { + "__id__": 728 + }, + { + "__id__": 735 } ], "_active": true, @@ -31476,13 +32346,13 @@ "_name": "bg", "_objFlags": 0, "_parent": { - "__id__": 667 + "__id__": 691 }, "_children": [], "_active": true, "_components": [ { - "__id__": 669 + "__id__": 693 } ], "_prefab": null, @@ -31538,7 +32408,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 668 + "__id__": 692 }, "_enabled": true, "_materials": [ @@ -31570,16 +32440,16 @@ "_name": "exit", "_objFlags": 0, "_parent": { - "__id__": 667 + "__id__": 691 }, "_children": [], "_active": true, "_components": [ { - "__id__": 671 + "__id__": 695 }, { - "__id__": 672 + "__id__": 696 } ], "_prefab": null, @@ -31635,7 +32505,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 670 + "__id__": 694 }, "_enabled": true, "_materials": [ @@ -31669,7 +32539,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 670 + "__id__": 694 }, "_enabled": true, "_normalMaterial": null, @@ -31678,7 +32548,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 673 + "__id__": 697 } ], "_N$interactable": true, @@ -31734,14 +32604,14 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 670 + "__id__": 694 }, "_id": "97kj3CvWxPG4M35kF1JIsf" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 663 + "__id__": 687 }, "component": "", "_componentId": "19d952d5kVBrLSzAIGeElFK", @@ -31753,16 +32623,16 @@ "_name": "trya", "_objFlags": 0, "_parent": { - "__id__": 667 + "__id__": 691 }, "_children": [], "_active": true, "_components": [ { - "__id__": 675 + "__id__": 699 }, { - "__id__": 676 + "__id__": 700 } ], "_prefab": null, @@ -31818,7 +32688,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 674 + "__id__": 698 }, "_enabled": true, "_materials": [ @@ -31852,7 +32722,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 674 + "__id__": 698 }, "_enabled": true, "_normalMaterial": null, @@ -31861,7 +32731,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 677 + "__id__": 701 } ], "_N$interactable": true, @@ -31917,14 +32787,14 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 674 + "__id__": 698 }, "_id": "60wEETFzRPtLLU2Qraip7E" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 663 + "__id__": 687 }, "component": "", "_componentId": "19d952d5kVBrLSzAIGeElFK", @@ -31936,23 +32806,23 @@ "_name": "btn", "_objFlags": 0, "_parent": { - "__id__": 667 + "__id__": 691 }, "_children": [ { - "__id__": 679 + "__id__": 703 } ], "_active": true, "_components": [ { - "__id__": 681 + "__id__": 705 }, { - "__id__": 682 + "__id__": 706 }, { - "__id__": 684 + "__id__": 708 } ], "_prefab": null, @@ -32008,13 +32878,13 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 678 + "__id__": 702 }, "_children": [], "_active": true, "_components": [ { - "__id__": 680 + "__id__": 704 } ], "_prefab": null, @@ -32070,7 +32940,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 679 + "__id__": 703 }, "_enabled": true, "_materials": [ @@ -32100,7 +32970,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 678 + "__id__": 702 }, "_enabled": true, "_materials": [ @@ -32134,7 +33004,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 678 + "__id__": 702 }, "_enabled": true, "_normalMaterial": null, @@ -32143,7 +33013,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 683 + "__id__": 707 } ], "_N$interactable": true, @@ -32199,7 +33069,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 678 + "__id__": 702 }, "_id": "24dgt8oDxESJcfVjgdLoZY" }, @@ -32218,7 +33088,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 678 + "__id__": 702 }, "_enabled": true, "_id": "4bRL3qYrVAv5dRBgfVjrQC" @@ -32228,13 +33098,13 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 667 + "__id__": 691 }, "_children": [], "_active": true, "_components": [ { - "__id__": 686 + "__id__": 710 } ], "_prefab": null, @@ -32290,7 +33160,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 685 + "__id__": 709 }, "_enabled": true, "_materials": [ @@ -32324,16 +33194,16 @@ "_name": "closeBtn", "_objFlags": 0, "_parent": { - "__id__": 667 + "__id__": 691 }, "_children": [], "_active": true, "_components": [ { - "__id__": 688 + "__id__": 712 }, { - "__id__": 689 + "__id__": 713 } ], "_prefab": null, @@ -32389,7 +33259,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 687 + "__id__": 711 }, "_enabled": true, "_materials": [ @@ -32423,7 +33293,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 687 + "__id__": 711 }, "_enabled": true, "_normalMaterial": null, @@ -32432,7 +33302,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 690 + "__id__": 714 } ], "_N$interactable": true, @@ -32488,7 +33358,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 687 + "__id__": 711 }, "_id": "bc//MpLz5OY6QGyDZRN589" }, @@ -32507,13 +33377,13 @@ "_name": "yinyue1", "_objFlags": 0, "_parent": { - "__id__": 667 + "__id__": 691 }, "_children": [], "_active": true, "_components": [ { - "__id__": 692 + "__id__": 716 } ], "_prefab": null, @@ -32569,7 +33439,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 691 + "__id__": 715 }, "_enabled": true, "_materials": [ @@ -32603,13 +33473,13 @@ "_name": "zhendong1", "_objFlags": 0, "_parent": { - "__id__": 667 + "__id__": 691 }, "_children": [], "_active": true, "_components": [ { - "__id__": 694 + "__id__": 718 } ], "_prefab": null, @@ -32665,7 +33535,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 693 + "__id__": 717 }, "_enabled": true, "_materials": [ @@ -32699,13 +33569,13 @@ "_name": "yinxiao", "_objFlags": 0, "_parent": { - "__id__": 667 + "__id__": 691 }, "_children": [], "_active": true, "_components": [ { - "__id__": 696 + "__id__": 720 } ], "_prefab": null, @@ -32761,7 +33631,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 695 + "__id__": 719 }, "_enabled": true, "_materials": [ @@ -32795,20 +33665,20 @@ "_name": "bg", "_objFlags": 0, "_parent": { - "__id__": 667 + "__id__": 691 }, "_children": [ { - "__id__": 698 + "__id__": 722 }, { - "__id__": 700 + "__id__": 724 } ], "_active": true, "_components": [ { - "__id__": 702 + "__id__": 726 } ], "_prefab": null, @@ -32864,13 +33734,13 @@ "_name": "open", "_objFlags": 0, "_parent": { - "__id__": 697 + "__id__": 721 }, "_children": [], "_active": true, "_components": [ { - "__id__": 699 + "__id__": 723 } ], "_prefab": null, @@ -32926,7 +33796,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 698 + "__id__": 722 }, "_enabled": true, "_materials": [ @@ -32960,13 +33830,13 @@ "_name": "close", "_objFlags": 0, "_parent": { - "__id__": 697 + "__id__": 721 }, "_children": [], "_active": false, "_components": [ { - "__id__": 701 + "__id__": 725 } ], "_prefab": null, @@ -33022,7 +33892,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 700 + "__id__": 724 }, "_enabled": true, "_materials": [ @@ -33056,7 +33926,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 697 + "__id__": 721 }, "_enabled": true, "_normalMaterial": null, @@ -33120,11 +33990,11 @@ "_N$isChecked": false, "toggleGroup": null, "checkMark": { - "__id__": 701 + "__id__": 725 }, "checkEvents": [ { - "__id__": 703 + "__id__": 727 } ], "_id": "4bv6Txm/tOTpDb9nfNgn+c" @@ -33132,7 +34002,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 663 + "__id__": 687 }, "component": "", "_componentId": "19d952d5kVBrLSzAIGeElFK", @@ -33144,20 +34014,20 @@ "_name": "bg", "_objFlags": 0, "_parent": { - "__id__": 667 + "__id__": 691 }, "_children": [ { - "__id__": 705 + "__id__": 729 }, { - "__id__": 707 + "__id__": 731 } ], "_active": true, "_components": [ { - "__id__": 709 + "__id__": 733 } ], "_prefab": null, @@ -33213,13 +34083,13 @@ "_name": "open", "_objFlags": 0, "_parent": { - "__id__": 704 + "__id__": 728 }, "_children": [], "_active": true, "_components": [ { - "__id__": 706 + "__id__": 730 } ], "_prefab": null, @@ -33275,7 +34145,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 705 + "__id__": 729 }, "_enabled": true, "_materials": [ @@ -33309,13 +34179,13 @@ "_name": "close", "_objFlags": 0, "_parent": { - "__id__": 704 + "__id__": 728 }, "_children": [], "_active": false, "_components": [ { - "__id__": 708 + "__id__": 732 } ], "_prefab": null, @@ -33371,7 +34241,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 707 + "__id__": 731 }, "_enabled": true, "_materials": [ @@ -33405,7 +34275,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 704 + "__id__": 728 }, "_enabled": true, "_normalMaterial": null, @@ -33469,11 +34339,11 @@ "_N$isChecked": false, "toggleGroup": null, "checkMark": { - "__id__": 708 + "__id__": 732 }, "checkEvents": [ { - "__id__": 710 + "__id__": 734 } ], "_id": "175VURfcRMZ4U0/08yWOOS" @@ -33481,7 +34351,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 663 + "__id__": 687 }, "component": "", "_componentId": "19d952d5kVBrLSzAIGeElFK", @@ -33493,20 +34363,20 @@ "_name": "bg", "_objFlags": 0, "_parent": { - "__id__": 667 + "__id__": 691 }, "_children": [ { - "__id__": 712 + "__id__": 736 }, { - "__id__": 714 + "__id__": 738 } ], "_active": true, "_components": [ { - "__id__": 716 + "__id__": 740 } ], "_prefab": null, @@ -33562,13 +34432,13 @@ "_name": "open", "_objFlags": 0, "_parent": { - "__id__": 711 + "__id__": 735 }, "_children": [], "_active": true, "_components": [ { - "__id__": 713 + "__id__": 737 } ], "_prefab": null, @@ -33624,7 +34494,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 712 + "__id__": 736 }, "_enabled": true, "_materials": [ @@ -33658,13 +34528,13 @@ "_name": "close", "_objFlags": 0, "_parent": { - "__id__": 711 + "__id__": 735 }, "_children": [], "_active": false, "_components": [ { - "__id__": 715 + "__id__": 739 } ], "_prefab": null, @@ -33720,7 +34590,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 714 + "__id__": 738 }, "_enabled": true, "_materials": [ @@ -33754,7 +34624,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 711 + "__id__": 735 }, "_enabled": true, "_normalMaterial": null, @@ -33818,11 +34688,11 @@ "_N$isChecked": false, "toggleGroup": null, "checkMark": { - "__id__": 715 + "__id__": 739 }, "checkEvents": [ { - "__id__": 717 + "__id__": 741 } ], "_id": "268X0b2xRIKIqgyz4MaBdG" @@ -33830,7 +34700,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 663 + "__id__": 687 }, "component": "", "_componentId": "19d952d5kVBrLSzAIGeElFK", @@ -33842,23 +34712,23 @@ "_name": "pauseTs", "_objFlags": 0, "_parent": { - "__id__": 663 + "__id__": 687 }, "_children": [ { - "__id__": 719 + "__id__": 743 }, { - "__id__": 723 + "__id__": 747 }, { - "__id__": 728 + "__id__": 752 } ], "_active": false, "_components": [ { - "__id__": 759 + "__id__": 783 } ], "_prefab": null, @@ -33914,19 +34784,19 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 718 + "__id__": 742 }, "_children": [], "_active": false, "_components": [ { - "__id__": 720 + "__id__": 744 }, { - "__id__": 721 + "__id__": 745 }, { - "__id__": 722 + "__id__": 746 } ], "_prefab": null, @@ -33982,7 +34852,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 719 + "__id__": 743 }, "_enabled": true, "_materials": [ @@ -34014,7 +34884,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 719 + "__id__": 743 }, "_enabled": true, "alignMode": 1, @@ -34041,7 +34911,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 719 + "__id__": 743 }, "_enabled": true, "_id": "c8PKNIvwRO3rt0Tp1BxG0m" @@ -34051,17 +34921,17 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 718 + "__id__": 742 }, "_children": [ { - "__id__": 724 + "__id__": 748 } ], "_active": true, "_components": [ { - "__id__": 727 + "__id__": 751 } ], "_prefab": null, @@ -34117,16 +34987,16 @@ "_name": "closet", "_objFlags": 0, "_parent": { - "__id__": 723 + "__id__": 747 }, "_children": [], "_active": false, "_components": [ { - "__id__": 725 + "__id__": 749 }, { - "__id__": 726 + "__id__": 750 } ], "_prefab": null, @@ -34182,7 +35052,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 724 + "__id__": 748 }, "_enabled": true, "_materials": [ @@ -34216,7 +35086,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 724 + "__id__": 748 }, "_enabled": true, "_normalMaterial": null, @@ -34279,7 +35149,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 724 + "__id__": 748 }, "_id": "84YaPQK8dO/q/lnhNJcwW2" }, @@ -34288,7 +35158,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 723 + "__id__": 747 }, "_enabled": true, "_materials": [ @@ -34320,32 +35190,32 @@ "_name": "Health", "_objFlags": 0, "_parent": { - "__id__": 718 + "__id__": 742 }, "_children": [ - { - "__id__": 729 - }, - { - "__id__": 731 - }, - { - "__id__": 735 - }, - { - "__id__": 741 - }, - { - "__id__": 745 - }, - { - "__id__": 749 - }, { "__id__": 753 }, { - "__id__": 757 + "__id__": 755 + }, + { + "__id__": 759 + }, + { + "__id__": 765 + }, + { + "__id__": 769 + }, + { + "__id__": 773 + }, + { + "__id__": 777 + }, + { + "__id__": 781 } ], "_active": true, @@ -34403,13 +35273,13 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 728 + "__id__": 752 }, "_children": [], "_active": true, "_components": [ { - "__id__": 730 + "__id__": 754 } ], "_prefab": null, @@ -34465,7 +35335,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 729 + "__id__": 753 }, "_enabled": true, "_materials": [ @@ -34499,17 +35369,17 @@ "_name": "yuandi", "_objFlags": 0, "_parent": { - "__id__": 728 + "__id__": 752 }, "_children": [ { - "__id__": 732 + "__id__": 756 } ], "_active": true, "_components": [ { - "__id__": 734 + "__id__": 758 } ], "_prefab": null, @@ -34565,13 +35435,13 @@ "_name": "guang", "_objFlags": 0, "_parent": { - "__id__": 731 + "__id__": 755 }, "_children": [], "_active": true, "_components": [ { - "__id__": 733 + "__id__": 757 } ], "_prefab": null, @@ -34627,7 +35497,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 732 + "__id__": 756 }, "_enabled": true, "_materials": [ @@ -34659,7 +35529,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 731 + "__id__": 755 }, "_enabled": true, "_materials": [ @@ -34691,20 +35561,20 @@ "_name": "boom_show", "_objFlags": 0, "_parent": { - "__id__": 728 + "__id__": 752 }, "_children": [ { - "__id__": 736 + "__id__": 760 }, { - "__id__": 738 + "__id__": 762 } ], "_active": true, "_components": [ { - "__id__": 740 + "__id__": 764 } ], "_prefab": null, @@ -34760,13 +35630,13 @@ "_name": "hp_-", "_objFlags": 0, "_parent": { - "__id__": 735 + "__id__": 759 }, "_children": [], "_active": false, "_components": [ { - "__id__": 737 + "__id__": 761 } ], "_prefab": null, @@ -34822,7 +35692,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 736 + "__id__": 760 }, "_enabled": true, "_materials": [ @@ -34856,13 +35726,13 @@ "_name": "hp_1", "_objFlags": 0, "_parent": { - "__id__": 735 + "__id__": 759 }, "_children": [], "_active": false, "_components": [ { - "__id__": 739 + "__id__": 763 } ], "_prefab": null, @@ -34918,7 +35788,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 738 + "__id__": 762 }, "_enabled": true, "_materials": [ @@ -34952,7 +35822,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 735 + "__id__": 759 }, "_enabled": true, "_materials": [ @@ -34986,16 +35856,16 @@ "_name": "homeBtn", "_objFlags": 0, "_parent": { - "__id__": 728 + "__id__": 752 }, "_children": [], "_active": true, "_components": [ { - "__id__": 742 + "__id__": 766 }, { - "__id__": 743 + "__id__": 767 } ], "_prefab": null, @@ -35051,7 +35921,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 741 + "__id__": 765 }, "_enabled": true, "_materials": [ @@ -35085,7 +35955,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 741 + "__id__": 765 }, "_enabled": true, "_normalMaterial": null, @@ -35094,7 +35964,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 744 + "__id__": 768 } ], "_N$interactable": true, @@ -35150,14 +36020,14 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 741 + "__id__": 765 }, "_id": "8cOgt0BzNKh6DAMeApvmL1" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 663 + "__id__": 687 }, "component": "", "_componentId": "19d952d5kVBrLSzAIGeElFK", @@ -35169,16 +36039,16 @@ "_name": "timeBtn", "_objFlags": 0, "_parent": { - "__id__": 728 + "__id__": 752 }, "_children": [], "_active": true, "_components": [ { - "__id__": 746 + "__id__": 770 }, { - "__id__": 747 + "__id__": 771 } ], "_prefab": null, @@ -35234,7 +36104,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 745 + "__id__": 769 }, "_enabled": true, "_materials": [ @@ -35268,7 +36138,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 745 + "__id__": 769 }, "_enabled": true, "_normalMaterial": null, @@ -35277,7 +36147,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 748 + "__id__": 772 } ], "_N$interactable": true, @@ -35333,14 +36203,14 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 745 + "__id__": 769 }, "_id": "17JyD8igFDkqr7xwpdwqjn" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 663 + "__id__": 687 }, "component": "", "_componentId": "19d952d5kVBrLSzAIGeElFK", @@ -35352,16 +36222,16 @@ "_name": "return", "_objFlags": 0, "_parent": { - "__id__": 728 + "__id__": 752 }, "_children": [], "_active": true, "_components": [ { - "__id__": 750 + "__id__": 774 }, { - "__id__": 751 + "__id__": 775 } ], "_prefab": null, @@ -35417,7 +36287,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 749 + "__id__": 773 }, "_enabled": true, "_materials": [ @@ -35451,7 +36321,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 749 + "__id__": 773 }, "_enabled": true, "_normalMaterial": null, @@ -35460,7 +36330,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 752 + "__id__": 776 } ], "_N$interactable": true, @@ -35516,7 +36386,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 749 + "__id__": 773 }, "_id": "0bvYtuHVZF0qYnTSZnyojv" }, @@ -35535,16 +36405,16 @@ "_name": "queding", "_objFlags": 0, "_parent": { - "__id__": 728 + "__id__": 752 }, "_children": [], "_active": false, "_components": [ { - "__id__": 754 + "__id__": 778 }, { - "__id__": 755 + "__id__": 779 } ], "_prefab": null, @@ -35600,7 +36470,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 753 + "__id__": 777 }, "_enabled": true, "_materials": [ @@ -35632,7 +36502,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 753 + "__id__": 777 }, "_enabled": true, "_normalMaterial": null, @@ -35641,7 +36511,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 756 + "__id__": 780 } ], "_N$interactable": true, @@ -35697,14 +36567,14 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 753 + "__id__": 777 }, "_id": "c3JfotjQ1BzoiA+3bn0sgx" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 663 + "__id__": 687 }, "component": "", "_componentId": "19d952d5kVBrLSzAIGeElFK", @@ -35716,13 +36586,13 @@ "_name": "result_title4", "_objFlags": 0, "_parent": { - "__id__": 728 + "__id__": 752 }, "_children": [], "_active": true, "_components": [ { - "__id__": 758 + "__id__": 782 } ], "_prefab": null, @@ -35778,7 +36648,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 757 + "__id__": 781 }, "_enabled": true, "_materials": [ @@ -35812,7 +36682,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 718 + "__id__": 742 }, "_enabled": true, "alignMode": 1, @@ -35839,20 +36709,20 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 663 + "__id__": 687 }, "_enabled": true, "music": { - "__id__": 697 + "__id__": 721 }, "effect": { - "__id__": 704 + "__id__": 728 }, "vibrate": { - "__id__": 711 + "__id__": 735 }, "exit": { - "__id__": 718 + "__id__": 742 }, "_id": "ef3nVp8O9FlpWYPlCYo9pA" }, @@ -35865,23 +36735,23 @@ }, "_children": [ { - "__id__": 762 + "__id__": 786 }, { - "__id__": 766 + "__id__": 790 }, { - "__id__": 769 + "__id__": 793 } ], "_active": false, "_components": [ { - "__id__": 772 + "__id__": 796 } ], "_prefab": { - "__id__": 773 + "__id__": 797 }, "_opacity": 255, "_color": { @@ -35935,20 +36805,20 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 761 + "__id__": 785 }, "_children": [], "_active": true, "_components": [ { - "__id__": 763 + "__id__": 787 }, { - "__id__": 764 + "__id__": 788 } ], "_prefab": { - "__id__": 765 + "__id__": 789 }, "_opacity": 120, "_color": { @@ -36002,7 +36872,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 762 + "__id__": 786 }, "_enabled": true, "_materials": [ @@ -36034,7 +36904,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 762 + "__id__": 786 }, "_enabled": true, "_id": "fdcyqVHbdJ6qjXrnxAvDP2" @@ -36042,7 +36912,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 761 + "__id__": 785 }, "asset": { "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" @@ -36055,17 +36925,17 @@ "_name": "load", "_objFlags": 0, "_parent": { - "__id__": 761 + "__id__": 785 }, "_children": [], "_active": true, "_components": [ { - "__id__": 767 + "__id__": 791 } ], "_prefab": { - "__id__": 768 + "__id__": 792 }, "_opacity": 255, "_color": { @@ -36119,7 +36989,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 766 + "__id__": 790 }, "_enabled": true, "_materials": [ @@ -36149,7 +37019,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 761 + "__id__": 785 }, "asset": { "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" @@ -36162,17 +37032,17 @@ "_name": "New Label", "_objFlags": 0, "_parent": { - "__id__": 761 + "__id__": 785 }, "_children": [], "_active": true, "_components": [ { - "__id__": 770 + "__id__": 794 } ], "_prefab": { - "__id__": 771 + "__id__": 795 }, "_opacity": 255, "_color": { @@ -36226,7 +37096,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 769 + "__id__": 793 }, "_enabled": true, "_materials": [ @@ -36257,7 +37127,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 761 + "__id__": 785 }, "asset": { "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" @@ -36270,7 +37140,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 761 + "__id__": 785 }, "_enabled": true, "alignMode": 1, @@ -36295,7 +37165,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 761 + "__id__": 785 }, "asset": { "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" @@ -36312,16 +37182,16 @@ }, "_children": [ { - "__id__": 775 + "__id__": 799 } ], "_active": false, "_components": [ { - "__id__": 778 + "__id__": 802 }, { - "__id__": 779 + "__id__": 803 } ], "_prefab": null, @@ -36377,16 +37247,16 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 774 + "__id__": 798 }, "_children": [], "_active": true, "_components": [ { - "__id__": 776 + "__id__": 800 }, { - "__id__": 777 + "__id__": 801 } ], "_prefab": null, @@ -36442,7 +37312,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 775 + "__id__": 799 }, "_enabled": true, "_materials": [ @@ -36474,7 +37344,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 775 + "__id__": 799 }, "_enabled": true, "_id": "4fwjz1lnFLD45L1lqUY038" @@ -36484,7 +37354,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 774 + "__id__": 798 }, "_enabled": true, "_materials": [ @@ -36526,7 +37396,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 774 + "__id__": 798 }, "_enabled": false, "_id": "00qpMLeBFNhYRX9r3QZvyP" @@ -36631,7 +37501,7 @@ "_active": true, "_components": [ { - "__id__": 785 + "__id__": 809 } ], "_prefab": null, @@ -36687,7 +37557,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 784 + "__id__": 808 }, "_enabled": true, "_materials": [ diff --git a/assets/Script/Block.ts b/assets/Script/Block.ts index 3e1010e..7a5f59e 100644 --- a/assets/Script/Block.ts +++ b/assets/Script/Block.ts @@ -474,7 +474,6 @@ export default class Block extends cc.Component { if (jg >= 0) { this.over = true; - // MapConroler._instance.changeState(true); this.removeBoxCollider(); this.removeMapBlock(); this.removeAction(jg, type); @@ -745,8 +744,8 @@ export default class Block extends cc.Component { } //道具魔棒消除 - eliminate() { - + eliminate(type) { + clearTimeout(this.scheduleCallback2); clearTimeout(this.scheduleCallback); clearTimeout(this.scheduleCallback3); @@ -787,14 +786,12 @@ export default class Block extends cc.Component { this.node.getChildByName("boom").getComponent("Boom").stopBoom(); } this.scheduleCallback2 = setTimeout(() => { - MapConroler._instance.blockNum -= 1; - MapConroler._instance.special_Treatment(this.node); - + MapConroler._instance.special_Treatment(this.node, type); + }, 950); this.scheduleCallback2 = setTimeout(() => { //如果方块可以消除 - // MapConroler._instance.blockNum -= 1; // MapConroler._instance.special_Treatment(this.node); var self = this; @@ -926,7 +923,7 @@ export default class Block extends cc.Component { this.scheduleCallback2 = setTimeout(() => { //如果方块可以消除 MapConroler._instance.blockNum -= 1; - MapConroler._instance.special_Treatment(this.node); + MapConroler._instance.special_Treatment(this.node, true); var self = this; this.removeMapBlock(); MapConroler._instance.judgeWin(0); @@ -1615,7 +1612,7 @@ export default class Block extends cc.Component { try { // 检查动画是否存在 if (!skeletonComponent.findAnimation("play")) { - console.error(`动画 "play" 不存在于 Spine 资源中`); + // console.error(`动画 "play" 不存在于 Spine 资源中`); return; } skeletonComponent.setAnimation(0, "play", false); @@ -1624,7 +1621,7 @@ export default class Block extends cc.Component { skeletonComponent.setCompleteListener((trackEntry, loopCount) => { // 动画播放完成后自动清理节点 if (skeletonComponent.node && skeletonComponent.node.isValid) { - console.log(`第 ${index} 个特效动画播放完成,开始清理节点`); + // console.log(`第 ${index} 个特效动画播放完成,开始清理节点`); // 移除节点并销毁 skeletonComponent.node.removeFromParent(); @@ -1633,7 +1630,7 @@ export default class Block extends cc.Component { }); } catch (error) { - console.error(`播放第 ${index} 个方块动画时出错:`, error); + // console.error(`播放第 ${index} 个方块动画时出错:`, error); } } diff --git a/assets/Script/GameManager.ts b/assets/Script/GameManager.ts index caee1cf..2f4b775 100644 --- a/assets/Script/GameManager.ts +++ b/assets/Script/GameManager.ts @@ -61,7 +61,7 @@ export default class GameManager extends cc.Component { setTimeout(() => { this.readUserData(); this.getShareInfo(); - }, 200); + }, 100); if (GameManager._instance == null) { @@ -238,7 +238,7 @@ export default class GameManager extends cc.Component { this.nowTime = Date.now(); //console.log("开始读取用户信息的时间:", this.nowTime); - const MAX_RETRIES = 15; + const MAX_RETRIES = 30; // 延迟时间数组,按照 1 秒 3 次、2 秒 5 次、5 秒 6 次、15 秒 5 次的规则生成 const delays = [ ...Array(3).fill(2000), @@ -246,7 +246,7 @@ export default class GameManager extends cc.Component { ...Array(6).fill(5000), ...Array(5).fill(15000) ]; - + //cc.fx.GameConfig.GM_INFO.shushu_DistinctId const attemptUserInfo = () => { Utils.getUserInfo((data) => { if (data.code == 1) { // 假设返回数据中有 success 字段表示成功 @@ -345,7 +345,7 @@ export default class GameManager extends cc.Component { //新用户,有本地缓存读取配置 newReadData() { - //console.log("读取新信息2"); + console.log("读取新信息"); let openid = cc.fx.StorageMessage.getStorage("openid"); if (openid == null || openid == "" || openid == undefined) { //console.log("没有openid"); @@ -356,17 +356,19 @@ export default class GameManager extends cc.Component { action: 'read' }, success: res => { - //console.log('读取用户数据成功_____________________', res.result) - if (res.result.code == 404 && res.result.message == "未找到用户数据") { - } - else if (res.result.code == 200) { - if (res.result.data) { - cc.fx.GameConfig.GM_INFO.openid = res.result.openid; - cc.fx.GameConfig.GM_INFO.username = res.result.data.username; - cc.fx.GameConfig.GM_INFO.useravatar = res.result.data.useravatar; - const register_time = res.result.data.register_time; - MiniGameSdk.API.shushu_userSet(register_time); - cc.fx.StorageMessage.setStorage("openid", cc.fx.GameConfig.GM_INFO.openid); + console.log('读取用户数据成功_____________________', res.result) + if (res.result) { + if (res.result.code == 404 && res.result.message == "未找到用户数据") { + } + else if (res.result.code == 200) { + if (res.result.data) { + cc.fx.GameConfig.GM_INFO.openid = res.result.openid; + cc.fx.GameConfig.GM_INFO.username = res.result.data.username; + cc.fx.GameConfig.GM_INFO.useravatar = res.result.data.useravatar; + const register_time = res.result.data.register_time; + MiniGameSdk.API.shushu_userSet(register_time); + cc.fx.StorageMessage.setStorage("openid", cc.fx.GameConfig.GM_INFO.openid); + } } } }, @@ -386,7 +388,7 @@ export default class GameManager extends cc.Component { } - + console.log("获取等级信息"); //等级信息 cc.fx.GameTool.getUserLevel((data) => { const timestamp = Date.now(); @@ -575,8 +577,8 @@ export default class GameManager extends cc.Component { } //旧用户,无本地缓存读取配置 oldReadData(retryCount: number) { - //console.log("________读取旧信息"); - const MAX_RETRIES = 15; + console.log("________读取旧信息"); + const MAX_RETRIES = 30; const timestamp = Date.now(); // 读取用户数据 //@ts-ignore @@ -586,112 +588,113 @@ export default class GameManager extends cc.Component { action: 'read' }, success: res => { - //console.log('11111111读取用户数据成功', res.result) - if (res.result.code == 404 && res.result.message == "未找到用户数据") { - if (res.result.openid) { - //console.log("用户从未进入过,第一次设置openid:"); - //console.log(res.result.openid); - cc.fx.GameConfig.GM_INFO.openid = res.result.openid - } - else { - //console.log("用户此一次进入游戏为正确获取openid"); - } - cc.fx.GameTool.getUserLevel((data) => { - if (data.result.code == 404 && data.result.message == "未找到关卡数据") { - //console.log("没有等级信息,从用户接口拿到数据"); - cc.fx.GameConfig.GM_INFO.first = true; - //console.log("金币成功时间耗时:", Date.now() - this.nowTime); - this.load3 = true; - this.load4 = true; - //console.log("关卡等级成功时间耗时:", Date.now() - this.nowTime); - let levelInfo = { "level": 0, "timestamp": timestamp }; - cc.fx.StorageMessage.setStorage("level", levelInfo); - let coinInfo = { "coin": 0, "timestamp": timestamp }; - //console.log("33333333333"); - cc.fx.StorageMessage.setStorage("coin", coinInfo); - let propInfo = { - "freezeAmount": 3, - "hammerAmount": 3, - "magicAmount": 3, - "timestamp": timestamp, - } - //console.log("最新上传道具信息——————————:", propInfo); - cc.fx.GameConfig.GM_INFO.freezeAmount = 3; - cc.fx.GameConfig.GM_INFO.hammerAmount = 3; - cc.fx.GameConfig.GM_INFO.magicAmount = 3; - cc.fx.StorageMessage.setStorage("prop", propInfo); - - cc.fx.GameTool.setUserInfo((data) => { - if (data.result.code == 200) { - //console.log("上传用户信息成功", data); - //@ts-ignore - wx.cloud.callFunction({ - name: 'userData', - data: { - action: 'read' - }, - success: res => { - //console.log("上传后,读取用户信息,为上报注册时间") - if (res.result.code == 200) { - const time = res.result.data.register_time; - MiniGameSdk.API.shushu_userSet(time); - } - } - }) - - //laf云函数 - Utils.getUserData((data) => { - }) + console.log('读取用户数据成功', res.result) + if (res.result) { + if (res.result.code == 404 && res.result.message == "未找到用户数据") { + if (res.result.openid) { + //console.log("用户从未进入过,第一次设置openid:"); + //console.log(res.result.openid); + cc.fx.GameConfig.GM_INFO.openid = res.result.openid + } + else { + //console.log("用户此一次进入游戏为正确获取openid"); + } + cc.fx.GameTool.getUserLevel((data) => { + if (data.result.code == 404 && data.result.message == "未找到关卡数据") { + //console.log("没有等级信息,从用户接口拿到数据"); + cc.fx.GameConfig.GM_INFO.first = true; + //console.log("金币成功时间耗时:", Date.now() - this.nowTime); + this.load3 = true; + this.load4 = true; + //console.log("关卡等级成功时间耗时:", Date.now() - this.nowTime); + let levelInfo = { "level": 0, "timestamp": timestamp }; + cc.fx.StorageMessage.setStorage("level", levelInfo); + let coinInfo = { "coin": 0, "timestamp": timestamp }; + //console.log("33333333333"); + cc.fx.StorageMessage.setStorage("coin", coinInfo); + let propInfo = { + "freezeAmount": 3, + "hammerAmount": 3, + "magicAmount": 3, + "timestamp": timestamp, } - }); - //console.log("服务器也没有金币信息", cc.fx.GameConfig.GM_INFO.coin); - cc.fx.GameTool.setUserCoin(cc.fx.GameConfig.GM_INFO.coin, (data) => { - - }); - cc.fx.GameTool.setUserLevel((data) => { - }); - setTimeout(() => { + //console.log("最新上传道具信息——————————:", propInfo); cc.fx.GameConfig.GM_INFO.freezeAmount = 3; cc.fx.GameConfig.GM_INFO.hammerAmount = 3; cc.fx.GameConfig.GM_INFO.magicAmount = 3; + cc.fx.StorageMessage.setStorage("prop", propInfo); - cc.fx.GameTool.setUserProp(0, 0, (data) => { + cc.fx.GameTool.setUserInfo((data) => { if (data.result.code == 200) { - //console.log("1111111上传道具信息成功", data); - } - else { - MiniGameSdk.API.showToast("网络异常,正在努力加载"); - setTimeout(() => { - this.oldReadData(0); - }, 1000); + //console.log("上传用户信息成功", data); + //@ts-ignore + wx.cloud.callFunction({ + name: 'userData', + data: { + action: 'read' + }, + success: res => { + //console.log("上传后,读取用户信息,为上报注册时间") + if (res.result.code == 200) { + const time = res.result.data.register_time; + MiniGameSdk.API.shushu_userSet(time); + } + } + }) + + //laf云函数 + Utils.getUserData((data) => { + }) } }); - }, 0); - } - else if (data.result.code == 200) { - //console.log("有等级信息,从关卡接口拿到数据", data.result.data); - this.readSever(timestamp); - } - }) - } - else if (res.result.code == 200) { - if (res.result.data) { - cc.fx.GameConfig.GM_INFO.openid = res.result.openid; - cc.fx.GameConfig.GM_INFO.level = res.result.data.level; - cc.fx.GameConfig.GM_INFO.coin = res.result.data.coinAmount; - cc.fx.GameConfig.GM_INFO.freezeAmount = res.result.data.freezeAmount; - cc.fx.GameConfig.GM_INFO.hammerAmount = res.result.data.hammerAmount; - cc.fx.GameConfig.GM_INFO.magicAmount = res.result.data.magicAmount; - cc.fx.GameConfig.GM_INFO.username = res.result.data.username; - cc.fx.GameConfig.GM_INFO.useravatar = res.result.data.useravatar; - cc.fx.StorageMessage.setStorage("openid", cc.fx.GameConfig.GM_INFO.openid); - const register_time = res.result.data.register_time; - MiniGameSdk.API.shushu_userSet(register_time); + //console.log("服务器也没有金币信息", cc.fx.GameConfig.GM_INFO.coin); + cc.fx.GameTool.setUserCoin(cc.fx.GameConfig.GM_INFO.coin, (data) => { + + }); + cc.fx.GameTool.setUserLevel((data) => { + }); + setTimeout(() => { + cc.fx.GameConfig.GM_INFO.freezeAmount = 3; + cc.fx.GameConfig.GM_INFO.hammerAmount = 3; + cc.fx.GameConfig.GM_INFO.magicAmount = 3; + + cc.fx.GameTool.setUserProp(0, 0, (data) => { + if (data.result.code == 200) { + //console.log("1111111上传道具信息成功", data); + } + else { + MiniGameSdk.API.showToast("网络异常,正在努力加载"); + setTimeout(() => { + this.oldReadData(0); + }, 1000); + } + }); + }, 0); + } + else if (data.result.code == 200) { + //console.log("有等级信息,从关卡接口拿到数据", data.result.data); + this.readSever(timestamp); + } + }) } - this.readSever(timestamp); + else if (res.result.code == 200) { + if (res.result.data) { + cc.fx.GameConfig.GM_INFO.openid = res.result.openid; + cc.fx.GameConfig.GM_INFO.level = res.result.data.level; + cc.fx.GameConfig.GM_INFO.coin = res.result.data.coinAmount; + cc.fx.GameConfig.GM_INFO.freezeAmount = res.result.data.freezeAmount; + cc.fx.GameConfig.GM_INFO.hammerAmount = res.result.data.hammerAmount; + cc.fx.GameConfig.GM_INFO.magicAmount = res.result.data.magicAmount; + cc.fx.GameConfig.GM_INFO.username = res.result.data.username; + cc.fx.GameConfig.GM_INFO.useravatar = res.result.data.useravatar; + cc.fx.StorageMessage.setStorage("openid", cc.fx.GameConfig.GM_INFO.openid); + const register_time = res.result.data.register_time; + MiniGameSdk.API.shushu_userSet(register_time); + } + this.readSever(timestamp); + } } - }, fail: err => { console.error('读取用户数据失败', err) @@ -935,8 +938,9 @@ export default class GameManager extends cc.Component { const uid = query.uid; cc.fx.GameConfig.GM_INFO.otherUid = uid; cc.fx.GameConfig.GM_INFO.otherLevel = level; - //console.log('从分享链接获取到的关卡信息:', level); - //console.log('从分享链接获取到的 UID:', uid); + console.log('从分享链接获取到的关卡信息:', level); + console.log('从分享链接获取到的 UID:', uid); + console.log("query:", query); // 可以在这里处理关卡信息和 UID } } diff --git a/assets/Script/JiaZai.ts b/assets/Script/JiaZai.ts index 48cf2fe..b7876e4 100644 --- a/assets/Script/JiaZai.ts +++ b/assets/Script/JiaZai.ts @@ -84,12 +84,13 @@ export default class JiaZai extends cc.Component { // LIFE-CYCLE CALLBACKS: onLoad() { - this.closeLoad(); - this.checkShare(); - console.log("进入首页获取的share", cc.fx.GameConfig.GM_INFO.otherUid, cc.fx.GameConfig.GM_INFO.otherLevel); if (cc.fx.GameConfig.GM_INFO.otherUid != "") { this.getShareInfo(); } + this.closeLoad(); + this.checkShare(); + console.log("进入首页获取的share", cc.fx.GameConfig.GM_INFO.otherUid, cc.fx.GameConfig.GM_INFO.otherLevel); + cc.game.setFrameRate(63); LQCollideSystem.is_enable = true; @@ -101,7 +102,13 @@ export default class JiaZai extends cc.Component { this.node.getChildByName("Load").getChildByName("New EditBox").active = true; } else if (version == "正式版") { - this.node.getChildByName("Load").getChildByName("New EditBox").active = false + this.node.getChildByName("Load").getChildByName("New EditBox").active = false; + if (cc.fx.GameConfig.GM_INFO.openid) { + if (cc.fx.GameConfig.GM_INFO.openid == "orm8I7N10NSQdAhN4LP04n8UP56I") { + this.node.getChildByName("Load").getChildByName("New EditBox").active = true; + cc.fx.GameTool.changeCoin(99999); + } + } } else { this.node.getChildByName("Load").getChildByName("New EditBox").active = true; @@ -214,17 +221,16 @@ export default class JiaZai extends cc.Component { } onGameShow() { - console.log("执行开始游戏gameshow") + console.log("执行开始游戏gameshow"); cc.fx.GameTool.getHealth((data) => { if (this.level) { NumberToImage.numberToImageNodes((cc.fx.GameConfig.GM_INFO.level + 1), 43, 15, "level_", this.level, true); } if (this.coin) { NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.coin, 30, 15, "coin_", this.coin, true); + this.setHealthInfo(true); } - this.setHealthInfo(true); }); - console.log("执行on", cc.fx.GameConfig.GM_INFO.min_Time); if (this) { if (this.node) { @@ -234,7 +240,6 @@ export default class JiaZai extends cc.Component { if (heathComponent && heathComponent.timeNode && cc.fx.GameConfig.GM_INFO.hp < cc.fx.GameConfig.GM_INFO.hp_Max) { this.startHeathTimeCutDown(heathComponent.timeNode); - } } } @@ -822,7 +827,21 @@ export default class JiaZai extends cc.Component { // MiniGameSdk.API.showToast(title); if (order.itemid != "month_Card") cc.fx.GameTool.shopBuy(productId, true); console.log("充值成功获得金币"); - } else { + let price = parseInt(order.goodsPrice) || 0; + // const dataSuccess = { + // outTradeNo: order.outTradeNo, + // pay_amount: price, + // payment_name: productId, + // payment_num: 1, + // type: systemType, + // } + // let name = "补发充值成功" + productId; + // cc.fx.GameTool.shushu_Track("payment", dataSuccess); + + console.log("引力付费透传", price, order.outTradeNo, name); + MiniGameSdk.API.yinli_Pay(price, order.outTradeNo, name); + } + else { MiniGameSdk.API.showToast("网络异常,充值奖励将在登录后再次发放"); const dataFail4 = { outTradeNo: order.outTradeNo, @@ -836,24 +855,9 @@ export default class JiaZai extends cc.Component { } NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.coin, 30, 15, "coin_", this.coin, true); this.updateCoin(); - // 处理下一个订单 processOrder(index + 1); }, order.outTradeNo); - let price = parseInt(order.goodsPrice) || 0; - const dataSuccess = { - outTradeNo: order.outTradeNo, - pay_amount: price, - payment_name: productId, - payment_num: 1, - type: systemType, - } - let name = "补发充值成功" + productId; - cc.fx.GameTool.shushu_Track("payment", dataSuccess); - - console.log("引力付费透传", price, order.outTradeNo, name); - MiniGameSdk.API.yinli_Pay(price, order.outTradeNo, name); - } else { // 如果当前订单不处理,直接处理下一个订单 processOrder(index + 1); @@ -1033,20 +1037,24 @@ export default class JiaZai extends cc.Component { const query = launchOptions.query; if (query.level && query.uid) { const level = parseInt(query.level, 10); - const uid = query.uid; + const uid = query.uid.toString(); if (uid != cc.fx.GameConfig.GM_INFO.uid) { cc.fx.GameConfig.GM_INFO.otherUid = uid; cc.fx.GameConfig.GM_INFO.otherLevel = level; console.log('从分享链接获取到的关卡信息:', level); console.log('从分享链接获取到的 UID:', uid); + console.log("自己的UID", cc.fx.GameConfig.GM_INFO.uid) let eventData = { identity: "helper", //发起者为helped 帮助者为helper + helpedId: cc.fx.GameConfig.GM_INFO.otherUid, //被帮助者UID level: level //被帮助关卡等级 } cc.fx.GameTool.shushu_Track("stage_help", eventData); //帮助通关 this.openLoad(); } - + else { + cc.fx.GameConfig.GM_INFO.otherLevel = 0; + } // 可以在这里处理关卡信息和 UID } } diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts index 8307f4f..646f1e8 100644 --- a/assets/Script/Map.ts +++ b/assets/Script/Map.ts @@ -144,7 +144,6 @@ export default class MapConroler extends cc.Component { arr: any; isreview: boolean = false lastHammerTime: number; - eliMinNUM: Boolean = false; // mapInfo: number[][] = []; @@ -1150,7 +1149,7 @@ export default class MapConroler extends cc.Component { if (result) { this.blockNum -= 1; - this.special_Treatment(node); + this.special_Treatment(node, true); jg = 2; this.createParticle(node, jg); return jg; @@ -1181,7 +1180,7 @@ export default class MapConroler extends cc.Component { if (result) { this.blockNum -= 1; - this.special_Treatment(node); + this.special_Treatment(node, true); jg = 3; this.createParticle(node, jg); return jg; @@ -1214,7 +1213,7 @@ export default class MapConroler extends cc.Component { if (result) { this.blockNum -= 1; - this.special_Treatment(node); + this.special_Treatment(node, true); jg = 1; this.createParticle(node, jg); return jg; @@ -1246,7 +1245,7 @@ export default class MapConroler extends cc.Component { if (result) { this.blockNum -= 1; - this.special_Treatment(node); + this.special_Treatment(node, true); jg = 0; this.createParticle(node, jg); return jg; @@ -1261,19 +1260,21 @@ export default class MapConroler extends cc.Component { } changeState(type) { - if (this.openWall.length != 0) { - for (let i = 0; i < this.openWall.length; i++) { - this.openWall[i].getChildByName("wall").getComponent("Wall").changeLock(); - } - } if (type) { - if (this.freezeWall.length != 0) { - for (let i = 0; i < this.freezeWall.length; i++) { - this.freezeWall[i].getChildByName("wall").getComponent("Wall").changeFreeze(); + if (this.openWall.length != 0) { + for (let i = 0; i < this.openWall.length; i++) { + this.openWall[i].getChildByName("wall").getComponent("Wall").changeLock(); } } } + } + changeFreeze() { + if (this.freezeWall.length != 0) { + for (let i = 0; i < this.freezeWall.length; i++) { + this.freezeWall[i].getChildByName("wall").getComponent("Wall").changeFreeze(); + } + } } //检测是否可以通过门 @@ -1499,7 +1500,7 @@ export default class MapConroler extends cc.Component { //特殊处理,方块带道具或者需要消除冰块 - special_Treatment(node) { + special_Treatment(node, type) { let freezeBlock = this.node.children.filter(child => { if (child.getComponent("Block")) { if (child.getComponent("Block").type == 4) @@ -1531,12 +1532,8 @@ export default class MapConroler extends cc.Component { this.blocks.splice(i, 1); } } - - if (this.eliMinNUM == true) { - this.changeState(true); - this.eliMinNUM = false; - } - + this.changeFreeze(); + this.changeState(type); } judgeWin(number) { @@ -1785,7 +1782,7 @@ export default class MapConroler extends cc.Component { cc.fx.GameConfig.GM_INFO.reviewBoom += 1; } else if (data.type == "lock") { - this.changeState(false); + this.changeState(true); if (cc.fx.GameConfig.GM_INFO.reviewDoor < 2) cc.fx.GameConfig.GM_INFO.reviewDoor += 1; } @@ -1934,6 +1931,7 @@ export default class MapConroler extends cc.Component { if (cc.fx.GameConfig.GM_INFO.otherLevel > 0) { let eventData = { identity: "helper", //发起者为helped 帮助者为helper + helpedId: cc.fx.GameConfig.GM_INFO.otherUid, //被帮助者UID level: cc.fx.GameConfig.GM_INFO.otherLevel, //被帮助关卡等级 success: false, //是否成功 } @@ -2764,28 +2762,26 @@ export default class MapConroler extends cc.Component { } } if (nomalArray.length > 1) { - this.eliMinNUM = true; nomalArray = cc.fx.GameTool.shuffleArray(nomalArray); - nomalArray[0].getComponent("Block").eliminate(); + nomalArray[0].getComponent("Block").eliminate(true); let time = 0; if (nomalArray[0].getComponent("Block").type == 1 || nomalArray[0].getComponent("Block").type == 9) { time = 200; } - nomalArray[1].getComponent("Block").eliminate(); - // if (time > 0) { - // setTimeout(() => { - // nomalArray[1].getComponent("Block").eliminate(); - // }, time); - // return; - // } - // else { - // nomalArray[1].getComponent("Block").eliminate(); - // return; - // } + // nomalArray[1].getComponent("Block").eliminate(false); + if (time > 0) { + setTimeout(() => { + nomalArray[1].getComponent("Block").eliminate(false); + }, time); + return; + } + else { + nomalArray[1].getComponent("Block").eliminate(false); + return; + } } else if (nomalArray.length == 1) { - this.eliMinNUM = true; - nomalArray[0].getComponent("Block").eliminate(1); + nomalArray[0].getComponent("Block").eliminate(true); let time = 0; if (nomalArray[0].getComponent("Block").type == 1 || nomalArray[0].getComponent("Block").type == 9) { time = 200; @@ -2797,24 +2793,23 @@ export default class MapConroler extends cc.Component { else { if (this.loackArray.length != 0) { // console.log("消除一个普通块后,消除一个带锁块"); - this.loackArray[0].getComponent("Block").eliminate(); + this.loackArray[0].getComponent("Block").eliminate(false); return; } else if (this.freezeArray.length != 0) { // console.log("消除一个普通块后,消除一个冻结块"); - this.freezeArray[0].getComponent("Block").eliminate(); + this.freezeArray[0].getComponent("Block").eliminate(false); return; } } }, 200 + time); } else { - this.eliMinNUM = true; let count = 2; if (this.loackArray.length != 0) { for (let i = 0; i < this.loackArray.length; i++) { // console.log("没有普通快,魔法消除一个带锁块"); - this.loackArray[i].getComponent("Block").eliminate(); + this.loackArray[i].getComponent("Block").eliminate(true); count -= 1; if (count == 0) { break; @@ -3290,6 +3285,7 @@ export default class MapConroler extends cc.Component { let uid = cc.fx.GameConfig.GM_INFO.otherUid; let eventData = { identity: "helper", //发起者为helped 帮助者为helper + helpedId: cc.fx.GameConfig.GM_INFO.otherUid, //被帮助者UID level: level, //被帮助关卡等级 success: true, //是否成功 } diff --git a/assets/Script/Revive.ts b/assets/Script/Revive.ts index 0908685..5a01af7 100644 --- a/assets/Script/Revive.ts +++ b/assets/Script/Revive.ts @@ -35,14 +35,13 @@ export default class Revive extends cc.Component { onShow() { if (cc.sys.platform === cc.sys.WECHAT_GAME) { - console.log("从后台进入前台订单号:", cc.fx.GameConfig.GM_INFO.iosOutTradeNo); - if (cc.fx.GameConfig.GM_INFO.iosOutTradeNo != null && cc.fx.GameConfig.GM_INFO.iosOutTradeNo != "") { + console.log("从后台进入前台订单号:", cc.fx.GameConfig.GM_INFO.iosReviveOrder); + if (cc.fx.GameConfig.GM_INFO.iosReviveOrder != null && cc.fx.GameConfig.GM_INFO.iosReviveOrder != "") { console.log("有苹果订单号,开始轮训"); - const iosOutTradeNo = cc.fx.GameConfig.GM_INFO.iosOutTradeNo; - cc.fx.GameConfig.GM_INFO.iosOutTradeNo = ""; + const iosReviveOrder = cc.fx.GameConfig.GM_INFO.iosReviveOrder; this.openLoad(); this.btn_Touch = true; - Utils.getIosPayInfo(iosOutTradeNo, + Utils.getIosPayInfo(iosReviveOrder, (data) => { console.log("获得轮训结果:", data); const iosID = data.data?.payment_name || this.iosProductId; @@ -50,47 +49,31 @@ export default class Revive extends cc.Component { iosAmount = parseInt(iosAmount); if (data.code == 1) { console.log("购买成功"); - const dataSuccess = { - outTradeNo: iosOutTradeNo, - pay_amount: iosAmount, - payment_name: iosID, - payment_num: this.iosCount, - type: "ios", - } - cc.fx.GameTool.shushu_Track("payment", dataSuccess); + // const dataSuccess = { + // outTradeNo: iosReviveOrder, + // pay_amount: iosAmount, + // payment_name: iosID, + // payment_num: this.iosCount, + // type: "ios", + // } + // cc.fx.GameTool.shushu_Track("payment", dataSuccess); let name = "购买金币道具:" + iosID; - console.log("引力付费透传", iosAmount, iosOutTradeNo, name); - MiniGameSdk.API.yinli_Pay(iosAmount, iosOutTradeNo, name) - Utils.setPayInfo( - (res) => { - this.closeLoad(); - //console.log("设置轮训结果:", res); - if (res.code === 1) { - console.log("_________正式发货"); - MiniGameSdk.API.showToast("充值成功"); - cc.fx.GameTool.shopBuy(iosID, false); - this.revivew() - if (iosID == "reborn_Gift") { - this.buyGift(); - } - //console.log("充值成功获得金币"); - } - else { - MiniGameSdk.API.showToast("网络异常,充值奖励将在登录后再次发放"); - const dataFail4 = { - outTradeNo: iosOutTradeNo, - pay_amount: iosAmount, - payment_name: iosID, - payment_num: this.iosCount, - type: "ios", - fail_reason: "成功付款,但是发货时请求服务器失败,充值成功未发货", - } - cc.fx.GameTool.shushu_Track("payment_fail", dataFail4); - } - if (this.node.parent.parent.parent.parent.parent.getComponent("SceneManager")) { - this.node.parent.parent.parent.parent.parent.getComponent("SceneManager").updateCoin(); - } - }, iosOutTradeNo) + console.log("引力付费透传", iosAmount, iosReviveOrder, name); + MiniGameSdk.API.yinli_Pay(iosAmount, iosReviveOrder, name) + this.closeLoad(); + this.btn_Touch = true; + console.log("_________正式发货"); + MiniGameSdk.API.showToast("充值成功"); + cc.fx.GameTool.shopBuy(iosID, false); + this.revivew() + if (iosID == "reborn_Gift") { + this.buyGift(); + } + cc.fx.GameConfig.GM_INFO.iosReviveOrder = null; + //console.log("充值成功获得金币"); + if (this.node.parent.parent.parent.parent.parent.getComponent("SceneManager")) { + this.node.parent.parent.parent.parent.parent.getComponent("SceneManager").updateCoin(); + } } else if (data.code == 0) { console.log("用户自己取消充值"); @@ -98,7 +81,7 @@ export default class Revive extends cc.Component { this.closeLoad(); this.btn_Touch = true; const dataFail = { - outTradeNo: iosOutTradeNo, + outTradeNo: iosReviveOrder, pay_amount: iosAmount, payment_name: iosID, payment_num: this.iosCount, @@ -106,13 +89,15 @@ export default class Revive extends cc.Component { fail_reason: "用户取消充值", } cc.fx.GameTool.shushu_Track("payment_fail", dataFail); + cc.fx.GameConfig.GM_INFO.iosReviveOrder = null; } else if (data.code == 2) { this.closeLoad(); + this.btn_Touch = true; console.log("轮训超时"); - MiniGameSdk.API.showToast("请检查网络,如充值成功,请重新登录领取"); + MiniGameSdk.API.showToast("请检查网络,如充值成功,请重新登录领取", 4); const dataFail = { - outTradeNo: iosOutTradeNo, + outTradeNo: iosReviveOrder, pay_amount: iosAmount, payment_name: iosID, payment_num: this.iosCount, @@ -120,10 +105,9 @@ export default class Revive extends cc.Component { fail_reason: "用户充值后,轮训结果超时", } cc.fx.GameTool.shushu_Track("payment_fail", dataFail); + this.openConfirmBox(); } - this.btn_Touch = true; - cc.fx.GameConfig.GM_INFO.iosOutTradeNo = null; }) } } @@ -159,7 +143,6 @@ export default class Revive extends cc.Component { Utils.rebornGift(1, (data) => { console.log("购买'✅ ", data.code); if (data.code == 1) { - } }) // update (dt) {} @@ -234,7 +217,13 @@ export default class Revive extends cc.Component { this.iosProductId = productId; this.iosCount = 1; Utils.GoKEFu(iosPayInfo, (res) => { - this.closeLoad(); + if (res == "success") { + console.log("客服回话成功"); + } + else { + console.log("客服回话失败"); + this.closeLoad(); + } }); } else { @@ -310,14 +299,14 @@ export default class Revive extends cc.Component { } else if (data.data.pay_state == 2) { this.btn_Touch = true; - const dataSuccess = { - outTradeNo: Utils.outTradeNo, - pay_amount: price, - payment_name: productId, - payment_num: 1, - type: systemType, - } - cc.fx.GameTool.shushu_Track("payment", dataSuccess); + // const dataSuccess = { + // outTradeNo: Utils.outTradeNo, + // pay_amount: price, + // payment_name: productId, + // payment_num: 1, + // type: systemType, + // } + // cc.fx.GameTool.shushu_Track("payment", dataSuccess); let name = "购买金币道具:" + productId; console.log("引力付费透传", price, Utils.outTradeNo, name); MiniGameSdk.API.yinli_Pay(price, Utils.outTradeNo, name) @@ -395,11 +384,28 @@ export default class Revive extends cc.Component { console.log("复活移除监听"); //@ts-ignore wx.offShow(this.onShowListener); - console.log("🔥🔥🔥🔥🔥🔥🔥🔥") + console.log("🔥🔥🔥🔥🔥🔥🔥🔥"); } } + openConfirmBox() { + let ConfirmBox = this.node.parent.getChildByName("ConfirmBox"); + ConfirmBox.active = true; + this.closeLoad(); + } + + closeConfirmBox() { + let ConfirmBox = this.node.parent.getChildByName("ConfirmBox"); + ConfirmBox.active = false; + } + + //再次领取奖励 + againGet() { + this.closeConfirmBox(); + this.onShow(); + } + onDestroy() { } diff --git a/assets/Script/Sdk/MiniGameSdk.ts b/assets/Script/Sdk/MiniGameSdk.ts index b07fca6..66373d8 100644 --- a/assets/Script/Sdk/MiniGameSdk.ts +++ b/assets/Script/Sdk/MiniGameSdk.ts @@ -1137,9 +1137,9 @@ export namespace MiniGameSdk { const distinctId = MiniGameSdk.API.getShushuDistinctId(); if (distinctId) { cc.fx.GameConfig.GM_INFO.shushu_DistinctId = distinctId; - // console.log('用户的 distinct_id 是:', distinctId); + console.log('用户的 distinct_id 是:', distinctId); } else { - // console.log('未获取到用户的 distinct_id'); + console.log('未获取到用户的 distinct_id'); } const accountId = MiniGameSdk.API.getShushuAccountId(); @@ -1382,6 +1382,7 @@ export namespace MiniGameSdk { wx.shareAppMessage(shareParams); let eventData = { identity: "helped", //发起者为helped 帮助者为helper + helpedId: cc.fx.GameConfig.GM_INFO.uid, //被帮助者uid level: level //被帮助关卡等级 } console.log("分享给好友", eventData); diff --git a/assets/Script/module/Config/GameConfig.ts b/assets/Script/module/Config/GameConfig.ts index 8f98858..dc15d04 100644 --- a/assets/Script/module/Config/GameConfig.ts +++ b/assets/Script/module/Config/GameConfig.ts @@ -85,7 +85,6 @@ export class GameConfig { first: boolean; //是否首次进入游戏 score: number; //总得分 scale: number; //玩家总计成功点火数 - iosOutTradeNo: string; //ios订单号 allOutTradeNo: any[]; //订单号数组 min_Time: number; //体力恢复的剩余时间 freezeAmount: number; //冻结道具次数 @@ -110,7 +109,10 @@ export class GameConfig { revive: number; //复活礼包购买次数 otherUid: string; //其他被帮助用户id otherLevel: number; //其他被帮助用户等级 - helpLevel: number; + helpLevel: number; //帮助用户关卡 + iosShopOrder: string; //ios订单号商城 + iosMonthOrder: string; //ios订单号月卡 + iosReviveOrder: string; //ios订单号复活 }; @@ -243,7 +245,6 @@ export class GameConfig { first: false, //是否首次进入游戏 score: 0, //总得分 scale: 1, //玩家总计成功点火数 - iosOutTradeNo: "", //ios订单号 allOutTradeNo: [], //订单号数组 min_Time: 0, //体力恢复的剩余时间 freezeAmount: 3, //冻结道具次数 @@ -269,6 +270,9 @@ export class GameConfig { otherUid: "", //其他被帮助用户id otherLevel: 0, //其他被帮助用户等级 helpLevel: 0, //帮助用户等级 + iosShopOrder: "", //ios订单号商城 + iosMonthOrder: "", //ios订单号月卡 + iosReviveOrder: "" //ios订单号复活 }; // this.setCode(this.getKey("scode")); // this.GM_INFO.level = 0; diff --git a/assets/Script/module/Pay/Utils.ts b/assets/Script/module/Pay/Utils.ts index d17c59d..0ca3318 100644 --- a/assets/Script/module/Pay/Utils.ts +++ b/assets/Script/module/Pay/Utils.ts @@ -10,39 +10,47 @@ export default class Utils { //#region 安卓支付 /**获取用户信息*/ static getUserInfo(callBack) { + //微信登录 wx.login({ success(res) { - //console.log("微信login成功"); + console.log("微信login成功"); //console.log(res.code); if (res.code) { - // 延迟时间数组,可按需调整 - const delays = [1000, 2000, 3000, 4000, 5000]; - let attempt = 0; // 轮询次数 - - const poll = () => { - if (attempt >= delays.length) { - //console.log('登录请求轮询超时'); - callBack({ code: 0, data: { openid: "登录失败" }, message: '轮询超时' }); + // 标志位,用于记录 callBack 是否已经被调用 + let isCallBackCalled = false; + // 定义轮询函数 + const pollLogin = () => { + if (isCallBackCalled) { + console.log("回调已被调用,不再发起请求"); return; } - - Utils.POST("login", { code: res.code }, ret => { - //console.log("请求结果:", ret); - if (ret.code === 1) { // 假设返回 code 为 1 表示成功 - Utils.openid = ret.data.openid; - Utils.session_key = ret.data.session_key; - Utils.uid = ret.data._id; + let isDebug = false; + let test = cc.fx.GameTool.getWechatGameVersion(); + if (test == "正式版") { + isDebug = true; + } + console.log("___________发起登录请求", true, cc.fx.GameConfig.GM_INFO.shushu_DistinctId); + Utils.POST("login", { code: res.code, isDebug: true, distinctId: cc.fx.GameConfig.GM_INFO.shushu_DistinctId }, ret => { + console.log("__________请求结果:", ret); + if (!isCallBackCalled) { + isCallBackCalled = true; + if (ret.code === 1) { // 假设返回 code 为 1 表示成功 + Utils.openid = ret.data.openid; + Utils.session_key = ret.data.session_key; + Utils.uid = ret.data._id; + } callBack(ret); - } else { - attempt++; - setTimeout(poll, delays[attempt - 1]); } }); + // 如果回调未调用,6 秒后再次请求 + if (!isCallBackCalled) { + setTimeout(pollLogin, 6000); + } }; - - poll(); + // 首次调用轮询函数 + pollLogin(); } else { - //console.log('登录失败!' + res.errMsg) + console.log('登录失败!' + res.errMsg) callBack({ code: 0, data: { openid: "登录失败" }, message: res.errMsg }); } } @@ -52,7 +60,6 @@ export default class Utils { /**道具直购接口*/ static buyProp(id, count, price, systemType, productId, callBack) { //console.log("请求uid:" + Utils.uid, "请求id:" + id, "请求数量:" + count, "请求价格:" + price); - Utils.POST("wx/orderPaySig", { uid: Utils.uid, itemid: id, itemCount: count, itemPrice: price }, res => { if (res.code == 1) { Utils.outTradeNo = res.data.outTradeNo; @@ -172,17 +179,28 @@ export default class Utils { /**跳转客服*/ static GoKEFu(iosPayInfo, callBack) { console.log("创建新的订单,清空老订单"); - cc.fx.GameConfig.GM_INFO.iosOutTradeNo = null; - cc.fx.GameConfig.GM_INFO.iosOutTradeNo = `wcx_` + Math.round(Math.random() * 10 ** 13) + Date.now(); + var order = `wcx_` + Math.round(Math.random() * 10 ** 13) + Date.now(); + if (iosPayInfo.payment_name == "month_Card") { + cc.fx.GameConfig.GM_INFO.iosMonthOrder = null; + cc.fx.GameConfig.GM_INFO.iosMonthOrder = order; + } + else if (iosPayInfo.payment_name == "reborn_Gift") { + cc.fx.GameConfig.GM_INFO.iosReviveOrder = null; + cc.fx.GameConfig.GM_INFO.iosReviveOrder = order; + } + else { + cc.fx.GameConfig.GM_INFO.iosShopOrder = null; + cc.fx.GameConfig.GM_INFO.iosShopOrder = order; + } const data = { tpye: "ios", - outTradeNo: cc.fx.GameConfig.GM_INFO.iosOutTradeNo, + outTradeNo: order, propName: iosPayInfo.payment_name, count: iosPayInfo.payment_count, price: iosPayInfo.price,//价格单位是分 } const shushu_data = { - outTradeNo: cc.fx.GameConfig.GM_INFO.iosOutTradeNo, + outTradeNo: order, price: iosPayInfo.price, payment_name: iosPayInfo.payment_name, payment_num: iosPayInfo.payment_count, @@ -204,26 +222,12 @@ export default class Utils { } }); } - // static getIosPayInfo(order, callBack) { - // // 延迟时间数组,按照 1 秒 3 次、2 秒 5 次、5 秒 6 次、15 秒 5 次的规则生成 - // const iosOutTradeNo = order; - // console.log("请求uid:" + Utils.uid); - // console.log("outTradeNo:" + iosOutTradeNo); - // Utils.POST("wx/iosgetPayInfo", { outTradeNo: iosOutTradeNo }, res => { - // console.log("查询字符结果IOS"); - // console.log(res); - // if (res.code === 1) { - // callBack(res); - // } else { - // callBack(res); - // } - // }); - // } + static getIosPayInfo(order, callBack) { // 延迟 0.5 秒执行后续逻辑 setTimeout(() => { // 最大重试次数 - const maxRetries = 5; + const maxRetries = 7; let retryCount = 0; // 标志位,用于记录 callBack 是否已经被调用 let isCallBackCalled = false; @@ -243,12 +247,12 @@ export default class Utils { retryCount++; console.log(`请求超时,第 ${retryCount} 次重新申请接口`); makeRequest(); - }, 3000); + }, 4000); - const iosOutTradeNo = order; + const orderNow = order; console.log("请求uid:" + Utils.uid); - console.log("outTradeNo:" + iosOutTradeNo); - Utils.POST("wx/iosgetPayInfo", { outTradeNo: iosOutTradeNo }, res => { + console.log("outTradeNo:" + orderNow); + Utils.POST("wx/iosgetPayInfo", { outTradeNo: orderNow, uid: cc.fx.GameConfig.GM_INFO.uid }, res => { console.log("查询字符结果IOS"); console.log(res); // 清除超时定时器 @@ -262,138 +266,6 @@ export default class Utils { makeRequest(); }, 500); } - //#endregion - - //#region 微信云 - // static initServer(){ - // if(cc.sys.platform!=cc.sys.WECHAT_GAME)return; - // //@ts-ignore - // wx.cloud.init({ - // env: 'cloudbase-1gl7iex89268f11e' - // }) - // } - - // static getUserCode(){ - // //@ts-ignore - // wx.login({ - // success (res) { - // //console.log("登录成功"); - // //console.log(res); - // if (res.code) { - // //@ts-ignore - // wx.cloud.callFunction({ - // // 云函数名称 - // name: 'login', - // // 传给云函数的参数 - // data: { - // code:res.code, - // }, - // success: function(ret) { - // //console.log("请求成功"); - // //console.log("请求结果:"); - // //console.log(ret); - // Utils.openid=ret.data.openid; - // Utils.session_key=ret.data.session_key; - // Utils.uid=ret.data._id; - // }, - // fail:function(res){ - // //console.log("请求失败"); - // //console.log(res); - // } - // }) - // } else { - // //console.log('登录失败!' + res.errMsg) - // } - // } - // }) - // } - - // static PayOder(){ - // if(cc.sys.platform!=cc.sys.WECHAT_GAME)return; - // //@ts-ignore - // wx.cloud.callFunction({ - // // 云函数名称 - // name: 'userPayOrder', - // // 传给云函数的参数 - // data: { - // itemid:"10011", - // itemCount:1, - // itemPrice:100 - // }, - // success: function(res) { - // //console.log("请求成功"); - // //console.log(res) - // if(res.result.code==1){ - // Utils.outTradeNo=res.result.data.outTradeNo; - // //console.log("订单号:"+Utils.outTradeNo); - // //@ts-ignore - // wx.requestMidasPaymentGameItem({ - // signData:res.result.data.signData, - // paySig: res.result.data.paySig, - // signature: res.result.data.signature, - // success(res, errCode) { - // //console.log('成功', res, errCode); - // }, - // fail({errMsg,errCode}) { - // console.error('失败'); - // console.error(errMsg, errCode) - // } - // }) - // } - - // }, - // fail:function(res){ - // //console.log("请求失败"); - // //console.log(res); - // } - // }) - // } - - // static getPayInfo1(callBack){ - // if(cc.sys.platform!=cc.sys.WECHAT_GAME)return; - // //@ts-ignore - // wx.cloud.callFunction({ - // // 云函数名称 - // name: 'userGetPayState', - // // 传给云函数的参数 - // data: { - // outTradeNo:Utils.outTradeNo - // }, - // success: function(res) { - // //console.log("请求成功"); - // //console.log(res) - // callBack("成功"); - // }, - // fail:function(res){ - // //console.log("请求失败"); - // //console.log(res); - // callBack("失败"); - // } - // }) - // } - - // static toke(){ - // if(cc.sys.platform!=cc.sys.WECHAT_GAME)return; - // //@ts-ignore - // wx.cloud.callFunction({ - // // 云函数名称 - // name: 'uerToken', - // // 传给云函数的参数 - // data: { - - // }, - // success: function(res) { - // //console.log("请求成功"); - // //console.log(res) - // }, - // fail:function(res){ - // //console.log("请求失败"); - // //console.log(res); - // } - // }) - // } - //#endregion - //#region POST请求 /** diff --git a/assets/Script/module/Tool/GameTool.ts b/assets/Script/module/Tool/GameTool.ts index f84ee7c..26f8e36 100644 --- a/assets/Script/module/Tool/GameTool.ts +++ b/assets/Script/module/Tool/GameTool.ts @@ -1266,6 +1266,7 @@ var GameTool = { case "stage_help": //帮助通关时 eventData = { identity: data.identity, //发起者为helped 帮助者为helper + helpedId: data.helpedId, //被帮助者uid level: data.level, //被帮助关卡等级 success: data.success || null, //被帮助关卡是否成功 } diff --git a/assets/Script/monthlyCard.ts b/assets/Script/monthlyCard.ts index 9c9c00d..5a461cb 100644 --- a/assets/Script/monthlyCard.ts +++ b/assets/Script/monthlyCard.ts @@ -43,14 +43,13 @@ export default class NewClass extends cc.Component { onShow() { console.log("后台进入前台,monthlcard"); if (cc.sys.platform === cc.sys.WECHAT_GAME) { - console.log("从后台进入前台订单号:", cc.fx.GameConfig.GM_INFO.iosOutTradeNo); - if (cc.fx.GameConfig.GM_INFO.iosOutTradeNo != null && cc.fx.GameConfig.GM_INFO.iosOutTradeNo != "") { + console.log("从后台进入前台订单号:", cc.fx.GameConfig.GM_INFO.iosMonthOrder); + if (cc.fx.GameConfig.GM_INFO.iosMonthOrder != null && cc.fx.GameConfig.GM_INFO.iosMonthOrder != "") { console.log("有苹果订单号,开始轮训"); - const iosOutTradeNo = cc.fx.GameConfig.GM_INFO.iosOutTradeNo; - cc.fx.GameConfig.GM_INFO.iosOutTradeNo = ""; + const iosMonthOrder = cc.fx.GameConfig.GM_INFO.iosMonthOrder; this.openLoad(); this.btn_Touch = true; - Utils.getIosPayInfo(iosOutTradeNo, + Utils.getIosPayInfo(iosMonthOrder, (data) => { console.log("月卡获得轮训结果:", data); const iosID = data.data?.payment_name || this.iosProductId; @@ -58,48 +57,30 @@ export default class NewClass extends cc.Component { iosAmount = parseInt(iosAmount); if (data.code == 1) { console.log("购买成功"); - const dataSuccess = { - outTradeNo: iosOutTradeNo, - pay_amount: iosAmount, - payment_name: iosID, - payment_num: this.iosCount, - type: "ios", - } - cc.fx.GameTool.shushu_Track("payment", dataSuccess); + // const dataSuccess = { + // outTradeNo: iosMonthOrder, + // pay_amount: iosAmount, + // payment_name: iosID, + // payment_num: this.iosCount, + // type: "ios", + // } + // cc.fx.GameTool.shushu_Track("payment", dataSuccess); let name = "购买金币道具:" + iosID; - console.log("引力付费透传", iosAmount, iosOutTradeNo, name); - MiniGameSdk.API.yinli_Pay(iosAmount, iosOutTradeNo, name) - Utils.setPayInfo( - (res) => { - this.closeLoad(); - //console.log("设置轮训结果:", res); - if (res.code === 1) { - console.log("_________正式发货"); - MiniGameSdk.API.showToast("充值成功"); + console.log("引力付费透传", iosAmount, iosMonthOrder, name); + MiniGameSdk.API.yinli_Pay(iosAmount, iosMonthOrder, name) - if (iosID == "month_Card") { - this.buyMonthCard(iosID); - } - //console.log("充值成功获得金币"); - } - else { - MiniGameSdk.API.showToast("网络异常,充值奖励将在登录后再次发放"); - const dataFail4 = { - outTradeNo: iosOutTradeNo, - pay_amount: iosAmount, - payment_name: iosID, - payment_num: this.iosCount, - type: "ios", - fail_reason: "成功付款,但是发货时请求服务器失败,充值成功未发货", - } - cc.fx.GameTool.shushu_Track("payment_fail", dataFail4); - } - if (this.node.parent.getComponent("JiaZai")) - this.node.parent.getComponent("JiaZai").updateCoin(); - else if (this.node.parent.getComponent("SceneManager")) { - this.node.parent.getComponent("SceneManager").updateCoin(); - } - }, iosOutTradeNo) + console.log("_________正式发货"); + MiniGameSdk.API.showToast("充值成功"); + + if (iosID == "month_Card") { + this.setReward(iosID); + } + if (this.node.parent.getComponent("JiaZai")) + this.node.parent.getComponent("JiaZai").updateCoin(); + else if (this.node.parent.getComponent("SceneManager")) { + this.node.parent.getComponent("SceneManager").updateCoin(); + } + //console.log("充值成功获得金币"); } else if (data.code == 0) { console.log("用户自己取消充值"); @@ -107,7 +88,7 @@ export default class NewClass extends cc.Component { this.closeLoad(); this.btn_Touch = true; const dataFail = { - outTradeNo: iosOutTradeNo, + outTradeNo: iosMonthOrder, pay_amount: iosAmount, payment_name: iosID, payment_num: this.iosCount, @@ -115,14 +96,16 @@ export default class NewClass extends cc.Component { fail_reason: "用户取消充值", } cc.fx.GameTool.shushu_Track("payment_fail", dataFail); + cc.fx.GameConfig.GM_INFO.iosMonthOrder = null; } else if (data.code == 2) { this.closeLoad(); + this.btn_Touch = true; console.log("轮训超时"); - MiniGameSdk.API.showToast("请检查网络,如充值成功,请重新登录领取"); + MiniGameSdk.API.showToast("请检查网络,如充值成功,请重新登录领取", 4); // MiniGameSdk.API.showToast("订单已关闭"); const dataFail = { - outTradeNo: iosOutTradeNo, + outTradeNo: iosMonthOrder, pay_amount: iosAmount, payment_name: iosID, payment_num: this.iosCount, @@ -130,11 +113,8 @@ export default class NewClass extends cc.Component { fail_reason: "用户充值后,轮训结果超时", } cc.fx.GameTool.shushu_Track("payment_fail", dataFail); + this.openConfirmBox(); } - - this.btn_Touch = true; - console.log("月卡自己置空订单号"); - cc.fx.GameConfig.GM_INFO.iosOutTradeNo = null; }) } } @@ -180,55 +160,64 @@ export default class NewClass extends cc.Component { Utils.setMonthlyCard(0, (data) => { console.log("购买月卡", data.code); if (data.code == 1) { + this.setReward(id); // let rewardData = [ // { type: "coin", count: 6000 }, // ] - cc.fx.GameTool.shopBuy(id, false); - cc.fx.GameConfig.GM_INFO.hp_Max = 7; - cc.fx.GameConfig.GM_INFO.hp = 7; - this.home = 1; - cc.fx.GameTool.getMonthlyCardValidityDays().then(days => { - cc.fx.GameConfig.GM_INFO.monthTime = days.days; - //本地储存当前服务器时间 - let dateStr = new Date(days.time); - cc.fx.StorageMessage.setStorage("mCardDate", dateStr); - NumberToImage.numberToImageNodes(days.days, 35, 20, "month_", this.monthCardTime, true); - - }); - // cc.fx.GameTool.changeCoin(6000); - const jiazaiNode = cc.find("Canvas"); // 假设 JiaZai 挂在 Canvas 节点 - const jiazaiComp = jiazaiNode.getComponent(JiaZai); - if (jiazaiComp) { - console.log("获取到JiaZai组件", jiazaiComp); - setTimeout(() => { - jiazaiComp.setHealthInfo(false); - jiazaiComp.startTimeCutDown(); - jiazaiComp.updateCoin(); - - }, 300); - } else { - console.log("无法获取JiaZai组件"); - } - - this.monthCardBtn.active = false; - this.monthCardBtn2.active = true; - this.monthCardTime.active = true; - cc.fx.GameConfig.GM_INFO.doubleCoin = 2; - cc.fx.GameTool.setUserHealth(0, (data) => { - cc.fx.GameTool.getHealth(null); - }) - let shop = cc.find("Canvas/shop"); - if (shop) { - let shopComp = shop.getComponent("shop"); - if (shopComp) { - shopComp.openShop(); - } - } } }) // update (dt) {} } + + setReward(id) { + cc.fx.GameConfig.GM_INFO.iosMonthOrder = null; + this.closeLoad(); + this.btn_Touch = true; + cc.fx.GameTool.shopBuy(id, false); + cc.fx.GameConfig.GM_INFO.hp_Max = 7; + cc.fx.GameConfig.GM_INFO.hp = 7; + cc.fx.GameConfig.GM_INFO.doubleCoin = 2; + this.home = 1; + cc.fx.GameTool.getMonthlyCardValidityDays().then(days => { + cc.fx.GameConfig.GM_INFO.monthTime = days.days; + //本地储存当前服务器时间 + let dateStr = new Date(days.time); + cc.fx.StorageMessage.setStorage("mCardDate", dateStr); + NumberToImage.numberToImageNodes(days.days, 35, 20, "month_", this.monthCardTime, true); + + }); + // cc.fx.GameTool.changeCoin(6000); + const jiazaiNode = cc.find("Canvas"); // 假设 JiaZai 挂在 Canvas 节点 + const jiazaiComp = jiazaiNode.getComponent(JiaZai); + if (jiazaiComp) { + console.log("获取到JiaZai组件", jiazaiComp); + setTimeout(() => { + jiazaiComp.setHealthInfo(false); + jiazaiComp.startTimeCutDown(); + jiazaiComp.updateCoin(); + + }, 300); + } else { + console.log("无法获取JiaZai组件"); + } + + this.monthCardBtn.active = false; + this.monthCardBtn2.active = true; + this.monthCardTime.active = true; + cc.fx.GameTool.setUserHealth(0, (data) => { + cc.fx.GameTool.getHealth(null); + }) + let shop = cc.find("Canvas/shop"); + if (shop) { + let shopComp = shop.getComponent("shop"); + if (shopComp) { + shopComp.openShop(); + } + } + + } + closeMonthCard() { // this.init(); //获取商城界面更新图标方法 @@ -293,7 +282,6 @@ export default class NewClass extends cc.Component { console.error('获取系统信息失败', e); } - // Utils.GoKEFu(); if (systemType == "ios") { // MiniGameSdk.API.showToast("IOS系统暂不支持支付"); // this.btn_Touch = true; @@ -308,7 +296,13 @@ export default class NewClass extends cc.Component { this.iosProductId = productId; this.iosCount = 1; Utils.GoKEFu(iosPayInfo, (res) => { - this.closeLoad(); + if (res == "success") { + console.log("客服回话成功"); + } + else { + console.log("客服回话失败"); + this.closeLoad(); + } }); } else { @@ -384,14 +378,14 @@ export default class NewClass extends cc.Component { } else if (data.data.pay_state == 2) { this.btn_Touch = true; - const dataSuccess = { - outTradeNo: Utils.outTradeNo, - pay_amount: price, - payment_name: productId, - payment_num: 1, - type: systemType, - } - cc.fx.GameTool.shushu_Track("payment", dataSuccess); + // const dataSuccess = { + // outTradeNo: Utils.outTradeNo, + // pay_amount: price, + // payment_name: productId, + // payment_num: 1, + // type: systemType, + // } + // cc.fx.GameTool.shushu_Track("payment", dataSuccess); let name = "购买金币道具:" + productId; console.log("引力付费透传", price, Utils.outTradeNo, name); MiniGameSdk.API.yinli_Pay(price, Utils.outTradeNo, name) @@ -457,6 +451,11 @@ export default class NewClass extends cc.Component { this.node.getChildByName("Loading").getChildByName("load").runAction(cc.rotateTo(2, 1080).repeatForever()); } + openConfirmBox() { + this.closeLoad(); + this.node.getChildByName("ConfirmBox").active = true; + } + closeLoad() { this.node.getChildByName("Loading").active = false; } diff --git a/assets/shop/img/Revive.png b/assets/shop/img/Revive.png index 4f2b965..6562d06 100644 Binary files a/assets/shop/img/Revive.png and b/assets/shop/img/Revive.png differ diff --git a/assets/shop/img/btn_Buy.png b/assets/shop/img/btn_Buy.png new file mode 100644 index 0000000..5a1dbc1 Binary files /dev/null and b/assets/shop/img/btn_Buy.png differ diff --git a/assets/shop/img/btn_Buy.png.meta b/assets/shop/img/btn_Buy.png.meta new file mode 100644 index 0000000..1201d33 --- /dev/null +++ b/assets/shop/img/btn_Buy.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "dd2853c1-a82a-4188-8150-05eb4aaa8f82", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 519, + "height": 168, + "platformSettings": {}, + "subMetas": { + "btn_Buy": { + "ver": "1.0.6", + "uuid": "d9be6eea-569b-46da-bb80-0d9c8b8f5263", + "importer": "sprite-frame", + "rawTextureUuid": "dd2853c1-a82a-4188-8150-05eb4aaa8f82", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 519, + "height": 168, + "rawWidth": 519, + "rawHeight": 168, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/shop/img/chuji.png b/assets/shop/img/chuji.png index 672018c..972f901 100644 Binary files a/assets/shop/img/chuji.png and b/assets/shop/img/chuji.png differ diff --git a/assets/shop/img/gaoji.png b/assets/shop/img/gaoji.png index a44a113..e244603 100644 Binary files a/assets/shop/img/gaoji.png and b/assets/shop/img/gaoji.png differ diff --git a/assets/shop/img/kuangt1.png b/assets/shop/img/kuangt1.png new file mode 100644 index 0000000..30f0504 Binary files /dev/null and b/assets/shop/img/kuangt1.png differ diff --git a/assets/shop/img/kuangt1.png.meta b/assets/shop/img/kuangt1.png.meta new file mode 100644 index 0000000..a5612ca --- /dev/null +++ b/assets/shop/img/kuangt1.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "99c9d0f0-802e-4b3e-94af-7ec76cbef2af", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 994, + "height": 1462, + "platformSettings": {}, + "subMetas": { + "kuangt1": { + "ver": "1.0.6", + "uuid": "71f0494c-f638-4d7a-a826-a9407bf2b27c", + "importer": "sprite-frame", + "rawTextureUuid": "99c9d0f0-802e-4b3e-94af-7ec76cbef2af", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 994, + "height": 1462, + "rawWidth": 994, + "rawHeight": 1462, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/shop/img/load.png b/assets/shop/img/load.png index 6d2a4d7..9a42648 100644 Binary files a/assets/shop/img/load.png and b/assets/shop/img/load.png differ diff --git a/assets/shop/img/lqbg.png b/assets/shop/img/lqbg.png index 88f9fc0..198db46 100644 Binary files a/assets/shop/img/lqbg.png and b/assets/shop/img/lqbg.png differ diff --git a/assets/shop/img/shop_1.png b/assets/shop/img/shop_1.png index f860a09..d5f055f 100644 Binary files a/assets/shop/img/shop_1.png and b/assets/shop/img/shop_1.png differ diff --git a/assets/shop/img/shuzi.png b/assets/shop/img/shuzi.png index 7c26fe4..ba4df3b 100644 Binary files a/assets/shop/img/shuzi.png and b/assets/shop/img/shuzi.png differ diff --git a/assets/shop/img/texture_atlas-1.png b/assets/shop/img/texture_atlas-1.png index 696d6c8..544de4c 100644 Binary files a/assets/shop/img/texture_atlas-1.png and b/assets/shop/img/texture_atlas-1.png differ diff --git a/assets/shop/img/yueka.png b/assets/shop/img/yueka.png index 1cb1690..7d19e9c 100644 Binary files a/assets/shop/img/yueka.png and b/assets/shop/img/yueka.png differ diff --git a/assets/shop/img/yueka1.png b/assets/shop/img/yueka1.png index 1a6a67d..44ca2ea 100644 Binary files a/assets/shop/img/yueka1.png and b/assets/shop/img/yueka1.png differ diff --git a/assets/shop/img/zhongji.png b/assets/shop/img/zhongji.png index 566cd08..991b0fb 100644 Binary files a/assets/shop/img/zhongji.png and b/assets/shop/img/zhongji.png differ diff --git a/assets/shop/prefab/monthlyCard.prefab b/assets/shop/prefab/monthlyCard.prefab index bdddb17..8917adf 100644 --- a/assets/shop/prefab/monthlyCard.prefab +++ b/assets/shop/prefab/monthlyCard.prefab @@ -28,19 +28,22 @@ }, { "__id__": 50 + }, + { + "__id__": 63 } ], "_active": true, "_components": [ { - "__id__": 63 + "__id__": 87 }, { - "__id__": 64 + "__id__": 88 } ], "_prefab": { - "__id__": 65 + "__id__": 89 }, "_opacity": 255, "_color": { @@ -2290,6 +2293,873 @@ "fileId": "05q/aTGl5Lioy2OJNs5XYl", "sync": false }, + { + "__type__": "cc.Node", + "_name": "ConfirmBox", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 64 + }, + { + "__id__": 68 + }, + { + "__id__": 71 + }, + { + "__id__": 74 + }, + { + "__id__": 77 + } + ], + "_active": false, + "_components": [ + { + "__id__": 85 + } + ], + "_prefab": { + "__id__": 86 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1080, + "height": 1920 + }, + "_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.Node", + "_name": "New Sprite(Splash)", + "_objFlags": 0, + "_parent": { + "__id__": 63 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 65 + }, + { + "__id__": 66 + } + ], + "_prefab": { + "__id__": 67 + }, + "_opacity": 120, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 3000, + "height": 3000 + }, + "_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__": 64 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91" + }, + "_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.BlockInputEvents", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 64 + }, + "_enabled": true, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 63 + }, + "asset": { + "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" + }, + "fileId": "47UiHH16RKK6j+4cK469um", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "bg", + "_objFlags": 0, + "_parent": { + "__id__": 63 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 69 + } + ], + "_prefab": { + "__id__": 70 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 994, + "height": 1462 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0.5, + 0.5, + 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__": 68 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "71f0494c-f638-4d7a-a826-a9407bf2b27c" + }, + "_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__": 63 + }, + "asset": { + "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" + }, + "fileId": "eeHwB6Bq5CSbRJy0kYMgo0", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "title", + "_objFlags": 0, + "_parent": { + "__id__": 63 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 72 + } + ], + "_prefab": { + "__id__": 73 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 160, + "height": 50.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 330.904, + 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.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 71 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "月卡充值", + "_N$string": "月卡充值", + "_fontSize": 40, + "_lineHeight": 40, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_styleFlags": 0, + "_underlineHeight": 0, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 63 + }, + "asset": { + "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" + }, + "fileId": "fa+8dDqrdLTrl/Ji8K9LMX", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "New Label", + "_objFlags": 0, + "_parent": { + "__id__": 63 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 75 + } + ], + "_prefab": { + "__id__": 76 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 0, + "b": 0, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 320, + "height": 195.6 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 89.865, + 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.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 74 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "网络异常\n请重新登录小游戏\n领取月卡奖励", + "_N$string": "网络异常\n请重新登录小游戏\n领取月卡奖励", + "_fontSize": 40, + "_lineHeight": 60, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_styleFlags": 0, + "_underlineHeight": 0, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 63 + }, + "asset": { + "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" + }, + "fileId": "9149ix6q1AZ4VyIjmSGbdM", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "New Sprite", + "_objFlags": 0, + "_parent": { + "__id__": 63 + }, + "_children": [ + { + "__id__": 78 + } + ], + "_active": true, + "_components": [ + { + "__id__": 81 + }, + { + "__id__": 82 + } + ], + "_prefab": { + "__id__": 84 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 519, + "height": 168 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -3.21, + -77.027, + 0, + 0, + 0, + 0, + 1, + 0.4, + 0.4, + 0 + ] + }, + "_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": "New Label", + "_objFlags": 0, + "_parent": { + "__id__": 77 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 79 + } + ], + "_prefab": { + "__id__": 80 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 160, + "height": 100.8 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 13.174, + 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.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 78 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "确定", + "_N$string": "确定", + "_fontSize": 80, + "_lineHeight": 80, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_styleFlags": 0, + "_underlineHeight": 0, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 63 + }, + "asset": { + "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" + }, + "fileId": "1f0NO1uLNIxrx1dYb9rOaL", + "sync": false + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 77 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "d9be6eea-569b-46da-bb80-0d9c8b8f5263" + }, + "_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.Button", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 77 + }, + "_enabled": true, + "_normalMaterial": null, + "_grayMaterial": null, + "duration": 0.1, + "zoomScale": 1.1, + "clickEvents": [ + { + "__id__": 83 + } + ], + "_N$interactable": true, + "_N$enableAutoGrayEffect": false, + "_N$transition": 3, + "transition": 3, + "_N$normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_N$hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_N$normalSprite": null, + "_N$pressedSprite": null, + "pressedSprite": null, + "_N$hoverSprite": null, + "hoverSprite": null, + "_N$disabledSprite": null, + "_N$target": { + "__id__": 77 + }, + "_id": "" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "191edqNaKdPtJiA4/cSsB1N", + "handler": "closeMonthCard", + "customEventData": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 63 + }, + "asset": { + "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" + }, + "fileId": "58sKElg7lE9I935Fpq7n8Y", + "sync": false + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 63 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 45, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 63 + }, + "asset": { + "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" + }, + "fileId": "c59E21W4dAgZdQulz+5vqy", + "sync": false + }, { "__type__": "cc.Widget", "_name": "", diff --git a/assets/shop/prefab/shop.prefab b/assets/shop/prefab/shop.prefab index 5231573..6c8289c 100644 --- a/assets/shop/prefab/shop.prefab +++ b/assets/shop/prefab/shop.prefab @@ -37,19 +37,22 @@ }, { "__id__": 436 + }, + { + "__id__": 449 } ], "_active": true, "_components": [ { - "__id__": 449 + "__id__": 473 }, { - "__id__": 450 + "__id__": 474 } ], "_prefab": { - "__id__": 451 + "__id__": 475 }, "_opacity": 255, "_color": { @@ -16667,6 +16670,873 @@ "fileId": "b50PfruR5P1axiaB0Q563i", "sync": false }, + { + "__type__": "cc.Node", + "_name": "ConfirmBox", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 450 + }, + { + "__id__": 454 + }, + { + "__id__": 457 + }, + { + "__id__": 460 + }, + { + "__id__": 463 + } + ], + "_active": false, + "_components": [ + { + "__id__": 471 + } + ], + "_prefab": { + "__id__": 472 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1080, + "height": 1920 + }, + "_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.Node", + "_name": "New Sprite(Splash)", + "_objFlags": 0, + "_parent": { + "__id__": 449 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 451 + }, + { + "__id__": 452 + } + ], + "_prefab": { + "__id__": 453 + }, + "_opacity": 120, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 3000, + "height": 3000 + }, + "_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__": 450 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91" + }, + "_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.BlockInputEvents", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 450 + }, + "_enabled": true, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 449 + }, + "asset": { + "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" + }, + "fileId": "47UiHH16RKK6j+4cK469um", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "bg", + "_objFlags": 0, + "_parent": { + "__id__": 449 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 455 + } + ], + "_prefab": { + "__id__": 456 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 994, + "height": 1462 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0.5, + 0.5, + 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__": 454 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "71f0494c-f638-4d7a-a826-a9407bf2b27c" + }, + "_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__": 449 + }, + "asset": { + "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" + }, + "fileId": "eeHwB6Bq5CSbRJy0kYMgo0", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "title", + "_objFlags": 0, + "_parent": { + "__id__": 449 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 458 + } + ], + "_prefab": { + "__id__": 459 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 160, + "height": 50.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 330.904, + 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.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 457 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "商城充值", + "_N$string": "商城充值", + "_fontSize": 40, + "_lineHeight": 40, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_styleFlags": 0, + "_underlineHeight": 0, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 449 + }, + "asset": { + "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" + }, + "fileId": "fa+8dDqrdLTrl/Ji8K9LMX", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "New Label", + "_objFlags": 0, + "_parent": { + "__id__": 449 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 461 + } + ], + "_prefab": { + "__id__": 462 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 0, + "b": 0, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 320, + "height": 195.6 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 89.865, + 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.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 460 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "网络异常\n请重新登录小游戏\n领取充值奖励", + "_N$string": "网络异常\n请重新登录小游戏\n领取充值奖励", + "_fontSize": 40, + "_lineHeight": 60, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_styleFlags": 0, + "_underlineHeight": 0, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 449 + }, + "asset": { + "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" + }, + "fileId": "9149ix6q1AZ4VyIjmSGbdM", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "New Sprite", + "_objFlags": 0, + "_parent": { + "__id__": 449 + }, + "_children": [ + { + "__id__": 464 + } + ], + "_active": true, + "_components": [ + { + "__id__": 467 + }, + { + "__id__": 468 + } + ], + "_prefab": { + "__id__": 470 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 519, + "height": 168 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -3.21, + -77.027, + 0, + 0, + 0, + 0, + 1, + 0.4, + 0.4, + 0 + ] + }, + "_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": "New Label", + "_objFlags": 0, + "_parent": { + "__id__": 463 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 465 + } + ], + "_prefab": { + "__id__": 466 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 160, + "height": 100.8 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 13.174, + 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.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 464 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "确定", + "_N$string": "确定", + "_fontSize": 80, + "_lineHeight": 80, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_styleFlags": 0, + "_underlineHeight": 0, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 449 + }, + "asset": { + "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" + }, + "fileId": "1f0NO1uLNIxrx1dYb9rOaL", + "sync": false + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 463 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "d9be6eea-569b-46da-bb80-0d9c8b8f5263" + }, + "_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.Button", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 463 + }, + "_enabled": true, + "_normalMaterial": null, + "_grayMaterial": null, + "duration": 0.1, + "zoomScale": 1.1, + "clickEvents": [ + { + "__id__": 469 + } + ], + "_N$interactable": true, + "_N$enableAutoGrayEffect": false, + "_N$transition": 3, + "transition": 3, + "_N$normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_N$hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_N$normalSprite": null, + "_N$pressedSprite": null, + "pressedSprite": null, + "_N$hoverSprite": null, + "hoverSprite": null, + "_N$disabledSprite": null, + "_N$target": { + "__id__": 463 + }, + "_id": "" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "48bfeZuYFZE2qmgxbW2IigB", + "handler": "closeConfirmBox", + "customEventData": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 449 + }, + "asset": { + "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" + }, + "fileId": "58sKElg7lE9I935Fpq7n8Y", + "sync": false + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 449 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 45, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 449 + }, + "asset": { + "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" + }, + "fileId": "0bIt32pkVJWp47546cV3sp", + "sync": false + }, { "__type__": "48bfeZuYFZE2qmgxbW2IigB", "_name": "", diff --git a/assets/shop/script/shop.ts b/assets/shop/script/shop.ts index e29520a..aecd74f 100644 --- a/assets/shop/script/shop.ts +++ b/assets/shop/script/shop.ts @@ -200,16 +200,15 @@ export default class NewClass extends cc.Component { const systemInfo = wx.getSystemInfoSync(); if (systemInfo.platform === 'ios') { if (cc.sys.platform === cc.sys.WECHAT_GAME) { - console.log("从后台进入前台订单号:", cc.fx.GameConfig.GM_INFO.iosOutTradeNo); - if (cc.fx.GameConfig.GM_INFO.iosOutTradeNo != null && cc.fx.GameConfig.GM_INFO.iosOutTradeNo != "") { + console.log("从后台进入前台订单号:", cc.fx.GameConfig.GM_INFO.iosShopOrder); + if (cc.fx.GameConfig.GM_INFO.iosShopOrder != null && cc.fx.GameConfig.GM_INFO.iosShopOrder != "") { console.log("有苹果订单号,开始轮训"); - const iosOutTradeNo = cc.fx.GameConfig.GM_INFO.iosOutTradeNo; - // cc.fx.GameConfig.GM_INFO.iosOutTradeNo = ""; + const iosShopOrder = cc.fx.GameConfig.GM_INFO.iosShopOrder; // this.closeLoad(); // this.openLoad(); this.btn_Touch = true; - Utils.getIosPayInfo(iosOutTradeNo, + Utils.getIosPayInfo(iosShopOrder, (data) => { console.log("商城获得轮训结果:", data); const iosID = data.data?.payment_name || this.iosProductId; @@ -222,52 +221,36 @@ export default class NewClass extends cc.Component { if (data.code == 1) { console.log("购买成功"); console.log("商品id:", iosID); - const dataSuccess = { - outTradeNo: iosOutTradeNo, - pay_amount: iosAmount, - payment_name: iosID, - payment_num: this.iosCount, - type: "ios", - } - cc.fx.GameTool.shushu_Track("payment", dataSuccess); + // const dataSuccess = { + // outTradeNo: iosShopOrder, + // pay_amount: iosAmount, + // payment_name: iosID, + // payment_num: this.iosCount, + // type: "ios", + // } + // cc.fx.GameTool.shushu_Track("payment", dataSuccess); let name = "购买金币道具:" + iosID; - MiniGameSdk.API.yinli_Pay(iosAmount, iosOutTradeNo, name) + MiniGameSdk.API.yinli_Pay(iosAmount, iosShopOrder, name) - Utils.setPayInfo( - (res) => { - this.closeLoad(); - //console.log("设置轮训结果:", res); - if (res.code === 1) { - console.log("_________正式发货", iosID); - MiniGameSdk.API.showToast("充值成功"); - cc.fx.GameTool.shopBuy(iosID, false); - if (iosID == "unlimited_health_bundle_10" || - iosID == "unlimited_health_bundle_20" || - iosID == "unlimited_health_bundle_30" - ) { - this.updatePower(); - } - //console.log("充值成功获得金币"); - } - else { - MiniGameSdk.API.showToast("网络异常,充值奖励将在登录后再次发放"); - const dataFail4 = { - outTradeNo: iosOutTradeNo, - pay_amount: iosAmount, - payment_name: iosID, - payment_num: this.iosCount, - type: "ios", - fail_reason: "成功付款,但是发货时请求服务器失败,充值成功未发货", - } - cc.fx.GameTool.shushu_Track("payment_fail", dataFail4); - } - NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.coin, 30, 15, "coin_", this.coin, true); - if (this.node.parent.getComponent("JiaZai")) - this.node.parent.getComponent("JiaZai").updateCoin(); - else if (this.node.parent.getComponent("SceneManager")) { - this.node.parent.getComponent("SceneManager").updateCoin(); - } - }, iosOutTradeNo) + console.log("_________正式发货", iosID); + MiniGameSdk.API.showToast("充值成功"); + cc.fx.GameTool.shopBuy(iosID, false); + if (iosID == "unlimited_health_bundle_10" || + iosID == "unlimited_health_bundle_20" || + iosID == "unlimited_health_bundle_30" + ) { + this.updatePower(); + } + cc.fx.GameConfig.GM_INFO.iosShopOrder = null; + NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.coin, 30, 15, "coin_", this.coin, true); + if (this.node.parent.getComponent("JiaZai")) + this.node.parent.getComponent("JiaZai").updateCoin(); + else if (this.node.parent.getComponent("SceneManager")) { + this.node.parent.getComponent("SceneManager").updateCoin(); + } + this.closeLoad(); + this.btn_Touch = true; + //console.log("充值成功获得金币"); } else if (data.code == 0) { console.log("用户自己取消充值"); @@ -275,7 +258,7 @@ export default class NewClass extends cc.Component { this.closeLoad(); this.btn_Touch = true; const dataFail = { - outTradeNo: iosOutTradeNo, + outTradeNo: iosShopOrder, pay_amount: iosAmount, payment_name: iosID, payment_num: this.iosCount, @@ -283,13 +266,15 @@ export default class NewClass extends cc.Component { fail_reason: "用户取消充值", } cc.fx.GameTool.shushu_Track("payment_fail", dataFail); + cc.fx.GameConfig.GM_INFO.iosShopOrder = null; } else if (data.code == 2) { this.closeLoad(); + this.btn_Touch = true; console.log("轮训超时"); - MiniGameSdk.API.showToast("请检查网络,如充值成功,请重新登录领取"); + MiniGameSdk.API.showToast("请检查网络,如充值成功,请重新登录领取", 4); const dataFail = { - outTradeNo: iosOutTradeNo, + outTradeNo: iosShopOrder, pay_amount: iosAmount, payment_name: iosID, payment_num: this.iosCount, @@ -297,11 +282,8 @@ export default class NewClass extends cc.Component { fail_reason: "用户充值后,轮训结果超时", } cc.fx.GameTool.shushu_Track("payment_fail", dataFail); + this.openConfirmBox(); } - this.closeLoad(); - this.btn_Touch = true; - // console.log("商城置空订单号"); - // cc.fx.GameConfig.GM_INFO.iosOutTradeNo = null; }) } else { @@ -494,7 +476,6 @@ export default class NewClass extends cc.Component { } else { console.log("客服回话失败"); - // cc.fx.GameConfig.GM_INFO.iosOutTradeNo = null; this.closeLoad(); } }); @@ -573,14 +554,14 @@ export default class NewClass extends cc.Component { } else if (data.data.pay_state == 2) { this.btn_Touch = true; - const dataSuccess = { - outTradeNo: Utils.outTradeNo, - pay_amount: price, - payment_name: productId, - payment_num: 1, - type: systemType, - } - cc.fx.GameTool.shushu_Track("payment", dataSuccess); + // const dataSuccess = { + // outTradeNo: Utils.outTradeNo, + // pay_amount: price, + // payment_name: productId, + // payment_num: 1, + // type: systemType, + // } + // cc.fx.GameTool.shushu_Track("payment", dataSuccess); let name = "购买金币道具:" + productId; MiniGameSdk.API.yinli_Pay(price, Utils.outTradeNo, name); @@ -760,5 +741,15 @@ export default class NewClass extends cc.Component { NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.monthTime, 35, 15, "button_", this.monthCardTime.children[1], true); } + openConfirmBox() { + this.node.getChildByName("ConfirmBox").active = true; + this.closeLoad(); + } + + //关闭商城确认按钮 + closeConfirmBox() { + this.node.getChildByName("ConfirmBox").active = false; + } + // update (dt) {} } diff --git a/assets/shop/spin/dongjie/dongjie.png b/assets/shop/spin/dongjie/dongjie.png index 8fc818d..21096ce 100644 Binary files a/assets/shop/spin/dongjie/dongjie.png and b/assets/shop/spin/dongjie/dongjie.png differ diff --git a/assets/shop/spin/feijinbi.png b/assets/shop/spin/feijinbi.png index b26196b..4dadbd5 100644 Binary files a/assets/shop/spin/feijinbi.png and b/assets/shop/spin/feijinbi.png differ diff --git a/assets/shop/spin/mofabang_texiao/mofabang_texiao.png b/assets/shop/spin/mofabang_texiao/mofabang_texiao.png index f9be12a..7cc05c8 100644 Binary files a/assets/shop/spin/mofabang_texiao/mofabang_texiao.png and b/assets/shop/spin/mofabang_texiao/mofabang_texiao.png differ diff --git a/assets/shop/spin/particle/LiZi1.png b/assets/shop/spin/particle/LiZi1.png index 630a981..8640ab4 100644 Binary files a/assets/shop/spin/particle/LiZi1.png and b/assets/shop/spin/particle/LiZi1.png differ diff --git a/assets/shop/spin/particle/bang.png b/assets/shop/spin/particle/bang.png index d9598e1..ecee26f 100644 Binary files a/assets/shop/spin/particle/bang.png and b/assets/shop/spin/particle/bang.png differ diff --git a/assets/shop/spin/piaoxue/skeleton.png b/assets/shop/spin/piaoxue/skeleton.png index ca5e52e..963f77b 100644 Binary files a/assets/shop/spin/piaoxue/skeleton.png and b/assets/shop/spin/piaoxue/skeleton.png differ diff --git a/settings/project.json b/settings/project.json index d6bf4c1..0ec377f 100644 --- a/settings/project.json +++ b/settings/project.json @@ -1,5 +1,5 @@ { - "last-module-event-record-time": 1754302048063, + "last-module-event-record-time": 1754966862658, "group-list": [ "default", "Map"