diff --git a/assets/Game/carTextures/rp_10012标志之旅/大厅/graySpinBtn.png b/assets/Game/carTextures/rp_10012标志之旅/大厅/graySpinBtn.png new file mode 100644 index 0000000..e8629b3 Binary files /dev/null and b/assets/Game/carTextures/rp_10012标志之旅/大厅/graySpinBtn.png differ diff --git a/assets/Game/carTextures/按钮1.png.meta b/assets/Game/carTextures/rp_10012标志之旅/大厅/graySpinBtn.png.meta similarity index 83% rename from assets/Game/carTextures/按钮1.png.meta rename to assets/Game/carTextures/rp_10012标志之旅/大厅/graySpinBtn.png.meta index 6e33424..3d29f4c 100644 --- a/assets/Game/carTextures/按钮1.png.meta +++ b/assets/Game/carTextures/rp_10012标志之旅/大厅/graySpinBtn.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "3e745b7e-8b21-4d64-ac9c-07a9f3923d87", + "uuid": "3bc48473-a47d-4954-a541-199b92e1922a", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "3e745b7e-8b21-4d64-ac9c-07a9f3923d87@6c48a", - "displayName": "按钮1", + "uuid": "3bc48473-a47d-4954-a541-199b92e1922a@6c48a", + "displayName": "graySpinBtn", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "3e745b7e-8b21-4d64-ac9c-07a9f3923d87", + "imageUuidOrDatabaseUri": "3bc48473-a47d-4954-a541-199b92e1922a", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "3e745b7e-8b21-4d64-ac9c-07a9f3923d87@f9941", - "displayName": "按钮1", + "uuid": "3bc48473-a47d-4954-a541-199b92e1922a@f9941", + "displayName": "graySpinBtn", "id": "f9941", "name": "spriteFrame", "userData": { @@ -114,7 +114,7 @@ ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "3e745b7e-8b21-4d64-ac9c-07a9f3923d87@6c48a", + "imageUuidOrDatabaseUri": "3bc48473-a47d-4954-a541-199b92e1922a@6c48a", "atlasUuid": "" }, "ver": "1.0.12", @@ -129,6 +129,6 @@ "type": "sprite-frame", "hasAlpha": true, "fixAlphaTransparencyArtifacts": false, - "redirect": "3e745b7e-8b21-4d64-ac9c-07a9f3923d87@6c48a" + "redirect": "3bc48473-a47d-4954-a541-199b92e1922a@6c48a" } } diff --git a/assets/Game/carTextures/按钮1.png b/assets/Game/carTextures/按钮1.png deleted file mode 100644 index 51141e0..0000000 Binary files a/assets/Game/carTextures/按钮1.png and /dev/null differ diff --git a/assets/Game/prefabs/SlotScene.prefab b/assets/Game/prefabs/SlotScene.prefab index 05461e3..aebac40 100644 --- a/assets/Game/prefabs/SlotScene.prefab +++ b/assets/Game/prefabs/SlotScene.prefab @@ -2294,7 +2294,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "49KpZAP5VGb6rYT0eQFk6k" + "fileId": "59wmnmhyxNAqQrCJa1e6L1" }, { "__type__": "cc.PrefabInfo", @@ -2304,7 +2304,7 @@ "asset": { "__id__": 0 }, - "fileId": "66llcYs1BFfb9JOhNVoB7p", + "fileId": "37oRJrZZ5HsapgOQR90RQm", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2335,7 +2335,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c6DBCaKTtF94QfU0DJWG44" + "fileId": "25Sf73MkRM0Jng3cumFL6G" }, { "__type__": "cc.PrefabInfo", @@ -2345,7 +2345,7 @@ "asset": { "__id__": 0 }, - "fileId": "03OAcYAi9EZ7HfcUliBMS0", + "fileId": "6b0it5yelC1LDgLv45wNHc", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2376,7 +2376,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3aUJ787PNFuISpFsxv+NQI" + "fileId": "86Jy7nY/JFFpj91ZHQTFJ9" }, { "__type__": "5fc10Zl7lVO97/rr2J1uxWH", @@ -2400,7 +2400,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "beIdcPvnxApZTxM/ZxSuS2" + "fileId": "c3SeGso2FCkoXrtAc5P2Wz" }, { "__type__": "5fd13+Xa69CZogb3Q/F1lnC", @@ -2573,7 +2573,7 @@ "asset": { "__id__": 0 }, - "fileId": "d0u6r6609J4KyQV0TSjjTZ", + "fileId": "bb7vhiemFMbY5DHybaMixd", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2598,7 +2598,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "28GkvbxONFRJ9y8gkDjDKd" + "fileId": "15otEHzYJDbLK6y9UOK3C7" }, { "__type__": "cc.UITransform", @@ -2626,7 +2626,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d1FK62lyhAzoBOwHCZM4pK" + "fileId": "1ahZiJU3FMfKFGBxhi1MGJ" }, { "__type__": "cc.Sprite", @@ -2671,7 +2671,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "30XLxzZ5RIQ55LN3HslWwz" + "fileId": "79n6njy2RF9qSmSw79QwjR" }, { "__type__": "cc.PrefabInfo", @@ -2681,7 +2681,7 @@ "asset": { "__id__": 0 }, - "fileId": "4b21x/qSdJeIyiRH71Lb2U", + "fileId": "d3KsYv7VtHBI9Nz+H9hK+p", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2936,7 +2936,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a4Wg5gqHtBu7/AWUnufjXM" + "fileId": "d8ekZlhSJF7o7H88dbsgwD" }, { "__type__": "cc.PrefabInfo", @@ -2946,7 +2946,7 @@ "asset": { "__id__": 0 }, - "fileId": "e4zvhvbVFBapizMDoOEtpF", + "fileId": "50o3/TChVEXIsZ8K7VcbIi", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2977,7 +2977,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "0d/e9BgJZM8YMBwt5xun52" + "fileId": "6fDr3QFqdIcqeXMarpNitS" }, { "__type__": "cc.PrefabInfo", @@ -2987,7 +2987,7 @@ "asset": { "__id__": 0 }, - "fileId": "551ZmiEK1Dc4Jc4WNAzImJ", + "fileId": "06V06MM+NDtITH8f8PqijH", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3018,7 +3018,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "65DH541bJFs7wVvnsSqy/v" + "fileId": "f1njSX285G/o9n/1Nish1G" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3042,7 +3042,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "73ew0GcC1G5ZGjtzfXQcHW" + "fileId": "95mVqO+n1ElJ7Ipzd8RlNp" }, { "__type__": "cc.PrefabInfo", @@ -3052,7 +3052,7 @@ "asset": { "__id__": 0 }, - "fileId": "87CyZalv5LKZPK0jd8E/LO", + "fileId": "895isDcuNMOpAGna0psBex", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3235,7 +3235,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5fivAZv5dJDLdMnqf8h+zj" + "fileId": "4eiT8ELMlBXpI6N2fyJZrE" }, { "__type__": "cc.PrefabInfo", @@ -3245,7 +3245,7 @@ "asset": { "__id__": 0 }, - "fileId": "f5YdSG5ktK1bbnrAAL5eMj", + "fileId": "0bWQHMwaRMd6J+2wdfh8dI", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3276,7 +3276,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "50CKriGWBIJrByVdNRSg6V" + "fileId": "ab1c6j9VFEaLAG1FvdoDWd" }, { "__type__": "cc.PrefabInfo", @@ -3286,7 +3286,7 @@ "asset": { "__id__": 0 }, - "fileId": "a562FtfeZOtYJ+yQ2fW+nt", + "fileId": "b2JupZcWFKQ5nYHoRiwXDh", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3317,7 +3317,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b2NOVPnkZB8IziF/KaEjSc" + "fileId": "0atXVh2QNE3a4zWK3isV1z" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3341,7 +3341,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "42bZ4DRfROCpd56XU9qAt8" + "fileId": "15tu1PWDBEArcM9uojKp1A" }, { "__type__": "cc.PrefabInfo", @@ -3351,7 +3351,7 @@ "asset": { "__id__": 0 }, - "fileId": "7aB0BAu01Et7m1nRX42Ju3", + "fileId": "bbxyMnEAxMuY2XUFVr4SM1", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3534,7 +3534,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5dXS9dmjNOT7G9Dg2xWdNQ" + "fileId": "54MkhCKP9EFoI3ypC+C1kb" }, { "__type__": "cc.PrefabInfo", @@ -3544,7 +3544,7 @@ "asset": { "__id__": 0 }, - "fileId": "a7AWlN1tJAqr1/4U/EuEWz", + "fileId": "a1AAshghdL078k/l6p1Stf", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3575,7 +3575,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "9buGilpUhOlZNbPGpArRi5" + "fileId": "38+z8g7iNP/pF910DW7N/4" }, { "__type__": "cc.PrefabInfo", @@ -3585,7 +3585,7 @@ "asset": { "__id__": 0 }, - "fileId": "922/jrndlC6bqAZsD++D+n", + "fileId": "39eO+sBDFNXJ1sGZ3F9CE+", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3616,7 +3616,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "67+r5EzXZGH5V+5VjjQ0BK" + "fileId": "b1uuXav9hIFIw4QaBy6Aw+" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3640,7 +3640,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "25DDRqy1dIOoFx+zVma5O9" + "fileId": "20EKN3/qdM14P9W1S/s7Bx" }, { "__type__": "cc.PrefabInfo", @@ -3650,7 +3650,7 @@ "asset": { "__id__": 0 }, - "fileId": "f6zUWFbrBNO6hqIiiCNY5O", + "fileId": "b0jiUxt81A55hHgp5Gu7hZ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3833,7 +3833,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "85A7qZCHZH8bLd4peP5REh" + "fileId": "05mFB4hvhBTaYGttDs0KHf" }, { "__type__": "cc.PrefabInfo", @@ -3843,7 +3843,7 @@ "asset": { "__id__": 0 }, - "fileId": "e7pCDbYRtAvL0j1CyE20NK", + "fileId": "982JyxB2ROyLg6+pDO6fIB", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3874,7 +3874,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2cTMZY2ZVO97tDHiCdc9Fw" + "fileId": "0a3xild25JXJlvgwj1gG+D" }, { "__type__": "cc.PrefabInfo", @@ -3884,7 +3884,7 @@ "asset": { "__id__": 0 }, - "fileId": "6bigBXBMBNgp014BCJCSOj", + "fileId": "fddenxPetJ26rEK2jUaXcy", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3915,7 +3915,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "62HZ9giQVITIhk5wM2kGZl" + "fileId": "6cIv2HmkFCOb9cterhQPW4" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3939,7 +3939,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b01TGvNLtEYqncTB1GRF2w" + "fileId": "fcHY8mydFEfpi4a2gkA1vJ" }, { "__type__": "cc.PrefabInfo", @@ -3949,7 +3949,7 @@ "asset": { "__id__": 0 }, - "fileId": "70TCr9OIxBGpQI4ZOFRcLn", + "fileId": "98qSx5GEtJhbRGFelkteCl", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4132,7 +4132,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "beIy+UxdhGwILlBVhTfnAG" + "fileId": "1dQt+8099KAphjC32yROJT" }, { "__type__": "cc.PrefabInfo", @@ -4142,7 +4142,7 @@ "asset": { "__id__": 0 }, - "fileId": "71xH99eoNHu7kcyOn4ZrAz", + "fileId": "adAnZTHjZNPoEOmOQMY+Ma", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4173,7 +4173,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "15T3WtB+NJuow6vK0XpP0O" + "fileId": "03tDxwGXhBuoxRhSyVto2A" }, { "__type__": "cc.PrefabInfo", @@ -4183,7 +4183,7 @@ "asset": { "__id__": 0 }, - "fileId": "89+HV5ouNE5qOGahyLf/Ml", + "fileId": "f9mzHuXc5JUJfZ3BbFBeb6", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4214,7 +4214,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "beIa8r4uNFeoH/UNczUklT" + "fileId": "4fMjmU0BpO6KwAfJz0aVfY" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4238,7 +4238,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c0wDhnwPFCqaAfP/pUjVk3" + "fileId": "e7mUWkjTpKEpOd4v9v11UH" }, { "__type__": "cc.PrefabInfo", @@ -4248,7 +4248,7 @@ "asset": { "__id__": 0 }, - "fileId": "5c8XSjtAdIGYzIAg+XE3GU", + "fileId": "6b6FOYxsdK1ocUmIAc/ye0", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4431,7 +4431,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "08bDLK21NF5py9rQDX5dgp" + "fileId": "138YvU7GFBxoRui3YpqETA" }, { "__type__": "cc.PrefabInfo", @@ -4441,7 +4441,7 @@ "asset": { "__id__": 0 }, - "fileId": "7e3AMcz/FM+5IcrEqHVIID", + "fileId": "c5wCkTnS5MfZ1xjGmJEH6h", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4472,7 +4472,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3bNw0ceHRD76OVs9yRdhwp" + "fileId": "32Q2uGcs9MFYU4lfaazb+u" }, { "__type__": "cc.PrefabInfo", @@ -4482,7 +4482,7 @@ "asset": { "__id__": 0 }, - "fileId": "7bv1fG6npNI6HmtRKRqycc", + "fileId": "1d+a8KvWhE8LMR9PS6gABu", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4513,7 +4513,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "39jVgakOBMM4cfLMncLOP8" + "fileId": "00gg9pAyVNCLoRea8gmoUq" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4537,7 +4537,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b6bgvcZ4VBmZsFuBr5FId6" + "fileId": "8fVFFCWbZMwos/yWb3nluG" }, { "__type__": "cc.PrefabInfo", @@ -4547,7 +4547,7 @@ "asset": { "__id__": 0 }, - "fileId": "38SrHPevpLs6ySPuhhIzHB", + "fileId": "649/S1bIBONpYcEFoKRyIK", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4572,7 +4572,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "0bqyc29ahLN7kjYP0fTSFX" + "fileId": "54pl4mMghOs4apgTa15Nqf" }, { "__type__": "cc.UITransform", @@ -4600,7 +4600,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "dcOHS3Db1BnL3VtnAUQ2kH" + "fileId": "3azSSf0ZdCJZLnhjbkSmyg" }, { "__type__": "cc.Sprite", @@ -4645,7 +4645,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "77aRMP/7xHY5aIdd77qgtc" + "fileId": "d64nUkXw1K0KVsJIazLTtb" }, { "__type__": "cc.PrefabInfo", @@ -4655,7 +4655,7 @@ "asset": { "__id__": 0 }, - "fileId": "ed/lnTIx1F3K4Wwcffuiy+", + "fileId": "61jN4rOflERKtswfwUcNwK", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -12826,7 +12826,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "3e745b7e-8b21-4d64-ac9c-07a9f3923d87@f9941", + "__uuid__": "3bc48473-a47d-4954-a541-199b92e1922a@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, diff --git a/assets/Game/scripts/SlotBar.ts b/assets/Game/scripts/SlotBar.ts index 510b5b7..2a276f0 100644 --- a/assets/Game/scripts/SlotBar.ts +++ b/assets/Game/scripts/SlotBar.ts @@ -44,6 +44,7 @@ export class SlotBar extends Component { private menuBtn: Button = null; spinNode: Node = null; + grayBtn: Node = null; spinBtn: Button = null; spinAni: SpinAni = null; stopAutoBtn: Button = null; @@ -87,6 +88,7 @@ export class SlotBar extends Component { this.winLabel = Labels.getChildByName('win').getComponent(Label); this.spinNode = this.node.getChildByName('SpinNode'); + this.grayBtn = this.spinNode.getChildByName('grayBtn'); this.spinAni = this.spinNode.getComponent(SpinAni); this.spinBtn = this.spinNode.getChildByName('spinBtn').getComponent(Button); this.stopAutoBtn = this.spinNode.getChildByName('BtnStopAuto').getComponent(Button); @@ -222,7 +224,7 @@ export class SlotBar extends Component { this.hasClickSpin = true; this.manualStopNode.active = true this.node.emit(SLOT_BAR_EVENT.ON_SPIN_CLICK); - this.spinAni.startSpin(); + this.spinAni.startSpin(this.isFastSpin); this.setBtnEnable(this.subBtn, false); this.setBtnEnable(this.addBtn, false); @@ -669,6 +671,11 @@ export class SlotBar extends Component { } } + setGraySpinBtn(show: boolean) { + this.spinBtn.node.active = !show + this.grayBtn.active = show + } + setNodeOpacity(node: Node, opacity: number) { node.getComponent(UIOpacity).opacity = opacity; } diff --git a/assets/Game/scripts/SlotScene.ts b/assets/Game/scripts/SlotScene.ts index b5de2f1..88deba3 100644 --- a/assets/Game/scripts/SlotScene.ts +++ b/assets/Game/scripts/SlotScene.ts @@ -466,6 +466,7 @@ export class SlotScene extends Component { if (this.checkHasEliminate()) { this.slotGame.deleteIconNode(); this.playElemWinAnimation(true); + this.slotBar.setGraySpinBtn(true) } else { if (this.gameState.isInFreeSpin) { if (this.gameState.isFirstFreeSpin) { @@ -789,6 +790,8 @@ export class SlotScene extends Component { this.slotBar.setWin(this.spinData.AllScore); callback?.(); } + + this.slotBar.setGraySpinBtn(false) }, delay) diff --git a/assets/Game/scripts/game/SpinAni.ts b/assets/Game/scripts/game/SpinAni.ts index c01f22c..c99f7fa 100644 --- a/assets/Game/scripts/game/SpinAni.ts +++ b/assets/Game/scripts/game/SpinAni.ts @@ -16,9 +16,10 @@ export class SpinAni extends Component { this.rotateSpine.setAnimation(0, 'idle', true) } - public startSpin() { + public startSpin(isFastSpin: boolean) { + // this.rotateSpine.timeScale = isFastSpin ? 2 : 1 + this.rotateSpine.setAnimation(0, 'Click', true) - // this.rotateSpine.addAnimation(0, 'Unclicked', true) }