dd

assets/resources/game/hero/arc1.prefab

@@ -31,14 +31,17 @@
         "__id__": 24
       },
       {
-        "__id__": 36
+        "__id__": 34
       },
       {
-        "__id__": 46
+        "__id__": 44
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 52
+      },
       {
         "__id__": 54
       },
@@ -50,13 +53,10 @@
       },
       {
         "__id__": 60
-      },
-      {
-        "__id__": 62
       }
     ],
     "_prefab": {
-      "__id__": 64
+      "__id__": 62
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -543,7 +543,7 @@
   },
   {
     "__type__": "cc.PrefabInstance",
-    "fileId": "d89zY+mVZFTJ2X0QMBQzh+",
+    "fileId": "07ICTWOHNPS6o9HGIXwtoO",
     "prefabRootNode": {
       "__id__": 1
     },
@@ -564,9 +564,6 @@
       },
       {
         "__id__": 32
-      },
-      {
-        "__id__": 34
       }
     ],
     "removedComponents": []
@@ -649,22 +646,6 @@
       "dfDOq9MhxDoay0LMIRMSnQ"
     ]
   },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 35
-    },
-    "propertyPath": [
-      "_active"
-    ],
-    "value": false
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "98WKvp4shKP6QSOhiLhHGZ"
-    ]
-  },
   {
     "__type__": "cc.Node",
     "_objFlags": 0,
@@ -672,14 +653,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 37
+      "__id__": 35
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 36
+      "__id__": 34
     },
     "asset": {
       "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -687,7 +668,7 @@
     },
     "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
     "instance": {
-      "__id__": 38
+      "__id__": 36
     },
     "targetOverrides": null
   },
@@ -700,20 +681,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
+      {
+        "__id__": 37
+      },
       {
         "__id__": 39
       },
+      {
+        "__id__": 40
+      },
       {
         "__id__": 41
       },
       {
         "__id__": 42
-      },
-      {
-        "__id__": 43
-      },
-      {
-        "__id__": 44
       }
     ],
     "removedComponents": []
@@ -721,7 +702,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 40
+      "__id__": 38
     },
     "propertyPath": [
       "_name"
@@ -737,7 +718,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 40
+      "__id__": 38
     },
     "propertyPath": [
       "_lpos"
@@ -752,7 +733,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 40
+      "__id__": 38
     },
     "propertyPath": [
       "_lrot"
@@ -768,7 +749,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 40
+      "__id__": 38
     },
     "propertyPath": [
       "_euler"
@@ -783,7 +764,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 45
+      "__id__": 43
     },
     "propertyPath": [
       "_active"
@@ -803,14 +784,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 47
+      "__id__": 45
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 46
+      "__id__": 44
     },
     "asset": {
       "__uuid__": "3e8ca50b-1db9-4996-affc-9d57af3a12d7",
@@ -818,7 +799,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 48
+      "__id__": 46
     },
     "targetOverrides": null
   },
@@ -831,17 +812,17 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
+      {
+        "__id__": 47
+      },
       {
         "__id__": 49
       },
+      {
+        "__id__": 50
+      },
       {
         "__id__": 51
-      },
-      {
-        "__id__": 52
-      },
-      {
-        "__id__": 53
       }
     ],
     "removedComponents": []
@@ -849,7 +830,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 50
+      "__id__": 48
     },
     "propertyPath": [
       "_name"
@@ -865,7 +846,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 50
+      "__id__": 48
     },
     "propertyPath": [
       "_lpos"
@@ -880,7 +861,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 50
+      "__id__": 48
     },
     "propertyPath": [
       "_lrot"
@@ -896,7 +877,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 50
+      "__id__": 48
     },
     "propertyPath": [
       "_euler"
@@ -918,7 +899,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 53
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -946,7 +927,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 57
+      "__id__": 55
     },
     "enabledContactListener": true,
     "bullet": true,
@@ -980,7 +961,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 59
+      "__id__": 57
     },
     "tag": 0,
     "_group": 4,
@@ -1014,7 +995,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 61
+      "__id__": 59
     },
     "hitFlashMaterial": {
       "__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264",
@@ -1040,7 +1021,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 63
+      "__id__": 61
     },
     "animator": {
       "__id__": 13
@@ -1064,10 +1045,10 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 46
+        "__id__": 44
       },
       {
-        "__id__": 36
+        "__id__": 34
       },
       {
         "__id__": 24

assets/resources/game/hero/top.prefab

@@ -522,7 +522,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@fe42e",
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@e4b0d",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -658,7 +658,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@24fc2",
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@57b31",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,

assets/resources/game/map/map_rpg.prefab

@@ -28,17 +28,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 502
+        "__id__": 503
       },
       {
-        "__id__": 504
+        "__id__": 505
       },
       {
-        "__id__": 506
+        "__id__": 507
       }
     ],
     "_prefab": {
-      "__id__": 508
+      "__id__": 509
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -197,17 +197,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 495
+        "__id__": 496
       },
       {
-        "__id__": 497
+        "__id__": 498
       },
       {
-        "__id__": 499
+        "__id__": 500
       }
     ],
     "_prefab": {
-      "__id__": 501
+      "__id__": 502
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -251,23 +251,23 @@
         "__id__": 8
       },
       {
-        "__id__": 476
+        "__id__": 477
       },
       {
-        "__id__": 480
+        "__id__": 481
       },
       {
-        "__id__": 486
+        "__id__": 487
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 492
+        "__id__": 493
       }
     ],
     "_prefab": {
-      "__id__": 494
+      "__id__": 495
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -314,20 +314,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 467
+        "__id__": 468
       },
       {
-        "__id__": 469
+        "__id__": 470
       },
       {
-        "__id__": 471
+        "__id__": 472
       },
       {
-        "__id__": 473
+        "__id__": 474
       }
     ],
     "_prefab": {
-      "__id__": 475
+      "__id__": 476
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -377,14 +377,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 462
+        "__id__": 463
       },
       {
-        "__id__": 464
+        "__id__": 465
       }
     ],
     "_prefab": {
-      "__id__": 466
+      "__id__": 467
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -10742,6 +10742,9 @@
       },
       {
         "__id__": 461
+      },
+      {
+        "__id__": 462
       }
     ],
     "removedComponents": []
