diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab
index 3b63fcfe..c38e9ced 100644
--- a/assets/resources/gui/role_controller.prefab
+++ b/assets/resources/gui/role_controller.prefab
@@ -25,23 +25,23 @@
         "__id__": 239
       },
       {
-        "__id__": 632
+        "__id__": 626
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 672
+        "__id__": 666
       },
       {
-        "__id__": 674
+        "__id__": 668
       },
       {
-        "__id__": 676
+        "__id__": 670
       }
     ],
     "_prefab": {
-      "__id__": 678
+      "__id__": 672
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -5524,21 +5524,21 @@
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 617
+      },
+      {
+        "__id__": 619
+      },
+      {
+        "__id__": 621
+      },
       {
         "__id__": 623
-      },
-      {
-        "__id__": 625
-      },
-      {
-        "__id__": 627
-      },
-      {
-        "__id__": 629
       }
     ],
     "_prefab": {
-      "__id__": 631
+      "__id__": 625
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -8791,26 +8791,26 @@
         "__id__": 376
       },
       {
-        "__id__": 456
+        "__id__": 454
       },
       {
-        "__id__": 536
+        "__id__": 532
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 616
+        "__id__": 610
       },
       {
-        "__id__": 618
+        "__id__": 612
       },
       {
-        "__id__": 620
+        "__id__": 614
       }
     ],
     "_prefab": {
-      "__id__": 622
+      "__id__": 616
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -8881,14 +8881,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 451
+        "__id__": 449
       },
       {
-        "__id__": 453
+        "__id__": 451
       }
     ],
     "_prefab": {
-      "__id__": 455
+      "__id__": 453
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -10277,14 +10277,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 446
+        "__id__": 444
       },
       {
-        "__id__": 448
+        "__id__": 446
       }
     ],
     "_prefab": {
-      "__id__": 450
+      "__id__": 448
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -10331,13 +10331,10 @@
       },
       {
         "__id__": 441
-      },
-      {
-        "__id__": 443
       }
     ],
     "_prefab": {
-      "__id__": 445
+      "__id__": 443
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -10464,28 +10461,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "20Bf9Rp4hLU7t7+jWEJQ1k"
   },
-  {
-    "__type__": "545c05XsG9GDJispEGWKvYv",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 438
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 444
-    },
-    "templateMode": false,
-    "watchPath": "data.hero1.count",
-    "labelType": "cc.Label",
-    "watchPathArr": [],
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "6fWvacJ6NDHIM7BxnQYa7P"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -10509,7 +10484,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 447
+      "__id__": 445
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -10537,7 +10512,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 449
+      "__id__": 447
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -10595,7 +10570,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 452
+      "__id__": 450
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -10623,7 +10598,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 454
+      "__id__": 452
     },
     "slot": 0,
     "_id": ""
