From efaf6ac27c5dfa0db1db2c4739d62fd62804b114 Mon Sep 17 00:00:00 2001
From: "pan@work" <panfudan0209@qq.com>
Date: Thu, 19 Sep 2024 17:20:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E4=B8=80=E6=AD=A5=20=E8=8B=B1?=
 =?UTF-8?q?=E9=9B=84=E6=8A=80=E8=83=BD=20ui=20=E5=88=B6=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/resources/gui/role_controller.prefab   | 1463 ++++++++---------
 assets/script/game/Role/RoleViewComp.ts       |   22 +-
 .../script/game/common/SingletonModuleComp.ts |   15 +-
 3 files changed, 673 insertions(+), 827 deletions(-)

diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab
index 1c009f6e..df48bdc7 100644
--- a/assets/resources/gui/role_controller.prefab
+++ b/assets/resources/gui/role_controller.prefab
@@ -31,44 +31,41 @@
         "__id__": 304
       },
       {
-        "__id__": 316
+        "__id__": 333
       },
       {
-        "__id__": 345
+        "__id__": 357
       },
       {
-        "__id__": 369
+        "__id__": 365
       },
       {
-        "__id__": 377
+        "__id__": 635
       },
       {
-        "__id__": 647
+        "__id__": 641
       },
       {
-        "__id__": 653
+        "__id__": 698
       },
       {
-        "__id__": 710
-      },
-      {
-        "__id__": 662
+        "__id__": 650
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 724
+        "__id__": 712
       },
       {
-        "__id__": 726
+        "__id__": 714
       },
       {
-        "__id__": 728
+        "__id__": 716
       }
     ],
     "_prefab": {
-      "__id__": 730
+      "__id__": 718
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -108,7 +105,7 @@
       "__id__": 1
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 3
@@ -7099,163 +7096,6 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
-  {
-    "__type__": "cc.Node",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_prefab": {
-      "__id__": 305
-    },
-    "__editorExtras__": {}
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 304
-    },
-    "asset": {
-      "__uuid__": "d0be7733-e160-4cff-8733-8fd75f10813d",
-      "__expectedType__": "cc.Prefab"
-    },
-    "fileId": "c46/YsCPVOJYA4mWEpNYRx",
-    "instance": {
-      "__id__": 306
-    },
-    "targetOverrides": null
-  },
-  {
-    "__type__": "cc.PrefabInstance",
-    "fileId": "9bCLol7VNBAKqOWWWzDE3g",
-    "prefabRootNode": {
-      "__id__": 1
-    },
-    "mountedChildren": [],
-    "mountedComponents": [],
-    "propertyOverrides": [
-      {
-        "__id__": 307
-      },
-      {
-        "__id__": 309
-      },
-      {
-        "__id__": 310
-      },
-      {
-        "__id__": 311
-      },
-      {
-        "__id__": 312
-      },
-      {
-        "__id__": 314
-      },
-      {
-        "__id__": 315
-      }
-    ],
-    "removedComponents": []
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 308
-    },
-    "propertyPath": [
-      "_name"
-    ],
-    "value": "hero_info"
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "c46/YsCPVOJYA4mWEpNYRx"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 308
-    },
-    "propertyPath": [
-      "_lpos"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 10,
-      "y": 269.729,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 308
-    },
-    "propertyPath": [
-      "_lrot"
-    ],
-    "value": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 308
-    },
-    "propertyPath": [
-      "_euler"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 313
-    },
-    "propertyPath": [
-      "_left"
-    ],
-    "value": 10
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "4cvO4etMZPXb7O03rne8fM"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 313
-    },
-    "propertyPath": [
-      "_right"
-    ],
-    "value": 0
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 308
-    },
-    "propertyPath": [
-      "_active"
-    ],
-    "value": true
-  },
   {
     "__type__": "cc.Node",
     "_name": "shuaxin",
@@ -7266,23 +7106,23 @@
     },
     "_children": [
       {
-        "__id__": 317
+        "__id__": 305
       },
       {
-        "__id__": 326
+        "__id__": 314
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 340
+        "__id__": 328
       },
       {
-        "__id__": 342
+        "__id__": 330
       }
     ],
     "_prefab": {
-      "__id__": 344
+      "__id__": 332
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -7319,23 +7159,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 316
+      "__id__": 304
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 318
+        "__id__": 306
       },
       {
-        "__id__": 320
+        "__id__": 308
       },
       {
-        "__id__": 322
+        "__id__": 310
       }
     ],
     "_prefab": {
-      "__id__": 325
+      "__id__": 313
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -7372,11 +7212,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 317
+      "__id__": 305
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 319
+      "__id__": 307
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -7400,11 +7240,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 317
+      "__id__": 305
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 321
+      "__id__": 309
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -7445,15 +7285,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 317
+      "__id__": 305
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 323
+      "__id__": 311
     },
     "clickEvents": [
       {
-        "__id__": 324
+        "__id__": 312
       }
     ],
     "_interactable": true,
@@ -7528,24 +7368,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 316
+      "__id__": 304
     },
     "_children": [
       {
-        "__id__": 327
+        "__id__": 315
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 335
+        "__id__": 323
       },
       {
-        "__id__": 337
+        "__id__": 325
       }
     ],
     "_prefab": {
-      "__id__": 339
+      "__id__": 327
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -7582,23 +7422,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 326
+      "__id__": 314
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 328
+        "__id__": 316
       },
       {
-        "__id__": 330
+        "__id__": 318
       },
       {
-        "__id__": 332
+        "__id__": 320
       }
     ],
     "_prefab": {
-      "__id__": 334
+      "__id__": 322
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -7635,11 +7475,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 327
+      "__id__": 315
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 329
+      "__id__": 317
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -7663,11 +7503,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 327
+      "__id__": 315
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 331
+      "__id__": 319
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -7731,11 +7571,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 327
+      "__id__": 315
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 333
+      "__id__": 321
     },
     "templateMode": false,
     "watchPath": "data.cards.ref_cost",
