assets/Game/lang/lang.json

@@ -325,7 +325,7 @@
         "Paytable_6_2": "Total number of winning bet ways for each symbol are calculated by multiplying the number of adjacent winning symbols on each symbols from leftmost reel to the right.",
         "Paytable_6_3": "From Above Example:",
         "Paytable_6_4": "The winning symbol payout is multiplied by the number of winning bet ways.",
-        "Paytable_6_5": "Total Winnings in this Example:",
+        "Paytable_6_5": "Total Winnings in this example:",
         "Paytable_6_6": "After the payout of every round is made, all winning symbols will explode allowing the symbols above them to cascade down for a new round.",
         "Paytable_6_7": "Additional winning combination will be tallied in every round until no more winning combination can be tallied.",
         "Paytable_6_8": "All wins shown in cash.",

assets/Game/prefabs/History/history_detail.prefab

@@ -5160,7 +5160,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1626
+      "height": 16260
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/Game/prefabs/Paytable/paytable.prefab

@@ -885,7 +885,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 18120
+      "height": 1812
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1476,7 +1476,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 1.158,
-      "y": -30,
+      "y": 20.962,
       "z": 0
     },
     "_lrot": {
@@ -1657,8 +1657,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 144.971,
+      "x": 1.158,
-      "y": -30,
+      "y": -33.381,
       "z": 0
     },
     "_lrot": {

assets/Game/prefabs/TotalWin/TotalWinAni.prefab

@@ -1364,7 +1364,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "94dafc0c-769d-4ae6-9c2e-d41701861c4e@f9941",
+      "__uuid__": "22c66498-0edb-4867-94e8-fe447d53a9e1@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -1398,7 +1398,7 @@
     "__prefab": {
       "__id__": 59
     },
-    "spriteName": "25",
+    "spriteName": "10",
     "_id": ""
   },
   {

assets/Game/rp_11001/spin/Multiplier Animation.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "df88d579-98fc-44be-818c-231143dc03ac",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}

assets/Game/rp_11001/spin/Multiplier Animation/Multiplier Animation.atlas

@@ -1,62 +0,0 @@
-
-Multiplier Animation.png
-size: 286,564
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-gq
-  rotate: false
-  xy: 211, 489
-  size: 73, 73
-  orig: 75, 75
-  offset: 1, 1
-  index: -1
-guang
-  rotate: false
-  xy: 2, 355
-  size: 207, 207
-  orig: 239, 238
-  offset: 16, 16
-  index: -1
-xg
-  rotate: true
-  xy: 2, 203
-  size: 150, 151
-  orig: 179, 179
-  offset: 13, 15
-  index: -1
-zy_ic_bs_1
-  rotate: true
-  xy: 2, 111
-  size: 90, 135
-  orig: 90, 135
-  offset: 0, 0
-  index: -1
-zy_ic_bs_2
-  rotate: true
-  xy: 139, 94
-  size: 90, 135
-  orig: 90, 135
-  offset: 0, 0
-  index: -1
-zy_ic_bs_3
-  rotate: true
-  xy: 2, 19
-  size: 90, 135
-  orig: 90, 135
-  offset: 0, 0
-  index: -1
-zy_ic_bs_4
-  rotate: true
-  xy: 139, 2
-  size: 90, 135
-  orig: 90, 135
-  offset: 0, 0
-  index: -1
-zy_ic_bs_g
-  rotate: false
-  xy: 155, 186
-  size: 120, 167
-  orig: 128, 173
-  offset: 4, 3
-  index: -1

assets/Game/rp_11001/spin/Multiplier Animation/Multiplier Animation.atlas.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.0.0",
-  "importer": "*",
-  "imported": true,
-  "uuid": "d56d12be-68ef-4161-bf75-eca1a1dbbd14",
-  "files": [
-    ".atlas",
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {}
-}

assets/Game/rp_11001/spin/Multiplier Animation/Multiplier Animation.json.meta

@@ -1,11 +0,0 @@
-{
-  "ver": "1.2.6",
-  "importer": "spine-data",
-  "imported": true,
-  "uuid": "4cdddc93-1b93-48ac-acde-f3a0c40d18a2",
-  "files": [
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {}
-}

assets/Game/rp_11001/spin/Multiplier Animation/Multiplier Animation.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "e58e3904-d953-41dc-99ec-4899be15980e",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "e58e3904-d953-41dc-99ec-4899be15980e@6c48a",
-      "displayName": "Multiplier Animation",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "e58e3904-d953-41dc-99ec-4899be15980e",
-        "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": "e58e3904-d953-41dc-99ec-4899be15980e@f9941",
-      "displayName": "Multiplier Animation",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 2,
-        "trimY": 2,
-        "width": 282,
-        "height": 560,
-        "rawWidth": 286,
-        "rawHeight": 564,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -141,
-            -280,
-            0,
-            141,
-            -280,
-            0,
-            -141,
-            280,
-            0,
-            141,
-            280,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            2,
-            562,
-            284,
-            562,
-            2,
-            2,
-            284,
-            2
-          ],
-          "nuv": [
-            0.006993006993006993,
-            0.0035460992907801418,
-            0.993006993006993,
-            0.0035460992907801418,
-            0.006993006993006993,
-            0.9964539007092199,
-            0.993006993006993,
-            0.9964539007092199
-          ],
-          "minPos": [
-            -141,
-            -280,
-            0
-          ],
-          "maxPos": [
-            141,
-            280,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "e58e3904-d953-41dc-99ec-4899be15980e@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "e58e3904-d953-41dc-99ec-4899be15980e@6c48a"
-  }
-}

assets/Game/rp_11001/spin/wild/wild.atlas

@@ -1,649 +1,201 @@
 
 wild.png
-size: 1985,1053
+size: 1702,1056
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
 1
-  rotate: true
+  rotate: false
-  xy: 1747, 545
+  xy: 829, 51
   size: 172, 167
   orig: 174, 169
   offset: 1, 1
   index: -1
 1-1
   rotate: false
-  xy: 1615, 334
+  xy: 1360, 81
   size: 172, 167
   orig: 174, 169
   offset: 1, 1
   index: -1
-1/image0
-  rotate: false
-  xy: 1263, 261
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-1/image1
-  rotate: false
-  xy: 1916, 525
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-1/image10
-  rotate: true
-  xy: 830, 33
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-1/image11
-  rotate: true
-  xy: 333, 7
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-1/image12
-  rotate: true
-  xy: 463, 7
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-1/image13
-  rotate: true
-  xy: 1564, 268
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-1/image14
-  rotate: false
-  xy: 1589, 138
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-1/image15
-  rotate: false
-  xy: 1655, 138
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-1/image2
-  rotate: false
-  xy: 1911, 395
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-1/image3
-  rotate: true
-  xy: 1789, 309
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-1/image4
-  rotate: false
-  xy: 1919, 265
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-1/image5
-  rotate: false
-  xy: 1263, 131
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-1/image6
-  rotate: true
-  xy: 1329, 167
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-1/image7
-  rotate: true
-  xy: 1459, 167
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-1/image8
-  rotate: true
-  xy: 1329, 101
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-1/image9
-  rotate: true
-  xy: 1459, 101
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
 2
