ui调整
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 44s

This commit is contained in:
TJH 2025-11-05 11:27:32 +08:00
parent 9768f42b03
commit 846e13deb2
5 changed files with 364 additions and 199 deletions

View File

@ -77,11 +77,11 @@
"__type__": "cc.RealCurve", "__type__": "cc.RealCurve",
"_times": [ "_times": [
0, 0,
0.08333333333333333, 0.0833333358168602,
0.25, 0.25,
0.3333333333333333, 0.3333333432674408,
0.36666666666666664, 0.36666667461395264,
0.4 0.4000000059604645
], ],
"_values": [ "_values": [
{ {
@ -112,7 +112,7 @@
"__type__": "cc.RealKeyframeValue", "__type__": "cc.RealKeyframeValue",
"interpolationMode": 0, "interpolationMode": 0,
"tangentWeightMode": 0, "tangentWeightMode": 0,
"value": 1.2, "value": 1.2000000476837158,
"rightTangent": 0, "rightTangent": 0,
"rightTangentWeight": 1, "rightTangentWeight": 1,
"leftTangent": 0, "leftTangent": 0,
@ -170,11 +170,11 @@
"__type__": "cc.RealCurve", "__type__": "cc.RealCurve",
"_times": [ "_times": [
0, 0,
0.08333333333333333, 0.0833333358168602,
0.25, 0.25,
0.3333333333333333, 0.3333333432674408,
0.36666666666666664, 0.36666667461395264,
0.4 0.4000000059604645
], ],
"_values": [ "_values": [
{ {
@ -205,7 +205,7 @@
"__type__": "cc.RealKeyframeValue", "__type__": "cc.RealKeyframeValue",
"interpolationMode": 0, "interpolationMode": 0,
"tangentWeightMode": 0, "tangentWeightMode": 0,
"value": 1.2, "value": 1.2000000476837158,
"rightTangent": 0, "rightTangent": 0,
"rightTangentWeight": 1, "rightTangentWeight": 1,
"leftTangent": 0, "leftTangent": 0,
@ -263,11 +263,11 @@
"__type__": "cc.RealCurve", "__type__": "cc.RealCurve",
"_times": [ "_times": [
0, 0,
0.08333333333333333, 0.0833333358168602,
0.25, 0.25,
0.3333333333333333, 0.3333333432674408,
0.36666666666666664, 0.36666667461395264,
0.4 0.4000000059604645
], ],
"_values": [ "_values": [
{ {
@ -407,7 +407,7 @@
"__type__": "cc.RealCurve", "__type__": "cc.RealCurve",
"_times": [ "_times": [
0, 0,
0.16666666666666666, 0.1666666716337204,
0.25 0.25
], ],
"_values": [ "_values": [
@ -461,7 +461,7 @@
"__type__": "cc.RealCurve", "__type__": "cc.RealCurve",
"_times": [ "_times": [
0, 0,
0.16666666666666666, 0.1666666716337204,
0.25 0.25
], ],
"_values": [ "_values": [
@ -515,7 +515,7 @@
"__type__": "cc.RealCurve", "__type__": "cc.RealCurve",
"_times": [ "_times": [
0, 0,
0.16666666666666666, 0.1666666716337204,
0.25 0.25
], ],
"_values": [ "_values": [

View File

@ -2294,7 +2294,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "72+zVBONZGpblWIQFe2NuA" "fileId": "f7+OgVGiRAMKgd29Y2wH19"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -2304,7 +2304,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "8fbF0aM8JKuo8d7moWg48i", "fileId": "f0EgDoPLtHwpPqGxzds98r",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -2335,7 +2335,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "a80vIDCd5NP5sk1AGDQsJu" "fileId": "0fjae2YyVFDLJUdK+b+7IR"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -2345,7 +2345,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "c0089/ZNBBT4jC7HQ+tq/7", "fileId": "ad8wpT+k5M7Ln/YYBwEE/8",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -2376,7 +2376,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "6aCBLCkshLlYhL7dgCKHmH" "fileId": "b6ahdrebJBMqBkbs2V1lye"
}, },
{ {
"__type__": "5fc10Zl7lVO97/rr2J1uxWH", "__type__": "5fc10Zl7lVO97/rr2J1uxWH",
@ -2400,7 +2400,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "75sBxPKWJOjbErcBpuOlEb" "fileId": "55hfg7WyBNl4hCzHTOg7kT"
}, },
{ {
"__type__": "5fd13+Xa69CZogb3Q/F1lnC", "__type__": "5fd13+Xa69CZogb3Q/F1lnC",
@ -2573,7 +2573,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "9bXZVwdEVNmKI96DbOWKWm", "fileId": "21sA0a9UJH4pv/GSK1z/xt",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -2598,7 +2598,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "8fdz3zBkhNjplIZvcN5Hng" "fileId": "4b45jCSq1BZLaM68IbUubM"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
@ -2626,7 +2626,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "49bQI0cTJD4o/emzMwr51u" "fileId": "b8pjyq3B1DLo56vFuVGq8e"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
@ -2671,7 +2671,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "89IzTru3xPMLhTl0uBMPWg" "fileId": "b6Wcz5cWFMmpzhYOtS03pg"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -2681,7 +2681,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "43+SCHsNtH4aD/xQvVUqIK", "fileId": "28Tp9pVJVGUppmeg6+5DIj",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -2936,7 +2936,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "98bM8Hx+1JpbzTZRiBt5cZ" "fileId": "78CfyIgoxEAZfif8Z5Oi1n"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -2946,7 +2946,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "3fRHs0gh5IMZ1J8uKkFBBM", "fileId": "e4/FTCwNtMhajPxFN1kUXm",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -2977,7 +2977,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "83+VqFd+NMpYkmhFxt/FFH" "fileId": "c3py7vtShEDoYncN4nzQFb"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -2987,7 +2987,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "d2VUNEAFNFBofp3Pq2C7gW", "fileId": "63OOYw3C9DfZYNq5FEhfUo",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3018,7 +3018,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "aeeSdwblxMI7vDCkLZcyuS" "fileId": "3dsqDo2OJHgpkykv7JIv63"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -3042,7 +3042,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "76ESrvhypC3bAFH3rjAbBP" "fileId": "b5dgvCe+dLxZWJBTC7ppgq"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3052,7 +3052,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "40on/lNFJDVJig7xp9+aOH", "fileId": "59pimerSdA06QqXn/o3ocX",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3235,7 +3235,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "13OsIQki5F6aGalx85jD88" "fileId": "02T4Wo6tJHWYDsbGnyW5Vz"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3245,7 +3245,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "8f0nRS2axDLJmp2mzcF9DI", "fileId": "83GOewyMVIrYoR+jMiz8h1",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3276,7 +3276,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "bcEMJK9KtNjbTbnm2+prfB" "fileId": "d2ajS4a29OGbIRsSjBovU4"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3286,7 +3286,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "b8YRkkxRxFg7Z+NqHVIR2i", "fileId": "21jGlDhbJNcrMZQ14lHqks",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3317,7 +3317,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "87ajWkDHBJnr1byK2j0KNn" "fileId": "e3TappsI9IwKrlZbDUXKii"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -3341,7 +3341,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "708yC1AZFHRrW9TCZ8H6wS" "fileId": "9eT/coJ+VN5ZyGbcDril8f"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3351,7 +3351,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "2fHN9ED2JDCoTD2lnS1pfk", "fileId": "11W4sqgepE6rgcHYXE3Ysh",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3534,7 +3534,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "d6BCPkoe1Ii53LkDyW3gMT" "fileId": "aeGq7zNqVCkr7caDeVtHLM"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3544,7 +3544,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "76A9a0Tg9NApNN96zadVHT", "fileId": "ccnkPpZYtCv5rbUPAOn4qJ",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3575,7 +3575,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "c8YJzE6UZEqYFwcVZWr3w4" "fileId": "afXrEdQXFAF5ABYUTYqfQR"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3585,7 +3585,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "64KbdJYJNL45L+SCybwgio", "fileId": "aaSZ+kYeZKMJYmygtVEh6I",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3616,7 +3616,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "163rYzYpRDbLimHwE38dUB" "fileId": "3742mBta9Nw7i6fu+jGENV"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -3640,7 +3640,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "fdZim9bblMb7QEYQU7u3um" "fileId": "caue9NRFVPC4DmPom2Jg77"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3650,7 +3650,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "14FRfuVfdF0qqxh2yWPi2x", "fileId": "2ekyXyrK5PM7NZykwM1FRd",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3833,7 +3833,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "2cCJkuWZFNWK43dB6yg0b8" "fileId": "7aMZR1TFZG1quUlmvzDW5G"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3843,7 +3843,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "98eszdWI5OsYtH6c9mKY3Z", "fileId": "46l9Ul6SJBD6TEsYY+8h3s",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3874,7 +3874,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "ccBTM71EZCOYWYl7I1uhfs" "fileId": "588+7/vvxEaITPpWT1zSGx"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3884,7 +3884,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "a8V1dkLldBdoW/LgmPGeKt", "fileId": "darjxnZUhPKIGMIKoeKQS6",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3915,7 +3915,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "3dLwgYN29Ouqq5J0W6HGv1" "fileId": "58KdJV9PhBJZVgLjEw6T8X"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -3939,7 +3939,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "2dXo0xTZpCt70IullabyBj" "fileId": "dfZWudKIFOLqqzeUUkKmw7"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3949,7 +3949,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "57n/kZAR1B57czc3wOVaGl", "fileId": "5bYERJQdJN5qnCH2YdWQ3a",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4132,7 +4132,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "21o3Wev6ZDQ4dUJiPTnkPX" "fileId": "6bYYpbtdlCmaNh85QD8+ah"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4142,7 +4142,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "495NDJOHhMaZfy9p8SWMSE", "fileId": "b4Pnaj8mVK0L9IJIrYU5W0",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4173,7 +4173,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "3aCrh8TV1OQYnqn8Ffc6o3" "fileId": "9arr83huZEAIAEYwCv0PPT"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4183,7 +4183,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "65Xq1ZVOFMmoJjRG3d31F8", "fileId": "ffumAno7FEvKJDrzI9Wjxl",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4214,7 +4214,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "15zx9Q03ZLeLU0q6hEJzBD" "fileId": "ac/iGAjL1GbJOg8vVvqazf"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -4238,7 +4238,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "06a3aw51NEUrxGmzmbv4dh" "fileId": "c4/rceMjBGX4TpuTllrCxy"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4248,7 +4248,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "92U502nwRLcLAn2VHUwBUA", "fileId": "e4ERIou25Gt6bC6bdd2bnf",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4431,7 +4431,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "3b69j1OERL0JJkA4p3KlZM" "fileId": "51DYHyc4JN3LJUNmYl/8C8"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4441,7 +4441,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "e2xnrj8NJOeJ9/w3abL/XS", "fileId": "1840uug/xLMLMOUd32rAOC",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4472,7 +4472,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "1215oFLLFLEqcQHg46xpd5" "fileId": "4b39N/eANDUpPvzcF9tF0j"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4482,7 +4482,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "e83NxvYlFDGY68ROh1oE7t", "fileId": "13Q5vMcRxJu4RxJeSfEyLJ",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4513,7 +4513,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "fcqtONAFlMGLiYNDHpbFSW" "fileId": "baofRZS4VNgJuG0CwLsgDb"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -4537,7 +4537,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "f5X5ltVHRNP7Yk96r9tSQb" "fileId": "15xKdKSFNK6ZYlXBfcvvx6"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4547,7 +4547,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "37+V1ZnzZJlJ9ctZgsOIN0", "fileId": "a6wzfh3DFB14sNSQEz8dRW",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4572,7 +4572,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "e4Dy2TcBdMx6xWnmBCK4wF" "fileId": "f8mwlsuoBC9quzT4ti7gfK"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
@ -4600,7 +4600,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "6c/p/9x2BEm5PBXW459uNG" "fileId": "d4GzxHFGJI4bn+n2oELL0t"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
@ -4645,7 +4645,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "b6f+mt6V5ABK1Tl2u/a+oM" "fileId": "026eZkoI9DToYiMxgdlhZs"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4655,7 +4655,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "171LLrnmJJp4l+9kOxvX8p", "fileId": "a1vDNc6UxFJ4NexOVPeV+z",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -17309,14 +17309,14 @@
"_string": "Quit", "_string": "Quit",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 23, "_actualFontSize": 28,
"_fontSize": 23, "_fontSize": 28,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_lineHeight": 28, "_lineHeight": 28,
"_overflow": 3, "_overflow": 3,
"_enableWrapText": true, "_enableWrapText": true,
"_font": { "_font": {
"__uuid__": "69fbd01d-29d4-4356-b163-4a703a7d45e4", "__uuid__": "7e072d14-f23f-45c4-90a4-64373fbcd6a5",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
@ -17493,14 +17493,14 @@
"_string": "Sound", "_string": "Sound",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 23, "_actualFontSize": 28,
"_fontSize": 23, "_fontSize": 28,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_lineHeight": 28, "_lineHeight": 28,
"_overflow": 3, "_overflow": 3,
"_enableWrapText": true, "_enableWrapText": true,
"_font": { "_font": {
"__uuid__": "69fbd01d-29d4-4356-b163-4a703a7d45e4", "__uuid__": "7e072d14-f23f-45c4-90a4-64373fbcd6a5",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
@ -17677,14 +17677,14 @@
"_string": "Paytable", "_string": "Paytable",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 23, "_actualFontSize": 28,
"_fontSize": 23, "_fontSize": 28,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_lineHeight": 28, "_lineHeight": 28,
"_overflow": 3, "_overflow": 3,
"_enableWrapText": true, "_enableWrapText": true,
"_font": { "_font": {
"__uuid__": "69fbd01d-29d4-4356-b163-4a703a7d45e4", "__uuid__": "7e072d14-f23f-45c4-90a4-64373fbcd6a5",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
@ -17861,14 +17861,14 @@
"_string": "Rule", "_string": "Rule",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 23, "_actualFontSize": 28,
"_fontSize": 23, "_fontSize": 28,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_lineHeight": 28, "_lineHeight": 28,
"_overflow": 3, "_overflow": 3,
"_enableWrapText": true, "_enableWrapText": true,
"_font": { "_font": {
"__uuid__": "69fbd01d-29d4-4356-b163-4a703a7d45e4", "__uuid__": "7e072d14-f23f-45c4-90a4-64373fbcd6a5",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
@ -18045,14 +18045,14 @@
"_string": "History", "_string": "History",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 23, "_actualFontSize": 28,
"_fontSize": 23, "_fontSize": 28,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_lineHeight": 28, "_lineHeight": 28,
"_overflow": 3, "_overflow": 3,
"_enableWrapText": true, "_enableWrapText": true,
"_font": { "_font": {
"__uuid__": "69fbd01d-29d4-4356-b163-4a703a7d45e4", "__uuid__": "7e072d14-f23f-45c4-90a4-64373fbcd6a5",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
@ -18229,14 +18229,14 @@
"_string": "Close", "_string": "Close",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 23, "_actualFontSize": 28,
"_fontSize": 23, "_fontSize": 28,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_lineHeight": 28, "_lineHeight": 28,
"_overflow": 3, "_overflow": 3,
"_enableWrapText": true, "_enableWrapText": true,
"_font": { "_font": {
"__uuid__": "69fbd01d-29d4-4356-b163-4a703a7d45e4", "__uuid__": "7e072d14-f23f-45c4-90a4-64373fbcd6a5",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
@ -22168,7 +22168,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 232.62, "width": 259.14,
"height": 40 "height": 40
}, },
"_anchorPoint": { "_anchorPoint": {
@ -22207,14 +22207,14 @@
"_string": "Minimum Bet", "_string": "Minimum Bet",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 40, "_actualFontSize": 42,
"_fontSize": 40, "_fontSize": 42,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_lineHeight": 40, "_lineHeight": 40,
"_overflow": 0, "_overflow": 0,
"_enableWrapText": true, "_enableWrapText": true,
"_font": { "_font": {
"__uuid__": "2e641180-f09b-4b02-b393-585d06441b69", "__uuid__": "7d82cd3b-f3fb-43bd-902e-e9ce812e1fb0",
"__expectedType__": "cc.TTFFont" "__expectedType__": "cc.TTFFont"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,

View File

@ -116,11 +116,26 @@ export class SlotBar extends Component {
const node = this.node.getChildByName(name); const node = this.node.getChildByName(name);
if (node) this.btnPositions.set(name, node.position.clone()); if (node) this.btnPositions.set(name, node.position.clone());
}); });
let auto_mouse_enter = this.autoBtn.getChildByName('AutoSpinGear')
let turbo_mouse_enter = this.turboBtn.getChildByName('TurboEffect')
auto_mouse_enter.on(Node.EventType.MOUSE_ENTER, () => {
this.autoBtnAni.play('autoSpin_Pressed_animation');
}, this)
turbo_mouse_enter.on(Node.EventType.MOUSE_ENTER, () => {
this.turboBtnAni.play('turbo_Pressed_animation');
}, this)
} }
protected onDestroy(): void { protected onDestroy(): void {
this.node.targetOff(this); this.node.targetOff(this);
let auto_mouse_enter = this.autoBtn.getChildByName('AutoSpinGear')
auto_mouse_enter.targetOff(this)
let turbo_mouse_enter = this.turboBtn.getChildByName('AutoSpinGear')
turbo_mouse_enter.targetOff(this)
} }
// spinBtn有两个动画idle状态循环旋转一圈spin状态速度加快 // spinBtn有两个动画idle状态循环旋转一圈spin状态速度加快
@ -379,7 +394,7 @@ export class SlotBar extends Component {
onBtnSubChips() { onBtnSubChips() {
AudioManager.instance.playSFX('Common_Button_Click'); AudioManager.instance.playSFX('Common_Button_Click');
this.betIndex -= 1; this.betIndex -= 1;
this.setBtnEnable(this.subBtn, this.betIndex > 0); this.setBtnEnable(this.subBtn, this.betIndex >= 0);
this.setBtnEnable(this.addBtn, this.betIndex != this.betGrade.length); this.setBtnEnable(this.addBtn, this.betIndex != this.betGrade.length);
if (this.betIndex < 0) { if (this.betIndex < 0) {
let tip = I18nManager.instance.t('AID_TIP_MIN_BET'); let tip = I18nManager.instance.t('AID_TIP_MIN_BET');
@ -506,6 +521,7 @@ export class SlotBar extends Component {
this.closeAutoSpin(); this.closeAutoSpin();
} else { } else {
let panel = NodePoolManager.instance.getNodeFromPoolStatic('AutoSpinPanel', this.autoSpinPanel); let panel = NodePoolManager.instance.getNodeFromPoolStatic('AutoSpinPanel', this.autoSpinPanel);
this.autoBtnAni.play('autoSpin_Pressed_animation');
panel.getComponent(AutoSpinPanel).setCloseCallback(() => { panel.getComponent(AutoSpinPanel).setCloseCallback(() => {
this.startAutoSpin(); this.startAutoSpin();
}); });

View File

@ -23,7 +23,7 @@
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 83 "__id__": 86
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@ -54,7 +54,7 @@
}, },
"autoReleaseAssets": false, "autoReleaseAssets": false,
"_globals": { "_globals": {
"__id__": 84 "__id__": 87
}, },
"_id": "6c29a3fe-b10e-44a5-98e3-55595b231767" "_id": "6c29a3fe-b10e-44a5-98e3-55595b231767"
}, },
@ -77,25 +77,25 @@
"__id__": 8 "__id__": 8
}, },
{ {
"__id__": 65 "__id__": 68
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 78
},
{
"__id__": 79
},
{
"__id__": 80
},
{ {
"__id__": 81 "__id__": 81
}, },
{ {
"__id__": 82 "__id__": 82
},
{
"__id__": 83
},
{
"__id__": 84
},
{
"__id__": 85
} }
], ],
"_prefab": null, "_prefab": null,
@ -341,22 +341,22 @@
"__id__": 9 "__id__": 9
}, },
{ {
"__id__": 58 "__id__": 61
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 61
},
{
"__id__": 62
},
{
"__id__": 63
},
{ {
"__id__": 64 "__id__": 64
},
{
"__id__": 65
},
{
"__id__": 66
},
{
"__id__": 67
} }
], ],
"_prefab": null, "_prefab": null,
@ -426,16 +426,19 @@
"__id__": 44 "__id__": 44
}, },
{ {
"__id__": 53 "__id__": 47
},
{
"__id__": 56
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 56 "__id__": 59
}, },
{ {
"__id__": 57 "__id__": 60
} }
], ],
"_prefab": null, "_prefab": null,
@ -1686,6 +1689,141 @@
"_shadowBlur": 2, "_shadowBlur": 2,
"_id": "2380yWt0tOa6GJutBEnRsb" "_id": "2380yWt0tOa6GJutBEnRsb"
}, },
{
"__type__": "cc.Node",
"_name": "retryTip",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 9
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 45
},
{
"__id__": 46
}
],
"_prefab": null,
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": -670,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": "58sDbbfwhBZpAYHFr151ss"
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 44
},
"_enabled": true,
"__prefab": null,
"_contentSize": {
"__type__": "cc.Size",
"width": 1021.423828125,
"height": 56.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 1
},
"_id": "3bZU0eD9VNNpLG11V8Juhb"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 44
},
"_enabled": true,
"__prefab": null,
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_string": "",
"_horizontalAlign": 1,
"_verticalAlign": 1,
"_actualFontSize": 42,
"_fontSize": 42,
"_fontFamily": "Arial",
"_lineHeight": 40,
"_overflow": 3,
"_enableWrapText": true,
"_font": {
"__uuid__": "7d82cd3b-f3fb-43bd-902e-e9ce812e1fb0",
"__expectedType__": "cc.TTFFont"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
"_isItalic": false,
"_isBold": true,
"_isUnderline": false,
"_underlineHeight": 2,
"_cacheMode": 0,
"_enableOutline": true,
"_outlineColor": {
"__type__": "cc.Color",
"r": 36,
"g": 37,
"b": 46,
"a": 255
},
"_outlineWidth": 3,
"_enableShadow": false,
"_shadowColor": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_shadowOffset": {
"__type__": "cc.Vec2",
"x": 2,
"y": 2
},
"_shadowBlur": 2,
"_id": "61i0gd04RHWKq/gulfeb0m"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "Btn", "_name": "Btn",
@ -1696,19 +1834,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 45 "__id__": 48
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 48 "__id__": 51
}, },
{ {
"__id__": 49 "__id__": 52
}, },
{ {
"__id__": 50 "__id__": 53
} }
], ],
"_prefab": null, "_prefab": null,
@ -1747,16 +1885,16 @@
"_objFlags": 512, "_objFlags": 512,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 44 "__id__": 47
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 46 "__id__": 49
}, },
{ {
"__id__": 47 "__id__": 50
} }
], ],
"_prefab": null, "_prefab": null,
@ -1795,7 +1933,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 45 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -1817,7 +1955,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 45 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -1879,7 +2017,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 44 "__id__": 47
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -1901,7 +2039,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 44 "__id__": 47
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -1940,16 +2078,16 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 44 "__id__": 47
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 51 "__id__": 54
}, },
{ {
"__id__": 52 "__id__": 55
} }
], ],
"_interactable": true, "_interactable": true,
@ -1989,7 +2127,7 @@
"_duration": 0.1, "_duration": 0.1,
"_zoomScale": 1.2, "_zoomScale": 1.2,
"_target": { "_target": {
"__id__": 44 "__id__": 47
}, },
"_id": "54j4lwPyZHbqqANZE+r9Tj" "_id": "54j4lwPyZHbqqANZE+r9Tj"
}, },
@ -2025,10 +2163,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 54 "__id__": 57
}, },
{ {
"__id__": 55 "__id__": 58
} }
], ],
"_prefab": null, "_prefab": null,
@ -2067,7 +2205,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 53 "__id__": 56
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2089,7 +2227,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 53 "__id__": 56
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2186,10 +2324,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 59 "__id__": 62
}, },
{ {
"__id__": 60 "__id__": 63
} }
], ],
"_prefab": null, "_prefab": null,
@ -2228,7 +2366,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 58 "__id__": 61
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2250,7 +2388,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 58 "__id__": 61
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2392,22 +2530,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 66 "__id__": 69
},
{
"__id__": 70
}, },
{ {
"__id__": 73 "__id__": 73
},
{
"__id__": 76
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 76 "__id__": 79
}, },
{ {
"__id__": 77 "__id__": 80
} }
], ],
"_prefab": null, "_prefab": null,
@ -2446,19 +2584,19 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 65 "__id__": 68
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 67 "__id__": 70
}, },
{ {
"__id__": 68 "__id__": 71
}, },
{ {
"__id__": 69 "__id__": 72
} }
], ],
"_prefab": null, "_prefab": null,
@ -2497,7 +2635,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 66 "__id__": 69
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2519,7 +2657,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 66 "__id__": 69
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2531,7 +2669,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 66 "__id__": 69
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2570,16 +2708,16 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 65 "__id__": 68
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 71 "__id__": 74
}, },
{ {
"__id__": 72 "__id__": 75
} }
], ],
"_prefab": null, "_prefab": null,
@ -2618,7 +2756,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 70 "__id__": 73
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2640,7 +2778,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 70 "__id__": 73
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2702,16 +2840,16 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 65 "__id__": 68
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 74 "__id__": 77
}, },
{ {
"__id__": 75 "__id__": 78
} }
], ],
"_prefab": null, "_prefab": null,
@ -2750,7 +2888,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 73 "__id__": 76
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2772,7 +2910,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 73 "__id__": 76
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2811,7 +2949,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 65 "__id__": 68
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2833,7 +2971,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 65 "__id__": 68
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2917,17 +3055,20 @@
"progressLabel": { "progressLabel": {
"__id__": 40 "__id__": 40
}, },
"tipLabel": { "loadingTipLabel": {
"__id__": 43 "__id__": 43
}, },
"retryTipLabel": {
"__id__": 46
},
"startBtn": { "startBtn": {
"__id__": 50 "__id__": 53
}, },
"startBtnLabel": { "startBtnLabel": {
"__id__": 47 "__id__": 50
}, },
"GameNode": { "GameNode": {
"__id__": 58 "__id__": 61
}, },
"languageJson": { "languageJson": {
"__uuid__": "d4b3e5be-f8b5-4627-a94c-615e1e6a317d", "__uuid__": "d4b3e5be-f8b5-4627-a94c-615e1e6a317d",
@ -2949,10 +3090,10 @@
"__id__": 5 "__id__": 5
}, },
"RB7Logo": { "RB7Logo": {
"__id__": 53 "__id__": 56
}, },
"rotateNode": { "rotateNode": {
"__id__": 65 "__id__": 68
}, },
"_id": "d8F/UwpTxNpZhwSJjDvnkk" "_id": "d8F/UwpTxNpZhwSJjDvnkk"
}, },
@ -2979,29 +3120,29 @@
{ {
"__type__": "cc.SceneGlobals", "__type__": "cc.SceneGlobals",
"ambient": { "ambient": {
"__id__": 85
},
"shadows": {
"__id__": 86
},
"_skybox": {
"__id__": 87
},
"fog": {
"__id__": 88 "__id__": 88
}, },
"octree": { "shadows": {
"__id__": 89 "__id__": 89
}, },
"skin": { "_skybox": {
"__id__": 90 "__id__": 90
}, },
"lightProbeInfo": { "fog": {
"__id__": 91 "__id__": 91
}, },
"postSettings": { "octree": {
"__id__": 92 "__id__": 92
}, },
"skin": {
"__id__": 93
},
"lightProbeInfo": {
"__id__": 94
},
"postSettings": {
"__id__": 95
},
"bakedWithStationaryMainLight": false, "bakedWithStationaryMainLight": false,
"bakedWithHighpLightmap": false "bakedWithHighpLightmap": false
}, },