@@ -7766,11 +7606,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 326
+      "__id__": 314
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 336
+      "__id__": 324
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -7794,11 +7634,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 326
+      "__id__": 314
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 338
+      "__id__": 326
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -7852,11 +7692,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 316
+      "__id__": 304
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 341
+      "__id__": 329
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -7880,11 +7720,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 316
+      "__id__": 304
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 343
+      "__id__": 331
     },
     "_alignFlags": 36,
     "_target": null,
@@ -7933,20 +7773,20 @@
     },
     "_children": [
       {
-        "__id__": 346
+        "__id__": 334
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 364
+        "__id__": 352
       },
       {
-        "__id__": 366
+        "__id__": 354
       }
     ],
     "_prefab": {
-      "__id__": 368
+      "__id__": 356
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -7983,33 +7823,33 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 345
+      "__id__": 333
     },
     "_children": [
       {
-        "__id__": 347
+        "__id__": 335
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 353
+        "__id__": 341
       },
       {
-        "__id__": 355
+        "__id__": 343
       },
       {
-        "__id__": 357
+        "__id__": 345
       },
       {
-        "__id__": 359
+        "__id__": 347
       },
       {
-        "__id__": 361
+        "__id__": 349
       }
     ],
     "_prefab": {
-      "__id__": 363
+      "__id__": 351
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -8046,20 +7886,20 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 346
+      "__id__": 334
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 348
+        "__id__": 336
       },
       {
-        "__id__": 350
+        "__id__": 338
       }
     ],
     "_prefab": {
-      "__id__": 352
+      "__id__": 340
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -8096,11 +7936,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 347
+      "__id__": 335
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 349
+      "__id__": 337
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -8124,11 +7964,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 347
+      "__id__": 335
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 351
+      "__id__": 339
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -8182,11 +8022,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 346
+      "__id__": 334
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 354
+      "__id__": 342
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -8210,11 +8050,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 346
+      "__id__": 334
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 356
+      "__id__": 344
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -8252,14 +8092,14 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 346
+      "__id__": 334
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 358
+      "__id__": 346
     },
     "_barSprite": {
-      "__id__": 350
+      "__id__": 338
     },
     "_mode": 2,
     "_totalLength": 1,
@@ -8277,11 +8117,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 346
+      "__id__": 334
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 360
+      "__id__": 348
     },
     "controller": false,
     "watchPath": "",
@@ -8305,11 +8145,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 346
+      "__id__": 334
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 362
+      "__id__": 350
     },
     "_alignFlags": 4,
     "_target": null,
@@ -8354,11 +8194,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 345
+      "__id__": 333
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 365
+      "__id__": 353
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -8382,11 +8222,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 345
+      "__id__": 333
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 367
+      "__id__": 355
     },
     "_alignFlags": 44,
     "_target": null,
@@ -8437,17 +8277,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 370
+        "__id__": 358
       },
       {
-        "__id__": 372
+        "__id__": 360
       },
       {
-        "__id__": 374
+        "__id__": 362
       }
     ],
     "_prefab": {
-      "__id__": 376
+      "__id__": 364
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -8484,11 +8324,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 369
+      "__id__": 357
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 371
+      "__id__": 359
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -8512,11 +8352,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 369
+      "__id__": 357
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 373
+      "__id__": 361
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -8557,11 +8397,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 369
+      "__id__": 357
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 375
+      "__id__": 363
     },
     "_alignFlags": 4,
     "_target": null,
@@ -8610,35 +8450,35 @@
     },
     "_children": [
       {
-        "__id__": 378
+        "__id__": 366
       },
       {
-        "__id__": 422
+        "__id__": 410
       },
       {
-        "__id__": 466
+        "__id__": 454
       },
       {
-        "__id__": 510
+        "__id__": 498
       },
       {
-        "__id__": 554
+        "__id__": 542
       },
       {
-        "__id__": 598
+        "__id__": 586
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 642
+        "__id__": 630
       },
       {
-        "__id__": 644
+        "__id__": 632
       }
     ],
     "_prefab": {
-      "__id__": 646
+      "__id__": 634
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -8675,39 +8515,39 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 377
+      "__id__": 365
     },
     "_children": [
       {
-        "__id__": 379
+        "__id__": 367
+      },
+      {
+        "__id__": 373
       },
       {
         "__id__": 385
       },
+      {
+        "__id__": 391
+      },
       {
         "__id__": 397
-      },
-      {
-        "__id__": 403
-      },
-      {
-        "__id__": 409
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 415
+        "__id__": 403
       },
       {
-        "__id__": 417
+        "__id__": 405
       },
       {
-        "__id__": 419
+        "__id__": 407
       }
     ],
     "_prefab": {
-      "__id__": 421
+      "__id__": 409
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -8744,20 +8584,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 378
+      "__id__": 366
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 380
+        "__id__": 368
       },
       {
-        "__id__": 382
+        "__id__": 370
       }
     ],
     "_prefab": {
-      "__id__": 384
+      "__id__": 372
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -8794,11 +8634,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 379
+      "__id__": 367
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 381
+      "__id__": 369
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -8822,11 +8662,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 379
+      "__id__": 367
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 383
+      "__id__": 371
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -8877,24 +8717,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 378
+      "__id__": 366
     },
     "_children": [
       {
-        "__id__": 386
+        "__id__": 374
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 392
+        "__id__": 380
       },
       {
-        "__id__": 394
+        "__id__": 382
       }
     ],
     "_prefab": {
-      "__id__": 396
+      "__id__": 384
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -8931,20 +8771,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 385
+      "__id__": 373
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 387
+        "__id__": 375
       },
       {
-        "__id__": 389
+        "__id__": 377
       }
     ],
     "_prefab": {
-      "__id__": 391
+      "__id__": 379
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -8981,11 +8821,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 386
+      "__id__": 374
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 388
+      "__id__": 376
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -9009,11 +8849,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 386
+      "__id__": 374
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 390
+      "__id__": 378
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -9090,11 +8930,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 385
+      "__id__": 373
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 393
+      "__id__": 381
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -9118,11 +8958,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 385
+      "__id__": 373
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 395
+      "__id__": 383
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -9176,20 +9016,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 378
+      "__id__": 366
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 398
+        "__id__": 386
       },
       {
-        "__id__": 400
+        "__id__": 388
       }
     ],
     "_prefab": {
-      "__id__": 402
+      "__id__": 390
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -9226,11 +9066,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 397
+      "__id__": 385
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 399
+      "__id__": 387
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -9254,11 +9094,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 397
+      "__id__": 385
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 401
+      "__id__": 389
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -9335,20 +9175,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 378
+      "__id__": 366
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 404
+        "__id__": 392
       },
       {
-        "__id__": 406
+        "__id__": 394
       }
     ],
     "_prefab": {
-      "__id__": 408
+      "__id__": 396
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -9385,11 +9225,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 403
+      "__id__": 391
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 405
+      "__id__": 393
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -9413,11 +9253,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 403
+      "__id__": 391
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 407
+      "__id__": 395
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -9471,20 +9311,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 378
+      "__id__": 366
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 410
+        "__id__": 398
       },
       {
-        "__id__": 412
+        "__id__": 400
       }
     ],
     "_prefab": {
-      "__id__": 414
+      "__id__": 402
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -9521,11 +9361,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 409
+      "__id__": 397
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 411
+      "__id__": 399
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -9549,11 +9389,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 409
+      "__id__": 397
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 413
+      "__id__": 401
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -9630,11 +9470,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 378
+      "__id__": 366
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 416
+      "__id__": 404
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -9658,11 +9498,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 378
+      "__id__": 366
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 418
+      "__id__": 406
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -9703,11 +9543,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 378
+      "__id__": 366
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 420
+      "__id__": 408
     },
     "clickEvents": [],
     "_interactable": true,