-  rotate: false
+  rotate: true
-  xy: 1691, 719
+  xy: 698, 551
   size: 172, 332
   orig: 174, 334
   offset: 1, 1
   index: -1
 2-1
   rotate: true
-  xy: 698, 548
+  xy: 1032, 551
   size: 172, 332
   orig: 174, 334
   offset: 1, 1
   index: -1
 3
   rotate: false
-  xy: 350, 553
+  xy: 350, 556
   size: 172, 498
   orig: 174, 500
   offset: 1, 1
   index: -1
 3-1
   rotate: false
-  xy: 524, 553
+  xy: 524, 556
   size: 172, 498
   orig: 174, 500
   offset: 1, 1
   index: -1
-3/image0
-  rotate: true
-  xy: 1589, 72
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-3/image1
-  rotate: true
-  xy: 953, 129
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-3/image10
-  rotate: false
-  xy: 1917, 135
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-3/image11
-  rotate: true
-  xy: 1787, 45
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-3/image12
-  rotate: false
-  xy: 1917, 5
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-3/image13
-  rotate: true
-  xy: 593, 7
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-3/image14
-  rotate: true
-  xy: 1311, 35
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-3/image15
-  rotate: true
-  xy: 1441, 35
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-3/image2
-  rotate: true
-  xy: 1083, 129
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-3/image3
-  rotate: true
-  xy: 960, 63
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-3/image4
-  rotate: true
-  xy: 1090, 63
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-3/image5
-  rotate: false
-  xy: 1721, 204
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-3/image6
-  rotate: true
-  xy: 1787, 243
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-3/image7
-  rotate: true
-  xy: 1787, 177
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-3/image8
-  rotate: false
-  xy: 1721, 74
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
-3/image9
-  rotate: true
-  xy: 1787, 111
-  size: 64, 128
-  orig: 64, 128
-  offset: 0, 0
-  index: -1
 4
   rotate: false
-  xy: 2, 387
+  xy: 2, 390
   size: 172, 664
   orig: 174, 666
   offset: 1, 1
   index: -1
 4-1
   rotate: false
-  xy: 176, 387
+  xy: 176, 390
   size: 172, 664
   orig: 174, 666
   offset: 1, 1
   index: -1
-4/image0
-  rotate: false
-  xy: 1865, 757
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-4/image1
-  rotate: true
-  xy: 2, 25
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-4/image10
-  rotate: true
-  xy: 182, 25
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-4/image11
-  rotate: true
-  xy: 242, 25
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-4/image12
-  rotate: false
-  xy: 1220, 75
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-4/image13
-  rotate: true
-  xy: 1251, 100
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-4/image14
-  rotate: true
-  xy: 1251, 69
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-4/image15
-  rotate: true
-  xy: 1571, 41
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-4/image2
-  rotate: false
-  xy: 1213, 135
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-4/image3
-  rotate: false
-  xy: 723, 13
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-4/image4
-  rotate: true
-  xy: 62, 25
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-4/image5
-  rotate: false
-  xy: 754, 13
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-4/image6
-  rotate: true
-  xy: 785, 2
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-4/image7
-  rotate: true
-  xy: 845, 2
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-4/image8
-  rotate: true
-  xy: 905, 2
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-4/image9
-  rotate: true
-  xy: 122, 25
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-5/image0
-  rotate: true
-  xy: 1631, 41
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-5/image1
-  rotate: true
-  xy: 1571, 10
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-5/image10
-  rotate: false
-  xy: 1027, 3
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-5/image11
-  rotate: false
-  xy: 1058, 3
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-5/image12
-  rotate: false
-  xy: 1089, 3
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-5/image13
-  rotate: false
-  xy: 1120, 3
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-5/image14
-  rotate: false
-  xy: 1151, 3
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-5/image15
-  rotate: false
-  xy: 1182, 3
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-5/image2
-  rotate: true
-  xy: 1631, 10
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-5/image3
-  rotate: false
-  xy: 1691, 12
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-5/image4
-  rotate: false
-  xy: 1722, 14
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-5/image5
-  rotate: false
-  xy: 1753, 14
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-5/image6
-  rotate: true
-  xy: 1784, 14
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-5/image7
-  rotate: true
-  xy: 1844, 14
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-5/image8
-  rotate: false
-  xy: 965, 3
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
-5/image9
-  rotate: false
-  xy: 996, 3
-  size: 29, 58
-  orig: 29, 58
-  offset: 0, 0
-  index: -1
 SG2
   rotate: false
-  xy: 1363, 345
+  xy: 1012, 174
   size: 250, 133
   orig: 250, 250
   offset: 0, 58
   index: -1
 huo12
   rotate: false
-  xy: 1363, 480
+  xy: 1012, 309
   size: 238, 240
   orig: 238, 240
   offset: 0, 0
   index: -1
 huo13_1
-  rotate: true
+  rotate: false
-  xy: 1865, 817
+  xy: 1003, 57
   size: 234, 115
   orig: 234, 115
   offset: 0, 0
   index: -1
 huo14_1
   rotate: false
-  xy: 1789, 375
+  xy: 1580, 224
   size: 120, 168
   orig: 120, 168
   offset: 0, 0
   index: -1
 huo15_1
-  rotate: false
+  rotate: true
-  xy: 1603, 503
+  xy: 1364, 250
   size: 142, 214
   orig: 142, 214
   offset: 0, 0
   index: -1
 huo1_1
   rotate: false
-  xy: 1012, 195
+  xy: 333, 29
   size: 249, 194
   orig: 249, 199
   offset: 0, 0
   index: -1
 lajiao
   rotate: false
-  xy: 674, 73
+  xy: 1534, 80
   size: 154, 142
   orig: 154, 142
   offset: 0, 0
   index: -1
 wild
-  rotate: true
+  rotate: false
-  xy: 1916, 655
+  xy: 584, 2
   size: 160, 67
   orig: 162, 69
   offset: 1, 1
   index: -1
 新建文件夹 (2)/图层 1
   rotate: false
-  xy: 578, 99
+  xy: 1264, 195
   size: 94, 121
   orig: 95, 135
   offset: 1, 13
   index: -1
 新建文件夹 (2)/图层 2
-  rotate: true
+  rotate: false
-  xy: 1329, 233
+  xy: 1252, 318
   size: 110, 119
   orig: 110, 122
   offset: 0, 3
   index: -1
 新建文件夹 (2)/图层 3
-  rotate: false
+  rotate: true
-  xy: 830, 99
+  xy: 1239, 51
   size: 121, 116
   orig: 121, 117
   offset: 0, 1
   index: -1
 新建文件夹 (2)/图层 4
   rotate: true
