From d6934993970140360907e0bb22e655a1d0731ea6 Mon Sep 17 00:00:00 2001 From: panfudan Date: Thu, 21 Aug 2025 22:57:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=96=B0=E6=89=8B=E5=BC=95?= =?UTF-8?q?=E5=AF=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resources/game/gui/hcard.prefab | 132 +- assets/resources/gui/Hinfo.prefab | 430 +- assets/resources/gui/anim/task.anim | 237 + assets/resources/gui/anim/task.anim.meta | 13 + assets/resources/gui/element/task.prefab | 270 + assets/resources/gui/element/task.prefab.meta | 13 + assets/resources/gui/hero_select.prefab | 621 +- assets/resources/gui/role_controller.prefab | 5602 +++++++++-------- assets/resources/gui/ui1.plist.meta | 8 +- .../script/game/common/SingletonModuleComp.ts | 1 + assets/script/game/map/HCardUICom.ts | 17 +- assets/script/game/map/HInfoComp.ts | 5 +- assets/script/game/map/HeroReadyCom.ts | 3 + assets/script/game/map/HeroSelectCom.ts | 3 + .../script/game/wx_clound_client_api/USAGE.md | 1 + .../cloud_functions/cocos_cloud/API.md | 1 + .../cocos_cloud/modules/response.js | 1 + 17 files changed, 4521 insertions(+), 2837 deletions(-) create mode 100644 assets/resources/gui/anim/task.anim create mode 100644 assets/resources/gui/anim/task.anim.meta create mode 100644 assets/resources/gui/element/task.prefab create mode 100644 assets/resources/gui/element/task.prefab.meta diff --git a/assets/resources/game/gui/hcard.prefab b/assets/resources/game/gui/hcard.prefab index 318b1188..ddf273aa 100644 --- a/assets/resources/game/gui/hcard.prefab +++ b/assets/resources/game/gui/hcard.prefab @@ -80,19 +80,22 @@ }, { "__id__": 263 + }, + { + "__id__": 283 } ], "_active": true, "_components": [ { - "__id__": 283 + "__id__": 291 }, { - "__id__": 285 + "__id__": 293 } ], "_prefab": { - "__id__": 287 + "__id__": 295 }, "_lpos": { "__type__": "cc.Vec3", @@ -6394,6 +6397,118 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 284 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 283 + }, + "asset": { + "__uuid__": "1c7a67cd-0d50-4b26-ae0f-8bbe3ec1a3a3", + "__expectedType__": "cc.Prefab" + }, + "fileId": "4fJlP7AItEGL6+yc5TgOyj", + "instance": { + "__id__": 285 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "3dFm5jvgxJHoZPSPcjeuZk", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 286 + }, + { + "__id__": 288 + }, + { + "__id__": 289 + }, + { + "__id__": 290 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 287 + }, + "propertyPath": [ + "_name" + ], + "value": "task" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "4fJlP7AItEGL6+yc5TgOyj" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 287 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 42.185, + "y": -43.337, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 287 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 287 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, { "__type__": "cc.UITransform", "_name": "", @@ -6404,7 +6519,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 284 + "__id__": 292 }, "_contentSize": { "__type__": "cc.Size", @@ -6432,7 +6547,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 286 + "__id__": 294 }, "_id": "" }, @@ -6450,6 +6565,11 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": null, - "targetOverrides": null + "targetOverrides": null, + "nestedPrefabInstanceRoots": [ + { + "__id__": 283 + } + ] } ] \ No newline at end of file diff --git a/assets/resources/gui/Hinfo.prefab b/assets/resources/gui/Hinfo.prefab index 38984e85..158a4408 100644 --- a/assets/resources/gui/Hinfo.prefab +++ b/assets/resources/gui/Hinfo.prefab @@ -94,32 +94,32 @@ "__id__": 1091 }, { - "__id__": 1114 + "__id__": 1122 }, { - "__id__": 1131 + "__id__": 1139 }, { - "__id__": 1143 + "__id__": 1151 }, { - "__id__": 1160 + "__id__": 1168 } ], "_active": true, "_components": [ { - "__id__": 1206 + "__id__": 1214 }, { - "__id__": 1208 + "__id__": 1216 }, { - "__id__": 1210 + "__id__": 1218 } ], "_prefab": { - "__id__": 1212 + "__id__": 1220 }, "_lpos": { "__type__": "cc.Vec3", @@ -24844,25 +24844,28 @@ }, { "__id__": 1098 + }, + { + "__id__": 1104 } ], "_active": true, "_components": [ { - "__id__": 1104 + "__id__": 1112 }, { - "__id__": 1106 + "__id__": 1114 }, { - "__id__": 1108 + "__id__": 1116 }, { - "__id__": 1110 + "__id__": 1118 } ], "_prefab": { - "__id__": 1113 + "__id__": 1121 }, "_lpos": { "__type__": "cc.Vec3", @@ -25188,6 +25191,118 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1091 + }, + "_prefab": { + "__id__": 1105 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1104 + }, + "asset": { + "__uuid__": "1c7a67cd-0d50-4b26-ae0f-8bbe3ec1a3a3", + "__expectedType__": "cc.Prefab" + }, + "fileId": "4fJlP7AItEGL6+yc5TgOyj", + "instance": { + "__id__": 1106 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "72myx/ftZGM4Q0ehIw+STf", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 1107 + }, + { + "__id__": 1109 + }, + { + "__id__": 1110 + }, + { + "__id__": 1111 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 1108 + }, + "propertyPath": [ + "_name" + ], + "value": "task" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "4fJlP7AItEGL6+yc5TgOyj" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 1108 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 63.992, + "y": -48.005, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 1108 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 1108 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, { "__type__": "cc.UITransform", "_name": "", @@ -25198,7 +25313,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1105 + "__id__": 1113 }, "_contentSize": { "__type__": "cc.Size", @@ -25226,7 +25341,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1107 + "__id__": 1115 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25271,7 +25386,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1109 + "__id__": 1117 }, "_alignFlags": 44, "_target": null, @@ -25307,11 +25422,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 1111 + "__id__": 1119 }, "clickEvents": [ { - "__id__": 1112 + "__id__": 1120 } ], "_interactable": true, @@ -25390,26 +25505,26 @@ }, "_children": [ { - "__id__": 1115 + "__id__": 1123 } ], "_active": true, "_components": [ { - "__id__": 1121 + "__id__": 1129 }, { - "__id__": 1123 + "__id__": 1131 }, { - "__id__": 1125 + "__id__": 1133 }, { - "__id__": 1127 + "__id__": 1135 } ], "_prefab": { - "__id__": 1130 + "__id__": 1138 }, "_lpos": { "__type__": "cc.Vec3", @@ -25446,20 +25561,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1114 + "__id__": 1122 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1116 + "__id__": 1124 }, { - "__id__": 1118 + "__id__": 1126 } ], "_prefab": { - "__id__": 1120 + "__id__": 1128 }, "_lpos": { "__type__": "cc.Vec3", @@ -25496,11 +25611,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1115 + "__id__": 1123 }, "_enabled": true, "__prefab": { - "__id__": 1117 + "__id__": 1125 }, "_contentSize": { "__type__": "cc.Size", @@ -25524,11 +25639,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1115 + "__id__": 1123 }, "_enabled": true, "__prefab": { - "__id__": 1119 + "__id__": 1127 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25582,11 +25697,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1114 + "__id__": 1122 }, "_enabled": true, "__prefab": { - "__id__": 1122 + "__id__": 1130 }, "_contentSize": { "__type__": "cc.Size", @@ -25610,11 +25725,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1114 + "__id__": 1122 }, "_enabled": true, "__prefab": { - "__id__": 1124 + "__id__": 1132 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25655,11 +25770,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1114 + "__id__": 1122 }, "_enabled": true, "__prefab": { - "__id__": 1126 + "__id__": 1134 }, "_alignFlags": 12, "_target": null, @@ -25691,15 +25806,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1114 + "__id__": 1122 }, "_enabled": true, "__prefab": { - "__id__": 1128 + "__id__": 1136 }, "clickEvents": [ { - "__id__": 1129 + "__id__": 1137 } ], "_interactable": true, @@ -25778,20 +25893,20 @@ }, "_children": [ { - "__id__": 1132 + "__id__": 1140 } ], "_active": true, "_components": [ { - "__id__": 1138 + "__id__": 1146 }, { - "__id__": 1140 + "__id__": 1148 } ], "_prefab": { - "__id__": 1142 + "__id__": 1150 }, "_lpos": { "__type__": "cc.Vec3", @@ -25828,20 +25943,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1131 + "__id__": 1139 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1133 + "__id__": 1141 }, { - "__id__": 1135 + "__id__": 1143 } ], "_prefab": { - "__id__": 1137 + "__id__": 1145 }, "_lpos": { "__type__": "cc.Vec3", @@ -25878,11 +25993,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1132 + "__id__": 1140 }, "_enabled": true, "__prefab": { - "__id__": 1134 + "__id__": 1142 }, "_contentSize": { "__type__": "cc.Size", @@ -25906,11 +26021,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1132 + "__id__": 1140 }, "_enabled": true, "__prefab": { - "__id__": 1136 + "__id__": 1144 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25964,11 +26079,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1131 + "__id__": 1139 }, "_enabled": true, "__prefab": { - "__id__": 1139 + "__id__": 1147 }, "_contentSize": { "__type__": "cc.Size", @@ -25992,11 +26107,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1131 + "__id__": 1139 }, "_enabled": true, "__prefab": { - "__id__": 1141 + "__id__": 1149 }, "_alignFlags": 17, "_target": null, @@ -26045,26 +26160,26 @@ }, "_children": [ { - "__id__": 1144 + "__id__": 1152 } ], - "_active": true, + "_active": false, "_components": [ { - "__id__": 1150 + "__id__": 1158 }, { - "__id__": 1152 + "__id__": 1160 }, { - "__id__": 1154 + "__id__": 1162 }, { - "__id__": 1156 + "__id__": 1164 } ], "_prefab": { - "__id__": 1159 + "__id__": 1167 }, "_lpos": { "__type__": "cc.Vec3", @@ -26101,20 +26216,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1143 + "__id__": 1151 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1145 + "__id__": 1153 }, { - "__id__": 1147 + "__id__": 1155 } ], "_prefab": { - "__id__": 1149 + "__id__": 1157 }, "_lpos": { "__type__": "cc.Vec3", @@ -26151,11 +26266,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1144 + "__id__": 1152 }, "_enabled": true, "__prefab": { - "__id__": 1146 + "__id__": 1154 }, "_contentSize": { "__type__": "cc.Size", @@ -26179,11 +26294,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1144 + "__id__": 1152 }, "_enabled": true, "__prefab": { - "__id__": 1148 + "__id__": 1156 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26260,11 +26375,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1143 + "__id__": 1151 }, "_enabled": true, "__prefab": { - "__id__": 1151 + "__id__": 1159 }, "_contentSize": { "__type__": "cc.Size", @@ -26288,11 +26403,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1143 + "__id__": 1151 }, "_enabled": true, "__prefab": { - "__id__": 1153 + "__id__": 1161 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26333,11 +26448,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1143 + "__id__": 1151 }, "_enabled": true, "__prefab": { - "__id__": 1155 + "__id__": 1163 }, "_alignFlags": 44, "_target": null, @@ -26369,15 +26484,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1143 + "__id__": 1151 }, "_enabled": true, "__prefab": { - "__id__": 1157 + "__id__": 1165 }, "clickEvents": [ { - "__id__": 1158 + "__id__": 1166 } ], "_interactable": true, @@ -26456,23 +26571,23 @@ }, "_children": [ { - "__id__": 1161 + "__id__": 1169 }, { - "__id__": 1169 + "__id__": 1177 } ], "_active": true, "_components": [ { - "__id__": 1201 + "__id__": 1209 }, { - "__id__": 1203 + "__id__": 1211 } ], "_prefab": { - "__id__": 1205 + "__id__": 1213 }, "_lpos": { "__type__": "cc.Vec3", @@ -26509,23 +26624,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1160 + "__id__": 1168 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1162 + "__id__": 1170 }, { - "__id__": 1164 + "__id__": 1172 }, { - "__id__": 1166 + "__id__": 1174 } ], "_prefab": { - "__id__": 1168 + "__id__": 1176 }, "_lpos": { "__type__": "cc.Vec3", @@ -26562,11 +26677,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1161 + "__id__": 1169 }, "_enabled": true, "__prefab": { - "__id__": 1163 + "__id__": 1171 }, "_contentSize": { "__type__": "cc.Size", @@ -26590,11 +26705,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1161 + "__id__": 1169 }, "_enabled": true, "__prefab": { - "__id__": 1165 + "__id__": 1173 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26635,11 +26750,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1161 + "__id__": 1169 }, "_enabled": true, "__prefab": { - "__id__": 1167 + "__id__": 1175 }, "_alignFlags": 45, "_target": null, @@ -26684,33 +26799,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1160 + "__id__": 1168 }, "_children": [ { - "__id__": 1170 - }, - { - "__id__": 1176 + "__id__": 1178 }, { "__id__": 1184 }, { - "__id__": 1190 - } - ], - "_active": true, - "_components": [ - { - "__id__": 1196 + "__id__": 1192 }, { "__id__": 1198 } ], + "_active": true, + "_components": [ + { + "__id__": 1204 + }, + { + "__id__": 1206 + } + ], "_prefab": { - "__id__": 1200 + "__id__": 1208 }, "_lpos": { "__type__": "cc.Vec3", @@ -26747,20 +26862,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1169 + "__id__": 1177 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1171 + "__id__": 1179 }, { - "__id__": 1173 + "__id__": 1181 } ], "_prefab": { - "__id__": 1175 + "__id__": 1183 }, "_lpos": { "__type__": "cc.Vec3", @@ -26797,11 +26912,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1170 + "__id__": 1178 }, "_enabled": true, "__prefab": { - "__id__": 1172 + "__id__": 1180 }, "_contentSize": { "__type__": "cc.Size", @@ -26825,11 +26940,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1170 + "__id__": 1178 }, "_enabled": true, "__prefab": { - "__id__": 1174 + "__id__": 1182 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26886,23 +27001,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1169 + "__id__": 1177 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1177 + "__id__": 1185 }, { - "__id__": 1179 + "__id__": 1187 }, { - "__id__": 1181 + "__id__": 1189 } ], "_prefab": { - "__id__": 1183 + "__id__": 1191 }, "_lpos": { "__type__": "cc.Vec3", @@ -26939,11 +27054,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1176 + "__id__": 1184 }, "_enabled": true, "__prefab": { - "__id__": 1178 + "__id__": 1186 }, "_contentSize": { "__type__": "cc.Size", @@ -26967,11 +27082,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1176 + "__id__": 1184 }, "_enabled": true, "__prefab": { - "__id__": 1180 + "__id__": 1188 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -27035,11 +27150,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1176 + "__id__": 1184 }, "_enabled": false, "__prefab": { - "__id__": 1182 + "__id__": 1190 }, "templateMode": true, "watchPath": "", @@ -27072,20 +27187,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1169 + "__id__": 1177 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1185 + "__id__": 1193 }, { - "__id__": 1187 + "__id__": 1195 } ], "_prefab": { - "__id__": 1189 + "__id__": 1197 }, "_lpos": { "__type__": "cc.Vec3", @@ -27122,11 +27237,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1184 + "__id__": 1192 }, "_enabled": true, "__prefab": { - "__id__": 1186 + "__id__": 1194 }, "_contentSize": { "__type__": "cc.Size", @@ -27150,11 +27265,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1184 + "__id__": 1192 }, "_enabled": true, "__prefab": { - "__id__": 1188 + "__id__": 1196 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -27231,20 +27346,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1169 + "__id__": 1177 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1191 + "__id__": 1199 }, { - "__id__": 1193 + "__id__": 1201 } ], "_prefab": { - "__id__": 1195 + "__id__": 1203 }, "_lpos": { "__type__": "cc.Vec3", @@ -27281,11 +27396,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1190 + "__id__": 1198 }, "_enabled": true, "__prefab": { - "__id__": 1192 + "__id__": 1200 }, "_contentSize": { "__type__": "cc.Size", @@ -27309,11 +27424,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1190 + "__id__": 1198 }, "_enabled": true, "__prefab": { - "__id__": 1194 + "__id__": 1202 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -27390,11 +27505,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1169 + "__id__": 1177 }, "_enabled": true, "__prefab": { - "__id__": 1197 + "__id__": 1205 }, "_contentSize": { "__type__": "cc.Size", @@ -27418,11 +27533,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1169 + "__id__": 1177 }, "_enabled": true, "__prefab": { - "__id__": 1199 + "__id__": 1207 }, "_resizeMode": 0, "_layoutType": 1, @@ -27469,11 +27584,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1160 + "__id__": 1168 }, "_enabled": true, "__prefab": { - "__id__": 1202 + "__id__": 1210 }, "_contentSize": { "__type__": "cc.Size", @@ -27497,11 +27612,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1160 + "__id__": 1168 }, "_enabled": true, "__prefab": { - "__id__": 1204 + "__id__": 1212 }, "_alignFlags": 44, "_target": null, @@ -27550,7 +27665,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1207 + "__id__": 1215 }, "_contentSize": { "__type__": "cc.Size", @@ -27578,7 +27693,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1209 + "__id__": 1217 }, "_alignFlags": 45, "_target": null, @@ -27614,7 +27729,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1211 + "__id__": 1219 }, "_id": "" }, @@ -27634,6 +27749,9 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ + { + "__id__": 1104 + }, { "__id__": 197 }, diff --git a/assets/resources/gui/anim/task.anim b/assets/resources/gui/anim/task.anim new file mode 100644 index 00000000..5e5c8f3c --- /dev/null +++ b/assets/resources/gui/anim/task.anim @@ -0,0 +1,237 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "task", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 10, + "speed": 1, + "wrapMode": 2, + "enableTrsBlending": false, + "_duration": 0.6, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [], + "_embeddedPlayers": [], + "_additiveSettings": { + "__id__": 11 + }, + "_auxiliaryCurveEntries": [] + }, + { + "__type__": "cc.animation.VectorTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 2 + }, + "proxy": null + }, + "_channels": [ + { + "__id__": 3 + }, + { + "__id__": 5 + }, + { + "__id__": 7 + }, + { + "__id__": 9 + } + ], + "_nComponents": 3 + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + "position" + ] + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 4 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.3, + 0.6 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 30, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 30, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 6 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.3, + 0.6 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": -30, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": -30, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 8 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.3 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 10 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [], + "_values": [], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/gui/anim/task.anim.meta b/assets/resources/gui/anim/task.anim.meta new file mode 100644 index 00000000..c5fb5a77 --- /dev/null +++ b/assets/resources/gui/anim/task.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "cc054dac-20b0-428b-bbb1-02776f6774ee", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "task" + } +} diff --git a/assets/resources/gui/element/task.prefab b/assets/resources/gui/element/task.prefab new file mode 100644 index 00000000..a2ee64d3 --- /dev/null +++ b/assets/resources/gui/element/task.prefab @@ -0,0 +1,270 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "task", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "task", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + } + ], + "_active": true, + "_components": [ + { + "__id__": 10 + } + ], + "_prefab": { + "__id__": 12 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 274.234, + "y": 484.746, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Tutorial_Hand", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 3 + }, + { + "__id__": 5 + }, + { + "__id__": 7 + } + ], + "_prefab": { + "__id__": 9 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 82, + "height": 90 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c1KB9dIDFAxbmLQg99swxi" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 6 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717@f17b2", + "__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": "75BNcZLuNN16FmtGUp8YIl" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 8 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "cc054dac-20b0-428b-bbb1-02776f6774ee", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "cc054dac-20b0-428b-bbb1-02776f6774ee", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f82R0f+7pPqrE0vPPEKFOZ" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "0658nQXq9N0oQ+gWV86dic", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 11 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 180, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2dOsoG349BmaSplRClOk+M" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "4fJlP7AItEGL6+yc5TgOyj", + "targetOverrides": null + } +] \ No newline at end of file diff --git a/assets/resources/gui/element/task.prefab.meta b/assets/resources/gui/element/task.prefab.meta new file mode 100644 index 00000000..7a58a55c --- /dev/null +++ b/assets/resources/gui/element/task.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "1c7a67cd-0d50-4b26-ae0f-8bbe3ec1a3a3", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "task" + } +} diff --git a/assets/resources/gui/hero_select.prefab b/assets/resources/gui/hero_select.prefab index 05e34024..57f26582 100644 --- a/assets/resources/gui/hero_select.prefab +++ b/assets/resources/gui/hero_select.prefab @@ -25,26 +25,29 @@ "__id__": 27 }, { - "__id__": 71 + "__id__": 95 }, { - "__id__": 87 + "__id__": 111 + }, + { + "__id__": 130 } ], "_active": true, "_components": [ { - "__id__": 106 + "__id__": 138 }, { - "__id__": 108 + "__id__": 140 }, { - "__id__": 110 + "__id__": 142 } ], "_prefab": { - "__id__": 112 + "__id__": 144 }, "_lpos": { "__type__": "cc.Vec3", @@ -402,20 +405,20 @@ "_active": true, "_components": [ { - "__id__": 64 + "__id__": 88 }, { - "__id__": 66 + "__id__": 90 }, { "__id__": 43 }, { - "__id__": 68 + "__id__": 92 } ], "_prefab": { - "__id__": 70 + "__id__": 94 }, "_lpos": { "__type__": "cc.Vec3", @@ -475,7 +478,7 @@ } ], "_prefab": { - "__id__": 63 + "__id__": 87 }, "_lpos": { "__type__": "cc.Vec3", @@ -817,21 +820,31 @@ "_parent": { "__id__": 46 }, - "_children": [], - "_active": true, - "_components": [ + "_children": [ { "__id__": 56 }, { - "__id__": 58 + "__id__": 64 }, { - "__id__": 60 + "__id__": 72 + } + ], + "_active": true, + "_components": [ + { + "__id__": 80 + }, + { + "__id__": 82 + }, + { + "__id__": 84 } ], "_prefab": { - "__id__": 62 + "__id__": 86 }, "_lpos": { "__type__": "cc.Vec3", @@ -1067,6 +1080,342 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 45 + }, + "_prefab": { + "__id__": 57 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 56 + }, + "asset": { + "__uuid__": "443470ad-dfbf-41b6-b474-a004470401de", + "__expectedType__": "cc.Prefab" + }, + "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "instance": { + "__id__": 58 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "d4YMNvu1dJ35BK4ZfHBlz5", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 59 + }, + { + "__id__": 61 + }, + { + "__id__": 62 + }, + { + "__id__": 63 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 60 + }, + "propertyPath": [ + "_name" + ], + "value": "hcard" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c46/YsCPVOJYA4mWEpNYRx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 60 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 120, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 60 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 60 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 45 + }, + "_prefab": { + "__id__": 65 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 64 + }, + "asset": { + "__uuid__": "443470ad-dfbf-41b6-b474-a004470401de", + "__expectedType__": "cc.Prefab" + }, + "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "instance": { + "__id__": 66 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "4eZQ1UZSlElIAK3yJH6dDs", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 67 + }, + { + "__id__": 69 + }, + { + "__id__": 70 + }, + { + "__id__": 71 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 68 + }, + "propertyPath": [ + "_name" + ], + "value": "hcard" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c46/YsCPVOJYA4mWEpNYRx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 68 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 350, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 68 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 68 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 45 + }, + "_prefab": { + "__id__": 73 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 72 + }, + "asset": { + "__uuid__": "443470ad-dfbf-41b6-b474-a004470401de", + "__expectedType__": "cc.Prefab" + }, + "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "instance": { + "__id__": 74 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "37v6Hc2WZFBLvYqawRVPLV", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 75 + }, + { + "__id__": 77 + }, + { + "__id__": 78 + }, + { + "__id__": 79 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 76 + }, + "propertyPath": [ + "_name" + ], + "value": "hcard" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c46/YsCPVOJYA4mWEpNYRx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 76 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 580, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 76 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 76 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, { "__type__": "cc.UITransform", "_name": "", @@ -1077,7 +1426,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 81 }, "_contentSize": { "__type__": "cc.Size", @@ -1105,7 +1454,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 59 + "__id__": 83 }, "_alignFlags": 9, "_target": null, @@ -1141,7 +1490,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 85 }, "_resizeMode": 0, "_layoutType": 1, @@ -1205,7 +1554,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 89 }, "_contentSize": { "__type__": "cc.Size", @@ -1233,7 +1582,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 67 + "__id__": 91 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1278,7 +1627,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 69 + "__id__": 93 }, "_alignFlags": 45, "_target": null, @@ -1327,23 +1676,23 @@ }, "_children": [ { - "__id__": 72 + "__id__": 96 } ], "_active": true, "_components": [ { - "__id__": 80 + "__id__": 104 }, { - "__id__": 82 + "__id__": 106 }, { - "__id__": 84 + "__id__": 108 } ], "_prefab": { - "__id__": 86 + "__id__": 110 }, "_lpos": { "__type__": "cc.Vec3", @@ -1380,23 +1729,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 71 + "__id__": 95 }, "_children": [], "_active": true, "_components": [ { - "__id__": 73 + "__id__": 97 }, { - "__id__": 75 + "__id__": 99 }, { - "__id__": 77 + "__id__": 101 } ], "_prefab": { - "__id__": 79 + "__id__": 103 }, "_lpos": { "__type__": "cc.Vec3", @@ -1433,11 +1782,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 72 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 74 + "__id__": 98 }, "_contentSize": { "__type__": "cc.Size", @@ -1461,11 +1810,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 72 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 76 + "__id__": 100 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1529,11 +1878,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 72 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 78 + "__id__": 102 }, "_alignFlags": 4, "_target": null, @@ -1578,11 +1927,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 71 + "__id__": 95 }, "_enabled": true, "__prefab": { - "__id__": 81 + "__id__": 105 }, "_contentSize": { "__type__": "cc.Size", @@ -1606,11 +1955,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 71 + "__id__": 95 }, "_enabled": true, "__prefab": { - "__id__": 83 + "__id__": 107 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1651,11 +2000,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 71 + "__id__": 95 }, "_enabled": true, "__prefab": { - "__id__": 85 + "__id__": 109 }, "_alignFlags": 41, "_target": null, @@ -1704,23 +2053,23 @@ }, "_children": [ { - "__id__": 88 + "__id__": 112 }, { - "__id__": 94 + "__id__": 118 } ], "_active": true, "_components": [ { - "__id__": 100 + "__id__": 124 }, { - "__id__": 102 + "__id__": 126 } ], "_prefab": { - "__id__": 105 + "__id__": 129 }, "_lpos": { "__type__": "cc.Vec3", @@ -1757,20 +2106,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 87 + "__id__": 111 }, "_children": [], "_active": true, "_components": [ { - "__id__": 89 + "__id__": 113 }, { - "__id__": 91 + "__id__": 115 } ], "_prefab": { - "__id__": 93 + "__id__": 117 }, "_lpos": { "__type__": "cc.Vec3", @@ -1807,11 +2156,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 88 + "__id__": 112 }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 114 }, "_contentSize": { "__type__": "cc.Size", @@ -1835,11 +2184,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 88 + "__id__": 112 }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 116 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1893,20 +2242,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 87 + "__id__": 111 }, "_children": [], "_active": true, "_components": [ { - "__id__": 95 + "__id__": 119 }, { - "__id__": 97 + "__id__": 121 } ], "_prefab": { - "__id__": 99 + "__id__": 123 }, "_lpos": { "__type__": "cc.Vec3", @@ -1943,11 +2292,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 94 + "__id__": 118 }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 120 }, "_contentSize": { "__type__": "cc.Size", @@ -1971,11 +2320,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 94 + "__id__": 118 }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 122 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2029,11 +2378,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 87 + "__id__": 111 }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 125 }, "_contentSize": { "__type__": "cc.Size", @@ -2057,15 +2406,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 87 + "__id__": 111 }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 127 }, "clickEvents": [ { - "__id__": 104 + "__id__": 128 } ], "_interactable": true, @@ -2134,6 +2483,118 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 131 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 130 + }, + "asset": { + "__uuid__": "1c7a67cd-0d50-4b26-ae0f-8bbe3ec1a3a3", + "__expectedType__": "cc.Prefab" + }, + "fileId": "4fJlP7AItEGL6+yc5TgOyj", + "instance": { + "__id__": 132 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "1cCqYGXSJISpmbEZ9gKXTs", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 133 + }, + { + "__id__": 135 + }, + { + "__id__": 136 + }, + { + "__id__": 137 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 134 + }, + "propertyPath": [ + "_name" + ], + "value": "task" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "4fJlP7AItEGL6+yc5TgOyj" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 134 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 153.535, + "y": -36.987, + "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.UITransform", "_name": "", @@ -2144,7 +2605,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 139 }, "_contentSize": { "__type__": "cc.Size", @@ -2172,7 +2633,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 141 }, "_alignFlags": 42, "_target": null, @@ -2208,7 +2669,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 143 }, "_id": "" }, @@ -2228,6 +2689,18 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ + { + "__id__": 130 + }, + { + "__id__": 72 + }, + { + "__id__": 64 + }, + { + "__id__": 56 + }, { "__id__": 2 } diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index bcd7d20d..34e4dea6 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -25,26 +25,26 @@ "__id__": 280 }, { - "__id__": 1522 + "__id__": 1550 }, { - "__id__": 1562 + "__id__": 1590 } ], "_active": true, "_components": [ { - "__id__": 1774 + "__id__": 1802 }, { - "__id__": 1776 + "__id__": 1804 }, { - "__id__": 1778 + "__id__": 1806 } ], "_prefab": { - "__id__": 1780 + "__id__": 1808 }, "_lpos": { "__type__": "cc.Vec3", @@ -6161,38 +6161,38 @@ "__id__": 281 }, { - "__id__": 306 - }, - { - "__id__": 557 + "__id__": 314 }, { "__id__": 577 }, { - "__id__": 1222 + "__id__": 597 }, { - "__id__": 1300 + "__id__": 1242 + }, + { + "__id__": 1320 } ], "_active": true, "_components": [ { - "__id__": 1513 + "__id__": 1541 }, { - "__id__": 1515 + "__id__": 1543 }, { - "__id__": 1517 + "__id__": 1545 }, { - "__id__": 1519 + "__id__": 1547 } ], "_prefab": { - "__id__": 1521 + "__id__": 1549 }, "_lpos": { "__type__": "cc.Vec3", @@ -6240,19 +6240,22 @@ }, { "__id__": 294 + }, + { + "__id__": 300 } ], "_active": true, "_components": [ { - "__id__": 300 + "__id__": 308 }, { - "__id__": 302 + "__id__": 310 } ], "_prefab": { - "__id__": 305 + "__id__": 313 }, "_lpos": { "__type__": "cc.Vec3", @@ -6714,6 +6717,118 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 281 + }, + "_prefab": { + "__id__": 301 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 300 + }, + "asset": { + "__uuid__": "1c7a67cd-0d50-4b26-ae0f-8bbe3ec1a3a3", + "__expectedType__": "cc.Prefab" + }, + "fileId": "4fJlP7AItEGL6+yc5TgOyj", + "instance": { + "__id__": 302 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "8c+dlW8NtHnaIkMi2L1di+", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 303 + }, + { + "__id__": 305 + }, + { + "__id__": 306 + }, + { + "__id__": 307 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 304 + }, + "propertyPath": [ + "_name" + ], + "value": "task" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "4fJlP7AItEGL6+yc5TgOyj" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 304 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 44.482, + "y": -41.682, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 304 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 304 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, { "__type__": "cc.UITransform", "_name": "", @@ -6724,7 +6839,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 301 + "__id__": 309 }, "_contentSize": { "__type__": "cc.Size", @@ -6752,11 +6867,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 303 + "__id__": 311 }, "clickEvents": [ { - "__id__": 304 + "__id__": 312 } ], "_interactable": true, @@ -6823,8 +6938,6 @@ "__id__": 0 }, "fileId": "d6zor/kXBFx4Y+N5rOgyup", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -6837,29 +6950,29 @@ }, "_children": [ { - "__id__": 307 + "__id__": 315 }, { - "__id__": 388 + "__id__": 396 }, { - "__id__": 469 + "__id__": 477 } ], "_active": true, "_components": [ { - "__id__": 550 + "__id__": 570 }, { - "__id__": 552 + "__id__": 572 }, { - "__id__": 554 + "__id__": 574 } ], "_prefab": { - "__id__": 556 + "__id__": 576 }, "_lpos": { "__type__": "cc.Vec3", @@ -6896,51 +7009,51 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 306 + "__id__": 314 }, "_children": [ { - "__id__": 308 + "__id__": 316 }, { - "__id__": 314 + "__id__": 322 }, { - "__id__": 320 + "__id__": 328 }, { - "__id__": 326 + "__id__": 334 }, { - "__id__": 332 + "__id__": 340 }, { - "__id__": 338 + "__id__": 346 }, { - "__id__": 344 - }, - { - "__id__": 360 + "__id__": 352 }, { "__id__": 368 + }, + { + "__id__": 376 } ], "_active": true, "_components": [ { - "__id__": 380 + "__id__": 388 }, { - "__id__": 382 + "__id__": 390 }, { - "__id__": 384 + "__id__": 392 } ], "_prefab": { - "__id__": 387 + "__id__": 395 }, "_lpos": { "__type__": "cc.Vec3", @@ -6977,20 +7090,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 307 + "__id__": 315 }, "_children": [], "_active": true, "_components": [ { - "__id__": 309 + "__id__": 317 }, { - "__id__": 311 + "__id__": 319 } ], "_prefab": { - "__id__": 313 + "__id__": 321 }, "_lpos": { "__type__": "cc.Vec3", @@ -7027,11 +7140,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 308 + "__id__": 316 }, "_enabled": true, "__prefab": { - "__id__": 310 + "__id__": 318 }, "_contentSize": { "__type__": "cc.Size", @@ -7055,11 +7168,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 308 + "__id__": 316 }, "_enabled": true, "__prefab": { - "__id__": 312 + "__id__": 320 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7113,20 +7226,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 307 + "__id__": 315 }, "_children": [], "_active": false, "_components": [ { - "__id__": 315 + "__id__": 323 }, { - "__id__": 317 + "__id__": 325 } ], "_prefab": { - "__id__": 319 + "__id__": 327 }, "_lpos": { "__type__": "cc.Vec3", @@ -7163,11 +7276,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 314 + "__id__": 322 }, "_enabled": true, "__prefab": { - "__id__": 316 + "__id__": 324 }, "_contentSize": { "__type__": "cc.Size", @@ -7191,11 +7304,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 314 + "__id__": 322 }, "_enabled": true, "__prefab": { - "__id__": 318 + "__id__": 326 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7249,20 +7362,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 307 + "__id__": 315 }, "_children": [], "_active": false, "_components": [ { - "__id__": 321 + "__id__": 329 }, { - "__id__": 323 + "__id__": 331 } ], "_prefab": { - "__id__": 325 + "__id__": 333 }, "_lpos": { "__type__": "cc.Vec3", @@ -7299,11 +7412,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 320 + "__id__": 328 }, "_enabled": true, "__prefab": { - "__id__": 322 + "__id__": 330 }, "_contentSize": { "__type__": "cc.Size", @@ -7327,11 +7440,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 320 + "__id__": 328 }, "_enabled": true, "__prefab": { - "__id__": 324 + "__id__": 332 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7385,20 +7498,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 307 + "__id__": 315 }, "_children": [], "_active": true, "_components": [ { - "__id__": 327 + "__id__": 335 }, { - "__id__": 329 + "__id__": 337 } ], "_prefab": { - "__id__": 331 + "__id__": 339 }, "_lpos": { "__type__": "cc.Vec3", @@ -7435,11 +7548,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 326 + "__id__": 334 }, "_enabled": true, "__prefab": { - "__id__": 328 + "__id__": 336 }, "_contentSize": { "__type__": "cc.Size", @@ -7463,11 +7576,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 326 + "__id__": 334 }, "_enabled": true, "__prefab": { - "__id__": 330 + "__id__": 338 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7521,20 +7634,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 307 + "__id__": 315 }, "_children": [], "_active": false, "_components": [ { - "__id__": 333 + "__id__": 341 }, { - "__id__": 335 + "__id__": 343 } ], "_prefab": { - "__id__": 337 + "__id__": 345 }, "_lpos": { "__type__": "cc.Vec3", @@ -7571,11 +7684,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 332 + "__id__": 340 }, "_enabled": true, "__prefab": { - "__id__": 334 + "__id__": 342 }, "_contentSize": { "__type__": "cc.Size", @@ -7599,11 +7712,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 332 + "__id__": 340 }, "_enabled": true, "__prefab": { - "__id__": 336 + "__id__": 344 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7657,20 +7770,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 307 + "__id__": 315 }, "_children": [], "_active": false, "_components": [ { - "__id__": 339 + "__id__": 347 }, { - "__id__": 341 + "__id__": 349 } ], "_prefab": { - "__id__": 343 + "__id__": 351 }, "_lpos": { "__type__": "cc.Vec3", @@ -7707,11 +7820,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 338 + "__id__": 346 }, "_enabled": true, "__prefab": { - "__id__": 340 + "__id__": 348 }, "_contentSize": { "__type__": "cc.Size", @@ -7735,11 +7848,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 338 + "__id__": 346 }, "_enabled": true, "__prefab": { - "__id__": 342 + "__id__": 350 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7793,24 +7906,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 307 + "__id__": 315 }, "_children": [ { - "__id__": 345 + "__id__": 353 }, { - "__id__": 351 + "__id__": 359 } ], "_active": true, "_components": [ { - "__id__": 357 + "__id__": 365 } ], "_prefab": { - "__id__": 359 + "__id__": 367 }, "_lpos": { "__type__": "cc.Vec3", @@ -7847,20 +7960,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 344 + "__id__": 352 }, "_children": [], "_active": true, "_components": [ { - "__id__": 346 + "__id__": 354 }, { - "__id__": 348 + "__id__": 356 } ], "_prefab": { - "__id__": 350 + "__id__": 358 }, "_lpos": { "__type__": "cc.Vec3", @@ -7897,11 +8010,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 345 + "__id__": 353 }, "_enabled": true, "__prefab": { - "__id__": 347 + "__id__": 355 }, "_contentSize": { "__type__": "cc.Size", @@ -7925,11 +8038,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 345 + "__id__": 353 }, "_enabled": true, "__prefab": { - "__id__": 349 + "__id__": 357 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7983,20 +8096,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 344 + "__id__": 352 }, "_children": [], "_active": true, "_components": [ { - "__id__": 352 + "__id__": 360 }, { - "__id__": 354 + "__id__": 362 } ], "_prefab": { - "__id__": 356 + "__id__": 364 }, "_lpos": { "__type__": "cc.Vec3", @@ -8033,11 +8146,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 351 + "__id__": 359 }, "_enabled": true, "__prefab": { - "__id__": 353 + "__id__": 361 }, "_contentSize": { "__type__": "cc.Size", @@ -8061,11 +8174,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 351 + "__id__": 359 }, "_enabled": true, "__prefab": { - "__id__": 355 + "__id__": 363 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8119,11 +8232,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 344 + "__id__": 352 }, "_enabled": true, "__prefab": { - "__id__": 358 + "__id__": 366 }, "_contentSize": { "__type__": "cc.Size", @@ -8160,23 +8273,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 307 + "__id__": 315 }, "_children": [], "_active": true, "_components": [ { - "__id__": 361 + "__id__": 369 }, { - "__id__": 363 + "__id__": 371 }, { - "__id__": 365 + "__id__": 373 } ], "_prefab": { - "__id__": 367 + "__id__": 375 }, "_lpos": { "__type__": "cc.Vec3", @@ -8213,11 +8326,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 360 + "__id__": 368 }, "_enabled": true, "__prefab": { - "__id__": 362 + "__id__": 370 }, "_contentSize": { "__type__": "cc.Size", @@ -8241,11 +8354,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 360 + "__id__": 368 }, "_enabled": true, "__prefab": { - "__id__": 364 + "__id__": 372 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8283,11 +8396,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 360 + "__id__": 368 }, "_enabled": true, "__prefab": { - "__id__": 366 + "__id__": 374 }, "playOnLoad": false, "_clips": [ @@ -8319,24 +8432,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 307 + "__id__": 315 }, "_children": [ { - "__id__": 369 + "__id__": 377 } ], "_active": true, "_components": [ { - "__id__": 375 + "__id__": 383 }, { - "__id__": 377 + "__id__": 385 } ], "_prefab": { - "__id__": 379 + "__id__": 387 }, "_lpos": { "__type__": "cc.Vec3", @@ -8373,20 +8486,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 368 + "__id__": 376 }, "_children": [], "_active": true, "_components": [ { - "__id__": 370 + "__id__": 378 }, { - "__id__": 372 + "__id__": 380 } ], "_prefab": { - "__id__": 374 + "__id__": 382 }, "_lpos": { "__type__": "cc.Vec3", @@ -8423,11 +8536,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 369 + "__id__": 377 }, "_enabled": true, "__prefab": { - "__id__": 371 + "__id__": 379 }, "_contentSize": { "__type__": "cc.Size", @@ -8451,11 +8564,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 369 + "__id__": 377 }, "_enabled": true, "__prefab": { - "__id__": 373 + "__id__": 381 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8532,11 +8645,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 368 + "__id__": 376 }, "_enabled": true, "__prefab": { - "__id__": 376 + "__id__": 384 }, "_contentSize": { "__type__": "cc.Size", @@ -8560,11 +8673,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 368 + "__id__": 376 }, "_enabled": true, "__prefab": { - "__id__": 378 + "__id__": 386 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8618,11 +8731,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 307 + "__id__": 315 }, "_enabled": true, "__prefab": { - "__id__": 381 + "__id__": 389 }, "_contentSize": { "__type__": "cc.Size", @@ -8646,11 +8759,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 307 + "__id__": 315 }, "_enabled": true, "__prefab": { - "__id__": 383 + "__id__": 391 }, "slot": 0, "_id": "" @@ -8665,15 +8778,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 307 + "__id__": 315 }, "_enabled": true, "__prefab": { - "__id__": 385 + "__id__": 393 }, "clickEvents": [ { - "__id__": 386 + "__id__": 394 } ], "_interactable": true, @@ -8722,7 +8835,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 307 + "__id__": 315 }, "component": "", "_componentId": "11781wlCNVB/K8+st/UbcXX", @@ -8748,51 +8861,51 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 306 + "__id__": 314 }, "_children": [ { - "__id__": 389 + "__id__": 397 }, { - "__id__": 395 + "__id__": 403 }, { - "__id__": 401 + "__id__": 409 }, { - "__id__": 407 + "__id__": 415 }, { - "__id__": 413 + "__id__": 421 }, { - "__id__": 419 + "__id__": 427 }, { - "__id__": 425 - }, - { - "__id__": 441 + "__id__": 433 }, { "__id__": 449 + }, + { + "__id__": 457 } ], "_active": true, "_components": [ { - "__id__": 461 + "__id__": 469 }, { - "__id__": 463 + "__id__": 471 }, { - "__id__": 465 + "__id__": 473 } ], "_prefab": { - "__id__": 468 + "__id__": 476 }, "_lpos": { "__type__": "cc.Vec3", @@ -8829,20 +8942,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 388 + "__id__": 396 }, "_children": [], "_active": true, "_components": [ { - "__id__": 390 + "__id__": 398 }, { - "__id__": 392 + "__id__": 400 } ], "_prefab": { - "__id__": 394 + "__id__": 402 }, "_lpos": { "__type__": "cc.Vec3", @@ -8879,11 +8992,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 389 + "__id__": 397 }, "_enabled": true, "__prefab": { - "__id__": 391 + "__id__": 399 }, "_contentSize": { "__type__": "cc.Size", @@ -8907,11 +9020,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 389 + "__id__": 397 }, "_enabled": true, "__prefab": { - "__id__": 393 + "__id__": 401 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8965,20 +9078,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 388 + "__id__": 396 }, "_children": [], "_active": false, "_components": [ { - "__id__": 396 + "__id__": 404 }, { - "__id__": 398 + "__id__": 406 } ], "_prefab": { - "__id__": 400 + "__id__": 408 }, "_lpos": { "__type__": "cc.Vec3", @@ -9015,11 +9128,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 395 + "__id__": 403 }, "_enabled": true, "__prefab": { - "__id__": 397 + "__id__": 405 }, "_contentSize": { "__type__": "cc.Size", @@ -9043,11 +9156,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 395 + "__id__": 403 }, "_enabled": true, "__prefab": { - "__id__": 399 + "__id__": 407 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9101,20 +9214,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 388 + "__id__": 396 }, "_children": [], "_active": false, "_components": [ { - "__id__": 402 + "__id__": 410 }, { - "__id__": 404 + "__id__": 412 } ], "_prefab": { - "__id__": 406 + "__id__": 414 }, "_lpos": { "__type__": "cc.Vec3", @@ -9151,11 +9264,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 401 + "__id__": 409 }, "_enabled": true, "__prefab": { - "__id__": 403 + "__id__": 411 }, "_contentSize": { "__type__": "cc.Size", @@ -9179,11 +9292,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 401 + "__id__": 409 }, "_enabled": true, "__prefab": { - "__id__": 405 + "__id__": 413 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9237,20 +9350,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 388 + "__id__": 396 }, "_children": [], "_active": true, "_components": [ { - "__id__": 408 + "__id__": 416 }, { - "__id__": 410 + "__id__": 418 } ], "_prefab": { - "__id__": 412 + "__id__": 420 }, "_lpos": { "__type__": "cc.Vec3", @@ -9287,11 +9400,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 407 + "__id__": 415 }, "_enabled": true, "__prefab": { - "__id__": 409 + "__id__": 417 }, "_contentSize": { "__type__": "cc.Size", @@ -9315,11 +9428,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 407 + "__id__": 415 }, "_enabled": true, "__prefab": { - "__id__": 411 + "__id__": 419 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9373,20 +9486,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 388 + "__id__": 396 }, "_children": [], "_active": false, "_components": [ { - "__id__": 414 + "__id__": 422 }, { - "__id__": 416 + "__id__": 424 } ], "_prefab": { - "__id__": 418 + "__id__": 426 }, "_lpos": { "__type__": "cc.Vec3", @@ -9423,11 +9536,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 413 + "__id__": 421 }, "_enabled": true, "__prefab": { - "__id__": 415 + "__id__": 423 }, "_contentSize": { "__type__": "cc.Size", @@ -9451,11 +9564,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 413 + "__id__": 421 }, "_enabled": true, "__prefab": { - "__id__": 417 + "__id__": 425 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9509,20 +9622,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 388 + "__id__": 396 }, "_children": [], "_active": false, "_components": [ { - "__id__": 420 + "__id__": 428 }, { - "__id__": 422 + "__id__": 430 } ], "_prefab": { - "__id__": 424 + "__id__": 432 }, "_lpos": { "__type__": "cc.Vec3", @@ -9559,11 +9672,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 419 + "__id__": 427 }, "_enabled": true, "__prefab": { - "__id__": 421 + "__id__": 429 }, "_contentSize": { "__type__": "cc.Size", @@ -9587,11 +9700,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 419 + "__id__": 427 }, "_enabled": true, "__prefab": { - "__id__": 423 + "__id__": 431 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9645,24 +9758,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 388 + "__id__": 396 }, "_children": [ { - "__id__": 426 + "__id__": 434 }, { - "__id__": 432 + "__id__": 440 } ], "_active": true, "_components": [ { - "__id__": 438 + "__id__": 446 } ], "_prefab": { - "__id__": 440 + "__id__": 448 }, "_lpos": { "__type__": "cc.Vec3", @@ -9699,20 +9812,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 425 + "__id__": 433 }, "_children": [], "_active": true, "_components": [ { - "__id__": 427 + "__id__": 435 }, { - "__id__": 429 + "__id__": 437 } ], "_prefab": { - "__id__": 431 + "__id__": 439 }, "_lpos": { "__type__": "cc.Vec3", @@ -9749,11 +9862,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 426 + "__id__": 434 }, "_enabled": true, "__prefab": { - "__id__": 428 + "__id__": 436 }, "_contentSize": { "__type__": "cc.Size", @@ -9777,11 +9890,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 426 + "__id__": 434 }, "_enabled": true, "__prefab": { - "__id__": 430 + "__id__": 438 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9835,20 +9948,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 425 + "__id__": 433 }, "_children": [], "_active": true, "_components": [ { - "__id__": 433 + "__id__": 441 }, { - "__id__": 435 + "__id__": 443 } ], "_prefab": { - "__id__": 437 + "__id__": 445 }, "_lpos": { "__type__": "cc.Vec3", @@ -9885,11 +9998,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 432 + "__id__": 440 }, "_enabled": true, "__prefab": { - "__id__": 434 + "__id__": 442 }, "_contentSize": { "__type__": "cc.Size", @@ -9913,11 +10026,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 432 + "__id__": 440 }, "_enabled": true, "__prefab": { - "__id__": 436 + "__id__": 444 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9971,11 +10084,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 425 + "__id__": 433 }, "_enabled": true, "__prefab": { - "__id__": 439 + "__id__": 447 }, "_contentSize": { "__type__": "cc.Size", @@ -10012,23 +10125,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 388 + "__id__": 396 }, "_children": [], "_active": true, "_components": [ { - "__id__": 442 + "__id__": 450 }, { - "__id__": 444 + "__id__": 452 }, { - "__id__": 446 + "__id__": 454 } ], "_prefab": { - "__id__": 448 + "__id__": 456 }, "_lpos": { "__type__": "cc.Vec3", @@ -10065,11 +10178,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 441 + "__id__": 449 }, "_enabled": true, "__prefab": { - "__id__": 443 + "__id__": 451 }, "_contentSize": { "__type__": "cc.Size", @@ -10093,11 +10206,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 441 + "__id__": 449 }, "_enabled": true, "__prefab": { - "__id__": 445 + "__id__": 453 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10135,11 +10248,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 441 + "__id__": 449 }, "_enabled": true, "__prefab": { - "__id__": 447 + "__id__": 455 }, "playOnLoad": false, "_clips": [ @@ -10171,24 +10284,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 388 + "__id__": 396 }, "_children": [ { - "__id__": 450 + "__id__": 458 } ], "_active": true, "_components": [ { - "__id__": 456 + "__id__": 464 }, { - "__id__": 458 + "__id__": 466 } ], "_prefab": { - "__id__": 460 + "__id__": 468 }, "_lpos": { "__type__": "cc.Vec3", @@ -10225,20 +10338,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 449 + "__id__": 457 }, "_children": [], "_active": true, "_components": [ { - "__id__": 451 + "__id__": 459 }, { - "__id__": 453 + "__id__": 461 } ], "_prefab": { - "__id__": 455 + "__id__": 463 }, "_lpos": { "__type__": "cc.Vec3", @@ -10275,11 +10388,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 450 + "__id__": 458 }, "_enabled": true, "__prefab": { - "__id__": 452 + "__id__": 460 }, "_contentSize": { "__type__": "cc.Size", @@ -10303,11 +10416,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 450 + "__id__": 458 }, "_enabled": true, "__prefab": { - "__id__": 454 + "__id__": 462 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10384,11 +10497,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 449 + "__id__": 457 }, "_enabled": true, "__prefab": { - "__id__": 457 + "__id__": 465 }, "_contentSize": { "__type__": "cc.Size", @@ -10412,11 +10525,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 449 + "__id__": 457 }, "_enabled": true, "__prefab": { - "__id__": 459 + "__id__": 467 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10470,11 +10583,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 388 + "__id__": 396 }, "_enabled": true, "__prefab": { - "__id__": 462 + "__id__": 470 }, "_contentSize": { "__type__": "cc.Size", @@ -10498,11 +10611,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 388 + "__id__": 396 }, "_enabled": true, "__prefab": { - "__id__": 464 + "__id__": 472 }, "slot": 1, "_id": "" @@ -10517,15 +10630,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 388 + "__id__": 396 }, "_enabled": true, "__prefab": { - "__id__": 466 + "__id__": 474 }, "clickEvents": [ { - "__id__": 467 + "__id__": 475 } ], "_interactable": true, @@ -10574,7 +10687,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 388 + "__id__": 396 }, "component": "", "_componentId": "11781wlCNVB/K8+st/UbcXX", @@ -10600,51 +10713,54 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 306 + "__id__": 314 }, "_children": [ { - "__id__": 470 + "__id__": 478 }, { - "__id__": 476 + "__id__": 484 }, { - "__id__": 482 + "__id__": 490 }, { - "__id__": 488 + "__id__": 496 }, { - "__id__": 494 + "__id__": 502 }, { - "__id__": 500 + "__id__": 508 }, { - "__id__": 506 - }, - { - "__id__": 522 + "__id__": 514 }, { "__id__": 530 + }, + { + "__id__": 538 + }, + { + "__id__": 550 } ], "_active": true, "_components": [ { - "__id__": 542 + "__id__": 562 }, { - "__id__": 544 + "__id__": 564 }, { - "__id__": 546 + "__id__": 566 } ], "_prefab": { - "__id__": 549 + "__id__": 569 }, "_lpos": { "__type__": "cc.Vec3", @@ -10681,20 +10797,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 469 + "__id__": 477 }, "_children": [], "_active": true, "_components": [ { - "__id__": 471 + "__id__": 479 }, { - "__id__": 473 + "__id__": 481 } ], "_prefab": { - "__id__": 475 + "__id__": 483 }, "_lpos": { "__type__": "cc.Vec3", @@ -10731,11 +10847,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 470 + "__id__": 478 }, "_enabled": true, "__prefab": { - "__id__": 472 + "__id__": 480 }, "_contentSize": { "__type__": "cc.Size", @@ -10759,11 +10875,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 470 + "__id__": 478 }, "_enabled": true, "__prefab": { - "__id__": 474 + "__id__": 482 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10817,20 +10933,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 469 + "__id__": 477 }, "_children": [], "_active": false, "_components": [ { - "__id__": 477 + "__id__": 485 }, { - "__id__": 479 + "__id__": 487 } ], "_prefab": { - "__id__": 481 + "__id__": 489 }, "_lpos": { "__type__": "cc.Vec3", @@ -10867,11 +10983,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 476 + "__id__": 484 }, "_enabled": true, "__prefab": { - "__id__": 478 + "__id__": 486 }, "_contentSize": { "__type__": "cc.Size", @@ -10895,11 +11011,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 476 + "__id__": 484 }, "_enabled": true, "__prefab": { - "__id__": 480 + "__id__": 488 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10953,20 +11069,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 469 + "__id__": 477 }, "_children": [], "_active": false, "_components": [ { - "__id__": 483 + "__id__": 491 }, { - "__id__": 485 + "__id__": 493 } ], "_prefab": { - "__id__": 487 + "__id__": 495 }, "_lpos": { "__type__": "cc.Vec3", @@ -11003,11 +11119,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 482 + "__id__": 490 }, "_enabled": true, "__prefab": { - "__id__": 484 + "__id__": 492 }, "_contentSize": { "__type__": "cc.Size", @@ -11031,11 +11147,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 482 + "__id__": 490 }, "_enabled": true, "__prefab": { - "__id__": 486 + "__id__": 494 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11089,20 +11205,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 469 + "__id__": 477 }, "_children": [], "_active": true, "_components": [ { - "__id__": 489 + "__id__": 497 }, { - "__id__": 491 + "__id__": 499 } ], "_prefab": { - "__id__": 493 + "__id__": 501 }, "_lpos": { "__type__": "cc.Vec3", @@ -11139,11 +11255,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 488 + "__id__": 496 }, "_enabled": true, "__prefab": { - "__id__": 490 + "__id__": 498 }, "_contentSize": { "__type__": "cc.Size", @@ -11167,11 +11283,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 488 + "__id__": 496 }, "_enabled": true, "__prefab": { - "__id__": 492 + "__id__": 500 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11225,20 +11341,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 469 + "__id__": 477 }, "_children": [], "_active": false, "_components": [ { - "__id__": 495 + "__id__": 503 }, { - "__id__": 497 + "__id__": 505 } ], "_prefab": { - "__id__": 499 + "__id__": 507 }, "_lpos": { "__type__": "cc.Vec3", @@ -11275,11 +11391,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 494 + "__id__": 502 }, "_enabled": true, "__prefab": { - "__id__": 496 + "__id__": 504 }, "_contentSize": { "__type__": "cc.Size", @@ -11303,11 +11419,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 494 + "__id__": 502 }, "_enabled": true, "__prefab": { - "__id__": 498 + "__id__": 506 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11361,20 +11477,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 469 + "__id__": 477 }, "_children": [], "_active": false, "_components": [ { - "__id__": 501 + "__id__": 509 }, { - "__id__": 503 + "__id__": 511 } ], "_prefab": { - "__id__": 505 + "__id__": 513 }, "_lpos": { "__type__": "cc.Vec3", @@ -11411,11 +11527,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 500 + "__id__": 508 }, "_enabled": true, "__prefab": { - "__id__": 502 + "__id__": 510 }, "_contentSize": { "__type__": "cc.Size", @@ -11439,11 +11555,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 500 + "__id__": 508 }, "_enabled": true, "__prefab": { - "__id__": 504 + "__id__": 512 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11497,24 +11613,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 469 + "__id__": 477 }, "_children": [ { - "__id__": 507 + "__id__": 515 }, { - "__id__": 513 + "__id__": 521 } ], "_active": true, "_components": [ { - "__id__": 519 + "__id__": 527 } ], "_prefab": { - "__id__": 521 + "__id__": 529 }, "_lpos": { "__type__": "cc.Vec3", @@ -11551,20 +11667,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 506 + "__id__": 514 }, "_children": [], "_active": true, "_components": [ { - "__id__": 508 + "__id__": 516 }, { - "__id__": 510 + "__id__": 518 } ], "_prefab": { - "__id__": 512 + "__id__": 520 }, "_lpos": { "__type__": "cc.Vec3", @@ -11601,11 +11717,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 507 + "__id__": 515 }, "_enabled": true, "__prefab": { - "__id__": 509 + "__id__": 517 }, "_contentSize": { "__type__": "cc.Size", @@ -11629,11 +11745,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 507 + "__id__": 515 }, "_enabled": true, "__prefab": { - "__id__": 511 + "__id__": 519 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11687,20 +11803,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 506 + "__id__": 514 }, "_children": [], "_active": true, "_components": [ { - "__id__": 514 + "__id__": 522 }, { - "__id__": 516 + "__id__": 524 } ], "_prefab": { - "__id__": 518 + "__id__": 526 }, "_lpos": { "__type__": "cc.Vec3", @@ -11737,11 +11853,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 513 + "__id__": 521 }, "_enabled": true, "__prefab": { - "__id__": 515 + "__id__": 523 }, "_contentSize": { "__type__": "cc.Size", @@ -11765,11 +11881,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 513 + "__id__": 521 }, "_enabled": true, "__prefab": { - "__id__": 517 + "__id__": 525 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11823,11 +11939,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 506 + "__id__": 514 }, "_enabled": true, "__prefab": { - "__id__": 520 + "__id__": 528 }, "_contentSize": { "__type__": "cc.Size", @@ -11864,23 +11980,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 469 + "__id__": 477 }, "_children": [], "_active": true, "_components": [ { - "__id__": 523 + "__id__": 531 }, { - "__id__": 525 + "__id__": 533 }, { - "__id__": 527 + "__id__": 535 } ], "_prefab": { - "__id__": 529 + "__id__": 537 }, "_lpos": { "__type__": "cc.Vec3", @@ -11917,11 +12033,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 522 + "__id__": 530 }, "_enabled": true, "__prefab": { - "__id__": 524 + "__id__": 532 }, "_contentSize": { "__type__": "cc.Size", @@ -11945,11 +12061,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 522 + "__id__": 530 }, "_enabled": true, "__prefab": { - "__id__": 526 + "__id__": 534 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11987,11 +12103,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 522 + "__id__": 530 }, "_enabled": true, "__prefab": { - "__id__": 528 + "__id__": 536 }, "playOnLoad": false, "_clips": [ @@ -12023,24 +12139,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 469 + "__id__": 477 }, "_children": [ { - "__id__": 531 + "__id__": 539 } ], "_active": true, "_components": [ { - "__id__": 537 + "__id__": 545 }, { - "__id__": 539 + "__id__": 547 } ], "_prefab": { - "__id__": 541 + "__id__": 549 }, "_lpos": { "__type__": "cc.Vec3", @@ -12077,20 +12193,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 530 + "__id__": 538 }, "_children": [], "_active": true, "_components": [ { - "__id__": 532 + "__id__": 540 }, { - "__id__": 534 + "__id__": 542 } ], "_prefab": { - "__id__": 536 + "__id__": 544 }, "_lpos": { "__type__": "cc.Vec3", @@ -12127,11 +12243,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 531 + "__id__": 539 }, "_enabled": true, "__prefab": { - "__id__": 533 + "__id__": 541 }, "_contentSize": { "__type__": "cc.Size", @@ -12155,11 +12271,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 531 + "__id__": 539 }, "_enabled": true, "__prefab": { - "__id__": 535 + "__id__": 543 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12236,11 +12352,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 530 + "__id__": 538 }, "_enabled": true, "__prefab": { - "__id__": 538 + "__id__": 546 }, "_contentSize": { "__type__": "cc.Size", @@ -12264,11 +12380,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 530 + "__id__": 538 }, "_enabled": true, "__prefab": { - "__id__": 540 + "__id__": 548 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12316,17 +12432,190 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 477 + }, + "_prefab": { + "__id__": 551 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 550 + }, + "asset": { + "__uuid__": "1c7a67cd-0d50-4b26-ae0f-8bbe3ec1a3a3", + "__expectedType__": "cc.Prefab" + }, + "fileId": "4fJlP7AItEGL6+yc5TgOyj", + "instance": { + "__id__": 552 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "3023UVZglIo6fN++Ad2YK2", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [ + { + "__id__": 553 + } + ], + "propertyOverrides": [ + { + "__id__": 557 + }, + { + "__id__": 559 + }, + { + "__id__": 560 + }, + { + "__id__": 561 + } + ], + "removedComponents": [] + }, + { + "__type__": "cc.MountedComponentsInfo", + "targetInfo": { + "__id__": 554 + }, + "components": [ + { + "__id__": 555 + } + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "4fJlP7AItEGL6+yc5TgOyj" + ] + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": { + "mountedRoot": { + "__id__": 550 + } + }, + "node": { + "__id__": 550 + }, + "_enabled": true, + "__prefab": { + "__id__": 556 + }, + "_alignFlags": 0, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8bzrZqx6tOqo7eUEWxp2TX" + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 558 + }, + "propertyPath": [ + "_name" + ], + "value": "task" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "4fJlP7AItEGL6+yc5TgOyj" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 558 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 35.554, + "y": -106.097, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 558 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 558 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, { "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 469 + "__id__": 477 }, "_enabled": true, "__prefab": { - "__id__": 543 + "__id__": 563 }, "_contentSize": { "__type__": "cc.Size", @@ -12350,11 +12639,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 469 + "__id__": 477 }, "_enabled": true, "__prefab": { - "__id__": 545 + "__id__": 565 }, "slot": 2, "_id": "" @@ -12369,15 +12658,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 469 + "__id__": 477 }, "_enabled": true, "__prefab": { - "__id__": 547 + "__id__": 567 }, "clickEvents": [ { - "__id__": 548 + "__id__": 568 } ], "_interactable": true, @@ -12426,7 +12715,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 469 + "__id__": 477 }, "component": "", "_componentId": "11781wlCNVB/K8+st/UbcXX", @@ -12452,11 +12741,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 306 + "__id__": 314 }, "_enabled": true, "__prefab": { - "__id__": 551 + "__id__": 571 }, "_contentSize": { "__type__": "cc.Size", @@ -12480,11 +12769,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 306 + "__id__": 314 }, "_enabled": true, "__prefab": { - "__id__": 553 + "__id__": 573 }, "_alignFlags": 45, "_target": null, @@ -12516,11 +12805,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 306 + "__id__": 314 }, "_enabled": true, "__prefab": { - "__id__": 555 + "__id__": 575 }, "_resizeMode": 2, "_layoutType": 1, @@ -12571,26 +12860,26 @@ }, "_children": [ { - "__id__": 558 + "__id__": 578 }, { - "__id__": 564 + "__id__": 584 } ], "_active": true, "_components": [ { - "__id__": 570 + "__id__": 590 }, { - "__id__": 572 + "__id__": 592 }, { - "__id__": 574 + "__id__": 594 } ], "_prefab": { - "__id__": 576 + "__id__": 596 }, "_lpos": { "__type__": "cc.Vec3", @@ -12627,20 +12916,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 557 + "__id__": 577 }, "_children": [], "_active": true, "_components": [ { - "__id__": 559 + "__id__": 579 }, { - "__id__": 561 + "__id__": 581 } ], "_prefab": { - "__id__": 563 + "__id__": 583 }, "_lpos": { "__type__": "cc.Vec3", @@ -12677,11 +12966,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 558 + "__id__": 578 }, "_enabled": true, "__prefab": { - "__id__": 560 + "__id__": 580 }, "_contentSize": { "__type__": "cc.Size", @@ -12705,11 +12994,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 558 + "__id__": 578 }, "_enabled": true, "__prefab": { - "__id__": 562 + "__id__": 582 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12763,20 +13052,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 557 + "__id__": 577 }, "_children": [], "_active": true, "_components": [ { - "__id__": 565 + "__id__": 585 }, { - "__id__": 567 + "__id__": 587 } ], "_prefab": { - "__id__": 569 + "__id__": 589 }, "_lpos": { "__type__": "cc.Vec3", @@ -12813,11 +13102,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 564 + "__id__": 584 }, "_enabled": true, "__prefab": { - "__id__": 566 + "__id__": 586 }, "_contentSize": { "__type__": "cc.Size", @@ -12841,11 +13130,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 564 + "__id__": 584 }, "_enabled": true, "__prefab": { - "__id__": 568 + "__id__": 588 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12922,11 +13211,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 557 + "__id__": 577 }, "_enabled": true, "__prefab": { - "__id__": 571 + "__id__": 591 }, "_contentSize": { "__type__": "cc.Size", @@ -12950,11 +13239,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 557 + "__id__": 577 }, "_enabled": true, "__prefab": { - "__id__": 573 + "__id__": 593 }, "_alignFlags": 17, "_target": null, @@ -12986,11 +13275,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 557 + "__id__": 577 }, "_enabled": true, "__prefab": { - "__id__": 575 + "__id__": 595 }, "_id": "" }, @@ -13021,38 +13310,38 @@ }, "_children": [ { - "__id__": 578 + "__id__": 598 }, { - "__id__": 586 + "__id__": 606 }, { - "__id__": 746 + "__id__": 766 }, { - "__id__": 1142 - }, - { - "__id__": 1197 - } - ], - "_active": true, - "_components": [ - { - "__id__": 1213 - }, - { - "__id__": 1215 + "__id__": 1162 }, { "__id__": 1217 + } + ], + "_active": false, + "_components": [ + { + "__id__": 1233 }, { - "__id__": 1219 + "__id__": 1235 + }, + { + "__id__": 1237 + }, + { + "__id__": 1239 } ], "_prefab": { - "__id__": 1221 + "__id__": 1241 }, "_lpos": { "__type__": "cc.Vec3", @@ -13089,23 +13378,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 577 + "__id__": 597 }, "_children": [], "_active": true, "_components": [ { - "__id__": 579 + "__id__": 599 }, { - "__id__": 581 + "__id__": 601 }, { - "__id__": 583 + "__id__": 603 } ], "_prefab": { - "__id__": 585 + "__id__": 605 }, "_lpos": { "__type__": "cc.Vec3", @@ -13142,11 +13431,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 578 + "__id__": 598 }, "_enabled": true, "__prefab": { - "__id__": 580 + "__id__": 600 }, "_contentSize": { "__type__": "cc.Size", @@ -13170,11 +13459,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 578 + "__id__": 598 }, "_enabled": true, "__prefab": { - "__id__": 582 + "__id__": 602 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13215,11 +13504,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 578 + "__id__": 598 }, "_enabled": true, "__prefab": { - "__id__": 584 + "__id__": 604 }, "_alignFlags": 45, "_target": null, @@ -13264,30 +13553,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 577 + "__id__": 597 }, "_children": [ { - "__id__": 587 + "__id__": 607 }, { - "__id__": 715 + "__id__": 735 }, { - "__id__": 729 + "__id__": 749 } ], "_active": true, "_components": [ { - "__id__": 741 + "__id__": 761 }, { - "__id__": 743 + "__id__": 763 } ], "_prefab": { - "__id__": 745 + "__id__": 765 }, "_lpos": { "__type__": "cc.Vec3", @@ -13324,36 +13613,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 586 + "__id__": 606 }, "_children": [ { - "__id__": 588 + "__id__": 608 }, { - "__id__": 618 + "__id__": 638 }, { - "__id__": 648 + "__id__": 668 }, { - "__id__": 678 + "__id__": 698 } ], "_active": true, "_components": [ { - "__id__": 708 + "__id__": 728 }, { - "__id__": 710 + "__id__": 730 }, { - "__id__": 712 + "__id__": 732 } ], "_prefab": { - "__id__": 714 + "__id__": 734 }, "_lpos": { "__type__": "cc.Vec3", @@ -13388,17 +13677,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 587 + "__id__": 607 }, "_prefab": { - "__id__": 589 + "__id__": 609 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 588 + "__id__": 608 }, "asset": { "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", @@ -13406,7 +13695,7 @@ }, "fileId": "f6ZIZpbPVPF6MTrktCfZoL", "instance": { - "__id__": 590 + "__id__": 610 }, "targetOverrides": null }, @@ -13420,386 +13709,32 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 591 + "__id__": 611 }, { - "__id__": 593 - }, - { - "__id__": 594 - }, - { - "__id__": 595 - }, - { - "__id__": 596 - }, - { - "__id__": 598 - }, - { - "__id__": 600 - }, - { - "__id__": 602 - }, - { - "__id__": 604 - }, - { - "__id__": 606 - }, - { - "__id__": 608 - }, - { - "__id__": 610 - }, - { - "__id__": 612 + "__id__": 613 }, { "__id__": 614 }, { - "__id__": 616 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 592 - }, - "propertyPath": [ - "_name" - ], - "value": "goods" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f6ZIZpbPVPF6MTrktCfZoL" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 592 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": -265, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 592 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 592 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 597 - }, - "propertyPath": [ - "_verticalCenter" - ], - "value": 0 - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "e7qY+Wxl9FKoloepaz/Wf4" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 599 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 170, - "height": 220 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "0c3KhXoilPSJTPJkQGL/8e" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 601 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 340, - "height": 440 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f85eeQArJGcIMAq80IOKe4", - "easlX04mxG5ZvUxfbp4BQ9" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 603 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 340, - "height": 440 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f85eeQArJGcIMAq80IOKe4", - "0adkCQpc9B4ZMzFRaIP9x9" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 605 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 332, - "height": 428 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f85eeQArJGcIMAq80IOKe4", - "b16zLquVBGSoVu7+4KcK2C" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 607 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 620, - "height": 850 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f85eeQArJGcIMAq80IOKe4", - "ca09JDbzBH77td3rhxxoVc" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 609 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 340, - "height": 440 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f85eeQArJGcIMAq80IOKe4", - "54+ClMn8xMOrjFt+y71Z7T" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 611 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 375, - "height": 110 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "fbY63t/gRMjJpuqyEa8XZY" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 613 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": -0.05, - "y": 82.8, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "37aClgQD9JQrDa0Me9DHGL" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 615 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": -77.375, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "09cTspqZNAOJXYGayfXNbV" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 617 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 3, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c5191IztlAOYvsl7+Bfvx9" - ] - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 587 - }, - "_prefab": { - "__id__": 619 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 618 - }, - "asset": { - "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "f6ZIZpbPVPF6MTrktCfZoL", - "instance": { - "__id__": 620 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "b7ztII3tNIerH2gj2QOpXE", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 621 + "__id__": 615 }, { - "__id__": 623 + "__id__": 616 + }, + { + "__id__": 618 + }, + { + "__id__": 620 + }, + { + "__id__": 622 }, { "__id__": 624 }, - { - "__id__": 625 - }, { "__id__": 626 }, @@ -13817,21 +13752,6 @@ }, { "__id__": 636 - }, - { - "__id__": 638 - }, - { - "__id__": 640 - }, - { - "__id__": 642 - }, - { - "__id__": 644 - }, - { - "__id__": 646 } ], "removedComponents": [] @@ -13839,7 +13759,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 622 + "__id__": 612 }, "propertyPath": [ "_name" @@ -13855,14 +13775,14 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 622 + "__id__": 612 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": -89, + "x": -265, "y": 0, "z": 0 } @@ -13870,7 +13790,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 622 + "__id__": 612 }, "propertyPath": [ "_lrot" @@ -13886,7 +13806,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 622 + "__id__": 612 }, "propertyPath": [ "_euler" @@ -13901,7 +13821,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 627 + "__id__": 617 }, "propertyPath": [ "_verticalCenter" @@ -13917,7 +13837,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 629 + "__id__": 619 }, "propertyPath": [ "_contentSize" @@ -13937,7 +13857,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 631 + "__id__": 621 }, "propertyPath": [ "_contentSize" @@ -13958,7 +13878,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 633 + "__id__": 623 }, "propertyPath": [ "_contentSize" @@ -13979,7 +13899,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 635 + "__id__": 625 }, "propertyPath": [ "_contentSize" @@ -14000,7 +13920,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 637 + "__id__": 627 }, "propertyPath": [ "_contentSize" @@ -14021,7 +13941,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 639 + "__id__": 629 }, "propertyPath": [ "_contentSize" @@ -14042,7 +13962,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 641 + "__id__": 631 }, "propertyPath": [ "_contentSize" @@ -14062,7 +13982,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 643 + "__id__": 633 }, "propertyPath": [ "_lpos" @@ -14083,7 +14003,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 645 + "__id__": 635 }, "propertyPath": [ "_lpos" @@ -14104,7 +14024,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 647 + "__id__": 637 }, "propertyPath": [ "_lpos" @@ -14126,17 +14046,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 587 + "__id__": 607 }, "_prefab": { - "__id__": 649 + "__id__": 639 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 648 + "__id__": 638 }, "asset": { "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", @@ -14144,13 +14064,13 @@ }, "fileId": "f6ZIZpbPVPF6MTrktCfZoL", "instance": { - "__id__": 650 + "__id__": 640 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "b9ZymnrBhOo4WchYG7tlzT", + "fileId": "b7ztII3tNIerH2gj2QOpXE", "prefabRootNode": { "__id__": 1 }, @@ -14158,17 +14078,32 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 651 + "__id__": 641 }, { - "__id__": 653 + "__id__": 643 + }, + { + "__id__": 644 + }, + { + "__id__": 645 + }, + { + "__id__": 646 + }, + { + "__id__": 648 + }, + { + "__id__": 650 + }, + { + "__id__": 652 }, { "__id__": 654 }, - { - "__id__": 655 - }, { "__id__": 656 }, @@ -14186,21 +14121,6 @@ }, { "__id__": 666 - }, - { - "__id__": 668 - }, - { - "__id__": 670 - }, - { - "__id__": 672 - }, - { - "__id__": 674 - }, - { - "__id__": 676 } ], "removedComponents": [] @@ -14208,7 +14128,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 652 + "__id__": 642 }, "propertyPath": [ "_name" @@ -14224,14 +14144,14 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 652 + "__id__": 642 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": 87, + "x": -89, "y": 0, "z": 0 } @@ -14239,7 +14159,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 652 + "__id__": 642 }, "propertyPath": [ "_lrot" @@ -14255,7 +14175,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 652 + "__id__": 642 }, "propertyPath": [ "_euler" @@ -14270,7 +14190,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 657 + "__id__": 647 }, "propertyPath": [ "_verticalCenter" @@ -14286,7 +14206,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 659 + "__id__": 649 }, "propertyPath": [ "_contentSize" @@ -14306,7 +14226,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 661 + "__id__": 651 }, "propertyPath": [ "_contentSize" @@ -14327,7 +14247,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 663 + "__id__": 653 }, "propertyPath": [ "_contentSize" @@ -14348,7 +14268,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 665 + "__id__": 655 }, "propertyPath": [ "_contentSize" @@ -14369,7 +14289,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 667 + "__id__": 657 }, "propertyPath": [ "_contentSize" @@ -14390,7 +14310,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 669 + "__id__": 659 }, "propertyPath": [ "_contentSize" @@ -14411,7 +14331,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 671 + "__id__": 661 }, "propertyPath": [ "_contentSize" @@ -14431,7 +14351,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 673 + "__id__": 663 }, "propertyPath": [ "_lpos" @@ -14452,7 +14372,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 675 + "__id__": 665 }, "propertyPath": [ "_lpos" @@ -14473,7 +14393,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 677 + "__id__": 667 }, "propertyPath": [ "_lpos" @@ -14495,17 +14415,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 587 + "__id__": 607 }, "_prefab": { - "__id__": 679 + "__id__": 669 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 678 + "__id__": 668 }, "asset": { "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", @@ -14513,13 +14433,13 @@ }, "fileId": "f6ZIZpbPVPF6MTrktCfZoL", "instance": { - "__id__": 680 + "__id__": 670 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "2aJAcxMKRPiYi6FRgAHL0A", + "fileId": "b9ZymnrBhOo4WchYG7tlzT", "prefabRootNode": { "__id__": 1 }, @@ -14527,17 +14447,32 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 681 + "__id__": 671 }, { - "__id__": 683 + "__id__": 673 + }, + { + "__id__": 674 + }, + { + "__id__": 675 + }, + { + "__id__": 676 + }, + { + "__id__": 678 + }, + { + "__id__": 680 + }, + { + "__id__": 682 }, { "__id__": 684 }, - { - "__id__": 685 - }, { "__id__": 686 }, @@ -14555,21 +14490,6 @@ }, { "__id__": 696 - }, - { - "__id__": 698 - }, - { - "__id__": 700 - }, - { - "__id__": 702 - }, - { - "__id__": 704 - }, - { - "__id__": 706 } ], "removedComponents": [] @@ -14577,7 +14497,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 682 + "__id__": 672 }, "propertyPath": [ "_name" @@ -14593,14 +14513,14 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 682 + "__id__": 672 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": 263, + "x": 87, "y": 0, "z": 0 } @@ -14608,7 +14528,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 682 + "__id__": 672 }, "propertyPath": [ "_lrot" @@ -14624,7 +14544,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 682 + "__id__": 672 }, "propertyPath": [ "_euler" @@ -14639,7 +14559,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 687 + "__id__": 677 }, "propertyPath": [ "_verticalCenter" @@ -14655,7 +14575,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 689 + "__id__": 679 }, "propertyPath": [ "_contentSize" @@ -14675,7 +14595,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 691 + "__id__": 681 }, "propertyPath": [ "_contentSize" @@ -14696,7 +14616,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 693 + "__id__": 683 }, "propertyPath": [ "_contentSize" @@ -14717,7 +14637,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 695 + "__id__": 685 }, "propertyPath": [ "_contentSize" @@ -14738,7 +14658,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 697 + "__id__": 687 }, "propertyPath": [ "_contentSize" @@ -14759,7 +14679,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 699 + "__id__": 689 }, "propertyPath": [ "_contentSize" @@ -14780,7 +14700,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 701 + "__id__": 691 }, "propertyPath": [ "_contentSize" @@ -14800,7 +14720,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 703 + "__id__": 693 }, "propertyPath": [ "_lpos" @@ -14821,7 +14741,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 705 + "__id__": 695 }, "propertyPath": [ "_lpos" @@ -14839,11 +14759,380 @@ "09cTspqZNAOJXYGayfXNbV" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 697 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 3, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c5191IztlAOYvsl7+Bfvx9" + ] + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 607 + }, + "_prefab": { + "__id__": 699 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 698 + }, + "asset": { + "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", + "__expectedType__": "cc.Prefab" + }, + "fileId": "f6ZIZpbPVPF6MTrktCfZoL", + "instance": { + "__id__": 700 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "2aJAcxMKRPiYi6FRgAHL0A", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 701 + }, + { + "__id__": 703 + }, + { + "__id__": 704 + }, + { + "__id__": 705 + }, + { + "__id__": 706 + }, + { + "__id__": 708 + }, + { + "__id__": 710 + }, + { + "__id__": 712 + }, + { + "__id__": 714 + }, + { + "__id__": 716 + }, + { + "__id__": 718 + }, + { + "__id__": 720 + }, + { + "__id__": 722 + }, + { + "__id__": 724 + }, + { + "__id__": 726 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 702 + }, + "propertyPath": [ + "_name" + ], + "value": "goods" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f6ZIZpbPVPF6MTrktCfZoL" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 702 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 263, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 702 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 702 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { "__id__": 707 }, + "propertyPath": [ + "_verticalCenter" + ], + "value": 0 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "e7qY+Wxl9FKoloepaz/Wf4" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 709 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 170, + "height": 220 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "0c3KhXoilPSJTPJkQGL/8e" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 711 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 340, + "height": 440 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f85eeQArJGcIMAq80IOKe4", + "easlX04mxG5ZvUxfbp4BQ9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 713 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 340, + "height": 440 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f85eeQArJGcIMAq80IOKe4", + "0adkCQpc9B4ZMzFRaIP9x9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 715 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 332, + "height": 428 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f85eeQArJGcIMAq80IOKe4", + "b16zLquVBGSoVu7+4KcK2C" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 717 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 620, + "height": 850 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f85eeQArJGcIMAq80IOKe4", + "ca09JDbzBH77td3rhxxoVc" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 719 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 340, + "height": 440 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f85eeQArJGcIMAq80IOKe4", + "54+ClMn8xMOrjFt+y71Z7T" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 721 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 375, + "height": 110 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbY63t/gRMjJpuqyEa8XZY" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 723 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -0.05, + "y": 82.8, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "37aClgQD9JQrDa0Me9DHGL" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 725 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": -77.375, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "09cTspqZNAOJXYGayfXNbV" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 727 + }, "propertyPath": [ "_lpos" ], @@ -14866,11 +15155,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 587 + "__id__": 607 }, "_enabled": true, "__prefab": { - "__id__": 709 + "__id__": 729 }, "_contentSize": { "__type__": "cc.Size", @@ -14894,11 +15183,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 587 + "__id__": 607 }, "_enabled": true, "__prefab": { - "__id__": 711 + "__id__": 731 }, "_alignFlags": 45, "_target": null, @@ -14930,11 +15219,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 587 + "__id__": 607 }, "_enabled": true, "__prefab": { - "__id__": 713 + "__id__": 733 }, "_resizeMode": 1, "_layoutType": 3, @@ -14981,27 +15270,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 586 + "__id__": 606 }, "_children": [ { - "__id__": 716 + "__id__": 736 } ], "_active": true, "_components": [ { - "__id__": 722 + "__id__": 742 }, { - "__id__": 724 + "__id__": 744 }, { - "__id__": 726 + "__id__": 746 } ], "_prefab": { - "__id__": 728 + "__id__": 748 }, "_lpos": { "__type__": "cc.Vec3", @@ -15038,20 +15327,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 715 + "__id__": 735 }, "_children": [], "_active": true, "_components": [ { - "__id__": 717 + "__id__": 737 }, { - "__id__": 719 + "__id__": 739 } ], "_prefab": { - "__id__": 721 + "__id__": 741 }, "_lpos": { "__type__": "cc.Vec3", @@ -15088,11 +15377,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 716 + "__id__": 736 }, "_enabled": true, "__prefab": { - "__id__": 718 + "__id__": 738 }, "_contentSize": { "__type__": "cc.Size", @@ -15116,11 +15405,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 716 + "__id__": 736 }, "_enabled": true, "__prefab": { - "__id__": 720 + "__id__": 740 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15197,11 +15486,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 715 + "__id__": 735 }, "_enabled": true, "__prefab": { - "__id__": 723 + "__id__": 743 }, "_contentSize": { "__type__": "cc.Size", @@ -15225,11 +15514,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 715 + "__id__": 735 }, "_enabled": true, "__prefab": { - "__id__": 725 + "__id__": 745 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15270,11 +15559,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 715 + "__id__": 735 }, "_enabled": true, "__prefab": { - "__id__": 727 + "__id__": 747 }, "_alignFlags": 41, "_target": null, @@ -15319,24 +15608,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 586 + "__id__": 606 }, "_children": [ { - "__id__": 730 + "__id__": 750 } ], "_active": true, "_components": [ { - "__id__": 736 + "__id__": 756 }, { - "__id__": 738 + "__id__": 758 } ], "_prefab": { - "__id__": 740 + "__id__": 760 }, "_lpos": { "__type__": "cc.Vec3", @@ -15373,20 +15662,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 729 + "__id__": 749 }, "_children": [], "_active": true, "_components": [ { - "__id__": 731 + "__id__": 751 }, { - "__id__": 733 + "__id__": 753 } ], "_prefab": { - "__id__": 735 + "__id__": 755 }, "_lpos": { "__type__": "cc.Vec3", @@ -15423,11 +15712,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 730 + "__id__": 750 }, "_enabled": true, "__prefab": { - "__id__": 732 + "__id__": 752 }, "_contentSize": { "__type__": "cc.Size", @@ -15451,11 +15740,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 730 + "__id__": 750 }, "_enabled": true, "__prefab": { - "__id__": 734 + "__id__": 754 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15532,11 +15821,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 729 + "__id__": 749 }, "_enabled": true, "__prefab": { - "__id__": 737 + "__id__": 757 }, "_contentSize": { "__type__": "cc.Size", @@ -15560,11 +15849,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 729 + "__id__": 749 }, "_enabled": true, "__prefab": { - "__id__": 739 + "__id__": 759 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15618,11 +15907,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 586 + "__id__": 606 }, "_enabled": true, "__prefab": { - "__id__": 742 + "__id__": 762 }, "_contentSize": { "__type__": "cc.Size", @@ -15646,11 +15935,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 586 + "__id__": 606 }, "_enabled": true, "__prefab": { - "__id__": 744 + "__id__": 764 }, "_alignFlags": 44, "_target": null, @@ -15695,27 +15984,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 577 + "__id__": 597 }, "_children": [ { - "__id__": 747 + "__id__": 767 }, { - "__id__": 1123 + "__id__": 1143 } ], "_active": true, "_components": [ { - "__id__": 1137 + "__id__": 1157 }, { - "__id__": 1139 + "__id__": 1159 } ], "_prefab": { - "__id__": 1141 + "__id__": 1161 }, "_lpos": { "__type__": "cc.Vec3", @@ -15752,48 +16041,48 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 746 + "__id__": 766 }, "_children": [ { - "__id__": 748 + "__id__": 768 }, { - "__id__": 794 + "__id__": 814 }, { - "__id__": 840 + "__id__": 860 }, { - "__id__": 886 + "__id__": 906 }, { - "__id__": 932 + "__id__": 952 }, { - "__id__": 978 + "__id__": 998 }, { - "__id__": 1024 + "__id__": 1044 }, { - "__id__": 1070 + "__id__": 1090 } ], "_active": true, "_components": [ { - "__id__": 1116 + "__id__": 1136 }, { - "__id__": 1118 + "__id__": 1138 }, { - "__id__": 1120 + "__id__": 1140 } ], "_prefab": { - "__id__": 1122 + "__id__": 1142 }, "_lpos": { "__type__": "cc.Vec3", @@ -15828,17 +16117,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 747 + "__id__": 767 }, "_prefab": { - "__id__": 749 + "__id__": 769 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 748 + "__id__": 768 }, "asset": { "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", @@ -15846,7 +16135,7 @@ }, "fileId": "f6ZIZpbPVPF6MTrktCfZoL", "instance": { - "__id__": 750 + "__id__": 770 }, "targetOverrides": null }, @@ -15860,62 +16149,26 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 751 + "__id__": 771 }, { - "__id__": 753 - }, - { - "__id__": 754 - }, - { - "__id__": 755 - }, - { - "__id__": 756 - }, - { - "__id__": 758 - }, - { - "__id__": 759 - }, - { - "__id__": 760 - }, - { - "__id__": 762 - }, - { - "__id__": 764 - }, - { - "__id__": 765 - }, - { - "__id__": 766 - }, - { - "__id__": 767 - }, - { - "__id__": 768 - }, - { - "__id__": 770 - }, - { - "__id__": 772 + "__id__": 773 }, { "__id__": 774 }, + { + "__id__": 775 + }, { "__id__": 776 }, { "__id__": 778 }, + { + "__id__": 779 + }, { "__id__": 780 }, @@ -15925,9 +16178,15 @@ { "__id__": 784 }, + { + "__id__": 785 + }, { "__id__": 786 }, + { + "__id__": 787 + }, { "__id__": 788 }, @@ -15936,6 +16195,36 @@ }, { "__id__": 792 + }, + { + "__id__": 794 + }, + { + "__id__": 796 + }, + { + "__id__": 798 + }, + { + "__id__": 800 + }, + { + "__id__": 802 + }, + { + "__id__": 804 + }, + { + "__id__": 806 + }, + { + "__id__": 808 + }, + { + "__id__": 810 + }, + { + "__id__": 812 } ], "removedComponents": [] @@ -15943,7 +16232,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 752 + "__id__": 772 }, "propertyPath": [ "_name" @@ -15959,7 +16248,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 752 + "__id__": 772 }, "propertyPath": [ "_lpos" @@ -15974,7 +16263,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 752 + "__id__": 772 }, "propertyPath": [ "_lrot" @@ -15990,7 +16279,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 752 + "__id__": 772 }, "propertyPath": [ "_euler" @@ -16005,7 +16294,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 757 + "__id__": 777 }, "propertyPath": [ "_active" @@ -16022,7 +16311,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 757 + "__id__": 777 }, "propertyPath": [ "_lscale" @@ -16037,7 +16326,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 757 + "__id__": 777 }, "propertyPath": [ "_lpos" @@ -16052,7 +16341,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 761 + "__id__": 781 }, "propertyPath": [ "_contentSize" @@ -16073,7 +16362,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 763 + "__id__": 783 }, "propertyPath": [ "_top" @@ -16090,7 +16379,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 763 + "__id__": 783 }, "propertyPath": [ "_bottom" @@ -16100,7 +16389,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 763 + "__id__": 783 }, "propertyPath": [ "_left" @@ -16110,7 +16399,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 763 + "__id__": 783 }, "propertyPath": [ "_right" @@ -16120,7 +16409,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 763 + "__id__": 783 }, "propertyPath": [ "_isAbsTop" @@ -16130,7 +16419,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 769 + "__id__": 789 }, "propertyPath": [ "_active" @@ -16147,7 +16436,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 771 + "__id__": 791 }, "propertyPath": [ "_contentSize" @@ -16168,7 +16457,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 773 + "__id__": 793 }, "propertyPath": [ "_contentSize" @@ -16189,7 +16478,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 775 + "__id__": 795 }, "propertyPath": [ "_contentSize" @@ -16210,7 +16499,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 777 + "__id__": 797 }, "propertyPath": [ "_contentSize" @@ -16231,7 +16520,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 779 + "__id__": 799 }, "propertyPath": [ "_contentSize" @@ -16252,7 +16541,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 781 + "__id__": 801 }, "propertyPath": [ "_lscale" @@ -16274,7 +16563,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 783 + "__id__": 803 }, "propertyPath": [ "_verticalCenter" @@ -16290,7 +16579,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 785 + "__id__": 805 }, "propertyPath": [ "_contentSize" @@ -16310,7 +16599,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 787 + "__id__": 807 }, "propertyPath": [ "_contentSize" @@ -16330,7 +16619,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 789 + "__id__": 809 }, "propertyPath": [ "_lpos" @@ -16351,7 +16640,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 791 + "__id__": 811 }, "propertyPath": [ "_lpos" @@ -16372,7 +16661,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 793 + "__id__": 813 }, "propertyPath": [ "_lpos" @@ -16394,17 +16683,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 747 + "__id__": 767 }, "_prefab": { - "__id__": 795 + "__id__": 815 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 794 + "__id__": 814 }, "asset": { "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", @@ -16412,7 +16701,7 @@ }, "fileId": "f6ZIZpbPVPF6MTrktCfZoL", "instance": { - "__id__": 796 + "__id__": 816 }, "targetOverrides": null }, @@ -16426,62 +16715,26 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 797 + "__id__": 817 }, { - "__id__": 799 - }, - { - "__id__": 800 - }, - { - "__id__": 801 - }, - { - "__id__": 802 - }, - { - "__id__": 804 - }, - { - "__id__": 805 - }, - { - "__id__": 806 - }, - { - "__id__": 808 - }, - { - "__id__": 810 - }, - { - "__id__": 811 - }, - { - "__id__": 812 - }, - { - "__id__": 813 - }, - { - "__id__": 814 - }, - { - "__id__": 816 - }, - { - "__id__": 818 + "__id__": 819 }, { "__id__": 820 }, + { + "__id__": 821 + }, { "__id__": 822 }, { "__id__": 824 }, + { + "__id__": 825 + }, { "__id__": 826 }, @@ -16491,9 +16744,15 @@ { "__id__": 830 }, + { + "__id__": 831 + }, { "__id__": 832 }, + { + "__id__": 833 + }, { "__id__": 834 }, @@ -16502,6 +16761,36 @@ }, { "__id__": 838 + }, + { + "__id__": 840 + }, + { + "__id__": 842 + }, + { + "__id__": 844 + }, + { + "__id__": 846 + }, + { + "__id__": 848 + }, + { + "__id__": 850 + }, + { + "__id__": 852 + }, + { + "__id__": 854 + }, + { + "__id__": 856 + }, + { + "__id__": 858 } ], "removedComponents": [] @@ -16509,7 +16798,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 798 + "__id__": 818 }, "propertyPath": [ "_name" @@ -16525,7 +16814,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 798 + "__id__": 818 }, "propertyPath": [ "_lpos" @@ -16540,7 +16829,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 798 + "__id__": 818 }, "propertyPath": [ "_lrot" @@ -16556,7 +16845,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 798 + "__id__": 818 }, "propertyPath": [ "_euler" @@ -16571,7 +16860,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 803 + "__id__": 823 }, "propertyPath": [ "_active" @@ -16588,7 +16877,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 803 + "__id__": 823 }, "propertyPath": [ "_lscale" @@ -16603,7 +16892,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 803 + "__id__": 823 }, "propertyPath": [ "_lpos" @@ -16618,7 +16907,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 807 + "__id__": 827 }, "propertyPath": [ "_contentSize" @@ -16639,7 +16928,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 809 + "__id__": 829 }, "propertyPath": [ "_top" @@ -16656,7 +16945,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 809 + "__id__": 829 }, "propertyPath": [ "_bottom" @@ -16666,7 +16955,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 809 + "__id__": 829 }, "propertyPath": [ "_left" @@ -16676,7 +16965,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 809 + "__id__": 829 }, "propertyPath": [ "_right" @@ -16686,7 +16975,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 809 + "__id__": 829 }, "propertyPath": [ "_isAbsTop" @@ -16696,7 +16985,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 815 + "__id__": 835 }, "propertyPath": [ "_active" @@ -16713,7 +17002,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 817 + "__id__": 837 }, "propertyPath": [ "_contentSize" @@ -16734,7 +17023,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 819 + "__id__": 839 }, "propertyPath": [ "_contentSize" @@ -16755,7 +17044,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 821 + "__id__": 841 }, "propertyPath": [ "_contentSize" @@ -16776,7 +17065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 823 + "__id__": 843 }, "propertyPath": [ "_contentSize" @@ -16797,7 +17086,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 825 + "__id__": 845 }, "propertyPath": [ "_contentSize" @@ -16818,7 +17107,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 827 + "__id__": 847 }, "propertyPath": [ "_lscale" @@ -16840,7 +17129,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 829 + "__id__": 849 }, "propertyPath": [ "_verticalCenter" @@ -16856,7 +17145,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 831 + "__id__": 851 }, "propertyPath": [ "_contentSize" @@ -16876,7 +17165,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 833 + "__id__": 853 }, "propertyPath": [ "_contentSize" @@ -16896,7 +17185,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 835 + "__id__": 855 }, "propertyPath": [ "_lpos" @@ -16917,7 +17206,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 837 + "__id__": 857 }, "propertyPath": [ "_lpos" @@ -16938,7 +17227,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 839 + "__id__": 859 }, "propertyPath": [ "_lpos" @@ -16960,17 +17249,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 747 + "__id__": 767 }, "_prefab": { - "__id__": 841 + "__id__": 861 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 840 + "__id__": 860 }, "asset": { "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", @@ -16978,7 +17267,7 @@ }, "fileId": "f6ZIZpbPVPF6MTrktCfZoL", "instance": { - "__id__": 842 + "__id__": 862 }, "targetOverrides": null }, @@ -16992,62 +17281,26 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 843 + "__id__": 863 }, { - "__id__": 845 - }, - { - "__id__": 846 - }, - { - "__id__": 847 - }, - { - "__id__": 848 - }, - { - "__id__": 850 - }, - { - "__id__": 851 - }, - { - "__id__": 852 - }, - { - "__id__": 854 - }, - { - "__id__": 856 - }, - { - "__id__": 857 - }, - { - "__id__": 858 - }, - { - "__id__": 859 - }, - { - "__id__": 860 - }, - { - "__id__": 862 - }, - { - "__id__": 864 + "__id__": 865 }, { "__id__": 866 }, + { + "__id__": 867 + }, { "__id__": 868 }, { "__id__": 870 }, + { + "__id__": 871 + }, { "__id__": 872 }, @@ -17057,9 +17310,15 @@ { "__id__": 876 }, + { + "__id__": 877 + }, { "__id__": 878 }, + { + "__id__": 879 + }, { "__id__": 880 }, @@ -17068,6 +17327,36 @@ }, { "__id__": 884 + }, + { + "__id__": 886 + }, + { + "__id__": 888 + }, + { + "__id__": 890 + }, + { + "__id__": 892 + }, + { + "__id__": 894 + }, + { + "__id__": 896 + }, + { + "__id__": 898 + }, + { + "__id__": 900 + }, + { + "__id__": 902 + }, + { + "__id__": 904 } ], "removedComponents": [] @@ -17075,7 +17364,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 844 + "__id__": 864 }, "propertyPath": [ "_name" @@ -17091,7 +17380,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 844 + "__id__": 864 }, "propertyPath": [ "_lpos" @@ -17106,7 +17395,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 844 + "__id__": 864 }, "propertyPath": [ "_lrot" @@ -17122,7 +17411,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 844 + "__id__": 864 }, "propertyPath": [ "_euler" @@ -17137,7 +17426,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 849 + "__id__": 869 }, "propertyPath": [ "_active" @@ -17154,7 +17443,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 849 + "__id__": 869 }, "propertyPath": [ "_lscale" @@ -17169,7 +17458,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 849 + "__id__": 869 }, "propertyPath": [ "_lpos" @@ -17184,7 +17473,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 853 + "__id__": 873 }, "propertyPath": [ "_contentSize" @@ -17205,7 +17494,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 855 + "__id__": 875 }, "propertyPath": [ "_top" @@ -17222,7 +17511,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 855 + "__id__": 875 }, "propertyPath": [ "_bottom" @@ -17232,7 +17521,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 855 + "__id__": 875 }, "propertyPath": [ "_left" @@ -17242,7 +17531,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 855 + "__id__": 875 }, "propertyPath": [ "_right" @@ -17252,7 +17541,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 855 + "__id__": 875 }, "propertyPath": [ "_isAbsTop" @@ -17262,7 +17551,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 861 + "__id__": 881 }, "propertyPath": [ "_active" @@ -17279,7 +17568,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 863 + "__id__": 883 }, "propertyPath": [ "_contentSize" @@ -17300,7 +17589,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 865 + "__id__": 885 }, "propertyPath": [ "_contentSize" @@ -17321,7 +17610,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 867 + "__id__": 887 }, "propertyPath": [ "_contentSize" @@ -17342,7 +17631,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 869 + "__id__": 889 }, "propertyPath": [ "_contentSize" @@ -17363,7 +17652,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 871 + "__id__": 891 }, "propertyPath": [ "_contentSize" @@ -17384,7 +17673,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 873 + "__id__": 893 }, "propertyPath": [ "_lscale" @@ -17406,7 +17695,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 875 + "__id__": 895 }, "propertyPath": [ "_verticalCenter" @@ -17422,7 +17711,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 877 + "__id__": 897 }, "propertyPath": [ "_contentSize" @@ -17442,7 +17731,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 879 + "__id__": 899 }, "propertyPath": [ "_contentSize" @@ -17462,7 +17751,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 881 + "__id__": 901 }, "propertyPath": [ "_lpos" @@ -17483,7 +17772,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 883 + "__id__": 903 }, "propertyPath": [ "_lpos" @@ -17504,7 +17793,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 885 + "__id__": 905 }, "propertyPath": [ "_lpos" @@ -17526,17 +17815,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 747 + "__id__": 767 }, "_prefab": { - "__id__": 887 + "__id__": 907 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 886 + "__id__": 906 }, "asset": { "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", @@ -17544,7 +17833,7 @@ }, "fileId": "f6ZIZpbPVPF6MTrktCfZoL", "instance": { - "__id__": 888 + "__id__": 908 }, "targetOverrides": null }, @@ -17558,62 +17847,26 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 889 + "__id__": 909 }, { - "__id__": 891 - }, - { - "__id__": 892 - }, - { - "__id__": 893 - }, - { - "__id__": 894 - }, - { - "__id__": 896 - }, - { - "__id__": 897 - }, - { - "__id__": 898 - }, - { - "__id__": 900 - }, - { - "__id__": 902 - }, - { - "__id__": 903 - }, - { - "__id__": 904 - }, - { - "__id__": 905 - }, - { - "__id__": 906 - }, - { - "__id__": 908 - }, - { - "__id__": 910 + "__id__": 911 }, { "__id__": 912 }, + { + "__id__": 913 + }, { "__id__": 914 }, { "__id__": 916 }, + { + "__id__": 917 + }, { "__id__": 918 }, @@ -17623,9 +17876,15 @@ { "__id__": 922 }, + { + "__id__": 923 + }, { "__id__": 924 }, + { + "__id__": 925 + }, { "__id__": 926 }, @@ -17634,6 +17893,36 @@ }, { "__id__": 930 + }, + { + "__id__": 932 + }, + { + "__id__": 934 + }, + { + "__id__": 936 + }, + { + "__id__": 938 + }, + { + "__id__": 940 + }, + { + "__id__": 942 + }, + { + "__id__": 944 + }, + { + "__id__": 946 + }, + { + "__id__": 948 + }, + { + "__id__": 950 } ], "removedComponents": [] @@ -17641,7 +17930,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 890 + "__id__": 910 }, "propertyPath": [ "_name" @@ -17657,7 +17946,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 890 + "__id__": 910 }, "propertyPath": [ "_lpos" @@ -17672,7 +17961,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 890 + "__id__": 910 }, "propertyPath": [ "_lrot" @@ -17688,7 +17977,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 890 + "__id__": 910 }, "propertyPath": [ "_euler" @@ -17703,7 +17992,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 895 + "__id__": 915 }, "propertyPath": [ "_active" @@ -17720,7 +18009,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 895 + "__id__": 915 }, "propertyPath": [ "_lscale" @@ -17735,7 +18024,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 895 + "__id__": 915 }, "propertyPath": [ "_lpos" @@ -17750,7 +18039,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 899 + "__id__": 919 }, "propertyPath": [ "_contentSize" @@ -17771,7 +18060,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 901 + "__id__": 921 }, "propertyPath": [ "_top" @@ -17788,7 +18077,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 901 + "__id__": 921 }, "propertyPath": [ "_bottom" @@ -17798,7 +18087,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 901 + "__id__": 921 }, "propertyPath": [ "_left" @@ -17808,7 +18097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 901 + "__id__": 921 }, "propertyPath": [ "_right" @@ -17818,7 +18107,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 901 + "__id__": 921 }, "propertyPath": [ "_isAbsTop" @@ -17828,7 +18117,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 907 + "__id__": 927 }, "propertyPath": [ "_active" @@ -17845,7 +18134,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 909 + "__id__": 929 }, "propertyPath": [ "_contentSize" @@ -17866,7 +18155,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 911 + "__id__": 931 }, "propertyPath": [ "_contentSize" @@ -17887,7 +18176,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 913 + "__id__": 933 }, "propertyPath": [ "_contentSize" @@ -17908,7 +18197,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 915 + "__id__": 935 }, "propertyPath": [ "_contentSize" @@ -17929,7 +18218,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 917 + "__id__": 937 }, "propertyPath": [ "_contentSize" @@ -17950,7 +18239,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 919 + "__id__": 939 }, "propertyPath": [ "_lscale" @@ -17972,7 +18261,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 921 + "__id__": 941 }, "propertyPath": [ "_verticalCenter" @@ -17988,7 +18277,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 923 + "__id__": 943 }, "propertyPath": [ "_contentSize" @@ -18008,7 +18297,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 925 + "__id__": 945 }, "propertyPath": [ "_contentSize" @@ -18028,7 +18317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 927 + "__id__": 947 }, "propertyPath": [ "_lpos" @@ -18049,7 +18338,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 929 + "__id__": 949 }, "propertyPath": [ "_lpos" @@ -18070,7 +18359,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 931 + "__id__": 951 }, "propertyPath": [ "_lpos" @@ -18092,17 +18381,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 747 + "__id__": 767 }, "_prefab": { - "__id__": 933 + "__id__": 953 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 932 + "__id__": 952 }, "asset": { "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", @@ -18110,7 +18399,7 @@ }, "fileId": "f6ZIZpbPVPF6MTrktCfZoL", "instance": { - "__id__": 934 + "__id__": 954 }, "targetOverrides": null }, @@ -18124,62 +18413,26 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 935 + "__id__": 955 }, { - "__id__": 937 - }, - { - "__id__": 938 - }, - { - "__id__": 939 - }, - { - "__id__": 940 - }, - { - "__id__": 942 - }, - { - "__id__": 943 - }, - { - "__id__": 944 - }, - { - "__id__": 946 - }, - { - "__id__": 948 - }, - { - "__id__": 949 - }, - { - "__id__": 950 - }, - { - "__id__": 951 - }, - { - "__id__": 952 - }, - { - "__id__": 954 - }, - { - "__id__": 956 + "__id__": 957 }, { "__id__": 958 }, + { + "__id__": 959 + }, { "__id__": 960 }, { "__id__": 962 }, + { + "__id__": 963 + }, { "__id__": 964 }, @@ -18189,9 +18442,15 @@ { "__id__": 968 }, + { + "__id__": 969 + }, { "__id__": 970 }, + { + "__id__": 971 + }, { "__id__": 972 }, @@ -18200,6 +18459,36 @@ }, { "__id__": 976 + }, + { + "__id__": 978 + }, + { + "__id__": 980 + }, + { + "__id__": 982 + }, + { + "__id__": 984 + }, + { + "__id__": 986 + }, + { + "__id__": 988 + }, + { + "__id__": 990 + }, + { + "__id__": 992 + }, + { + "__id__": 994 + }, + { + "__id__": 996 } ], "removedComponents": [] @@ -18207,7 +18496,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 936 + "__id__": 956 }, "propertyPath": [ "_name" @@ -18223,7 +18512,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 936 + "__id__": 956 }, "propertyPath": [ "_lpos" @@ -18238,7 +18527,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 936 + "__id__": 956 }, "propertyPath": [ "_lrot" @@ -18254,7 +18543,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 936 + "__id__": 956 }, "propertyPath": [ "_euler" @@ -18269,7 +18558,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 941 + "__id__": 961 }, "propertyPath": [ "_active" @@ -18286,7 +18575,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 941 + "__id__": 961 }, "propertyPath": [ "_lscale" @@ -18301,7 +18590,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 941 + "__id__": 961 }, "propertyPath": [ "_lpos" @@ -18316,7 +18605,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 945 + "__id__": 965 }, "propertyPath": [ "_contentSize" @@ -18337,7 +18626,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 947 + "__id__": 967 }, "propertyPath": [ "_top" @@ -18354,7 +18643,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 947 + "__id__": 967 }, "propertyPath": [ "_bottom" @@ -18364,7 +18653,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 947 + "__id__": 967 }, "propertyPath": [ "_left" @@ -18374,7 +18663,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 947 + "__id__": 967 }, "propertyPath": [ "_right" @@ -18384,7 +18673,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 947 + "__id__": 967 }, "propertyPath": [ "_isAbsTop" @@ -18394,7 +18683,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 953 + "__id__": 973 }, "propertyPath": [ "_active" @@ -18411,7 +18700,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 955 + "__id__": 975 }, "propertyPath": [ "_contentSize" @@ -18432,7 +18721,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 957 + "__id__": 977 }, "propertyPath": [ "_contentSize" @@ -18453,7 +18742,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 959 + "__id__": 979 }, "propertyPath": [ "_contentSize" @@ -18474,7 +18763,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 961 + "__id__": 981 }, "propertyPath": [ "_contentSize" @@ -18495,7 +18784,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 963 + "__id__": 983 }, "propertyPath": [ "_contentSize" @@ -18516,7 +18805,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 965 + "__id__": 985 }, "propertyPath": [ "_lscale" @@ -18538,7 +18827,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 967 + "__id__": 987 }, "propertyPath": [ "_verticalCenter" @@ -18554,7 +18843,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 969 + "__id__": 989 }, "propertyPath": [ "_contentSize" @@ -18574,7 +18863,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 971 + "__id__": 991 }, "propertyPath": [ "_contentSize" @@ -18594,7 +18883,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 973 + "__id__": 993 }, "propertyPath": [ "_lpos" @@ -18615,7 +18904,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 975 + "__id__": 995 }, "propertyPath": [ "_lpos" @@ -18636,7 +18925,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 977 + "__id__": 997 }, "propertyPath": [ "_lpos" @@ -18658,17 +18947,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 747 + "__id__": 767 }, "_prefab": { - "__id__": 979 + "__id__": 999 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 978 + "__id__": 998 }, "asset": { "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", @@ -18676,7 +18965,7 @@ }, "fileId": "f6ZIZpbPVPF6MTrktCfZoL", "instance": { - "__id__": 980 + "__id__": 1000 }, "targetOverrides": null }, @@ -18690,62 +18979,26 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 981 + "__id__": 1001 }, { - "__id__": 983 - }, - { - "__id__": 984 - }, - { - "__id__": 985 - }, - { - "__id__": 986 - }, - { - "__id__": 988 - }, - { - "__id__": 989 - }, - { - "__id__": 990 - }, - { - "__id__": 992 - }, - { - "__id__": 994 - }, - { - "__id__": 995 - }, - { - "__id__": 996 - }, - { - "__id__": 997 - }, - { - "__id__": 998 - }, - { - "__id__": 1000 - }, - { - "__id__": 1002 + "__id__": 1003 }, { "__id__": 1004 }, + { + "__id__": 1005 + }, { "__id__": 1006 }, { "__id__": 1008 }, + { + "__id__": 1009 + }, { "__id__": 1010 }, @@ -18755,9 +19008,15 @@ { "__id__": 1014 }, + { + "__id__": 1015 + }, { "__id__": 1016 }, + { + "__id__": 1017 + }, { "__id__": 1018 }, @@ -18766,6 +19025,36 @@ }, { "__id__": 1022 + }, + { + "__id__": 1024 + }, + { + "__id__": 1026 + }, + { + "__id__": 1028 + }, + { + "__id__": 1030 + }, + { + "__id__": 1032 + }, + { + "__id__": 1034 + }, + { + "__id__": 1036 + }, + { + "__id__": 1038 + }, + { + "__id__": 1040 + }, + { + "__id__": 1042 } ], "removedComponents": [] @@ -18773,7 +19062,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 982 + "__id__": 1002 }, "propertyPath": [ "_name" @@ -18789,7 +19078,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 982 + "__id__": 1002 }, "propertyPath": [ "_lpos" @@ -18804,7 +19093,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 982 + "__id__": 1002 }, "propertyPath": [ "_lrot" @@ -18820,7 +19109,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 982 + "__id__": 1002 }, "propertyPath": [ "_euler" @@ -18835,7 +19124,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 987 + "__id__": 1007 }, "propertyPath": [ "_active" @@ -18852,7 +19141,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 987 + "__id__": 1007 }, "propertyPath": [ "_lscale" @@ -18867,7 +19156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 987 + "__id__": 1007 }, "propertyPath": [ "_lpos" @@ -18882,7 +19171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 991 + "__id__": 1011 }, "propertyPath": [ "_contentSize" @@ -18903,7 +19192,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 993 + "__id__": 1013 }, "propertyPath": [ "_top" @@ -18920,7 +19209,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 993 + "__id__": 1013 }, "propertyPath": [ "_bottom" @@ -18930,7 +19219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 993 + "__id__": 1013 }, "propertyPath": [ "_left" @@ -18940,7 +19229,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 993 + "__id__": 1013 }, "propertyPath": [ "_right" @@ -18950,7 +19239,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 993 + "__id__": 1013 }, "propertyPath": [ "_isAbsTop" @@ -18960,7 +19249,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 999 + "__id__": 1019 }, "propertyPath": [ "_active" @@ -18977,7 +19266,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1001 + "__id__": 1021 }, "propertyPath": [ "_contentSize" @@ -18998,7 +19287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1003 + "__id__": 1023 }, "propertyPath": [ "_contentSize" @@ -19019,7 +19308,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1005 + "__id__": 1025 }, "propertyPath": [ "_contentSize" @@ -19040,7 +19329,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1007 + "__id__": 1027 }, "propertyPath": [ "_contentSize" @@ -19061,7 +19350,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1009 + "__id__": 1029 }, "propertyPath": [ "_contentSize" @@ -19082,7 +19371,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1011 + "__id__": 1031 }, "propertyPath": [ "_lscale" @@ -19104,7 +19393,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1013 + "__id__": 1033 }, "propertyPath": [ "_verticalCenter" @@ -19120,7 +19409,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1015 + "__id__": 1035 }, "propertyPath": [ "_contentSize" @@ -19140,7 +19429,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1017 + "__id__": 1037 }, "propertyPath": [ "_contentSize" @@ -19160,7 +19449,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1019 + "__id__": 1039 }, "propertyPath": [ "_lpos" @@ -19181,7 +19470,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1021 + "__id__": 1041 }, "propertyPath": [ "_lpos" @@ -19202,7 +19491,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1023 + "__id__": 1043 }, "propertyPath": [ "_lpos" @@ -19224,17 +19513,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 747 + "__id__": 767 }, "_prefab": { - "__id__": 1025 + "__id__": 1045 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1024 + "__id__": 1044 }, "asset": { "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", @@ -19242,7 +19531,7 @@ }, "fileId": "f6ZIZpbPVPF6MTrktCfZoL", "instance": { - "__id__": 1026 + "__id__": 1046 }, "targetOverrides": null }, @@ -19256,62 +19545,26 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 1027 + "__id__": 1047 }, { - "__id__": 1029 - }, - { - "__id__": 1030 - }, - { - "__id__": 1031 - }, - { - "__id__": 1032 - }, - { - "__id__": 1034 - }, - { - "__id__": 1035 - }, - { - "__id__": 1036 - }, - { - "__id__": 1038 - }, - { - "__id__": 1040 - }, - { - "__id__": 1041 - }, - { - "__id__": 1042 - }, - { - "__id__": 1043 - }, - { - "__id__": 1044 - }, - { - "__id__": 1046 - }, - { - "__id__": 1048 + "__id__": 1049 }, { "__id__": 1050 }, + { + "__id__": 1051 + }, { "__id__": 1052 }, { "__id__": 1054 }, + { + "__id__": 1055 + }, { "__id__": 1056 }, @@ -19321,9 +19574,15 @@ { "__id__": 1060 }, + { + "__id__": 1061 + }, { "__id__": 1062 }, + { + "__id__": 1063 + }, { "__id__": 1064 }, @@ -19332,6 +19591,36 @@ }, { "__id__": 1068 + }, + { + "__id__": 1070 + }, + { + "__id__": 1072 + }, + { + "__id__": 1074 + }, + { + "__id__": 1076 + }, + { + "__id__": 1078 + }, + { + "__id__": 1080 + }, + { + "__id__": 1082 + }, + { + "__id__": 1084 + }, + { + "__id__": 1086 + }, + { + "__id__": 1088 } ], "removedComponents": [] @@ -19339,7 +19628,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1028 + "__id__": 1048 }, "propertyPath": [ "_name" @@ -19355,7 +19644,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1028 + "__id__": 1048 }, "propertyPath": [ "_lpos" @@ -19370,7 +19659,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1028 + "__id__": 1048 }, "propertyPath": [ "_lrot" @@ -19386,7 +19675,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1028 + "__id__": 1048 }, "propertyPath": [ "_euler" @@ -19401,7 +19690,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1033 + "__id__": 1053 }, "propertyPath": [ "_active" @@ -19418,7 +19707,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1033 + "__id__": 1053 }, "propertyPath": [ "_lscale" @@ -19433,7 +19722,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1033 + "__id__": 1053 }, "propertyPath": [ "_lpos" @@ -19448,7 +19737,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1037 + "__id__": 1057 }, "propertyPath": [ "_contentSize" @@ -19469,7 +19758,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1039 + "__id__": 1059 }, "propertyPath": [ "_top" @@ -19486,7 +19775,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1039 + "__id__": 1059 }, "propertyPath": [ "_bottom" @@ -19496,7 +19785,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1039 + "__id__": 1059 }, "propertyPath": [ "_left" @@ -19506,7 +19795,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1039 + "__id__": 1059 }, "propertyPath": [ "_right" @@ -19516,7 +19805,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1039 + "__id__": 1059 }, "propertyPath": [ "_isAbsTop" @@ -19526,7 +19815,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1045 + "__id__": 1065 }, "propertyPath": [ "_active" @@ -19543,7 +19832,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1047 + "__id__": 1067 }, "propertyPath": [ "_contentSize" @@ -19564,7 +19853,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1049 + "__id__": 1069 }, "propertyPath": [ "_contentSize" @@ -19585,7 +19874,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1051 + "__id__": 1071 }, "propertyPath": [ "_contentSize" @@ -19606,7 +19895,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1053 + "__id__": 1073 }, "propertyPath": [ "_contentSize" @@ -19627,7 +19916,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1055 + "__id__": 1075 }, "propertyPath": [ "_contentSize" @@ -19648,7 +19937,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1057 + "__id__": 1077 }, "propertyPath": [ "_lscale" @@ -19670,7 +19959,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1059 + "__id__": 1079 }, "propertyPath": [ "_verticalCenter" @@ -19686,7 +19975,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1061 + "__id__": 1081 }, "propertyPath": [ "_contentSize" @@ -19706,7 +19995,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1063 + "__id__": 1083 }, "propertyPath": [ "_contentSize" @@ -19726,7 +20015,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1065 + "__id__": 1085 }, "propertyPath": [ "_lpos" @@ -19747,7 +20036,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1067 + "__id__": 1087 }, "propertyPath": [ "_lpos" @@ -19768,7 +20057,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1069 + "__id__": 1089 }, "propertyPath": [ "_lpos" @@ -19790,17 +20079,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 747 + "__id__": 767 }, "_prefab": { - "__id__": 1071 + "__id__": 1091 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1070 + "__id__": 1090 }, "asset": { "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", @@ -19808,7 +20097,7 @@ }, "fileId": "f6ZIZpbPVPF6MTrktCfZoL", "instance": { - "__id__": 1072 + "__id__": 1092 }, "targetOverrides": null }, @@ -19822,62 +20111,26 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 1073 + "__id__": 1093 }, { - "__id__": 1075 - }, - { - "__id__": 1076 - }, - { - "__id__": 1077 - }, - { - "__id__": 1078 - }, - { - "__id__": 1080 - }, - { - "__id__": 1081 - }, - { - "__id__": 1082 - }, - { - "__id__": 1084 - }, - { - "__id__": 1086 - }, - { - "__id__": 1087 - }, - { - "__id__": 1088 - }, - { - "__id__": 1089 - }, - { - "__id__": 1090 - }, - { - "__id__": 1092 - }, - { - "__id__": 1094 + "__id__": 1095 }, { "__id__": 1096 }, + { + "__id__": 1097 + }, { "__id__": 1098 }, { "__id__": 1100 }, + { + "__id__": 1101 + }, { "__id__": 1102 }, @@ -19887,9 +20140,15 @@ { "__id__": 1106 }, + { + "__id__": 1107 + }, { "__id__": 1108 }, + { + "__id__": 1109 + }, { "__id__": 1110 }, @@ -19898,6 +20157,36 @@ }, { "__id__": 1114 + }, + { + "__id__": 1116 + }, + { + "__id__": 1118 + }, + { + "__id__": 1120 + }, + { + "__id__": 1122 + }, + { + "__id__": 1124 + }, + { + "__id__": 1126 + }, + { + "__id__": 1128 + }, + { + "__id__": 1130 + }, + { + "__id__": 1132 + }, + { + "__id__": 1134 } ], "removedComponents": [] @@ -19905,7 +20194,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1074 + "__id__": 1094 }, "propertyPath": [ "_name" @@ -19921,7 +20210,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1074 + "__id__": 1094 }, "propertyPath": [ "_lpos" @@ -19936,7 +20225,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1074 + "__id__": 1094 }, "propertyPath": [ "_lrot" @@ -19952,7 +20241,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1074 + "__id__": 1094 }, "propertyPath": [ "_euler" @@ -19967,7 +20256,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1079 + "__id__": 1099 }, "propertyPath": [ "_active" @@ -19984,7 +20273,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1079 + "__id__": 1099 }, "propertyPath": [ "_lscale" @@ -19999,7 +20288,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1079 + "__id__": 1099 }, "propertyPath": [ "_lpos" @@ -20014,7 +20303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1083 + "__id__": 1103 }, "propertyPath": [ "_contentSize" @@ -20035,7 +20324,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1085 + "__id__": 1105 }, "propertyPath": [ "_top" @@ -20052,7 +20341,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1085 + "__id__": 1105 }, "propertyPath": [ "_bottom" @@ -20062,7 +20351,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1085 + "__id__": 1105 }, "propertyPath": [ "_left" @@ -20072,7 +20361,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1085 + "__id__": 1105 }, "propertyPath": [ "_right" @@ -20082,7 +20371,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1085 + "__id__": 1105 }, "propertyPath": [ "_isAbsTop" @@ -20092,7 +20381,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1091 + "__id__": 1111 }, "propertyPath": [ "_active" @@ -20109,7 +20398,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1093 + "__id__": 1113 }, "propertyPath": [ "_contentSize" @@ -20130,7 +20419,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1095 + "__id__": 1115 }, "propertyPath": [ "_contentSize" @@ -20151,7 +20440,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1097 + "__id__": 1117 }, "propertyPath": [ "_contentSize" @@ -20172,7 +20461,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1099 + "__id__": 1119 }, "propertyPath": [ "_contentSize" @@ -20193,7 +20482,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1101 + "__id__": 1121 }, "propertyPath": [ "_contentSize" @@ -20214,7 +20503,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1103 + "__id__": 1123 }, "propertyPath": [ "_lscale" @@ -20236,7 +20525,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1105 + "__id__": 1125 }, "propertyPath": [ "_verticalCenter" @@ -20252,7 +20541,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1107 + "__id__": 1127 }, "propertyPath": [ "_contentSize" @@ -20272,7 +20561,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1109 + "__id__": 1129 }, "propertyPath": [ "_contentSize" @@ -20292,7 +20581,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1111 + "__id__": 1131 }, "propertyPath": [ "_lpos" @@ -20313,7 +20602,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1113 + "__id__": 1133 }, "propertyPath": [ "_lpos" @@ -20334,7 +20623,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1115 + "__id__": 1135 }, "propertyPath": [ "_lpos" @@ -20358,11 +20647,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 747 + "__id__": 767 }, "_enabled": true, "__prefab": { - "__id__": 1117 + "__id__": 1137 }, "_contentSize": { "__type__": "cc.Size", @@ -20386,11 +20675,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 747 + "__id__": 767 }, "_enabled": true, "__prefab": { - "__id__": 1119 + "__id__": 1139 }, "_alignFlags": 45, "_target": null, @@ -20422,11 +20711,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 747 + "__id__": 767 }, "_enabled": true, "__prefab": { - "__id__": 1121 + "__id__": 1141 }, "_resizeMode": 1, "_layoutType": 3, @@ -20473,27 +20762,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 746 + "__id__": 766 }, "_children": [ { - "__id__": 1124 + "__id__": 1144 } ], "_active": true, "_components": [ { - "__id__": 1130 + "__id__": 1150 }, { - "__id__": 1132 + "__id__": 1152 }, { - "__id__": 1134 + "__id__": 1154 } ], "_prefab": { - "__id__": 1136 + "__id__": 1156 }, "_lpos": { "__type__": "cc.Vec3", @@ -20530,20 +20819,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1123 + "__id__": 1143 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1125 + "__id__": 1145 }, { - "__id__": 1127 + "__id__": 1147 } ], "_prefab": { - "__id__": 1129 + "__id__": 1149 }, "_lpos": { "__type__": "cc.Vec3", @@ -20580,11 +20869,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1124 + "__id__": 1144 }, "_enabled": true, "__prefab": { - "__id__": 1126 + "__id__": 1146 }, "_contentSize": { "__type__": "cc.Size", @@ -20608,11 +20897,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1124 + "__id__": 1144 }, "_enabled": true, "__prefab": { - "__id__": 1128 + "__id__": 1148 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20689,11 +20978,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1123 + "__id__": 1143 }, "_enabled": true, "__prefab": { - "__id__": 1131 + "__id__": 1151 }, "_contentSize": { "__type__": "cc.Size", @@ -20717,11 +21006,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1123 + "__id__": 1143 }, "_enabled": true, "__prefab": { - "__id__": 1133 + "__id__": 1153 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20762,11 +21051,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1123 + "__id__": 1143 }, "_enabled": true, "__prefab": { - "__id__": 1135 + "__id__": 1155 }, "_alignFlags": 40, "_target": null, @@ -20811,11 +21100,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 746 + "__id__": 766 }, "_enabled": true, "__prefab": { - "__id__": 1138 + "__id__": 1158 }, "_contentSize": { "__type__": "cc.Size", @@ -20839,11 +21128,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 746 + "__id__": 766 }, "_enabled": true, "__prefab": { - "__id__": 1140 + "__id__": 1160 }, "_alignFlags": 44, "_target": null, @@ -20888,36 +21177,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 577 + "__id__": 597 }, "_children": [ { - "__id__": 1143 + "__id__": 1163 }, { - "__id__": 1168 + "__id__": 1188 }, { - "__id__": 1174 + "__id__": 1194 }, { - "__id__": 1180 + "__id__": 1200 }, { - "__id__": 1186 + "__id__": 1206 } ], "_active": false, "_components": [ { - "__id__": 1192 + "__id__": 1212 }, { - "__id__": 1194 + "__id__": 1214 } ], "_prefab": { - "__id__": 1196 + "__id__": 1216 }, "_lpos": { "__type__": "cc.Vec3", @@ -20952,17 +21241,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 1142 + "__id__": 1162 }, "_prefab": { - "__id__": 1144 + "__id__": 1164 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1143 + "__id__": 1163 }, "asset": { "__uuid__": "41a77c92-67f6-4685-8609-682e643aa8ca", @@ -20970,7 +21259,7 @@ }, "fileId": "4foJ4Sd5VJtr2JgTnv7kNd", "instance": { - "__id__": 1145 + "__id__": 1165 }, "targetOverrides": null }, @@ -20984,40 +21273,40 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 1146 + "__id__": 1166 }, { - "__id__": 1148 + "__id__": 1168 }, { - "__id__": 1150 + "__id__": 1170 }, { - "__id__": 1152 + "__id__": 1172 }, { - "__id__": 1154 + "__id__": 1174 }, { - "__id__": 1156 + "__id__": 1176 }, { - "__id__": 1158 + "__id__": 1178 }, { - "__id__": 1160 + "__id__": 1180 }, { - "__id__": 1162 + "__id__": 1182 }, { - "__id__": 1164 + "__id__": 1184 }, { - "__id__": 1165 + "__id__": 1185 }, { - "__id__": 1167 + "__id__": 1187 } ], "removedComponents": [] @@ -21025,7 +21314,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1147 + "__id__": 1167 }, "propertyPath": [ "_name" @@ -21041,7 +21330,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1149 + "__id__": 1169 }, "propertyPath": [ "_lpos" @@ -21062,7 +21351,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1151 + "__id__": 1171 }, "propertyPath": [ "_lrot" @@ -21084,7 +21373,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1153 + "__id__": 1173 }, "propertyPath": [ "_euler" @@ -21105,7 +21394,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1155 + "__id__": 1175 }, "propertyPath": [ "_contentSize" @@ -21125,7 +21414,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1157 + "__id__": 1177 }, "propertyPath": [ "_contentSize" @@ -21145,7 +21434,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1159 + "__id__": 1179 }, "propertyPath": [ "_contentSize" @@ -21165,7 +21454,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1161 + "__id__": 1181 }, "propertyPath": [ "_contentSize" @@ -21185,7 +21474,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1163 + "__id__": 1183 }, "propertyPath": [ "_contentSize" @@ -21205,7 +21494,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1153 + "__id__": 1173 }, "propertyPath": [ "_active" @@ -21215,7 +21504,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1166 + "__id__": 1186 }, "propertyPath": [ "_right" @@ -21231,7 +21520,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1166 + "__id__": 1186 }, "propertyPath": [ "_left" @@ -21244,20 +21533,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1142 + "__id__": 1162 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1169 + "__id__": 1189 }, { - "__id__": 1171 + "__id__": 1191 } ], "_prefab": { - "__id__": 1173 + "__id__": 1193 }, "_lpos": { "__type__": "cc.Vec3", @@ -21294,11 +21583,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1168 + "__id__": 1188 }, "_enabled": true, "__prefab": { - "__id__": 1170 + "__id__": 1190 }, "_contentSize": { "__type__": "cc.Size", @@ -21322,11 +21611,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1168 + "__id__": 1188 }, "_enabled": true, "__prefab": { - "__id__": 1172 + "__id__": 1192 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21380,20 +21669,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1142 + "__id__": 1162 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1175 + "__id__": 1195 }, { - "__id__": 1177 + "__id__": 1197 } ], "_prefab": { - "__id__": 1179 + "__id__": 1199 }, "_lpos": { "__type__": "cc.Vec3", @@ -21430,11 +21719,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1174 + "__id__": 1194 }, "_enabled": true, "__prefab": { - "__id__": 1176 + "__id__": 1196 }, "_contentSize": { "__type__": "cc.Size", @@ -21458,11 +21747,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1174 + "__id__": 1194 }, "_enabled": true, "__prefab": { - "__id__": 1178 + "__id__": 1198 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21516,20 +21805,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1142 + "__id__": 1162 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1181 + "__id__": 1201 }, { - "__id__": 1183 + "__id__": 1203 } ], "_prefab": { - "__id__": 1185 + "__id__": 1205 }, "_lpos": { "__type__": "cc.Vec3", @@ -21566,11 +21855,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1180 + "__id__": 1200 }, "_enabled": true, "__prefab": { - "__id__": 1182 + "__id__": 1202 }, "_contentSize": { "__type__": "cc.Size", @@ -21594,11 +21883,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1180 + "__id__": 1200 }, "_enabled": true, "__prefab": { - "__id__": 1184 + "__id__": 1204 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21652,20 +21941,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1142 + "__id__": 1162 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1187 + "__id__": 1207 }, { - "__id__": 1189 + "__id__": 1209 } ], "_prefab": { - "__id__": 1191 + "__id__": 1211 }, "_lpos": { "__type__": "cc.Vec3", @@ -21702,11 +21991,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1186 + "__id__": 1206 }, "_enabled": true, "__prefab": { - "__id__": 1188 + "__id__": 1208 }, "_contentSize": { "__type__": "cc.Size", @@ -21730,11 +22019,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1186 + "__id__": 1206 }, "_enabled": true, "__prefab": { - "__id__": 1190 + "__id__": 1210 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21788,11 +22077,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1142 + "__id__": 1162 }, "_enabled": true, "__prefab": { - "__id__": 1193 + "__id__": 1213 }, "_contentSize": { "__type__": "cc.Size", @@ -21816,11 +22105,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1142 + "__id__": 1162 }, "_enabled": true, "__prefab": { - "__id__": 1195 + "__id__": 1215 }, "_alignFlags": 44, "_target": null, @@ -21865,27 +22154,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 577 + "__id__": 597 }, "_children": [ { - "__id__": 1198 + "__id__": 1218 } ], "_active": true, "_components": [ { - "__id__": 1206 + "__id__": 1226 }, { - "__id__": 1208 + "__id__": 1228 }, { - "__id__": 1210 + "__id__": 1230 } ], "_prefab": { - "__id__": 1212 + "__id__": 1232 }, "_lpos": { "__type__": "cc.Vec3", @@ -21922,23 +22211,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1197 + "__id__": 1217 }, "_children": [], "_active": false, "_components": [ { - "__id__": 1199 + "__id__": 1219 }, { - "__id__": 1201 + "__id__": 1221 }, { - "__id__": 1203 + "__id__": 1223 } ], "_prefab": { - "__id__": 1205 + "__id__": 1225 }, "_lpos": { "__type__": "cc.Vec3", @@ -21975,11 +22264,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1198 + "__id__": 1218 }, "_enabled": true, "__prefab": { - "__id__": 1200 + "__id__": 1220 }, "_contentSize": { "__type__": "cc.Size", @@ -22003,11 +22292,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1198 + "__id__": 1218 }, "_enabled": true, "__prefab": { - "__id__": 1202 + "__id__": 1222 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -22071,11 +22360,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1198 + "__id__": 1218 }, "_enabled": true, "__prefab": { - "__id__": 1204 + "__id__": 1224 }, "_alignFlags": 4, "_target": null, @@ -22120,11 +22409,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1197 + "__id__": 1217 }, "_enabled": true, "__prefab": { - "__id__": 1207 + "__id__": 1227 }, "_contentSize": { "__type__": "cc.Size", @@ -22148,11 +22437,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1197 + "__id__": 1217 }, "_enabled": true, "__prefab": { - "__id__": 1209 + "__id__": 1229 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -22193,11 +22482,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1197 + "__id__": 1217 }, "_enabled": true, "__prefab": { - "__id__": 1211 + "__id__": 1231 }, "_alignFlags": 41, "_target": null, @@ -22242,11 +22531,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 577 + "__id__": 597 }, "_enabled": true, "__prefab": { - "__id__": 1214 + "__id__": 1234 }, "_contentSize": { "__type__": "cc.Size", @@ -22270,11 +22559,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 577 + "__id__": 597 }, "_enabled": true, "__prefab": { - "__id__": 1216 + "__id__": 1236 }, "_alignFlags": 45, "_target": null, @@ -22306,11 +22595,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 577 + "__id__": 597 }, "_enabled": true, "__prefab": { - "__id__": 1218 + "__id__": 1238 }, "_id": "" }, @@ -22324,11 +22613,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 577 + "__id__": 597 }, "_enabled": true, "__prefab": { - "__id__": 1220 + "__id__": 1240 }, "_id": "" }, @@ -22359,32 +22648,32 @@ }, "_children": [ { - "__id__": 1223 + "__id__": 1243 }, { - "__id__": 1231 + "__id__": 1251 }, { - "__id__": 1247 + "__id__": 1267 } ], "_active": false, "_components": [ { - "__id__": 1291 + "__id__": 1311 }, { - "__id__": 1293 + "__id__": 1313 }, { - "__id__": 1295 + "__id__": 1315 }, { - "__id__": 1297 + "__id__": 1317 } ], "_prefab": { - "__id__": 1299 + "__id__": 1319 }, "_lpos": { "__type__": "cc.Vec3", @@ -22421,23 +22710,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1222 + "__id__": 1242 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1224 + "__id__": 1244 }, { - "__id__": 1226 + "__id__": 1246 }, { - "__id__": 1228 + "__id__": 1248 } ], "_prefab": { - "__id__": 1230 + "__id__": 1250 }, "_lpos": { "__type__": "cc.Vec3", @@ -22474,11 +22763,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1223 + "__id__": 1243 }, "_enabled": true, "__prefab": { - "__id__": 1225 + "__id__": 1245 }, "_contentSize": { "__type__": "cc.Size", @@ -22502,11 +22791,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1223 + "__id__": 1243 }, "_enabled": true, "__prefab": { - "__id__": 1227 + "__id__": 1247 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -22547,11 +22836,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1223 + "__id__": 1243 }, "_enabled": true, "__prefab": { - "__id__": 1229 + "__id__": 1249 }, "_alignFlags": 45, "_target": null, @@ -22596,27 +22885,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1222 + "__id__": 1242 }, "_children": [ { - "__id__": 1232 + "__id__": 1252 } ], "_active": true, "_components": [ { - "__id__": 1240 + "__id__": 1260 }, { - "__id__": 1242 + "__id__": 1262 }, { - "__id__": 1244 + "__id__": 1264 } ], "_prefab": { - "__id__": 1246 + "__id__": 1266 }, "_lpos": { "__type__": "cc.Vec3", @@ -22653,23 +22942,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1231 + "__id__": 1251 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1233 + "__id__": 1253 }, { - "__id__": 1235 + "__id__": 1255 }, { - "__id__": 1237 + "__id__": 1257 } ], "_prefab": { - "__id__": 1239 + "__id__": 1259 }, "_lpos": { "__type__": "cc.Vec3", @@ -22706,11 +22995,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1232 + "__id__": 1252 }, "_enabled": true, "__prefab": { - "__id__": 1234 + "__id__": 1254 }, "_contentSize": { "__type__": "cc.Size", @@ -22734,11 +23023,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1232 + "__id__": 1252 }, "_enabled": true, "__prefab": { - "__id__": 1236 + "__id__": 1256 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -22802,11 +23091,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1232 + "__id__": 1252 }, "_enabled": true, "__prefab": { - "__id__": 1238 + "__id__": 1258 }, "_alignFlags": 4, "_target": null, @@ -22851,11 +23140,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1231 + "__id__": 1251 }, "_enabled": true, "__prefab": { - "__id__": 1241 + "__id__": 1261 }, "_contentSize": { "__type__": "cc.Size", @@ -22879,11 +23168,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1231 + "__id__": 1251 }, "_enabled": true, "__prefab": { - "__id__": 1243 + "__id__": 1263 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -22924,11 +23213,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1231 + "__id__": 1251 }, "_enabled": true, "__prefab": { - "__id__": 1245 + "__id__": 1265 }, "_alignFlags": 41, "_target": null, @@ -22973,33 +23262,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1222 + "__id__": 1242 }, "_children": [ { - "__id__": 1248 + "__id__": 1268 }, { - "__id__": 1266 + "__id__": 1286 } ], "_active": true, "_components": [ { - "__id__": 1284 + "__id__": 1304 }, { - "__id__": 1286 + "__id__": 1306 }, { - "__id__": 1263 + "__id__": 1283 }, { - "__id__": 1288 + "__id__": 1308 } ], "_prefab": { - "__id__": 1290 + "__id__": 1310 }, "_lpos": { "__type__": "cc.Vec3", @@ -23036,30 +23325,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1247 + "__id__": 1267 }, "_children": [ { - "__id__": 1249 + "__id__": 1269 } ], "_active": false, "_components": [ { - "__id__": 1255 + "__id__": 1275 }, { - "__id__": 1257 + "__id__": 1277 }, { - "__id__": 1259 + "__id__": 1279 }, { - "__id__": 1261 + "__id__": 1281 } ], "_prefab": { - "__id__": 1283 + "__id__": 1303 }, "_lpos": { "__type__": "cc.Vec3", @@ -23096,20 +23385,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1248 + "__id__": 1268 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1250 + "__id__": 1270 }, { - "__id__": 1252 + "__id__": 1272 } ], "_prefab": { - "__id__": 1254 + "__id__": 1274 }, "_lpos": { "__type__": "cc.Vec3", @@ -23146,11 +23435,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1249 + "__id__": 1269 }, "_enabled": true, "__prefab": { - "__id__": 1251 + "__id__": 1271 }, "_contentSize": { "__type__": "cc.Size", @@ -23174,11 +23463,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1249 + "__id__": 1269 }, "_enabled": true, "__prefab": { - "__id__": 1253 + "__id__": 1273 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -23232,11 +23521,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1248 + "__id__": 1268 }, "_enabled": true, "__prefab": { - "__id__": 1256 + "__id__": 1276 }, "_contentSize": { "__type__": "cc.Size", @@ -23260,11 +23549,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1248 + "__id__": 1268 }, "_enabled": true, "__prefab": { - "__id__": 1258 + "__id__": 1278 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -23305,11 +23594,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1248 + "__id__": 1268 }, "_enabled": true, "__prefab": { - "__id__": 1260 + "__id__": 1280 }, "_alignFlags": 37, "_target": null, @@ -23341,17 +23630,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1248 + "__id__": 1268 }, "_enabled": true, "__prefab": { - "__id__": 1262 + "__id__": 1282 }, "_scrollView": { - "__id__": 1263 + "__id__": 1283 }, "_handle": { - "__id__": 1252 + "__id__": 1272 }, "_direction": 1, "_enableAutoHide": false, @@ -23368,11 +23657,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1247 + "__id__": 1267 }, "_enabled": true, "__prefab": { - "__id__": 1264 + "__id__": 1284 }, "bounceDuration": 0.23, "brake": 0.75, @@ -23383,7 +23672,7 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 1265 + "__id__": 1285 }, "_horizontalScrollBar": null, "_verticalScrollBar": null, @@ -23399,23 +23688,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1266 + "__id__": 1286 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1276 + "__id__": 1296 }, { - "__id__": 1278 + "__id__": 1298 }, { - "__id__": 1280 + "__id__": 1300 } ], "_prefab": { - "__id__": 1282 + "__id__": 1302 }, "_lpos": { "__type__": "cc.Vec3", @@ -23452,30 +23741,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1247 + "__id__": 1267 }, "_children": [ { - "__id__": 1265 + "__id__": 1285 } ], "_active": true, "_components": [ { - "__id__": 1267 + "__id__": 1287 }, { - "__id__": 1269 + "__id__": 1289 }, { - "__id__": 1271 + "__id__": 1291 }, { - "__id__": 1273 + "__id__": 1293 } ], "_prefab": { - "__id__": 1275 + "__id__": 1295 }, "_lpos": { "__type__": "cc.Vec3", @@ -23512,11 +23801,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1266 + "__id__": 1286 }, "_enabled": true, "__prefab": { - "__id__": 1268 + "__id__": 1288 }, "_contentSize": { "__type__": "cc.Size", @@ -23540,11 +23829,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1266 + "__id__": 1286 }, "_enabled": true, "__prefab": { - "__id__": 1270 + "__id__": 1290 }, "_type": 0, "_inverted": false, @@ -23562,11 +23851,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1266 + "__id__": 1286 }, "_enabled": true, "__prefab": { - "__id__": 1272 + "__id__": 1292 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -23608,11 +23897,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1266 + "__id__": 1286 }, "_enabled": true, "__prefab": { - "__id__": 1274 + "__id__": 1294 }, "_alignFlags": 45, "_target": null, @@ -23657,11 +23946,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1265 + "__id__": 1285 }, "_enabled": true, "__prefab": { - "__id__": 1277 + "__id__": 1297 }, "_contentSize": { "__type__": "cc.Size", @@ -23685,11 +23974,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1265 + "__id__": 1285 }, "_enabled": true, "__prefab": { - "__id__": 1279 + "__id__": 1299 }, "_alignFlags": 41, "_target": null, @@ -23721,11 +24010,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1265 + "__id__": 1285 }, "_enabled": true, "__prefab": { - "__id__": 1281 + "__id__": 1301 }, "_resizeMode": 0, "_layoutType": 3, @@ -23785,11 +24074,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1247 + "__id__": 1267 }, "_enabled": true, "__prefab": { - "__id__": 1285 + "__id__": 1305 }, "_contentSize": { "__type__": "cc.Size", @@ -23813,11 +24102,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1247 + "__id__": 1267 }, "_enabled": false, "__prefab": { - "__id__": 1287 + "__id__": 1307 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -23858,11 +24147,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1247 + "__id__": 1267 }, "_enabled": true, "__prefab": { - "__id__": 1289 + "__id__": 1309 }, "_alignFlags": 45, "_target": null, @@ -23907,11 +24196,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1222 + "__id__": 1242 }, "_enabled": true, "__prefab": { - "__id__": 1292 + "__id__": 1312 }, "_contentSize": { "__type__": "cc.Size", @@ -23935,11 +24224,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1222 + "__id__": 1242 }, "_enabled": true, "__prefab": { - "__id__": 1294 + "__id__": 1314 }, "_alignFlags": 45, "_target": null, @@ -23971,11 +24260,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1222 + "__id__": 1242 }, "_enabled": true, "__prefab": { - "__id__": 1296 + "__id__": 1316 }, "_id": "" }, @@ -23989,11 +24278,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1222 + "__id__": 1242 }, "_enabled": true, "__prefab": { - "__id__": 1298 + "__id__": 1318 }, "_id": "" }, @@ -24024,35 +24313,35 @@ }, "_children": [ { - "__id__": 1301 + "__id__": 1321 }, { - "__id__": 1342 + "__id__": 1362 }, { - "__id__": 1383 + "__id__": 1403 }, { - "__id__": 1424 + "__id__": 1452 }, { - "__id__": 1465 + "__id__": 1493 } ], "_active": true, "_components": [ { - "__id__": 1506 + "__id__": 1534 }, { - "__id__": 1508 + "__id__": 1536 }, { - "__id__": 1510 + "__id__": 1538 } ], "_prefab": { - "__id__": 1512 + "__id__": 1540 }, "_lpos": { "__type__": "cc.Vec3", @@ -24089,27 +24378,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1300 + "__id__": 1320 }, "_children": [ { - "__id__": 1302 + "__id__": 1322 }, { - "__id__": 1316 + "__id__": 1336 } ], "_active": true, "_components": [ { - "__id__": 1336 + "__id__": 1356 }, { - "__id__": 1338 + "__id__": 1358 } ], "_prefab": { - "__id__": 1341 + "__id__": 1361 }, "_lpos": { "__type__": "cc.Vec3", @@ -24146,27 +24435,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1301 + "__id__": 1321 }, "_children": [ { - "__id__": 1303 + "__id__": 1323 } ], "_active": true, "_components": [ { - "__id__": 1309 + "__id__": 1329 }, { - "__id__": 1311 + "__id__": 1331 }, { - "__id__": 1313 + "__id__": 1333 } ], "_prefab": { - "__id__": 1315 + "__id__": 1335 }, "_lpos": { "__type__": "cc.Vec3", @@ -24203,20 +24492,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1302 + "__id__": 1322 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1304 + "__id__": 1324 }, { - "__id__": 1306 + "__id__": 1326 } ], "_prefab": { - "__id__": 1308 + "__id__": 1328 }, "_lpos": { "__type__": "cc.Vec3", @@ -24253,11 +24542,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1303 + "__id__": 1323 }, "_enabled": true, "__prefab": { - "__id__": 1305 + "__id__": 1325 }, "_contentSize": { "__type__": "cc.Size", @@ -24281,11 +24570,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1303 + "__id__": 1323 }, "_enabled": true, "__prefab": { - "__id__": 1307 + "__id__": 1327 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -24342,11 +24631,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1302 + "__id__": 1322 }, "_enabled": true, "__prefab": { - "__id__": 1310 + "__id__": 1330 }, "_contentSize": { "__type__": "cc.Size", @@ -24370,11 +24659,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1302 + "__id__": 1322 }, "_enabled": true, "__prefab": { - "__id__": 1312 + "__id__": 1332 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -24415,11 +24704,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1302 + "__id__": 1322 }, "_enabled": true, "__prefab": { - "__id__": 1314 + "__id__": 1334 }, "_alignFlags": 45, "_target": null, @@ -24464,30 +24753,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1301 + "__id__": 1321 }, "_children": [ { - "__id__": 1317 + "__id__": 1337 }, { - "__id__": 1323 + "__id__": 1343 } ], "_active": true, "_components": [ { - "__id__": 1329 + "__id__": 1349 }, { - "__id__": 1331 + "__id__": 1351 }, { - "__id__": 1333 + "__id__": 1353 } ], "_prefab": { - "__id__": 1335 + "__id__": 1355 }, "_lpos": { "__type__": "cc.Vec3", @@ -24524,20 +24813,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1316 + "__id__": 1336 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1318 + "__id__": 1338 }, { - "__id__": 1320 + "__id__": 1340 } ], "_prefab": { - "__id__": 1322 + "__id__": 1342 }, "_lpos": { "__type__": "cc.Vec3", @@ -24574,11 +24863,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1317 + "__id__": 1337 }, "_enabled": true, "__prefab": { - "__id__": 1319 + "__id__": 1339 }, "_contentSize": { "__type__": "cc.Size", @@ -24602,11 +24891,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1317 + "__id__": 1337 }, "_enabled": true, "__prefab": { - "__id__": 1321 + "__id__": 1341 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -24663,20 +24952,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1316 + "__id__": 1336 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1324 + "__id__": 1344 }, { - "__id__": 1326 + "__id__": 1346 } ], "_prefab": { - "__id__": 1328 + "__id__": 1348 }, "_lpos": { "__type__": "cc.Vec3", @@ -24713,11 +25002,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1323 + "__id__": 1343 }, "_enabled": true, "__prefab": { - "__id__": 1325 + "__id__": 1345 }, "_contentSize": { "__type__": "cc.Size", @@ -24741,11 +25030,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1323 + "__id__": 1343 }, "_enabled": true, "__prefab": { - "__id__": 1327 + "__id__": 1347 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -24822,11 +25111,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1316 + "__id__": 1336 }, "_enabled": true, "__prefab": { - "__id__": 1330 + "__id__": 1350 }, "_contentSize": { "__type__": "cc.Size", @@ -24850,11 +25139,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1316 + "__id__": 1336 }, "_enabled": true, "__prefab": { - "__id__": 1332 + "__id__": 1352 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -24895,11 +25184,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1316 + "__id__": 1336 }, "_enabled": true, "__prefab": { - "__id__": 1334 + "__id__": 1354 }, "_alignFlags": 45, "_target": null, @@ -24944,11 +25233,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1301 + "__id__": 1321 }, "_enabled": true, "__prefab": { - "__id__": 1337 + "__id__": 1357 }, "_contentSize": { "__type__": "cc.Size", @@ -24972,15 +25261,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1301 + "__id__": 1321 }, "_enabled": true, "__prefab": { - "__id__": 1339 + "__id__": 1359 }, "clickEvents": [ { - "__id__": 1340 + "__id__": 1360 } ], "_interactable": true, @@ -25055,27 +25344,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1300 + "__id__": 1320 }, "_children": [ { - "__id__": 1343 + "__id__": 1363 }, { - "__id__": 1357 + "__id__": 1377 } ], "_active": true, "_components": [ { - "__id__": 1377 + "__id__": 1397 }, { - "__id__": 1379 + "__id__": 1399 } ], "_prefab": { - "__id__": 1382 + "__id__": 1402 }, "_lpos": { "__type__": "cc.Vec3", @@ -25112,27 +25401,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1342 + "__id__": 1362 }, "_children": [ { - "__id__": 1344 + "__id__": 1364 } ], "_active": true, "_components": [ { - "__id__": 1350 + "__id__": 1370 }, { - "__id__": 1352 + "__id__": 1372 }, { - "__id__": 1354 + "__id__": 1374 } ], "_prefab": { - "__id__": 1356 + "__id__": 1376 }, "_lpos": { "__type__": "cc.Vec3", @@ -25169,20 +25458,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1343 + "__id__": 1363 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1345 + "__id__": 1365 }, { - "__id__": 1347 + "__id__": 1367 } ], "_prefab": { - "__id__": 1349 + "__id__": 1369 }, "_lpos": { "__type__": "cc.Vec3", @@ -25219,11 +25508,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1344 + "__id__": 1364 }, "_enabled": true, "__prefab": { - "__id__": 1346 + "__id__": 1366 }, "_contentSize": { "__type__": "cc.Size", @@ -25247,11 +25536,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1344 + "__id__": 1364 }, "_enabled": true, "__prefab": { - "__id__": 1348 + "__id__": 1368 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25305,11 +25594,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1343 + "__id__": 1363 }, "_enabled": true, "__prefab": { - "__id__": 1351 + "__id__": 1371 }, "_contentSize": { "__type__": "cc.Size", @@ -25333,11 +25622,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1343 + "__id__": 1363 }, "_enabled": true, "__prefab": { - "__id__": 1353 + "__id__": 1373 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25378,11 +25667,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1343 + "__id__": 1363 }, "_enabled": true, "__prefab": { - "__id__": 1355 + "__id__": 1375 }, "_alignFlags": 45, "_target": null, @@ -25427,30 +25716,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1342 + "__id__": 1362 }, "_children": [ { - "__id__": 1358 + "__id__": 1378 }, { - "__id__": 1364 + "__id__": 1384 } ], "_active": true, "_components": [ { - "__id__": 1370 + "__id__": 1390 }, { - "__id__": 1372 + "__id__": 1392 }, { - "__id__": 1374 + "__id__": 1394 } ], "_prefab": { - "__id__": 1376 + "__id__": 1396 }, "_lpos": { "__type__": "cc.Vec3", @@ -25487,20 +25776,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1357 + "__id__": 1377 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1359 + "__id__": 1379 }, { - "__id__": 1361 + "__id__": 1381 } ], "_prefab": { - "__id__": 1363 + "__id__": 1383 }, "_lpos": { "__type__": "cc.Vec3", @@ -25537,11 +25826,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1358 + "__id__": 1378 }, "_enabled": true, "__prefab": { - "__id__": 1360 + "__id__": 1380 }, "_contentSize": { "__type__": "cc.Size", @@ -25565,11 +25854,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1358 + "__id__": 1378 }, "_enabled": true, "__prefab": { - "__id__": 1362 + "__id__": 1382 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25623,20 +25912,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1357 + "__id__": 1377 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1365 + "__id__": 1385 }, { - "__id__": 1367 + "__id__": 1387 } ], "_prefab": { - "__id__": 1369 + "__id__": 1389 }, "_lpos": { "__type__": "cc.Vec3", @@ -25673,11 +25962,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1364 + "__id__": 1384 }, "_enabled": true, "__prefab": { - "__id__": 1366 + "__id__": 1386 }, "_contentSize": { "__type__": "cc.Size", @@ -25701,11 +25990,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1364 + "__id__": 1384 }, "_enabled": true, "__prefab": { - "__id__": 1368 + "__id__": 1388 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25782,11 +26071,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1357 + "__id__": 1377 }, "_enabled": true, "__prefab": { - "__id__": 1371 + "__id__": 1391 }, "_contentSize": { "__type__": "cc.Size", @@ -25810,11 +26099,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1357 + "__id__": 1377 }, "_enabled": true, "__prefab": { - "__id__": 1373 + "__id__": 1393 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25855,11 +26144,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1357 + "__id__": 1377 }, "_enabled": true, "__prefab": { - "__id__": 1375 + "__id__": 1395 }, "_alignFlags": 45, "_target": null, @@ -25904,11 +26193,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1342 + "__id__": 1362 }, "_enabled": true, "__prefab": { - "__id__": 1378 + "__id__": 1398 }, "_contentSize": { "__type__": "cc.Size", @@ -25932,15 +26221,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1342 + "__id__": 1362 }, "_enabled": true, "__prefab": { - "__id__": 1380 + "__id__": 1400 }, "clickEvents": [ { - "__id__": 1381 + "__id__": 1401 } ], "_interactable": true, @@ -26015,27 +26304,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1300 + "__id__": 1320 }, "_children": [ { - "__id__": 1384 + "__id__": 1404 }, { - "__id__": 1398 + "__id__": 1418 + }, + { + "__id__": 1438 } ], "_active": true, "_components": [ { - "__id__": 1418 + "__id__": 1446 }, { - "__id__": 1420 + "__id__": 1448 } ], "_prefab": { - "__id__": 1423 + "__id__": 1451 }, "_lpos": { "__type__": "cc.Vec3", @@ -26072,27 +26364,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1383 + "__id__": 1403 }, "_children": [ { - "__id__": 1385 + "__id__": 1405 } ], "_active": true, "_components": [ { - "__id__": 1391 + "__id__": 1411 }, { - "__id__": 1393 + "__id__": 1413 }, { - "__id__": 1395 + "__id__": 1415 } ], "_prefab": { - "__id__": 1397 + "__id__": 1417 }, "_lpos": { "__type__": "cc.Vec3", @@ -26129,20 +26421,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1384 + "__id__": 1404 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1386 + "__id__": 1406 }, { - "__id__": 1388 + "__id__": 1408 } ], "_prefab": { - "__id__": 1390 + "__id__": 1410 }, "_lpos": { "__type__": "cc.Vec3", @@ -26179,11 +26471,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1385 + "__id__": 1405 }, "_enabled": true, "__prefab": { - "__id__": 1387 + "__id__": 1407 }, "_contentSize": { "__type__": "cc.Size", @@ -26207,11 +26499,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1385 + "__id__": 1405 }, "_enabled": true, "__prefab": { - "__id__": 1389 + "__id__": 1409 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26265,11 +26557,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1384 + "__id__": 1404 }, "_enabled": true, "__prefab": { - "__id__": 1392 + "__id__": 1412 }, "_contentSize": { "__type__": "cc.Size", @@ -26293,11 +26585,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1384 + "__id__": 1404 }, "_enabled": true, "__prefab": { - "__id__": 1394 + "__id__": 1414 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26338,11 +26630,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1384 + "__id__": 1404 }, "_enabled": true, "__prefab": { - "__id__": 1396 + "__id__": 1416 }, "_alignFlags": 45, "_target": null, @@ -26387,30 +26679,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1383 + "__id__": 1403 }, "_children": [ { - "__id__": 1399 + "__id__": 1419 }, { - "__id__": 1405 + "__id__": 1425 } ], "_active": true, "_components": [ { - "__id__": 1411 + "__id__": 1431 }, { - "__id__": 1413 + "__id__": 1433 }, { - "__id__": 1415 + "__id__": 1435 } ], "_prefab": { - "__id__": 1417 + "__id__": 1437 }, "_lpos": { "__type__": "cc.Vec3", @@ -26447,20 +26739,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1398 + "__id__": 1418 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1400 + "__id__": 1420 }, { - "__id__": 1402 + "__id__": 1422 } ], "_prefab": { - "__id__": 1404 + "__id__": 1424 }, "_lpos": { "__type__": "cc.Vec3", @@ -26497,11 +26789,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1399 + "__id__": 1419 }, "_enabled": true, "__prefab": { - "__id__": 1401 + "__id__": 1421 }, "_contentSize": { "__type__": "cc.Size", @@ -26525,11 +26817,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1399 + "__id__": 1419 }, "_enabled": true, "__prefab": { - "__id__": 1403 + "__id__": 1423 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26583,20 +26875,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1398 + "__id__": 1418 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1406 + "__id__": 1426 }, { - "__id__": 1408 + "__id__": 1428 } ], "_prefab": { - "__id__": 1410 + "__id__": 1430 }, "_lpos": { "__type__": "cc.Vec3", @@ -26633,11 +26925,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1405 + "__id__": 1425 }, "_enabled": true, "__prefab": { - "__id__": 1407 + "__id__": 1427 }, "_contentSize": { "__type__": "cc.Size", @@ -26661,11 +26953,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1405 + "__id__": 1425 }, "_enabled": true, "__prefab": { - "__id__": 1409 + "__id__": 1429 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26742,11 +27034,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1398 + "__id__": 1418 }, "_enabled": true, "__prefab": { - "__id__": 1412 + "__id__": 1432 }, "_contentSize": { "__type__": "cc.Size", @@ -26770,11 +27062,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1398 + "__id__": 1418 }, "_enabled": true, "__prefab": { - "__id__": 1414 + "__id__": 1434 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26815,11 +27107,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1398 + "__id__": 1418 }, "_enabled": true, "__prefab": { - "__id__": 1416 + "__id__": 1436 }, "_alignFlags": 45, "_target": null, @@ -26858,17 +27150,129 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1403 + }, + "_prefab": { + "__id__": 1439 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1438 + }, + "asset": { + "__uuid__": "1c7a67cd-0d50-4b26-ae0f-8bbe3ec1a3a3", + "__expectedType__": "cc.Prefab" + }, + "fileId": "4fJlP7AItEGL6+yc5TgOyj", + "instance": { + "__id__": 1440 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "4d51KTpQxOjoPcC0zobT/Z", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 1441 + }, + { + "__id__": 1443 + }, + { + "__id__": 1444 + }, + { + "__id__": 1445 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 1442 + }, + "propertyPath": [ + "_name" + ], + "value": "task" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "4fJlP7AItEGL6+yc5TgOyj" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 1442 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 44.218, + "y": -22.866, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 1442 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 1442 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, { "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1383 + "__id__": 1403 }, "_enabled": true, "__prefab": { - "__id__": 1419 + "__id__": 1447 }, "_contentSize": { "__type__": "cc.Size", @@ -26892,15 +27296,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1383 + "__id__": 1403 }, "_enabled": true, "__prefab": { - "__id__": 1421 + "__id__": 1449 }, "clickEvents": [ { - "__id__": 1422 + "__id__": 1450 } ], "_interactable": true, @@ -26975,27 +27379,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1300 + "__id__": 1320 }, "_children": [ { - "__id__": 1425 + "__id__": 1453 }, { - "__id__": 1439 + "__id__": 1467 } ], "_active": false, "_components": [ { - "__id__": 1459 + "__id__": 1487 }, { - "__id__": 1461 + "__id__": 1489 } ], "_prefab": { - "__id__": 1464 + "__id__": 1492 }, "_lpos": { "__type__": "cc.Vec3", @@ -27032,27 +27436,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1424 + "__id__": 1452 }, "_children": [ { - "__id__": 1426 + "__id__": 1454 } ], "_active": true, "_components": [ { - "__id__": 1432 + "__id__": 1460 }, { - "__id__": 1434 + "__id__": 1462 }, { - "__id__": 1436 + "__id__": 1464 } ], "_prefab": { - "__id__": 1438 + "__id__": 1466 }, "_lpos": { "__type__": "cc.Vec3", @@ -27089,20 +27493,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1425 + "__id__": 1453 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1427 + "__id__": 1455 }, { - "__id__": 1429 + "__id__": 1457 } ], "_prefab": { - "__id__": 1431 + "__id__": 1459 }, "_lpos": { "__type__": "cc.Vec3", @@ -27139,11 +27543,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1426 + "__id__": 1454 }, "_enabled": true, "__prefab": { - "__id__": 1428 + "__id__": 1456 }, "_contentSize": { "__type__": "cc.Size", @@ -27167,11 +27571,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1426 + "__id__": 1454 }, "_enabled": true, "__prefab": { - "__id__": 1430 + "__id__": 1458 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -27225,11 +27629,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1425 + "__id__": 1453 }, "_enabled": true, "__prefab": { - "__id__": 1433 + "__id__": 1461 }, "_contentSize": { "__type__": "cc.Size", @@ -27253,11 +27657,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1425 + "__id__": 1453 }, "_enabled": true, "__prefab": { - "__id__": 1435 + "__id__": 1463 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -27298,11 +27702,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1425 + "__id__": 1453 }, "_enabled": true, "__prefab": { - "__id__": 1437 + "__id__": 1465 }, "_alignFlags": 45, "_target": null, @@ -27347,30 +27751,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1424 + "__id__": 1452 }, "_children": [ { - "__id__": 1440 + "__id__": 1468 }, { - "__id__": 1446 + "__id__": 1474 } ], "_active": true, "_components": [ { - "__id__": 1452 + "__id__": 1480 }, { - "__id__": 1454 + "__id__": 1482 }, { - "__id__": 1456 + "__id__": 1484 } ], "_prefab": { - "__id__": 1458 + "__id__": 1486 }, "_lpos": { "__type__": "cc.Vec3", @@ -27407,20 +27811,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1439 + "__id__": 1467 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1441 + "__id__": 1469 }, { - "__id__": 1443 + "__id__": 1471 } ], "_prefab": { - "__id__": 1445 + "__id__": 1473 }, "_lpos": { "__type__": "cc.Vec3", @@ -27457,11 +27861,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1440 + "__id__": 1468 }, "_enabled": true, "__prefab": { - "__id__": 1442 + "__id__": 1470 }, "_contentSize": { "__type__": "cc.Size", @@ -27485,11 +27889,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1440 + "__id__": 1468 }, "_enabled": true, "__prefab": { - "__id__": 1444 + "__id__": 1472 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -27543,20 +27947,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1439 + "__id__": 1467 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1447 + "__id__": 1475 }, { - "__id__": 1449 + "__id__": 1477 } ], "_prefab": { - "__id__": 1451 + "__id__": 1479 }, "_lpos": { "__type__": "cc.Vec3", @@ -27593,11 +27997,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1446 + "__id__": 1474 }, "_enabled": true, "__prefab": { - "__id__": 1448 + "__id__": 1476 }, "_contentSize": { "__type__": "cc.Size", @@ -27621,11 +28025,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1446 + "__id__": 1474 }, "_enabled": true, "__prefab": { - "__id__": 1450 + "__id__": 1478 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -27702,11 +28106,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1439 + "__id__": 1467 }, "_enabled": true, "__prefab": { - "__id__": 1453 + "__id__": 1481 }, "_contentSize": { "__type__": "cc.Size", @@ -27730,11 +28134,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1439 + "__id__": 1467 }, "_enabled": true, "__prefab": { - "__id__": 1455 + "__id__": 1483 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -27775,11 +28179,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1439 + "__id__": 1467 }, "_enabled": true, "__prefab": { - "__id__": 1457 + "__id__": 1485 }, "_alignFlags": 45, "_target": null, @@ -27824,11 +28228,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1424 + "__id__": 1452 }, "_enabled": true, "__prefab": { - "__id__": 1460 + "__id__": 1488 }, "_contentSize": { "__type__": "cc.Size", @@ -27852,15 +28256,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1424 + "__id__": 1452 }, "_enabled": true, "__prefab": { - "__id__": 1462 + "__id__": 1490 }, "clickEvents": [ { - "__id__": 1463 + "__id__": 1491 } ], "_interactable": true, @@ -27935,27 +28339,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1300 + "__id__": 1320 }, "_children": [ { - "__id__": 1466 + "__id__": 1494 }, { - "__id__": 1480 + "__id__": 1508 } ], "_active": false, "_components": [ { - "__id__": 1500 + "__id__": 1528 }, { - "__id__": 1502 + "__id__": 1530 } ], "_prefab": { - "__id__": 1505 + "__id__": 1533 }, "_lpos": { "__type__": "cc.Vec3", @@ -27992,27 +28396,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1465 + "__id__": 1493 }, "_children": [ { - "__id__": 1467 + "__id__": 1495 } ], "_active": true, "_components": [ { - "__id__": 1473 + "__id__": 1501 }, { - "__id__": 1475 + "__id__": 1503 }, { - "__id__": 1477 + "__id__": 1505 } ], "_prefab": { - "__id__": 1479 + "__id__": 1507 }, "_lpos": { "__type__": "cc.Vec3", @@ -28049,20 +28453,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1466 + "__id__": 1494 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1468 + "__id__": 1496 }, { - "__id__": 1470 + "__id__": 1498 } ], "_prefab": { - "__id__": 1472 + "__id__": 1500 }, "_lpos": { "__type__": "cc.Vec3", @@ -28099,11 +28503,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1467 + "__id__": 1495 }, "_enabled": true, "__prefab": { - "__id__": 1469 + "__id__": 1497 }, "_contentSize": { "__type__": "cc.Size", @@ -28127,11 +28531,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1467 + "__id__": 1495 }, "_enabled": true, "__prefab": { - "__id__": 1471 + "__id__": 1499 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -28185,11 +28589,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1466 + "__id__": 1494 }, "_enabled": true, "__prefab": { - "__id__": 1474 + "__id__": 1502 }, "_contentSize": { "__type__": "cc.Size", @@ -28213,11 +28617,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1466 + "__id__": 1494 }, "_enabled": true, "__prefab": { - "__id__": 1476 + "__id__": 1504 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -28258,11 +28662,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1466 + "__id__": 1494 }, "_enabled": true, "__prefab": { - "__id__": 1478 + "__id__": 1506 }, "_alignFlags": 45, "_target": null, @@ -28307,30 +28711,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1465 + "__id__": 1493 }, "_children": [ { - "__id__": 1481 + "__id__": 1509 }, { - "__id__": 1487 + "__id__": 1515 } ], "_active": true, "_components": [ { - "__id__": 1493 + "__id__": 1521 }, { - "__id__": 1495 + "__id__": 1523 }, { - "__id__": 1497 + "__id__": 1525 } ], "_prefab": { - "__id__": 1499 + "__id__": 1527 }, "_lpos": { "__type__": "cc.Vec3", @@ -28367,20 +28771,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1480 + "__id__": 1508 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1482 + "__id__": 1510 }, { - "__id__": 1484 + "__id__": 1512 } ], "_prefab": { - "__id__": 1486 + "__id__": 1514 }, "_lpos": { "__type__": "cc.Vec3", @@ -28417,11 +28821,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1481 + "__id__": 1509 }, "_enabled": true, "__prefab": { - "__id__": 1483 + "__id__": 1511 }, "_contentSize": { "__type__": "cc.Size", @@ -28445,11 +28849,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1481 + "__id__": 1509 }, "_enabled": true, "__prefab": { - "__id__": 1485 + "__id__": 1513 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -28503,20 +28907,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1480 + "__id__": 1508 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1488 + "__id__": 1516 }, { - "__id__": 1490 + "__id__": 1518 } ], "_prefab": { - "__id__": 1492 + "__id__": 1520 }, "_lpos": { "__type__": "cc.Vec3", @@ -28553,11 +28957,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1487 + "__id__": 1515 }, "_enabled": true, "__prefab": { - "__id__": 1489 + "__id__": 1517 }, "_contentSize": { "__type__": "cc.Size", @@ -28581,11 +28985,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1487 + "__id__": 1515 }, "_enabled": true, "__prefab": { - "__id__": 1491 + "__id__": 1519 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -28662,11 +29066,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1480 + "__id__": 1508 }, "_enabled": true, "__prefab": { - "__id__": 1494 + "__id__": 1522 }, "_contentSize": { "__type__": "cc.Size", @@ -28690,11 +29094,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1480 + "__id__": 1508 }, "_enabled": true, "__prefab": { - "__id__": 1496 + "__id__": 1524 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -28735,11 +29139,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1480 + "__id__": 1508 }, "_enabled": true, "__prefab": { - "__id__": 1498 + "__id__": 1526 }, "_alignFlags": 45, "_target": null, @@ -28784,11 +29188,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1465 + "__id__": 1493 }, "_enabled": true, "__prefab": { - "__id__": 1501 + "__id__": 1529 }, "_contentSize": { "__type__": "cc.Size", @@ -28812,15 +29216,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1465 + "__id__": 1493 }, "_enabled": true, "__prefab": { - "__id__": 1503 + "__id__": 1531 }, "clickEvents": [ { - "__id__": 1504 + "__id__": 1532 } ], "_interactable": true, @@ -28895,11 +29299,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1300 + "__id__": 1320 }, "_enabled": true, "__prefab": { - "__id__": 1507 + "__id__": 1535 }, "_contentSize": { "__type__": "cc.Size", @@ -28923,11 +29327,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1300 + "__id__": 1320 }, "_enabled": true, "__prefab": { - "__id__": 1509 + "__id__": 1537 }, "_resizeMode": 1, "_layoutType": 1, @@ -28961,11 +29365,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1300 + "__id__": 1320 }, "_enabled": true, "__prefab": { - "__id__": 1511 + "__id__": 1539 }, "_alignFlags": 44, "_target": null, @@ -29014,7 +29418,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1514 + "__id__": 1542 }, "_contentSize": { "__type__": "cc.Size", @@ -29042,7 +29446,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1516 + "__id__": 1544 }, "_alignFlags": 21, "_target": null, @@ -29078,7 +29482,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1518 + "__id__": 1546 }, "_id": "" }, @@ -29096,7 +29500,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1520 + "__id__": 1548 }, "_alignFlags": 45, "_target": null, @@ -29145,32 +29549,32 @@ }, "_children": [ { - "__id__": 1523 + "__id__": 1551 }, { - "__id__": 1531 + "__id__": 1559 }, { - "__id__": 1539 + "__id__": 1567 }, { - "__id__": 1547 + "__id__": 1575 } ], "_active": false, "_components": [ { - "__id__": 1555 + "__id__": 1583 }, { - "__id__": 1557 + "__id__": 1585 }, { - "__id__": 1559 + "__id__": 1587 } ], "_prefab": { - "__id__": 1561 + "__id__": 1589 }, "_lpos": { "__type__": "cc.Vec3", @@ -29207,23 +29611,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1522 + "__id__": 1550 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1524 + "__id__": 1552 }, { - "__id__": 1526 + "__id__": 1554 }, { - "__id__": 1528 + "__id__": 1556 } ], "_prefab": { - "__id__": 1530 + "__id__": 1558 }, "_lpos": { "__type__": "cc.Vec3", @@ -29260,11 +29664,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1523 + "__id__": 1551 }, "_enabled": true, "__prefab": { - "__id__": 1525 + "__id__": 1553 }, "_contentSize": { "__type__": "cc.Size", @@ -29288,11 +29692,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1523 + "__id__": 1551 }, "_enabled": true, "__prefab": { - "__id__": 1527 + "__id__": 1555 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -29333,11 +29737,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1523 + "__id__": 1551 }, "_enabled": true, "__prefab": { - "__id__": 1529 + "__id__": 1557 }, "_alignFlags": 45, "_target": null, @@ -29382,23 +29786,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1522 + "__id__": 1550 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1532 + "__id__": 1560 }, { - "__id__": 1534 + "__id__": 1562 }, { - "__id__": 1536 + "__id__": 1564 } ], "_prefab": { - "__id__": 1538 + "__id__": 1566 }, "_lpos": { "__type__": "cc.Vec3", @@ -29435,11 +29839,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1531 + "__id__": 1559 }, "_enabled": true, "__prefab": { - "__id__": 1533 + "__id__": 1561 }, "_contentSize": { "__type__": "cc.Size", @@ -29463,11 +29867,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1531 + "__id__": 1559 }, "_enabled": true, "__prefab": { - "__id__": 1535 + "__id__": 1563 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -29508,11 +29912,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1531 + "__id__": 1559 }, "_enabled": true, "__prefab": { - "__id__": 1537 + "__id__": 1565 }, "_alignFlags": 45, "_target": null, @@ -29557,23 +29961,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1522 + "__id__": 1550 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1540 + "__id__": 1568 }, { - "__id__": 1542 + "__id__": 1570 }, { - "__id__": 1544 + "__id__": 1572 } ], "_prefab": { - "__id__": 1546 + "__id__": 1574 }, "_lpos": { "__type__": "cc.Vec3", @@ -29610,11 +30014,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1539 + "__id__": 1567 }, "_enabled": true, "__prefab": { - "__id__": 1541 + "__id__": 1569 }, "_contentSize": { "__type__": "cc.Size", @@ -29638,11 +30042,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1539 + "__id__": 1567 }, "_enabled": true, "__prefab": { - "__id__": 1543 + "__id__": 1571 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -29683,11 +30087,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1539 + "__id__": 1567 }, "_enabled": true, "__prefab": { - "__id__": 1545 + "__id__": 1573 }, "playOnLoad": true, "_clips": [ @@ -29725,23 +30129,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1522 + "__id__": 1550 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1548 + "__id__": 1576 }, { - "__id__": 1550 + "__id__": 1578 }, { - "__id__": 1552 + "__id__": 1580 } ], "_prefab": { - "__id__": 1554 + "__id__": 1582 }, "_lpos": { "__type__": "cc.Vec3", @@ -29778,11 +30182,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1547 + "__id__": 1575 }, "_enabled": true, "__prefab": { - "__id__": 1549 + "__id__": 1577 }, "_contentSize": { "__type__": "cc.Size", @@ -29806,11 +30210,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1547 + "__id__": 1575 }, "_enabled": true, "__prefab": { - "__id__": 1551 + "__id__": 1579 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -29851,11 +30255,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1547 + "__id__": 1575 }, "_enabled": true, "__prefab": { - "__id__": 1553 + "__id__": 1581 }, "playOnLoad": true, "_clips": [ @@ -29893,11 +30297,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1522 + "__id__": 1550 }, "_enabled": true, "__prefab": { - "__id__": 1556 + "__id__": 1584 }, "_contentSize": { "__type__": "cc.Size", @@ -29921,11 +30325,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1522 + "__id__": 1550 }, "_enabled": true, "__prefab": { - "__id__": 1558 + "__id__": 1586 }, "_alignFlags": 45, "_target": null, @@ -29957,11 +30361,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1522 + "__id__": 1550 }, "_enabled": true, "__prefab": { - "__id__": 1560 + "__id__": 1588 }, "_id": "" }, @@ -29992,26 +30396,26 @@ }, "_children": [ { - "__id__": 1563 + "__id__": 1591 }, { - "__id__": 1763 + "__id__": 1791 } ], "_active": true, "_components": [ { - "__id__": 1767 + "__id__": 1795 }, { - "__id__": 1769 + "__id__": 1797 }, { - "__id__": 1771 + "__id__": 1799 } ], "_prefab": { - "__id__": 1773 + "__id__": 1801 }, "_lpos": { "__type__": "cc.Vec3", @@ -30048,39 +30452,39 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1562 + "__id__": 1590 }, "_children": [ { - "__id__": 1564 + "__id__": 1592 }, { - "__id__": 1612 + "__id__": 1640 }, { - "__id__": 1660 + "__id__": 1688 }, { - "__id__": 1708 + "__id__": 1736 } ], "_active": true, "_components": [ { - "__id__": 1754 + "__id__": 1782 }, { - "__id__": 1756 + "__id__": 1784 }, { - "__id__": 1758 + "__id__": 1786 }, { - "__id__": 1760 + "__id__": 1788 } ], "_prefab": { - "__id__": 1762 + "__id__": 1790 }, "_lpos": { "__type__": "cc.Vec3", @@ -30117,30 +30521,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1563 + "__id__": 1591 }, "_children": [ { - "__id__": 1565 + "__id__": 1593 }, { - "__id__": 1573 + "__id__": 1601 }, { - "__id__": 1579 + "__id__": 1607 }, { - "__id__": 1589 + "__id__": 1617 } ], "_active": true, "_components": [ { - "__id__": 1609 + "__id__": 1637 } ], "_prefab": { - "__id__": 1611 + "__id__": 1639 }, "_lpos": { "__type__": "cc.Vec3", @@ -30177,23 +30581,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1564 + "__id__": 1592 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1566 + "__id__": 1594 }, { - "__id__": 1568 + "__id__": 1596 }, { - "__id__": 1570 + "__id__": 1598 } ], "_prefab": { - "__id__": 1572 + "__id__": 1600 }, "_lpos": { "__type__": "cc.Vec3", @@ -30230,11 +30634,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1565 + "__id__": 1593 }, "_enabled": true, "__prefab": { - "__id__": 1567 + "__id__": 1595 }, "_contentSize": { "__type__": "cc.Size", @@ -30258,11 +30662,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1565 + "__id__": 1593 }, "_enabled": true, "__prefab": { - "__id__": 1569 + "__id__": 1597 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -30275,7 +30679,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717@549c9", + "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717@8fe5f", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -30290,7 +30694,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -30303,11 +30710,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1565 + "__id__": 1593 }, "_enabled": true, "__prefab": { - "__id__": 1571 + "__id__": 1599 }, "_alignFlags": 40, "_target": null, @@ -30352,20 +30759,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1564 + "__id__": 1592 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1574 + "__id__": 1602 }, { - "__id__": 1576 + "__id__": 1604 } ], "_prefab": { - "__id__": 1578 + "__id__": 1606 }, "_lpos": { "__type__": "cc.Vec3", @@ -30402,11 +30809,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1573 + "__id__": 1601 }, "_enabled": true, "__prefab": { - "__id__": 1575 + "__id__": 1603 }, "_contentSize": { "__type__": "cc.Size", @@ -30430,11 +30837,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1573 + "__id__": 1601 }, "_enabled": true, "__prefab": { - "__id__": 1577 + "__id__": 1605 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -30491,26 +30898,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1564 + "__id__": 1592 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1580 + "__id__": 1608 }, { - "__id__": 1582 + "__id__": 1610 }, { - "__id__": 1584 + "__id__": 1612 }, { - "__id__": 1586 + "__id__": 1614 } ], "_prefab": { - "__id__": 1588 + "__id__": 1616 }, "_lpos": { "__type__": "cc.Vec3", @@ -30547,11 +30954,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1579 + "__id__": 1607 }, "_enabled": true, "__prefab": { - "__id__": 1581 + "__id__": 1609 }, "_contentSize": { "__type__": "cc.Size", @@ -30575,11 +30982,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1579 + "__id__": 1607 }, "_enabled": true, "__prefab": { - "__id__": 1583 + "__id__": 1611 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -30643,11 +31050,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1579 + "__id__": 1607 }, "_enabled": true, "__prefab": { - "__id__": 1585 + "__id__": 1613 }, "_alignFlags": 10, "_target": null, @@ -30679,11 +31086,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1579 + "__id__": 1607 }, "_enabled": false, "__prefab": { - "__id__": 1587 + "__id__": 1615 }, "templateMode": true, "watchPath": "data.data.gold", @@ -30716,30 +31123,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1564 + "__id__": 1592 }, "_children": [ { - "__id__": 1590 + "__id__": 1618 }, { - "__id__": 1596 + "__id__": 1624 } ], "_active": true, "_components": [ { - "__id__": 1602 + "__id__": 1630 }, { - "__id__": 1604 + "__id__": 1632 }, { - "__id__": 1606 + "__id__": 1634 } ], "_prefab": { - "__id__": 1608 + "__id__": 1636 }, "_lpos": { "__type__": "cc.Vec3", @@ -30776,20 +31183,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1589 + "__id__": 1617 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1591 + "__id__": 1619 }, { - "__id__": 1593 + "__id__": 1621 } ], "_prefab": { - "__id__": 1595 + "__id__": 1623 }, "_lpos": { "__type__": "cc.Vec3", @@ -30826,11 +31233,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1590 + "__id__": 1618 }, "_enabled": true, "__prefab": { - "__id__": 1592 + "__id__": 1620 }, "_contentSize": { "__type__": "cc.Size", @@ -30854,11 +31261,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1590 + "__id__": 1618 }, "_enabled": true, "__prefab": { - "__id__": 1594 + "__id__": 1622 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -30912,20 +31319,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1589 + "__id__": 1617 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1597 + "__id__": 1625 }, { - "__id__": 1599 + "__id__": 1627 } ], "_prefab": { - "__id__": 1601 + "__id__": 1629 }, "_lpos": { "__type__": "cc.Vec3", @@ -30962,11 +31369,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1596 + "__id__": 1624 }, "_enabled": true, "__prefab": { - "__id__": 1598 + "__id__": 1626 }, "_contentSize": { "__type__": "cc.Size", @@ -30990,11 +31397,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1596 + "__id__": 1624 }, "_enabled": true, "__prefab": { - "__id__": 1600 + "__id__": 1628 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -31048,11 +31455,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1589 + "__id__": 1617 }, "_enabled": true, "__prefab": { - "__id__": 1603 + "__id__": 1631 }, "_contentSize": { "__type__": "cc.Size", @@ -31076,11 +31483,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1589 + "__id__": 1617 }, "_enabled": true, "__prefab": { - "__id__": 1605 + "__id__": 1633 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -31121,11 +31528,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1589 + "__id__": 1617 }, "_enabled": true, "__prefab": { - "__id__": 1607 + "__id__": 1635 }, "_alignFlags": 32, "_target": null, @@ -31170,11 +31577,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1564 + "__id__": 1592 }, "_enabled": true, "__prefab": { - "__id__": 1610 + "__id__": 1638 }, "_contentSize": { "__type__": "cc.Size", @@ -31211,30 +31618,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1563 + "__id__": 1591 }, "_children": [ { - "__id__": 1613 + "__id__": 1641 }, { - "__id__": 1621 + "__id__": 1649 }, { - "__id__": 1627 + "__id__": 1655 }, { - "__id__": 1637 + "__id__": 1665 } ], "_active": true, "_components": [ { - "__id__": 1657 + "__id__": 1685 } ], "_prefab": { - "__id__": 1659 + "__id__": 1687 }, "_lpos": { "__type__": "cc.Vec3", @@ -31271,23 +31678,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1612 + "__id__": 1640 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1614 + "__id__": 1642 }, { - "__id__": 1616 + "__id__": 1644 }, { - "__id__": 1618 + "__id__": 1646 } ], "_prefab": { - "__id__": 1620 + "__id__": 1648 }, "_lpos": { "__type__": "cc.Vec3", @@ -31324,11 +31731,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1613 + "__id__": 1641 }, "_enabled": true, "__prefab": { - "__id__": 1615 + "__id__": 1643 }, "_contentSize": { "__type__": "cc.Size", @@ -31352,11 +31759,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1613 + "__id__": 1641 }, "_enabled": true, "__prefab": { - "__id__": 1617 + "__id__": 1645 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -31369,7 +31776,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717@549c9", + "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717@8fe5f", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -31384,7 +31791,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -31397,11 +31807,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1613 + "__id__": 1641 }, "_enabled": true, "__prefab": { - "__id__": 1619 + "__id__": 1647 }, "_alignFlags": 40, "_target": null, @@ -31446,20 +31856,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1612 + "__id__": 1640 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1622 + "__id__": 1650 }, { - "__id__": 1624 + "__id__": 1652 } ], "_prefab": { - "__id__": 1626 + "__id__": 1654 }, "_lpos": { "__type__": "cc.Vec3", @@ -31496,11 +31906,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1621 + "__id__": 1649 }, "_enabled": true, "__prefab": { - "__id__": 1623 + "__id__": 1651 }, "_contentSize": { "__type__": "cc.Size", @@ -31524,11 +31934,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1621 + "__id__": 1649 }, "_enabled": true, "__prefab": { - "__id__": 1625 + "__id__": 1653 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -31585,26 +31995,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1612 + "__id__": 1640 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1628 + "__id__": 1656 }, { - "__id__": 1630 + "__id__": 1658 }, { - "__id__": 1632 + "__id__": 1660 }, { - "__id__": 1634 + "__id__": 1662 } ], "_prefab": { - "__id__": 1636 + "__id__": 1664 }, "_lpos": { "__type__": "cc.Vec3", @@ -31641,11 +32051,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1627 + "__id__": 1655 }, "_enabled": true, "__prefab": { - "__id__": 1629 + "__id__": 1657 }, "_contentSize": { "__type__": "cc.Size", @@ -31669,11 +32079,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1627 + "__id__": 1655 }, "_enabled": true, "__prefab": { - "__id__": 1631 + "__id__": 1659 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -31737,11 +32147,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1627 + "__id__": 1655 }, "_enabled": true, "__prefab": { - "__id__": 1633 + "__id__": 1661 }, "_alignFlags": 10, "_target": null, @@ -31773,11 +32183,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1627 + "__id__": 1655 }, "_enabled": false, "__prefab": { - "__id__": 1635 + "__id__": 1663 }, "templateMode": true, "watchPath": "data.data.diamond", @@ -31810,30 +32220,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1612 + "__id__": 1640 }, "_children": [ { - "__id__": 1638 + "__id__": 1666 }, { - "__id__": 1644 + "__id__": 1672 } ], "_active": true, "_components": [ { - "__id__": 1650 + "__id__": 1678 }, { - "__id__": 1652 + "__id__": 1680 }, { - "__id__": 1654 + "__id__": 1682 } ], "_prefab": { - "__id__": 1656 + "__id__": 1684 }, "_lpos": { "__type__": "cc.Vec3", @@ -31870,20 +32280,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1637 + "__id__": 1665 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1639 + "__id__": 1667 }, { - "__id__": 1641 + "__id__": 1669 } ], "_prefab": { - "__id__": 1643 + "__id__": 1671 }, "_lpos": { "__type__": "cc.Vec3", @@ -31920,11 +32330,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1638 + "__id__": 1666 }, "_enabled": true, "__prefab": { - "__id__": 1640 + "__id__": 1668 }, "_contentSize": { "__type__": "cc.Size", @@ -31948,11 +32358,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1638 + "__id__": 1666 }, "_enabled": true, "__prefab": { - "__id__": 1642 + "__id__": 1670 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -32006,20 +32416,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1637 + "__id__": 1665 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1645 + "__id__": 1673 }, { - "__id__": 1647 + "__id__": 1675 } ], "_prefab": { - "__id__": 1649 + "__id__": 1677 }, "_lpos": { "__type__": "cc.Vec3", @@ -32056,11 +32466,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1644 + "__id__": 1672 }, "_enabled": true, "__prefab": { - "__id__": 1646 + "__id__": 1674 }, "_contentSize": { "__type__": "cc.Size", @@ -32084,11 +32494,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1644 + "__id__": 1672 }, "_enabled": true, "__prefab": { - "__id__": 1648 + "__id__": 1676 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -32142,11 +32552,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1637 + "__id__": 1665 }, "_enabled": true, "__prefab": { - "__id__": 1651 + "__id__": 1679 }, "_contentSize": { "__type__": "cc.Size", @@ -32170,11 +32580,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1637 + "__id__": 1665 }, "_enabled": true, "__prefab": { - "__id__": 1653 + "__id__": 1681 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -32215,11 +32625,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1637 + "__id__": 1665 }, "_enabled": true, "__prefab": { - "__id__": 1655 + "__id__": 1683 }, "_alignFlags": 32, "_target": null, @@ -32264,11 +32674,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1612 + "__id__": 1640 }, "_enabled": true, "__prefab": { - "__id__": 1658 + "__id__": 1686 }, "_contentSize": { "__type__": "cc.Size", @@ -32305,30 +32715,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1563 + "__id__": 1591 }, "_children": [ { - "__id__": 1661 + "__id__": 1689 }, { - "__id__": 1669 + "__id__": 1697 }, { - "__id__": 1675 + "__id__": 1703 }, { - "__id__": 1685 + "__id__": 1713 } ], "_active": false, "_components": [ { - "__id__": 1705 + "__id__": 1733 } ], "_prefab": { - "__id__": 1707 + "__id__": 1735 }, "_lpos": { "__type__": "cc.Vec3", @@ -32365,23 +32775,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1660 + "__id__": 1688 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1662 + "__id__": 1690 }, { - "__id__": 1664 + "__id__": 1692 }, { - "__id__": 1666 + "__id__": 1694 } ], "_prefab": { - "__id__": 1668 + "__id__": 1696 }, "_lpos": { "__type__": "cc.Vec3", @@ -32418,11 +32828,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1661 + "__id__": 1689 }, "_enabled": true, "__prefab": { - "__id__": 1663 + "__id__": 1691 }, "_contentSize": { "__type__": "cc.Size", @@ -32446,11 +32856,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1661 + "__id__": 1689 }, "_enabled": true, "__prefab": { - "__id__": 1665 + "__id__": 1693 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -32491,11 +32901,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1661 + "__id__": 1689 }, "_enabled": true, "__prefab": { - "__id__": 1667 + "__id__": 1695 }, "_alignFlags": 40, "_target": null, @@ -32540,20 +32950,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1660 + "__id__": 1688 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1670 + "__id__": 1698 }, { - "__id__": 1672 + "__id__": 1700 } ], "_prefab": { - "__id__": 1674 + "__id__": 1702 }, "_lpos": { "__type__": "cc.Vec3", @@ -32590,11 +33000,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1669 + "__id__": 1697 }, "_enabled": true, "__prefab": { - "__id__": 1671 + "__id__": 1699 }, "_contentSize": { "__type__": "cc.Size", @@ -32618,11 +33028,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1669 + "__id__": 1697 }, "_enabled": true, "__prefab": { - "__id__": 1673 + "__id__": 1701 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -32679,26 +33089,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1660 + "__id__": 1688 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1676 + "__id__": 1704 }, { - "__id__": 1678 + "__id__": 1706 }, { - "__id__": 1680 + "__id__": 1708 }, { - "__id__": 1682 + "__id__": 1710 } ], "_prefab": { - "__id__": 1684 + "__id__": 1712 }, "_lpos": { "__type__": "cc.Vec3", @@ -32735,11 +33145,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1675 + "__id__": 1703 }, "_enabled": true, "__prefab": { - "__id__": 1677 + "__id__": 1705 }, "_contentSize": { "__type__": "cc.Size", @@ -32763,11 +33173,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1675 + "__id__": 1703 }, "_enabled": true, "__prefab": { - "__id__": 1679 + "__id__": 1707 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -32831,11 +33241,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1675 + "__id__": 1703 }, "_enabled": true, "__prefab": { - "__id__": 1681 + "__id__": 1709 }, "_alignFlags": 10, "_target": null, @@ -32867,11 +33277,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1675 + "__id__": 1703 }, "_enabled": false, "__prefab": { - "__id__": 1683 + "__id__": 1711 }, "templateMode": true, "watchPath": "data.data.meat", @@ -32904,30 +33314,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1660 + "__id__": 1688 }, "_children": [ { - "__id__": 1686 + "__id__": 1714 }, { - "__id__": 1692 + "__id__": 1720 } ], "_active": true, "_components": [ { - "__id__": 1698 + "__id__": 1726 }, { - "__id__": 1700 + "__id__": 1728 }, { - "__id__": 1702 + "__id__": 1730 } ], "_prefab": { - "__id__": 1704 + "__id__": 1732 }, "_lpos": { "__type__": "cc.Vec3", @@ -32964,20 +33374,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1685 + "__id__": 1713 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1687 + "__id__": 1715 }, { - "__id__": 1689 + "__id__": 1717 } ], "_prefab": { - "__id__": 1691 + "__id__": 1719 }, "_lpos": { "__type__": "cc.Vec3", @@ -33014,11 +33424,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1686 + "__id__": 1714 }, "_enabled": true, "__prefab": { - "__id__": 1688 + "__id__": 1716 }, "_contentSize": { "__type__": "cc.Size", @@ -33042,11 +33452,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1686 + "__id__": 1714 }, "_enabled": true, "__prefab": { - "__id__": 1690 + "__id__": 1718 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -33100,20 +33510,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1685 + "__id__": 1713 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1693 + "__id__": 1721 }, { - "__id__": 1695 + "__id__": 1723 } ], "_prefab": { - "__id__": 1697 + "__id__": 1725 }, "_lpos": { "__type__": "cc.Vec3", @@ -33150,11 +33560,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1692 + "__id__": 1720 }, "_enabled": true, "__prefab": { - "__id__": 1694 + "__id__": 1722 }, "_contentSize": { "__type__": "cc.Size", @@ -33178,11 +33588,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1692 + "__id__": 1720 }, "_enabled": true, "__prefab": { - "__id__": 1696 + "__id__": 1724 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -33236,11 +33646,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1685 + "__id__": 1713 }, "_enabled": true, "__prefab": { - "__id__": 1699 + "__id__": 1727 }, "_contentSize": { "__type__": "cc.Size", @@ -33264,11 +33674,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1685 + "__id__": 1713 }, "_enabled": true, "__prefab": { - "__id__": 1701 + "__id__": 1729 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -33309,11 +33719,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1685 + "__id__": 1713 }, "_enabled": true, "__prefab": { - "__id__": 1703 + "__id__": 1731 }, "_alignFlags": 32, "_target": null, @@ -33358,11 +33768,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1660 + "__id__": 1688 }, "_enabled": true, "__prefab": { - "__id__": 1706 + "__id__": 1734 }, "_contentSize": { "__type__": "cc.Size", @@ -33399,30 +33809,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1563 + "__id__": 1591 }, "_children": [ { - "__id__": 1709 + "__id__": 1737 }, { - "__id__": 1717 + "__id__": 1745 }, { - "__id__": 1723 + "__id__": 1751 }, { - "__id__": 1731 + "__id__": 1759 } ], "_active": true, "_components": [ { - "__id__": 1751 + "__id__": 1779 } ], "_prefab": { - "__id__": 1753 + "__id__": 1781 }, "_lpos": { "__type__": "cc.Vec3", @@ -33459,23 +33869,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1708 + "__id__": 1736 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1710 + "__id__": 1738 }, { - "__id__": 1712 + "__id__": 1740 }, { - "__id__": 1714 + "__id__": 1742 } ], "_prefab": { - "__id__": 1716 + "__id__": 1744 }, "_lpos": { "__type__": "cc.Vec3", @@ -33512,11 +33922,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1709 + "__id__": 1737 }, "_enabled": true, "__prefab": { - "__id__": 1711 + "__id__": 1739 }, "_contentSize": { "__type__": "cc.Size", @@ -33540,11 +33950,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1709 + "__id__": 1737 }, "_enabled": true, "__prefab": { - "__id__": 1713 + "__id__": 1741 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -33557,7 +33967,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717@549c9", + "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717@8fe5f", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -33572,7 +33982,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -33585,11 +33998,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1709 + "__id__": 1737 }, "_enabled": true, "__prefab": { - "__id__": 1715 + "__id__": 1743 }, "_alignFlags": 40, "_target": null, @@ -33634,20 +34047,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1708 + "__id__": 1736 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1718 + "__id__": 1746 }, { - "__id__": 1720 + "__id__": 1748 } ], "_prefab": { - "__id__": 1722 + "__id__": 1750 }, "_lpos": { "__type__": "cc.Vec3", @@ -33684,11 +34097,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1717 + "__id__": 1745 }, "_enabled": true, "__prefab": { - "__id__": 1719 + "__id__": 1747 }, "_contentSize": { "__type__": "cc.Size", @@ -33712,11 +34125,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1717 + "__id__": 1745 }, "_enabled": true, "__prefab": { - "__id__": 1721 + "__id__": 1749 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -33773,23 +34186,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1708 + "__id__": 1736 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1724 + "__id__": 1752 }, { - "__id__": 1726 + "__id__": 1754 }, { - "__id__": 1728 + "__id__": 1756 } ], "_prefab": { - "__id__": 1730 + "__id__": 1758 }, "_lpos": { "__type__": "cc.Vec3", @@ -33826,11 +34239,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1723 + "__id__": 1751 }, "_enabled": true, "__prefab": { - "__id__": 1725 + "__id__": 1753 }, "_contentSize": { "__type__": "cc.Size", @@ -33854,11 +34267,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1723 + "__id__": 1751 }, "_enabled": true, "__prefab": { - "__id__": 1727 + "__id__": 1755 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -33922,11 +34335,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1723 + "__id__": 1751 }, "_enabled": true, "__prefab": { - "__id__": 1729 + "__id__": 1757 }, "_alignFlags": 10, "_target": null, @@ -33971,30 +34384,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1708 + "__id__": 1736 }, "_children": [ { - "__id__": 1732 + "__id__": 1760 }, { - "__id__": 1738 + "__id__": 1766 } ], "_active": true, "_components": [ { - "__id__": 1744 + "__id__": 1772 }, { - "__id__": 1746 + "__id__": 1774 }, { - "__id__": 1748 + "__id__": 1776 } ], "_prefab": { - "__id__": 1750 + "__id__": 1778 }, "_lpos": { "__type__": "cc.Vec3", @@ -34031,20 +34444,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1731 + "__id__": 1759 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1733 + "__id__": 1761 }, { - "__id__": 1735 + "__id__": 1763 } ], "_prefab": { - "__id__": 1737 + "__id__": 1765 }, "_lpos": { "__type__": "cc.Vec3", @@ -34081,11 +34494,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1732 + "__id__": 1760 }, "_enabled": true, "__prefab": { - "__id__": 1734 + "__id__": 1762 }, "_contentSize": { "__type__": "cc.Size", @@ -34109,11 +34522,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1732 + "__id__": 1760 }, "_enabled": true, "__prefab": { - "__id__": 1736 + "__id__": 1764 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -34167,20 +34580,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1731 + "__id__": 1759 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1739 + "__id__": 1767 }, { - "__id__": 1741 + "__id__": 1769 } ], "_prefab": { - "__id__": 1743 + "__id__": 1771 }, "_lpos": { "__type__": "cc.Vec3", @@ -34217,11 +34630,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1738 + "__id__": 1766 }, "_enabled": true, "__prefab": { - "__id__": 1740 + "__id__": 1768 }, "_contentSize": { "__type__": "cc.Size", @@ -34245,11 +34658,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1738 + "__id__": 1766 }, "_enabled": true, "__prefab": { - "__id__": 1742 + "__id__": 1770 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -34303,11 +34716,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1731 + "__id__": 1759 }, "_enabled": true, "__prefab": { - "__id__": 1745 + "__id__": 1773 }, "_contentSize": { "__type__": "cc.Size", @@ -34331,11 +34744,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1731 + "__id__": 1759 }, "_enabled": true, "__prefab": { - "__id__": 1747 + "__id__": 1775 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -34376,11 +34789,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1731 + "__id__": 1759 }, "_enabled": true, "__prefab": { - "__id__": 1749 + "__id__": 1777 }, "_alignFlags": 32, "_target": null, @@ -34425,11 +34838,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1708 + "__id__": 1736 }, "_enabled": true, "__prefab": { - "__id__": 1752 + "__id__": 1780 }, "_contentSize": { "__type__": "cc.Size", @@ -34466,11 +34879,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1563 + "__id__": 1591 }, "_enabled": true, "__prefab": { - "__id__": 1755 + "__id__": 1783 }, "_contentSize": { "__type__": "cc.Size", @@ -34494,11 +34907,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1563 + "__id__": 1591 }, "_enabled": true, "__prefab": { - "__id__": 1757 + "__id__": 1785 }, "_alignFlags": 8, "_target": null, @@ -34530,11 +34943,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1563 + "__id__": 1591 }, "_enabled": true, "__prefab": { - "__id__": 1759 + "__id__": 1787 }, "_resizeMode": 0, "_layoutType": 1, @@ -34568,11 +34981,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1563 + "__id__": 1591 }, "_enabled": true, "__prefab": { - "__id__": 1761 + "__id__": 1789 }, "_alignFlags": 40, "_target": null, @@ -34617,17 +35030,17 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1562 + "__id__": 1590 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1764 + "__id__": 1792 } ], "_prefab": { - "__id__": 1766 + "__id__": 1794 }, "_lpos": { "__type__": "cc.Vec3", @@ -34664,11 +35077,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1763 + "__id__": 1791 }, "_enabled": true, "__prefab": { - "__id__": 1765 + "__id__": 1793 }, "_contentSize": { "__type__": "cc.Size", @@ -34705,11 +35118,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1562 + "__id__": 1590 }, "_enabled": true, "__prefab": { - "__id__": 1768 + "__id__": 1796 }, "_contentSize": { "__type__": "cc.Size", @@ -34733,11 +35146,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1562 + "__id__": 1590 }, "_enabled": true, "__prefab": { - "__id__": 1770 + "__id__": 1798 }, "_alignFlags": 17, "_target": null, @@ -34769,11 +35182,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1562 + "__id__": 1590 }, "_enabled": true, "__prefab": { - "__id__": 1772 + "__id__": 1800 }, "_id": "" }, @@ -34804,7 +35217,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1775 + "__id__": 1803 }, "_contentSize": { "__type__": "cc.Size", @@ -34832,7 +35245,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1777 + "__id__": 1805 }, "_alignFlags": 45, "_target": null, @@ -34868,7 +35281,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1779 + "__id__": 1807 }, "_id": "" }, @@ -34888,48 +35301,57 @@ "instance": null, "targetOverrides": [ { - "__id__": 1781 + "__id__": 1809 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 1143 + "__id__": 1438 }, { - "__id__": 1070 + "__id__": 1163 }, { - "__id__": 1024 + "__id__": 1090 }, { - "__id__": 978 + "__id__": 1044 }, { - "__id__": 932 + "__id__": 998 }, { - "__id__": 886 + "__id__": 952 }, { - "__id__": 840 + "__id__": 906 }, { - "__id__": 794 + "__id__": 860 }, { - "__id__": 748 + "__id__": 814 }, { - "__id__": 678 + "__id__": 768 }, { - "__id__": 648 + "__id__": 698 }, { - "__id__": 618 + "__id__": 668 }, { - "__id__": 588 + "__id__": 638 + }, + { + "__id__": 608 + }, + { + "__id__": 550 + }, + { + "__id__": 300 }, { "__id__": 71 @@ -34939,17 +35361,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 1143 + "__id__": 1163 }, "sourceInfo": { - "__id__": 1782 + "__id__": 1810 }, "propertyPath": [], "target": { - "__id__": 1143 + "__id__": 1163 }, "targetInfo": { - "__id__": 1783 + "__id__": 1811 } }, { diff --git a/assets/resources/gui/ui1.plist.meta b/assets/resources/gui/ui1.plist.meta index f18ff7f3..a05fb639 100644 --- a/assets/resources/gui/ui1.plist.meta +++ b/assets/resources/gui/ui1.plist.meta @@ -13089,10 +13089,10 @@ "height": 56, "rawWidth": 64, "rawHeight": 56, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 28, + "borderBottom": 28, + "borderLeft": 32, + "borderRight": 32, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts index 9922d219..95e9e5a8 100644 --- a/assets/script/game/common/SingletonModuleComp.ts +++ b/assets/script/game/common/SingletonModuleComp.ts @@ -38,6 +38,7 @@ export class SingletonModuleComp extends ecs.Comp { diamond:100, //商店购买 及 双倍奖励资源 meat:0, exp:0, + task:0, } shop:any={ daily:[1001,1004,1002,1005], diff --git a/assets/script/game/map/HCardUICom.ts b/assets/script/game/map/HCardUICom.ts index 90c1409a..cf630b37 100644 --- a/assets/script/game/map/HCardUICom.ts +++ b/assets/script/game/map/HCardUICom.ts @@ -6,33 +6,35 @@ import { UIID } from '../common/config/GameUIConfig'; import { GameSet, HeroConSet, QualitySet } from '../common/config/BoxSet'; import { HttpReturn } from 'db://oops-framework/libs/network/HttpRequest'; import { GameEvent } from '../common/config/GameEvent'; +import { ecs } from 'db://oops-framework/libs/ecs/ECS'; +import { CCComp } from 'db://oops-framework/module/common/CCComp'; const { ccclass, property } = _decorator; @ccclass('HCardUICom') -export class HCardUICom extends Component { +@ecs.register('HCardUICom', false) +export class HCardUICom extends CCComp { h_uuid:number=0 type:number=0 slot:number=0 - start() { // console.log("[HCardUICom]:start") } protected onLoad(): void { - oops.message.on(GameEvent.UpdateHero,this.to_update_hero,this) + this.on(GameEvent.UpdateHero,this.to_update_hero,this) } update(deltaTime: number) { } to_update_hero(event:any,args:any){ if(args.uuid==this.h_uuid){ - // console.log("[HCardUICom]:是我诶:",HeroInfo[args.uuid].name+args.uuid) - this.update_data(args.uuid,{type:this.type}) + console.log("[HCardUICom]:是我诶:",HeroInfo[args.uuid].name+args.uuid,this.h_uuid) + this.update_data(this.h_uuid,{type:this.type}) } } update_data(uuid:number,args:any){ this.type=args.type if(args.slot) this.slot=args.slot - // console.log("[HCardUICom]:update_data",uuid,this.type,this.slot,args) + console.log("[HCardUICom]:update_data",uuid,this.type,this.slot,args,this.node) this.h_uuid=uuid this.node.getChildByName("in_fight").active=this.check_in_fight() let hero_data = HeroInfo[uuid] @@ -95,6 +97,9 @@ export class HCardUICom extends Component { } return false } + reset() { + this.node.destroy() + } } diff --git a/assets/script/game/map/HInfoComp.ts b/assets/script/game/map/HInfoComp.ts index f5bd229a..dc659749 100644 --- a/assets/script/game/map/HInfoComp.ts +++ b/assets/script/game/map/HInfoComp.ts @@ -26,7 +26,7 @@ export class HInfoComp extends Component { this.h_uuid=uuid let hero_data = HeroInfo[uuid] - // console.log("[HInfoComp]:update_data",uuid,hero_data,this.node) + console.log("[HInfoComp]:update_data",uuid,hero_data,this.node) let lv=smc.heros[uuid]?.lv??1 let anm_path=hero_data.path resources.load("game/heros/hero/"+anm_path+"/idle", AnimationClip, (err, clip) => { @@ -133,6 +133,9 @@ export class HInfoComp extends Component { close(){ oops.gui.removeByNode(this.node) } + reset() { + this.node.destroy() + } } diff --git a/assets/script/game/map/HeroReadyCom.ts b/assets/script/game/map/HeroReadyCom.ts index 3dff90df..a9460003 100644 --- a/assets/script/game/map/HeroReadyCom.ts +++ b/assets/script/game/map/HeroReadyCom.ts @@ -53,6 +53,9 @@ export class HeroReadyCom extends Component { if(oops.gui.has(UIID.HeroSelect)) return oops.gui.open(UIID.HeroSelect,{slot:this.slot}) } + reset() { + this.node.destroy() + } } diff --git a/assets/script/game/map/HeroSelectCom.ts b/assets/script/game/map/HeroSelectCom.ts index f377b496..3f0845f1 100644 --- a/assets/script/game/map/HeroSelectCom.ts +++ b/assets/script/game/map/HeroSelectCom.ts @@ -63,6 +63,9 @@ export class HeroSelectCom extends Component { close(){ oops.gui.removeByNode(this.node) } + reset() { + this.node.destroy() + } } diff --git a/assets/script/game/wx_clound_client_api/USAGE.md b/assets/script/game/wx_clound_client_api/USAGE.md index ffbe9ee5..621c547f 100644 --- a/assets/script/game/wx_clound_client_api/USAGE.md +++ b/assets/script/game/wx_clound_client_api/USAGE.md @@ -447,3 +447,4 @@ export class GameDataManager { + diff --git a/build-templates/wechatgame/cloud_functions/cocos_cloud/API.md b/build-templates/wechatgame/cloud_functions/cocos_cloud/API.md index 8335712f..cf192a72 100644 --- a/build-templates/wechatgame/cloud_functions/cocos_cloud/API.md +++ b/build-templates/wechatgame/cloud_functions/cocos_cloud/API.md @@ -917,3 +917,4 @@ wx.cloud.callFunction({ + diff --git a/build-templates/wechatgame/cloud_functions/cocos_cloud/modules/response.js b/build-templates/wechatgame/cloud_functions/cocos_cloud/modules/response.js index 0105d184..5ea3a23d 100644 --- a/build-templates/wechatgame/cloud_functions/cocos_cloud/modules/response.js +++ b/build-templates/wechatgame/cloud_functions/cocos_cloud/modules/response.js @@ -271,3 +271,4 @@ module.exports = { +