diff --git a/assets/Game/Prefab/FeatureBuyPopUp.prefab b/assets/Game/Prefab/FeatureBuyPopUp.prefab index 00ea797..162b2e0 100644 --- a/assets/Game/Prefab/FeatureBuyPopUp.prefab +++ b/assets/Game/Prefab/FeatureBuyPopUp.prefab @@ -1152,8 +1152,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 632.35, - "height": 40 + "width": 900, + "height": 200 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1188,15 +1188,15 @@ "b": 255, "a": 255 }, - "_string": "740.00", + "_string": "74022222.00", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 150, + "_actualFontSize": 113, "_fontSize": 150, "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 0, - "_enableWrapText": true, + "_lineHeight": 160, + "_overflow": 2, + "_enableWrapText": false, "_font": { "__uuid__": "440b0efb-6a4a-4c11-9cfb-bf746b908efd", "__expectedType__": "cc.BitmapFont" diff --git a/assets/Game/Scripts/SlotGame.ts b/assets/Game/Scripts/SlotGame.ts index 6ff0dbf..b7e6c3c 100644 --- a/assets/Game/Scripts/SlotGame.ts +++ b/assets/Game/Scripts/SlotGame.ts @@ -39,6 +39,7 @@ export class SlotGame extends Component { rollersMsg: number[] = [3, 4, 5, 5, 4, 3]; featureBuyBtnEnabled: boolean = true; waysNum = 3 * 4 * 5 * 5 * 4 * 3; + curBet = 0 protected onLoad(): void { this.rollerManager.node.on(ROLLER_COMBINE_EVENT.ONE_ROLLER_STOP, this.onOneRollerStopped, this); @@ -55,6 +56,14 @@ export class SlotGame extends Component { } + setCurBet(bet) { + this.curBet = bet + } + + updateDoubleWinNeedCount() { + this.doubleWinBtnNode.getChildByPath('on/count').getComponent(Label).string = gold2cash(this.curBet * 1.25) + } + onClickDoubleWin() { this.doubleWinIsOn = !this.doubleWinIsOn; // this.doubleWinBtnNode.getChildByName('bg').active = this.doubleWinIsOn @@ -64,6 +73,7 @@ export class SlotGame extends Component { // this.doubleWinBtnNode.getChildByName('deng_on').active = this.doubleWinIsOn this.doubleWinBtnNode.getChildByName('on').active = this.doubleWinIsOn this.doubleWinBtnNode.getChildByName('off').active = !this.doubleWinIsOn + this.updateDoubleWinNeedCount() // this.doubleWinBtnNode.getChildByName('deng_off').active = !this.doubleWinIsOn // this.doubleWinBtnNode.getChildByName('bet_label').active = !this.doubleWinIsOn @@ -602,17 +612,8 @@ export class SlotGame extends Component { this.refreshBuyBtnState(false); } - showPos = new Vec3(-294, -329, 0); - hidePos = new Vec3(-1080, -329, 0); hideFeatureBuy() { - Tween.stopAllByTarget(this.featureBuyNode); - this.setBtnEnable(this.featureBuyNode, false); - tween(this.featureBuyNode) - .to(0.1, { position: this.hidePos }) - .call(() => { - this.featureBuyNode.setPosition(this.hidePos); - }) - .start(); + this.setBtnEnable(this.featureBuyNode, false) } showFeatureBuy(bol: boolean) { @@ -621,15 +622,7 @@ export class SlotGame extends Component { return; } - Tween.stopAllByTarget(this.featureBuyNode); - this.setBtnEnable(this.featureBuyNode, false); - tween(this.featureBuyNode) - .to(0.1, { position: this.showPos }) - .call(() => { - this.setBtnEnable(this.featureBuyNode, true); - this.featureBuyNode.setPosition(this.showPos); - }) - .start(); + this.setBtnEnable(this.featureBuyNode, true) } setFeatureBuyBtnEnable(bol: boolean) { diff --git a/assets/Game/Scripts/SlotScene.ts b/assets/Game/Scripts/SlotScene.ts index dff6aa4..8ab5632 100644 --- a/assets/Game/Scripts/SlotScene.ts +++ b/assets/Game/Scripts/SlotScene.ts @@ -124,6 +124,7 @@ export class SlotScene extends Component { if (!this.gameInfo.CloseBuyGame) { this.slotGame.setFeatureBuyActive(!(this.slotBar.getBet() * this.gameInfo.BuyMul > this.gameInfo.MaxBuyBet)); } + this.slotGame.setCurBet(this.slotBar.getBet()) this.updateBg(this.isFreeSpin, true); let frb = GameDataManager.instance.frb; @@ -248,6 +249,8 @@ export class SlotScene extends Component { this.slotBar.setDisplayBet(bet * 1.25); } this.slotGame.refreshDoubleWinCount(); + this.slotGame.setCurBet(this.slotBar.getBet()) + this.slotGame.updateDoubleWinNeedCount() } onMaxBet() { @@ -260,14 +263,14 @@ export class SlotScene extends Component { } onOpenMenu() { - // this.slotGame.hideFeatureBuy(); + this.slotGame.hideFeatureBuy(); this.slotGame.setDoubleWinBtnEnable(false); } onCloseMenu() { this.slotGame.setDoubleWinBtnEnable(true); if (this.gameInfo.CloseBuyGame) return; - // this.slotGame.showFeatureBuy(false); + this.slotGame.showFeatureBuy(false); } onAutoSpin(isAutoSpin: boolean) { diff --git a/assets/Game/SlotScene.prefab b/assets/Game/SlotScene.prefab index c639d8a..59558b4 100644 --- a/assets/Game/SlotScene.prefab +++ b/assets/Game/SlotScene.prefab @@ -11245,7 +11245,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 61.44, + "width": 90, "height": 40 }, "_anchorPoint": { @@ -11281,14 +11281,14 @@ "b": 255, "a": 255 }, - "_string": "1.68", + "_string": "10000", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 24, + "_actualFontSize": 23, "_fontSize": 24, "_fontFamily": "Arial", "_lineHeight": 40, - "_overflow": 0, + "_overflow": 2, "_enableWrapText": true, "_font": { "__uuid__": "e3973bf7-5341-4d1e-8265-88afe473ed48",