-  xy: 1450, 233
+  xy: 1252, 439
   size: 110, 112
   orig: 110, 113
   offset: 0, 0
   index: -1
 新建文件夹/图层 1
   rotate: false
-  xy: 2, 56
+  xy: 2, 59
   size: 329, 329
   orig: 329, 329
   offset: 0, 0
   index: -1
 新建文件夹/图层 2
   rotate: false
-  xy: 698, 722
+  xy: 698, 725
   size: 329, 329
   orig: 329, 329
   offset: 0, 0
   index: -1
 新建文件夹/图层 3
   rotate: false
-  xy: 1029, 722
+  xy: 1029, 725
   size: 329, 329
   orig: 329, 329
   offset: 0, 0
   index: -1
 新建文件夹/图层 4
   rotate: false
-  xy: 1360, 722
+  xy: 1360, 725
   size: 329, 329
   orig: 329, 329
   offset: 0, 0
   index: -1
 新建文件夹/图层 5
   rotate: false
-  xy: 1032, 391
+  xy: 1366, 394
   size: 329, 329
   orig: 329, 329
   offset: 0, 0
   index: -1
 新建文件夹/图层 6
   rotate: false
-  xy: 350, 222
+  xy: 350, 225
   size: 329, 329
   orig: 329, 329
   offset: 0, 0
   index: -1
 新建文件夹/图层 7
   rotate: false
-  xy: 681, 217
+  xy: 681, 220
   size: 329, 329
   orig: 329, 329
   offset: 0, 0
   index: -1
 新建文件夹/图层 8 
   rotate: true
-  xy: 333, 73
+  xy: 584, 71
   size: 147, 243
   orig: 147, 244
   offset: 0, 0

assets/Game/rp_11001/spin/wild/wild.png.meta

@@ -43,13 +43,13 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": -0.5,
+        "offsetY": 0,
         "trimX": 2,
-        "trimY": 3,
+        "trimY": 2,
-        "width": 1981,
+        "width": 1698,
-        "height": 1048,
+        "height": 1052,
-        "rawWidth": 1985,
+        "rawWidth": 1702,
-        "rawHeight": 1053,
+        "rawHeight": 1056,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -990.5,
+            -849,
-            -524,
+            -526,
             0,
-            990.5,
+            849,
-            -524,
+            -526,
             0,
-            -990.5,
+            -849,
-            524,
+            526,
             0,
-            990.5,
+            849,
-            524,
+            526,
             0
           ],
           "indexes": [
@@ -84,32 +84,32 @@
           ],
           "uv": [
             2,
-            1050,
+            1054,
-            1983,
+            1700,
-            1050,
+            1054,
             2,
             2,
-            1983,
+            1700,
             2
           ],
           "nuv": [
-            0.0010075566750629723,
+            0.0011750881316098707,
-            0.001899335232668566,
+            0.001893939393939394,
-            0.998992443324937,
+            0.9988249118683902,
-            0.001899335232668566,
+            0.001893939393939394,
-            0.0010075566750629723,
+            0.0011750881316098707,
-            0.9971509971509972,
+            0.9981060606060606,
-            0.998992443324937,
+            0.9988249118683902,
-            0.9971509971509972
+            0.9981060606060606
           ],
           "minPos": [
-            -990.5,
+            -849,
-            -524,
+            -526,
             0
           ],
           "maxPos": [
-            990.5,
+            849,
-            524,
+            526,
             0
           ]
         },

assets/Game/rp_11001/spin/元素动画/JQKA/10.atlas.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.0",
   "importer": "*",
   "imported": true,
-  "uuid": "7345c921-0ed8-463d-9270-e3e7f4cbd0cc",
+  "uuid": "2cfeef2a-5a7d-412c-a818-f37899842365",
   "files": [
     ".atlas",
     ".json"

assets/Game/rp_11001/spin/元素动画/JQKA/10.json

@@ -1 +1 @@
-{"skeleton":{"hash":"iBGjhzmutTzad3K8sgpL4GUE8q4","spine":"3.8.99","x":-86,"y":-83,"width":172,"height":166,"images":"./i/","audio":"E:/项目/Slot/火锅狂欢/源文件/JQKA"},"bones":[{"name":"root"},{"name":"骨骼","parent":"root"}],"slots":[{"name":"1","bone":"骨骼","attachment":"12"}],"skins":[{"name":"default","attachments":{"1":{"12":{"width":172,"height":166}}}}],"animations":{"animation":{"bones":{"骨骼":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"y":-5.04,"curve":0.25,"c3":0.75},{"time":0.1333,"y":1.09,"curve":0.25,"c3":0.75},{"time":0.1667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.178,"y":0.923,"curve":0.25,"c3":0.75},{"time":0.1333,"x":0.978,"y":1.014,"curve":0.25,"c3":0.75},{"time":0.1667}]}}},"xiaoshi":{"slots":{"1":{"color":[{"time":0.5667,"color":"ffffffff"},{"time":0.6,"color":"ffffff00"}]}},"bones":{"骨骼":{"rotate":[{},{"time":0.0667,"angle":2.29},{"time":0.1333,"angle":-3.36},{"time":0.2,"angle":2.29},{"time":0.2667,"angle":-3.36},{"time":0.3333,"angle":2.29},{"time":0.4,"angle":-3.36},{"time":0.4667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.5,"x":1.171,"y":1.171,"curve":0.25,"c3":0.75},{"time":0.6,"x":0.167,"y":0.167}]}}}}}
+{"skeleton":{"hash":"AZUYCe1mrqJqfY+AD/UWI9OwFVQ","spine":"3.8.99","x":-86,"y":-83,"width":172,"height":166,"images":"./i/","audio":"E:/项目/Slot/火锅狂欢/源文件/JQKA"},"bones":[{"name":"root"},{"name":"骨骼","parent":"root"}],"slots":[{"name":"1","bone":"骨骼","attachment":"12"}],"skins":[{"name":"default","attachments":{"1":{"12":{"width":172,"height":166}}}}],"animations":{"animation":{"bones":{"骨骼":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"y":-5.04,"curve":0.25,"c3":0.75},{"time":0.1333,"y":1.09,"curve":0.25,"c3":0.75},{"time":0.1667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.178,"y":0.923,"curve":0.25,"c3":0.75},{"time":0.1333,"x":0.978,"y":1.014,"curve":0.25,"c3":0.75},{"time":0.1667}]}}},"xiaoshi":{"slots":{"1":{"color":[{"time":0.3,"color":"ffffffff"},{"time":0.3333,"color":"ffffff00"}]}},"bones":{"骨骼":{"scale":[{"curve":0.25,"c3":0.75},{"time":0.2333,"x":1.171,"y":1.171,"curve":0.25,"c3":0.75},{"time":0.3333,"x":0.167,"y":0.167}]}}}}}

