UI修改

.gitea/workflows/deploy.yaml

@@ -17,6 +17,11 @@ jobs:
           pwd
           git pull
           echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
+      - name: npm i
+        run: |
+          echo 'npm i'
+          npm i
+          echo "✅ npm i done"
       - name: build
         run: |
           echo 'build'

assets/Game/Prefab/AutoSpinPanel.prefab

@@ -1240,7 +1240,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 811.1579999999999,
-      "height": 58
+      "height": 80
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1470,7 +1470,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 674.271,
-      "height": 61.084999999999994
+      "height": 70
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1700,7 +1700,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 320,
-      "height": 32.76
+      "height": 40
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/Game/Prefab/FeatureBuyPopUp.prefab

@@ -542,7 +542,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 2340
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -839,8 +839,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 996,
+      "width": 1030,
-      "height": 311
+      "height": 312
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1710,7 +1710,7 @@
     },
     "clickEvents": [],
     "_interactable": true,
-    "_transition": 0,
+    "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
       "r": 255,
@@ -2067,7 +2067,7 @@
     },
     "clickEvents": [],
     "_interactable": true,
-    "_transition": 0,
+    "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
       "r": 255,
@@ -2178,7 +2178,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1919.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/Game/Prefab/FreeSpinEnter.prefab

@@ -25,26 +25,26 @@
         "__id__": 12
       },
       {
-        "__id__": 26
+        "__id__": 30
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 78
-      },
-      {
-        "__id__": 80
-      },
       {
         "__id__": 82
       },
       {
         "__id__": 84
+      },
+      {
+        "__id__": 86
+      },
+      {
+        "__id__": 88
       }
     ],
     "_prefab": {
-      "__id__": 86
+      "__id__": 90
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -286,18 +286,21 @@
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 19
-      },
       {
         "__id__": 21
       },
       {
         "__id__": 23
+      },
+      {
+        "__id__": 25
+      },
+      {
+        "__id__": 27
       }
     ],
     "_prefab": {
-      "__id__": 25
+      "__id__": 29
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -344,10 +347,13 @@
       },
       {
         "__id__": 16
+      },
+      {
+        "__id__": 18
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 20
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -451,6 +457,25 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "b1t/5ILB5NyYSZZ7cIvE+T"
   },
+  {
+    "__type__": "cc.UIOpacity",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 13
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 19
+    },
+    "_opacity": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "4c6i+ABgxO6pjQW1axaAYX"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -474,7 +499,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 20
+      "__id__": 22
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -502,7 +527,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 22
+      "__id__": 24
     },
     "_type": 0,
     "_inverted": false,
@@ -524,7 +549,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 24
+      "__id__": 26
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -560,6 +585,42 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "6apteDREpBg6kOqpSu5rPZ"
   },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 12
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 28
+    },
+    "_alignFlags": 40,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 910,
+    "_bottom": 910,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 100,
+    "_originalHeight": 100,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "95Rk+4vQ1DYLrapN0eBzUI"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -583,32 +644,32 @@
     },
     "_children": [
       {
-        "__id__": 27
+        "__id__": 31
       },
       {
-        "__id__": 33
+        "__id__": 37
       },
       {
-        "__id__": 41
+        "__id__": 45
       },
       {
-        "__id__": 49
+        "__id__": 53
       },
       {
-        "__id__": 55
+        "__id__": 59
       },
       {
-        "__id__": 61
+        "__id__": 65
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 75
+        "__id__": 79
       }
     ],
     "_prefab": {
-      "__id__": 77
+      "__id__": 81
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -645,20 +706,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 26
+      "__id__": 30
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 32
       },
       {
-        "__id__": 30
+        "__id__": 34
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 36
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -695,11 +756,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 27
+      "__id__": 31
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 33
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -723,11 +784,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 27
+      "__id__": 31
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 31
+      "__id__": 35
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -807,23 +868,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 26
+      "__id__": 30
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 34
-      },
-      {
-        "__id__": 36
-      },
       {
         "__id__": 38
+      },
+      {
+        "__id__": 40
+      },
+      {
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 44
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -860,11 +921,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 37
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 35
+      "__id__": 39
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -888,11 +949,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 37
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 37
+      "__id__": 41
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -933,11 +994,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 37
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 39
+      "__id__": 43
     },
     "spriteName": "FREELoading",
     "_id": ""
@@ -965,23 +1026,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 26
+      "__id__": 30
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 42
-      },
-      {
-        "__id__": 44
-      },
       {
         "__id__": 46
+      },
+      {
+        "__id__": 48
+      },
+      {
+        "__id__": 50
       }
     ],
     "_prefab": {
-      "__id__": 48
+      "__id__": 52
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1018,11 +1079,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 41
+      "__id__": 45
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 43
+      "__id__": 47
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1046,11 +1107,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 41
+      "__id__": 45
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 45
+      "__id__": 49
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1091,11 +1152,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 41
+      "__id__": 45
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 47
+      "__id__": 51
     },
     "spriteName": "FREELoading1",
     "_id": ""
@@ -1123,20 +1184,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 26
+      "__id__": 30
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 50
+        "__id__": 54
       },
       {
-        "__id__": 52
+        "__id__": 56
       }
     ],
     "_prefab": {
-      "__id__": 54
+      "__id__": 58
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1173,11 +1234,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 49
+      "__id__": 53
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 55
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1201,11 +1262,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 49
+      "__id__": 53
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 57
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1259,20 +1320,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 26
+      "__id__": 30
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 56
+        "__id__": 60
       },
       {
-        "__id__": 58
+        "__id__": 62
       }
     ],
     "_prefab": {
-      "__id__": 60
+      "__id__": 64
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1309,11 +1370,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 55
+      "__id__": 59
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 57
+      "__id__": 61
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1337,11 +1398,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 55
+      "__id__": 59
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 59
+      "__id__": 63
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1421,24 +1482,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 26
+      "__id__": 30
     },
     "_children": [
       {
-        "__id__": 62
+        "__id__": 66
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 70
+        "__id__": 74
       },
       {
-        "__id__": 72
+        "__id__": 76
       }
     ],
     "_prefab": {
-      "__id__": 74
+      "__id__": 78
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1475,23 +1536,23 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 61
+      "__id__": 65
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 63
-      },
-      {
-        "__id__": 65
-      },
       {
         "__id__": 67
+      },
+      {
+        "__id__": 69
+      },
+      {
+        "__id__": 71
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 73
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1528,11 +1589,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 62
+      "__id__": 66
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 64
+      "__id__": 68
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1556,11 +1617,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 62
+      "__id__": 66
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 66
+      "__id__": 70
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1601,11 +1662,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 62
+      "__id__": 66
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 68
+      "__id__": 72
     },
     "spriteName": "FREELoading2",
     "_id": ""
@@ -1633,11 +1694,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 61
+      "__id__": 65
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 71
+      "__id__": 75
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1661,11 +1722,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 61
+      "__id__": 65
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 77
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1719,11 +1780,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 26
+      "__id__": 30
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 76
+      "__id__": 80
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1764,7 +1825,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 79
+      "__id__": 83
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1792,25 +1853,25 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 81
+      "__id__": 85
     },
     "mainNode": {
-      "__id__": 26
+      "__id__": 30
     },
     "envEnterSpineNode": {
       "__id__": 13
     },
     "freeSpinCount": {
-      "__id__": 30
+      "__id__": 34
     },
     "loadingProgressLabel": {
-      "__id__": 58
+      "__id__": 62
     },
     "loadingNode": {
-      "__id__": 49
+      "__id__": 53
     },
     "startBtn": {
-      "__id__": 61
+      "__id__": 65
     },
     "_id": ""
   },
@@ -1828,7 +1889,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 83
+      "__id__": 87
     },
     "_alignFlags": 45,
     "_target": null,
@@ -1864,9 +1925,9 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 85
+      "__id__": 89
     },
-    "_opacity": 255,
+    "_opacity": 0,
     "_id": ""
   },
   {

assets/Game/Prefab/TotalWinSpine.prefab

@@ -25,23 +25,26 @@
         "__id__": 12
       },
       {
-        "__id__": 26
+        "__id__": 18
+      },
+      {
+        "__id__": 34
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 61
+        "__id__": 69
       },
       {
-        "__id__": 63
+        "__id__": 71
       },
       {
-        "__id__": 65
+        "__id__": 73
       }
     ],
     "_prefab": {
-      "__id__": 67
+      "__id__": 75
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -270,81 +273,24 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "mask",
+    "_name": "Tolal Win_bg",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 1
     },
-    "_children": [
-      {
-        "__id__": 13
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 19
-      },
-      {
-        "__id__": 21
-      },
-      {
-        "__id__": 23
-      }
-    ],
-    "_prefab": {
-      "__id__": 25
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 1073741824,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "fsTotalWinSpineNode",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 12
-    },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 14
+        "__id__": 13
       },
       {
-        "__id__": 16
+        "__id__": 15
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 17
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -381,11 +327,207 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 13
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 15
+      "__id__": 14
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 1080,
+      "height": 2360
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "4a5NgL9FxFuILj8C5Neb5G"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 12
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 16
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "55945810-20e2-450a-ae06-f4e8a620639b@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "2bC8GtNcRFwKvJtznmYNOD"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "8c4rTudzBEQZo6iPWZIuHF",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "mask",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 19
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 25
+      },
+      {
+        "__id__": 27
+      },
+      {
+        "__id__": 29
+      },
+      {
+        "__id__": 31
+      }
+    ],
+    "_prefab": {
+      "__id__": 33
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "fsTotalWinSpineNode",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 18
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 20
+      },
+      {
+        "__id__": 22
+      }
+    ],
+    "_prefab": {
+      "__id__": 24
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 19
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 21
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -409,11 +551,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 13
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 17
+      "__id__": 23
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -467,11 +609,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 18
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 20
+      "__id__": 26
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -495,11 +637,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 18
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 22
+      "__id__": 28
     },
     "_type": 0,
     "_inverted": false,
@@ -517,11 +659,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 18
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 24
+      "__id__": 30
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -557,6 +699,42 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "94NATrtj5D2IUjRo/TT/gz"
   },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 18
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 32
+    },
+    "_alignFlags": 40,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 910,
+    "_bottom": 910,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 100,
+    "_originalHeight": 100,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "8d31nnNe9Kzr70kLupTJ4+"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -579,24 +757,24 @@
       "__id__": 1
     },
     "_children": [
-      {
-        "__id__": 27
-      },
       {
         "__id__": 35
       },
       {
-        "__id__": 41
+        "__id__": 43
+      },
+      {
+        "__id__": 49
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 58
+        "__id__": 66
       }
     ],
     "_prefab": {
-      "__id__": 60
+      "__id__": 68
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -633,23 +811,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 26
+      "__id__": 34
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 36
       },
       {
-        "__id__": 30
+        "__id__": 38
       },
       {
-        "__id__": 32
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 34
+      "__id__": 42
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -686,11 +864,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 27
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 37
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -714,11 +892,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 27
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 31
+      "__id__": 39
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -759,11 +937,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 27
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 33
+      "__id__": 41
     },
     "spriteName": "FREESPIN5",
     "_id": ""
@@ -791,20 +969,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 26
+      "__id__": 34
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 44
       },
       {
-        "__id__": 38
+        "__id__": 46
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 48
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -841,11 +1019,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 35
+      "__id__": 43
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 37
+      "__id__": 45
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -869,11 +1047,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 35
+      "__id__": 43
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 39
+      "__id__": 47
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -953,27 +1131,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 26
+      "__id__": 34
     },
     "_children": [
       {
-        "__id__": 42
+        "__id__": 50
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 50
+        "__id__": 58
       },
       {
-        "__id__": 52
+        "__id__": 60
       },
       {
-        "__id__": 54
+        "__id__": 62
       }
     ],
     "_prefab": {
-      "__id__": 57
+      "__id__": 65
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1010,23 +1188,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 41
+      "__id__": 49
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 43
+        "__id__": 51
       },
       {
-        "__id__": 45
+        "__id__": 53
       },
       {
-        "__id__": 47
+        "__id__": 55
       }
     ],
     "_prefab": {
-      "__id__": 49
+      "__id__": 57
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1063,11 +1241,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 50
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 44
+      "__id__": 52
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1091,11 +1269,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 50
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 46
+      "__id__": 54
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1136,11 +1314,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 50
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 56
     },
     "spriteName": "FREESPIN$",
     "_id": ""
@@ -1168,11 +1346,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 41
+      "__id__": 49
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 59
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1196,11 +1374,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 41
+      "__id__": 49
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 61
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1241,15 +1419,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 41
+      "__id__": 49
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 63
     },
     "clickEvents": [
       {
-        "__id__": 56
+        "__id__": 64
       }
     ],
     "_interactable": true,
@@ -1289,7 +1467,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 41
+      "__id__": 49
     },
     "_id": ""
   },
@@ -1326,11 +1504,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 26
+      "__id__": 34
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 59
+      "__id__": 67
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1371,12 +1549,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 62
+      "__id__": 70
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1919.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1399,19 +1577,19 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 64
+      "__id__": 72
     },
     "mainNode": {
-      "__id__": 26
+      "__id__": 34
     },
     "fsTotalWinSpineNode": {
-      "__id__": 13
+      "__id__": 19
     },
     "totalWinCount": {
-      "__id__": 35
+      "__id__": 43
     },
     "collectBtn": {
-      "__id__": 41
+      "__id__": 49
     },
     "_id": ""
   },
@@ -1429,7 +1607,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 66
+      "__id__": 74
     },
     "_alignFlags": 45,
     "_target": null,

assets/Game/Scripts/BigWin.ts

