diff --git a/assets/Game/prefabs/SlotScene.prefab b/assets/Game/prefabs/SlotScene.prefab index d7a82ab..9ccd651 100644 --- a/assets/Game/prefabs/SlotScene.prefab +++ b/assets/Game/prefabs/SlotScene.prefab @@ -629,7 +629,7 @@ "__expectedType__": "sp.SkeletonData" }, "defaultSkin": "default", - "defaultAnimation": "", + "defaultAnimation": "", "_premultipliedAlpha": false, "_timeScale": 1, "_preCacheMode": 0, @@ -2294,7 +2294,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "0anr2r+rZGRpm3dAu+hLQb" + "fileId": "53OkM1QXJIIYTTECG/BOks" }, { "__type__": "cc.PrefabInfo", @@ -2304,7 +2304,7 @@ "asset": { "__id__": 0 }, - "fileId": "75lPUwnBBGvo/l3oimd7cb", + "fileId": "78SkWuFPNPrrhYWUb5sgpQ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2335,7 +2335,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "9aUbbrdZxM070eB/gTo7in" + "fileId": "a5EJpCNqFCCJy4TOx5T7aB" }, { "__type__": "cc.PrefabInfo", @@ -2345,7 +2345,7 @@ "asset": { "__id__": 0 }, - "fileId": "47r7vaXN9ISr1XO18T8vGx", + "fileId": "22IYS90fJIrYYcaSshdIGU", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2376,7 +2376,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f6RSEnvelL+Iv/qNNfLmLT" + "fileId": "69r4gHcp9Gw4X+H8VfqiES" }, { "__type__": "5fc10Zl7lVO97/rr2J1uxWH", @@ -2400,7 +2400,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "51JWZZPeJL5I98K8LqvvmY" + "fileId": "0cNZ6dN2xD3aeeC4I7buEj" }, { "__type__": "5fd13+Xa69CZogb3Q/F1lnC", @@ -2573,7 +2573,7 @@ "asset": { "__id__": 0 }, - "fileId": "fb9qRQn41P/ofPCVqIc6HM", + "fileId": "ecRqPLr6JOwJBbm2mlmLQ4", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2598,7 +2598,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "47MhhINnVO/ZGDRNU76820" + "fileId": "7ecg9svgBKwL/Wc+dFHn6B" }, { "__type__": "cc.UITransform", @@ -2626,7 +2626,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3eKyO/qIZBWKSpN0GkRIyS" + "fileId": "ccsvA0C1RAOpyaLvXlrLjt" }, { "__type__": "cc.Sprite", @@ -2671,7 +2671,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "dbtPrk9/RAZKLJATTg+Ogw" + "fileId": "c5WEWDMrBHuJ5Ontm9iuob" }, { "__type__": "cc.PrefabInfo", @@ -2681,7 +2681,7 @@ "asset": { "__id__": 0 }, - "fileId": "bcyY6Ur7hHX6bCY+A9VZ4h", + "fileId": "96eAxLQmxJDZ4DTYjLnfXk", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2936,7 +2936,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "bdCCEk3vpLvZFUdNNh/lQX" + "fileId": "25xt4XFTlBZrH2x2pwtXvV" }, { "__type__": "cc.PrefabInfo", @@ -2946,7 +2946,7 @@ "asset": { "__id__": 0 }, - "fileId": "58VSBEPFxGHKTrXXtlh3Ea", + "fileId": "b39akHkzhPSZJ6oK59GtPH", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2977,7 +2977,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2dvh8sQkNIv5q18pFffoGI" + "fileId": "09zADo1qdIXoKFcv7wMXXX" }, { "__type__": "cc.PrefabInfo", @@ -2987,7 +2987,7 @@ "asset": { "__id__": 0 }, - "fileId": "bdZtkE77ZKO6ZyvHLfbb7n", + "fileId": "68628o04hAp5BNLrNyCDUw", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3018,7 +3018,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f2sKKS1HhEO6TPvOWqcuqq" + "fileId": "36ZvBCDIZFKbsJW4xuIpOo" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3042,7 +3042,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a6wKIqorhHF4pUjncFVquh" + "fileId": "3d+RrRPgRKJbiteMDjWLNi" }, { "__type__": "cc.PrefabInfo", @@ -3052,7 +3052,7 @@ "asset": { "__id__": 0 }, - "fileId": "a6L9xh8j9PB4u2PsjoRLSv", + "fileId": "96haqIhTZMppPElEnk6duc", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3235,7 +3235,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "69ZgnTvUVGl7QC5Q4I3RN6" + "fileId": "2d7F/AlLZA9ZiPsZbSWA/c" }, { "__type__": "cc.PrefabInfo", @@ -3245,7 +3245,7 @@ "asset": { "__id__": 0 }, - "fileId": "feBIcOpFFBKJy16emJ/2mK", + "fileId": "05/Qos8lhCR4EWRwOu8MOK", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3276,7 +3276,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3dLGDdNsdPzph/Ltqmp2kA" + "fileId": "a1fhd626pOs7W9I38O3Bmx" }, { "__type__": "cc.PrefabInfo", @@ -3286,7 +3286,7 @@ "asset": { "__id__": 0 }, - "fileId": "f01XMeOyFPH6oLaEs6Qe/p", + "fileId": "bdJwVQkfRC+r3D+wvmF2EU", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3317,7 +3317,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "4dYQU/G9lD5YoCFNbnxDvf" + "fileId": "22rpEmtB5IlKXdOabRTEGJ" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3341,7 +3341,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "07Bq9DF15KoqYNuvCEteOS" + "fileId": "c63Qo9wM9Kxq1gAwL/yfWg" }, { "__type__": "cc.PrefabInfo", @@ -3351,7 +3351,7 @@ "asset": { "__id__": 0 }, - "fileId": "99kvJ47u9FGpXsPxpD4ZIV", + "fileId": "a05TLaDfhELZaXQkg037+P", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3534,7 +3534,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "aaMFt9eR9PUY5ncEJ9QrxO" + "fileId": "54J0wpvbNHe7xr5k7kEsfb" }, { "__type__": "cc.PrefabInfo", @@ -3544,7 +3544,7 @@ "asset": { "__id__": 0 }, - "fileId": "3dZqpsWY5L5JDXQKkdyot/", + "fileId": "27T631j+FEgK+DhUsKVjsY", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3575,7 +3575,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "53zPWbwbtEqKw3hwBwNjNG" + "fileId": "70GZbCN6JP9rpDvqVw9Z8Q" }, { "__type__": "cc.PrefabInfo", @@ -3585,7 +3585,7 @@ "asset": { "__id__": 0 }, - "fileId": "a8NKqT/cBBlqKcTRUVLMaq", + "fileId": "e6dzGIpfhBI5hBu58Ato98", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3616,7 +3616,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "610YknMHpAHY6sdhMRO67A" + "fileId": "10DaUugztAapUdRwD67any" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3640,7 +3640,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "7caaRyX8lKPonMfvofyx6Z" + "fileId": "e79Z5WncpFS7iWfH4utA5w" }, { "__type__": "cc.PrefabInfo", @@ -3650,7 +3650,7 @@ "asset": { "__id__": 0 }, - "fileId": "cewZh/aMZP2bL9HY9HABSU", + "fileId": "543fCYcoVD2r2dUNXKT//r", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3833,7 +3833,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e09jpBRYNBRIBIipUYZegs" + "fileId": "35y7kONXtBnbD6Shx3tGuQ" }, { "__type__": "cc.PrefabInfo", @@ -3843,7 +3843,7 @@ "asset": { "__id__": 0 }, - "fileId": "c6vgxjx8FEU4oQP/Lfd3fb", + "fileId": "cfGCyyQj9OLqFjFTzoi6n2", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3874,7 +3874,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "66IfdxyS5BcIkicXC3t/5g" + "fileId": "13An/vhstEZ4GkJX4dXTn2" }, { "__type__": "cc.PrefabInfo", @@ -3884,7 +3884,7 @@ "asset": { "__id__": 0 }, - "fileId": "bewbZZXCZDwJf4w7dlbFVZ", + "fileId": "05zloR7vRKU41BdzborPVe", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3915,7 +3915,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c5+PAQUQxLa61+x6MwoqJp" + "fileId": "99cXsty9tLEbdrR6fw8lqL" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3939,7 +3939,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "faZmMVakJCp5SxXD/b63vv" + "fileId": "34td6A8ANFQ5YOYZH5aC81" }, { "__type__": "cc.PrefabInfo", @@ -3949,7 +3949,7 @@ "asset": { "__id__": 0 }, - "fileId": "e5D4WCdOpODrXk3eW0lPU/", + "fileId": "68FJR04ttGU48eqRowW0/o", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4132,7 +4132,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "07EKTHAXFOGaxfcAZk2J4r" + "fileId": "e33FazIVhAdKno8/fT/KFQ" }, { "__type__": "cc.PrefabInfo", @@ -4142,7 +4142,7 @@ "asset": { "__id__": 0 }, - "fileId": "2bMe9Yqe1FaYNmE6v6I9OA", + "fileId": "b1If9Yr2lCiJys8CCPzJpm", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4173,7 +4173,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "7dhA/c2uJBtKk5xhRBrW6T" + "fileId": "f6E2+HnsNG3J3lnZogV20E" }, { "__type__": "cc.PrefabInfo", @@ -4183,7 +4183,7 @@ "asset": { "__id__": 0 }, - "fileId": "b6cu+5l41L5K27zE8FRFLN", + "fileId": "8chB2wsAlFA62g0JhJDt1d", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4214,7 +4214,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "46bOQHeSxExaGMRF3TA2OW" + "fileId": "2dqWr/h95MvJ675Fpy+Hk8" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4238,7 +4238,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "61VcYvoAVK2YusLgM5uV7A" + "fileId": "9czfzEvpNCQKv9kt8yxkDi" }, { "__type__": "cc.PrefabInfo", @@ -4248,7 +4248,7 @@ "asset": { "__id__": 0 }, - "fileId": "532MCoFOxOmoLwaGmwo3G3", + "fileId": "c6plb7SI1EE5eEPWyd/Ppx", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4431,7 +4431,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "64/C7hQlRElKsOtoMO4UFe" + "fileId": "fbE8Vvxp5O1767n1MlLprY" }, { "__type__": "cc.PrefabInfo", @@ -4441,7 +4441,7 @@ "asset": { "__id__": 0 }, - "fileId": "f7tXNU0zZNFZ0hsZDWY2MU", + "fileId": "13r5wjfYlCoYuhoBL9QPoA", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4472,7 +4472,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "78dJXgSm9KPIBvu1Hekf0P" + "fileId": "8co1vukxxJypIfoR469Duw" }, { "__type__": "cc.PrefabInfo", @@ -4482,7 +4482,7 @@ "asset": { "__id__": 0 }, - "fileId": "3dkHStysJNo7zeSxoFXF3x", + "fileId": "2aF3bNmeZH+piPkxQTZ/g6", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4513,7 +4513,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3cPOI4g/VEjoy9gIMRXAap" + "fileId": "a7C5KpneRN5pwQbW8uLaFZ" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4537,7 +4537,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "72x1a0PDtCtLA3Iq0xP3R1" + "fileId": "d6AW1UWU9Ki6v0XijWGR6T" }, { "__type__": "cc.PrefabInfo", @@ -4547,7 +4547,7 @@ "asset": { "__id__": 0 }, - "fileId": "1aUOz94y9KtaRsLFoh4aeG", + "fileId": "e9MRBASrtEnouOH+z66Vdb", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4572,7 +4572,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f6gh1WmNBNeLG7YoabOIe9" + "fileId": "b11vBnFzNCxYxmG3CW/OC0" }, { "__type__": "cc.UITransform", @@ -4600,7 +4600,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "933cf/J35J35ItZuTBXw4e" + "fileId": "93wEmk2VVKm76uecWoXQfn" }, { "__type__": "cc.Sprite", @@ -4645,7 +4645,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d9eflcCFdH14irO1kfYQ3C" + "fileId": "7coXrko0xJWbDSRMFmOzeX" }, { "__type__": "cc.PrefabInfo", @@ -4655,7 +4655,7 @@ "asset": { "__id__": 0 }, - "fileId": "67DHLFaAFHpY2yl49TPdfw", + "fileId": "43GzXqt5VO3pto40NZRJf3", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -11907,7 +11907,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1920 + "height": 1919.9999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -18605,7 +18605,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -1000, + "y": -600, "z": 0 }, "_lrot": { @@ -21568,7 +21568,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1920 + "height": 1919.9999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -21730,7 +21730,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1920 + "height": 1919.9999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -21925,7 +21925,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1920 + "height": 1919.9999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -22077,7 +22077,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1920 + "height": 1919.9999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -22229,7 +22229,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1920 + "height": 1919.9999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -22381,7 +22381,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1920 + "height": 1919.9999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -27961,7 +27961,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1920 + "height": 1919.9999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/Game/scripts/SlotGame.ts b/assets/Game/scripts/SlotGame.ts index 913cb4d..198eaad 100644 --- a/assets/Game/scripts/SlotGame.ts +++ b/assets/Game/scripts/SlotGame.ts @@ -116,6 +116,9 @@ export class SlotGame extends Component { this.baseBg = this.node.getChildByName('base_bg'); this.freeBg = this.node.getChildByName('free_bg'); + this.baseBg.getChildByName('deng').getComponent(sp.Skeleton).setAnimation(0, 'animation', true) + this.baseBg.getChildByName('mainFrame_01').getComponent(sp.Skeleton).setAnimation(0, 'anim1', true) + this.baseBg.getChildByName('mainFrame_02').getComponent(sp.Skeleton).setAnimation(0, 'animation', true) this.base = this.node.getChildByName('base'); // this.normalMultiAni = this.base.getChildByName('NormalMultiAniNode').getComponent(Animation); diff --git a/assets/Game/scripts/game/Icon.ts b/assets/Game/scripts/game/Icon.ts index d37ec20..6ad8f47 100644 --- a/assets/Game/scripts/game/Icon.ts +++ b/assets/Game/scripts/game/Icon.ts @@ -541,9 +541,9 @@ export class Icon extends Component { .to(1, { position: new Vec3(0, 200, 0) }) .call(() => { multiMoveNode.destroy() - AudioManager.instance.playSFX('Multi_merge'); if (bigMultiNode.active) return + AudioManager.instance.playSFX('Multi_merge'); bigMultiLabel.getComponent(Label).string = 'x' + XnInfo.NowN bigMultiNode.active = true bigMultiNode.getComponent(sp.Skeleton).setAnimation(0, 'animation', false) diff --git a/assets/Loading/game.scene b/assets/Loading/game.scene index 3bdafdc..a25cb9e 100644 --- a/assets/Loading/game.scene +++ b/assets/Loading/game.scene @@ -1647,8 +1647,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1.2, - "y": 1.4, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, diff --git a/assets/Loading/scripts/manager/AudioManager.ts b/assets/Loading/scripts/manager/AudioManager.ts index 52ff2fc..609eabd 100644 --- a/assets/Loading/scripts/manager/AudioManager.ts +++ b/assets/Loading/scripts/manager/AudioManager.ts @@ -55,39 +55,45 @@ export class AudioManager { } playBGM(name: string, loop: boolean = true) { - if (this._isMuted || !this._bgmAudioSource) return; - this._bgmAudioSource.stop(); - let clip = this._audioClips.get(name); - if (!clip) { - console.warn(`BGM ${name} 不存在`); - return; - } - this._bgmClip = clip; - this._bgmAudioSource.clip = clip; - this._bgmAudioSource.loop = loop; - this._bgmAudioSource.volume = this._bgmVolume; - this._bgmAudioSource.play(); - this._isPaused = false; + // if (this._isMuted || !this._bgmAudioSource) return; + // this._bgmAudioSource.stop(); + // let clip = this._audioClips.get(name); + // if (!clip) { + // console.warn(`BGM ${name} 不存在`); + // return; + // } + // this._bgmClip = clip; + // this._bgmAudioSource.clip = clip; + // this._bgmAudioSource.loop = loop; + // this._bgmAudioSource.volume = this._bgmVolume; + // this._bgmAudioSource.play(); + // this._isPaused = false; } playSFX(name: string, volume: number = 1.0, loop: boolean = false) { if (this._isMuted) return; - let clip = this._audioClips.get(name); if (!clip) { console.warn(`音效 ${name} 不存在`); return; } + console.log('播放', clip) // 找到一个空闲的AudioSource let availableSource = this._sfxAudioSources.find(source => !source.playing); if (availableSource) { // 确保音量正确 availableSource.volume = volume; - availableSource.loop = loop; availableSource.clip = clip; + // 播放新音效 - availableSource.play() + if (loop) { + availableSource.loop = loop; + availableSource.play() + } else { + availableSource.playOneShot(clip, volume) + } + } else { // 如果没有空闲的AudioSource,创建一个新的 let sfxNode = new Node(`SFX_${this._sfxAudioSources.length}`); @@ -95,10 +101,14 @@ export class AudioManager { let newSource = sfxNode.addComponent(AudioSource); newSource.playOnAwake = false; newSource.volume = volume; - newSource.loop = loop; newSource.clip = clip; this._sfxAudioSources.push(newSource); - newSource.play() + if (loop) { + newSource.loop = loop; + newSource.play() + } else { + newSource.playOneShot(clip, volume) + } } }