assets/Game/rp_11001/spin/元素动画/JQKA/A.json

@@ -1 +1 @@
-{"skeleton":{"hash":"sXfvHhUjH1usBzHLhnSZaZGe2Pk","spine":"3.8.99","x":-86,"y":-83,"width":172,"height":166,"images":"./i/","audio":""},"bones":[{"name":"root"},{"name":"骨骼","parent":"root"}],"slots":[{"name":"1","bone":"骨骼","attachment":"8"}],"skins":[{"name":"default","attachments":{"1":{"8":{"width":172,"height":166}}}}],"animations":{"animation":{"bones":{"骨骼":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"y":-5.04,"curve":0.25,"c3":0.75},{"time":0.1333,"y":1.09,"curve":0.25,"c3":0.75},{"time":0.1667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.178,"y":0.923,"curve":0.25,"c3":0.75},{"time":0.1333,"x":0.978,"y":1.014,"curve":0.25,"c3":0.75},{"time":0.1667}]}}},"xiaoshi":{"slots":{"1":{"color":[{"time":0.5667,"color":"ffffffff"},{"time":0.6,"color":"ffffff00"}]}},"bones":{"骨骼":{"rotate":[{},{"time":0.0667,"angle":2.29},{"time":0.1333,"angle":-3.36},{"time":0.2,"angle":2.29},{"time":0.2667,"angle":-3.36},{"time":0.3333,"angle":2.29},{"time":0.4,"angle":-3.36},{"time":0.4667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.5,"x":1.171,"y":1.171,"curve":0.25,"c3":0.75},{"time":0.6,"x":0.167,"y":0.167}]}}}}}
+{"skeleton":{"hash":"v3Ed7TDYt/iMcgnc3eL8T2ppdPQ","spine":"3.8.99","x":-86,"y":-83,"width":172,"height":166,"images":"./i/","audio":""},"bones":[{"name":"root"},{"name":"骨骼","parent":"root"}],"slots":[{"name":"1","bone":"骨骼","attachment":"8"}],"skins":[{"name":"default","attachments":{"1":{"8":{"width":172,"height":166}}}}],"animations":{"animation":{"bones":{"骨骼":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"y":-5.04,"curve":0.25,"c3":0.75},{"time":0.1333,"y":1.09,"curve":0.25,"c3":0.75},{"time":0.1667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.178,"y":0.923,"curve":0.25,"c3":0.75},{"time":0.1333,"x":0.978,"y":1.014,"curve":0.25,"c3":0.75},{"time":0.1667}]}}},"xiaoshi":{"slots":{"1":{"color":[{"time":0.3,"color":"ffffffff"},{"time":0.3333,"color":"ffffff00"}]}},"bones":{"骨骼":{"scale":[{"curve":0.25,"c3":0.75},{"time":0.2333,"x":1.171,"y":1.171,"curve":0.25,"c3":0.75},{"time":0.3333,"x":0.167,"y":0.167}]}}}}}

assets/Game/rp_11001/spin/元素动画/JQKA/J.json

@@ -1 +1 @@
-{"skeleton":{"hash":"TslaEGbaogYpIMDBjLW4tVlCddE","spine":"3.8.99","x":-86,"y":-83,"width":172,"height":166,"images":"./i/","audio":"E:/项目/Slot/火锅狂欢/源文件/JQKA"},"bones":[{"name":"root"},{"name":"骨骼","parent":"root"}],"slots":[{"name":"1","bone":"骨骼","attachment":"11"}],"skins":[{"name":"default","attachments":{"1":{"11":{"width":172,"height":166}}}}],"animations":{"animation":{"bones":{"骨骼":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"y":-5.04,"curve":0.25,"c3":0.75},{"time":0.1333,"y":1.09,"curve":0.25,"c3":0.75},{"time":0.1667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.178,"y":0.923,"curve":0.25,"c3":0.75},{"time":0.1333,"x":0.978,"y":1.014,"curve":0.25,"c3":0.75},{"time":0.1667}]}}},"xiaoshi":{"slots":{"1":{"color":[{"time":0.5667,"color":"ffffffff"},{"time":0.6,"color":"ffffff00"}]}},"bones":{"骨骼":{"rotate":[{},{"time":0.0667,"angle":2.29},{"time":0.1333,"angle":-3.36},{"time":0.2,"angle":2.29},{"time":0.2667,"angle":-3.36},{"time":0.3333,"angle":2.29},{"time":0.4,"angle":-3.36},{"time":0.4667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.5,"x":1.171,"y":1.171,"curve":0.25,"c3":0.75},{"time":0.6,"x":0.167,"y":0.167}]}}}}}
+{"skeleton":{"hash":"J93k7D47c7HePoZ8bNS8uR7oYqY","spine":"3.8.99","x":-86,"y":-83,"width":172,"height":166,"images":"./i/","audio":"E:/项目/Slot/火锅狂欢/源文件/JQKA"},"bones":[{"name":"root"},{"name":"骨骼","parent":"root"}],"slots":[{"name":"1","bone":"骨骼","attachment":"11"}],"skins":[{"name":"default","attachments":{"1":{"11":{"width":172,"height":166}}}}],"animations":{"animation":{"bones":{"骨骼":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"y":-5.04,"curve":0.25,"c3":0.75},{"time":0.1333,"y":1.09,"curve":0.25,"c3":0.75},{"time":0.1667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.178,"y":0.923,"curve":0.25,"c3":0.75},{"time":0.1333,"x":0.978,"y":1.014,"curve":0.25,"c3":0.75},{"time":0.1667}]}}},"xiaoshi":{"slots":{"1":{"color":[{"time":0.3,"color":"ffffffff"},{"time":0.3333,"color":"ffffff00"}]}},"bones":{"骨骼":{"scale":[{"curve":0.25,"c3":0.75},{"time":0.2333,"x":1.171,"y":1.171,"curve":0.25,"c3":0.75},{"time":0.3333,"x":0.167,"y":0.167}]}}}}}

assets/Game/rp_11001/spin/元素动画/JQKA/K.json

