1

assets/Game/prefabs/TotalWin/TotalWinAni.prefab

@@ -28,14 +28,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 84
+        "__id__": 86
       },
       {
-        "__id__": 86
+        "__id__": 88
       }
     ],
     "_prefab": {
-      "__id__": 88
+      "__id__": 90
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -230,23 +230,23 @@
         "__id__": 23
       },
       {
-        "__id__": 51
+        "__id__": 53
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 77
-      },
       {
         "__id__": 79
       },
       {
         "__id__": 81
+      },
+      {
+        "__id__": 83
       }
     ],
     "_prefab": {
-      "__id__": 83
+      "__id__": 85
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -304,8 +304,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -0.000020639643480535597,
+      "x": 0,
-      "y": 258.0899963378906,
+      "y": 93.497,
       "z": 0
     },
     "_lrot": {
@@ -566,20 +566,20 @@
         "__id__": 24
       },
       {
-        "__id__": 38
+        "__id__": 40
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 46
+        "__id__": 48
       },
       {
-        "__id__": 48
+        "__id__": 50
       }
     ],
     "_prefab": {
-      "__id__": 50
+      "__id__": 52
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -625,18 +625,18 @@
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 31
-      },
       {
         "__id__": 33
       },
       {
         "__id__": 35
+      },
+      {
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 39
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -683,14 +683,17 @@
       },
       {
         "__id__": 28
+      },
+      {
+        "__id__": 30
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 32
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -374.128,
+      "x": -472.405,
       "y": 22.338,
       "z": 0
     },
@@ -816,6 +819,42 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "4143eGnsZLGKtRmgjOp70S"
   },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 25
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 31
+    },
+    "_alignFlags": 8,
+    "_target": null,
+    "_left": -100,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b6g/z07sBFlZE9hCst2rRM"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -839,12 +878,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 32
+      "__id__": 34
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 627,
+      "width": 832,
-      "height": 86
+      "height": 113
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -867,7 +906,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 34
+      "__id__": 36
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -880,7 +919,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "879e3400-ddc2-463b-b464-52d9c0fe7e19@f9941",
+      "__uuid__": "74853e5f-9882-4a90-87d2-e320b00ff42e@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -912,7 +951,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 36
+      "__id__": 38
     },
     "spriteName": "30",
     "_id": ""
@@ -945,23 +984,23 @@
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 39
-      },
       {
         "__id__": 41
       },
       {
         "__id__": 43
+      },
+      {
+        "__id__": 45
       }
     ],
     "_prefab": {
-      "__id__": 45
+      "__id__": 47
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -200.697,
+      "y": -288.247,
       "z": 0
     },
     "_lrot": {
@@ -993,16 +1032,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 40
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 40
+      "__id__": 42
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1007,
+      "width": 1068,
-      "height": 248
+      "height": 480
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1021,11 +1060,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 40
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 42
+      "__id__": 44
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1038,7 +1077,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "3e0d7d54-2af3-4bfc-a7d5-4b30dfbc025a@f9941",
+      "__uuid__": "a56f3894-0ec0-425f-8044-4b79850426d5@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -1066,11 +1105,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 40
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 44
+      "__id__": 46
     },
     "spriteName": "29",
     "_id": ""
@@ -1102,7 +1141,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 47
+      "__id__": 49
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1130,7 +1169,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 49
+      "__id__": 51
     },
     "_opacity": 255,
     "_id": ""
@@ -1162,17 +1201,17 @@
     },
     "_children": [
       {
-        "__id__": 52
+        "__id__": 54
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 74
+        "__id__": 76
       }
     ],
     "_prefab": {
-      "__id__": 76
+      "__id__": 78
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1209,30 +1248,30 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 51
+      "__id__": 53
     },
     "_children": [
       {
-        "__id__": 53
+        "__id__": 55
       },
       {
-        "__id__": 61
+        "__id__": 63
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 67
-      },
       {
         "__id__": 69
       },
       {
         "__id__": 71
+      },
+      {
+        "__id__": 73
       }
     ],
     "_prefab": {
-      "__id__": 73
+      "__id__": 75
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1269,23 +1308,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 52
+      "__id__": 54
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 54
-      },
       {
         "__id__": 56
       },
       {
         "__id__": 58
+      },
+      {
+        "__id__": 60
       }
     ],
     "_prefab": {
-      "__id__": 60
+      "__id__": 62
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1322,11 +1361,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 53
+      "__id__": 55
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 57
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1350,11 +1389,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 53
+      "__id__": 55
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 57
+      "__id__": 59
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1395,11 +1434,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 53
+      "__id__": 55
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 59
+      "__id__": 61
     },
     "spriteName": "25",
     "_id": ""
