diff --git a/assets/resources/gui/anim/upanm.anim b/assets/resources/gui/anim/upanm.anim new file mode 100644 index 00000000..3a4285ce --- /dev/null +++ b/assets/resources/gui/anim/upanm.anim @@ -0,0 +1,112 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "upanm", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 20, + "speed": 1, + "wrapMode": 1, + "enableTrsBlending": false, + "_duration": 0.45, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [], + "_embeddedPlayers": [], + "_additiveSettings": { + "__id__": 6 + }, + "_auxiliaryCurveEntries": [] + }, + { + "__type__": "cc.animation.ObjectTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 2 + }, + "proxy": null + }, + "_channel": { + "__id__": 4 + } + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 3 + }, + "spriteFrame" + ] + }, + { + "__type__": "cc.animation.ComponentPath", + "component": "cc.Sprite" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 5 + } + }, + { + "__type__": "cc.ObjectCurve", + "_times": [ + 0, + 0.05, + 0.1, + 0.15, + 0.2, + 0.25, + 0.3, + 0.35, + 0.4 + ], + "_values": [ + null, + { + "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@57c99", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@d4a49", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@57598", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@ee898", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@2ce81", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@214a5", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@0ef72", + "__expectedType__": "cc.SpriteFrame" + }, + null + ] + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/gui/anim/upanm.anim.meta b/assets/resources/gui/anim/upanm.anim.meta new file mode 100644 index 00000000..6134e9a1 --- /dev/null +++ b/assets/resources/gui/anim/upanm.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "b194c17a-d811-4d73-ab53-7d567487ce80", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "upanm" + } +} diff --git a/assets/resources/gui/element/heros.prefab b/assets/resources/gui/element/heros.prefab index 218b7f6b..56ef86b2 100644 --- a/assets/resources/gui/element/heros.prefab +++ b/assets/resources/gui/element/heros.prefab @@ -25,29 +25,29 @@ "__id__": 88 }, { - "__id__": 527 + "__id__": 535 }, { - "__id__": 541 + "__id__": 549 } ], "_active": true, "_components": [ { - "__id__": 639 + "__id__": 647 }, { - "__id__": 641 + "__id__": 649 }, { - "__id__": 643 + "__id__": 651 }, { - "__id__": 645 + "__id__": 653 } ], "_prefab": { - "__id__": 647 + "__id__": 655 }, "_lpos": { "__type__": "cc.Vec3", @@ -1254,26 +1254,26 @@ "__id__": 89 }, { - "__id__": 196 + "__id__": 204 }, { - "__id__": 372 + "__id__": 380 }, { - "__id__": 394 + "__id__": 402 } ], "_active": true, "_components": [ { - "__id__": 522 + "__id__": 530 }, { - "__id__": 524 + "__id__": 532 } ], "_prefab": { - "__id__": 526 + "__id__": 534 }, "_lpos": { "__type__": "cc.Vec3", @@ -1320,26 +1320,29 @@ "__id__": 96 }, { - "__id__": 125 + "__id__": 104 }, { - "__id__": 131 + "__id__": 133 }, { - "__id__": 161 + "__id__": 139 + }, + { + "__id__": 169 } ], "_active": true, "_components": [ { - "__id__": 191 + "__id__": 199 }, { - "__id__": 193 + "__id__": 201 } ], "_prefab": { - "__id__": 195 + "__id__": 203 }, "_lpos": { "__type__": "cc.Vec3", @@ -1509,6 +1512,171 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "upanm", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 89 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 97 + }, + { + "__id__": 99 + }, + { + "__id__": 101 + } + ], + "_prefab": { + "__id__": 103 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 3, + "y": 3, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 96 + }, + "_enabled": true, + "__prefab": { + "__id__": 98 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2c7VMBCRVBrIesOiIaVTqJ" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 96 + }, + "_enabled": true, + "__prefab": { + "__id__": 100 + }, + "playOnLoad": false, + "_clips": [ + { + "__uuid__": "b194c17a-d811-4d73-ab53-7d567487ce80", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "b194c17a-d811-4d73-ab53-7d567487ce80", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "fekwFmKOBPQKf1SQs+paT2" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 96 + }, + "_enabled": true, + "__prefab": { + "__id__": 102 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": null, + "_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": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ebtV7Vc69CUKLETdAgznvy" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c8fnsbI21PvJ5IoU+um4tF", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.Node", "_name": "nameTitle", @@ -1519,20 +1687,20 @@ }, "_children": [ { - "__id__": 97 + "__id__": 105 }, { - "__id__": 114 + "__id__": 122 } ], "_active": true, "_components": [ { - "__id__": 122 + "__id__": 130 } ], "_prefab": { - "__id__": 124 + "__id__": 132 }, "_lpos": { "__type__": "cc.Vec3", @@ -1567,17 +1735,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 96 + "__id__": 104 }, "_prefab": { - "__id__": 98 + "__id__": 106 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 97 + "__id__": 105 }, "asset": { "__uuid__": "c85dc4d5-6ebf-4cee-aa3e-6c027334e622", @@ -1585,7 +1753,7 @@ }, "fileId": "40LEKxke9Hs6tfg2pVspXT", "instance": { - "__id__": 99 + "__id__": 107 }, "targetOverrides": null }, @@ -1599,31 +1767,31 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 100 + "__id__": 108 }, { - "__id__": 102 - }, - { - "__id__": 103 - }, - { - "__id__": 104 - }, - { - "__id__": 105 - }, - { - "__id__": 107 - }, - { - "__id__": 109 + "__id__": 110 }, { "__id__": 111 }, + { + "__id__": 112 + }, { "__id__": 113 + }, + { + "__id__": 115 + }, + { + "__id__": 117 + }, + { + "__id__": 119 + }, + { + "__id__": 121 } ], "removedComponents": [] @@ -1631,7 +1799,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 101 + "__id__": 109 }, "propertyPath": [ "_name" @@ -1647,7 +1815,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 101 + "__id__": 109 }, "propertyPath": [ "_lpos" @@ -1662,7 +1830,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 101 + "__id__": 109 }, "propertyPath": [ "_lrot" @@ -1678,7 +1846,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 101 + "__id__": 109 }, "propertyPath": [ "_euler" @@ -1693,7 +1861,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 106 + "__id__": 114 }, "propertyPath": [ "_contentSize" @@ -1713,7 +1881,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 108 + "__id__": 116 }, "propertyPath": [ "_contentSize" @@ -1733,7 +1901,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 110 + "__id__": 118 }, "propertyPath": [ "_contentSize" @@ -1753,7 +1921,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 112 + "__id__": 120 }, "propertyPath": [ "_contentSize" @@ -1773,7 +1941,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 101 + "__id__": 109 }, "propertyPath": [ "_lscale" @@ -1791,23 +1959,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 96 + "__id__": 104 }, "_children": [], "_active": true, "_components": [ { - "__id__": 115 + "__id__": 123 }, { - "__id__": 117 + "__id__": 125 }, { - "__id__": 119 + "__id__": 127 } ], "_prefab": { - "__id__": 121 + "__id__": 129 }, "_lpos": { "__type__": "cc.Vec3", @@ -1844,11 +2012,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 122 }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 124 }, "_contentSize": { "__type__": "cc.Size", @@ -1872,11 +2040,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 122 }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 126 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1940,11 +2108,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 122 }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 128 }, "_alignFlags": 17, "_target": null, @@ -1989,11 +2157,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 96 + "__id__": 104 }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 131 }, "_contentSize": { "__type__": "cc.Size", @@ -2036,14 +2204,14 @@ "_active": true, "_components": [ { - "__id__": 126 + "__id__": 134 }, { - "__id__": 128 + "__id__": 136 } ], "_prefab": { - "__id__": 130 + "__id__": 138 }, "_lpos": { "__type__": "cc.Vec3", @@ -2080,11 +2248,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 125 + "__id__": 133 }, "_enabled": true, "__prefab": { - "__id__": 127 + "__id__": 135 }, "_contentSize": { "__type__": "cc.Size", @@ -2108,11 +2276,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 125 + "__id__": 133 }, "_enabled": true, "__prefab": { - "__id__": 129 + "__id__": 137 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2193,20 +2361,20 @@ }, "_children": [ { - "__id__": 132 + "__id__": 140 }, { - "__id__": 152 + "__id__": 160 } ], "_active": true, "_components": [ { - "__id__": 158 + "__id__": 166 } ], "_prefab": { - "__id__": 160 + "__id__": 168 }, "_lpos": { "__type__": "cc.Vec3", @@ -2243,24 +2411,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 131 + "__id__": 139 }, "_children": [ { - "__id__": 133 + "__id__": 141 }, { - "__id__": 141 + "__id__": 149 } ], "_active": true, "_components": [ { - "__id__": 149 + "__id__": 157 } ], "_prefab": { - "__id__": 151 + "__id__": 159 }, "_lpos": { "__type__": "cc.Vec3", @@ -2297,183 +2465,8 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 132 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 134 - }, - { - "__id__": 136 - }, - { - "__id__": 138 - } - ], - "_prefab": { "__id__": 140 }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 133 - }, - "_enabled": true, - "__prefab": { - "__id__": 135 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 42 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f2R/871ZtBuKWy7/EAK1pP" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 133 - }, - "_enabled": true, - "__prefab": { - "__id__": 137 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 29, - "g": 172, - "b": 73, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "dd7e2f04-f9b9-489b-8d38-b4971ad81910@5c970", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "e2jxckoJFCkqXD517/q53e" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 133 - }, - "_enabled": true, - "__prefab": { - "__id__": 139 - }, - "_alignFlags": 40, - "_target": null, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 0, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 69, - "_originalHeight": 0, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "8ckWkuRg5NCpJwyJU58T6J" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "a8njQit6FDpJsv2GZ32RcS", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "Label_Tapered_02_White_Border", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 132 - }, "_children": [], "_active": true, "_components": [ @@ -2531,6 +2524,181 @@ "__prefab": { "__id__": 143 }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 42 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f2R/871ZtBuKWy7/EAK1pP" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 141 + }, + "_enabled": true, + "__prefab": { + "__id__": 145 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 29, + "g": 172, + "b": 73, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "dd7e2f04-f9b9-489b-8d38-b4971ad81910@5c970", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e2jxckoJFCkqXD517/q53e" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 141 + }, + "_enabled": true, + "__prefab": { + "__id__": 147 + }, + "_alignFlags": 40, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 69, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8ckWkuRg5NCpJwyJU58T6J" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "a8njQit6FDpJsv2GZ32RcS", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Label_Tapered_02_White_Border", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 140 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 150 + }, + { + "__id__": 152 + }, + { + "__id__": 154 + } + ], + "_prefab": { + "__id__": 156 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 149 + }, + "_enabled": true, + "__prefab": { + "__id__": 151 + }, "_contentSize": { "__type__": "cc.Size", "width": 102, @@ -2553,11 +2721,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 149 }, "_enabled": true, "__prefab": { - "__id__": 145 + "__id__": 153 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2598,11 +2766,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 149 }, "_enabled": true, "__prefab": { - "__id__": 147 + "__id__": 155 }, "_alignFlags": 40, "_target": null, @@ -2647,11 +2815,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 132 + "__id__": 140 }, "_enabled": true, "__prefab": { - "__id__": 150 + "__id__": 158 }, "_contentSize": { "__type__": "cc.Size", @@ -2688,20 +2856,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 131 + "__id__": 139 }, "_children": [], "_active": true, "_components": [ { - "__id__": 153 + "__id__": 161 }, { - "__id__": 155 + "__id__": 163 } ], "_prefab": { - "__id__": 157 + "__id__": 165 }, "_lpos": { "__type__": "cc.Vec3", @@ -2738,11 +2906,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 152 + "__id__": 160 }, "_enabled": true, "__prefab": { - "__id__": 154 + "__id__": 162 }, "_contentSize": { "__type__": "cc.Size", @@ -2766,11 +2934,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 152 + "__id__": 160 }, "_enabled": true, "__prefab": { - "__id__": 156 + "__id__": 164 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2847,11 +3015,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 131 + "__id__": 139 }, "_enabled": true, "__prefab": { - "__id__": 159 + "__id__": 167 }, "_contentSize": { "__type__": "cc.Size", @@ -2892,20 +3060,20 @@ }, "_children": [ { - "__id__": 162 + "__id__": 170 }, { - "__id__": 182 + "__id__": 190 } ], "_active": true, "_components": [ { - "__id__": 188 + "__id__": 196 } ], "_prefab": { - "__id__": 190 + "__id__": 198 }, "_lpos": { "__type__": "cc.Vec3", @@ -2942,24 +3110,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 161 + "__id__": 169 }, "_children": [ { - "__id__": 163 + "__id__": 171 }, { - "__id__": 171 + "__id__": 179 } ], "_active": true, "_components": [ { - "__id__": 179 + "__id__": 187 } ], "_prefab": { - "__id__": 181 + "__id__": 189 }, "_lpos": { "__type__": "cc.Vec3", @@ -2996,183 +3164,8 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 162 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 164 - }, - { - "__id__": 166 - }, - { - "__id__": 168 - } - ], - "_prefab": { "__id__": 170 }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 163 - }, - "_enabled": true, - "__prefab": { - "__id__": 165 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 42 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f7yv9MflRIkrK73ROsC0gc" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 163 - }, - "_enabled": true, - "__prefab": { - "__id__": 167 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 29, - "g": 172, - "b": 73, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "dd7e2f04-f9b9-489b-8d38-b4971ad81910@5c970", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "22ajM2+IpKV7zP0aTHN+31" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 163 - }, - "_enabled": true, - "__prefab": { - "__id__": 169 - }, - "_alignFlags": 40, - "_target": null, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 0, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 69, - "_originalHeight": 0, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "eeBpEYWzJP4qdbSj8sMtu8" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "c3ouPpfcRGvafC3MNAKx9U", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "Label_Tapered_02_White_Border", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 162 - }, "_children": [], "_active": true, "_components": [ @@ -3230,6 +3223,181 @@ "__prefab": { "__id__": 173 }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 42 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f7yv9MflRIkrK73ROsC0gc" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 171 + }, + "_enabled": true, + "__prefab": { + "__id__": 175 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 29, + "g": 172, + "b": 73, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "dd7e2f04-f9b9-489b-8d38-b4971ad81910@5c970", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "22ajM2+IpKV7zP0aTHN+31" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 171 + }, + "_enabled": true, + "__prefab": { + "__id__": 177 + }, + "_alignFlags": 40, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 69, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "eeBpEYWzJP4qdbSj8sMtu8" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c3ouPpfcRGvafC3MNAKx9U", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Label_Tapered_02_White_Border", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 170 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 180 + }, + { + "__id__": 182 + }, + { + "__id__": 184 + } + ], + "_prefab": { + "__id__": 186 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 179 + }, + "_enabled": true, + "__prefab": { + "__id__": 181 + }, "_contentSize": { "__type__": "cc.Size", "width": 102, @@ -3252,11 +3420,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 171 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 175 + "__id__": 183 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3297,11 +3465,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 171 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 177 + "__id__": 185 }, "_alignFlags": 40, "_target": null, @@ -3346,11 +3514,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 162 + "__id__": 170 }, "_enabled": true, "__prefab": { - "__id__": 180 + "__id__": 188 }, "_contentSize": { "__type__": "cc.Size", @@ -3387,20 +3555,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 161 + "__id__": 169 }, "_children": [], "_active": true, "_components": [ { - "__id__": 183 + "__id__": 191 }, { - "__id__": 185 + "__id__": 193 } ], "_prefab": { - "__id__": 187 + "__id__": 195 }, "_lpos": { "__type__": "cc.Vec3", @@ -3437,11 +3605,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 182 + "__id__": 190 }, "_enabled": true, "__prefab": { - "__id__": 184 + "__id__": 192 }, "_contentSize": { "__type__": "cc.Size", @@ -3465,11 +3633,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 182 + "__id__": 190 }, "_enabled": true, "__prefab": { - "__id__": 186 + "__id__": 194 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3546,11 +3714,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 161 + "__id__": 169 }, "_enabled": true, "__prefab": { - "__id__": 189 + "__id__": 197 }, "_contentSize": { "__type__": "cc.Size", @@ -3591,7 +3759,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 192 + "__id__": 200 }, "_contentSize": { "__type__": "cc.Size", @@ -3619,7 +3787,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 194 + "__id__": 202 }, "_alignFlags": 1, "_target": null, @@ -3668,32 +3836,32 @@ }, "_children": [ { - "__id__": 197 + "__id__": 205 }, { - "__id__": 239 + "__id__": 247 }, { - "__id__": 281 + "__id__": 289 }, { - "__id__": 323 + "__id__": 331 } ], "_active": true, "_components": [ { - "__id__": 365 + "__id__": 373 }, { - "__id__": 367 + "__id__": 375 }, { - "__id__": 369 + "__id__": 377 } ], "_prefab": { - "__id__": 371 + "__id__": 379 }, "_lpos": { "__type__": "cc.Vec3", @@ -3730,30 +3898,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 196 + "__id__": 204 }, "_children": [ { - "__id__": 198 + "__id__": 206 }, { - "__id__": 206 + "__id__": 214 } ], "_active": true, "_components": [ { - "__id__": 232 + "__id__": 240 }, { - "__id__": 234 + "__id__": 242 }, { - "__id__": 236 + "__id__": 244 } ], "_prefab": { - "__id__": 238 + "__id__": 246 }, "_lpos": { "__type__": "cc.Vec3", @@ -3790,23 +3958,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 197 + "__id__": 205 }, "_children": [], "_active": true, "_components": [ { - "__id__": 199 + "__id__": 207 }, { - "__id__": 201 + "__id__": 209 }, { - "__id__": 203 + "__id__": 211 } ], "_prefab": { - "__id__": 205 + "__id__": 213 }, "_lpos": { "__type__": "cc.Vec3", @@ -3843,11 +4011,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 198 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 200 + "__id__": 208 }, "_contentSize": { "__type__": "cc.Size", @@ -3871,11 +4039,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 198 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 202 + "__id__": 210 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3919,11 +4087,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 198 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 204 + "__id__": 212 }, "_alignFlags": 45, "_target": null, @@ -3968,24 +4136,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 197 + "__id__": 205 }, "_children": [ { - "__id__": 207 + "__id__": 215 }, { - "__id__": 213 + "__id__": 221 } ], "_active": true, "_components": [ { - "__id__": 229 + "__id__": 237 } ], "_prefab": { - "__id__": 231 + "__id__": 239 }, "_lpos": { "__type__": "cc.Vec3", @@ -4022,20 +4190,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 206 + "__id__": 214 }, "_children": [], "_active": true, "_components": [ { - "__id__": 208 + "__id__": 216 }, { - "__id__": 210 + "__id__": 218 } ], "_prefab": { - "__id__": 212 + "__id__": 220 }, "_lpos": { "__type__": "cc.Vec3", @@ -4072,11 +4240,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 207 + "__id__": 215 }, "_enabled": true, "__prefab": { - "__id__": 209 + "__id__": 217 }, "_contentSize": { "__type__": "cc.Size", @@ -4100,11 +4268,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 207 + "__id__": 215 }, "_enabled": true, "__prefab": { - "__id__": 211 + "__id__": 219 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4161,24 +4329,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 206 + "__id__": 214 }, "_children": [ { - "__id__": 214 + "__id__": 222 }, { - "__id__": 220 + "__id__": 228 } ], "_active": true, "_components": [ { - "__id__": 226 + "__id__": 234 } ], "_prefab": { - "__id__": 228 + "__id__": 236 }, "_lpos": { "__type__": "cc.Vec3", @@ -4215,20 +4383,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 213 + "__id__": 221 }, "_children": [], "_active": true, "_components": [ { - "__id__": 215 + "__id__": 223 }, { - "__id__": 217 + "__id__": 225 } ], "_prefab": { - "__id__": 219 + "__id__": 227 }, "_lpos": { "__type__": "cc.Vec3", @@ -4265,11 +4433,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 222 }, "_enabled": true, "__prefab": { - "__id__": 216 + "__id__": 224 }, "_contentSize": { "__type__": "cc.Size", @@ -4293,11 +4461,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 222 }, "_enabled": true, "__prefab": { - "__id__": 218 + "__id__": 226 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4374,20 +4542,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 213 + "__id__": 221 }, "_children": [], "_active": true, "_components": [ { - "__id__": 221 + "__id__": 229 }, { - "__id__": 223 + "__id__": 231 } ], "_prefab": { - "__id__": 225 + "__id__": 233 }, "_lpos": { "__type__": "cc.Vec3", @@ -4424,11 +4592,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 220 + "__id__": 228 }, "_enabled": true, "__prefab": { - "__id__": 222 + "__id__": 230 }, "_contentSize": { "__type__": "cc.Size", @@ -4452,11 +4620,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 220 + "__id__": 228 }, "_enabled": true, "__prefab": { - "__id__": 224 + "__id__": 232 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4533,11 +4701,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 213 + "__id__": 221 }, "_enabled": true, "__prefab": { - "__id__": 227 + "__id__": 235 }, "_contentSize": { "__type__": "cc.Size", @@ -4574,11 +4742,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 206 + "__id__": 214 }, "_enabled": true, "__prefab": { - "__id__": 230 + "__id__": 238 }, "_contentSize": { "__type__": "cc.Size", @@ -4615,11 +4783,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 197 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 233 + "__id__": 241 }, "_contentSize": { "__type__": "cc.Size", @@ -4643,11 +4811,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 197 + "__id__": 205 }, "_enabled": false, "__prefab": { - "__id__": 235 + "__id__": 243 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4688,11 +4856,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 197 + "__id__": 205 }, "_enabled": false, "__prefab": { - "__id__": 237 + "__id__": 245 }, "_alignFlags": 44, "_target": null, @@ -4737,30 +4905,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 196 + "__id__": 204 }, "_children": [ { - "__id__": 240 + "__id__": 248 }, { - "__id__": 248 + "__id__": 256 } ], "_active": true, "_components": [ { - "__id__": 274 + "__id__": 282 }, { - "__id__": 276 + "__id__": 284 }, { - "__id__": 278 + "__id__": 286 } ], "_prefab": { - "__id__": 280 + "__id__": 288 }, "_lpos": { "__type__": "cc.Vec3", @@ -4797,23 +4965,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 239 + "__id__": 247 }, "_children": [], "_active": true, "_components": [ { - "__id__": 241 + "__id__": 249 }, { - "__id__": 243 + "__id__": 251 }, { - "__id__": 245 + "__id__": 253 } ], "_prefab": { - "__id__": 247 + "__id__": 255 }, "_lpos": { "__type__": "cc.Vec3", @@ -4850,11 +5018,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 240 + "__id__": 248 }, "_enabled": true, "__prefab": { - "__id__": 242 + "__id__": 250 }, "_contentSize": { "__type__": "cc.Size", @@ -4878,11 +5046,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 240 + "__id__": 248 }, "_enabled": true, "__prefab": { - "__id__": 244 + "__id__": 252 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4926,11 +5094,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 240 + "__id__": 248 }, "_enabled": true, "__prefab": { - "__id__": 246 + "__id__": 254 }, "_alignFlags": 45, "_target": null, @@ -4975,24 +5143,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 239 + "__id__": 247 }, "_children": [ { - "__id__": 249 + "__id__": 257 }, { - "__id__": 255 + "__id__": 263 } ], "_active": true, "_components": [ { - "__id__": 271 + "__id__": 279 } ], "_prefab": { - "__id__": 273 + "__id__": 281 }, "_lpos": { "__type__": "cc.Vec3", @@ -5029,20 +5197,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 248 + "__id__": 256 }, "_children": [], "_active": true, "_components": [ { - "__id__": 250 + "__id__": 258 }, { - "__id__": 252 + "__id__": 260 } ], "_prefab": { - "__id__": 254 + "__id__": 262 }, "_lpos": { "__type__": "cc.Vec3", @@ -5079,11 +5247,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 249 + "__id__": 257 }, "_enabled": true, "__prefab": { - "__id__": 251 + "__id__": 259 }, "_contentSize": { "__type__": "cc.Size", @@ -5107,11 +5275,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 249 + "__id__": 257 }, "_enabled": true, "__prefab": { - "__id__": 253 + "__id__": 261 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5168,24 +5336,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 248 + "__id__": 256 }, "_children": [ { - "__id__": 256 + "__id__": 264 }, { - "__id__": 262 + "__id__": 270 } ], "_active": true, "_components": [ { - "__id__": 268 + "__id__": 276 } ], "_prefab": { - "__id__": 270 + "__id__": 278 }, "_lpos": { "__type__": "cc.Vec3", @@ -5222,20 +5390,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 255 + "__id__": 263 }, "_children": [], "_active": true, "_components": [ { - "__id__": 257 + "__id__": 265 }, { - "__id__": 259 + "__id__": 267 } ], "_prefab": { - "__id__": 261 + "__id__": 269 }, "_lpos": { "__type__": "cc.Vec3", @@ -5272,11 +5440,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 256 + "__id__": 264 }, "_enabled": true, "__prefab": { - "__id__": 258 + "__id__": 266 }, "_contentSize": { "__type__": "cc.Size", @@ -5300,11 +5468,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 256 + "__id__": 264 }, "_enabled": true, "__prefab": { - "__id__": 260 + "__id__": 268 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5381,20 +5549,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 255 + "__id__": 263 }, "_children": [], "_active": true, "_components": [ { - "__id__": 263 + "__id__": 271 }, { - "__id__": 265 + "__id__": 273 } ], "_prefab": { - "__id__": 267 + "__id__": 275 }, "_lpos": { "__type__": "cc.Vec3", @@ -5431,11 +5599,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 262 + "__id__": 270 }, "_enabled": true, "__prefab": { - "__id__": 264 + "__id__": 272 }, "_contentSize": { "__type__": "cc.Size", @@ -5459,11 +5627,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 262 + "__id__": 270 }, "_enabled": true, "__prefab": { - "__id__": 266 + "__id__": 274 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5540,11 +5708,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 255 + "__id__": 263 }, "_enabled": true, "__prefab": { - "__id__": 269 + "__id__": 277 }, "_contentSize": { "__type__": "cc.Size", @@ -5581,11 +5749,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 256 }, "_enabled": true, "__prefab": { - "__id__": 272 + "__id__": 280 }, "_contentSize": { "__type__": "cc.Size", @@ -5622,11 +5790,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 239 + "__id__": 247 }, "_enabled": true, "__prefab": { - "__id__": 275 + "__id__": 283 }, "_contentSize": { "__type__": "cc.Size", @@ -5650,11 +5818,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 239 + "__id__": 247 }, "_enabled": false, "__prefab": { - "__id__": 277 + "__id__": 285 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5695,11 +5863,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 239 + "__id__": 247 }, "_enabled": false, "__prefab": { - "__id__": 279 + "__id__": 287 }, "_alignFlags": 44, "_target": null, @@ -5744,30 +5912,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 196 + "__id__": 204 }, "_children": [ { - "__id__": 282 + "__id__": 290 }, { - "__id__": 290 + "__id__": 298 } ], "_active": true, "_components": [ { - "__id__": 316 + "__id__": 324 }, { - "__id__": 318 + "__id__": 326 }, { - "__id__": 320 + "__id__": 328 } ], "_prefab": { - "__id__": 322 + "__id__": 330 }, "_lpos": { "__type__": "cc.Vec3", @@ -5804,23 +5972,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 281 + "__id__": 289 }, "_children": [], "_active": true, "_components": [ { - "__id__": 283 + "__id__": 291 }, { - "__id__": 285 + "__id__": 293 }, { - "__id__": 287 + "__id__": 295 } ], "_prefab": { - "__id__": 289 + "__id__": 297 }, "_lpos": { "__type__": "cc.Vec3", @@ -5857,11 +6025,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 282 + "__id__": 290 }, "_enabled": true, "__prefab": { - "__id__": 284 + "__id__": 292 }, "_contentSize": { "__type__": "cc.Size", @@ -5885,11 +6053,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 282 + "__id__": 290 }, "_enabled": true, "__prefab": { - "__id__": 286 + "__id__": 294 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5933,11 +6101,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 282 + "__id__": 290 }, "_enabled": true, "__prefab": { - "__id__": 288 + "__id__": 296 }, "_alignFlags": 45, "_target": null, @@ -5982,24 +6150,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 281 + "__id__": 289 }, "_children": [ { - "__id__": 291 + "__id__": 299 }, { - "__id__": 297 + "__id__": 305 } ], "_active": true, "_components": [ { - "__id__": 313 + "__id__": 321 } ], "_prefab": { - "__id__": 315 + "__id__": 323 }, "_lpos": { "__type__": "cc.Vec3", @@ -6036,20 +6204,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 290 + "__id__": 298 }, "_children": [], "_active": true, "_components": [ { - "__id__": 292 + "__id__": 300 }, { - "__id__": 294 + "__id__": 302 } ], "_prefab": { - "__id__": 296 + "__id__": 304 }, "_lpos": { "__type__": "cc.Vec3", @@ -6086,11 +6254,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 299 }, "_enabled": true, "__prefab": { - "__id__": 293 + "__id__": 301 }, "_contentSize": { "__type__": "cc.Size", @@ -6114,11 +6282,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 299 }, "_enabled": true, "__prefab": { - "__id__": 295 + "__id__": 303 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6175,24 +6343,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 290 + "__id__": 298 }, "_children": [ { - "__id__": 298 + "__id__": 306 }, { - "__id__": 304 + "__id__": 312 } ], "_active": true, "_components": [ { - "__id__": 310 + "__id__": 318 } ], "_prefab": { - "__id__": 312 + "__id__": 320 }, "_lpos": { "__type__": "cc.Vec3", @@ -6229,20 +6397,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 297 + "__id__": 305 }, "_children": [], "_active": true, "_components": [ { - "__id__": 299 + "__id__": 307 }, { - "__id__": 301 + "__id__": 309 } ], "_prefab": { - "__id__": 303 + "__id__": 311 }, "_lpos": { "__type__": "cc.Vec3", @@ -6279,11 +6447,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 298 + "__id__": 306 }, "_enabled": true, "__prefab": { - "__id__": 300 + "__id__": 308 }, "_contentSize": { "__type__": "cc.Size", @@ -6307,11 +6475,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 298 + "__id__": 306 }, "_enabled": true, "__prefab": { - "__id__": 302 + "__id__": 310 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6388,20 +6556,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 297 + "__id__": 305 }, "_children": [], "_active": true, "_components": [ { - "__id__": 305 + "__id__": 313 }, { - "__id__": 307 + "__id__": 315 } ], "_prefab": { - "__id__": 309 + "__id__": 317 }, "_lpos": { "__type__": "cc.Vec3", @@ -6438,11 +6606,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 304 + "__id__": 312 }, "_enabled": true, "__prefab": { - "__id__": 306 + "__id__": 314 }, "_contentSize": { "__type__": "cc.Size", @@ -6466,11 +6634,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 304 + "__id__": 312 }, "_enabled": true, "__prefab": { - "__id__": 308 + "__id__": 316 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6547,11 +6715,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 297 + "__id__": 305 }, "_enabled": true, "__prefab": { - "__id__": 311 + "__id__": 319 }, "_contentSize": { "__type__": "cc.Size", @@ -6588,11 +6756,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 298 }, "_enabled": true, "__prefab": { - "__id__": 314 + "__id__": 322 }, "_contentSize": { "__type__": "cc.Size", @@ -6629,11 +6797,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 281 + "__id__": 289 }, "_enabled": true, "__prefab": { - "__id__": 317 + "__id__": 325 }, "_contentSize": { "__type__": "cc.Size", @@ -6657,11 +6825,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 281 + "__id__": 289 }, "_enabled": false, "__prefab": { - "__id__": 319 + "__id__": 327 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6702,11 +6870,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 281 + "__id__": 289 }, "_enabled": false, "__prefab": { - "__id__": 321 + "__id__": 329 }, "_alignFlags": 44, "_target": null, @@ -6751,30 +6919,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 196 + "__id__": 204 }, "_children": [ { - "__id__": 324 + "__id__": 332 }, { - "__id__": 332 + "__id__": 340 } ], "_active": true, "_components": [ { - "__id__": 358 + "__id__": 366 }, { - "__id__": 360 + "__id__": 368 }, { - "__id__": 362 + "__id__": 370 } ], "_prefab": { - "__id__": 364 + "__id__": 372 }, "_lpos": { "__type__": "cc.Vec3", @@ -6811,23 +6979,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 323 + "__id__": 331 }, "_children": [], "_active": true, "_components": [ { - "__id__": 325 + "__id__": 333 }, { - "__id__": 327 + "__id__": 335 }, { - "__id__": 329 + "__id__": 337 } ], "_prefab": { - "__id__": 331 + "__id__": 339 }, "_lpos": { "__type__": "cc.Vec3", @@ -6864,11 +7032,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 324 + "__id__": 332 }, "_enabled": true, "__prefab": { - "__id__": 326 + "__id__": 334 }, "_contentSize": { "__type__": "cc.Size", @@ -6892,11 +7060,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 324 + "__id__": 332 }, "_enabled": true, "__prefab": { - "__id__": 328 + "__id__": 336 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6940,11 +7108,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 324 + "__id__": 332 }, "_enabled": true, "__prefab": { - "__id__": 330 + "__id__": 338 }, "_alignFlags": 45, "_target": null, @@ -6989,24 +7157,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 323 + "__id__": 331 }, "_children": [ { - "__id__": 333 + "__id__": 341 }, { - "__id__": 339 + "__id__": 347 } ], "_active": true, "_components": [ { - "__id__": 355 + "__id__": 363 } ], "_prefab": { - "__id__": 357 + "__id__": 365 }, "_lpos": { "__type__": "cc.Vec3", @@ -7043,20 +7211,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 332 + "__id__": 340 }, "_children": [], "_active": true, "_components": [ { - "__id__": 334 + "__id__": 342 }, { - "__id__": 336 + "__id__": 344 } ], "_prefab": { - "__id__": 338 + "__id__": 346 }, "_lpos": { "__type__": "cc.Vec3", @@ -7093,11 +7261,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 333 + "__id__": 341 }, "_enabled": true, "__prefab": { - "__id__": 335 + "__id__": 343 }, "_contentSize": { "__type__": "cc.Size", @@ -7121,11 +7289,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 333 + "__id__": 341 }, "_enabled": true, "__prefab": { - "__id__": 337 + "__id__": 345 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7182,24 +7350,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 332 + "__id__": 340 }, "_children": [ { - "__id__": 340 + "__id__": 348 }, { - "__id__": 346 + "__id__": 354 } ], "_active": true, "_components": [ { - "__id__": 352 + "__id__": 360 } ], "_prefab": { - "__id__": 354 + "__id__": 362 }, "_lpos": { "__type__": "cc.Vec3", @@ -7236,20 +7404,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 339 + "__id__": 347 }, "_children": [], "_active": true, "_components": [ { - "__id__": 341 + "__id__": 349 }, { - "__id__": 343 + "__id__": 351 } ], "_prefab": { - "__id__": 345 + "__id__": 353 }, "_lpos": { "__type__": "cc.Vec3", @@ -7286,11 +7454,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 340 + "__id__": 348 }, "_enabled": true, "__prefab": { - "__id__": 342 + "__id__": 350 }, "_contentSize": { "__type__": "cc.Size", @@ -7314,11 +7482,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 340 + "__id__": 348 }, "_enabled": true, "__prefab": { - "__id__": 344 + "__id__": 352 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7395,20 +7563,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 339 + "__id__": 347 }, "_children": [], "_active": true, "_components": [ { - "__id__": 347 + "__id__": 355 }, { - "__id__": 349 + "__id__": 357 } ], "_prefab": { - "__id__": 351 + "__id__": 359 }, "_lpos": { "__type__": "cc.Vec3", @@ -7445,11 +7613,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 346 + "__id__": 354 }, "_enabled": true, "__prefab": { - "__id__": 348 + "__id__": 356 }, "_contentSize": { "__type__": "cc.Size", @@ -7473,11 +7641,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 346 + "__id__": 354 }, "_enabled": true, "__prefab": { - "__id__": 350 + "__id__": 358 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7554,11 +7722,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 339 + "__id__": 347 }, "_enabled": true, "__prefab": { - "__id__": 353 + "__id__": 361 }, "_contentSize": { "__type__": "cc.Size", @@ -7595,11 +7763,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 332 + "__id__": 340 }, "_enabled": true, "__prefab": { - "__id__": 356 + "__id__": 364 }, "_contentSize": { "__type__": "cc.Size", @@ -7636,11 +7804,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 323 + "__id__": 331 }, "_enabled": true, "__prefab": { - "__id__": 359 + "__id__": 367 }, "_contentSize": { "__type__": "cc.Size", @@ -7664,11 +7832,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 323 + "__id__": 331 }, "_enabled": false, "__prefab": { - "__id__": 361 + "__id__": 369 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7709,11 +7877,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 323 + "__id__": 331 }, "_enabled": false, "__prefab": { - "__id__": 363 + "__id__": 371 }, "_alignFlags": 44, "_target": null, @@ -7758,11 +7926,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 196 + "__id__": 204 }, "_enabled": true, "__prefab": { - "__id__": 366 + "__id__": 374 }, "_contentSize": { "__type__": "cc.Size", @@ -7786,11 +7954,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 196 + "__id__": 204 }, "_enabled": true, "__prefab": { - "__id__": 368 + "__id__": 376 }, "_alignFlags": 1, "_target": null, @@ -7822,11 +7990,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 196 + "__id__": 204 }, "_enabled": true, "__prefab": { - "__id__": 370 + "__id__": 378 }, "_resizeMode": 1, "_layoutType": 3, @@ -7877,26 +8045,26 @@ }, "_children": [ { - "__id__": 373 + "__id__": 381 }, { - "__id__": 381 + "__id__": 389 } ], "_active": true, "_components": [ { - "__id__": 387 + "__id__": 395 }, { - "__id__": 389 + "__id__": 397 }, { - "__id__": 391 + "__id__": 399 } ], "_prefab": { - "__id__": 393 + "__id__": 401 }, "_lpos": { "__type__": "cc.Vec3", @@ -7933,23 +8101,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 372 + "__id__": 380 }, "_children": [], "_active": true, "_components": [ { - "__id__": 374 + "__id__": 382 }, { - "__id__": 376 + "__id__": 384 }, { - "__id__": 378 + "__id__": 386 } ], "_prefab": { - "__id__": 380 + "__id__": 388 }, "_lpos": { "__type__": "cc.Vec3", @@ -7986,11 +8154,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 373 + "__id__": 381 }, "_enabled": true, "__prefab": { - "__id__": 375 + "__id__": 383 }, "_contentSize": { "__type__": "cc.Size", @@ -8014,11 +8182,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 373 + "__id__": 381 }, "_enabled": true, "__prefab": { - "__id__": 377 + "__id__": 385 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8062,11 +8230,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 373 + "__id__": 381 }, "_enabled": true, "__prefab": { - "__id__": 379 + "__id__": 387 }, "_alignFlags": 45, "_target": null, @@ -8111,20 +8279,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 372 + "__id__": 380 }, "_children": [], "_active": true, "_components": [ { - "__id__": 382 + "__id__": 390 }, { - "__id__": 384 + "__id__": 392 } ], "_prefab": { - "__id__": 386 + "__id__": 394 }, "_lpos": { "__type__": "cc.Vec3", @@ -8161,11 +8329,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 381 + "__id__": 389 }, "_enabled": true, "__prefab": { - "__id__": 383 + "__id__": 391 }, "_contentSize": { "__type__": "cc.Size", @@ -8189,11 +8357,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 381 + "__id__": 389 }, "_enabled": true, "__prefab": { - "__id__": 385 + "__id__": 393 }, "_alignFlags": 45, "_target": null, @@ -8238,11 +8406,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 372 + "__id__": 380 }, "_enabled": true, "__prefab": { - "__id__": 388 + "__id__": 396 }, "_contentSize": { "__type__": "cc.Size", @@ -8266,11 +8434,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 372 + "__id__": 380 }, "_enabled": true, "__prefab": { - "__id__": 390 + "__id__": 398 }, "_alignFlags": 5, "_target": null, @@ -8302,11 +8470,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 372 + "__id__": 380 }, "_enabled": false, "__prefab": { - "__id__": 392 + "__id__": 400 }, "_resizeMode": 1, "_layoutType": 3, @@ -8354,14 +8522,14 @@ "__id__": 88 }, "_prefab": { - "__id__": 395 + "__id__": 403 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 394 + "__id__": 402 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -8369,7 +8537,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 396 + "__id__": 404 }, "targetOverrides": null }, @@ -8381,89 +8549,74 @@ }, "mountedChildren": [ { - "__id__": 397 + "__id__": 405 }, { - "__id__": 457 + "__id__": 465 } ], "mountedComponents": [ { - "__id__": 468 + "__id__": 476 } ], "propertyOverrides": [ { - "__id__": 472 + "__id__": 480 }, { - "__id__": 474 - }, - { - "__id__": 475 - }, - { - "__id__": 476 - }, - { - "__id__": 477 - }, - { - "__id__": 479 - }, - { - "__id__": 481 + "__id__": 482 }, { "__id__": 483 }, + { + "__id__": 484 + }, { "__id__": 485 }, { - "__id__": 486 + "__id__": 487 }, { - "__id__": 488 + "__id__": 489 }, { - "__id__": 490 + "__id__": 491 }, { - "__id__": 492 + "__id__": 493 }, { "__id__": 494 }, { - "__id__": 495 + "__id__": 496 }, { - "__id__": 497 + "__id__": 498 }, { - "__id__": 499 + "__id__": 500 }, { - "__id__": 501 + "__id__": 502 }, { "__id__": 503 }, - { - "__id__": 504 - }, { "__id__": 505 }, { - "__id__": 506 + "__id__": 507 }, { - "__id__": 508 + "__id__": 509 }, { - "__id__": 510 + "__id__": 511 }, { "__id__": 512 @@ -8472,19 +8625,34 @@ "__id__": 513 }, { - "__id__": 515 + "__id__": 514 }, { - "__id__": 517 + "__id__": 516 }, { "__id__": 518 }, { - "__id__": 519 + "__id__": 520 }, { "__id__": 521 + }, + { + "__id__": 523 + }, + { + "__id__": 525 + }, + { + "__id__": 526 + }, + { + "__id__": 527 + }, + { + "__id__": 529 } ], "removedComponents": [] @@ -8492,11 +8660,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 398 + "__id__": 406 }, "nodes": [ { - "__id__": 399 + "__id__": 407 } ] }, @@ -8510,14 +8678,14 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 400 + "__id__": 408 }, "_prefab": { - "__id__": 450 + "__id__": 458 }, "__editorExtras__": { "mountedRoot": { - "__id__": 394 + "__id__": 402 } } }, @@ -8529,30 +8697,30 @@ "mountedRoot": null }, "_parent": { - "__id__": 401 + "__id__": 409 }, "_children": [ { - "__id__": 433 + "__id__": 441 }, { - "__id__": 439 + "__id__": 447 }, { - "__id__": 399 + "__id__": 407 } ], "_active": true, "_components": [ { - "__id__": 445 + "__id__": 453 }, { - "__id__": 447 + "__id__": 455 } ], "_prefab": { - "__id__": 449 + "__id__": 457 }, "_lpos": { "__type__": "cc.Vec3", @@ -8589,33 +8757,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 394 + "__id__": 402 }, "_children": [ { - "__id__": 400 + "__id__": 408 }, { - "__id__": 402 + "__id__": 410 }, { - "__id__": 420 + "__id__": 428 } ], "_active": true, "_components": [ { - "__id__": 426 + "__id__": 434 }, { - "__id__": 428 + "__id__": 436 }, { - "__id__": 430 + "__id__": 438 } ], "_prefab": { - "__id__": 432 + "__id__": 440 }, "_lpos": { "__type__": "cc.Vec3", @@ -8654,27 +8822,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 401 + "__id__": 409 }, "_children": [ { - "__id__": 403 - }, - { - "__id__": 409 - } - ], - "_active": false, - "_components": [ - { - "__id__": 415 + "__id__": 411 }, { "__id__": 417 } ], + "_active": false, + "_components": [ + { + "__id__": 423 + }, + { + "__id__": 425 + } + ], "_prefab": { - "__id__": 419 + "__id__": 427 }, "_lpos": { "__type__": "cc.Vec3", @@ -8711,20 +8879,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 402 + "__id__": 410 }, "_children": [], "_active": true, "_components": [ { - "__id__": 404 + "__id__": 412 }, { - "__id__": 406 + "__id__": 414 } ], "_prefab": { - "__id__": 408 + "__id__": 416 }, "_lpos": { "__type__": "cc.Vec3", @@ -8761,11 +8929,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 403 + "__id__": 411 }, "_enabled": true, "__prefab": { - "__id__": 405 + "__id__": 413 }, "_contentSize": { "__type__": "cc.Size", @@ -8789,11 +8957,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 403 + "__id__": 411 }, "_enabled": true, "__prefab": { - "__id__": 407 + "__id__": 415 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8850,20 +9018,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 402 + "__id__": 410 }, "_children": [], "_active": true, "_components": [ { - "__id__": 410 + "__id__": 418 }, { - "__id__": 412 + "__id__": 420 } ], "_prefab": { - "__id__": 414 + "__id__": 422 }, "_lpos": { "__type__": "cc.Vec3", @@ -8900,11 +9068,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 409 + "__id__": 417 }, "_enabled": true, "__prefab": { - "__id__": 411 + "__id__": 419 }, "_contentSize": { "__type__": "cc.Size", @@ -8928,11 +9096,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 409 + "__id__": 417 }, "_enabled": true, "__prefab": { - "__id__": 413 + "__id__": 421 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9009,11 +9177,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 402 + "__id__": 410 }, "_enabled": true, "__prefab": { - "__id__": 416 + "__id__": 424 }, "_contentSize": { "__type__": "cc.Size", @@ -9037,11 +9205,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 402 + "__id__": 410 }, "_enabled": true, "__prefab": { - "__id__": 418 + "__id__": 426 }, "_resizeMode": 1, "_layoutType": 1, @@ -9090,20 +9258,20 @@ "mountedRoot": null }, "_parent": { - "__id__": 401 + "__id__": 409 }, "_children": [], "_active": true, "_components": [ { - "__id__": 421 + "__id__": 429 }, { - "__id__": 423 + "__id__": 431 } ], "_prefab": { - "__id__": 425 + "__id__": 433 }, "_lpos": { "__type__": "cc.Vec3", @@ -9140,11 +9308,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 420 + "__id__": 428 }, "_enabled": true, "__prefab": { - "__id__": 422 + "__id__": 430 }, "_contentSize": { "__type__": "cc.Size", @@ -9168,11 +9336,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 420 + "__id__": 428 }, "_enabled": true, "__prefab": { - "__id__": 424 + "__id__": 432 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9249,11 +9417,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 401 + "__id__": 409 }, "_enabled": true, "__prefab": { - "__id__": 427 + "__id__": 435 }, "_contentSize": { "__type__": "cc.Size", @@ -9277,11 +9445,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 401 + "__id__": 409 }, "_enabled": true, "__prefab": { - "__id__": 429 + "__id__": 437 }, "_alignFlags": 45, "_target": null, @@ -9313,11 +9481,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 401 + "__id__": 409 }, "_enabled": true, "__prefab": { - "__id__": 431 + "__id__": 439 }, "_resizeMode": 1, "_layoutType": 2, @@ -9364,20 +9532,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 400 + "__id__": 408 }, "_children": [], "_active": false, "_components": [ { - "__id__": 434 + "__id__": 442 }, { - "__id__": 436 + "__id__": 444 } ], "_prefab": { - "__id__": 438 + "__id__": 446 }, "_lpos": { "__type__": "cc.Vec3", @@ -9414,11 +9582,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 433 + "__id__": 441 }, "_enabled": true, "__prefab": { - "__id__": 435 + "__id__": 443 }, "_contentSize": { "__type__": "cc.Size", @@ -9442,11 +9610,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 433 + "__id__": 441 }, "_enabled": true, "__prefab": { - "__id__": 437 + "__id__": 445 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9500,20 +9668,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 400 + "__id__": 408 }, "_children": [], "_active": true, "_components": [ { - "__id__": 440 + "__id__": 448 }, { - "__id__": 442 + "__id__": 450 } ], "_prefab": { - "__id__": 444 + "__id__": 452 }, "_lpos": { "__type__": "cc.Vec3", @@ -9550,11 +9718,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 439 + "__id__": 447 }, "_enabled": true, "__prefab": { - "__id__": 441 + "__id__": 449 }, "_contentSize": { "__type__": "cc.Size", @@ -9578,11 +9746,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 439 + "__id__": 447 }, "_enabled": true, "__prefab": { - "__id__": 443 + "__id__": 451 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9659,11 +9827,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 400 + "__id__": 408 }, "_enabled": true, "__prefab": { - "__id__": 446 + "__id__": 454 }, "_contentSize": { "__type__": "cc.Size", @@ -9687,11 +9855,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 400 + "__id__": 408 }, "_enabled": true, "__prefab": { - "__id__": 448 + "__id__": 456 }, "_resizeMode": 1, "_layoutType": 1, @@ -9735,7 +9903,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 399 + "__id__": 407 }, "asset": { "__uuid__": "4b8fb686-b649-4525-9aae-df0e7369205b", @@ -9743,7 +9911,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 451 + "__id__": 459 }, "targetOverrides": null }, @@ -9757,16 +9925,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 452 + "__id__": 460 }, { - "__id__": 454 + "__id__": 462 }, { - "__id__": 455 + "__id__": 463 }, { - "__id__": 456 + "__id__": 464 } ], "removedComponents": [] @@ -9774,7 +9942,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 453 + "__id__": 461 }, "propertyPath": [ "_name" @@ -9790,7 +9958,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 453 + "__id__": 461 }, "propertyPath": [ "_lpos" @@ -9805,7 +9973,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 453 + "__id__": 461 }, "propertyPath": [ "_lrot" @@ -9821,7 +9989,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 453 + "__id__": 461 }, "propertyPath": [ "_euler" @@ -9836,11 +10004,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 458 + "__id__": 466 }, "nodes": [ { - "__id__": 459 + "__id__": 467 } ] }, @@ -9854,21 +10022,21 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 394 + "__id__": 402 }, "_prefab": { - "__id__": 460 + "__id__": 468 }, "__editorExtras__": { "mountedRoot": { - "__id__": 394 + "__id__": 402 } } }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 459 + "__id__": 467 }, "asset": { "__uuid__": "86a3c4cd-71c7-4502-b713-65f0ace7912a", @@ -9876,7 +10044,7 @@ }, "fileId": "d3jYvT7whFS5scQFZeO5AK", "instance": { - "__id__": 461 + "__id__": 469 }, "targetOverrides": null }, @@ -9890,19 +10058,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 462 + "__id__": 470 }, { - "__id__": 464 + "__id__": 472 }, { - "__id__": 465 + "__id__": 473 }, { - "__id__": 466 + "__id__": 474 }, { - "__id__": 467 + "__id__": 475 } ], "removedComponents": [] @@ -9910,7 +10078,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 463 + "__id__": 471 }, "propertyPath": [ "_name" @@ -9926,7 +10094,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 463 + "__id__": 471 }, "propertyPath": [ "_lpos" @@ -9941,7 +10109,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 463 + "__id__": 471 }, "propertyPath": [ "_lrot" @@ -9957,7 +10125,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 463 + "__id__": 471 }, "propertyPath": [ "_euler" @@ -9972,7 +10140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 463 + "__id__": 471 }, "propertyPath": [ "_active" @@ -9982,11 +10150,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 469 + "__id__": 477 }, "components": [ { - "__id__": 470 + "__id__": 478 } ] }, @@ -10002,15 +10170,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 394 + "__id__": 402 } }, "node": { - "__id__": 394 + "__id__": 402 }, "_enabled": true, "__prefab": { - "__id__": 471 + "__id__": 479 }, "_alignFlags": 4, "_target": null, @@ -10039,7 +10207,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 473 + "__id__": 481 }, "propertyPath": [ "_name" @@ -10055,7 +10223,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 473 + "__id__": 481 }, "propertyPath": [ "_lpos" @@ -10070,7 +10238,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 473 + "__id__": 481 }, "propertyPath": [ "_lrot" @@ -10086,7 +10254,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 473 + "__id__": 481 }, "propertyPath": [ "_euler" @@ -10101,7 +10269,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 478 + "__id__": 486 }, "propertyPath": [ "_contentSize" @@ -10121,7 +10289,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 480 + "__id__": 488 }, "propertyPath": [ "_contentSize" @@ -10141,7 +10309,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 482 + "__id__": 490 }, "propertyPath": [ "_contentSize" @@ -10161,7 +10329,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 484 + "__id__": 492 }, "propertyPath": [ "_top" @@ -10177,7 +10345,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 484 + "__id__": 492 }, "propertyPath": [ "_bottom" @@ -10187,7 +10355,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 487 + "__id__": 495 }, "propertyPath": [ "_string" @@ -10203,7 +10371,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 489 + "__id__": 497 }, "propertyPath": [ "_contentSize" @@ -10223,7 +10391,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 491 + "__id__": 499 }, "propertyPath": [ "_name" @@ -10239,7 +10407,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 493 + "__id__": 501 }, "propertyPath": [ "_spriteFrame" @@ -10258,7 +10426,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 493 + "__id__": 501 }, "propertyPath": [ "_atlas" @@ -10271,7 +10439,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 496 + "__id__": 504 }, "propertyPath": [ "_spacingY" @@ -10287,7 +10455,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 498 + "__id__": 506 }, "propertyPath": [ "_lpos" @@ -10308,7 +10476,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 500 + "__id__": 508 }, "propertyPath": [ "_lpos" @@ -10329,7 +10497,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 502 + "__id__": 510 }, "propertyPath": [ "_lpos" @@ -10350,7 +10518,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 487 + "__id__": 495 }, "propertyPath": [ "_lineHeight" @@ -10360,7 +10528,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 487 + "__id__": 495 }, "propertyPath": [ "_fontSize" @@ -10370,7 +10538,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 487 + "__id__": 495 }, "propertyPath": [ "_actualFontSize" @@ -10380,7 +10548,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 507 + "__id__": 515 }, "propertyPath": [ "_lpos" @@ -10401,7 +10569,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 509 + "__id__": 517 }, "propertyPath": [ "_lpos" @@ -10422,7 +10590,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 511 + "__id__": 519 }, "propertyPath": [ "_contentSize" @@ -10442,7 +10610,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 507 + "__id__": 515 }, "propertyPath": [ "_active" @@ -10452,7 +10620,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 514 + "__id__": 522 }, "propertyPath": [ "_fontSize" @@ -10468,7 +10636,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 516 + "__id__": 524 }, "propertyPath": [ "_contentSize" @@ -10488,7 +10656,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 514 + "__id__": 522 }, "propertyPath": [ "_actualFontSize" @@ -10498,7 +10666,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 514 + "__id__": 522 }, "propertyPath": [ "_string" @@ -10508,7 +10676,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 520 + "__id__": 528 }, "propertyPath": [ "_horizontalDirection" @@ -10524,7 +10692,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 520 + "__id__": 528 }, "propertyPath": [ "_spacingX" @@ -10541,7 +10709,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 523 + "__id__": 531 }, "_contentSize": { "__type__": "cc.Size", @@ -10569,7 +10737,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 525 + "__id__": 533 }, "_alignFlags": 45, "_target": null, @@ -10618,20 +10786,20 @@ }, "_children": [ { - "__id__": 528 + "__id__": 536 } ], "_active": true, "_components": [ { - "__id__": 536 + "__id__": 544 }, { - "__id__": 538 + "__id__": 546 } ], "_prefab": { - "__id__": 540 + "__id__": 548 }, "_lpos": { "__type__": "cc.Vec3", @@ -10668,23 +10836,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 527 + "__id__": 535 }, "_children": [], "_active": true, "_components": [ { - "__id__": 529 + "__id__": 537 }, { - "__id__": 531 + "__id__": 539 }, { - "__id__": 533 + "__id__": 541 } ], "_prefab": { - "__id__": 535 + "__id__": 543 }, "_lpos": { "__type__": "cc.Vec3", @@ -10721,11 +10889,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 528 + "__id__": 536 }, "_enabled": true, "__prefab": { - "__id__": 530 + "__id__": 538 }, "_contentSize": { "__type__": "cc.Size", @@ -10749,11 +10917,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 528 + "__id__": 536 }, "_enabled": true, "__prefab": { - "__id__": 532 + "__id__": 540 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10797,11 +10965,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 528 + "__id__": 536 }, "_enabled": true, "__prefab": { - "__id__": 534 + "__id__": 542 }, "_alignFlags": 45, "_target": null, @@ -10846,11 +11014,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 527 + "__id__": 535 }, "_enabled": true, "__prefab": { - "__id__": 537 + "__id__": 545 }, "_contentSize": { "__type__": "cc.Size", @@ -10874,11 +11042,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 527 + "__id__": 535 }, "_enabled": true, "__prefab": { - "__id__": 539 + "__id__": 547 }, "_alignFlags": 44, "_target": null, @@ -10927,20 +11095,20 @@ }, "_children": [ { - "__id__": 542 + "__id__": 550 } ], "_active": true, "_components": [ { - "__id__": 634 + "__id__": 642 }, { - "__id__": 636 + "__id__": 644 } ], "_prefab": { - "__id__": 638 + "__id__": 646 }, "_lpos": { "__type__": "cc.Vec3", @@ -10977,33 +11145,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 541 + "__id__": 549 }, "_children": [ { - "__id__": 543 + "__id__": 551 }, { - "__id__": 561 + "__id__": 569 } ], "_active": true, "_components": [ { - "__id__": 627 + "__id__": 635 }, { - "__id__": 629 + "__id__": 637 }, { - "__id__": 558 + "__id__": 566 }, { - "__id__": 631 + "__id__": 639 } ], "_prefab": { - "__id__": 633 + "__id__": 641 }, "_lpos": { "__type__": "cc.Vec3", @@ -11040,30 +11208,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 542 + "__id__": 550 }, "_children": [ { - "__id__": 544 + "__id__": 552 } ], "_active": false, "_components": [ { - "__id__": 550 + "__id__": 558 }, { - "__id__": 552 + "__id__": 560 }, { - "__id__": 554 + "__id__": 562 }, { - "__id__": 556 + "__id__": 564 } ], "_prefab": { - "__id__": 626 + "__id__": 634 }, "_lpos": { "__type__": "cc.Vec3", @@ -11100,20 +11268,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 543 + "__id__": 551 }, "_children": [], "_active": true, "_components": [ { - "__id__": 545 + "__id__": 553 }, { - "__id__": 547 + "__id__": 555 } ], "_prefab": { - "__id__": 549 + "__id__": 557 }, "_lpos": { "__type__": "cc.Vec3", @@ -11150,11 +11318,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 544 + "__id__": 552 }, "_enabled": true, "__prefab": { - "__id__": 546 + "__id__": 554 }, "_contentSize": { "__type__": "cc.Size", @@ -11178,11 +11346,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 544 + "__id__": 552 }, "_enabled": true, "__prefab": { - "__id__": 548 + "__id__": 556 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11236,11 +11404,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 543 + "__id__": 551 }, "_enabled": true, "__prefab": { - "__id__": 551 + "__id__": 559 }, "_contentSize": { "__type__": "cc.Size", @@ -11264,11 +11432,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 543 + "__id__": 551 }, "_enabled": true, "__prefab": { - "__id__": 553 + "__id__": 561 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11309,11 +11477,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 543 + "__id__": 551 }, "_enabled": true, "__prefab": { - "__id__": 555 + "__id__": 563 }, "_alignFlags": 37, "_target": null, @@ -11345,17 +11513,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 543 + "__id__": 551 }, "_enabled": true, "__prefab": { - "__id__": 557 + "__id__": 565 }, "_scrollView": { - "__id__": 558 + "__id__": 566 }, "_handle": { - "__id__": 547 + "__id__": 555 }, "_direction": 1, "_enableAutoHide": false, @@ -11372,11 +11540,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 542 + "__id__": 550 }, "_enabled": true, "__prefab": { - "__id__": 559 + "__id__": 567 }, "bounceDuration": 0.23, "brake": 0.75, @@ -11387,11 +11555,11 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 560 + "__id__": 568 }, "_horizontalScrollBar": null, "_verticalScrollBar": { - "__id__": 556 + "__id__": 564 }, "_id": "" }, @@ -11405,12 +11573,9 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 561 + "__id__": 569 }, "_children": [ - { - "__id__": 571 - }, { "__id__": 579 }, @@ -11425,22 +11590,25 @@ }, { "__id__": 611 + }, + { + "__id__": 619 } ], "_active": true, "_components": [ { - "__id__": 619 + "__id__": 627 }, { - "__id__": 621 + "__id__": 629 }, { - "__id__": 623 + "__id__": 631 } ], "_prefab": { - "__id__": 625 + "__id__": 633 }, "_lpos": { "__type__": "cc.Vec3", @@ -11477,30 +11645,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 542 + "__id__": 550 }, "_children": [ { - "__id__": 560 + "__id__": 568 } ], "_active": true, "_components": [ { - "__id__": 562 + "__id__": 570 }, { - "__id__": 564 + "__id__": 572 }, { - "__id__": 566 + "__id__": 574 }, { - "__id__": 568 + "__id__": 576 } ], "_prefab": { - "__id__": 570 + "__id__": 578 }, "_lpos": { "__type__": "cc.Vec3", @@ -11537,11 +11705,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 561 + "__id__": 569 }, "_enabled": true, "__prefab": { - "__id__": 563 + "__id__": 571 }, "_contentSize": { "__type__": "cc.Size", @@ -11565,11 +11733,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 561 + "__id__": 569 }, "_enabled": true, "__prefab": { - "__id__": 565 + "__id__": 573 }, "_type": 0, "_inverted": false, @@ -11587,11 +11755,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 561 + "__id__": 569 }, "_enabled": true, "__prefab": { - "__id__": 567 + "__id__": 575 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11633,11 +11801,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 561 + "__id__": 569 }, "_enabled": true, "__prefab": { - "__id__": 569 + "__id__": 577 }, "_alignFlags": 45, "_target": null, @@ -11680,119 +11848,7 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 560 - }, - "_prefab": { - "__id__": 572 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 571 - }, - "asset": { - "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", - "__expectedType__": "cc.Prefab" - }, - "fileId": "24rlgXRJ9AHLGpMW+aYyEx", - "instance": { - "__id__": 573 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "64yEjjz/RFNqtSeZVUbhB9", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 574 - }, - { - "__id__": 576 - }, - { - "__id__": 577 - }, - { - "__id__": 578 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 575 - }, - "propertyPath": [ - "_name" - ], - "value": "cardlite" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "24rlgXRJ9AHLGpMW+aYyEx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 575 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 75, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 575 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 575 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 560 + "__id__": 568 }, "_prefab": { "__id__": 580 @@ -11816,7 +11872,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "44Kzmdb2tDtanrlkr3dUVM", + "fileId": "64yEjjz/RFNqtSeZVUbhB9", "prefabRootNode": { "__id__": 1 }, @@ -11864,7 +11920,7 @@ ], "value": { "__type__": "cc.Vec3", - "x": 205, + "x": 75, "y": 0, "z": 0 } @@ -11904,7 +11960,7 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 560 + "__id__": 568 }, "_prefab": { "__id__": 588 @@ -11928,7 +11984,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "52NG3CI6VAIbDfiJ0mY2ot", + "fileId": "44Kzmdb2tDtanrlkr3dUVM", "prefabRootNode": { "__id__": 1 }, @@ -11958,7 +12014,7 @@ "propertyPath": [ "_name" ], - "value": "cardlite-001" + "value": "cardlite" }, { "__type__": "cc.TargetInfo", @@ -11976,7 +12032,7 @@ ], "value": { "__type__": "cc.Vec3", - "x": 335, + "x": 205, "y": 0, "z": 0 } @@ -12016,7 +12072,7 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 560 + "__id__": 568 }, "_prefab": { "__id__": 596 @@ -12040,7 +12096,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "bcy0GUJZJL5qFQV1QjBJ10", + "fileId": "52NG3CI6VAIbDfiJ0mY2ot", "prefabRootNode": { "__id__": 1 }, @@ -12070,7 +12126,7 @@ "propertyPath": [ "_name" ], - "value": "cardlite-002" + "value": "cardlite-001" }, { "__type__": "cc.TargetInfo", @@ -12088,7 +12144,7 @@ ], "value": { "__type__": "cc.Vec3", - "x": 465, + "x": 335, "y": 0, "z": 0 } @@ -12128,7 +12184,7 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 560 + "__id__": 568 }, "_prefab": { "__id__": 604 @@ -12152,7 +12208,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "c3CrwiNMJAbrf3PDzkAdTl", + "fileId": "bcy0GUJZJL5qFQV1QjBJ10", "prefabRootNode": { "__id__": 1 }, @@ -12182,7 +12238,7 @@ "propertyPath": [ "_name" ], - "value": "cardlite-003" + "value": "cardlite-002" }, { "__type__": "cc.TargetInfo", @@ -12200,7 +12256,7 @@ ], "value": { "__type__": "cc.Vec3", - "x": 595, + "x": 465, "y": 0, "z": 0 } @@ -12240,7 +12296,7 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 560 + "__id__": 568 }, "_prefab": { "__id__": 612 @@ -12264,7 +12320,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "f2DTEeYgpNWY+KgIS5X+ND", + "fileId": "c3CrwiNMJAbrf3PDzkAdTl", "prefabRootNode": { "__id__": 1 }, @@ -12294,7 +12350,7 @@ "propertyPath": [ "_name" ], - "value": "cardlite-004" + "value": "cardlite-003" }, { "__type__": "cc.TargetInfo", @@ -12312,7 +12368,7 @@ ], "value": { "__type__": "cc.Vec3", - "x": 725, + "x": 595, "y": 0, "z": 0 } @@ -12348,17 +12404,129 @@ "z": 0 } }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 568 + }, + "_prefab": { + "__id__": 620 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 619 + }, + "asset": { + "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 621 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "f2DTEeYgpNWY+KgIS5X+ND", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 622 + }, + { + "__id__": 624 + }, + { + "__id__": 625 + }, + { + "__id__": 626 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 623 + }, + "propertyPath": [ + "_name" + ], + "value": "cardlite-004" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24rlgXRJ9AHLGpMW+aYyEx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 623 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 725, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 623 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 623 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, { "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 560 + "__id__": 568 }, "_enabled": true, "__prefab": { - "__id__": 620 + "__id__": 628 }, "_contentSize": { "__type__": "cc.Size", @@ -12382,11 +12550,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 560 + "__id__": 568 }, "_enabled": true, "__prefab": { - "__id__": 622 + "__id__": 630 }, "_alignFlags": 13, "_target": null, @@ -12418,11 +12586,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 560 + "__id__": 568 }, "_enabled": true, "__prefab": { - "__id__": 624 + "__id__": 632 }, "_resizeMode": 0, "_layoutType": 1, @@ -12482,11 +12650,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 542 + "__id__": 550 }, "_enabled": true, "__prefab": { - "__id__": 628 + "__id__": 636 }, "_contentSize": { "__type__": "cc.Size", @@ -12510,11 +12678,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 542 + "__id__": 550 }, "_enabled": false, "__prefab": { - "__id__": 630 + "__id__": 638 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12555,11 +12723,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 542 + "__id__": 550 }, "_enabled": true, "__prefab": { - "__id__": 632 + "__id__": 640 }, "_alignFlags": 45, "_target": null, @@ -12604,11 +12772,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 541 + "__id__": 549 }, "_enabled": true, "__prefab": { - "__id__": 635 + "__id__": 643 }, "_contentSize": { "__type__": "cc.Size", @@ -12632,11 +12800,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 541 + "__id__": 549 }, "_enabled": true, "__prefab": { - "__id__": 637 + "__id__": 645 }, "_alignFlags": 44, "_target": null, @@ -12685,7 +12853,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 640 + "__id__": 648 }, "_contentSize": { "__type__": "cc.Size", @@ -12713,7 +12881,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 642 + "__id__": 650 }, "_alignFlags": 45, "_target": null, @@ -12749,53 +12917,56 @@ }, "_enabled": true, "__prefab": { - "__id__": 644 + "__id__": 652 }, "hero_icon": { "__id__": 90 }, "ap_node": { - "__id__": 262 + "__id__": 270 }, "def_node": { - "__id__": 346 + "__id__": 354 }, "hp_node": { - "__id__": 304 + "__id__": 312 }, "cd_node": { - "__id__": 220 + "__id__": 228 }, "BG_node": { "__id__": 2 }, "info_node": { - "__id__": 381 + "__id__": 389 }, "name_node": { - "__id__": 114 + "__id__": 122 }, "cards_node": { - "__id__": 560 + "__id__": 568 }, "card_lite_prefab": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", "__expectedType__": "cc.Prefab" }, "lv_label": { - "__id__": 128 + "__id__": 136 }, "type_node": { - "__id__": 131 + "__id__": 139 }, "upgrade_btn": { - "__id__": 394 + "__id__": 402 }, "fragment_node": { - "__id__": 439 + "__id__": 447 }, "chip_node": { - "__id__": 399 + "__id__": 407 + }, + "upgrade_anim_node": { + "__id__": 96 }, "_id": "" }, @@ -12813,7 +12984,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 646 + "__id__": 654 }, "_id": "" }, @@ -12833,10 +13004,13 @@ "instance": null, "targetOverrides": [ { - "__id__": 648 + "__id__": 656 } ], "nestedPrefabInstanceRoots": [ + { + "__id__": 619 + }, { "__id__": 611 }, @@ -12853,19 +13027,16 @@ "__id__": 579 }, { - "__id__": 571 + "__id__": 402 }, { - "__id__": 394 + "__id__": 467 }, { - "__id__": 459 + "__id__": 407 }, { - "__id__": 399 - }, - { - "__id__": 97 + "__id__": 105 }, { "__id__": 67 @@ -12887,17 +13058,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 643 + "__id__": 651 }, "sourceInfo": null, "propertyPath": [ "fragment_node" ], "target": { - "__id__": 394 + "__id__": 402 }, "targetInfo": { - "__id__": 649 + "__id__": 657 } }, { diff --git a/assets/script/game/map/HerosListComp.ts b/assets/script/game/map/HerosListComp.ts index 1b8717ee..1cfa9995 100644 --- a/assets/script/game/map/HerosListComp.ts +++ b/assets/script/game/map/HerosListComp.ts @@ -87,6 +87,10 @@ export class HerosListComp extends CCComp { @property(Node) chip_node = null! + /** 升级特效动画节点（内含升级效果 Animation，点击升级时从头播放） */ + @property(Node) + upgrade_anim_node = null! + // ======================== 运行时状态 ======================== huuid: number = 0 @@ -97,6 +101,8 @@ export class HerosListComp extends CCComp { start() { this.bindUpgradeBtn() this.initCardList() + // 升级特效动画初始隐藏，点击升级时才显示播放 + if (this.upgrade_anim_node) this.upgrade_anim_node.active = false if (HeroList.length > 0) { this.onCardSelect(HeroList[0]) } @@ -171,6 +177,7 @@ export class HerosListComp extends CCComp { const success = smc.upgradeHero(uuid) if (success) { mLogger.log(this.debugMode, "HerosListComp", `英雄 ${uuid} 升级成功`) + this.playUpgradeAnim() this.updateHeroDetail(uuid) } else { const growth = smc.getHeroGrowth(uuid) @@ -204,6 +211,44 @@ export class HerosListComp extends CCComp { .start() } + /** + * 播放升级特效动画 + * 每次升级成功均从头播放；动画未播完时再次升级，立即重新开始 + */ + private playUpgradeAnim() { + if (!this.upgrade_anim_node) { + mLogger.log(this.debugMode, "HerosListComp", "playUpgradeAnim: upgrade_anim_node 未绑定") + return + } + const anim = this.upgrade_anim_node.getComponent(Animation) + const clip = anim?.clips?.[0] + if (!anim || !clip) { + mLogger.log(this.debugMode, "HerosListComp", "playUpgradeAnim: 缺少 Animation 组件或动画剪辑") + return + } + + this.upgrade_anim_node.active = true + // 停止当前播放（如有），保证从头开始 + anim.stop() + + const animState = anim.getState(clip.name) + if (animState) { + // 防止重复注册，播放结束后自动隐藏特效节点 + animState.off('finished', this.onUpgradeAnimFinished, this) + animState.once('finished', this.onUpgradeAnimFinished, this) + } + anim.play(clip.name) + } + + /** + * 升级特效动画播放结束回调：隐藏特效节点 + */ + private onUpgradeAnimFinished() { + if (this.upgrade_anim_node && this.upgrade_anim_node.isValid) { + this.upgrade_anim_node.active = false + } + } + /** * 在升级按钮附近弹出 smalltip 气泡提示 * @param text 提示文案