@@ -1 +1 @@
-{"skeleton":{"hash":"dqZswk3XisfRVmxjXlEZp8aMYGE","spine":"3.8.99","x":-86,"y":-83,"width":172,"height":166,"images":"./i/","audio":"E:/项目/Slot/火锅狂欢/源文件/JQKA"},"bones":[{"name":"root"},{"name":"骨骼","parent":"root"}],"slots":[{"name":"1","bone":"骨骼","attachment":"9"}],"skins":[{"name":"default","attachments":{"1":{"9":{"width":172,"height":166}}}}],"animations":{"animation":{"bones":{"骨骼":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"y":-5.04,"curve":0.25,"c3":0.75},{"time":0.1333,"y":1.09,"curve":0.25,"c3":0.75},{"time":0.1667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.178,"y":0.923,"curve":0.25,"c3":0.75},{"time":0.1333,"x":0.978,"y":1.014,"curve":0.25,"c3":0.75},{"time":0.1667}]}}},"xiaoshi":{"slots":{"1":{"color":[{"time":0.5667,"color":"ffffffff"},{"time":0.6,"color":"ffffff00"}]}},"bones":{"骨骼":{"rotate":[{},{"time":0.0667,"angle":2.29},{"time":0.1333,"angle":-3.36},{"time":0.2,"angle":2.29},{"time":0.2667,"angle":-3.36},{"time":0.3333,"angle":2.29},{"time":0.4,"angle":-3.36},{"time":0.4667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.5,"x":1.171,"y":1.171,"curve":0.25,"c3":0.75},{"time":0.6,"x":0.167,"y":0.167}]}}}}}
+{"skeleton":{"hash":"vHJp09nrQkzXF/pJnJ2PKe+2LYs","spine":"3.8.99","x":-86,"y":-83,"width":172,"height":166,"images":"./i/","audio":"E:/项目/Slot/火锅狂欢/源文件/JQKA"},"bones":[{"name":"root"},{"name":"骨骼","parent":"root"}],"slots":[{"name":"1","bone":"骨骼","attachment":"9"}],"skins":[{"name":"default","attachments":{"1":{"9":{"width":172,"height":166}}}}],"animations":{"animation":{"bones":{"骨骼":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"y":-5.04,"curve":0.25,"c3":0.75},{"time":0.1333,"y":1.09,"curve":0.25,"c3":0.75},{"time":0.1667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.178,"y":0.923,"curve":0.25,"c3":0.75},{"time":0.1333,"x":0.978,"y":1.014,"curve":0.25,"c3":0.75},{"time":0.1667}]}}},"xiaoshi":{"slots":{"1":{"color":[{"time":0.3,"color":"ffffffff"},{"time":0.3333,"color":"ffffff00"}]}},"bones":{"骨骼":{"scale":[{"curve":0.25,"c3":0.75},{"time":0.2333,"x":1.171,"y":1.171,"curve":0.25,"c3":0.75},{"time":0.3333,"x":0.167,"y":0.167}]}}}}}

assets/Game/rp_11001/spin/元素动画/JQKA/Q.json

@@ -1 +1 @@
-{"skeleton":{"hash":"HL22Xp3Kc+zmooVcbPFcQDsXoRk","spine":"3.8.99","x":-86,"y":-83,"width":172,"height":166,"images":"./i/","audio":"E:/项目/Slot/火锅狂欢/源文件/JQKA"},"bones":[{"name":"root"},{"name":"骨骼","parent":"root"}],"slots":[{"name":"1","bone":"骨骼","attachment":"10"}],"skins":[{"name":"default","attachments":{"1":{"10":{"width":172,"height":166}}}}],"animations":{"animation":{"bones":{"骨骼":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"y":-5.04,"curve":0.25,"c3":0.75},{"time":0.1333,"y":1.09,"curve":0.25,"c3":0.75},{"time":0.1667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.178,"y":0.923,"curve":0.25,"c3":0.75},{"time":0.1333,"x":0.978,"y":1.014,"curve":0.25,"c3":0.75},{"time":0.1667}]}}},"xiaoshi":{"slots":{"1":{"color":[{"time":0.5667,"color":"ffffffff"},{"time":0.6,"color":"ffffff00"}]}},"bones":{"骨骼":{"rotate":[{},{"time":0.0667,"angle":2.29},{"time":0.1333,"angle":-3.36},{"time":0.2,"angle":2.29},{"time":0.2667,"angle":-3.36},{"time":0.3333,"angle":2.29},{"time":0.4,"angle":-3.36},{"time":0.4667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.5,"x":1.171,"y":1.171,"curve":0.25,"c3":0.75},{"time":0.6,"x":0.167,"y":0.167}]}}}}}
+{"skeleton":{"hash":"iLa0H1pQms9i9cSfjQzNA9aatMk","spine":"3.8.99","x":-86,"y":-83,"width":172,"height":166,"images":"./i/","audio":"E:/项目/Slot/火锅狂欢/源文件/JQKA"},"bones":[{"name":"root"},{"name":"骨骼","parent":"root"}],"slots":[{"name":"1","bone":"骨骼","attachment":"10"}],"skins":[{"name":"default","attachments":{"1":{"10":{"width":172,"height":166}}}}],"animations":{"animation":{"bones":{"骨骼":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"y":-5.04,"curve":0.25,"c3":0.75},{"time":0.1333,"y":1.09,"curve":0.25,"c3":0.75},{"time":0.1667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.178,"y":0.923,"curve":0.25,"c3":0.75},{"time":0.1333,"x":0.978,"y":1.014,"curve":0.25,"c3":0.75},{"time":0.1667}]}}},"xiaoshi":{"slots":{"1":{"color":[{"time":0.3,"color":"ffffffff"},{"time":0.3333,"color":"ffffff00"}]}},"bones":{"骨骼":{"scale":[{"curve":0.25,"c3":0.75},{"time":0.2333,"x":1.171,"y":1.171,"curve":0.25,"c3":0.75},{"time":0.3333,"x":0.167,"y":0.167}]}}}}}

assets/Game/scripts/SlotGame.ts

@@ -569,11 +569,11 @@ export class SlotGame extends Component {
             AudioManager.instance.playSFX('Appear_Scatter_Sound_elimin', 1, true)
             this.scheduleOnce(() => {
                 AudioManager.instance.stopAllSFX()
-                this.setWaysCount(this.spinData.Symbol.WaysNum);
+                this.setWaysCount(this.spinData.WaysNum);
                 this.rollerManager.iconFallDown(this.spinData);
             }, 2)
         } else {
-            this.setWaysCount(this.spinData.Symbol.WaysNum);
+            this.setWaysCount(this.spinData.WaysNum);
             this.rollerManager.iconFallDown(this.spinData);
         }
     }