@@ -10655,44 +10630,44 @@
     },
     "_children": [
       {
-        "__id__": 457
+        "__id__": 455
       },
       {
-        "__id__": 463
+        "__id__": 461
       },
       {
-        "__id__": 469
+        "__id__": 467
       },
       {
-        "__id__": 475
+        "__id__": 473
       },
       {
-        "__id__": 481
+        "__id__": 479
       },
       {
-        "__id__": 487
+        "__id__": 485
       },
       {
-        "__id__": 493
+        "__id__": 491
       },
       {
-        "__id__": 509
+        "__id__": 507
       },
       {
-        "__id__": 517
+        "__id__": 515
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 531
+        "__id__": 527
       },
       {
-        "__id__": 533
+        "__id__": 529
       }
     ],
     "_prefab": {
-      "__id__": 535
+      "__id__": 531
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -10729,20 +10704,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 456
+      "__id__": 454
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 458
+        "__id__": 456
       },
       {
-        "__id__": 460
+        "__id__": 458
       }
     ],
     "_prefab": {
-      "__id__": 462
+      "__id__": 460
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -10779,11 +10754,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 457
+      "__id__": 455
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 459
+      "__id__": 457
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -10807,11 +10782,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 457
+      "__id__": 455
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 461
+      "__id__": 459
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -10865,20 +10840,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 456
+      "__id__": 454
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 464
+        "__id__": 462
       },
       {
-        "__id__": 466
+        "__id__": 464
       }
     ],
     "_prefab": {
-      "__id__": 468
+      "__id__": 466
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -10915,11 +10890,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 463
+      "__id__": 461
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 465
+      "__id__": 463
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -10943,11 +10918,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 463
+      "__id__": 461
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 467
+      "__id__": 465
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -11001,20 +10976,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 456
+      "__id__": 454
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 470
+        "__id__": 468
       },
       {
-        "__id__": 472
+        "__id__": 470
       }
     ],
     "_prefab": {
-      "__id__": 474
+      "__id__": 472
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -11051,11 +11026,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 469
+      "__id__": 467
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 471
+      "__id__": 469
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -11079,11 +11054,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 469
+      "__id__": 467
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 473
+      "__id__": 471
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -11137,20 +11112,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 456
+      "__id__": 454
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 476
+        "__id__": 474
       },
       {
-        "__id__": 478
+        "__id__": 476
       }
     ],
     "_prefab": {
-      "__id__": 480
+      "__id__": 478
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -11187,11 +11162,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 475
+      "__id__": 473
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 477
+      "__id__": 475
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -11215,11 +11190,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 475
+      "__id__": 473
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 479
+      "__id__": 477
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -11273,20 +11248,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 456
+      "__id__": 454
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 482
+        "__id__": 480
       },
       {
-        "__id__": 484
+        "__id__": 482
       }
     ],
     "_prefab": {
-      "__id__": 486
+      "__id__": 484
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -11323,11 +11298,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 481
+      "__id__": 479
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 483
+      "__id__": 481
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -11351,11 +11326,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 481
+      "__id__": 479
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 485
+      "__id__": 483
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -11409,20 +11384,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 456
+      "__id__": 454
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 488
+        "__id__": 486
       },
       {
-        "__id__": 490
+        "__id__": 488
       }
     ],
     "_prefab": {
-      "__id__": 492
+      "__id__": 490
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -11459,11 +11434,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 487
+      "__id__": 485
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 489
+      "__id__": 487
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -11487,11 +11462,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 487
+      "__id__": 485
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 491
+      "__id__": 489
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -11545,24 +11520,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 456
+      "__id__": 454
     },
     "_children": [
       {
-        "__id__": 494
+        "__id__": 492
       },
       {
-        "__id__": 500
+        "__id__": 498
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 506
+        "__id__": 504
       }
     ],
     "_prefab": {
-      "__id__": 508
+      "__id__": 506
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -11599,20 +11574,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 493
+      "__id__": 491
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 495
+        "__id__": 493
       },
       {
-        "__id__": 497
+        "__id__": 495
       }
     ],
     "_prefab": {
-      "__id__": 499
+      "__id__": 497
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -11649,11 +11624,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 494
+      "__id__": 492
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 496
+      "__id__": 494
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -11677,11 +11652,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 494
+      "__id__": 492
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 498
+      "__id__": 496
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -11735,20 +11710,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 493
+      "__id__": 491
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 501
+        "__id__": 499
       },
       {
-        "__id__": 503
+        "__id__": 501
       }
     ],
     "_prefab": {
-      "__id__": 505
+      "__id__": 503
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -11785,11 +11760,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 500
+      "__id__": 498
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 502
+      "__id__": 500
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -11813,11 +11788,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 500
+      "__id__": 498
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 504
+      "__id__": 502
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -11871,11 +11846,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 493
+      "__id__": 491
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 507
+      "__id__": 505
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -11912,23 +11887,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 456
+      "__id__": 454
     },
     "_children": [],
     "_active": true,
     "_components": [
+      {
+        "__id__": 508
+      },
       {
         "__id__": 510
       },
       {
         "__id__": 512
-      },
-      {
-        "__id__": 514
       }
     ],
     "_prefab": {
-      "__id__": 516
+      "__id__": 514
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -11965,11 +11940,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 509
+      "__id__": 507
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 511
+      "__id__": 509
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -11993,11 +11968,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 509
+      "__id__": 507
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 513
+      "__id__": 511
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -12035,11 +12010,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 509
+      "__id__": 507
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 515
+      "__id__": 513
     },
     "playOnLoad": false,
     "_clips": [
@@ -12071,24 +12046,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 456
+      "__id__": 454
     },
     "_children": [
       {
-        "__id__": 518
+        "__id__": 516
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 526
+        "__id__": 522
       },
       {
-        "__id__": 528
+        "__id__": 524
       }
     ],
     "_prefab": {
-      "__id__": 530
+      "__id__": 526
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -12125,23 +12100,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 517
+      "__id__": 515
     },
     "_children": [],
     "_active": true,
     "_components": [
+      {
+        "__id__": 517
+      },
       {
         "__id__": 519
-      },
-      {
-        "__id__": 521
-      },
-      {
-        "__id__": 523
       }
     ],
     "_prefab": {
-      "__id__": 525
+      "__id__": 521
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -12178,11 +12150,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 518
+      "__id__": 516
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 520
+      "__id__": 518
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -12206,11 +12178,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 518
+      "__id__": 516
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 522
+      "__id__": 520
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -12268,28 +12240,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "baXgekL59KyYF9BMiEzQmy"
   },