@@ -10808,6 +10811,16 @@
       "z": 0
     }
   },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 458
+    },
+    "propertyPath": [
+      "_active"
+    ],
+    "value": false
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -10818,7 +10831,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 463
+      "__id__": 464
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -10846,7 +10859,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 465
+      "__id__": 466
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -10890,6 +10903,8 @@
       "__id__": 0
     },
     "fileId": "6dFdGsgPxD8oVoba7hVEO3",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -10902,7 +10917,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 468
+      "__id__": 469
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -10930,10 +10945,10 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 470
+      "__id__": 471
     },
     "bgImg": {
-      "__id__": 464
+      "__id__": 465
     },
     "_id": ""
   },
@@ -10951,7 +10966,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 472
+      "__id__": 473
     },
     "light": {
       "__uuid__": "319c7eb8-9826-48b6-81e4-82559dbf82a8",
@@ -10973,7 +10988,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 474
+      "__id__": 475
     },
     "start_p": {
       "__id__": 454
@@ -11009,11 +11024,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 477
+        "__id__": 478
       }
     ],
     "_prefab": {
-      "__id__": 479
+      "__id__": 480
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -11050,11 +11065,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 476
+      "__id__": 477
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 478
+      "__id__": 479
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -11097,14 +11112,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 481
+        "__id__": 482
       },
       {
-        "__id__": 483
+        "__id__": 484
       }
     ],
     "_prefab": {
-      "__id__": 485
+      "__id__": 486
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -11141,11 +11156,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 480
+      "__id__": 481
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 482
+      "__id__": 483
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -11169,11 +11184,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 480
+      "__id__": 481
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 484
+      "__id__": 485
     },
     "_id": ""
   },
@@ -11206,14 +11221,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 487
+        "__id__": 488
       },
       {
-        "__id__": 489
+        "__id__": 490
       }
     ],
     "_prefab": {
-      "__id__": 491
+      "__id__": 492
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -11250,11 +11265,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 486
+      "__id__": 487
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 488
+      "__id__": 489
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -11278,11 +11293,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 486
+      "__id__": 487
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 490
+      "__id__": 491
     },
     "light": {
       "__uuid__": "319c7eb8-9826-48b6-81e4-82559dbf82a8",
@@ -11317,7 +11332,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 493
+      "__id__": 494
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -11344,6 +11359,8 @@
       "__id__": 0
     },
     "fileId": "68Q5vEQWBINrggngtTZ7wh",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -11356,7 +11373,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 496
+      "__id__": 497
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -11384,7 +11401,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 498
+      "__id__": 499
     },
     "camera": {
       "__id__": 3
@@ -11393,16 +11410,16 @@
       "__id__": 7
     },
     "mapLayer": {
-      "__id__": 469
+      "__id__": 470
     },
     "floorLayer": {
-      "__id__": 476
+      "__id__": 477
     },
     "entityLayer": {
-      "__id__": 483
+      "__id__": 484
     },
     "SkillLayer": {
-      "__id__": 489
+      "__id__": 490
     },
     "isFollowPlayer": true,
     "_id": ""
@@ -11421,7 +11438,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 500
+      "__id__": 501
     },
     "_id": ""
   },
@@ -11452,7 +11469,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 503
+      "__id__": 504
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -11480,7 +11497,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 505
+      "__id__": 506
     },
     "_cameraComponent": {
       "__id__": 3
@@ -11502,7 +11519,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 507
+      "__id__": 508
     },
     "_alignFlags": 45,
     "_target": null,

assets/resources/game/map/start.prefab

@@ -265,8 +265,8 @@
       "__type__": "cc.Quat",
       "x": 0,
       "y": 0,
-      "z": 0,
+      "z": 1,
-      "w": 1
+      "w": 6.123233995736766e-17
     },
     "_lscale": {
       "__type__": "cc.Vec3",
@@ -280,7 +280,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0
+      "z": 180
     },
     "_id": ""
   },
@@ -299,7 +299,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 32,
-      "height": 32
+      "height": 48
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -335,12 +335,12 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@ec313",
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@dc4f2",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,

assets/resources/game/monster/top.prefab

@@ -524,10 +524,7 @@
       "b": 255,
       "a": 255
     },
-    "_spriteFrame": {
+    "_spriteFrame": null,
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@779a3",
-      "__expectedType__": "cc.SpriteFrame"
-    },
     "_type": 0,
     "_fillType": 0,
     "_sizeMode": 0,
@@ -660,10 +657,7 @@
       "b": 255,
       "a": 255
     },
-    "_spriteFrame": {
+    "_spriteFrame": null,
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@fe42e",
-      "__expectedType__": "cc.SpriteFrame"
-    },
     "_type": 0,
     "_fillType": 0,
     "_sizeMode": 0,
@@ -796,10 +790,7 @@
       "b": 255,
       "a": 255
     },
-    "_spriteFrame": {
+    "_spriteFrame": null,
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@24fc2",
-      "__expectedType__": "cc.SpriteFrame"
-    },
     "_type": 0,
     "_fillType": 0,
     "_sizeMode": 0,

