diff --git a/assets/FirstScene/bg.jpg b/assets/FirstScene/bg.jpg new file mode 100644 index 00000000..64db6c0c Binary files /dev/null and b/assets/FirstScene/bg.jpg differ diff --git a/assets/FirstScene/loadBg.jpg.meta b/assets/FirstScene/bg.jpg.meta similarity index 78% rename from assets/FirstScene/loadBg.jpg.meta rename to assets/FirstScene/bg.jpg.meta index dbac1dae..b96db2f3 100644 --- a/assets/FirstScene/loadBg.jpg.meta +++ b/assets/FirstScene/bg.jpg.meta @@ -1,6 +1,6 @@ { "ver": "2.3.7", - "uuid": "0f9aab89-5e08-423d-8030-259fe54c4d74", + "uuid": "623c5e97-b793-4406-a29b-e61c3dfa9a64", "importer": "texture", "type": "sprite", "wrapMode": "clamp", @@ -12,11 +12,11 @@ "height": 2340, "platformSettings": {}, "subMetas": { - "loadBg": { + "bg": { "ver": "1.0.6", - "uuid": "c09e129e-5195-4054-b8a5-65e1bd675c3f", + "uuid": "7f72518d-9ac9-4220-9a15-d0d4922d2341", "importer": "sprite-frame", - "rawTextureUuid": "0f9aab89-5e08-423d-8030-259fe54c4d74", + "rawTextureUuid": "623c5e97-b793-4406-a29b-e61c3dfa9a64", "trimType": "auto", "trimThreshold": 1, "rotated": false, diff --git a/assets/FirstScene/jiazai1.png b/assets/FirstScene/jiazai1.png deleted file mode 100644 index d1f6a27e..00000000 Binary files a/assets/FirstScene/jiazai1.png and /dev/null differ diff --git a/assets/FirstScene/jiazai2.png b/assets/FirstScene/jiazai2.png deleted file mode 100644 index 8aa293c3..00000000 Binary files a/assets/FirstScene/jiazai2.png and /dev/null differ diff --git a/assets/FirstScene/jiazai3.png b/assets/FirstScene/jiazai3.png deleted file mode 100644 index 0d4b2f01..00000000 Binary files a/assets/FirstScene/jiazai3.png and /dev/null differ diff --git a/assets/FirstScene/loadBg.jpg b/assets/FirstScene/loadBg.jpg deleted file mode 100644 index d746f4e3..00000000 Binary files a/assets/FirstScene/loadBg.jpg and /dev/null differ diff --git a/assets/FirstScene/progress.png b/assets/FirstScene/progress.png index 077e2897..e189ff6d 100644 Binary files a/assets/FirstScene/progress.png and b/assets/FirstScene/progress.png differ diff --git a/assets/FirstScene/progress.png.meta b/assets/FirstScene/progress.png.meta index fb9099d3..001ea79b 100644 --- a/assets/FirstScene/progress.png.meta +++ b/assets/FirstScene/progress.png.meta @@ -8,8 +8,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 669, - "height": 30, + "width": 846, + "height": 54, "platformSettings": {}, "subMetas": { "progress": { @@ -20,14 +20,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -0.5, "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 669, - "height": 30, - "rawWidth": 669, - "rawHeight": 30, + "trimX": 5, + "trimY": 5, + "width": 835, + "height": 44, + "rawWidth": 846, + "rawHeight": 54, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/FirstScene/progressBg.png b/assets/FirstScene/progressBg.png index f0a112af..9f48f56f 100644 Binary files a/assets/FirstScene/progressBg.png and b/assets/FirstScene/progressBg.png differ diff --git a/assets/FirstScene/progressBg.png.meta b/assets/FirstScene/progressBg.png.meta index ccf9cc48..188f6084 100644 --- a/assets/FirstScene/progressBg.png.meta +++ b/assets/FirstScene/progressBg.png.meta @@ -8,8 +8,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 669, - "height": 30, + "width": 846, + "height": 54, "platformSettings": {}, "subMetas": { "progressBg": { @@ -24,10 +24,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 669, - "height": 30, - "rawWidth": 669, - "rawHeight": 30, + "width": 846, + "height": 54, + "rawWidth": 846, + "rawHeight": 54, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/Scene/HomeScene.fire b/assets/Scene/HomeScene.fire index 6b4dfc93..a5894d78 100644 --- a/assets/Scene/HomeScene.fire +++ b/assets/Scene/HomeScene.fire @@ -20,7 +20,7 @@ "__id__": 5 }, { - "__id__": 660 + "__id__": 676 } ], "_active": false, @@ -240,19 +240,19 @@ "__id__": 646 }, { - "__id__": 655 + "__id__": 671 } ], "_active": true, "_components": [ { - "__id__": 657 + "__id__": 673 }, { - "__id__": 658 + "__id__": 674 }, { - "__id__": 659 + "__id__": 675 } ], "_prefab": null, @@ -16237,7 +16237,7 @@ "ctor": "Float64Array", "array": [ 0, - 0, + -13.081, 0, 0, 0, @@ -27907,12 +27907,24 @@ }, { "__id__": 652 - } - ], - "_active": false, - "_components": [ + }, { "__id__": 654 + }, + { + "__id__": 658 + }, + { + "__id__": 662 + }, + { + "__id__": 666 + } + ], + "_active": true, + "_components": [ + { + "__id__": 670 } ], "_prefab": null, @@ -28072,7 +28084,7 @@ }, { "__type__": "cc.Node", - "_name": "load", + "_name": "New Label", "_objFlags": 0, "_parent": { "__id__": 646 @@ -28095,101 +28107,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 689, - "height": 656 - }, - "_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": "eaR6sogyxOcJaWjbE5eSF1" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 650 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "794efc8c-624c-469f-84c0-24ce84022c54" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": null, - "_id": "5cezb/BW9Fw54XLAdLou49" - }, - { - "__type__": "cc.Node", - "_name": "New Label", - "_objFlags": 0, - "_parent": { - "__id__": 646 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 653 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 135, + "width": 172.51, "height": 56.7 }, "_anchorPoint": { @@ -28202,7 +28120,7 @@ "ctor": "Float64Array", "array": [ 0, - 0, + -241.306, 0, 0, 0, @@ -28231,7 +28149,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 652 + "__id__": 650 }, "_enabled": true, "_materials": [ @@ -28241,8 +28159,8 @@ ], "_srcBlendFactor": 770, "_dstBlendFactor": 771, - "_string": "请稍后", - "_N$string": "请稍后", + "_string": "请稍后...", + "_N$string": "请稍后...", "_fontSize": 45, "_lineHeight": 45, "_enableWrapText": true, @@ -28259,6 +28177,868 @@ "_N$cacheMode": 0, "_id": "88GNsUUo5Mc6gDnzEvAq40" }, + { + "__type__": "cc.Node", + "_name": "cat", + "_objFlags": 0, + "_parent": { + "__id__": 646 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 653 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 130, + "height": 131 + }, + "_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": "84r0LteRtKvbNXnN674x2F" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 652 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "5606741f-1930-452e-9bbf-6c340be10f22" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "b5J9L6pZRAG4SUlP9fM+dt" + }, + { + "__type__": "cc.Node", + "_name": "block1", + "_objFlags": 0, + "_parent": { + "__id__": 646 + }, + "_children": [ + { + "__id__": 655 + } + ], + "_active": true, + "_components": [ + { + "__id__": 657 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 98, + "height": 103 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -150, + -139.215, + 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": "83oACjAEpGwYOKC1p/2aYB" + }, + { + "__type__": "cc.Node", + "_name": "light", + "_objFlags": 0, + "_parent": { + "__id__": 654 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 656 + } + ], + "_prefab": null, + "_opacity": 0, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 98, + "height": 103 + }, + "_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": "7e4czhVsxBRKXpjjzH0Qbk" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 655 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "b771c7bc-1f88-4358-91f6-f3fcdeed5e13" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "14xNZN6ERM2qW1SWy3tU6F" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 654 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "ddf6971b-b969-4692-a6a4-d98479ba28ba" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "60D/cUneVJmKokf4uO6eBk" + }, + { + "__type__": "cc.Node", + "_name": "block2", + "_objFlags": 0, + "_parent": { + "__id__": 646 + }, + "_children": [ + { + "__id__": 659 + } + ], + "_active": true, + "_components": [ + { + "__id__": 661 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 98, + "height": 103 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + -139.215, + 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": "4cxDWrFnBD/JbfBx97oZKR" + }, + { + "__type__": "cc.Node", + "_name": "light", + "_objFlags": 0, + "_parent": { + "__id__": 658 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 660 + } + ], + "_prefab": null, + "_opacity": 0, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 98, + "height": 103 + }, + "_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": "10CTzJ4p9Iv5zzBpyiGFpe" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 659 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "b771c7bc-1f88-4358-91f6-f3fcdeed5e13" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "8arA9Y0Z5HbY4FNWckIqi7" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 658 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "ddf6971b-b969-4692-a6a4-d98479ba28ba" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "b8blo4Hs1HgZfwUIGz0hXp" + }, + { + "__type__": "cc.Node", + "_name": "block3", + "_objFlags": 0, + "_parent": { + "__id__": 646 + }, + "_children": [ + { + "__id__": 663 + } + ], + "_active": true, + "_components": [ + { + "__id__": 665 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 98, + "height": 103 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 150, + -139.215, + 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": "78U/bDOQBB05BdtTKL0TnU" + }, + { + "__type__": "cc.Node", + "_name": "light", + "_objFlags": 0, + "_parent": { + "__id__": 662 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 664 + } + ], + "_prefab": null, + "_opacity": 0, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 98, + "height": 103 + }, + "_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": "d1pgg2VDJMTraL1jNvGXUg" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 663 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "b771c7bc-1f88-4358-91f6-f3fcdeed5e13" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "b3rY4v3ttJZqAEsdIiwZ2L" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 662 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "ddf6971b-b969-4692-a6a4-d98479ba28ba" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "6aXTZCBo1C2KV/PnweYTZy" + }, + { + "__type__": "cc.Node", + "_name": "block4", + "_objFlags": 0, + "_parent": { + "__id__": 646 + }, + "_children": [ + { + "__id__": 667 + } + ], + "_active": true, + "_components": [ + { + "__id__": 669 + } + ], + "_prefab": null, + "_opacity": 0, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 98, + "height": 103 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 300, + -139.215, + 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": "08C8KigEdIq4a3Enyn3u0v" + }, + { + "__type__": "cc.Node", + "_name": "light", + "_objFlags": 0, + "_parent": { + "__id__": 666 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 668 + } + ], + "_prefab": null, + "_opacity": 0, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 98, + "height": 103 + }, + "_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": "d1J0aYl/ZMw4bFrm56UQxR" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 667 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "b771c7bc-1f88-4358-91f6-f3fcdeed5e13" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "a0WrAIvgZJMJmF84hmZekr" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 666 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "ddf6971b-b969-4692-a6a4-d98479ba28ba" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "97zbp9wIlBaoKHTKBeZU47" + }, { "__type__": "cc.Widget", "_name": "", @@ -28297,7 +29077,7 @@ "_active": true, "_components": [ { - "__id__": 656 + "__id__": 672 } ], "_prefab": null, @@ -28353,7 +29133,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 655 + "__id__": 671 }, "_enabled": true, "alignMode": 1, @@ -28478,13 +29258,13 @@ "_active": true, "_components": [ { - "__id__": 661 + "__id__": 677 }, { - "__id__": 662 + "__id__": 678 }, { - "__id__": 663 + "__id__": 679 } ], "_prefab": null, @@ -28540,7 +29320,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 660 + "__id__": 676 }, "_enabled": true, "_materials": [ @@ -28573,7 +29353,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 660 + "__id__": 676 }, "_enabled": true, "alignMode": 1, @@ -28600,11 +29380,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 660 + "__id__": 676 }, "_enabled": true, "uid_Number": { - "__id__": 661 + "__id__": 677 }, "_id": "67zCbKKV9PvYlB9x+eob0L" } diff --git a/assets/Script/GameManager.ts b/assets/Script/GameManager.ts index 2832df31..03053d94 100644 --- a/assets/Script/GameManager.ts +++ b/assets/Script/GameManager.ts @@ -122,7 +122,7 @@ export default class GameManager extends cc.Component { .to(1.8, { fillRange: 0.7 }) .start(); cc.tween(this.lizi) - .to(1.8, { position: cc.v3(-345 + 669 * 0.7, -520, 0) }) + .to(1.8, { position: cc.v3(-400 + 810 * 0.7, -520, 0) }) .start(); } @@ -203,7 +203,7 @@ export default class GameManager extends cc.Component { .to(0.5, { fillRange: 1 }) .start(); cc.tween(this.lizi) - .to(0.5, { position: cc.v3(320, -516.426, 0) }) + .to(0.5, { position: cc.v3(410, -516.426, 0) }) .start(); // 加载成功后进入 HomeScene cc.assetManager.loadBundle('shop', (err, bundle) => { diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts index a19d5b11..be733100 100644 --- a/assets/Script/Map.ts +++ b/assets/Script/Map.ts @@ -3987,24 +3987,24 @@ export default class MapConroler extends cc.Component { coin: -coin } if (type == "time") { - if (cc.fx.GameConfig.GM_INFO.review == 1) coin = 500; - else if (cc.fx.GameConfig.GM_INFO.review == 2) coin = 500; + if (cc.fx.GameConfig.GM_INFO.review == 1) coin = 700; + else if (cc.fx.GameConfig.GM_INFO.review == 2) coin = 900; } else if (type == "boom") { - if (cc.fx.GameConfig.GM_INFO.reviewBoom == 1) coin = 500; - else if (cc.fx.GameConfig.GM_INFO.reviewBoom == 2) coin = 500; + if (cc.fx.GameConfig.GM_INFO.reviewBoom == 1) coin = 700; + else if (cc.fx.GameConfig.GM_INFO.reviewBoom == 2) coin = 900; } else if (type == "lock") { - if (cc.fx.GameConfig.GM_INFO.reviewDoor == 1) coin = 500; - else if (cc.fx.GameConfig.GM_INFO.reviewDoor == 2) coin = 500; + if (cc.fx.GameConfig.GM_INFO.reviewDoor == 1) coin = 700; + else if (cc.fx.GameConfig.GM_INFO.reviewDoor == 2) coin = 900; } else if (type == "revolving") { - if (cc.fx.GameConfig.GM_INFO.reviewRevolving == 1) coin = 500; - else if (cc.fx.GameConfig.GM_INFO.reviewRevolving == 2) coin = 500; + if (cc.fx.GameConfig.GM_INFO.reviewRevolving == 1) coin = 700; + else if (cc.fx.GameConfig.GM_INFO.reviewRevolving == 2) coin = 900; } else if (type == "longAndShort") { - if (cc.fx.GameConfig.GM_INFO.reviewLongAndShort == 1) coin = 500; - else if (cc.fx.GameConfig.GM_INFO.reviewLongAndShort == 2) coin = 500; + if (cc.fx.GameConfig.GM_INFO.reviewLongAndShort == 1) coin = 700; + else if (cc.fx.GameConfig.GM_INFO.reviewLongAndShort == 2) coin = 900; } data.coin = -coin; // console.log("自身金币:",cc.fx.GameConfig.GM_INFO.coin,"消耗金币:",coin); diff --git a/assets/Script/module/Config/GameConfig.ts b/assets/Script/module/Config/GameConfig.ts index fe03fd2b..84476b29 100644 --- a/assets/Script/module/Config/GameConfig.ts +++ b/assets/Script/module/Config/GameConfig.ts @@ -323,7 +323,7 @@ export class GameConfig { vibrateOpen: true, //震动 coinnum: 0, //每局的金币数 paid_user: false, //是否是付费用户 - version: "1.0.28", //版本号 + version: "1.0.30", //版本号 shushu_DistinctId: "", //数数访客ID shushu_AccountId: "", //数数账号ID uid: "", //用户和后端唯一id diff --git a/assets/Script/module/Tool/GameTool.ts b/assets/Script/module/Tool/GameTool.ts index 7464f793..94fe72cd 100644 --- a/assets/Script/module/Tool/GameTool.ts +++ b/assets/Script/module/Tool/GameTool.ts @@ -451,7 +451,7 @@ var GameTool = { // cc.fx.StorageMessage.setStorage("level", levelInfo); // } - let max_level = 1860; + let max_level = 1880; if (cc.fx.GameConfig.GM_INFO.level > (max_level - 1)) { cc.fx.GameConfig.GM_INFO.level = max_level; diff --git a/assets/StartScene/LoadScene.fire b/assets/StartScene/LoadScene.fire index ab37680e..90b1b74f 100644 --- a/assets/StartScene/LoadScene.fire +++ b/assets/StartScene/LoadScene.fire @@ -222,8 +222,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 669, - "height": 30 + "width": 835, + "height": 44 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -535,7 +535,7 @@ "_srcBlendFactor": 770, "_dstBlendFactor": 771, "_spriteFrame": { - "__uuid__": "c09e129e-5195-4054-b8a5-65e1bd675c3f" + "__uuid__": "7f72518d-9ac9-4220-9a15-d0d4922d2341" }, "_type": 0, "_sizeMode": 0, @@ -603,8 +603,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 669, - "height": 30 + "width": 846, + "height": 54 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -711,7 +711,7 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -345, + -400, -520, 0, 0, @@ -759,7 +759,7 @@ "__uuid__": "2fdf5c03-b33d-4d22-a79a-0eff900dae7d" }, "_texture": null, - "_stopped": true, + "_stopped": false, "playOnLoad": true, "autoRemoveOnFinish": false, "totalParticles": 100, @@ -868,9 +868,9 @@ "_opacity": 255, "_color": { "__type__": "cc.Color", - "r": 81, - "g": 16, - "b": 16, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, "_contentSize": { diff --git a/assets/TextureBlock/block/vine.meta b/assets/UI/load.meta similarity index 81% rename from assets/TextureBlock/block/vine.meta rename to assets/UI/load.meta index 95fd18e0..80675947 100644 --- a/assets/TextureBlock/block/vine.meta +++ b/assets/UI/load.meta @@ -1,6 +1,6 @@ { "ver": "1.1.3", - "uuid": "71705b20-c883-45b3-a406-a2e9b30da1f8", + "uuid": "d6f6519f-68f0-43ab-a8b1-3194fce85a6f", "importer": "folder", "isBundle": false, "bundleName": "", diff --git a/assets/UI/load/block.png b/assets/UI/load/block.png new file mode 100644 index 00000000..73aa26c0 Binary files /dev/null and b/assets/UI/load/block.png differ diff --git a/assets/FirstScene/jiazai3.png.meta b/assets/UI/load/block.png.meta similarity index 65% rename from assets/FirstScene/jiazai3.png.meta rename to assets/UI/load/block.png.meta index dbf47c7b..5b497362 100644 --- a/assets/FirstScene/jiazai3.png.meta +++ b/assets/UI/load/block.png.meta @@ -1,6 +1,6 @@ { "ver": "2.3.7", - "uuid": "e1b9ccf5-5ce0-4f3a-98b3-be03da8aa0b1", + "uuid": "f05c593d-0367-4ee1-a9ad-c5fa1e160ddb", "importer": "texture", "type": "sprite", "wrapMode": "clamp", @@ -8,15 +8,15 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 50, - "height": 53, + "width": 98, + "height": 103, "platformSettings": {}, "subMetas": { - "jiazai3": { + "block": { "ver": "1.0.6", - "uuid": "9a639b00-f202-4b8e-98f0-6be5cece1cc6", + "uuid": "ddf6971b-b969-4692-a6a4-d98479ba28ba", "importer": "sprite-frame", - "rawTextureUuid": "e1b9ccf5-5ce0-4f3a-98b3-be03da8aa0b1", + "rawTextureUuid": "f05c593d-0367-4ee1-a9ad-c5fa1e160ddb", "trimType": "auto", "trimThreshold": 1, "rotated": false, @@ -24,10 +24,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 50, - "height": 53, - "rawWidth": 50, - "rawHeight": 53, + "width": 98, + "height": 103, + "rawWidth": 98, + "rawHeight": 103, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/UI/load/block_light.png b/assets/UI/load/block_light.png new file mode 100644 index 00000000..56d54c19 Binary files /dev/null and b/assets/UI/load/block_light.png differ diff --git a/assets/FirstScene/jiazai2.png.meta b/assets/UI/load/block_light.png.meta similarity index 64% rename from assets/FirstScene/jiazai2.png.meta rename to assets/UI/load/block_light.png.meta index c6e1d04e..87ce0843 100644 --- a/assets/FirstScene/jiazai2.png.meta +++ b/assets/UI/load/block_light.png.meta @@ -1,6 +1,6 @@ { "ver": "2.3.7", - "uuid": "6d618c9c-dc6d-48d0-a203-3304725f885b", + "uuid": "05ce75aa-9d30-4d02-988a-502fd98affb9", "importer": "texture", "type": "sprite", "wrapMode": "clamp", @@ -8,15 +8,15 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 69, - "height": 64, + "width": 98, + "height": 103, "platformSettings": {}, "subMetas": { - "jiazai2": { + "block_light": { "ver": "1.0.6", - "uuid": "24e560c5-22d5-44e4-8b55-85431fd8a61b", + "uuid": "b771c7bc-1f88-4358-91f6-f3fcdeed5e13", "importer": "sprite-frame", - "rawTextureUuid": "6d618c9c-dc6d-48d0-a203-3304725f885b", + "rawTextureUuid": "05ce75aa-9d30-4d02-988a-502fd98affb9", "trimType": "auto", "trimThreshold": 1, "rotated": false, @@ -24,10 +24,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 69, - "height": 64, - "rawWidth": 69, - "rawHeight": 64, + "width": 98, + "height": 103, + "rawWidth": 98, + "rawHeight": 103, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/UI/load/cat.png b/assets/UI/load/cat.png new file mode 100644 index 00000000..4456deb1 Binary files /dev/null and b/assets/UI/load/cat.png differ diff --git a/assets/FirstScene/jiazai1.png.meta b/assets/UI/load/cat.png.meta similarity index 65% rename from assets/FirstScene/jiazai1.png.meta rename to assets/UI/load/cat.png.meta index a662e6f5..d126c74d 100644 --- a/assets/FirstScene/jiazai1.png.meta +++ b/assets/UI/load/cat.png.meta @@ -1,6 +1,6 @@ { "ver": "2.3.7", - "uuid": "a599dccc-d5a2-4fff-86ea-f3a03ce9b7b8", + "uuid": "902724fb-c29e-4c94-be7b-b77fcdfdbe75", "importer": "texture", "type": "sprite", "wrapMode": "clamp", @@ -8,15 +8,15 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 52, - "height": 49, + "width": 130, + "height": 131, "platformSettings": {}, "subMetas": { - "jiazai1": { + "cat": { "ver": "1.0.6", - "uuid": "081a89e4-cd4d-49b7-81a3-bd2b3321ca26", + "uuid": "5606741f-1930-452e-9bbf-6c340be10f22", "importer": "sprite-frame", - "rawTextureUuid": "a599dccc-d5a2-4fff-86ea-f3a03ce9b7b8", + "rawTextureUuid": "902724fb-c29e-4c94-be7b-b77fcdfdbe75", "trimType": "auto", "trimThreshold": 1, "rotated": false, @@ -24,10 +24,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 52, - "height": 49, - "rawWidth": 52, - "rawHeight": 49, + "width": 130, + "height": 131, + "rawWidth": 130, + "rawHeight": 131, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/custom/Json/level1848.json b/assets/custom/Json/level1848.json index 136cd133..c796b349 100644 --- a/assets/custom/Json/level1848.json +++ b/assets/custom/Json/level1848.json @@ -362,7 +362,7 @@ "length": 3, "longAndShort": 31, "order": false, - "colorChange": 7 + "colorChange": 2 }, { "id": 1856, @@ -372,7 +372,7 @@ "length": 0, "longAndShort": 31, "order": false, - "colorChange": 7 + "colorChange": 2 }, { "id": 1857, @@ -382,7 +382,7 @@ "length": 0, "longAndShort": 31, "order": false, - "colorChange": 7 + "colorChange": 2 }, { "id": 1858, @@ -416,4 +416,4 @@ } ] ] -} \ No newline at end of file +} diff --git a/assets/custom/Json/level1881.json b/assets/custom/Json/level1881.json new file mode 100644 index 00000000..d49d3f4d --- /dev/null +++ b/assets/custom/Json/level1881.json @@ -0,0 +1,193 @@ +{ + "LEVEL_INFO": [ + { + "risefall": [ + { + "x": 2, + "y": 8, + "vine": 3 + }, + { + "x": 2, + "y": 7, + "vine": 2 + }, + { + "x": 2, + "y": 6, + "vine": 1 + }, + { + "x": 7, + "y": 1, + "vine": 4 + }, + { + "x": 7, + "y": 2, + "vine": 3 + }, + { + "x": 7, + "y": 3, + "vine": 2 + }, + { + "x": 7, + "y": 4, + "vine": 1 + }, + { + "x": 1, + "y": 2, + "vine": 3 + }, + { + "x": 2, + "y": 2, + "vine": 2 + }, + { + "x": 3, + "y": 2, + "vine": 1 + } + ], + "id": "1881", + "map": [ + 10, + 10 + ], + "time": 500, + "gap": [] + } + ], + "BLOCK_INFO": [ + [ + { + "block": 0, + "color": 5, + "type": 0, + "position": { + "x": 120, + "y": 0, + "z": 0 + }, + "id": 210 + }, + { + "block": 1, + "color": 5, + "type": 0, + "position": { + "x": 120, + "y": -120, + "z": 0 + }, + "id": 220 + }, + { + "block": 0, + "color": 5, + "type": 0, + "position": { + "x": -120, + "y": -480, + "z": 0 + }, + "id": 230 + }, + { + "block": 0, + "color": 4, + "type": 0, + "position": { + "x": 240, + "y": 0, + "z": 0 + }, + "id": 240 + }, + { + "block": 0, + "color": 4, + "type": 0, + "position": { + "x": 0, + "y": 240, + "z": 0 + }, + "id": 250 + }, + { + "block": 0, + "color": 4, + "type": 0, + "position": { + "x": 240, + "y": 240, + "z": 0 + }, + "id": 260 + }, + { + "block": 0, + "color": 10, + "type": 0, + "position": { + "x": -240, + "y": 0, + "z": 0 + }, + "id": 270 + }, + { + "block": 0, + "color": 10, + "type": 0, + "position": { + "x": -240, + "y": -240, + "z": 0 + }, + "id": 280 + }, + { + "block": 0, + "color": 10, + "type": 0, + "position": { + "x": 240, + "y": -360, + "z": 0 + }, + "id": 290 + } + ] + ], + "WALL_INFO": [ + [ + { + "id": 1882, + "num": 3, + "color": 5, + "special": 0, + "length": 1 + }, + { + "id": 1883, + "num": 29, + "color": 4, + "special": 0, + "length": 1 + }, + { + "id": 1884, + "num": 21, + "color": 10, + "special": 0, + "length": 1 + } + ] + ] +} \ No newline at end of file diff --git a/assets/custom/Json/level1881.json.meta b/assets/custom/Json/level1881.json.meta new file mode 100644 index 00000000..fe9128cb --- /dev/null +++ b/assets/custom/Json/level1881.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "2c225059-0bc6-4784-8a32-9ef0dde8854c", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/jungle_treasure/music.meta b/assets/jungle_treasure/music.meta new file mode 100644 index 00000000..01d0772e --- /dev/null +++ b/assets/jungle_treasure/music.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.3", + "uuid": "e1f21953-51c2-4fb3-9386-c06fc33bd4ba", + "importer": "folder", + "isBundle": false, + "bundleName": "", + "priority": 1, + "compressionType": {}, + "optimizeHotUpdate": {}, + "inlineSpriteFrames": {}, + "isRemoteBundle": {}, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/jungle_treasure/music/anniu.mp3 b/assets/jungle_treasure/music/anniu.mp3 new file mode 100644 index 00000000..50c07706 Binary files /dev/null and b/assets/jungle_treasure/music/anniu.mp3 differ diff --git a/assets/jungle_treasure/music/anniu.mp3.meta b/assets/jungle_treasure/music/anniu.mp3.meta new file mode 100644 index 00000000..eff0873a --- /dev/null +++ b/assets/jungle_treasure/music/anniu.mp3.meta @@ -0,0 +1,8 @@ +{ + "ver": "2.0.3", + "uuid": "8aa21a10-e438-4074-bc20-e4df1d185a99", + "importer": "audio-clip", + "downloadMode": 0, + "duration": 1.848, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/jungle_treasure/music/jiangli.mp3 b/assets/jungle_treasure/music/jiangli.mp3 new file mode 100644 index 00000000..86c8adb5 Binary files /dev/null and b/assets/jungle_treasure/music/jiangli.mp3 differ diff --git a/assets/jungle_treasure/music/jiangli.mp3.meta b/assets/jungle_treasure/music/jiangli.mp3.meta new file mode 100644 index 00000000..64b623ac --- /dev/null +++ b/assets/jungle_treasure/music/jiangli.mp3.meta @@ -0,0 +1,8 @@ +{ + "ver": "2.0.3", + "uuid": "88b2a21f-cba3-4b8d-837c-2d5745bb5c24", + "importer": "audio-clip", + "downloadMode": 0, + "duration": 2.376, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/jungle_treasure/music/kaisuo.mp3 b/assets/jungle_treasure/music/kaisuo.mp3 new file mode 100644 index 00000000..c235e1ae Binary files /dev/null and b/assets/jungle_treasure/music/kaisuo.mp3 differ diff --git a/assets/jungle_treasure/music/kaisuo.mp3.meta b/assets/jungle_treasure/music/kaisuo.mp3.meta new file mode 100644 index 00000000..75303114 --- /dev/null +++ b/assets/jungle_treasure/music/kaisuo.mp3.meta @@ -0,0 +1,8 @@ +{ + "ver": "2.0.3", + "uuid": "74560a7c-89ec-4730-97f9-eeba91f5e764", + "importer": "audio-clip", + "downloadMode": 0, + "duration": 1.032, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/jungle_treasure/prefab/jungle.prefab b/assets/jungle_treasure/prefab/jungle.prefab index 908717dd..cc46363e 100644 --- a/assets/jungle_treasure/prefab/jungle.prefab +++ b/assets/jungle_treasure/prefab/jungle.prefab @@ -1122,6 +1122,15 @@ }, "useMockPayment": false, "previewAnimationOnly": false, + "anniuMusic": { + "__uuid__": "8aa21a10-e438-4074-bc20-e4df1d185a99" + }, + "unLockMusic": { + "__uuid__": "74560a7c-89ec-4730-97f9-eeba91f5e764" + }, + "rewardMusic": { + "__uuid__": "88b2a21f-cba3-4b8d-837c-2d5745bb5c24" + }, "_id": "" }, { diff --git a/assets/jungle_treasure/script/jungle_Manager.ts b/assets/jungle_treasure/script/jungle_Manager.ts index 6c15c314..b539ed6b 100644 --- a/assets/jungle_treasure/script/jungle_Manager.ts +++ b/assets/jungle_treasure/script/jungle_Manager.ts @@ -80,6 +80,15 @@ export default class JungleManager extends cc.Component { @property({ tooltip: "只预览领取和轨道动画，不发道具、不支付、不保存进度" }) previewAnimationOnly: boolean = true; + @property(cc.AudioClip) + anniuMusic: cc.AudioClip = null; + + @property(cc.AudioClip) + unLockMusic: cc.AudioClip = null; + + @property(cc.AudioClip) + rewardMusic: cc.AudioClip = null; + private activityConfig: JungleActivityConfig = null; private currentTierIndex: number = 0; private cards: cc.Node[] = []; @@ -282,6 +291,17 @@ export default class JungleManager extends cc.Component { } private onCardClicked(buttonComponent: cc.Button): void { + const clickedButton = buttonComponent && buttonComponent.node; + const clickedCard = clickedButton && clickedButton.parent; + const clickedTierIndex = clickedCard ? this.cards.indexOf(clickedCard) : -1; + const clickedTier = this.activityConfig && clickedTierIndex >= 0 + ? this.activityConfig.tiers[this.currentTierIndex + clickedTierIndex] + : null; + // 状态 1 对应“免费/领取”按钮；无论当前是否轮到该档位，点击都会播放按钮音效。 + if (clickedTier && clickedTier.state === 1) { + this.playJungleEffect(this.anniuMusic); + } + if (this.isMoving || this.isPurchasing || this.isClaiming || this.isUnlockAnimating || !this.activityConfig) { return; @@ -997,6 +1017,8 @@ export default class JungleManager extends cc.Component { } const leavingCard = this.cards[0]; + // playClaimEffect 开始时，奖励图标会立即执行向上飞并渐隐动画。 + this.playJungleEffect(this.rewardMusic); this.animator.playClaimEffect( leavingCard, () => this.animator.playCardExit(leavingCard, () => this.shiftCards()), @@ -1109,6 +1131,8 @@ export default class JungleManager extends cc.Component { } this.isUnlockAnimating = true; + // playUnlockEffect 起始阶段会立即将 lock 图片切换为 unlock。 + this.playJungleEffect(this.unLockMusic); this.animator.playUnlockEffect(targetCard, () => { if (!cc.isValid(this.node)) { return; @@ -1118,6 +1142,19 @@ export default class JungleManager extends cc.Component { }); } + private playJungleEffect(clip: cc.AudioClip): void { + if (!clip || (cc.fx.GameConfig && cc.fx.GameConfig.GM_INFO + && cc.fx.GameConfig.GM_INFO.effectOpen === false)) { + return; + } + const audioManager = cc.fx.AudioManager && cc.fx.AudioManager._instance; + if (audioManager && audioManager.play) { + audioManager.play(clip, false, null, false); + return; + } + cc.audioEngine.playEffect(clip, false); + } + private updateTimer(): void { if (!this.view || !this.activityConfig) { return; diff --git a/assets/shop/img/passCheck/bg.jpg b/assets/shop/img/passCheck/bg.jpg index dd88691a..2b9b918a 100644 Binary files a/assets/shop/img/passCheck/bg.jpg and b/assets/shop/img/passCheck/bg.jpg differ