diff --git a/assets/resources/game/map/map_rpg.prefab b/assets/resources/game/map/map_rpg.prefab index ebe22270..6d0f061e 100644 --- a/assets/resources/game/map/map_rpg.prefab +++ b/assets/resources/game/map/map_rpg.prefab @@ -28,17 +28,17 @@ "_active": true, "_components": [ { - "__id__": 120 + "__id__": 130 }, { - "__id__": 122 + "__id__": 132 }, { - "__id__": 124 + "__id__": 134 } ], "_prefab": { - "__id__": 126 + "__id__": 136 }, "_lpos": { "__type__": "cc.Vec3", @@ -197,17 +197,17 @@ "_active": true, "_components": [ { - "__id__": 113 + "__id__": 123 }, { - "__id__": 115 + "__id__": 125 }, { - "__id__": 117 + "__id__": 127 } ], "_prefab": { - "__id__": 119 + "__id__": 129 }, "_lpos": { "__type__": "cc.Vec3", @@ -251,23 +251,23 @@ "__id__": 8 }, { - "__id__": 66 + "__id__": 76 }, { - "__id__": 70 + "__id__": 80 }, { - "__id__": 104 + "__id__": 114 } ], "_active": true, "_components": [ { - "__id__": 110 + "__id__": 120 } ], "_prefab": { - "__id__": 112 + "__id__": 122 }, "_lpos": { "__type__": "cc.Vec3", @@ -312,19 +312,22 @@ }, { "__id__": 57 + }, + { + "__id__": 67 } ], "_active": true, "_components": [ { - "__id__": 61 + "__id__": 71 }, { - "__id__": 63 + "__id__": 73 } ], "_prefab": { - "__id__": 65 + "__id__": 75 }, "_lpos": { "__type__": "cc.Vec3", @@ -357,7 +360,7 @@ }, { "__type__": "cc.Node", - "_name": "maps", + "_name": "fight", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -991,7 +994,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, + "x": -9.387, "y": -43.92, "z": 0 }, @@ -1456,6 +1459,234 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "main", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 8 + }, + "_children": [ + { + "__id__": 58 + } + ], + "_active": false, + "_components": [ + { + "__id__": 64 + } + ], + "_prefab": { + "__id__": 66 + }, + "_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": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "1_Lobby", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 57 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 59 + }, + { + "__id__": 61 + } + ], + "_prefab": { + "__id__": 63 + }, + "_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": 2, + "y": 2, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 58 + }, + "_enabled": true, + "__prefab": { + "__id__": 60 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 432, + "height": 936 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0e18K7RrtFlJdnHk0ZPrmZ" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 58 + }, + "_enabled": true, + "__prefab": { + "__id__": 62 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780@fe1eb", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2ehPuc5IRMr7wJTRutqDQe" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "71XEQ7teRJxLirxzocu773", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 57 + }, + "_enabled": true, + "__prefab": { + "__id__": 65 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e1MvAbrRhD5aP+s7KLy8Pt" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "1do9aUUb1AVJtdvOEYrrX8", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.Node", "_name": "loading", @@ -1468,11 +1699,11 @@ "_active": false, "_components": [ { - "__id__": 58 + "__id__": 68 } ], "_prefab": { - "__id__": 60 + "__id__": 70 }, "_lpos": { "__type__": "cc.Vec3", @@ -1509,11 +1740,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 67 }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 69 }, "_contentSize": { "__type__": "cc.Size", @@ -1554,7 +1785,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 72 }, "_contentSize": { "__type__": "cc.Size", @@ -1582,7 +1813,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 74 }, "bgImg": null, "_id": "" @@ -1616,11 +1847,11 @@ "_active": true, "_components": [ { - "__id__": 67 + "__id__": 77 } ], "_prefab": { - "__id__": 69 + "__id__": 79 }, "_lpos": { "__type__": "cc.Vec3", @@ -1657,11 +1888,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 76 }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 78 }, "_contentSize": { "__type__": "cc.Size", @@ -1702,38 +1933,38 @@ }, "_children": [ { - "__id__": 71 + "__id__": 81 }, { - "__id__": 75 + "__id__": 85 }, { - "__id__": 79 + "__id__": 89 }, { - "__id__": 83 + "__id__": 93 }, { - "__id__": 87 + "__id__": 97 }, { - "__id__": 91 + "__id__": 101 }, { - "__id__": 95 + "__id__": 105 } ], "_active": true, "_components": [ { - "__id__": 99 + "__id__": 109 }, { - "__id__": 101 + "__id__": 111 } ], "_prefab": { - "__id__": 103 + "__id__": 113 }, "_lpos": { "__type__": "cc.Vec3", @@ -1770,17 +2001,17 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 70 + "__id__": 80 }, "_children": [], "_active": true, "_components": [ { - "__id__": 72 + "__id__": 82 } ], "_prefab": { - "__id__": 74 + "__id__": 84 }, "_lpos": { "__type__": "cc.Vec3", @@ -1817,11 +2048,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 71 + "__id__": 81 }, "_enabled": true, "__prefab": { - "__id__": 73 + "__id__": 83 }, "_contentSize": { "__type__": "cc.Size", @@ -1858,17 +2089,17 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 70 + "__id__": 80 }, "_children": [], "_active": true, "_components": [ { - "__id__": 76 + "__id__": 86 } ], "_prefab": { - "__id__": 78 + "__id__": 88 }, "_lpos": { "__type__": "cc.Vec3", @@ -1905,11 +2136,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 85 }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -1946,17 +2177,17 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 70 + "__id__": 80 }, "_children": [], "_active": true, "_components": [ { - "__id__": 80 + "__id__": 90 } ], "_prefab": { - "__id__": 82 + "__id__": 92 }, "_lpos": { "__type__": "cc.Vec3", @@ -1993,11 +2224,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 79 + "__id__": 89 }, "_enabled": true, "__prefab": { - "__id__": 81 + "__id__": 91 }, "_contentSize": { "__type__": "cc.Size", @@ -2034,17 +2265,17 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 70 + "__id__": 80 }, "_children": [], "_active": true, "_components": [ { - "__id__": 84 + "__id__": 94 } ], "_prefab": { - "__id__": 86 + "__id__": 96 }, "_lpos": { "__type__": "cc.Vec3", @@ -2081,11 +2312,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 83 + "__id__": 93 }, "_enabled": true, "__prefab": { - "__id__": 85 + "__id__": 95 }, "_contentSize": { "__type__": "cc.Size", @@ -2122,17 +2353,17 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 70 + "__id__": 80 }, "_children": [], "_active": true, "_components": [ { - "__id__": 88 + "__id__": 98 } ], "_prefab": { - "__id__": 90 + "__id__": 100 }, "_lpos": { "__type__": "cc.Vec3", @@ -2169,11 +2400,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 87 + "__id__": 97 }, "_enabled": true, "__prefab": { - "__id__": 89 + "__id__": 99 }, "_contentSize": { "__type__": "cc.Size", @@ -2210,17 +2441,17 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 70 + "__id__": 80 }, "_children": [], "_active": true, "_components": [ { - "__id__": 92 + "__id__": 102 } ], "_prefab": { - "__id__": 94 + "__id__": 104 }, "_lpos": { "__type__": "cc.Vec3", @@ -2257,11 +2488,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 101 }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 103 }, "_contentSize": { "__type__": "cc.Size", @@ -2298,17 +2529,17 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 70 + "__id__": 80 }, "_children": [], "_active": true, "_components": [ { - "__id__": 96 + "__id__": 106 } ], "_prefab": { - "__id__": 98 + "__id__": 108 }, "_lpos": { "__type__": "cc.Vec3", @@ -2345,11 +2576,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 105 }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 107 }, "_contentSize": { "__type__": "cc.Size", @@ -2386,11 +2617,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 80 }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 110 }, "_contentSize": { "__type__": "cc.Size", @@ -2414,11 +2645,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 80 }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 112 }, "_id": "" }, @@ -2451,14 +2682,14 @@ "_active": true, "_components": [ { - "__id__": 105 + "__id__": 115 }, { - "__id__": 107 + "__id__": 117 } ], "_prefab": { - "__id__": 109 + "__id__": 119 }, "_lpos": { "__type__": "cc.Vec3", @@ -2495,11 +2726,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 104 + "__id__": 114 }, "_enabled": true, "__prefab": { - "__id__": 106 + "__id__": 116 }, "_contentSize": { "__type__": "cc.Size", @@ -2523,11 +2754,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 104 + "__id__": 114 }, "_enabled": true, "__prefab": { - "__id__": 108 + "__id__": 118 }, "light": null, "_id": "" @@ -2559,7 +2790,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 121 }, "_contentSize": { "__type__": "cc.Size", @@ -2600,7 +2831,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 124 }, "_contentSize": { "__type__": "cc.Size", @@ -2628,7 +2859,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 126 }, "camera": { "__id__": 3 @@ -2637,16 +2868,16 @@ "__id__": 7 }, "mapLayer": { - "__id__": 63 + "__id__": 73 }, "floorLayer": { - "__id__": 66 + "__id__": 76 }, "entityLayer": { - "__id__": 101 + "__id__": 111 }, "SkillLayer": { - "__id__": 107 + "__id__": 117 }, "isFollowPlayer": true, "_id": "" @@ -2665,7 +2896,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 128 }, "_id": "" }, @@ -2696,7 +2927,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 121 + "__id__": 131 }, "_contentSize": { "__type__": "cc.Size", @@ -2724,7 +2955,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 133 }, "_cameraComponent": { "__id__": 3 @@ -2746,7 +2977,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 125 + "__id__": 135 }, "_alignFlags": 45, "_target": null, diff --git a/assets/resources/gui/element/prefab_talent_item.prefab b/assets/resources/gui/element/prefab_talent_item.prefab index d2ccd903..1af388a4 100644 --- a/assets/resources/gui/element/prefab_talent_item.prefab +++ b/assets/resources/gui/element/prefab_talent_item.prefab @@ -25,35 +25,38 @@ "__id__": 10 }, { - "__id__": 16 + "__id__": 18 }, { - "__id__": 22 + "__id__": 26 }, { - "__id__": 92 + "__id__": 32 }, { - "__id__": 98 + "__id__": 102 }, { - "__id__": 112 + "__id__": 108 }, { - "__id__": 118 + "__id__": 122 + }, + { + "__id__": 128 } ], "_active": true, "_components": [ { - "__id__": 154 + "__id__": 165 }, { - "__id__": 156 + "__id__": 167 } ], "_prefab": { - "__id__": 158 + "__id__": 169 }, "_lpos": { "__type__": "cc.Vec3", @@ -151,8 +154,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 660, - "height": 80 + "width": 170, + "height": 230 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -188,7 +191,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@d3d89", + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@c77a7", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -202,8 +205,11 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": true, - "_atlas": null, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -261,7 +267,7 @@ }, { "__type__": "cc.Node", - "_name": "lbl_name", + "_name": "product11", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -275,15 +281,18 @@ }, { "__id__": 13 + }, + { + "__id__": 15 } ], "_prefab": { - "__id__": 15 + "__id__": 17 }, "_lpos": { "__type__": "cc.Vec3", - "x": -203.864, - "y": 19.021, + "x": 0, + "y": 30, "z": 0 }, "_lrot": { @@ -321,6 +330,181 @@ "__prefab": { "__id__": 12 }, + "_contentSize": { + "__type__": "cc.Size", + "width": 140, + "height": 140 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e8sr0zajFNh4WjhmN0i/qv" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": { + "__id__": 14 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@49830", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f6YxRY8mFDEIg8wMDKbXZE" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": { + "__id__": 16 + }, + "_alignFlags": 41, + "_target": null, + "_left": 15, + "_right": 15, + "_top": 15, + "_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": "49pKceM9hL4YDs+3dheEId" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "99qHpq3R5PKYzZqX4TPN7j", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "lbl_name", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 19 + }, + { + "__id__": 21 + }, + { + "__id__": 23 + } + ], + "_prefab": { + "__id__": 25 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 82.8, + "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__": 18 + }, + "_enabled": true, + "__prefab": { + "__id__": 20 + }, "_contentSize": { "__type__": "cc.Size", "width": 90, @@ -343,11 +527,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 18 }, "_enabled": true, "__prefab": { - "__id__": 14 + "__id__": 22 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -405,6 +589,42 @@ "__type__": "cc.CompPrefabInfo", "fileId": "c1dkHIVGpGAINrWXErE6GE" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 18 + }, + "_enabled": true, + "__prefab": { + "__id__": 24 + }, + "_alignFlags": 17, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 5, + "_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": "c5bJLF9ENORaTR8+amqZzR" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -430,14 +650,14 @@ "_active": true, "_components": [ { - "__id__": 17 + "__id__": 27 }, { - "__id__": 19 + "__id__": 29 } ], "_prefab": { - "__id__": 21 + "__id__": 31 }, "_lpos": { "__type__": "cc.Vec3", @@ -474,11 +694,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 26 }, "_enabled": true, "__prefab": { - "__id__": 18 + "__id__": 28 }, "_contentSize": { "__type__": "cc.Size", @@ -502,11 +722,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 26 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 30 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -587,29 +807,29 @@ }, "_children": [ { - "__id__": 23 + "__id__": 33 }, { - "__id__": 31 + "__id__": 41 }, { - "__id__": 39 + "__id__": 49 } ], "_active": true, "_components": [ { - "__id__": 85 + "__id__": 95 }, { - "__id__": 87 + "__id__": 97 }, { - "__id__": 89 + "__id__": 99 } ], "_prefab": { - "__id__": 91 + "__id__": 101 }, "_lpos": { "__type__": "cc.Vec3", @@ -646,23 +866,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 22 + "__id__": 32 }, "_children": [], "_active": true, "_components": [ { - "__id__": 24 + "__id__": 34 }, { - "__id__": 26 + "__id__": 36 }, { - "__id__": 28 + "__id__": 38 } ], "_prefab": { - "__id__": 30 + "__id__": 40 }, "_lpos": { "__type__": "cc.Vec3", @@ -699,11 +919,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 23 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 25 + "__id__": 35 }, "_contentSize": { "__type__": "cc.Size", @@ -727,11 +947,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 23 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 27 + "__id__": 37 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -772,11 +992,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 23 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 29 + "__id__": 39 }, "_alignFlags": 45, "_target": null, @@ -821,23 +1041,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 22 + "__id__": 32 }, "_children": [], "_active": true, "_components": [ { - "__id__": 32 + "__id__": 42 }, { - "__id__": 34 + "__id__": 44 }, { - "__id__": 36 + "__id__": 46 } ], "_prefab": { - "__id__": 38 + "__id__": 48 }, "_lpos": { "__type__": "cc.Vec3", @@ -874,11 +1094,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 31 + "__id__": 41 }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 43 }, "_contentSize": { "__type__": "cc.Size", @@ -902,11 +1122,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 31 + "__id__": 41 }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 45 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -950,11 +1170,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 31 + "__id__": 41 }, "_enabled": true, "__prefab": { - "__id__": 37 + "__id__": 47 }, "_alignFlags": 5, "_target": null, @@ -999,36 +1219,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 22 + "__id__": 32 }, "_children": [ { - "__id__": 40 + "__id__": 50 }, { - "__id__": 48 + "__id__": 58 }, { - "__id__": 56 + "__id__": 66 }, { - "__id__": 64 - }, - { - "__id__": 72 - } - ], - "_active": true, - "_components": [ - { - "__id__": 80 + "__id__": 74 }, { "__id__": 82 } ], + "_active": true, + "_components": [ + { + "__id__": 90 + }, + { + "__id__": 92 + } + ], "_prefab": { - "__id__": 84 + "__id__": 94 }, "_lpos": { "__type__": "cc.Vec3", @@ -1065,23 +1285,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 39 + "__id__": 49 }, "_children": [], "_active": true, "_components": [ { - "__id__": 41 + "__id__": 51 }, { - "__id__": 43 + "__id__": 53 }, { - "__id__": 45 + "__id__": 55 } ], "_prefab": { - "__id__": 47 + "__id__": 57 }, "_lpos": { "__type__": "cc.Vec3", @@ -1118,11 +1338,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 52 }, "_contentSize": { "__type__": "cc.Size", @@ -1146,11 +1366,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 54 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1191,11 +1411,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 50 }, "_enabled": false, "__prefab": { - "__id__": 46 + "__id__": 56 }, "_alignFlags": 45, "_target": null, @@ -1240,23 +1460,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 39 + "__id__": 49 }, "_children": [], "_active": true, "_components": [ { - "__id__": 49 + "__id__": 59 }, { - "__id__": 51 + "__id__": 61 }, { - "__id__": 53 + "__id__": 63 } ], "_prefab": { - "__id__": 55 + "__id__": 65 }, "_lpos": { "__type__": "cc.Vec3", @@ -1293,11 +1513,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 48 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 60 }, "_contentSize": { "__type__": "cc.Size", @@ -1321,11 +1541,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 48 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 62 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1366,11 +1586,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 48 + "__id__": 58 }, "_enabled": false, "__prefab": { - "__id__": 54 + "__id__": 64 }, "_alignFlags": 45, "_target": null, @@ -1415,23 +1635,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 39 + "__id__": 49 }, "_children": [], "_active": true, "_components": [ { - "__id__": 57 + "__id__": 67 }, { - "__id__": 59 + "__id__": 69 }, { - "__id__": 61 + "__id__": 71 } ], "_prefab": { - "__id__": 63 + "__id__": 73 }, "_lpos": { "__type__": "cc.Vec3", @@ -1468,11 +1688,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 56 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 68 }, "_contentSize": { "__type__": "cc.Size", @@ -1496,11 +1716,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 56 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 70 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1541,11 +1761,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 56 + "__id__": 66 }, "_enabled": false, "__prefab": { - "__id__": 62 + "__id__": 72 }, "_alignFlags": 45, "_target": null, @@ -1590,23 +1810,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 39 + "__id__": 49 }, "_children": [], "_active": true, "_components": [ { - "__id__": 65 + "__id__": 75 }, { - "__id__": 67 + "__id__": 77 }, { - "__id__": 69 + "__id__": 79 } ], "_prefab": { - "__id__": 71 + "__id__": 81 }, "_lpos": { "__type__": "cc.Vec3", @@ -1643,11 +1863,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 74 }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 76 }, "_contentSize": { "__type__": "cc.Size", @@ -1671,11 +1891,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 74 }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 78 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1716,11 +1936,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 74 }, "_enabled": false, "__prefab": { - "__id__": 70 + "__id__": 80 }, "_alignFlags": 45, "_target": null, @@ -1765,23 +1985,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 39 + "__id__": 49 }, "_children": [], "_active": true, "_components": [ { - "__id__": 73 + "__id__": 83 }, { - "__id__": 75 + "__id__": 85 }, { - "__id__": 77 + "__id__": 87 } ], "_prefab": { - "__id__": 79 + "__id__": 89 }, "_lpos": { "__type__": "cc.Vec3", @@ -1818,11 +2038,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 72 + "__id__": 82 }, "_enabled": true, "__prefab": { - "__id__": 74 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1846,11 +2066,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 72 + "__id__": 82 }, "_enabled": true, "__prefab": { - "__id__": 76 + "__id__": 86 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1891,11 +2111,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 72 + "__id__": 82 }, "_enabled": false, "__prefab": { - "__id__": 78 + "__id__": 88 }, "_alignFlags": 45, "_target": null, @@ -1940,11 +2160,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 81 + "__id__": 91 }, "_contentSize": { "__type__": "cc.Size", @@ -1968,11 +2188,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 83 + "__id__": 93 }, "_resizeMode": 0, "_layoutType": 1, @@ -2019,11 +2239,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 86 + "__id__": 96 }, "_contentSize": { "__type__": "cc.Size", @@ -2047,11 +2267,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 32 }, "_enabled": false, "__prefab": { - "__id__": 88 + "__id__": 98 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2095,14 +2315,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 100 }, "_barSprite": { - "__id__": 34 + "__id__": 44 }, "_mode": 0, "_totalLength": 100, @@ -2139,14 +2359,14 @@ "_active": true, "_components": [ { - "__id__": 93 + "__id__": 103 }, { - "__id__": 95 + "__id__": 105 } ], "_prefab": { - "__id__": 97 + "__id__": 107 }, "_lpos": { "__type__": "cc.Vec3", @@ -2183,11 +2403,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 92 + "__id__": 102 }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 104 }, "_contentSize": { "__type__": "cc.Size", @@ -2211,11 +2431,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 92 + "__id__": 102 }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 106 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2296,23 +2516,23 @@ }, "_children": [ { - "__id__": 99 + "__id__": 109 } ], "_active": true, "_components": [ { - "__id__": 105 + "__id__": 115 }, { - "__id__": 107 + "__id__": 117 }, { - "__id__": 109 + "__id__": 119 } ], "_prefab": { - "__id__": 111 + "__id__": 121 }, "_lpos": { "__type__": "cc.Vec3", @@ -2349,20 +2569,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 98 + "__id__": 108 }, "_children": [], "_active": true, "_components": [ { - "__id__": 100 + "__id__": 110 }, { - "__id__": 102 + "__id__": 112 } ], "_prefab": { - "__id__": 104 + "__id__": 114 }, "_lpos": { "__type__": "cc.Vec3", @@ -2399,11 +2619,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 99 + "__id__": 109 }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 111 }, "_contentSize": { "__type__": "cc.Size", @@ -2427,11 +2647,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 99 + "__id__": 109 }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 113 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2508,11 +2728,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 98 + "__id__": 108 }, "_enabled": true, "__prefab": { - "__id__": 106 + "__id__": 116 }, "_contentSize": { "__type__": "cc.Size", @@ -2536,11 +2756,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 98 + "__id__": 108 }, "_enabled": true, "__prefab": { - "__id__": 108 + "__id__": 118 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2584,11 +2804,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 98 + "__id__": 108 }, "_enabled": true, "__prefab": { - "__id__": 110 + "__id__": 120 }, "clickEvents": [], "_interactable": true, @@ -2640,7 +2860,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 98 + "__id__": 108 }, "_id": "" }, @@ -2673,14 +2893,14 @@ "_active": true, "_components": [ { - "__id__": 113 + "__id__": 123 }, { - "__id__": 115 + "__id__": 125 } ], "_prefab": { - "__id__": 117 + "__id__": 127 }, "_lpos": { "__type__": "cc.Vec3", @@ -2717,11 +2937,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 112 + "__id__": 122 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 124 }, "_contentSize": { "__type__": "cc.Size", @@ -2745,11 +2965,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 112 + "__id__": 122 }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 126 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2827,14 +3047,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 119 + "__id__": 129 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 118 + "__id__": 128 }, "asset": { "__uuid__": "d19cde30-f5d0-47de-a0d5-3a272b696343", @@ -2842,7 +3062,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 120 + "__id__": 130 }, "targetOverrides": null }, @@ -2856,32 +3076,17 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 121 + "__id__": 131 }, { - "__id__": 123 - }, - { - "__id__": 124 - }, - { - "__id__": 125 - }, - { - "__id__": 126 - }, - { - "__id__": 128 - }, - { - "__id__": 130 - }, - { - "__id__": 132 + "__id__": 133 }, { "__id__": 134 }, + { + "__id__": 135 + }, { "__id__": 136 }, @@ -2898,19 +3103,37 @@ "__id__": 144 }, { - "__id__": 145 + "__id__": 146 }, { - "__id__": 147 + "__id__": 148 }, { - "__id__": 149 + "__id__": 150 }, { - "__id__": 151 + "__id__": 152 }, { - "__id__": 153 + "__id__": 154 + }, + { + "__id__": 155 + }, + { + "__id__": 157 + }, + { + "__id__": 159 + }, + { + "__id__": 161 + }, + { + "__id__": 163 + }, + { + "__id__": 164 } ], "removedComponents": [] @@ -2918,7 +3141,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 122 + "__id__": 132 }, "propertyPath": [ "_name" @@ -2934,7 +3157,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 122 + "__id__": 132 }, "propertyPath": [ "_lpos" @@ -2949,7 +3172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 122 + "__id__": 132 }, "propertyPath": [ "_lrot" @@ -2965,7 +3188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 122 + "__id__": 132 }, "propertyPath": [ "_euler" @@ -2980,7 +3203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 127 + "__id__": 137 }, "propertyPath": [ "_active" @@ -2996,7 +3219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 129 + "__id__": 139 }, "propertyPath": [ "_enabled" @@ -3012,7 +3235,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 131 + "__id__": 141 }, "propertyPath": [ "_active" @@ -3025,106 +3248,6 @@ "93fFoXu3BBYqu4RLG2YPon" ] }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 133 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 60, - "height": 60 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f9WzzmQplCw4od/9N1bGZ8" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 135 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 60, - "height": 60 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "cdEeG/ubFJgqKs1MdM6xd9" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 137 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 58, - "height": 58 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "03nWLvwvFC5YKsJgnNXuKJ" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 139 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 56, - "height": 56 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "e2LJMsJCxMdZP6mZ0DhjCz" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 141 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 48, - "height": 48 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "76Sa4mmOZMQrMumtAHxyo2" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -3139,6 +3262,106 @@ "height": 60 } }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f9WzzmQplCw4od/9N1bGZ8" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 145 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 60, + "height": 60 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cdEeG/ubFJgqKs1MdM6xd9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 147 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 58, + "height": 58 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "03nWLvwvFC5YKsJgnNXuKJ" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 149 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 56, + "height": 56 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "e2LJMsJCxMdZP6mZ0DhjCz" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 151 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 48, + "height": 48 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "76Sa4mmOZMQrMumtAHxyo2" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 153 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 60, + "height": 60 + } + }, { "__type__": "cc.TargetInfo", "localID": [ @@ -3148,7 +3371,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 131 + "__id__": 141 }, "propertyPath": [ "_lpos" @@ -3163,7 +3386,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 146 + "__id__": 156 }, "propertyPath": [ "_lpos" @@ -3184,7 +3407,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 148 + "__id__": 158 }, "propertyPath": [ "_lpos" @@ -3205,7 +3428,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 150 + "__id__": 160 }, "propertyPath": [ "_lpos" @@ -3226,7 +3449,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 152 + "__id__": 162 }, "propertyPath": [ "_lpos" @@ -3247,7 +3470,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 133 + "__id__": 143 }, "propertyPath": [ "_anchorPoint" @@ -3258,6 +3481,16 @@ "y": 0.5 } }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 132 + }, + "propertyPath": [ + "_active" + ], + "value": true + }, { "__type__": "cc.UITransform", "_name": "", @@ -3268,12 +3501,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 155 + "__id__": 166 }, "_contentSize": { "__type__": "cc.Size", - "width": 660, - "height": 80 + "width": 170, + "height": 230 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3296,7 +3529,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 157 + "__id__": 168 }, "_alignFlags": 40, "_target": null, @@ -3334,34 +3567,34 @@ "instance": null, "targetOverrides": [ { - "__id__": 159 + "__id__": 170 }, { - "__id__": 162 + "__id__": 173 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 118 + "__id__": 128 } ] }, { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 118 + "__id__": 128 }, "sourceInfo": { - "__id__": 160 + "__id__": 171 }, "propertyPath": [ "icon_node" ], "target": { - "__id__": 118 + "__id__": 128 }, "targetInfo": { - "__id__": 161 + "__id__": 172 } }, { @@ -3379,19 +3612,19 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 118 + "__id__": 128 }, "sourceInfo": { - "__id__": 163 + "__id__": 174 }, "propertyPath": [ "info_label" ], "target": { - "__id__": 118 + "__id__": 128 }, "targetInfo": { - "__id__": 164 + "__id__": 175 } }, { diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index bdda3bff..8ad121c8 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -25,26 +25,26 @@ "__id__": 916 }, { - "__id__": 1186 + "__id__": 1178 }, { - "__id__": 1195 + "__id__": 1187 } ], "_active": true, "_components": [ { - "__id__": 1241 + "__id__": 1233 }, { - "__id__": 1243 + "__id__": 1235 }, { - "__id__": 1245 + "__id__": 1237 } ], "_prefab": { - "__id__": 1247 + "__id__": 1239 }, "_lpos": { "__type__": "cc.Vec3", @@ -19115,26 +19115,23 @@ "__id__": 917 }, { - "__id__": 925 - }, - { - "__id__": 1162 + "__id__": 1154 } ], - "_active": false, + "_active": true, "_components": [ { - "__id__": 1179 + "__id__": 1171 }, { - "__id__": 1181 + "__id__": 1173 }, { - "__id__": 1183 + "__id__": 1175 } ], "_prefab": { - "__id__": 1185 + "__id__": 1177 }, "_lpos": { "__type__": "cc.Vec3", @@ -19165,184 +19162,6 @@ }, "_id": "" }, - { - "__type__": "cc.Node", - "_name": "bg2", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 916 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 918 - }, - { - "__id__": 920 - }, - { - "__id__": 922 - } - ], - "_prefab": { - "__id__": 924 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -154.939, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1.9999999999999998, - "y": 1.9999999999999998, - "z": 0.9999999999999999 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 917 - }, - "_enabled": true, - "__prefab": { - "__id__": 919 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 432, - "height": 936 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "3fwrO90BxPGIHz2cpuzgmO" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 917 - }, - "_enabled": true, - "__prefab": { - "__id__": 921 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780@fe1eb", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": { - "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c8Dw75a6RANJhZgw9tHZXg" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 917 - }, - "_enabled": true, - "__prefab": { - "__id__": 923 - }, - "_alignFlags": 20, - "_target": null, - "_left": 54, - "_right": 233.99999999999997, - "_top": 344, - "_bottom": -154.939, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 229, - "_originalHeight": 63, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "13wq2tFTJFfrGX6dXD9UPB" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "9b/wzscV5BUaE020voDXyc", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, { "__type__": "cc.Node", "_name": "bar", @@ -19353,35 +19172,35 @@ }, "_children": [ { - "__id__": 926 + "__id__": 918 }, { - "__id__": 967 + "__id__": 959 }, { - "__id__": 1008 + "__id__": 1000 }, { - "__id__": 1057 + "__id__": 1049 }, { - "__id__": 1106 + "__id__": 1098 } ], "_active": true, "_components": [ { - "__id__": 1155 + "__id__": 1147 }, { - "__id__": 1157 + "__id__": 1149 }, { - "__id__": 1159 + "__id__": 1151 } ], "_prefab": { - "__id__": 1161 + "__id__": 1153 }, "_lpos": { "__type__": "cc.Vec3", @@ -19418,27 +19237,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 925 + "__id__": 917 }, "_children": [ { - "__id__": 927 + "__id__": 919 }, { - "__id__": 941 + "__id__": 933 } ], "_active": false, "_components": [ { - "__id__": 961 + "__id__": 953 }, { - "__id__": 963 + "__id__": 955 } ], "_prefab": { - "__id__": 966 + "__id__": 958 }, "_lpos": { "__type__": "cc.Vec3", @@ -19475,27 +19294,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 926 + "__id__": 918 }, "_children": [ { - "__id__": 928 + "__id__": 920 } ], "_active": true, "_components": [ { - "__id__": 934 + "__id__": 926 }, { - "__id__": 936 + "__id__": 928 }, { - "__id__": 938 + "__id__": 930 } ], "_prefab": { - "__id__": 940 + "__id__": 932 }, "_lpos": { "__type__": "cc.Vec3", @@ -19532,20 +19351,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 927 + "__id__": 919 }, "_children": [], "_active": true, "_components": [ { - "__id__": 929 + "__id__": 921 }, { - "__id__": 931 + "__id__": 923 } ], "_prefab": { - "__id__": 933 + "__id__": 925 }, "_lpos": { "__type__": "cc.Vec3", @@ -19582,11 +19401,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 928 + "__id__": 920 }, "_enabled": true, "__prefab": { - "__id__": 930 + "__id__": 922 }, "_contentSize": { "__type__": "cc.Size", @@ -19610,11 +19429,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 928 + "__id__": 920 }, "_enabled": true, "__prefab": { - "__id__": 932 + "__id__": 924 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19668,11 +19487,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 927 + "__id__": 919 }, "_enabled": true, "__prefab": { - "__id__": 935 + "__id__": 927 }, "_contentSize": { "__type__": "cc.Size", @@ -19696,11 +19515,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 927 + "__id__": 919 }, "_enabled": true, "__prefab": { - "__id__": 937 + "__id__": 929 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19741,11 +19560,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 927 + "__id__": 919 }, "_enabled": true, "__prefab": { - "__id__": 939 + "__id__": 931 }, "_alignFlags": 45, "_target": null, @@ -19790,30 +19609,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 926 + "__id__": 918 }, "_children": [ { - "__id__": 942 + "__id__": 934 }, { - "__id__": 948 + "__id__": 940 } ], "_active": false, "_components": [ { - "__id__": 954 + "__id__": 946 }, { - "__id__": 956 + "__id__": 948 }, { - "__id__": 958 + "__id__": 950 } ], "_prefab": { - "__id__": 960 + "__id__": 952 }, "_lpos": { "__type__": "cc.Vec3", @@ -19850,20 +19669,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 941 + "__id__": 933 }, "_children": [], "_active": true, "_components": [ { - "__id__": 943 + "__id__": 935 }, { - "__id__": 945 + "__id__": 937 } ], "_prefab": { - "__id__": 947 + "__id__": 939 }, "_lpos": { "__type__": "cc.Vec3", @@ -19900,11 +19719,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 942 + "__id__": 934 }, "_enabled": true, "__prefab": { - "__id__": 944 + "__id__": 936 }, "_contentSize": { "__type__": "cc.Size", @@ -19928,11 +19747,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 942 + "__id__": 934 }, "_enabled": true, "__prefab": { - "__id__": 946 + "__id__": 938 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19986,20 +19805,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 941 + "__id__": 933 }, "_children": [], "_active": true, "_components": [ { - "__id__": 949 + "__id__": 941 }, { - "__id__": 951 + "__id__": 943 } ], "_prefab": { - "__id__": 953 + "__id__": 945 }, "_lpos": { "__type__": "cc.Vec3", @@ -20036,11 +19855,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 948 + "__id__": 940 }, "_enabled": true, "__prefab": { - "__id__": 950 + "__id__": 942 }, "_contentSize": { "__type__": "cc.Size", @@ -20064,11 +19883,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 948 + "__id__": 940 }, "_enabled": true, "__prefab": { - "__id__": 952 + "__id__": 944 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20145,11 +19964,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 941 + "__id__": 933 }, "_enabled": true, "__prefab": { - "__id__": 955 + "__id__": 947 }, "_contentSize": { "__type__": "cc.Size", @@ -20173,11 +19992,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 941 + "__id__": 933 }, "_enabled": true, "__prefab": { - "__id__": 957 + "__id__": 949 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20218,11 +20037,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 941 + "__id__": 933 }, "_enabled": true, "__prefab": { - "__id__": 959 + "__id__": 951 }, "_alignFlags": 45, "_target": null, @@ -20267,11 +20086,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 926 + "__id__": 918 }, "_enabled": true, "__prefab": { - "__id__": 962 + "__id__": 954 }, "_contentSize": { "__type__": "cc.Size", @@ -20295,15 +20114,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 926 + "__id__": 918 }, "_enabled": true, "__prefab": { - "__id__": 964 + "__id__": 956 }, "clickEvents": [ { - "__id__": 965 + "__id__": 957 } ], "_interactable": true, @@ -20378,27 +20197,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 925 + "__id__": 917 }, "_children": [ { - "__id__": 968 + "__id__": 960 }, { - "__id__": 982 + "__id__": 974 } ], "_active": false, "_components": [ { - "__id__": 1002 + "__id__": 994 }, { - "__id__": 1004 + "__id__": 996 } ], "_prefab": { - "__id__": 1007 + "__id__": 999 }, "_lpos": { "__type__": "cc.Vec3", @@ -20435,27 +20254,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 967 + "__id__": 959 }, "_children": [ { - "__id__": 969 + "__id__": 961 } ], "_active": true, "_components": [ { - "__id__": 975 + "__id__": 967 }, { - "__id__": 977 + "__id__": 969 }, { - "__id__": 979 + "__id__": 971 } ], "_prefab": { - "__id__": 981 + "__id__": 973 }, "_lpos": { "__type__": "cc.Vec3", @@ -20492,20 +20311,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 968 + "__id__": 960 }, "_children": [], "_active": true, "_components": [ { - "__id__": 970 + "__id__": 962 }, { - "__id__": 972 + "__id__": 964 } ], "_prefab": { - "__id__": 974 + "__id__": 966 }, "_lpos": { "__type__": "cc.Vec3", @@ -20542,11 +20361,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 969 + "__id__": 961 }, "_enabled": true, "__prefab": { - "__id__": 971 + "__id__": 963 }, "_contentSize": { "__type__": "cc.Size", @@ -20570,11 +20389,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 969 + "__id__": 961 }, "_enabled": true, "__prefab": { - "__id__": 973 + "__id__": 965 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20628,11 +20447,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 968 + "__id__": 960 }, "_enabled": true, "__prefab": { - "__id__": 976 + "__id__": 968 }, "_contentSize": { "__type__": "cc.Size", @@ -20656,11 +20475,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 968 + "__id__": 960 }, "_enabled": true, "__prefab": { - "__id__": 978 + "__id__": 970 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20701,11 +20520,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 968 + "__id__": 960 }, "_enabled": true, "__prefab": { - "__id__": 980 + "__id__": 972 }, "_alignFlags": 45, "_target": null, @@ -20750,30 +20569,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 967 + "__id__": 959 }, "_children": [ { - "__id__": 983 + "__id__": 975 }, { - "__id__": 989 + "__id__": 981 } ], "_active": false, "_components": [ { - "__id__": 995 + "__id__": 987 }, { - "__id__": 997 + "__id__": 989 }, { - "__id__": 999 + "__id__": 991 } ], "_prefab": { - "__id__": 1001 + "__id__": 993 }, "_lpos": { "__type__": "cc.Vec3", @@ -20810,20 +20629,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 982 + "__id__": 974 }, "_children": [], "_active": true, "_components": [ { - "__id__": 984 + "__id__": 976 }, { - "__id__": 986 + "__id__": 978 } ], "_prefab": { - "__id__": 988 + "__id__": 980 }, "_lpos": { "__type__": "cc.Vec3", @@ -20860,11 +20679,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 983 + "__id__": 975 }, "_enabled": true, "__prefab": { - "__id__": 985 + "__id__": 977 }, "_contentSize": { "__type__": "cc.Size", @@ -20888,11 +20707,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 983 + "__id__": 975 }, "_enabled": true, "__prefab": { - "__id__": 987 + "__id__": 979 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20946,20 +20765,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 982 + "__id__": 974 }, "_children": [], "_active": true, "_components": [ { - "__id__": 990 + "__id__": 982 }, { - "__id__": 992 + "__id__": 984 } ], "_prefab": { - "__id__": 994 + "__id__": 986 }, "_lpos": { "__type__": "cc.Vec3", @@ -20996,11 +20815,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 989 + "__id__": 981 }, "_enabled": true, "__prefab": { - "__id__": 991 + "__id__": 983 }, "_contentSize": { "__type__": "cc.Size", @@ -21024,11 +20843,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 989 + "__id__": 981 }, "_enabled": true, "__prefab": { - "__id__": 993 + "__id__": 985 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21105,11 +20924,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 982 + "__id__": 974 }, "_enabled": true, "__prefab": { - "__id__": 996 + "__id__": 988 }, "_contentSize": { "__type__": "cc.Size", @@ -21133,11 +20952,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 982 + "__id__": 974 }, "_enabled": true, "__prefab": { - "__id__": 998 + "__id__": 990 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21178,11 +20997,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 982 + "__id__": 974 }, "_enabled": true, "__prefab": { - "__id__": 1000 + "__id__": 992 }, "_alignFlags": 45, "_target": null, @@ -21227,11 +21046,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 967 + "__id__": 959 }, "_enabled": true, "__prefab": { - "__id__": 1003 + "__id__": 995 }, "_contentSize": { "__type__": "cc.Size", @@ -21255,15 +21074,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 967 + "__id__": 959 }, "_enabled": true, "__prefab": { - "__id__": 1005 + "__id__": 997 }, "clickEvents": [ { - "__id__": 1006 + "__id__": 998 } ], "_interactable": true, @@ -21338,30 +21157,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 925 + "__id__": 917 }, "_children": [ + { + "__id__": 1001 + }, { "__id__": 1009 }, { - "__id__": 1017 - }, - { - "__id__": 1037 + "__id__": 1029 } ], "_active": true, "_components": [ { - "__id__": 1051 + "__id__": 1043 }, { - "__id__": 1053 + "__id__": 1045 } ], "_prefab": { - "__id__": 1056 + "__id__": 1048 }, "_lpos": { "__type__": "cc.Vec3", @@ -21398,23 +21217,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1008 + "__id__": 1000 }, "_children": [], "_active": false, "_components": [ { - "__id__": 1010 + "__id__": 1002 }, { - "__id__": 1012 + "__id__": 1004 }, { - "__id__": 1014 + "__id__": 1006 } ], "_prefab": { - "__id__": 1016 + "__id__": 1008 }, "_lpos": { "__type__": "cc.Vec3", @@ -21451,11 +21270,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1009 + "__id__": 1001 }, "_enabled": true, "__prefab": { - "__id__": 1011 + "__id__": 1003 }, "_contentSize": { "__type__": "cc.Size", @@ -21479,11 +21298,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1009 + "__id__": 1001 }, "_enabled": true, "__prefab": { - "__id__": 1013 + "__id__": 1005 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21524,11 +21343,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1009 + "__id__": 1001 }, "_enabled": true, "__prefab": { - "__id__": 1015 + "__id__": 1007 }, "_alignFlags": 45, "_target": null, @@ -21573,30 +21392,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1008 + "__id__": 1000 }, "_children": [ { - "__id__": 1018 + "__id__": 1010 }, { - "__id__": 1024 + "__id__": 1016 } ], "_active": false, "_components": [ { - "__id__": 1030 + "__id__": 1022 }, { - "__id__": 1032 + "__id__": 1024 }, { - "__id__": 1034 + "__id__": 1026 } ], "_prefab": { - "__id__": 1036 + "__id__": 1028 }, "_lpos": { "__type__": "cc.Vec3", @@ -21633,20 +21452,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1017 + "__id__": 1009 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1019 + "__id__": 1011 }, { - "__id__": 1021 + "__id__": 1013 } ], "_prefab": { - "__id__": 1023 + "__id__": 1015 }, "_lpos": { "__type__": "cc.Vec3", @@ -21683,11 +21502,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1018 + "__id__": 1010 }, "_enabled": true, "__prefab": { - "__id__": 1020 + "__id__": 1012 }, "_contentSize": { "__type__": "cc.Size", @@ -21711,11 +21530,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1018 + "__id__": 1010 }, "_enabled": true, "__prefab": { - "__id__": 1022 + "__id__": 1014 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21769,20 +21588,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1017 + "__id__": 1009 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1025 + "__id__": 1017 }, { - "__id__": 1027 + "__id__": 1019 } ], "_prefab": { - "__id__": 1029 + "__id__": 1021 }, "_lpos": { "__type__": "cc.Vec3", @@ -21819,11 +21638,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1024 + "__id__": 1016 }, "_enabled": true, "__prefab": { - "__id__": 1026 + "__id__": 1018 }, "_contentSize": { "__type__": "cc.Size", @@ -21847,11 +21666,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1024 + "__id__": 1016 }, "_enabled": true, "__prefab": { - "__id__": 1028 + "__id__": 1020 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21928,11 +21747,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1017 + "__id__": 1009 }, "_enabled": true, "__prefab": { - "__id__": 1031 + "__id__": 1023 }, "_contentSize": { "__type__": "cc.Size", @@ -21956,11 +21775,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1017 + "__id__": 1009 }, "_enabled": true, "__prefab": { - "__id__": 1033 + "__id__": 1025 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -22001,11 +21820,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1017 + "__id__": 1009 }, "_enabled": true, "__prefab": { - "__id__": 1035 + "__id__": 1027 }, "_alignFlags": 45, "_target": null, @@ -22050,24 +21869,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1008 + "__id__": 1000 }, "_children": [ { - "__id__": 1038 + "__id__": 1030 } ], "_active": true, "_components": [ { - "__id__": 1046 + "__id__": 1038 }, { - "__id__": 1048 + "__id__": 1040 } ], "_prefab": { - "__id__": 1050 + "__id__": 1042 }, "_lpos": { "__type__": "cc.Vec3", @@ -22104,23 +21923,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1037 + "__id__": 1029 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1039 + "__id__": 1031 }, { - "__id__": 1041 + "__id__": 1033 }, { - "__id__": 1043 + "__id__": 1035 } ], "_prefab": { - "__id__": 1045 + "__id__": 1037 }, "_lpos": { "__type__": "cc.Vec3", @@ -22157,11 +21976,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1038 + "__id__": 1030 }, "_enabled": true, "__prefab": { - "__id__": 1040 + "__id__": 1032 }, "_contentSize": { "__type__": "cc.Size", @@ -22185,11 +22004,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1038 + "__id__": 1030 }, "_enabled": true, "__prefab": { - "__id__": 1042 + "__id__": 1034 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -22253,11 +22072,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1038 + "__id__": 1030 }, "_enabled": true, "__prefab": { - "__id__": 1044 + "__id__": 1036 }, "_params": [], "_dataID": "bar_heros", @@ -22286,11 +22105,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1037 + "__id__": 1029 }, "_enabled": true, "__prefab": { - "__id__": 1047 + "__id__": 1039 }, "_contentSize": { "__type__": "cc.Size", @@ -22314,11 +22133,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1037 + "__id__": 1029 }, "_enabled": true, "__prefab": { - "__id__": 1049 + "__id__": 1041 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -22375,11 +22194,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1008 + "__id__": 1000 }, "_enabled": true, "__prefab": { - "__id__": 1052 + "__id__": 1044 }, "_contentSize": { "__type__": "cc.Size", @@ -22403,15 +22222,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1008 + "__id__": 1000 }, "_enabled": true, "__prefab": { - "__id__": 1054 + "__id__": 1046 }, "clickEvents": [ { - "__id__": 1055 + "__id__": 1047 } ], "_interactable": true, @@ -22486,30 +22305,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 925 + "__id__": 917 }, "_children": [ + { + "__id__": 1050 + }, { "__id__": 1058 }, { - "__id__": 1066 - }, - { - "__id__": 1086 + "__id__": 1078 } ], "_active": true, "_components": [ { - "__id__": 1100 + "__id__": 1092 }, { - "__id__": 1102 + "__id__": 1094 } ], "_prefab": { - "__id__": 1105 + "__id__": 1097 }, "_lpos": { "__type__": "cc.Vec3", @@ -22546,23 +22365,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1057 + "__id__": 1049 }, "_children": [], "_active": false, "_components": [ { - "__id__": 1059 + "__id__": 1051 }, { - "__id__": 1061 + "__id__": 1053 }, { - "__id__": 1063 + "__id__": 1055 } ], "_prefab": { - "__id__": 1065 + "__id__": 1057 }, "_lpos": { "__type__": "cc.Vec3", @@ -22599,11 +22418,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1058 + "__id__": 1050 }, "_enabled": true, "__prefab": { - "__id__": 1060 + "__id__": 1052 }, "_contentSize": { "__type__": "cc.Size", @@ -22627,11 +22446,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1058 + "__id__": 1050 }, "_enabled": true, "__prefab": { - "__id__": 1062 + "__id__": 1054 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -22672,11 +22491,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1058 + "__id__": 1050 }, "_enabled": true, "__prefab": { - "__id__": 1064 + "__id__": 1056 }, "_alignFlags": 45, "_target": null, @@ -22721,30 +22540,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1057 + "__id__": 1049 }, "_children": [ { - "__id__": 1067 + "__id__": 1059 }, { - "__id__": 1073 + "__id__": 1065 } ], "_active": false, "_components": [ { - "__id__": 1079 + "__id__": 1071 }, { - "__id__": 1081 + "__id__": 1073 }, { - "__id__": 1083 + "__id__": 1075 } ], "_prefab": { - "__id__": 1085 + "__id__": 1077 }, "_lpos": { "__type__": "cc.Vec3", @@ -22781,20 +22600,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1066 + "__id__": 1058 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1068 + "__id__": 1060 }, { - "__id__": 1070 + "__id__": 1062 } ], "_prefab": { - "__id__": 1072 + "__id__": 1064 }, "_lpos": { "__type__": "cc.Vec3", @@ -22831,11 +22650,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1067 + "__id__": 1059 }, "_enabled": true, "__prefab": { - "__id__": 1069 + "__id__": 1061 }, "_contentSize": { "__type__": "cc.Size", @@ -22859,11 +22678,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1067 + "__id__": 1059 }, "_enabled": true, "__prefab": { - "__id__": 1071 + "__id__": 1063 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -22917,20 +22736,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1066 + "__id__": 1058 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1074 + "__id__": 1066 }, { - "__id__": 1076 + "__id__": 1068 } ], "_prefab": { - "__id__": 1078 + "__id__": 1070 }, "_lpos": { "__type__": "cc.Vec3", @@ -22967,11 +22786,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1073 + "__id__": 1065 }, "_enabled": true, "__prefab": { - "__id__": 1075 + "__id__": 1067 }, "_contentSize": { "__type__": "cc.Size", @@ -22995,11 +22814,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1073 + "__id__": 1065 }, "_enabled": true, "__prefab": { - "__id__": 1077 + "__id__": 1069 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -23076,11 +22895,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1066 + "__id__": 1058 }, "_enabled": true, "__prefab": { - "__id__": 1080 + "__id__": 1072 }, "_contentSize": { "__type__": "cc.Size", @@ -23104,11 +22923,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1066 + "__id__": 1058 }, "_enabled": true, "__prefab": { - "__id__": 1082 + "__id__": 1074 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -23149,11 +22968,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1066 + "__id__": 1058 }, "_enabled": true, "__prefab": { - "__id__": 1084 + "__id__": 1076 }, "_alignFlags": 45, "_target": null, @@ -23198,24 +23017,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1057 + "__id__": 1049 }, "_children": [ { - "__id__": 1087 + "__id__": 1079 } ], "_active": true, "_components": [ { - "__id__": 1095 + "__id__": 1087 }, { - "__id__": 1097 + "__id__": 1089 } ], "_prefab": { - "__id__": 1099 + "__id__": 1091 }, "_lpos": { "__type__": "cc.Vec3", @@ -23252,23 +23071,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1086 + "__id__": 1078 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1088 + "__id__": 1080 }, { - "__id__": 1090 + "__id__": 1082 }, { - "__id__": 1092 + "__id__": 1084 } ], "_prefab": { - "__id__": 1094 + "__id__": 1086 }, "_lpos": { "__type__": "cc.Vec3", @@ -23305,11 +23124,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1087 + "__id__": 1079 }, "_enabled": true, "__prefab": { - "__id__": 1089 + "__id__": 1081 }, "_contentSize": { "__type__": "cc.Size", @@ -23333,11 +23152,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1087 + "__id__": 1079 }, "_enabled": true, "__prefab": { - "__id__": 1091 + "__id__": 1083 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -23401,11 +23220,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1087 + "__id__": 1079 }, "_enabled": true, "__prefab": { - "__id__": 1093 + "__id__": 1085 }, "_params": [], "_dataID": "bar_ranks", @@ -23434,11 +23253,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1086 + "__id__": 1078 }, "_enabled": true, "__prefab": { - "__id__": 1096 + "__id__": 1088 }, "_contentSize": { "__type__": "cc.Size", @@ -23462,11 +23281,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1086 + "__id__": 1078 }, "_enabled": true, "__prefab": { - "__id__": 1098 + "__id__": 1090 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -23520,11 +23339,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1057 + "__id__": 1049 }, "_enabled": true, "__prefab": { - "__id__": 1101 + "__id__": 1093 }, "_contentSize": { "__type__": "cc.Size", @@ -23548,15 +23367,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1057 + "__id__": 1049 }, "_enabled": true, "__prefab": { - "__id__": 1103 + "__id__": 1095 }, "clickEvents": [ { - "__id__": 1104 + "__id__": 1096 } ], "_interactable": true, @@ -23631,30 +23450,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 925 + "__id__": 917 }, "_children": [ + { + "__id__": 1099 + }, { "__id__": 1107 }, { - "__id__": 1115 - }, - { - "__id__": 1135 + "__id__": 1127 } ], "_active": true, "_components": [ { - "__id__": 1149 + "__id__": 1141 }, { - "__id__": 1151 + "__id__": 1143 } ], "_prefab": { - "__id__": 1154 + "__id__": 1146 }, "_lpos": { "__type__": "cc.Vec3", @@ -23691,23 +23510,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1106 + "__id__": 1098 }, "_children": [], "_active": false, "_components": [ { - "__id__": 1108 + "__id__": 1100 }, { - "__id__": 1110 + "__id__": 1102 }, { - "__id__": 1112 + "__id__": 1104 } ], "_prefab": { - "__id__": 1114 + "__id__": 1106 }, "_lpos": { "__type__": "cc.Vec3", @@ -23744,11 +23563,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1107 + "__id__": 1099 }, "_enabled": true, "__prefab": { - "__id__": 1109 + "__id__": 1101 }, "_contentSize": { "__type__": "cc.Size", @@ -23772,11 +23591,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1107 + "__id__": 1099 }, "_enabled": true, "__prefab": { - "__id__": 1111 + "__id__": 1103 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -23817,11 +23636,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1107 + "__id__": 1099 }, "_enabled": true, "__prefab": { - "__id__": 1113 + "__id__": 1105 }, "_alignFlags": 45, "_target": null, @@ -23866,30 +23685,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1106 + "__id__": 1098 }, "_children": [ { - "__id__": 1116 + "__id__": 1108 }, { - "__id__": 1122 + "__id__": 1114 } ], "_active": false, "_components": [ { - "__id__": 1128 + "__id__": 1120 }, { - "__id__": 1130 + "__id__": 1122 }, { - "__id__": 1132 + "__id__": 1124 } ], "_prefab": { - "__id__": 1134 + "__id__": 1126 }, "_lpos": { "__type__": "cc.Vec3", @@ -23926,20 +23745,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1115 + "__id__": 1107 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1117 + "__id__": 1109 }, { - "__id__": 1119 + "__id__": 1111 } ], "_prefab": { - "__id__": 1121 + "__id__": 1113 }, "_lpos": { "__type__": "cc.Vec3", @@ -23976,11 +23795,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1116 + "__id__": 1108 }, "_enabled": true, "__prefab": { - "__id__": 1118 + "__id__": 1110 }, "_contentSize": { "__type__": "cc.Size", @@ -24004,11 +23823,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1116 + "__id__": 1108 }, "_enabled": true, "__prefab": { - "__id__": 1120 + "__id__": 1112 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -24062,20 +23881,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1115 + "__id__": 1107 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1123 + "__id__": 1115 }, { - "__id__": 1125 + "__id__": 1117 } ], "_prefab": { - "__id__": 1127 + "__id__": 1119 }, "_lpos": { "__type__": "cc.Vec3", @@ -24112,11 +23931,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1122 + "__id__": 1114 }, "_enabled": true, "__prefab": { - "__id__": 1124 + "__id__": 1116 }, "_contentSize": { "__type__": "cc.Size", @@ -24140,11 +23959,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1122 + "__id__": 1114 }, "_enabled": true, "__prefab": { - "__id__": 1126 + "__id__": 1118 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -24221,11 +24040,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1115 + "__id__": 1107 }, "_enabled": true, "__prefab": { - "__id__": 1129 + "__id__": 1121 }, "_contentSize": { "__type__": "cc.Size", @@ -24249,11 +24068,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1115 + "__id__": 1107 }, "_enabled": true, "__prefab": { - "__id__": 1131 + "__id__": 1123 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -24294,11 +24113,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1115 + "__id__": 1107 }, "_enabled": true, "__prefab": { - "__id__": 1133 + "__id__": 1125 }, "_alignFlags": 45, "_target": null, @@ -24343,24 +24162,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1106 + "__id__": 1098 }, "_children": [ { - "__id__": 1136 + "__id__": 1128 } ], "_active": true, "_components": [ { - "__id__": 1144 + "__id__": 1136 }, { - "__id__": 1146 + "__id__": 1138 } ], "_prefab": { - "__id__": 1148 + "__id__": 1140 }, "_lpos": { "__type__": "cc.Vec3", @@ -24397,23 +24216,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1135 + "__id__": 1127 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1137 + "__id__": 1129 }, { - "__id__": 1139 + "__id__": 1131 }, { - "__id__": 1141 + "__id__": 1133 } ], "_prefab": { - "__id__": 1143 + "__id__": 1135 }, "_lpos": { "__type__": "cc.Vec3", @@ -24450,11 +24269,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1136 + "__id__": 1128 }, "_enabled": true, "__prefab": { - "__id__": 1138 + "__id__": 1130 }, "_contentSize": { "__type__": "cc.Size", @@ -24478,11 +24297,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1136 + "__id__": 1128 }, "_enabled": true, "__prefab": { - "__id__": 1140 + "__id__": 1132 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -24546,11 +24365,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1136 + "__id__": 1128 }, "_enabled": true, "__prefab": { - "__id__": 1142 + "__id__": 1134 }, "_params": [], "_dataID": "bar_talents", @@ -24579,11 +24398,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1135 + "__id__": 1127 }, "_enabled": true, "__prefab": { - "__id__": 1145 + "__id__": 1137 }, "_contentSize": { "__type__": "cc.Size", @@ -24607,11 +24426,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1135 + "__id__": 1127 }, "_enabled": true, "__prefab": { - "__id__": 1147 + "__id__": 1139 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -24668,11 +24487,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1106 + "__id__": 1098 }, "_enabled": true, "__prefab": { - "__id__": 1150 + "__id__": 1142 }, "_contentSize": { "__type__": "cc.Size", @@ -24696,15 +24515,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1106 + "__id__": 1098 }, "_enabled": true, "__prefab": { - "__id__": 1152 + "__id__": 1144 }, "clickEvents": [ { - "__id__": 1153 + "__id__": 1145 } ], "_interactable": true, @@ -24779,11 +24598,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 925 + "__id__": 917 }, "_enabled": true, "__prefab": { - "__id__": 1156 + "__id__": 1148 }, "_contentSize": { "__type__": "cc.Size", @@ -24807,11 +24626,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 925 + "__id__": 917 }, "_enabled": true, "__prefab": { - "__id__": 1158 + "__id__": 1150 }, "_alignFlags": 44, "_target": null, @@ -24843,11 +24662,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 925 + "__id__": 917 }, "_enabled": true, "__prefab": { - "__id__": 1160 + "__id__": 1152 }, "_resizeMode": 1, "_layoutType": 1, @@ -24898,23 +24717,23 @@ }, "_children": [ { - "__id__": 1163 + "__id__": 1155 } ], "_active": true, "_components": [ { - "__id__": 1171 + "__id__": 1163 }, { - "__id__": 1173 + "__id__": 1165 }, { - "__id__": 1176 + "__id__": 1168 } ], "_prefab": { - "__id__": 1178 + "__id__": 1170 }, "_lpos": { "__type__": "cc.Vec3", @@ -24951,23 +24770,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1162 + "__id__": 1154 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1164 + "__id__": 1156 }, { - "__id__": 1166 + "__id__": 1158 }, { - "__id__": 1168 + "__id__": 1160 } ], "_prefab": { - "__id__": 1170 + "__id__": 1162 }, "_lpos": { "__type__": "cc.Vec3", @@ -24984,8 +24803,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1.7, - "y": 1.7, + "x": 1.5, + "y": 1.5, "z": 1 }, "_mobility": 0, @@ -25004,11 +24823,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1163 + "__id__": 1155 }, "_enabled": true, "__prefab": { - "__id__": 1165 + "__id__": 1157 }, "_contentSize": { "__type__": "cc.Size", @@ -25032,11 +24851,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1163 + "__id__": 1155 }, "_enabled": true, "__prefab": { - "__id__": 1167 + "__id__": 1159 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25080,11 +24899,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1163 + "__id__": 1155 }, "_enabled": true, "__prefab": { - "__id__": 1169 + "__id__": 1161 }, "_alignFlags": 45, "_target": null, @@ -25129,11 +24948,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1162 + "__id__": 1154 }, "_enabled": true, "__prefab": { - "__id__": 1172 + "__id__": 1164 }, "_contentSize": { "__type__": "cc.Size", @@ -25157,15 +24976,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1162 + "__id__": 1154 }, "_enabled": true, "__prefab": { - "__id__": 1174 + "__id__": 1166 }, "clickEvents": [ { - "__id__": 1175 + "__id__": 1167 } ], "_interactable": true, @@ -25227,11 +25046,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1162 + "__id__": 1154 }, "_enabled": true, "__prefab": { - "__id__": 1177 + "__id__": 1169 }, "_alignFlags": 4, "_target": null, @@ -25280,7 +25099,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1180 + "__id__": 1172 }, "_contentSize": { "__type__": "cc.Size", @@ -25308,7 +25127,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1182 + "__id__": 1174 }, "_alignFlags": 21, "_target": null, @@ -25344,16 +25163,16 @@ }, "_enabled": true, "__prefab": { - "__id__": 1184 + "__id__": 1176 }, "home_btn": { - "__id__": 967 + "__id__": 959 }, "hero_btn": { - "__id__": 926 + "__id__": 918 }, "rank_btn": { - "__id__": 1057 + "__id__": 1049 }, "_id": "" }, @@ -25381,14 +25200,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 1187 + "__id__": 1179 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1186 + "__id__": 1178 }, "asset": { "__uuid__": "26bff847-cd29-48a5-bbfa-c3e2dbda688d", @@ -25396,7 +25215,7 @@ }, "fileId": "5a9CMsVQhKP5Y+UJfTKPbx", "instance": { - "__id__": 1188 + "__id__": 1180 }, "targetOverrides": null }, @@ -25410,19 +25229,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 1189 + "__id__": 1181 }, { - "__id__": 1191 + "__id__": 1183 }, { - "__id__": 1192 + "__id__": 1184 }, { - "__id__": 1193 + "__id__": 1185 }, { - "__id__": 1194 + "__id__": 1186 } ], "removedComponents": [] @@ -25430,7 +25249,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1190 + "__id__": 1182 }, "propertyPath": [ "_name" @@ -25446,7 +25265,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1190 + "__id__": 1182 }, "propertyPath": [ "_lpos" @@ -25461,7 +25280,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1190 + "__id__": 1182 }, "propertyPath": [ "_lrot" @@ -25477,7 +25296,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1190 + "__id__": 1182 }, "propertyPath": [ "_euler" @@ -25492,7 +25311,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1190 + "__id__": 1182 }, "propertyPath": [ "_active" @@ -25509,23 +25328,23 @@ }, "_children": [ { - "__id__": 1196 + "__id__": 1188 } ], "_active": false, "_components": [ { - "__id__": 1234 + "__id__": 1226 }, { - "__id__": 1236 + "__id__": 1228 }, { - "__id__": 1238 + "__id__": 1230 } ], "_prefab": { - "__id__": 1240 + "__id__": 1232 }, "_lpos": { "__type__": "cc.Vec3", @@ -25562,30 +25381,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1195 + "__id__": 1187 }, "_children": [ { - "__id__": 1197 + "__id__": 1189 } ], "_active": true, "_components": [ { - "__id__": 1225 + "__id__": 1217 }, { - "__id__": 1227 + "__id__": 1219 }, { - "__id__": 1229 + "__id__": 1221 }, { - "__id__": 1231 + "__id__": 1223 } ], "_prefab": { - "__id__": 1233 + "__id__": 1225 }, "_lpos": { "__type__": "cc.Vec3", @@ -25622,27 +25441,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1196 + "__id__": 1188 }, "_children": [ + { + "__id__": 1190 + }, { "__id__": 1198 }, { - "__id__": 1206 - }, - { - "__id__": 1212 + "__id__": 1204 } ], "_active": true, "_components": [ { - "__id__": 1222 + "__id__": 1214 } ], "_prefab": { - "__id__": 1224 + "__id__": 1216 }, "_lpos": { "__type__": "cc.Vec3", @@ -25679,23 +25498,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1197 + "__id__": 1189 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1199 + "__id__": 1191 }, { - "__id__": 1201 + "__id__": 1193 }, { - "__id__": 1203 + "__id__": 1195 } ], "_prefab": { - "__id__": 1205 + "__id__": 1197 }, "_lpos": { "__type__": "cc.Vec3", @@ -25732,11 +25551,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1198 + "__id__": 1190 }, "_enabled": true, "__prefab": { - "__id__": 1200 + "__id__": 1192 }, "_contentSize": { "__type__": "cc.Size", @@ -25760,11 +25579,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1198 + "__id__": 1190 }, "_enabled": true, "__prefab": { - "__id__": 1202 + "__id__": 1194 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25808,11 +25627,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1198 + "__id__": 1190 }, "_enabled": true, "__prefab": { - "__id__": 1204 + "__id__": 1196 }, "_alignFlags": 40, "_target": null, @@ -25857,20 +25676,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1197 + "__id__": 1189 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1207 + "__id__": 1199 }, { - "__id__": 1209 + "__id__": 1201 } ], "_prefab": { - "__id__": 1211 + "__id__": 1203 }, "_lpos": { "__type__": "cc.Vec3", @@ -25907,11 +25726,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1206 + "__id__": 1198 }, "_enabled": true, "__prefab": { - "__id__": 1208 + "__id__": 1200 }, "_contentSize": { "__type__": "cc.Size", @@ -25935,11 +25754,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1206 + "__id__": 1198 }, "_enabled": true, "__prefab": { - "__id__": 1210 + "__id__": 1202 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25996,26 +25815,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1197 + "__id__": 1189 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1213 + "__id__": 1205 }, { - "__id__": 1215 + "__id__": 1207 }, { - "__id__": 1217 + "__id__": 1209 }, { - "__id__": 1219 + "__id__": 1211 } ], "_prefab": { - "__id__": 1221 + "__id__": 1213 }, "_lpos": { "__type__": "cc.Vec3", @@ -26052,11 +25871,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1212 + "__id__": 1204 }, "_enabled": true, "__prefab": { - "__id__": 1214 + "__id__": 1206 }, "_contentSize": { "__type__": "cc.Size", @@ -26080,11 +25899,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1212 + "__id__": 1204 }, "_enabled": true, "__prefab": { - "__id__": 1216 + "__id__": 1208 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26148,11 +25967,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1212 + "__id__": 1204 }, "_enabled": true, "__prefab": { - "__id__": 1218 + "__id__": 1210 }, "_alignFlags": 10, "_target": null, @@ -26184,11 +26003,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1212 + "__id__": 1204 }, "_enabled": true, "__prefab": { - "__id__": 1220 + "__id__": 1212 }, "templateMode": true, "watchPath": "data.data.gold", @@ -26221,11 +26040,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1197 + "__id__": 1189 }, "_enabled": true, "__prefab": { - "__id__": 1223 + "__id__": 1215 }, "_contentSize": { "__type__": "cc.Size", @@ -26262,11 +26081,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1196 + "__id__": 1188 }, "_enabled": true, "__prefab": { - "__id__": 1226 + "__id__": 1218 }, "_contentSize": { "__type__": "cc.Size", @@ -26290,11 +26109,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1196 + "__id__": 1188 }, "_enabled": true, "__prefab": { - "__id__": 1228 + "__id__": 1220 }, "_alignFlags": 8, "_target": null, @@ -26326,11 +26145,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1196 + "__id__": 1188 }, "_enabled": true, "__prefab": { - "__id__": 1230 + "__id__": 1222 }, "_resizeMode": 0, "_layoutType": 1, @@ -26364,11 +26183,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1196 + "__id__": 1188 }, "_enabled": true, "__prefab": { - "__id__": 1232 + "__id__": 1224 }, "_alignFlags": 40, "_target": null, @@ -26413,11 +26232,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1195 + "__id__": 1187 }, "_enabled": true, "__prefab": { - "__id__": 1235 + "__id__": 1227 }, "_contentSize": { "__type__": "cc.Size", @@ -26441,11 +26260,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1195 + "__id__": 1187 }, "_enabled": true, "__prefab": { - "__id__": 1237 + "__id__": 1229 }, "_alignFlags": 17, "_target": null, @@ -26477,11 +26296,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1195 + "__id__": 1187 }, "_enabled": true, "__prefab": { - "__id__": 1239 + "__id__": 1231 }, "_id": "" }, @@ -26512,7 +26331,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1242 + "__id__": 1234 }, "_contentSize": { "__type__": "cc.Size", @@ -26540,7 +26359,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1244 + "__id__": 1236 }, "_alignFlags": 45, "_target": null, @@ -26576,7 +26395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1246 + "__id__": 1238 }, "debugMode": false, "_id": "" @@ -26598,7 +26417,7 @@ "targetOverrides": [], "nestedPrefabInstanceRoots": [ { - "__id__": 1186 + "__id__": 1178 }, { "__id__": 837 diff --git a/assets/script/game/map/MissionHomeComp.ts b/assets/script/game/map/MissionHomeComp.ts index e5510f7e..24b50986 100644 --- a/assets/script/game/map/MissionHomeComp.ts +++ b/assets/script/game/map/MissionHomeComp.ts @@ -72,11 +72,18 @@ export class MissionHomeComp extends CCComp { * 1. 打印日志。 * 2. 分发 MissionStart 事件，驱动 MissionComp / MissionCardComp 初始化战斗。 * 3. 隐藏主页节点。 + * 4. 隐藏 mapLayer 下的 main 节点。 */ start_mission() { mLogger.log(this.debugMode, 'MissionHomeComp', "start_mission") oops.message.dispatchEvent(GameEvent.MissionStart, {}) this.node.active=false; + + // 隐藏 mapLayer 下的 main 节点 + let mainNode = smc.map.MapView.scene.mapLayer?.node.getChildByName("main"); + if (mainNode) { + mainNode.active = false; + } } /** 打开排行榜弹窗 */ @@ -99,6 +106,12 @@ export class MissionHomeComp extends CCComp { home_active(){ this.uodate_data() this.node.active=true + + // 重新显示 mapLayer 下的 main 节点 + let mainNode = smc.map.MapView.scene.mapLayer?.node.getChildByName("main"); + if (mainNode) { + mainNode.active = true; + } } /** 更新主页显示数据（预留） */ diff --git a/assets/script/game/map/MissionMonComp.ts b/assets/script/game/map/MissionMonComp.ts index 231024e6..20169d1f 100644 --- a/assets/script/game/map/MissionMonComp.ts +++ b/assets/script/game/map/MissionMonComp.ts @@ -105,7 +105,6 @@ export class MissionMonCompComp extends CCComp { this.on("SpawnSpecialMonster", this.onSpawnSpecialMonster, this); this.on("PhasePrepareEnd", this.onPhasePrepareEnd, this); this.on("TimeUpAdvanceWave", this.onTimeUpAdvanceWave, this); - this.resetSlotSpawnData(1) } /**