@@ -762,7 +762,7 @@ export class SlotGame extends Component {
         spine.setAnimation(0, 'animation', true);
 
         let posX = this.rollerManager.getRollerPosition(rollerId).x;
-        this.readyHand.setPosition(posX, 360, 0);
+        this.readyHand.setPosition(posX, 270, 0);
         this.grayNode.active = true;
         this.grayNode.children.forEach((child, index) => {
             if (index < rollerId) {

assets/Game/scripts/game/FreeSpinAdd.ts

@@ -57,14 +57,17 @@ export class FreeSpinAdd extends Component {
     // 加入回调
     onClose() {
         this.unscheduleAllCallbacks();
-        tween(this.freeSpinAddSpine.node.getComponent(UIOpacity))
+        tween(this.freeSpinAddSpine.node)
-            .to(0.5, { opacity: 0 })
+            .to(0.5, { scale: new Vec3(0, 0, 0) })
             .call(() => {
                 this.freeSpinAddUI.removeFromParent();
                 NodePoolManager.instance.putNodeToPool('freeSpinAdd', this.freeSpinAddUI);
                 this.closeCallBack && this.closeCallBack();
             })
             .start()
+        tween(this.freeSpinAddSpine.node.getComponent(UIOpacity))
+            .to(0.5, { opacity: 0 })
+            .start()
     }
 }
 

assets/Game/scripts/game/FreeSpinEnter.ts

@@ -79,14 +79,17 @@ export class FreeSpinEnter extends Component {
         this.btn.node.active = false;
         this.unscheduleAllCallbacks();
         // this.fadeOutScoreLabel(0.5, 0.5);
-        tween(this.freeSpinEnterSpine.node.getComponent(UIOpacity))
+        tween(this.freeSpinEnterSpine.node)
-            .to(0.5, { opacity: 0 })
+            .to(0.5, { scale: new Vec3(0, 0, 0) })
             .call(() => {
                 this.freeSpinEnterUI.removeFromParent();
                 NodePoolManager.instance.putNodeToPool('freeSpinEnter', this.freeSpinEnterUI);
                 this.closeCallBack && this.closeCallBack();
             })
             .start()
+        tween(this.freeSpinEnterSpine.node.getComponent(UIOpacity))
+            .to(0.5, { opacity: 0 })
+            .start()
     }
 
 }

assets/Game/scripts/game/HistoryDetail.ts

@@ -234,7 +234,7 @@ export class HistoryDetail extends Component {
 
         info.getChildByName("Label_Bet").getComponent(Label).string = getTranslate(this.dict, "Bet") + `(${currencySymbol})`;
 
-        info.getChildByName("txt_profit").getComponent(Label).string = fixNum(pan.WinInfo ? pan.WinInfo.Score : 0);
+        info.getChildByName("txt_profit").getComponent(Label).string = fixNum(pan.AllScore - pan.Bet);
         info.getChildByName("Label_Profit").getComponent(Label).string = getTranslate(this.dict, "Profit") + `(${currencySymbol})`;
 
         info.getChildByName("txt_balance_before").getComponent(Label).string = fixNum(pan.Balance - pan.AllScore + pan.Bet) + "➡️";
@@ -403,7 +403,6 @@ export class HistoryDetail extends Component {
         multiValue.push(multiValue[3] + 2)
         for (let i = 0; i < multiValue.length; i++) {
             showMultiNode.getChildByName('bg').children[i].getChildByName('multi').getComponent(Label).string = 'x' + multiValue[i]
-            showMultiNode.getChildByName('bg').children[i].getChildByName('multi').getComponent(Label).fontSize = 30
             showMultiNode.getChildByName('bg').children[i].getChildByName('multi').getComponent(Label).font = this.multiLabelFont[0]
             showMultiNode.getChildByName('bg').children[i].getChildByName('multi').setPosition(0, 0, 0)
             showMultiNode.getChildByName('bg').children[i].getComponent(Sprite).spriteFrame = multiValue[i] >= 4 ? this.multiFrame[1] : this.multiFrame[0]
@@ -412,7 +411,6 @@ export class HistoryDetail extends Component {
         if (pan.WinInfo && pan.WinInfo.MultPos) {
             for (let key in pan.WinInfo.MultPos) {
                 showMultiNode.getChildByName('bg').children[key].getChildByName('multi').setPosition(0, 110, 0)
-                showMultiNode.getChildByName('bg').children[key].getChildByName('multi').getComponent(Label).fontSize = 20
                 showMultiNode.getChildByName('bg').children[key].getChildByName('multi').getComponent(Label).font = this.multiLabelFont[1]
                 showMultiNode.getChildByName('bg').children[key].getComponent(Sprite).spriteFrame = pan.WinInfo.MultPos[key] >= 4 ? this.multiFrame[4] : this.multiFrame[3]
             }

assets/Game/scripts/game/Icon.ts

@@ -511,44 +511,15 @@ export class Icon extends Component {
                 children[i].active = false;
             }
             winSpine.removeFromParent();
-        }, 1.1)
+        }, 0.6)
     }
 
     playChangeAni(isChange: boolean) {
         if (isChange) {
-            let winSpine = instantiate(this.winSpinePrefab)
-
-            winSpine.setParent(this.node);
-            winSpine.setPosition(0, 0, 0);
-            winSpine.setScale(1, 1, 1);
-
-            let ascendWin = winSpine.getChildByName('Ascend_win');
-            let skeleton = ascendWin.getComponent(sp.Skeleton);
-
-            ascendWin.active = true;
-            skeleton.setAnimation(0, `${this.lHeight}`, false);
             this.scheduleOnce(() => {
-                skeleton.setCompleteListener(null);
-                skeleton.clearTracks()
-                ascendWin.active = false;
                 this.playChangeSprite(true);
-            }, 1.1)
+            }, 0.1)
         } else {
-            // 清理winSpine节点
-            let winSpine = this.node.getChildByName('winSpine');
-            if (winSpine) {
-                // 停用所有子节点
-                let children = winSpine.children;
-                for (let i = 0; i < children.length; i++) {
-                    children[i].active = false;
-                }
-
-                // 回收节点
-                winSpine.removeFromParent();
-                NodePoolManager.instance.putNodeToPool('winSpine', winSpine);
-            }
-
-            // 停止精灵切换动画
             this.playChangeSprite(false);
         }
     }

assets/Game/scripts/game/Roller.ts

@@ -660,12 +660,12 @@ export class Roller extends BaseRoller {
             iconComponent.playDeleteAni();
             this.scheduleOnce(() => {
                 this.iconFactory.recycleIcon(iconNode);
-            }, 1.1)
+            }, 0.6)
         }
 
         this.scheduleOnce(() => {
             this.node.emit(ROLLER_EVENT.ICON_DELETED, this._rollerId);
-        }, 1.1)
+        }, 0.6)
 
     }
 
@@ -850,7 +850,7 @@ export class Roller extends BaseRoller {
         for (let update of updates) {
 
             let fallDelay = update.index * delayBetweenIcons; // 根据索引计算延迟
-            let fallTime = 0.2; // 掉落动画时间
+            let fallTime = 0.3; // 掉落动画时间
 
             // 清除可能存在的动画
             tween(update.node).stop();

assets/Game/scripts/game/RollerManager.ts

@@ -255,7 +255,7 @@ export class RollerManager extends Component {
                 AudioManager.instance.playSFX('Appear_Scatter_Sound');
             }
 
-            if (!isWild && !isScatter && this._isFastSpin) {
+            if (!isWild && !isScatter) {
                 AudioManager.instance.playSFX('Scroll_Stop_Sound');
             }
         }
@@ -670,7 +670,7 @@ export class RollerManager extends Component {
 
 
         // 9. 计算动画播放时间并处理没有删除图标的roller
-        let animationTime = aniData.length > 0 ? 1.1 : 1.1;
+        let animationTime = aniData.length > 0 ? 0.6 : 0.6;
         let rollersWithoutDeleteOps = [];
 
         for (let i = 0; i < this.allRollers.length; i++) {
@@ -697,7 +697,7 @@ export class RollerManager extends Component {
             //     AudioManager.instance.playSFX('Symbol_Change_Sound');
             // }
             this.returnIconsFromWinLayer(winLayerRef, positionsCopy);
-        }, 1); // 在动画结束前稍早将图标移回
+        }, 0.5); // 在动画结束前稍早将图标移回
     }
 
     // 将图标从win层返回到原始层

