diff --git a/assets/Game/SlotRanking/scripts/SlotRanking.ts b/assets/Game/SlotRanking/scripts/SlotRanking.ts index d3d5173..cc7b247 100644 --- a/assets/Game/SlotRanking/scripts/SlotRanking.ts +++ b/assets/Game/SlotRanking/scripts/SlotRanking.ts @@ -6,6 +6,7 @@ import { RewardHistoryList } from './RewardHistoryList'; import { SlotRankingDataManager } from './SlotRankingDataManager'; import { callGameApiForRank, getGameId } from 'db://assets/Loading/scripts/comm'; import { AudioManager } from 'db://assets/Loading/scripts/manager/AudioManager'; +import { SlotScene } from '../../scripts/SlotScene'; const { ccclass, property } = _decorator; @@ -33,7 +34,7 @@ export class SlotRanking extends Component { DESIGN_WIDTH: number = 1080; DESIGN_HEIGHT: number = 1920; - slotScene: any = null; // SlotScene 引用 + slotScene: SlotScene = null; // SlotScene 引用 isMove: boolean = false; // 是否是拖动状态 isClick: boolean = false; // 是否是点击状态 startPos: Vec3 = v3(432, 650, 0); @@ -118,7 +119,7 @@ export class SlotRanking extends Component { }; } - setSlotScene(slotScene: any) { + setSlotScene(slotScene: SlotScene) { this.slotScene = slotScene; // 将 slotScene 引用传递给 RewardList if (this.rewardList) { @@ -128,8 +129,13 @@ export class SlotRanking extends Component { // 检查是否可以点击排行榜按钮 canClickRankingBtn(): boolean { - if (!this.slotScene) return true; + console.log('slotScene', this.slotScene) + if (!this.slotScene) return true; + console.log('isAutoSpin', this.slotScene.gameState.isAutoSpin) + console.log('isInFreeSpin', this.slotScene.gameState.isInFreeSpin) + console.log('isFeatureBuySpin', this.slotScene.gameState.isFeatureBuySpin) + console.log('isEliminating', this.slotScene.gameState.isEliminating) // 如果正在滚动,不可点击 if (this.slotScene.slotGame && this.slotScene.slotGame.isScroll()) { return false; @@ -219,7 +225,7 @@ export class SlotRanking extends Component { this.isClick = false; return; } - + console.log('isClick', this.isClick) if (this.isClick) { // 检查是否可以点击 if (!this.canClickRankingBtn()) { diff --git a/assets/Game/SlotScene.prefab b/assets/Game/SlotScene.prefab index 27cff3b..505fb25 100644 --- a/assets/Game/SlotScene.prefab +++ b/assets/Game/SlotScene.prefab @@ -2327,7 +2327,7 @@ "__id__": 88 }, "asset": { - "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e", + "__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2338,7 +2338,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "d9jf+GEcJLALnixCEWJrQN", + "fileId": "48qHqvKItOK7UR3p8M+5eq", "prefabRootNode": { "__id__": 1 }, @@ -2364,7 +2364,7 @@ "__id__": 91 }, "asset": { - "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", + "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2375,7 +2375,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "c2YjJyltVHDYKGUqRX+96X", + "fileId": "f0WT2SlWhDSaSy/RaNh1z9", "prefabRootNode": { "__id__": 1 }, @@ -2401,7 +2401,7 @@ "__id__": 94 }, "asset": { - "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7", + "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2412,7 +2412,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "45Iz7xzHNKWY3HlGhusXnV", + "fileId": "67hvRuuppLRLdCwYI10XzK", "prefabRootNode": { "__id__": 1 }, @@ -2438,7 +2438,7 @@ "__id__": 97 }, "asset": { - "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", + "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2449,7 +2449,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "430eBmKStF+a9sxRv5P49e", + "fileId": "64JlvTlJBMpp3f+2ARNa1I", "prefabRootNode": { "__id__": 1 }, @@ -2475,7 +2475,7 @@ "__id__": 100 }, "asset": { - "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad", + "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2486,7 +2486,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "96royNGZdAH7er3gkEZfhT", + "fileId": "6chX+Y5pxEIImoGd9Xpox0", "prefabRootNode": { "__id__": 1 }, @@ -2521,7 +2521,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c7lgE+f+tM/5zZ6OEmLYwx" + "fileId": "36MlMw1CJHGKmukOEFpRu6" }, { "__type__": "cc.PrefabInfo", @@ -2531,7 +2531,7 @@ "asset": { "__id__": 0 }, - "fileId": "3dPvNX0IRFVIxZ09YMbCOx", + "fileId": "ed7XQ32TlENaoErTZyTzCr", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2562,7 +2562,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b8Wkt1uXpFHatKrdIuTgK7" + "fileId": "8fGwVHIfRJqIPr93OnWb3E" }, { "__type__": "cc.PrefabInfo", @@ -2572,7 +2572,7 @@ "asset": { "__id__": 0 }, - "fileId": "05y4USAIFM0pb1++QjdvVi", + "fileId": "a95tlmYS9M7qAU2LhdLJBw", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2603,7 +2603,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "7f+woqbCRG4o0d8HuyAQ4l" + "fileId": "72tUNNkmBHT4OJ9S+GK5Dq" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -2628,7 +2628,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6fMKigUu1JqY0Fw5gf+3ts" + "fileId": "88uAip+OpH2KFTrzhB0jEA" }, { "__type__": "5fd13+Xa69CZogb3Q/F1lnC", @@ -2801,7 +2801,7 @@ "asset": { "__id__": 0 }, - "fileId": "11gzAC/0NBEopLOG4Sbiw1", + "fileId": "619SmmsVxKE5x8sJPsXw7i", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2991,7 +2991,7 @@ "__id__": 123 }, "asset": { - "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", + "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3002,7 +3002,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "41U/NV14pBCYnTvx3ugRK/", + "fileId": "9fCltv6BtL0rNim6XRM9qm", "prefabRootNode": { "__id__": 1 }, @@ -3028,7 +3028,7 @@ "__id__": 126 }, "asset": { - "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", + "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3039,7 +3039,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "82PZKdUZRKjatZizbZ8Z8s", + "fileId": "d89xWerAdPo4sAaoyenDfJ", "prefabRootNode": { "__id__": 1 }, @@ -3065,7 +3065,7 @@ "__id__": 129 }, "asset": { - "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", + "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3076,7 +3076,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "51zNUEyO5P6p29s8Pz588Z", + "fileId": "8dgR04fXBBqI0SO509tMym", "prefabRootNode": { "__id__": 1 }, @@ -3102,7 +3102,7 @@ "__id__": 132 }, "asset": { - "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", + "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3113,7 +3113,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "71I7OcP2NMJLL2w5xkpA9o", + "fileId": "70qqzgka9EuIfT6kpEfVWU", "prefabRootNode": { "__id__": 1 }, @@ -3139,7 +3139,7 @@ "__id__": 135 }, "asset": { - "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", + "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3150,7 +3150,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "71XDVBMm1A2Jkw3bDTRTK1", + "fileId": "26QqvF0QRCuJteTexcqi0/", "prefabRootNode": { "__id__": 1 }, @@ -3185,7 +3185,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "06Jx9VUIxP647yTnTKnqYI" + "fileId": "f5Nx19CHFDlrh2WihQpyU4" }, { "__type__": "cc.PrefabInfo", @@ -3195,7 +3195,7 @@ "asset": { "__id__": 0 }, - "fileId": "6ec8Nx0L9MjbU57l8wHGqw", + "fileId": "5fDws/wZVFF5wspiGXHXYG", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3226,7 +3226,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "abjURfnyxMcLyjD+2lhm+J" + "fileId": "80l5zWr69DvIYX8qkVlFkQ" }, { "__type__": "cc.PrefabInfo", @@ -3236,7 +3236,7 @@ "asset": { "__id__": 0 }, - "fileId": "b9EppD+P9JroxCrPdIbuNs", + "fileId": "c2FcqUVhFI87W3+Xkvsf+J", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3267,7 +3267,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "081ja4KQBPspbo0pdSk1ZO" + "fileId": "2dQJAYC59C4ogoPoooHc9F" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3292,7 +3292,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "46e1R99aNFfq6A/XBFkFp1" + "fileId": "a6WUoN551N7ZUJsj9yxU1c" }, { "__type__": "cc.PrefabInfo", @@ -3302,7 +3302,7 @@ "asset": { "__id__": 0 }, - "fileId": "16F2/G55JDSZEQnL0EIBy/", + "fileId": "d5UlsekgtHMKJQf7m3fHZL", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3492,7 +3492,7 @@ "__id__": 152 }, "asset": { - "__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", + "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3503,7 +3503,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "7a2OKFttRHQrIAlT/qJyOo", + "fileId": "ees3Kc+oNFU58t3SkNL4rx", "prefabRootNode": { "__id__": 1 }, @@ -3529,7 +3529,7 @@ "__id__": 155 }, "asset": { - "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e", + "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3540,7 +3540,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "382iIoVjJFkbF3FH+G57hg", + "fileId": "a2dBxMwElN7pAZWLJWN7Op", "prefabRootNode": { "__id__": 1 }, @@ -3577,7 +3577,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "1abj5MXd1BtLQgWnOB1Bvq", + "fileId": "6811X61XhBb7PD/4vo+Szy", "prefabRootNode": { "__id__": 1 }, @@ -3603,7 +3603,7 @@ "__id__": 161 }, "asset": { - "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", + "__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3614,7 +3614,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3b0t/LXBxH6rMpMwbqcxmn", + "fileId": "0b+R5ROX5H45lFlFQ5/Lt7", "prefabRootNode": { "__id__": 1 }, @@ -3640,7 +3640,7 @@ "__id__": 164 }, "asset": { - "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", + "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3651,7 +3651,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "15VMECrX1KXaFx61Zehdmx", + "fileId": "870ROMsn1I+4WSE19BePFd", "prefabRootNode": { "__id__": 1 }, @@ -3686,7 +3686,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "93r4EF3xdLALJANeVkbJQb" + "fileId": "1cT2WhL/BL6J5KfbqzC86d" }, { "__type__": "cc.PrefabInfo", @@ -3696,7 +3696,7 @@ "asset": { "__id__": 0 }, - "fileId": "e9S1XQmuxCuof0o5gE6EB7", + "fileId": "dcihJaxTFL1JGsAXOtJp5e", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3727,7 +3727,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b3KLyiC1RA2aGekFil5L5T" + "fileId": "68pH+Y1YtB8qjl60rHIa4u" }, { "__type__": "cc.PrefabInfo", @@ -3737,7 +3737,7 @@ "asset": { "__id__": 0 }, - "fileId": "87Te26z8hEfqhpfLpmNDPs", + "fileId": "eeR9GspfZHrY9mylaXYBfy", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3768,7 +3768,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b1tF+NzsBCZqjswRpUIm0W" + "fileId": "61hb7VBJlA2JSb8FVUbDmd" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3793,7 +3793,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2bqpfdWQBBL4JjbVogHB5R" + "fileId": "72QeKA6+RMuKe8HsjrFqsW" }, { "__type__": "cc.PrefabInfo", @@ -3803,7 +3803,7 @@ "asset": { "__id__": 0 }, - "fileId": "a0ZFNjOtRJjpU/WPDZneL1", + "fileId": "a72fj2SOVI1pmmxIl3psKz", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3993,7 +3993,7 @@ "__id__": 181 }, "asset": { - "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", + "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4004,7 +4004,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "c55Q+YDeZGAY9YyFyvImfg", + "fileId": "2f8c7LlzBDQLxkoaBPHF4x", "prefabRootNode": { "__id__": 1 }, @@ -4030,7 +4030,7 @@ "__id__": 184 }, "asset": { - "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", + "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4041,7 +4041,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "37Qbu3JvdMsI5o4zQOw1Tb", + "fileId": "60bTaQnCxGUYHxpMxJWKXv", "prefabRootNode": { "__id__": 1 }, @@ -4067,7 +4067,7 @@ "__id__": 187 }, "asset": { - "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e", + "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4078,7 +4078,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "d5GvChmzJIKoTgFRdq2RI/", + "fileId": "34EUHe0FlBoZOreBU2emJR", "prefabRootNode": { "__id__": 1 }, @@ -4104,7 +4104,7 @@ "__id__": 190 }, "asset": { - "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", + "__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4115,7 +4115,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "adXzFF2blJtbKEoA+QUH2g", + "fileId": "73IGIB4zFKTb5UT/A4V1+r", "prefabRootNode": { "__id__": 1 }, @@ -4141,7 +4141,7 @@ "__id__": 193 }, "asset": { - "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", + "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4152,7 +4152,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "8475q7SIZMc79f+0BQxXmI", + "fileId": "25MEP34QRMWJ4YyGd8CwSV", "prefabRootNode": { "__id__": 1 }, @@ -4187,7 +4187,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5dsrXac3hIpoNYkIAo+sNQ" + "fileId": "67E+b73UxLJozzxHzz/7iQ" }, { "__type__": "cc.PrefabInfo", @@ -4197,7 +4197,7 @@ "asset": { "__id__": 0 }, - "fileId": "38LtbYsyxJC5gl3w2w2Xms", + "fileId": "5f9Gdum/1PUZK/UitgyvmV", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4228,7 +4228,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c3Oz7hNURM/bTucNsJXH/l" + "fileId": "23ZUrBJ3RI272RuLqCm396" }, { "__type__": "cc.PrefabInfo", @@ -4238,7 +4238,7 @@ "asset": { "__id__": 0 }, - "fileId": "5bQmrqqVhNvbA2GT0V+yh6", + "fileId": "dbIZrpHMpCu65XriH/wBMg", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4269,7 +4269,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a9zEuEQmZG47uBhdEBgvzK" + "fileId": "8bgA/RNxlJw4FUoCz2aerS" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4294,7 +4294,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "68mOHiVXRGnLKWz7dTnGL4" + "fileId": "71G/k9xulAy7pcVq/8EwXs" }, { "__type__": "cc.PrefabInfo", @@ -4304,7 +4304,7 @@ "asset": { "__id__": 0 }, - "fileId": "a5ZkxCIV5L6qhESllm72+3", + "fileId": "f0GG1/6NVP/oNlXQY9T46D", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4494,7 +4494,7 @@ "__id__": 210 }, "asset": { - "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", + "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4505,7 +4505,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "9ap01J9d1BzIEgLHcXpVyR", + "fileId": "7bfQ5b+AREO7HUSbLbKZre", "prefabRootNode": { "__id__": 1 }, @@ -4542,7 +4542,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "dd2iJVpJBGTIiMx/b4ZWVl", + "fileId": "a0nxD1KlRHHJ+kMSNk4Zkw", "prefabRootNode": { "__id__": 1 }, @@ -4568,7 +4568,7 @@ "__id__": 216 }, "asset": { - "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", + "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4579,7 +4579,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "6f112SqddI3od7v0WR1bj2", + "fileId": "18VYCbBiRPbajPZCjbQgjs", "prefabRootNode": { "__id__": 1 }, @@ -4605,7 +4605,7 @@ "__id__": 219 }, "asset": { - "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", + "__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4616,7 +4616,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "c8dPbxb9dJxoeguy0qOeC8", + "fileId": "2eeDBeYURPGKezDciRO+tb", "prefabRootNode": { "__id__": 1 }, @@ -4642,7 +4642,7 @@ "__id__": 222 }, "asset": { - "__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", + "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4653,7 +4653,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "dcM76VolVCXoYUrHeZKJaS", + "fileId": "d9lMDRYf1GUpAEhmC9yxNC", "prefabRootNode": { "__id__": 1 }, @@ -4688,7 +4688,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3aokwpdtxFQYJuKKk4cfE3" + "fileId": "3aMC1oxn5MI7FHP0j1bPso" }, { "__type__": "cc.PrefabInfo", @@ -4698,7 +4698,7 @@ "asset": { "__id__": 0 }, - "fileId": "1fg4EJ3T5DIbCjxxV1JlWo", + "fileId": "6bjskj/aNGw6yolQnFLeBu", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4729,7 +4729,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "734DTXhMBC4LM/DlcO8jKM" + "fileId": "7cQN6XUCxDD75jA+NNfoxU" }, { "__type__": "cc.PrefabInfo", @@ -4739,7 +4739,7 @@ "asset": { "__id__": 0 }, - "fileId": "9eQBsudaJGRo5F7v0hsRLn", + "fileId": "94KgIuuQNMopuGwDWDJDb7", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4770,7 +4770,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d2RSfekGpPpY2p+YOH2HGg" + "fileId": "cdWw9OuttJC6sJe1VIedQQ" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4795,7 +4795,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "15qtp5rA1FkKcsnJCvCnqD" + "fileId": "1eimgMwTRIg4su79NHfYmd" }, { "__type__": "cc.PrefabInfo", @@ -4805,7 +4805,7 @@ "asset": { "__id__": 0 }, - "fileId": "46MNZDludGsrY5dct9FBbo", + "fileId": "6dX+KylxZHv7fxyRXFcXLe", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4995,7 +4995,7 @@ "__id__": 239 }, "asset": { - "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", + "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5006,7 +5006,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "78RyBCk9BH/oAQkNmzuVyK", + "fileId": "4dpEw69xZNx7+ugpRTGkgw", "prefabRootNode": { "__id__": 1 }, @@ -5032,7 +5032,7 @@ "__id__": 242 }, "asset": { - "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", + "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5043,7 +5043,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "18/cii1U1AHJ6cel+EYr1S", + "fileId": "68cDDzqMJOmoWVI4b/2pcL", "prefabRootNode": { "__id__": 1 }, @@ -5069,7 +5069,7 @@ "__id__": 245 }, "asset": { - "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", + "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5080,7 +5080,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "2dGgKrWMZClqOmgUL4Cxeb", + "fileId": "c42q74Y4lGz4g9sa2bQ07U", "prefabRootNode": { "__id__": 1 }, @@ -5106,7 +5106,7 @@ "__id__": 248 }, "asset": { - "__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", + "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5117,7 +5117,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "ceext+jThCM6qYn4a1gp/H", + "fileId": "9bgoafDhFEaYJBlIYHt4ia", "prefabRootNode": { "__id__": 1 }, @@ -5143,7 +5143,7 @@ "__id__": 251 }, "asset": { - "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", + "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5154,7 +5154,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "8fhAjV4hNNyIL3NdmWCHOw", + "fileId": "3cCSztL0dPb7Ar2xGpwkSL", "prefabRootNode": { "__id__": 1 }, @@ -5189,7 +5189,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a1whULgPtA9r3kik9FtFlf" + "fileId": "22O9LHh4tK87f6AlwPHD23" }, { "__type__": "cc.PrefabInfo", @@ -5199,7 +5199,7 @@ "asset": { "__id__": 0 }, - "fileId": "6elz7bfOpNF55qynzjafgD", + "fileId": "66aftGkTNDl6e24TYJE213", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5230,7 +5230,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "01IIkU0IhPtYG/HII9i2Ue" + "fileId": "90ZeRRqldB2qBKg+8QS0zk" }, { "__type__": "cc.PrefabInfo", @@ -5240,7 +5240,7 @@ "asset": { "__id__": 0 }, - "fileId": "abIFJqrWxEpZBFmnclT+Hq", + "fileId": "98LM8xq7NJ37y/tcIaLkhc", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5271,7 +5271,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "57ysMVU3RJeq4qlgjwKepR" + "fileId": "41L0ajOMtBHrsCRHfWCnNm" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -5296,7 +5296,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8aErOKQi5PB5UQzy26PF89" + "fileId": "87M746kq5Ey6VraB63OI0d" }, { "__type__": "cc.PrefabInfo", @@ -5306,7 +5306,7 @@ "asset": { "__id__": 0 }, - "fileId": "99LqN9qjFIuooOlCbNwO0Y", + "fileId": "3dS8cmSqdFxbI9qTAwfHx3", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5331,7 +5331,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "cd1UUoisRNaIWx48wfmlhG" + "fileId": "2fF8yUUKlCKLzpPJNL+8ON" }, { "__type__": "cc.UITransform", @@ -5359,7 +5359,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "4fmwlrzdhCzrTLA5AhFfXQ" + "fileId": "35tScQtxlKWZ57uKNLE6GX" }, { "__type__": "cc.Graphics", @@ -5405,7 +5405,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e7X7EvBcRNsIEpOG2erTt8" + "fileId": "386qsVs7JKU6+9yZ+luFD9" }, { "__type__": "cc.PrefabInfo", @@ -5415,7 +5415,7 @@ "asset": { "__id__": 0 }, - "fileId": "4d2ZcVS+VO95PV+/w/YnMj", + "fileId": "e1KUWHXphB0b5Cdo+aNsrn", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -36030,6 +36030,7 @@ "SysGift": { "__id__": 1546 }, + "slotRanking": null, "_id": "" }, { @@ -36085,6 +36086,9 @@ "targetOverrides": [ { "__id__": 1631 + }, + { + "__id__": 1634 } ], "nestedPrefabInstanceRoots": [ @@ -36212,5 +36216,27 @@ "localID": [ "16zYkBMI1DO6FucagYN/iX" ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 1626 + }, + "sourceInfo": null, + "propertyPath": [ + "slotRanking" + ], + "target": { + "__id__": 1549 + }, + "targetInfo": { + "__id__": 1635 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "63Iqyz9cJFrIVs7wdSxKzr" + ] } ] \ No newline at end of file diff --git a/assets/Game/scripts/SlotScene.ts b/assets/Game/scripts/SlotScene.ts index c97a1aa..ab06ea2 100644 --- a/assets/Game/scripts/SlotScene.ts +++ b/assets/Game/scripts/SlotScene.ts @@ -23,6 +23,7 @@ import { FreeSpinEnter } from "./game/FreeSpinEnter"; import { FreeSpinAdd } from "./game/FreeSpinAdd"; import { SysGift } from "./game/SysGift"; import { ErrorManager } from "../../Loading/scripts/manager/ErrorManager"; +import { SlotRanking } from "../SlotRanking/scripts/SlotRanking"; let { ccclass, property } = _decorator; @@ -36,6 +37,7 @@ interface GameState { isInFreeSpin: boolean; isOneRoundEnd: boolean; isDebug: boolean; + isFeatureBuySpin: boolean; } // 自动旋转配置接口 @@ -51,7 +53,7 @@ interface AutoSpinConfig { export class SlotScene extends Component { // 组件引用 @property(SlotGame) - private slotGame: SlotGame = null; + public slotGame: SlotGame = null; @property(SlotBar) private slotBar: SlotBar = null; @@ -77,6 +79,9 @@ export class SlotScene extends Component { @property(SysGift) private SysGift: SysGift = null; + @property(SlotRanking) + slotRanking: SlotRanking = null; + // 游戏数据 private gameInfo: GameInfo = null; private spinInfo: any = null; @@ -87,7 +92,7 @@ export class SlotScene extends Component { private objectId: string[] = []; // 游戏状态管理 - private gameState: GameState = { + public gameState: GameState = { isOnReconnect: false, isAutoSpin: false, isEliminating: false, @@ -95,6 +100,7 @@ export class SlotScene extends Component { isFirstFreeSpin: false, isInFreeSpin: false, isOneRoundEnd: false, + isFeatureBuySpin: false, isDebug: false, }; @@ -112,6 +118,8 @@ export class SlotScene extends Component { async start() { + this.slotRanking.setSlotScene(this); + await this.init(); // this.TotalWin.show(505000, 10) // this.FreeSpinEnter.show(8) @@ -265,6 +273,8 @@ export class SlotScene extends Component { this.node.addChild(panel); featureBuy.show(this.slotBar.getBet(), this.gameInfo.BuyMul, () => { this.spinBtnClick(false, true); + this.gameState.isFeatureBuySpin = true; + this.slotBar.featureBuySpin(); }); } @@ -777,6 +787,8 @@ export class SlotScene extends Component { isReconnect: boolean = false ) { this.gameState.isFirstFreeSpin = false; + this.gameState.isFeatureBuySpin = false; + this.gameState.isInFreeSpin = false; this.slotBar.exitFreeSpin();