Compare commits

..

No commits in common. "master" and "v0.0.87" have entirely different histories.

26 changed files with 1171 additions and 1650 deletions

View File

@ -373,7 +373,7 @@
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -320, "x": -369,
"y": 3, "y": 3,
"z": 0 "z": 0
}, },
@ -532,7 +532,7 @@
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -140, "x": -190,
"y": 3, "y": 3,
"z": 0 "z": 0
}, },
@ -701,7 +701,7 @@
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 50, "x": 15,
"y": 3, "y": 3,
"z": 0 "z": 0
}, },
@ -1359,7 +1359,7 @@
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 220, "x": 205,
"y": 3, "y": 3,
"z": 0 "z": 0
}, },
@ -1522,7 +1522,7 @@
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 378, "x": 366,
"y": 0, "y": 0,
"z": 0 "z": 0
}, },

View File

@ -234,7 +234,7 @@
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -320, "x": -369,
"y": 0, "y": 0,
"z": 0 "z": 0
}, },
@ -393,7 +393,7 @@
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -140, "x": -190,
"y": 0, "y": 0,
"z": 0 "z": 0
}, },
@ -562,7 +562,7 @@
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 50, "x": 15,
"y": 0, "y": 0,
"z": 0 "z": 0
}, },
@ -1220,7 +1220,7 @@
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 220, "x": 205,
"y": 0, "y": 0,
"z": 0 "z": 0
}, },

View File

@ -2,10 +2,10 @@
"ver": "1.0.1", "ver": "1.0.1",
"importer": "ttf-font", "importer": "ttf-font",
"imported": true, "imported": true,
"uuid": "c1b68eb2-a73e-4f93-9c82-7321995ad81d", "uuid": "db1cf3a9-156f-4898-86ba-9144abc1c1cd",
"files": [ "files": [
".json", ".json",
"AvenirNextWorldMedium.ttf" "Avenir Next World Demi.ttf"
], ],
"subMetas": {}, "subMetas": {},
"userData": {} "userData": {}

View File

@ -0,0 +1,12 @@
{
"ver": "1.0.1",
"importer": "ttf-font",
"imported": true,
"uuid": "93a00770-2ea9-4b72-b00b-35ec67e77b2f",
"files": [
".json",
"Avenir Next World Medium.ttf"
],
"subMetas": {},
"userData": {}
}

Binary file not shown.

View File

@ -2,10 +2,10 @@
"ver": "1.0.1", "ver": "1.0.1",
"importer": "ttf-font", "importer": "ttf-font",
"imported": true, "imported": true,
"uuid": "c7f4c757-2847-4dd9-8706-1368db6e855e", "uuid": "7e072d14-f23f-45c4-90a4-64373fbcd6a5",
"files": [ "files": [
".json", ".json",
"Roboto_Bold.ttf" "Pyidaungsu.ttf"
], ],
"subMetas": {}, "subMetas": {},
"userData": {} "userData": {}

View File

