节奏调整

assets/Game/prefabs/FreeSpinEnter/FreeSpinEnter.prefab

@@ -1382,8 +1382,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
+      "x": 0.8,
-      "y": 1,
+      "y": 0.8,
       "z": 1
     },
     "_mobility": 0,

assets/Game/prefabs/History/history_detail.prefab

@@ -1828,7 +1828,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 251.25,
+      "width": 269.0234375,
       "height": 75.6
     },
     "_anchorPoint": {
@@ -1864,7 +1864,7 @@
       "b": 255,
       "a": 255
     },
-    "_string": "Free Spin: 1/8",
+    "_string": "Free Spin：0/0",
     "_horizontalAlign": 0,
     "_verticalAlign": 1,
     "_actualFontSize": 40,
@@ -5638,7 +5638,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -13.830078125,
+      "x": -5.830078125,
       "y": 0,
       "z": 0
     },
@@ -5797,7 +5797,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 96.73583984375,
+      "x": 104.73583984375,
       "y": 0,
       "z": 0
     },
@@ -5933,7 +5933,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 184.787109375,
+      "x": 192.787109375,
       "y": 0,
       "z": 0
     },

assets/Game/prefabs/Icon/Icon0.prefab

@@ -500,7 +500,7 @@
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "default",
-    "defaultAnimation": "1_1",
+    "defaultAnimation": "<None>",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,

assets/Game/prefabs/Icon/Icon1.prefab

@@ -500,7 +500,7 @@
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "default",
-    "defaultAnimation": "1_1",
+    "defaultAnimation": "<None>",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,

assets/Game/prefabs/Paytable/paytable.prefab

@@ -885,7 +885,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 18120
+      "height": 1812
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/Game/prefabs/Rules/rules.prefab

@@ -996,7 +996,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 18120
+      "height": 1812
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/Game/prefabs/TotalWin/TotalWinAni.prefab

@@ -580,7 +580,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -0.00006837247929070145,
+      "x": 0,
       "y": 622.0899658203125,
       "z": 0
     },
@@ -588,8 +588,8 @@
       "__type__": "cc.Quat",
       "x": 0,
       "y": 0,
-      "z": 4.3711388286737347e-8,
+      "z": 4.371138828673731e-8,
-      "w": 0.9999999999999981
+      "w": 0.999999999999999
     },
     "_lscale": {
       "__type__": "cc.Vec3",
@@ -603,7 +603,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0.000005008956130975262
+      "z": 0.000005008956130975261
     },
     "_id": ""
   },
@@ -637,7 +637,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": 75.802,
       "y": 31.482,
       "z": 0
     },
@@ -1246,8 +1246,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
+      "x": 0.8,
-      "y": 1,
+      "y": 0.8,
       "z": 1
     },
     "_mobility": 0,

assets/Game/scripts/SlotBar.ts

