Compare commits

..

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

9 changed files with 248 additions and 276 deletions

View File

@ -1037,7 +1037,7 @@
"__id__": 378 "__id__": 378
} }
], ],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 387 "__id__": 387
@ -1253,7 +1253,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 893.55908203125, "width": 873.017578125,
"height": 50.4 "height": 50.4
}, },
"_anchorPoint": { "_anchorPoint": {
@ -1289,7 +1289,7 @@
"b": 187, "b": 187,
"a": 255 "a": 255
}, },
"_string": "누적 베팅 횟수 XX회 및 누적 베팅 금액 XX를 달성하면 이벤트에 참여할 수 있습니다", "_string": "活动介绍活动期间参与指定游戏并将赢分排在前XX名即可获得丰厚大",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 27, "_actualFontSize": 27,
@ -1302,7 +1302,7 @@
"_isSystemFontUsed": true, "_isSystemFontUsed": true,
"_spacingX": 0, "_spacingX": 0,
"_isItalic": false, "_isItalic": false,
"_isBold": false, "_isBold": true,
"_isUnderline": false, "_isUnderline": false,
"_underlineHeight": 2, "_underlineHeight": 2,
"_cacheMode": 0, "_cacheMode": 0,
@ -15686,7 +15686,7 @@
"__id__": 940 "__id__": 940
} }
], ],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1004 "__id__": 1004
@ -26074,7 +26074,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",
@ -26151,7 +26151,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",

View File