@@ -1427,20 +1466,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 52
+      "__id__": 54
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 62
+        "__id__": 64
       },
       {
-        "__id__": 64
+        "__id__": 66
       }
     ],
     "_prefab": {
-      "__id__": 66
+      "__id__": 68
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1477,11 +1516,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 61
+      "__id__": 63
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 63
+      "__id__": 65
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1505,11 +1544,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 61
+      "__id__": 63
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 65
+      "__id__": 67
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1563,11 +1602,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 52
+      "__id__": 54
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 68
+      "__id__": 70
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1591,11 +1630,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 52
+      "__id__": 54
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 70
+      "__id__": 72
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1636,11 +1675,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 52
+      "__id__": 54
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 72
+      "__id__": 74
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1705,11 +1744,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 51
+      "__id__": 53
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 75
+      "__id__": 77
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1750,7 +1789,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 78
+      "__id__": 80
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1778,7 +1817,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 80
+      "__id__": 82
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1823,7 +1862,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 82
+      "__id__": 84
     },
     "_opacity": 255,
     "_id": ""
@@ -1855,7 +1894,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 85
+      "__id__": 87
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1883,7 +1922,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 87
+      "__id__": 89
     },
     "_alignFlags": 45,
     "_target": null,

assets/Game/scripts/SlotGame.ts