-  {
-    "__type__": "545c05XsG9GDJispEGWKvYv",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 518
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 524
-    },
-    "templateMode": false,
-    "watchPath": "data.hero1.count",
-    "labelType": "cc.Label",
-    "watchPathArr": [],
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "28WuLVxu9JG5wtR9efz4ab"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -12309,11 +12259,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 517
+      "__id__": 515
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 527
+      "__id__": 523
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -12337,11 +12287,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 517
+      "__id__": 515
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 529
+      "__id__": 525
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -12395,11 +12345,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 456
+      "__id__": 454
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 532
+      "__id__": 528
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -12423,11 +12373,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 456
+      "__id__": 454
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 534
+      "__id__": 530
     },
     "slot": 1,
     "_id": ""
@@ -12459,44 +12409,44 @@
     },
     "_children": [
       {
-        "__id__": 537
+        "__id__": 533
       },
       {
-        "__id__": 543
+        "__id__": 539
       },
       {
-        "__id__": 549
+        "__id__": 545
       },
       {
-        "__id__": 555
+        "__id__": 551
       },
       {
-        "__id__": 561
+        "__id__": 557
       },
       {
-        "__id__": 567
+        "__id__": 563
       },
       {
-        "__id__": 573
+        "__id__": 569
       },
       {
-        "__id__": 589
+        "__id__": 585
       },
       {
-        "__id__": 597
+        "__id__": 593
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 611
+        "__id__": 605
       },
       {
-        "__id__": 613
+        "__id__": 607
       }
     ],
     "_prefab": {
-      "__id__": 615
+      "__id__": 609
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -12533,20 +12483,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 536
+      "__id__": 532
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 538
+        "__id__": 534
       },
       {
-        "__id__": 540
+        "__id__": 536
       }
     ],
     "_prefab": {
-      "__id__": 542
+      "__id__": 538
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -12583,11 +12533,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 537
+      "__id__": 533
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 539
+      "__id__": 535
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -12611,11 +12561,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 537
+      "__id__": 533
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 541
+      "__id__": 537
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -12669,20 +12619,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 536
+      "__id__": 532
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 544
+        "__id__": 540
       },
       {
-        "__id__": 546
+        "__id__": 542
       }
     ],
     "_prefab": {
-      "__id__": 548
+      "__id__": 544
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -12719,11 +12669,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 543
+      "__id__": 539
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 545
+      "__id__": 541
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -12747,11 +12697,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 543
+      "__id__": 539
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 547
+      "__id__": 543
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -12805,20 +12755,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 536
+      "__id__": 532
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 550
+        "__id__": 546
       },
       {
-        "__id__": 552
+        "__id__": 548
       }
     ],
     "_prefab": {
-      "__id__": 554
+      "__id__": 550
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -12855,11 +12805,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 549
+      "__id__": 545
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 551
+      "__id__": 547
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -12883,11 +12833,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 549
+      "__id__": 545
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 553
+      "__id__": 549
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -12941,20 +12891,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 536
+      "__id__": 532
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 556
+        "__id__": 552
       },
       {
-        "__id__": 558
+        "__id__": 554
       }
     ],
     "_prefab": {
-      "__id__": 560
+      "__id__": 556
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -12991,11 +12941,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 555
+      "__id__": 551
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 557
+      "__id__": 553
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -13019,11 +12969,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 555
+      "__id__": 551
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 559
+      "__id__": 555
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -13077,20 +13027,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 536
+      "__id__": 532
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 562
+        "__id__": 558
       },
       {
-        "__id__": 564
+        "__id__": 560
       }
     ],
     "_prefab": {
-      "__id__": 566
+      "__id__": 562
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -13127,11 +13077,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 561
+      "__id__": 557
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 563
+      "__id__": 559
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -13155,11 +13105,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 561
+      "__id__": 557
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 565
+      "__id__": 561
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -13213,20 +13163,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 536
+      "__id__": 532
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 568
+        "__id__": 564
       },
       {
-        "__id__": 570
+        "__id__": 566
       }
     ],
     "_prefab": {
-      "__id__": 572
+      "__id__": 568
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -13263,11 +13213,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 567
+      "__id__": 563
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 569
+      "__id__": 565
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -13291,11 +13241,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 567
+      "__id__": 563
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 571
+      "__id__": 567
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -13349,24 +13299,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 536
+      "__id__": 532
     },
     "_children": [
       {
-        "__id__": 574
+        "__id__": 570
       },
       {
-        "__id__": 580
+        "__id__": 576
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 586
+        "__id__": 582
       }
     ],
     "_prefab": {
-      "__id__": 588
+      "__id__": 584
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -13403,20 +13353,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 573
+      "__id__": 569
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 575
+        "__id__": 571
       },
       {
-        "__id__": 577
+        "__id__": 573
       }
     ],
     "_prefab": {
-      "__id__": 579
+      "__id__": 575
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -13453,11 +13403,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 574
+      "__id__": 570
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 576
+      "__id__": 572
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -13481,11 +13431,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 574
+      "__id__": 570
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 578
+      "__id__": 574
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -13539,20 +13489,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 573
+      "__id__": 569
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 581
+        "__id__": 577
       },
       {
-        "__id__": 583
+        "__id__": 579
       }
     ],
     "_prefab": {
-      "__id__": 585
+      "__id__": 581
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -13589,11 +13539,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 580
+      "__id__": 576
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 582
+      "__id__": 578
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -13617,11 +13567,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 580
+      "__id__": 576
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 584
+      "__id__": 580
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -13675,11 +13625,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 573
+      "__id__": 569
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 587
+      "__id__": 583
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -13716,23 +13666,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 536
+      "__id__": 532
     },
     "_children": [],
     "_active": true,
     "_components": [
+      {
+        "__id__": 586
+      },
+      {
+        "__id__": 588
+      },
       {
         "__id__": 590
-      },
-      {
-        "__id__": 592
-      },
-      {
-        "__id__": 594
       }
     ],
     "_prefab": {
-      "__id__": 596
+      "__id__": 592
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -13769,11 +13719,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 589
+      "__id__": 585
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 591
+      "__id__": 587
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -13797,11 +13747,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 589
+      "__id__": 585
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 593
+      "__id__": 589
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -13839,11 +13789,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 589
+      "__id__": 585
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 595
+      "__id__": 591
     },
     "playOnLoad": false,
     "_clips": [
@@ -13875,24 +13825,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 536
+      "__id__": 532
     },
     "_children": [
       {
-        "__id__": 598
+        "__id__": 594
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 606
+        "__id__": 600
       },
       {
-        "__id__": 608
+        "__id__": 602
       }
     ],
     "_prefab": {
-      "__id__": 610
+      "__id__": 604
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -13929,23 +13879,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 597
+      "__id__": 593
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 599
+        "__id__": 595
       },
       {
-        "__id__": 601
-      },
-      {
-        "__id__": 603
+        "__id__": 597
       }
     ],
     "_prefab": {
-      "__id__": 605
+      "__id__": 599
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -13982,11 +13929,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 598
+      "__id__": 594
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 600
+      "__id__": 596
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -14010,11 +13957,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 598
+      "__id__": 594
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 602
+      "__id__": 598
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -14072,28 +14019,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "8aFIfNQ11MfKRjvp5/PWKo"
   },