View File

@ -24,7 +24,10 @@ export class LoadingUI extends Component {
progressLabel: Label = null; progressLabel: Label = null;
@property(Label) @property(Label)
tipLabel: Label = null; loadingTipLabel: Label = null;
@property(Label)
retryTipLabel: Label = null;
@property(Button) @property(Button)
startBtn: Button = null; startBtn: Button = null;
@ -93,7 +96,8 @@ export class LoadingUI extends Component {
try { try {
// 更新进度条到 0.6 // 更新进度条到 0.6
this.updateProgress(0.6); this.updateProgress(0.6);
this.tipLabel.string = `${I18nManager.instance.t('AID_LOADING')}...`; this.loadingTipLabel.string = `${I18nManager.instance.t('AID_LOADING')}`;
this.retryTipLabel.string = '';
let gameInfo = await callGameApi("gameinfo", {}); let gameInfo = await callGameApi("gameinfo", {});
if (!gameInfo) throw new Error('Get game info failed'); if (!gameInfo) throw new Error('Get game info failed');
GameDataManager.instance.gameInfo = gameInfo; GameDataManager.instance.gameInfo = gameInfo;
@ -122,7 +126,8 @@ export class LoadingUI extends Component {
private async startLoadingGameBundle() { private async startLoadingGameBundle() {
try { try {
// 显示加载UI // 显示加载UI
this.tipLabel.string = `${I18nManager.instance.t('AID_LOADING')}...`; this.loadingTipLabel.string = `${I18nManager.instance.t('AID_LOADING')}`;
this.retryTipLabel.string = '';
this.startBtn.node.active = false; this.startBtn.node.active = false;
// 从 0.8 开始加载 // 从 0.8 开始加载
@ -168,7 +173,8 @@ export class LoadingUI extends Component {
// 开始游戏 // 开始游戏
// AudioManager.instance.playBGM('Normal_Mode_BGM'); // AudioManager.instance.playBGM('Normal_Mode_BGM');
this.scheduleOnce(() => { this.scheduleOnce(() => {
this.tipLabel.string = ''; this.loadingTipLabel.string = '';
this.retryTipLabel.string = '';
this.startBtn.node.active = true; this.startBtn.node.active = true;
this.startBtnLabel.string = I18nManager.instance.t('AID_GET_STARTED'); this.startBtnLabel.string = I18nManager.instance.t('AID_GET_STARTED');
this.progressBar.node.active = false; this.progressBar.node.active = false;
@ -181,23 +187,24 @@ export class LoadingUI extends Component {
private handleError(error: Error) { private handleError(error: Error) {
this._retryCount++; this._retryCount++;
this.loadingTipLabel.string = '';
if (this._retryCount <= this.MAX_RETRY) { if (this._retryCount <= this.MAX_RETRY) {
// 自动重试 // 自动重试
switch (this._retryCount) { switch (this._retryCount) {
case 1: case 1:
this.tipLabel.string = I18nManager.instance.t('AID_NETWORK_RETRY_1'); this.retryTipLabel.string = I18nManager.instance.t('AID_NETWORK_RETRY_1');
break break
case 2: case 2:
this.tipLabel.string = I18nManager.instance.t('AID_NETWORK_RETRY_2'); this.retryTipLabel.string = I18nManager.instance.t('AID_NETWORK_RETRY_2');
break break
case 3: case 3:
this.tipLabel.string = I18nManager.instance.t('AID_NETWORK_RETRY_3'); this.retryTipLabel.string = I18nManager.instance.t('AID_NETWORK_RETRY_3');
break break
case 4: case 4:
this.tipLabel.string = I18nManager.instance.t('AID_NETWORK_RETRY_4'); this.retryTipLabel.string = I18nManager.instance.t('AID_NETWORK_RETRY_4');
break break
case 5: case 5:
this.tipLabel.string = I18nManager.instance.t('AID_NETWORK_RETRY_5'); this.retryTipLabel.string = I18nManager.instance.t('AID_NETWORK_RETRY_5');
break break
} }
@ -210,7 +217,8 @@ export class LoadingUI extends Component {
}, 2); }, 2);
} else { } else {
// 显示重试按钮 // 显示重试按钮
this.tipLabel.string = `${I18nManager.instance.t('AID_LOADING')}...`; this.loadingTipLabel.string = `${I18nManager.instance.t('AID_LOADING')}`;
this.retryTipLabel.string = '';
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;