assets/resources/game/skills/atkup.prefab

@@ -170,7 +170,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@fe42e",
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@57b31",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,

assets/resources/game/skills/heath.prefab

@@ -173,7 +173,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@73a32",
+      "__uuid__": "8de06a84-af95-42b1-ab9b-40701e6b3ed3@23ee4",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,

assets/resources/game/skills/mball.prefab

@@ -173,7 +173,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@1d925",
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@2416d",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,

assets/resources/game/talent.prefab.meta

@@ -0,0 +1 @@
+{"ver":"1.1.50","importer":"prefab","imported":true,"uuid":"407f71e4-91fa-4800-be94-bcb155cde502","files":[".json"],"subMetas":{},"userData":{"syncNodeName":"talent"}}

assets/resources/gui/gui2.plist.meta

@@ -25,8 +25,8 @@
         "height": 1560,
         "rawWidth": 720,
         "rawHeight": 1560,
-        "borderTop": 0,
+        "borderTop": 942,
-        "borderBottom": 0,
+        "borderBottom": 242,
         "borderLeft": 0,
         "borderRight": 0,
         "packable": true,

assets/resources/gui/hero_home.prefab

@@ -28,23 +28,23 @@
         "__id__": 14
       },
       {
-        "__id__": 90
+        "__id__": 102
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 126
+        "__id__": 138
       },
       {
-        "__id__": 128
+        "__id__": 140
       },
       {
-        "__id__": 130
+        "__id__": 142
       }
     ],
     "_prefab": {
-      "__id__": 132
+      "__id__": 144
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -140,7 +140,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1560
+      "height": 1700
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -179,9 +179,9 @@
       "__uuid__": "8e53e122-d71b-440a-bb07-9938dd6c20d9@62b4a",
       "__expectedType__": "cc.SpriteFrame"
     },
-    "_type": 0,
+    "_type": 1,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -376,16 +376,19 @@
       },
       {
         "__id__": 71
+      },
+      {
+        "__id__": 87
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 87
+        "__id__": 99
       }
     ],
     "_prefab": {
-      "__id__": 89
+      "__id__": 101
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -976,7 +979,7 @@
         "__id__": 46
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 52
@@ -1023,7 +1026,7 @@
       "__id__": 39
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 41
@@ -1366,7 +1369,7 @@
         "__id__": 62
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 68
@@ -1756,7 +1759,7 @@
         "__id__": 78
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 84
@@ -2130,6 +2133,305 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "Label_Parallelogram_Green",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 14
+    },
+    "_children": [
+      {
+        "__id__": 88
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 94
+      },
+      {
+        "__id__": 96
+      }
+    ],
+    "_prefab": {
+      "__id__": 98
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 246.375,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "NAME",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 87
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 89
+      },
+      {
+        "__id__": 91
+      }
+    ],
+    "_prefab": {
+      "__id__": 93
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 3.604,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 88
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 90
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 70.3766968425967,
+      "height": 54.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "dfTlG7KNhJ2LRweDwG36Hq"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 88
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 92
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_string": "天赋",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 30,
+    "_fontSize": 30,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": true,
+    "_isBold": false,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_enableOutline": true,
+    "_outlineColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_outlineWidth": 2,
+    "_enableShadow": false,
+    "_shadowColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_shadowOffset": {
+      "__type__": "cc.Vec2",
+      "x": 2,
+      "y": 2
+    },
+    "_shadowBlur": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "54LfKDZXZHMqvUihLNfH+k"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "degsX29zRP+YBNG+boc0k9",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 87
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 95
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 120,
+      "height": 50
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "8ayUxUES1BKowgQofrB2/S"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 87
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 97
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@fa9fd",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 1,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "12FPhR8ddHi48XrrnQSJ7N"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "5fObHDjKtAr678iEpWZptg",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -2140,7 +2442,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 88
+      "__id__": 100
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2167,11 +2469,13 @@
       "__id__": 0
     },
     "fileId": "88qDsGkSZBYI0AysVLTsek",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.Node",
-    "_name": "hero_talent",
+    "_name": "talents",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -2179,26 +2483,26 @@
     },
     "_children": [
       {
-        "__id__": 91
+        "__id__": 103
       },
-      {
-        "__id__": 109
-      }
-    ],
-    "_active": false,
-    "_components": [
       {
         "__id__": 121
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 133
       },
       {
-        "__id__": 123
+        "__id__": 135
       },
       {
-        "__id__": 106
+        "__id__": 118
       }
     ],
     "_prefab": {
-      "__id__": 125
+      "__id__": 137
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2235,30 +2539,30 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 90
+      "__id__": 102
     },
     "_children": [
       {
-        "__id__": 92
+        "__id__": 104
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 98
+        "__id__": 110
       },
       {
-        "__id__": 100
+        "__id__": 112
       },
       {
-        "__id__": 102
+        "__id__": 114
       },
       {
-        "__id__": 104
+        "__id__": 116
       }
     ],
     "_prefab": {
-      "__id__": 120
+      "__id__": 132
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2295,20 +2599,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 91
+      "__id__": 103
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 93
+        "__id__": 105
       },
       {
-        "__id__": 95
+        "__id__": 107
       }
     ],
     "_prefab": {
-      "__id__": 97
+      "__id__": 109
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2345,11 +2649,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 92
+      "__id__": 104
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 94
+      "__id__": 106
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2373,11 +2677,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 92
+      "__id__": 104
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 96
+      "__id__": 108
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2431,11 +2735,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 91
+      "__id__": 103
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 99
+      "__id__": 111
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2459,11 +2763,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 91
+      "__id__": 103
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 101
+      "__id__": 113
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2504,11 +2808,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 91
+      "__id__": 103
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 103
+      "__id__": 115
     },
     "_alignFlags": 37,
     "_target": null,