assets/Loading/game.scene

@@ -23,7 +23,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 89
+      "__id__": 86
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -54,7 +54,7 @@
     },
     "autoReleaseAssets": false,
     "_globals": {
-      "__id__": 90
+      "__id__": 87
     },
     "_id": "6c29a3fe-b10e-44a5-98e3-55595b231767"
   },
@@ -81,24 +81,21 @@
       },
       {
         "__id__": 67
-      },
-      {
-        "__id__": 82
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 82
+      },
+      {
+        "__id__": 83
+      },
+      {
+        "__id__": 84
+      },
       {
         "__id__": 85
-      },
-      {
-        "__id__": 86
-      },
-      {
-        "__id__": 87
-      },
-      {
-        "__id__": 88
       }
     ],
     "_prefab": null,
@@ -3040,115 +3037,6 @@
     "_lockFlags": 0,
     "_id": "7aUBGhIOdMcoBPdaq1qcxJ"
   },
-  {
-    "__type__": "cc.Node",
-    "_name": "Node",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 2
-    },
-    "_children": [],
-    "_active": false,
-    "_components": [
-      {
-        "__id__": 83
-      },
-      {
-        "__id__": 84
-      }
-    ],
-    "_prefab": null,
-    "_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": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": "ceBmvO7Y1K+q7Dn6NIZt+K"
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 82
-    },
-    "_enabled": true,
-    "__prefab": null,
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 334.4700012207031,
-      "height": 666
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5639967671276223,
-      "y": 0.5
-    },
-    "_id": "4cV7QO90JAcJ7G7zBbVSit"
-  },
-  {
-    "__type__": "sp.Skeleton",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 82
-    },
-    "_enabled": true,
-    "__prefab": null,
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_skeletonData": {
-      "__uuid__": "8ee61171-8810-4f18-bd24-f2fa8f84eb19",
-      "__expectedType__": "sp.SkeletonData"
-    },
-    "defaultSkin": "default",
-    "defaultAnimation": "4_3",
-    "_premultipliedAlpha": false,
-    "_timeScale": 1,
-    "_preCacheMode": 0,
-    "_cacheMode": 0,
-    "_sockets": [],
-    "_useTint": false,
-    "_debugMesh": false,
-    "_debugBones": false,
-    "_debugSlots": false,
-    "_enableBatch": false,
-    "loop": true,
-    "_id": "220VCc52hJMrDrhUuihTWL"
-  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -3262,28 +3150,28 @@
   {
     "__type__": "cc.SceneGlobals",
     "ambient": {
-      "__id__": 91
+      "__id__": 88
     },
     "shadows": {
-      "__id__": 92
+      "__id__": 89
     },
     "_skybox": {
-      "__id__": 93
+      "__id__": 90
     },
     "fog": {
-      "__id__": 94
+      "__id__": 91
     },
     "octree": {
-      "__id__": 95
+      "__id__": 92
     },
     "skin": {
-      "__id__": 96
+      "__id__": 93
     },
     "lightProbeInfo": {
-      "__id__": 97
+      "__id__": 94
     },
     "postSettings": {
-      "__id__": 98
+      "__id__": 95
     },
     "bakedWithStationaryMainLight": false,
     "bakedWithHighpLightmap": false

assets/resources/audio/Appear_Scatter_Sound.mp3.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.0",
   "importer": "audio-clip",
   "imported": true,
-  "uuid": "613aee40-bbbd-4155-bc7a-86d003acb781",
+  "uuid": "a2685682-cefe-455d-af00-883496c87f1f",
   "files": [
     ".json",
     ".mp3"

assets/resources/audio/Appear_Wild_Sound.mp3.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.0",
   "importer": "audio-clip",
   "imported": true,
-  "uuid": "69f14e67-3a4c-4070-a25b-b7344de0e3fd",
+  "uuid": "4c46d093-4904-4085-84d7-23c3ee2874b7",
   "files": [
     ".json",
     ".mp3"

assets/resources/audio/快速模式下，盘面整体下落音效.mp3.meta

@@ -1,14 +0,0 @@
-{
-  "ver": "1.0.0",
-  "importer": "audio-clip",
-  "imported": true,
-  "uuid": "70fd8da1-9462-4c87-97ba-0ff7aea4ba6a",
-  "files": [
-    ".json",
-    ".mp3"
-  ],
-  "subMetas": {},
-  "userData": {
-    "downloadMode": 0
-  }
-}

assets/resources/i18nSprite/de/4.png.meta

@@ -44,12 +44,12 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 0,
+        "trimX": 2,
-        "trimY": 0,
+        "trimY": 2,
-        "width": 138,
+        "width": 213,
-        "height": 69,
+        "height": 29,
-        "rawWidth": 138,
+        "rawWidth": 217,
-        "rawHeight": 69,
+        "rawHeight": 33,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -69,
+            -106.5,
-            -34.5,
+            -14.5,
             0,
-            69,
+            106.5,
-            -34.5,
+            -14.5,
             0,
-            -69,
+            -106.5,
-            34.5,
+            14.5,
             0,
-            69,
+            106.5,
-            34.5,
+            14.5,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            0,
+            2,
-            69,
+            31,
-            138,
+            215,
-            69,
+            31,
-            0,
+            2,
-            0,
+            2,
-            138,
+            215,
-            0
+            2
           ],
           "nuv": [
-            0,
+            0.009216589861751152,
-            0,
+            0.06060606060606061,
-            1,
+            0.9907834101382489,
-            0,
+            0.06060606060606061,
-            0,
+            0.009216589861751152,
-            1,
+            0.9393939393939394,
-            1,
+            0.9907834101382489,
-            1
+            0.9393939393939394
           ],
           "minPos": [
-            -69,
+            -106.5,
-            -34.5,
+            -14.5,
             0
           ],
           "maxPos": [
-            69,
+            106.5,
-            34.5,
+            14.5,
             0
           ]
         },

assets/resources/i18nSprite/en/4.png.meta

@@ -44,11 +44,11 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 0,
+        "trimX": 2,
-        "trimY": 0,
+        "trimY": 2,
-        "width": 218,
+        "width": 191,
-        "height": 42,
+        "height": 38,
-        "rawWidth": 218,
+        "rawWidth": 195,
         "rawHeight": 42,
         "borderTop": 0,
         "borderBottom": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -109,
+            -95.5,
-            -21,
+            -19,
             0,
-            109,
+            95.5,
-            -21,
+            -19,
             0,
-            -109,
+            -95.5,
-            21,
+            19,
             0,
-            109,
+            95.5,
-            21,
+            19,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            0,
+            2,
-            42,
+            40,
-            218,
+            193,
-            42,
+            40,
-            0,
+            2,
-            0,
+            2,
-            218,
+            193,
-            0
+            2
           ],
           "nuv": [
-            0,
+            0.010256410256410256,
-            0,
+            0.047619047619047616,
-            1,
+            0.9897435897435898,
-            0,
+            0.047619047619047616,
-            0,
+            0.010256410256410256,
-            1,
+            0.9523809523809523,
-            1,
+            0.9897435897435898,
-            1
+            0.9523809523809523
           ],
           "minPos": [
-            -109,
+            -95.5,
-            -21,
+            -19,
             0
           ],
           "maxPos": [
-            109,
+            95.5,
-            21,
+            19,
             0
           ]
         },

