diff --git a/assets/Game/fonts/字体.meta b/assets/Game/fonts/字体.meta index a2852b6..7758f03 100644 --- a/assets/Game/fonts/字体.meta +++ b/assets/Game/fonts/字体.meta @@ -2,7 +2,7 @@ "ver": "1.2.0", "importer": "directory", "imported": true, - "uuid": "3c4d4994-66fc-45a9-8cf6-841ded1e5d20", + "uuid": "5988a31c-346d-4df5-92a3-177855d991f6", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/Game/fonts/字体.zip b/assets/Game/fonts/字体.zip new file mode 100644 index 0000000..2f544fc Binary files /dev/null and b/assets/Game/fonts/字体.zip differ diff --git a/assets/Game/fonts/字体.zip.meta b/assets/Game/fonts/字体.zip.meta new file mode 100644 index 0000000..379cbf5 --- /dev/null +++ b/assets/Game/fonts/字体.zip.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.0.0", + "importer": "*", + "imported": true, + "uuid": "eebf365b-9852-4f64-8dfc-e7c3b69aedae", + "files": [ + ".json", + ".zip" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/Game/fonts/字体/ways数字.meta b/assets/Game/fonts/字体/ways数字.meta index ded06de..23e6336 100644 --- a/assets/Game/fonts/字体/ways数字.meta +++ b/assets/Game/fonts/字体/ways数字.meta @@ -2,7 +2,7 @@ "ver": "1.2.0", "importer": "directory", "imported": true, - "uuid": "21c83ffb-1785-4aab-88f2-448c5ecbaafa", + "uuid": "e6ee7498-3d84-48e4-9eae-fb7159842fc0", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/Game/fonts/字体/ways数字/ways.fnt b/assets/Game/fonts/字体/ways数字/ways.fnt old mode 100755 new mode 100644 diff --git a/assets/Game/fonts/字体/ways数字/ways.png b/assets/Game/fonts/字体/ways数字/ways.png old mode 100755 new mode 100644 index 19a858d..78a76d1 Binary files a/assets/Game/fonts/字体/ways数字/ways.png and b/assets/Game/fonts/字体/ways数字/ways.png differ diff --git a/assets/Game/fonts/字体/win数字.meta b/assets/Game/fonts/字体/win数字.meta index 8763246..b1402f1 100644 --- a/assets/Game/fonts/字体/win数字.meta +++ b/assets/Game/fonts/字体/win数字.meta @@ -2,7 +2,7 @@ "ver": "1.2.0", "importer": "directory", "imported": true, - "uuid": "3237faf3-dca4-447b-a5e2-4f447ae4a05d", + "uuid": "310e3d04-88e0-418e-bd8d-4867846775f2", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/Game/fonts/字体/win数字/win_nb.fnt b/assets/Game/fonts/字体/win数字/win_nb.fnt old mode 100755 new mode 100644 diff --git a/assets/Game/fonts/字体/win数字/win_nb.png b/assets/Game/fonts/字体/win数字/win_nb.png old mode 100755 new mode 100644 index b8ac8e2..92e33b6 Binary files a/assets/Game/fonts/字体/win数字/win_nb.png and b/assets/Game/fonts/字体/win数字/win_nb.png differ diff --git a/assets/Game/fonts/字体/免费模式又触发免费模式数字.meta b/assets/Game/fonts/字体/免费模式又触发免费模式数字.meta index adba985..25a4104 100644 --- a/assets/Game/fonts/字体/免费模式又触发免费模式数字.meta +++ b/assets/Game/fonts/字体/免费模式又触发免费模式数字.meta @@ -2,7 +2,7 @@ "ver": "1.2.0", "importer": "directory", "imported": true, - "uuid": "b8417a35-8c66-4da6-83a2-299d660d5344", + "uuid": "70480116-1631-4590-bdd4-e55bf24619a3", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/Game/fonts/字体/免费模式又触发免费模式数字/mf_nb.fnt b/assets/Game/fonts/字体/免费模式又触发免费模式数字/mf_nb.fnt old mode 100755 new mode 100644 index 121d43a..c84e4d6 --- a/assets/Game/fonts/字体/免费模式又触发免费模式数字/mf_nb.fnt +++ b/assets/Game/fonts/字体/免费模式又触发免费模式数字/mf_nb.fnt @@ -1,16 +1,16 @@ info face="Arial" size=10 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=2,2 -common lineHeight=380 base=10 scaleW=5280 scaleH=380 pages=1 packed=0 +common lineHeight=232 base=10 scaleW=3339 scaleH=232 pages=1 packed=0 page id=0 file="mf_nb.png" chars count=12 -char id=120 x=0 y=0 width=440 height=380 xoffset=0 yoffset=0 xadvance=440 page=0 chnl=0 page=0 letter="x" -char id=48 x=440 y=0 width=440 height=380 xoffset=0 yoffset=0 xadvance=440 page=0 chnl=0 page=0 letter="0" -char id=49 x=880 y=0 width=440 height=380 xoffset=0 yoffset=0 xadvance=440 page=0 chnl=0 page=0 letter="1" -char id=50 x=1320 y=0 width=440 height=380 xoffset=0 yoffset=0 xadvance=440 page=0 chnl=0 page=0 letter="2" -char id=51 x=1760 y=0 width=440 height=380 xoffset=0 yoffset=0 xadvance=440 page=0 chnl=0 page=0 letter="3" -char id=52 x=2200 y=0 width=440 height=380 xoffset=0 yoffset=0 xadvance=440 page=0 chnl=0 page=0 letter="4" -char id=53 x=2640 y=0 width=440 height=380 xoffset=0 yoffset=0 xadvance=440 page=0 chnl=0 page=0 letter="5" -char id=54 x=3080 y=0 width=440 height=380 xoffset=0 yoffset=0 xadvance=440 page=0 chnl=0 page=0 letter="6" -char id=55 x=3520 y=0 width=440 height=380 xoffset=0 yoffset=0 xadvance=440 page=0 chnl=0 page=0 letter="7" -char id=56 x=3960 y=0 width=440 height=380 xoffset=0 yoffset=0 xadvance=440 page=0 chnl=0 page=0 letter="8" -char id=57 x=4400 y=0 width=440 height=380 xoffset=0 yoffset=0 xadvance=440 page=0 chnl=0 page=0 letter="9" -char id=32 x=4840 y=0 width=440 height=380 xoffset=0 yoffset=0 xadvance=440 page=0 chnl=0 page=0 letter="space" \ No newline at end of file +char id=57 x=0 y=0 width=298 height=232 xoffset=0 yoffset=0 xadvance=298 page=0 chnl=0 page=0 letter="9" +char id=48 x=298 y=0 width=299 height=232 xoffset=0 yoffset=0 xadvance=299 page=0 chnl=0 page=0 letter="0" +char id=49 x=597 y=0 width=165 height=232 xoffset=0 yoffset=0 xadvance=165 page=0 chnl=0 page=0 letter="1" +char id=50 x=762 y=0 width=298 height=232 xoffset=0 yoffset=0 xadvance=298 page=0 chnl=0 page=0 letter="2" +char id=51 x=1060 y=0 width=301 height=232 xoffset=0 yoffset=0 xadvance=301 page=0 chnl=0 page=0 letter="3" +char id=52 x=1361 y=0 width=290 height=232 xoffset=0 yoffset=0 xadvance=290 page=0 chnl=0 page=0 letter="4" +char id=53 x=1651 y=0 width=298 height=232 xoffset=0 yoffset=0 xadvance=298 page=0 chnl=0 page=0 letter="5" +char id=54 x=1949 y=0 width=298 height=232 xoffset=0 yoffset=0 xadvance=298 page=0 chnl=0 page=0 letter="6" +char id=55 x=2247 y=0 width=278 height=232 xoffset=0 yoffset=0 xadvance=278 page=0 chnl=0 page=0 letter="7" +char id=56 x=2525 y=0 width=298 height=232 xoffset=0 yoffset=0 xadvance=298 page=0 chnl=0 page=0 letter="8" +char id=120 x=2823 y=0 width=215 height=170 xoffset=0 yoffset=40 xadvance=215 page=0 chnl=0 page=0 letter="x" +char id=32 x=3038 y=0 width=301 height=232 xoffset=0 yoffset=0 xadvance=301 page=0 chnl=0 page=0 letter="space" \ No newline at end of file diff --git a/assets/Game/fonts/字体/免费模式又触发免费模式数字/mf_nb.fnt.meta b/assets/Game/fonts/字体/免费模式又触发免费模式数字/mf_nb.fnt.meta index cb7cdaa..d0ad2a2 100644 --- a/assets/Game/fonts/字体/免费模式又触发免费模式数字/mf_nb.fnt.meta +++ b/assets/Game/fonts/字体/免费模式又触发免费模式数字/mf_nb.fnt.meta @@ -9,141 +9,141 @@ "subMetas": {}, "userData": { "_fntConfig": { - "commonHeight": 380, + "commonHeight": 232, "fontSize": 10, "atlasName": "mf_nb.png", "fontDefDictionary": { "32": { "rect": { - "x": 4840, + "x": 3038, "y": 0, - "width": 440, - "height": 380 + "width": 301, + "height": 232 }, "xOffset": 0, "yOffset": 0, - "xAdvance": 440 + "xAdvance": 301 }, "48": { "rect": { - "x": 440, + "x": 298, "y": 0, - "width": 440, - "height": 380 + "width": 299, + "height": 232 }, "xOffset": 0, "yOffset": 0, - "xAdvance": 440 + "xAdvance": 299 }, "49": { "rect": { - "x": 880, + "x": 597, "y": 0, - "width": 440, - "height": 380 + "width": 165, + "height": 232 }, "xOffset": 0, "yOffset": 0, - "xAdvance": 440 + "xAdvance": 165 }, "50": { "rect": { - "x": 1320, + "x": 762, "y": 0, - "width": 440, - "height": 380 + "width": 298, + "height": 232 }, "xOffset": 0, "yOffset": 0, - "xAdvance": 440 + "xAdvance": 298 }, "51": { "rect": { - "x": 1760, + "x": 1060, "y": 0, - "width": 440, - "height": 380 + "width": 301, + "height": 232 }, "xOffset": 0, "yOffset": 0, - "xAdvance": 440 + "xAdvance": 301 }, "52": { "rect": { - "x": 2200, + "x": 1361, "y": 0, - "width": 440, - "height": 380 + "width": 290, + "height": 232 }, "xOffset": 0, "yOffset": 0, - "xAdvance": 440 + "xAdvance": 290 }, "53": { "rect": { - "x": 2640, + "x": 1651, "y": 0, - "width": 440, - "height": 380 + "width": 298, + "height": 232 }, "xOffset": 0, "yOffset": 0, - "xAdvance": 440 + "xAdvance": 298 }, "54": { "rect": { - "x": 3080, + "x": 1949, "y": 0, - "width": 440, - "height": 380 + "width": 298, + "height": 232 }, "xOffset": 0, "yOffset": 0, - "xAdvance": 440 + "xAdvance": 298 }, "55": { "rect": { - "x": 3520, + "x": 2247, "y": 0, - "width": 440, - "height": 380 + "width": 278, + "height": 232 }, "xOffset": 0, "yOffset": 0, - "xAdvance": 440 + "xAdvance": 278 }, "56": { "rect": { - "x": 3960, + "x": 2525, "y": 0, - "width": 440, - "height": 380 + "width": 298, + "height": 232 }, "xOffset": 0, "yOffset": 0, - "xAdvance": 440 + "xAdvance": 298 }, "57": { "rect": { - "x": 4400, + "x": 0, "y": 0, - "width": 440, - "height": 380 + "width": 298, + "height": 232 }, "xOffset": 0, "yOffset": 0, - "xAdvance": 440 + "xAdvance": 298 }, "120": { "rect": { - "x": 0, + "x": 2823, "y": 0, - "width": 440, - "height": 380 + "width": 215, + "height": 170 }, "xOffset": 0, - "yOffset": 0, - "xAdvance": 440 + "yOffset": 40, + "xAdvance": 215 } }, "kerningDict": {} diff --git a/assets/Game/fonts/字体/免费模式又触发免费模式数字/mf_nb.png b/assets/Game/fonts/字体/免费模式又触发免费模式数字/mf_nb.png old mode 100755 new mode 100644 index 6cb100a..4cb9f2f Binary files a/assets/Game/fonts/字体/免费模式又触发免费模式数字/mf_nb.png and b/assets/Game/fonts/字体/免费模式又触发免费模式数字/mf_nb.png differ diff --git a/assets/Game/fonts/字体/免费模式又触发免费模式数字/mf_nb.png.meta b/assets/Game/fonts/字体/免费模式又触发免费模式数字/mf_nb.png.meta index ae5ea70..ae774ec 100644 --- a/assets/Game/fonts/字体/免费模式又触发免费模式数字/mf_nb.png.meta +++ b/assets/Game/fonts/字体/免费模式又触发免费模式数字/mf_nb.png.meta @@ -42,14 +42,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -199.5, + "offsetX": -150.5, "offsetY": 0, - "trimX": 44, + "trimX": 0, "trimY": 0, - "width": 4793, - "height": 380, - "rawWidth": 5280, - "rawHeight": 380, + "width": 3038, + "height": 232, + "rawWidth": 3339, + "rawHeight": 232, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -2396.5, - -190, + -1519, + -116, 0, - 2396.5, - -190, + 1519, + -116, 0, - -2396.5, - 190, + -1519, + 116, 0, - 2396.5, - 190, + 1519, + 116, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 44, - 380, - 4837, - 380, - 44, 0, - 4837, + 232, + 3038, + 232, + 0, + 0, + 3038, 0 ], "nuv": [ - 0.008333333333333333, 0, - 0.9160984848484849, 0, - 0.008333333333333333, + 0.909853249475891, + 0, + 0, 1, - 0.9160984848484849, + 0.909853249475891, 1 ], "minPos": [ - -2396.5, - -190, + -1519, + -116, 0 ], "maxPos": [ - 2396.5, - 190, + 1519, + 116, 0 ] }, diff --git a/assets/Game/fonts/字体/免费模式数字.meta b/assets/Game/fonts/字体/免费模式数字.meta index bf6d942..323148d 100644 --- a/assets/Game/fonts/字体/免费模式数字.meta +++ b/assets/Game/fonts/字体/免费模式数字.meta @@ -2,7 +2,7 @@ "ver": "1.2.0", "importer": "directory", "imported": true, - "uuid": "8dfbc27e-4646-4236-b1f5-5b63041e1e83", + "uuid": "a66b031d-086f-47d6-940a-ddca2264ff63", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/Game/fonts/字体/免费模式数字/nb.fnt b/assets/Game/fonts/字体/免费模式数字/nb.fnt old mode 100755 new mode 100644 diff --git a/assets/Game/fonts/字体/免费模式数字/nb.png b/assets/Game/fonts/字体/免费模式数字/nb.png old mode 100755 new mode 100644 index 51acabc..097f19e Binary files a/assets/Game/fonts/字体/免费模式数字/nb.png and b/assets/Game/fonts/字体/免费模式数字/nb.png differ diff --git a/assets/Game/fonts/字体/免费游戏数字.meta b/assets/Game/fonts/字体/免费游戏数字.meta index 9bc96dc..4cef979 100644 --- a/assets/Game/fonts/字体/免费游戏数字.meta +++ b/assets/Game/fonts/字体/免费游戏数字.meta @@ -2,7 +2,7 @@ "ver": "1.2.0", "importer": "directory", "imported": true, - "uuid": "b4e755cb-86e4-404f-9b94-64b45859a105", + "uuid": "0323ada8-d119-40fb-8d13-657482e39bd3", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/Game/fonts/字体/免费游戏数字/mfxz_nb.fnt b/assets/Game/fonts/字体/免费游戏数字/mfxz_nb.fnt old mode 100755 new mode 100644 diff --git a/assets/Game/fonts/字体/免费游戏数字/mfxz_nb.png b/assets/Game/fonts/字体/免费游戏数字/mfxz_nb.png old mode 100755 new mode 100644 index 92568dc..42c540b Binary files a/assets/Game/fonts/字体/免费游戏数字/mfxz_nb.png and b/assets/Game/fonts/字体/免费游戏数字/mfxz_nb.png differ diff --git a/assets/Game/fonts/字体/加载数字.meta b/assets/Game/fonts/字体/加载数字.meta index 0b124be..aa0e19b 100644 --- a/assets/Game/fonts/字体/加载数字.meta +++ b/assets/Game/fonts/字体/加载数字.meta @@ -2,7 +2,7 @@ "ver": "1.2.0", "importer": "directory", "imported": true, - "uuid": "91edcdb6-9d54-47d2-b809-332ee63e8c1d", + "uuid": "fc1d4d31-fd5e-48a9-b8f7-be50ce362eb3", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/Game/fonts/字体/加载数字/jz_nb.fnt b/assets/Game/fonts/字体/加载数字/jz_nb.fnt old mode 100755 new mode 100644 diff --git a/assets/Game/fonts/字体/加载数字/jz_nb.png b/assets/Game/fonts/字体/加载数字/jz_nb.png old mode 100755 new mode 100644 index 7b4f910..34ce455 Binary files a/assets/Game/fonts/字体/加载数字/jz_nb.png and b/assets/Game/fonts/字体/加载数字/jz_nb.png differ diff --git a/assets/Game/fonts/字体/咨询数字.meta b/assets/Game/fonts/字体/咨询数字.meta index e6bb2d9..69e8796 100644 --- a/assets/Game/fonts/字体/咨询数字.meta +++ b/assets/Game/fonts/字体/咨询数字.meta @@ -2,7 +2,7 @@ "ver": "1.2.0", "importer": "directory", "imported": true, - "uuid": "33bacaa0-85fe-43e0-98df-9ab90fb8a2ea", + "uuid": "509dffa3-f51a-499d-ba33-3e10077525f1", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/Game/fonts/字体/咨询数字/nb_big.fnt b/assets/Game/fonts/字体/咨询数字/nb_big.fnt old mode 100755 new mode 100644 diff --git a/assets/Game/fonts/字体/咨询数字/nb_big.png b/assets/Game/fonts/字体/咨询数字/nb_big.png old mode 100755 new mode 100644 index 8a18105..bae9911 Binary files a/assets/Game/fonts/字体/咨询数字/nb_big.png and b/assets/Game/fonts/字体/咨询数字/nb_big.png differ diff --git a/assets/Game/fonts/字体/咨询数字/nb_big2.png.fnt b/assets/Game/fonts/字体/咨询数字/nb_big2.png.fnt old mode 100755 new mode 100644 diff --git a/assets/Game/fonts/字体/咨询数字/nb_big2.png.png b/assets/Game/fonts/字体/咨询数字/nb_big2.png.png old mode 100755 new mode 100644 index c8f8381..af4d033 Binary files a/assets/Game/fonts/字体/咨询数字/nb_big2.png.png and b/assets/Game/fonts/字体/咨询数字/nb_big2.png.png differ diff --git a/assets/Game/fonts/字体/咨询数字/nb_small.fnt b/assets/Game/fonts/字体/咨询数字/nb_small.fnt old mode 100755 new mode 100644 diff --git a/assets/Game/fonts/字体/咨询数字/nb_small.png b/assets/Game/fonts/字体/咨询数字/nb_small.png old mode 100755 new mode 100644 index eccb9db..64ed79c Binary files a/assets/Game/fonts/字体/咨询数字/nb_small.png and b/assets/Game/fonts/字体/咨询数字/nb_small.png differ diff --git a/assets/Game/fonts/字体/咨询数字/nb_small2.fnt b/assets/Game/fonts/字体/咨询数字/nb_small2.fnt old mode 100755 new mode 100644 diff --git a/assets/Game/fonts/字体/咨询数字/nb_small2.png b/assets/Game/fonts/字体/咨询数字/nb_small2.png old mode 100755 new mode 100644 index cd15bfc..f80fef6 Binary files a/assets/Game/fonts/字体/咨询数字/nb_small2.png and b/assets/Game/fonts/字体/咨询数字/nb_small2.png differ diff --git a/assets/Game/fonts/字体/旋转数字.meta b/assets/Game/fonts/字体/旋转数字.meta index beafc8e..56ccc9d 100644 --- a/assets/Game/fonts/字体/旋转数字.meta +++ b/assets/Game/fonts/字体/旋转数字.meta @@ -2,7 +2,7 @@ "ver": "1.2.0", "importer": "directory", "imported": true, - "uuid": "6cfd8156-236d-4540-ba45-d03bc06a3528", + "uuid": "17da85d9-6624-40a9-a963-8a7bb0f80b71", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/Game/fonts/字体/旋转数字/xz_nb.fnt b/assets/Game/fonts/字体/旋转数字/xz_nb.fnt old mode 100755 new mode 100644 diff --git a/assets/Game/fonts/字体/旋转数字/xz_nb.png b/assets/Game/fonts/字体/旋转数字/xz_nb.png old mode 100755 new mode 100644 index 9d8e940..c51d557 Binary files a/assets/Game/fonts/字体/旋转数字/xz_nb.png and b/assets/Game/fonts/字体/旋转数字/xz_nb.png differ diff --git a/assets/Game/fonts/字体/结算数字.meta b/assets/Game/fonts/字体/结算数字.meta index b49a90a..1ed52ff 100644 --- a/assets/Game/fonts/字体/结算数字.meta +++ b/assets/Game/fonts/字体/结算数字.meta @@ -2,7 +2,7 @@ "ver": "1.2.0", "importer": "directory", "imported": true, - "uuid": "a10ea0e3-fdb4-4fe4-90f2-88829e901270", + "uuid": "71e0e917-2da5-46b6-b6c5-3bf1aee48560", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/Game/fonts/字体/结算数字/nb.fnt b/assets/Game/fonts/字体/结算数字/nb.fnt old mode 100755 new mode 100644 diff --git a/assets/Game/fonts/字体/结算数字/nb.png b/assets/Game/fonts/字体/结算数字/nb.png old mode 100755 new mode 100644 index 72e44b7..be89a73 Binary files a/assets/Game/fonts/字体/结算数字/nb.png and b/assets/Game/fonts/字体/结算数字/nb.png differ diff --git a/assets/Game/fonts/字体/跑马灯数字.meta b/assets/Game/fonts/字体/跑马灯数字.meta index cbdfd57..67e319e 100644 --- a/assets/Game/fonts/字体/跑马灯数字.meta +++ b/assets/Game/fonts/字体/跑马灯数字.meta @@ -2,7 +2,7 @@ "ver": "1.2.0", "importer": "directory", "imported": true, - "uuid": "65c09dee-6d84-4ffb-b9a6-c101b6c4ad47", + "uuid": "1c5d3874-f7cc-43fb-a031-4ce216852e5d", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/Game/fonts/字体/跑马灯数字/pmd_nb.fnt b/assets/Game/fonts/字体/跑马灯数字/pmd_nb.fnt old mode 100755 new mode 100644 diff --git a/assets/Game/fonts/字体/跑马灯数字/pmd_nb.png b/assets/Game/fonts/字体/跑马灯数字/pmd_nb.png old mode 100755 new mode 100644 index 161541e..336351c Binary files a/assets/Game/fonts/字体/跑马灯数字/pmd_nb.png and b/assets/Game/fonts/字体/跑马灯数字/pmd_nb.png differ diff --git a/assets/Game/prefabs/SlotScene.prefab b/assets/Game/prefabs/SlotScene.prefab index 1c1a5f0..7398ec8 100644 --- a/assets/Game/prefabs/SlotScene.prefab +++ b/assets/Game/prefabs/SlotScene.prefab @@ -44,22 +44,25 @@ }, { "__id__": 1386 + }, + { + "__id__": 1398 } ], "_active": true, "_components": [ { - "__id__": 1408 + "__id__": 1420 }, { - "__id__": 1410 + "__id__": 1422 }, { - "__id__": 1412 + "__id__": 1424 } ], "_prefab": { - "__id__": 1414 + "__id__": 1426 }, "_lpos": { "__type__": "cc.Vec3", @@ -1403,7 +1406,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a9wQKf7NlPk5nSX5RWh7MG" + "fileId": "d1Nc6ftnFGJ6uqhFoRlhxU" }, { "__type__": "cc.PrefabInfo", @@ -1413,7 +1416,7 @@ "asset": { "__id__": 0 }, - "fileId": "43yTIybkNEgZ4z/1QbqZsn", + "fileId": "0fcKAdlhtL9oDNfLGOUQt/", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1444,7 +1447,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d91goua/hDHrDwwkYo9uW7" + "fileId": "cdWZrOS4NKypnayJ0EYUxW" }, { "__type__": "cc.PrefabInfo", @@ -1454,7 +1457,7 @@ "asset": { "__id__": 0 }, - "fileId": "13zdCNoYhOPKYD5bnwMWRW", + "fileId": "f3aHA5WTFOXKwnyv0y2YBV", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1485,7 +1488,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c899EjhxVOdr+zJSzdMHHP" + "fileId": "08jCc7hZ1DZoJ5YtAswY3r" }, { "__type__": "5fc10Zl7lVO97/rr2J1uxWH", @@ -1509,7 +1512,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b3TPOzroxBv7fq3RZg0vVu" + "fileId": "7dO22/dR9NQrNko7FP4FuS" }, { "__type__": "5fd13+Xa69CZogb3Q/F1lnC", @@ -1682,7 +1685,7 @@ "asset": { "__id__": 0 }, - "fileId": "6cMzKFxIhBUJIIiruhPZ4R", + "fileId": "19P8trVfJEErMOcxg/+uc7", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1707,7 +1710,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "98MyyxJvpI24vfJY7HSZZK" + "fileId": "edXgY6MspEf6fKStmE2ObU" }, { "__type__": "cc.UITransform", @@ -1735,7 +1738,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "06xDZF7hxBY5CK//LcJLKN" + "fileId": "23V04BJllAAp6ygo1LOwM+" }, { "__type__": "cc.Sprite", @@ -1780,7 +1783,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b1i5zSLs1FNqEy659L2h+4" + "fileId": "8ea46zra1LM7M8F93PHN0i" }, { "__type__": "cc.PrefabInfo", @@ -1790,7 +1793,7 @@ "asset": { "__id__": 0 }, - "fileId": "0clAEN1hZO8bEuhMqmRMUe", + "fileId": "ddLnFtGa1P9bSYf/tGesnu", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2045,7 +2048,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "76kmZP+95EwqJZhBB6b6WF" + "fileId": "91U6qq3EpGCaGhKtH6Z3lm" }, { "__type__": "cc.PrefabInfo", @@ -2055,7 +2058,7 @@ "asset": { "__id__": 0 }, - "fileId": "58gJs2jRxLKLwfHpxH07pZ", + "fileId": "94goNkTRVBmZCHQhIownVN", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2086,7 +2089,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ac5uXu/EJPlobT12oOjdox" + "fileId": "3cD2FjJ8JIrIbZQ+aY4mbs" }, { "__type__": "cc.PrefabInfo", @@ -2096,7 +2099,7 @@ "asset": { "__id__": 0 }, - "fileId": "cdfYnBR3BARqe2PjlGPmeY", + "fileId": "c1snt+/HhMM51bUhBUfq1w", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2127,7 +2130,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a5i1X24EpCX4bGk2cPJ+3M" + "fileId": "0cM31CfYFBEI0vAtB/iO1/" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -2151,7 +2154,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fd1Bu3//1JfaGtgglN3s5E" + "fileId": "11KnZnL4VCB5Q4df3LvDqn" }, { "__type__": "cc.PrefabInfo", @@ -2161,7 +2164,7 @@ "asset": { "__id__": 0 }, - "fileId": "b82AfeRBNE4pjHuYUqVJdg", + "fileId": "7do0OyzN1PZJMrY0MZKTrq", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2344,7 +2347,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "35QL0ZfxFN8JDQf1841R5L" + "fileId": "0br4pYV4NBxbCocnDR6v/x" }, { "__type__": "cc.PrefabInfo", @@ -2354,7 +2357,7 @@ "asset": { "__id__": 0 }, - "fileId": "9dIk5Pb+dIurB1I16mTCR4", + "fileId": "6an3/RKMBP4LE7gXWoEDKk", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2385,7 +2388,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "27Tj3uqlJJArNT9EAnf7Vh" + "fileId": "b9fmliuSBLMaVsfTwgIP8J" }, { "__type__": "cc.PrefabInfo", @@ -2395,7 +2398,7 @@ "asset": { "__id__": 0 }, - "fileId": "72cdGKv5tFSKPym5DLiqM1", + "fileId": "f3qNxjEz1PYY/+74IcBZdd", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2426,7 +2429,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "29Nki9audOLqdoiSJWzJB7" + "fileId": "85II2vHPtOEYMtIEOZ9wif" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -2450,7 +2453,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2clMZmHeBNq4saUsMqpUSK" + "fileId": "02qbTfrbdGA4JcPA6mfyEi" }, { "__type__": "cc.PrefabInfo", @@ -2460,7 +2463,7 @@ "asset": { "__id__": 0 }, - "fileId": "5eNYIezdlPV4xWE3Iat+02", + "fileId": "59xbDGwSlNVKLgHTO9YGRA", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2643,7 +2646,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a97aJ3SmFFo4x4hrhKBvMM" + "fileId": "f1T3d1fi5A/5Kf0Nb4TFMX" }, { "__type__": "cc.PrefabInfo", @@ -2653,7 +2656,7 @@ "asset": { "__id__": 0 }, - "fileId": "c45La7O91Iw4DEZnEqjfiD", + "fileId": "bfuaULEzZGzZEpoPxd+Bwe", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2684,7 +2687,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "13zQg1iwpAObS8eBI826ZL" + "fileId": "174jK6qU1GwKFQ+SRBFUlh" }, { "__type__": "cc.PrefabInfo", @@ -2694,7 +2697,7 @@ "asset": { "__id__": 0 }, - "fileId": "b7FUTAZ6VDr7V6vNJkk/03", + "fileId": "eewSzAzZBBvLiTwbnrxPUX", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2725,7 +2728,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d6sWb2F+JFUpv01p1O4Gi6" + "fileId": "9bilw+K5xEfIDbmSgHvaLu" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -2749,7 +2752,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "75BFAcJulKWrz2jEmZPovr" + "fileId": "967KeLqNBOJLCOT1WC17Wl" }, { "__type__": "cc.PrefabInfo", @@ -2759,7 +2762,7 @@ "asset": { "__id__": 0 }, - "fileId": "56q6ZQIglBspLaBDuwDC45", + "fileId": "43blR+En5PvatLSBq9qFZu", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2942,7 +2945,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "14n40gPx9I95+MB5GcCUBw" + "fileId": "ef+/aMGVZAt4soXbXsMSas" }, { "__type__": "cc.PrefabInfo", @@ -2952,7 +2955,7 @@ "asset": { "__id__": 0 }, - "fileId": "beeH5Rw2tMHa8rZFbeZ2Bj", + "fileId": "40+KtfoR1IsqO0tNTGUJwo", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2983,7 +2986,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "876gxOYmNB7Jrlb4WIUjfo" + "fileId": "07LfNQtkRFurduq+hHnPf/" }, { "__type__": "cc.PrefabInfo", @@ -2993,7 +2996,7 @@ "asset": { "__id__": 0 }, - "fileId": "30MbByaa9AU4fgvgJulXvK", + "fileId": "f3bzG3seJBLJITYYnsIfOC", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3024,7 +3027,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c8Y60QytBIZYQ1y+8NijPD" + "fileId": "d13NNeB8VF9ZD76KS0MLcL" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3048,7 +3051,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c2ChFySjRIgpxP8a3yx4Ux" + "fileId": "cdTv/rqdNEIouZJdtC4f2V" }, { "__type__": "cc.PrefabInfo", @@ -3058,7 +3061,7 @@ "asset": { "__id__": 0 }, - "fileId": "c4zlLZbm9FuY+rv3umsbcc", + "fileId": "04y9WW2DhI/Il0/CUpR3nj", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3241,7 +3244,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d4HO4UBOBEhobfG4tP2u0X" + "fileId": "46Tmydf1pEoKgQf0gKj6SI" }, { "__type__": "cc.PrefabInfo", @@ -3251,7 +3254,7 @@ "asset": { "__id__": 0 }, - "fileId": "0b9NGisjBMOpO4yF9PSmyq", + "fileId": "01UXXlRaFFEJuNa3gmddHa", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3282,7 +3285,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "06/0SvAMpJUbT/ovpr/SAC" + "fileId": "fafwOygSZGtZlqTILsxltT" }, { "__type__": "cc.PrefabInfo", @@ -3292,7 +3295,7 @@ "asset": { "__id__": 0 }, - "fileId": "02iQHxz5ZHqYEoS1pjhsda", + "fileId": "e3zX46mQJDEJ2QpAn5loCr", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3323,7 +3326,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "96SfefXupODpg1h3rYvU7X" + "fileId": "efMv8UnwxHqqbcqfEVIX5g" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3347,7 +3350,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "86O+0YW7RIiYo4CLBPmsXg" + "fileId": "452DLZhQJMCrGV+7fwyeMI" }, { "__type__": "cc.PrefabInfo", @@ -3357,7 +3360,7 @@ "asset": { "__id__": 0 }, - "fileId": "2aK8Y3XHVP2qWA1d74M2vv", + "fileId": "f4Y3TMT81BlI0MkxupWVZ/", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3540,7 +3543,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "7cBcEeXbdBfa8r+y3nw8dk" + "fileId": "678MMfXFNKSoG5Q6noBeha" }, { "__type__": "cc.PrefabInfo", @@ -3550,7 +3553,7 @@ "asset": { "__id__": 0 }, - "fileId": "eblfmmTDJM24OgASPcVuzu", + "fileId": "e9hGrK1q5HjpEodmZp1VC/", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3581,7 +3584,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b7P9AyxkJOrrlyY4xmhy44" + "fileId": "21XYlrATtDl52xNYRBPUaQ" }, { "__type__": "cc.PrefabInfo", @@ -3591,7 +3594,7 @@ "asset": { "__id__": 0 }, - "fileId": "acjy+m+kBKk7UaB3+SjLls", + "fileId": "f9Nr9aMvlPPJM6JXN1f1wI", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3622,7 +3625,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "4aQHh4adNG8KaJuh0P8Kze" + "fileId": "32n1hOyXxBxIrO3JbvIAAf" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3646,7 +3649,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "aemKlPpu5JorfYVg1sitGs" + "fileId": "075Wi3IVJFdY9i9BebyWkm" }, { "__type__": "cc.PrefabInfo", @@ -3656,7 +3659,7 @@ "asset": { "__id__": 0 }, - "fileId": "85ldhdWRFOkLE1RgKbvVZg", + "fileId": "39tCTpQzZHoLOIqdZeu5wd", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3681,7 +3684,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e0CvdUufpHBqCl75Z5AM3r" + "fileId": "ffZmCfU81EvJ10T6b4EBFL" }, { "__type__": "cc.UITransform", @@ -3709,7 +3712,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "48fzwcTOpKDZhU94nFk/X4" + "fileId": "d3PcTR5QFGv5izuud1GsOM" }, { "__type__": "cc.Sprite", @@ -3754,7 +3757,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "13dIFya3dMW5Pq6aD8YXEd" + "fileId": "a8n3EeA3ZJHI0Z/S3RMVSj" }, { "__type__": "cc.PrefabInfo", @@ -3764,7 +3767,7 @@ "asset": { "__id__": 0 }, - "fileId": "34/lyjcblDraI2Kk0j+dq+", + "fileId": "6f14HFzcBP4ahFz3f62UTx", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -9566,7 +9569,8 @@ "fileId": "28g1VVD5RIHqrBSBeqOEct", "instance": { "__id__": 427 - } + }, + "targetOverrides": null }, { "__type__": "cc.PrefabInstance", @@ -29600,7 +29604,7 @@ }, { "__type__": "cc.Node", - "_name": "layer", + "_name": "showMulti", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -29609,30 +29613,21 @@ "_children": [ { "__id__": 1387 - }, - { - "__id__": 1395 } ], "_active": false, "_components": [ { - "__id__": 1401 - }, - { - "__id__": 1403 - }, - { - "__id__": 1405 + "__id__": 1395 } ], "_prefab": { - "__id__": 1407 + "__id__": 1397 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 100, "z": 0 }, "_lrot": { @@ -29660,7 +29655,7 @@ }, { "__type__": "cc.Node", - "_name": "0", + "_name": "multi", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -29697,8 +29692,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.2, + "y": 0.2, "z": 1 }, "_mobility": 0, @@ -29723,6 +29718,291 @@ "__prefab": { "__id__": 1389 }, + "_contentSize": { + "__type__": "cc.Size", + "width": 2020, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9ebJB3lOdF9bZ2gvNsoccc" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1387 + }, + "_enabled": true, + "__prefab": { + "__id__": 1391 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "x4", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 40, + "_fontSize": 40, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": { + "__uuid__": "3e9635ee-9adf-433e-a7a7-7959e0486d74", + "__expectedType__": "cc.BitmapFont" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": false, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0bNzIkEblHxoBx4UY3ENZE" + }, + { + "__type__": "cc.UIOpacity", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1387 + }, + "_enabled": true, + "__prefab": { + "__id__": 1393 + }, + "_opacity": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "35S/eTEWJKCa85jX+3Ylfc" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "19uzX+iCFNcIZOBXt5x8Mu", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1386 + }, + "_enabled": true, + "__prefab": { + "__id__": 1396 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "38cnx9pTZF5bG+7giCg5ro" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "8fp53yNwpIgaID8ionNM4V", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "layer", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 1399 + }, + { + "__id__": 1407 + } + ], + "_active": false, + "_components": [ + { + "__id__": 1413 + }, + { + "__id__": 1415 + }, + { + "__id__": 1417 + } + ], + "_prefab": { + "__id__": 1419 + }, + "_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.Node", + "_name": "0", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1398 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 1400 + }, + { + "__id__": 1402 + }, + { + "__id__": 1404 + } + ], + "_prefab": { + "__id__": 1406 + }, + "_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__": 1399 + }, + "_enabled": true, + "__prefab": { + "__id__": 1401 + }, "_contentSize": { "__type__": "cc.Size", "width": 1080, @@ -29745,11 +30025,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1387 + "__id__": 1399 }, "_enabled": true, "__prefab": { - "__id__": 1391 + "__id__": 1403 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -29790,11 +30070,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1387 + "__id__": 1399 }, "_enabled": true, "__prefab": { - "__id__": 1393 + "__id__": 1405 }, "_alignFlags": 45, "_target": null, @@ -29839,20 +30119,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1386 + "__id__": 1398 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1396 + "__id__": 1408 }, { - "__id__": 1398 + "__id__": 1410 } ], "_prefab": { - "__id__": 1400 + "__id__": 1412 }, "_lpos": { "__type__": "cc.Vec3", @@ -29889,11 +30169,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1395 + "__id__": 1407 }, "_enabled": true, "__prefab": { - "__id__": 1397 + "__id__": 1409 }, "_contentSize": { "__type__": "cc.Size", @@ -29917,11 +30197,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1395 + "__id__": 1407 }, "_enabled": true, "__prefab": { - "__id__": 1399 + "__id__": 1411 }, "_alignFlags": 45, "_target": null, @@ -29966,11 +30246,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1386 + "__id__": 1398 }, "_enabled": true, "__prefab": { - "__id__": 1402 + "__id__": 1414 }, "_contentSize": { "__type__": "cc.Size", @@ -29994,11 +30274,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1386 + "__id__": 1398 }, "_enabled": true, "__prefab": { - "__id__": 1404 + "__id__": 1416 }, "_alignFlags": 45, "_target": null, @@ -30030,11 +30310,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1386 + "__id__": 1398 }, "_enabled": true, "__prefab": { - "__id__": 1406 + "__id__": 1418 }, "_id": "" }, @@ -30065,7 +30345,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1409 + "__id__": 1421 }, "_contentSize": { "__type__": "cc.Size", @@ -30093,7 +30373,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1411 + "__id__": 1423 }, "slotGame": { "__id__": 596 @@ -30139,7 +30419,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1413 + "__id__": 1425 }, "_alignFlags": 45, "_target": null, @@ -30177,7 +30457,7 @@ "instance": null, "targetOverrides": [ { - "__id__": 1415 + "__id__": 1427 } ], "nestedPrefabInstanceRoots": [ @@ -30210,7 +30490,7 @@ "__id__": 602 }, "sourceInfo": { - "__id__": 1416 + "__id__": 1428 }, "propertyPath": [ "_target" @@ -30219,7 +30499,7 @@ "__id__": 602 }, "targetInfo": { - "__id__": 1417 + "__id__": 1429 } }, { diff --git a/assets/Game/scripts/SlotGame.ts b/assets/Game/scripts/SlotGame.ts index 2b90c02..a6a4d43 100644 --- a/assets/Game/scripts/SlotGame.ts +++ b/assets/Game/scripts/SlotGame.ts @@ -398,9 +398,8 @@ export class SlotGame extends Component { } - showMultiMove() { - let multiMove = this.node.getChildByName('multiMove') - this.rollerManager.showMultiMove(multiMove) + showMultiMove(multiNum) { + this.rollerManager.showMultiMove(multiNum) } diff --git a/assets/Game/scripts/SlotScene.ts b/assets/Game/scripts/SlotScene.ts index f6fe873..a885e1b 100644 --- a/assets/Game/scripts/SlotScene.ts +++ b/assets/Game/scripts/SlotScene.ts @@ -749,7 +749,7 @@ export class SlotScene extends Component { } //播放倍率飞到信息栏的动画 if (this.spinData.XnInfo.NowN > 1) { - this.slotGame.showMultiMove() + this.slotGame.showMultiMove(this.spinData.XnInfo.NowN) } // 3,4,5 diff --git a/assets/Game/scripts/game/BaseRoller.ts b/assets/Game/scripts/game/BaseRoller.ts index 4d381ed..ac0833b 100644 --- a/assets/Game/scripts/game/BaseRoller.ts +++ b/assets/Game/scripts/game/BaseRoller.ts @@ -677,7 +677,7 @@ export abstract class BaseRoller extends Component { abstract playFrameTypeChangeAni(positions: number[]): void; - abstract showMultiMove(multiMove: Node): void; + abstract showMultiMove(multiNum: number): void; abstract chanegeIconAndFrameType(data: any[]): void; diff --git a/assets/Game/scripts/game/HRoller.ts b/assets/Game/scripts/game/HRoller.ts index 8bb1ad0..41cc679 100644 --- a/assets/Game/scripts/game/HRoller.ts +++ b/assets/Game/scripts/game/HRoller.ts @@ -629,11 +629,11 @@ export class HRoller extends BaseRoller { this.node.emit(ROLLER_EVENT.ICON_DELETED, this._rollerId); } - showMultiMove(multiMove: Node) { + showMultiMove(multiNum: number) { let allIcons = Array.from(this._allIcons.values()); allIcons.forEach(icon => { if (!icon || !icon.isValid) return; - icon.getComponent(Icon).playNormalMultiMove(multiMove) + icon.getComponent(Icon).playNormalMultiMove(multiNum) }); } diff --git a/assets/Game/scripts/game/Icon.ts b/assets/Game/scripts/game/Icon.ts index 2d76c6e..e31a518 100644 --- a/assets/Game/scripts/game/Icon.ts +++ b/assets/Game/scripts/game/Icon.ts @@ -476,22 +476,48 @@ export class Icon extends Component { this.playSpawnAnimation() } - playNormalMultiMove(multiMove: Node) { + playNormalMultiMove(multiNum: number) { if (this._iconId != 2) return let slotGame = this.node.parent.parent.parent.parent.parent.parent this._normalSpriteNode.getComponent(UIOpacity).opacity = 150 let multiMoveNode = instantiate(slotGame.getChildByName('multiMove')) + let bigMultiNode = slotGame.parent.getChildByName('showMulti') + let bigMultiLabel = bigMultiNode.getChildByName('multi') multiMoveNode.parent = slotGame multiMoveNode.setWorldPosition(this.node.getWorldPosition()) multiMoveNode.getComponent(Sprite).spriteFrame = this.multiSprite[this._multi] tween(multiMoveNode) - .to(0.5, { scale: new Vec3(1.4, 1.4, 1) }) - .to(1.5, { position: new Vec3(0, 100, 0) }) - .to(0.5, { position: new Vec3(0, -176, 0) }) + .delay(0.3) + .to(1, { scale: new Vec3(0.8, 0.8, 1) }) + .start() + + tween(multiMoveNode) + .to(0.3, { scale: new Vec3(1.4, 1.4, 1) }) + .to(1, { position: new Vec3(0, 100, 0) }) .call(() => { multiMoveNode.destroy() + + if (bigMultiNode.active) return + bigMultiLabel.getComponent(Label).string = 'x' + multiNum + bigMultiNode.active = true + tween(bigMultiLabel.getComponent(UIOpacity)) + .to(0.3, { opacity: 255 }) + .delay(0.7) + .to(0.3, { opacity: 0 }) + .start() + tween(bigMultiLabel) + .to(0.3, { scale: new Vec3(0.24, 0.24, 1) }) + .to(0.3, { scale: new Vec3(0.2, 0.2, 1) }) + .to(0.4, { position: new Vec3(0, -450, 0) }) + .to(0.3, { scale: new Vec3(0.3, 0.3, 1) }) + .call(() => { + bigMultiLabel.setPosition(0, 0, 0) + bigMultiLabel.setScale(0.2, 0.2, 1) + bigMultiNode.active = false + }) + .start() }) .start() } diff --git a/assets/Game/scripts/game/Roller.ts b/assets/Game/scripts/game/Roller.ts index 9304f58..4da575e 100644 --- a/assets/Game/scripts/game/Roller.ts +++ b/assets/Game/scripts/game/Roller.ts @@ -695,11 +695,11 @@ export class Roller extends BaseRoller { } - showMultiMove(multiMove: Node) { + showMultiMove(multiNum: number) { let allIcons = Array.from(this._allIcons.values()); allIcons.forEach(icon => { if (!icon || !icon.isValid) return; - icon.getComponent(Icon).playNormalMultiMove(multiMove) + icon.getComponent(Icon).playNormalMultiMove(multiNum) }); } diff --git a/assets/Game/scripts/game/RollerManager.ts b/assets/Game/scripts/game/RollerManager.ts index 8552b10..db1211f 100644 --- a/assets/Game/scripts/game/RollerManager.ts +++ b/assets/Game/scripts/game/RollerManager.ts @@ -617,10 +617,10 @@ export class RollerManager extends Component { return roller.getContentNode(); } - showMultiMove(multiMove: Node) { + showMultiMove(multiNum: number) { for (let i = 0; i < this.allRollers.length; i++) { let roller = this.allRollers[i]; - roller.showMultiMove(multiMove) + roller.showMultiMove(multiNum) } } diff --git a/assets/Loading/scripts/comm.ts b/assets/Loading/scripts/comm.ts index 4d47758..2a695fa 100644 --- a/assets/Loading/scripts/comm.ts +++ b/assets/Loading/scripts/comm.ts @@ -7,7 +7,7 @@ import { PREVIEW } from "cc/env" const gameId = "rp_10012"; // let apiaddr = "https://rpgames-api.rpfafafahkdev.com"; let apiaddr = ""; -let token = "eyJQIjoxMDA5NDksIkUiOjE3NTc2ODU5NzMsIlMiOjk5NiwiRCI6InJwXzEwMDEyIn0.ICaHIo1nKP1ZfXfPSI86vOHeKF4VsNt3OQNEU6laN2w"; +let token = "eyJQIjoxMDA5NDksIkUiOjE3NTc5NDM3NjAsIlMiOjEwMDMsIkQiOiJycF8xMDAxMiJ9._wN9bG5q9Pa8FL6mOEHLCyyxnCWzKcfqYRTryyrmXsE"; let language = "en" let currency = "THB" let supportUrl = ""