信息栏相关改动

assets/Game/prefabs/SlotScene.prefab

@@ -2294,7 +2294,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "72ushYN3xKg5m7fo94o6BO"
+    "fileId": "a7sZo/4KFAg4dM0eYp1MCX"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2304,7 +2304,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "47c3cBk6hK+r1OvPBCq8PW",
+    "fileId": "e2/5wGiZ5NaocYztMfiM8X",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -2335,7 +2335,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "e8/nkCNTRMm40ur8FY0/xe"
+    "fileId": "13RuIm/U5KvJWzdaFVmajJ"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2345,7 +2345,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "66MlCJ015LTZbGd4PD8VBV",
+    "fileId": "f2IxdT5KxPpqge68dMfh+s",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -2376,7 +2376,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "8cUZzB2RBD64owKwp0CuoR"
+    "fileId": "0cDh2zxHhEmagps3LScPEV"
   },
   {
     "__type__": "5fc10Zl7lVO97/rr2J1uxWH",
@@ -2400,7 +2400,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "e9VCIsVptH/a4hqUyQsg2P"
+    "fileId": "39Yt7NXRVByrhYJQAN2mOP"
   },
   {
     "__type__": "5fd13+Xa69CZogb3Q/F1lnC",
@@ -2573,7 +2573,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "d3VBi2mttGrpgMPoodAvfK",
+    "fileId": "07wF/lGUtAEYaj8CWODi1r",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -2598,7 +2598,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "b2Bf4gdutOvoM6jO1pu7Lz"
+    "fileId": "27OCNTlTpEm7qSp5Ny1dSl"
   },
   {
     "__type__": "cc.UITransform",
@@ -2626,7 +2626,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "46wj4Sr51PFLuGzbYVZbUT"
+    "fileId": "004sbjCAtEkph+P3yeLYCX"
   },
   {
     "__type__": "cc.Sprite",
@@ -2671,7 +2671,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "6c3Wqt9whBhYFdzKWVZ5aD"
+    "fileId": "667aGwYwlA35lwgJpIg25Z"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2681,7 +2681,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "4f6HxitzdKSJ+B9hVUKanQ",
+    "fileId": "fe3Ia8SkFNlp2ttnbkJI7V",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -2936,7 +2936,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "73SkqDw8lOyJX6z+83OwN0"
+    "fileId": "ffd87Xlp1A1pOo9FNl1L2a"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2946,7 +2946,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "25FuUBa+VCRq+yBqNLBZhZ",
+    "fileId": "a2yeS32WhJM6Gt3R9f3E/n",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -2977,7 +2977,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "e8vqsvsA1MbbFIYrIGR38J"
+    "fileId": "a0ZI6goUZLSb02riW4AlD8"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2987,7 +2987,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "68daSIEkFOkKKGx8NhbHsx",
+    "fileId": "7b3cTjkqdCubyY7zM8OVGg",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3018,7 +3018,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "51M3h/Ix9OdrHNhL6/yzNq"
+    "fileId": "19vjKLygpEspffwFE+YZQT"
   },
   {
     "__type__": "45522uB1sdFu4FJAojtnha4",
@@ -3042,7 +3042,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "94HVGALFhEWrBqrEkbxCPQ"
+    "fileId": "b41kUdL99FvIQ6yXb38CTI"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3052,7 +3052,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "bdeOQyVIxK16sbLx8jY7zH",
+    "fileId": "01D4tTtTtDk6RIj4Xll8bd",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3235,7 +3235,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "19CwxEmsVNlIVKkb68jCOo"
+    "fileId": "4dKoKSM7hKkZGEoBe28pwT"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3245,7 +3245,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "047NbH6lVFw6vo9/q3LV1f",
+    "fileId": "072MTyHENAzp+auLzXztdc",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3276,7 +3276,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "862BbYSp1OipFqWxmRspE/"
+    "fileId": "3aaFQew2hKkpwRdhDi5YNF"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3286,7 +3286,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "3aP9I3zQpJJaGK9PAATTYB",
+    "fileId": "91yuEHHeBI+7HxHns2Uql9",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3317,7 +3317,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "25OQLbc55M9Kgvac4P98WF"
+    "fileId": "f36RseaHtG+awb7p8eJ/7+"
   },
   {
     "__type__": "45522uB1sdFu4FJAojtnha4",
@@ -3341,7 +3341,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "6d6jj/VutFIY6d1yT1RFBB"
+    "fileId": "bfihdiSJ1Onadp8aId5sXy"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3351,7 +3351,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "25N4TJeW9NO4wf8nEIVHSr",
+    "fileId": "5e252Uwi1Cr5fPx19J9bxO",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3534,7 +3534,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "87Pb5Vx0ZEJa41ZmYZP5o7"
+    "fileId": "e9L9cSz5tFUbfO9L1sELUH"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3544,7 +3544,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "10qSUN8ctJHqWGmCBemnKn",
+    "fileId": "02/BfovcNFJ4RkCAzhVe/O",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3575,7 +3575,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "1aByQjlVJKsbR6eHRGY3Hg"
+    "fileId": "93ECHmScJCE7GfrZuq0NdC"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3585,7 +3585,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "9d00hIbTtPF4ASi0/WjBrv",
+    "fileId": "a4gu/aJFlFT5CzQVvg/UOZ",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3616,7 +3616,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "ebm2jc60JAWYLdELGo8hKV"
+    "fileId": "9etO3NKa1FkaNW+XyhMWD1"
   },
   {
     "__type__": "45522uB1sdFu4FJAojtnha4",
@@ -3640,7 +3640,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "967McGVshLup+ul5BKxMJg"
+    "fileId": "26QeGfm9BBaKEJKMH2LiW6"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3650,7 +3650,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "dcj9tqDNNDbaGKkb4ImBhF",
+    "fileId": "7ehcyGGBBH9KZBcrpHTZMm",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3833,7 +3833,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "9aa5DsEqhBdpxd0IFfs4Me"
+    "fileId": "f6ZODhcfBPkYFcD9rQsioJ"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3843,7 +3843,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "f3ROAlGMpGJIpLwf5D2Eg5",
+    "fileId": "1ejtB1podJgYZs4h6RO+3h",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3874,7 +3874,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "55u7qdRpVA7o6AzMTuq0oa"
+    "fileId": "95BDLK+mJLTacmy5D8uqvj"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3884,7 +3884,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "86V/MF2ZZNKb0YztZdwk59",
+    "fileId": "670ULK2BVE97BbxajSzg4r",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3915,7 +3915,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "b1IyB0ltpGOJQ6SJl76fCq"
+    "fileId": "69vPdlwZ5MO6hUBMkqi9oa"
   },
   {
     "__type__": "45522uB1sdFu4FJAojtnha4",
@@ -3939,7 +3939,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "b0jUF84GJJwa30SyTMAnEg"
+    "fileId": "7cleRweM1A7bUbHB6/IN2Q"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3949,7 +3949,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "87BM4jHX1JMZMLt60wIzPV",
+    "fileId": "4epwN2fSBLeLN16bZzrX7m",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -4132,7 +4132,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "e7YdKcthRG0IJOhqYmjk4y"
+    "fileId": "ed7x5FUE5EJJq5dhNjJXzp"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4142,7 +4142,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "9fWZowzS1CmrfhJJdwa/aK",
+    "fileId": "a8g/4gGMdFjomKm9XKSyme",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -4173,7 +4173,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "ealG5NsmVJz4Z+irr3l188"
+    "fileId": "311PZsRfdD+IWNZU7XlvCt"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4183,7 +4183,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "e1u4/XLgtBOqEJBcD0Xrl5",
+    "fileId": "5f0CLpJOtHib36Kzy8Orp6",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -4214,7 +4214,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "fc+d3c5GBFkYN6xqy0OZrf"
+    "fileId": "8ff/RcTHRLNavlT2PY3zw1"
   },
   {
     "__type__": "45522uB1sdFu4FJAojtnha4",
@@ -4238,7 +4238,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "00Pr7EpW5FK4bPXoUuut+W"
+    "fileId": "e3LPxitxtOqpC0raMS1r8N"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4248,7 +4248,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "35jlc8qTJBRoFz6yewXjNP",
+    "fileId": "64YmWpAgFO+qAVXvWc91hm",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -4431,7 +4431,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "f8dgQQgAZLoYuhYI4uuSIo"
+    "fileId": "287fCV4vJHD7ROL2E/oUPZ"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4441,7 +4441,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "e8FH7j8ApN76NEWCljcV4q",
+    "fileId": "a3tSBT37ZCp6q3uWp5Pvat",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -4472,7 +4472,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "31vrDONqBD3Zm9+nXOiJd8"
+    "fileId": "e3KgeiFe1GobQ1F+viF7mk"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4482,7 +4482,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "ec/7SSBQBCyJxTqdX6vxaL",
+    "fileId": "ebLP8Xx8JNtJ+hkpxkzaNx",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -4513,7 +4513,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "ab4WBHWZdIQrZw+xJeAZV2"
+    "fileId": "7b0gudoPZH16Qx2T6meDLV"
   },
   {
     "__type__": "45522uB1sdFu4FJAojtnha4",
@@ -4537,7 +4537,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "a589XnKxlFLav6xDDbj/IJ"
+    "fileId": "b2E4kRKLJPi5dkeTkIQ5/r"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4547,7 +4547,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "ee5eWRejZPH56tY/Pgr7yU",
+    "fileId": "a5y+eiMQZEbqqhTvajK7Ni",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -4572,7 +4572,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "c3QZ2idzVNArYapdjZKc0G"
+    "fileId": "00og4+xBhP9btTLeV15uQG"
   },
   {
     "__type__": "cc.UITransform",
@@ -4600,7 +4600,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "70U3G1ArxO6Yiz1ZhwqoRT"
+    "fileId": "a0jkfljNxMgZYsfAd5FYQ/"
   },
   {
     "__type__": "cc.Sprite",
@@ -4645,7 +4645,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "fa83ezSRNAm7XUvWm0ky3w"
+    "fileId": "2flyYR9lpOYYQctyuwmzr0"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4655,7 +4655,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "eaTz0P6bBL8pK5qzaxHhQD",
+    "fileId": "44UBc1LchENrvZhzpx/7Sg",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -9024,8 +9024,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 905,
+      "width": 1454.81005859375,
-      "height": 126
+      "height": 231.2899932861328
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -9039,7 +9039,7 @@
     "fileId": "dcNuCIXwJG9qoGTLnAw6y6"
   },
   {
-    "__type__": "cc.Sprite",
+    "__type__": "sp.Skeleton",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -9060,28 +9060,28 @@
       "b": 255,
       "a": 255
     },