@@ -2540,17 +2844,17 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 91
+      "__id__": 103
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 105
+      "__id__": 117
     },
     "_scrollView": {
-      "__id__": 106
+      "__id__": 118
     },
     "_handle": {
-      "__id__": 95
+      "__id__": 107
     },
     "_direction": 1,
     "_enableAutoHide": false,
@@ -2567,11 +2871,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 90
+      "__id__": 102
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 107
+      "__id__": 119
     },
     "bounceDuration": 0.23,
     "brake": 0.75,
@@ -2582,7 +2886,7 @@
     "cancelInnerEvents": true,
     "scrollEvents": [],
     "_content": {
-      "__id__": 108
+      "__id__": 120
     },
     "_horizontalScrollBar": null,
     "_verticalScrollBar": null,
@@ -2598,17 +2902,17 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 109
+      "__id__": 121
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 117
+        "__id__": 129
       }
     ],
     "_prefab": {
-      "__id__": 119
+      "__id__": 131
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2645,27 +2949,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 90
+      "__id__": 102
     },
     "_children": [
       {
-        "__id__": 108
+        "__id__": 120
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 110
+        "__id__": 122
       },
       {
-        "__id__": 112
+        "__id__": 124
       },
       {
-        "__id__": 114
+        "__id__": 126
       }
     ],
     "_prefab": {
-      "__id__": 116
+      "__id__": 128
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2702,11 +3006,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 109
+      "__id__": 121
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 111
+      "__id__": 123
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2730,11 +3034,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 109
+      "__id__": 121
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 113
+      "__id__": 125
     },
     "_type": 0,
     "_inverted": false,
@@ -2752,11 +3056,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 109
+      "__id__": 121
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 115
+      "__id__": 127
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2801,6 +3105,8 @@
       "__id__": 0
     },
     "fileId": "ed2fEwfa1DXbhBFNUmOCN6",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -2809,11 +3115,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 108
+      "__id__": 120
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 118
+      "__id__": 130
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2840,6 +3146,8 @@
       "__id__": 0
     },
     "fileId": "d39d7J3ChLzpEWoJet5TNb",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -2861,11 +3169,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 90
+      "__id__": 102
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 122
+      "__id__": 134
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2889,11 +3197,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 90
+      "__id__": 102
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 124
+      "__id__": 136
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2934,6 +3242,8 @@
       "__id__": 0
     },
     "fileId": "dc7bEYSZ1A7rzUAdr17uKj",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -2946,7 +3256,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 127
+      "__id__": 139
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2974,7 +3284,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 129
+      "__id__": 141
     },
     "_alignFlags": 20,
     "_target": null,
@@ -3010,7 +3320,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 131
+      "__id__": 143
     },
     "_id": ""
   },
@@ -3027,6 +3337,7 @@
       "__id__": 0
     },
     "fileId": "913f5QU7JKAZE87n6c4hSI",
-    "instance": null
+    "instance": null,
+    "targetOverrides": null
   }
 ]

assets/resources/gui/item_box.prefab

@@ -565,7 +565,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@ab3da",
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@12d6e",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -1537,7 +1537,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@360cc",
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@69993",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -2253,7 +2253,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@8a7df",
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@fe0af",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -2969,7 +2969,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@8a7df",
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@4a940",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -3685,7 +3685,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@63bfa",
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@ee721",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -4401,7 +4401,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@a018f",
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@19c31",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,

assets/resources/gui/talent.prefab.meta