@ -1,4 +1,4 @@
import { _decorator, Button, Color, Component, Label, Node, Sprite, Tween, tween, UITransform, v3, Vec2 } from 'cc'; import { _decorator, Button, Color, Component, Label, Node, Sprite, Tween, tween, UITransform, v3 } from 'cc';
import { VirtualScrollView } from './VScrollView'; import { VirtualScrollView } from './VScrollView';
import { Palette } from './Palette'; import { Palette } from './Palette';
import { SlotRankingDataManager } from './SlotRankingDataManager'; import { SlotRankingDataManager } from './SlotRankingDataManager';
@ -249,24 +249,11 @@ export class RankList extends Component {
// 再次强制更新以确保宽度准确 // 再次强制更新以确保宽度准确
labelComp.updateRenderData(true); labelComp.updateRenderData(true);
let labelLength = labelComp.node.getComponent(UITransform).width; let labelLength = labelComp.node.getComponent(UITransform).width;
let maskLength = this.msg_1.parent.getComponent(UITransform).width
// 设置初始位置 // 设置初始位置
let endX = 0 this.msg_1.setPosition(-450, this.msg_1.position.y, this.msg_1.position.z);
let duration = 0 let endX = -labelLength;
let duration = Math.max(3, (-450 + labelLength) / 80);
if (labelLength <= maskLength) {
labelComp.node.getComponent(UITransform).setAnchorPoint(new Vec2(0.5, 0.5))
this.msg_1.setPosition(0, this.msg_1.position.y, this.msg_1.position.z);
endX = - maskLength / 2 - labelLength / 2 - 30
duration = Math.max(3, labelLength / 80);
} else {
labelComp.node.getComponent(UITransform).setAnchorPoint(new Vec2(0, 0.5))
this.msg_1.setPosition(- maskLength / 2, this.msg_1.position.y, this.msg_1.position.z);
endX = - maskLength / 2 - labelLength - 30
duration = Math.max(3, (- maskLength / 2 + labelLength) / 80);
}
// 启动跑马灯动画 // 启动跑马灯动画
Tween.stopAllByTarget(this.msg_1); Tween.stopAllByTarget(this.msg_1);

View File

@ -2327,7 +2327,7 @@
"__id__": 88 "__id__": 88
}, },
"asset": { "asset": {
"__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -2338,7 +2338,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "0f3pOPboxG44yWk/JCQjSS", "fileId": "9aTtrNaR1Eo4Xi7+JsYXch",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -2364,7 +2364,7 @@
"__id__": 91 "__id__": 91
}, },
"asset": { "asset": {
"__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -2375,7 +2375,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "3f022EbyBAZ41bxa6xkCKp", "fileId": "6bJWc6EHJKVZRfCO3gpbcF",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -2412,7 +2412,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "84aEHSH8FNfp7qTux+nRax", "fileId": "c4eZb8EphNgpYmPeQby1Zk",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -2438,7 +2438,7 @@
"__id__": 97 "__id__": 97
}, },
"asset": { "asset": {
"__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -2449,7 +2449,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "a0wMIOM0RMN4cBBhNv0QyX", "fileId": "b2yrZU7kZJx6wc0bBEx8hI",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -2475,7 +2475,7 @@
"__id__": 100 "__id__": 100
}, },
"asset": { "asset": {
"__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -2486,7 +2486,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "5aLcpLD65ExLKtx69+f9Gl", "fileId": "dbafEgJWtD2Zf47dnaBarh",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -2521,7 +2521,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "eflcvphMtF4ruRwgE1YCS1" "fileId": "7c3XPzhfpLSYo4f+yWJ3d4"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -2531,7 +2531,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "e6inF6oSNEVpbQ5YJJ8ocR", "fileId": "38K7t+Z5NCqovC8VLuS6K6",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -2562,7 +2562,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "20w1sxEVhP1ZfaCs+V8bee" "fileId": "7b33viHTZI3LbgbSolbh7h"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -2572,7 +2572,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "f7sYbPjMRPfrzYYHxZPfg9", "fileId": "1cHJqld75JIrDLM+k1cOuY",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -2603,7 +2603,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "e3LrgFgq9LDJO7o0N+a9pI" "fileId": "36Dz8j85xLH4KkfPfCgF9y"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -2628,7 +2628,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "82ZihloCNFVbAa9chQsSek" "fileId": "c2BYYP0ZBDEoK4kaQzTpxA"
}, },
{ {
"__type__": "5fd13+Xa69CZogb3Q/F1lnC", "__type__": "5fd13+Xa69CZogb3Q/F1lnC",
@ -2801,7 +2801,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "f721R536VAhZYKuVv5fZwp", "fileId": "7eA53/xSlPIK96XwJo2bQ/",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -2991,7 +2991,7 @@
"__id__": 123 "__id__": 123
}, },
"asset": { "asset": {
"__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3002,7 +3002,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "c57tT1J2hAULSodcDb6IOP", "fileId": "17f0UMkq1IC65eEyUJ6xWN",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3028,7 +3028,7 @@
"__id__": 126 "__id__": 126
}, },
"asset": { "asset": {
"__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3039,7 +3039,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "3bFkDLdEVI84JwZ2DCq8yQ", "fileId": "f2ediWCR5Paq7uZzGmwvdv",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3065,7 +3065,7 @@
"__id__": 129 "__id__": 129
}, },
"asset": { "asset": {
"__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3076,7 +3076,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "eeF0g/24FCbKGwsTve/2xv", "fileId": "1e7faihHBD45MPnHw8Dvm7",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3102,7 +3102,7 @@
"__id__": 132 "__id__": 132
}, },
"asset": { "asset": {
"__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3113,7 +3113,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "2bEeglqPNHtLtyvhKfx+SJ", "fileId": "cbdB/sf+lCwrZCvvS1TTle",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3139,7 +3139,7 @@
"__id__": 135 "__id__": 135
}, },
"asset": { "asset": {
"__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3150,7 +3150,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "1f8i9NXIZHx6Y+XxoueCBY", "fileId": "a5wPsTCv1Meb7HamkXT5Py",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3185,7 +3185,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "6aqak2tPRL/4PMJJGJECHZ" "fileId": "1bXPqgtWVFGJwDdGhQrsGb"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3195,7 +3195,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "41CocIGpVG86tr9MOctsZL", "fileId": "75bPtRWtRJ4ZSu84c0FcD7",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3226,7 +3226,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "063MT+E9pNz7dRXAy0oK7T" "fileId": "1aDvkRRGpNdIfYjRIBzG7J"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3236,7 +3236,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "3e+hGgcqFA/ogh/1V6Yeok", "fileId": "54IT5/3R5HgrpzmL9qQqis",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3267,7 +3267,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "ef27s4MsdGRrxSWUZAsHyd" "fileId": "14s2UTdn5Jb7pAY//9Djhc"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -3292,7 +3292,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "87csZK6UBGAJJFzxjSiPe5" "fileId": "03wU2fOFBHq6syLn2IxjWi"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3302,7 +3302,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "29E2nf0SlPpYYd+BeYcOfd", "fileId": "a4X9xEOPZMVKCyHvHkf9gO",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3492,7 +3492,7 @@
"__id__": 152 "__id__": 152
}, },
"asset": { "asset": {
"__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3503,7 +3503,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "094BgpDX1Eh6p7AQlL57RQ", "fileId": "f3re9AnuxN1ZyBTS+HLoxj",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3529,7 +3529,7 @@
"__id__": 155 "__id__": 155
}, },
"asset": { "asset": {
"__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3540,7 +3540,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "0eNqRd8ItD4oaQg4sFL3a4", "fileId": "1cz4MpdzFGnr/ZXYbD9DKc",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3566,7 +3566,7 @@
"__id__": 158 "__id__": 158
}, },
"asset": { "asset": {
"__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3577,7 +3577,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "86dtGHniROZ6qMnNQg4wYg", "fileId": "a3ZcUCA1xGPai4qn9CRvB4",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3603,7 +3603,7 @@
"__id__": 161 "__id__": 161
}, },
"asset": { "asset": {
"__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", "__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3614,7 +3614,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "38BzcqrIhAf51/cJWNerGn", "fileId": "2aXpOadD9G8I+VSaW33Otr",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3640,7 +3640,7 @@
"__id__": 164 "__id__": 164
}, },
"asset": { "asset": {
"__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad", "__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3651,7 +3651,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "6fia851ClKYbEudZv1yPHl", "fileId": "34akFKuPFCjYaWwUHiH4AO",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3686,7 +3686,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "20FxLDh1dASJ1wjCJ09lBA" "fileId": "6cwsnsDlVMwJWEPOGpki/C"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3696,7 +3696,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "6c6NIej49J2IO2WLtzLXM7", "fileId": "7cEHW0LxhAkbc55xAiaSSq",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3727,7 +3727,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "59yeFDsS5Ol6JImVIH1Bp3" "fileId": "383QzOz+hM66FYTzFf5YIg"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3737,7 +3737,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "89GtwYwPZF2oM5AUPuSB8n", "fileId": "3fuBLGcZ1N7qXXmoPXrrDX",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3768,7 +3768,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "74/aiZjjxDjb/ADKqSnb5Z" "fileId": "d30bZ89KxBubwJDcEP2smc"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -3793,7 +3793,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "14eerc+QlDwpWU8rDkE9KD" "fileId": "7d2D84KnFCm5O38b+CSU7x"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3803,7 +3803,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "99E9b7eeBKJrI3oGH0qFy3", "fileId": "3bp1XGGANMw5EBbD9GfGm6",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3993,7 +3993,7 @@
"__id__": 181 "__id__": 181
}, },
"asset": { "asset": {
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4004,7 +4004,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "0ck9/uzr5KJ7FF2a8VpwDY", "fileId": "eecsEQuHhB26+EsSsM7ABF",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4030,7 +4030,7 @@
"__id__": 184 "__id__": 184
}, },
"asset": { "asset": {
"__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4041,7 +4041,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "21Ajh3DlNHOYFQPVesvgYR", "fileId": "b5NZwLo5hBmIMpdXtdUbjB",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4067,7 +4067,7 @@
"__id__": 187 "__id__": 187
}, },
"asset": { "asset": {
"__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad", "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4078,7 +4078,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "23jPS92kFEDZxDoR2xAOKV", "fileId": "6fntdSxLtGUqt0DjxNnUK8",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4104,7 +4104,7 @@
"__id__": 190 "__id__": 190
}, },
"asset": { "asset": {
"__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4115,7 +4115,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "22OS5x+J9KaYZG9sKgRVRa", "fileId": "baz8y0ltxG97jmeDJcOEvx",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4141,7 +4141,7 @@
"__id__": 193 "__id__": 193
}, },
"asset": { "asset": {
"__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4152,7 +4152,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "c9VE3vFa1P+ZHPhn5KKtPl", "fileId": "2cspXiyb5Fk6mkRSiX37ZS",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4187,7 +4187,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "d8T4Hs5oNPyIqAKU7Sdjwl" "fileId": "72ggdMq0dIIpTXjILAYgkh"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4197,7 +4197,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "5dfjuAputGk4Itw3vfQiyi", "fileId": "4eLiN4zyZE0LOazq7keddi",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4228,7 +4228,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "d6edz7AUpFcJJ0TadLE87i" "fileId": "8eu2IWR5VKiIvOw8qTL2Z3"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4238,7 +4238,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "79IBUR5aZED4KXD8a1UXlP", "fileId": "75JCQ2gFtIZq2fMZRC1gai",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4269,7 +4269,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "66woIm6PBBY4WFiXCbO6Tl" "fileId": "e0jv9PuopJpqCSl9sUxo3a"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -4294,7 +4294,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "9cuJnTsNxEZ7sU5EXiKkDA" "fileId": "b6mpgUaMlLF4SccVYd8v9/"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4304,7 +4304,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "27eaCtNIJBpaM6zqanwmiJ", "fileId": "90mw62DORNcof3h/ufVdId",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4494,7 +4494,7 @@
"__id__": 210 "__id__": 210
}, },
"asset": { "asset": {
"__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4505,7 +4505,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "23yTguRwNMELQQvfgCbb+W", "fileId": "13qVFQPExHOrFYA7YTLt45",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4531,7 +4531,7 @@
"__id__": 213 "__id__": 213
}, },
"asset": { "asset": {
"__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4542,7 +4542,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "9bgMaBv0RCroidMbwE7Cct", "fileId": "bc6ffNudhHzKp97EDcY3oT",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4568,7 +4568,7 @@
"__id__": 216 "__id__": 216
}, },
"asset": { "asset": {
"__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4579,7 +4579,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "b6ATfJh89GjZFg1CNcNOhg", "fileId": "83PZedKwtAa699a3aKR3sO",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4605,7 +4605,7 @@
"__id__": 219 "__id__": 219
}, },
"asset": { "asset": {
"__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4616,7 +4616,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "0cB5jNjYROW7gM2tekIJQ1", "fileId": "b6PdnKLi9D0JrfE5LneRUe",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4653,7 +4653,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "98ulLgULNBeaRNJV9jAoI1", "fileId": "8fVykjZM9CoKigX8us5VLz",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4688,7 +4688,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "080DNc8eBJaqXvtSavUhLc" "fileId": "744DgTB5VGq7bCAxD3IcRW"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4698,7 +4698,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "4cW/MfrDhGn5xLejVtVElx", "fileId": "1aL+guRvdM966c6rcKtidJ",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4729,7 +4729,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "39D+/JWlBG2rTL63YkTgmm" "fileId": "2aKiVG5xVDxoH2hDc6R57T"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4739,7 +4739,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "17jptQ6b9OV73UXdvsWutq", "fileId": "72FQPzL5ZMoYDYs1yKJW3l",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4770,7 +4770,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "b0NGKfeCxAXoKt/SgIHsjJ" "fileId": "fclR1+z+JLJqRNYzBwUiMT"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -4795,7 +4795,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "25ZQIuJClG0KJTAFn7Ev8w" "fileId": "e58kuiYv9HS55vo1zi2r06"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4805,7 +4805,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "10oM51wIRKmbBOzSylipzc", "fileId": "0bYRuhoI1Ifp12bVM7oMSE",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4995,7 +4995,7 @@
"__id__": 239 "__id__": 239
}, },
"asset": { "asset": {
"__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -5006,7 +5006,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "b3JgFNov1H36B7ujPi1ZEy", "fileId": "e8eIQDY/VKob4hFKmrmjae",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -5032,7 +5032,7 @@
"__id__": 242 "__id__": 242
}, },
"asset": { "asset": {
"__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -5043,7 +5043,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "ddrgallwdO64VjtksU29nI", "fileId": "41uaTh9nJND64Laj6inOvT",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -5069,7 +5069,7 @@
"__id__": 245 "__id__": 245
}, },
"asset": { "asset": {
"__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -5080,7 +5080,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "09heY5vGBF0pE+yZneRXdB", "fileId": "a3UtAWA+JJMK0uN1P6Zlo3",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -5106,7 +5106,7 @@
"__id__": 248 "__id__": 248
}, },
"asset": { "asset": {
"__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e", "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -5117,7 +5117,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "11ClKO+KtCkbs5uBmid6pl", "fileId": "3d6fCWJy9OnJE2yN/DFmFM",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -5143,7 +5143,7 @@
"__id__": 251 "__id__": 251
}, },
"asset": { "asset": {
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -5154,7 +5154,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "6dq95CRO9HSKwaml2oGbZO", "fileId": "f06uzILtxAwI8OqvIWFBKM",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -5189,7 +5189,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "9ftvwhNhxH3b3O1mztJO5j" "fileId": "e4/LsYisdNoqWP31rkKvXr"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -5199,7 +5199,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "f21rWrVQpOhKm00J4mh8HA", "fileId": "db+zZ4diFLXZT77eDfTI3O",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -5230,7 +5230,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "eeH5Y31XFDmJ1YnkZSCLRZ" "fileId": "8cm8O41ChI0pCVf5VSC5Fx"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -5240,7 +5240,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "ab8/KuGshI+JzRvwPHo3Zz", "fileId": "12uNf6gCtMmI7Voa4UcItX",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -5271,7 +5271,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "c3tc2nINxPQpJPBMep7uFP" "fileId": "49NygYIGZOwoPPtvvK0sZv"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -5296,7 +5296,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "5fOZ1swPJMx59Mjqs3Hky4" "fileId": "51zkn5vVJHSZ73LZdGkaqz"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -5306,7 +5306,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "92JA5j/flMA7QCno8AXWcJ", "fileId": "e59jRlSppHnJUsn2srvWPY",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -5331,7 +5331,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "40Kf+Xv0ZLaIDY1fWtHJTh" "fileId": "80Yuo7y1JPQ7lY6J7rg2JF"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
@ -5359,7 +5359,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "5bEQ5seCZN7ZjJBfJAuRMD" "fileId": "cfhbKAja5Djrwv/WPwlU/y"
}, },
{ {
"__type__": "cc.Graphics", "__type__": "cc.Graphics",
@ -5405,7 +5405,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "d8g/aFd1VPs7umheabny1z" "fileId": "92oGYCmK5PcJjRt816zWLp"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -5415,7 +5415,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "09oOMOXVFBWqhyaSw7BtxL", "fileId": "fc/VATOpVHbIsXz5f0z5+T",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null

View File

@ -984,14 +984,6 @@ export class SlotScene extends Component {
); );
} }
break; break;
case 5:
msg1 = I18nManager.instance.t('AID_ERROR_CONTENT_4');
msg2 = I18nManager.instance.t('AID_ERROR_CODE_4');
tip = `${msg1}\n${msg2}`;
if (!this.TipPanel.getHasTip()) {
this.TipPanel.showTip(title, tip, () => { window.close() }, () => { callback?.(); }, I18nManager.instance.t('AID_ERROR_QUIT_BUTTON'), I18nManager.instance.t('AID_ERROR_RETRY_BUTTON'), true);
}
break;
} }
} }

