diff --git a/assets/resources/common/prefab/window.prefab b/assets/resources/common/prefab/window.prefab index 30804fd9..2a95b92c 100644 --- a/assets/resources/common/prefab/window.prefab +++ b/assets/resources/common/prefab/window.prefab @@ -1781,7 +1781,7 @@ "propertyPath": [ "_active" ], - "value": true + "value": false }, { "__type__": "cc.TargetInfo", @@ -1800,7 +1800,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": -30, + "y": 0, "z": 0 } }, @@ -1821,7 +1821,7 @@ "value": { "__type__": "cc.Size", "width": 150, - "height": 95.5 + "height": 35.5 } }, { @@ -1838,7 +1838,7 @@ "propertyPath": [ "_active" ], - "value": true + "value": false }, { "__type__": "cc.TargetInfo", @@ -1869,7 +1869,7 @@ "propertyPath": [ "_top" ], - "value": -8.2625 + "value": 6.737500000000001 }, { "__type__": "cc.TargetInfo", @@ -1885,7 +1885,7 @@ "propertyPath": [ "_bottom" ], - "value": -7.237500000000001 + "value": 7.762499999999999 }, { "__type__": "CCPropertyOverrideInfo", @@ -1933,7 +1933,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 2.75, + "y": 17.75, "z": 0 } }, @@ -3659,7 +3659,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -30, + "y": 0, "z": 0 }, "_lrot": { @@ -3766,7 +3766,7 @@ "__id__": 202 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 208 @@ -4202,7 +4202,7 @@ "__id__": 220 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 226 @@ -4217,7 +4217,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 2.75, + "y": 17.75, "z": 0 }, "_lrot": { @@ -4635,7 +4635,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 150, - "height": 95.5 + "height": 35.5 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4664,8 +4664,8 @@ "_target": null, "_left": 0, "_right": 0, - "_top": -8.2625, - "_bottom": -7.237500000000001, + "_top": 21.7375, + "_bottom": 22.7625, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, diff --git a/assets/resources/gui/element/cardlite.prefab b/assets/resources/gui/element/cardlite.prefab index 0e4fd526..8d40e4d8 100644 --- a/assets/resources/gui/element/cardlite.prefab +++ b/assets/resources/gui/element/cardlite.prefab @@ -1083,7 +1083,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 103.54399999999998, + "y": 96.661, "z": 0 }, "_lrot": { @@ -1314,8 +1314,8 @@ "_target": null, "_left": 15, "_right": 15, - "_top": 11.456000000000017, - "_bottom": 58.54399999999999, + "_top": 18.339, + "_bottom": 51.66100000000001, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, diff --git a/assets/resources/gui/element/heros.prefab b/assets/resources/gui/element/heros.prefab index a1bff094..77868e64 100644 --- a/assets/resources/gui/element/heros.prefab +++ b/assets/resources/gui/element/heros.prefab @@ -22,29 +22,32 @@ "__id__": 2 }, { - "__id__": 52 + "__id__": 58 }, { - "__id__": 66 + "__id__": 72 + }, + { + "__id__": 346 } ], "_active": true, "_components": [ { - "__id__": 164 + "__id__": 383 }, { - "__id__": 166 + "__id__": 385 }, { - "__id__": 168 + "__id__": 387 }, { - "__id__": 170 + "__id__": 389 } ], "_prefab": { - "__id__": 172 + "__id__": 391 }, "_lpos": { "__type__": "cc.Vec3", @@ -199,6 +202,15 @@ }, { "__id__": 50 + }, + { + "__id__": 52 + }, + { + "__id__": 54 + }, + { + "__id__": 56 } ], "removedComponents": [] @@ -673,7 +685,7 @@ "propertyPath": [ "_active" ], - "value": false + "value": true }, { "__type__": "cc.TargetInfo", @@ -682,6 +694,75 @@ "7228fRtBlHhKwOIL9H6qr/" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 53 + }, + "propertyPath": [ + "_color" + ], + "value": { + "__type__": "cc.Color", + "r": 0, + "g": 153, + "b": 255, + "a": 255 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "60e94Pw55PX7q2WrNHLWO7", + "253QE7witBsbB6iYj7GHjO" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 55 + }, + "propertyPath": [ + "_color" + ], + "value": { + "__type__": "cc.Color", + "r": 18, + "g": 122, + "b": 255, + "a": 255 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "60e94Pw55PX7q2WrNHLWO7", + "9biHW3cOVCkb0JnJZjTlFV" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 57 + }, + "propertyPath": [ + "_color" + ], + "value": { + "__type__": "cc.Color", + "r": 131, + "g": 190, + "b": 255, + "a": 85 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "60e94Pw55PX7q2WrNHLWO7", + "015DHKMtpIrLoszvWeVn5S" + ] + }, { "__type__": "cc.Node", "_name": "barbg", @@ -692,20 +773,20 @@ }, "_children": [ { - "__id__": 53 + "__id__": 59 } ], "_active": false, "_components": [ { - "__id__": 61 + "__id__": 67 }, { - "__id__": 63 + "__id__": 69 } ], "_prefab": { - "__id__": 65 + "__id__": 71 }, "_lpos": { "__type__": "cc.Vec3", @@ -742,23 +823,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 52 + "__id__": 58 }, "_children": [], "_active": true, "_components": [ { - "__id__": 54 + "__id__": 60 }, { - "__id__": 56 + "__id__": 62 }, { - "__id__": 58 + "__id__": 64 } ], "_prefab": { - "__id__": 60 + "__id__": 66 }, "_lpos": { "__type__": "cc.Vec3", @@ -795,11 +876,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 53 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 61 }, "_contentSize": { "__type__": "cc.Size", @@ -823,11 +904,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 53 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 63 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -871,11 +952,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 53 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 65 }, "_alignFlags": 45, "_target": null, @@ -920,11 +1001,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 52 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 68 }, "_contentSize": { "__type__": "cc.Size", @@ -948,11 +1029,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 52 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 70 }, "_alignFlags": 44, "_target": null, @@ -1001,25 +1082,25 @@ }, "_children": [ { - "__id__": 67 + "__id__": 73 } ], "_active": true, "_components": [ { - "__id__": 159 + "__id__": 341 }, { - "__id__": 161 + "__id__": 343 } ], "_prefab": { - "__id__": 163 + "__id__": 345 }, "_lpos": { "__type__": "cc.Vec3", "x": -360, - "y": -75, + "y": -60, "z": 0 }, "_lrot": { @@ -1051,33 +1132,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 66 + "__id__": 72 }, "_children": [ { - "__id__": 68 + "__id__": 74 }, { - "__id__": 86 + "__id__": 92 } ], "_active": true, "_components": [ { - "__id__": 152 + "__id__": 334 }, { - "__id__": 154 + "__id__": 336 }, { - "__id__": 83 + "__id__": 89 }, { - "__id__": 156 + "__id__": 338 } ], "_prefab": { - "__id__": 158 + "__id__": 340 }, "_lpos": { "__type__": "cc.Vec3", @@ -1114,30 +1195,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 67 + "__id__": 73 }, "_children": [ { - "__id__": 69 + "__id__": 75 } ], "_active": false, "_components": [ - { - "__id__": 75 - }, - { - "__id__": 77 - }, - { - "__id__": 79 - }, { "__id__": 81 + }, + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 } ], "_prefab": { - "__id__": 151 + "__id__": 333 }, "_lpos": { "__type__": "cc.Vec3", @@ -1174,20 +1255,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 68 + "__id__": 74 }, "_children": [], "_active": true, "_components": [ { - "__id__": 70 + "__id__": 76 }, { - "__id__": 72 + "__id__": 78 } ], "_prefab": { - "__id__": 74 + "__id__": 80 }, "_lpos": { "__type__": "cc.Vec3", @@ -1224,11 +1305,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 71 + "__id__": 77 }, "_contentSize": { "__type__": "cc.Size", @@ -1252,11 +1333,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 73 + "__id__": 79 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1310,11 +1391,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 68 + "__id__": 74 }, "_enabled": true, "__prefab": { - "__id__": 76 + "__id__": 82 }, "_contentSize": { "__type__": "cc.Size", @@ -1338,11 +1419,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 68 + "__id__": 74 }, "_enabled": true, "__prefab": { - "__id__": 78 + "__id__": 84 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1383,11 +1464,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 68 + "__id__": 74 }, "_enabled": true, "__prefab": { - "__id__": 80 + "__id__": 86 }, "_alignFlags": 37, "_target": null, @@ -1419,17 +1500,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 68 + "__id__": 74 }, "_enabled": true, "__prefab": { - "__id__": 82 + "__id__": 88 }, "_scrollView": { - "__id__": 83 + "__id__": 89 }, "_handle": { - "__id__": 72 + "__id__": 78 }, "_direction": 1, "_enableAutoHide": false, @@ -1446,26 +1527,26 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 67 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 84 + "__id__": 90 }, "bounceDuration": 0.23, "brake": 0.75, "elastic": true, "inertia": true, - "horizontal": true, - "vertical": false, + "horizontal": false, + "vertical": true, "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 85 + "__id__": 91 }, "_horizontalScrollBar": null, "_verticalScrollBar": { - "__id__": 81 + "__id__": 87 }, "_id": "" }, @@ -1479,47 +1560,113 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 86 + "__id__": 92 }, "_children": [ { - "__id__": 96 + "__id__": 102 }, { - "__id__": 104 + "__id__": 110 }, { - "__id__": 112 + "__id__": 118 }, { - "__id__": 120 + "__id__": 126 }, { - "__id__": 128 + "__id__": 134 }, { - "__id__": 136 + "__id__": 142 + }, + { + "__id__": 150 + }, + { + "__id__": 158 + }, + { + "__id__": 166 + }, + { + "__id__": 174 + }, + { + "__id__": 182 + }, + { + "__id__": 190 + }, + { + "__id__": 198 + }, + { + "__id__": 206 + }, + { + "__id__": 214 + }, + { + "__id__": 222 + }, + { + "__id__": 230 + }, + { + "__id__": 238 + }, + { + "__id__": 246 + }, + { + "__id__": 254 + }, + { + "__id__": 262 + }, + { + "__id__": 270 + }, + { + "__id__": 278 + }, + { + "__id__": 286 + }, + { + "__id__": 294 + }, + { + "__id__": 302 + }, + { + "__id__": 310 + }, + { + "__id__": 318 } ], "_active": true, "_components": [ { - "__id__": 144 + "__id__": 326 }, { - "__id__": 146 + "__id__": 328 }, { - "__id__": 148 + "__id__": 330 } ], "_prefab": { - "__id__": 150 + "__id__": 332 }, "_lpos": { "__type__": "cc.Vec3", "x": -360, - "y": -435, + "y": -420, "z": 0 }, "_lrot": { @@ -1551,30 +1698,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 67 + "__id__": 73 }, "_children": [ { - "__id__": 85 + "__id__": 91 } ], "_active": true, "_components": [ - { - "__id__": 87 - }, - { - "__id__": 89 - }, - { - "__id__": 91 - }, { "__id__": 93 + }, + { + "__id__": 95 + }, + { + "__id__": 97 + }, + { + "__id__": 99 } ], "_prefab": { - "__id__": 95 + "__id__": 101 }, "_lpos": { "__type__": "cc.Vec3", @@ -1611,16 +1758,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 86 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 88 + "__id__": 94 }, "_contentSize": { "__type__": "cc.Size", "width": 720, - "height": 1130 + "height": 1160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1639,11 +1786,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 86 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 96 }, "_type": 0, "_inverted": false, @@ -1661,11 +1808,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 86 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 98 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1707,11 +1854,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 86 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 100 }, "_alignFlags": 45, "_target": null, @@ -1754,17 +1901,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 85 + "__id__": 91 }, "_prefab": { - "__id__": 97 + "__id__": 103 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 96 + "__id__": 102 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -1772,13 +1919,13 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 98 + "__id__": 104 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "64yEjjz/RFNqtSeZVUbhB9", + "fileId": "c3vQtZKtdFIaq0Pygb8ppf", "prefabRootNode": { "__id__": 1 }, @@ -1786,16 +1933,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 99 + "__id__": 105 }, { - "__id__": 101 + "__id__": 107 }, { - "__id__": 102 + "__id__": 108 }, { - "__id__": 103 + "__id__": 109 } ], "removedComponents": [] @@ -1803,7 +1950,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 100 + "__id__": 106 }, "propertyPath": [ "_name" @@ -1819,7 +1966,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 100 + "__id__": 106 }, "propertyPath": [ "_lpos" @@ -1827,14 +1974,14 @@ "value": { "__type__": "cc.Vec3", "x": 105, - "y": 820, + "y": 810, "z": 0 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 100 + "__id__": 106 }, "propertyPath": [ "_lrot" @@ -1850,7 +1997,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 100 + "__id__": 106 }, "propertyPath": [ "_euler" @@ -1866,17 +2013,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 85 + "__id__": 91 }, "_prefab": { - "__id__": 105 + "__id__": 111 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 104 + "__id__": 110 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -1884,13 +2031,13 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 106 + "__id__": 112 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "44Kzmdb2tDtanrlkr3dUVM", + "fileId": "73ZtVzvvVAbpZZTkDJTV7a", "prefabRootNode": { "__id__": 1 }, @@ -1898,16 +2045,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 107 + "__id__": 113 }, { - "__id__": 109 + "__id__": 115 }, { - "__id__": 110 + "__id__": 116 }, { - "__id__": 111 + "__id__": 117 } ], "removedComponents": [] @@ -1915,7 +2062,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 108 + "__id__": 114 }, "propertyPath": [ "_name" @@ -1931,7 +2078,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 108 + "__id__": 114 }, "propertyPath": [ "_lpos" @@ -1939,14 +2086,14 @@ "value": { "__type__": "cc.Vec3", "x": 275, - "y": 820, + "y": 810, "z": 0 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 108 + "__id__": 114 }, "propertyPath": [ "_lrot" @@ -1962,7 +2109,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 108 + "__id__": 114 }, "propertyPath": [ "_euler" @@ -1978,17 +2125,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 85 + "__id__": 91 }, "_prefab": { - "__id__": 113 + "__id__": 119 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 112 + "__id__": 118 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -1996,13 +2143,13 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 114 + "__id__": 120 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "52NG3CI6VAIbDfiJ0mY2ot", + "fileId": "a2QmiXJ0FIJKjK5NUId4vx", "prefabRootNode": { "__id__": 1 }, @@ -2010,16 +2157,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 115 + "__id__": 121 }, { - "__id__": 117 + "__id__": 123 }, { - "__id__": 118 + "__id__": 124 }, { - "__id__": 119 + "__id__": 125 } ], "removedComponents": [] @@ -2027,7 +2174,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 116 + "__id__": 122 }, "propertyPath": [ "_name" @@ -2043,7 +2190,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 116 + "__id__": 122 }, "propertyPath": [ "_lpos" @@ -2051,14 +2198,14 @@ "value": { "__type__": "cc.Vec3", "x": 445, - "y": 820, + "y": 810, "z": 0 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 116 + "__id__": 122 }, "propertyPath": [ "_lrot" @@ -2074,7 +2221,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 116 + "__id__": 122 }, "propertyPath": [ "_euler" @@ -2090,17 +2237,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 85 + "__id__": 91 }, "_prefab": { - "__id__": 121 + "__id__": 127 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 120 + "__id__": 126 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -2108,13 +2255,13 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 122 + "__id__": 128 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "bcy0GUJZJL5qFQV1QjBJ10", + "fileId": "93xYzgdItAJpt8cxMF0XXz", "prefabRootNode": { "__id__": 1 }, @@ -2122,16 +2269,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 123 + "__id__": 129 }, { - "__id__": 125 + "__id__": 131 }, { - "__id__": 126 + "__id__": 132 }, { - "__id__": 127 + "__id__": 133 } ], "removedComponents": [] @@ -2139,7 +2286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 124 + "__id__": 130 }, "propertyPath": [ "_name" @@ -2155,7 +2302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 124 + "__id__": 130 }, "propertyPath": [ "_lpos" @@ -2163,14 +2310,14 @@ "value": { "__type__": "cc.Vec3", "x": 615, - "y": 820, + "y": 810, "z": 0 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 124 + "__id__": 130 }, "propertyPath": [ "_lrot" @@ -2186,7 +2333,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 124 + "__id__": 130 }, "propertyPath": [ "_euler" @@ -2202,17 +2349,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 85 + "__id__": 91 }, "_prefab": { - "__id__": 129 + "__id__": 135 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 128 + "__id__": 134 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -2220,13 +2367,13 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 130 + "__id__": 136 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "c3CrwiNMJAbrf3PDzkAdTl", + "fileId": "63kdIcFsBPn57AnAODMEzb", "prefabRootNode": { "__id__": 1 }, @@ -2234,16 +2381,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 131 + "__id__": 137 }, { - "__id__": 133 + "__id__": 139 }, { - "__id__": 134 + "__id__": 140 }, { - "__id__": 135 + "__id__": 141 } ], "removedComponents": [] @@ -2251,7 +2398,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 132 + "__id__": 138 }, "propertyPath": [ "_name" @@ -2267,7 +2414,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 132 + "__id__": 138 }, "propertyPath": [ "_lpos" @@ -2275,14 +2422,14 @@ "value": { "__type__": "cc.Vec3", "x": 105, - "y": 640, + "y": 630, "z": 0 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 132 + "__id__": 138 }, "propertyPath": [ "_lrot" @@ -2298,7 +2445,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 132 + "__id__": 138 }, "propertyPath": [ "_euler" @@ -2314,17 +2461,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 85 + "__id__": 91 }, "_prefab": { - "__id__": 137 + "__id__": 143 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 136 + "__id__": 142 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -2332,13 +2479,13 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 138 + "__id__": 144 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "f2DTEeYgpNWY+KgIS5X+ND", + "fileId": "a7p6HVtolCg7GCXEF+9wJR", "prefabRootNode": { "__id__": 1 }, @@ -2346,16 +2493,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 139 + "__id__": 145 }, { - "__id__": 141 + "__id__": 147 }, { - "__id__": 142 + "__id__": 148 }, { - "__id__": 143 + "__id__": 149 } ], "removedComponents": [] @@ -2363,7 +2510,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 140 + "__id__": 146 }, "propertyPath": [ "_name" @@ -2379,7 +2526,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 140 + "__id__": 146 }, "propertyPath": [ "_lpos" @@ -2387,14 +2534,14 @@ "value": { "__type__": "cc.Vec3", "x": 275, - "y": 640, + "y": 630, "z": 0 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 140 + "__id__": 146 }, "propertyPath": [ "_lrot" @@ -2410,7 +2557,2471 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 140 + "__id__": 146 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 91 + }, + "_prefab": { + "__id__": 151 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 150 + }, + "asset": { + "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 152 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "1bwmpxRzlHXq5rM29ADZDt", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 153 + }, + { + "__id__": 155 + }, + { + "__id__": 156 + }, + { + "__id__": 157 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 154 + }, + "propertyPath": [ + "_name" + ], + "value": "cardlite-005" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24rlgXRJ9AHLGpMW+aYyEx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 154 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 445, + "y": 630, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 154 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 154 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 91 + }, + "_prefab": { + "__id__": 159 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 158 + }, + "asset": { + "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 160 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "96SaiMuKNHt69LjyOUSC4Q", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 161 + }, + { + "__id__": 163 + }, + { + "__id__": 164 + }, + { + "__id__": 165 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 162 + }, + "propertyPath": [ + "_name" + ], + "value": "cardlite-006" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24rlgXRJ9AHLGpMW+aYyEx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 162 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 615, + "y": 630, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 162 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 162 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 91 + }, + "_prefab": { + "__id__": 167 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 166 + }, + "asset": { + "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 168 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "f5gy289b5OVbLMMBblxVKu", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 169 + }, + { + "__id__": 171 + }, + { + "__id__": 172 + }, + { + "__id__": 173 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 170 + }, + "propertyPath": [ + "_name" + ], + "value": "cardlite-007" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24rlgXRJ9AHLGpMW+aYyEx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 170 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 105, + "y": 450, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 170 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 170 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 91 + }, + "_prefab": { + "__id__": 175 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 174 + }, + "asset": { + "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 176 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "e5oIJ0XlpLmLmD3hrlq5SW", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 177 + }, + { + "__id__": 179 + }, + { + "__id__": 180 + }, + { + "__id__": 181 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 178 + }, + "propertyPath": [ + "_name" + ], + "value": "cardlite-008" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24rlgXRJ9AHLGpMW+aYyEx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 178 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 275, + "y": 450, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 178 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 178 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 91 + }, + "_prefab": { + "__id__": 183 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 182 + }, + "asset": { + "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 184 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "8b0L6eND5I9prtU9jkwXME", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 185 + }, + { + "__id__": 187 + }, + { + "__id__": 188 + }, + { + "__id__": 189 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 186 + }, + "propertyPath": [ + "_name" + ], + "value": "cardlite-009" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24rlgXRJ9AHLGpMW+aYyEx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 186 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 445, + "y": 450, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 186 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 186 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 91 + }, + "_prefab": { + "__id__": 191 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 190 + }, + "asset": { + "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 192 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "440u17cXZBx5TpSCS8I5kz", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 193 + }, + { + "__id__": 195 + }, + { + "__id__": 196 + }, + { + "__id__": 197 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 194 + }, + "propertyPath": [ + "_name" + ], + "value": "cardlite-010" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24rlgXRJ9AHLGpMW+aYyEx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 194 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 615, + "y": 450, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 194 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 194 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 91 + }, + "_prefab": { + "__id__": 199 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 198 + }, + "asset": { + "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 200 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "99/nG6Y8NDmY128FpcSW8H", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 201 + }, + { + "__id__": 203 + }, + { + "__id__": 204 + }, + { + "__id__": 205 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 202 + }, + "propertyPath": [ + "_name" + ], + "value": "cardlite-011" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24rlgXRJ9AHLGpMW+aYyEx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 202 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 105, + "y": 270, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 202 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 202 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 91 + }, + "_prefab": { + "__id__": 207 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 206 + }, + "asset": { + "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 208 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "ccd+QqSCxGvqk3/cCrSxIA", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 209 + }, + { + "__id__": 211 + }, + { + "__id__": 212 + }, + { + "__id__": 213 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 210 + }, + "propertyPath": [ + "_name" + ], + "value": "cardlite-012" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24rlgXRJ9AHLGpMW+aYyEx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 210 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 275, + "y": 270, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 210 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 210 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 91 + }, + "_prefab": { + "__id__": 215 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 214 + }, + "asset": { + "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 216 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "b5Mjo/gUpL+J8xLuCTjWPj", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 217 + }, + { + "__id__": 219 + }, + { + "__id__": 220 + }, + { + "__id__": 221 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 218 + }, + "propertyPath": [ + "_name" + ], + "value": "cardlite-013" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24rlgXRJ9AHLGpMW+aYyEx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 218 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 445, + "y": 270, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 218 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 218 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 91 + }, + "_prefab": { + "__id__": 223 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 222 + }, + "asset": { + "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 224 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "e9m0WVFdNEzZCUpV/PBI0o", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 225 + }, + { + "__id__": 227 + }, + { + "__id__": 228 + }, + { + "__id__": 229 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 226 + }, + "propertyPath": [ + "_name" + ], + "value": "cardlite-014" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24rlgXRJ9AHLGpMW+aYyEx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 226 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 615, + "y": 270, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 226 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 226 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 91 + }, + "_prefab": { + "__id__": 231 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 230 + }, + "asset": { + "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 232 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "53OnkYdnhAsKBu4F00u4Tm", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 233 + }, + { + "__id__": 235 + }, + { + "__id__": 236 + }, + { + "__id__": 237 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 234 + }, + "propertyPath": [ + "_name" + ], + "value": "cardlite-015" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24rlgXRJ9AHLGpMW+aYyEx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 234 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 105, + "y": 90, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 234 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 234 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 91 + }, + "_prefab": { + "__id__": 239 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 238 + }, + "asset": { + "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 240 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "00RPGMpflLGbh5S/Y27ZTf", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 241 + }, + { + "__id__": 243 + }, + { + "__id__": 244 + }, + { + "__id__": 245 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 242 + }, + "propertyPath": [ + "_name" + ], + "value": "cardlite-016" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24rlgXRJ9AHLGpMW+aYyEx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 242 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 275, + "y": 90, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 242 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 242 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 91 + }, + "_prefab": { + "__id__": 247 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 246 + }, + "asset": { + "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 248 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "e7sQVwE/1EkbNJIMdsfjAu", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 249 + }, + { + "__id__": 251 + }, + { + "__id__": 252 + }, + { + "__id__": 253 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 250 + }, + "propertyPath": [ + "_name" + ], + "value": "cardlite-017" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24rlgXRJ9AHLGpMW+aYyEx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 250 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 445, + "y": 90, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 250 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 250 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 91 + }, + "_prefab": { + "__id__": 255 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 254 + }, + "asset": { + "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 256 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "db1xWCXHVFb4zDO9U/JiP6", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 257 + }, + { + "__id__": 259 + }, + { + "__id__": 260 + }, + { + "__id__": 261 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 258 + }, + "propertyPath": [ + "_name" + ], + "value": "cardlite-018" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24rlgXRJ9AHLGpMW+aYyEx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 258 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 615, + "y": 90, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 258 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 258 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 91 + }, + "_prefab": { + "__id__": 263 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 262 + }, + "asset": { + "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 264 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "61jeHWgDlGo7sv3r1+AqVr", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 265 + }, + { + "__id__": 267 + }, + { + "__id__": 268 + }, + { + "__id__": 269 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 266 + }, + "propertyPath": [ + "_name" + ], + "value": "cardlite-019" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24rlgXRJ9AHLGpMW+aYyEx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 266 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 105, + "y": -90, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 266 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 266 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 91 + }, + "_prefab": { + "__id__": 271 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 270 + }, + "asset": { + "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 272 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "1aeMaU341LHbJ4Gf0eMlKE", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 273 + }, + { + "__id__": 275 + }, + { + "__id__": 276 + }, + { + "__id__": 277 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 274 + }, + "propertyPath": [ + "_name" + ], + "value": "cardlite-020" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24rlgXRJ9AHLGpMW+aYyEx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 274 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 275, + "y": -90, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 274 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 274 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 91 + }, + "_prefab": { + "__id__": 279 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 278 + }, + "asset": { + "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 280 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "cc7LHWTsBADILI8ZAk88pZ", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 281 + }, + { + "__id__": 283 + }, + { + "__id__": 284 + }, + { + "__id__": 285 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 282 + }, + "propertyPath": [ + "_name" + ], + "value": "cardlite-021" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24rlgXRJ9AHLGpMW+aYyEx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 282 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 445, + "y": -90, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 282 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 282 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 91 + }, + "_prefab": { + "__id__": 287 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 286 + }, + "asset": { + "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 288 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "48at7g4EVGjrrE0hwsbttp", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 289 + }, + { + "__id__": 291 + }, + { + "__id__": 292 + }, + { + "__id__": 293 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 290 + }, + "propertyPath": [ + "_name" + ], + "value": "cardlite-022" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24rlgXRJ9AHLGpMW+aYyEx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 290 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 615, + "y": -90, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 290 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 290 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 91 + }, + "_prefab": { + "__id__": 295 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 294 + }, + "asset": { + "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 296 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "52UnMR1dxKk6uNja/9TPAA", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 297 + }, + { + "__id__": 299 + }, + { + "__id__": 300 + }, + { + "__id__": 301 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 298 + }, + "propertyPath": [ + "_name" + ], + "value": "cardlite-023" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24rlgXRJ9AHLGpMW+aYyEx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 298 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 105, + "y": -270, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 298 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 298 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 91 + }, + "_prefab": { + "__id__": 303 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 302 + }, + "asset": { + "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 304 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "5ap+MFYC5CjaAWFbE2iVEs", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 305 + }, + { + "__id__": 307 + }, + { + "__id__": 308 + }, + { + "__id__": 309 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 306 + }, + "propertyPath": [ + "_name" + ], + "value": "cardlite-024" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24rlgXRJ9AHLGpMW+aYyEx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 306 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 275, + "y": -270, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 306 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 306 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 91 + }, + "_prefab": { + "__id__": 311 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 310 + }, + "asset": { + "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 312 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "c0s904cCBKPLoG++HnUtGm", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 313 + }, + { + "__id__": 315 + }, + { + "__id__": 316 + }, + { + "__id__": 317 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 314 + }, + "propertyPath": [ + "_name" + ], + "value": "cardlite-025" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24rlgXRJ9AHLGpMW+aYyEx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 314 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 445, + "y": -270, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 314 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 314 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 91 + }, + "_prefab": { + "__id__": 319 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 318 + }, + "asset": { + "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 320 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "5dqJlAkJJJ27aMvgeeYmId", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 321 + }, + { + "__id__": 323 + }, + { + "__id__": 324 + }, + { + "__id__": 325 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 322 + }, + "propertyPath": [ + "_name" + ], + "value": "cardlite-026" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24rlgXRJ9AHLGpMW+aYyEx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 322 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 615, + "y": -270, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 322 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 322 }, "propertyPath": [ "_euler" @@ -2428,11 +5039,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 85 + "__id__": 91 }, "_enabled": true, "__prefab": { - "__id__": 145 + "__id__": 327 }, "_contentSize": { "__type__": "cc.Size", @@ -2456,11 +5067,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 85 + "__id__": 91 }, "_enabled": true, "__prefab": { - "__id__": 147 + "__id__": 329 }, "_alignFlags": 41, "_target": null, @@ -2492,11 +5103,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 85 + "__id__": 91 }, "_enabled": true, "__prefab": { - "__id__": 149 + "__id__": 331 }, "_resizeMode": 0, "_layoutType": 3, @@ -2507,15 +5118,15 @@ }, "_startAxis": 0, "_paddingLeft": 30, - "_paddingRight": 0, - "_paddingTop": 20, - "_paddingBottom": 0, + "_paddingRight": 30, + "_paddingTop": 30, + "_paddingBottom": 20, "_spacingX": 20, "_spacingY": 20, "_verticalDirection": 1, "_horizontalDirection": 0, - "_constraint": 0, - "_constraintNum": 2, + "_constraint": 2, + "_constraintNum": 4, "_affectedByScale": true, "_isAlign": true, "_id": "" @@ -2556,16 +5167,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 67 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 153 + "__id__": 335 }, "_contentSize": { "__type__": "cc.Size", "width": 720, - "height": 1130 + "height": 1160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2584,11 +5195,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 67 + "__id__": 73 }, "_enabled": false, "__prefab": { - "__id__": 155 + "__id__": 337 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2629,11 +5240,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 67 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 157 + "__id__": 339 }, "_alignFlags": 45, "_target": null, @@ -2678,16 +5289,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 72 }, "_enabled": true, "__prefab": { - "__id__": 160 + "__id__": 342 }, "_contentSize": { "__type__": "cc.Size", "width": 720, - "height": 1130 + "height": 1160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2706,17 +5317,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 72 }, "_enabled": true, "__prefab": { - "__id__": 162 + "__id__": 344 }, "_alignFlags": 45, "_target": null, "_left": 0, "_right": 0, - "_top": 150, + "_top": 120, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -2749,6 +5360,632 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "Node", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 347 + }, + { + "__id__": 372 + } + ], + "_active": true, + "_components": [ + { + "__id__": 378 + }, + { + "__id__": 380 + } + ], + "_prefab": { + "__id__": 382 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 574.843, + "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.Node", + "_objFlags": 0, + "_parent": { + "__id__": 346 + }, + "_prefab": { + "__id__": 348 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 347 + }, + "asset": { + "__uuid__": "c85dc4d5-6ebf-4cee-aa3e-6c027334e622", + "__expectedType__": "cc.Prefab" + }, + "fileId": "40LEKxke9Hs6tfg2pVspXT", + "instance": { + "__id__": 349 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "37OkXe9ghMG691beJTFl7x", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [ + { + "__id__": 350 + } + ], + "propertyOverrides": [ + { + "__id__": 354 + }, + { + "__id__": 356 + }, + { + "__id__": 357 + }, + { + "__id__": 358 + }, + { + "__id__": 359 + }, + { + "__id__": 361 + }, + { + "__id__": 363 + }, + { + "__id__": 365 + }, + { + "__id__": 367 + }, + { + "__id__": 368 + }, + { + "__id__": 370 + } + ], + "removedComponents": [] + }, + { + "__type__": "cc.MountedComponentsInfo", + "targetInfo": { + "__id__": 351 + }, + "components": [ + { + "__id__": 352 + } + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "40LEKxke9Hs6tfg2pVspXT" + ] + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": { + "mountedRoot": { + "__id__": 347 + } + }, + "node": { + "__id__": 347 + }, + "_enabled": true, + "__prefab": { + "__id__": 353 + }, + "_alignFlags": 41, + "_target": null, + "_left": -100, + "_right": -100, + "_top": -75, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 200, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7fq4yysJRCN7ouvoW+c4TW" + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 355 + }, + "propertyPath": [ + "_name" + ], + "value": "Lable" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "40LEKxke9Hs6tfg2pVspXT" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 355 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 355 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 355 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 360 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 418.18181818181813, + "height": 100 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "32q1bLzYBFr5SK8ZtIeSWI" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 362 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 418.18181818181813, + "height": 54 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "06bJQzIv9Dd4vvjRlqtfn3" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 364 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 418.18181818181813, + "height": 45 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "8d3sM/DlJKPpJHNKbTBwEP" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 366 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 410.18181818181813, + "height": 44 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "17CdGbg9BG87rd0n06WZvm" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 355 + }, + "propertyPath": [ + "_lscale" + ], + "value": { + "__type__": "cc.Vec3", + "x": 2.2, + "y": 2.5, + "z": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 369 + }, + "propertyPath": [ + "_color" + ], + "value": { + "__type__": "cc.Color", + "r": 167, + "g": 167, + "b": 167, + "a": 255 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "4ckA8btpNNTrqJr6S7VGRN" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 371 + }, + "propertyPath": [ + "_color" + ], + "value": { + "__type__": "cc.Color", + "r": 0, + "g": 218, + "b": 248, + "a": 255 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "b1UpBBMc9Obp5MBENsf/W/" + ] + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 346 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 373 + }, + { + "__id__": 375 + } + ], + "_prefab": { + "__id__": 377 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -275.661, + "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__": 372 + }, + "_enabled": true, + "__prefab": { + "__id__": 374 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 116.6278280709945, + "height": 69 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "906wmZ27NKGbaluV8ue6PJ" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 372 + }, + "_enabled": true, + "__prefab": { + "__id__": 376 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "英雄", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 50, + "_fontSize": 50, + "_fontFamily": "Arial", + "_lineHeight": 50, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": true, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 3, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c1c9BIbURPCK/XA7pkhAJ9" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "aa2iDECkxJp6CKRXPecD9q", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 346 + }, + "_enabled": true, + "__prefab": { + "__id__": 379 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 720, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "14K3RyQ1ZNnqqDZr6AdS+S" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 346 + }, + "_enabled": true, + "__prefab": { + "__id__": 381 + }, + "_alignFlags": 41, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 15.157000000000039, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "57qlFqjT1K5626whSzbF5E" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "3by5P0tmhI8JjbOXe3M/hI", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -2759,7 +5996,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 165 + "__id__": 384 }, "_contentSize": { "__type__": "cc.Size", @@ -2787,7 +6024,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 167 + "__id__": 386 }, "_alignFlags": 45, "_target": null, @@ -2823,18 +6060,22 @@ }, "_enabled": true, "__prefab": { - "__id__": 169 + "__id__": 388 }, "cards_node": { - "__id__": 85 + "__id__": 91 }, "card_lite_prefab": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", "__expectedType__": "cc.Prefab" }, "card_w": 150, + "card_h": 200, "spacing_x": 20, + "spacing_y": 10, + "cols": 4, "margin_x": 20, + "margin_y": 50, "_id": "" }, { @@ -2851,7 +6092,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 171 + "__id__": 390 }, "_id": "" }, @@ -2871,30 +6112,99 @@ "instance": null, "targetOverrides": [ { - "__id__": 173 + "__id__": 392 }, { - "__id__": 175 + "__id__": 394 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 136 + "__id__": 347 }, { - "__id__": 128 + "__id__": 318 }, { - "__id__": 120 + "__id__": 310 }, { - "__id__": 112 + "__id__": 302 }, { - "__id__": 104 + "__id__": 294 }, { - "__id__": 96 + "__id__": 286 + }, + { + "__id__": 278 + }, + { + "__id__": 270 + }, + { + "__id__": 262 + }, + { + "__id__": 254 + }, + { + "__id__": 246 + }, + { + "__id__": 238 + }, + { + "__id__": 230 + }, + { + "__id__": 222 + }, + { + "__id__": 214 + }, + { + "__id__": 206 + }, + { + "__id__": 198 + }, + { + "__id__": 190 + }, + { + "__id__": 182 + }, + { + "__id__": 174 + }, + { + "__id__": 166 + }, + { + "__id__": 158 + }, + { + "__id__": 150 + }, + { + "__id__": 142 + }, + { + "__id__": 134 + }, + { + "__id__": 126 + }, + { + "__id__": 118 + }, + { + "__id__": 110 + }, + { + "__id__": 102 }, { "__id__": 2 @@ -2904,7 +6214,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 168 + "__id__": 387 }, "sourceInfo": null, "propertyPath": [ @@ -2912,7 +6222,7 @@ ], "target": null, "targetInfo": { - "__id__": 174 + "__id__": 393 } }, { @@ -2924,7 +6234,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 168 + "__id__": 387 }, "sourceInfo": null, "propertyPath": [ @@ -2932,7 +6242,7 @@ ], "target": null, "targetInfo": { - "__id__": 176 + "__id__": 395 } }, { diff --git a/assets/resources/gui/element/prefab_talent_item.prefab b/assets/resources/gui/element/prefab_talent_item.prefab index 191b7135..eeef39d7 100644 --- a/assets/resources/gui/element/prefab_talent_item.prefab +++ b/assets/resources/gui/element/prefab_talent_item.prefab @@ -37,23 +37,23 @@ "__id__": 64 }, { - "__id__": 80 + "__id__": 101 } ], "_active": true, "_components": [ { - "__id__": 100 + "__id__": 121 }, { - "__id__": 102 + "__id__": 123 }, { - "__id__": 104 + "__id__": 125 } ], "_prefab": { - "__id__": 106 + "__id__": 127 }, "_lpos": { "__type__": "cc.Vec3", @@ -1554,21 +1554,24 @@ }, { "__id__": 71 + }, + { + "__id__": 92 } ], - "_active": true, + "_active": false, "_components": [ { - "__id__": 77 + "__id__": 98 } ], "_prefab": { - "__id__": 79 + "__id__": 100 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -79.992, + "y": -80.146, "z": 0 }, "_lrot": { @@ -1730,6 +1733,278 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 64 + }, + "_prefab": { + "__id__": 72 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 71 + }, + "asset": { + "__uuid__": "c85dc4d5-6ebf-4cee-aa3e-6c027334e622", + "__expectedType__": "cc.Prefab" + }, + "fileId": "40LEKxke9Hs6tfg2pVspXT", + "instance": { + "__id__": 73 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "bcGGAQVadOp4NqjzQfitOC", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 74 + }, + { + "__id__": 76 + }, + { + "__id__": 77 + }, + { + "__id__": 78 + }, + { + "__id__": 79 + }, + { + "__id__": 80 + }, + { + "__id__": 82 + }, + { + "__id__": 84 + }, + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 75 + }, + "propertyPath": [ + "_name" + ], + "value": "Lable" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "40LEKxke9Hs6tfg2pVspXT" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 75 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 75 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 75 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 75 + }, + "propertyPath": [ + "_lscale" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0.7, + "y": 0.7, + "z": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 81 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 140, + "height": 100 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "32q1bLzYBFr5SK8ZtIeSWI" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 83 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 140, + "height": 54 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "06bJQzIv9Dd4vvjRlqtfn3" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 85 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 140, + "height": 45 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "8d3sM/DlJKPpJHNKbTBwEP" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 87 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 132, + "height": 44 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "17CdGbg9BG87rd0n06WZvm" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 89 + }, + "propertyPath": [ + "_color" + ], + "value": { + "__type__": "cc.Color", + "r": 231, + "g": 231, + "b": 69, + "a": 255 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "4ckA8btpNNTrqJr6S7VGRN" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 91 + }, + "propertyPath": [ + "_color" + ], + "value": { + "__type__": "cc.Color", + "r": 213, + "g": 186, + "b": 50, + "a": 255 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "b1UpBBMc9Obp5MBENsf/W/" + ] + }, { "__type__": "cc.Node", "_name": "Label", @@ -1742,14 +2017,14 @@ "_active": true, "_components": [ { - "__id__": 72 + "__id__": 93 }, { - "__id__": 74 + "__id__": 95 } ], "_prefab": { - "__id__": 76 + "__id__": 97 }, "_lpos": { "__type__": "cc.Vec3", @@ -1786,11 +2061,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 71 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 73 + "__id__": 94 }, "_contentSize": { "__type__": "cc.Size", @@ -1814,11 +2089,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 71 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 75 + "__id__": 96 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1899,7 +2174,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 78 + "__id__": 99 }, "_contentSize": { "__type__": "cc.Size", @@ -1940,23 +2215,23 @@ }, "_children": [ { - "__id__": 81 + "__id__": 102 }, { - "__id__": 89 + "__id__": 110 } ], - "_active": false, + "_active": true, "_components": [ { - "__id__": 95 + "__id__": 116 }, { - "__id__": 97 + "__id__": 118 } ], "_prefab": { - "__id__": 99 + "__id__": 120 }, "_lpos": { "__type__": "cc.Vec3", @@ -1993,23 +2268,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 80 + "__id__": 101 }, "_children": [], "_active": true, "_components": [ { - "__id__": 82 + "__id__": 103 }, { - "__id__": 84 + "__id__": 105 }, { - "__id__": 86 + "__id__": 107 } ], "_prefab": { - "__id__": 88 + "__id__": 109 }, "_lpos": { "__type__": "cc.Vec3", @@ -2046,11 +2321,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 102 }, "_enabled": true, "__prefab": { - "__id__": 83 + "__id__": 104 }, "_contentSize": { "__type__": "cc.Size", @@ -2074,21 +2349,21 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 102 }, "_enabled": true, "__prefab": { - "__id__": 85 + "__id__": 106 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 170, - "g": 170, - "b": 170, - "a": 109 + "r": 255, + "g": 255, + "b": 255, + "a": 192 }, "_spriteFrame": { "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@c7ff0", @@ -2105,7 +2380,7 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": false, + "_useGrayscale": true, "_atlas": null, "_id": "" }, @@ -2119,11 +2394,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 102 }, "_enabled": false, "__prefab": { - "__id__": 87 + "__id__": 108 }, "_alignFlags": 45, "_target": null, @@ -2168,20 +2443,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 80 + "__id__": 101 }, "_children": [], "_active": true, "_components": [ { - "__id__": 90 + "__id__": 111 }, { - "__id__": 92 + "__id__": 113 } ], "_prefab": { - "__id__": 94 + "__id__": 115 }, "_lpos": { "__type__": "cc.Vec3", @@ -2218,11 +2493,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 89 + "__id__": 110 }, "_enabled": true, "__prefab": { - "__id__": 91 + "__id__": 112 }, "_contentSize": { "__type__": "cc.Size", @@ -2246,11 +2521,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 89 + "__id__": 110 }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 114 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2307,11 +2582,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 80 + "__id__": 101 }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 117 }, "_contentSize": { "__type__": "cc.Size", @@ -2335,11 +2610,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 80 + "__id__": 101 }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 119 }, "_alignFlags": 45, "_target": null, @@ -2388,7 +2663,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 122 }, "_contentSize": { "__type__": "cc.Size", @@ -2416,7 +2691,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 103 + "__id__": 124 }, "_alignFlags": 40, "_target": null, @@ -2452,7 +2727,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 126 }, "lbl_name": { "__id__": 49 @@ -2473,7 +2748,7 @@ "__id__": 64 }, "node_lock": { - "__id__": 80 + "__id__": 101 }, "_id": "" }, @@ -2493,7 +2768,12 @@ "instance": null, "targetOverrides": [ { - "__id__": 107 + "__id__": 128 + } + ], + "nestedPrefabInstanceRoots": [ + { + "__id__": 71 } ] }, @@ -2506,7 +2786,7 @@ ], "target": null, "targetInfo": { - "__id__": 108 + "__id__": 129 } }, { diff --git a/assets/resources/gui/element/talents.prefab b/assets/resources/gui/element/talents.prefab index 0e33c244..05e58986 100644 --- a/assets/resources/gui/element/talents.prefab +++ b/assets/resources/gui/element/talents.prefab @@ -34,23 +34,23 @@ "__id__": 341 }, { - "__id__": 391 + "__id__": 453 } ], "_active": true, "_components": [ { - "__id__": 399 + "__id__": 461 }, { - "__id__": 401 + "__id__": 463 }, { - "__id__": 403 + "__id__": 465 } ], "_prefab": { - "__id__": 405 + "__id__": 467 }, "_lpos": { "__type__": "cc.Vec3", @@ -221,9 +221,9 @@ ], "value": { "__type__": "cc.Color", - "r": 39, - "g": 140, - "b": 241, + "r": 241, + "g": 160, + "b": 39, "a": 255 } }, @@ -243,9 +243,9 @@ ], "value": { "__type__": "cc.Color", - "r": 101, - "g": 178, - "b": 230, + "r": 230, + "g": 204, + "b": 101, "a": 255 } }, @@ -359,7 +359,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -75, + "y": -95, "z": 0 }, "_lrot": { @@ -805,7 +805,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 65, + "y": 45, "z": 0 }, "_lrot": { @@ -906,7 +906,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 720, - "height": 1130 + "height": 1090 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2385,7 +2385,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 720, - "height": 1130 + "height": 1090 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2459,7 +2459,7 @@ "_target": null, "_left": 0, "_right": 0, - "_top": 150, + "_top": 190, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -5806,7 +5806,7 @@ "__id__": 328 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 336 @@ -5821,7 +5821,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 575.577, + "y": 564.593, "z": 0 }, "_lrot": { @@ -5915,7 +5915,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 720, - "height": 200 + "height": 250 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5945,9 +5945,9 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 30, - "g": 36, - "b": 64, + "r": 224, + "g": 166, + "b": 42, "a": 255 }, "_spriteFrame": { @@ -6037,7 +6037,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 720, - "height": 200 + "height": 250 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6066,7 +6066,7 @@ "_target": null, "_left": 0, "_right": 0, - "_top": -35.577, + "_top": -49.59299999999996, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -6112,31 +6112,37 @@ "__id__": 342 }, { - "__id__": 354 + "__id__": 361 }, { - "__id__": 372 + "__id__": 379 + }, + { + "__id__": 397 + }, + { + "__id__": 434 } ], "_active": true, "_components": [ { - "__id__": 384 + "__id__": 446 }, { - "__id__": 386 + "__id__": 448 }, { - "__id__": 388 + "__id__": 450 } ], "_prefab": { - "__id__": 390 + "__id__": 452 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 512.707, + "y": 503.3230000000001, "z": 0 }, "_lrot": { @@ -6148,8 +6154,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.6, - "y": 0.6, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -6164,7 +6170,254 @@ }, { "__type__": "cc.Node", - "_name": "p", + "_objFlags": 0, + "_parent": { + "__id__": 341 + }, + "_prefab": { + "__id__": 343 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 342 + }, + "asset": { + "__uuid__": "c85dc4d5-6ebf-4cee-aa3e-6c027334e622", + "__expectedType__": "cc.Prefab" + }, + "fileId": "40LEKxke9Hs6tfg2pVspXT", + "instance": { + "__id__": 344 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "78DVJlGblFcb0kSEputvC8", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 345 + }, + { + "__id__": 347 + }, + { + "__id__": 348 + }, + { + "__id__": 349 + }, + { + "__id__": 350 + }, + { + "__id__": 352 + }, + { + "__id__": 354 + }, + { + "__id__": 356 + }, + { + "__id__": 358 + }, + { + "__id__": 359 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 346 + }, + "propertyPath": [ + "_name" + ], + "value": "Lable" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "40LEKxke9Hs6tfg2pVspXT" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 346 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 34.108, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 346 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 346 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 351 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 900, + "height": 200 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "32q1bLzYBFr5SK8ZtIeSWI" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 353 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 900, + "height": 104 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "06bJQzIv9Dd4vvjRlqtfn3" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 355 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 900, + "height": 95 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "8d3sM/DlJKPpJHNKbTBwEP" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 357 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 892, + "height": 94 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "17CdGbg9BG87rd0n06WZvm" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 346 + }, + "propertyPath": [ + "_lscale" + ], + "value": { + "__type__": "cc.Vec3", + "x": 2, + "y": 2, + "z": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 360 + }, + "propertyPath": [ + "_color" + ], + "value": { + "__type__": "cc.Color", + "r": 141, + "g": 141, + "b": 141, + "a": 255 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "4ckA8btpNNTrqJr6S7VGRN" + ] + }, + { + "__type__": "cc.Node", + "_name": "lv", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -6172,25 +6425,28 @@ }, "_children": [ { - "__id__": 343 + "__id__": 362 + }, + { + "__id__": 368 } ], "_active": true, "_components": [ { - "__id__": 349 + "__id__": 374 }, { - "__id__": 351 + "__id__": 376 } ], "_prefab": { - "__id__": 353 + "__id__": 378 }, "_lpos": { "__type__": "cc.Vec3", - "x": 483.3333333333334, - "y": 0, + "x": -345, + "y": -30, "z": 0 }, "_lrot": { @@ -6202,9 +6458,9 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1.6666666666666665, - "y": 1.6666666666666665, - "z": 0.9999999999999999 + "x": 1, + "y": 1, + "z": 1 }, "_mobility": 0, "_layer": 1073741824, @@ -6218,24 +6474,24 @@ }, { "__type__": "cc.Node", - "_name": "Label", + "_name": "name", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 342 + "__id__": 361 }, "_children": [], "_active": true, "_components": [ { - "__id__": 344 + "__id__": 363 }, { - "__id__": 346 + "__id__": 365 } ], "_prefab": { - "__id__": 348 + "__id__": 367 }, "_lpos": { "__type__": "cc.Vec3", @@ -6272,27 +6528,27 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 343 + "__id__": 362 }, "_enabled": true, "__prefab": { - "__id__": 345 + "__id__": 364 }, "_contentSize": { "__type__": "cc.Size", - "width": 72.3642578125, + "width": 154, "height": 54.4 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.5, + "x": 0, "y": 0.5 }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d5BOBpgahLWoWVXM63bQEf" + "fileId": "09M1KBvNdGsaKooJ5nwJBG" }, { "__type__": "cc.Label", @@ -6300,11 +6556,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 343 + "__id__": 362 }, "_enabled": true, "__prefab": { - "__id__": 347 + "__id__": 366 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6316,8 +6572,8 @@ "b": 255, "a": 255 }, - "_string": "label", - "_horizontalAlign": 1, + "_string": "天赋等级：", + "_horizontalAlign": 0, "_verticalAlign": 1, "_actualFontSize": 30, "_fontSize": 30, @@ -6360,7 +6616,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "90umMR2fNJxYq17Hp3x4yG" + "fileId": "48HL+0J/1MSLrooJPLWWVu" }, { "__type__": "cc.PrefabInfo", @@ -6370,568 +6626,35 @@ "asset": { "__id__": 0 }, - "fileId": "756Dqga6xFh4O+OA+86u0J", + "fileId": "802aj8HuFEdqWBvuL3XA6C", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 342 - }, - "_enabled": true, - "__prefab": { - "__id__": 350 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "29W2Y5F6ZEA6a5Ymcz4leF" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 342 - }, - "_enabled": true, - "__prefab": { - "__id__": 352 - }, - "_alignFlags": 32, - "_target": null, - "_left": 0, - "_right": 50, - "_top": 0, - "_bottom": 0, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 0, - "_originalHeight": 0, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "4ebTsaPwFOjZbPrtafhLEC" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "5c3Ij1FfZPj6DY3d1Z3wTy", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "exp", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 341 - }, - "_children": [ - { - "__id__": 355 - } - ], - "_active": true, - "_components": [ - { - "__id__": 369 - } - ], - "_prefab": { - "__id__": 371 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -112.47, - "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.Node", - "_name": "ProgressBar", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 354 - }, - "_children": [ - { - "__id__": 356 - } - ], - "_active": true, - "_components": [ - { - "__id__": 362 - }, - { - "__id__": 364 - }, - { - "__id__": 366 - } - ], - "_prefab": { - "__id__": 368 - }, - "_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.Node", - "_name": "Bar", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 355 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 357 - }, - { - "__id__": 359 - } - ], - "_prefab": { - "__id__": 361 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -400, - "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__": 356 - }, - "_enabled": true, - "__prefab": { - "__id__": 358 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 800, - "height": 50 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "bekSK2RflO3aD+UDHNebd4" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 356 - }, - "_enabled": true, - "__prefab": { - "__id__": 360 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@fe983", - "__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": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "12XEWR9OhPpp/b2b3bEl6Y" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "7csMYKb0xD6bcw2RZEg/2j", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 355 - }, - "_enabled": true, - "__prefab": { - "__id__": 363 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 810, - "height": 60 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c5VDCdvQ9GiJ+s5COXFyi7" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 355 - }, - "_enabled": true, - "__prefab": { - "__id__": 365 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@19840", - "__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": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "dfsWswlWJP2q0uSMujz5ZC" - }, - { - "__type__": "cc.ProgressBar", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 355 - }, - "_enabled": true, - "__prefab": { - "__id__": 367 - }, - "_barSprite": { - "__id__": 359 - }, - "_mode": 0, - "_totalLength": 800, - "_progress": 1, - "_reverse": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f4NC932dpHb7wUOvg18M4Z" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "8bJWQeeoVMsrzuMySyKEvr", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 354 - }, - "_enabled": true, - "__prefab": { - "__id__": 370 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 800, - "height": 50 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a2vm7rSS1A4IjjatFIng9v" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "85qs9RGXlHGKzaPgJhISYn", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "lv", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 341 - }, - "_children": [ - { - "__id__": 373 - } - ], - "_active": true, - "_components": [ - { - "__id__": 379 - }, - { - "__id__": 381 - } - ], - "_prefab": { - "__id__": 383 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -525.775, - "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.Node", "_name": "Label", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 372 + "__id__": 361 }, "_children": [], "_active": true, "_components": [ { - "__id__": 374 + "__id__": 369 }, { - "__id__": 376 + "__id__": 371 } ], "_prefab": { - "__id__": 378 + "__id__": 373 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, + "x": 184.786, "y": 0, "z": 0 }, @@ -6964,11 +6687,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 373 + "__id__": 368 }, "_enabled": true, "__prefab": { - "__id__": 375 + "__id__": 370 }, "_contentSize": { "__type__": "cc.Size", @@ -6992,11 +6715,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 373 + "__id__": 368 }, "_enabled": true, "__prefab": { - "__id__": 377 + "__id__": 372 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7073,20 +6796,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 372 + "__id__": 361 }, "_enabled": true, "__prefab": { - "__id__": 380 + "__id__": 375 }, "_contentSize": { "__type__": "cc.Size", - "width": 100, - "height": 90 + "width": 360, + "height": 40 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.5, + "x": 0, "y": 0.5 }, "_id": "" @@ -7101,11 +6824,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 372 + "__id__": 361 }, - "_enabled": true, + "_enabled": false, "__prefab": { - "__id__": 382 + "__id__": 377 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7156,6 +6879,1397 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "p", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 341 + }, + "_children": [ + { + "__id__": 380 + }, + { + "__id__": 386 + } + ], + "_active": true, + "_components": [ + { + "__id__": 392 + }, + { + "__id__": 394 + } + ], + "_prefab": { + "__id__": 396 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -29.111000000000047, + "y": -30, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 0.9999999999999999 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "name", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 379 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 381 + }, + { + "__id__": 383 + } + ], + "_prefab": { + "__id__": 385 + }, + "_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__": 380 + }, + "_enabled": true, + "__prefab": { + "__id__": 382 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 154, + "height": 54.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "baesI1htRBXo0m4U4aVaUL" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 380 + }, + "_enabled": true, + "__prefab": { + "__id__": 384 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "天赋点数：", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 30, + "_fontSize": 30, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a1cHTzfA5NIpbsTC3OolmM" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "de9rcahwFDlZSL82XCUdAW", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 379 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 387 + }, + { + "__id__": 389 + } + ], + "_prefab": { + "__id__": 391 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 157.411, + "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__": 386 + }, + "_enabled": true, + "__prefab": { + "__id__": 388 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 79.05859375, + "height": 54.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d5BOBpgahLWoWVXM63bQEf" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 386 + }, + "_enabled": true, + "__prefab": { + "__id__": 390 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "1 / 30", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 30, + "_fontSize": 30, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "90umMR2fNJxYq17Hp3x4yG" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "756Dqga6xFh4O+OA+86u0J", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 379 + }, + "_enabled": true, + "__prefab": { + "__id__": 393 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 360, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "29W2Y5F6ZEA6a5Ymcz4leF" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 379 + }, + "_enabled": true, + "__prefab": { + "__id__": 395 + }, + "_alignFlags": 32, + "_target": null, + "_left": 0, + "_right": 39.11100000000003, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "4ebTsaPwFOjZbPrtafhLEC" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "5c3Ij1FfZPj6DY3d1Z3wTy", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "exp", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 341 + }, + "_children": [ + { + "__id__": 398 + }, + { + "__id__": 412 + }, + { + "__id__": 425 + } + ], + "_active": true, + "_components": [ + { + "__id__": 431 + } + ], + "_prefab": { + "__id__": 433 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 22.292, + "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.Node", + "_name": "ProgressBar", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 397 + }, + "_children": [ + { + "__id__": 399 + } + ], + "_active": true, + "_components": [ + { + "__id__": 405 + }, + { + "__id__": 407 + }, + { + "__id__": 409 + } + ], + "_prefab": { + "__id__": 411 + }, + "_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.Node", + "_name": "Bar", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 398 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 400 + }, + { + "__id__": 402 + } + ], + "_prefab": { + "__id__": 404 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -350, + "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__": 399 + }, + "_enabled": true, + "__prefab": { + "__id__": 401 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 696, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "bekSK2RflO3aD+UDHNebd4" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 399 + }, + "_enabled": true, + "__prefab": { + "__id__": 403 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@61404", + "__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": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "12XEWR9OhPpp/b2b3bEl6Y" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "7csMYKb0xD6bcw2RZEg/2j", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 398 + }, + "_enabled": true, + "__prefab": { + "__id__": 406 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 700, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c5VDCdvQ9GiJ+s5COXFyi7" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 398 + }, + "_enabled": true, + "__prefab": { + "__id__": 408 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 82, + "g": 82, + "b": 82, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "dd7e2f04-f9b9-489b-8d38-b4971ad81910@be560", + "__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": { + "__uuid__": "dd7e2f04-f9b9-489b-8d38-b4971ad81910", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "dfsWswlWJP2q0uSMujz5ZC" + }, + { + "__type__": "cc.ProgressBar", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 398 + }, + "_enabled": true, + "__prefab": { + "__id__": 410 + }, + "_barSprite": { + "__id__": 402 + }, + "_mode": 0, + "_totalLength": 696, + "_progress": 1, + "_reverse": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f4NC932dpHb7wUOvg18M4Z" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "8bJWQeeoVMsrzuMySyKEvr", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 397 + }, + "_prefab": { + "__id__": 413 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 412 + }, + "asset": { + "__uuid__": "db18158c-588a-49ea-a224-cace29d5c912", + "__expectedType__": "cc.Prefab" + }, + "fileId": "47Sc4S8E5EfJ3uZtG97byB", + "instance": { + "__id__": 414 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "cd/b+HG9FPvKet8q8s30Gt", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 415 + }, + { + "__id__": 417 + }, + { + "__id__": 418 + }, + { + "__id__": 419 + }, + { + "__id__": 420 + }, + { + "__id__": 422 + }, + { + "__id__": 423 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 416 + }, + "propertyPath": [ + "_name" + ], + "value": "reward_item_exp" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "47Sc4S8E5EfJ3uZtG97byB" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 416 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -327.436, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 416 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 416 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 421 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "bbIROaQytLa7tkpPKzVoid" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 416 + }, + "propertyPath": [ + "_lscale" + ], + "value": { + "__type__": "cc.Vec3", + "x": 1.4, + "y": 1.4, + "z": 0.9999999999999999 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 424 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "7bVF5TCMhCxYHg/COrstD8" + ] + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 397 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 426 + }, + { + "__id__": 428 + } + ], + "_prefab": { + "__id__": 430 + }, + "_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__": 425 + }, + "_enabled": true, + "__prefab": { + "__id__": 427 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 79.0732421875, + "height": 54.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a5Xxm7qd5CpZl/vqMZ17qx" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 425 + }, + "_enabled": true, + "__prefab": { + "__id__": 429 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "99/99", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 30, + "_fontSize": 30, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "14mFGK0MFCZrI65rcbQLSV" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "1fBx/m7WNAULEbCLVuggiN", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 397 + }, + "_enabled": true, + "__prefab": { + "__id__": 432 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 800, + "height": 50 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a2vm7rSS1A4IjjatFIng9v" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "85qs9RGXlHGKzaPgJhISYn", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "reset", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 341 + }, + "_children": [ + { + "__id__": 435 + } + ], + "_active": true, + "_components": [ + { + "__id__": 443 + } + ], + "_prefab": { + "__id__": 445 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 283.677, + "y": -30, + "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.Node", + "_objFlags": 0, + "_parent": { + "__id__": 434 + }, + "_prefab": { + "__id__": 436 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 435 + }, + "asset": { + "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", + "__expectedType__": "cc.Prefab" + }, + "fileId": "60RuUkpjBAGoLk3z4xlHcF", + "instance": { + "__id__": 437 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "a9k/OUCTFOjZr6v87Lr9Pe", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 438 + }, + { + "__id__": 440 + }, + { + "__id__": 441 + }, + { + "__id__": 442 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 439 + }, + "propertyPath": [ + "_name" + ], + "value": "button" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "60RuUkpjBAGoLk3z4xlHcF" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 439 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 439 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 439 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 434 + }, + "_enabled": true, + "__prefab": { + "__id__": 444 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 50 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e8lK6UzARLjb3RvAjZwToC" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "18cCHUdUxGM4pJzozeEExH", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -7166,11 +8280,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 385 + "__id__": 447 }, "_contentSize": { "__type__": "cc.Size", - "width": 1233.3333333333335, + "width": 740, "height": 114 }, "_anchorPoint": { @@ -7194,7 +8308,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 387 + "__id__": 449 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7239,13 +8353,13 @@ }, "_enabled": true, "__prefab": { - "__id__": 389 + "__id__": 451 }, "_alignFlags": 41, "_target": null, "_left": -10, "_right": -10, - "_top": 93.09299999999996, + "_top": 79.67699999999996, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -7290,17 +8404,17 @@ "_active": true, "_components": [ { - "__id__": 392 + "__id__": 454 }, { - "__id__": 394 + "__id__": 456 }, { - "__id__": 396 + "__id__": 458 } ], "_prefab": { - "__id__": 398 + "__id__": 460 }, "_lpos": { "__type__": "cc.Vec3", @@ -7337,15 +8451,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 391 + "__id__": 453 }, "_enabled": true, "__prefab": { - "__id__": 393 + "__id__": 455 }, "_contentSize": { "__type__": "cc.Size", - "width": 122.6278280709945, + "width": 112, "height": 87.6 }, "_anchorPoint": { @@ -7365,11 +8479,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 391 + "__id__": 453 }, "_enabled": true, "__prefab": { - "__id__": 395 + "__id__": 457 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7393,7 +8507,7 @@ "_font": null, "_isSystemFontUsed": true, "_spacingX": 0, - "_isItalic": true, + "_isItalic": false, "_isBold": true, "_isUnderline": false, "_underlineHeight": 2, @@ -7433,15 +8547,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 391 + "__id__": 453 }, "_enabled": true, "__prefab": { - "__id__": 397 + "__id__": 459 }, "_alignFlags": 9, "_target": null, - "_left": 12.850085964502739, + "_left": 18.163999999999987, "_right": 0, "_top": 5.205000000000041, "_bottom": 0, @@ -7486,7 +8600,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 400 + "__id__": 462 }, "_contentSize": { "__type__": "cc.Size", @@ -7514,7 +8628,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 402 + "__id__": 464 }, "_alignFlags": 45, "_target": null, @@ -7550,7 +8664,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 404 + "__id__": 466 }, "talents_content": { "__id__": 39 @@ -7560,13 +8674,16 @@ "__expectedType__": "cc.Prefab" }, "lbl_points": { - "__id__": 346 + "__id__": 389 }, "lbl_lv": { - "__id__": 376 + "__id__": 371 }, "progress_exp": { - "__id__": 366 + "__id__": 409 + }, + "lbl_exp": { + "__id__": 428 }, "tab_basic": { "__id__": 156 @@ -7614,6 +8731,15 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ + { + "__id__": 435 + }, + { + "__id__": 412 + }, + { + "__id__": 342 + }, { "__id__": 285 }, diff --git a/assets/resources/gui/ui3.plist.meta b/assets/resources/gui/ui3.plist.meta index 5f2dcb74..ace19d39 100644 --- a/assets/resources/gui/ui3.plist.meta +++ b/assets/resources/gui/ui3.plist.meta @@ -8166,10 +8166,10 @@ "height": 35, "rawWidth": 8, "rawHeight": 35, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 7, + "borderTop": 15, + "borderBottom": 15, + "borderLeft": 1, + "borderRight": 5, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, diff --git a/assets/resources/gui/ui5.plist.meta b/assets/resources/gui/ui5.plist.meta index 23f7c776..609428f2 100644 --- a/assets/resources/gui/ui5.plist.meta +++ b/assets/resources/gui/ui5.plist.meta @@ -116,8 +116,8 @@ "height": 54, "rawWidth": 89, "rawHeight": 54, - "borderTop": 0, - "borderBottom": 0, + "borderTop": 26, + "borderBottom": 26, "borderLeft": 44, "borderRight": 44, "packable": true, @@ -576,8 +576,8 @@ "height": 45, "rawWidth": 52, "rawHeight": 45, - "borderTop": 0, - "borderBottom": 0, + "borderTop": 22, + "borderBottom": 23, "borderLeft": 26, "borderRight": 26, "packable": true, @@ -4992,8 +4992,8 @@ "height": 45, "rawWidth": 81, "rawHeight": 45, - "borderTop": 0, - "borderBottom": 0, + "borderTop": 22.5, + "borderBottom": 22.5, "borderLeft": 40, "borderRight": 40, "packable": true, @@ -6096,10 +6096,10 @@ "height": 39, "rawWidth": 37, "rawHeight": 39, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 19, + "borderBottom": 18, + "borderLeft": 19, + "borderRight": 18, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, diff --git a/assets/script/game/map/HeroInfoComp.ts b/assets/script/game/map/HeroInfoComp.ts index 78edd232..b961c86e 100644 --- a/assets/script/game/map/HeroInfoComp.ts +++ b/assets/script/game/map/HeroInfoComp.ts @@ -6,7 +6,7 @@ * 1. 展示单个英雄的详情：idle 动画、名称、AP / DEF / HP / CD、技能描述、 * 稀有度底框、局外等级、职业、碎片数量、升级按钮、技能图标列表。 * 2. 提供升级操作（消耗碎片提升局外等级，成功后播放升级特效）。 - * 3. 提供前后英雄切换按钮，按图鉴排序顺序循环切换（getSortedHeroList）。 + * 3. 提供前后英雄切换按钮，按图鉴排序顺序循环切换（品质降序 → uuid 升序）。 * 4. 提供关闭按钮 / 遮罩点击关闭弹窗。 * * 使用（oops.gui 模块）： @@ -15,12 +15,11 @@ * 关键设计： * - 详情渲染逻辑与原 HerosListComp 详情面板同源（已迁移至此）， * HerosListComp 仅保留卡片列表，点击卡片改为打开本弹窗。 - * - 前后切换按 getSortedHeroList 计算的顺序循环（与图鉴页面卡片顺序一致）。 + * - 前后切换按品质降序 → uuid 升序循环（与图鉴页面卡片顺序一致）。 * - hero_icon 使用 Animation + iconVisualToken 机制防止异步加载竞态。 * * 依赖： - * - HeroInfo / heroSet —— 英雄静态配置 - * - getSortedHeroList（heroUpSet）—— 图鉴排序 + * - HeroInfo / HeroList（heroSet）—— 英雄静态配置与全量 UUID 列表 * - smc.getHeroGrowth / smc.getHeroOuterLv / smc.upgradeHero —— 成长数据 * - buildHeroSkillDesc（HeroSkillText）—— 技能描述生成器 * - SSkillBoxComp / ChipComp / SmallTipComp —— 子组件 @@ -30,12 +29,11 @@ import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ec import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; import { oops } from "db://oops-framework/core/Oops"; import { mLogger } from "../common/Logger"; -import { HeroInfo, SkillTriggerType, LvFieldEntry, LvTriggerEntry, TriggerGrouped, HSkillInfo, getHeroDisplayStats, LvBonusAttrsEntry } from "../common/config/heroSet"; +import { HeroInfo, HeroList, SkillTriggerType, LvFieldEntry, LvTriggerEntry, TriggerGrouped, HSkillInfo, getHeroDisplayStats, LvBonusAttrsEntry } from "../common/config/heroSet"; import { buildHeroSkillDesc } from "../common/HeroSkillText"; import { outlineRich } from "../common/RichOutline"; import { GameEvent } from "../common/config/GameEvent"; import { HERO_UPGRADE_NEED_FRAGMENTS, RARITY_BG_COLORS } from "../common/config/GameSet"; -import { getSortedHeroList } from "../common/config/heroUpSet"; import { ChipComp } from "./ChipComp"; import { SmallTipComp } from "./SmallTipComp"; import { SSkillBoxComp } from "./SSkillBoxComp"; @@ -249,7 +247,13 @@ export class HeroInfoComp extends CCComp { * @param delta 1 下一个，-1 上一个 */ private switchHero(delta: 1 | -1) { - const sorted = getSortedHeroList(uuid => smc.getHeroGrowth(uuid)); + // 与图鉴页面排序同源：仅按品质降序 → uuid 升序 + const sorted = [...HeroList].sort((a, b) => { + const ra = HeroInfo[a]?.rarity ?? 1; + const rb = HeroInfo[b]?.rarity ?? 1; + if (ra !== rb) return rb - ra; + return a - b; + }); if (sorted.length === 0) return; const idx = sorted.indexOf(this.huuid); // 当前 uuid 不在列表中（异常）时回退到第一个 diff --git a/assets/script/game/map/HerosListComp.ts b/assets/script/game/map/HerosListComp.ts index 2a0a8705..b81918c9 100644 --- a/assets/script/game/map/HerosListComp.ts +++ b/assets/script/game/map/HerosListComp.ts @@ -5,15 +5,16 @@ * 职责： * 1. 以卡片列表形式展示所有可用英雄（使用 CardLiteComp 预制体）。 * 2. 点击卡片打开英雄详情弹窗（UIID.HeroInfo），详情/升级在 HeroInfoComp 中处理。 - * 3. 卡片排序：可升级优先 → 现有等级降序 → 品质降序（getSortedHeroList）。 + * 3. 卡片排序：仅按品质降序 → uuid 升序（与养成进度解耦，保持展示稳定）。 * * 关键设计： * - cards_node 为卡片容器，通过 instantiate(card_lite_prefab) 动态生成卡片。 * - 升级/碎片变动后通过 HERO_GROWTH_UPDATE 事件统一刷新所有卡片的可升级标识。 * - 详情面板已从本组件剥离，由 HeroInfoComp 承载。 + * - 排序不依赖 smc，仅读取静态配置（HeroInfo.rarity）。 * * 依赖： - * - getSortedHeroList（heroUpSet）—— 图鉴排序 + * - HeroInfo / HeroList（heroSet）—— 英雄静态配置与全量 UUID 列表 * - CardLiteComp —— 轻量卡片组件 * - UIID.HeroInfo（oops.gui）—— 英雄详情弹窗 */ @@ -24,10 +25,8 @@ import { oops } from "db://oops-framework/core/Oops"; import { mLogger } from "../common/Logger"; import { HeroInfo, HeroList } from "../common/config/heroSet"; import { GameEvent } from "../common/config/GameEvent"; -import { getSortedHeroList } from "../common/config/heroUpSet"; import { UIID } from "../common/config/GameUIConfig"; import { CardLiteComp } from "./CardLiteComp"; -import { smc } from "../common/SingletonModuleComp"; const { property, ccclass } = _decorator; @@ -46,14 +45,30 @@ export class HerosListComp extends CCComp { @property card_w = 120 + /** 卡片高度 */ + @property + card_h = 200 + /** 卡片横向间隔 */ @property spacing_x = 10 + /** 卡片纵向间隔 */ + @property + spacing_y = 10 + + /** 每行卡片数（竖向滚动时按列排列） */ + @property + cols = 4 + /** 卡片左右边距 */ @property margin_x = 15 + /** 卡片上下边距 */ + @property + margin_y = 50 + // ======================== 运行时状态 ======================== debugMode: boolean = false @@ -95,8 +110,13 @@ export class HerosListComp extends CCComp { this.cards_node.removeAllChildren() - // 排序与详情面板"前后切换"同源（getSortedHeroList），保证两个入口顺序一致 - const sorted = getSortedHeroList(uuid => smc.getHeroGrowth(uuid)) + // 图鉴排序：仅按品质降序 → uuid 升序（与养成进度解耦，保持展示稳定） + const sorted = [...HeroList].sort((a, b) => { + const ra = HeroInfo[a]?.rarity ?? 1; + const rb = HeroInfo[b]?.rarity ?? 1; + if (ra !== rb) return rb - ra; + return a - b; + }) for (const uuid of sorted) { const hero = HeroInfo[uuid] @@ -127,16 +147,18 @@ export class HerosListComp extends CCComp { const total = this.cards_node.children.length if (total === 0) return - // 宽度 = 卡片总宽 + 卡片间隔 + 左右边距 - const contentW = total * this.card_w - + (total - 1) * this.spacing_x + // 竖向滚动：宽度固定（每行 cols 列），高度按行数累计 + const rows = Math.ceil(total / this.cols) + + // 宽度 = 每行卡片总宽 + 横向间隔 + 左右边距 + const contentW = this.cols * this.card_w + + (this.cols - 1) * this.spacing_x + this.margin_x * 2 - const cols = 4 - const rows = Math.ceil(total / cols) - const cardH = 200 - const spacingY = 10 - const contentH = Math.max(1000, rows * (cardH + spacingY) + 50) + // 高度 = 行数 × 卡片高 + 纵向间隔 + 上下边距 + const contentH = rows * this.card_h + + (rows - 1) * this.spacing_y + + this.margin_y * 2 const uiTrans = this.cards_node.getComponent(UITransform) if (uiTrans) { diff --git a/assets/script/game/map/TalentsComp.ts b/assets/script/game/map/TalentsComp.ts index f6b3cf18..f2d12dbc 100644 --- a/assets/script/game/map/TalentsComp.ts +++ b/assets/script/game/map/TalentsComp.ts @@ -69,6 +69,9 @@ export class TalentsComp extends CCComp { @property({ type: ProgressBar, tooltip: "当前等级经验进度条" }) progress_exp: ProgressBar = null!; + @property({ type: Label, tooltip: "当前等级经验数值（当前经验/升级所需经验）" }) + lbl_exp: Label = null!; + @property({ type: Node, tooltip: "一阶页签节点" }) tab_basic: Node = null!; @@ -148,7 +151,14 @@ export class TalentsComp extends CCComp { if (!this.talents_content || !this.prefab_talent_item) return; const levels = smc.getTalentLevels(); - if (this.lbl_points) this.lbl_points.string = `${smc.getTalentPoints()}`; + if (this.lbl_points) { + // 剩余/总点数：总点数 = 剩余 + 各阶已投入 + const remaining = smc.getTalentPoints(); + const invested = getTalentTierInvestedPoints(levels, TalentTier.Basic) + + getTalentTierInvestedPoints(levels, TalentTier.Specialized) + + getTalentTierInvestedPoints(levels, TalentTier.Super); + this.lbl_points.string = `${remaining}/${remaining + invested}`; + } // 天赋等级（Lv.x）与当前等级经验进度 const talentLv = smc.getTalentLevel(); @@ -160,6 +170,13 @@ export class TalentsComp extends CCComp { ? Math.min(1, smc.getTalentExp() / needExp) : 1; } + if (this.lbl_exp) { + const needExp = getTalentLevelExp(talentLv); + // 满级后显示为 0/0，避免分母为 0 + this.lbl_exp.string = needExp > 0 + ? `${smc.getTalentExp()}/${needExp}` + : `0/0`; + } // 仅首次进入时默认选中已解锁的最高阶，后续刷新保持玩家当前选择 if (!this.inited) {