@@ -9772,39 +9612,39 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 377
+      "__id__": 365
     },
     "_children": [
       {
-        "__id__": 423
+        "__id__": 411
+      },
+      {
+        "__id__": 417
       },
       {
         "__id__": 429
       },
+      {
+        "__id__": 435
+      },
       {
         "__id__": 441
-      },
-      {
-        "__id__": 447
-      },
-      {
-        "__id__": 453
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 459
+        "__id__": 447
       },
       {
-        "__id__": 461
+        "__id__": 449
       },
       {
-        "__id__": 463
+        "__id__": 451
       }
     ],
     "_prefab": {
-      "__id__": 465
+      "__id__": 453
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -9841,20 +9681,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 422
+      "__id__": 410
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 424
+        "__id__": 412
       },
       {
-        "__id__": 426
+        "__id__": 414
       }
     ],
     "_prefab": {
-      "__id__": 428
+      "__id__": 416
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -9891,11 +9731,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 423
+      "__id__": 411
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 425
+      "__id__": 413
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -9919,11 +9759,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 423
+      "__id__": 411
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 427
+      "__id__": 415
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -9974,24 +9814,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 422
+      "__id__": 410
     },
     "_children": [
       {
-        "__id__": 430
+        "__id__": 418
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 436
+        "__id__": 424
       },
       {
-        "__id__": 438
+        "__id__": 426
       }
     ],
     "_prefab": {
-      "__id__": 440
+      "__id__": 428
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -10028,20 +9868,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 429
+      "__id__": 417
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 431
+        "__id__": 419
       },
       {
-        "__id__": 433
+        "__id__": 421
       }
     ],
     "_prefab": {
-      "__id__": 435
+      "__id__": 423
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -10078,11 +9918,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 430
+      "__id__": 418
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 432
+      "__id__": 420
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -10106,11 +9946,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 430
+      "__id__": 418
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 434
+      "__id__": 422
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -10187,11 +10027,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 429
+      "__id__": 417
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 437
+      "__id__": 425
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -10215,11 +10055,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 429
+      "__id__": 417
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 439
+      "__id__": 427
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -10273,20 +10113,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 422
+      "__id__": 410
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 442
+        "__id__": 430
       },
       {
-        "__id__": 444
+        "__id__": 432
       }
     ],
     "_prefab": {
-      "__id__": 446
+      "__id__": 434
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -10323,11 +10163,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 441
+      "__id__": 429
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 443
+      "__id__": 431
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -10351,11 +10191,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 441
+      "__id__": 429
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 445
+      "__id__": 433
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -10432,20 +10272,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 422
+      "__id__": 410
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 448
+        "__id__": 436
       },
       {
-        "__id__": 450
+        "__id__": 438
       }
     ],
     "_prefab": {
-      "__id__": 452
+      "__id__": 440
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -10482,11 +10322,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 447
+      "__id__": 435
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 449
+      "__id__": 437
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -10510,11 +10350,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 447
+      "__id__": 435
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 451
+      "__id__": 439
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -10568,20 +10408,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 422
+      "__id__": 410
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 454
+        "__id__": 442
       },
       {
-        "__id__": 456
+        "__id__": 444
       }
     ],
     "_prefab": {
-      "__id__": 458
+      "__id__": 446
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -10618,11 +10458,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 453
+      "__id__": 441
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 455
+      "__id__": 443
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -10646,11 +10486,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 453
+      "__id__": 441
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 457
+      "__id__": 445
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -10727,11 +10567,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 422
+      "__id__": 410
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 460
+      "__id__": 448
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -10755,11 +10595,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 422
+      "__id__": 410
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 462
+      "__id__": 450
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -10800,11 +10640,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 422
+      "__id__": 410
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 464
+      "__id__": 452
     },
     "clickEvents": [],
     "_interactable": true,
