From 67c2a532112ef0c0f341410e6d3a1f98731ab7c0 Mon Sep 17 00:00:00 2001 From: panFD Date: Sun, 2 Aug 2026 10:17:10 +0800 Subject: [PATCH] =?UTF-8?q?fix(map):=20=E7=BB=9F=E4=B8=80=E8=8B=B1?= =?UTF-8?q?=E9=9B=84=E7=9B=B8=E5=85=B3=E6=8F=90=E7=A4=BA=E7=9A=84=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E9=80=BB=E8=BE=91=E4=B8=8E=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 调整出售英雄时的提示方式,复用smalltip气泡弹窗而非独立toast 2. 优化MissionCardComp的smalltip提示方法,支持自定义文案和多负载格式 3. 补充英雄满员提示的自定义文案,与出售限制提示保持统一提示样式 --- assets/resources/gui/element/mission.prefab | 2631 ++++++++++--------- assets/script/game/map/HeroBoxComp.ts | 4 +- assets/script/game/map/MissionCardComp.ts | 19 +- 3 files changed, 1455 insertions(+), 1199 deletions(-) diff --git a/assets/resources/gui/element/mission.prefab b/assets/resources/gui/element/mission.prefab index 5418294c..9dc59b70 100644 --- a/assets/resources/gui/element/mission.prefab +++ b/assets/resources/gui/element/mission.prefab @@ -28,59 +28,59 @@ "__id__": 153 }, { - "__id__": 305 + "__id__": 307 }, { - "__id__": 487 + "__id__": 510 }, { - "__id__": 553 + "__id__": 576 }, { - "__id__": 621 + "__id__": 644 }, { - "__id__": 687 + "__id__": 710 }, { - "__id__": 816 + "__id__": 839 }, { - "__id__": 856 + "__id__": 879 }, { - "__id__": 886 + "__id__": 909 } ], "_active": true, "_components": [ { - "__id__": 930 + "__id__": 953 }, { - "__id__": 932 + "__id__": 955 }, { - "__id__": 934 + "__id__": 957 }, { - "__id__": 936 + "__id__": 959 }, { - "__id__": 938 + "__id__": 961 }, { - "__id__": 940 + "__id__": 963 }, { - "__id__": 942 + "__id__": 965 }, { - "__id__": 944 + "__id__": 967 } ], "_prefab": { - "__id__": 946 + "__id__": 969 }, "_lpos": { "__type__": "cc.Vec3", @@ -2469,9 +2469,6 @@ ], "_active": true, "_components": [ - { - "__id__": 296 - }, { "__id__": 298 }, @@ -2480,10 +2477,13 @@ }, { "__id__": 302 + }, + { + "__id__": 304 } ], "_prefab": { - "__id__": 304 + "__id__": 306 }, "_lpos": { "__type__": "cc.Vec3", @@ -2731,17 +2731,14 @@ "__id__": 171 }, { - "__id__": 207 + "__id__": 208 }, { - "__id__": 243 + "__id__": 244 } ], "_active": true, "_components": [ - { - "__id__": 287 - }, { "__id__": 289 }, @@ -2750,10 +2747,13 @@ }, { "__id__": 293 + }, + { + "__id__": 295 } ], "_prefab": { - "__id__": 295 + "__id__": 297 }, "_lpos": { "__type__": "cc.Vec3", @@ -2797,26 +2797,26 @@ "__id__": 172 }, { - "__id__": 186 + "__id__": 187 }, { - "__id__": 192 + "__id__": 193 } ], "_active": true, "_components": [ { - "__id__": 200 + "__id__": 201 }, { - "__id__": 202 + "__id__": 203 }, { - "__id__": 204 + "__id__": 205 } ], "_prefab": { - "__id__": 206 + "__id__": 207 }, "_lpos": { "__type__": "cc.Vec3", @@ -2902,6 +2902,9 @@ }, { "__id__": 184 + }, + { + "__id__": 186 } ], "removedComponents": [] @@ -3024,6 +3027,16 @@ "11pqUo9t9IWYWj/LjK3fNo" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 176 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, { "__type__": "cc.Node", "_name": "icon", @@ -3036,14 +3049,14 @@ "_active": true, "_components": [ { - "__id__": 187 + "__id__": 188 }, { - "__id__": 189 + "__id__": 190 } ], "_prefab": { - "__id__": 191 + "__id__": 192 }, "_lpos": { "__type__": "cc.Vec3", @@ -3080,11 +3093,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 186 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 188 + "__id__": 189 }, "_contentSize": { "__type__": "cc.Size", @@ -3108,11 +3121,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 186 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 190 + "__id__": 191 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3175,17 +3188,17 @@ "_active": true, "_components": [ { - "__id__": 193 + "__id__": 194 }, { - "__id__": 195 + "__id__": 196 }, { - "__id__": 197 + "__id__": 198 } ], "_prefab": { - "__id__": 199 + "__id__": 200 }, "_lpos": { "__type__": "cc.Vec3", @@ -3222,11 +3235,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 192 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 194 + "__id__": 195 }, "_contentSize": { "__type__": "cc.Size", @@ -3250,11 +3263,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 192 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 196 + "__id__": 197 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3318,11 +3331,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 192 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 198 + "__id__": 199 }, "templateMode": true, "watchPath": "0", @@ -3359,7 +3372,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 201 + "__id__": 202 }, "_contentSize": { "__type__": "cc.Size", @@ -3387,7 +3400,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 203 + "__id__": 204 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3429,7 +3442,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 205 + "__id__": 206 }, "_alignFlags": 40, "_target": null, @@ -3478,29 +3491,29 @@ }, "_children": [ { - "__id__": 208 + "__id__": 209 }, { - "__id__": 222 + "__id__": 223 }, { - "__id__": 228 + "__id__": 229 } ], "_active": true, "_components": [ { - "__id__": 236 + "__id__": 237 }, { - "__id__": 238 + "__id__": 239 }, { - "__id__": 240 + "__id__": 241 } ], "_prefab": { - "__id__": 242 + "__id__": 243 }, "_lpos": { "__type__": "cc.Vec3", @@ -3535,17 +3548,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 207 + "__id__": 208 }, "_prefab": { - "__id__": 209 + "__id__": 210 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 208 + "__id__": 209 }, "asset": { "__uuid__": "86a3c4cd-71c7-4502-b713-65f0ace7912a", @@ -3553,7 +3566,7 @@ }, "fileId": "d3jYvT7whFS5scQFZeO5AK", "instance": { - "__id__": 210 + "__id__": 211 }, "targetOverrides": null }, @@ -3567,10 +3580,7 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 211 - }, - { - "__id__": 213 + "__id__": 212 }, { "__id__": 214 @@ -3582,10 +3592,13 @@ "__id__": 216 }, { - "__id__": 218 + "__id__": 217 }, { - "__id__": 220 + "__id__": 219 + }, + { + "__id__": 221 } ], "removedComponents": [] @@ -3593,7 +3606,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 212 + "__id__": 213 }, "propertyPath": [ "_name" @@ -3609,7 +3622,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 212 + "__id__": 213 }, "propertyPath": [ "_lpos" @@ -3624,7 +3637,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 212 + "__id__": 213 }, "propertyPath": [ "_lrot" @@ -3640,7 +3653,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 212 + "__id__": 213 }, "propertyPath": [ "_euler" @@ -3655,7 +3668,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 217 + "__id__": 218 }, "propertyPath": [ "_contentSize" @@ -3675,7 +3688,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 219 + "__id__": 220 }, "propertyPath": [ "_string" @@ -3691,7 +3704,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 221 + "__id__": 222 }, "propertyPath": [ "_contentSize" @@ -3714,20 +3727,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 207 + "__id__": 208 }, "_children": [], "_active": true, "_components": [ { - "__id__": 223 + "__id__": 224 }, { - "__id__": 225 + "__id__": 226 } ], "_prefab": { - "__id__": 227 + "__id__": 228 }, "_lpos": { "__type__": "cc.Vec3", @@ -3764,11 +3777,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 222 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 224 + "__id__": 225 }, "_contentSize": { "__type__": "cc.Size", @@ -3792,11 +3805,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 222 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 226 + "__id__": 227 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3853,23 +3866,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 207 + "__id__": 208 }, "_children": [], "_active": true, "_components": [ { - "__id__": 229 + "__id__": 230 }, { - "__id__": 231 + "__id__": 232 }, { - "__id__": 233 + "__id__": 234 } ], "_prefab": { - "__id__": 235 + "__id__": 236 }, "_lpos": { "__type__": "cc.Vec3", @@ -3906,11 +3919,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 228 + "__id__": 229 }, "_enabled": true, "__prefab": { - "__id__": 230 + "__id__": 231 }, "_contentSize": { "__type__": "cc.Size", @@ -3934,11 +3947,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 228 + "__id__": 229 }, "_enabled": true, "__prefab": { - "__id__": 232 + "__id__": 233 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4002,11 +4015,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 228 + "__id__": 229 }, "_enabled": true, "__prefab": { - "__id__": 234 + "__id__": 235 }, "templateMode": true, "watchPath": "0", @@ -4039,11 +4052,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 207 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 237 + "__id__": 238 }, "_contentSize": { "__type__": "cc.Size", @@ -4067,11 +4080,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 207 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 239 + "__id__": 240 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4109,11 +4122,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 207 + "__id__": 208 }, "_enabled": false, "__prefab": { - "__id__": 241 + "__id__": 242 }, "_alignFlags": 40, "_target": null, @@ -4162,32 +4175,32 @@ }, "_children": [ { - "__id__": 244 + "__id__": 245 }, { - "__id__": 258 + "__id__": 260 }, { - "__id__": 266 + "__id__": 268 }, { - "__id__": 272 + "__id__": 274 } ], "_active": true, "_components": [ - { - "__id__": 280 - }, { "__id__": 282 }, { "__id__": 284 + }, + { + "__id__": 286 } ], "_prefab": { - "__id__": 286 + "__id__": 288 }, "_lpos": { "__type__": "cc.Vec3", @@ -4222,17 +4235,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 243 + "__id__": 244 }, "_prefab": { - "__id__": 245 + "__id__": 246 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 244 + "__id__": 245 }, "asset": { "__uuid__": "86a3c4cd-71c7-4502-b713-65f0ace7912a", @@ -4240,7 +4253,7 @@ }, "fileId": "d3jYvT7whFS5scQFZeO5AK", "instance": { - "__id__": 246 + "__id__": 247 }, "targetOverrides": null }, @@ -4254,10 +4267,7 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 247 - }, - { - "__id__": 249 + "__id__": 248 }, { "__id__": 250 @@ -4269,10 +4279,16 @@ "__id__": 252 }, { - "__id__": 254 + "__id__": 253 }, { - "__id__": 256 + "__id__": 255 + }, + { + "__id__": 257 + }, + { + "__id__": 259 } ], "removedComponents": [] @@ -4280,7 +4296,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 248 + "__id__": 249 }, "propertyPath": [ "_name" @@ -4296,7 +4312,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 248 + "__id__": 249 }, "propertyPath": [ "_lpos" @@ -4311,7 +4327,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 248 + "__id__": 249 }, "propertyPath": [ "_lrot" @@ -4327,7 +4343,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 248 + "__id__": 249 }, "propertyPath": [ "_euler" @@ -4342,14 +4358,14 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 253 + "__id__": 254 }, "propertyPath": [ "_contentSize" ], "value": { "__type__": "cc.Size", - "width": 150, + "width": 200, "height": 70 } }, @@ -4362,7 +4378,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 255 + "__id__": 256 }, "propertyPath": [ "_string" @@ -4378,7 +4394,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 257 + "__id__": 258 }, "propertyPath": [ "_contentSize" @@ -4395,29 +4411,39 @@ "11pqUo9t9IWYWj/LjK3fNo" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 249 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, { "__type__": "cc.Node", "_name": "bg", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 243 + "__id__": 244 }, "_children": [], "_active": false, "_components": [ - { - "__id__": 259 - }, { "__id__": 261 }, { "__id__": 263 + }, + { + "__id__": 265 } ], "_prefab": { - "__id__": 265 + "__id__": 267 }, "_lpos": { "__type__": "cc.Vec3", @@ -4454,11 +4480,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 258 + "__id__": 260 }, "_enabled": true, "__prefab": { - "__id__": 260 + "__id__": 262 }, "_contentSize": { "__type__": "cc.Size", @@ -4482,11 +4508,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 258 + "__id__": 260 }, "_enabled": true, "__prefab": { - "__id__": 262 + "__id__": 264 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4530,11 +4556,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 258 + "__id__": 260 }, "_enabled": true, "__prefab": { - "__id__": 264 + "__id__": 266 }, "_alignFlags": 45, "_target": null, @@ -4579,20 +4605,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 243 + "__id__": 244 }, "_children": [], "_active": true, "_components": [ { - "__id__": 267 + "__id__": 269 }, { - "__id__": 269 + "__id__": 271 } ], "_prefab": { - "__id__": 271 + "__id__": 273 }, "_lpos": { "__type__": "cc.Vec3", @@ -4629,11 +4655,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 266 + "__id__": 268 }, "_enabled": true, "__prefab": { - "__id__": 268 + "__id__": 270 }, "_contentSize": { "__type__": "cc.Size", @@ -4657,11 +4683,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 266 + "__id__": 268 }, "_enabled": true, "__prefab": { - "__id__": 270 + "__id__": 272 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4718,23 +4744,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 243 + "__id__": 244 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 273 - }, { "__id__": 275 }, { "__id__": 277 + }, + { + "__id__": 279 } ], "_prefab": { - "__id__": 279 + "__id__": 281 }, "_lpos": { "__type__": "cc.Vec3", @@ -4771,11 +4797,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 272 + "__id__": 274 }, "_enabled": true, "__prefab": { - "__id__": 274 + "__id__": 276 }, "_contentSize": { "__type__": "cc.Size", @@ -4799,11 +4825,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 272 + "__id__": 274 }, "_enabled": true, "__prefab": { - "__id__": 276 + "__id__": 278 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4867,11 +4893,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 272 + "__id__": 274 }, "_enabled": true, "__prefab": { - "__id__": 278 + "__id__": 280 }, "templateMode": true, "watchPath": "", @@ -4905,11 +4931,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 243 + "__id__": 244 }, "_enabled": true, "__prefab": { - "__id__": 281 + "__id__": 283 }, "_contentSize": { "__type__": "cc.Size", @@ -4933,11 +4959,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 243 + "__id__": 244 }, "_enabled": true, "__prefab": { - "__id__": 283 + "__id__": 285 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4975,11 +5001,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 243 + "__id__": 244 }, "_enabled": false, "__prefab": { - "__id__": 285 + "__id__": 287 }, "_alignFlags": 40, "_target": null, @@ -5028,7 +5054,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 288 + "__id__": 290 }, "_contentSize": { "__type__": "cc.Size", @@ -5056,7 +5082,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 290 + "__id__": 292 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5104,7 +5130,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 292 + "__id__": 294 }, "_alignFlags": 45, "_target": null, @@ -5140,7 +5166,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 294 + "__id__": 296 }, "_resizeMode": 0, "_layoutType": 1, @@ -5191,7 +5217,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 297 + "__id__": 299 }, "_contentSize": { "__type__": "cc.Size", @@ -5219,7 +5245,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 299 + "__id__": 301 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5267,7 +5293,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 301 + "__id__": 303 }, "_alignFlags": 44, "_target": null, @@ -5303,7 +5329,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 303 + "__id__": 305 }, "_resizeMode": 0, "_layoutType": 1, @@ -5354,32 +5380,32 @@ }, "_children": [ { - "__id__": 306 + "__id__": 308 }, { - "__id__": 325 + "__id__": 327 }, { - "__id__": 378 + "__id__": 401 } ], "_active": true, "_components": [ { - "__id__": 478 + "__id__": 501 }, { - "__id__": 480 + "__id__": 503 }, { - "__id__": 482 + "__id__": 505 }, { - "__id__": 484 + "__id__": 507 } ], "_prefab": { - "__id__": 486 + "__id__": 509 }, "_lpos": { "__type__": "cc.Vec3", @@ -5414,17 +5440,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 305 + "__id__": 307 }, "_prefab": { - "__id__": 307 + "__id__": 309 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 306 + "__id__": 308 }, "asset": { "__uuid__": "555f7387-1025-41a8-a2a8-ff61c76004a3", @@ -5432,7 +5458,7 @@ }, "fileId": "50T0YGiGBH7qZZFeATiEP+", "instance": { - "__id__": 308 + "__id__": 310 }, "targetOverrides": null }, @@ -5445,21 +5471,18 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 309 - }, { "__id__": 311 }, - { - "__id__": 312 - }, { "__id__": 313 }, { "__id__": 314 }, + { + "__id__": 315 + }, { "__id__": 316 }, @@ -5473,7 +5496,10 @@ "__id__": 322 }, { - "__id__": 323 + "__id__": 324 + }, + { + "__id__": 325 } ], "removedComponents": [] @@ -5481,7 +5507,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 310 + "__id__": 312 }, "propertyPath": [ "_name" @@ -5497,7 +5523,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 310 + "__id__": 312 }, "propertyPath": [ "_lpos" @@ -5512,7 +5538,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 310 + "__id__": 312 }, "propertyPath": [ "_lrot" @@ -5528,7 +5554,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 310 + "__id__": 312 }, "propertyPath": [ "_euler" @@ -5543,7 +5569,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 315 + "__id__": 317 }, "propertyPath": [ "_contentSize" @@ -5563,7 +5589,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 317 + "__id__": 319 }, "propertyPath": [ "_contentSize" @@ -5583,7 +5609,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 319 + "__id__": 321 }, "propertyPath": [ "_contentSize" @@ -5603,7 +5629,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 321 + "__id__": 323 }, "propertyPath": [ "_contentSize" @@ -5623,7 +5649,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 310 + "__id__": 312 }, "propertyPath": [ "_active" @@ -5633,7 +5659,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 324 + "__id__": 326 }, "propertyPath": [ "_active" @@ -5652,33 +5678,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 305 + "__id__": 307 }, "_children": [ { - "__id__": 326 + "__id__": 328 }, { - "__id__": 341 + "__id__": 350 }, { - "__id__": 356 + "__id__": 372 } ], "_active": true, "_components": [ { - "__id__": 371 + "__id__": 394 }, { - "__id__": 373 + "__id__": 396 }, { - "__id__": 375 + "__id__": 398 } ], "_prefab": { - "__id__": 377 + "__id__": 400 }, "_lpos": { "__type__": "cc.Vec3", @@ -5713,17 +5739,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 325 + "__id__": 327 }, "_prefab": { - "__id__": 327 + "__id__": 329 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 326 + "__id__": 328 }, "asset": { "__uuid__": "f820a186-b9f6-44df-a534-bdcbaa6a639a", @@ -5731,17 +5757,26 @@ }, "fileId": "5dVotvOAFMoaprbNZVAkgY", "instance": { - "__id__": 328 + "__id__": 330 }, "targetOverrides": [ { - "__id__": 334 - }, - { - "__id__": 337 + "__id__": 336 }, { "__id__": 339 + }, + { + "__id__": 341 + }, + { + "__id__": 344 + }, + { + "__id__": 346 + }, + { + "__id__": 348 } ] }, @@ -5754,17 +5789,17 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 329 - }, { "__id__": 331 }, { - "__id__": 332 + "__id__": 333 }, { - "__id__": 333 + "__id__": 334 + }, + { + "__id__": 335 } ], "removedComponents": [] @@ -5772,7 +5807,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 330 + "__id__": 332 }, "propertyPath": [ "_name" @@ -5788,7 +5823,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 330 + "__id__": 332 }, "propertyPath": [ "_lpos" @@ -5803,7 +5838,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 330 + "__id__": 332 }, "propertyPath": [ "_lrot" @@ -5819,7 +5854,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 330 + "__id__": 332 }, "propertyPath": [ "_euler" @@ -5839,10 +5874,10 @@ "icon_node" ], "target": { - "__id__": 335 + "__id__": 337 }, "targetInfo": { - "__id__": 336 + "__id__": 338 } }, { @@ -5852,7 +5887,71 @@ { "__type__": "cc.TargetInfo", "localID": [ - "a33ReyWcpAoZY5ieotS6Ir" + "93wpdyvytKPqGrBBUDf293" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "bg_node" + ], + "target": { + "__id__": 337 + }, + "targetInfo": { + "__id__": 340 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c8niXKCPZJkZO13m9+xJNN" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "sell_btn" + ], + "target": { + "__id__": 342 + }, + "targetInfo": { + "__id__": 343 + } + }, + { + "__type__": "cc.Node", + "__editorExtras__": {} + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "59HmW0DT5L74QSaNhJXq7r" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "sell_price_label" + ], + "target": { + "__id__": 342 + }, + "targetInfo": { + "__id__": 345 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "9deqZrZeZEEKkvtD7QlGHO" ] }, { @@ -5863,10 +5962,10 @@ "icon_node" ], "target": { - "__id__": 335 + "__id__": 337 }, "targetInfo": { - "__id__": 338 + "__id__": 347 } }, { @@ -5883,10 +5982,10 @@ "bg_node" ], "target": { - "__id__": 335 + "__id__": 337 }, "targetInfo": { - "__id__": 340 + "__id__": 349 } }, { @@ -5899,17 +5998,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 325 + "__id__": 327 }, "_prefab": { - "__id__": 342 + "__id__": 351 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 341 + "__id__": 350 }, "asset": { "__uuid__": "f820a186-b9f6-44df-a534-bdcbaa6a639a", @@ -5917,17 +6016,26 @@ }, "fileId": "5dVotvOAFMoaprbNZVAkgY", "instance": { - "__id__": 343 + "__id__": 352 }, "targetOverrides": [ { - "__id__": 349 + "__id__": 358 }, { - "__id__": 352 + "__id__": 361 }, { - "__id__": 354 + "__id__": 363 + }, + { + "__id__": 366 + }, + { + "__id__": 368 + }, + { + "__id__": 370 } ] }, @@ -5941,16 +6049,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 344 + "__id__": 353 }, { - "__id__": 346 + "__id__": 355 }, { - "__id__": 347 + "__id__": 356 }, { - "__id__": 348 + "__id__": 357 } ], "removedComponents": [] @@ -5958,7 +6066,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 345 + "__id__": 354 }, "propertyPath": [ "_name" @@ -5974,7 +6082,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 345 + "__id__": 354 }, "propertyPath": [ "_lpos" @@ -5989,7 +6097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 345 + "__id__": 354 }, "propertyPath": [ "_lrot" @@ -6005,7 +6113,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 345 + "__id__": 354 }, "propertyPath": [ "_euler" @@ -6025,10 +6133,10 @@ "icon_node" ], "target": { - "__id__": 350 + "__id__": 359 }, "targetInfo": { - "__id__": 351 + "__id__": 360 } }, { @@ -6038,7 +6146,71 @@ { "__type__": "cc.TargetInfo", "localID": [ - "a33ReyWcpAoZY5ieotS6Ir" + "93wpdyvytKPqGrBBUDf293" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "bg_node" + ], + "target": { + "__id__": 359 + }, + "targetInfo": { + "__id__": 362 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c8niXKCPZJkZO13m9+xJNN" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "sell_btn" + ], + "target": { + "__id__": 364 + }, + "targetInfo": { + "__id__": 365 + } + }, + { + "__type__": "cc.Node", + "__editorExtras__": {} + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "59HmW0DT5L74QSaNhJXq7r" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "sell_price_label" + ], + "target": { + "__id__": 364 + }, + "targetInfo": { + "__id__": 367 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "9deqZrZeZEEKkvtD7QlGHO" ] }, { @@ -6049,10 +6221,10 @@ "icon_node" ], "target": { - "__id__": 350 + "__id__": 359 }, "targetInfo": { - "__id__": 353 + "__id__": 369 } }, { @@ -6069,10 +6241,10 @@ "bg_node" ], "target": { - "__id__": 350 + "__id__": 359 }, "targetInfo": { - "__id__": 355 + "__id__": 371 } }, { @@ -6085,17 +6257,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 325 + "__id__": 327 }, "_prefab": { - "__id__": 357 + "__id__": 373 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 356 + "__id__": 372 }, "asset": { "__uuid__": "f820a186-b9f6-44df-a534-bdcbaa6a639a", @@ -6103,17 +6275,26 @@ }, "fileId": "5dVotvOAFMoaprbNZVAkgY", "instance": { - "__id__": 358 + "__id__": 374 }, "targetOverrides": [ { - "__id__": 364 + "__id__": 380 }, { - "__id__": 367 + "__id__": 383 }, { - "__id__": 369 + "__id__": 385 + }, + { + "__id__": 388 + }, + { + "__id__": 390 + }, + { + "__id__": 392 } ] }, @@ -6127,16 +6308,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 359 + "__id__": 375 }, { - "__id__": 361 + "__id__": 377 }, { - "__id__": 362 + "__id__": 378 }, { - "__id__": 363 + "__id__": 379 } ], "removedComponents": [] @@ -6144,7 +6325,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 360 + "__id__": 376 }, "propertyPath": [ "_name" @@ -6160,7 +6341,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 360 + "__id__": 376 }, "propertyPath": [ "_lpos" @@ -6175,7 +6356,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 360 + "__id__": 376 }, "propertyPath": [ "_lrot" @@ -6191,7 +6372,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 360 + "__id__": 376 }, "propertyPath": [ "_euler" @@ -6211,10 +6392,10 @@ "icon_node" ], "target": { - "__id__": 365 + "__id__": 381 }, "targetInfo": { - "__id__": 366 + "__id__": 382 } }, { @@ -6224,7 +6405,71 @@ { "__type__": "cc.TargetInfo", "localID": [ - "a33ReyWcpAoZY5ieotS6Ir" + "93wpdyvytKPqGrBBUDf293" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "bg_node" + ], + "target": { + "__id__": 381 + }, + "targetInfo": { + "__id__": 384 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c8niXKCPZJkZO13m9+xJNN" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "sell_btn" + ], + "target": { + "__id__": 386 + }, + "targetInfo": { + "__id__": 387 + } + }, + { + "__type__": "cc.Node", + "__editorExtras__": {} + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "59HmW0DT5L74QSaNhJXq7r" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "sell_price_label" + ], + "target": { + "__id__": 386 + }, + "targetInfo": { + "__id__": 389 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "9deqZrZeZEEKkvtD7QlGHO" ] }, { @@ -6235,10 +6480,10 @@ "icon_node" ], "target": { - "__id__": 365 + "__id__": 381 }, "targetInfo": { - "__id__": 368 + "__id__": 391 } }, { @@ -6255,10 +6500,10 @@ "bg_node" ], "target": { - "__id__": 365 + "__id__": 381 }, "targetInfo": { - "__id__": 370 + "__id__": 393 } }, { @@ -6273,11 +6518,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 325 + "__id__": 327 }, "_enabled": true, "__prefab": { - "__id__": 372 + "__id__": 395 }, "_contentSize": { "__type__": "cc.Size", @@ -6301,11 +6546,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 325 + "__id__": 327 }, "_enabled": true, "__prefab": { - "__id__": 374 + "__id__": 397 }, "_alignFlags": 45, "_target": null, @@ -6337,11 +6582,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 325 + "__id__": 327 }, "_enabled": false, "__prefab": { - "__id__": 376 + "__id__": 399 }, "_resizeMode": 0, "_layoutType": 2, @@ -6388,36 +6633,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 305 + "__id__": 307 }, "_children": [ { - "__id__": 379 + "__id__": 402 }, { - "__id__": 420 + "__id__": 443 }, { - "__id__": 428 + "__id__": 451 } ], "_active": false, "_components": [ { - "__id__": 469 + "__id__": 492 }, { - "__id__": 471 + "__id__": 494 }, { - "__id__": 473 + "__id__": 496 }, { - "__id__": 475 + "__id__": 498 } ], "_prefab": { - "__id__": 477 + "__id__": 500 }, "_lpos": { "__type__": "cc.Vec3", @@ -6452,17 +6697,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 378 + "__id__": 401 }, "_prefab": { - "__id__": 380 + "__id__": 403 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 379 + "__id__": 402 }, "asset": { "__uuid__": "555f7387-1025-41a8-a2a8-ff61c76004a3", @@ -6470,7 +6715,7 @@ }, "fileId": "50T0YGiGBH7qZZFeATiEP+", "instance": { - "__id__": 381 + "__id__": 404 }, "targetOverrides": null }, @@ -6482,40 +6727,40 @@ }, "mountedChildren": [ { - "__id__": 382 + "__id__": 405 } ], "mountedComponents": [], "propertyOverrides": [ { - "__id__": 404 + "__id__": 427 }, { - "__id__": 406 + "__id__": 429 }, { - "__id__": 407 + "__id__": 430 }, { - "__id__": 408 + "__id__": 431 }, { - "__id__": 409 + "__id__": 432 }, { - "__id__": 411 + "__id__": 434 }, { - "__id__": 413 + "__id__": 436 }, { - "__id__": 415 + "__id__": 438 }, { - "__id__": 417 + "__id__": 440 }, { - "__id__": 418 + "__id__": 441 } ], "removedComponents": [] @@ -6523,11 +6768,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 383 + "__id__": 406 }, "nodes": [ { - "__id__": 384 + "__id__": 407 } ] }, @@ -6541,21 +6786,21 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 379 + "__id__": 402 }, "_prefab": { - "__id__": 385 + "__id__": 408 }, "__editorExtras__": { "mountedRoot": { - "__id__": 379 + "__id__": 402 } } }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 384 + "__id__": 407 }, "asset": { "__uuid__": "b5782405-f3d9-4d45-ba8c-01b5ec2748b2", @@ -6563,7 +6808,7 @@ }, "fileId": "99dvuw5eJJzqP11ZqucD+r", "instance": { - "__id__": 386 + "__id__": 409 }, "targetOverrides": null }, @@ -6577,37 +6822,37 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 387 + "__id__": 410 }, { - "__id__": 389 + "__id__": 412 }, { - "__id__": 390 + "__id__": 413 }, { - "__id__": 391 + "__id__": 414 }, { - "__id__": 392 + "__id__": 415 }, { - "__id__": 394 + "__id__": 417 }, { - "__id__": 396 + "__id__": 419 }, { - "__id__": 397 + "__id__": 420 }, { - "__id__": 399 + "__id__": 422 }, { - "__id__": 401 + "__id__": 424 }, { - "__id__": 403 + "__id__": 426 } ], "removedComponents": [] @@ -6615,7 +6860,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 388 + "__id__": 411 }, "propertyPath": [ "_name" @@ -6631,7 +6876,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 388 + "__id__": 411 }, "propertyPath": [ "_lpos" @@ -6646,7 +6891,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 388 + "__id__": 411 }, "propertyPath": [ "_lrot" @@ -6662,7 +6907,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 388 + "__id__": 411 }, "propertyPath": [ "_euler" @@ -6677,7 +6922,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 393 + "__id__": 416 }, "propertyPath": [ "_top" @@ -6693,7 +6938,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 395 + "__id__": 418 }, "propertyPath": [ "_active" @@ -6709,7 +6954,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 393 + "__id__": 416 }, "propertyPath": [ "_left" @@ -6719,7 +6964,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 398 + "__id__": 421 }, "propertyPath": [ "_contentSize" @@ -6739,7 +6984,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 400 + "__id__": 423 }, "propertyPath": [ "_contentSize" @@ -6759,7 +7004,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 402 + "__id__": 425 }, "propertyPath": [ "_contentSize" @@ -6779,7 +7024,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 393 + "__id__": 416 }, "propertyPath": [ "_right" @@ -6789,7 +7034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 405 + "__id__": 428 }, "propertyPath": [ "_name" @@ -6805,7 +7050,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 405 + "__id__": 428 }, "propertyPath": [ "_lpos" @@ -6820,7 +7065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 405 + "__id__": 428 }, "propertyPath": [ "_lrot" @@ -6836,7 +7081,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 405 + "__id__": 428 }, "propertyPath": [ "_euler" @@ -6851,7 +7096,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 410 + "__id__": 433 }, "propertyPath": [ "_contentSize" @@ -6871,7 +7116,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 412 + "__id__": 435 }, "propertyPath": [ "_contentSize" @@ -6891,7 +7136,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 414 + "__id__": 437 }, "propertyPath": [ "_contentSize" @@ -6911,7 +7156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 416 + "__id__": 439 }, "propertyPath": [ "_contentSize" @@ -6931,7 +7176,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 405 + "__id__": 428 }, "propertyPath": [ "_active" @@ -6941,7 +7186,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 419 + "__id__": 442 }, "propertyPath": [ "_active" @@ -6960,23 +7205,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 378 + "__id__": 401 }, "_children": [], "_active": true, "_components": [ { - "__id__": 421 + "__id__": 444 }, { - "__id__": 423 + "__id__": 446 }, { - "__id__": 425 + "__id__": 448 } ], "_prefab": { - "__id__": 427 + "__id__": 450 }, "_lpos": { "__type__": "cc.Vec3", @@ -7013,11 +7258,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 420 + "__id__": 443 }, "_enabled": true, "__prefab": { - "__id__": 422 + "__id__": 445 }, "_contentSize": { "__type__": "cc.Size", @@ -7041,11 +7286,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 420 + "__id__": 443 }, "_enabled": true, "__prefab": { - "__id__": 424 + "__id__": 447 }, "_alignFlags": 45, "_target": null, @@ -7077,11 +7322,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 420 + "__id__": 443 }, "_enabled": false, "__prefab": { - "__id__": 426 + "__id__": 449 }, "_resizeMode": 0, "_layoutType": 1, @@ -7128,30 +7373,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 378 + "__id__": 401 }, "_children": [ { - "__id__": 429 + "__id__": 452 }, { - "__id__": 439 + "__id__": 462 } ], "_active": true, "_components": [ { - "__id__": 462 + "__id__": 485 }, { - "__id__": 464 + "__id__": 487 }, { - "__id__": 466 + "__id__": 489 } ], "_prefab": { - "__id__": 468 + "__id__": 491 }, "_lpos": { "__type__": "cc.Vec3", @@ -7186,17 +7431,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 428 + "__id__": 451 }, "_prefab": { - "__id__": 430 + "__id__": 453 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 429 + "__id__": 452 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -7204,7 +7449,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 431 + "__id__": 454 }, "targetOverrides": null }, @@ -7218,31 +7463,31 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 432 + "__id__": 455 }, { - "__id__": 434 + "__id__": 457 }, { - "__id__": 435 + "__id__": 458 }, { - "__id__": 436 + "__id__": 459 } ], "removedComponents": [ { - "__id__": 437 + "__id__": 460 }, { - "__id__": 438 + "__id__": 461 } ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 433 + "__id__": 456 }, "propertyPath": [ "_name" @@ -7258,7 +7503,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 433 + "__id__": 456 }, "propertyPath": [ "_lpos" @@ -7273,7 +7518,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 433 + "__id__": 456 }, "propertyPath": [ "_lrot" @@ -7289,7 +7534,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 433 + "__id__": 456 }, "propertyPath": [ "_euler" @@ -7317,17 +7562,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 428 + "__id__": 451 }, "_prefab": { - "__id__": 440 + "__id__": 463 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 439 + "__id__": 462 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -7335,7 +7580,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 441 + "__id__": 464 }, "targetOverrides": null }, @@ -7349,52 +7594,52 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 442 + "__id__": 465 }, { - "__id__": 444 + "__id__": 467 }, { - "__id__": 445 + "__id__": 468 }, { - "__id__": 446 + "__id__": 469 }, { - "__id__": 447 + "__id__": 470 }, { - "__id__": 449 + "__id__": 472 }, { - "__id__": 451 + "__id__": 474 }, { - "__id__": 453 + "__id__": 476 }, { - "__id__": 455 + "__id__": 478 }, { - "__id__": 456 + "__id__": 479 }, { - "__id__": 458 + "__id__": 481 } ], "removedComponents": [ { - "__id__": 460 + "__id__": 483 }, { - "__id__": 461 + "__id__": 484 } ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 443 + "__id__": 466 }, "propertyPath": [ "_name" @@ -7410,7 +7655,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 443 + "__id__": 466 }, "propertyPath": [ "_lpos" @@ -7425,7 +7670,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 443 + "__id__": 466 }, "propertyPath": [ "_lrot" @@ -7441,7 +7686,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 443 + "__id__": 466 }, "propertyPath": [ "_euler" @@ -7456,7 +7701,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 448 + "__id__": 471 }, "propertyPath": [ "_active" @@ -7472,7 +7717,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 450 + "__id__": 473 }, "propertyPath": [ "_lpos" @@ -7493,7 +7738,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 452 + "__id__": 475 }, "propertyPath": [ "_contentSize" @@ -7513,7 +7758,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 454 + "__id__": 477 }, "propertyPath": [ "_top" @@ -7529,7 +7774,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 454 + "__id__": 477 }, "propertyPath": [ "_bottom" @@ -7539,7 +7784,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 457 + "__id__": 480 }, "propertyPath": [ "_string" @@ -7555,7 +7800,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 459 + "__id__": 482 }, "propertyPath": [ "_contentSize" @@ -7590,11 +7835,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 428 + "__id__": 451 }, "_enabled": true, "__prefab": { - "__id__": 463 + "__id__": 486 }, "_contentSize": { "__type__": "cc.Size", @@ -7618,11 +7863,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 428 + "__id__": 451 }, "_enabled": true, "__prefab": { - "__id__": 465 + "__id__": 488 }, "_alignFlags": 41, "_target": null, @@ -7654,11 +7899,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 428 + "__id__": 451 }, "_enabled": true, "__prefab": { - "__id__": 467 + "__id__": 490 }, "_resizeMode": 1, "_layoutType": 1, @@ -7705,11 +7950,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 378 + "__id__": 401 }, "_enabled": true, "__prefab": { - "__id__": 470 + "__id__": 493 }, "_contentSize": { "__type__": "cc.Size", @@ -7733,11 +7978,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 378 + "__id__": 401 }, "_enabled": true, "__prefab": { - "__id__": 472 + "__id__": 495 }, "_alignFlags": 44, "_target": null, @@ -7769,11 +8014,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 378 + "__id__": 401 }, "_enabled": false, "__prefab": { - "__id__": 474 + "__id__": 497 }, "_resizeMode": 1, "_layoutType": 1, @@ -7807,11 +8052,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 378 + "__id__": 401 }, "_enabled": true, "__prefab": { - "__id__": 476 + "__id__": 499 }, "_id": "" }, @@ -7838,11 +8083,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 305 + "__id__": 307 }, "_enabled": true, "__prefab": { - "__id__": 479 + "__id__": 502 }, "_contentSize": { "__type__": "cc.Size", @@ -7866,11 +8111,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 305 + "__id__": 307 }, "_enabled": true, "__prefab": { - "__id__": 481 + "__id__": 504 }, "_alignFlags": 44, "_target": null, @@ -7902,11 +8147,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 305 + "__id__": 307 }, "_enabled": false, "__prefab": { - "__id__": 483 + "__id__": 506 }, "_resizeMode": 1, "_layoutType": 1, @@ -7940,11 +8185,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 305 + "__id__": 307 }, "_enabled": true, "__prefab": { - "__id__": 485 + "__id__": 508 }, "_id": "" }, @@ -7975,32 +8220,32 @@ }, "_children": [ { - "__id__": 488 + "__id__": 511 }, { - "__id__": 528 + "__id__": 551 }, { - "__id__": 536 + "__id__": 559 } ], "_active": true, "_components": [ { - "__id__": 544 + "__id__": 567 }, { - "__id__": 546 + "__id__": 569 }, { - "__id__": 548 + "__id__": 571 }, { - "__id__": 550 + "__id__": 573 } ], "_prefab": { - "__id__": 552 + "__id__": 575 }, "_lpos": { "__type__": "cc.Vec3", @@ -8035,17 +8280,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 487 + "__id__": 510 }, "_prefab": { - "__id__": 489 + "__id__": 512 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 488 + "__id__": 511 }, "asset": { "__uuid__": "555f7387-1025-41a8-a2a8-ff61c76004a3", @@ -8053,7 +8298,7 @@ }, "fileId": "50T0YGiGBH7qZZFeATiEP+", "instance": { - "__id__": 490 + "__id__": 513 }, "targetOverrides": null }, @@ -8065,37 +8310,37 @@ }, "mountedChildren": [ { - "__id__": 491 + "__id__": 514 } ], "mountedComponents": [], "propertyOverrides": [ { - "__id__": 513 + "__id__": 536 }, { - "__id__": 515 + "__id__": 538 }, { - "__id__": 516 + "__id__": 539 }, { - "__id__": 517 + "__id__": 540 }, { - "__id__": 518 + "__id__": 541 }, { - "__id__": 520 + "__id__": 543 }, { - "__id__": 522 + "__id__": 545 }, { - "__id__": 524 + "__id__": 547 }, { - "__id__": 526 + "__id__": 549 } ], "removedComponents": [] @@ -8103,11 +8348,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 492 + "__id__": 515 }, "nodes": [ { - "__id__": 493 + "__id__": 516 } ] }, @@ -8121,21 +8366,21 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 488 + "__id__": 511 }, "_prefab": { - "__id__": 494 + "__id__": 517 }, "__editorExtras__": { "mountedRoot": { - "__id__": 488 + "__id__": 511 } } }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 493 + "__id__": 516 }, "asset": { "__uuid__": "b5782405-f3d9-4d45-ba8c-01b5ec2748b2", @@ -8143,7 +8388,7 @@ }, "fileId": "99dvuw5eJJzqP11ZqucD+r", "instance": { - "__id__": 495 + "__id__": 518 }, "targetOverrides": null }, @@ -8157,37 +8402,37 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 496 + "__id__": 519 }, { - "__id__": 498 + "__id__": 521 }, { - "__id__": 499 + "__id__": 522 }, { - "__id__": 500 + "__id__": 523 }, { - "__id__": 501 + "__id__": 524 }, { - "__id__": 503 + "__id__": 526 }, { - "__id__": 505 + "__id__": 528 }, { - "__id__": 506 + "__id__": 529 }, { - "__id__": 508 + "__id__": 531 }, { - "__id__": 510 + "__id__": 533 }, { - "__id__": 512 + "__id__": 535 } ], "removedComponents": [] @@ -8195,7 +8440,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 497 + "__id__": 520 }, "propertyPath": [ "_name" @@ -8211,7 +8456,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 497 + "__id__": 520 }, "propertyPath": [ "_lpos" @@ -8226,7 +8471,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 497 + "__id__": 520 }, "propertyPath": [ "_lrot" @@ -8242,7 +8487,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 497 + "__id__": 520 }, "propertyPath": [ "_euler" @@ -8257,7 +8502,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 502 + "__id__": 525 }, "propertyPath": [ "_top" @@ -8273,7 +8518,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 504 + "__id__": 527 }, "propertyPath": [ "_active" @@ -8289,7 +8534,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 502 + "__id__": 525 }, "propertyPath": [ "_left" @@ -8299,7 +8544,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 507 + "__id__": 530 }, "propertyPath": [ "_contentSize" @@ -8319,7 +8564,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 509 + "__id__": 532 }, "propertyPath": [ "_contentSize" @@ -8339,7 +8584,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 511 + "__id__": 534 }, "propertyPath": [ "_contentSize" @@ -8359,7 +8604,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 502 + "__id__": 525 }, "propertyPath": [ "_right" @@ -8369,7 +8614,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 514 + "__id__": 537 }, "propertyPath": [ "_name" @@ -8385,7 +8630,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 514 + "__id__": 537 }, "propertyPath": [ "_lpos" @@ -8400,7 +8645,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 514 + "__id__": 537 }, "propertyPath": [ "_lrot" @@ -8416,7 +8661,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 514 + "__id__": 537 }, "propertyPath": [ "_euler" @@ -8431,7 +8676,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 519 + "__id__": 542 }, "propertyPath": [ "_contentSize" @@ -8451,7 +8696,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 521 + "__id__": 544 }, "propertyPath": [ "_contentSize" @@ -8471,7 +8716,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 523 + "__id__": 546 }, "propertyPath": [ "_contentSize" @@ -8491,7 +8736,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 525 + "__id__": 548 }, "propertyPath": [ "_contentSize" @@ -8511,7 +8756,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 527 + "__id__": 550 }, "propertyPath": [ "_active" @@ -8530,23 +8775,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 487 + "__id__": 510 }, "_children": [], "_active": true, "_components": [ { - "__id__": 529 + "__id__": 552 }, { - "__id__": 531 + "__id__": 554 }, { - "__id__": 533 + "__id__": 556 } ], "_prefab": { - "__id__": 535 + "__id__": 558 }, "_lpos": { "__type__": "cc.Vec3", @@ -8583,11 +8828,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 528 + "__id__": 551 }, "_enabled": true, "__prefab": { - "__id__": 530 + "__id__": 553 }, "_contentSize": { "__type__": "cc.Size", @@ -8611,11 +8856,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 528 + "__id__": 551 }, "_enabled": true, "__prefab": { - "__id__": 532 + "__id__": 555 }, "_alignFlags": 45, "_target": null, @@ -8647,11 +8892,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 528 + "__id__": 551 }, "_enabled": false, "__prefab": { - "__id__": 534 + "__id__": 557 }, "_resizeMode": 0, "_layoutType": 1, @@ -8696,17 +8941,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 487 + "__id__": 510 }, "_prefab": { - "__id__": 537 + "__id__": 560 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 536 + "__id__": 559 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -8714,7 +8959,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 538 + "__id__": 561 }, "targetOverrides": null }, @@ -8728,16 +8973,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 539 + "__id__": 562 }, { - "__id__": 541 + "__id__": 564 }, { - "__id__": 542 + "__id__": 565 }, { - "__id__": 543 + "__id__": 566 } ], "removedComponents": [] @@ -8745,7 +8990,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 540 + "__id__": 563 }, "propertyPath": [ "_name" @@ -8761,7 +9006,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 540 + "__id__": 563 }, "propertyPath": [ "_lpos" @@ -8776,7 +9021,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 540 + "__id__": 563 }, "propertyPath": [ "_lrot" @@ -8792,7 +9037,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 540 + "__id__": 563 }, "propertyPath": [ "_euler" @@ -8810,11 +9055,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 487 + "__id__": 510 }, "_enabled": true, "__prefab": { - "__id__": 545 + "__id__": 568 }, "_contentSize": { "__type__": "cc.Size", @@ -8838,11 +9083,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 487 + "__id__": 510 }, "_enabled": true, "__prefab": { - "__id__": 547 + "__id__": 570 }, "_alignFlags": 44, "_target": null, @@ -8874,11 +9119,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 487 + "__id__": 510 }, "_enabled": false, "__prefab": { - "__id__": 549 + "__id__": 572 }, "_resizeMode": 1, "_layoutType": 1, @@ -8912,11 +9157,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 487 + "__id__": 510 }, "_enabled": true, "__prefab": { - "__id__": 551 + "__id__": 574 }, "_id": "" }, @@ -8947,32 +9192,32 @@ }, "_children": [ { - "__id__": 554 + "__id__": 577 }, { - "__id__": 594 + "__id__": 617 }, { - "__id__": 602 + "__id__": 625 } ], "_active": true, "_components": [ { - "__id__": 612 + "__id__": 635 }, { - "__id__": 614 + "__id__": 637 }, { - "__id__": 616 + "__id__": 639 }, { - "__id__": 618 + "__id__": 641 } ], "_prefab": { - "__id__": 620 + "__id__": 643 }, "_lpos": { "__type__": "cc.Vec3", @@ -9007,17 +9252,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 553 + "__id__": 576 }, "_prefab": { - "__id__": 555 + "__id__": 578 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 554 + "__id__": 577 }, "asset": { "__uuid__": "555f7387-1025-41a8-a2a8-ff61c76004a3", @@ -9025,7 +9270,7 @@ }, "fileId": "50T0YGiGBH7qZZFeATiEP+", "instance": { - "__id__": 556 + "__id__": 579 }, "targetOverrides": null }, @@ -9037,37 +9282,37 @@ }, "mountedChildren": [ { - "__id__": 557 + "__id__": 580 } ], "mountedComponents": [], "propertyOverrides": [ { - "__id__": 579 + "__id__": 602 }, { - "__id__": 581 + "__id__": 604 }, { - "__id__": 582 + "__id__": 605 }, { - "__id__": 583 + "__id__": 606 }, { - "__id__": 584 + "__id__": 607 }, { - "__id__": 586 + "__id__": 609 }, { - "__id__": 588 + "__id__": 611 }, { - "__id__": 590 + "__id__": 613 }, { - "__id__": 592 + "__id__": 615 } ], "removedComponents": [] @@ -9075,11 +9320,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 558 + "__id__": 581 }, "nodes": [ { - "__id__": 559 + "__id__": 582 } ] }, @@ -9093,21 +9338,21 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 554 + "__id__": 577 }, "_prefab": { - "__id__": 560 + "__id__": 583 }, "__editorExtras__": { "mountedRoot": { - "__id__": 554 + "__id__": 577 } } }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 559 + "__id__": 582 }, "asset": { "__uuid__": "b5782405-f3d9-4d45-ba8c-01b5ec2748b2", @@ -9115,7 +9360,7 @@ }, "fileId": "99dvuw5eJJzqP11ZqucD+r", "instance": { - "__id__": 561 + "__id__": 584 }, "targetOverrides": null }, @@ -9129,37 +9374,37 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 562 + "__id__": 585 }, { - "__id__": 564 + "__id__": 587 }, { - "__id__": 565 + "__id__": 588 }, { - "__id__": 566 + "__id__": 589 }, { - "__id__": 567 + "__id__": 590 }, { - "__id__": 569 + "__id__": 592 }, { - "__id__": 571 + "__id__": 594 }, { - "__id__": 572 + "__id__": 595 }, { - "__id__": 574 + "__id__": 597 }, { - "__id__": 576 + "__id__": 599 }, { - "__id__": 578 + "__id__": 601 } ], "removedComponents": [] @@ -9167,7 +9412,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 563 + "__id__": 586 }, "propertyPath": [ "_name" @@ -9183,7 +9428,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 563 + "__id__": 586 }, "propertyPath": [ "_lpos" @@ -9198,7 +9443,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 563 + "__id__": 586 }, "propertyPath": [ "_lrot" @@ -9214,7 +9459,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 563 + "__id__": 586 }, "propertyPath": [ "_euler" @@ -9229,7 +9474,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 568 + "__id__": 591 }, "propertyPath": [ "_top" @@ -9245,7 +9490,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 570 + "__id__": 593 }, "propertyPath": [ "_active" @@ -9261,7 +9506,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 568 + "__id__": 591 }, "propertyPath": [ "_left" @@ -9271,7 +9516,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 573 + "__id__": 596 }, "propertyPath": [ "_contentSize" @@ -9291,7 +9536,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 575 + "__id__": 598 }, "propertyPath": [ "_contentSize" @@ -9311,7 +9556,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 577 + "__id__": 600 }, "propertyPath": [ "_contentSize" @@ -9331,7 +9576,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 568 + "__id__": 591 }, "propertyPath": [ "_right" @@ -9341,7 +9586,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 580 + "__id__": 603 }, "propertyPath": [ "_name" @@ -9357,7 +9602,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 580 + "__id__": 603 }, "propertyPath": [ "_lpos" @@ -9372,7 +9617,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 580 + "__id__": 603 }, "propertyPath": [ "_lrot" @@ -9388,7 +9633,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 580 + "__id__": 603 }, "propertyPath": [ "_euler" @@ -9403,7 +9648,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 585 + "__id__": 608 }, "propertyPath": [ "_contentSize" @@ -9423,7 +9668,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 587 + "__id__": 610 }, "propertyPath": [ "_contentSize" @@ -9443,7 +9688,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 589 + "__id__": 612 }, "propertyPath": [ "_contentSize" @@ -9463,7 +9708,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 591 + "__id__": 614 }, "propertyPath": [ "_contentSize" @@ -9483,7 +9728,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 593 + "__id__": 616 }, "propertyPath": [ "_active" @@ -9502,23 +9747,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 553 + "__id__": 576 }, "_children": [], "_active": true, "_components": [ { - "__id__": 595 + "__id__": 618 }, { - "__id__": 597 + "__id__": 620 }, { - "__id__": 599 + "__id__": 622 } ], "_prefab": { - "__id__": 601 + "__id__": 624 }, "_lpos": { "__type__": "cc.Vec3", @@ -9555,11 +9800,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 594 + "__id__": 617 }, "_enabled": true, "__prefab": { - "__id__": 596 + "__id__": 619 }, "_contentSize": { "__type__": "cc.Size", @@ -9583,11 +9828,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 594 + "__id__": 617 }, "_enabled": true, "__prefab": { - "__id__": 598 + "__id__": 621 }, "_alignFlags": 45, "_target": null, @@ -9619,11 +9864,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 594 + "__id__": 617 }, "_enabled": false, "__prefab": { - "__id__": 600 + "__id__": 623 }, "_resizeMode": 0, "_layoutType": 1, @@ -9668,17 +9913,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 553 + "__id__": 576 }, "_prefab": { - "__id__": 603 + "__id__": 626 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 602 + "__id__": 625 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -9686,7 +9931,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 604 + "__id__": 627 }, "targetOverrides": null }, @@ -9700,31 +9945,31 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 605 + "__id__": 628 }, { - "__id__": 607 + "__id__": 630 }, { - "__id__": 608 + "__id__": 631 }, { - "__id__": 609 + "__id__": 632 } ], "removedComponents": [ { - "__id__": 610 + "__id__": 633 }, { - "__id__": 611 + "__id__": 634 } ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 606 + "__id__": 629 }, "propertyPath": [ "_name" @@ -9740,7 +9985,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 606 + "__id__": 629 }, "propertyPath": [ "_lpos" @@ -9755,7 +10000,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 606 + "__id__": 629 }, "propertyPath": [ "_lrot" @@ -9771,7 +10016,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 606 + "__id__": 629 }, "propertyPath": [ "_euler" @@ -9801,11 +10046,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 553 + "__id__": 576 }, "_enabled": true, "__prefab": { - "__id__": 613 + "__id__": 636 }, "_contentSize": { "__type__": "cc.Size", @@ -9829,11 +10074,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 553 + "__id__": 576 }, "_enabled": true, "__prefab": { - "__id__": 615 + "__id__": 638 }, "_alignFlags": 44, "_target": null, @@ -9865,11 +10110,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 553 + "__id__": 576 }, "_enabled": false, "__prefab": { - "__id__": 617 + "__id__": 640 }, "_resizeMode": 1, "_layoutType": 1, @@ -9903,11 +10148,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 553 + "__id__": 576 }, "_enabled": true, "__prefab": { - "__id__": 619 + "__id__": 642 }, "_id": "" }, @@ -9938,32 +10183,32 @@ }, "_children": [ { - "__id__": 622 + "__id__": 645 }, { - "__id__": 662 + "__id__": 685 }, { - "__id__": 670 + "__id__": 693 } ], "_active": true, "_components": [ { - "__id__": 678 + "__id__": 701 }, { - "__id__": 680 + "__id__": 703 }, { - "__id__": 682 + "__id__": 705 }, { - "__id__": 684 + "__id__": 707 } ], "_prefab": { - "__id__": 686 + "__id__": 709 }, "_lpos": { "__type__": "cc.Vec3", @@ -9998,17 +10243,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 621 + "__id__": 644 }, "_prefab": { - "__id__": 623 + "__id__": 646 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 622 + "__id__": 645 }, "asset": { "__uuid__": "555f7387-1025-41a8-a2a8-ff61c76004a3", @@ -10016,7 +10261,7 @@ }, "fileId": "50T0YGiGBH7qZZFeATiEP+", "instance": { - "__id__": 624 + "__id__": 647 }, "targetOverrides": null }, @@ -10028,37 +10273,37 @@ }, "mountedChildren": [ { - "__id__": 625 + "__id__": 648 } ], "mountedComponents": [], "propertyOverrides": [ { - "__id__": 647 + "__id__": 670 }, { - "__id__": 649 + "__id__": 672 }, { - "__id__": 650 + "__id__": 673 }, { - "__id__": 651 + "__id__": 674 }, { - "__id__": 652 + "__id__": 675 }, { - "__id__": 654 + "__id__": 677 }, { - "__id__": 656 + "__id__": 679 }, { - "__id__": 658 + "__id__": 681 }, { - "__id__": 660 + "__id__": 683 } ], "removedComponents": [] @@ -10066,11 +10311,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 626 + "__id__": 649 }, "nodes": [ { - "__id__": 627 + "__id__": 650 } ] }, @@ -10084,21 +10329,21 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 622 + "__id__": 645 }, "_prefab": { - "__id__": 628 + "__id__": 651 }, "__editorExtras__": { "mountedRoot": { - "__id__": 622 + "__id__": 645 } } }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 627 + "__id__": 650 }, "asset": { "__uuid__": "b5782405-f3d9-4d45-ba8c-01b5ec2748b2", @@ -10106,7 +10351,7 @@ }, "fileId": "99dvuw5eJJzqP11ZqucD+r", "instance": { - "__id__": 629 + "__id__": 652 }, "targetOverrides": null }, @@ -10120,37 +10365,37 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 630 + "__id__": 653 }, { - "__id__": 632 + "__id__": 655 }, { - "__id__": 633 + "__id__": 656 }, { - "__id__": 634 + "__id__": 657 }, { - "__id__": 635 + "__id__": 658 }, { - "__id__": 637 + "__id__": 660 }, { - "__id__": 639 + "__id__": 662 }, { - "__id__": 640 + "__id__": 663 }, { - "__id__": 642 + "__id__": 665 }, { - "__id__": 644 + "__id__": 667 }, { - "__id__": 646 + "__id__": 669 } ], "removedComponents": [] @@ -10158,7 +10403,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 631 + "__id__": 654 }, "propertyPath": [ "_name" @@ -10174,7 +10419,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 631 + "__id__": 654 }, "propertyPath": [ "_lpos" @@ -10189,7 +10434,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 631 + "__id__": 654 }, "propertyPath": [ "_lrot" @@ -10205,7 +10450,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 631 + "__id__": 654 }, "propertyPath": [ "_euler" @@ -10220,7 +10465,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 636 + "__id__": 659 }, "propertyPath": [ "_top" @@ -10236,7 +10481,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 638 + "__id__": 661 }, "propertyPath": [ "_active" @@ -10252,7 +10497,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 636 + "__id__": 659 }, "propertyPath": [ "_left" @@ -10262,7 +10507,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 641 + "__id__": 664 }, "propertyPath": [ "_contentSize" @@ -10282,7 +10527,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 643 + "__id__": 666 }, "propertyPath": [ "_contentSize" @@ -10302,7 +10547,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 645 + "__id__": 668 }, "propertyPath": [ "_contentSize" @@ -10322,7 +10567,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 636 + "__id__": 659 }, "propertyPath": [ "_right" @@ -10332,7 +10577,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 648 + "__id__": 671 }, "propertyPath": [ "_name" @@ -10348,7 +10593,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 648 + "__id__": 671 }, "propertyPath": [ "_lpos" @@ -10363,7 +10608,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 648 + "__id__": 671 }, "propertyPath": [ "_lrot" @@ -10379,7 +10624,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 648 + "__id__": 671 }, "propertyPath": [ "_euler" @@ -10394,7 +10639,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 653 + "__id__": 676 }, "propertyPath": [ "_contentSize" @@ -10414,7 +10659,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 655 + "__id__": 678 }, "propertyPath": [ "_contentSize" @@ -10434,7 +10679,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 657 + "__id__": 680 }, "propertyPath": [ "_contentSize" @@ -10454,7 +10699,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 659 + "__id__": 682 }, "propertyPath": [ "_contentSize" @@ -10474,7 +10719,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 661 + "__id__": 684 }, "propertyPath": [ "_active" @@ -10493,23 +10738,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 621 + "__id__": 644 }, "_children": [], "_active": true, "_components": [ { - "__id__": 663 + "__id__": 686 }, { - "__id__": 665 + "__id__": 688 }, { - "__id__": 667 + "__id__": 690 } ], "_prefab": { - "__id__": 669 + "__id__": 692 }, "_lpos": { "__type__": "cc.Vec3", @@ -10546,11 +10791,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 662 + "__id__": 685 }, "_enabled": true, "__prefab": { - "__id__": 664 + "__id__": 687 }, "_contentSize": { "__type__": "cc.Size", @@ -10574,11 +10819,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 662 + "__id__": 685 }, "_enabled": true, "__prefab": { - "__id__": 666 + "__id__": 689 }, "_alignFlags": 45, "_target": null, @@ -10610,11 +10855,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 662 + "__id__": 685 }, "_enabled": false, "__prefab": { - "__id__": 668 + "__id__": 691 }, "_resizeMode": 0, "_layoutType": 1, @@ -10659,17 +10904,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 621 + "__id__": 644 }, "_prefab": { - "__id__": 671 + "__id__": 694 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 670 + "__id__": 693 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -10677,7 +10922,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 672 + "__id__": 695 }, "targetOverrides": null }, @@ -10691,16 +10936,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 673 + "__id__": 696 }, { - "__id__": 675 + "__id__": 698 }, { - "__id__": 676 + "__id__": 699 }, { - "__id__": 677 + "__id__": 700 } ], "removedComponents": [] @@ -10708,7 +10953,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 674 + "__id__": 697 }, "propertyPath": [ "_name" @@ -10724,7 +10969,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 674 + "__id__": 697 }, "propertyPath": [ "_lpos" @@ -10739,7 +10984,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 674 + "__id__": 697 }, "propertyPath": [ "_lrot" @@ -10755,7 +11000,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 674 + "__id__": 697 }, "propertyPath": [ "_euler" @@ -10773,11 +11018,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 621 + "__id__": 644 }, "_enabled": true, "__prefab": { - "__id__": 679 + "__id__": 702 }, "_contentSize": { "__type__": "cc.Size", @@ -10801,11 +11046,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 621 + "__id__": 644 }, "_enabled": true, "__prefab": { - "__id__": 681 + "__id__": 704 }, "_alignFlags": 44, "_target": null, @@ -10837,11 +11082,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 621 + "__id__": 644 }, "_enabled": false, "__prefab": { - "__id__": 683 + "__id__": 706 }, "_resizeMode": 1, "_layoutType": 1, @@ -10875,11 +11120,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 621 + "__id__": 644 }, "_enabled": true, "__prefab": { - "__id__": 685 + "__id__": 708 }, "_id": "" }, @@ -10910,32 +11155,32 @@ }, "_children": [ { - "__id__": 688 + "__id__": 711 }, { - "__id__": 717 + "__id__": 740 }, { - "__id__": 749 + "__id__": 772 }, { - "__id__": 778 + "__id__": 801 } ], "_active": true, "_components": [ { - "__id__": 809 + "__id__": 832 }, { - "__id__": 811 + "__id__": 834 }, { - "__id__": 813 + "__id__": 836 } ], "_prefab": { - "__id__": 815 + "__id__": 838 }, "_lpos": { "__type__": "cc.Vec3", @@ -10970,17 +11215,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 687 + "__id__": 710 }, "_prefab": { - "__id__": 689 + "__id__": 712 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 688 + "__id__": 711 }, "asset": { "__uuid__": "99b1fd19-5e71-4e63-9682-d82b23244510", @@ -10988,7 +11233,7 @@ }, "fileId": "cfWG6+EKVJ3IlHCuz5Pa35", "instance": { - "__id__": 690 + "__id__": 713 }, "targetOverrides": null }, @@ -11001,53 +11246,53 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 691 - }, - { - "__id__": 693 - }, - { - "__id__": 694 - }, - { - "__id__": 695 - }, - { - "__id__": 696 - }, - { - "__id__": 698 - }, - { - "__id__": 700 - }, - { - "__id__": 702 - }, - { - "__id__": 704 - }, - { - "__id__": 705 - }, - { - "__id__": 707 - }, - { - "__id__": 709 - }, - { - "__id__": 710 - }, - { - "__id__": 712 - }, { "__id__": 714 }, { - "__id__": 715 + "__id__": 716 + }, + { + "__id__": 717 + }, + { + "__id__": 718 + }, + { + "__id__": 719 + }, + { + "__id__": 721 + }, + { + "__id__": 723 + }, + { + "__id__": 725 + }, + { + "__id__": 727 + }, + { + "__id__": 728 + }, + { + "__id__": 730 + }, + { + "__id__": 732 + }, + { + "__id__": 733 + }, + { + "__id__": 735 + }, + { + "__id__": 737 + }, + { + "__id__": 738 } ], "removedComponents": [] @@ -11055,7 +11300,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 692 + "__id__": 715 }, "propertyPath": [ "_name" @@ -11071,7 +11316,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 692 + "__id__": 715 }, "propertyPath": [ "_lpos" @@ -11086,7 +11331,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 692 + "__id__": 715 }, "propertyPath": [ "_lrot" @@ -11102,7 +11347,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 692 + "__id__": 715 }, "propertyPath": [ "_euler" @@ -11117,7 +11362,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 697 + "__id__": 720 }, "propertyPath": [ "_contentSize" @@ -11137,7 +11382,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 699 + "__id__": 722 }, "propertyPath": [ "_contentSize" @@ -11157,7 +11402,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 701 + "__id__": 724 }, "propertyPath": [ "_contentSize" @@ -11177,7 +11422,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 703 + "__id__": 726 }, "propertyPath": [ "_spriteFrame" @@ -11196,7 +11441,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 703 + "__id__": 726 }, "propertyPath": [ "_atlas" @@ -11209,7 +11454,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 706 + "__id__": 729 }, "propertyPath": [ "_contentSize" @@ -11229,7 +11474,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 708 + "__id__": 731 }, "propertyPath": [ "_spriteFrame" @@ -11248,7 +11493,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 708 + "__id__": 731 }, "propertyPath": [ "_atlas" @@ -11261,7 +11506,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 711 + "__id__": 734 }, "propertyPath": [ "_string" @@ -11277,7 +11522,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 713 + "__id__": 736 }, "propertyPath": [ "_string" @@ -11293,7 +11538,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 697 + "__id__": 720 }, "propertyPath": [ "_anchorPoint" @@ -11307,7 +11552,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 716 + "__id__": 739 }, "propertyPath": [ "_lpos" @@ -11329,17 +11574,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 687 + "__id__": 710 }, "_prefab": { - "__id__": 718 + "__id__": 741 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 717 + "__id__": 740 }, "asset": { "__uuid__": "99b1fd19-5e71-4e63-9682-d82b23244510", @@ -11347,7 +11592,7 @@ }, "fileId": "cfWG6+EKVJ3IlHCuz5Pa35", "instance": { - "__id__": 719 + "__id__": 742 }, "targetOverrides": null }, @@ -11361,58 +11606,58 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 720 + "__id__": 743 }, { - "__id__": 722 - }, - { - "__id__": 723 - }, - { - "__id__": 724 - }, - { - "__id__": 725 - }, - { - "__id__": 727 - }, - { - "__id__": 729 - }, - { - "__id__": 731 - }, - { - "__id__": 732 - }, - { - "__id__": 734 - }, - { - "__id__": 736 - }, - { - "__id__": 737 - }, - { - "__id__": 739 - }, - { - "__id__": 741 - }, - { - "__id__": 742 - }, - { - "__id__": 744 + "__id__": 745 }, { "__id__": 746 }, { "__id__": 747 + }, + { + "__id__": 748 + }, + { + "__id__": 750 + }, + { + "__id__": 752 + }, + { + "__id__": 754 + }, + { + "__id__": 755 + }, + { + "__id__": 757 + }, + { + "__id__": 759 + }, + { + "__id__": 760 + }, + { + "__id__": 762 + }, + { + "__id__": 764 + }, + { + "__id__": 765 + }, + { + "__id__": 767 + }, + { + "__id__": 769 + }, + { + "__id__": 770 } ], "removedComponents": [] @@ -11420,7 +11665,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 721 + "__id__": 744 }, "propertyPath": [ "_name" @@ -11436,7 +11681,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 721 + "__id__": 744 }, "propertyPath": [ "_lpos" @@ -11451,7 +11696,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 721 + "__id__": 744 }, "propertyPath": [ "_lrot" @@ -11467,7 +11712,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 721 + "__id__": 744 }, "propertyPath": [ "_euler" @@ -11482,7 +11727,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 726 + "__id__": 749 }, "propertyPath": [ "_contentSize" @@ -11502,7 +11747,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 728 + "__id__": 751 }, "propertyPath": [ "_contentSize" @@ -11522,7 +11767,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 730 + "__id__": 753 }, "propertyPath": [ "_active" @@ -11538,7 +11783,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 730 + "__id__": 753 }, "propertyPath": [ "_lpos" @@ -11553,7 +11798,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 733 + "__id__": 756 }, "propertyPath": [ "_contentSize" @@ -11573,7 +11818,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 735 + "__id__": 758 }, "propertyPath": [ "_spriteFrame" @@ -11592,7 +11837,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 735 + "__id__": 758 }, "propertyPath": [ "_atlas" @@ -11605,7 +11850,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 738 + "__id__": 761 }, "propertyPath": [ "_contentSize" @@ -11625,7 +11870,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 740 + "__id__": 763 }, "propertyPath": [ "_spriteFrame" @@ -11644,7 +11889,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 740 + "__id__": 763 }, "propertyPath": [ "_atlas" @@ -11657,7 +11902,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 743 + "__id__": 766 }, "propertyPath": [ "_string" @@ -11673,7 +11918,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 745 + "__id__": 768 }, "propertyPath": [ "_string" @@ -11689,7 +11934,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 726 + "__id__": 749 }, "propertyPath": [ "_anchorPoint" @@ -11703,7 +11948,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 748 + "__id__": 771 }, "propertyPath": [ "_lpos" @@ -11725,17 +11970,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 687 + "__id__": 710 }, "_prefab": { - "__id__": 750 + "__id__": 773 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 749 + "__id__": 772 }, "asset": { "__uuid__": "99b1fd19-5e71-4e63-9682-d82b23244510", @@ -11743,7 +11988,7 @@ }, "fileId": "cfWG6+EKVJ3IlHCuz5Pa35", "instance": { - "__id__": 751 + "__id__": 774 }, "targetOverrides": null }, @@ -11756,53 +12001,53 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 752 - }, - { - "__id__": 754 - }, - { - "__id__": 755 - }, - { - "__id__": 756 - }, - { - "__id__": 757 - }, - { - "__id__": 759 - }, - { - "__id__": 761 - }, - { - "__id__": 763 - }, - { - "__id__": 765 - }, - { - "__id__": 766 - }, - { - "__id__": 768 - }, - { - "__id__": 770 - }, - { - "__id__": 771 - }, - { - "__id__": 773 - }, { "__id__": 775 }, { - "__id__": 776 + "__id__": 777 + }, + { + "__id__": 778 + }, + { + "__id__": 779 + }, + { + "__id__": 780 + }, + { + "__id__": 782 + }, + { + "__id__": 784 + }, + { + "__id__": 786 + }, + { + "__id__": 788 + }, + { + "__id__": 789 + }, + { + "__id__": 791 + }, + { + "__id__": 793 + }, + { + "__id__": 794 + }, + { + "__id__": 796 + }, + { + "__id__": 798 + }, + { + "__id__": 799 } ], "removedComponents": [] @@ -11810,7 +12055,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 753 + "__id__": 776 }, "propertyPath": [ "_name" @@ -11826,7 +12071,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 753 + "__id__": 776 }, "propertyPath": [ "_lpos" @@ -11841,7 +12086,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 753 + "__id__": 776 }, "propertyPath": [ "_lrot" @@ -11857,7 +12102,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 753 + "__id__": 776 }, "propertyPath": [ "_euler" @@ -11872,7 +12117,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 758 + "__id__": 781 }, "propertyPath": [ "_contentSize" @@ -11892,7 +12137,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 760 + "__id__": 783 }, "propertyPath": [ "_contentSize" @@ -11912,7 +12157,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 762 + "__id__": 785 }, "propertyPath": [ "_contentSize" @@ -11932,7 +12177,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 764 + "__id__": 787 }, "propertyPath": [ "_spriteFrame" @@ -11951,7 +12196,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 764 + "__id__": 787 }, "propertyPath": [ "_atlas" @@ -11964,7 +12209,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 767 + "__id__": 790 }, "propertyPath": [ "_contentSize" @@ -11984,7 +12229,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 769 + "__id__": 792 }, "propertyPath": [ "_spriteFrame" @@ -12003,7 +12248,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 769 + "__id__": 792 }, "propertyPath": [ "_atlas" @@ -12016,7 +12261,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 772 + "__id__": 795 }, "propertyPath": [ "_string" @@ -12032,7 +12277,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 774 + "__id__": 797 }, "propertyPath": [ "_string" @@ -12048,7 +12293,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 758 + "__id__": 781 }, "propertyPath": [ "_anchorPoint" @@ -12062,7 +12307,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 777 + "__id__": 800 }, "propertyPath": [ "_lpos" @@ -12084,17 +12329,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 687 + "__id__": 710 }, "_prefab": { - "__id__": 779 + "__id__": 802 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 778 + "__id__": 801 }, "asset": { "__uuid__": "99b1fd19-5e71-4e63-9682-d82b23244510", @@ -12102,7 +12347,7 @@ }, "fileId": "cfWG6+EKVJ3IlHCuz5Pa35", "instance": { - "__id__": 780 + "__id__": 803 }, "targetOverrides": null }, @@ -12115,48 +12360,6 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 781 - }, - { - "__id__": 783 - }, - { - "__id__": 784 - }, - { - "__id__": 785 - }, - { - "__id__": 786 - }, - { - "__id__": 788 - }, - { - "__id__": 790 - }, - { - "__id__": 792 - }, - { - "__id__": 794 - }, - { - "__id__": 795 - }, - { - "__id__": 797 - }, - { - "__id__": 799 - }, - { - "__id__": 800 - }, - { - "__id__": 802 - }, { "__id__": 804 }, @@ -12165,6 +12368,48 @@ }, { "__id__": 807 + }, + { + "__id__": 808 + }, + { + "__id__": 809 + }, + { + "__id__": 811 + }, + { + "__id__": 813 + }, + { + "__id__": 815 + }, + { + "__id__": 817 + }, + { + "__id__": 818 + }, + { + "__id__": 820 + }, + { + "__id__": 822 + }, + { + "__id__": 823 + }, + { + "__id__": 825 + }, + { + "__id__": 827 + }, + { + "__id__": 829 + }, + { + "__id__": 830 } ], "removedComponents": [] @@ -12172,7 +12417,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 782 + "__id__": 805 }, "propertyPath": [ "_name" @@ -12188,7 +12433,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 782 + "__id__": 805 }, "propertyPath": [ "_lpos" @@ -12203,7 +12448,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 782 + "__id__": 805 }, "propertyPath": [ "_lrot" @@ -12219,7 +12464,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 782 + "__id__": 805 }, "propertyPath": [ "_euler" @@ -12234,7 +12479,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 787 + "__id__": 810 }, "propertyPath": [ "_contentSize" @@ -12254,7 +12499,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 789 + "__id__": 812 }, "propertyPath": [ "_contentSize" @@ -12274,7 +12519,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 791 + "__id__": 814 }, "propertyPath": [ "_contentSize" @@ -12294,7 +12539,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 793 + "__id__": 816 }, "propertyPath": [ "_spriteFrame" @@ -12313,7 +12558,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 793 + "__id__": 816 }, "propertyPath": [ "_atlas" @@ -12326,7 +12571,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 796 + "__id__": 819 }, "propertyPath": [ "_contentSize" @@ -12346,7 +12591,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 798 + "__id__": 821 }, "propertyPath": [ "_spriteFrame" @@ -12365,7 +12610,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 798 + "__id__": 821 }, "propertyPath": [ "_atlas" @@ -12378,7 +12623,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 801 + "__id__": 824 }, "propertyPath": [ "_string" @@ -12394,7 +12639,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 803 + "__id__": 826 }, "propertyPath": [ "_string" @@ -12410,7 +12655,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 805 + "__id__": 828 }, "propertyPath": [ "_contentSize" @@ -12430,7 +12675,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 787 + "__id__": 810 }, "propertyPath": [ "_anchorPoint" @@ -12444,7 +12689,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 808 + "__id__": 831 }, "propertyPath": [ "_lpos" @@ -12468,11 +12713,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 687 + "__id__": 710 }, "_enabled": true, "__prefab": { - "__id__": 810 + "__id__": 833 }, "_contentSize": { "__type__": "cc.Size", @@ -12496,11 +12741,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 687 + "__id__": 710 }, "_enabled": true, "__prefab": { - "__id__": 812 + "__id__": 835 }, "_alignFlags": 44, "_target": null, @@ -12532,11 +12777,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 687 + "__id__": 710 }, "_enabled": true, "__prefab": { - "__id__": 814 + "__id__": 837 }, "_resizeMode": 0, "_layoutType": 1, @@ -12587,32 +12832,32 @@ }, "_children": [ { - "__id__": 817 + "__id__": 840 }, { - "__id__": 827 + "__id__": 850 }, { - "__id__": 837 + "__id__": 860 } ], "_active": false, "_components": [ { - "__id__": 847 + "__id__": 870 }, { - "__id__": 849 + "__id__": 872 }, { - "__id__": 851 + "__id__": 874 }, { - "__id__": 853 + "__id__": 876 } ], "_prefab": { - "__id__": 855 + "__id__": 878 }, "_lpos": { "__type__": "cc.Vec3", @@ -12649,21 +12894,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 816 + "__id__": 839 }, "_children": [ { - "__id__": 818 + "__id__": 841 } ], "_active": true, "_components": [ { - "__id__": 824 + "__id__": 847 } ], "_prefab": { - "__id__": 826 + "__id__": 849 }, "_lpos": { "__type__": "cc.Vec3", @@ -12700,20 +12945,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 817 + "__id__": 840 }, "_children": [], "_active": true, "_components": [ { - "__id__": 819 + "__id__": 842 }, { - "__id__": 821 + "__id__": 844 } ], "_prefab": { - "__id__": 823 + "__id__": 846 }, "_lpos": { "__type__": "cc.Vec3", @@ -12750,11 +12995,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 818 + "__id__": 841 }, "_enabled": true, "__prefab": { - "__id__": 820 + "__id__": 843 }, "_contentSize": { "__type__": "cc.Size", @@ -12778,11 +13023,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 818 + "__id__": 841 }, "_enabled": true, "__prefab": { - "__id__": 822 + "__id__": 845 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12836,11 +13081,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 817 + "__id__": 840 }, "_enabled": true, "__prefab": { - "__id__": 825 + "__id__": 848 }, "_contentSize": { "__type__": "cc.Size", @@ -12877,21 +13122,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 816 + "__id__": 839 }, "_children": [ { - "__id__": 828 + "__id__": 851 } ], "_active": true, "_components": [ { - "__id__": 834 + "__id__": 857 } ], "_prefab": { - "__id__": 836 + "__id__": 859 }, "_lpos": { "__type__": "cc.Vec3", @@ -12928,20 +13173,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 827 + "__id__": 850 }, "_children": [], "_active": true, "_components": [ { - "__id__": 829 + "__id__": 852 }, { - "__id__": 831 + "__id__": 854 } ], "_prefab": { - "__id__": 833 + "__id__": 856 }, "_lpos": { "__type__": "cc.Vec3", @@ -12978,11 +13223,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 828 + "__id__": 851 }, "_enabled": true, "__prefab": { - "__id__": 830 + "__id__": 853 }, "_contentSize": { "__type__": "cc.Size", @@ -13006,11 +13251,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 828 + "__id__": 851 }, "_enabled": true, "__prefab": { - "__id__": 832 + "__id__": 855 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13064,11 +13309,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 827 + "__id__": 850 }, "_enabled": true, "__prefab": { - "__id__": 835 + "__id__": 858 }, "_contentSize": { "__type__": "cc.Size", @@ -13105,21 +13350,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 816 + "__id__": 839 }, "_children": [ { - "__id__": 838 + "__id__": 861 } ], "_active": true, "_components": [ { - "__id__": 844 + "__id__": 867 } ], "_prefab": { - "__id__": 846 + "__id__": 869 }, "_lpos": { "__type__": "cc.Vec3", @@ -13156,20 +13401,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 837 + "__id__": 860 }, "_children": [], "_active": true, "_components": [ { - "__id__": 839 + "__id__": 862 }, { - "__id__": 841 + "__id__": 864 } ], "_prefab": { - "__id__": 843 + "__id__": 866 }, "_lpos": { "__type__": "cc.Vec3", @@ -13206,11 +13451,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 838 + "__id__": 861 }, "_enabled": true, "__prefab": { - "__id__": 840 + "__id__": 863 }, "_contentSize": { "__type__": "cc.Size", @@ -13234,11 +13479,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 838 + "__id__": 861 }, "_enabled": true, "__prefab": { - "__id__": 842 + "__id__": 865 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13292,11 +13537,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 837 + "__id__": 860 }, "_enabled": true, "__prefab": { - "__id__": 845 + "__id__": 868 }, "_contentSize": { "__type__": "cc.Size", @@ -13333,11 +13578,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 816 + "__id__": 839 }, "_enabled": true, "__prefab": { - "__id__": 848 + "__id__": 871 }, "_contentSize": { "__type__": "cc.Size", @@ -13361,11 +13606,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 816 + "__id__": 839 }, "_enabled": true, "__prefab": { - "__id__": 850 + "__id__": 873 }, "_alignFlags": 44, "_target": null, @@ -13397,11 +13642,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 816 + "__id__": 839 }, "_enabled": true, "__prefab": { - "__id__": 852 + "__id__": 875 }, "_resizeMode": 0, "_layoutType": 1, @@ -13435,11 +13680,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 816 + "__id__": 839 }, "_enabled": true, "__prefab": { - "__id__": 854 + "__id__": 877 }, "_id": "" }, @@ -13470,26 +13715,26 @@ }, "_children": [ { - "__id__": 857 + "__id__": 880 }, { - "__id__": 863 + "__id__": 886 }, { - "__id__": 871 + "__id__": 894 } ], "_active": true, "_components": [ { - "__id__": 881 + "__id__": 904 }, { - "__id__": 883 + "__id__": 906 } ], "_prefab": { - "__id__": 885 + "__id__": 908 }, "_lpos": { "__type__": "cc.Vec3", @@ -13526,20 +13771,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 856 + "__id__": 879 }, "_children": [], "_active": true, "_components": [ { - "__id__": 858 + "__id__": 881 }, { - "__id__": 860 + "__id__": 883 } ], "_prefab": { - "__id__": 862 + "__id__": 885 }, "_lpos": { "__type__": "cc.Vec3", @@ -13576,11 +13821,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 857 + "__id__": 880 }, "_enabled": true, "__prefab": { - "__id__": 859 + "__id__": 882 }, "_contentSize": { "__type__": "cc.Size", @@ -13604,11 +13849,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 857 + "__id__": 880 }, "_enabled": true, "__prefab": { - "__id__": 861 + "__id__": 884 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13662,23 +13907,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 856 + "__id__": 879 }, "_children": [], "_active": false, "_components": [ { - "__id__": 864 + "__id__": 887 }, { - "__id__": 866 + "__id__": 889 }, { - "__id__": 868 + "__id__": 891 } ], "_prefab": { - "__id__": 870 + "__id__": 893 }, "_lpos": { "__type__": "cc.Vec3", @@ -13715,11 +13960,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 863 + "__id__": 886 }, "_enabled": true, "__prefab": { - "__id__": 865 + "__id__": 888 }, "_contentSize": { "__type__": "cc.Size", @@ -13743,11 +13988,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 863 + "__id__": 886 }, "_enabled": true, "__prefab": { - "__id__": 867 + "__id__": 890 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13791,11 +14036,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 863 + "__id__": 886 }, "_enabled": true, "__prefab": { - "__id__": 869 + "__id__": 892 }, "_alignFlags": 40, "_target": null, @@ -13840,26 +14085,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 856 + "__id__": 879 }, "_children": [], "_active": true, "_components": [ { - "__id__": 872 + "__id__": 895 }, { - "__id__": 874 + "__id__": 897 }, { - "__id__": 876 + "__id__": 899 }, { - "__id__": 878 + "__id__": 901 } ], "_prefab": { - "__id__": 880 + "__id__": 903 }, "_lpos": { "__type__": "cc.Vec3", @@ -13896,11 +14141,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 871 + "__id__": 894 }, "_enabled": true, "__prefab": { - "__id__": 873 + "__id__": 896 }, "_contentSize": { "__type__": "cc.Size", @@ -13924,11 +14169,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 871 + "__id__": 894 }, "_enabled": true, "__prefab": { - "__id__": 875 + "__id__": 898 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13992,11 +14237,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 871 + "__id__": 894 }, "_enabled": true, "__prefab": { - "__id__": 877 + "__id__": 900 }, "_params": [], "_dataID": "", @@ -14012,11 +14257,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 871 + "__id__": 894 }, "_enabled": true, "__prefab": { - "__id__": 879 + "__id__": 902 }, "_alignFlags": 45, "_target": null, @@ -14061,11 +14306,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 856 + "__id__": 879 }, "_enabled": true, "__prefab": { - "__id__": 882 + "__id__": 905 }, "_contentSize": { "__type__": "cc.Size", @@ -14089,11 +14334,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 856 + "__id__": 879 }, "_enabled": true, "__prefab": { - "__id__": 884 + "__id__": 907 }, "_alignFlags": 1, "_target": null, @@ -14142,26 +14387,26 @@ }, "_children": [ { - "__id__": 887 + "__id__": 910 }, { - "__id__": 903 + "__id__": 926 }, { - "__id__": 913 + "__id__": 936 } ], "_active": true, "_components": [ { - "__id__": 925 + "__id__": 948 }, { - "__id__": 927 + "__id__": 950 } ], "_prefab": { - "__id__": 929 + "__id__": 952 }, "_lpos": { "__type__": "cc.Vec3", @@ -14198,24 +14443,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 886 + "__id__": 909 }, "_children": [ { - "__id__": 888 + "__id__": 911 }, { - "__id__": 894 + "__id__": 917 } ], "_active": true, "_components": [ { - "__id__": 900 + "__id__": 923 } ], "_prefab": { - "__id__": 902 + "__id__": 925 }, "_lpos": { "__type__": "cc.Vec3", @@ -14252,20 +14497,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 887 + "__id__": 910 }, "_children": [], "_active": true, "_components": [ { - "__id__": 889 + "__id__": 912 }, { - "__id__": 891 + "__id__": 914 } ], "_prefab": { - "__id__": 893 + "__id__": 916 }, "_lpos": { "__type__": "cc.Vec3", @@ -14302,11 +14547,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 888 + "__id__": 911 }, "_enabled": true, "__prefab": { - "__id__": 890 + "__id__": 913 }, "_contentSize": { "__type__": "cc.Size", @@ -14330,11 +14575,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 888 + "__id__": 911 }, "_enabled": true, "__prefab": { - "__id__": 892 + "__id__": 915 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14391,20 +14636,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 887 + "__id__": 910 }, "_children": [], "_active": true, "_components": [ { - "__id__": 895 + "__id__": 918 }, { - "__id__": 897 + "__id__": 920 } ], "_prefab": { - "__id__": 899 + "__id__": 922 }, "_lpos": { "__type__": "cc.Vec3", @@ -14441,11 +14686,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 894 + "__id__": 917 }, "_enabled": true, "__prefab": { - "__id__": 896 + "__id__": 919 }, "_contentSize": { "__type__": "cc.Size", @@ -14469,11 +14714,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 894 + "__id__": 917 }, "_enabled": true, "__prefab": { - "__id__": 898 + "__id__": 921 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14550,11 +14795,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 887 + "__id__": 910 }, "_enabled": true, "__prefab": { - "__id__": 901 + "__id__": 924 }, "_contentSize": { "__type__": "cc.Size", @@ -14591,21 +14836,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 886 + "__id__": 909 }, "_children": [ { - "__id__": 904 + "__id__": 927 } ], "_active": false, "_components": [ { - "__id__": 910 + "__id__": 933 } ], "_prefab": { - "__id__": 912 + "__id__": 935 }, "_lpos": { "__type__": "cc.Vec3", @@ -14642,20 +14887,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 903 + "__id__": 926 }, "_children": [], "_active": true, "_components": [ { - "__id__": 905 + "__id__": 928 }, { - "__id__": 907 + "__id__": 930 } ], "_prefab": { - "__id__": 909 + "__id__": 932 }, "_lpos": { "__type__": "cc.Vec3", @@ -14692,11 +14937,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 904 + "__id__": 927 }, "_enabled": true, "__prefab": { - "__id__": 906 + "__id__": 929 }, "_contentSize": { "__type__": "cc.Size", @@ -14720,11 +14965,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 904 + "__id__": 927 }, "_enabled": true, "__prefab": { - "__id__": 908 + "__id__": 931 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14801,11 +15046,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 903 + "__id__": 926 }, "_enabled": true, "__prefab": { - "__id__": 911 + "__id__": 934 }, "_contentSize": { "__type__": "cc.Size", @@ -14842,24 +15087,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 886 + "__id__": 909 }, "_children": [ { - "__id__": 914 + "__id__": 937 } ], "_active": true, "_components": [ { - "__id__": 920 + "__id__": 943 }, { - "__id__": 922 + "__id__": 945 } ], "_prefab": { - "__id__": 924 + "__id__": 947 }, "_lpos": { "__type__": "cc.Vec3", @@ -14896,20 +15141,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 913 + "__id__": 936 }, "_children": [], "_active": true, "_components": [ { - "__id__": 915 + "__id__": 938 }, { - "__id__": 917 + "__id__": 940 } ], "_prefab": { - "__id__": 919 + "__id__": 942 }, "_lpos": { "__type__": "cc.Vec3", @@ -14946,11 +15191,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 914 + "__id__": 937 }, "_enabled": true, "__prefab": { - "__id__": 916 + "__id__": 939 }, "_contentSize": { "__type__": "cc.Size", @@ -14974,11 +15219,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 914 + "__id__": 937 }, "_enabled": true, "__prefab": { - "__id__": 918 + "__id__": 941 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15035,11 +15280,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 913 + "__id__": 936 }, "_enabled": true, "__prefab": { - "__id__": 921 + "__id__": 944 }, "_contentSize": { "__type__": "cc.Size", @@ -15063,11 +15308,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 913 + "__id__": 936 }, "_enabled": true, "__prefab": { - "__id__": 923 + "__id__": 946 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15144,11 +15389,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 886 + "__id__": 909 }, "_enabled": true, "__prefab": { - "__id__": 926 + "__id__": 949 }, "_contentSize": { "__type__": "cc.Size", @@ -15172,11 +15417,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 886 + "__id__": 909 }, "_enabled": true, "__prefab": { - "__id__": 928 + "__id__": 951 }, "_alignFlags": 41, "_target": null, @@ -15225,7 +15470,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 931 + "__id__": 954 }, "_contentSize": { "__type__": "cc.Size", @@ -15253,7 +15498,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 933 + "__id__": 956 }, "_alignFlags": 21, "_target": null, @@ -15289,16 +15534,16 @@ }, "_enabled": true, "__prefab": { - "__id__": 935 + "__id__": 958 }, "debugMode": false, "showMemoryPanel": true, "start_btn": null, "time_node": { - "__id__": 886 + "__id__": 909 }, "tooltip": { - "__id__": 856 + "__id__": 879 }, "_id": "" }, @@ -15316,92 +15561,92 @@ }, "_enabled": true, "__prefab": { - "__id__": 937 + "__id__": 960 }, "cardPanNode": { - "__id__": 378 + "__id__": 401 }, "cards_node": { - "__id__": 420 + "__id__": 443 }, "cardPrefab": { "__uuid__": "f2f9a3e0-d0f5-46f4-84bd-dd54c2248470", "__expectedType__": "cc.Prefab" }, "closeCards": { - "__id__": 439 + "__id__": 462 }, "nock_node": { - "__id__": 816 + "__id__": 839 }, "showHeros": { - "__id__": 688 + "__id__": 711 }, "herosPanNode": { - "__id__": 305 + "__id__": 307 }, "herosBoxNode": { - "__id__": 325 + "__id__": 327 }, "showEquips": { - "__id__": 717 + "__id__": 740 }, "equipsPanNode": { - "__id__": 487 + "__id__": 510 }, "equipsBoxNode": { - "__id__": 528 + "__id__": 551 }, "equipPrefab": { "__uuid__": "f30f91b1-3100-4d9e-befb-cdde5f86e6f8", "__expectedType__": "cc.Prefab" }, "showSkills": { - "__id__": 749 + "__id__": 772 }, "skillPanNode": { - "__id__": 553 + "__id__": 576 }, "skillBoxNode": { - "__id__": 594 + "__id__": 617 }, "sCardPrefab": { "__uuid__": "78a5b2d1-a34b-4190-895d-7d0aa22037cc", "__expectedType__": "cc.Prefab" }, "showShop": { - "__id__": 778 + "__id__": 801 }, "shopPanNode": { - "__id__": 621 + "__id__": 644 }, "shopBoxNode": { - "__id__": 662 + "__id__": 685 }, "itemPrefab": { "__uuid__": "abae16b3-c2a2-4971-95b1-fc121f769554", "__expectedType__": "cc.Prefab" }, "skill_refresh": { - "__id__": 602 + "__id__": 625 }, "equip_refresh": { - "__id__": 536 + "__id__": 559 }, "shop_refresh": { - "__id__": 670 + "__id__": 693 }, "cards_chou": { - "__id__": 429 + "__id__": 452 }, "coins_node": { "__id__": 171 }, "hero_num_node": { - "__id__": 243 + "__id__": 244 }, "refresh_stone_num_node": { - "__id__": 207 + "__id__": 208 }, "_id": "" }, @@ -15419,7 +15664,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 939 + "__id__": 962 }, "_id": "" }, @@ -15437,7 +15682,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 941 + "__id__": 964 }, "debugMode": false, "_id": "" @@ -15456,7 +15701,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 943 + "__id__": 966 }, "skill_box": { "__uuid__": "d19cde30-f5d0-47de-a0d5-3a272b696343", @@ -15478,7 +15723,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 945 + "__id__": 968 }, "equip_box": { "__uuid__": "66d7902d-2a85-43d5-8cbb-671cc7dbb275", @@ -15503,73 +15748,73 @@ "targetOverrides": [], "nestedPrefabInstanceRoots": [ { - "__id__": 778 + "__id__": 801 }, { - "__id__": 749 + "__id__": 772 }, { - "__id__": 717 + "__id__": 740 }, { - "__id__": 688 + "__id__": 711 }, { - "__id__": 670 + "__id__": 693 }, { - "__id__": 622 + "__id__": 645 }, { - "__id__": 627 + "__id__": 650 }, { - "__id__": 602 + "__id__": 625 }, { - "__id__": 554 + "__id__": 577 + }, + { + "__id__": 582 }, { "__id__": 559 }, { - "__id__": 536 + "__id__": 511 }, { - "__id__": 488 + "__id__": 516 }, { - "__id__": 493 + "__id__": 462 }, { - "__id__": 439 + "__id__": 452 }, { - "__id__": 429 + "__id__": 402 }, { - "__id__": 379 + "__id__": 407 }, { - "__id__": 384 + "__id__": 372 }, { - "__id__": 356 + "__id__": 350 }, { - "__id__": 341 + "__id__": 328 }, { - "__id__": 326 + "__id__": 308 }, { - "__id__": 306 + "__id__": 245 }, { - "__id__": 244 - }, - { - "__id__": 208 + "__id__": 209 }, { "__id__": 172 diff --git a/assets/script/game/map/HeroBoxComp.ts b/assets/script/game/map/HeroBoxComp.ts index baf66c0b..f219fff7 100644 --- a/assets/script/game/map/HeroBoxComp.ts +++ b/assets/script/game/map/HeroBoxComp.ts @@ -189,9 +189,9 @@ export class HeroBoxComp extends CCComp { */ private onSellHeroClick() { if (!this.eid || !this.model) return; - // 场上仅剩 1 个英雄时不允许出售(至少保留一个作战单位) + // 场上仅剩 1 个英雄时不允许出售:复用英雄栏 smalltip 气泡提示(与满员同一挂载点) if (HeroBoxComp.getAliveHeroCount() <= 1) { - oops.gui.toast("至少保留 1 个英雄"); + oops.message.dispatchEvent(GameEvent.ShowSmallTip, { type: "hero_full", text: "至少保留 1 个英雄" }); return; } oops.audio.playEffect("music/button"); diff --git a/assets/script/game/map/MissionCardComp.ts b/assets/script/game/map/MissionCardComp.ts index 372c3ec1..9561cbbc 100644 --- a/assets/script/game/map/MissionCardComp.ts +++ b/assets/script/game/map/MissionCardComp.ts @@ -455,11 +455,17 @@ export class MissionCardComp extends CCComp { } private onShowSmallTip(event: string, args: any) { - const type = args as string; - this.showSmallTip(type as any); + // 支持字符串(仅类型)或 { type, text }(类型 + 自定义文案)两种负载 + const payload = typeof args === "string" ? { type: args } : (args ?? {}); + this.showSmallTip(payload.type, payload.text); } - public showSmallTip(type: "refresh_coin" | "buy_coin" | "hero_full") { + /** + * 在目标节点上弹出 smalltip 气泡(缩放动画)。 + * @param type 提示类型(决定挂载到哪个节点) + * @param text 可选:覆盖气泡文字(默认读 prefab 中配置的文本) + */ + public showSmallTip(type: "refresh_coin" | "buy_coin" | "hero_full", text?: string) { let targetNode: Node | null = null; switch (type) { case "refresh_coin": @@ -475,6 +481,11 @@ export class MissionCardComp extends CCComp { if (targetNode && targetNode.isValid) { const tipNode = targetNode.getChildByName("smalltip"); if (tipNode) { + // 动态覆盖气泡文字(box/Label),用于同节点多文案场景(如英雄满员 / 至少保留 1 人) + if (text) { + const label = tipNode.getComponentInChildren(Label); + if (label) label.string = text; + } tipNode.active = true; Tween.stopAllByTarget(tipNode); @@ -740,7 +751,7 @@ export class MissionCardComp extends CCComp { if (current >= heroMax) { payload.cancel = true; payload.reason = "hero_limit"; - this.showSmallTip("hero_full"); + this.showSmallTip("hero_full", "英雄队伍已满"); this.playHeroNumDeniedAnim(); } }