-  {
-    "__type__": "545c05XsG9GDJispEGWKvYv",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 598
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 604
-    },
-    "templateMode": false,
-    "watchPath": "data.hero1.count",
-    "labelType": "cc.Label",
-    "watchPathArr": [],
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "04ENttyXdCmp7oz760XUTP"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -14113,11 +14038,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 597
+      "__id__": 593
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 607
+      "__id__": 601
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -14141,11 +14066,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 597
+      "__id__": 593
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 609
+      "__id__": 603
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -14199,11 +14124,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 536
+      "__id__": 532
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 612
+      "__id__": 606
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -14227,11 +14152,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 536
+      "__id__": 532
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 614
+      "__id__": 608
     },
     "slot": 2,
     "_id": ""
@@ -14263,7 +14188,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 617
+      "__id__": 611
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -14291,7 +14216,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 619
+      "__id__": 613
     },
     "_alignFlags": 45,
     "_target": null,
@@ -14327,7 +14252,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 621
+      "__id__": 615
     },
     "_resizeMode": 2,
     "_layoutType": 1,
@@ -14378,7 +14303,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 624
+      "__id__": 618
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -14406,7 +14331,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 626
+      "__id__": 620
     },
     "_alignFlags": 20,
     "_target": null,
@@ -14442,7 +14367,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 628
+      "__id__": 622
     },
     "_id": ""
   },
