assets/Game/prefabs/SlotScene.prefab

@@ -2294,7 +2294,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "96MLnfjEtAi4b6uJnykcDB"
+    "fileId": "36/hgbuL9IMrK8Mtl1IMVw"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2304,7 +2304,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "e5Rbn5A6NHiodenRWoj/Qs",
+    "fileId": "91WOH/VS5OzYrKcQC+AYpK",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -2335,7 +2335,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "6btVXoPndM97FlNHbG3z84"
+    "fileId": "ccrDQPFlJC+bruTEodPDf9"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2345,7 +2345,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "ea3FITMjpAFL+wheKPLImZ",
+    "fileId": "a0aj38rrZDbIGDKwY/5G9k",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -2376,7 +2376,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "0d6korPC5FkZUMNv9ICwZN"
+    "fileId": "8fVzKzrgxFzb0MW3fX/o/C"
   },
   {
     "__type__": "5fc10Zl7lVO97/rr2J1uxWH",
@@ -2400,7 +2400,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "a8bzvo+AZGvoIZY1dJmrB8"
+    "fileId": "0bHKYXmw9LzqXcZ30l/b1g"
   },
   {
     "__type__": "5fd13+Xa69CZogb3Q/F1lnC",
@@ -2573,7 +2573,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "76L4Z0qz9LE6DNE5ao1QqQ",
+    "fileId": "27Bwq4K1ZJHrOQ2HVBDwD4",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -2598,7 +2598,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "20ckLk7g1Bj4XHUDk0iTe7"
+    "fileId": "181vzPIzRHBIrYsoJgSS+a"
   },
   {
     "__type__": "cc.UITransform",
@@ -2626,7 +2626,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "72EvQeMXBHVJjOlxKNXX2a"
+    "fileId": "31LH3ucypO1LLHZvOy/mCL"
   },
   {
     "__type__": "cc.Sprite",
@@ -2671,7 +2671,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "55pXkLUU5AFqDQsjXTveUy"
+    "fileId": "d1VDevPYtKNbgn98zMEQVy"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2681,7 +2681,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "62U3hvxLdJqo66wzDeIVgB",
+    "fileId": "1eTuPljnNHGZQ+OP0nzAKk",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -2936,7 +2936,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "efwkZDG6VAoKB8yy/NjWKf"
+    "fileId": "73vZ5jykpLFogTcFjT9JrO"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2946,7 +2946,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "f9LF6VRn5GU5UrTV9wz76y",
+    "fileId": "26Hf1hjVFPqrn67xLxkhpG",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -2977,7 +2977,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "c36TSwlS1OTaQM8581ZxVE"
+    "fileId": "51GeHrpSBMWZa3pByCG8U1"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2987,7 +2987,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "3dMfN9OupGEpzzfWTYzNSJ",
+    "fileId": "74wUqcYpNNdqMxwX0m7UUx",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3018,7 +3018,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "deCmi+rEJPQqjki5Aya+vh"
+    "fileId": "fcfICkj4NNIrEKzFwFnkNO"
   },
   {
     "__type__": "45522uB1sdFu4FJAojtnha4",
@@ -3042,7 +3042,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "06X/tYgzxEV4G/8F/4tY5M"
+    "fileId": "62GyOk1IJB75PrvIzUWhLo"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3052,7 +3052,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "4cyydghzVLVoleu66PGZlg",
+    "fileId": "4aTPaEf4FMk50BQdcpUxCt",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3235,7 +3235,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "adMfKGBU9MMorY9A/Zzdc7"
+    "fileId": "8dc7YCwA9MgqJ+Z04tQdOu"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3245,7 +3245,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "a3CNi/9SZCOoOC2GCBRhsz",
+    "fileId": "43dKTwJ5FKl5R4z/wQvFgC",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3276,7 +3276,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "ae9vlaJAJHB5zheG/jXKAY"
+    "fileId": "93UPVSZOVGAbHraBw3xdJX"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3286,7 +3286,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "40BzCRD8VJxqpdi2JerDAW",
+    "fileId": "ffeCIrbntJs5/hELI6aCzk",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3317,7 +3317,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "5d7yl9LOtLLLFW4DPzcxRY"
+    "fileId": "48HaVP9GpFWrO6FC7Z2G8l"
   },
   {
     "__type__": "45522uB1sdFu4FJAojtnha4",
@@ -3341,7 +3341,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "96fSi/+HZDC51Eh1WIzZQW"
+    "fileId": "ea9X4w7OtOlojtkXC4mOyz"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3351,7 +3351,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "5bAwT5xx1NHpA4MYBmiftu",
+    "fileId": "c5IT89S01FNY3uD2KSbBpT",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3534,7 +3534,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "688/+8/zpHoJ0hNGSQS9la"
+    "fileId": "b8GvHExuNB445+aueio+Ox"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3544,7 +3544,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "34cmNMH4tIJLmuwb9uEIjU",
+    "fileId": "f9aCEzhAdCo5nxXIQpgjWr",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3575,7 +3575,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "fbsUHwYUhDZpL6gsUrZ4CZ"
+    "fileId": "10QJOBeqBN96BJTMed2ZZN"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3585,7 +3585,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "72atkhvc5Pm7d/O669Q8J6",
+    "fileId": "c5gxmVSjNKVrEQnExUwzCY",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3616,7 +3616,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "1b32uXkTJM2qiLO7SerCAH"
+    "fileId": "c6foaGcgZE7p2qf5Wm/6yt"
   },
   {
     "__type__": "45522uB1sdFu4FJAojtnha4",
@@ -3640,7 +3640,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "726ZpFn4dJ/77G02VUSBgm"
+    "fileId": "a1nkNrtC9EGYq3Yy+sm+jq"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3650,7 +3650,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "fd63IBg7xH4qNq3LOAUsCY",
+    "fileId": "cbs6iwYZVNtqPnQgU8Cuio",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3833,7 +3833,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "dajcBHFI5EY4mfnn2UXTsC"
+    "fileId": "fddQC6wwFLq65rD91x9wkV"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3843,7 +3843,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "30LaHWAG9PNpFm7Z7d4lL6",
+    "fileId": "6bIUExco1EEYrKbf2FE7PX",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3874,7 +3874,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "70H2zRUQNFoK1DU2t5qBNs"
+    "fileId": "2bhfG3aXlBoYKXja+LX1Lu"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3884,7 +3884,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "e7mktnJCZMAKLBicFrZWUb",
+    "fileId": "b6iUeGSyZNQIrCVICGLr0N",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3915,7 +3915,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "479dS/AGJDU4fR5Z+dbrik"
+    "fileId": "115aYgrMpCObFLPGKadMIy"
   },
   {
     "__type__": "45522uB1sdFu4FJAojtnha4",
@@ -3939,7 +3939,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "76/kijLyVIrqpW5tBxkKbZ"
+    "fileId": "aa3dHLRS1BnqvMMKIeOZHi"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3949,7 +3949,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "ecOPFB7+hGRIyPF+/Nutjl",
+    "fileId": "0aCNKvi+RGw5av+rAacAMv",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -4132,7 +4132,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "72Utrsf2tB9KSKvG+pxRAk"
+    "fileId": "b0c06hiK9KMahmQIcOvCvH"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4142,7 +4142,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "22wFBDJm9HZ53HPyQsZOcJ",
+    "fileId": "603XGNOrlKWqQlcEYB8Y8s",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -4173,7 +4173,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d5lb8U7LBOgo4It5OfNZTq"
+    "fileId": "c95AxGEjFHX7vEy2h+2SfK"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4183,7 +4183,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "81wTKbEnZNPYJARX77tLcM",
+    "fileId": "0eCAkd/+1F1aYLYUsDqJmy",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -4214,7 +4214,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "8baFNQ0tZEY5KVJj7arUMo"
+    "fileId": "38cas4p3BD5KSam2gYvkC5"
   },
   {
     "__type__": "45522uB1sdFu4FJAojtnha4",
@@ -4238,7 +4238,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "6csI0r9CVJTbyxzGUBbCrJ"
+    "fileId": "8fyNIbJ4pJYaCt6IWUBEN2"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4248,7 +4248,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "36hDWHDodAAausmMoZOkS1",
+    "fileId": "39jjsh6DNIabd80zeipjyI",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -4431,7 +4431,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "91ax0uBV5IlqnpeYxKRF2J"
+    "fileId": "89wSxaKBdCUJ/i702wGeQ7"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4441,7 +4441,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "42eYvObzxNLKsZEYiC6Awd",
+    "fileId": "0b4PI7+9ZDZZNzqkRGr3en",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -4472,7 +4472,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "25t2C1Gt1GOJsYDFYF1Fqg"
+    "fileId": "5ccW4dawlBHLSS/pH8LAGN"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4482,7 +4482,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "b3/l/OBQ9FhbQf+aQFW84y",
+    "fileId": "c6cDh5S9xHJo0JN+kRo08F",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -4513,7 +4513,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "cdCO8bRQpPuL2vUis9qZ3b"
+    "fileId": "4c7XxjcB9AuaSRVenQnyMp"
   },
   {
     "__type__": "45522uB1sdFu4FJAojtnha4",
@@ -4537,7 +4537,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "1dmSIJ3K5D4LxRD2GceGO0"
+    "fileId": "07nf1f7RxAz6sedy+K4mHW"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4547,7 +4547,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "05azKCuPhI46+3LeJXao/L",
+    "fileId": "66AOaLoiZLybDooEPKqVbZ",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -4572,7 +4572,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "3bowkinSVFB5hlw/A52QNK"
+    "fileId": "d7eD3+9cVGDYEgmy0PlqdU"
   },
   {
     "__type__": "cc.UITransform",
@@ -4600,7 +4600,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "12Kv+4W2VD55ehjEfI2pZS"
+    "fileId": "66ERiAPeNJz7eCKFl45P6q"
   },
   {
     "__type__": "cc.Sprite",
@@ -4645,7 +4645,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "c2sAKfoBBPTJYlC21LXaxk"
+    "fileId": "44NclXuHRE0LgYYr9mskjX"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4655,7 +4655,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "26XGQ69WJFfZLtvDfBhfjT",
+    "fileId": "c60ZJ4WeBNpKIuFSLQW4Qo",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null

assets/Game/scripts/SlotBar.ts

@@ -63,7 +63,6 @@ export class SlotBar extends Component {
     private curBet: number = 0;             // 当前下注区间
     private curWin: number = 0;             // 当前赢分
     private betIndex: number = 0;           // 下注区间下标        
-    private thisRotateTime: number = 0;     // 当前次滚动已经持续的时间        
 
     private tweenIsEnd: boolean = true;     // 动画是否完成
     isAuto: boolean = false;
@@ -206,14 +205,6 @@ export class SlotBar extends Component {
 
     }
 
-    protected update(dt: number): void {
-        if (this.hasClickSpin) {
-            this.thisRotateTime += dt
-        } else {
-            this.thisRotateTime = 0
-        }
-    }
-
     onBtnSpin() {
 
         // 第一次点击 旋转
@@ -230,11 +221,7 @@ export class SlotBar extends Component {
             this.setBtnEnable(this.menuBtn, false);
         }
         // 第二次点击 手动停止
-        else if (this.hasClickSpin && !this.hasClickManualStop && this.thisRotateTime < 0.5) {
+        else if (this.hasClickSpin && !this.hasClickManualStop) {
-            this.scheduleOnce(() => {
-                this.node.emit(SLOT_BAR_EVENT.ON_MANUAL_STOP);
-            }, 0.3)
-        } else if (this.hasClickSpin && !this.hasClickManualStop && this.thisRotateTime >= 0.5) {
             this.node.emit(SLOT_BAR_EVENT.ON_MANUAL_STOP);
 
         }
@@ -253,11 +240,7 @@ export class SlotBar extends Component {
             this.setBtnEnable(this.menuBtn, false);
         }
         // 第二次点击 手动停止
-        else if (this.hasClickSpin && !this.hasClickManualStop && this.thisRotateTime < 0.8) {
+        else if (this.hasClickSpin && !this.hasClickManualStop) {
-            this.scheduleOnce(() => {
-                this.node.emit(SLOT_BAR_EVENT.ON_MANUAL_STOP);
-            }, 0.5)
-        } else if (this.hasClickSpin && !this.hasClickManualStop && this.thisRotateTime >= 0.8) {
             this.node.emit(SLOT_BAR_EVENT.ON_MANUAL_STOP);
 
         }
@@ -276,24 +259,14 @@ export class SlotBar extends Component {
             this.setBtnEnable(this.menuBtn, false);
         }
         // 第二次点击 手动停止
-        else if (this.hasClickSpin && !this.hasClickManualStop && this.thisRotateTime < 0.8) {
+        else if (this.hasClickSpin && !this.hasClickManualStop) {
-            this.scheduleOnce(() => {
             this.node.emit(SLOT_BAR_EVENT.ON_MANUAL_STOP);
-            }, 0.5)
-        } else if (this.hasClickSpin && !this.hasClickManualStop && this.thisRotateTime >= 0.8) {
-            this.node.emit(SLOT_BAR_EVENT.ON_MANUAL_STOP);
-
         }
     }
 
     onBtnManualStop() {
-        if (this.hasClickSpin && !this.hasClickManualStop && this.thisRotateTime < 0.8) {
+        if (this.hasClickSpin && !this.hasClickManualStop) {
-            this.scheduleOnce(() => {
             this.node.emit(SLOT_BAR_EVENT.ON_MANUAL_STOP);
-            }, 0.5)
-        } else if (this.hasClickSpin && !this.hasClickManualStop && this.thisRotateTime >= 0.8) {
-            this.node.emit(SLOT_BAR_EVENT.ON_MANUAL_STOP);
-
         }
     }
 
@@ -556,7 +529,6 @@ export class SlotBar extends Component {
     resetAllState() {
         this.hasClickSpin = false;
         this.hasClickManualStop = false;
-        this.thisRotateTime = 0
         this.manualStopNode.active = false
         this.isAuto = false;
         this.setBtnVisible(this.spinBtn, true);

assets/Game/scripts/SlotScene.ts

@@ -583,8 +583,6 @@ export class SlotScene extends Component {
                         this.slotGame.playScatterAni(() => {
                             // 第一次进入免费旋转需要切换背景和展示免费次数
                             this.FreeSpinEnter.show(this.spinInfo.Data.FreeSpin.MaxCount, () => {
-                                AudioManager.instance.stopAllSFX()
-                                AudioManager.instance.playBGM('Free_Mode_BGM');
                                 this.slotGame.changeBg(true);
                                 this.slotBar.enterFreeSpin(this.spinInfo.Data.FreeSpin.LeftCount);
                                 this.scheduleOnce(() => {