.gitea/workflows/deploy.yaml

@@ -19,9 +19,7 @@ jobs:
           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/prefabs/SlotScene.prefab

@@ -50,25 +50,22 @@
       },
       {
         "__id__": 1376
-      },
-      {
-        "__id__": 1386
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 1394
+        "__id__": 1386
       },
       {
-        "__id__": 1396
+        "__id__": 1388
       },
       {
-        "__id__": 1398
+        "__id__": 1390
       }
     ],
     "_prefab": {
-      "__id__": 1400
+      "__id__": 1392
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2300,7 +2297,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "f4Gg4bv2NCUoW2+JwNkNLh"
+    "fileId": "474untOCpHWY6Qj2uP19E4"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2310,7 +2307,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "11bk2QCntOxJC/Kf1YArEX",
+    "fileId": "efzaF4hS1OAbEp9UxbQNhx",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -2341,7 +2338,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "eb74xlYRVGbYvIvzPPX2fK"
+    "fileId": "48ofa//m5Hf4E8JhtCsk6+"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2351,7 +2348,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "a8n6fBHDJKxKebTC2ahZE4",
+    "fileId": "27o3j6IIJG24V0Xxad//zY",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -2382,7 +2379,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "18xQQjfTRPv439te/QUyRh"
+    "fileId": "e3b34tMDpOZoJpCyhYo3RW"
   },
   {
     "__type__": "5fc10Zl7lVO97/rr2J1uxWH",
@@ -2406,7 +2403,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "5bqQpHhn1Nz6I1GEvsCNJX"
+    "fileId": "5fdQKnOjZAh4VEnOf1rEO5"
   },
   {
     "__type__": "5fd13+Xa69CZogb3Q/F1lnC",
@@ -2579,7 +2576,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "deAZ5BMhBB0a5t/hRkEzi7",
+    "fileId": "3dG9T9DNxNB6z8vPiZ8WS5",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -2604,7 +2601,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "eaRNpA2ZFPioFBGP8E78OJ"
+    "fileId": "f9xc4vttJF+ZiFoGNX8W3t"
   },
   {
     "__type__": "cc.UITransform",
@@ -2632,7 +2629,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "1b9ScCOhlIjIZAubYlOKUD"
+    "fileId": "9c05WFWAhONaMyr+/E7Shc"
   },
   {
     "__type__": "cc.Sprite",
@@ -2677,7 +2674,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "e5zf2hwhhErLw5n8rPAhCE"
+    "fileId": "e8LlRd5StJW42FsulkvBfH"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2687,7 +2684,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "fcL/AOLMxIrborIFwVfo8i",
+    "fileId": "bbBbOyMFZKXp7bHe6sD0It",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -2942,7 +2939,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "5faZd2aARL/43y6WZMyO4x"
+    "fileId": "7cgElNnmNLbrQo6qMPvX6X"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2952,7 +2949,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "ffx+Z2YCFAVay6kQuRas76",
+    "fileId": "e3+r0W1kJL+I68GTF4669l",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -2983,7 +2980,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "97u2nJ15lOuquow25r3Bja"
+    "fileId": "289bKoj6dKKoydIRLpWT8a"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2993,7 +2990,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "54DjDWRnNHEJWee198pMLg",
+    "fileId": "02JiBil/VJxLFib+gJ/Hn2",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3024,7 +3021,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "790wmtrpJLQ777R4VZmzHD"
+    "fileId": "baLsYJmt1M/oVztDdO2+37"
   },
   {
     "__type__": "45522uB1sdFu4FJAojtnha4",
@@ -3048,7 +3045,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "bcjVsBJB1Ed7ItfaGxh3/H"
+    "fileId": "60/LhqfK5BfqSpHK4P9aGn"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3058,7 +3055,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "beZ8pMMm5M4rP4T8FJjTpB",
+    "fileId": "b7zQXb/W5BZYX1enrfDh9g",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3241,7 +3238,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "9e8SgfJjxMFZIV0oP82hyQ"
+    "fileId": "efX7nb1KxBN6kTlecwmxyQ"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3251,7 +3248,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "4ec5LXoTpP8bUOj9AcjtQJ",
+    "fileId": "20ADiwKhFChbm2P2F0w9Il",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3282,7 +3279,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "4ffJ4jab9BmLWvNgVZnDmN"
+    "fileId": "897kQAzwdGuoFpmt9LgaS/"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3292,7 +3289,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "78IFwl9S1G0o0W+fI/0UsS",
+    "fileId": "51JVTg3FlN5oHObig3RB8A",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3323,7 +3320,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "5eNlmXLYJHiJJEFlvVutKH"
+    "fileId": "ebRabvFaFK3ZgnED8umlfE"
   },
   {
     "__type__": "45522uB1sdFu4FJAojtnha4",
@@ -3347,7 +3344,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "0faGWcIKNGdJQXetCGLPcr"
+    "fileId": "25+Xa+ULpMMo9e4vyjjf8e"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3357,7 +3354,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "08DZBPuLZCdpNbiM3zTkbQ",
+    "fileId": "9ftuR3BMlMJL4Mg5nRqDXc",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3540,7 +3537,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "a8nGhZoctG0LfK7IaOCzU0"
+    "fileId": "4atuG87wZMwrdJtBXBFg+m"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3550,7 +3547,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "066lZOMh9L9akHmp2ZhUMV",
+    "fileId": "2ctdSV8FdIJbEpemj2MuxK",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3581,7 +3578,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "f5+LWcAOtP8J95uKypRZdh"
+    "fileId": "c0nsk6VwdFv5Nwtf1XNEeL"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3591,7 +3588,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "eaJWLaewJNObKk4KYgrpxj",
+    "fileId": "74Uk3fo/1BXLTkUB5LA0ZL",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3622,7 +3619,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "950I5Q5cRPp6C3+km7TqS3"
+    "fileId": "00Pb8xjclHJ4J5ruWvAJd0"
   },
   {
     "__type__": "45522uB1sdFu4FJAojtnha4",
@@ -3646,7 +3643,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "7dXgXiMRhDfL0rO6X0lM73"
+    "fileId": "c3mWpw8yBFOpOBYK/oJwlf"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3656,7 +3653,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "a5yYSJTJ9JN6vAnJJdmFx3",
+    "fileId": "154TYNxAVOR7ivZexIoW8U",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3839,7 +3836,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "06a4B33eJM1Km6bOdD6oc+"
+    "fileId": "a9PsnIsy5NLZskGkfMRJs9"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3849,7 +3846,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "4ajGiaIlxHua5GzzAy+dmo",
+    "fileId": "2eSknPaLxFFYWmAOdxXU8p",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3880,7 +3877,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d2YeBBoo5A7Yb395f0fHF4"
+    "fileId": "94MCkleqpKOY12qL5k2+N8"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3890,7 +3887,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "ac5ybgPrJKQ4QXmRHgemq8",
+    "fileId": "50PK2GHFBPjqhgxoWTU/2r",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3921,7 +3918,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "2ffM3bdnxGUbYr1VRiPrps"
+    "fileId": "e9eDfNpyhCH5XstQIJ/OUz"
   },
   {
     "__type__": "45522uB1sdFu4FJAojtnha4",
@@ -3945,7 +3942,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "dcOXuLG65Ea740lFqW8vN2"
+    "fileId": "08HhZYarpCwoZ9SmvwHyOI"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3955,7 +3952,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "12Ga2SdYNBBojuaPGJfEZc",
+    "fileId": "d7ES3kyGVE45RBIjyAxdo/",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -4138,7 +4135,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d5+21H/iVPv5XZpjM7MPxG"
+    "fileId": "49KFheyEpFk7j4ya66hie6"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4148,7 +4145,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "8bV9nOAZhNBbvKGl1CePTc",
+    "fileId": "2aMr/tAZ5CV6d4qvKHSwQI",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -4179,7 +4176,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "75t972NyVF7YNd3AKMOfDG"
+    "fileId": "929eWEal9M85LSGHGEywvv"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4189,7 +4186,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "70NRzJCopGfKbXvqrl35ZS",
+    "fileId": "f3tU5ZHclMkKnQ3/XZY4tU",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -4220,7 +4217,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "2aI/cSdaVG7rvozZ4iUTiU"
+    "fileId": "2d8sr8UA5I1K3OiBNtBSXY"
   },
   {
     "__type__": "45522uB1sdFu4FJAojtnha4",
@@ -4244,7 +4241,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "f4w4HHMEZP9qRJsnYn7MWU"
+    "fileId": "34H87vDfdN7Z5hiGu7bjqZ"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4254,7 +4251,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "7azXfEuh9NnpmFk8MgdAfS",
+    "fileId": "ff+cG5ZfxAzaQAURuv01xe",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -4437,7 +4434,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "2fprvqimVIzJQfDjkKvuvs"
+    "fileId": "70cqz67q5A6bJsQryZ4Hx/"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4447,7 +4444,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "36FhPT8C1KkKT/qNMhHDnf",
+    "fileId": "4akmLWGeBMaaibtkhRlmgv",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -4478,7 +4475,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "daFw7aWftJF6Ve5CHUq0HK"
+    "fileId": "9amAXvlCtDmpEeuhJmTneh"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4488,7 +4485,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "a1pZ+d6v5EiLeYBeQt6unG",
+    "fileId": "17XhDfV3hJnLs0XiJirgCs",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -4519,7 +4516,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "b575sE27BDp7WNhwv0x81X"
+    "fileId": "c2ntGmdxJK1oi60EitYG/S"
   },
   {
     "__type__": "45522uB1sdFu4FJAojtnha4",
@@ -4543,7 +4540,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "27iaFASVNGtIEn5L3Nd30Y"
+    "fileId": "d5TH2t/gVMAINUEpnOn8r5"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4553,7 +4550,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "d2Fob7+8RIJq0m9uPoTQru",
+    "fileId": "9bj0pPQpNBMJxXrqKjLL84",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -4578,7 +4575,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "63bIOjWbJH3KOdDadWP3vc"
+    "fileId": "24OGdcXuxEwo5lQTl47pAy"
   },
   {
     "__type__": "cc.UITransform",
@@ -4606,7 +4603,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "347k8acNBI2bPVDA9hUmSY"
+    "fileId": "f019yzablDZLKsgsLi4UUu"
   },
   {
     "__type__": "cc.Sprite",
@@ -4651,7 +4648,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "983DRgidBIv5cVdUZJQr7K"
+    "fileId": "60DBhD8shFl6Ld7QWyLMR+"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4661,7 +4658,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "7dri8YhVRCaKBFB6Owy/t9",
+    "fileId": "1bXEry42BMFouw5k3TWaG+",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -12298,7 +12295,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1919.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -23754,7 +23751,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1919.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -23823,9 +23820,6 @@
       "__uuid__": "257442c9-fc68-435b-8fef-6c448a2d8885",
       "__expectedType__": "cc.Prefab"
     },
