diff --git a/assets/Game/fonts/咨询数字/nb_small2.fnt b/assets/Game/fonts/咨询数字/nb_small2.fnt index 87a586e..a6acd6f 100644 --- a/assets/Game/fonts/咨询数字/nb_small2.fnt +++ b/assets/Game/fonts/咨询数字/nb_small2.fnt @@ -2,14 +2,14 @@ info face="Arial" size=10 bold=0 italic=0 charset="" unicode=0 stretchH=100 smoo common lineHeight=56 base=10 scaleW=432 scaleH=56 pages=1 packed=0 page id=0 file="nb_small2.png" chars count=11 -char id=48 x=0 y=0 width=39 height=56 xoffset=0 yoffset=0 xadvance=39 page=0 chnl=0 page=0 letter="0" -char id=49 x=39 y=0 width=39 height=56 xoffset=0 yoffset=0 xadvance=39 page=0 chnl=0 page=0 letter="1" -char id=50 x=78 y=0 width=40 height=56 xoffset=0 yoffset=0 xadvance=40 page=0 chnl=0 page=0 letter="2" -char id=51 x=118 y=0 width=39 height=56 xoffset=0 yoffset=0 xadvance=39 page=0 chnl=0 page=0 letter="3" -char id=52 x=157 y=0 width=39 height=56 xoffset=0 yoffset=0 xadvance=39 page=0 chnl=0 page=0 letter="4" -char id=53 x=196 y=0 width=39 height=56 xoffset=0 yoffset=0 xadvance=39 page=0 chnl=0 page=0 letter="5" -char id=54 x=235 y=0 width=39 height=56 xoffset=0 yoffset=0 xadvance=39 page=0 chnl=0 page=0 letter="6" -char id=55 x=274 y=0 width=40 height=56 xoffset=0 yoffset=0 xadvance=40 page=0 chnl=0 page=0 letter="7" -char id=56 x=314 y=0 width=39 height=56 xoffset=0 yoffset=0 xadvance=39 page=0 chnl=0 page=0 letter="8" -char id=57 x=353 y=0 width=39 height=56 xoffset=0 yoffset=0 xadvance=39 page=0 chnl=0 page=0 letter="9" -char id=32 x=392 y=0 width=40 height=56 xoffset=0 yoffset=0 xadvance=40 page=0 chnl=0 page=0 letter="space" \ No newline at end of file +char id=48 x=0 y=0 width=39 height=56 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=0 page=0 letter="0" +char id=49 x=39 y=0 width=39 height=56 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=0 page=0 letter="1" +char id=50 x=78 y=0 width=40 height=56 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=0 page=0 letter="2" +char id=51 x=118 y=0 width=39 height=56 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=0 page=0 letter="3" +char id=52 x=157 y=0 width=39 height=56 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=0 page=0 letter="4" +char id=53 x=196 y=0 width=39 height=56 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=0 page=0 letter="5" +char id=54 x=235 y=0 width=39 height=56 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=0 page=0 letter="6" +char id=55 x=274 y=0 width=40 height=56 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=0 page=0 letter="7" +char id=56 x=314 y=0 width=39 height=56 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=0 page=0 letter="8" +char id=57 x=353 y=0 width=39 height=56 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=0 page=0 letter="9" +char id=32 x=392 y=0 width=40 height=56 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=0 page=0 letter="space" \ No newline at end of file diff --git a/assets/Game/fonts/咨询数字/nb_small2.fnt.meta b/assets/Game/fonts/咨询数字/nb_small2.fnt.meta index 2cbae84..f034c75 100644 --- a/assets/Game/fonts/咨询数字/nb_small2.fnt.meta +++ b/assets/Game/fonts/咨询数字/nb_small2.fnt.meta @@ -22,7 +22,7 @@ }, "xOffset": 0, "yOffset": 0, - "xAdvance": 40 + "xAdvance": 30 }, "48": { "rect": { @@ -33,7 +33,7 @@ }, "xOffset": 0, "yOffset": 0, - "xAdvance": 39 + "xAdvance": 30 }, "49": { "rect": { @@ -44,7 +44,7 @@ }, "xOffset": 0, "yOffset": 0, - "xAdvance": 39 + "xAdvance": 30 }, "50": { "rect": { @@ -55,7 +55,7 @@ }, "xOffset": 0, "yOffset": 0, - "xAdvance": 40 + "xAdvance": 30 }, "51": { "rect": { @@ -66,7 +66,7 @@ }, "xOffset": 0, "yOffset": 0, - "xAdvance": 39 + "xAdvance": 30 }, "52": { "rect": { @@ -77,7 +77,7 @@ }, "xOffset": 0, "yOffset": 0, - "xAdvance": 39 + "xAdvance": 30 }, "53": { "rect": { @@ -88,7 +88,7 @@ }, "xOffset": 0, "yOffset": 0, - "xAdvance": 39 + "xAdvance": 30 }, "54": { "rect": { @@ -99,7 +99,7 @@ }, "xOffset": 0, "yOffset": 0, - "xAdvance": 39 + "xAdvance": 30 }, "55": { "rect": { @@ -110,7 +110,7 @@ }, "xOffset": 0, "yOffset": 0, - "xAdvance": 40 + "xAdvance": 30 }, "56": { "rect": { @@ -121,7 +121,7 @@ }, "xOffset": 0, "yOffset": 0, - "xAdvance": 39 + "xAdvance": 30 }, "57": { "rect": { @@ -132,7 +132,7 @@ }, "xOffset": 0, "yOffset": 0, - "xAdvance": 39 + "xAdvance": 30 } }, "kerningDict": {} diff --git a/assets/Game/prefabs/Game/iconMsg.prefab b/assets/Game/prefabs/Game/iconMsg.prefab index c32a12c..5521d54 100644 --- a/assets/Game/prefabs/Game/iconMsg.prefab +++ b/assets/Game/prefabs/Game/iconMsg.prefab @@ -1028,7 +1028,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 87.6, + "width": 73.2, "height": 20 }, "_anchorPoint": { @@ -1447,7 +1447,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 87.6, + "width": 73.2, "height": 20 }, "_anchorPoint": { @@ -1866,7 +1866,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 87.6, + "width": 73.2, "height": 20 }, "_anchorPoint": { @@ -2285,7 +2285,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 87.6, + "width": 73.2, "height": 20 }, "_anchorPoint": { @@ -4068,7 +4068,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 87.6, + "width": 73.2, "height": 20 }, "_anchorPoint": { @@ -4487,7 +4487,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 87.6, + "width": 73.2, "height": 20 }, "_anchorPoint": { @@ -4906,7 +4906,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 87.6, + "width": 73.2, "height": 20 }, "_anchorPoint": { @@ -5325,7 +5325,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 87.6, + "width": 73.2, "height": 20 }, "_anchorPoint": { diff --git a/assets/Game/prefabs/SlotScene.prefab b/assets/Game/prefabs/SlotScene.prefab index dfecf84..0e53c25 100644 --- a/assets/Game/prefabs/SlotScene.prefab +++ b/assets/Game/prefabs/SlotScene.prefab @@ -2294,7 +2294,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b1UZGhYnlDS5qQd410OXNq" + "fileId": "44pqqT+lZLAp3S8UZvRLl+" }, { "__type__": "cc.PrefabInfo", @@ -2304,7 +2304,7 @@ "asset": { "__id__": 0 }, - "fileId": "c4yW4AEVBGVYooCu8XWuVL", + "fileId": "48moLswplCbr4OZO+HaWRH", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2335,7 +2335,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2ae7o6KyZIDa+JIPnz97Se" + "fileId": "2fI0yU1H9Ml6Sp0wWb0P8J" }, { "__type__": "cc.PrefabInfo", @@ -2345,7 +2345,7 @@ "asset": { "__id__": 0 }, - "fileId": "cfdsZr26BPSJSSUxFu3AZI", + "fileId": "dbE9bDVCBGXpT8V8vXqx0X", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2376,7 +2376,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5eLWf5HWNEtZFs3W4jOEmv" + "fileId": "c8fOZvoO9JBYDC6zu/zMlO" }, { "__type__": "5fc10Zl7lVO97/rr2J1uxWH", @@ -2400,7 +2400,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ebO7ykMwhOQqqnhHD/4+ZU" + "fileId": "adJigKu0xEzbS9i3yyMxRS" }, { "__type__": "5fd13+Xa69CZogb3Q/F1lnC", @@ -2573,7 +2573,7 @@ "asset": { "__id__": 0 }, - "fileId": "fdGsO7ANdJqaRwPVDkR0vb", + "fileId": "7e643PlHBGL6x5xfgqwGTu", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2598,7 +2598,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "baNHPSFPJGkLEFGWEKkiQB" + "fileId": "83uEe4WG5NpIk/HidMJ4bb" }, { "__type__": "cc.UITransform", @@ -2626,7 +2626,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "bcm/IC3d1OiKF2768810eV" + "fileId": "f0MjYMaw9M+b9tOgnKiFvl" }, { "__type__": "cc.Sprite", @@ -2671,7 +2671,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "59Ddr5++RGf5VjCO3C0Rek" + "fileId": "6eM5CU7IpGRLuYCmrS1aL6" }, { "__type__": "cc.PrefabInfo", @@ -2681,7 +2681,7 @@ "asset": { "__id__": 0 }, - "fileId": "36OwIYCzhHUKvlTUwaJVRE", + "fileId": "b6EJbHrnJCaYizs95E4lTH", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2936,7 +2936,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d4EskfufZNdp+appetEVn+" + "fileId": "d56JkveQtPBZwro4iS0gAj" }, { "__type__": "cc.PrefabInfo", @@ -2946,7 +2946,7 @@ "asset": { "__id__": 0 }, - "fileId": "98ZMWTIeBOObAgN9dT/Tii", + "fileId": "b5JuQPu5VCALsvY240jU0g", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2977,7 +2977,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3aG4PqO0lG5oL+l2dq3pnr" + "fileId": "d4443813tGMJ7KAB8hzUfZ" }, { "__type__": "cc.PrefabInfo", @@ -2987,7 +2987,7 @@ "asset": { "__id__": 0 }, - "fileId": "29CXlCyrtL2q5YqiP+lvWI", + "fileId": "4cl174DUBNE4442+L1yVam", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3018,7 +3018,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a3lBcyQYNFAIxs6Y49+xwW" + "fileId": "4eKNm36SFPupfBrbD++xd9" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3042,7 +3042,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a3uE1/1jpClIB8mCtSprAN" + "fileId": "01/nuhIS5NE7O3NMhVBAR1" }, { "__type__": "cc.PrefabInfo", @@ -3052,7 +3052,7 @@ "asset": { "__id__": 0 }, - "fileId": "ccfD3hCwpAnZeSGVJ9WEpC", + "fileId": "a78hHKPD1D4bwaTNdQXlDP", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3235,7 +3235,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "76AyTDwfxEDZ6wJfKzrH1Z" + "fileId": "e3lhwBRYhGoowtMdJrBY2e" }, { "__type__": "cc.PrefabInfo", @@ -3245,7 +3245,7 @@ "asset": { "__id__": 0 }, - "fileId": "f4TawvGHdJSL6MNlVERbXE", + "fileId": "cbXeDluilD0Z+WiWqQ8j8U", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3276,7 +3276,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "70FmIa83pDDKi++n9OgY3c" + "fileId": "3fS5A3/sNLyqulx2tCaHnL" }, { "__type__": "cc.PrefabInfo", @@ -3286,7 +3286,7 @@ "asset": { "__id__": 0 }, - "fileId": "e9LC6tBxVJcKjbjHWnOqAw", + "fileId": "aaOqwO8ptB3qjaiwAlRt0F", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3317,7 +3317,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d53TKXLYlDhISfd2wvmMvk" + "fileId": "32dhBQaJZMMptdXX+vX3jj" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3341,7 +3341,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "99uiXxoJNPdIMDrnNDt9ac" + "fileId": "2aS0sYXVNDUYAR5IWVNt47" }, { "__type__": "cc.PrefabInfo", @@ -3351,7 +3351,7 @@ "asset": { "__id__": 0 }, - "fileId": "e1b2LNfeRL3YiGLm9pUSc6", + "fileId": "40JynHSglBe7iSYw1UQo2w", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3534,7 +3534,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "96sGITz61GNoKhz10e0zxI" + "fileId": "f4DMh5FaZFcoNptHoiqJRw" }, { "__type__": "cc.PrefabInfo", @@ -3544,7 +3544,7 @@ "asset": { "__id__": 0 }, - "fileId": "f7t057YCFKeo89icw1rU9m", + "fileId": "6fKYcSGIJLlaC2FqlLPV2M", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3575,7 +3575,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "41fqVxa8BBb6gTKEWMEcdn" + "fileId": "7ek7D0McRCkaSJREU4celb" }, { "__type__": "cc.PrefabInfo", @@ -3585,7 +3585,7 @@ "asset": { "__id__": 0 }, - "fileId": "0b/VMTX8ZPD7h6CqeI0QDr", + "fileId": "abrqxhFZhICZXx4i2NbhS4", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3616,7 +3616,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8bP3G0zz1Aub0TKIrtO2Hf" + "fileId": "6cy4TaSuZP3rO9T2mS4GDO" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3640,7 +3640,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "37m2NWmuBB07kKo1e7k3Zr" + "fileId": "7dSC8N2NBJs5SomC4K811w" }, { "__type__": "cc.PrefabInfo", @@ -3650,7 +3650,7 @@ "asset": { "__id__": 0 }, - "fileId": "90AXGK5rJPXaNIeLLvRwFt", + "fileId": "3cXbkcBaRAI4BQpJpxmlVL", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3833,7 +3833,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "80e6Ui5pJNzpT63Ggf2JI7" + "fileId": "59W9CtDtNGoaPgU+uegM/B" }, { "__type__": "cc.PrefabInfo", @@ -3843,7 +3843,7 @@ "asset": { "__id__": 0 }, - "fileId": "91QXkPZN9NArJ0RbEDFhIx", + "fileId": "5aOF0MeUhNFq0ofOk74oSV", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3874,7 +3874,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "65CGCJoTZAM4Dmpe7XMTFL" + "fileId": "99ov3/dBlOo6oxGzgmgeQo" }, { "__type__": "cc.PrefabInfo", @@ -3884,7 +3884,7 @@ "asset": { "__id__": 0 }, - "fileId": "09skpCpWZO/KhyeaBwQKA7", + "fileId": "46XzAi6n5P87Og2jbt5r6U", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3915,7 +3915,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a0Kd8SHupMR5mBtUAvEfyV" + "fileId": "00/BZ2Mm5BkoJ/6R56jfub" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3939,7 +3939,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1aOg1hDK9OkplAcChKlGXK" + "fileId": "27iItRD/NJZ4jZBQzE7B5K" }, { "__type__": "cc.PrefabInfo", @@ -3949,7 +3949,7 @@ "asset": { "__id__": 0 }, - "fileId": "bbR1jR+W9Gw5Ow/yfvi2kU", + "fileId": "4eyCxtO6lGLI/b7bzDm6nY", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4132,7 +4132,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c1jAQ/xLlM9IumrCeM+KIT" + "fileId": "01w1o6YZlJJq6Dd+HqJ+RE" }, { "__type__": "cc.PrefabInfo", @@ -4142,7 +4142,7 @@ "asset": { "__id__": 0 }, - "fileId": "6cKkBQBu1E1ZLwyPa+bF/W", + "fileId": "86KGrhgAZAOrt/qtPmCuOu", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4173,7 +4173,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "76l8/QSN5HNY3weggGlNWF" + "fileId": "b5x8fP2SRACZgtOU2ryfU4" }, { "__type__": "cc.PrefabInfo", @@ -4183,7 +4183,7 @@ "asset": { "__id__": 0 }, - "fileId": "01PYopa1FIq4IZkQhtr2v5", + "fileId": "06dsySBaNIJqsI8QIjM/I+", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4214,7 +4214,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "73/cUOjoNJNpcjVe7KMwL8" + "fileId": "26/yo+KMpKcZrePD5vtGhj" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4238,7 +4238,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "159GD9pApLmaoZXLZ2uFb0" + "fileId": "4ab2lWOG9Kt6vNSMp1C7h6" }, { "__type__": "cc.PrefabInfo", @@ -4248,7 +4248,7 @@ "asset": { "__id__": 0 }, - "fileId": "97JOQlosJO6JAhMVaBBbZV", + "fileId": "00rqgcBpJCGrKyQGgNzsf9", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4431,7 +4431,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "65BKG0/9BBgJIkO4RkVpS5" + "fileId": "6aEFpGvKlEuK9ST4paLd2o" }, { "__type__": "cc.PrefabInfo", @@ -4441,7 +4441,7 @@ "asset": { "__id__": 0 }, - "fileId": "27kccxIShFgrT4mUtlDjHT", + "fileId": "21gbjlLhpI54h4xisGGVhU", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4472,7 +4472,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "af3SZoAAZNc5163njVxb/M" + "fileId": "f5JYs39JtKKotle7+yCJHs" }, { "__type__": "cc.PrefabInfo", @@ -4482,7 +4482,7 @@ "asset": { "__id__": 0 }, - "fileId": "benXQIh/BAvJttj0x2Xyt6", + "fileId": "20Ys7cJrRA07by9s5VaOI+", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4513,7 +4513,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "0eYTc5mq9O66gPzjsLcxyP" + "fileId": "32NsDtA6BJoqkX+eD5NHRb" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4537,7 +4537,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "87vFhUNqlFTa7wA3v0Mulu" + "fileId": "23+cstac1HsJsdPzZWcko2" }, { "__type__": "cc.PrefabInfo", @@ -4547,7 +4547,7 @@ "asset": { "__id__": 0 }, - "fileId": "a5OedUx/VDsJu+6Nhg0Gd7", + "fileId": "6eTzoQWh5GeqYNy8iopDNy", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4572,7 +4572,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "bboycfwKJBXYj3PAdFxcff" + "fileId": "7090+aMHlOp7mnIt68RANx" }, { "__type__": "cc.UITransform", @@ -4600,7 +4600,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "864K08xCFIDqtoE+rIUMD9" + "fileId": "57/M4ldzRJdI0w5Cw08yf4" }, { "__type__": "cc.Sprite", @@ -4645,7 +4645,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "74H2F+59FJur4tfmMs/fGf" + "fileId": "a8UAnP8V9Czr7gLma6Q9Z6" }, { "__type__": "cc.PrefabInfo", @@ -4655,7 +4655,7 @@ "asset": { "__id__": 0 }, - "fileId": "c8Go9NL4lL/Ixd9z1fEoFP", + "fileId": "f9WiabnXtG7a2ZVaCjjI1S", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null diff --git a/assets/Game/scripts/SlotBar.ts b/assets/Game/scripts/SlotBar.ts index 2a276f0..d8eb6bd 100644 --- a/assets/Game/scripts/SlotBar.ts +++ b/assets/Game/scripts/SlotBar.ts @@ -301,7 +301,7 @@ export class SlotBar extends Component { manualStop() { this.hasClickManualStop = true; - this.spinAni.stopSpin(); + this.spinAniStop() this.setBtnEnable(this.spinBtn, false); } @@ -562,7 +562,6 @@ export class SlotBar extends Component { this.manualStopNode.active = false this.isAuto = false; this.setBtnVisible(this.spinBtn, true); - this.spinAni.stopSpin(); this.setBtnVisible(this.stopAutoBtn, false); this.setBtnEnable(this.spinBtn, true); @@ -572,6 +571,10 @@ export class SlotBar extends Component { this.setBtnEnable(this.autoBtn, true); } + spinAniStop() { + this.spinAni.stopSpin(); + } + onTurboMouseDown() { this.unscheduleAllCallbacks(); this.turboBtnAni.stop(); diff --git a/assets/Game/scripts/SlotScene.ts b/assets/Game/scripts/SlotScene.ts index 245dff5..945e6fe 100644 --- a/assets/Game/scripts/SlotScene.ts +++ b/assets/Game/scripts/SlotScene.ts @@ -750,6 +750,7 @@ export class SlotScene extends Component { let delay = 0.1 // 2 if (winType === WIN_TYPE.NONE) { + this.slotBar.spinAniStop() //小游戏中增加新倍率但没有赢分 if (this.spinData.XnInfo.AddN > 1 && isFreeSpin && !this.isfirstSpinInFreeMode()) { delay = 2.2 @@ -784,13 +785,13 @@ export class SlotScene extends Component { this.slotBar.setWin(this.spinData.AllScore); callback?.(); }); - this.BigWinUI.show(score, winType, this.slotBar.getBet()); + this.BigWinUI.show(score, winType, this.slotBar.getBet(), isFreeSpin); } else { this.slotGame.showWinScore(true, false, true, false, true, false, score); this.slotBar.setWin(this.spinData.AllScore); callback?.(); } - + this.slotBar.spinAniStop() this.slotBar.setGraySpinBtn(false) }, delay) diff --git a/assets/Game/scripts/game/BigWinUI.ts b/assets/Game/scripts/game/BigWinUI.ts index d91e9d2..bbe978d 100644 --- a/assets/Game/scripts/game/BigWinUI.ts +++ b/assets/Game/scripts/game/BigWinUI.ts @@ -50,13 +50,16 @@ export class BigWinUI extends Component { // 添加一个标记来区分是否是点击跳过 isSkipByTouch: boolean = false; + isfree: boolean = false;//是否在小游戏内 + protected onLoad(): void { - // this.show(600000, WIN_TYPE.SUPER_MEGA_WIN, 10000) + // this.show(600000, WIN_TYPE.SUPER_MEGA_WIN, 10000,false) } - show(winScore: number, winType: WIN_TYPE, betAmount: number) { + show(winScore: number, winType: WIN_TYPE, betAmount: number, isFreeSpin: boolean) { this.bigWinUINode = NodePoolManager.instance.getNodeFromPoolStatic('bigWinUI', this.bigWinUiPre); - + this.isfree = isFreeSpin + AudioManager.instance.stopBGM() this.scoreLabel = this.bigWinUINode.getChildByName('score').getComponent(Label); this.winMainSpine = this.bigWinUINode.getChildByName('winMain').getComponent(sp.Skeleton); this.bigwinLabelSprite = this.bigWinUINode.getChildByName('bigwinLabel').getComponent(Sprite); @@ -545,6 +548,7 @@ export class BigWinUI extends Component { // this.winLabelSprite.setCompleteListener(null); // } this.bigWinUINode.off(Node.EventType.TOUCH_START, this.onTouch, this); + AudioManager.instance.playBGM(this.isfree ? 'Free_Mode_BGM' : 'Normal_Mode_BGM') this.hide(); } diff --git a/assets/Game/scripts/game/SpinAni.ts b/assets/Game/scripts/game/SpinAni.ts index c99f7fa..c0072ba 100644 --- a/assets/Game/scripts/game/SpinAni.ts +++ b/assets/Game/scripts/game/SpinAni.ts @@ -13,11 +13,12 @@ export class SpinAni extends Component { private playIdleSpin() { this.rotateSpine.timeScale = 1 + this.rotateSpine.clearTracks() this.rotateSpine.setAnimation(0, 'idle', true) } public startSpin(isFastSpin: boolean) { - // this.rotateSpine.timeScale = isFastSpin ? 2 : 1 + this.rotateSpine.timeScale = isFastSpin ? 2 : 1 this.rotateSpine.setAnimation(0, 'Click', true)