@@ -14460,7 +14385,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 630
+      "__id__": 624
     },
     "_alignFlags": 45,
     "_target": null,
@@ -14509,32 +14434,32 @@
     },
     "_children": [
       {
-        "__id__": 633
+        "__id__": 627
       },
       {
-        "__id__": 641
+        "__id__": 635
       },
       {
-        "__id__": 649
+        "__id__": 643
       },
       {
-        "__id__": 657
+        "__id__": 651
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 665
+        "__id__": 659
       },
       {
-        "__id__": 667
+        "__id__": 661
       },
       {
-        "__id__": 669
+        "__id__": 663
       }
     ],
     "_prefab": {
-      "__id__": 671
+      "__id__": 665
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -14571,23 +14496,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 632
+      "__id__": 626
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 634
+        "__id__": 628
       },
       {
-        "__id__": 636
+        "__id__": 630
       },
       {
-        "__id__": 638
+        "__id__": 632
       }
     ],
     "_prefab": {
-      "__id__": 640
+      "__id__": 634
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -14624,11 +14549,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 633
+      "__id__": 627
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 635
+      "__id__": 629
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -14652,11 +14577,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 633
+      "__id__": 627
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 637
+      "__id__": 631
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -14697,11 +14622,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 633
+      "__id__": 627
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 639
+      "__id__": 633
     },
     "_alignFlags": 45,
     "_target": null,
@@ -14746,23 +14671,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 632
+      "__id__": 626
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 642
+        "__id__": 636
       },
       {
-        "__id__": 644
+        "__id__": 638
       },
       {
-        "__id__": 646
+        "__id__": 640
       }
     ],
     "_prefab": {
-      "__id__": 648
+      "__id__": 642
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -14799,11 +14724,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 641
+      "__id__": 635
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 643
+      "__id__": 637
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -14827,11 +14752,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 641
+      "__id__": 635
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 645
+      "__id__": 639
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -14872,11 +14797,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 641
+      "__id__": 635
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 647
+      "__id__": 641
     },
     "_alignFlags": 45,
     "_target": null,
