assets/Game/prefabs/TotalWin/TotalWinAni.prefab

@@ -28,14 +28,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 86
+        "__id__": 84
       },
       {
-        "__id__": 88
+        "__id__": 86
       }
     ],
     "_prefab": {
-      "__id__": 90
+      "__id__": 88
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -230,23 +230,23 @@
         "__id__": 23
       },
       {
-        "__id__": 53
+        "__id__": 51
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 77
+      },
       {
         "__id__": 79
       },
       {
         "__id__": 81
-      },
-      {
-        "__id__": 83
       }
     ],
     "_prefab": {
-      "__id__": 85
+      "__id__": 83
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -304,8 +304,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": -0.000020639643480535597,
-      "y": 93.497,
+      "y": 258.0899963378906,
       "z": 0
     },
     "_lrot": {
@@ -566,20 +566,20 @@
         "__id__": 24
       },
       {
-        "__id__": 40
+        "__id__": 38
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 46
       },
       {
-        "__id__": 50
+        "__id__": 48
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 50
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -625,18 +625,18 @@
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 31
+      },
       {
         "__id__": 33
       },
       {
         "__id__": 35
-      },
-      {
-        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 39
+      "__id__": 37
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -683,17 +683,14 @@
       },
       {
         "__id__": 28
-      },
-      {
-        "__id__": 30
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 30
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -472.405,
+      "x": -374.128,
       "y": 22.338,
       "z": 0
     },
@@ -819,42 +816,6 @@
     "__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": {
@@ -878,12 +839,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 34
+      "__id__": 32
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 832,
+      "width": 627,
-      "height": 113
+      "height": 86
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -906,7 +867,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 36
+      "__id__": 34
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -919,7 +880,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "74853e5f-9882-4a90-87d2-e320b00ff42e@f9941",
+      "__uuid__": "879e3400-ddc2-463b-b464-52d9c0fe7e19@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -951,7 +912,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 38
+      "__id__": 36
     },
     "spriteName": "30",
     "_id": ""
@@ -984,23 +945,23 @@
     "_children": [],
     "_active": true,
     "_components": [
+      {
+        "__id__": 39
+      },
       {
         "__id__": 41
       },
       {
         "__id__": 43
-      },
-      {
-        "__id__": 45
       }
     ],
     "_prefab": {
-      "__id__": 47
+      "__id__": 45
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -288.247,
+      "y": -200.697,
       "z": 0
     },
     "_lrot": {
@@ -1032,16 +993,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 40
+      "__id__": 38
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 42
+      "__id__": 40
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1068,
+      "width": 1007,
-      "height": 480
+      "height": 248
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1060,11 +1021,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 40
+      "__id__": 38
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 44
+      "__id__": 42
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1077,7 +1038,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "a56f3894-0ec0-425f-8044-4b79850426d5@f9941",
+      "__uuid__": "3e0d7d54-2af3-4bfc-a7d5-4b30dfbc025a@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -1105,11 +1066,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 40
+      "__id__": 38
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 46
+      "__id__": 44
     },
     "spriteName": "29",
     "_id": ""
@@ -1141,7 +1102,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 49
+      "__id__": 47
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1169,7 +1130,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 49
     },
     "_opacity": 255,
     "_id": ""
@@ -1201,17 +1162,17 @@
     },
     "_children": [
       {
-        "__id__": 54
+        "__id__": 52
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 76
+        "__id__": 74
       }
     ],
     "_prefab": {
-      "__id__": 78
+      "__id__": 76
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1248,30 +1209,30 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 53
+      "__id__": 51
     },
     "_children": [
       {
-        "__id__": 55
+        "__id__": 53
       },
       {
-        "__id__": 63
+        "__id__": 61
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 67
+      },
       {
         "__id__": 69
       },
       {
         "__id__": 71
-      },
-      {
-        "__id__": 73
       }
     ],
     "_prefab": {
-      "__id__": 75
+      "__id__": 73
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1308,23 +1269,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 54
+      "__id__": 52
     },
     "_children": [],
     "_active": true,
     "_components": [
+      {
+        "__id__": 54
+      },
       {
         "__id__": 56
       },
       {
         "__id__": 58
-      },
-      {
-        "__id__": 60
       }
     ],
     "_prefab": {
-      "__id__": 62
+      "__id__": 60
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1361,11 +1322,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 55
+      "__id__": 53
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 57
+      "__id__": 55
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1389,11 +1350,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 55
+      "__id__": 53
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 59
+      "__id__": 57
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1434,11 +1395,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 55
+      "__id__": 53
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 61
+      "__id__": 59
     },
     "spriteName": "25",
     "_id": ""