@@ -61,6 +61,9 @@ export class SlotBar extends Component {
   @property(Prefab)
   pfb_rules: Prefab = null;
 
+  @property(Node)
+  private manualStopNode: Node = null;
+
   private MaskNode: Node = null;
   private balanceLabel: Label = null;
   private betLabel: Label = null;
@@ -265,6 +268,7 @@ export class SlotBar extends Component {
     if (!this.hasClickSpin && !this.hasClickManualStop) {
       AudioManager.instance.playSFX("Spin_Button_Click");
       this.hasClickSpin = true;
+      this.manualStopNode.active = true
       this.node.emit(SLOT_BAR_EVENT.ON_SPIN_CLICK);
       this.spinAni.startSpin();
 
@@ -284,6 +288,7 @@ export class SlotBar extends Component {
     if (!this.hasClickSpin && !this.hasClickManualStop) {
       // AudioManager.instance.playSFX('Spin_Button_Click');
       this.hasClickSpin = true;
+      this.manualStopNode.active = true
 
       this.setBtnEnable(this.subBtn, false);
       this.setBtnEnable(this.addBtn, false);
@@ -313,6 +318,12 @@ export class SlotBar extends Component {
     }
   }
 
+  onBtnManualStop() {
+    if (this.hasClickSpin && !this.hasClickManualStop) {
+      this.node.emit(SLOT_BAR_EVENT.ON_MANUAL_STOP);
+    }
+  }
+
   manualStop() {
     this.hasClickManualStop = true;
     this.spinAni.stopSpin();
@@ -595,6 +606,7 @@ export class SlotBar extends Component {
   resetAllState() {
     this.hasClickSpin = false;
     this.hasClickManualStop = false;
+    this.manualStopNode.active = false
     this.isAuto = false;
     this.setBtnVisible(this.spinBtn, true);
     this.spinAni.stopSpin();

assets/Game/scripts/SlotScene.ts

@@ -115,6 +115,7 @@ export class SlotScene extends Component {
     await this.init();
     // this.TotalWin.show(505000, 8)
     // this.FreeSpinEnter.show(8)
+    // this.FreeSpinAdd.show(5)
     // this.BigWinUI.show(800000, WIN_TYPE.SUPER_MEGA_WIN, 10000)
   }
 

assets/Game/scripts/game/FreeSpinAdd.ts

@@ -18,7 +18,6 @@ export class FreeSpinAdd extends Component {
     closeCallBack: (() => void) | null = null;
 
     show(freeCount: number, closeCallBack: (() => void) | null = null) {
-        AudioManager.instance.playSFX('Free_Trigger_Free_Sound');
         this.freeSpinAddUI = NodePoolManager.instance.getNodeFromPoolStatic('freeSpinAdd', this.freeSpinAddPre);
         this.freeSpinAddSpine = this.freeSpinAddUI.getChildByName('spine').getComponent(sp.Skeleton);
 

assets/Game/scripts/game/HistoryDetail.ts

@@ -115,7 +115,7 @@ export class HistoryDetail extends Component {
                 txt_round.color = yellowColor
                 txt_score.color = yellowColor
             } else {
-                txt_round.string = getTranslate(this.dict, "Free Spin:") + ` ${i}/${scoreInfos.length - 1}`
+                txt_round.string = getTranslate(this.dict, "Free Spin：") + ` ${i}/${scoreInfos.length - 1}`
                 txt_round.color = Color.WHITE
                 txt_score.color = Color.WHITE
             }
@@ -247,7 +247,7 @@ export class HistoryDetail extends Component {
         const bet_info = content.getChildByName("bet_info")
         if (pan.RoundInfo) {
             const txt_round = bet_info.getChildByName("txt_round").getComponent(Label)
-            txt_round.string = getTranslate(this.dict, "Round:") + ` ${pan.RoundInfo.Current}/${pan.RoundInfo.Total}`
+            txt_round.string = getTranslate(this.dict, "Round：") + ` ${pan.RoundInfo.Current}/${pan.RoundInfo.Total}`
         } else {
             bet_info.getChildByName("txt_round").active = false
         }

assets/Game/scripts/game/Roller.ts

@@ -660,12 +660,12 @@ export class Roller extends BaseRoller {
             iconComponent.playDeleteAni();
             this.scheduleOnce(() => {
                 this.iconFactory.recycleIcon(iconNode);
-            }, 1.1)
+            }, 0.9)
         }
 
         this.scheduleOnce(() => {
             this.node.emit(ROLLER_EVENT.ICON_DELETED, this._rollerId);
-        }, 1.1)
+        }, 0.9)
 
     }
 
@@ -768,7 +768,7 @@ export class Roller extends BaseRoller {
         let topY = this.getIconPosition(0, 1);
 
         //总共掉落了多少格
-        let fallDownNum = 0
+        let fallDownNum = 0 //3
         //已经计算的格数
         let nowDownNum = 0
         for (let i = 0; i < createDatas.length; i++) {

assets/Game/scripts/game/RollerManager.ts

@@ -697,7 +697,7 @@ export class RollerManager extends Component {
             //     AudioManager.instance.playSFX('Symbol_Change_Sound');
             // }
             this.returnIconsFromWinLayer(winLayerRef, positionsCopy);
-        }, 1); // 在动画结束前稍早将图标移回
+        }, 0.8); // 在动画结束前稍早将图标移回
     }
 
     // 将图标从win层返回到原始层

assets/Loading/scripts/comm.ts

@@ -7,7 +7,7 @@ import { PREVIEW } from "cc/env"
 const gameId = "rp_11001";
 // let apiaddr = "https://rpgames-api.rpfafafahkdev.com";
 let apiaddr = "";
-let token = "eyJQIjoxMDAwMDEsIkUiOjE3NjY0OTc0NjAsIlMiOjk5NiwiRCI6InJwXzExMDAxIn0.1J21YwU3oPhRzpJoTm5GyBbUAxAOEiV56XaFhxOGcJ8";
+let token = "eyJQIjoxMDAwMDEsIkUiOjE3NjY1ODUzNzAsIlMiOjEwMDAsIkQiOiJycF8xMTAwMSJ9.CNO2Io1S3L_T2tNKUGEkVnUgsQDjeMiWR4Gi3hMtZ34";
 
 
 let language = "en"