@@ -10869,39 +10709,39 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 377
+      "__id__": 365
     },
     "_children": [
       {
-        "__id__": 467
+        "__id__": 455
+      },
+      {
+        "__id__": 461
       },
       {
         "__id__": 473
       },
+      {
+        "__id__": 479
+      },
       {
         "__id__": 485
-      },
-      {
-        "__id__": 491
-      },
-      {
-        "__id__": 497
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 503
+        "__id__": 491
       },
       {
-        "__id__": 505
+        "__id__": 493
       },
       {
-        "__id__": 507
+        "__id__": 495
       }
     ],
     "_prefab": {
-      "__id__": 509
+      "__id__": 497
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -10938,20 +10778,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 466
+      "__id__": 454
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 468
+        "__id__": 456
       },
       {
-        "__id__": 470
+        "__id__": 458
       }
     ],
     "_prefab": {
-      "__id__": 472
+      "__id__": 460
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -10988,11 +10828,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 467
+      "__id__": 455
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 469
+      "__id__": 457
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -11016,11 +10856,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 467
+      "__id__": 455
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 471
+      "__id__": 459
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -11071,24 +10911,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 466
+      "__id__": 454
     },
     "_children": [
       {
-        "__id__": 474
+        "__id__": 462
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 480
+        "__id__": 468
       },
       {
-        "__id__": 482
+        "__id__": 470
       }
     ],
     "_prefab": {
-      "__id__": 484
+      "__id__": 472
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -11125,20 +10965,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 473
+      "__id__": 461
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 475
+        "__id__": 463
       },
       {
-        "__id__": 477
+        "__id__": 465
       }
     ],
     "_prefab": {
-      "__id__": 479
+      "__id__": 467
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -11175,11 +11015,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 474
+      "__id__": 462
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 476
+      "__id__": 464
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -11203,11 +11043,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 474
+      "__id__": 462
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 478
+      "__id__": 466
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -11284,11 +11124,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 473
+      "__id__": 461
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 481
+      "__id__": 469
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -11312,11 +11152,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 473
+      "__id__": 461
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 483
+      "__id__": 471
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -11370,20 +11210,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 466
+      "__id__": 454
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 486
+        "__id__": 474
       },
       {
-        "__id__": 488
+        "__id__": 476
       }
     ],
     "_prefab": {
-      "__id__": 490
+      "__id__": 478
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -11420,11 +11260,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 485
+      "__id__": 473
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 487
+      "__id__": 475
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -11448,11 +11288,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 485
+      "__id__": 473
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 489
+      "__id__": 477
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -11529,20 +11369,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 466
+      "__id__": 454
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 492
+        "__id__": 480
       },
       {
-        "__id__": 494
+        "__id__": 482
       }
     ],
     "_prefab": {
-      "__id__": 496
+      "__id__": 484
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -11579,11 +11419,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 491
+      "__id__": 479
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 493
+      "__id__": 481
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -11607,11 +11447,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 491
+      "__id__": 479
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 495
+      "__id__": 483
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -11665,20 +11505,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 466
+      "__id__": 454
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 498
+        "__id__": 486
       },
       {
-        "__id__": 500
+        "__id__": 488
       }
     ],
     "_prefab": {
-      "__id__": 502
+      "__id__": 490
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -11715,11 +11555,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 497
+      "__id__": 485
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 499
+      "__id__": 487
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -11743,11 +11583,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 497
+      "__id__": 485
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 501
+      "__id__": 489
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -11824,11 +11664,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 466
+      "__id__": 454
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 504
+      "__id__": 492
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -11852,11 +11692,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 466
+      "__id__": 454
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 506
+      "__id__": 494
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -11897,11 +11737,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 466
+      "__id__": 454
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 508
+      "__id__": 496
     },
     "clickEvents": [],
     "_interactable": true,
@@ -11966,39 +11806,39 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 377
+      "__id__": 365
     },
     "_children": [
       {
-        "__id__": 511
+        "__id__": 499
+      },
+      {
+        "__id__": 505
       },
       {
         "__id__": 517
       },
+      {
+        "__id__": 523
+      },
       {
         "__id__": 529
-      },
-      {
-        "__id__": 535
-      },
-      {
-        "__id__": 541
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 547
+        "__id__": 535
       },
       {
-        "__id__": 549
+        "__id__": 537
       },
       {
-        "__id__": 551
+        "__id__": 539
       }
     ],
     "_prefab": {
-      "__id__": 553
+      "__id__": 541
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -12035,20 +11875,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 510
+      "__id__": 498
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 512
+        "__id__": 500
       },
       {
-        "__id__": 514
+        "__id__": 502
       }
     ],
     "_prefab": {
-      "__id__": 516
+      "__id__": 504
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -12085,11 +11925,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 511
+      "__id__": 499
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 513
+      "__id__": 501
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -12113,11 +11953,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 511
+      "__id__": 499
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 515
+      "__id__": 503
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -12168,24 +12008,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 510
+      "__id__": 498
     },
     "_children": [
       {
-        "__id__": 518
+        "__id__": 506
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 524
+        "__id__": 512
       },
       {
-        "__id__": 526
+        "__id__": 514
       }
     ],
     "_prefab": {
-      "__id__": 528
+      "__id__": 516
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -12222,20 +12062,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 517
+      "__id__": 505
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 519
+        "__id__": 507
       },
       {
-        "__id__": 521
+        "__id__": 509
       }
     ],
     "_prefab": {
-      "__id__": 523
+      "__id__": 511
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -12272,11 +12112,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 518
+      "__id__": 506
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 520
+      "__id__": 508
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -12300,11 +12140,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 518
+      "__id__": 506
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 522
+      "__id__": 510
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -12381,11 +12221,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 517
+      "__id__": 505
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 525
+      "__id__": 513
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -12409,11 +12249,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 517
+      "__id__": 505
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 527
+      "__id__": 515
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -12467,20 +12307,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 510
+      "__id__": 498
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 530
+        "__id__": 518
       },
       {
-        "__id__": 532
+        "__id__": 520
       }
     ],
     "_prefab": {
-      "__id__": 534
+      "__id__": 522
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -12517,11 +12357,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 529
+      "__id__": 517
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 531
+      "__id__": 519
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -12545,11 +12385,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 529
+      "__id__": 517
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 533
+      "__id__": 521
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -12626,20 +12466,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 510
+      "__id__": 498
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 536
+        "__id__": 524
       },
       {
-        "__id__": 538
+        "__id__": 526
       }
     ],
     "_prefab": {
-      "__id__": 540
+      "__id__": 528
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -12676,11 +12516,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 535
+      "__id__": 523
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 537
+      "__id__": 525
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -12704,11 +12544,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 535
+      "__id__": 523
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 539
+      "__id__": 527
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -12762,20 +12602,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 510
+      "__id__": 498
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 542
+        "__id__": 530
       },
       {
-        "__id__": 544
+        "__id__": 532
       }
     ],
     "_prefab": {
-      "__id__": 546
+      "__id__": 534
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -12812,11 +12652,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 541
+      "__id__": 529
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 543
+      "__id__": 531
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -12840,11 +12680,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 541
+      "__id__": 529
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 545
+      "__id__": 533
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -12921,11 +12761,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 510
+      "__id__": 498
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 548
+      "__id__": 536
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -12949,11 +12789,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 510
+      "__id__": 498
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 550
+      "__id__": 538
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -12994,11 +12834,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 510
+      "__id__": 498
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 552
+      "__id__": 540
     },
     "clickEvents": [],
     "_interactable": true,