@@ -1466,20 +1427,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 54
+      "__id__": 52
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 64
+        "__id__": 62
       },
       {
-        "__id__": 66
+        "__id__": 64
       }
     ],
     "_prefab": {
-      "__id__": 68
+      "__id__": 66
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1516,11 +1477,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 63
+      "__id__": 61
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 65
+      "__id__": 63
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1544,11 +1505,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 63
+      "__id__": 61
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 67
+      "__id__": 65
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1602,11 +1563,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 54
+      "__id__": 52
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 70
+      "__id__": 68
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1630,11 +1591,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 54
+      "__id__": 52
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 72
+      "__id__": 70
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1675,11 +1636,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 54
+      "__id__": 52
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 74
+      "__id__": 72
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1744,11 +1705,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 53
+      "__id__": 51
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 77
+      "__id__": 75
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1789,7 +1750,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 80
+      "__id__": 78
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1817,7 +1778,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 82
+      "__id__": 80
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1862,7 +1823,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 84
+      "__id__": 82
     },
     "_opacity": 255,
     "_id": ""
@@ -1894,7 +1855,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 87
+      "__id__": 85
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1922,7 +1883,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 89
+      "__id__": 87
     },
     "_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: Node = null;
+    private waysCount: Label = null;
     private waysLayout: Layout = null;
     private layCount: Label = null;
 
     private free: Node = null;
     private freeMulti: Node = null;
-    private freeWaysCount: Node = null;
+    private freeWaysCount: Label = 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');
+        this.waysCount = ways.getChildByName('count').getComponent(Label);
         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');
+        this.freeWaysCount = free_ways.getChildByName('count').getComponent(Label);
         this.freeWaysLayout = free_ways.getChildByName('lay').getComponent(Layout);
         this.freeLayCount = this.freeWaysLayout.node.getChildByName('count').getComponent(Label);
 
@@ -158,10 +158,6 @@ 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;
@@ -458,14 +454,14 @@ export class SlotGame extends Component {
 
     setWaysCount(ways: any) {
         if (ways == '...') {
-            this.waysCount.active = true;
+            this.waysCount.node.active = true;
             this.waysLayout.node.active = false;
-            this.freeWaysCount.active = true;
+            this.freeWaysCount.node.active = true;
             this.freeWaysLayout.node.active = false;
         } else {
-            this.waysCount.active = false;
+            this.waysCount.node.active = false;
             this.waysLayout.node.active = true;
-            this.freeWaysCount.active = false;
+            this.freeWaysCount.node.active = false;
             this.freeWaysLayout.node.active = true;
             this.layCount.string = `${ways}`;
             this.freeLayCount.string = `${ways}`;
@@ -716,7 +712,7 @@ export class SlotGame extends Component {
     onIconClicked(iconComponent: Icon) {
         if (this.isEliminating) return;
         if (this.isShow) return;
-        let isExpect = this.rollerManager.checkNextRollerExpect(6, 4);
+        let isExpect = this.rollerManager.checkNextRollerExpect(6);
         if (isExpect) return;
 
         if (this.freeBg.active) return;
@@ -742,6 +738,7 @@ 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 ? 0.2 : 0;
+      let delay = hasWin ? 1 : 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.AllBet) : fixNum(0)
+        let bet = idx == 0 ? fixNum(pan.Bet) : fixNum(0)
         info.getChildByName("txt_bet").getComponent(Label).string = bet;
 
         info.getChildByName("Label_Bet").getComponent(Label).string = getTranslate(this.dict, "Bet") + `(${currencySymbol})`;

assets/Loading/scripts/comm.ts

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

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

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