assets/resources/i18nSprite/fi/4.png.meta

@@ -44,12 +44,12 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 0,
+        "trimX": 2,
-        "trimY": 0,
+        "trimY": 2,
-        "width": 154,
+        "width": 198,
-        "height": 69,
+        "height": 27,
-        "rawWidth": 154,
+        "rawWidth": 202,
-        "rawHeight": 69,
+        "rawHeight": 31,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -77,
+            -99,
-            -34.5,
+            -13.5,
             0,
-            77,
+            99,
-            -34.5,
+            -13.5,
             0,
-            -77,
+            -99,
-            34.5,
+            13.5,
             0,
-            77,
+            99,
-            34.5,
+            13.5,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            0,
+            2,
-            69,
+            29,
-            154,
+            200,
-            69,
+            29,
-            0,
+            2,
-            0,
+            2,
-            154,
+            200,
-            0
+            2
           ],
           "nuv": [
-            0,
+            0.009900990099009901,
-            0,
+            0.06451612903225806,
-            1,
+            0.9900990099009901,
-            0,
+            0.06451612903225806,
-            0,
+            0.009900990099009901,
-            1,
+            0.9354838709677419,
-            1,
+            0.9900990099009901,
-            1
+            0.9354838709677419
           ],
           "minPos": [
-            -77,
+            -99,
-            -34.5,
+            -13.5,
             0
           ],
           "maxPos": [
-            77,
+            99,
-            34.5,
+            13.5,
             0
           ]
         },

assets/resources/i18nSprite/it/4.png.meta

@@ -44,12 +44,12 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 0,
+        "trimX": 2,
-        "trimY": 0,
+        "trimY": 2,
-        "width": 114,
+        "width": 234,
-        "height": 69,
+        "height": 38,
-        "rawWidth": 114,
+        "rawWidth": 238,
-        "rawHeight": 69,
+        "rawHeight": 42,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -57,
+            -117,
-            -34.5,
+            -19,
             0,
-            57,
+            117,
-            -34.5,
+            -19,
             0,
-            -57,
+            -117,
-            34.5,
+            19,
             0,
-            57,
+            117,
-            34.5,
+            19,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            0,
+            2,
-            69,
+            40,
-            114,
+            236,
-            69,
+            40,
-            0,
+            2,
-            0,
+            2,
-            114,
+            236,
-            0
+            2
           ],
           "nuv": [
-            0,
+            0.008403361344537815,
-            0,
+            0.047619047619047616,
-            1,
+            0.9915966386554622,
-            0,
+            0.047619047619047616,
-            0,
+            0.008403361344537815,
-            1,
+            0.9523809523809523,
-            1,
+            0.9915966386554622,
-            1
+            0.9523809523809523
           ],
           "minPos": [
-            -57,
+            -117,
-            -34.5,
+            -19,
             0
           ],
           "maxPos": [
-            57,
+            117,
-            34.5,
+            19,
             0
           ]
         },

assets/resources/i18nSprite/my/4.png.meta

@@ -44,12 +44,12 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 0,
+        "trimX": 2,
-        "trimY": 0,
+        "trimY": 2,
-        "width": 267,
+        "width": 215,
-        "height": 60,
+        "height": 50,
-        "rawWidth": 267,
+        "rawWidth": 219,
-        "rawHeight": 60,
+        "rawHeight": 54,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -133.5,
+            -107.5,
-            -30,
+            -25,
             0,
-            133.5,
+            107.5,
-            -30,
+            -25,
             0,
-            -133.5,
+            -107.5,
-            30,
+            25,
             0,
-            133.5,
+            107.5,
-            30,
+            25,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            0,
+            2,
-            60,
+            52,
-            267,
+            217,
-            60,
+            52,
-            0,
+            2,
-            0,
+            2,
-            267,
+            217,
-            0
+            2
           ],
           "nuv": [
-            0,
+            0.0091324200913242,
-            0,
+            0.037037037037037035,
-            1,
+            0.9908675799086758,
-            0,
+            0.037037037037037035,
-            0,
+            0.0091324200913242,
-            1,
+            0.9629629629629629,
-            1,
+            0.9908675799086758,
-            1
+            0.9629629629629629
           ],
           "minPos": [
-            -133.5,
+            -107.5,
-            -30,
+            -25,
             0
           ],
           "maxPos": [
-            133.5,
+            107.5,
-            30,
+            25,
             0
           ]
         },

assets/resources/i18nSprite/sv/4.png.meta

@@ -44,12 +44,12 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 0,
+        "trimX": 2,
-        "trimY": 0,
+        "trimY": 2,
-        "width": 96,
+        "width": 191,
-        "height": 69,
+        "height": 36,
-        "rawWidth": 96,
+        "rawWidth": 195,
-        "rawHeight": 69,
+        "rawHeight": 40,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -48,
+            -95.5,
-            -34.5,
+            -18,
             0,
-            48,
+            95.5,
-            -34.5,
+            -18,
             0,
-            -48,
+            -95.5,
-            34.5,
+            18,
             0,
-            48,
+            95.5,
-            34.5,
+            18,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            0,
+            2,
-            69,
+            38,
-            96,
+            193,
-            69,
+            38,
-            0,
+            2,
-            0,
+            2,
-            96,
+            193,
-            0
+            2
           ],
           "nuv": [
-            0,
+            0.010256410256410256,
-            0,
+            0.05,
-            1,
+            0.9897435897435898,
-            0,
+            0.05,
-            0,
+            0.010256410256410256,
-            1,
+            0.95,
-            1,
+            0.9897435897435898,
-            1
+            0.95
           ],
           "minPos": [
-            -48,
+            -95.5,
-            -34.5,
+            -18,
             0
           ],
           "maxPos": [
-            48,
+            95.5,
-            34.5,
+            18,
             0
           ]
         },