@@ -13063,39 +12903,39 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 377
+      "__id__": 365
     },
     "_children": [
       {
-        "__id__": 555
+        "__id__": 543
+      },
+      {
+        "__id__": 549
       },
       {
         "__id__": 561
       },
+      {
+        "__id__": 567
+      },
       {
         "__id__": 573
-      },
-      {
-        "__id__": 579
-      },
-      {
-        "__id__": 585
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 591
+        "__id__": 579
       },
       {
-        "__id__": 593
+        "__id__": 581
       },
       {
-        "__id__": 595
+        "__id__": 583
       }
     ],
     "_prefab": {
-      "__id__": 597
+      "__id__": 585
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -13132,20 +12972,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 554
+      "__id__": 542
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 556
+        "__id__": 544
       },
       {
-        "__id__": 558
+        "__id__": 546
       }
     ],
     "_prefab": {
-      "__id__": 560
+      "__id__": 548
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -13182,11 +13022,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 555
+      "__id__": 543
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 557
+      "__id__": 545
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -13210,11 +13050,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 555
+      "__id__": 543
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 559
+      "__id__": 547
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -13265,24 +13105,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 554
+      "__id__": 542
     },
     "_children": [
       {
-        "__id__": 562
+        "__id__": 550
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
-        "__id__": 568
+        "__id__": 556
       },
       {
-        "__id__": 570
+        "__id__": 558
       }
     ],
     "_prefab": {
-      "__id__": 572
+      "__id__": 560
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -13319,20 +13159,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 561
+      "__id__": 549
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 563
+        "__id__": 551
       },
       {
-        "__id__": 565
+        "__id__": 553
       }
     ],
     "_prefab": {
-      "__id__": 567
+      "__id__": 555
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -13369,11 +13209,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 562
+      "__id__": 550
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 564
+      "__id__": 552
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -13397,11 +13237,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 562
+      "__id__": 550
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 566
+      "__id__": 554
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -13478,11 +13318,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 561
+      "__id__": 549
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 569
+      "__id__": 557
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -13506,11 +13346,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 561
+      "__id__": 549
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 571
+      "__id__": 559
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -13564,20 +13404,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 554
+      "__id__": 542
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 574
+        "__id__": 562
       },
       {
-        "__id__": 576
+        "__id__": 564
       }
     ],
     "_prefab": {
-      "__id__": 578
+      "__id__": 566
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -13614,11 +13454,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 573
+      "__id__": 561
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 575
+      "__id__": 563
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -13642,11 +13482,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 573
+      "__id__": 561
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 577
+      "__id__": 565
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -13723,20 +13563,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 554
+      "__id__": 542
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 580
+        "__id__": 568
       },
       {
-        "__id__": 582
+        "__id__": 570
       }
     ],
     "_prefab": {
-      "__id__": 584
+      "__id__": 572
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -13773,11 +13613,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 579
+      "__id__": 567
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 581
+      "__id__": 569
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -13801,11 +13641,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 579
+      "__id__": 567
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 583
+      "__id__": 571
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -13859,20 +13699,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 554
+      "__id__": 542
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 586
+        "__id__": 574
       },
       {
-        "__id__": 588
+        "__id__": 576
       }
     ],
     "_prefab": {
-      "__id__": 590
+      "__id__": 578
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -13909,11 +13749,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 585
+      "__id__": 573
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 587
+      "__id__": 575
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -13937,11 +13777,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 585
+      "__id__": 573
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 589
+      "__id__": 577
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -14018,11 +13858,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 554
+      "__id__": 542
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 592
+      "__id__": 580
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -14046,11 +13886,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 554
+      "__id__": 542
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 594
+      "__id__": 582
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -14091,11 +13931,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 554
+      "__id__": 542
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 596
+      "__id__": 584
     },
     "clickEvents": [],
     "_interactable": true,