@@ -1,13 +0,0 @@
-{
-  "ver": "1.1.50",
-  "importer": "prefab",
-  "imported": true,
-  "uuid": "9062ed4f-da96-4e4c-8c5f-72294fd608fe",
-  "files": [
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {
-    "syncNodeName": "talent"
-  }
-}

assets/script/game/Role/Role.ts

@@ -16,6 +16,7 @@ import { RoleSpine } from "./RoleSpine";
 import { RoleViewComp } from "./RoleViewComp";
 import { BoxSet } from "../common/config/BoxSet";
 import { HeroModelComp } from "../hero/HeroModelComp";
+import { Talents } from "../common/config/TalentSet";
 /** 角色实体 */
 @ecs.register(`Role`)
 export class Role extends ecs.Entity {
@@ -51,28 +52,30 @@ export class Role extends ecs.Entity {
     hero_init(uuid:number=1001,node:Node,pos:Vec3=v3(0,0,0)){
         var rv = node.getComponent(RoleViewComp)!;
         let role=smc.vm_data.role;
+        let role_talent= smc.vm_data.talent
+        let talents=Talents;
         rv.hero_uuid=uuid;
         rv.speed =rv.ospeed = role.speed;
         rv.atk_dis = role.atk_dis;
         rv.hero_name= "role";
-        rv.hp= rv.hp_max = role.hp*(1+smc.vm_data.talent[1].bonus*smc.vm_data.talent[1].lv);
         rv.level = role.lv;
-        rv.atk = role.atk*(1+smc.vm_data.talent[2].bonus*smc.vm_data.talent[2].lv);
-        rv.atk_cd = role.atk_cd*(1-smc.vm_data.talent[3].bonus*smc.vm_data.talent[3].lv);
-        rv.st_boncus=1+smc.vm_data.talent[15].bonus*smc.vm_data.talent[15].lv;
-        rv.s_boncus=1+smc.vm_data.talent[16].bonus*smc.vm_data.talent[16].lv;
         rv.power = role.power;
         rv.skill1 = role.skill1;  
-        rv.skill1.cd=rv.skill1.cd_max=rv.skill1.cd_max*(1-smc.vm_data.talent[4].bonus*smc.vm_data.talent[4].lv)
         rv.skill2 = role.skill2;  
-        rv.skill2.cd=rv.skill2.cd_max=rv.skill1.cd_max*(1-smc.vm_data.talent[4].bonus*smc.vm_data.talent[4].lv)
         rv.skill3 = role.skill3; 
-        rv.skill3.cd=rv.skill3.cd_max=rv.skill1.cd_max*(1-smc.vm_data.talent[4].bonus*smc.vm_data.talent[4].lv)
         rv.skill4 = role.skill4; 
-        rv.skill4.cd=rv.skill4.cd_max=rv.skill1.cd_max*(1-smc.vm_data.talent[4].bonus*smc.vm_data.talent[4].lv)
         rv.skill5 = role.skill5;  
-        rv.skill5.cd=rv.skill5.cd_max=rv.skill1.cd_max*(1-smc.vm_data.talent[4].bonus*smc.vm_data.talent[4].lv)
         rv.skill = role.skill;
+        rv.skill1.cd=rv.skill1.cd_max=rv.skill1.cd_max*(1-talents[1004].bonus*role_talent[1004].lv)
+        rv.skill2.cd=rv.skill2.cd_max=rv.skill1.cd_max*(1-talents[1004].bonus*role_talent[1004].lv) 
+        rv.skill3.cd=rv.skill3.cd_max=rv.skill1.cd_max*(1-talents[1004].bonus*role_talent[1004].lv) 
+        rv.skill4.cd=rv.skill4.cd_max=rv.skill1.cd_max*(1-talents[1004].bonus*role_talent[1004].lv)
+        rv.skill5.cd=rv.skill5.cd_max=rv.skill1.cd_max*(1-talents[1004].bonus*role_talent[1004].lv)
+        rv.hp= rv.hp_max = role.hp*(1+talents[1001].bonus*role_talent[1001].lv);
+        rv.atk = role.atk*(1+talents[1002].bonus*role_talent[1002].lv);
+        rv.atk_cd = role.atk_cd*(1-talents[1003].bonus*role_talent[1003].lv);
+        rv.st_boncus=1+talents[1005].bonus*role_talent[1005].lv;
+        rv.s_boncus=1+talents[1006].bonus*role_talent[1006].lv;
         rv.box_group = BoxSet.HERO;        
         this.add(rv);
     }

assets/script/game/Role/Talent.ts

@@ -10,7 +10,9 @@ export class Talent extends ecs.Entity {
     /** ---------- 数据层 ---------- */
 
     TalentView!: TalentComp
+    protected init() {
 
+    }
     destroy(): void {
         this.remove(TalentComp);
         super.destroy();
@@ -19,11 +21,14 @@ export class Talent extends ecs.Entity {
      /** 加载角色 */
     load(pos: Vec3 = Vec3.ZERO,uuid:number=101,parent:Node) {
         // var path =  "game/monster/"+prefab_path;
-        var path =  "game/heros/role";
+        var path =  "game/talent";
         var prefab: Prefab = oops.res.get(path, Prefab)!;
         var node = instantiate(prefab);
         node.parent = parent;
-        node.setScale(node.scale.x, node.scale.y, node.scale.z);
         node.setPosition(pos)
+        console.log("load_talent",node)
+        let tv = node.getComponent(TalentComp)!;
+        tv.t_uuid = uuid;
+        this.add(tv);
     }
 }

assets/script/game/Role/TalentComp.ts

@@ -1,6 +1,8 @@
-import { _decorator } from "cc";
+import { _decorator, Label } from "cc";
 import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS";
 import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp";
+import { Talents } from "../common/config/TalentSet";
+import { smc } from "../common/SingletonModuleComp";
 
 const { ccclass, property } = _decorator;
 
@@ -8,12 +10,35 @@ const { ccclass, property } = _decorator;
 @ccclass('TalentComp')
 @ecs.register('TalentView', false)
 export class TalentComp extends CCComp {
+    t_uuid:number = 0;
     /** 视图层逻辑代码分离演示 */
     start() {
-        // var entity = this.ent as ecs.Entity;         // ecs.Entity 可转为当前模块的具体实体对象
+        let name =this.node.getChildByName("name")
-        // this.on(ModuleEvent.Cmd, this.onHandler, this);
+        let info =this.node.getChildByName("info")
+        let icon =this.node.getChildByName("icon")
+        let cost =this.node.getChildByName("cost")
+        let lv =this.node.getChildByName("lv")
+        let talent= Talents[this.t_uuid]
+        let role_talents = smc.vm_data.talent[talent.uuid]
+        cost.getComponent(Label).string = (talent.cost*(1+role_talents.lv)).toString()
+        name.getComponent(Label).string = talent.name
+        info.getComponent(Label).string = talent.info
+        lv.getComponent(Label).string = role_talents.lv.toString()
+        if (talent.type == 1){
+            this.node.getChildByName("role").active=true
         }
         
+        if (talent.type == 2){
+            this.node.getChildByName("hero").active=true
+        }
+        
+        if (talent.type == 3){
+            this.node.getChildByName("mission").active=true
+        }
+    }
+    to_update_t(){
+        console.log("to_update_t",this.t_uuid)
+    }
     /** 全局消息逻辑处理 */
     // private onHandler(event: string, args: any) {
     //     switch (event) {

assets/script/game/common/SingletonModuleComp.ts

@@ -77,6 +77,8 @@ export class SingletonModuleComp extends ecs.Comp {
         gems: 4,
         unlock:5,
         mission:{
+            play:false,
+            pause:false,
             victory:0,
             once:6,   //每波刷新怪物数量
             total:120, //总怪物数
@@ -133,26 +135,24 @@ export class SingletonModuleComp extends ecs.Comp {
             skill3:{uuid:1001,cd:3,cd_max:3,alive:false},
             skill4:{uuid:1001,cd:3,cd_max:3,alive:false},
             skill5:{uuid:1001,cd:3,cd_max:3,alive:false},
-     
-
         },
         talent:{
-            1:{bonus:3,lv:0,lv_max:5,info:"英雄血量加成",name:""},
+            1001:{uuid:1001,lv:0,},
-            2:{bonus:3,lv:0,lv_max:5,info:"英雄攻击加成",name:""},
+            1002:{uuid:1002,lv:0,},
-            3:{bonus:3,lv:0,lv_max:5,info:"英雄攻击加速",name:""},
+            1003:{uuid:1003,lv:0,},
-            4:{bonus:3,lv:0,lv_max:5,info:"英雄技能cd加速",name:""},
+            1004:{uuid:1004,lv:0,},
-            5:{bonus:3,lv:0,lv_max:5,info:"英雄技能效果加强",name:""},
+            1005:{uuid:1005,lv:0,},
-            6:{bonus:3,lv:0,lv_max:5,info:"铜币收益增加",name:""},
+            1006:{uuid:1006,lv:0,},
-            7:{bonus:3,lv:0,lv_max:5,info:"",name:""},
+            1007:{uuid:1007,lv:0,},
-            8:{bonus:3,lv:0,lv_max:5,info:"",name:""},
+            1008:{uuid:1008,lv:0,},
-            9:{bonus:3,lv:0,lv_max:5,info:"",name:""},
+            1009:{uuid:1009,lv:0,},
-            10:{bonus:3,lv:0,lv_max:5,info:"",name:""},
+            1010:{uuid:1010,lv:0,},
-            11:{bonus:3,lv:0,lv_max:5,info:"血量加成",name:""},
+            1011:{uuid:1011,lv:0,},
-            12:{bonus:3,lv:0,lv_max:5,info:"攻击加成",name:""},
+            1012:{uuid:1012,lv:0,},
-            13:{bonus:3,lv:0,lv_max:5,info:"攻击加速",name:""},
+            1013:{uuid:1013,lv:0,},
-            14:{bonus:3,lv:0,lv_max:5,info:"技能cd加速",name:""},
+            1014:{uuid:1014,lv:0,},
-            15:{bonus:3,lv:0,lv_max:5,info:"技能效果加强",name:""},
+            1015:{uuid:1015,lv:0,},
-            16:{bonus:3,lv:0,lv_max:5,info:"技能持续时间",name:""},
+            1016:{uuid:1016,lv:0,},
         },
         monster:{
             gold_add:1,

assets/script/game/common/config/TalentSet.ts

@@ -0,0 +1,19 @@
+export const talent_num=2
+export const Talents={
+     1001:{uuid:1001,type: 1,bonus:3,cost:1,lv_max:99,info:"勇者血量加成",name:"强身"},
+     1002:{uuid:1002,type: 1,bonus:3,cost:1,lv_max:99,info:"勇者攻击加成",name:"历练"},
+     1003:{uuid:1003,type: 1,bonus:3,cost:1,lv_max:99,info:"勇者攻击加速",name:"迅捷"},
+     1004:{uuid:1004,type: 1,bonus:3,cost:1,lv_max:99,info:"勇者技能cd加速",name:"咏唱"},
+     1005:{uuid:1005,type: 1,bonus:3,cost:1,lv_max:99,info:"勇者技能效果加强",name:"凝聚"},
+     1006:{uuid:1006,type: 1,bonus:3,cost:1,lv_max:99,info:"铜币收益增加",name:"精打细算"},
+     // 1007:{uuid:1007,type: 1,bonus:3,cost:1,lv_max:99,info:"",name:""},
+     // 1008:{uuid:1008,type: 1,bonus:3,cost:1,lv_max:99,info:"",name:""},
+     // 1009:{uuid:1009,type: 1,bonus:3,cost:1,lv_max:99,info:"",name:""},
+     // 1010:{uuid:1010,type: 1,bonus:3,cost:1,lv_max:99,info:"",name:""},
+     1011:{uuid:1011,type: 2,bonus:3,cost:1,lv_max:99,info:"佣兵血量加成",name:"后援"},
+     1012:{uuid:1012,type: 2,bonus:3,cost:1,lv_max:99,info:"佣兵攻击加成",name:"激励"},
+     1013:{uuid:1013,type: 2,bonus:3,cost:1,lv_max:99,info:"佣兵攻击加速",name:"鼓舞"},
+     1014:{uuid:1014,type: 2,bonus:3,cost:1,lv_max:99,info:"佣兵技能cd加速",name:"联结"},
+     1015:{uuid:1015,type: 2,bonus:3,cost:1,lv_max:99,info:"佣兵技能效果加强",name:"祝福"},
+     1016:{uuid:1016,type: 2,bonus:3,cost:1,lv_max:99,info:"佣兵技能持续时间",name:"透支"},
+}

assets/script/game/common/config/TalentSet.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "5fdc5c44-f438-4c0e-8c5c-a2673d49aafd",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

assets/script/game/hero/Hero.ts

@@ -19,6 +19,7 @@ import { RandomManager } from "../../../../extensions/oops-plugin-framework/asse
 import { HeroSet,MonSet } from "../common/config/heroSet";
 import { Role } from "../Role/Role";
 import { MoveToComp } from "../common/ecs/position/MoveTo";
+import { Talents } from "../common/config/TalentSet";
 /** 角色实体 */
 @ecs.register(`Hero`)
 export class Hero extends ecs.Entity {
@@ -59,24 +60,26 @@ export class Hero extends ecs.Entity {
         var hv = node.getComponent(HeroViewComp)!;
         // console.log("hero_init",buff)
         let hero_set= smc.heros[uuid]
+        let role_talent= smc.vm_data.talent
+        let talents=Talents;
+        hv.scale = 1;
         hv.speed =hv.ospeed = hero_set.speed;
         hv.hero_uuid= uuid;
         hv.hero_name= hero_set.name;
-        hv.hp= hv.hp_max =Math.floor(hero_set.hp*(1+smc.vm_data.talent[11].bonus*smc.vm_data.talent[11].lv)*smc.vm_data.mission.hero.hp);
-        hv.atk = Math.floor(hero_set.atk*(1+smc.vm_data.talent[12].bonus*smc.vm_data.talent[12].lv))
-        hv.atk_cd = hero_set.atk_cd*(1-smc.vm_data.talent[13].bonus*smc.vm_data.talent[13].lv);
-        hv.st_boncus=1+smc.vm_data.talent[15].bonus*smc.vm_data.talent[15].lv;
-        hv.s_boncus=1+smc.vm_data.talent[16].bonus*smc.vm_data.talent[16].lv;
         hv.atk_dis = hero_set.atk_dis;
         hv.power = hero_set.power;
         hv.level = hero_set.level;
-        hv.power_max= hero_set.power_max*(1-smc.vm_data.talent[14].bonus*smc.vm_data.talent[14].lv);;
         hv.type = hero_set.type;
         hv.skill_uuid = hero_set.skill_uuid;        
         hv.max_skill_uuid = hero_set.max_skill_uuid;
-        hv.scale = 1;
         hv.role_heros_index = index;
         hv.type = hero_set.type;
+        hv.hp= hv.hp_max =Math.floor(hero_set.hp*(1+talents[1011].bonus*role_talent[1011].lv)*smc.vm_data.mission.hero.hp);
+        hv.atk = Math.floor(hero_set.atk*(1+talents[1012].bonus*role_talent[1012].lv))
+        hv.atk_cd = hero_set.atk_cd*(1-talents[1013].bonus*role_talent[1013].lv);
+        hv.st_boncus=1+talents[1015].bonus*role_talent[1015].lv;
+        hv.s_boncus=1+talents[1016].bonus*role_talent[1016].lv;
+        hv.power_max= hero_set.power_max*(1-talents[1014].bonus*role_talent[1014].lv);;
         this.add(hv);
     }
     set_ratio(uuid:number){

assets/script/game/hero/HeroViewComp.ts

@@ -277,6 +277,7 @@ export class HeroViewComp extends CCComp {
     get_hero_pos(hero:any){
         let pos =this.skill_pos()
         let t_pos:Vec3 = v3(720,0)
+        console.log("hero.node.isValid",hero);
         if(!hero.node.isValid){
             return
         }else{
@@ -363,20 +364,20 @@ export class HeroViewComp extends CCComp {
     handle_skill(skill:number){    
         switch (smc.skills[skill].tg) {
             case 0: //自己
-                this.to_add_buff(this.ent,skill)
+                this.to_add_buff(this.node.getComponent(HeroViewComp),skill)
                 break;
             case 1: //伙伴
                 this.push_least_buff(skill)
                 break;
             case 2: //自己和伙伴
-                this.to_add_buff(this.ent,skill)
+                this.to_add_buff(this.node.getComponent(HeroViewComp),skill)
                 this.push_least_buff(skill)
                 break;
             case 3: //敌人
                 this.shoot_enemy(skill)
                 break;
             case 4: //敌人和自己
-                this.to_add_buff(this.ent,skill)
+                this.to_add_buff(this.node.getComponent(HeroViewComp),skill)
                 this.shoot_enemy(skill)
                 break;    
         }

assets/script/game/map/CardController.ts

@@ -10,6 +10,8 @@ import { RewardSet } from "../common/config/RewardSet";
 import { GameSet } from "../common/config/BoxSet";
 import { GameMap } from "./GameMap";
 import { MapModelComp } from "./model/MapModelComp";
+import { Talent } from "../Role/Talent";
+import { Talents } from "../common/config/TalentSet";
 const { ccclass, property } = _decorator;
 
 /** 视图层对象 */
@@ -42,7 +44,9 @@ export class CardControllerComp extends CCComp {
         oops.message.on("minssion_defeat", this.do_minssion_defeat, this)
     }
     start() {
+
     }
+    
     show_info(uuid:number,type:number){
         // console.log("show_info",uuid)
         let node =this.node.getChildByName("item_box")
@@ -188,7 +192,7 @@ export class CardControllerComp extends CCComp {
     coin_add(dt: number) {
         smc.vm_data.gold.time += dt;
         if (smc.vm_data.gold.time >= smc.vm_data.gold.cd) {
-            let coin =(GameSet.COIN_ADD*smc.vm_data.mission.coin_reward_add*(1+smc.vm_data.talent[6].bonus*smc.vm_data.talent[6].lv)).toFixed(0)
+            let coin =(GameSet.COIN_ADD*smc.vm_data.mission.coin_reward_add*(1+Talents[1006].bonus*smc.vm_data.talent[1006].lv)).toFixed(0)
             smc.vm_data.mission.coin += parseFloat(coin)
             smc.vm_data.gold.time = 0;
         }
@@ -204,6 +208,13 @@ export class CardControllerComp extends CCComp {
         this.node.getChildByName("bar").getChildByName("hero_btn").setScale(1,1)
         this.node.getChildByName("bar").getChildByName("home_btn").setScale(1,1)
     }
+    mission_start(){
+        this.node.getChildByName("bar").active=false;
+        this.node.getChildByName("mission_home").active=false
+        this.node.getChildByName("mission").active=true
+        smc.vm_data.mission.play = true;
+        oops.message.dispatchEvent("mission_start")
+    }
     to_home(){
         this.node.getChildByName("mission_home").active=false
         this.node.getChildByName("hero_home").active=false

assets/script/game/map/HeroHomeComp.ts

@@ -10,6 +10,8 @@ import { RewardSet } from "../common/config/RewardSet";
 import { GameSet } from "../common/config/BoxSet";
 import { GameMap } from "./GameMap";
 import { MapModelComp } from "./model/MapModelComp";
+import { Talent } from "../Role/Talent";
+import { Talents } from "../common/config/TalentSet";
 const { ccclass, property } = _decorator;
 
 /** 视图层对象 */
@@ -21,12 +23,34 @@ export class HeroHomeComp extends CCComp {
 
     }
     start() {
-        let hero_talent_content=this.node.getChildByName("hero_talent").getChildByName("view").getChildByName("content").getComponent(UITransform)
+        
-        hero_talent_content.height=2000
+        this.load_talents()
         console.log("hero_home start")
 
     }
-  
+    load_talents(){
+        let y=-70
+        let pos = v3(0,y)
+        let talents:any= Talents
+        let parent= this.node.getChildByName("talents").getChildByName("view").getChildByName("content")
+        console.log("talents:",talents,)
+        const keys = Object.keys(talents);
+        if (keys.length === 0) {
+            console.log("No talents to process.");
+        } else {
+            for (const key of keys) {
+                const talentData = talents[key];
+                let talent = ecs.getEntity<Talent>(Talent);
+                console.log("talent:", talentData);
+                let uuid = talentData.uuid;
+                talent.load(pos, uuid, parent);
+                pos.y -= 140; // 更新位置
+            }
+        }
+        let hero_talent_content=parent.getComponent(UITransform)
+        hero_talent_content.height=2000
+        console.log("hero_talent_content:",parent)
+    }
     /** 视图对象通过 ecs.Entity.remove(ControllerComp) 删除组件是触发组件处理自定义释放逻辑 */
     reset() {
         this.node.destroy();

assets/script/game/map/MapMonsterComp.ts

@@ -54,6 +54,7 @@ export class MapMonsterComp extends CCComp {
         // 监听全局事件
         oops.message.on("other_add_monster", this.on_other_add_monster, this);
         oops.message.on("do_add_hero", this.on_do_add_hero, this);     
+        oops.message.on("mission_start", this.mission_start, this);              
         oops.message.on("normal_call", this.on_normal_call, this);
         oops.message.on("better_call", this.on_better_call, this);
 
@@ -72,14 +73,10 @@ export class MapMonsterComp extends CCComp {
         // console.log("当前关卡方案",this.cur_mission,this.mission_list)
         this.refresh_timer= new Timer(smc.vm_data.shuaxin.max);
         smc.vm_data.mission.m_less=smc.vm_data.mission.m_alive=JSON.parse(JSON.stringify(this.total));
-        this.monster_refresh()
-        this.load_role()
-        this.load_boss()
-
     }
     
     protected update(dt: number): void {
-        if(smc.vm_data.game_over||smc.vm_data.game_pause){
+        if(!smc.vm_data.mission.play||smc.vm_data.pause){
             return
         }
         if(this.setp_timer.update(dt)){
@@ -102,6 +99,10 @@ export class MapMonsterComp extends CCComp {
         // }
         // this.shuaxin(dt)
     } 
+    mission_start(){
+        this.load_role()
+        this.load_boss()
+    }
     on_normal_call(){
         let hero:any =RandomManager.instance.getRandomByObjectList(smc.cards, 1);
         this.addHero(hero[0].uuid)
@@ -150,7 +151,7 @@ export class MapMonsterComp extends CCComp {
         this.addMonster(args.uuid,monster_layer,pos)
     }
     set_start_point(){
-        this.start_p.setPosition(-240,BoxSet.GAME_LINE+this.start_ys[this.hero_index]+30,0)
+        // this.start_p.setPosition(-240,BoxSet.GAME_LINE+this.start_ys[this.hero_index]+30,0)
     }
     check_mon_count(){
         let count = 0;

assets/script/game/mon/MonViewComp.ts

@@ -21,6 +21,7 @@ import { SkillSet } from "../common/config/SkillSet";
 import { Tooltip } from "../skills/Tooltip";
 import { MoveToComp } from "../common/ecs/position/MoveTo";
 import { BoxRangComp } from "./BoxRangComp";
+import { Talents } from "../common/config/TalentSet";
 const { ccclass, property } = _decorator;
 
 /** 角色显示组件 */
@@ -429,7 +430,7 @@ export class MonViewComp extends CCComp {
 
     }
     dead(){
-        let coin =(GameSet.MON_COIN_ADD*smc.vm_data.mission.coin_reward_add*(1+smc.vm_data.talent[6].bonus*smc.vm_data.talent[6].lv)).toFixed(0)
+        let coin =(GameSet.MON_COIN_ADD*smc.vm_data.mission.coin_reward_add*(1+Talents[1006].bonus*smc.vm_data.talent[1006].lv)).toFixed(0)
         smc.vm_data.mission.coin += parseFloat(coin)
         smc.vm_data.mission.reward_num += 1;
         smc.vm_data.mission.m_alive -= 1;