View File

@ -389,11 +389,6 @@ export class BigWinUI extends Component {
this.unscheduleAllCallbacks(); this.unscheduleAllCallbacks();
this.currentScore = this.winScore; this.currentScore = this.winScore;
this.updateScoreLabel(); this.updateScoreLabel();
this.bigWinAudio.stop();
this.bigWinAudio.clip = this.bigWinAudioClips[3];
if (!AudioManager.instance.getMuted()) {
this.bigWinAudio.play();
}
this.endAni(); this.endAni();
return; return;
} }

View File

@ -76,6 +76,9 @@
{ {
"__id__": 8 "__id__": 8
}, },
{
"__id__": 64
},
{ {
"__id__": 67 "__id__": 67
} }
@ -338,22 +341,22 @@
"__id__": 9 "__id__": 9
}, },
{ {
"__id__": 60 "__id__": 57
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 60
},
{
"__id__": 61
},
{
"__id__": 62
},
{ {
"__id__": 63 "__id__": 63
},
{
"__id__": 64
},
{
"__id__": 65
},
{
"__id__": 66
} }
], ],
"_prefab": null, "_prefab": null,
@ -424,18 +427,15 @@
}, },
{ {
"__id__": 46 "__id__": 46
},
{
"__id__": 55
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 58 "__id__": 55
}, },
{ {
"__id__": 59 "__id__": 56
} }
], ],
"_prefab": null, "_prefab": null,
@ -2121,115 +2121,6 @@
"handler": "onStartBtnClick", "handler": "onStartBtnClick",
"customEventData": "" "customEventData": ""
}, },
{
"__type__": "cc.Node",
"_name": "Logo",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 9
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 56
},
{
"__id__": 57
}
],
"_prefab": null,
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": -863.572,
"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": "7fIthn6UNHcLw6FSdCz2Pr"
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 55
},
"_enabled": true,
"__prefab": null,
"_contentSize": {
"__type__": "cc.Size",
"width": 1080,
"height": 312
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": "87yEPbyQ5Oo67IhJRV9xNy"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 55
},
"_enabled": true,
"__prefab": null,
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_spriteFrame": {
"__uuid__": "9251663c-e78f-40a1-80a9-7992abf27cad@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_fillType": 0,
"_sizeMode": 1,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": "fbc6nCtwZOupP1ub4elEjo"
},
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
"_name": "", "_name": "",
@ -2294,10 +2185,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 61 "__id__": 58
}, },
{ {
"__id__": 62 "__id__": 59
} }
], ],
"_prefab": null, "_prefab": null,
@ -2336,7 +2227,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 60 "__id__": 57
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2358,7 +2249,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 60 "__id__": 57
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -2490,6 +2381,115 @@
"_miterLimit": 10, "_miterLimit": 10,
"_id": "88ENBOYIpCGKFcHVTgSMzZ" "_id": "88ENBOYIpCGKFcHVTgSMzZ"
}, },
{
"__type__": "cc.Node",
"_name": "Logo",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 2
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 65
},
{
"__id__": 66
}
],
"_prefab": null,
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": -863.572,
"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": "7fIthn6UNHcLw6FSdCz2Pr"
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 64
},
"_enabled": true,
"__prefab": null,
"_contentSize": {
"__type__": "cc.Size",
"width": 1080,
"height": 312
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": "87yEPbyQ5Oo67IhJRV9xNy"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 64
},
"_enabled": true,
"__prefab": null,
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_spriteFrame": {
"__uuid__": "9251663c-e78f-40a1-80a9-7992abf27cad@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_fillType": 0,
"_sizeMode": 1,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": "fbc6nCtwZOupP1ub4elEjo"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "tips", "_name": "tips",
@ -3087,7 +3087,7 @@
"__id__": 9 "__id__": 9
}, },
"rb7Logo": { "rb7Logo": {
"__id__": 55 "__id__": 64
}, },
"languageJson": { "languageJson": {
"__uuid__": "65d2a408-9396-47e4-99de-73423a590b7f", "__uuid__": "65d2a408-9396-47e4-99de-73423a590b7f",
@ -3118,7 +3118,7 @@
"__id__": 5 "__id__": 5
}, },
"Logo": { "Logo": {
"__id__": 55 "__id__": 64
}, },
"rotateNode": { "rotateNode": {
"__id__": 67 "__id__": 67

View File

@ -76,9 +76,7 @@ export class LayoutAdapter extends Component {
const texH = this.sprite.spriteFrame.height; const texH = this.sprite.spriteFrame.height;
const scale = Math.max(size.width / texW, size.height / texH); const scale = Math.max(size.width / texW, size.height / texH);
this.BG_01.setScale(scale, scale); // 铺满并保持比例 this.BG_01.setScale(scale, scale); // 铺满并保持比例
if (this.Logo.isValid) { this.changeLoge(size.height)
this.changeLoge(size.height)
}
if (this.isMobile()) { if (this.isMobile()) {

View File

@ -7,7 +7,7 @@ import { PREVIEW } from "cc/env"
const gameId = "rp_11001"; const gameId = "rp_11001";
// let apiaddr = "https://rpgames-api.rpfafafahkdev.com"; // let apiaddr = "https://rpgames-api.rpfafafahkdev.com";
let apiaddr = ""; let apiaddr = "";
let token = "eyJQIjoxMDA5NDksIkUiOjE3Njc4ODExMzMsIlMiOjEwMDEsIkQiOiJycF8xMTAwMSJ9.N2C9PWfr9Vjv_Ve_1OTGwCBh40m1mTg_gZhq3mu43wg"; let token = "eyJQIjoxMDA5NDksIkUiOjE3Njc2Mzg4MTgsIlMiOjEwMDUsIkQiOiJycF8xMTAwMSJ9._8ddABlHN9TDbjznz2Tde1SC2mZBTJg2olyYV-ZhTiQ";
let language = "en" let language = "en"

View File

@ -77,7 +77,7 @@ export class Loading extends Component {
this.node.getChildByPath("Mask/LoadingUINode/logo_en").active = true; this.node.getChildByPath("Mask/LoadingUINode/logo_en").active = true;
} }
// initErrorManager(); initErrorManager();
await I18nManager.instance.ensureI18nSprite(language, "2"); await I18nManager.instance.ensureI18nSprite(language, "2");
this.node this.node
.getChildByPath('Mask/LoadingUINode/msg') .getChildByPath('Mask/LoadingUINode/msg')