-    "slotGame": {
-      "__id__": 548
-    },
     "tipSmall_turbo": {
       "__id__": 1021
     },
@@ -23925,7 +23919,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1919.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -24120,7 +24114,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1919.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -24272,7 +24266,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1919.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -24424,7 +24418,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1919.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -24576,7 +24570,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1919.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -30097,7 +30091,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1919.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -30318,169 +30312,21 @@
     ]
   },
   {
-    "__type__": "cc.Node",
+    "__type__": "cc.UITransform",
-    "_name": "gray",
+    "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
-    "_parent": {
+    "node": {
       "__id__": 1
     },
-    "_children": [],
+    "_enabled": true,
-    "_active": false,
+    "__prefab": {
-    "_components": [
-      {
       "__id__": 1387
     },
-      {
-        "__id__": 1389
-      },
-      {
-        "__id__": 1391
-      }
-    ],
-    "_prefab": {
-      "__id__": 1393
-    },
-    "_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": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1386
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 1388
-    },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1919.9999999999998
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "8dnEFMZhdBHZgGTN35mIfp"
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1386
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 1390
-    },
-    "_alignFlags": 45,
-    "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
-    "_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": "6d7HB/3g5J2LzW+CANn6gq"
-  },
-  {
-    "__type__": "cc.BlockInputEvents",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1386
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 1392
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "1aPZzXzAFCuZ93rILNDyPe"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "88eS+SRl1LOJg4IojX4U5f",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 1395
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 1080,
-      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -30503,7 +30349,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 1397
+      "__id__": 1389
     },
     "slotGame": {
       "__id__": 548
@@ -30534,9 +30380,6 @@
       "__id__": 1373
     },
     "slotRanking": null,