@ -2,7 +2,7 @@
"ver": "1.0.1", "ver": "1.0.1",
"importer": "ttf-font", "importer": "ttf-font",
"imported": true, "imported": true,
"uuid": "04b2382d-084e-4641-8293-37cfa724b9e6", "uuid": "b7abfaa3-2c0e-43fd-9e90-6e37dcab9adf",
"files": [ "files": [
".json", ".json",
"Pyidaungsu_Bold.ttf" "Pyidaungsu_Bold.ttf"

View File

@ -2,7 +2,7 @@
"ver": "1.0.1", "ver": "1.0.1",
"importer": "ttf-font", "importer": "ttf-font",
"imported": true, "imported": true,
"uuid": "92ea9ea8-342a-477d-8107-8c1f877ff75e", "uuid": "78f28491-4722-42b8-a068-34405c8ea56e",
"files": [ "files": [
".json", ".json",
"Pyidaungsu_Regular.ttf" "Pyidaungsu_Regular.ttf"

Binary file not shown.

View File

@ -2,10 +2,10 @@
"ver": "1.0.1", "ver": "1.0.1",
"importer": "ttf-font", "importer": "ttf-font",
"imported": true, "imported": true,
"uuid": "a99cc7c0-5b18-496c-8c1d-891a541aecb7", "uuid": "e0a726e5-7f1c-4a87-be05-95fc6f4ac3d8",
"files": [ "files": [
".json", ".json",
"Roboto_Regular.ttf" "Roboto Bold.ttf"
], ],
"subMetas": {}, "subMetas": {},
"userData": {} "userData": {}

Binary file not shown.

View File

@ -2,10 +2,10 @@
"ver": "1.0.1", "ver": "1.0.1",
"importer": "ttf-font", "importer": "ttf-font",
"imported": true, "imported": true,
"uuid": "6d1253b1-d035-4f95-be22-6b2901f004e8", "uuid": "a591473d-fa62-4b03-988f-2b3f00a338e8",
"files": [ "files": [
".json", ".json",
"AvenirNextWorldDemi.ttf" "Roboto Regular.ttf"
], ],
"subMetas": {}, "subMetas": {},
"userData": {} "userData": {}

View File

@ -1,9 +0,0 @@
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "15c5f239-0858-470f-88e1-d516729e1409",
"files": [],
"subMetas": {},
"userData": {}
}

View File

@ -1211,7 +1211,7 @@
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 197, "y": 199.531,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
@ -1251,8 +1251,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 244.78125, "width": 811.1579999999999,
"height": 88.2 "height": 58
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -1293,11 +1293,11 @@
"_actualFontSize": 56, "_actualFontSize": 56,
"_fontSize": 56, "_fontSize": 56,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_lineHeight": 70, "_lineHeight": 58,
"_overflow": 0, "_overflow": 2,
"_enableWrapText": false, "_enableWrapText": true,
"_font": { "_font": {
"__uuid__": "c7f4c757-2847-4dd9-8706-1368db6e855e", "__uuid__": "e0a726e5-7f1c-4a87-be05-95fc6f4ac3d8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
@ -1369,27 +1369,27 @@
}, },
"isBold": true, "isBold": true,
"fontOther": { "fontOther": {
"__uuid__": "a99cc7c0-5b18-496c-8c1d-891a541aecb7", "__uuid__": "a591473d-fa62-4b03-988f-2b3f00a338e8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontOtherBold": { "fontOtherBold": {
"__uuid__": "c7f4c757-2847-4dd9-8706-1368db6e855e", "__uuid__": "e0a726e5-7f1c-4a87-be05-95fc6f4ac3d8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontThVi": { "fontThVi": {
"__uuid__": "c1b68eb2-a73e-4f93-9c82-7321995ad81d", "__uuid__": "93a00770-2ea9-4b72-b00b-35ec67e77b2f",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontThViBold": { "fontThViBold": {
"__uuid__": "6d1253b1-d035-4f95-be22-6b2901f004e8", "__uuid__": "db1cf3a9-156f-4898-86ba-9144abc1c1cd",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontMy": { "fontMy": {
"__uuid__": "92ea9ea8-342a-477d-8107-8c1f877ff75e", "__uuid__": "78f28491-4722-42b8-a068-34405c8ea56e",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontMyBold": { "fontMyBold": {
"__uuid__": "04b2382d-084e-4641-8293-37cfa724b9e6", "__uuid__": "b7abfaa3-2c0e-43fd-9e90-6e37dcab9adf",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_id": "" "_id": ""
@ -1441,7 +1441,7 @@
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": -153, "y": -155,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
@ -1481,8 +1481,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 286.9453125, "width": 674.271,
"height": 63 "height": 61.084999999999994
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -1520,14 +1520,14 @@
"_string": "Start Auto Spin", "_string": "Start Auto Spin",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 42, "_actualFontSize": 43,
"_fontSize": 42, "_fontSize": 42,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_lineHeight": 50, "_lineHeight": 46,
"_overflow": 0, "_overflow": 2,
"_enableWrapText": false, "_enableWrapText": true,
"_font": { "_font": {
"__uuid__": "c7f4c757-2847-4dd9-8706-1368db6e855e", "__uuid__": "e0a726e5-7f1c-4a87-be05-95fc6f4ac3d8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
@ -1599,27 +1599,27 @@
}, },
"isBold": true, "isBold": true,
"fontOther": { "fontOther": {
"__uuid__": "a99cc7c0-5b18-496c-8c1d-891a541aecb7", "__uuid__": "a591473d-fa62-4b03-988f-2b3f00a338e8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontOtherBold": { "fontOtherBold": {
"__uuid__": "c7f4c757-2847-4dd9-8706-1368db6e855e", "__uuid__": "e0a726e5-7f1c-4a87-be05-95fc6f4ac3d8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontThVi": { "fontThVi": {
"__uuid__": "c1b68eb2-a73e-4f93-9c82-7321995ad81d", "__uuid__": "93a00770-2ea9-4b72-b00b-35ec67e77b2f",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontThViBold": { "fontThViBold": {
"__uuid__": "6d1253b1-d035-4f95-be22-6b2901f004e8", "__uuid__": "db1cf3a9-156f-4898-86ba-9144abc1c1cd",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontMy": { "fontMy": {
"__uuid__": "92ea9ea8-342a-477d-8107-8c1f877ff75e", "__uuid__": "78f28491-4722-42b8-a068-34405c8ea56e",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontMyBold": { "fontMyBold": {
"__uuid__": "04b2382d-084e-4641-8293-37cfa724b9e6", "__uuid__": "b7abfaa3-2c0e-43fd-9e90-6e37dcab9adf",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_id": "" "_id": ""
@ -1670,8 +1670,8 @@
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 334, "x": 345.572,
"y": 75, "y": 75.314,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
@ -1711,8 +1711,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 256.2294921875, "width": 320,
"height": 44.1 "height": 32
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -1747,17 +1747,17 @@
"b": 255, "b": 255,
"a": 255 "a": 255
}, },
"_string": "Number of Auto Spins", "_string": "Number of Rounds",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 26, "_actualFontSize": 28,
"_fontSize": 26, "_fontSize": 28,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_lineHeight": 35, "_lineHeight": 26,
"_overflow": 0, "_overflow": 2,
"_enableWrapText": false, "_enableWrapText": false,
"_font": { "_font": {
"__uuid__": "a99cc7c0-5b18-496c-8c1d-891a541aecb7", "__uuid__": "a591473d-fa62-4b03-988f-2b3f00a338e8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
@ -1829,27 +1829,27 @@
}, },
"isBold": false, "isBold": false,
"fontOther": { "fontOther": {
"__uuid__": "a99cc7c0-5b18-496c-8c1d-891a541aecb7", "__uuid__": "a591473d-fa62-4b03-988f-2b3f00a338e8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontOtherBold": { "fontOtherBold": {
"__uuid__": "c7f4c757-2847-4dd9-8706-1368db6e855e", "__uuid__": "e0a726e5-7f1c-4a87-be05-95fc6f4ac3d8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontThVi": { "fontThVi": {
"__uuid__": "c1b68eb2-a73e-4f93-9c82-7321995ad81d", "__uuid__": "93a00770-2ea9-4b72-b00b-35ec67e77b2f",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontThViBold": { "fontThViBold": {
"__uuid__": "6d1253b1-d035-4f95-be22-6b2901f004e8", "__uuid__": "db1cf3a9-156f-4898-86ba-9144abc1c1cd",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontMy": { "fontMy": {
"__uuid__": "92ea9ea8-342a-477d-8107-8c1f877ff75e", "__uuid__": "78f28491-4722-42b8-a068-34405c8ea56e",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontMyBold": { "fontMyBold": {
"__uuid__": "04b2382d-084e-4641-8293-37cfa724b9e6", "__uuid__": "b7abfaa3-2c0e-43fd-9e90-6e37dcab9adf",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_id": "" "_id": ""
@ -1895,7 +1895,7 @@
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 334.98, "x": 334.98,
"y": 5, "y": 5.33,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {

File diff suppressed because it is too large Load Diff

View File

@ -27,18 +27,18 @@
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 88
},
{ {
"__id__": 90 "__id__": 90
}, },
{ {
"__id__": 92 "__id__": 92
},
{
"__id__": 94
} }
], ],
"_prefab": { "_prefab": {
"__id__": 94 "__id__": 96
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@ -140,7 +140,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1080, "width": 1080,
"height": 1920 "height": 1920.0000000000002
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -299,23 +299,23 @@
"__id__": 59 "__id__": 59
}, },
{ {
"__id__": 67 "__id__": 69
}, },
{ {
"__id__": 75 "__id__": 77
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 83 "__id__": 85
}, },
{ {
"__id__": 85 "__id__": 87
} }
], ],
"_prefab": { "_prefab": {
"__id__": 87 "__id__": 89
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@ -789,7 +789,7 @@
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 185.57, "x": 182.887,
"y": -150, "y": -150,
"z": 0 "z": 0
}, },
@ -830,8 +830,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 79.0986328125, "width": 251,
"height": 75.6 "height": 40
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -866,17 +866,17 @@
"b": 255, "b": 255,
"a": 255 "a": 255
}, },
"_string": "Quit", "_string": "Confirm",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 42, "_actualFontSize": 42,
"_fontSize": 42, "_fontSize": 42,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_lineHeight": 60, "_lineHeight": 40,
"_overflow": 0, "_overflow": 2,
"_enableWrapText": false, "_enableWrapText": true,
"_font": { "_font": {
"__uuid__": "c7f4c757-2847-4dd9-8706-1368db6e855e", "__uuid__": "e0a726e5-7f1c-4a87-be05-95fc6f4ac3d8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
@ -929,27 +929,27 @@
}, },
"isBold": true, "isBold": true,
"fontOther": { "fontOther": {
"__uuid__": "a99cc7c0-5b18-496c-8c1d-891a541aecb7", "__uuid__": "a591473d-fa62-4b03-988f-2b3f00a338e8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontOtherBold": { "fontOtherBold": {
"__uuid__": "c7f4c757-2847-4dd9-8706-1368db6e855e", "__uuid__": "e0a726e5-7f1c-4a87-be05-95fc6f4ac3d8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontThVi": { "fontThVi": {
"__uuid__": "c1b68eb2-a73e-4f93-9c82-7321995ad81d", "__uuid__": "93a00770-2ea9-4b72-b00b-35ec67e77b2f",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontThViBold": { "fontThViBold": {
"__uuid__": "6d1253b1-d035-4f95-be22-6b2901f004e8", "__uuid__": "db1cf3a9-156f-4898-86ba-9144abc1c1cd",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontMy": { "fontMy": {
"__uuid__": "92ea9ea8-342a-477d-8107-8c1f877ff75e", "__uuid__": "78f28491-4722-42b8-a068-34405c8ea56e",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontMyBold": { "fontMyBold": {
"__uuid__": "04b2382d-084e-4641-8293-37cfa724b9e6", "__uuid__": "b7abfaa3-2c0e-43fd-9e90-6e37dcab9adf",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_id": "" "_id": ""
@ -1177,8 +1177,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 150.8759765625, "width": 251,
"height": 75.6 "height": 40
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -1219,11 +1219,11 @@
"_actualFontSize": 42, "_actualFontSize": 42,
"_fontSize": 42, "_fontSize": 42,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_lineHeight": 60, "_lineHeight": 40,
"_overflow": 0, "_overflow": 2,
"_enableWrapText": false, "_enableWrapText": true,
"_font": { "_font": {
"__uuid__": "c7f4c757-2847-4dd9-8706-1368db6e855e", "__uuid__": "e0a726e5-7f1c-4a87-be05-95fc6f4ac3d8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
@ -1276,27 +1276,27 @@
}, },
"isBold": true, "isBold": true,
"fontOther": { "fontOther": {
"__uuid__": "a99cc7c0-5b18-496c-8c1d-891a541aecb7", "__uuid__": "a591473d-fa62-4b03-988f-2b3f00a338e8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontOtherBold": { "fontOtherBold": {
"__uuid__": "c7f4c757-2847-4dd9-8706-1368db6e855e", "__uuid__": "e0a726e5-7f1c-4a87-be05-95fc6f4ac3d8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontThVi": { "fontThVi": {
"__uuid__": "c1b68eb2-a73e-4f93-9c82-7321995ad81d", "__uuid__": "93a00770-2ea9-4b72-b00b-35ec67e77b2f",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontThViBold": { "fontThViBold": {
"__uuid__": "6d1253b1-d035-4f95-be22-6b2901f004e8", "__uuid__": "db1cf3a9-156f-4898-86ba-9144abc1c1cd",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontMy": { "fontMy": {
"__uuid__": "92ea9ea8-342a-477d-8107-8c1f877ff75e", "__uuid__": "78f28491-4722-42b8-a068-34405c8ea56e",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontMyBold": { "fontMyBold": {
"__uuid__": "04b2382d-084e-4641-8293-37cfa724b9e6", "__uuid__": "b7abfaa3-2c0e-43fd-9e90-6e37dcab9adf",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_id": "" "_id": ""
@ -1476,10 +1476,13 @@
}, },
{ {
"__id__": 64 "__id__": 64
},
{
"__id__": 66
} }
], ],
"_prefab": { "_prefab": {
"__id__": 66 "__id__": 68
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@ -1524,8 +1527,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 127.8251953125, "width": 251,
"height": 75.6 "height": 40
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -1566,11 +1569,11 @@
"_actualFontSize": 42, "_actualFontSize": 42,
"_fontSize": 42, "_fontSize": 42,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_lineHeight": 60, "_lineHeight": 40,
"_overflow": 0, "_overflow": 2,
"_enableWrapText": false, "_enableWrapText": true,
"_font": { "_font": {
"__uuid__": "c7f4c757-2847-4dd9-8706-1368db6e855e", "__uuid__": "e0a726e5-7f1c-4a87-be05-95fc6f4ac3d8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
@ -1609,6 +1612,25 @@
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "c4kn/dwy9JE7b3LltCan8M" "fileId": "c4kn/dwy9JE7b3LltCan8M"
}, },
{
"__type__": "0059a+GnsRMGp0ldUMAWFR3",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 59
},
"_enabled": false,
"__prefab": {
"__id__": 65
},
"_key": "AID_QUIT_LEFT_BUTTON",
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "f2MqdiXIhK9JLnoNSmaVgM"
},
{ {
"__type__": "de146+mh9NCho861VoY+Eu8", "__type__": "de146+mh9NCho861VoY+Eu8",
"_name": "", "_name": "",
@ -1619,31 +1641,31 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 65 "__id__": 67
}, },
"isBold": true, "isBold": true,
"fontOther": { "fontOther": {
"__uuid__": "a99cc7c0-5b18-496c-8c1d-891a541aecb7", "__uuid__": "a591473d-fa62-4b03-988f-2b3f00a338e8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontOtherBold": { "fontOtherBold": {
"__uuid__": "c7f4c757-2847-4dd9-8706-1368db6e855e", "__uuid__": "e0a726e5-7f1c-4a87-be05-95fc6f4ac3d8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontThVi": { "fontThVi": {
"__uuid__": "c1b68eb2-a73e-4f93-9c82-7321995ad81d", "__uuid__": "93a00770-2ea9-4b72-b00b-35ec67e77b2f",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontThViBold": { "fontThViBold": {
"__uuid__": "6d1253b1-d035-4f95-be22-6b2901f004e8", "__uuid__": "db1cf3a9-156f-4898-86ba-9144abc1c1cd",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontMy": { "fontMy": {
"__uuid__": "92ea9ea8-342a-477d-8107-8c1f877ff75e", "__uuid__": "78f28491-4722-42b8-a068-34405c8ea56e",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontMyBold": { "fontMyBold": {
"__uuid__": "04b2382d-084e-4641-8293-37cfa724b9e6", "__uuid__": "b7abfaa3-2c0e-43fd-9e90-6e37dcab9adf",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_id": "" "_id": ""
@ -1676,23 +1698,23 @@
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 68
},
{ {
"__id__": 70 "__id__": 70
}, },
{ {
"__id__": 72 "__id__": 72
},
{
"__id__": 74
} }
], ],
"_prefab": { "_prefab": {
"__id__": 74 "__id__": 76
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 200, "y": 198.321,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
@ -1724,16 +1746,16 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 67 "__id__": 69
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 69 "__id__": 71
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 264.5234375, "width": 580,
"height": 88.2 "height": 60
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -1752,11 +1774,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 67 "__id__": 69
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 71 "__id__": 73
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
@ -1768,17 +1790,17 @@
"b": 255, "b": 255,
"a": 255 "a": 255
}, },
"_string": "Quit Game", "_string": "Tip",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 56, "_actualFontSize": 56,
"_fontSize": 56, "_fontSize": 56,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_lineHeight": 70, "_lineHeight": 60,
"_overflow": 0, "_overflow": 2,
"_enableWrapText": false, "_enableWrapText": true,
"_font": { "_font": {
"__uuid__": "c7f4c757-2847-4dd9-8706-1368db6e855e", "__uuid__": "e0a726e5-7f1c-4a87-be05-95fc6f4ac3d8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
@ -1823,35 +1845,35 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 67 "__id__": 69
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 73 "__id__": 75
}, },
"isBold": true, "isBold": true,
"fontOther": { "fontOther": {
"__uuid__": "a99cc7c0-5b18-496c-8c1d-891a541aecb7", "__uuid__": "a591473d-fa62-4b03-988f-2b3f00a338e8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontOtherBold": { "fontOtherBold": {
"__uuid__": "c7f4c757-2847-4dd9-8706-1368db6e855e", "__uuid__": "e0a726e5-7f1c-4a87-be05-95fc6f4ac3d8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontThVi": { "fontThVi": {
"__uuid__": "c1b68eb2-a73e-4f93-9c82-7321995ad81d", "__uuid__": "93a00770-2ea9-4b72-b00b-35ec67e77b2f",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontThViBold": { "fontThViBold": {
"__uuid__": "6d1253b1-d035-4f95-be22-6b2901f004e8", "__uuid__": "db1cf3a9-156f-4898-86ba-9144abc1c1cd",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontMy": { "fontMy": {
"__uuid__": "92ea9ea8-342a-477d-8107-8c1f877ff75e", "__uuid__": "78f28491-4722-42b8-a068-34405c8ea56e",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontMyBold": { "fontMyBold": {
"__uuid__": "04b2382d-084e-4641-8293-37cfa724b9e6", "__uuid__": "b7abfaa3-2c0e-43fd-9e90-6e37dcab9adf",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_id": "" "_id": ""
@ -1884,23 +1906,23 @@
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 76
},
{ {
"__id__": 78 "__id__": 78
}, },
{ {
"__id__": 80 "__id__": 80
},
{
"__id__": 82
} }
], ],
"_prefab": { "_prefab": {
"__id__": 82 "__id__": 84
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 4.263256414560601e-14,
"y": 22, "y": 20,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
@ -1932,11 +1954,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 75 "__id__": 77
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 77 "__id__": 79
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@ -1960,11 +1982,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 75 "__id__": 77
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 79 "__id__": 81
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
@ -1976,17 +1998,17 @@
"b": 255, "b": 255,
"a": 255 "a": 255
}, },
"_string": "Are you sure you want to quit? want to quit?", "_string": "label",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 43, "_actualFontSize": 43,
"_fontSize": 42, "_fontSize": 42,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_lineHeight": 57, "_lineHeight": 40,
"_overflow": 2, "_overflow": 2,
"_enableWrapText": true, "_enableWrapText": true,
"_font": { "_font": {
"__uuid__": "a99cc7c0-5b18-496c-8c1d-891a541aecb7", "__uuid__": "a591473d-fa62-4b03-988f-2b3f00a338e8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
@ -2031,35 +2053,35 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 75 "__id__": 77
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 81 "__id__": 83
}, },
"isBold": false, "isBold": false,
"fontOther": { "fontOther": {
"__uuid__": "a99cc7c0-5b18-496c-8c1d-891a541aecb7", "__uuid__": "a591473d-fa62-4b03-988f-2b3f00a338e8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontOtherBold": { "fontOtherBold": {
"__uuid__": "c7f4c757-2847-4dd9-8706-1368db6e855e", "__uuid__": "e0a726e5-7f1c-4a87-be05-95fc6f4ac3d8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontThVi": { "fontThVi": {
"__uuid__": "c1b68eb2-a73e-4f93-9c82-7321995ad81d", "__uuid__": "93a00770-2ea9-4b72-b00b-35ec67e77b2f",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontThViBold": { "fontThViBold": {
"__uuid__": "6d1253b1-d035-4f95-be22-6b2901f004e8", "__uuid__": "db1cf3a9-156f-4898-86ba-9144abc1c1cd",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontMy": { "fontMy": {
"__uuid__": "92ea9ea8-342a-477d-8107-8c1f877ff75e", "__uuid__": "78f28491-4722-42b8-a068-34405c8ea56e",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontMyBold": { "fontMyBold": {
"__uuid__": "04b2382d-084e-4641-8293-37cfa724b9e6", "__uuid__": "b7abfaa3-2c0e-43fd-9e90-6e37dcab9adf",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_id": "" "_id": ""
@ -2091,12 +2113,12 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 84 "__id__": 86
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1080, "width": 1080,
"height": 1920 "height": 1920.0000000000002
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -2119,7 +2141,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 86 "__id__": 88
}, },
"_alignFlags": 45, "_alignFlags": 45,
"_target": null, "_target": null,
@ -2168,12 +2190,12 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 89 "__id__": 91
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1080, "width": 1080,
"height": 1920 "height": 1920.0000000000002
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -2196,7 +2218,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 91 "__id__": 93
}, },
"_alignFlags": 45, "_alignFlags": 45,
"_target": null, "_target": null,
@ -2232,7 +2254,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 93 "__id__": 95
}, },
"_id": "" "_id": ""
}, },

View File

@ -23,9 +23,7 @@ export class SlotBar extends Component {
private autoSpinPanel: Prefab = null; private autoSpinPanel: Prefab = null;
@property(Node) @property(Node)
private tipSmall_turbo: Node = null; private tipSmall: Node = null;
@property(Node)
private tipSmall_bet: Node = null;
@property(Node) @property(Node)
private manualStopNode: Node = null; private manualStopNode: Node = null;
@ -412,48 +410,34 @@ export class SlotBar extends Component {
showTipSmall(str: string, openTurbo?: boolean) { showTipSmall(str: string, openTurbo?: boolean) {
// 清理之前的计时器和动画 // 清理之前的计时器和动画
this.clearTipTimers(); this.clearTipTimers();
let tipNode = null
if (openTurbo != null) { if (openTurbo != null) {
tipNode = this.tipSmall_turbo this.tipSmall.getChildByPath("layout/Turboon").active = openTurbo
this.tipSmall_bet.active = false this.tipSmall.getChildByPath("layout/Turbooff").active = !openTurbo
tipNode.getChildByPath("layout/Turboon").active = openTurbo
tipNode.getChildByPath("layout/Turbooff").active = !openTurbo
// 设置提示内容
tipNode.active = true;
tipNode.getChildByPath("layout/Label").getComponent(Label).string = str;
let label = tipNode.getChildByPath("layout/Label").getComponent(Label);
label.updateRenderData(true);
tipNode.getChildByPath("layout").getComponent(Layout).updateLayout(true)
let tipWidth = tipNode.getChildByPath("layout").getComponent(UITransform).width;
let frame = tipNode.getChildByName('Frame_Assets');
// 调整框架大小
frame.getComponent(UITransform).setContentSize(tipWidth + 140, 125);
} else { } else {
tipNode = this.tipSmall_bet this.tipSmall.getChildByPath("layout/Turboon").active = false
this.tipSmall_turbo.active = false this.tipSmall.getChildByPath("layout/Turbooff").active = false
// 设置提示内容
tipNode.active = true;
tipNode.getChildByPath("Label").getComponent(Label).string = str;
let label = tipNode.getChildByPath("Label").getComponent(Label);
label.updateRenderData(true);
let tipWidth = tipNode.getChildByPath("Label").getComponent(UITransform).width;
let frame = tipNode.getChildByName('Frame_Assets');
// 调整框架大小
frame.getComponent(UITransform).setContentSize(tipWidth + 140, 105);
} }
tipNode.scale = new Vec3(0, 0, 0); // 设置提示内容
this.tipSmall.getChildByPath("layout/Label").getComponent(Label).string = str;
let label = this.tipSmall.getChildByPath("layout/Label").getComponent(Label);
label.updateRenderData(true);
let tipWidth = this.tipSmall.getChildByPath("layout/Label").getComponent(UITransform).width;
let frame = this.tipSmall.getChildByName('Frame_Assets');
frame.getComponent(UITransform).setContentSize(tipWidth + 100, 105);
// 调整框架大小
setTimeout(() => { setTimeout(() => {
this.tipSmall.active = true;
// 显示动画 // 显示动画
this.currentTipTween = tween(tipNode) this.tipSmall.scale = new Vec3(0, 0, 0);
this.currentTipTween = tween(this.tipSmall)
.to(0.1, { scale: new Vec3(1, 1, 1) }) .to(0.1, { scale: new Vec3(1, 1, 1) })
.call(() => { .call(() => {
// 5. 设置隐藏计时器 // 5. 设置隐藏计时器
this.hideTimer = setTimeout(() => { this.hideTimer = setTimeout(() => {
this.hideTipSmall(tipNode); this.hideTipSmall();
}, 1000); // 1秒后隐藏 }, 1000); // 1秒后隐藏
}) })
.start(); .start();
@ -462,15 +446,15 @@ export class SlotBar extends Component {
} }
private hideTipSmall(tipNode) { private hideTipSmall() {
if (!tipNode.active) return; if (!this.tipSmall.active) return;
this.clearTipTimers(); // 清理可能存在的计时器 this.clearTipTimers(); // 清理可能存在的计时器
this.currentTipTween = tween(tipNode) this.currentTipTween = tween(this.tipSmall)
.to(0.1, { scale: new Vec3(0, 0, 0) }) .to(0.1, { scale: new Vec3(0, 0, 0) })
.call(() => { .call(() => {
tipNode.active = false; this.tipSmall.active = false;
this.currentTipTween = null; this.currentTipTween = null;
}) })
.start(); .start();

View File

@ -23,7 +23,7 @@
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 89 "__id__": 88
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@ -54,7 +54,7 @@
}, },
"autoReleaseAssets": false, "autoReleaseAssets": false,
"_globals": { "_globals": {
"__id__": 90 "__id__": 89
}, },
"_id": "6c29a3fe-b10e-44a5-98e3-55595b231767" "_id": "6c29a3fe-b10e-44a5-98e3-55595b231767"
}, },
@ -77,11 +77,14 @@
"__id__": 8 "__id__": 8
}, },
{ {
"__id__": 71 "__id__": 70
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 83
},
{ {
"__id__": 84 "__id__": 84
}, },
@ -93,9 +96,6 @@
}, },
{ {
"__id__": 87 "__id__": 87
},
{
"__id__": 88
} }
], ],
"_prefab": null, "_prefab": null,
@ -187,7 +187,7 @@
"_priority": 0, "_priority": 0,
"_fov": 45, "_fov": 45,
"_fovAxis": 0, "_fovAxis": 0,
"_orthoHeight": 960, "_orthoHeight": 960.0000000000001,
"_near": 0, "_near": 0,
"_far": 2000, "_far": 2000,
"_color": { "_color": {
@ -341,11 +341,14 @@
"__id__": 9 "__id__": 9
}, },
{ {
"__id__": 64 "__id__": 63
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 66
},
{ {
"__id__": 67 "__id__": 67
}, },
@ -354,9 +357,6 @@
}, },
{ {
"__id__": 69 "__id__": 69
},
{
"__id__": 70
} }
], ],
"_prefab": null, "_prefab": null,
@ -426,19 +426,19 @@
"__id__": 45 "__id__": 45
}, },
{ {
"__id__": 49 "__id__": 48
}, },
{ {
"__id__": 59 "__id__": 58
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 62 "__id__": 61
}, },
{ {
"__id__": 63 "__id__": 62
} }
], ],
"_prefab": null, "_prefab": null,
@ -1582,7 +1582,7 @@
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": -485, "y": -551,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
@ -1620,8 +1620,8 @@
"__prefab": null, "__prefab": null,
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1000, "width": 1021.423828125,
"height": 200 "height": 69
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -1650,17 +1650,17 @@
"b": 255, "b": 255,
"a": 255 "a": 255
}, },
"_string": "Loading...", "_string": "LOADING...",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 36, "_actualFontSize": 36,
"_fontSize": 36, "_fontSize": 36,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_lineHeight": 36, "_lineHeight": 50,
"_overflow": 2, "_overflow": 3,
"_enableWrapText": false, "_enableWrapText": true,
"_font": { "_font": {
"__uuid__": "c7f4c757-2847-4dd9-8706-1368db6e855e", "__uuid__": "e0a726e5-7f1c-4a87-be05-95fc6f4ac3d8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
@ -1707,27 +1707,27 @@
"__prefab": null, "__prefab": null,
"isBold": true, "isBold": true,
"fontOther": { "fontOther": {
"__uuid__": "a99cc7c0-5b18-496c-8c1d-891a541aecb7", "__uuid__": "a591473d-fa62-4b03-988f-2b3f00a338e8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontOtherBold": { "fontOtherBold": {
"__uuid__": "c7f4c757-2847-4dd9-8706-1368db6e855e", "__uuid__": "e0a726e5-7f1c-4a87-be05-95fc6f4ac3d8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontThVi": { "fontThVi": {
"__uuid__": "c1b68eb2-a73e-4f93-9c82-7321995ad81d", "__uuid__": "93a00770-2ea9-4b72-b00b-35ec67e77b2f",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontThViBold": { "fontThViBold": {
"__uuid__": "6d1253b1-d035-4f95-be22-6b2901f004e8", "__uuid__": "db1cf3a9-156f-4898-86ba-9144abc1c1cd",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontMy": { "fontMy": {
"__uuid__": "92ea9ea8-342a-477d-8107-8c1f877ff75e", "__uuid__": "78f28491-4722-42b8-a068-34405c8ea56e",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontMyBold": { "fontMyBold": {
"__uuid__": "04b2382d-084e-4641-8293-37cfa724b9e6", "__uuid__": "b7abfaa3-2c0e-43fd-9e90-6e37dcab9adf",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_id": "88i8H1p61Pp5xAPRWfmHez" "_id": "88i8H1p61Pp5xAPRWfmHez"
@ -1748,16 +1748,13 @@
}, },
{ {
"__id__": 47 "__id__": 47
},
{
"__id__": 48
} }
], ],
"_prefab": null, "_prefab": null,
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": -485, "y": -670,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
@ -1795,8 +1792,8 @@
"__prefab": null, "__prefab": null,
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1000, "width": 1021.423828125,
"height": 200 "height": 69
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -1828,14 +1825,14 @@
"_string": "", "_string": "",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 36, "_actualFontSize": 42,
"_fontSize": 36, "_fontSize": 42,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_lineHeight": 36, "_lineHeight": 50,
"_overflow": 2, "_overflow": 3,
"_enableWrapText": false, "_enableWrapText": true,
"_font": { "_font": {
"__uuid__": "c7f4c757-2847-4dd9-8706-1368db6e855e", "__uuid__": "7d82cd3b-f3fb-43bd-902e-e9ce812e1fb0",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
@ -1870,43 +1867,6 @@
"_shadowBlur": 2, "_shadowBlur": 2,
"_id": "61i0gd04RHWKq/gulfeb0m" "_id": "61i0gd04RHWKq/gulfeb0m"
}, },
{
"__type__": "de146+mh9NCho861VoY+Eu8",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 45
},
"_enabled": true,
"__prefab": null,
"isBold": true,
"fontOther": {
"__uuid__": "a99cc7c0-5b18-496c-8c1d-891a541aecb7",
"__expectedType__": "cc.TTFFont"
},
"fontOtherBold": {
"__uuid__": "c7f4c757-2847-4dd9-8706-1368db6e855e",
"__expectedType__": "cc.TTFFont"
},
"fontThVi": {
"__uuid__": "c1b68eb2-a73e-4f93-9c82-7321995ad81d",
"__expectedType__": "cc.TTFFont"
},
"fontThViBold": {
"__uuid__": "6d1253b1-d035-4f95-be22-6b2901f004e8",
"__expectedType__": "cc.TTFFont"
},
"fontMy": {
"__uuid__": "92ea9ea8-342a-477d-8107-8c1f877ff75e",
"__expectedType__": "cc.TTFFont"
},
"fontMyBold": {
"__uuid__": "04b2382d-084e-4641-8293-37cfa724b9e6",
"__expectedType__": "cc.TTFFont"
},
"_id": "62IwvcKlpKlKKiMClWvxEH"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "Btn", "_name": "Btn",
@ -1917,19 +1877,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 50 "__id__": 49
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{
"__id__": 53
},
{ {
"__id__": 54 "__id__": 54
}, },
{ {
"__id__": 55 "__id__": 55
},
{
"__id__": 56
} }
], ],
"_prefab": null, "_prefab": null,
@ -1968,26 +1928,26 @@
"_objFlags": 512, "_objFlags": 512,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 49 "__id__": 48
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 50
},
{ {
"__id__": 51 "__id__": 51
}, },
{ {
"__id__": 52 "__id__": 52
},
{
"__id__": 53
} }
], ],
"_prefab": null, "_prefab": null,
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 7, "y": 7.533,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
@ -2019,14 +1979,14 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 50 "__id__": 49
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 400, "width": 313.4249267578125,
"height": 200 "height": 56.7
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -2041,7 +2001,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 50 "__id__": 49
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2062,10 +2022,10 @@
"_fontSize": 45, "_fontSize": 45,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_lineHeight": 45, "_lineHeight": 45,
"_overflow": 2, "_overflow": 0,
"_enableWrapText": false, "_enableWrapText": false,
"_font": { "_font": {
"__uuid__": "c7f4c757-2847-4dd9-8706-1368db6e855e", "__uuid__": "e0a726e5-7f1c-4a87-be05-95fc6f4ac3d8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
@ -2106,33 +2066,33 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 50 "__id__": 49
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
"isBold": true, "isBold": true,
"fontOther": { "fontOther": {
"__uuid__": "a99cc7c0-5b18-496c-8c1d-891a541aecb7", "__uuid__": "a591473d-fa62-4b03-988f-2b3f00a338e8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontOtherBold": { "fontOtherBold": {
"__uuid__": "c7f4c757-2847-4dd9-8706-1368db6e855e", "__uuid__": "e0a726e5-7f1c-4a87-be05-95fc6f4ac3d8",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontThVi": { "fontThVi": {
"__uuid__": "c1b68eb2-a73e-4f93-9c82-7321995ad81d", "__uuid__": "93a00770-2ea9-4b72-b00b-35ec67e77b2f",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontThViBold": { "fontThViBold": {
"__uuid__": "6d1253b1-d035-4f95-be22-6b2901f004e8", "__uuid__": "db1cf3a9-156f-4898-86ba-9144abc1c1cd",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontMy": { "fontMy": {
"__uuid__": "92ea9ea8-342a-477d-8107-8c1f877ff75e", "__uuid__": "78f28491-4722-42b8-a068-34405c8ea56e",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"fontMyBold": { "fontMyBold": {
"__uuid__": "04b2382d-084e-4641-8293-37cfa724b9e6", "__uuid__": "b7abfaa3-2c0e-43fd-9e90-6e37dcab9adf",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_id": "d0ciBlSNZE5ocCrvwlZ5Qs" "_id": "d0ciBlSNZE5ocCrvwlZ5Qs"
@ -2143,7 +2103,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 49 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2165,7 +2125,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 49 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2204,16 +2164,16 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 49 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 57 "__id__": 56
}, },
{ {
"__id__": 58 "__id__": 57
} }
], ],
"_interactable": true, "_interactable": true,
@ -2253,7 +2213,7 @@
"_duration": 0.1, "_duration": 0.1,
"_zoomScale": 1.2, "_zoomScale": 1.2,
"_target": { "_target": {
"__id__": 49 "__id__": 48
}, },
"_id": "54j4lwPyZHbqqANZE+r9Tj" "_id": "54j4lwPyZHbqqANZE+r9Tj"
}, },
@ -2289,10 +2249,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 60 "__id__": 59
}, },
{ {
"__id__": 61 "__id__": 60
} }
], ],
"_prefab": null, "_prefab": null,
@ -2331,7 +2291,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 59 "__id__": 58
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2353,7 +2313,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 59 "__id__": 58
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2450,10 +2410,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 65 "__id__": 64
}, },
{ {
"__id__": 66 "__id__": 65
} }
], ],
"_prefab": null, "_prefab": null,
@ -2492,7 +2452,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 64 "__id__": 63
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2514,7 +2474,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 64 "__id__": 63
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2656,22 +2616,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 72 "__id__": 71
}, },
{ {
"__id__": 76 "__id__": 75
}, },
{ {
"__id__": 79 "__id__": 78
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 82 "__id__": 81
}, },
{ {
"__id__": 83 "__id__": 82
} }
], ],
"_prefab": null, "_prefab": null,
@ -2710,19 +2670,19 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 71 "__id__": 70
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 72
},
{ {
"__id__": 73 "__id__": 73
}, },
{ {
"__id__": 74 "__id__": 74
},
{
"__id__": 75
} }
], ],
"_prefab": null, "_prefab": null,
@ -2761,7 +2721,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 72 "__id__": 71
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2783,7 +2743,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 72 "__id__": 71
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2795,7 +2755,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 72 "__id__": 71
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2834,16 +2794,16 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 71 "__id__": 70
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 77 "__id__": 76
}, },
{ {
"__id__": 78 "__id__": 77
} }
], ],
"_prefab": null, "_prefab": null,
@ -2882,7 +2842,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 76 "__id__": 75
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2904,7 +2864,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 76 "__id__": 75
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2966,16 +2926,16 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 71 "__id__": 70
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 80 "__id__": 79
}, },
{ {
"__id__": 81 "__id__": 80
} }
], ],
"_prefab": null, "_prefab": null,
@ -3014,7 +2974,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 79 "__id__": 78
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -3036,7 +2996,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 79 "__id__": 78
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -3075,7 +3035,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 71 "__id__": 70
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -3097,7 +3057,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 71 "__id__": 70
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -3188,13 +3148,13 @@
"__id__": 47 "__id__": 47
}, },
"startBtn": { "startBtn": {
"__id__": 56 "__id__": 55
}, },
"startBtnLabel": { "startBtnLabel": {
"__id__": 52 "__id__": 51
}, },
"GameNode": { "GameNode": {
"__id__": 64 "__id__": 63
}, },
"languageJson": { "languageJson": {
"__uuid__": "cbed1e31-2337-413a-beb0-a09df95b3bb4", "__uuid__": "cbed1e31-2337-413a-beb0-a09df95b3bb4",
@ -3216,10 +3176,10 @@
"__id__": 5 "__id__": 5
}, },
"RB7Logo": { "RB7Logo": {
"__id__": 59 "__id__": 58
}, },
"rotateNode": { "rotateNode": {
"__id__": 71 "__id__": 70
}, },
"_id": "d8F/UwpTxNpZhwSJjDvnkk" "_id": "d8F/UwpTxNpZhwSJjDvnkk"
}, },
@ -3246,28 +3206,28 @@
{ {
"__type__": "cc.SceneGlobals", "__type__": "cc.SceneGlobals",
"ambient": { "ambient": {
"__id__": 91 "__id__": 90
}, },
"shadows": { "shadows": {
"__id__": 92 "__id__": 91
}, },
"_skybox": { "_skybox": {
"__id__": 93 "__id__": 92
}, },
"fog": { "fog": {
"__id__": 94 "__id__": 93
}, },
"octree": { "octree": {
"__id__": 95 "__id__": 94
}, },
"skin": { "skin": {
"__id__": 96 "__id__": 95
}, },
"lightProbeInfo": { "lightProbeInfo": {
"__id__": 97 "__id__": 96
}, },
"postSettings": { "postSettings": {
"__id__": 98 "__id__": 97
}, },
"bakedWithStationaryMainLight": false, "bakedWithStationaryMainLight": false,
"bakedWithHighpLightmap": false "bakedWithHighpLightmap": false

View File

@ -9,7 +9,7 @@ const qs = new URLSearchParams(location.search)
// let apiaddr = "https://rpgames-api.rpfafafahkdev.com"; // let apiaddr = "https://rpgames-api.rpfafafahkdev.com";
let apiaddr = ""; let apiaddr = "";
let token = "eyJQIjoxMDA5NDksIkUiOjE3NzA2NzA4MTEsIlMiOjk5OCwiRCI6InJwXzEwMDEyIn0.8IGbHU3d63mIZPXD96UTHmDndTb2zf7JYMRpAvH4kGs"; let token = "eyJQIjoxMDA5NDksIkUiOjE3NjkxOTAzNTYsIlMiOjEwMDUsIkQiOiJycF8xMDAxMiJ9.JP2SqCScYvK7x0kQVJ_ecCMUnKH7UO4K8i4uqppa6gw";
let language = "en" let language = "en"
let currency = "THB" let currency = "THB"
let isfrom = null let isfrom = null
@ -31,7 +31,7 @@ export function getHistoryUrl() {
} }
export function getLanguage() { export function getLanguage() {
// return 'my'; // return 'th';
return language; return language;
} }
export function getIsRB7() { export function getIsRB7() {

View File

@ -222,7 +222,7 @@ export class LoadingUI extends Component {
this.startBtn.node.active = true; this.startBtn.node.active = true;
this.progressBar.node.active = false; this.progressBar.node.active = false;
this.progressLabel.node.active = false; this.progressLabel.node.active = false;
this.loadingTipLabel.node.active = false;
this.maskUITransform.node.active = false; this.maskUITransform.node.active = false;
this.lightNode.active = false; this.lightNode.active = false;