@@ -14160,39 +14000,39 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 377
+      "__id__": 365
     },
     "_children": [
       {
-        "__id__": 599
+        "__id__": 587
+      },
+      {
+        "__id__": 593
       },
       {
         "__id__": 605
       },
+      {
+        "__id__": 611
+      },
       {
         "__id__": 617
-      },
-      {
-        "__id__": 623
-      },
-      {
-        "__id__": 629
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 635
+        "__id__": 623
       },
       {
-        "__id__": 637
+        "__id__": 625
       },
       {
-        "__id__": 639
+        "__id__": 627
       }
     ],
     "_prefab": {
-      "__id__": 641
+      "__id__": 629
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -14229,20 +14069,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 598
+      "__id__": 586
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 600
+        "__id__": 588
       },
       {
-        "__id__": 602
+        "__id__": 590
       }
     ],
     "_prefab": {
-      "__id__": 604
+      "__id__": 592
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -14279,11 +14119,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 599
+      "__id__": 587
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 601
+      "__id__": 589
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -14307,11 +14147,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 599
+      "__id__": 587
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 603
+      "__id__": 591
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -14362,24 +14202,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 598
+      "__id__": 586
     },
     "_children": [
       {
-        "__id__": 606
+        "__id__": 594
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
-        "__id__": 612
+        "__id__": 600
       },
       {
-        "__id__": 614
+        "__id__": 602
       }
     ],
     "_prefab": {
-      "__id__": 616
+      "__id__": 604
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -14416,20 +14256,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 605
+      "__id__": 593
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 607
+        "__id__": 595
       },
       {
-        "__id__": 609
+        "__id__": 597
       }
     ],
     "_prefab": {
-      "__id__": 611
+      "__id__": 599
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -14466,11 +14306,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 606
+      "__id__": 594
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 608
+      "__id__": 596
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -14494,11 +14334,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 606
+      "__id__": 594
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 610
+      "__id__": 598
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -14575,11 +14415,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 605
+      "__id__": 593
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 613
+      "__id__": 601
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -14603,11 +14443,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 605
+      "__id__": 593
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 615
+      "__id__": 603
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -14661,20 +14501,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 598
+      "__id__": 586
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 618
+        "__id__": 606
       },
       {
-        "__id__": 620
+        "__id__": 608
       }
     ],
     "_prefab": {
-      "__id__": 622
+      "__id__": 610
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -14711,11 +14551,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 617
+      "__id__": 605
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 619
+      "__id__": 607
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -14739,11 +14579,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 617
+      "__id__": 605
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 621
+      "__id__": 609
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -14820,20 +14660,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 598
+      "__id__": 586
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 624
+        "__id__": 612
       },
       {
-        "__id__": 626
+        "__id__": 614
       }
     ],
     "_prefab": {
-      "__id__": 628
+      "__id__": 616
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -14870,11 +14710,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 623
+      "__id__": 611
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 625
+      "__id__": 613
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -14898,11 +14738,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 623
+      "__id__": 611
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 627
+      "__id__": 615
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -14956,20 +14796,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 598
+      "__id__": 586
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 630
+        "__id__": 618
       },
       {
-        "__id__": 632
+        "__id__": 620
       }
     ],
     "_prefab": {
-      "__id__": 634
+      "__id__": 622
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -15006,11 +14846,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 629
+      "__id__": 617
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 631
+      "__id__": 619
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -15034,11 +14874,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 629
+      "__id__": 617
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 633
+      "__id__": 621
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -15115,11 +14955,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 598
+      "__id__": 586
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 636
+      "__id__": 624
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -15143,11 +14983,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 598
+      "__id__": 586
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 638
+      "__id__": 626
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -15188,11 +15028,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 598
+      "__id__": 586
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 640
+      "__id__": 628
     },
     "clickEvents": [],
     "_interactable": true,
@@ -15257,11 +15097,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 377
+      "__id__": 365
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 643
+      "__id__": 631
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -15285,11 +15125,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 377
+      "__id__": 365
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 645
+      "__id__": 633
     },
     "_alignFlags": 44,
     "_target": null,
@@ -15340,14 +15180,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 648
+        "__id__": 636
       },
       {
-        "__id__": 650
+        "__id__": 638
       }
     ],
     "_prefab": {
-      "__id__": 652
+      "__id__": 640
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -15384,11 +15224,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 647
+      "__id__": 635
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 649
+      "__id__": 637
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -15412,11 +15252,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 647
+      "__id__": 635
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 651
+      "__id__": 639
     },
     "_alignFlags": 12,
     "_target": null,
@@ -15465,29 +15305,29 @@
     },
     "_children": [
       {
-        "__id__": 654
+        "__id__": 642
       },
       {
-        "__id__": 692
+        "__id__": 680
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 701
+        "__id__": 689
       },
       {
-        "__id__": 703
+        "__id__": 691
       },
       {
-        "__id__": 705
+        "__id__": 693
       },
       {
-        "__id__": 707
+        "__id__": 695
       }
     ],
     "_prefab": {
-      "__id__": 709
+      "__id__": 697
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -15524,23 +15364,23 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 653
+      "__id__": 641
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 655
+        "__id__": 643
       },
       {
-        "__id__": 657
+        "__id__": 645
       },
       {
-        "__id__": 659
+        "__id__": 647
       }
     ],
     "_prefab": {
-      "__id__": 691
+      "__id__": 679
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -15577,11 +15417,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 654
+      "__id__": 642
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 656
+      "__id__": 644
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -15605,11 +15445,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 654
+      "__id__": 642
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 658
+      "__id__": 646
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -15650,15 +15490,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 654
+      "__id__": 642
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 660
+      "__id__": 648
     },
     "clickEvents": [
       {
-        "__id__": 661
+        "__id__": 649
       }
     ],
     "_interactable": true,
@@ -15698,7 +15538,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 654
+      "__id__": 642
     },
     "_id": ""
   },
@@ -15709,7 +15549,7 @@
   {
     "__type__": "cc.ClickEvent",
     "target": {
-      "__id__": 662
+      "__id__": 650
     },
     "component": "",
     "_componentId": "3a67fnZjfNM/JVdGoscMLLo",
@@ -15723,14 +15563,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 663
+      "__id__": 651
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 662
+      "__id__": 650
     },
     "asset": {
       "__uuid__": "b033123c-3b97-4d66-a18d-c584460cf02f",
@@ -15738,7 +15578,7 @@
     },
     "fileId": "c7ZN3fr+hJoZmUZs2A0Ye0",
     "instance": {
-      "__id__": 664
+      "__id__": 652
     },
     "targetOverrides": null
   },