@@ -69,13 +69,13 @@ export class SlotGame extends Component {
 
     private base: Node = null;
     private multi: Node = null;
-    private waysCount: Label = null;
+    private waysCount: Node = null;
     private waysLayout: Layout = null;
     private layCount: Label = null;
 
     private free: Node = null;
     private freeMulti: Node = null;
-    private freeWaysCount: Label = null;
+    private freeWaysCount: Node = null;
     private freeWaysLayout: Layout = null;
     private freeLayCount: Label = null;
 
@@ -129,14 +129,14 @@ export class SlotGame extends Component {
         this.base = this.node.getChildByName('base');
         this.multi = this.base.getChildByName('multi');
         let ways = this.base.getChildByName('ways');
-        this.waysCount = ways.getChildByName('count').getComponent(Label);
+        this.waysCount = ways.getChildByName('count');
         this.waysLayout = ways.getChildByName('lay').getComponent(Layout);
         this.layCount = this.waysLayout.node.getChildByName('count').getComponent(Label);
 
         this.free = this.node.getChildByName('free');
         this.freeMulti = this.free.getChildByName('multi')
         let free_ways = this.free.getChildByName('ways');
-        this.freeWaysCount = free_ways.getChildByName('count').getComponent(Label);
+        this.freeWaysCount = free_ways.getChildByName('count');
         this.freeWaysLayout = free_ways.getChildByName('lay').getComponent(Layout);
         this.freeLayCount = this.freeWaysLayout.node.getChildByName('count').getComponent(Label);
 
@@ -158,6 +158,10 @@ export class SlotGame extends Component {
     }
 
     playNextSprite() {
+
+        let firstSprite = this.moveSprite[0];
+        firstSprite.node.setPosition(540, 0, 0);
+
         // 如果所有精灵都播放完了，重置索引
         if (this.moveIndex >= this.moveSprite.length) {
             this.moveIndex = 0;
@@ -454,14 +458,14 @@ export class SlotGame extends Component {
 
     setWaysCount(ways: any) {
         if (ways == '...') {
-            this.waysCount.node.active = true;
+            this.waysCount.active = true;
             this.waysLayout.node.active = false;
-            this.freeWaysCount.node.active = true;
+            this.freeWaysCount.active = true;
             this.freeWaysLayout.node.active = false;
         } else {
-            this.waysCount.node.active = false;
+            this.waysCount.active = false;
             this.waysLayout.node.active = true;
-            this.freeWaysCount.node.active = false;
+            this.freeWaysCount.active = false;
             this.freeWaysLayout.node.active = true;
             this.layCount.string = `${ways}`;
             this.freeLayCount.string = `${ways}`;
@@ -712,7 +716,7 @@ export class SlotGame extends Component {
     onIconClicked(iconComponent: Icon) {
         if (this.isEliminating) return;
         if (this.isShow) return;
-        let isExpect = this.rollerManager.checkNextRollerExpect(6);
+        let isExpect = this.rollerManager.checkNextRollerExpect(6, 4);
         if (isExpect) return;
 
         if (this.freeBg.active) return;
@@ -738,7 +742,6 @@ export class SlotGame extends Component {
         // if (iconComponent.rollerIndex == 0 && iconComponent.startPos >= 2) {
         //     isLeft = false;
         // }
-
         iconMsgNode.getComponent(IconMsg).show(isLeft, iconComponent);
         this.node.parent.getChildByName('layer').active = true;
 

assets/Game/scripts/SlotScene.ts

@@ -445,7 +445,7 @@ export class SlotScene extends Component {
 
     // 处理自动旋转已经走到最后一步了和当前一轮流程走完最后的逻辑
     let handleNonAutoSpin = (hasWin: boolean, isReconnect: boolean) => {
-      let delay = hasWin ? 1 : 0;
+      let delay = hasWin ? 0.2 : 0;
       this.scheduleOnce(() => {
         let frb = GameDataManager.instance.frb;
         if (frb.Finished?.Popup) {

assets/Game/scripts/game/HistoryDetail.ts

@@ -231,7 +231,7 @@ export class HistoryDetail extends Component {
         const info = item.getChildByName("info");
         info.getChildByName("txt_transaction").getComponent(Label).string = this.data.roundId;
 
-        let bet = idx == 0 ? fixNum(pan.Bet) : fixNum(0)
+        let bet = idx == 0 ? fixNum(pan.AllBet) : fixNum(0)
         info.getChildByName("txt_bet").getComponent(Label).string = bet;
 
         info.getChildByName("Label_Bet").getComponent(Label).string = getTranslate(this.dict, "Bet") + `(${currencySymbol})`;

assets/Game/scripts/game/RollerManager.ts

@@ -785,7 +785,7 @@ export class RollerManager extends Component {
             let rollerCroSymbols = processedCroSymbols[index];
             roller.setCroSymbols(rollerCroSymbols);
             this.scheduleOnce(() => {
-                roller.iconFallDown(stopData, rollerCroSymbols,inPan)
+                roller.iconFallDown(stopData, rollerCroSymbols, inPan)
             }, 0.03 * index)
         })
 

assets/Loading/scripts/comm.ts

@@ -32,7 +32,7 @@ export function getHistoryUrl() {
 }
 
 export function getLanguage() {
-    // return 'nl';
+    return 'vi';
     return language;
 }
 

assets/resources/i18nSprite/zh/5.png.meta

@@ -44,12 +44,12 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 2,
+        "trimX": 0,
-        "trimY": 2,
+        "trimY": 0,
-        "width": 95,
+        "width": 241,
         "height": 50,
-        "rawWidth": 99,
+        "rawWidth": 241,
-        "rawHeight": 54,
+        "rawHeight": 50,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,16 +61,16 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -47.5,
+            -120.5,
             -25,
             0,
-            47.5,
+            120.5,
             -25,
             0,
-            -47.5,
+            -120.5,
             25,
             0,
-            47.5,
+            120.5,
             25,
             0
           ],
@@ -83,32 +83,32 @@
             3
           ],
           "uv": [
-            2,
+            0,
-            52,
+            50,
-            97,
+            241,
-            52,
+            50,
-            2,
+            0,
-            2,
+            0,
-            97,
+            241,
-            2
+            0
           ],
           "nuv": [
-            0.020202020202020204,
+            0,
-            0.037037037037037035,
+            0,
-            0.9797979797979798,
+            1,
-            0.037037037037037035,
+            0,
-            0.020202020202020204,
+            0,
-            0.9629629629629629,
+            1,
-            0.9797979797979798,
+            1,
-            0.9629629629629629
+            1
           ],
           "minPos": [
-            -47.5,
+            -120.5,
             -25,
             0
           ],
           "maxPos": [
-            47.5,
+            120.5,
             25,
             0
           ]