diff --git a/assets/Game/fonts/ways数字/ways.fnt b/assets/Game/fonts/ways数字/ways.fnt index 1559899..4469f0e 100644 --- a/assets/Game/fonts/ways数字/ways.fnt +++ b/assets/Game/fonts/ways数字/ways.fnt @@ -2,15 +2,15 @@ info face="Arial" size=10 bold=0 italic=0 charset="" unicode=0 stretchH=100 smoo common lineHeight=48 base=10 scaleW=480 scaleH=48 pages=1 packed=0 page id=0 file="ways.png" chars count=12 -char id=57 x=0 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=0 page=0 letter="9" -char id=46 x=40 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=0 page=0 letter="." -char id=48 x=80 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=0 page=0 letter="0" -char id=49 x=120 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=0 page=0 letter="1" -char id=50 x=160 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=0 page=0 letter="2" -char id=51 x=200 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=0 page=0 letter="3" -char id=52 x=240 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=0 page=0 letter="4" -char id=53 x=280 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=0 page=0 letter="5" -char id=54 x=320 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=0 page=0 letter="6" -char id=55 x=360 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=0 page=0 letter="7" -char id=56 x=400 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=0 page=0 letter="8" -char id=32 x=440 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=0 page=0 letter="space" \ No newline at end of file +char id=57 x=0 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=25 page=0 chnl=0 page=0 letter="9" +char id=46 x=40 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=25 page=0 chnl=0 page=0 letter="." +char id=48 x=80 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=25 page=0 chnl=0 page=0 letter="0" +char id=49 x=120 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=25 page=0 chnl=0 page=0 letter="1" +char id=50 x=160 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=25 page=0 chnl=0 page=0 letter="2" +char id=51 x=200 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=25 page=0 chnl=0 page=0 letter="3" +char id=52 x=240 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=25 page=0 chnl=0 page=0 letter="4" +char id=53 x=280 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=25 page=0 chnl=0 page=0 letter="5" +char id=54 x=320 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=25 page=0 chnl=0 page=0 letter="6" +char id=55 x=360 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=25 page=0 chnl=0 page=0 letter="7" +char id=56 x=400 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=25 page=0 chnl=0 page=0 letter="8" +char id=32 x=440 y=0 width=40 height=48 xoffset=0 yoffset=0 xadvance=25 page=0 chnl=0 page=0 letter="space" \ No newline at end of file diff --git a/assets/Game/fonts/ways数字/ways.fnt.meta b/assets/Game/fonts/ways数字/ways.fnt.meta index 499aadd..502a26e 100644 --- a/assets/Game/fonts/ways数字/ways.fnt.meta +++ b/assets/Game/fonts/ways数字/ways.fnt.meta @@ -22,7 +22,7 @@ }, "xOffset": 0, "yOffset": 0, - "xAdvance": 30 + "xAdvance": 25 }, "46": { "rect": { @@ -33,7 +33,7 @@ }, "xOffset": 0, "yOffset": 0, - "xAdvance": 30 + "xAdvance": 25 }, "48": { "rect": { @@ -44,7 +44,7 @@ }, "xOffset": 0, "yOffset": 0, - "xAdvance": 30 + "xAdvance": 25 }, "49": { "rect": { @@ -55,7 +55,7 @@ }, "xOffset": 0, "yOffset": 0, - "xAdvance": 30 + "xAdvance": 25 }, "50": { "rect": { @@ -66,7 +66,7 @@ }, "xOffset": 0, "yOffset": 0, - "xAdvance": 30 + "xAdvance": 25 }, "51": { "rect": { @@ -77,7 +77,7 @@ }, "xOffset": 0, "yOffset": 0, - "xAdvance": 30 + "xAdvance": 25 }, "52": { "rect": { @@ -88,7 +88,7 @@ }, "xOffset": 0, "yOffset": 0, - "xAdvance": 30 + "xAdvance": 25 }, "53": { "rect": { @@ -99,7 +99,7 @@ }, "xOffset": 0, "yOffset": 0, - "xAdvance": 30 + "xAdvance": 25 }, "54": { "rect": { @@ -110,7 +110,7 @@ }, "xOffset": 0, "yOffset": 0, - "xAdvance": 30 + "xAdvance": 25 }, "55": { "rect": { @@ -121,7 +121,7 @@ }, "xOffset": 0, "yOffset": 0, - "xAdvance": 30 + "xAdvance": 25 }, "56": { "rect": { @@ -132,7 +132,7 @@ }, "xOffset": 0, "yOffset": 0, - "xAdvance": 30 + "xAdvance": 25 }, "57": { "rect": { @@ -143,7 +143,7 @@ }, "xOffset": 0, "yOffset": 0, - "xAdvance": 30 + "xAdvance": 25 } }, "kerningDict": {} diff --git a/assets/Game/prefabs/SlotScene.prefab b/assets/Game/prefabs/SlotScene.prefab index e1c24f0..66e700d 100644 --- a/assets/Game/prefabs/SlotScene.prefab +++ b/assets/Game/prefabs/SlotScene.prefab @@ -51,18 +51,18 @@ ], "_active": true, "_components": [ - { - "__id__": 1309 - }, - { - "__id__": 1311 - }, { "__id__": 1313 + }, + { + "__id__": 1315 + }, + { + "__id__": 1317 } ], "_prefab": { - "__id__": 1315 + "__id__": 1319 }, "_lpos": { "__type__": "cc.Vec3", @@ -2294,7 +2294,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "26had8uwBCY7Un8KiCBp97" + "fileId": "5e6Yf3CQ5D44aiAKVfoQOf" }, { "__type__": "cc.PrefabInfo", @@ -2304,7 +2304,7 @@ "asset": { "__id__": 0 }, - "fileId": "92eOO3YpFPOrKNXP8qi5nS", + "fileId": "7cYr3JQVdACK3NN8LSEV/+", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2335,7 +2335,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a03hV7PQZAP6iOrNuq1aRw" + "fileId": "2e7PSbuWVEHZ4m1rTWseX3" }, { "__type__": "cc.PrefabInfo", @@ -2345,7 +2345,7 @@ "asset": { "__id__": 0 }, - "fileId": "e4f8dI8ktJdqkh3t5O7OHw", + "fileId": "5dq7gOqL9IdZx7dY8u+nje", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2376,7 +2376,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "33M9X9+mNGvof3elTwUq0C" + "fileId": "b3CpVep09FnIqVW72cVRli" }, { "__type__": "5fc10Zl7lVO97/rr2J1uxWH", @@ -2400,7 +2400,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e17ByfuKlCKbvhSDYWEKRQ" + "fileId": "04V594yoVH0Y8uh02C26ag" }, { "__type__": "5fd13+Xa69CZogb3Q/F1lnC", @@ -2573,7 +2573,7 @@ "asset": { "__id__": 0 }, - "fileId": "da78irJZVIPLfVbQRVZpSp", + "fileId": "7drfdh1gVPFLxvrvgtqxHI", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2598,7 +2598,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "afaBABNs1I/Lnwajl3ZAa3" + "fileId": "49N6sfwkdBYrae2NDFP1tS" }, { "__type__": "cc.UITransform", @@ -2626,7 +2626,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "655t+kLgZD+5zNsjcPnRjm" + "fileId": "91xYau4BBE96oPz3Yz48tF" }, { "__type__": "cc.Sprite", @@ -2671,7 +2671,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2d86AhBVZBaog/ym0jgE9O" + "fileId": "1ahsIrpyRFb6NXvATG9Oc2" }, { "__type__": "cc.PrefabInfo", @@ -2681,7 +2681,7 @@ "asset": { "__id__": 0 }, - "fileId": "158v9ZDdRKHJhsaOszNQFA", + "fileId": "07C/MGz6JIAYCiSdomKZh5", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2936,7 +2936,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "7f0a5CjwFANK4LTvDfUI1U" + "fileId": "1ewzT5UlJMpq69LS39Y8+J" }, { "__type__": "cc.PrefabInfo", @@ -2946,7 +2946,7 @@ "asset": { "__id__": 0 }, - "fileId": "39D/A4xEFI5pZ5FXQtMTHf", + "fileId": "13UMAf+NtLyaz0i2d1QhUG", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2977,7 +2977,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ebXKEqbs5GwLe9JXahJg4O" + "fileId": "228SAOYflGZ5w6rleiirH/" }, { "__type__": "cc.PrefabInfo", @@ -2987,7 +2987,7 @@ "asset": { "__id__": 0 }, - "fileId": "bfAmytJxNJNZAKe6JxASoN", + "fileId": "15uJBfeRRLPZrYI4AAxJj/", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3018,7 +3018,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "87eCZ5TlFD2YD3QJOeatjH" + "fileId": "96jl7Af+xPnrmgIHBmyeui" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3042,7 +3042,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "faI+b0XudEbrbD5GACJ1jn" + "fileId": "141w+sAo1FX6w44XaxUDt7" }, { "__type__": "cc.PrefabInfo", @@ -3052,7 +3052,7 @@ "asset": { "__id__": 0 }, - "fileId": "f4TBUuBLpPm7XeRUMnpWm9", + "fileId": "891UC/kwlEVJtthCS1+2Tf", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3235,7 +3235,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "32FzHUlD1EMZM0ovqMOGf+" + "fileId": "41D8nqubFJMYAw1/5FRK07" }, { "__type__": "cc.PrefabInfo", @@ -3245,7 +3245,7 @@ "asset": { "__id__": 0 }, - "fileId": "84y54QwtVOppOdvnxPo+9i", + "fileId": "ad5L/QZ7dBeJj9g/N7q2zB", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3276,7 +3276,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a6hTp9lWVALJUAp05NPJ42" + "fileId": "79xsOSjt9K64UioKUW8vCA" }, { "__type__": "cc.PrefabInfo", @@ -3286,7 +3286,7 @@ "asset": { "__id__": 0 }, - "fileId": "6cuC88YqJNaKzpyIvdzGXS", + "fileId": "55xeRT7DNMFLVXiErVKspn", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3317,7 +3317,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a27PmupzxJQr3B1nYH4dwO" + "fileId": "2dFNXMHKZOXa41CgkvLfJc" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3341,7 +3341,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e04G8zjuVAyKVn+XlEP0Vp" + "fileId": "15J5MeDoBC67u+EdJEoNGp" }, { "__type__": "cc.PrefabInfo", @@ -3351,7 +3351,7 @@ "asset": { "__id__": 0 }, - "fileId": "03iUMTOr1MKKPndiyILLpu", + "fileId": "dbdpOSkx9N/ahCZ3X0a3fo", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3534,7 +3534,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "48LJoT77FKdYGSUA2E4tdp" + "fileId": "44WxRm7I9EbLE/RyJIWl2t" }, { "__type__": "cc.PrefabInfo", @@ -3544,7 +3544,7 @@ "asset": { "__id__": 0 }, - "fileId": "ad1r262dRDWJwk+uL+EwEn", + "fileId": "c0j6Ijj/hMDKJ11NCr4ERZ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3575,7 +3575,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e6KJ+CvSlDHJ0nXMV0CfbM" + "fileId": "f94oIrHlFDlqBUYW5Z+ejf" }, { "__type__": "cc.PrefabInfo", @@ -3585,7 +3585,7 @@ "asset": { "__id__": 0 }, - "fileId": "de1H8ypT9KYZf1I/eqEvkI", + "fileId": "4bn8/KtqJCg5OutitjbxET", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3616,7 +3616,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "371wCIeqxIqazmoahR8nYX" + "fileId": "47XMTG/NpGYYocCq3ksxIF" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3640,7 +3640,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "12Yqnx5R9CYIVnxZV4KOQd" + "fileId": "0fzElHe5FMhK9bV85Q646P" }, { "__type__": "cc.PrefabInfo", @@ -3650,7 +3650,7 @@ "asset": { "__id__": 0 }, - "fileId": "30uQeGkQ1CRo/tuItz9z/t", + "fileId": "faDuLDLYpE0orFli9qv5Kl", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3833,7 +3833,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "dei0YPu3JHg5Cr/byl8ZVB" + "fileId": "aa7wxxM+9InL6Ufqeic5uh" }, { "__type__": "cc.PrefabInfo", @@ -3843,7 +3843,7 @@ "asset": { "__id__": 0 }, - "fileId": "91eoeLXLNDrYr1ung1OoVw", + "fileId": "aa6DgSb6hIMacecd/W1jX2", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3874,7 +3874,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1fvFb+jIdPx4VvztTqQyJf" + "fileId": "03kqjsYnVEK5fJRfqTanQm" }, { "__type__": "cc.PrefabInfo", @@ -3884,7 +3884,7 @@ "asset": { "__id__": 0 }, - "fileId": "68YV+pIVlHMrh8cBtp2+ok", + "fileId": "25hMiIR6pKwZXZSMiUOiUa", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3915,7 +3915,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3coh0LDxpGk5XEyKI539U2" + "fileId": "756s2g06tD+456zUYfWJY8" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3939,7 +3939,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8aWZIhxRpCX6hII6gQgegV" + "fileId": "53Lu0vgYVEg5Nudvy6Jk1H" }, { "__type__": "cc.PrefabInfo", @@ -3949,7 +3949,7 @@ "asset": { "__id__": 0 }, - "fileId": "05d19eul9FkoGcN6A1VTAC", + "fileId": "78ai/0uzRDerWAOyIkNbmE", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4132,7 +4132,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "4aY86GOQtD9ZVd3ZXPPar+" + "fileId": "bcbnDePaBAn6oOqm94tLrk" }, { "__type__": "cc.PrefabInfo", @@ -4142,7 +4142,7 @@ "asset": { "__id__": 0 }, - "fileId": "4dM7kjF4tBMISXXkT0TFds", + "fileId": "74D8xEUaBNgbkOGRhnJ50q", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4173,7 +4173,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "27FoP3BkhKFrAsU4UN90Ui" + "fileId": "2dHznFv7NCxq+LbBANZOqg" }, { "__type__": "cc.PrefabInfo", @@ -4183,7 +4183,7 @@ "asset": { "__id__": 0 }, - "fileId": "aff4iKAuJMcZEQmrWCqubf", + "fileId": "a0KKNvSe5PUJAQTCIKyXoR", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4214,7 +4214,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "4eSXvtkclPE5wBkPgYdw4k" + "fileId": "7ajXgaDIVOEYI4SlKrHlIc" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4238,7 +4238,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3cF8zPY3JMJKCCSfeLNN4U" + "fileId": "e95gNjm5BAeZsmQJN4GFUQ" }, { "__type__": "cc.PrefabInfo", @@ -4248,7 +4248,7 @@ "asset": { "__id__": 0 }, - "fileId": "85kBkJ4lZMCZ+kq1AIHIBy", + "fileId": "389Jlol1VA4Kaq0AJWMFQ1", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4431,7 +4431,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "05M1Jlrv5O9a31IKW2R+Lu" + "fileId": "35/N6E0uhCH5r5k3jVnm0+" }, { "__type__": "cc.PrefabInfo", @@ -4441,7 +4441,7 @@ "asset": { "__id__": 0 }, - "fileId": "91gu/RytNNmIdoY0fQt4qb", + "fileId": "baeLAbsfZKPr44wdFRtacc", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4472,7 +4472,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "15vHUbNwBLjqwKoPFZ9sSn" + "fileId": "6fuNFvmBtNm6RMPY9JuWZY" }, { "__type__": "cc.PrefabInfo", @@ -4482,7 +4482,7 @@ "asset": { "__id__": 0 }, - "fileId": "8fYK9ViEJEepHzG5aJdfyF", + "fileId": "4bc50/A3hPGrf16obz2wp/", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4513,7 +4513,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c6LRNTuWFN3ZS5BMnMtXoH" + "fileId": "82DCdekVZDzZXhmqATTvb1" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4537,7 +4537,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6bUnH9CclLfoXIdOsjRn45" + "fileId": "af38AOG/VBGo+/yayLH/Ds" }, { "__type__": "cc.PrefabInfo", @@ -4547,7 +4547,7 @@ "asset": { "__id__": 0 }, - "fileId": "21eCp2k5dBCIYn3sCbF7TJ", + "fileId": "53ywPfJjtBTY35mXqOxK9c", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4572,7 +4572,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "67uqYscHxNyp+TiiSMZFzD" + "fileId": "fdYo/dFVdClJRSNm2t+Tj7" }, { "__type__": "cc.UITransform", @@ -4600,7 +4600,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "cf/ElkFLhOdoOTURD1CISD" + "fileId": "4bfa/u2sFAkrcuqJba2Qc4" }, { "__type__": "cc.Sprite", @@ -4645,7 +4645,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c2xSvKvVhD27yjycw3CMco" + "fileId": "98Rh88e5FOP4k6x6IzEaZe" }, { "__type__": "cc.PrefabInfo", @@ -4655,7 +4655,7 @@ "asset": { "__id__": 0 }, - "fileId": "c4JHoecMBKLL6Ojfk5CyXi", + "fileId": "adMkcwsdZFA41ykWID+Yzx", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -6876,8 +6876,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 136, - "height": 43 + "width": 208, + "height": 41 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6913,7 +6913,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "d28325a9-1e19-4ccd-a759-e312ee3056b2@f9941", + "__uuid__": "2d218527-c9f5-4622-8c16-9e2ccb9e46ad@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -6981,7 +6981,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 100, + "width": 90, "height": 15 }, "_anchorPoint": { @@ -7159,7 +7159,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -80, + "x": -68, "y": 18, "z": 0 }, @@ -7200,7 +7200,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 160, + "width": 140, "height": 10 }, "_anchorPoint": { @@ -7324,7 +7324,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 80, + "x": 70, "y": 0, "z": 0 }, @@ -7470,7 +7470,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 320, + "width": 276, "height": 100 }, "_anchorPoint": { @@ -7492,7 +7492,7 @@ "node": { "__id__": 309 }, - "_enabled": false, + "_enabled": true, "__prefab": { "__id__": 327 }, @@ -11438,7 +11438,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 150, + "width": 135, "height": 15 }, "_anchorPoint": { @@ -11616,7 +11616,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -80, + "x": -68, "y": 18, "z": 0 }, @@ -11657,7 +11657,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 130, + "width": 140, "height": 10 }, "_anchorPoint": { @@ -11693,7 +11693,7 @@ "b": 255, "a": 255 }, - "_string": "1200", + "_string": "12000", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 10, @@ -11781,7 +11781,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 80, + "x": 70, "y": 0, "z": 0 }, @@ -11927,7 +11927,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 320, + "width": 276, "height": 100 }, "_anchorPoint": { @@ -11949,7 +11949,7 @@ "node": { "__id__": 510 }, - "_enabled": false, + "_enabled": true, "__prefab": { "__id__": 528 }, @@ -24011,26 +24011,26 @@ "__id__": 1100 }, { - "__id__": 1182 + "__id__": 1184 }, { - "__id__": 1256 + "__id__": 1260 } ], "_active": true, "_components": [ - { - "__id__": 1302 - }, - { - "__id__": 1304 - }, { "__id__": 1306 + }, + { + "__id__": 1308 + }, + { + "__id__": 1310 } ], "_prefab": { - "__id__": 1308 + "__id__": 1312 }, "_lpos": { "__type__": "cc.Vec3", @@ -24074,29 +24074,29 @@ "__id__": 1101 }, { - "__id__": 1109 + "__id__": 1111 }, { - "__id__": 1145 + "__id__": 1147 }, { - "__id__": 1154 + "__id__": 1156 }, { - "__id__": 1171 + "__id__": 1173 } ], "_active": false, "_components": [ { - "__id__": 1177 + "__id__": 1179 }, { - "__id__": 1179 + "__id__": 1181 } ], "_prefab": { - "__id__": 1181 + "__id__": 1183 }, "_lpos": { "__type__": "cc.Vec3", @@ -24146,10 +24146,13 @@ }, { "__id__": 1106 + }, + { + "__id__": 1108 } ], "_prefab": { - "__id__": 1108 + "__id__": 1110 }, "_lpos": { "__type__": "cc.Vec3", @@ -24195,7 +24198,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 2080, - "height": 3360 + "height": 2920 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -24289,6 +24292,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "28/tiws69O7pzk7RphzwNp" }, + { + "__type__": "cc.BlockInputEvents", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1101 + }, + "_enabled": true, + "__prefab": { + "__id__": 1109 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5eGq+p24lEn6eFV5ty1+g2" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -24312,29 +24333,29 @@ }, "_children": [ { - "__id__": 1110 + "__id__": 1112 }, { - "__id__": 1116 + "__id__": 1118 }, { - "__id__": 1124 + "__id__": 1126 }, { - "__id__": 1132 + "__id__": 1134 } ], "_active": true, "_components": [ { - "__id__": 1140 + "__id__": 1142 }, { - "__id__": 1142 + "__id__": 1144 } ], "_prefab": { - "__id__": 1144 + "__id__": 1146 }, "_lpos": { "__type__": "cc.Vec3", @@ -24371,20 +24392,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1109 + "__id__": 1111 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1111 + "__id__": 1113 }, { - "__id__": 1113 + "__id__": 1115 } ], "_prefab": { - "__id__": 1115 + "__id__": 1117 }, "_lpos": { "__type__": "cc.Vec3", @@ -24421,11 +24442,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1110 + "__id__": 1112 }, "_enabled": true, "__prefab": { - "__id__": 1112 + "__id__": 1114 }, "_contentSize": { "__type__": "cc.Size", @@ -24449,11 +24470,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1110 + "__id__": 1112 }, "_enabled": true, "__prefab": { - "__id__": 1114 + "__id__": 1116 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -24507,23 +24528,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1109 + "__id__": 1111 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1117 - }, { "__id__": 1119 }, { "__id__": 1121 + }, + { + "__id__": 1123 } ], "_prefab": { - "__id__": 1123 + "__id__": 1125 }, "_lpos": { "__type__": "cc.Vec3", @@ -24560,11 +24581,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1116 + "__id__": 1118 }, "_enabled": true, "__prefab": { - "__id__": 1118 + "__id__": 1120 }, "_contentSize": { "__type__": "cc.Size", @@ -24588,11 +24609,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1116 + "__id__": 1118 }, "_enabled": true, "__prefab": { - "__id__": 1120 + "__id__": 1122 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -24633,11 +24654,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1116 + "__id__": 1118 }, "_enabled": true, "__prefab": { - "__id__": 1122 + "__id__": 1124 }, "spriteName": "sysgift_symbols", "_id": "" @@ -24665,23 +24686,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1109 + "__id__": 1111 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1125 - }, { "__id__": 1127 }, { "__id__": 1129 + }, + { + "__id__": 1131 } ], "_prefab": { - "__id__": 1131 + "__id__": 1133 }, "_lpos": { "__type__": "cc.Vec3", @@ -24718,11 +24739,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1124 + "__id__": 1126 }, "_enabled": true, "__prefab": { - "__id__": 1126 + "__id__": 1128 }, "_contentSize": { "__type__": "cc.Size", @@ -24746,11 +24767,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1124 + "__id__": 1126 }, "_enabled": true, "__prefab": { - "__id__": 1128 + "__id__": 1130 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -24791,11 +24812,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1124 + "__id__": 1126 }, "_enabled": true, "__prefab": { - "__id__": 1130 + "__id__": 1132 }, "spriteName": "sysgift_fbs", "_id": "" @@ -24823,23 +24844,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1109 + "__id__": 1111 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1133 - }, { "__id__": 1135 }, { "__id__": 1137 + }, + { + "__id__": 1139 } ], "_prefab": { - "__id__": 1139 + "__id__": 1141 }, "_lpos": { "__type__": "cc.Vec3", @@ -24876,11 +24897,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1132 + "__id__": 1134 }, "_enabled": true, "__prefab": { - "__id__": 1134 + "__id__": 1136 }, "_contentSize": { "__type__": "cc.Size", @@ -24904,11 +24925,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1132 + "__id__": 1134 }, "_enabled": true, "__prefab": { - "__id__": 1136 + "__id__": 1138 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -24949,11 +24970,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1132 + "__id__": 1134 }, "_enabled": true, "__prefab": { - "__id__": 1138 + "__id__": 1140 }, "spriteName": "sysgift_received", "_id": "" @@ -24981,11 +25002,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1109 + "__id__": 1111 }, "_enabled": true, "__prefab": { - "__id__": 1141 + "__id__": 1143 }, "_contentSize": { "__type__": "cc.Size", @@ -25009,11 +25030,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1109 + "__id__": 1111 }, "_enabled": true, "__prefab": { - "__id__": 1143 + "__id__": 1145 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25072,18 +25093,18 @@ "_children": [], "_active": true, "_components": [ - { - "__id__": 1146 - }, { "__id__": 1148 }, { "__id__": 1150 + }, + { + "__id__": 1152 } ], "_prefab": { - "__id__": 1153 + "__id__": 1155 }, "_lpos": { "__type__": "cc.Vec3", @@ -25120,16 +25141,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1145 + "__id__": 1147 }, "_enabled": true, "__prefab": { - "__id__": 1147 + "__id__": 1149 }, "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2360 + "height": 1919.9999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -25148,11 +25169,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1145 + "__id__": 1147 }, "_enabled": true, "__prefab": { - "__id__": 1149 + "__id__": 1151 }, "_alignFlags": 45, "_target": null, @@ -25184,15 +25205,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1145 + "__id__": 1147 }, "_enabled": true, "__prefab": { - "__id__": 1151 + "__id__": 1153 }, "clickEvents": [ { - "__id__": 1152 + "__id__": 1154 } ], "_interactable": true, @@ -25269,23 +25290,23 @@ }, "_children": [ { - "__id__": 1155 + "__id__": 1157 } ], "_active": true, "_components": [ - { - "__id__": 1163 - }, { "__id__": 1165 }, { "__id__": 1167 + }, + { + "__id__": 1169 } ], "_prefab": { - "__id__": 1170 + "__id__": 1172 }, "_lpos": { "__type__": "cc.Vec3", @@ -25322,23 +25343,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1154 + "__id__": 1156 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1156 - }, { "__id__": 1158 }, { "__id__": 1160 + }, + { + "__id__": 1162 } ], "_prefab": { - "__id__": 1162 + "__id__": 1164 }, "_lpos": { "__type__": "cc.Vec3", @@ -25375,11 +25396,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1155 + "__id__": 1157 }, "_enabled": true, "__prefab": { - "__id__": 1157 + "__id__": 1159 }, "_contentSize": { "__type__": "cc.Size", @@ -25403,11 +25424,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1155 + "__id__": 1157 }, "_enabled": true, "__prefab": { - "__id__": 1159 + "__id__": 1161 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25448,11 +25469,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1155 + "__id__": 1157 }, "_enabled": true, "__prefab": { - "__id__": 1161 + "__id__": 1163 }, "spriteName": "sysgift_continue", "_id": "" @@ -25480,11 +25501,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1154 + "__id__": 1156 }, "_enabled": true, "__prefab": { - "__id__": 1164 + "__id__": 1166 }, "_contentSize": { "__type__": "cc.Size", @@ -25508,11 +25529,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1154 + "__id__": 1156 }, "_enabled": true, "__prefab": { - "__id__": 1166 + "__id__": 1168 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25553,15 +25574,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1154 + "__id__": 1156 }, "_enabled": true, "__prefab": { - "__id__": 1168 + "__id__": 1170 }, "clickEvents": [ { - "__id__": 1169 + "__id__": 1171 } ], "_interactable": true, @@ -25642,14 +25663,14 @@ "_active": true, "_components": [ { - "__id__": 1172 + "__id__": 1174 }, { - "__id__": 1174 + "__id__": 1176 } ], "_prefab": { - "__id__": 1176 + "__id__": 1178 }, "_lpos": { "__type__": "cc.Vec3", @@ -25686,11 +25707,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1171 + "__id__": 1173 }, "_enabled": true, "__prefab": { - "__id__": 1173 + "__id__": 1175 }, "_contentSize": { "__type__": "cc.Size", @@ -25714,11 +25735,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1171 + "__id__": 1173 }, "_enabled": true, "__prefab": { - "__id__": 1175 + "__id__": 1177 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25802,12 +25823,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 1178 + "__id__": 1180 }, "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2360 + "height": 1919.9999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -25830,7 +25851,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1180 + "__id__": 1182 }, "_alignFlags": 45, "_target": null, @@ -25879,32 +25900,32 @@ }, "_children": [ { - "__id__": 1183 + "__id__": 1185 }, { - "__id__": 1191 + "__id__": 1195 }, { - "__id__": 1219 + "__id__": 1223 }, { - "__id__": 1228 + "__id__": 1232 }, { - "__id__": 1245 + "__id__": 1249 } ], "_active": false, "_components": [ { - "__id__": 1251 + "__id__": 1255 }, { - "__id__": 1253 + "__id__": 1257 } ], "_prefab": { - "__id__": 1255 + "__id__": 1259 }, "_lpos": { "__type__": "cc.Vec3", @@ -25941,23 +25962,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1182 + "__id__": 1184 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1184 - }, { "__id__": 1186 }, { "__id__": 1188 + }, + { + "__id__": 1190 + }, + { + "__id__": 1192 } ], "_prefab": { - "__id__": 1190 + "__id__": 1194 }, "_lpos": { "__type__": "cc.Vec3", @@ -25994,11 +26018,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1183 + "__id__": 1185 }, "_enabled": true, "__prefab": { - "__id__": 1185 + "__id__": 1187 }, "_contentSize": { "__type__": "cc.Size", @@ -26022,11 +26046,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1183 + "__id__": 1185 }, "_enabled": true, "__prefab": { - "__id__": 1187 + "__id__": 1189 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26067,11 +26091,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1183 + "__id__": 1185 }, "_enabled": true, "__prefab": { - "__id__": 1189 + "__id__": 1191 }, "_alignFlags": 45, "_target": null, @@ -26097,6 +26121,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "c9XOuikUxAyqKUfqMogAFo" }, + { + "__type__": "cc.BlockInputEvents", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1185 + }, + "_enabled": true, + "__prefab": { + "__id__": 1193 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5a/T16mK9KgLMhpH9Uyez5" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -26116,30 +26158,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1182 + "__id__": 1184 }, "_children": [ { - "__id__": 1192 + "__id__": 1196 }, { - "__id__": 1198 + "__id__": 1202 }, { - "__id__": 1206 + "__id__": 1210 } ], "_active": true, "_components": [ { - "__id__": 1214 + "__id__": 1218 }, { - "__id__": 1216 + "__id__": 1220 } ], "_prefab": { - "__id__": 1218 + "__id__": 1222 }, "_lpos": { "__type__": "cc.Vec3", @@ -26176,20 +26218,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1191 + "__id__": 1195 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1193 + "__id__": 1197 }, { - "__id__": 1195 + "__id__": 1199 } ], "_prefab": { - "__id__": 1197 + "__id__": 1201 }, "_lpos": { "__type__": "cc.Vec3", @@ -26226,11 +26268,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1192 + "__id__": 1196 }, "_enabled": true, "__prefab": { - "__id__": 1194 + "__id__": 1198 }, "_contentSize": { "__type__": "cc.Size", @@ -26254,11 +26296,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1192 + "__id__": 1196 }, "_enabled": true, "__prefab": { - "__id__": 1196 + "__id__": 1200 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26312,23 +26354,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1191 + "__id__": 1195 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1199 - }, - { - "__id__": 1201 - }, { "__id__": 1203 + }, + { + "__id__": 1205 + }, + { + "__id__": 1207 } ], "_prefab": { - "__id__": 1205 + "__id__": 1209 }, "_lpos": { "__type__": "cc.Vec3", @@ -26365,11 +26407,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1198 + "__id__": 1202 }, "_enabled": true, "__prefab": { - "__id__": 1200 + "__id__": 1204 }, "_contentSize": { "__type__": "cc.Size", @@ -26393,11 +26435,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1198 + "__id__": 1202 }, "_enabled": true, "__prefab": { - "__id__": 1202 + "__id__": 1206 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26438,11 +26480,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1198 + "__id__": 1202 }, "_enabled": true, "__prefab": { - "__id__": 1204 + "__id__": 1208 }, "spriteName": "sysgift_completed", "_id": "" @@ -26470,23 +26512,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1191 + "__id__": 1195 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1207 - }, - { - "__id__": 1209 - }, { "__id__": 1211 + }, + { + "__id__": 1213 + }, + { + "__id__": 1215 } ], "_prefab": { - "__id__": 1213 + "__id__": 1217 }, "_lpos": { "__type__": "cc.Vec3", @@ -26523,11 +26565,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1206 + "__id__": 1210 }, "_enabled": true, "__prefab": { - "__id__": 1208 + "__id__": 1212 }, "_contentSize": { "__type__": "cc.Size", @@ -26551,11 +26593,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1206 + "__id__": 1210 }, "_enabled": true, "__prefab": { - "__id__": 1210 + "__id__": 1214 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26596,11 +26638,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1206 + "__id__": 1210 }, "_enabled": true, "__prefab": { - "__id__": 1212 + "__id__": 1216 }, "spriteName": "sysgift_total", "_id": "" @@ -26628,11 +26670,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1191 + "__id__": 1195 }, "_enabled": true, "__prefab": { - "__id__": 1215 + "__id__": 1219 }, "_contentSize": { "__type__": "cc.Size", @@ -26656,11 +26698,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1191 + "__id__": 1195 }, "_enabled": true, "__prefab": { - "__id__": 1217 + "__id__": 1221 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26714,23 +26756,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1182 + "__id__": 1184 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1220 + "__id__": 1224 }, { - "__id__": 1222 + "__id__": 1226 }, { - "__id__": 1225 + "__id__": 1229 } ], "_prefab": { - "__id__": 1227 + "__id__": 1231 }, "_lpos": { "__type__": "cc.Vec3", @@ -26767,11 +26809,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1219 + "__id__": 1223 }, "_enabled": true, "__prefab": { - "__id__": 1221 + "__id__": 1225 }, "_contentSize": { "__type__": "cc.Size", @@ -26795,15 +26837,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1219 + "__id__": 1223 }, "_enabled": true, "__prefab": { - "__id__": 1223 + "__id__": 1227 }, "clickEvents": [ { - "__id__": 1224 + "__id__": 1228 } ], "_interactable": true, @@ -26863,11 +26905,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1219 + "__id__": 1223 }, "_enabled": true, "__prefab": { - "__id__": 1226 + "__id__": 1230 }, "_alignFlags": 45, "_target": null, @@ -26912,27 +26954,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1182 + "__id__": 1184 }, "_children": [ { - "__id__": 1229 + "__id__": 1233 } ], "_active": true, "_components": [ - { - "__id__": 1237 - }, - { - "__id__": 1239 - }, { "__id__": 1241 + }, + { + "__id__": 1243 + }, + { + "__id__": 1245 } ], "_prefab": { - "__id__": 1244 + "__id__": 1248 }, "_lpos": { "__type__": "cc.Vec3", @@ -26969,23 +27011,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1228 + "__id__": 1232 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1230 - }, - { - "__id__": 1232 - }, { "__id__": 1234 + }, + { + "__id__": 1236 + }, + { + "__id__": 1238 } ], "_prefab": { - "__id__": 1236 + "__id__": 1240 }, "_lpos": { "__type__": "cc.Vec3", @@ -27022,11 +27064,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1229 + "__id__": 1233 }, "_enabled": true, "__prefab": { - "__id__": 1231 + "__id__": 1235 }, "_contentSize": { "__type__": "cc.Size", @@ -27050,11 +27092,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1229 + "__id__": 1233 }, "_enabled": true, "__prefab": { - "__id__": 1233 + "__id__": 1237 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -27095,11 +27137,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1229 + "__id__": 1233 }, "_enabled": true, "__prefab": { - "__id__": 1235 + "__id__": 1239 }, "spriteName": "sysgift_continue", "_id": "" @@ -27127,11 +27169,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1228 + "__id__": 1232 }, "_enabled": true, "__prefab": { - "__id__": 1238 + "__id__": 1242 }, "_contentSize": { "__type__": "cc.Size", @@ -27155,11 +27197,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1228 + "__id__": 1232 }, "_enabled": true, "__prefab": { - "__id__": 1240 + "__id__": 1244 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -27200,15 +27242,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1228 + "__id__": 1232 }, "_enabled": true, "__prefab": { - "__id__": 1242 + "__id__": 1246 }, "clickEvents": [ { - "__id__": 1243 + "__id__": 1247 } ], "_interactable": true, @@ -27283,20 +27325,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1182 + "__id__": 1184 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1246 + "__id__": 1250 }, { - "__id__": 1248 + "__id__": 1252 } ], "_prefab": { - "__id__": 1250 + "__id__": 1254 }, "_lpos": { "__type__": "cc.Vec3", @@ -27333,11 +27375,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1245 + "__id__": 1249 }, "_enabled": true, "__prefab": { - "__id__": 1247 + "__id__": 1251 }, "_contentSize": { "__type__": "cc.Size", @@ -27361,11 +27403,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1245 + "__id__": 1249 }, "_enabled": true, "__prefab": { - "__id__": 1249 + "__id__": 1253 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -27445,11 +27487,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1182 + "__id__": 1184 }, "_enabled": true, "__prefab": { - "__id__": 1252 + "__id__": 1256 }, "_contentSize": { "__type__": "cc.Size", @@ -27473,11 +27515,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1182 + "__id__": 1184 }, "_enabled": true, "__prefab": { - "__id__": 1254 + "__id__": 1258 }, "_alignFlags": 45, "_target": null, @@ -27526,32 +27568,32 @@ }, "_children": [ { - "__id__": 1257 + "__id__": 1261 }, { - "__id__": 1269 + "__id__": 1273 }, { - "__id__": 1277 + "__id__": 1281 }, { - "__id__": 1285 + "__id__": 1289 }, { - "__id__": 1291 + "__id__": 1295 } ], "_active": false, "_components": [ { - "__id__": 1297 + "__id__": 1301 }, { - "__id__": 1299 + "__id__": 1303 } ], "_prefab": { - "__id__": 1301 + "__id__": 1305 }, "_lpos": { "__type__": "cc.Vec3", @@ -27588,24 +27630,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1256 + "__id__": 1260 }, "_children": [ { - "__id__": 1258 + "__id__": 1262 } ], "_active": true, "_components": [ { - "__id__": 1264 + "__id__": 1268 }, { - "__id__": 1266 + "__id__": 1270 } ], "_prefab": { - "__id__": 1268 + "__id__": 1272 }, "_lpos": { "__type__": "cc.Vec3", @@ -27642,20 +27684,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1257 + "__id__": 1261 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1259 + "__id__": 1263 }, { - "__id__": 1261 + "__id__": 1265 } ], "_prefab": { - "__id__": 1263 + "__id__": 1267 }, "_lpos": { "__type__": "cc.Vec3", @@ -27692,11 +27734,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1258 + "__id__": 1262 }, "_enabled": true, "__prefab": { - "__id__": 1260 + "__id__": 1264 }, "_contentSize": { "__type__": "cc.Size", @@ -27720,11 +27762,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1258 + "__id__": 1262 }, "_enabled": true, "__prefab": { - "__id__": 1262 + "__id__": 1266 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -27778,11 +27820,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1257 + "__id__": 1261 }, "_enabled": true, "__prefab": { - "__id__": 1265 + "__id__": 1269 }, "_contentSize": { "__type__": "cc.Size", @@ -27806,11 +27848,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1257 + "__id__": 1261 }, "_enabled": true, "__prefab": { - "__id__": 1267 + "__id__": 1271 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -27864,23 +27906,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1256 + "__id__": 1260 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1270 - }, - { - "__id__": 1272 - }, { "__id__": 1274 + }, + { + "__id__": 1276 + }, + { + "__id__": 1278 } ], "_prefab": { - "__id__": 1276 + "__id__": 1280 }, "_lpos": { "__type__": "cc.Vec3", @@ -27917,11 +27959,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1269 + "__id__": 1273 }, "_enabled": true, "__prefab": { - "__id__": 1271 + "__id__": 1275 }, "_contentSize": { "__type__": "cc.Size", @@ -27945,11 +27987,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1269 + "__id__": 1273 }, "_enabled": true, "__prefab": { - "__id__": 1273 + "__id__": 1277 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -27990,11 +28032,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1269 + "__id__": 1273 }, "_enabled": true, "__prefab": { - "__id__": 1275 + "__id__": 1279 }, "spriteName": "sysgift_info_fbs", "_id": "" @@ -28022,23 +28064,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1256 + "__id__": 1260 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1278 - }, - { - "__id__": 1280 - }, { "__id__": 1282 + }, + { + "__id__": 1284 + }, + { + "__id__": 1286 } ], "_prefab": { - "__id__": 1284 + "__id__": 1288 }, "_lpos": { "__type__": "cc.Vec3", @@ -28075,11 +28117,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1277 + "__id__": 1281 }, "_enabled": true, "__prefab": { - "__id__": 1279 + "__id__": 1283 }, "_contentSize": { "__type__": "cc.Size", @@ -28103,11 +28145,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1277 + "__id__": 1281 }, "_enabled": true, "__prefab": { - "__id__": 1281 + "__id__": 1285 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -28145,11 +28187,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1277 + "__id__": 1281 }, "_enabled": true, "__prefab": { - "__id__": 1283 + "__id__": 1287 }, "spriteName": "sysgift_win", "_id": "" @@ -28177,20 +28219,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1256 + "__id__": 1260 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1286 + "__id__": 1290 }, { - "__id__": 1288 + "__id__": 1292 } ], "_prefab": { - "__id__": 1290 + "__id__": 1294 }, "_lpos": { "__type__": "cc.Vec3", @@ -28227,11 +28269,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1285 + "__id__": 1289 }, "_enabled": true, "__prefab": { - "__id__": 1287 + "__id__": 1291 }, "_contentSize": { "__type__": "cc.Size", @@ -28255,11 +28297,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1285 + "__id__": 1289 }, "_enabled": true, "__prefab": { - "__id__": 1289 + "__id__": 1293 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -28339,20 +28381,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1256 + "__id__": 1260 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1292 + "__id__": 1296 }, { - "__id__": 1294 + "__id__": 1298 } ], "_prefab": { - "__id__": 1296 + "__id__": 1300 }, "_lpos": { "__type__": "cc.Vec3", @@ -28389,11 +28431,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1291 + "__id__": 1295 }, "_enabled": true, "__prefab": { - "__id__": 1293 + "__id__": 1297 }, "_contentSize": { "__type__": "cc.Size", @@ -28417,11 +28459,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1291 + "__id__": 1295 }, "_enabled": true, "__prefab": { - "__id__": 1295 + "__id__": 1299 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -28501,11 +28543,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1256 + "__id__": 1260 }, "_enabled": true, "__prefab": { - "__id__": 1298 + "__id__": 1302 }, "_contentSize": { "__type__": "cc.Size", @@ -28529,11 +28571,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1256 + "__id__": 1260 }, "_enabled": false, "__prefab": { - "__id__": 1300 + "__id__": 1304 }, "_alignFlags": 1, "_target": null, @@ -28582,7 +28624,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1303 + "__id__": 1307 }, "_contentSize": { "__type__": "cc.Size", @@ -28610,7 +28652,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1305 + "__id__": 1309 }, "_alignFlags": 45, "_target": null, @@ -28646,16 +28688,16 @@ }, "_enabled": true, "__prefab": { - "__id__": 1307 + "__id__": 1311 }, "confirm": { "__id__": 1100 }, "settle": { - "__id__": 1182 + "__id__": 1184 }, "info": { - "__id__": 1256 + "__id__": 1260 }, "_id": "" }, @@ -28686,7 +28728,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1310 + "__id__": 1314 }, "_contentSize": { "__type__": "cc.Size", @@ -28714,7 +28756,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1312 + "__id__": 1316 }, "slotGame": { "__id__": 548 @@ -28742,7 +28784,7 @@ "__id__": 1058 }, "SysGift": { - "__id__": 1306 + "__id__": 1310 }, "_id": "" }, @@ -28760,7 +28802,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1314 + "__id__": 1318 }, "_alignFlags": 45, "_target": null, @@ -28798,7 +28840,7 @@ "instance": null, "targetOverrides": [ { - "__id__": 1316 + "__id__": 1320 } ], "nestedPrefabInstanceRoots": [ @@ -28816,7 +28858,7 @@ "__id__": 563 }, "sourceInfo": { - "__id__": 1317 + "__id__": 1321 }, "propertyPath": [ "_target" @@ -28825,7 +28867,7 @@ "__id__": 563 }, "targetInfo": { - "__id__": 1318 + "__id__": 1322 } }, { diff --git a/assets/Game/prefabs/WebView/webView.prefab b/assets/Game/prefabs/WebView/webView.prefab index 54e56e8..5a42a85 100644 --- a/assets/Game/prefabs/WebView/webView.prefab +++ b/assets/Game/prefabs/WebView/webView.prefab @@ -137,7 +137,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1920 + "height": 1919.9999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -560,8 +560,6 @@ "__id__": 0 }, "fileId": "c7sV+7QEFBa62NH8OX0M8v", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -837,9 +835,9 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 134, + "g": 85, + "b": 62, "a": 255 }, "_spriteFrame": { @@ -913,8 +911,6 @@ "__id__": 0 }, "fileId": "617U3zX5RJSKOZ2Q2/3Ysd", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -1704,7 +1700,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1920 + "height": 1919.9999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/Game/scripts/game/BaseRoller.ts b/assets/Game/scripts/game/BaseRoller.ts index b4da5d8..a38751d 100644 --- a/assets/Game/scripts/game/BaseRoller.ts +++ b/assets/Game/scripts/game/BaseRoller.ts @@ -358,8 +358,8 @@ export abstract class BaseRoller extends Component { return this._info.isFastSpin ? [ // [0.1, -1000], - [0.1, 0], - [0.1, 4000] + [0, 0], + [0, 4000] ] : [ [0.05 * this._rollerId, 0], diff --git a/assets/Game/scripts/game/SysGift.ts b/assets/Game/scripts/game/SysGift.ts index 0eda00c..31bdf44 100644 --- a/assets/Game/scripts/game/SysGift.ts +++ b/assets/Game/scripts/game/SysGift.ts @@ -28,6 +28,10 @@ export class SysGift extends Component { onLoad(): void { this.hideAll(); + + let sp_win = this.info.getChildByName("sysgift_win"); + let scale = 116 / sp_win.getComponent(Sprite).spriteFrame.width; + sp_win.setScale(scale, scale, scale); } hideAll() { @@ -45,16 +49,11 @@ export class SysGift extends Component { if (!frb) return; let txt_spin_num = this.info.getChildByName("count") - txt_spin_num.getComponent(Label).string = (frb.Ongoing.Frn.toLocaleString()) + txt_spin_num.getComponent(Label).string = frb.Ongoing.Frn.toLocaleString() - let sp_win = this.info.getChildByName("sysgift_win") + // let sp_win = this.info.getChildByName("sysgift_win") let txt_win = this.info.getChildByName("win") - sp_win.getComponent(LocalizedSprite).fetchRender(); - let scale = 116 / sp_win.getComponent(Sprite).spriteFrame.width; - sp_win.setScale(scale, scale, scale); - - let num = Math.round(frb.Ongoing.Fra * 100 + 1e-6) / 100; txt_win.getComponent(Label).string = num.toLocaleString('en-US', { minimumFractionDigits: 2, @@ -67,6 +66,7 @@ export class SysGift extends Component { } onClickConfirm() { + GameDataManager.instance.frb.Finished = null; this.hide(this.settle); this.node.emit(SYS_GIFT.SETTLE_CONTINUE); } diff --git a/settings/v2/packages/builder.json b/settings/v2/packages/builder.json index 7526e40..3fb9771 100644 --- a/settings/v2/packages/builder.json +++ b/settings/v2/packages/builder.json @@ -1,3 +1,8 @@ { - "__version__": "1.3.9" + "__version__": "1.3.9", + "splash-setting": { + "logo": { + "type": "none" + } + } } diff --git a/settings/v2/packages/information.json b/settings/v2/packages/information.json index 7776e3d..b1c2bfb 100644 --- a/settings/v2/packages/information.json +++ b/settings/v2/packages/information.json @@ -6,8 +6,8 @@ "label": "customSplash", "enable": true, "customSplash": { - "complete": false, - "form": "https://creator-api.cocos.com/api/form/show?sid=fa2c35c7c7e42e225f57bb932a4b3aea" + "complete": true, + "form": "https://creator-api.cocos.com/api/form/show?sid=571ede397bfe249c5b5fb193d6022644" } }, "removeSplash": {