diff --git a/assets/resources/gui/element/prefab_talent_item.prefab b/assets/resources/gui/element/prefab_talent_item.prefab index 4c6c833c..4ad52d2f 100644 --- a/assets/resources/gui/element/prefab_talent_item.prefab +++ b/assets/resources/gui/element/prefab_talent_item.prefab @@ -186,8 +186,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1.4, - "y": 1.4, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -214,8 +214,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 154, - "height": 200 + "width": 200, + "height": 230 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -361,8 +361,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1.4, - "y": 1.4, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -389,8 +389,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 154, - "height": 200 + "width": 200, + "height": 230 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -536,8 +536,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1.4, - "y": 1.4, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -564,8 +564,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 154, - "height": 200 + "width": 200, + "height": 230 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -739,8 +739,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 220, - "height": 270 + "width": 200, + "height": 230 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -861,8 +861,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 220, - "height": 270 + "width": 200, + "height": 230 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -948,7 +948,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 82.087, + "y": 43.046, "z": 0 }, "_lrot": { @@ -960,8 +960,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.7, - "y": 0.7, + "x": 0.6, + "y": 0.6, "z": 1 }, "_mobility": 0, @@ -1024,7 +1024,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "2239ed56-3d9b-4c36-8deb-d3a294bb241d@36114", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 0, "_fillType": 0, "_sizeMode": 0, @@ -1037,7 +1040,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "2239ed56-3d9b-4c36-8deb-d3a294bb241d", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1081,7 +1087,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 17.465, + "y": 96.421, "z": 0 }, "_lrot": { @@ -1121,8 +1127,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 140, - "height": 40 + "width": 150, + "height": 25 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1160,10 +1166,10 @@ "_string": "是个字长", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 25, - "_fontSize": 25, + "_actualFontSize": 20, + "_fontSize": 20, "_fontFamily": "Arial", - "_lineHeight": 40, + "_lineHeight": 25, "_overflow": 2, "_enableWrapText": true, "_font": null, @@ -1280,8 +1286,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 200, - "height": 90 + "width": 159.7, + "height": 63 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1319,10 +1325,10 @@ "_string": "+10", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 21, - "_fontSize": 20, + "_actualFontSize": 19, + "_fontSize": 18, "_fontFamily": "Arial", - "_lineHeight": 30, + "_lineHeight": 21, "_overflow": 2, "_enableWrapText": true, "_font": null, @@ -1399,7 +1405,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -86.761, + "y": -63.477, "z": 0 }, "_lrot": { @@ -1439,7 +1445,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 59.60546875, + "width": 38.75341796875, "height": 67 }, "_anchorPoint": { @@ -1478,8 +1484,8 @@ "_string": "0/9", "_horizontalAlign": 2, "_verticalAlign": 2, - "_actualFontSize": 40, - "_fontSize": 40, + "_actualFontSize": 25, + "_fontSize": 25, "_fontFamily": "Arial", "_lineHeight": 50, "_overflow": 0, @@ -1562,7 +1568,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -92.772, + "y": -79.992, "z": 0 }, "_lrot": { @@ -1940,7 +1946,7 @@ "__id__": 89 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 95 @@ -2020,8 +2026,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1.4, - "y": 1.4, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -2048,8 +2054,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 154, - "height": 200 + "width": 200, + "height": 230 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2180,7 +2186,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -102.773, + "y": -73.713, "z": 0 }, "_lrot": { @@ -2192,8 +2198,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1.1, - "y": 1.1, + "x": 0.8, + "y": 0.8, "z": 1 }, "_mobility": 0, @@ -2306,8 +2312,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 220, - "height": 270 + "width": 200, + "height": 230 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2383,8 +2389,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 220, - "height": 270 + "width": 200, + "height": 230 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/resources/gui/element/talents.prefab b/assets/resources/gui/element/talents.prefab index 99426793..0e33c244 100644 --- a/assets/resources/gui/element/talents.prefab +++ b/assets/resources/gui/element/talents.prefab @@ -25,32 +25,32 @@ "__id__": 21 }, { - "__id__": 65 + "__id__": 155 }, { - "__id__": 237 + "__id__": 327 }, { - "__id__": 251 + "__id__": 341 }, { - "__id__": 301 + "__id__": 391 } ], "_active": true, "_components": [ { - "__id__": 309 + "__id__": 399 }, { - "__id__": 311 + "__id__": 401 }, { - "__id__": 313 + "__id__": 403 } ], "_prefab": { - "__id__": 315 + "__id__": 405 }, "_lpos": { "__type__": "cc.Vec3", @@ -341,20 +341,20 @@ "_active": true, "_components": [ { - "__id__": 58 + "__id__": 148 }, { - "__id__": 60 + "__id__": 150 }, { "__id__": 37 }, { - "__id__": 62 + "__id__": 152 } ], "_prefab": { - "__id__": 64 + "__id__": 154 }, "_lpos": { "__type__": "cc.Vec3", @@ -414,7 +414,7 @@ } ], "_prefab": { - "__id__": 57 + "__id__": 147 }, "_lpos": { "__type__": "cc.Vec3", @@ -758,21 +758,49 @@ "_parent": { "__id__": 40 }, - "_children": [], - "_active": true, - "_components": [ + "_children": [ { "__id__": 50 }, { - "__id__": 52 + "__id__": 60 }, { - "__id__": 54 + "__id__": 70 + }, + { + "__id__": 80 + }, + { + "__id__": 90 + }, + { + "__id__": 100 + }, + { + "__id__": 110 + }, + { + "__id__": 120 + }, + { + "__id__": 130 + } + ], + "_active": true, + "_components": [ + { + "__id__": 140 + }, + { + "__id__": 142 + }, + { + "__id__": 144 } ], "_prefab": { - "__id__": 56 + "__id__": 146 }, "_lpos": { "__type__": "cc.Vec3", @@ -1008,6 +1036,1212 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 39 + }, + "_prefab": { + "__id__": 51 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 50 + }, + "asset": { + "__uuid__": "a0cdb31c-0abb-4e12-9dfe-0bd9e8cd7272", + "__expectedType__": "cc.Prefab" + }, + "fileId": "9ai0wNGzpNXJsQGNNoy6Le", + "instance": { + "__id__": 52 + }, + "targetOverrides": [ + { + "__id__": 58 + } + ] + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "98teo1xgZClpLRtb7+kr1w", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 53 + }, + { + "__id__": 55 + }, + { + "__id__": 56 + }, + { + "__id__": 57 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 54 + }, + "propertyPath": [ + "_name" + ], + "value": "prefab_talent_item" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "9ai0wNGzpNXJsQGNNoy6Le" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 54 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -230, + "y": 355, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 54 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 54 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "bg" + ], + "target": null, + "targetInfo": { + "__id__": 59 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "1fQvT1A5hItJZd6AwSBLLo" + ] + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 39 + }, + "_prefab": { + "__id__": 61 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 60 + }, + "asset": { + "__uuid__": "a0cdb31c-0abb-4e12-9dfe-0bd9e8cd7272", + "__expectedType__": "cc.Prefab" + }, + "fileId": "9ai0wNGzpNXJsQGNNoy6Le", + "instance": { + "__id__": 62 + }, + "targetOverrides": [ + { + "__id__": 68 + } + ] + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "a8RxzadB5PuqjU+d4azv4r", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 63 + }, + { + "__id__": 65 + }, + { + "__id__": 66 + }, + { + "__id__": 67 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 64 + }, + "propertyPath": [ + "_name" + ], + "value": "prefab_talent_item" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "9ai0wNGzpNXJsQGNNoy6Le" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 64 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -10, + "y": 355, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 64 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 64 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "bg" + ], + "target": null, + "targetInfo": { + "__id__": 69 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "1fQvT1A5hItJZd6AwSBLLo" + ] + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 39 + }, + "_prefab": { + "__id__": 71 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 70 + }, + "asset": { + "__uuid__": "a0cdb31c-0abb-4e12-9dfe-0bd9e8cd7272", + "__expectedType__": "cc.Prefab" + }, + "fileId": "9ai0wNGzpNXJsQGNNoy6Le", + "instance": { + "__id__": 72 + }, + "targetOverrides": [ + { + "__id__": 78 + } + ] + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "e7rIWZNgdAhaLr9OF5qpU7", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 73 + }, + { + "__id__": 75 + }, + { + "__id__": 76 + }, + { + "__id__": 77 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 74 + }, + "propertyPath": [ + "_name" + ], + "value": "prefab_talent_item" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "9ai0wNGzpNXJsQGNNoy6Le" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 74 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 210, + "y": 355, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 74 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 74 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "bg" + ], + "target": null, + "targetInfo": { + "__id__": 79 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "1fQvT1A5hItJZd6AwSBLLo" + ] + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 39 + }, + "_prefab": { + "__id__": 81 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 80 + }, + "asset": { + "__uuid__": "a0cdb31c-0abb-4e12-9dfe-0bd9e8cd7272", + "__expectedType__": "cc.Prefab" + }, + "fileId": "9ai0wNGzpNXJsQGNNoy6Le", + "instance": { + "__id__": 82 + }, + "targetOverrides": [ + { + "__id__": 88 + } + ] + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "87aFHbEnhCfo+x8oY8OLEs", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 86 + }, + { + "__id__": 87 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 84 + }, + "propertyPath": [ + "_name" + ], + "value": "prefab_talent_item" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "9ai0wNGzpNXJsQGNNoy6Le" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 84 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -230, + "y": 105, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 84 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 84 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "bg" + ], + "target": null, + "targetInfo": { + "__id__": 89 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "1fQvT1A5hItJZd6AwSBLLo" + ] + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 39 + }, + "_prefab": { + "__id__": 91 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 90 + }, + "asset": { + "__uuid__": "a0cdb31c-0abb-4e12-9dfe-0bd9e8cd7272", + "__expectedType__": "cc.Prefab" + }, + "fileId": "9ai0wNGzpNXJsQGNNoy6Le", + "instance": { + "__id__": 92 + }, + "targetOverrides": [ + { + "__id__": 98 + } + ] + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "24j0/Fg/NHKY7tBMj0sh8u", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 93 + }, + { + "__id__": 95 + }, + { + "__id__": 96 + }, + { + "__id__": 97 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 94 + }, + "propertyPath": [ + "_name" + ], + "value": "prefab_talent_item" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "9ai0wNGzpNXJsQGNNoy6Le" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 94 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -10, + "y": 105, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 94 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 94 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "bg" + ], + "target": null, + "targetInfo": { + "__id__": 99 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "1fQvT1A5hItJZd6AwSBLLo" + ] + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 39 + }, + "_prefab": { + "__id__": 101 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 100 + }, + "asset": { + "__uuid__": "a0cdb31c-0abb-4e12-9dfe-0bd9e8cd7272", + "__expectedType__": "cc.Prefab" + }, + "fileId": "9ai0wNGzpNXJsQGNNoy6Le", + "instance": { + "__id__": 102 + }, + "targetOverrides": [ + { + "__id__": 108 + } + ] + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "88S9d4UndAc4SP+fj4NyW9", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 103 + }, + { + "__id__": 105 + }, + { + "__id__": 106 + }, + { + "__id__": 107 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 104 + }, + "propertyPath": [ + "_name" + ], + "value": "prefab_talent_item" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "9ai0wNGzpNXJsQGNNoy6Le" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 104 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 210, + "y": 105, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 104 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 104 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "bg" + ], + "target": null, + "targetInfo": { + "__id__": 109 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "1fQvT1A5hItJZd6AwSBLLo" + ] + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 39 + }, + "_prefab": { + "__id__": 111 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 110 + }, + "asset": { + "__uuid__": "a0cdb31c-0abb-4e12-9dfe-0bd9e8cd7272", + "__expectedType__": "cc.Prefab" + }, + "fileId": "9ai0wNGzpNXJsQGNNoy6Le", + "instance": { + "__id__": 112 + }, + "targetOverrides": [ + { + "__id__": 118 + } + ] + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "26/4gmDzZDeKf5K9LGEQc3", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 113 + }, + { + "__id__": 115 + }, + { + "__id__": 116 + }, + { + "__id__": 117 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 114 + }, + "propertyPath": [ + "_name" + ], + "value": "prefab_talent_item" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "9ai0wNGzpNXJsQGNNoy6Le" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 114 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -230, + "y": -145, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 114 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 114 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "bg" + ], + "target": null, + "targetInfo": { + "__id__": 119 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "1fQvT1A5hItJZd6AwSBLLo" + ] + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 39 + }, + "_prefab": { + "__id__": 121 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 120 + }, + "asset": { + "__uuid__": "a0cdb31c-0abb-4e12-9dfe-0bd9e8cd7272", + "__expectedType__": "cc.Prefab" + }, + "fileId": "9ai0wNGzpNXJsQGNNoy6Le", + "instance": { + "__id__": 122 + }, + "targetOverrides": [ + { + "__id__": 128 + } + ] + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "6dbKx81CdDh5t4Y9X5h6fK", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 123 + }, + { + "__id__": 125 + }, + { + "__id__": 126 + }, + { + "__id__": 127 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 124 + }, + "propertyPath": [ + "_name" + ], + "value": "prefab_talent_item" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "9ai0wNGzpNXJsQGNNoy6Le" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 124 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -10, + "y": -145, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 124 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 124 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "bg" + ], + "target": null, + "targetInfo": { + "__id__": 129 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "1fQvT1A5hItJZd6AwSBLLo" + ] + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 39 + }, + "_prefab": { + "__id__": 131 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 130 + }, + "asset": { + "__uuid__": "a0cdb31c-0abb-4e12-9dfe-0bd9e8cd7272", + "__expectedType__": "cc.Prefab" + }, + "fileId": "9ai0wNGzpNXJsQGNNoy6Le", + "instance": { + "__id__": 132 + }, + "targetOverrides": [ + { + "__id__": 138 + } + ] + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "0bIoOX/WJNoK3wdJ9nXYIY", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 133 + }, + { + "__id__": 135 + }, + { + "__id__": 136 + }, + { + "__id__": 137 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 134 + }, + "propertyPath": [ + "_name" + ], + "value": "prefab_talent_item" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "9ai0wNGzpNXJsQGNNoy6Le" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 134 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 210, + "y": -145, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 134 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 134 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "bg" + ], + "target": null, + "targetInfo": { + "__id__": 139 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "1fQvT1A5hItJZd6AwSBLLo" + ] + }, { "__type__": "cc.UITransform", "_name": "", @@ -1018,7 +2252,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 141 }, "_contentSize": { "__type__": "cc.Size", @@ -1046,7 +2280,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 143 }, "_alignFlags": 41, "_target": null, @@ -1082,7 +2316,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 145 }, "_resizeMode": 0, "_layoutType": 3, @@ -1092,12 +2326,12 @@ "height": 40 }, "_startAxis": 0, - "_paddingLeft": 15, - "_paddingRight": 15, + "_paddingLeft": 30, + "_paddingRight": 30, "_paddingTop": 30, "_paddingBottom": 0, - "_spacingX": 15, - "_spacingY": 15, + "_spacingX": 20, + "_spacingY": 20, "_verticalDirection": 1, "_horizontalDirection": 0, "_constraint": 2, @@ -1146,7 +2380,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 149 }, "_contentSize": { "__type__": "cc.Size", @@ -1174,7 +2408,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 61 + "__id__": 151 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1219,7 +2453,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 153 }, "_alignFlags": 45, "_target": null, @@ -1268,26 +2502,26 @@ }, "_children": [ { - "__id__": 66 + "__id__": 156 }, { - "__id__": 118 + "__id__": 208 }, { - "__id__": 175 + "__id__": 265 } ], "_active": true, "_components": [ { - "__id__": 232 + "__id__": 322 }, { - "__id__": 234 + "__id__": 324 } ], "_prefab": { - "__id__": 236 + "__id__": 326 }, "_lpos": { "__type__": "cc.Vec3", @@ -1324,33 +2558,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 65 + "__id__": 155 }, "_children": [ { - "__id__": 67 + "__id__": 157 }, { - "__id__": 78 + "__id__": 168 }, { - "__id__": 86 + "__id__": 176 }, { - "__id__": 97 + "__id__": 187 }, { - "__id__": 103 + "__id__": 193 } ], "_active": true, "_components": [ { - "__id__": 115 + "__id__": 205 } ], "_prefab": { - "__id__": 117 + "__id__": 207 }, "_lpos": { "__type__": "cc.Vec3", @@ -1385,17 +2619,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 66 + "__id__": 156 }, "_prefab": { - "__id__": 68 + "__id__": 158 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 67 + "__id__": 157 }, "asset": { "__uuid__": "86a3c4cd-71c7-4502-b713-65f0ace7912a", @@ -1403,7 +2637,7 @@ }, "fileId": "d3jYvT7whFS5scQFZeO5AK", "instance": { - "__id__": 69 + "__id__": 159 }, "targetOverrides": null }, @@ -1417,22 +2651,22 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 70 + "__id__": 160 }, { - "__id__": 72 + "__id__": 162 }, { - "__id__": 73 + "__id__": 163 }, { - "__id__": 74 + "__id__": 164 }, { - "__id__": 75 + "__id__": 165 }, { - "__id__": 76 + "__id__": 166 } ], "removedComponents": [] @@ -1440,7 +2674,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 161 }, "propertyPath": [ "_name" @@ -1456,7 +2690,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 161 }, "propertyPath": [ "_lpos" @@ -1471,7 +2705,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 161 }, "propertyPath": [ "_lrot" @@ -1487,7 +2721,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 161 }, "propertyPath": [ "_euler" @@ -1502,7 +2736,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 161 }, "propertyPath": [ "_active" @@ -1512,7 +2746,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 77 + "__id__": 167 }, "propertyPath": [ "_contentSize" @@ -1533,17 +2767,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 66 + "__id__": 156 }, "_prefab": { - "__id__": 79 + "__id__": 169 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 78 + "__id__": 168 }, "asset": { "__uuid__": "f42da8df-b2a0-49a4-a1ce-dcfe5e62e0c8", @@ -1551,7 +2785,7 @@ }, "fileId": "b6wCk5tlZEMqEmX5Myn34Y", "instance": { - "__id__": 80 + "__id__": 170 }, "targetOverrides": null }, @@ -1565,16 +2799,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 81 + "__id__": 171 }, { - "__id__": 83 + "__id__": 173 }, { - "__id__": 84 + "__id__": 174 }, { - "__id__": 85 + "__id__": 175 } ], "removedComponents": [] @@ -1582,7 +2816,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 82 + "__id__": 172 }, "propertyPath": [ "_name" @@ -1598,7 +2832,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 82 + "__id__": 172 }, "propertyPath": [ "_lpos" @@ -1613,7 +2847,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 82 + "__id__": 172 }, "propertyPath": [ "_lrot" @@ -1629,7 +2863,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 82 + "__id__": 172 }, "propertyPath": [ "_euler" @@ -1645,17 +2879,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 66 + "__id__": 156 }, "_prefab": { - "__id__": 87 + "__id__": 177 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 86 + "__id__": 176 }, "asset": { "__uuid__": "f42da8df-b2a0-49a4-a1ce-dcfe5e62e0c8", @@ -1663,7 +2897,7 @@ }, "fileId": "b6wCk5tlZEMqEmX5Myn34Y", "instance": { - "__id__": 88 + "__id__": 178 }, "targetOverrides": null }, @@ -1677,22 +2911,22 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 89 + "__id__": 179 }, { - "__id__": 91 + "__id__": 181 }, { - "__id__": 92 + "__id__": 182 }, { - "__id__": 93 + "__id__": 183 }, { - "__id__": 94 + "__id__": 184 }, { - "__id__": 96 + "__id__": 186 } ], "removedComponents": [] @@ -1700,7 +2934,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 90 + "__id__": 180 }, "propertyPath": [ "_name" @@ -1716,7 +2950,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 90 + "__id__": 180 }, "propertyPath": [ "_lpos" @@ -1731,7 +2965,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 90 + "__id__": 180 }, "propertyPath": [ "_lrot" @@ -1747,7 +2981,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 90 + "__id__": 180 }, "propertyPath": [ "_euler" @@ -1762,7 +2996,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 95 + "__id__": 185 }, "propertyPath": [ "_color" @@ -1784,7 +3018,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 90 + "__id__": 180 }, "propertyPath": [ "_active" @@ -1797,20 +3031,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 66 + "__id__": 156 }, "_children": [], "_active": true, "_components": [ { - "__id__": 98 + "__id__": 188 }, { - "__id__": 100 + "__id__": 190 } ], "_prefab": { - "__id__": 102 + "__id__": 192 }, "_lpos": { "__type__": "cc.Vec3", @@ -1847,11 +3081,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 97 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 189 }, "_contentSize": { "__type__": "cc.Size", @@ -1875,11 +3109,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 97 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 191 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1956,24 +3190,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 66 + "__id__": 156 }, "_children": [ { - "__id__": 104 + "__id__": 194 } ], "_active": true, "_components": [ { - "__id__": 110 + "__id__": 200 }, { - "__id__": 112 + "__id__": 202 } ], "_prefab": { - "__id__": 114 + "__id__": 204 }, "_lpos": { "__type__": "cc.Vec3", @@ -2010,20 +3244,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 103 + "__id__": 193 }, "_children": [], "_active": true, "_components": [ { - "__id__": 105 + "__id__": 195 }, { - "__id__": 107 + "__id__": 197 } ], "_prefab": { - "__id__": 109 + "__id__": 199 }, "_lpos": { "__type__": "cc.Vec3", @@ -2060,11 +3294,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 104 + "__id__": 194 }, "_enabled": true, "__prefab": { - "__id__": 106 + "__id__": 196 }, "_contentSize": { "__type__": "cc.Size", @@ -2088,11 +3322,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 104 + "__id__": 194 }, "_enabled": true, "__prefab": { - "__id__": 108 + "__id__": 198 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2169,11 +3403,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 103 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 201 }, "_contentSize": { "__type__": "cc.Size", @@ -2197,11 +3431,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 103 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 203 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2255,11 +3489,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 156 }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 206 }, "_contentSize": { "__type__": "cc.Size", @@ -2296,36 +3530,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 65 + "__id__": 155 }, "_children": [ { - "__id__": 119 + "__id__": 209 }, { - "__id__": 130 + "__id__": 220 }, { - "__id__": 138 + "__id__": 228 }, { - "__id__": 148 + "__id__": 238 }, { - "__id__": 154 + "__id__": 244 }, { - "__id__": 160 + "__id__": 250 } ], "_active": true, "_components": [ { - "__id__": 172 + "__id__": 262 } ], "_prefab": { - "__id__": 174 + "__id__": 264 }, "_lpos": { "__type__": "cc.Vec3", @@ -2360,17 +3594,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 118 + "__id__": 208 }, "_prefab": { - "__id__": 120 + "__id__": 210 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 119 + "__id__": 209 }, "asset": { "__uuid__": "86a3c4cd-71c7-4502-b713-65f0ace7912a", @@ -2378,7 +3612,7 @@ }, "fileId": "d3jYvT7whFS5scQFZeO5AK", "instance": { - "__id__": 121 + "__id__": 211 }, "targetOverrides": null }, @@ -2392,22 +3626,22 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 122 + "__id__": 212 }, { - "__id__": 124 + "__id__": 214 }, { - "__id__": 125 + "__id__": 215 }, { - "__id__": 126 + "__id__": 216 }, { - "__id__": 127 + "__id__": 217 }, { - "__id__": 128 + "__id__": 218 } ], "removedComponents": [] @@ -2415,7 +3649,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 123 + "__id__": 213 }, "propertyPath": [ "_name" @@ -2431,7 +3665,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 123 + "__id__": 213 }, "propertyPath": [ "_lpos" @@ -2446,7 +3680,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 123 + "__id__": 213 }, "propertyPath": [ "_lrot" @@ -2462,7 +3696,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 123 + "__id__": 213 }, "propertyPath": [ "_euler" @@ -2477,7 +3711,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 123 + "__id__": 213 }, "propertyPath": [ "_active" @@ -2487,7 +3721,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 129 + "__id__": 219 }, "propertyPath": [ "_contentSize" @@ -2508,17 +3742,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 118 + "__id__": 208 }, "_prefab": { - "__id__": 131 + "__id__": 221 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 130 + "__id__": 220 }, "asset": { "__uuid__": "f42da8df-b2a0-49a4-a1ce-dcfe5e62e0c8", @@ -2526,7 +3760,7 @@ }, "fileId": "b6wCk5tlZEMqEmX5Myn34Y", "instance": { - "__id__": 132 + "__id__": 222 }, "targetOverrides": null }, @@ -2540,16 +3774,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 133 + "__id__": 223 }, { - "__id__": 135 + "__id__": 225 }, { - "__id__": 136 + "__id__": 226 }, { - "__id__": 137 + "__id__": 227 } ], "removedComponents": [] @@ -2557,7 +3791,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 134 + "__id__": 224 }, "propertyPath": [ "_name" @@ -2573,7 +3807,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 134 + "__id__": 224 }, "propertyPath": [ "_lpos" @@ -2588,7 +3822,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 134 + "__id__": 224 }, "propertyPath": [ "_lrot" @@ -2604,7 +3838,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 134 + "__id__": 224 }, "propertyPath": [ "_euler" @@ -2620,17 +3854,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 118 + "__id__": 208 }, "_prefab": { - "__id__": 139 + "__id__": 229 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 138 + "__id__": 228 }, "asset": { "__uuid__": "f42da8df-b2a0-49a4-a1ce-dcfe5e62e0c8", @@ -2638,7 +3872,7 @@ }, "fileId": "b6wCk5tlZEMqEmX5Myn34Y", "instance": { - "__id__": 140 + "__id__": 230 }, "targetOverrides": null }, @@ -2652,19 +3886,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 141 + "__id__": 231 }, { - "__id__": 143 + "__id__": 233 }, { - "__id__": 144 + "__id__": 234 }, { - "__id__": 145 + "__id__": 235 }, { - "__id__": 146 + "__id__": 236 } ], "removedComponents": [] @@ -2672,7 +3906,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 142 + "__id__": 232 }, "propertyPath": [ "_name" @@ -2688,7 +3922,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 142 + "__id__": 232 }, "propertyPath": [ "_lpos" @@ -2703,7 +3937,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 142 + "__id__": 232 }, "propertyPath": [ "_lrot" @@ -2719,7 +3953,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 142 + "__id__": 232 }, "propertyPath": [ "_euler" @@ -2734,7 +3968,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 147 + "__id__": 237 }, "propertyPath": [ "_color" @@ -2759,20 +3993,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 118 + "__id__": 208 }, "_children": [], "_active": true, "_components": [ { - "__id__": 149 + "__id__": 239 }, { - "__id__": 151 + "__id__": 241 } ], "_prefab": { - "__id__": 153 + "__id__": 243 }, "_lpos": { "__type__": "cc.Vec3", @@ -2809,11 +4043,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 148 + "__id__": 238 }, "_enabled": true, "__prefab": { - "__id__": 150 + "__id__": 240 }, "_contentSize": { "__type__": "cc.Size", @@ -2837,11 +4071,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 148 + "__id__": 238 }, "_enabled": true, "__prefab": { - "__id__": 152 + "__id__": 242 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2918,20 +4152,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 118 + "__id__": 208 }, "_children": [], "_active": true, "_components": [ { - "__id__": 155 + "__id__": 245 }, { - "__id__": 157 + "__id__": 247 } ], "_prefab": { - "__id__": 159 + "__id__": 249 }, "_lpos": { "__type__": "cc.Vec3", @@ -2968,11 +4202,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 154 + "__id__": 244 }, "_enabled": true, "__prefab": { - "__id__": 156 + "__id__": 246 }, "_contentSize": { "__type__": "cc.Size", @@ -2996,11 +4230,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 154 + "__id__": 244 }, "_enabled": true, "__prefab": { - "__id__": 158 + "__id__": 248 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3051,24 +4285,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 118 + "__id__": 208 }, "_children": [ { - "__id__": 161 + "__id__": 251 } ], "_active": true, "_components": [ { - "__id__": 167 + "__id__": 257 }, { - "__id__": 169 + "__id__": 259 } ], "_prefab": { - "__id__": 171 + "__id__": 261 }, "_lpos": { "__type__": "cc.Vec3", @@ -3105,20 +4339,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 160 + "__id__": 250 }, "_children": [], "_active": true, "_components": [ { - "__id__": 162 + "__id__": 252 }, { - "__id__": 164 + "__id__": 254 } ], "_prefab": { - "__id__": 166 + "__id__": 256 }, "_lpos": { "__type__": "cc.Vec3", @@ -3155,11 +4389,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 161 + "__id__": 251 }, "_enabled": true, "__prefab": { - "__id__": 163 + "__id__": 253 }, "_contentSize": { "__type__": "cc.Size", @@ -3183,11 +4417,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 161 + "__id__": 251 }, "_enabled": true, "__prefab": { - "__id__": 165 + "__id__": 255 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3264,11 +4498,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 160 + "__id__": 250 }, "_enabled": true, "__prefab": { - "__id__": 168 + "__id__": 258 }, "_contentSize": { "__type__": "cc.Size", @@ -3292,11 +4526,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 160 + "__id__": 250 }, "_enabled": true, "__prefab": { - "__id__": 170 + "__id__": 260 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3350,11 +4584,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 118 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 173 + "__id__": 263 }, "_contentSize": { "__type__": "cc.Size", @@ -3391,36 +4625,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 65 + "__id__": 155 }, "_children": [ { - "__id__": 176 + "__id__": 266 }, { - "__id__": 187 + "__id__": 277 }, { - "__id__": 195 + "__id__": 285 }, { - "__id__": 205 + "__id__": 295 }, { - "__id__": 211 + "__id__": 301 }, { - "__id__": 217 + "__id__": 307 } ], "_active": true, "_components": [ { - "__id__": 229 + "__id__": 319 } ], "_prefab": { - "__id__": 231 + "__id__": 321 }, "_lpos": { "__type__": "cc.Vec3", @@ -3455,17 +4689,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 175 + "__id__": 265 }, "_prefab": { - "__id__": 177 + "__id__": 267 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 176 + "__id__": 266 }, "asset": { "__uuid__": "86a3c4cd-71c7-4502-b713-65f0ace7912a", @@ -3473,7 +4707,7 @@ }, "fileId": "d3jYvT7whFS5scQFZeO5AK", "instance": { - "__id__": 178 + "__id__": 268 }, "targetOverrides": null }, @@ -3487,22 +4721,22 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 179 + "__id__": 269 }, { - "__id__": 181 + "__id__": 271 }, { - "__id__": 182 + "__id__": 272 }, { - "__id__": 183 + "__id__": 273 }, { - "__id__": 184 + "__id__": 274 }, { - "__id__": 185 + "__id__": 275 } ], "removedComponents": [] @@ -3510,7 +4744,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 180 + "__id__": 270 }, "propertyPath": [ "_name" @@ -3526,7 +4760,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 180 + "__id__": 270 }, "propertyPath": [ "_lpos" @@ -3541,7 +4775,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 180 + "__id__": 270 }, "propertyPath": [ "_lrot" @@ -3557,7 +4791,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 180 + "__id__": 270 }, "propertyPath": [ "_euler" @@ -3572,7 +4806,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 180 + "__id__": 270 }, "propertyPath": [ "_active" @@ -3582,7 +4816,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 186 + "__id__": 276 }, "propertyPath": [ "_contentSize" @@ -3603,17 +4837,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 175 + "__id__": 265 }, "_prefab": { - "__id__": 188 + "__id__": 278 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 187 + "__id__": 277 }, "asset": { "__uuid__": "f42da8df-b2a0-49a4-a1ce-dcfe5e62e0c8", @@ -3621,7 +4855,7 @@ }, "fileId": "b6wCk5tlZEMqEmX5Myn34Y", "instance": { - "__id__": 189 + "__id__": 279 }, "targetOverrides": null }, @@ -3635,16 +4869,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 190 + "__id__": 280 }, { - "__id__": 192 + "__id__": 282 }, { - "__id__": 193 + "__id__": 283 }, { - "__id__": 194 + "__id__": 284 } ], "removedComponents": [] @@ -3652,7 +4886,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 191 + "__id__": 281 }, "propertyPath": [ "_name" @@ -3668,7 +4902,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 191 + "__id__": 281 }, "propertyPath": [ "_lpos" @@ -3683,7 +4917,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 191 + "__id__": 281 }, "propertyPath": [ "_lrot" @@ -3699,7 +4933,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 191 + "__id__": 281 }, "propertyPath": [ "_euler" @@ -3715,17 +4949,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 175 + "__id__": 265 }, "_prefab": { - "__id__": 196 + "__id__": 286 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 195 + "__id__": 285 }, "asset": { "__uuid__": "f42da8df-b2a0-49a4-a1ce-dcfe5e62e0c8", @@ -3733,7 +4967,7 @@ }, "fileId": "b6wCk5tlZEMqEmX5Myn34Y", "instance": { - "__id__": 197 + "__id__": 287 }, "targetOverrides": null }, @@ -3747,19 +4981,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 198 + "__id__": 288 }, { - "__id__": 200 + "__id__": 290 }, { - "__id__": 201 + "__id__": 291 }, { - "__id__": 202 + "__id__": 292 }, { - "__id__": 203 + "__id__": 293 } ], "removedComponents": [] @@ -3767,7 +5001,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 199 + "__id__": 289 }, "propertyPath": [ "_name" @@ -3783,7 +5017,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 199 + "__id__": 289 }, "propertyPath": [ "_lpos" @@ -3798,7 +5032,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 199 + "__id__": 289 }, "propertyPath": [ "_lrot" @@ -3814,7 +5048,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 199 + "__id__": 289 }, "propertyPath": [ "_euler" @@ -3829,7 +5063,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 204 + "__id__": 294 }, "propertyPath": [ "_color" @@ -3854,20 +5088,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 175 + "__id__": 265 }, "_children": [], "_active": true, "_components": [ { - "__id__": 206 + "__id__": 296 }, { - "__id__": 208 + "__id__": 298 } ], "_prefab": { - "__id__": 210 + "__id__": 300 }, "_lpos": { "__type__": "cc.Vec3", @@ -3904,11 +5138,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 205 + "__id__": 295 }, "_enabled": true, "__prefab": { - "__id__": 207 + "__id__": 297 }, "_contentSize": { "__type__": "cc.Size", @@ -3932,11 +5166,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 205 + "__id__": 295 }, "_enabled": true, "__prefab": { - "__id__": 209 + "__id__": 299 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4013,20 +5247,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 175 + "__id__": 265 }, "_children": [], "_active": true, "_components": [ { - "__id__": 212 + "__id__": 302 }, { - "__id__": 214 + "__id__": 304 } ], "_prefab": { - "__id__": 216 + "__id__": 306 }, "_lpos": { "__type__": "cc.Vec3", @@ -4063,11 +5297,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 211 + "__id__": 301 }, "_enabled": true, "__prefab": { - "__id__": 213 + "__id__": 303 }, "_contentSize": { "__type__": "cc.Size", @@ -4091,11 +5325,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 211 + "__id__": 301 }, "_enabled": true, "__prefab": { - "__id__": 215 + "__id__": 305 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4146,24 +5380,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 175 + "__id__": 265 }, "_children": [ { - "__id__": 218 + "__id__": 308 } ], "_active": true, "_components": [ { - "__id__": 224 + "__id__": 314 }, { - "__id__": 226 + "__id__": 316 } ], "_prefab": { - "__id__": 228 + "__id__": 318 }, "_lpos": { "__type__": "cc.Vec3", @@ -4200,20 +5434,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 217 + "__id__": 307 }, "_children": [], "_active": true, "_components": [ { - "__id__": 219 + "__id__": 309 }, { - "__id__": 221 + "__id__": 311 } ], "_prefab": { - "__id__": 223 + "__id__": 313 }, "_lpos": { "__type__": "cc.Vec3", @@ -4250,11 +5484,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 218 + "__id__": 308 }, "_enabled": true, "__prefab": { - "__id__": 220 + "__id__": 310 }, "_contentSize": { "__type__": "cc.Size", @@ -4278,11 +5512,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 218 + "__id__": 308 }, "_enabled": true, "__prefab": { - "__id__": 222 + "__id__": 312 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4359,11 +5593,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 217 + "__id__": 307 }, "_enabled": true, "__prefab": { - "__id__": 225 + "__id__": 315 }, "_contentSize": { "__type__": "cc.Size", @@ -4387,11 +5621,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 217 + "__id__": 307 }, "_enabled": true, "__prefab": { - "__id__": 227 + "__id__": 317 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4445,11 +5679,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 175 + "__id__": 265 }, "_enabled": true, "__prefab": { - "__id__": 230 + "__id__": 320 }, "_contentSize": { "__type__": "cc.Size", @@ -4486,11 +5720,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 155 }, "_enabled": true, "__prefab": { - "__id__": 233 + "__id__": 323 }, "_contentSize": { "__type__": "cc.Size", @@ -4514,11 +5748,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 155 }, "_enabled": true, "__prefab": { - "__id__": 235 + "__id__": 325 }, "_resizeMode": 1, "_layoutType": 1, @@ -4569,20 +5803,20 @@ }, "_children": [ { - "__id__": 238 + "__id__": 328 } ], "_active": true, "_components": [ { - "__id__": 246 + "__id__": 336 }, { - "__id__": 248 + "__id__": 338 } ], "_prefab": { - "__id__": 250 + "__id__": 340 }, "_lpos": { "__type__": "cc.Vec3", @@ -4619,23 +5853,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 237 + "__id__": 327 }, "_children": [], "_active": true, "_components": [ { - "__id__": 239 + "__id__": 329 }, { - "__id__": 241 + "__id__": 331 }, { - "__id__": 243 + "__id__": 333 } ], "_prefab": { - "__id__": 245 + "__id__": 335 }, "_lpos": { "__type__": "cc.Vec3", @@ -4672,11 +5906,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 238 + "__id__": 328 }, "_enabled": true, "__prefab": { - "__id__": 240 + "__id__": 330 }, "_contentSize": { "__type__": "cc.Size", @@ -4700,11 +5934,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 238 + "__id__": 328 }, "_enabled": true, "__prefab": { - "__id__": 242 + "__id__": 332 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4745,11 +5979,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 238 + "__id__": 328 }, "_enabled": true, "__prefab": { - "__id__": 244 + "__id__": 334 }, "_alignFlags": 45, "_target": null, @@ -4794,11 +6028,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 237 + "__id__": 327 }, "_enabled": true, "__prefab": { - "__id__": 247 + "__id__": 337 }, "_contentSize": { "__type__": "cc.Size", @@ -4822,11 +6056,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 237 + "__id__": 327 }, "_enabled": true, "__prefab": { - "__id__": 249 + "__id__": 339 }, "_alignFlags": 41, "_target": null, @@ -4875,29 +6109,29 @@ }, "_children": [ { - "__id__": 252 + "__id__": 342 }, { - "__id__": 264 + "__id__": 354 }, { - "__id__": 282 + "__id__": 372 } ], "_active": true, "_components": [ { - "__id__": 294 + "__id__": 384 }, { - "__id__": 296 + "__id__": 386 }, { - "__id__": 298 + "__id__": 388 } ], "_prefab": { - "__id__": 300 + "__id__": 390 }, "_lpos": { "__type__": "cc.Vec3", @@ -4934,24 +6168,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 251 + "__id__": 341 }, "_children": [ { - "__id__": 253 + "__id__": 343 } ], "_active": true, "_components": [ { - "__id__": 259 + "__id__": 349 }, { - "__id__": 261 + "__id__": 351 } ], "_prefab": { - "__id__": 263 + "__id__": 353 }, "_lpos": { "__type__": "cc.Vec3", @@ -4988,20 +6222,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 252 + "__id__": 342 }, "_children": [], "_active": true, "_components": [ { - "__id__": 254 + "__id__": 344 }, { - "__id__": 256 + "__id__": 346 } ], "_prefab": { - "__id__": 258 + "__id__": 348 }, "_lpos": { "__type__": "cc.Vec3", @@ -5038,11 +6272,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 253 + "__id__": 343 }, "_enabled": true, "__prefab": { - "__id__": 255 + "__id__": 345 }, "_contentSize": { "__type__": "cc.Size", @@ -5066,11 +6300,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 253 + "__id__": 343 }, "_enabled": true, "__prefab": { - "__id__": 257 + "__id__": 347 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5147,11 +6381,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 252 + "__id__": 342 }, "_enabled": true, "__prefab": { - "__id__": 260 + "__id__": 350 }, "_contentSize": { "__type__": "cc.Size", @@ -5175,11 +6409,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 252 + "__id__": 342 }, "_enabled": true, "__prefab": { - "__id__": 262 + "__id__": 352 }, "_alignFlags": 32, "_target": null, @@ -5224,21 +6458,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 251 + "__id__": 341 }, "_children": [ { - "__id__": 265 + "__id__": 355 } ], "_active": true, "_components": [ { - "__id__": 279 + "__id__": 369 } ], "_prefab": { - "__id__": 281 + "__id__": 371 }, "_lpos": { "__type__": "cc.Vec3", @@ -5275,27 +6509,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 264 + "__id__": 354 }, "_children": [ { - "__id__": 266 + "__id__": 356 } ], "_active": true, "_components": [ { - "__id__": 272 + "__id__": 362 }, { - "__id__": 274 + "__id__": 364 }, { - "__id__": 276 + "__id__": 366 } ], "_prefab": { - "__id__": 278 + "__id__": 368 }, "_lpos": { "__type__": "cc.Vec3", @@ -5332,20 +6566,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 265 + "__id__": 355 }, "_children": [], "_active": true, "_components": [ { - "__id__": 267 + "__id__": 357 }, { - "__id__": 269 + "__id__": 359 } ], "_prefab": { - "__id__": 271 + "__id__": 361 }, "_lpos": { "__type__": "cc.Vec3", @@ -5382,11 +6616,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 266 + "__id__": 356 }, "_enabled": true, "__prefab": { - "__id__": 268 + "__id__": 358 }, "_contentSize": { "__type__": "cc.Size", @@ -5410,11 +6644,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 266 + "__id__": 356 }, "_enabled": true, "__prefab": { - "__id__": 270 + "__id__": 360 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5471,11 +6705,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 265 + "__id__": 355 }, "_enabled": true, "__prefab": { - "__id__": 273 + "__id__": 363 }, "_contentSize": { "__type__": "cc.Size", @@ -5499,11 +6733,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 265 + "__id__": 355 }, "_enabled": true, "__prefab": { - "__id__": 275 + "__id__": 365 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5547,14 +6781,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 265 + "__id__": 355 }, "_enabled": true, "__prefab": { - "__id__": 277 + "__id__": 367 }, "_barSprite": { - "__id__": 269 + "__id__": 359 }, "_mode": 0, "_totalLength": 800, @@ -5585,11 +6819,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 264 + "__id__": 354 }, "_enabled": true, "__prefab": { - "__id__": 280 + "__id__": 370 }, "_contentSize": { "__type__": "cc.Size", @@ -5626,24 +6860,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 251 + "__id__": 341 }, "_children": [ { - "__id__": 283 + "__id__": 373 } ], "_active": true, "_components": [ { - "__id__": 289 + "__id__": 379 }, { - "__id__": 291 + "__id__": 381 } ], "_prefab": { - "__id__": 293 + "__id__": 383 }, "_lpos": { "__type__": "cc.Vec3", @@ -5680,20 +6914,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 282 + "__id__": 372 }, "_children": [], "_active": true, "_components": [ { - "__id__": 284 + "__id__": 374 }, { - "__id__": 286 + "__id__": 376 } ], "_prefab": { - "__id__": 288 + "__id__": 378 }, "_lpos": { "__type__": "cc.Vec3", @@ -5730,11 +6964,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 283 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 285 + "__id__": 375 }, "_contentSize": { "__type__": "cc.Size", @@ -5758,11 +6992,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 283 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 287 + "__id__": 377 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5839,11 +7073,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 282 + "__id__": 372 }, "_enabled": true, "__prefab": { - "__id__": 290 + "__id__": 380 }, "_contentSize": { "__type__": "cc.Size", @@ -5867,11 +7101,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 282 + "__id__": 372 }, "_enabled": true, "__prefab": { - "__id__": 292 + "__id__": 382 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5928,11 +7162,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 251 + "__id__": 341 }, "_enabled": true, "__prefab": { - "__id__": 295 + "__id__": 385 }, "_contentSize": { "__type__": "cc.Size", @@ -5956,11 +7190,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 251 + "__id__": 341 }, "_enabled": false, "__prefab": { - "__id__": 297 + "__id__": 387 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6001,11 +7235,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 251 + "__id__": 341 }, "_enabled": true, "__prefab": { - "__id__": 299 + "__id__": 389 }, "_alignFlags": 41, "_target": null, @@ -6056,17 +7290,17 @@ "_active": true, "_components": [ { - "__id__": 302 + "__id__": 392 }, { - "__id__": 304 + "__id__": 394 }, { - "__id__": 306 + "__id__": 396 } ], "_prefab": { - "__id__": 308 + "__id__": 398 }, "_lpos": { "__type__": "cc.Vec3", @@ -6103,11 +7337,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 301 + "__id__": 391 }, "_enabled": true, "__prefab": { - "__id__": 303 + "__id__": 393 }, "_contentSize": { "__type__": "cc.Size", @@ -6131,11 +7365,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 301 + "__id__": 391 }, "_enabled": true, "__prefab": { - "__id__": 305 + "__id__": 395 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6199,11 +7433,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 301 + "__id__": 391 }, "_enabled": true, "__prefab": { - "__id__": 307 + "__id__": 397 }, "_alignFlags": 9, "_target": null, @@ -6252,7 +7486,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 310 + "__id__": 400 }, "_contentSize": { "__type__": "cc.Size", @@ -6280,7 +7514,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 312 + "__id__": 402 }, "_alignFlags": 45, "_target": null, @@ -6316,7 +7550,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 314 + "__id__": 404 }, "talents_content": { "__id__": 39 @@ -6326,40 +7560,40 @@ "__expectedType__": "cc.Prefab" }, "lbl_points": { - "__id__": 256 + "__id__": 346 }, "lbl_lv": { - "__id__": 286 + "__id__": 376 }, "progress_exp": { - "__id__": 276 + "__id__": 366 }, "tab_basic": { - "__id__": 66 + "__id__": 156 }, "tab_special": { - "__id__": 118 - }, - "tab_super": { - "__id__": 175 - }, - "lbl_tab_basic": { - "__id__": 100 - }, - "lbl_tab_special": { - "__id__": 151 - }, - "lbl_tab_super": { "__id__": 208 }, + "tab_super": { + "__id__": 265 + }, + "lbl_tab_basic": { + "__id__": 190 + }, + "lbl_tab_special": { + "__id__": 241 + }, + "lbl_tab_super": { + "__id__": 298 + }, "lbl_invest_basic": { - "__id__": 107 + "__id__": 197 }, "lbl_invest_special": { - "__id__": 164 + "__id__": 254 }, "lbl_invest_super": { - "__id__": 221 + "__id__": 311 }, "btn_reset": null, "_id": "" @@ -6381,31 +7615,58 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 195 + "__id__": 285 }, { - "__id__": 187 + "__id__": 277 + }, + { + "__id__": 266 + }, + { + "__id__": 228 + }, + { + "__id__": 220 + }, + { + "__id__": 209 }, { "__id__": 176 }, { - "__id__": 138 + "__id__": 168 + }, + { + "__id__": 157 }, { "__id__": 130 }, { - "__id__": 119 + "__id__": 120 }, { - "__id__": 86 + "__id__": 110 }, { - "__id__": 78 + "__id__": 100 }, { - "__id__": 67 + "__id__": 90 + }, + { + "__id__": 80 + }, + { + "__id__": 70 + }, + { + "__id__": 60 + }, + { + "__id__": 50 }, { "__id__": 2 diff --git a/assets/script/game/map/TalentItemComp.ts b/assets/script/game/map/TalentItemComp.ts index 8dce46f2..8f989fd8 100644 --- a/assets/script/game/map/TalentItemComp.ts +++ b/assets/script/game/map/TalentItemComp.ts @@ -6,7 +6,7 @@ * 1. 接收 TalentsComp 下发的天赋配置 + 当前等级 + 阶位解锁态，渲染迷你点选卡。 * 2. 卡面自包含：图标 / 名称 / 当前已生效数值（Lv0 显示每级数值引导）/ 右下「当前/满级」角标。 * 3. 阶位背景：普通背景节点下挂 blue / red / yellow 三个颜色子节点，按阶位激活其一（Ⅰ蓝 / Ⅱ红 / Ⅲ金）。 - * 4. 状态机：满级（MAX 金角标）/ 未激活（左上锁角标 + 背景与图标灰阶 Grayscale）。 + * 4. 状态机：满级（MAX 金角标）/ 未激活（左上锁角标，不再做灰阶处理）。 * 5. 点击回调上抛卡体点击，加点确认弹窗与升级校验统一由 TalentsComp 处理（单一决策点）。 * * 依赖： @@ -85,11 +85,11 @@ export class TalentItemComp extends CCComp { if (this.lbl_info) this.lbl_info.string = getTalentDisplayText(cfg, lv); if (this.lbl_lv) this.lbl_lv.string = `${lv}/${cfg.max_lv}`; - // 未激活（Lv0 或阶位未解锁）：背景与图标灰阶 + // 未激活（Lv0 或阶位未解锁）：仅显示 node_lock 锁遮罩，不做灰阶处理 const inactive = lv <= 0 || !tierUnlocked; // 阶位背景：激活对应颜色子节点（Ⅰ蓝 / Ⅱ红 / Ⅲ金） - if (this.bg) this.applyTierBg(cfg.tier, inactive); + if (this.bg) this.applyTierBg(cfg.tier); // 图标：技能图标图集（gui/ui7）优先，资源目录回退（与 SCardComp 口径一致） if (this.icon && cfg.icon) { @@ -101,7 +101,6 @@ export class TalentItemComp extends CCComp { frame = oops.res.get("game/heros/cards/" + cfg.icon, SpriteFrame) as SpriteFrame; } if (frame) this.icon.spriteFrame = frame; - this.icon.grayscale = inactive; } // 状态角标：满级 MAX / 未激活锁角标（未加点或阶位未解锁，置于左上角） @@ -109,16 +108,13 @@ export class TalentItemComp extends CCComp { if (this.node_lock) this.node_lock.active = inactive; } - /** 按阶位激活 bg 下对应颜色子节点，其余隐藏；未激活时全部开启灰阶 */ - private applyTierBg(tier: TalentTier, inactive: boolean): void { + /** 按阶位激活 bg 下对应颜色子节点，其余隐藏 */ + private applyTierBg(tier: TalentTier): void { const curName = TIER_BG_CHILD_NAMES[tier]; for (const [, name] of Object.entries(TIER_BG_CHILD_NAMES)) { const child = this.bg.getChildByName(name); if (!child) continue; child.active = name === curName; - // Sprite 内置灰阶材质，未激活天赋的背景置灰 - const render = child.getComponent(Sprite); - if (render) render.grayscale = inactive; } }