@@ -14921,23 +14846,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 632
+      "__id__": 626
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 650
+        "__id__": 644
       },
       {
-        "__id__": 652
+        "__id__": 646
       },
       {
-        "__id__": 654
+        "__id__": 648
       }
     ],
     "_prefab": {
-      "__id__": 656
+      "__id__": 650
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -14974,11 +14899,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 649
+      "__id__": 643
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 651
+      "__id__": 645
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -15002,11 +14927,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 649
+      "__id__": 643
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 653
+      "__id__": 647
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -15047,11 +14972,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 649
+      "__id__": 643
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 655
+      "__id__": 649
     },
     "playOnLoad": true,
     "_clips": [
@@ -15089,23 +15014,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 632
+      "__id__": 626
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 658
+        "__id__": 652
       },
       {
-        "__id__": 660
+        "__id__": 654
       },
       {
-        "__id__": 662
+        "__id__": 656
       }
     ],
     "_prefab": {
-      "__id__": 664
+      "__id__": 658
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -15142,11 +15067,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 657
+      "__id__": 651
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 659
+      "__id__": 653
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -15170,11 +15095,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 657
+      "__id__": 651
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 661
+      "__id__": 655
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -15215,11 +15140,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 657
+      "__id__": 651
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 663
+      "__id__": 657
     },
     "playOnLoad": true,
     "_clips": [
@@ -15257,11 +15182,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 632
+      "__id__": 626
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 666
+      "__id__": 660
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -15285,11 +15210,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 632
+      "__id__": 626
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 668
+      "__id__": 662
     },
     "_alignFlags": 45,
     "_target": null,
@@ -15321,11 +15246,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 632
+      "__id__": 626
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 670
+      "__id__": 664
     },
     "_id": ""
   },
@@ -15356,7 +15281,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 673
+      "__id__": 667
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -15384,7 +15309,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 675
+      "__id__": 669
     },
     "_alignFlags": 45,
     "_target": null,
@@ -15420,7 +15345,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 677
+      "__id__": 671
     },
     "_id": ""
   },
diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts
index c4672837..c3da1107 100644
--- a/assets/script/game/hero/HeroViewComp.ts
+++ b/assets/script/game/hero/HeroViewComp.ts
@@ -172,7 +172,7 @@ export class HeroViewComp extends CCComp {
     hp_show(){
         // if(this.node.getComponent(HeroViewComp).fac == 0) return
         let hp=this.hp;
-        let hp_max=this.hp_max;
+        let hp_max=this.Attrs[BuffAttr.HP_MAX];
         let hp_progress= hp/hp_max;
         this.node.getChildByName("top").getChildByName("hp").getComponent(ProgressBar).progress = hp_progress;
         // this.node.getChildByName("top").getChildByName("hp").active = (hp == hp_max) ? false : true;
@@ -211,7 +211,7 @@ export class HeroViewComp extends CCComp {
     add_hp(hp: number = 0,is_num:boolean=true) {
         this.BUFFCOMP.heathed();
         let real_hp=0
-        let hp_max=this.hp_max
+        let hp_max=this.Attrs[BuffAttr.HP_MAX]
         let lost_hp=hp_max-this.hp
         if(is_num){
             if(lost_hp > hp){
@@ -306,8 +306,8 @@ export class HeroViewComp extends CCComp {
                 // this.is_stop=true
                 break
             case DebuffAttr.DEHP:
-                this.hp_max-=deV/100*this.hp_max
-                if(this.hp-this.hp_max>0) this.hp=this.hp_max
+                this.Attrs[BuffAttr.HP_MAX]-=deV/100*this.Attrs[BuffAttr.HP_MAX]
+                if(this.hp-this.Attrs[BuffAttr.HP_MAX]>0) this.hp=this.Attrs[BuffAttr.HP_MAX]
                 break
             case DebuffAttr.DEATK:   //99为具体数字  并且局内永久生效,其他为百分比
                 if(deC == 99){
diff --git a/assets/script/game/hero/Mon.ts b/assets/script/game/hero/Mon.ts
index 1887c326..3f094e7c 100644
--- a/assets/script/game/hero/Mon.ts
+++ b/assets/script/game/hero/Mon.ts
@@ -8,7 +8,7 @@ import { HeroInfo } from "../common/config/heroSet";
 import { MonModelComp } from "./MonModelComp";
 import { BattleMoveComp } from "../common/ecs/position/BattleMoveComp";
 import { SkillConComp } from "./SkillConComp";
-import { BuffAttr, SkillSet } from "../common/config/SkillSet";
+import { BuffAttr, getBuffNum, SkillSet } from "../common/config/SkillSet";
 /** 角色实体 */
 @ecs.register(`Monster`)
 export class Monster extends ecs.Entity {
@@ -75,8 +75,9 @@ export class Monster extends ecs.Entity {
         hv.box_group = box_group;
         hv.hero_uuid= uuid;
         hv.hero_name= hero.name;
-        hv.speed =hv.speed_base = hero.speed;
-        hv.dis = hero.dis;
+        
+        // 初始化Attrs属性系统，参考Hero.ts的实现
+        hv.Attrs = getBuffNum();
         
         // 肉鸽模式使用固定数值，否则使用等级计算
         if (rogueHp !== undefined && rogueAttack !== undefined) {
@@ -98,11 +99,34 @@ export class Monster extends ecs.Entity {
             
             hv.hp = hv.hp_max = levelHp;
             hv.ap = levelAp;
-            hv.ap_base=levelAp
+            hv.ap_base = levelAp;
             console.log(`[Monster]: 怪物${hero.name}(等级${lv}) - 基础HP:${baseHp}->等级HP:${levelHp}, 基础AP:${baseAp}->等级AP:${levelAp}`);
         }
         
-        hv.cd = hero.cd
+        // 设置基础属性到Attrs系统
+        hv.Attrs[BuffAttr.SPEED] = hv.speed = hv.speed_base = hero.speed;
+        hv.Attrs[BuffAttr.DIS] = hv.dis = hero.dis;
+        hv.Attrs[BuffAttr.ATK_CD] = hv.cd = hero.cd;
+        hv.Attrs[BuffAttr.HP_MAX] = hv.hp_max;
+        hv.Attrs[BuffAttr.AP] = hv.ap;
+        hv.Attrs[BuffAttr.DEF] = hv.def;
+        
+        // 处理原有Buff，使用统一的apply_buff方法
+        hero.buff.forEach((buff:any)=>{
+            hv.apply_buff(buff.type, buff.value);
+        })
+        
+        // 处理肉鸽模式的词条Buff
+        if (rogueBuffData && rogueBuffData.length > 0) {
+            console.log(`[Monster]: 怪物${hero.name}应用肉鸽词条:`, rogueBuffData);
+            rogueBuffData.forEach((buff:any)=>{
+                hv.apply_buff(buff.type, buff.value);
+            })
+        }
+        
+        // 重新计算最终HP（因为buff可能修改了hp_max）
+        hv.hp = hv.hp_max;
+        
         for(let i=0;i<hero.skills.length;i++){
             hv.skills.push({
                 cd:0,
@@ -110,73 +134,7 @@ export class Monster extends ecs.Entity {
                 cd_max:i==0?hero.cd:SkillSet[hero.skills[i]].cd
             })
         }
-        // 处理原有Buff
-        hero.buff.forEach((buff:any)=>{
-            this.applyBuffToMonster(hv, buff);
-        })
-        
-        // 处理肉鸽模式的词条Buff
-        if (rogueBuffData && rogueBuffData.length > 0) {
-            console.log(`[Monster]: 怪物${hero.name}应用肉鸽词条:`, rogueBuffData);
-            rogueBuffData.forEach((buff:any)=>{
-                this.applyBuffToMonster(hv, buff);
-            })
-        }
-        
-        // 重新计算最终HP（因为buff可能修改了hp_max）
-        hv.hp = hv.hp_max;
         
         this.add(hv);
     }
-    
-    /**
-     * 应用Buff到怪物的通用方法
-     */
-    private applyBuffToMonster(hv: any, buff: any) {
-        switch(buff.buff_type){
-            case BuffAttr.CRITICAL:
-                hv.crit+=buff.value
-                break
-            case BuffAttr.CRITICAL_DMG:
-                hv.crit_d+=buff.value
-                break
-            case BuffAttr.DODGE:
-                hv.dod+=buff.value
-                break
-            case BuffAttr.DODGE_NO:
-                hv.dod_no+=buff.value
-                break
-            case BuffAttr.CRITICAL_NO:
-                hv.crit_no+=buff.value
-                break
-            case BuffAttr.BURN_COUNT:
-                hv.burn_count+=buff.value
-                break
-            case BuffAttr.PUNCTURE:
-                hv.puncture+=buff.value
-                break
-            case BuffAttr.PUNCTURE_DMG:
-                hv.puncture_damage+=buff.value
-                break
-            case BuffAttr.WFUNY:
-                hv.wfuny+=buff.value
-                break
-            case BuffAttr.ATK_CD:
-                hv.cd=hv.cd*(100+buff.value)/100
-                break
-            case BuffAttr.HP:
-                hv.hp_max=hv.hp_max*(100+buff.value)/100
-                break
-            case BuffAttr.DEF:
-                hv.def+=buff.value
-                break
-            case BuffAttr.ATK:
-                hv.ap=hv.ap*(100+buff.value)/100
-                break
-            case BuffAttr.FROST_RATIO:
-                hv.frost_ratio+=buff.value
-                break
-        }
-    }
-
 }
\ No newline at end of file
diff --git a/assets/script/game/skills/Skill.ts b/assets/script/game/skills/Skill.ts
index 015ddcbf..35d925c8 100644
--- a/assets/script/game/skills/Skill.ts
+++ b/assets/script/game/skills/Skill.ts
@@ -68,25 +68,7 @@ export class Skill extends ecs.Entity {
         node.angle+=angle
         // 添加技能组件
         const SComp = node.getComponent(SkillCom); // 初始化技能参数
-        if (!SComp) {
-            console.error("[Skill] 技能组件获取失败");
-            return;
-        }
-
-       
-
-        // 确保caster有必要的属性
-        if (typeof caster.ap === 'undefined') {
-            console.error("[Skill] caster.ap 未定义");
-            return;
-        }
-
-        if (typeof caster.box_group === 'undefined') {
-            console.error("[Skill] caster.box_group 未定义");
-            return;
-        }
-
-
+        
         // 只设置必要的运行时属性，配置信息通过 SkillSet[uuid] 访问
         Object.assign(SComp, {
             // 核心标识
@@ -94,7 +76,6 @@ export class Skill extends ecs.Entity {
             // 位置和施法者信息
             startPos: startPos,
             targetPos: targetPos,
-            caster: caster,
             group: caster.box_group,
             fac: caster.fac,
             // 技能数值
diff --git a/assets/script/game/skills/SkillCom.ts b/assets/script/game/skills/SkillCom.ts
index c4071104..a9564737 100644
--- a/assets/script/game/skills/SkillCom.ts
+++ b/assets/script/game/skills/SkillCom.ts
@@ -161,10 +161,23 @@ export class SkillCom extends CCComp {
     onAnimationFinished(){
         // console.log("[SkillCom]:onAnimationFinished",this.s_uuid)
         if (!this.skillConfig) return;
+        
         if(this.skillConfig.EType==EType.timeEnd) return
+        if(this.skillConfig.SType!=SType.damage){
+            this.to_do_buff()
+        } 
+
         this.is_destroy=true
     }
-
+    to_do_buff(){
+        if (!this.skillConfig) return;
+        
+        switch(this.skillConfig.SType){
+            case SType.shield:
+                this.caster.add_shield(this.skillConfig.buV)
+                break;
+        }
+    }
     //单体伤害
     single_damage(target:HeroViewComp,is_range:boolean=false){
         // //console.log("[SkillCom]:onBeginContact hit_count:",this.hit_count,SkillSet[this.s_uuid].hit)