@@ -15751,10 +15591,28 @@
     "mountedChildren": [],
     "mountedComponents": [
       {
-        "__id__": 665
+        "__id__": 653
       }
     ],
     "propertyOverrides": [
+      {
+        "__id__": 657
+      },
+      {
+        "__id__": 659
+      },
+      {
+        "__id__": 661
+      },
+      {
+        "__id__": 663
+      },
+      {
+        "__id__": 665
+      },
+      {
+        "__id__": 667
+      },
       {
         "__id__": 669
       },
@@ -15762,37 +15620,19 @@
         "__id__": 671
       },
       {
-        "__id__": 673
+        "__id__": 672
+      },
+      {
+        "__id__": 674
       },
       {
         "__id__": 675
       },
+      {
+        "__id__": 676
+      },
       {
         "__id__": 677
-      },
-      {
-        "__id__": 679
-      },
-      {
-        "__id__": 681
-      },
-      {
-        "__id__": 683
-      },
-      {
-        "__id__": 684
-      },
-      {
-        "__id__": 686
-      },
-      {
-        "__id__": 687
-      },
-      {
-        "__id__": 688
-      },
-      {
-        "__id__": 689
       }
     ],
     "removedComponents": []
@@ -15800,11 +15640,11 @@
   {
     "__type__": "cc.MountedComponentsInfo",
     "targetInfo": {
-      "__id__": 666
+      "__id__": 654
     },
     "components": [
       {
-        "__id__": 667
+        "__id__": 655
       }
     ]
   },
@@ -15820,15 +15660,15 @@
     "_objFlags": 0,
     "__editorExtras__": {
       "mountedRoot": {
-        "__id__": 662
+        "__id__": 650
       }
     },
     "node": {
-      "__id__": 662
+      "__id__": 650
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 668
+      "__id__": 656
     },
     "_id": ""
   },
@@ -15839,7 +15679,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 670
+      "__id__": 658
     },
     "propertyPath": [
       "_name"
@@ -15855,7 +15695,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 672
+      "__id__": 660
     },
     "propertyPath": [
       "_lpos"
@@ -15876,7 +15716,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 674
+      "__id__": 662
     },
     "propertyPath": [
       "_lrot"
@@ -15898,7 +15738,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 676
+      "__id__": 664
     },
     "propertyPath": [
       "_euler"
@@ -15919,7 +15759,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 678
+      "__id__": 666
     },
     "propertyPath": [
       "_active"
@@ -15935,7 +15775,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 680
+      "__id__": 668
     },
     "propertyPath": [
       "clickEvents",
@@ -15943,7 +15783,7 @@
       "target"
     ],
     "value": {
-      "__id__": 653
+      "__id__": 641
     }
   },
   {
@@ -15955,7 +15795,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 682
+      "__id__": 670
     },
     "propertyPath": [
       "clickEvents",
@@ -15973,7 +15813,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 682
+      "__id__": 670
     },
     "propertyPath": [
       "clickEvents",
@@ -15985,7 +15825,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 685
+      "__id__": 673
     },
     "propertyPath": [
       "clickEvents",
@@ -15993,7 +15833,7 @@
       "target"
     ],
     "value": {
-      "__id__": 662
+      "__id__": 650
     }
   },
   {
@@ -16005,7 +15845,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 685
+      "__id__": 673
     },
     "propertyPath": [
       "clickEvents",
@@ -16017,7 +15857,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 685
+      "__id__": 673
     },
     "propertyPath": [
       "clickEvents",
@@ -16029,7 +15869,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 682
+      "__id__": 670
     },
     "propertyPath": [
       "clickEvents",
@@ -16040,20 +15880,20 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 682
+      "__id__": 670
     },
     "propertyPath": [
       "clickEvents",
       "1"
     ],
     "value": {
-      "__id__": 690
+      "__id__": 678
     }
   },
   {
     "__type__": "cc.ClickEvent",
     "target": {
-      "__id__": 662
+      "__id__": 650
     },
     "component": "",
     "_componentId": "3a67fnZjfNM/JVdGoscMLLo",
@@ -16079,23 +15919,23 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 653
+      "__id__": 641
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 693
+        "__id__": 681
       },
       {
-        "__id__": 695
+        "__id__": 683
       },
       {
-        "__id__": 697
+        "__id__": 685
       }
     ],
     "_prefab": {
-      "__id__": 700
+      "__id__": 688
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -16132,11 +15972,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 692
+      "__id__": 680
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 694
+      "__id__": 682
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -16160,11 +16000,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 692
+      "__id__": 680
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 696
+      "__id__": 684
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -16205,15 +16045,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 692
+      "__id__": 680
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 698
+      "__id__": 686
     },
     "clickEvents": [
       {
-        "__id__": 699
+        "__id__": 687
       }
     ],
     "_interactable": true,
@@ -16253,7 +16093,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 692
+      "__id__": 680
     },
     "_id": ""
   },
@@ -16264,7 +16104,7 @@
   {
     "__type__": "cc.ClickEvent",
     "target": {
-      "__id__": 662
+      "__id__": 650
     },
     "component": "",
     "_componentId": "3a67fnZjfNM/JVdGoscMLLo",
@@ -16290,11 +16130,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 653
+      "__id__": 641
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 702
+      "__id__": 690
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -16318,11 +16158,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 653
+      "__id__": 641
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 704
+      "__id__": 692
     },
     "_alignFlags": 4,
     "_target": null,
@@ -16354,11 +16194,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 653
+      "__id__": 641
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 706
+      "__id__": 694
     },
     "_id": ""
   },
@@ -16372,11 +16212,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 653
+      "__id__": 641
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 708
+      "__id__": 696
     },
     "_id": ""
   },
@@ -16404,14 +16244,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 711
+      "__id__": 699
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 710
+      "__id__": 698
     },
     "asset": {
       "__uuid__": "e9d4aea4-d78a-40ff-9300-ad76fec45cfe",
@@ -16419,7 +16259,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 712
+      "__id__": 700
     },
     "targetOverrides": null
   },