-    "gray": {
-      "__id__": 1386
-    },
     "_id": ""
   },
   {
@@ -30553,7 +30396,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 1399
+      "__id__": 1391
     },
     "_alignFlags": 45,
     "_target": null,
@@ -30591,10 +30434,10 @@
     "instance": null,
     "targetOverrides": [
       {
-        "__id__": 1401
+        "__id__": 1393
       },
       {
-        "__id__": 1404
+        "__id__": 1396
       }
     ],
     "nestedPrefabInstanceRoots": [
@@ -30615,7 +30458,7 @@
       "__id__": 563
     },
     "sourceInfo": {
-      "__id__": 1402
+      "__id__": 1394
     },
     "propertyPath": [
       "_target"
@@ -30624,7 +30467,7 @@
       "__id__": 563
     },
     "targetInfo": {
-      "__id__": 1403
+      "__id__": 1395
     }
   },
   {
@@ -30642,7 +30485,7 @@
   {
     "__type__": "cc.TargetOverrideInfo",
     "source": {
-      "__id__": 1396
+      "__id__": 1388
     },
     "sourceInfo": null,
     "propertyPath": [
@@ -30652,7 +30495,7 @@
       "__id__": 1376
     },
     "targetInfo": {
-      "__id__": 1405
+      "__id__": 1397
     }
   },
   {

assets/Game/prefabs/WebView/webView.prefab

@@ -1160,7 +1160,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -83.523,
+      "y": -70,
       "z": 0
     },
     "_lrot": {
@@ -1201,7 +1201,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 167.19189453125,
-      "height": 80
+      "height": 54.18
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1243,7 +1243,7 @@
     "_fontSize": 43,
     "_fontFamily": "Arial",
     "_lineHeight": 43,
-    "_overflow": 2,
+    "_overflow": 0,
     "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,

assets/Game/scripts/SlotBar.ts

@@ -11,7 +11,6 @@ import { I18nManager } from '../../Loading/scripts/manager/I18nManager';
 import { LocalizedSprite } from '../../Loading/scripts/i18n/LocalizedSprite';
 import { AudioManager } from '../../Loading/scripts/manager/AudioManager';
 import { SpinAni } from './game/SpinAni';
-import { SlotGame } from './SlotGame';
 const { ccclass, property } = _decorator;
 
 @ccclass('SlotBar')
@@ -23,9 +22,6 @@ export class SlotBar extends Component {
     @property({ type: Prefab })
     private autoSpinPanel: Prefab = null;
 
-    @property(SlotGame)
-    private slotGame: SlotGame = null;
-
     @property(Node)
     private tipSmall_turbo: Node = null;
     @property(Node)
@@ -416,33 +412,20 @@ export class SlotBar extends Component {
         if (this.isGetBalance) return
         this.isGetBalance = true;
         try {
-            let balacneData = await this.refreshBalanceFromServer();
+            let balacneData = await callGameBalanceApi({ GameId: getGameId() });
-            this.setBalance(balacneData)
+            this.setBalance(balacneData.Balance)
-            return balacneData;
+            return balacneData.Balance;
         } catch (err) {
             console.log('获取余额失败')
             return null;
         } finally {
             this.scheduleOnce(() => {
                 this.isGetBalance = false;
-            }, 0.5)
+            }, 1)
 
         }
     }
 
-    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;
-        }
-    }
-
     private currentTipTween: Tween<Node> = null;
     private hideTimer: number = null;
     showTipSmall(str: string, openTurbo?: boolean) {
@@ -609,8 +592,6 @@ export class SlotBar extends Component {
         this.setBtnEnable(this.menuBtn, false);
         this.setBtnEnable(this.spinBtn, false);
 
-        this.slotGame.showFeatureBuy(true)
-
         this.setBtnVisible(this.spinBtn, false);
         this.setBtnVisible(this.stopAutoBtn, true);
 
@@ -631,7 +612,6 @@ export class SlotBar extends Component {
         this.setBtnVisible(this.spinBtn, true);
         this.setBtnVisible(this.stopAutoBtn, false);
         this.setBtnEnable(this.spinBtn, false);
-        this.slotGame.showFeatureBuy(this.getBet() * this.gameInfo.BuyMul > this.gameInfo.MaxBuyBet)
     }
 
     reconnectState(hasDelete: boolean = false) {
@@ -809,27 +789,5 @@ export class SlotBar extends Component {
             this.setBet(this.betGrade[this.betIndex], true);
         }
     }
-    // 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(() => {
-            // this._refreshingBalance = false;
-            // }, 1)
 
 }
-    }
-}

