From ec9dc8db3e16161f04cdf77d6fbebb764216bdfb Mon Sep 17 00:00:00 2001 From: TJH Date: Fri, 10 Oct 2025 11:01:44 +0800 Subject: [PATCH] 1 --- assets/Game/prefabs/SlotScene.prefab | 114 +++++++++--------- .../Loading/scripts/manager/AudioManager.ts | 27 ++--- 2 files changed, 70 insertions(+), 71 deletions(-) diff --git a/assets/Game/prefabs/SlotScene.prefab b/assets/Game/prefabs/SlotScene.prefab index 9ccd651..cc8b08e 100644 --- a/assets/Game/prefabs/SlotScene.prefab +++ b/assets/Game/prefabs/SlotScene.prefab @@ -2294,7 +2294,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "53OkM1QXJIIYTTECG/BOks" + "fileId": "38yA+vQiFBxJdu8+hfyxhg" }, { "__type__": "cc.PrefabInfo", @@ -2304,7 +2304,7 @@ "asset": { "__id__": 0 }, - "fileId": "78SkWuFPNPrrhYWUb5sgpQ", + "fileId": "35fMC+MUdIJac+EBbdYHqa", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2335,7 +2335,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a5EJpCNqFCCJy4TOx5T7aB" + "fileId": "3dBOwHrYpMZZiMBV3XdjCn" }, { "__type__": "cc.PrefabInfo", @@ -2345,7 +2345,7 @@ "asset": { "__id__": 0 }, - "fileId": "22IYS90fJIrYYcaSshdIGU", + "fileId": "15kTeQyfpDlKQqWD9PPSGK", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2376,7 +2376,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "69r4gHcp9Gw4X+H8VfqiES" + "fileId": "eeB9F22GtNBpdrlnPynwrP" }, { "__type__": "5fc10Zl7lVO97/rr2J1uxWH", @@ -2400,7 +2400,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "0cNZ6dN2xD3aeeC4I7buEj" + "fileId": "56wylOY9NDo62JnOC0L2Hz" }, { "__type__": "5fd13+Xa69CZogb3Q/F1lnC", @@ -2573,7 +2573,7 @@ "asset": { "__id__": 0 }, - "fileId": "ecRqPLr6JOwJBbm2mlmLQ4", + "fileId": "0eR9ceg9VFALhw6wzpwhAf", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2598,7 +2598,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "7ecg9svgBKwL/Wc+dFHn6B" + "fileId": "e1sLEEf2NCSbF90rSXjYdl" }, { "__type__": "cc.UITransform", @@ -2626,7 +2626,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ccsvA0C1RAOpyaLvXlrLjt" + "fileId": "58jFexZLBA9Z+kiiizLrrg" }, { "__type__": "cc.Sprite", @@ -2671,7 +2671,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c5WEWDMrBHuJ5Ontm9iuob" + "fileId": "97HzHIL3lMXqPnzWNVNYhV" }, { "__type__": "cc.PrefabInfo", @@ -2681,7 +2681,7 @@ "asset": { "__id__": 0 }, - "fileId": "96eAxLQmxJDZ4DTYjLnfXk", + "fileId": "32Y9yEpwhL4qzYZ8pDG1jn", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2936,7 +2936,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "25xt4XFTlBZrH2x2pwtXvV" + "fileId": "92GvcDZjpIi7SH+jTDHFvH" }, { "__type__": "cc.PrefabInfo", @@ -2946,7 +2946,7 @@ "asset": { "__id__": 0 }, - "fileId": "b39akHkzhPSZJ6oK59GtPH", + "fileId": "bfEcSS+YBGeJsHj04CXENc", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2977,7 +2977,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "09zADo1qdIXoKFcv7wMXXX" + "fileId": "edWgOKA/9E5Y378PTXTfpC" }, { "__type__": "cc.PrefabInfo", @@ -2987,7 +2987,7 @@ "asset": { "__id__": 0 }, - "fileId": "68628o04hAp5BNLrNyCDUw", + "fileId": "4fQUCzOzBBMLOsKA7AWr4w", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3018,7 +3018,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "36ZvBCDIZFKbsJW4xuIpOo" + "fileId": "80OEIVQ8lMEZbroRgjmSJr" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3042,7 +3042,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3d+RrRPgRKJbiteMDjWLNi" + "fileId": "14EIrMvg9II7ciYrsDRxpO" }, { "__type__": "cc.PrefabInfo", @@ -3052,7 +3052,7 @@ "asset": { "__id__": 0 }, - "fileId": "96haqIhTZMppPElEnk6duc", + "fileId": "dahWE8GYRKb5gzkGf8Yc5f", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3235,7 +3235,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2d7F/AlLZA9ZiPsZbSWA/c" + "fileId": "a0uVbv3TVAD77w/Pdsv+xx" }, { "__type__": "cc.PrefabInfo", @@ -3245,7 +3245,7 @@ "asset": { "__id__": 0 }, - "fileId": "05/Qos8lhCR4EWRwOu8MOK", + "fileId": "deJ4sO6KlLPpW1DVXFZDR0", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3276,7 +3276,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a1fhd626pOs7W9I38O3Bmx" + "fileId": "02LLGgR4NKbLXkermI/0/V" }, { "__type__": "cc.PrefabInfo", @@ -3286,7 +3286,7 @@ "asset": { "__id__": 0 }, - "fileId": "bdJwVQkfRC+r3D+wvmF2EU", + "fileId": "61CZ3mJNdKvaKVfDkEDtej", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3317,7 +3317,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "22rpEmtB5IlKXdOabRTEGJ" + "fileId": "dcHQVJq2FFoIbpRi6s6XzK" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3341,7 +3341,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c63Qo9wM9Kxq1gAwL/yfWg" + "fileId": "54PAIeEP5NJaJF3d/LWD3R" }, { "__type__": "cc.PrefabInfo", @@ -3351,7 +3351,7 @@ "asset": { "__id__": 0 }, - "fileId": "a05TLaDfhELZaXQkg037+P", + "fileId": "92OjafLB5KVZOZ4bSaS4Jh", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3534,7 +3534,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "54J0wpvbNHe7xr5k7kEsfb" + "fileId": "8a6e6I/rdNHYDv4OnW3N22" }, { "__type__": "cc.PrefabInfo", @@ -3544,7 +3544,7 @@ "asset": { "__id__": 0 }, - "fileId": "27T631j+FEgK+DhUsKVjsY", + "fileId": "81qNSa5GVCx7yr0Mjfs8Vh", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3575,7 +3575,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "70GZbCN6JP9rpDvqVw9Z8Q" + "fileId": "1drkF3t3dK6rVk3NkckPqx" }, { "__type__": "cc.PrefabInfo", @@ -3585,7 +3585,7 @@ "asset": { "__id__": 0 }, - "fileId": "e6dzGIpfhBI5hBu58Ato98", + "fileId": "f3xZSD7w5D04DCatmVrJr/", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3616,7 +3616,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "10DaUugztAapUdRwD67any" + "fileId": "a6vDOBp05K0KQx87yqm+oX" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3640,7 +3640,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e79Z5WncpFS7iWfH4utA5w" + "fileId": "a3bEpenqpOb7KQh65Y7+fD" }, { "__type__": "cc.PrefabInfo", @@ -3650,7 +3650,7 @@ "asset": { "__id__": 0 }, - "fileId": "543fCYcoVD2r2dUNXKT//r", + "fileId": "b28PIPuGVK9pu8eWxnVGVm", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3833,7 +3833,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "35y7kONXtBnbD6Shx3tGuQ" + "fileId": "44GbsOFEhIErvGEY7+9rla" }, { "__type__": "cc.PrefabInfo", @@ -3843,7 +3843,7 @@ "asset": { "__id__": 0 }, - "fileId": "cfGCyyQj9OLqFjFTzoi6n2", + "fileId": "09dzM9/fNDg4CnqOxVxfDb", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3874,7 +3874,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "13An/vhstEZ4GkJX4dXTn2" + "fileId": "f9Zo3AJzhJCq5sAkzvgCtJ" }, { "__type__": "cc.PrefabInfo", @@ -3884,7 +3884,7 @@ "asset": { "__id__": 0 }, - "fileId": "05zloR7vRKU41BdzborPVe", + "fileId": "2dwSswWLJGmpHbqA6VFO4n", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3915,7 +3915,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "99cXsty9tLEbdrR6fw8lqL" + "fileId": "5bIVp7b+FBkb6bbreiGX70" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3939,7 +3939,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "34td6A8ANFQ5YOYZH5aC81" + "fileId": "25c+ALJKBLXpVSrMvX3x97" }, { "__type__": "cc.PrefabInfo", @@ -3949,7 +3949,7 @@ "asset": { "__id__": 0 }, - "fileId": "68FJR04ttGU48eqRowW0/o", + "fileId": "7e4PakL/tAN54XC0GGMftt", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4132,7 +4132,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e33FazIVhAdKno8/fT/KFQ" + "fileId": "43LeQQ2spMGYjnH2NU90Yu" }, { "__type__": "cc.PrefabInfo", @@ -4142,7 +4142,7 @@ "asset": { "__id__": 0 }, - "fileId": "b1If9Yr2lCiJys8CCPzJpm", + "fileId": "a7BkPrTp5D76X1SleWsHqu", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4173,7 +4173,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f6E2+HnsNG3J3lnZogV20E" + "fileId": "f39O1gwrFGupm369+NTp43" }, { "__type__": "cc.PrefabInfo", @@ -4183,7 +4183,7 @@ "asset": { "__id__": 0 }, - "fileId": "8chB2wsAlFA62g0JhJDt1d", + "fileId": "fcbar8tEpGco0DiCSJWXzp", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4214,7 +4214,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2dqWr/h95MvJ675Fpy+Hk8" + "fileId": "4az9eG/4ZLra/sHDNXU2ZF" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4238,7 +4238,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "9czfzEvpNCQKv9kt8yxkDi" + "fileId": "6es2XwOvhEUIx8Ihbh/eQ0" }, { "__type__": "cc.PrefabInfo", @@ -4248,7 +4248,7 @@ "asset": { "__id__": 0 }, - "fileId": "c6plb7SI1EE5eEPWyd/Ppx", + "fileId": "d4aFxuBwxDZYmzjBJYCMdj", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4431,7 +4431,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fbE8Vvxp5O1767n1MlLprY" + "fileId": "02JzRMiZRLKaOArvh2m5/1" }, { "__type__": "cc.PrefabInfo", @@ -4441,7 +4441,7 @@ "asset": { "__id__": 0 }, - "fileId": "13r5wjfYlCoYuhoBL9QPoA", + "fileId": "07lmZR/69IL4uEGBf9aYnN", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4472,7 +4472,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8co1vukxxJypIfoR469Duw" + "fileId": "e9ZjCebNlGcaYCo6jBOQoZ" }, { "__type__": "cc.PrefabInfo", @@ -4482,7 +4482,7 @@ "asset": { "__id__": 0 }, - "fileId": "2aF3bNmeZH+piPkxQTZ/g6", + "fileId": "65qAJn61VAL5my247++eS3", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4513,7 +4513,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a7C5KpneRN5pwQbW8uLaFZ" + "fileId": "ed21X4SPxIXL42tU+0JxYH" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4537,7 +4537,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d6AW1UWU9Ki6v0XijWGR6T" + "fileId": "54QRSamC5AwKSUNxCiO23w" }, { "__type__": "cc.PrefabInfo", @@ -4547,7 +4547,7 @@ "asset": { "__id__": 0 }, - "fileId": "e9MRBASrtEnouOH+z66Vdb", + "fileId": "70CsTKY4hLpJDLq+33l/s8", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4572,7 +4572,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b11vBnFzNCxYxmG3CW/OC0" + "fileId": "b1fZvSbb9N/YVmdb4a1qqs" }, { "__type__": "cc.UITransform", @@ -4600,7 +4600,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "93wEmk2VVKm76uecWoXQfn" + "fileId": "75jNr/A7xA4o6QKos6X6AB" }, { "__type__": "cc.Sprite", @@ -4645,7 +4645,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "7coXrko0xJWbDSRMFmOzeX" + "fileId": "542VzNcYRGLbEAjoo2uV4H" }, { "__type__": "cc.PrefabInfo", @@ -4655,7 +4655,7 @@ "asset": { "__id__": 0 }, - "fileId": "43GzXqt5VO3pto40NZRJf3", + "fileId": "bemPnYhSFMlKwcLnirFdHd", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null diff --git a/assets/Loading/scripts/manager/AudioManager.ts b/assets/Loading/scripts/manager/AudioManager.ts index 609eabd..e942e16 100644 --- a/assets/Loading/scripts/manager/AudioManager.ts +++ b/assets/Loading/scripts/manager/AudioManager.ts @@ -55,19 +55,19 @@ 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) { @@ -77,7 +77,6 @@ export class AudioManager { console.warn(`音效 ${name} 不存在`); return; } - console.log('播放', clip) // 找到一个空闲的AudioSource let availableSource = this._sfxAudioSources.find(source => !source.playing);