@@ -16433,28 +16273,28 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 713
+        "__id__": 701
       },
       {
-        "__id__": 715
+        "__id__": 703
       },
       {
-        "__id__": 716
+        "__id__": 704
       },
       {
-        "__id__": 717
+        "__id__": 705
       },
       {
-        "__id__": 718
+        "__id__": 706
       },
       {
-        "__id__": 720
+        "__id__": 708
       },
       {
-        "__id__": 721
+        "__id__": 709
       },
       {
-        "__id__": 723
+        "__id__": 711
       }
     ],
     "removedComponents": []
@@ -16462,7 +16302,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 714
+      "__id__": 702
     },
     "propertyPath": [
       "_name"
@@ -16478,7 +16318,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 714
+      "__id__": 702
     },
     "propertyPath": [
       "_lpos"
@@ -16493,7 +16333,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 714
+      "__id__": 702
     },
     "propertyPath": [
       "_lrot"
@@ -16509,7 +16349,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 714
+      "__id__": 702
     },
     "propertyPath": [
       "_euler"
@@ -16524,7 +16364,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 719
+      "__id__": 707
     },
     "propertyPath": [
       "_left"
@@ -16540,7 +16380,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 719
+      "__id__": 707
     },
     "propertyPath": [
       "_right"
@@ -16550,7 +16390,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 722
+      "__id__": 710
     },
     "propertyPath": [
       "_contentSize"
@@ -16570,7 +16410,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 714
+      "__id__": 702
     },
     "propertyPath": [
       "_active"
@@ -16587,7 +16427,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 725
+      "__id__": 713
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -16615,7 +16455,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 727
+      "__id__": 715
     },
     "_alignFlags": 45,
     "_target": null,
@@ -16651,7 +16491,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 729
+      "__id__": 717
     },
     "_id": ""
   },
@@ -16671,40 +16511,37 @@
     "instance": null,
     "targetOverrides": [
       {
-        "__id__": 731
+        "__id__": 719
       },
       {
-        "__id__": 734
+        "__id__": 722
       }
     ],
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 662
+        "__id__": 650
       },
       {
-        "__id__": 710
-      },
-      {
-        "__id__": 304
+        "__id__": 698
       }
     ]
   },
   {
     "__type__": "cc.TargetOverrideInfo",
     "source": {
-      "__id__": 662
+      "__id__": 650
     },
     "sourceInfo": {
-      "__id__": 732
+      "__id__": 720
     },
     "propertyPath": [
       "_target"
     ],
     "target": {
-      "__id__": 662
+      "__id__": 650
     },
     "targetInfo": {
-      "__id__": 733
+      "__id__": 721
     }
   },
   {
@@ -16722,19 +16559,19 @@
   {
     "__type__": "cc.TargetOverrideInfo",
     "source": {
-      "__id__": 662
+      "__id__": 650
     },
     "sourceInfo": {
-      "__id__": 735
+      "__id__": 723
     },
     "propertyPath": [
       "_target"
     ],
     "target": {
-      "__id__": 662
+      "__id__": 650
     },
     "targetInfo": {
-      "__id__": 736
+      "__id__": 724
     }
   },
   {
diff --git a/assets/script/game/Role/RoleViewComp.ts b/assets/script/game/Role/RoleViewComp.ts
index 6add1623..99dbe94a 100644
--- a/assets/script/game/Role/RoleViewComp.ts
+++ b/assets/script/game/Role/RoleViewComp.ts
@@ -58,13 +58,7 @@ export class RoleViewComp extends CCComp {
     power_max: number = 1200;  /** 能量最大值 */
     power_speed: number = 1; //能量回复速度每0.1秒回复量
     skill:8001;
-    skills:{
-        1:{uuid:8001,cd:2,alive:true },
-        2:{uuid:8001,cd:2,alive:false},
-        3:{uuid:8001,cd:2,alive:false},
-        4:{uuid:8001,cd:2,alive:false},
-        5:{uuid:8001,cd:2,alive:false},
-    }
+    skills:any=[]
     buff_atks:any = [];
     buff_atk:number = 0;
 
@@ -173,9 +167,23 @@ export class RoleViewComp extends CCComp {
         this.in_stop(dt);
         this.atk_time += dt;
         this.in_atk();
+        this.skill_cds(dt);
         // this.move();
         this.check_enemys()
     }
+    skill_cds(dt:number){
+        this.skills.forEach((e:any) => {
+            if(e.cd > 0&&e.alive){
+                e.cd -= dt;
+                if(e.cd <= 0){
+                   this.shoot(e.uuid);
+                   e.cd=smc.skills[e.uuid].cd
+                   console.log("shoot uuid :"+e.uuid);
+                }
+            }
+        });
+        // console.log(this.skills);
+    }
     check_enemys(){
         let enemys=ecs.query(ecs.allOf(MonViewComp));
         if(enemys.length > 0){
diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts
index 78b1ed6c..b7e8602f 100644
--- a/assets/script/game/common/SingletonModuleComp.ts
+++ b/assets/script/game/common/SingletonModuleComp.ts
@@ -100,13 +100,14 @@ export class SingletonModuleComp extends ecs.Comp {
             next_exp:100,
             power:300,
             skill:8001,
-            skills:{
-                1:{uuid:8001,cd:2,alive:true },
-                2:{uuid:9002,cd:2,alive:false},
-                3:{uuid:9003,cd:2,alive:false},
-                4:{uuid:9004,cd:2,alive:false},
-                5:{uuid:9005,cd:2,alive:false},
-            }
+            skills:[
+                {uuid:1002,cd:2,alive:true },
+                {uuid:1003,cd:3,alive:true},
+                {uuid:1004,cd:4,alive:true},
+                {uuid:0,cd:0,alive:false},
+                {uuid:0,cd:0,alive:false},
+            ]
+               
         },
         /** 当前等级 */
         cards:{