-    "_spriteFrame": {
+    "_skeletonData": {
-      "__uuid__": "ba590657-856f-4f56-9ce5-0290c40ffb3f@f9941",
+      "__uuid__": "ad4ecbb8-d2ae-410b-b204-aaed61bc63e6",
-      "__expectedType__": "cc.SpriteFrame"
+      "__expectedType__": "sp.SkeletonData"
     },
-    "_type": 0,
+    "defaultSkin": "default",
-    "_fillType": 0,
+    "defaultAnimation": "anim1",
-    "_sizeMode": 1,
+    "_premultipliedAlpha": false,
-    "_fillCenter": {
+    "_timeScale": 1,
-      "__type__": "cc.Vec2",
+    "_preCacheMode": 0,
-      "x": 0,
+    "_cacheMode": 0,
-      "y": 0
+    "_sockets": [],
-    },
+    "_useTint": false,
-    "_fillStart": 0,
+    "_debugMesh": false,
-    "_fillRange": 0,
+    "_debugBones": false,
-    "_isTrimmedMode": true,
+    "_debugSlots": false,
-    "_useGrayscale": false,
+    "_enableBatch": false,
-    "_atlas": null,
+    "loop": true,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "ec0dMWapxNKobrvVRCFDX7"
+    "fileId": "62etvj+Y5FjpUqoQErYMAv"
   },
   {
     "__type__": "cc.PrefabInfo",

assets/Game/scripts/SlotGame.ts

@@ -37,6 +37,9 @@ export class SlotGame extends Component {
     private winTypeAni: Animation = null;
     // private winTypeParticle: ParticleSystem = null;
 
+    private normalMode: Node = null;
+
+
     private normalWin: Node = null;
     private normalWinLayout: Layout = null;
     // private normalWinSprite: Node = null;
@@ -101,6 +104,7 @@ export class SlotGame extends Component {
         // this.winTypeParticle = this.winType.getChildByName('ParticleNode').getChildByName('Particle').getComponent(ParticleSystem);
 
         let frameNode = this.winType.getChildByName('FrameNode');
+        this.normalMode = frameNode.getChildByName('marqueeFrame_01');
         this.normalWin = frameNode.getChildByName('marqueeFrame_02');
         this.totalWin = frameNode.getChildByName('marqueeFrame_03');
         this.oneScrtter = frameNode.getChildByName('oneScatter');
@@ -515,6 +519,9 @@ export class SlotGame extends Component {
     showWinScore(bol: boolean, isFirstWin: boolean, isBigWin: boolean, isReconnect: boolean, isNormalTotalWin: boolean, needTopScore?: boolean, score?: number) {
         // 隐藏
         if (!bol) {
+            this.normalMode.active = true
+            this.normalMode.getComponent(sp.Skeleton).setAnimation(0, `anim1`, true)
+
             this.normalWin.active = false;
             this.totalWin.active = false;
             this.winTypeAni.stop();
@@ -556,6 +563,7 @@ export class SlotGame extends Component {
                         this.normalWinLabel_top.node.setPosition(0, 350, 0)
                         this.normalWinLabel.string = gold2cash(this.allScore);
                         this.normalWinLayout.updateLayout();
+                        this.normalMode.active = false
                         this.playMarqueeAnimation(isFirstWin, isBigWin)
 
                     })
@@ -563,6 +571,7 @@ export class SlotGame extends Component {
             } else {
                 this.normalWinLabel.string = gold2cash(score);
                 this.normalWinLayout.updateLayout();
+                this.normalMode.active = false
                 this.playMarqueeAnimation(isFirstWin, isBigWin)
             }
         }
@@ -579,7 +588,7 @@ export class SlotGame extends Component {
 
         // 播放动画效果
         if (isFirstWin) {
-            for (let i = 1; i < 3; i++) {
+            for (let i = 0; i < 3; i++) {
                 if (children[i].active) {
                     children[i].getComponent(sp.Skeleton).setAnimation(0, `anim${i + 1}`, true)
                 }