@@ -126,13 +126,15 @@ export class BigWin extends Component {
     }
 
     startScrolling(isFirst: boolean, curType: WIN_TYPE, startValue: number, targetValue: number, callBack: () => void) {
-        if (curType === this.endWinType && !isFirst) {
+        if (curType === this.endWinType + 1 && !isFirst) {
             if (this.numHolder && this.numHolder.holder) Tween.stopAllByTarget(this.numHolder.holder);
             this.winCount.string = gold2cash(targetValue);
             this.isScrolling = false;
-            if (curType == WIN_TYPE.SUPER_MEGA_WIN) {
+            // if (curType == WIN_TYPE.SUPER_MEGA_WIN) {
-                AudioManager.instance.playBGM('Super_Mega_Win_Bgm');
+            //     AudioManager.instance.playBGM('Super_Mega_Win_Bgm');
-            }
+            // }
+            AudioManager.instance.playBGM('Big_Win_End');
+
             tween(this.winCount.node)
                 .to(0.1, { scale: v3(1.1, 1.1, 1.1) }, { easing: 'quadIn' })
                 .to(0.1, { scale: v3(1, 1, 1) }, { easing: 'quadOut' })
@@ -165,7 +167,7 @@ export class BigWin extends Component {
                         this.tweenOpen(nextType);
                         this.startScrolling(false, nextType, this.winCounts[curType], this.winCounts[nextType], callBack);
                     } else {
-                        this.startScrolling(false, this.endWinType, this.winCounts[curType], this.winCounts[this.endWinType], callBack);
+                        this.startScrolling(false, this.endWinType + 1, this.winCounts[curType], this.winCounts[this.endWinType], callBack);
                     }
                 })
                 .start();
@@ -193,6 +195,7 @@ export class BigWin extends Component {
 
                 this.tweenOpen(this.endWinType);
                 this.winCount.string = gold2cash(this.winCounts[this.endWinType]);
+                AudioManager.instance.playBGM('Big_Win_End');
 
                 tween(this.winCount.node)
                     .to(0.1, { scale: v3(1.1, 1.1, 1.1) }, { easing: 'quadIn' })
@@ -204,6 +207,8 @@ export class BigWin extends Component {
                     })
                     .start();
             } else {
+                AudioManager.instance.playBGM('Big_Win_End');
+
                 this.winCount.string = gold2cash(this.winCounts[this.endWinType]);
                 tween(this.winCount.node)
                     .to(0.1, { scale: v3(1.1, 1.1, 1.1) }, { easing: 'quadIn' })
@@ -324,7 +329,13 @@ export class BigWin extends Component {
     private stopBubbleAnimation() {
         if (this.bubbleTween) {
             this.bubbleTween.stop();
+            // tween(this.bubbleNode)
+            //     .to(0.1, { scale: v3(1, 1, 1) }, { easing: 'quadIn' })
+            //     .to(0.2, { scale: v3(0, 0, 0) }, { easing: 'quadOut' })
+            //     .call(() => {
             this.bubbleTween = null;
+            //     })
+            //     .start();
         }
 
         if (this.bubbleNode && this.bubbleNode.isValid) {

assets/Game/Scripts/ChooseDiff.ts

@@ -16,6 +16,9 @@ export class ChooseDiff extends Component {
     @property(Node)
     chooseDiffBgNode: Node = null;
 
+    @property(Node)
+    blackBg: Node = null;
+
     currentDiff: number = 1;
 
     lowBgPos: Vec3 = new Vec3(-330, 16, 0);
@@ -26,7 +29,9 @@ export class ChooseDiff extends Component {
     animationCb: Function = null;
     confirmCb: Function = null;
 
-    open(diff: number, animationCb?: () => void, confirmCb?: () => void) {
+    open(diff: number, animationCb?: () => void, confirmCb?: () => void, isFirst: boolean = false) {
+        this.blackBg.active = isFirst;
+        this.node.getChildByName('main').getChildByName('Btn_Close_01').active = !isFirst;
         this.chooseDiffSkeleton.setAnimation(0, null, false);
         this.currentDiff = diff;
         this.animationCb = animationCb;
@@ -63,7 +68,9 @@ export class ChooseDiff extends Component {
 
     onBtnConfirm() {
         if (!this.canClickBtn) return;
+        this.blackBg.active = false;
         AudioManager.instance.playSFX("Click_Menu");
+        localStorage.setItem('HasGamePending', "1");
         if (this.currentDiff === GameDataManager.instance.chooseDiff) {
             this.onBtnClose();
             return;

assets/Game/Scripts/FreeSpinEnterSpine.ts

@@ -42,11 +42,14 @@ export class FreeSpinEnterSpine extends Component {
         });
 
         this.mainNode.active = true;
-        this.envEnterSpineNode.active = true;
         AudioManager.instance.playBGM('Change_Free_Bgm');
         // 透明度
         let opacity = this.node.getComponent(UIOpacity);
         opacity.opacity = 0;
+        this.envEnterSpineNode.active = true;
+        this.envEnterSpineNode.getComponent(UIOpacity).opacity = 255;
+
+
         tween(opacity)
             .to(0.5, { opacity: 255 }, { easing: 'quadIn' })
             .start();
@@ -76,6 +79,8 @@ export class FreeSpinEnterSpine extends Component {
                 this.startBtn.active = true;
                 this.freeSpinCount.node.active = true
                 this.startBtn.scale = new Vec3(0.1, 0.1, 0.1);
+                AudioManager.instance.playSFX('Change_Free_Button')
+
                 tween(this.startBtn)
                     .set({ scale: new Vec3(0.1, 0.1, 0.1) })
                     .to(0.5, { scale: new Vec3(1, 1, 1) })
@@ -94,6 +99,8 @@ export class FreeSpinEnterSpine extends Component {
         this.unscheduleAllCallbacks();
         if (this.hasClickBtn) return;
         this.hasClickBtn = true;
+        AudioManager.instance.stopAllSFX()
+
         // 插入一个放大缩小的动画
         tween(this.startBtn)
             .to(0.1, { scale: new Vec3(1.1, 1.1, 1.1) })

assets/Game/Scripts/Icon.ts

@@ -302,6 +302,14 @@ export class Icon extends Component {
             if (this.isMulti) {
                 return
             }
+            if (this.iconId < 7) {
+                AudioManager.instance.playSFX(`Click_icon_${this.iconId}`)
+
+            } else {
+                AudioManager.instance.playSFX('Click_icon_7')
+
+            }
+
             let iconMsg = await NodePoolManager.instance.getNodeFromPoolDynamic('IconMsg', 'Prefab/Others/IconMsg', 'Game');
             let gameNode = find('Canvas/main/game');
             if (!gameNode) return;

assets/Game/Scripts/Roller.ts

@@ -213,7 +213,7 @@ export class Roller extends Component {
     // ─── 旋转主流程 ──────────────────────────────────────────────────────────
 
     /** 开始旋转：现有图标向上飞出（退场动画） */
-    startScroll() {
+    startScroll(isFastSpin) {
         if (this._info.state != ROLLER_STATE.STOP) return;
         AudioManager.instance.playSFX('Roller_Start');
 
@@ -228,7 +228,7 @@ export class Roller extends Component {
                 seen.add(icon);
                 this._exitingIcons.push(icon);
                 let iconRef = icon;
-                let exitDelay = this._info.isFastSpin ? 0 : (this.row - 1 - i) * 0.02;
+                let exitDelay = isFastSpin ? 0 : (this.row - 1 - i) * 0.02;
                 tween(iconRef)
                     .delay(exitDelay)
                     .to(0.14, { position: v3(0, exitTopY, 0) }, { easing: 'quadIn' })
@@ -251,7 +251,7 @@ export class Roller extends Component {
         this._info.state = ROLLER_STATE.ACCELERATE;
 
         // 退场结束后标记"可掉落"
-        let exitDuration = this._info.isFastSpin ? 0.14 : 0.14 + (this.row - 1) * 0.02;
+        let exitDuration = isFastSpin ? 0.14 : 0.14 + (this.row - 1) * 0.02;
         this.scheduleOnce(() => {
             if (this._info.state !== ROLLER_STATE.ACCELERATE) return;
             this._info.state = ROLLER_STATE.UNIFORM;

assets/Game/Scripts/RollerManager.ts

@@ -394,12 +394,12 @@ export class RollerManager extends Component {
     startScroll() {
         this._isManualStop = false;
         this.unscheduleAllCallbacks();
-        if (this._isFastSpin) {
+        if (this._isFastSpin && !this._isFreeSpin) {
             for (let i = 0; i < this.allRollers.length; i++) {
                 let roller = this.allRollers[i];
                 if (roller) {
                     if (this._isManualStop) return;
-                    roller.startScroll();
+                    roller.startScroll(true);
                 }
             }
         } else {
@@ -409,7 +409,7 @@ export class RollerManager extends Component {
                 if (roller) {
                     this.scheduleOnce(() => {
                         if (this._isManualStop) return;
-                        roller.startScroll();
+                        roller.startScroll(false);
                     }, delay);
                 }
             }

assets/Game/Scripts/SlotBar.ts

@@ -1,6 +1,6 @@
 import { _decorator, Animation, Button, Component, Label, Node, sp, Sprite, tween, Tween, UIOpacity, Vec3, } from "cc";
 import { SLOT_BAR_EVENT } from "./Define";
-import { gold2cash } from "../../Main/Scripts/main/comm";
+import { callGameBalanceApi, getGameId, gold2cash } from "../../Main/Scripts/main/comm";
 import { AudioManager } from "../../Main/Scripts/managers/AudioManager";
 import { GameDataManager } from "../../Main/Scripts/managers/GameDataManager";
 import { I18nManager } from "../../Main/Scripts/managers/I18nManager";
@@ -161,6 +161,7 @@ export class SlotBar extends Component {
   }
 
   updateBalanceMsg(balance: number, isReconnect: boolean, callBack: () => void) {
+    //中奖后播放totalwin到下一次可以点击的间隔
     let time = isReconnect ? 0 : 1;
     let tw = UIManager.instance.tweenScorelinear(this.getBalance(), balance, time);
     if (tw !== null) {
@@ -255,6 +256,10 @@ export class SlotBar extends Component {
     this.freeSpinBetLabel.string = gold2cash(bet);
   }
 
+  getdisplayBet() {
+    return this.displayBet
+  }
+
   getBet(): number {
     return this.curBet;
   }
@@ -358,7 +363,7 @@ export class SlotBar extends Component {
   closeMenu() {
     if (this.isAnimating) return;
     this.node.emit(SLOT_BAR_EVENT.CLOSE_MENU);
-    AudioManager.instance.playSFX("Click_Menu");
+    AudioManager.instance.playSFX("Click_Menu_menu");
     this.isAnimating = true;
 
     let btn_L1_opacity = this.btn_L1.getComponent(UIOpacity);
@@ -477,23 +482,23 @@ export class SlotBar extends Component {
   }
 
   onClickRules() {
-    AudioManager.instance.playSFX("Click_Menu");
+    AudioManager.instance.playSFX("Click_Menu_menu");
     UIManager.instance.showPopup("WebView", "history/prefabs/rules", "Game", null);
   }
 
   onClickPaytable() {
-    AudioManager.instance.playSFX("Click_Menu");
+    AudioManager.instance.playSFX("Click_Menu_menu");
     UIManager.instance.showPopup("WebView", "history/prefabs/paytable", "Game", null);
   }
 
   onClickHistory() {
-    AudioManager.instance.playSFX("Click_Menu");
+    AudioManager.instance.playSFX("Click_Menu_menu");
     UIManager.instance.showPopup("WebView", "history/prefabs/history", "Game", null);
   }
 
   isON = true;
   onClickBtnSound() {
-    AudioManager.instance.playSFX("Click_Menu");
+    AudioManager.instance.playSFX("Click_Menu_menu");
     let btns2 = this.btn_L2;
     let sound = btns2.getChildByName("soundBtn");
     let on = sound.getChildByName("Btn_SoundON_01");
@@ -517,7 +522,7 @@ export class SlotBar extends Component {
       I18nManager.instance.t("AID_QUIT_LEFT_BUTTON"),
       I18nManager.instance.t("AID_ERROR_QUIT_BUTTON")
     );
-    AudioManager.instance.playSFX("Click_Menu");
+    AudioManager.instance.playSFX("Click_Menu_menu");
   }
 
   onClickAutoSpin() {
@@ -536,6 +541,40 @@ export class SlotBar extends Component {
       });
   }
 
+  private isGetBalance: boolean = false;
+  async onClickBalance(): Promise<number | null> {
+    if (this.isGetBalance) return
+
+    let delay = 0.5
+    this.isGetBalance = true;
+    try {
+      let balacneData = await this.refreshBalanceFromServer();
+      this.setBalance(balacneData)
+      return balacneData;
+    } catch (err) {
+      console.log('获取余额失败')
+      return null;
+    } finally {
+      this.scheduleOnce(() => {
+        this.isGetBalance = false;
+      }, delay)
+
+    }
+  }
+
+  async onConfirmErr2(): Promise<number | null> {
+    try {
+      let balacneData = await this.refreshBalanceFromServer();
+      this.setBalance(balacneData)
+      return balacneData;
+    } catch (err) {
+      console.log('获取余额失败')
+      return null;
+    } finally {
+      this.isGetBalance = false;
+    }
+  }
+
   setLeftAutoCount(count: number) {
     let num = this.getBtnNode(Btn_Key.StopAutoSpinBtn)
       .getChildByName("num")
@@ -715,4 +754,28 @@ export class SlotBar extends Component {
     this.betIndex = 0;
     this.setBet(this.betGrade[this.betIndex]);
   }
+  // private _refreshingBalance: boolean = false;
+  async refreshBalanceFromServer(): Promise<number | null> {
+    // if (this._refreshingBalance) return this.getBalance();
+    // this._refreshingBalance = true;
+    try {
+      const res = await callGameBalanceApi({});
+      const balance = Number(res.Balance);
+      if (!Number.isFinite(balance)) {
+        console.warn("[SlotBar] invalid balance response:", res);
+        return this.getBalance();
+      }
+      this.setBalance(balance);
+      return balance;
+    } catch (err) {
+      console.error("[SlotBar] refresh balance failed:", err);
+      return this.getBalance();
+    } finally {
+      // this.scheduleOnce(() => {
+      //   console.log('还原')
+      //   this._refreshingBalance = false;
+      // }, 0.2)
+
+    }
+  }
 }

assets/Game/Scripts/SlotGame.ts

@@ -5,7 +5,7 @@ import { UpLayer } from './UpLayer';
 import { Icon } from './Icon';
 import { UIManager } from '../../Main/Scripts/managers/UIManager';
 import { GameDataManager } from '../../Main/Scripts/managers/GameDataManager';
-import { gold2cash } from '../../Main/Scripts/main/comm';
+import { getLanguage, gold2cash } from '../../Main/Scripts/main/comm';
 import { AudioManager } from '../../Main/Scripts/managers/AudioManager';
 // import { FeatureBuyPopup } from './FeatureBuyPopup';
 const { ccclass, property } = _decorator;
@@ -53,7 +53,13 @@ export class SlotGame extends Component {
         this.rollerManager.node.on(ROLLER_COMBINE_EVENT.ALL_ROLLER_ICONS_CREATED, this.onAllRollerIconsCreated, this);
         this.rollerManager.node.on(ROLLER_COMBINE_EVENT.ALL_ROLLER_ICONS_FALLEN, this.onAllRollerIconsFallen, this);
 
-
+        let pt_11 = this.doubleWinBtnNode.getChildByName('pt_11');
+        let on = pt_11.getChildByName('on')
+        let off = pt_11.getChildByName('off')
+        on.getChildByName('on_zh').active = getLanguage() === "zh"
+        on.getChildByName('on_en').active = getLanguage() !== "zh"
+        off.getChildByName('off_zh').active = getLanguage() === "zh"
+        off.getChildByName('off_en').active = getLanguage() !== "zh"
     }
 
     setCurBet(bet) {
@@ -74,6 +80,7 @@ export class SlotGame extends Component {
         this.doubleWinBtnNode.getChildByName('on').active = this.doubleWinIsOn
         this.doubleWinBtnNode.getChildByName('off').active = !this.doubleWinIsOn
         this.updateDoubleWinNeedCount()
+        AudioManager.instance.playSFX('Click_Menu');
 
         // this.doubleWinBtnNode.getChildByName('deng_off').active = !this.doubleWinIsOn
         // this.doubleWinBtnNode.getChildByName('bet_label').active = !this.doubleWinIsOn
@@ -301,6 +308,7 @@ export class SlotGame extends Component {
 
         // this.setWaysCount('...');
         this.rollerManager.resetInfo();
+        this.rollerManager.setIsFreeSpin(isFreeSpin)
         this.rollerManager.startScroll();
         this._lastRemoveData = [];  // ← 清除
     }
@@ -327,9 +335,9 @@ export class SlotGame extends Component {
         this.node.emit(SLOT_GAME_EVENT.ALL_ROLLER_STOP);
     }
 
-    playIconWinAni(spinData: any) {
+    playIconWinAni(spinData: any, isFreeSpin: boolean) {
         this.spinData = spinData;
-        AudioManager.instance.playSFX('Win_Icon_Up');
+        AudioManager.instance.playSFX(isFreeSpin ? 'Win_Icon_Up_Free' : 'Win_Icon_Up');
         let deleteIconNodesPos = this.rollerManager.getAllRemoveIconsPos(this.parsedData.RemoveData);
 
         this.upLayer.setWinLayerActive(true);
@@ -357,13 +365,13 @@ export class SlotGame extends Component {
                 }
             }, 0)
             this.scheduleOnce(() => {
+                AudioManager.instance.playSFX('Eliminate_Icon');
                 for (let i = 0; i < deleteIconNodesPos.length; i++) {
                     let poses = deleteIconNodesPos[i];
                     for (let j = 0; j < poses.length; j++) {
                         let pos = poses[j];
                         let iconNode = this.rollerManager.getIconNode(pos);
                         if (iconNode) {
-                            AudioManager.instance.playSFX('Eliminate_Icon');
                             this.rollerManager.deleteIconNode(pos);
                         }
                     }
@@ -387,13 +395,14 @@ export class SlotGame extends Component {
         }
 
         this.scheduleOnce(() => {
+            AudioManager.instance.playSFX('Eliminate_Icon');
+
             for (let i = 0; i < deleteIconNodesPos.length; i++) {
                 let poses = deleteIconNodesPos[i];
                 for (let j = 0; j < poses.length; j++) {
                     let pos = poses[j];
                     let iconNode = this.rollerManager.getIconNode(pos);
                     if (iconNode) {
-                        AudioManager.instance.playSFX('Eliminate_Icon');
                         this.rollerManager.deleteIconNode(pos);
                     }
                 }
@@ -567,7 +576,7 @@ export class SlotGame extends Component {
 
     // -----------------------------购买相关-----------------------------    
     onClickFeatureBuy() {
-        AudioManager.instance.playSFX('Click_FeatureBuy_Btn');
+        AudioManager.instance.playSFX('Click_Menu');
         this.setBtnEnableForBol(this.featureBuyNode, false);
         this.setBtnEnableForBol(this.doubleWinBtnNode.getChildByName('pt_11'), false);
 

assets/Game/Scripts/SlotMsg.ts

@@ -49,6 +49,7 @@ export class SlotMsg extends Component {
     startPos: Vec3 = new Vec3(-259.5, 0, 0);
     maxWidth: number = 540;
     currTotaleMulti: number = 0
+    MultiMergeTime: number = 0
     currRoundWinMsg: string = ''
     showLabelMsgForTween() {
         Tween.stopAllByTarget(this.i18nSpriteMsg.node);
@@ -111,8 +112,13 @@ export class SlotMsg extends Component {
         tweenFun();
     }
 
-    setTotaleMulti(mul: number) {
+    setTotaleMultiAndMultiMergeTime(mul: number) {
         this.currTotaleMulti = mul
+        if (mul == 0) {
+            this.MultiMergeTime == 0
+        } else {
+            this.MultiMergeTime++
+        }
     }
 
     showTotalWinAnimaiton(startScore: number, endScore: number, cb) {
@@ -131,14 +137,14 @@ export class SlotMsg extends Component {
         let winCount = msg.getChildByName('winCount');
         winCount.getComponent(Label).string = gold2cash(startScore);
 
-        AudioManager.instance.playSFX('Gold_Up');
+        AudioManager.instance.playSFX('Slot_Msg_Free_Total_Win');
         UIManager.instance.tweenScorelinear(startScore, endScore, 2)
             .onUpdate((v: number) => {
                 winCount.getComponent(Label).string = gold2cash(v);
             })
             .onComplete(() => {
                 winCount.getComponent(Label).string = gold2cash(endScore);
-                AudioManager.instance.stopSFX('Gold_Up');
+                // AudioManager.instance.stopSFX('Gold_Up');
                 tween(winCount)
                     .to(0.2, { scale: v3(1.1, 1.1, 1.1) })
                     .to(0.2, { scale: v3(1, 1, 1) })
@@ -167,7 +173,10 @@ export class SlotMsg extends Component {
         if (currMulti == 0) {
             winCount.getComponent(Label).string = gold2cash(endScore);
             this.currRoundWinMsg = winCount.getComponent(Label).string
+            //稍微延迟防止跟中奖音效冲突
+            this.scheduleOnce(() => {
                 AudioManager.instance.playSFX('Slot_Msg_Normal_Win');
+            }, 0.1)
         } else {
             winCount.getComponent(Label).string = this.currRoundWinMsg + ' x ' + currMulti
         }
@@ -197,7 +206,9 @@ export class SlotMsg extends Component {
         this.middleMsgNode.active = false;
         this.largeMsgNode.active = false;
     }
-
+    //multi
+    //score
+    //script
     /**
      * 展示多倍炸弹倍率动画
      * @param spinData 当前spin数据
@@ -278,7 +289,11 @@ export class SlotMsg extends Component {
                 let flyNode = instantiate(centerMulNode)
                 flyNode.setPosition(centerMulNode.getPosition())
                 this.node.addChild(flyNode)
+                // this.scheduleOnce(() => {
+                AudioManager.instance.playSFX('Multi_Fly_Start')
+                // }, 0.1)
                 await tweenToAsync(flyNode, centerLocalPos, 0.6);
+                AudioManager.instance.playSFX('Multi_Fly_End')
                 flyNode.destroy()
                 this.showRoundWinMsg(1, this.currTotaleMulti)
             }
@@ -306,9 +321,15 @@ export class SlotMsg extends Component {
                 info.multiNode.active = false;
                 this.node.addChild(flyNode);
                 flyNode.setPosition(sourceLocalPos);
+                // this.scheduleOnce(() => {
+                AudioManager.instance.playSFX('Multi_Fly_Start')
+                // }, 0.1)
 
                 // 2.4 飞到信息栏动画
                 await tweenToAsync(flyNode, centerLocalPos, 0.6);
+                // this.scheduleOnce(() => {
+                AudioManager.instance.playSFX('Multi_Fly_End')
+                // }, 0.1)
                 flyNode.destroy();
 
                 // 2.5 累加倍率，信息栏文本根据每个倍率到达而改变
@@ -334,12 +355,35 @@ export class SlotMsg extends Component {
             // 5. 展示最终总分获胜弹窗和新的总倍率
             let showCurrMulti = () => {
                 return new Promise<void>((resolve) => {
-                    this.setTotaleMulti(sumMul)
+                    this.setTotaleMultiAndMultiMergeTime(sumMul)
                     let totalMultiBgSpin = slotGame.node.getChildByPath('FreeGameBg1/qiu')
+                    //球体开始扩张
+                    AudioManager.instance.playSFX('Ball_Ball_Expand')
+                    AudioManager.instance.playSFX('Sprite_Ball_Prepare_Expand')
+                    this.scheduleOnce(() => {
+                        AudioManager.instance.playSFX('Sprite_Ball_Expand')
+                    }, 0.2)
                     tween(totalMultiBgSpin)
-                        .to(0.2, { scale: v3(1.2, 1.2, 1) })
+                        .to(0.4, { scale: v3(1.5, 1.5, 1) })
-                        .to(0.2, { scale: v3(1, 1, 1) })
+                        .to(0.4, { scale: v3(1, 1, 1) })
                         .call(() => {
+                            AudioManager.instance.playSFX('Sprite_Multi_Show')
+                            this.scheduleOnce(() => {
+                                switch (true) {
+                                    case this.MultiMergeTime < 3:
+                                        AudioManager.instance.playSFX('Ball_First_Show')
+                                        break
+                                    case this.MultiMergeTime >= 3 && this.MultiMergeTime < 5:
+                                        AudioManager.instance.playSFX('Ball_Three_Show')
+                                        break
+                                    case this.MultiMergeTime >= 5 && this.MultiMergeTime < 7:
+                                        AudioManager.instance.playSFX('Ball_Five_Show')
+                                        break
+                                    case this.MultiMergeTime >= 7:
+                                        AudioManager.instance.playSFX('Ball_Seven_Show')
+                                        break
+                                }
+                            }, 0.1)
                             slotGame.setFreeTotalMulti(this.currTotaleMulti)
                             resolve()
                         })

assets/Game/Scripts/SlotScene.ts

@@ -4,7 +4,7 @@ import { SlotBar } from "./SlotBar";
 import { GAME_DATA, SLOT_BAR_EVENT, SLOT_GAME_EVENT, SYS_GIFT, WIN_TYPE, } from "./Define";
 import { SlotMsg } from "./SlotMsg";
 import { GameDataManager } from "../../Main/Scripts/managers/GameDataManager";
-import { callGameApi } from "../../Main/Scripts/main/comm";
+import { callGameApi, callGameBalanceApi, getGameId } from "../../Main/Scripts/main/comm";
 import { I18nManager } from "../../Main/Scripts/managers/I18nManager";
 import { UIManager } from "../../Main/Scripts/managers/UIManager";
 import { NodePoolManager } from "../../Main/Scripts/managers/NodePoolManager";
@@ -62,8 +62,8 @@ export class SlotScene extends Component {
   autoSpinConfig: any = {
     count: 0,
     delay: {
-      fast: 0.5,
+      fast: 0,
-      normal: 1,
+      normal: 0,
     },
   };
 
@@ -139,6 +139,32 @@ export class SlotScene extends Component {
     }
 
     this.isFreeSpin ? AudioManager.instance.playBGM("Free_Bg_Bgm") : AudioManager.instance.playBGM("Normal_Bg_Bgm");
+    if (!localStorage.getItem('HasGamePending')) this.openFirstChooseDiff();
+
+
+    // let score = 1000000
+    // let winType = this.checkWinType(score)
+    // NodePoolManager.instance.getNodeFromPoolDynamic("BigWin", "Prefab/BigWin", "Game").then((prefab: Node) => {
+    //   this.node.addChild(prefab);
+    //   prefab.getComponent(BigWin).open(winType, score, this.slotBar.getBet(), null, this.isFreeSpin);
+    // });
+
+    // NodePoolManager.instance.getNodeFromPoolDynamic("TotalWinSpine", "Prefab/TotalWinSpine", "Game").then((prefab: Node) => {
+    //   this.node.addChild(prefab);
+    //   prefab.getComponent(TotalWinSpine).showTotalWinSpine(score, () => {
+    //     AudioManager.instance.playBGM("Free_Bg_Bgm");
+    //     NodePoolManager.instance.putNodeToPool("FreeSpinEnter", prefab);
+    //   })
+    // });
+
+    // NodePoolManager.instance.getNodeFromPoolDynamic("FreeSpinEnter", "Prefab/FreeSpinEnter", "Game").then((prefab: Node) => {
+    //   this.node.addChild(prefab);
+    //   let freeCount = 15;
+    //   prefab.getComponent(FreeSpinEnterSpine).showEnterAni(freeCount, () => {
+    //     AudioManager.instance.playBGM("Normal_Bg_Bgm");
+    //     NodePoolManager.instance.putNodeToPool("FreeSpinEnter", prefab);
+    //   });
+    // });
   }
 
   updateBg(isFreeSpin: boolean, isReconnect: boolean) {
@@ -152,11 +178,11 @@ export class SlotScene extends Component {
   }
 
   async handleReconnect() {
-    this.slotMsg.setTotaleMulti(this.spinData.WinMultiPlier)
+    this.slotMsg.setTotaleMultiAndMultiMergeTime(this.spinData.WinMultiPlier)
 
     if (this.hasEliminate) {
       this.slotBar.manualStop(this.hasEliminate);
-      this.slotGame.playIconWinAni(this.spinData);
+      this.slotGame.playIconWinAni(this.spinData, this.isFreeSpin);
       this.slotMsg.showRoundWinMsg(this.spinData.RoundInfo.AllScore);
       this.slotBar.updateWinMsg(this.spinData.AllScore, true);
       if (this.isDebug) {
@@ -188,9 +214,24 @@ export class SlotScene extends Component {
     // 重置    
     this.slotMsg.hideWinSpine();
     if (isNewSpin) {
-      this.slotMsg.setTotaleMulti(0)
+      this.slotMsg.setTotaleMultiAndMultiMergeTime(0)
     }
-    if (!this.isFreeSpin) { this.slotBar.setWin(0); }
+    if (!this.isFreeSpin) {
+      this.slotBar.setWin(0);
+    }
+
+    let curBalanceData = await this.slotBar.refreshBalanceFromServer()
+    if (!curBalanceData) {
+      curBalanceData = this.slotBar.getBalance()
+    }
+    if (curBalanceData < (buyType == 1 ? this.slotBar.getBet() * this.gameInfo.BuyMul : (this.isDoubleWin ? this.slotBar.getdisplayBet() : this.slotBar.getBet())) && !this.isFreeSpin && !this.spinInfo.Frb.Ongoing) {
+      //余额不足不经过服务器，在客户端拦截
+      this.showErrorTip(2, "", () => { this.slotBar.onConfirmErr2() });
+      this.handleErrSpin(true);
+      this.isPreviewSpin = true;
+      return
+    }
+
 
     let msg = !this.isFeatureBuySpin && buyType == 0 ?
       { Bet: this.slotBar.getBet(), IsDouble: this.isDoubleWin, }
@@ -391,7 +432,7 @@ export class SlotScene extends Component {
     if (this.hasEliminate) this.slotBar.spinBtnSpineEliminate();
     // 如果本次有消除，则进行删除工作。
     if (this.hasEliminate) {
-      this.slotGame.playIconWinAni(this.spinData);
+      this.slotGame.playIconWinAni(this.spinData, this.isFreeSpin);
       this.slotMsg.showRoundWinMsg(this.spinData.RoundInfo.AllScore);
       this.slotBar.updateWinMsg(this.spinData.AllScore, false);
       if (this.isDebug) {
@@ -446,7 +487,7 @@ export class SlotScene extends Component {
 
   async onAllRollerIconsFallen() {
     if (this.hasEliminate) {
-      this.slotGame.playIconWinAni(this.spinData);
+      this.slotGame.playIconWinAni(this.spinData, this.isFreeSpin);
       this.slotMsg.showRoundWinMsg(this.spinData.RoundInfo.AllScore);
       this.slotBar.updateWinMsg(this.spinData.AllScore, false);
       if (this.isDebug) {
@@ -490,7 +531,10 @@ export class SlotScene extends Component {
         // 进入免费前，先给 2 秒展示 scatter 动画并更新信息栏
         this.slotBar.updatePlayerMsg(this.spinData, false, null);
         this.slotGame.upLayer.playScatterWaitSpine(true);
+        AudioManager.instance.playSFX('Wait_Free_Game')
         this.scheduleOnce(() => {
+          AudioManager.instance.stopSFX('Wait_Free_Game')
+
           this.slotGame.upLayer.playScatterWaitSpine(false);
           this.scheduleOnce(() => { this.updateBg(true, false); this.slotBar.updateIsFreeSpin(true); this.slotBar.setLeftCount(this.spinData.FreeSpin.MaxCount); }, 1)
           NodePoolManager.instance.getNodeFromPoolDynamic("FreeSpinEnter", "Prefab/FreeSpinEnter", "Game").then((prefab: Node) => {
@@ -498,6 +542,7 @@ export class SlotScene extends Component {
             let freeCount = this.spinData.FreeSpin.MaxCount;
             prefab.getComponent(FreeSpinEnterSpine).showEnterAni(freeCount, () => {
               AudioManager.instance.playBGM("Free_Bg_Bgm");
+              AudioManager.instance.playSFX("Free_First_Entry");
               NodePoolManager.instance.putNodeToPool("FreeSpinEnter", prefab);
               this.scheduleOnce(() => {
                 this.handleNextFreeSpin(this.spinData.FreeSpin.LeftCount - 1);
@@ -653,7 +698,7 @@ export class SlotScene extends Component {
 
     if (this.spinData.RoundInfo.Mul == 1) {
       this.slotMsg.showTotalWinMsg(this.spinData.RoundInfo.Score);
-      this.slotBar.updateWinMsg(this.spinData.RoundInfo.Score, false);
+      this.slotBar.updateWinMsg(this.spinData.AllScore, false);
       callBack();
       return;
     }
@@ -670,7 +715,7 @@ export class SlotScene extends Component {
       callBack();
       return
     }
-    let score = this.isFreeSpin ? this.spinData.RoundInfo.Score : this.spinData.AllScore;
+    let score = this.spinData.Score;
     let winType = score ? this.checkWinType(score) : WIN_TYPE.NONE;
     if (winType >= WIN_TYPE.BIG_WIN) {
       NodePoolManager.instance.getNodeFromPoolDynamic("BigWin", "Prefab/BigWin", "Game").then((prefab: Node) => {
@@ -852,7 +897,7 @@ export class SlotScene extends Component {
           title,
           msg,
           true,
-          null,
+          callBack,
           null,
           I18nManager.instance.t("AID_ERROR_OK_BUTTON")
         );
@@ -904,16 +949,51 @@ export class SlotScene extends Component {
     }
   }
 
-  handleErrSpin() {
+  handleErrSpin(isErr2 = false) {
     this.spinInfo = this.lastSpinInfo;
     this.spinData = this.spinInfo.Data;
     this.isAutoSpin = false;
     this.spinData.AllScore = 0;
     this.spinData.SpinScore = 0;
     this.slotGame.stopScroll(this.spinData);
-    this.slotBar.setBalance(this.spinInfo.Balance);
+    this.slotBar.setBalance(isErr2 ? this.slotBar.getBalance() : this.spinInfo.Balance
+    );
+    this.slotBar.closeAutoSpin();
+
   }
 
+  openFirstChooseDiff() {
+    NodePoolManager.instance.getNodeFromPoolDynamic("ChooseDiff", "Prefab/ChooseDiff", "Game").then((prefab: Node) => {
+      this.node.addChild(prefab);
+
+      prefab.getComponent(ChooseDiff).open(GameDataManager.instance.chooseDiff, async () => {
+        let gameinfo = await callGameApi('gameinfo', {});
+        GameDataManager.instance.gameInfo = gameinfo;
+
+        this.spinInfo = gameinfo;
+        this.spinData = gameinfo.Data;
+
+        this.resetStateForPreview();
+
+        this.isPreviewSpin = true;
+
+        this.slotGame.startScroll(false);
+
+        this.handleSpinResult();
+
+        this.slotGame.stopScroll(this.spinData);
+
+        this.slotBar.setGameInfo(gameinfo);
+        this.slotGame.updateDiffBg(true);
+
+      },
+        () => {
+          this.slotBar.updateChooseDiff();
+        }, !localStorage.getItem('HasGamePending'));
+    });
+  }
+
+
   async spinWithRetry(bet: number, maxTry: number = 5, initialDelay: number = 0.5): Promise<any> {
     let delay = initialDelay;
     for (let i = 0; i < maxTry; i++) {

assets/Game/Scripts/TotalWinSpine.ts

@@ -45,30 +45,38 @@ export class TotalWinSpine extends Component {
             .to(0.5, { scale: new Vec3(1, 1, 1) }, { easing: 'bounceOut' })
             .start();
 
-        this.labelController = UIManager.instance.tweenScorelinear(0, totalWinCount, 2)
+        this.labelController = UIManager.instance.tweenScorelinear(0, totalWinCount, 3.3)
             .onUpdate((v: number) => {
                 this.totalWinCount.getComponent(Label).string = gold2cash(v);
             })
             .onComplete(() => {
                 this.collectBtn.active = true;
+                AudioManager.instance.stopBGM()
+                AudioManager.instance.playSFX('Total_Win_Jump');
                 this.totalWinCount.getComponent(Label).string = gold2cash(totalWinCount);
                 this.scheduleOnce(() => {
                     this.onClickCollectBtn();
-                }, 5);
+                }, 3);
             })
             .start();
     }
 
     onClickGrayBg() {
-        AudioManager.instance.playBGM('Total_Win_Jump');
+        AudioManager.instance.stopBGM()
+
+        AudioManager.instance.playSFX('Total_Win_Jump');
         this.node.getChildByName('grayBg').off(Node.EventType.TOUCH_START, this.onClickGrayBg, this);
         Tween.stopAllByTarget(this.labelController.holder);
         this.collectBtn.active = true;
         this.totalWinCount.getComponent(Label).string = gold2cash(this.totalWinCountValue);
+        this.scheduleOnce(() => {
+            this.onClickCollectBtn();
+        }, 3);
     }
 
     onClickCollectBtn() {
         if (this.hasClickBtn) return;
+        AudioManager.instance.playSFX('Click_TotalWin_Collect')
         this.hasClickBtn = true;
         tween(this.collectBtn)
             .to(0.1, { scale: new Vec3(1.1, 1.1, 1.1) })

assets/Game/Textures/SlotBar/other/Btn_Close.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "0fa889be-0d0a-4158-8c4d-8843a7b00b0b",
+  "uuid": "fb63cd45-5ce1-45a1-a788-c3013eacab31",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "0fa889be-0d0a-4158-8c4d-8843a7b00b0b@6c48a",
+      "uuid": "fb63cd45-5ce1-45a1-a788-c3013eacab31@6c48a",
-      "displayName": "Btn_Close_02",
+      "displayName": "Btn_Close",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "0fa889be-0d0a-4158-8c4d-8843a7b00b0b",
+        "imageUuidOrDatabaseUri": "fb63cd45-5ce1-45a1-a788-c3013eacab31",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "0fa889be-0d0a-4158-8c4d-8843a7b00b0b@f9941",
+      "uuid": "fb63cd45-5ce1-45a1-a788-c3013eacab31@f9941",
-      "displayName": "Btn_Close_02",
+      "displayName": "Btn_Close",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "0fa889be-0d0a-4158-8c4d-8843a7b00b0b@6c48a",
+        "imageUuidOrDatabaseUri": "fb63cd45-5ce1-45a1-a788-c3013eacab31@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "0fa889be-0d0a-4158-8c4d-8843a7b00b0b@6c48a"
+    "redirect": "fb63cd45-5ce1-45a1-a788-c3013eacab31@6c48a"
   }
 }

assets/Game/Textures/SlotBar/other/Btn_History.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "1481aa23-7b67-49c8-af7d-bfaff8a291d0",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "1481aa23-7b67-49c8-af7d-bfaff8a291d0@6c48a",
+      "displayName": "Btn_History",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "1481aa23-7b67-49c8-af7d-bfaff8a291d0",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "1481aa23-7b67-49c8-af7d-bfaff8a291d0@f9941",
+      "displayName": "Btn_History",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0.5,
+        "offsetY": -0.5,
+        "trimX": 9,
+        "trimY": 9,
+        "width": 77,
+        "height": 77,
+        "rawWidth": 94,
+        "rawHeight": 94,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -38.5,
+            -38.5,
+            0,
+            38.5,
+            -38.5,
+            0,
+            -38.5,
+            38.5,
+            0,
+            38.5,
+            38.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            9,
+            85,
+            86,
+            85,
+            9,
+            8,
+            86,
+            8
+          ],
+          "nuv": [
+            0.09574468085106383,
+            0.0851063829787234,
+            0.9148936170212766,
+            0.0851063829787234,
+            0.09574468085106383,
+            0.9042553191489362,
+            0.9148936170212766,
+            0.9042553191489362
+          ],
+          "minPos": [
+            -38.5,
+            -38.5,
+            0
+          ],
+          "maxPos": [
+            38.5,
+            38.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "1481aa23-7b67-49c8-af7d-bfaff8a291d0@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "1481aa23-7b67-49c8-af7d-bfaff8a291d0@6c48a"
+  }
+}

assets/Game/Textures/SlotBar/other/Btn_Paytable.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "507bf745-2f3e-425e-9552-a919a6b76228",
+  "uuid": "106e4f72-7ee8-4c51-9f6c-02f230a6f427",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "507bf745-2f3e-425e-9552-a919a6b76228@6c48a",
+      "uuid": "106e4f72-7ee8-4c51-9f6c-02f230a6f427@6c48a",
-      "displayName": "Btn_History_01",
+      "displayName": "Btn_Paytable",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "507bf745-2f3e-425e-9552-a919a6b76228",
+        "imageUuidOrDatabaseUri": "106e4f72-7ee8-4c51-9f6c-02f230a6f427",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "507bf745-2f3e-425e-9552-a919a6b76228@f9941",
+      "uuid": "106e4f72-7ee8-4c51-9f6c-02f230a6f427@f9941",
-      "displayName": "Btn_History_01",
+      "displayName": "Btn_Paytable",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -44,10 +44,10 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 3,
+        "trimX": 9,
-        "trimY": 3,
+        "trimY": 9,
-        "width": 88,
+        "width": 76,
-        "height": 88,
+        "height": 76,
         "rawWidth": 94,
         "rawHeight": 94,
         "borderTop": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -44,
+            -38,
-            -44,
+            -38,
             0,
-            44,
+            38,
-            -44,
+            -38,
             0,
-            -44,
+            -38,
-            44,
+            38,
             0,
-            44,
+            38,
-            44,
+            38,
             0
           ],
           "indexes": [
@@ -83,38 +83,38 @@
             3
           ],
           "uv": [
-            3,
+            9,
-            91,
+            85,
-            91,
+            85,
-            91,
+            85,
-            3,
+            9,
-            3,
+            9,
-            91,
+            85,
-            3
+            9
           ],
           "nuv": [
-            0.031914893617021274,
+            0.09574468085106383,
-            0.031914893617021274,
+            0.09574468085106383,
-            0.9680851063829787,
+            0.9042553191489362,
-            0.031914893617021274,
+            0.09574468085106383,
-            0.031914893617021274,
+            0.09574468085106383,
-            0.9680851063829787,
+            0.9042553191489362,
-            0.9680851063829787,
+            0.9042553191489362,
-            0.9680851063829787
+            0.9042553191489362
           ],
           "minPos": [
-            -44,
+            -38,
-            -44,
+            -38,
             0
           ],
           "maxPos": [
-            44,
+            38,
-            44,
+            38,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "507bf745-2f3e-425e-9552-a919a6b76228@6c48a",
+        "imageUuidOrDatabaseUri": "106e4f72-7ee8-4c51-9f6c-02f230a6f427@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "507bf745-2f3e-425e-9552-a919a6b76228@6c48a"
+    "redirect": "106e4f72-7ee8-4c51-9f6c-02f230a6f427@6c48a"
   }
 }

assets/Game/Textures/SlotBar/other/Btn_Quit.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "121ac080-4602-4b53-a118-05a3673415d5",
+  "uuid": "ee594cf5-98ff-4e5f-9739-407bd908140b",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "121ac080-4602-4b53-a118-05a3673415d5@6c48a",
+      "uuid": "ee594cf5-98ff-4e5f-9739-407bd908140b@6c48a",
-      "displayName": "Btn_Quit_01",
+      "displayName": "Btn_Quit",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "121ac080-4602-4b53-a118-05a3673415d5",
+        "imageUuidOrDatabaseUri": "ee594cf5-98ff-4e5f-9739-407bd908140b",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "121ac080-4602-4b53-a118-05a3673415d5@f9941",
+      "uuid": "ee594cf5-98ff-4e5f-9739-407bd908140b@f9941",
-      "displayName": "Btn_Quit_01",
+      "displayName": "Btn_Quit",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -43,11 +43,11 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": 0,
+        "offsetY": 0.5,
         "trimX": 8,
-        "trimY": 7,
+        "trimY": 8,
         "width": 78,
-        "height": 80,
+        "height": 77,
         "rawWidth": 94,
         "rawHeight": 94,
         "borderTop": 0,
@@ -62,16 +62,16 @@
         "vertices": {
           "rawPosition": [
             -39,
-            -40,
+            -38.5,
             0,
             39,
-            -40,
+            -38.5,
             0,
             -39,
-            40,
+            38.5,
             0,
             39,
-            40,
+            38.5,
             0
           ],
           "indexes": [
@@ -84,37 +84,37 @@
           ],
           "uv": [
             8,
-            87,
             86,
-            87,
+            86,
+            86,
             8,
-            7,
+            9,
             86,
-            7
+            9
           ],
           "nuv": [
             0.0851063829787234,
-            0.07446808510638298,
+            0.09574468085106383,
             0.9148936170212766,
-            0.07446808510638298,
+            0.09574468085106383,
             0.0851063829787234,
-            0.925531914893617,
             0.9148936170212766,
-            0.925531914893617
+            0.9148936170212766,
+            0.9148936170212766
           ],
           "minPos": [
             -39,
-            -40,
+            -38.5,
             0
           ],
           "maxPos": [
             39,
-            40,
+            38.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "121ac080-4602-4b53-a118-05a3673415d5@6c48a",
+        "imageUuidOrDatabaseUri": "ee594cf5-98ff-4e5f-9739-407bd908140b@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "121ac080-4602-4b53-a118-05a3673415d5@6c48a"
+    "redirect": "ee594cf5-98ff-4e5f-9739-407bd908140b@6c48a"
   }
 }

assets/Game/Textures/SlotBar/other/Btn_Rule.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "731e2e63-533b-405e-9924-bc3bf0fe43fd",
+  "uuid": "898599e1-aea5-4f39-8e3b-ba19d016504d",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "731e2e63-533b-405e-9924-bc3bf0fe43fd@6c48a",
+      "uuid": "898599e1-aea5-4f39-8e3b-ba19d016504d@6c48a",
-      "displayName": "Btn_Rule_01",
+      "displayName": "Btn_Rule",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "731e2e63-533b-405e-9924-bc3bf0fe43fd",
+        "imageUuidOrDatabaseUri": "898599e1-aea5-4f39-8e3b-ba19d016504d",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "731e2e63-533b-405e-9924-bc3bf0fe43fd@f9941",
+      "uuid": "898599e1-aea5-4f39-8e3b-ba19d016504d@f9941",
-      "displayName": "Btn_Rule_01",
+      "displayName": "Btn_Rule",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -43,9 +43,9 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": 0.5,
+        "offsetY": -0.5,
         "trimX": 3,
-        "trimY": 11,
+        "trimY": 12,
         "width": 88,
         "height": 71,
         "rawWidth": 94,
@@ -84,23 +84,23 @@
           ],
           "uv": [
             3,
-            83,
+            82,
             91,
-            83,
+            82,
             3,
-            12,
+            11,
             91,
-            12
+            11
           ],
           "nuv": [
             0.031914893617021274,
-            0.1276595744680851,
+            0.11702127659574468,
             0.9680851063829787,
-            0.1276595744680851,
+            0.11702127659574468,
             0.031914893617021274,
-            0.8829787234042553,
+            0.8723404255319149,
             0.9680851063829787,
-            0.8829787234042553
+            0.8723404255319149
           ],
           "minPos": [
             -44,
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "731e2e63-533b-405e-9924-bc3bf0fe43fd@6c48a",
+        "imageUuidOrDatabaseUri": "898599e1-aea5-4f39-8e3b-ba19d016504d@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "731e2e63-533b-405e-9924-bc3bf0fe43fd@6c48a"
+    "redirect": "898599e1-aea5-4f39-8e3b-ba19d016504d@6c48a"
   }
 }

assets/Game/Textures/SlotBar/other/Btn_SoundOFF.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "93fdb261-9610-4fe6-8d58-dbc806e0878c",
+  "uuid": "8445313a-84a4-41ab-94e7-aeacf29fcdee",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "93fdb261-9610-4fe6-8d58-dbc806e0878c@6c48a",
+      "uuid": "8445313a-84a4-41ab-94e7-aeacf29fcdee@6c48a",
-      "displayName": "Btn_Paytable_01",
+      "displayName": "Btn_SoundOFF",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "93fdb261-9610-4fe6-8d58-dbc806e0878c",
+        "imageUuidOrDatabaseUri": "8445313a-84a4-41ab-94e7-aeacf29fcdee",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,20 +34,20 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "93fdb261-9610-4fe6-8d58-dbc806e0878c@f9941",
+      "uuid": "8445313a-84a4-41ab-94e7-aeacf29fcdee@f9941",
-      "displayName": "Btn_Paytable_01",
+      "displayName": "Btn_SoundOFF",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": -0.5,
+        "offsetX": 0,
-        "offsetY": 0.5,
+        "offsetY": 0,
-        "trimX": 3,
+        "trimX": 4,
-        "trimY": 3,
+        "trimY": 8,
-        "width": 87,
+        "width": 86,
-        "height": 87,
+        "height": 78,
         "rawWidth": 94,
         "rawHeight": 94,
         "borderTop": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -43.5,
+            -43,
-            -43.5,
+            -39,
             0,
-            43.5,
+            43,
-            -43.5,
+            -39,
             0,
-            -43.5,
+            -43,
-            43.5,
+            39,
             0,
-            43.5,
+            43,
-            43.5,
+            39,
             0
           ],
           "indexes": [
@@ -83,38 +83,38 @@
             3
           ],
           "uv": [
-            3,
-            91,
-            90,
-            91,
-            3,
             4,
+            86,
             90,
-            4
+            86,
+            4,
+            8,
+            90,
+            8
           ],
           "nuv": [
-            0.031914893617021274,
             0.0425531914893617,
+            0.0851063829787234,
             0.9574468085106383,
+            0.0851063829787234,
             0.0425531914893617,
-            0.031914893617021274,
+            0.9148936170212766,
-            0.9680851063829787,
             0.9574468085106383,
-            0.9680851063829787
+            0.9148936170212766
           ],
           "minPos": [
-            -43.5,
+            -43,
-            -43.5,
+            -39,
             0
           ],
           "maxPos": [
-            43.5,
+            43,
-            43.5,
+            39,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "93fdb261-9610-4fe6-8d58-dbc806e0878c@6c48a",
+        "imageUuidOrDatabaseUri": "8445313a-84a4-41ab-94e7-aeacf29fcdee@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "93fdb261-9610-4fe6-8d58-dbc806e0878c@6c48a"
+    "redirect": "8445313a-84a4-41ab-94e7-aeacf29fcdee@6c48a"
   }
 }

assets/Game/Textures/SlotBar/other/Btn_SoundOFF_01.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "e40bb2de-fab3-4374-a24f-477e7109bcb4",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "e40bb2de-fab3-4374-a24f-477e7109bcb4@6c48a",
-      "displayName": "Btn_SoundOFF_01",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "e40bb2de-fab3-4374-a24f-477e7109bcb4",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "e40bb2de-fab3-4374-a24f-477e7109bcb4@f9941",
-      "displayName": "Btn_SoundOFF_01",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": -0.5,
-        "offsetY": 0,
-        "trimX": 3,
-        "trimY": 6,
-        "width": 87,
-        "height": 82,
-        "rawWidth": 94,
-        "rawHeight": 94,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -43.5,
-            -41,
-            0,
-            43.5,
-            -41,
-            0,
-            -43.5,
-            41,
-            0,
-            43.5,
-            41,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            3,
-            88,
-            90,
-            88,
-            3,
-            6,
-            90,
-            6
-          ],
-          "nuv": [
-            0.031914893617021274,
-            0.06382978723404255,
-            0.9574468085106383,
-            0.06382978723404255,
-            0.031914893617021274,
-            0.9361702127659575,
-            0.9574468085106383,
-            0.9361702127659575
-          ],
-          "minPos": [
-            -43.5,
-            -41,
-            0
-          ],
-          "maxPos": [
-            43.5,
-            41,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "e40bb2de-fab3-4374-a24f-477e7109bcb4@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "e40bb2de-fab3-4374-a24f-477e7109bcb4@6c48a"
-  }
-}

assets/Game/Textures/SlotBar/other/Btn_SoundON.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "21e74a46-2d92-4de1-a7a4-6664d9c4fb73",
+  "uuid": "930fb168-8205-41c8-bafd-13d36487b8bb",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "21e74a46-2d92-4de1-a7a4-6664d9c4fb73@6c48a",
+      "uuid": "930fb168-8205-41c8-bafd-13d36487b8bb@6c48a",
-      "displayName": "Btn_SoundON_01",
+      "displayName": "Btn_SoundON",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "21e74a46-2d92-4de1-a7a4-6664d9c4fb73",
+        "imageUuidOrDatabaseUri": "930fb168-8205-41c8-bafd-13d36487b8bb",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,20 +34,20 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "21e74a46-2d92-4de1-a7a4-6664d9c4fb73@f9941",
+      "uuid": "930fb168-8205-41c8-bafd-13d36487b8bb@f9941",
-      "displayName": "Btn_SoundON_01",
+      "displayName": "Btn_SoundON",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": -2,
+        "offsetX": -1.5,
         "offsetY": 0,
-        "trimX": 3,
+        "trimX": 4,
-        "trimY": 6,
+        "trimY": 8,
-        "width": 84,
+        "width": 83,
-        "height": 82,
+        "height": 78,
         "rawWidth": 94,
         "rawHeight": 94,
         "borderTop": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -42,
+            -41.5,
-            -41,
+            -39,
             0,
-            42,
+            41.5,
-            -41,
+            -39,
             0,
-            -42,
+            -41.5,
-            41,
+            39,
             0,
-            42,
+            41.5,
-            41,
+            39,
             0
           ],
           "indexes": [
@@ -83,38 +83,38 @@
             3
           ],
           "uv": [
-            3,
+            4,
-            88,
+            86,
             87,
-            88,
+            86,
-            3,
+            4,
-            6,
+            8,
             87,
-            6
+            8
           ],
           "nuv": [
-            0.031914893617021274,
+            0.0425531914893617,
-            0.06382978723404255,
+            0.0851063829787234,
             0.925531914893617,
-            0.06382978723404255,
+            0.0851063829787234,
-            0.031914893617021274,
+            0.0425531914893617,
-            0.9361702127659575,
+            0.9148936170212766,
             0.925531914893617,
-            0.9361702127659575
+            0.9148936170212766
           ],
           "minPos": [
-            -42,
+            -41.5,
-            -41,
+            -39,
             0
           ],
           "maxPos": [
-            42,
+            41.5,
-            41,
+            39,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "21e74a46-2d92-4de1-a7a4-6664d9c4fb73@6c48a",
+        "imageUuidOrDatabaseUri": "930fb168-8205-41c8-bafd-13d36487b8bb@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "21e74a46-2d92-4de1-a7a4-6664d9c4fb73@6c48a"
+    "redirect": "930fb168-8205-41c8-bafd-13d36487b8bb@6c48a"
   }
 }

assets/Game/history/scripts/History.ts

@@ -1,4 +1,4 @@
-import { _decorator, Button, Color, Component, EventHandler, EventMouse, instantiate, isValid, JsonAsset, Label, math, Node, Prefab, ScrollView, sp, tween, UITransform, Vec3 } from 'cc';
+import { _decorator, Button, Color, Component, EventHandler, EventMouse, instantiate, isValid, JsonAsset, Label, math, Node, Prefab, ScrollView, sp, tween, UIOpacity, UITransform, Vec3 } from 'cc';
 import { getCsymbol, getHistory, getHistoryDetails, getLanguage } from 'db://assets/Main/Scripts/main/comm';
 import { fixNum, getTimezoneOffsetString, getTranslate, hideAllChildren, hideToBottom, showAllChildren, updateLang } from './Tools';
 const { ccclass, property } = _decorator;
@@ -381,6 +381,7 @@ export class History extends Component {
         console.log("clickItem, roundId = ", roundId)
 
         const history_detail = instantiate(this.history_detail)
+        history_detail.getComponent(UIOpacity).opacity = 0
         this.node_detail.addChild(history_detail)
 
         let res = await getHistoryDetails({
@@ -393,6 +394,8 @@ export class History extends Component {
 
         const self = this
         history_detail.position = new Vec3(1080, 0)
+        history_detail.getComponent(UIOpacity).opacity = 255
+
         tween(history_detail).to(0.2, { position: new Vec3(0, 0) })
             .call(() => {
                 self.scheduleOnce(() => { comp.entryFinish() })

assets/Game/history/scripts/HistoryDetail.ts

@@ -191,7 +191,7 @@ export class HistoryDetail extends Component {
         let close_Lab = this.list_round_winning.node.getChildByName('btn_close').getChildByName('Label');
         close_Lab.getComponent(Label).string = getTranslate(this.dict, "Close");
         let startVec = new Vec3(0, 3000)
-        let endVec = new Vec3(0, 800)
+        let endVec = new Vec3(0, this.list_detail.node.getPosition().y)
 
         node.position = startVec
         tween(node).to(0.2, { position: endVec }).call(() => {
@@ -668,6 +668,7 @@ export class HistoryDetail extends Component {
             if (idx == this.data.panDetails.length - 1) {
                 // console.log("已全部生成完")
                 this.hideLoading()
+                this.item_detail.removeFromParent()
                 this.scrollControl.jumpToPage(0)
             }
 
@@ -676,7 +677,6 @@ export class HistoryDetail extends Component {
 
         })
 
-
         this.scrollControl.vert_scrollView = this.list_detail.content.children[0].getComponent(ScrollView)
         this.list_detail.node.active = true
 
@@ -759,15 +759,16 @@ export class HistoryDetail extends Component {
     showLoading() {
         this.loading.active = true
         let sk = this.loading.getComponent(sp.Skeleton)
-        sk.paused = false
+        // sk.paused = false
-        sk.loop = true
+        // sk.loop = true
+        sk.setAnimation(0, 'loadingLoop')
     }
 
     hideLoading() {
         let sk = this.loading.getComponent(sp.Skeleton)
-        sk.paused = true
+        // sk.paused = true
-        sk.loop = false
+        // sk.loop = false
-
+        sk.clearAnimations()
         this.loading.active = false
 
     }

assets/Game/history/scripts/Paytable.ts

@@ -1,4 +1,4 @@
-import { _decorator, Component, EventMouse, JsonAsset, Layout, math, Node, ScrollView, UITransform } from 'cc';
+import { _decorator, Component, EventMouse, JsonAsset, Layout, math, Node, ScrollView, UITransform, Widget } from 'cc';
 import { hideToBottom, isBrahmic, updateLang, wrapTextBySpace } from './Tools';
 import { getLanguage } from 'db://assets/Main/Scripts/main/comm';
 
@@ -19,6 +19,7 @@ export class Paytable extends Component {
         this.dict = this.langJson.json[getLanguage()] ?? this.langJson.json["en"];
 
         this.scrollView = this.node.getChildByName("ScrollView").getComponent(ScrollView)
+        this.scrollView.node.getChildByName('view').getComponent(Widget).updateAlignment()
 
         this.scrollView.node.on('scrolling', this.onScrolling, this);
         this.node.on(Node.EventType.MOUSE_WHEEL, this.onMouseWheel, this);

assets/Game/history/scripts/Rules.ts

@@ -1,4 +1,4 @@
-import { _decorator, Component, EventMouse, JsonAsset, Label, Layout, math, Node, ScrollView, UITransform } from 'cc';
+import { _decorator, Component, EventMouse, JsonAsset, Label, Layout, math, Node, ScrollView, UITransform, Widget } from 'cc';
 import { getAllRichTexts, hideToBottom, isBrahmic, updateLang, wrapTextBySpace } from './Tools';
 import { getCsymbol, getLanguage } from 'db://assets/Main/Scripts/main/comm';
 const { ccclass, property } = _decorator;
@@ -16,6 +16,7 @@ export class Rules extends Component {
     protected onLoad(): void {
         this.dict = this.langJson.json[getLanguage()] ?? this.langJson.json["en"];
         this.scrollView = this.node.getChildByName("ScrollView").getComponent(ScrollView)
+        this.scrollView.node.getChildByName('view').getComponent(Widget).updateAlignment()
 
         this.scrollView.node.on('scrolling', this.onScrolling, this);
         this.node.on(Node.EventType.MOUSE_WHEEL, this.onMouseWheel, this);
@@ -43,10 +44,10 @@ export class Rules extends Component {
 
         //有一条规则内容要获取货币符号显示
         const content = this.node.getChildByName("ScrollView").getComponent(ScrollView).content
-        const Label_1_3 = content.getChildByName("Label_1_3").getComponent(Label)
+        const Label_1_2 = content.getChildByName("Label_1_2").getComponent(Label)
 
-        let str = Label_1_3.string.replace("{currencySymbol}", getCsymbol())
+        let str = Label_1_2.string.replace("{currencySymbol}", getCsymbol())
-        Label_1_3.string = str
+        Label_1_2.string = str
     }
 
     clickCloseRules() {

assets/Game/history/scripts/Tools.ts

@@ -171,9 +171,43 @@ export function wrapRichTextBySpace(richText: RichText, key: string, dict, lang)
 
     // key like this: Label_Rules_6_14_2 <img src='dates' /> Label_Rules_6_14_3
     const segmentArr: Segment[] = [];
-    const regex = /Label_[^<\s]+|<img[^>]+>/g;
+
+    //Label_[^<\s] 表示由Label开头，遇到<或空白(\s)则停止
+    //+表示前面的字符类可能出现多次
+    //|表示另一种组合，匹配其中任意一种
+    //<img[^>]+>表示由img开头，遇到>则停止，并在结尾再添加一个>
+    const regexp = /Label_[^<\s]+|<img[^>]+>/g;
+
+
+    // console.log('返回所有匹配的字符串', key.match(regexp))
+    // let matchArr = key.match(regexp)
+    // matchArr.forEach(match => {
+    //     if (match.startsWith("Label_")) {
+    //         let key = match.split("Label_")[1]
+    //         if (dict[key]) {
+    //             segmentArr.push({ type: "label", value: dict[key] });
+    //         }
+
+    //     } else {
+    //         segmentArr.push({ type: "image", value: match }); // "<img src='dates' />"
+    //     }
+    // });
+
+    // console.log('返回所有匹配的字符串', key.matchAll(regexp))
+    // let matchArr = [...key.matchAll(regexp)]
+    // matchArr.forEach(match => {
+    //     if (match[0].startsWith("Label_")) {
+    //         let key = match[0].split("Label_")[1]
+    //         if (dict[key]) {
+    //             segmentArr.push({ type: "label", value: dict[key] });
+    //         }
+
+    //     } else {
+    //         segmentArr.push({ type: "image", value: match[0] }); // "<img src='dates' />"
+    //     }
+    // });
     let match: RegExpExecArray | null;
-    while ((match = regex.exec(key)) !== null) {
+    while ((match = regexp.exec(key)) !== null) {
         if (match[0].startsWith("Label_")) {
 
             let key = match[0].split("Label_")[1]

assets/Game/阿拉丁神灯-资源/Tolal Win_bg.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "55945810-20e2-450a-ae06-f4e8a620639b",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "55945810-20e2-450a-ae06-f4e8a620639b@6c48a",
+      "displayName": "Tolal Win_bg",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "55945810-20e2-450a-ae06-f4e8a620639b",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "55945810-20e2-450a-ae06-f4e8a620639b@f9941",
+      "displayName": "Tolal Win_bg",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 1080,
+        "height": 2360,
+        "rawWidth": 1080,
+        "rawHeight": 2360,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -540,
+            -1180,
+            0,
+            540,
+            -1180,
+            0,
+            -540,
+            1180,
+            0,
+            540,
+            1180,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            2360,
+            1080,
+            2360,
+            0,
+            0,
+            1080,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -540,
+            -1180,
+            0
+          ],
+          "maxPos": [
+            540,
+            1180,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "55945810-20e2-450a-ae06-f4e8a620639b@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "55945810-20e2-450a-ae06-f4e8a620639b@6c48a"
+  }
+}

assets/Game/阿拉丁神灯-资源/spin/spin.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
-  "uuid": "c2811632-365f-4927-b5ed-fc7fc6b4cab5",
+  "uuid": "5fffe013-5fed-4c7e-9e25-dcb9745fdda3",
   "files": [],
   "subMetas": {},
   "userData": {}

assets/Game/阿拉丁神灯-资源/spin/spin/spin.atlas

@@ -1,41 +1,55 @@
 
 spin.png
-size: 821,432
+size: 1364,444
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
-200-1
+200 (2)
   rotate: true
-  xy: 2, 54
+  xy: 2, 2
+  size: 440, 458
+  orig: 466, 466
+  offset: 16, 3
+  index: -1
+200-1
+  rotate: false
+  xy: 462, 55
   size: 376, 387
   orig: 400, 411
   offset: 12, 12
   index: -1
 dt_xz_btn
   rotate: false
-  xy: 391, 154
+  xy: 840, 166
   size: 276, 276
   orig: 291, 288
   offset: 7, 10
   index: -1
 dt_xz_btn_jt01
   rotate: false
-  xy: 545, 2
+  xy: 994, 14
   size: 150, 150
   orig: 154, 154
   offset: 2, 2
   index: -1
 dt_xz_btn_jt02
   rotate: false
-  xy: 391, 2
+  xy: 840, 14
   size: 152, 150
   orig: 158, 154
   offset: 3, 2
   index: -1
 dt_xz_btn_jt03
   rotate: false
-  xy: 669, 280
+  xy: 1146, 46
   size: 150, 150
   orig: 154, 154
   offset: 2, 2
   index: -1
+mT
+  rotate: false
+  xy: 1118, 198
+  size: 244, 244
+  orig: 256, 256
+  offset: 8, 4
+  index: -1

assets/Game/阿拉丁神灯-资源/spin/spin/spin.atlas.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.0",
   "importer": "*",
   "imported": true,
-  "uuid": "bdf76baf-98df-47a4-8bdf-03c65bff19df",
+  "uuid": "ee724fa4-c654-4d45-b6a6-48781a48adc1",
   "files": [
     ".atlas",
     ".json"

assets/Game/阿拉丁神灯-资源/spin/spin/spin.json.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "358c6521-8846-4499-a543-4b3648db658e",
+  "uuid": "8ea9dba9-f366-4476-97c4-014000285acd",
   "files": [
     ".json"
   ],

assets/Game/阿拉丁神灯-资源/spin/spin/spin.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "c8ba8f90-1ff4-418a-9229-fc72c486dcbb",
+  "uuid": "40415d30-ef25-488c-b27d-d776963f9c3f",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "c8ba8f90-1ff4-418a-9229-fc72c486dcbb@6c48a",
+      "uuid": "40415d30-ef25-488c-b27d-d776963f9c3f@6c48a",
       "displayName": "spin",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "c8ba8f90-1ff4-418a-9229-fc72c486dcbb",
+        "imageUuidOrDatabaseUri": "40415d30-ef25-488c-b27d-d776963f9c3f",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "c8ba8f90-1ff4-418a-9229-fc72c486dcbb@f9941",
+      "uuid": "40415d30-ef25-488c-b27d-d776963f9c3f@f9941",
       "displayName": "spin",
       "id": "f9941",
       "name": "spriteFrame",
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 2,
         "trimY": 2,
-        "width": 817,
+        "width": 1360,
-        "height": 428,
+        "height": 440,
-        "rawWidth": 821,
+        "rawWidth": 1364,
-        "rawHeight": 432,
+        "rawHeight": 444,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -408.5,
+            -680,
-            -214,
+            -220,
             0,
-            408.5,
+            680,
-            -214,
+            -220,
             0,
-            -408.5,
+            -680,
-            214,
+            220,
             0,
-            408.5,
+            680,
-            214,
+            220,
             0
           ],
           "indexes": [
@@ -84,37 +84,37 @@
           ],
           "uv": [
             2,
-            430,
+            442,
-            819,
+            1362,
-            430,
+            442,
             2,
             2,
-            819,
+            1362,
             2
           ],
           "nuv": [
-            0.00243605359317905,
+            0.001466275659824047,
-            0.004629629629629629,
+            0.0045045045045045045,
-            0.997563946406821,
+            0.998533724340176,
-            0.004629629629629629,
+            0.0045045045045045045,
-            0.00243605359317905,
+            0.001466275659824047,
-            0.9953703703703703,
+            0.9954954954954955,
-            0.997563946406821,
+            0.998533724340176,
-            0.9953703703703703
+            0.9954954954954955
           ],
           "minPos": [
-            -408.5,
+            -680,
-            -214,
+            -220,
             0
           ],
           "maxPos": [
-            408.5,
+            680,
-            214,
+            220,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "c8ba8f90-1ff4-418a-9229-fc72c486dcbb@6c48a",
+        "imageUuidOrDatabaseUri": "40415d30-ef25-488c-b27d-d776963f9c3f@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "c8ba8f90-1ff4-418a-9229-fc72c486dcbb@6c48a"
+    "redirect": "40415d30-ef25-488c-b27d-d776963f9c3f@6c48a"
   }
 }

assets/Game/阿拉丁神灯-资源/spin/跑马灯/pmd2.atlas

@@ -1,229 +1,236 @@
 
 pmd2.png
-size: 1707,1181
+size: 1983,1211
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
 1/图层 31
-  rotate: false
+  rotate: true
-  xy: 2, 893
+  xy: 2, 53
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 32
-  rotate: false
+  rotate: true
-  xy: 343, 893
+  xy: 179, 76
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 33
   rotate: false
-  xy: 684, 887
+  xy: 230, 520
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 34
-  rotate: false
+  rotate: true
-  xy: 1025, 887
+  xy: 356, 179
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 35
   rotate: false
-  xy: 1366, 887
+  xy: 356, 2
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 36
-  rotate: false
+  rotate: true
-  xy: 2, 716
+  xy: 533, 179
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 37
   rotate: false
-  xy: 343, 716
+  xy: 571, 520
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 38
   rotate: false
-  xy: 684, 710
+  xy: 697, 2
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 39
-  rotate: false
+  rotate: true
-  xy: 1025, 710
+  xy: 710, 179
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 40
-  rotate: false
+  rotate: true
-  xy: 1366, 710
+  xy: 887, 179
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 41
   rotate: false
-  xy: 2, 539
+  xy: 1038, 2
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 42
-  rotate: false
+  rotate: true
-  xy: 343, 539
+  xy: 744, 870
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 43
-  rotate: false
+  rotate: true
-  xy: 684, 533
+  xy: 912, 529
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 44
-  rotate: false
+  rotate: true
-  xy: 1025, 533
+  xy: 921, 870
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 45
-  rotate: false
+  rotate: true
-  xy: 1366, 533
+  xy: 1064, 188
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 46
-  rotate: false
+  rotate: true
-  xy: 2, 362
+  xy: 1089, 529
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 47
-  rotate: false
+  rotate: true
-  xy: 343, 362
+  xy: 1098, 870
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 48
-  rotate: false
+  rotate: true
-  xy: 684, 356
+  xy: 1241, 188
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 49
-  rotate: false
+  rotate: true
-  xy: 1025, 356
+  xy: 1266, 529
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 50
-  rotate: false
+  rotate: true
-  xy: 1366, 356
+  xy: 1275, 870
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 51
   rotate: false
-  xy: 2, 185
+  xy: 1379, 11
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 52
-  rotate: false
+  rotate: true
-  xy: 343, 185
+  xy: 1418, 188
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 53
-  rotate: false
+  rotate: true
-  xy: 684, 179
+  xy: 1443, 529
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 54
-  rotate: false
+  rotate: true
-  xy: 1025, 179
+  xy: 1595, 188
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 55
-  rotate: false
+  rotate: true
-  xy: 1366, 179
+  xy: 1452, 870
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 56
-  rotate: false
+  rotate: true
-  xy: 2, 8
+  xy: 1620, 529
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 57
-  rotate: false
+  rotate: true
-  xy: 343, 8
+  xy: 1629, 870
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 58
-  rotate: false
+  rotate: true
-  xy: 684, 2
+  xy: 1806, 870
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 59
-  rotate: false
+  rotate: true
-  xy: 1025, 2
+  xy: 1797, 529
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
 1/图层 60
-  rotate: false
+  rotate: true
-  xy: 1366, 2
+  xy: 1772, 188
   size: 339, 175
   orig: 339, 175
   offset: 0, 0
   index: -1
-pmd2
+huaban-6089523074
   rotate: false
-  xy: 819, 1064
+  xy: 230, 697
+  size: 512, 512
+  orig: 512, 512
+  offset: 0, 0
+  index: -1
+pmd2
+  rotate: true
+  xy: 113, 417
   size: 792, 115
   orig: 796, 119
   offset: 2, 2
   index: -1
 pmd2_zz
-  rotate: false
+  rotate: true
-  xy: 2, 1070
+  xy: 2, 394
   size: 815, 109
   orig: 817, 112
   offset: 1, 2

assets/Game/阿拉丁神灯-资源/spin/跑马灯/pmd2.atlas.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.0",
   "importer": "*",
   "imported": true,
-  "uuid": "338e3b88-9e0d-4f2e-acd7-2cfce14fa8b6",
+  "uuid": "108ed562-306a-4059-9440-62f45821d871",
   "files": [
     ".atlas",
     ".json"

assets/Game/阿拉丁神灯-资源/spin/跑马灯/pmd2.json.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "4a208b24-7c3e-4c7e-b199-5a62190dfac2",
+  "uuid": "26b28449-fa71-49da-9b2e-8f296c759040",
   "files": [
     ".json"
   ],

assets/Game/阿拉丁神灯-资源/spin/跑马灯/pmd2.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "20905625-6d0f-46e1-b99f-6e7008f4f12b",
+  "uuid": "9e1832d6-e4d2-4959-b969-0b0e0bee6c54",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "20905625-6d0f-46e1-b99f-6e7008f4f12b@6c48a",
+      "uuid": "9e1832d6-e4d2-4959-b969-0b0e0bee6c54@6c48a",
       "displayName": "pmd2",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "20905625-6d0f-46e1-b99f-6e7008f4f12b",
+        "imageUuidOrDatabaseUri": "9e1832d6-e4d2-4959-b969-0b0e0bee6c54",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "20905625-6d0f-46e1-b99f-6e7008f4f12b@f9941",
+      "uuid": "9e1832d6-e4d2-4959-b969-0b0e0bee6c54@f9941",
       "displayName": "pmd2",
       "id": "f9941",
       "name": "spriteFrame",
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 2,
         "trimY": 2,
-        "width": 1703,
+        "width": 1979,
-        "height": 1177,
+        "height": 1207,
-        "rawWidth": 1707,
+        "rawWidth": 1983,
-        "rawHeight": 1181,
+        "rawHeight": 1211,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -851.5,
+            -989.5,
-            -588.5,
+            -603.5,
             0,
-            851.5,
+            989.5,
-            -588.5,
+            -603.5,
             0,
-            -851.5,
+            -989.5,
-            588.5,
+            603.5,
             0,
-            851.5,
+            989.5,
-            588.5,
+            603.5,
             0
           ],
           "indexes": [
@@ -84,37 +84,37 @@
           ],
           "uv": [
             2,
-            1179,
+            1209,
-            1705,
+            1981,
-            1179,
+            1209,
             2,
             2,
-            1705,
+            1981,
             2
           ],
           "nuv": [
-            0.0011716461628588166,
+            0.0010085728693898135,
-            0.001693480101608806,
+            0.0016515276630883566,
-            0.9988283538371412,
+            0.9989914271306102,
-            0.001693480101608806,
+            0.0016515276630883566,
-            0.0011716461628588166,
+            0.0010085728693898135,
-            0.9983065198983911,
+            0.9983484723369116,
-            0.9988283538371412,
+            0.9989914271306102,
-            0.9983065198983911
+            0.9983484723369116
           ],
           "minPos": [
-            -851.5,
+            -989.5,
-            -588.5,
+            -603.5,
             0
           ],
           "maxPos": [
-            851.5,
+            989.5,
-            588.5,
+            603.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "20905625-6d0f-46e1-b99f-6e7008f4f12b@6c48a",
+        "imageUuidOrDatabaseUri": "9e1832d6-e4d2-4959-b969-0b0e0bee6c54@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "20905625-6d0f-46e1-b99f-6e7008f4f12b@6c48a"
+    "redirect": "9e1832d6-e4d2-4959-b969-0b0e0bee6c54@6c48a"
   }
 }

assets/Game/阿拉丁神灯-资源/spin/跑马灯/pmd3.atlas

@@ -1,187 +1,194 @@
 
 pmd3.png
-size: 2005,1436
+size: 2015,1675
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
 G
   rotate: false
-  xy: 1514, 32
+  xy: 1010, 32
   size: 207, 207
   orig: 239, 238
   offset: 16, 16
   index: -1
+huaban-6089523074
+  rotate: false
+  xy: 2, 1161
+  size: 512, 512
+  orig: 512, 512
+  offset: 0, 0
+  index: -1
 yh/看图王批量图片转换结果/图层 1
   rotate: false
-  xy: 2, 1197
+  xy: 2, 922
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 10
   rotate: false
-  xy: 758, 1197
+  xy: 1020, 1436
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 11
   rotate: false
-  xy: 2, 241
+  xy: 2, 205
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 12
   rotate: false
-  xy: 254, 480
+  xy: 254, 444
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 13
   rotate: false
-  xy: 506, 719
+  xy: 1020, 1197
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 14
   rotate: false
-  xy: 758, 958
+  xy: 1272, 1436
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 15
   rotate: false
-  xy: 1010, 1197
+  xy: 254, 205
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 16
   rotate: false
-  xy: 2, 2
+  xy: 1272, 1197
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 17
   rotate: false
-  xy: 254, 241
+  xy: 1524, 1436
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 18
   rotate: false
-  xy: 506, 480
+  xy: 1524, 1197
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 19
-  rotate: false
+  rotate: true
-  xy: 758, 719
+  xy: 1776, 1423
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 2
   rotate: false
-  xy: 2, 958
+  xy: 516, 1436
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 20
-  rotate: false
+  rotate: true
-  xy: 1010, 958
+  xy: 1776, 1171
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 21
   rotate: false
-  xy: 1262, 1197
+  xy: 516, 958
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 22
   rotate: false
-  xy: 254, 2
+  xy: 768, 958
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 23
   rotate: false
-  xy: 506, 241
+  xy: 1020, 958
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 24
   rotate: false
-  xy: 758, 480
+  xy: 1272, 958
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 25
   rotate: false
-  xy: 1010, 719
+  xy: 1524, 958
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 26
   rotate: false
-  xy: 1262, 958
+  xy: 506, 719
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 27
   rotate: false
-  xy: 1514, 1197
+  xy: 506, 480
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 28
-  rotate: true
+  rotate: false
-  xy: 1766, 1184
+  xy: 758, 719
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 29
   rotate: false
-  xy: 1514, 958
+  xy: 506, 241
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 3
   rotate: false
-  xy: 254, 1197
+  xy: 2, 683
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 30
-  rotate: true
+  rotate: false
-  xy: 1766, 932
+  xy: 758, 480
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 31
   rotate: false
-  xy: 506, 2
+  xy: 1010, 719
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
@@ -208,128 +215,184 @@ yh/看图王批量图片转换结果/图层 34
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 35
-  rotate: false
-  xy: 1514, 719
-  size: 250, 237
-  orig: 250, 237
-  offset: 0, 0
-  index: -1
-yh/看图王批量图片转换结果/图层 36
-  rotate: true
-  xy: 1766, 680
-  size: 250, 237
-  orig: 250, 237
-  offset: 0, 0
-  index: -1
-yh/看图王批量图片转换结果/图层 37
-  rotate: false
-  xy: 758, 2
-  size: 250, 237
-  orig: 250, 237
-  offset: 0, 0
-  index: -1
-yh/看图王批量图片转换结果/图层 38
   rotate: false
   xy: 1010, 241
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
-yh/看图王批量图片转换结果/图层 39
+yh/看图王批量图片转换结果/图层 36
   rotate: false
   xy: 1262, 480
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
-yh/看图王批量图片转换结果/图层 4
+yh/看图王批量图片转换结果/图层 37
   rotate: false
-  xy: 2, 719
+  xy: 1514, 719
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
-yh/看图王批量图片转换结果/图层 40
+yh/看图王批量图片转换结果/图层 38
-  rotate: false
-  xy: 1514, 480
-  size: 250, 237
-  orig: 250, 237
-  offset: 0, 0
-  index: -1
-yh/看图王批量图片转换结果/图层 41
-  rotate: true
-  xy: 1766, 428
-  size: 250, 237
-  orig: 250, 237
-  offset: 0, 0
-  index: -1
-yh/看图王批量图片转换结果/图层 42
-  rotate: false
-  xy: 1010, 2
-  size: 250, 237
-  orig: 250, 237
-  offset: 0, 0
-  index: -1
-yh/看图王批量图片转换结果/图层 43
   rotate: false
   xy: 1262, 241
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
-yh/看图王批量图片转换结果/图层 44
+yh/看图王批量图片转换结果/图层 39
+  rotate: false
+  xy: 1514, 480
+  size: 250, 237
+  orig: 250, 237
+  offset: 0, 0
+  index: -1
+yh/看图王批量图片转换结果/图层 4
+  rotate: false
+  xy: 254, 922
+  size: 250, 237
+  orig: 250, 237
+  offset: 0, 0
+  index: -1
+yh/看图王批量图片转换结果/图层 40
   rotate: false
   xy: 1514, 241
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
-yh/看图王批量图片转换结果/图层 45
+yh/看图王批量图片转换结果/图层 41
   rotate: true
-  xy: 1766, 176
+  xy: 1776, 919
+  size: 250, 237
+  orig: 250, 237
+  offset: 0, 0
+  index: -1
+yh/看图王批量图片转换结果/图层 42
+  rotate: true
+  xy: 1766, 667
+  size: 250, 237
+  orig: 250, 237
+  offset: 0, 0
+  index: -1
+yh/看图王批量图片转换结果/图层 43
+  rotate: true
+  xy: 1766, 415
+  size: 250, 237
+  orig: 250, 237
+  offset: 0, 0
+  index: -1
+yh/看图王批量图片转换结果/图层 44
+  rotate: true
+  xy: 1766, 163
+  size: 250, 237
+  orig: 250, 237
+  offset: 0, 0
+  index: -1
+yh/看图王批量图片转换结果/图层 45
+  rotate: false
+  xy: 506, 2
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 46
   rotate: false
-  xy: 1262, 2
+  xy: 758, 2
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 5
   rotate: false
-  xy: 254, 958
+  xy: 516, 1197
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 6
   rotate: false
-  xy: 506, 1197
+  xy: 768, 1436
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 7
   rotate: false
-  xy: 2, 480
+  xy: 2, 444
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 8
   rotate: false
-  xy: 254, 719
+  xy: 254, 683
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
 yh/看图王批量图片转换结果/图层 9
   rotate: false
-  xy: 506, 958
+  xy: 768, 1197
   size: 250, 237
   orig: 250, 237
   offset: 0, 0
   index: -1
+看图王批量图片转换结果/1
+  rotate: false
+  xy: 2, 116
+  size: 87, 87
+  orig: 87, 87
+  offset: 0, 0
+  index: -1
+看图王批量图片转换结果/2
+  rotate: false
+  xy: 2, 27
+  size: 74, 87
+  orig: 74, 87
+  offset: 0, 0
+  index: -1
+看图王批量图片转换结果/3
+  rotate: false
+  xy: 91, 116
+  size: 58, 87
+  orig: 58, 87
+  offset: 0, 0
+  index: -1
+看图王批量图片转换结果/4
+  rotate: false
+  xy: 1297, 153
+  size: 32, 86
+  orig: 32, 86
+  offset: 0, 0
+  index: -1
+看图王批量图片转换结果/5
+  rotate: true
+  xy: 1010, 9
+  size: 21, 85
+  orig: 21, 85
+  offset: 0, 0
+  index: -1
+看图王批量图片转换结果/6
+  rotate: false
+  xy: 78, 30
+  size: 31, 84
+  orig: 31, 84
+  offset: 0, 0
+  index: -1
+看图王批量图片转换结果/7
+  rotate: false
+  xy: 1219, 62
+  size: 55, 87
+  orig: 55, 87
+  offset: 0, 0
+  index: -1
+看图王批量图片转换结果/8
+  rotate: false
+  xy: 1219, 151
+  size: 76, 88
+  orig: 76, 88
+  offset: 0, 0
+  index: -1

assets/Game/阿拉丁神灯-资源/spin/跑马灯/pmd3.atlas.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.0",
   "importer": "*",
   "imported": true,
-  "uuid": "1fd80bac-d318-4a71-ab93-21efaf69066e",
+  "uuid": "a1e88653-a5e8-415c-a465-a01025e40fb5",
   "files": [
     ".atlas",
     ".json"

assets/Game/阿拉丁神灯-资源/spin/跑马灯/pmd3.json.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "f239db8d-3e11-4e07-a5e7-70308e19d181",
+  "uuid": "a6925dec-b38a-4554-b8d1-cc34c4f7e6e8",
   "files": [
     ".json"
   ],

assets/Game/阿拉丁神灯-资源/spin/跑马灯/pmd3.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "25f43007-673c-412b-a4fa-6e1eb3e2b5f4",
+  "uuid": "1c5d73d6-166a-4c11-80a0-60db90d9ac5a",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "25f43007-673c-412b-a4fa-6e1eb3e2b5f4@6c48a",
+      "uuid": "1c5d73d6-166a-4c11-80a0-60db90d9ac5a@6c48a",
       "displayName": "pmd3",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "25f43007-673c-412b-a4fa-6e1eb3e2b5f4",
+        "imageUuidOrDatabaseUri": "1c5d73d6-166a-4c11-80a0-60db90d9ac5a",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "25f43007-673c-412b-a4fa-6e1eb3e2b5f4@f9941",
+      "uuid": "1c5d73d6-166a-4c11-80a0-60db90d9ac5a@f9941",
       "displayName": "pmd3",
       "id": "f9941",
       "name": "spriteFrame",
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 2,
         "trimY": 2,
-        "width": 2001,
+        "width": 2011,
-        "height": 1432,
+        "height": 1671,
-        "rawWidth": 2005,
+        "rawWidth": 2015,
-        "rawHeight": 1436,
+        "rawHeight": 1675,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -1000.5,
+            -1005.5,
-            -716,
+            -835.5,
             0,
-            1000.5,
+            1005.5,
-            -716,
+            -835.5,
             0,
-            -1000.5,
+            -1005.5,
-            716,
+            835.5,
             0,
-            1000.5,
+            1005.5,
-            716,
+            835.5,
             0
           ],
           "indexes": [
@@ -84,37 +84,37 @@
           ],
           "uv": [
             2,
-            1434,
+            1673,
-            2003,
+            2013,
-            1434,
+            1673,
             2,
             2,
-            2003,
+            2013,
             2
           ],
           "nuv": [
-            0.000997506234413965,
+            0.0009925558312655087,
-            0.001392757660167131,
+            0.0011940298507462687,
-            0.999002493765586,
+            0.9990074441687344,
-            0.001392757660167131,
+            0.0011940298507462687,
-            0.000997506234413965,
+            0.0009925558312655087,
-            0.9986072423398329,
+            0.9988059701492538,
-            0.999002493765586,
+            0.9990074441687344,
-            0.9986072423398329
+            0.9988059701492538
           ],
           "minPos": [
-            -1000.5,
+            -1005.5,
-            -716,
+            -835.5,
             0
           ],
           "maxPos": [
-            1000.5,
+            1005.5,
-            716,
+            835.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "25f43007-673c-412b-a4fa-6e1eb3e2b5f4@6c48a",
+        "imageUuidOrDatabaseUri": "1c5d73d6-166a-4c11-80a0-60db90d9ac5a@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "25f43007-673c-412b-a4fa-6e1eb3e2b5f4@6c48a"
+    "redirect": "1c5d73d6-166a-4c11-80a0-60db90d9ac5a@6c48a"
   }
 }

assets/Main/I18nJson/lang.json

@@ -79,7 +79,8 @@
 		"AID_VOLATILITY_CONTENT_3_1": "Uendelige gevinster",
 		"AID_VOLATILITY_CONTENT_3_2": "Spændingsspil",
 		"AID_VOLATILITY_CONTENT_3_3": "Mega gevinster",
-		"AID_VOLATILITY_TITLE": "Volatilitetstilstand"
+		"AID_VOLATILITY_TITLE": "Volatilitetstilstand",
+		"Double the chance of Free Spins Feature": "Dobbelt chance for gratis spins-funktionen"
 	},
 	"de": {
 		"AID_AUTO_BUTTON": "Auto-Dreh starten",
@@ -161,7 +162,8 @@
 		"AID_VOLATILITY_CONTENT_3_1": "Endlose Gewinne",
 		"AID_VOLATILITY_CONTENT_3_2": "Spannungsspiel",
 		"AID_VOLATILITY_CONTENT_3_3": "Mega-Gewinne",
-		"AID_VOLATILITY_TITLE": "Volatilitätsmodus"
+		"AID_VOLATILITY_TITLE": "Volatilitätsmodus",
+		"Double the chance of Free Spins Feature": "Verdoppeln Sie die Chance auf Freispiele"
 	},
 	"en": {
 		"AID_AUTO_BUTTON": "Start Auto Spin",
@@ -243,7 +245,8 @@
 		"AID_VOLATILITY_CONTENT_3_1": "Endless Wins",
 		"AID_VOLATILITY_CONTENT_3_2": "Thrill Play",
 		"AID_VOLATILITY_CONTENT_3_3": "Mega Wins",
-		"AID_VOLATILITY_TITLE": "Volatility Mode"		
+		"AID_VOLATILITY_TITLE": "Volatility Mode",
+		"Double the chance of Free Spins Feature": "Double the chance of Free Spins Feature"
 	},
 	"es": {
 		"AID_AUTO_BUTTON": "Iniciar Giros Automáticos",
@@ -325,7 +328,8 @@
 		"AID_VOLATILITY_CONTENT_3_1": "Ganancias infinitas",
 		"AID_VOLATILITY_CONTENT_3_2": "Juego de emoción",
 		"AID_VOLATILITY_CONTENT_3_3": "Megaganancias",
-		"AID_VOLATILITY_TITLE": "Modo de volatilidad"
+		"AID_VOLATILITY_TITLE": "Modo de volatilidad",
+		"Double the chance of Free Spins Feature": "Doble probabilidad de obtener la función de giros gratis"
 	},
 	"fi": {
 		"AID_AUTO_BUTTON": "Käynnistä Automaattipyöritys",
@@ -407,7 +411,8 @@
 		"AID_VOLATILITY_CONTENT_3_1": "Loputtomat voitot",
 		"AID_VOLATILITY_CONTENT_3_2": "Jännityspeli",
 		"AID_VOLATILITY_CONTENT_3_3": "Megavoitot",
-        "AID_VOLATILITY_TITLE": "Volatiliteettitila"
+		"AID_VOLATILITY_TITLE": "Volatiliteettitila",
+		"Double the chance of Free Spins Feature": "Tuplaa ilmaiskierrosten mahdollisuutesi"
 	},
 	"fr": {
 		"AID_AUTO_BUTTON": "Démarrer Lancement Auto",
@@ -489,7 +494,8 @@
 		"AID_VOLATILITY_CONTENT_3_1": "Gains infinis",
 		"AID_VOLATILITY_CONTENT_3_2": "Jeu de sensation",
 		"AID_VOLATILITY_CONTENT_3_3": "Méga gains",
-        "AID_VOLATILITY_TITLE": "Mode de volatilité"
+		"AID_VOLATILITY_TITLE": "Mode de volatilité",
+		"Double the chance of Free Spins Feature": "Doublez vos chances de gagner des tours gratuits !"
 	},
 	"id": {
 		"AID_AUTO_BUTTON": "Mulai Putar Otomatis",
@@ -571,7 +577,8 @@
 		"AID_VOLATILITY_CONTENT_3_1": "Kemenangan Tanpa Henti",
 		"AID_VOLATILITY_CONTENT_3_2": "Permainan Seru",
 		"AID_VOLATILITY_CONTENT_3_3": "Kemenangan Mega",
-        "AID_VOLATILITY_TITLE": "Mode Volatilitas"
+		"AID_VOLATILITY_TITLE": "Mode Volatilitas",
+		"Double the chance of Free Spins Feature": "Gandakan peluang fitur Putaran Gratis"
 	},
 	"it": {
 		"AID_AUTO_BUTTON": "Avvia Giocata Automatica",
@@ -653,7 +660,8 @@
 		"AID_VOLATILITY_CONTENT_3_1": "Vincite infinite",
 		"AID_VOLATILITY_CONTENT_3_2": "Gioco emozionante",
 		"AID_VOLATILITY_CONTENT_3_3": "Mega vincite",
-        "AID_VOLATILITY_TITLE": "Modalità di volatilità"
+		"AID_VOLATILITY_TITLE": "Modalità di volatilità",
+		"Double the chance of Free Spins Feature": "Raddoppia le possibilità di attivare la funzione Giri Gratuiti"
 	},
 	"ja": {
 		"AID_AUTO_BUTTON": "オートスピン開始",
@@ -735,7 +743,8 @@
 		"AID_VOLATILITY_CONTENT_3_1": "エンドレスウィン",
 		"AID_VOLATILITY_CONTENT_3_2": "スリルプレイ",
 		"AID_VOLATILITY_CONTENT_3_3": "メガウィン",
-        "AID_VOLATILITY_TITLE": "ボラティリティモード"
+		"AID_VOLATILITY_TITLE": "ボラティリティモード",
+		"Double the chance of Free Spins Feature": "フリースピンフィーチャーのチャンスが2倍"
 	},
 	"ko": {
 		"AID_AUTO_BUTTON": "자동 회전 시작",
@@ -817,7 +826,8 @@
 		"AID_VOLATILITY_CONTENT_3_1": "엔드리스 윈",
 		"AID_VOLATILITY_CONTENT_3_2": "스릴 플레이",
 		"AID_VOLATILITY_CONTENT_3_3": "메가 윈",
-        "AID_VOLATILITY_TITLE": "변동성 모드"
+		"AID_VOLATILITY_TITLE": "변동성 모드",
+		"Double the chance of Free Spins Feature": "무료 스핀 기능 발동 확률 두 배"
 	},
 	"my": {
 		"AID_AUTO_BUTTON": "အလိုအလျောက် လည်ခြင်းကို စတင်မည်",
@@ -899,7 +909,8 @@
 		"AID_VOLATILITY_CONTENT_3_1": "အဆုံးမရှိသော အနိုင်ရမှုများ",
 		"AID_VOLATILITY_CONTENT_3_2": "စိတ်လှုပ်ရှားဖွယ်ကစားနည်း",
 		"AID_VOLATILITY_CONTENT_3_3": "မဂါအနိုင်ရမှုများ",
-        "AID_VOLATILITY_TITLE": "အတက်အကျမုဒ်"
+		"AID_VOLATILITY_TITLE": "အတက်အကျမုဒ်",
+		"Double the chance of Free Spins Feature": "အခမဲ့လှည့်ခွင့် လုပ်ဆောင်ချက်၏ အခွင့်အလမ်းကို နှစ်ဆတိုးပါ"
 	},
 	"nl": {
 		"AID_AUTO_BUTTON": "Start Automatisch Draaien",
@@ -981,7 +992,8 @@
 		"AID_VOLATILITY_CONTENT_3_1": "Eindeloze winsten",
 		"AID_VOLATILITY_CONTENT_3_2": "Thrill Play",
 		"AID_VOLATILITY_CONTENT_3_3": "Megawinsten",
-        "AID_VOLATILITY_TITLE": "Volatiliteitsmodus"
+		"AID_VOLATILITY_TITLE": "Volatiliteitsmodus",
+		"Double the chance of Free Spins Feature": "Verdubbel je kans op de gratis spins-functie."
 	},
 	"pt": {
 		"AID_AUTO_BUTTON": "Iniciar Voltas Automáticas",
@@ -1063,7 +1075,8 @@
 		"AID_VOLATILITY_CONTENT_3_1": "Ganhos infinitos",
 		"AID_VOLATILITY_CONTENT_3_2": "Jogo de emoção",
 		"AID_VOLATILITY_CONTENT_3_3": "Megaganhos",
-        "AID_VOLATILITY_TITLE": "Modo de volatilidade"
+		"AID_VOLATILITY_TITLE": "Modo de volatilidade",
+		"Double the chance of Free Spins Feature": "Dobre suas chances de ativar o recurso de Giros Grátis."
 	},
 	"ro": {
 		"AID_AUTO_BUTTON": "Începe Rotirea Automată",
@@ -1145,7 +1158,8 @@
 		"AID_VOLATILITY_CONTENT_3_1": "Câștiguri nesfârșite",
 		"AID_VOLATILITY_CONTENT_3_2": "Joc de senzație",
 		"AID_VOLATILITY_CONTENT_3_3": "Megacâștiguri",
-        "AID_VOLATILITY_TITLE": "Modul de volatilitate"
+		"AID_VOLATILITY_TITLE": "Modul de volatilitate",
+		"Double the chance of Free Spins Feature": "Șansă dublă de rotiri gratuite"
 	},
 	"ru": {
 		"AID_AUTO_BUTTON": "Запустить автоспин",
@@ -1227,7 +1241,8 @@
 		"AID_VOLATILITY_CONTENT_3_1": "Бесконечные выигрыши",
 		"AID_VOLATILITY_CONTENT_3_2": "Острые ощущения",
 		"AID_VOLATILITY_CONTENT_3_3": "Мега-выигрыши",
-        "AID_VOLATILITY_TITLE": "Режим волатильности"
+		"AID_VOLATILITY_TITLE": "Режим волатильности",
+		"Double the chance of Free Spins Feature": "Удвойте шанс на активацию функции бесплатных вращений."
 	},
 	"sv": {
 		"AID_AUTO_BUTTON": "Starta autospinn",
@@ -1309,7 +1324,8 @@
 		"AID_VOLATILITY_CONTENT_3_1": "Oändliga vinster",
 		"AID_VOLATILITY_CONTENT_3_2": "Spänning",
 		"AID_VOLATILITY_CONTENT_3_3": "Megavinster",
-        "AID_VOLATILITY_TITLE": "Volatilitetsläge"
+		"AID_VOLATILITY_TITLE": "Volatilitetsläge",
+		"Double the chance of Free Spins Feature": "Dubbla chansen till Free Spins-funktionen"
 	},
 	"th": {
 		"AID_AUTO_BUTTON": "เริ่มหมุนอัตโนมัติ",
@@ -1391,7 +1407,8 @@
 		"AID_VOLATILITY_CONTENT_3_1": "ชนะไม่สิ้นสุด",
 		"AID_VOLATILITY_CONTENT_3_2": "การเล่นที่เร้าใจ",
 		"AID_VOLATILITY_CONTENT_3_3": "ชนะรางวัลใหญ่",
-        "AID_VOLATILITY_TITLE": "โหมดความผันผวน"
+		"AID_VOLATILITY_TITLE": "โหมดความผันผวน",
+		"Double the chance of Free Spins Feature": "โอกาสได้รับฟีเจอร์ฟรีสปินเพิ่มขึ้นเป็นสองเท่า"
 	},
 	"tr": {
 		"AID_AUTO_BUTTON": "Otomatik Oynatmayı Başlat",
@@ -1473,7 +1490,8 @@
 		"AID_VOLATILITY_CONTENT_3_1": "Sonsuz Kazançlar",
 		"AID_VOLATILITY_CONTENT_3_2": "Heyecan Oyunu",
 		"AID_VOLATILITY_CONTENT_3_3": "Büyük Kazançlar",
-        "AID_VOLATILITY_TITLE": "Oynaklık Modu"
+		"AID_VOLATILITY_TITLE": "Oynaklık Modu",
+		"Double the chance of Free Spins Feature": "Ücretsiz Döndürme Özelliğinde Şansı İkiye Katlayın"
 	},
 	"vi": {
 		"AID_AUTO_BUTTON": "Bắt Đầu Quay Tự Động",
@@ -1555,7 +1573,8 @@
 		"AID_VOLATILITY_CONTENT_3_1": "Chiến thắng bất tận",
 		"AID_VOLATILITY_CONTENT_3_2": "Lối chơi kịch tính",
 		"AID_VOLATILITY_CONTENT_3_3": "Chiến thắng lớn",
-        "AID_VOLATILITY_TITLE": "Chế độ biến động"
+		"AID_VOLATILITY_TITLE": "Chế độ biến động",
+		"Double the chance of Free Spins Feature": "Tăng gấp đôi cơ hội nhận tính năng Vòng quay miễn phí"
 	},
 	"zh": {
 		"AID_AUTO_BUTTON": "開始自動旋轉",
@@ -1630,13 +1649,14 @@
 		"AID_VOLATILITY_BUTTON": "確認",
 		"AID_VOLATILITY_CONTENT_1_1": "輕鬆模式",
 		"AID_VOLATILITY_CONTENT_1_2": "冒險模式",
-        "AID_VOLATILITY_CONTENT_1_3": "高能量模式",
+		"AID_VOLATILITY_CONTENT_1_3": "高能模式",
 		"AID_VOLATILITY_CONTENT_2_1": "（低）",
 		"AID_VOLATILITY_CONTENT_2_2": "（中）",
 		"AID_VOLATILITY_CONTENT_2_3": "（高）",
 		"AID_VOLATILITY_CONTENT_3_1": "中獎不斷",
 		"AID_VOLATILITY_CONTENT_3_2": "有輸有贏",
 		"AID_VOLATILITY_CONTENT_3_3": "更多大獎",
-        "AID_VOLATILITY_TITLE": "波動模式"
+		"AID_VOLATILITY_TITLE": "波動模式",
+		"Double the chance of Free Spins Feature": "雙倍機率贏得免費遊戲"
 	}
 }

assets/Main/Scripts/main/LayoutAdapter.ts

@@ -1,6 +1,7 @@
 import { _decorator, Node, Component, screen, view, ResolutionPolicy, Sprite, sys, Widget, Label, find } from 'cc';
 import { getLanguage } from './comm';
-
+import { installLabelAlignmentCenterFix } from 'common_tools';
+installLabelAlignmentCenterFix();
 const { ccclass, property } = _decorator;
 
 export let SWITCH_PROTRAIT_MODE = {

assets/Main/Scripts/main/comm.ts

@@ -11,7 +11,7 @@ let apiaddr = "";
 let token = "eyJQIjoxMDEzNzAsIkUiOjE3NjI4ODQxNjksIlMiOjEwMDIsIkQiOiJycF8xMDAxNyJ9.nb071g5rB617sJNMMhSKh7kXM0C0oTWSfPo90pejoc4";
 let language = "en"
 let currency = "THB"
-let csymbol = ""
+let csymbol = "$"
 let supportUrl = ""
 let oddsUrl = ""
 let historyUrl = ""
@@ -30,7 +30,7 @@ export function getHistoryUrl() {
 }
 
 export function getLanguage() {
-    // return 'zh';
+    // return 'my';
     return language;
 }
 
@@ -135,6 +135,29 @@ export async function callGamePendingApi(argsObj: any) {
     return obj
 }
 
+export async function callGameBalanceApi(argsObj: any) {
+    const url = apiaddr + path.join("/gameapi/getPlayerBalance")
+    const payload = JSON.stringify(argsObj)
+
+    const res = await fetch(url, {
+        signal: AbortSignal.timeout(10000),
+        headers: {
+            "Content-Type": "application/json",
+            "X-Rp-Token": token,
+        },
+        method: "POST",
+        body: payload,
+        mode: 'cors',
+    })
+
+    if (res.status != 200) {
+        const errstr = await res.text()
+        throw new Error(errstr || res.statusText)
+    }
+    const obj = await res.json()
+    return obj
+}
+
 export async function callGameApi(action: string, argsObj: any) {
     const url = apiaddr + path.join("/gameapi/", GameDataManager.instance.gamePending, action)
     const payload = JSON.stringify(argsObj)

assets/Main/Scripts/managers/AudioManager.ts

@@ -74,10 +74,10 @@ export class AudioManager {
     }
 
     // 统一封装：以名称打标签地播放一次性音效，并在结束后清理
-    private _playOneShotTagged(source: AudioSource, clip: AudioClip, name: string, volume: number) {
+    private _playOneShotTagged(source: AudioSource, clip: AudioClip, name: string, volume: number, loop: boolean) {
         source.volume = volume;
         source.clip = clip;
-        source.loop = false;
+        source.loop = loop;
         source.play();
         // source.playOneShot(clip, volume);
 
@@ -98,7 +98,7 @@ export class AudioManager {
         this._sfxTimers.set(source, timer);
     }
 
-    playSFX(name: string, volume: number = 1.0) {
+    playSFX(name: string, volume: number = 1.0, loop: boolean = false) {
         if (this._isMuted) return;
 
         let clip = this._audioClips.get(name);
@@ -109,9 +109,9 @@ export class AudioManager {
 
         // 找到一个空闲的AudioSource
         let availableSource = this._sfxAudioSources.find(source => !source.playing);
-        if (availableSource) {
+        if (availableSource && this.isSpecialAudio(name)) {
             // 打标签播放（支持后续按名称停止）
-            this._playOneShotTagged(availableSource, clip, name, volume);
+            this._playOneShotTagged(availableSource, clip, name, volume, loop);
         } else {
             // 如果没有空闲的AudioSource，创建一个新的
             let sfxNode = new Node(`SFX_${this._sfxAudioSources.length}`);
@@ -119,10 +119,14 @@ export class AudioManager {
             let newSource = sfxNode.addComponent(AudioSource);
             newSource.playOnAwake = false;
             this._sfxAudioSources.push(newSource);
-            this._playOneShotTagged(newSource, clip, name, volume);
+            this._playOneShotTagged(newSource, clip, name, volume, loop);
         }
     }
 
+    isSpecialAudio(name: string) {
+        return name == 'Win_Icon_Up' || name == 'Win_Icon_Up_Free'
+    }
+
     // 按名称停止当前播放的 SFX。stopAll=true 时停止所有同名实例，false 时仅停止一个。
     stopSFX(name: string, stopAll: boolean = true) {
         if (!name) return;

assets/Main/Scripts/managers/I18nManager.ts

@@ -33,7 +33,14 @@ export class I18nManager {
         const task = new Promise<SpriteFrame>((resolve, reject) => {
             resources.load(path, SpriteFrame, (err, sf) => {
                 this._sfTasks.delete(key);
-                if (err || !sf) return reject(err);
+                if (err || !sf) {
+                    resources.load(`i18nSprite2/en/${name}/spriteFrame`, SpriteFrame, (err, sf) => {
+                        this._sfTasks.delete(key);
+                        this.spriteFrameCache.set(key, sf);
+                        resolve(sf);
+                    });
+                    return;
+                }
                 this.spriteFrameCache.set(key, sf);
                 resolve(sf);
             });
@@ -61,8 +68,8 @@ export class I18nManager {
                     'Buy2',
                     'Buy4',
                     'Buy5',
-                    'Buy6',
+                    // 'Buy6',
-                    'Buy7',
+                    // 'Buy7',
                     'Buy8',
                     'Free',
                     'Free1',
@@ -86,6 +93,14 @@ export class I18nManager {
                     'Normal9',
                     'Normal10',
                     'Normal11',
+                    'sysgift_completed',
+                    'sysgift_continue',
+                    'sysgift_fbs',
+                    'sysgift_info_fbs',
+                    'sysgift_received',
+                    'sysgift_symbols',
+                    'sysgift_total',
+                    'sysgift_win',
                     'Win1',
                     'Win2',
                     'Win3',
@@ -95,6 +110,9 @@ export class I18nManager {
             let okSpine = await this.preloadAssets('spine', []);
 
             this.ready = okSprite && okAtlas && okSpine;
+            if (!this.ready) {
+                this.init('en', languageJson)
+            }
         } catch (error) {
             console.error('I18nManager init failed:', error);
         }

assets/Main/Scripts/managers/UIManager.ts

@@ -38,7 +38,7 @@ export class UIManager {
 
         let main = prefab.getChildByName('main');
         if (!main) {
-            console.error(`UIManager ${name}prefab 没有main节点，命名不规范: ${path}`);
+            // console.error(`UIManager ${name}prefab 没有main节点，命名不规范: ${path}`);
             return;
         }
         if (callBack) callBack(prefab);

assets/Main/TipMessagePanel.prefab

@@ -27,18 +27,18 @@
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 94
-      },
       {
         "__id__": 96
       },
       {
         "__id__": 98
+      },
+      {
+        "__id__": 100
       }
     ],
     "_prefab": {
-      "__id__": 100
+      "__id__": 102
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -287,26 +287,26 @@
         "__id__": 33
       },
       {
-        "__id__": 41
+        "__id__": 43
       },
       {
-        "__id__": 57
+        "__id__": 59
       },
       {
-        "__id__": 73
+        "__id__": 75
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 89
+        "__id__": 91
       },
       {
-        "__id__": 91
+        "__id__": 93
       }
     ],
     "_prefab": {
-      "__id__": 93
+      "__id__": 95
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -718,7 +718,7 @@
     "_actualFontSize": 57,
     "_fontSize": 56,
     "_fontFamily": "Arial",
-    "_lineHeight": 56,
+    "_lineHeight": 57,
     "_overflow": 2,
     "_enableWrapText": true,
     "_font": {
@@ -836,10 +836,13 @@
       },
       {
         "__id__": 38
+      },
+      {
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 42
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -920,13 +923,13 @@
       "b": 255,
       "a": 255
     },
-    "_string": "label",
+    "_string": "လက်ကျန်ငွေ မလုံလောက်ပါ။ အရောင်းပမာဏကို ပြောင်းလဲကြည့်ရှုပါ။",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 43,
     "_fontSize": 42,
     "_fontFamily": "Arial",
-    "_lineHeight": 42,
+    "_lineHeight": 57,
     "_overflow": 2,
     "_enableWrapText": true,
     "_font": {
@@ -1012,6 +1015,25 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "7bvpzJamlOlquyMqNzwm5Q"
   },
+  {
+    "__type__": "cc.UIOpacity",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 33
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 41
+    },
+    "_opacity": 255,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "9b/qfHIkVPwZouLlXmPvo4"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -1021,8 +1043,6 @@
       "__id__": 0
     },
     "fileId": "d0C7b4KtxF3Z5olPuBCkBH",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -1035,20 +1055,20 @@
     },
     "_children": [
       {
-        "__id__": 42
+        "__id__": 44
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 52
+        "__id__": 54
       },
       {
-        "__id__": 54
+        "__id__": 56
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 58
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1085,14 +1105,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 41
+      "__id__": 43
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 43
-      },
       {
         "__id__": 45
       },
@@ -1101,10 +1118,13 @@
       },
       {
         "__id__": 49
+      },
+      {
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 53
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1141,11 +1161,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 44
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 44
+      "__id__": 46
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1169,11 +1189,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 44
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 46
+      "__id__": 48
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1240,11 +1260,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 44
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 50
     },
     "key": "Confirm",
     "_id": ""
@@ -1259,11 +1279,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 44
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 50
+      "__id__": 52
     },
     "isBold": true,
     "fontOther": {
@@ -1315,11 +1335,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 41
+      "__id__": 43
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 55
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1343,11 +1363,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 41
+      "__id__": 43
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 57
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1405,20 +1425,20 @@
     },
     "_children": [
       {
-        "__id__": 58
+        "__id__": 60
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 68
+        "__id__": 70
       },
       {
-        "__id__": 70
+        "__id__": 72
       }
     ],
     "_prefab": {
-      "__id__": 72
+      "__id__": 74
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1455,14 +1475,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 57
+      "__id__": 59
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 59
-      },
       {
         "__id__": 61
       },
@@ -1471,10 +1488,13 @@
       },
       {
         "__id__": 65
+      },
+      {
+        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 67
+      "__id__": 69
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1511,11 +1531,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 60
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 60
+      "__id__": 62
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1539,11 +1559,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 60
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 62
+      "__id__": 64
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1610,11 +1630,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 60
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 64
+      "__id__": 66
     },
     "key": "Confirm",
     "_id": ""
@@ -1629,11 +1649,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 60
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 66
+      "__id__": 68
     },
     "isBold": true,
     "fontOther": {
@@ -1685,11 +1705,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 57
+      "__id__": 59
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 69
+      "__id__": 71
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1713,11 +1733,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 57
+      "__id__": 59
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 71
+      "__id__": 73
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1775,20 +1795,20 @@
     },
     "_children": [
       {
-        "__id__": 74
+        "__id__": 76
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 84
+        "__id__": 86
       },
       {
-        "__id__": 86
+        "__id__": 88
       }
     ],
     "_prefab": {
-      "__id__": 88
+      "__id__": 90
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1825,14 +1845,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 73
+      "__id__": 75
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 75
-      },
       {
         "__id__": 77
       },
@@ -1841,10 +1858,13 @@
       },
       {
         "__id__": 81
+      },
+      {
+        "__id__": 83
       }
     ],
     "_prefab": {
-      "__id__": 83
+      "__id__": 85
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1881,11 +1901,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 74
+      "__id__": 76
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 76
+      "__id__": 78
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1909,11 +1929,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 74
+      "__id__": 76
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 78
+      "__id__": 80
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1980,11 +2000,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 74
+      "__id__": 76
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 80
+      "__id__": 82
     },
     "key": "Close",
     "_id": ""
@@ -1999,11 +2019,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 74
+      "__id__": 76
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 82
+      "__id__": 84
     },
     "isBold": true,
     "fontOther": {
@@ -2055,11 +2075,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 73
+      "__id__": 75
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 85
+      "__id__": 87
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2083,11 +2103,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 73
+      "__id__": 75
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 87
+      "__id__": 89
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2145,7 +2165,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 90
+      "__id__": 92
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2173,7 +2193,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 92
+      "__id__": 94
     },
     "_alignFlags": 45,
     "_target": null,
@@ -2222,7 +2242,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 95
+      "__id__": 97
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2250,7 +2270,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 97
+      "__id__": 99
     },
     "_alignFlags": 45,
     "_target": null,
@@ -2286,7 +2306,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 99
+      "__id__": 101
     },
     "_id": ""
   },

assets/Main/main.scene

@@ -1776,8 +1776,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 679,
+      "width": 917,
-      "height": 238
+      "height": 182
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1807,7 +1807,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "7b32201a-9f8d-4fa7-828d-05de06163f80@f9941",
+      "__uuid__": "ee9f6c92-901e-46c7-98de-e2776a5f5bcc@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -1960,7 +1960,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 326.66748046875,
-      "height": 56.7
+      "height": 69.3
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1995,7 +1995,7 @@
     "_actualFontSize": 45,
     "_fontSize": 45,
     "_fontFamily": "Arial",
-    "_lineHeight": 45,
+    "_lineHeight": 55,
     "_overflow": 0,
     "_enableWrapText": true,
     "_font": null,
@@ -2568,7 +2568,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 2400
+      "height": 2360
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3240,7 +3240,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 580,
-      "height": 60
+      "height": 62
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3275,7 +3275,7 @@
     "_actualFontSize": 58,
     "_fontSize": 58,
     "_fontFamily": "Arial",
-    "_lineHeight": 60,
+    "_lineHeight": 62,
     "_overflow": 2,
     "_enableWrapText": true,
     "_font": {
@@ -3522,7 +3522,7 @@
     "_actualFontSize": 44,
     "_fontSize": 43,
     "_fontFamily": "Arial",
-    "_lineHeight": 40,
+    "_lineHeight": 62,
     "_overflow": 2,
     "_enableWrapText": true,
     "_font": {
@@ -4427,7 +4427,7 @@
   {
     "__type__": "cc.Node",
     "_name": "rotateNode",
-    "_objFlags": 0,
+    "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 2
@@ -4485,7 +4485,7 @@
   {
     "__type__": "cc.Node",
     "_name": "block",
-    "_objFlags": 0,
+    "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 117
@@ -4594,7 +4594,7 @@
   {
     "__type__": "cc.Node",
     "_name": "tips",
-    "_objFlags": 0,
+    "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 117
@@ -4726,7 +4726,7 @@
   {
     "__type__": "cc.Node",
     "_name": "rotate_phone",
-    "_objFlags": 0,
+    "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 117
@@ -4976,7 +4976,7 @@
     "asset": null,
     "fileId": "047bc2a0-3759-4c52-a603-35f19f0b22ac",
     "instance": null,
-    "targetOverrides": null
+    "targetOverrides": []
   },
   {
     "__type__": "cc.SceneGlobals",

assets/resources/audio/Appear_Scatter_Sound.mp3.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.0",
   "importer": "audio-clip",
   "imported": true,
-  "uuid": "ff16f9e4-d2e3-44ee-aaea-4f3e7bed7875",
+  "uuid": "51064731-6de7-4c3c-b8fd-8d4616d667d6",
   "files": [
     ".json",
     ".mp3"

assets/resources/audio/Ball_Ball_Expand.mp3.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.0",
   "importer": "audio-clip",
   "imported": true,
-  "uuid": "8ece85c6-e0b9-4bd6-b264-48e69994ab7e",
+  "uuid": "dfc34f2d-7e52-4f62-b739-b2acedfa6170",
   "files": [
     ".json",
     ".mp3"

assets/resources/audio/Ball_First_Show.mp3.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.0",
   "importer": "audio-clip",
   "imported": true,
-  "uuid": "a4fd247b-af33-4371-b2be-60197cda4f51",
+  "uuid": "38f8c2bb-e793-45e7-ac77-2bf74531e3cc",
   "files": [
     ".json",
     ".mp3"

assets/resources/audio/Ball_Five_Show.mp3.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.0",
   "importer": "audio-clip",
   "imported": true,
-  "uuid": "be5da60d-5ece-42ca-9d87-fc5b179bdbde",
+  "uuid": "355015b1-2f1d-49ef-84a4-60e2887f79f1",
   "files": [
     ".json",
     ".mp3"

assets/resources/audio/Ball_Seven_Show.mp3.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.0",
   "importer": "audio-clip",
   "imported": true,
-  "uuid": "b7700aa1-ed12-4ce0-86ca-ae5e32d88022",
+  "uuid": "58e57a6a-d527-440c-8c9e-5b65559f8645",
   "files": [
     ".json",
     ".mp3"

assets/resources/audio/Ball_Three_Show.mp3.meta

@@ -0,0 +1,14 @@
+{
+  "ver": "1.0.0",
+  "importer": "audio-clip",
+  "imported": true,
+  "uuid": "c8f0b90f-6986-40d6-b3fd-1b8d84a30aee",
+  "files": [
+    ".json",
+    ".mp3"
+  ],
+  "subMetas": {},
+  "userData": {
+    "downloadMode": 0
+  }
+}

assets/resources/audio/Big_Win_Bgm.mp3.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.0",
   "importer": "audio-clip",
   "imported": true,
-  "uuid": "7447c5de-cd1d-47a2-a51e-e873a3641546",
+  "uuid": "a2755747-b93c-47da-89d7-dd7679161b86",
   "files": [
     ".json",
     ".mp3"

assets/resources/audio/Big_Win_End.mp3.meta

@@ -0,0 +1,14 @@
+{
+  "ver": "1.0.0",
+  "importer": "audio-clip",
+  "imported": true,
+  "uuid": "3a29d472-ceb3-43f2-ac21-8b4e8d8b2d68",
+  "files": [
+    ".json",
+    ".mp3"
+  ],
+  "subMetas": {},
+  "userData": {
+    "downloadMode": 0
+  }
+}

assets/resources/audio/Change_Free_Bgm.mp3.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.0",
   "importer": "audio-clip",
   "imported": true,
-  "uuid": "d1adcd35-4537-4505-87a8-2ea2dca41247",
+  "uuid": "cb707c05-4cdd-4e31-9116-dba8c6404cac",
   "files": [
     ".json",
     ".mp3"