assets/Game/scripts/SlotScene.ts

@@ -1,10 +1,10 @@
-import { _decorator, Component, Node, Prefab } from 'cc';
+import { _decorator, Component, Prefab } from 'cc';
 import { FREE_SPIN_ROLLER_RULE, GameInfo, ROLLER_RULE, SLOT_BAR_EVENT, SLOT_GAME_EVENT, SYS_GIFT, WIN_TYPE, testData } from './game/Define';
 import { SlotBar } from './SlotBar';
 import { SlotGame } from './SlotGame';
 import { BigWinUI } from './game/BigWinUI';
 import { GameDataManager } from '../../Loading/scripts/manager/GameDataManager';
-import { callGameApi, callGameBalanceApi, getGameId, getIsFrom } from '../../Loading/scripts/comm';
+import { callGameApi, getIsFrom } from '../../Loading/scripts/comm';
 import { TipPanel } from './game/TipPanel';
 import { I18nManager } from '../../Loading/scripts/manager/I18nManager';
 import { TotalWin } from './game/TotalWin';
@@ -72,17 +72,12 @@ export class SlotScene extends Component {
 
     @property(SlotRanking)
     slotRanking: SlotRanking = null;
-
-    @property(Node)
-    gray: Node = null;
-
     // 游戏数据
     private gameInfo: GameInfo = null;
     private spinInfo: any = null;
     private lastSpinInfo: any = null;
     private spinData: any = null;
     private isReceiveMsg: boolean = false;
-    private isErr2: boolean = false;
 
     private objectId: string[] = [];
 
@@ -128,6 +123,8 @@ export class SlotScene extends Component {
             this.lastSpinInfo = this.gameInfo;
             this.spinData = this.gameInfo.Data;
 
+            this.slotGame.showFeatureBuy(this.gameInfo.CloseBuyGame);
+
             // 注册事件监听            
             this.slotBar.node.on(SLOT_BAR_EVENT.ON_SPIN_CLICK, this.spinBtnClick, this);
             // this.slotBar.node.on(SLOT_BAR_EVENT.ON_TEST_SPIN_CLICK, this.spinBtnClick2, this);
@@ -243,15 +240,10 @@ export class SlotScene extends Component {
             this.slotBar.setWin(0);
         }
 
-        let curBalanceData = await this.slotBar.refreshBalanceFromServer()
+        if (this.slotBar.getBalance() < (isFeatureBuy ? this.slotBar.getBet() * this.gameInfo.BuyMul : this.slotBar.getBet()) && !isFreeSpin && !GameDataManager.instance.frb.Ongoing) {
-        if (!curBalanceData) {
-            curBalanceData = this.slotBar.getBalance()
-        }
-        if (curBalanceData < (isFeatureBuy ? this.slotBar.getBet() * this.gameInfo.BuyMul : this.slotBar.getBet()) && !isFreeSpin && !GameDataManager.instance.frb.Ongoing) {
             //余额不足不经过服务器，在客户端拦截
-            this.showErrorTip(2, () => { this.slotBar.onConfirmErr2() });
+            this.showErrorTip(2, () => { this.slotBar.onClickBalance() });
-            this.handleErrSpin(true);
+            this.handleErrSpin();
-            this.isErr2 = true;
             return
         }
         try {
@@ -386,7 +378,7 @@ export class SlotScene extends Component {
         this.slotGame.manualStop();
     }
 
-    private handleErrSpin(isErr2 = false) {
+    private handleErrSpin() {
         this.spinInfo = this.lastSpinInfo;
         this.spinData = this.spinInfo.Data;
         this.slotGame.setRollerIconRule(this.spinData.Mode == 0 ? ROLLER_RULE : FREE_SPIN_ROLLER_RULE);
@@ -396,8 +388,8 @@ export class SlotScene extends Component {
             this.spinData.RoundInfo.AllScore = 0;
         }
         this.slotGame.stopScroll(this.spinData, false, null);
-        // this.slotGame.manualStop();
+        this.slotGame.manualStop();
-        this.slotBar.setBalance(isErr2 ? this.slotBar.getBalance() : this.spinInfo.Balance);
+        this.slotBar.setBalance(this.spinInfo.Balance);
         this.slotBar.closeAutoSpin();
         this.slotGame.setFeatureBuyInteractable(true)
 
@@ -695,13 +687,8 @@ export class SlotScene extends Component {
     }
 
     private async normalStop(isReconnect: boolean = false) {
-        if (this.isErr2) {
-            this.isErr2 = false;
-            this.slotBar.setBalance(this.slotBar.getBalance());
-        } else {
         this.slotBar.setBalance(this.spinData.Balance);
-
+        let winType = this.slotGame.checkWinType(this.spinData.AllScore);
-        } let winType = this.slotGame.checkWinType(this.spinData.AllScore);
 
         await this.handleWinResult(winType, isReconnect, false, () => {
             this.checkAutoSpin(winType !== WIN_TYPE.NONE, isReconnect);
@@ -937,10 +924,9 @@ export class SlotScene extends Component {
 
             () => {
                 let isFrom = getIsFrom()
-                if (!isFrom || isFrom == "") {
+                if (!isFrom) {
                     window.close();
                 } else {
-                    this.gray.active = true
                     window.location.replace(isFrom)
                 }
             }, null,

assets/Loading/game.scene

@@ -187,7 +187,7 @@
     "_priority": 0,
     "_fov": 45,
     "_fovAxis": 0,
-    "_orthoHeight": 960,
+    "_orthoHeight": 959.9999999999999,
     "_near": 0,
     "_far": 2000,
     "_color": {

assets/Loading/scripts/LayoutAdapter.ts

@@ -1,9 +1,7 @@
 import { _decorator, Node, Component, screen, view, ResolutionPolicy, Sprite, sys, Label, Widget, Vec3, UITransform } from 'cc';
 import { LocalizedLabel } from './i18n/LocalizedLabel';
 import { getLanguage } from './comm';
-import { installLabelAlignmentCenterFix } from 'common_tools';
 
-installLabelAlignmentCenterFix();
 const { ccclass, property } = _decorator;
 export let SWITCH_PROTRAIT_MODE = {
     "da": "Skift venligst til portrættilstand",

assets/Loading/scripts/comm.ts

@@ -9,7 +9,7 @@ const qs = new URLSearchParams(location.search)
 
 // let apiaddr = "https://rpgames-api.rpfafafahkdev.com";
 let apiaddr = "";
-let token = "eyJQIjoxMDA5NDksIkUiOjE3ODI3NjA2MTIsIlMiOjEwMDQsIkQiOiJycF8xMDAxMiJ9.f8r8mMsNIh9XSXq-Ni_h2KRw4EBDu9pTWIfwAQw7O7U";
+let token = "eyJQIjoxMDAwMDEsIkUiOjE3ODExMTY1NjYsIlMiOjEwMDIsIkQiOiJycF8xMDAxMiJ9.I2959bskgMea99B9N_7_Lbb083gZcuov9nTDZX0hjRQ";
 let language = "en"
 let currency = "THB"
 let isfrom = null

package-lock.json

@@ -9,15 +9,9 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "common_tools": "git+ssh://git@gitea.rpfafafahkdev.com:taotao/common_tools.git",
         "nosleep.js": "^0.12.0"
       }
     },
-    "node_modules/common_tools": {
-      "version": "1.0.0",
-      "resolved": "git+ssh://git@gitea.rpfafafahkdev.com:taotao/common_tools.git#c49bf2990a6f348489505ac4998683c814b58dde",
-      "license": "MIT"
-    },
     "node_modules/nosleep.js": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/nosleep.js/-/nosleep.js-0.12.0.tgz",

package.json

@@ -14,7 +14,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "common_tools": "git+ssh://git@gitea.rpfafafahkdev.com:taotao/common_tools.git",
     "nosleep.js": "^0.12.0"
   }
 }