ui修改

assets/resources/game/talent.prefab.meta

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

assets/resources/gui/element.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "3b20dfdf-8127-4357-b79c-0d12cf3328eb",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

assets/resources/gui/element/hero_card.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.50",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "79e41d70-e29c-4986-98a4-349aa253f58e",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "hero_card"
+  }
+}

assets/resources/gui/element/skill_card.prefab

@@ -1,7 +1,7 @@
 [
   {
     "__type__": "cc.Prefab",
-    "_name": "talent",
+    "_name": "skill_card",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_native": "",
@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "talent",
+    "_name": "skill_card",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": null,
@@ -52,26 +52,29 @@
         "__id__": 62
       },
       {
-        "__id__": 77
+        "__id__": 68
       },
       {
         "__id__": 83
       },
       {
         "__id__": 89
+      },
+      {
+        "__id__": 95
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 95
+        "__id__": 101
       },
       {
-        "__id__": 97
+        "__id__": 103
       }
     ],
     "_prefab": {
-      "__id__": 99
+      "__id__": 105
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -203,7 +206,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@d4108",
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@b9426",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 1,
@@ -1215,7 +1218,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "name",
+    "_name": "bg",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -1236,8 +1239,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -143.08,
+      "x": -11.158,
-      "y": 39.186,
+      "y": -12.553,
       "z": 0
     },
     "_lrot": {
@@ -1277,8 +1280,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 124,
+      "width": 420,
-      "height": 48.1
+      "height": 75
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1289,10 +1292,10 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "3eIvIWgWRG+ZH+2Avs2v+F"
+    "fileId": "a4XOBa/D5CVJOV6YJDYzoN"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1311,53 +1314,30 @@
       "r": 255,
       "g": 255,
       "b": 255,
-      "a": 255
+      "a": 111
     },
-    "_string": "天赋名称",
+    "_spriteFrame": {
-    "_horizontalAlign": 0,
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@58cb7",
-    "_verticalAlign": 1,
+      "__expectedType__": "cc.SpriteFrame"
-    "_actualFontSize": 30,
-    "_fontSize": 30,
-    "_fontFamily": "Arial",
-    "_lineHeight": 35,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": false,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": true,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
     },
-    "_outlineWidth": 2,
+    "_type": 1,
-    "_enableShadow": false,
+    "_fillType": 0,
-    "_shadowColor": {
+    "_sizeMode": 0,
-      "__type__": "cc.Color",
+    "_fillCenter": {
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_shadowOffset": {
       "__type__": "cc.Vec2",
-      "x": 2,
+      "x": 0,
-      "y": 2
+      "y": 0
     },
-    "_shadowBlur": 2,
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "85/KPIfHxOkqKjGGiokOxa"
+    "fileId": "2ak3j4GGJM4IT/SqGMrC1M"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1367,7 +1347,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "1eszWpL2JPPrSX620DCBJd",
+    "fileId": "1aPNLGgx5OPbr+WUXjBkEg",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -1531,6 +1511,165 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "name",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 63
+      },
+      {
+        "__id__": 65
+      }
+    ],
+    "_prefab": {
+      "__id__": 67
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -143.08,
+      "y": 39.186,
+      "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__": 62
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 64
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 124,
+      "height": 48.1
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "3eIvIWgWRG+ZH+2Avs2v+F"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 62
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 66
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_string": "天赋名称",
+    "_horizontalAlign": 0,
+    "_verticalAlign": 1,
+    "_actualFontSize": 30,
+    "_fontSize": 30,
+    "_fontFamily": "Arial",
+    "_lineHeight": 35,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_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": "85/KPIfHxOkqKjGGiokOxa"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "1eszWpL2JPPrSX620DCBJd",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.Node",
     "_name": "update",
@@ -1541,23 +1680,23 @@
     },
     "_children": [
       {
-        "__id__": 63
+        "__id__": 69
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 69
+        "__id__": 75
       },
       {
-        "__id__": 71
+        "__id__": 77
       },
       {
-        "__id__": 73
+        "__id__": 79
       }
     ],
     "_prefab": {
-      "__id__": 76
+      "__id__": 82
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1594,20 +1733,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 62
+      "__id__": 68
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 64
+        "__id__": 70
       },
       {
-        "__id__": 66
+        "__id__": 72
       }
     ],
     "_prefab": {
-      "__id__": 68
+      "__id__": 74
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1644,11 +1783,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 63
+      "__id__": 69
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 65
+      "__id__": 71
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1672,11 +1811,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 63
+      "__id__": 69
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 67
+      "__id__": 73
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1753,11 +1892,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 62
+      "__id__": 68
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 70
+      "__id__": 76
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1781,11 +1920,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 62
+      "__id__": 68
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 72
+      "__id__": 78
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1826,15 +1965,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 62
+      "__id__": 68
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 74
+      "__id__": 80
     },
     "clickEvents": [
       {
-        "__id__": 75
+        "__id__": 81
       }
     ],
     "_interactable": true,
@@ -1915,14 +2054,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 78
+        "__id__": 84
       },
       {
-        "__id__": 80
+        "__id__": 86
       }
     ],
     "_prefab": {
-      "__id__": 82
+      "__id__": 88
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1959,11 +2098,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 77
+      "__id__": 83
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 79
+      "__id__": 85
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1987,11 +2126,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 77
+      "__id__": 83
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 81
+      "__id__": 87
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2051,14 +2190,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 84
+        "__id__": 90
       },
       {
-        "__id__": 86
+        "__id__": 92
       }
     ],
     "_prefab": {
-      "__id__": 88
+      "__id__": 94
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2095,11 +2234,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 83
+      "__id__": 89
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 85
+      "__id__": 91
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2123,11 +2262,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 83
+      "__id__": 89
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 87
+      "__id__": 93
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2187,14 +2326,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 90
+        "__id__": 96
       },
       {
-        "__id__": 92
+        "__id__": 98
       }
     ],
     "_prefab": {
-      "__id__": 94
+      "__id__": 100
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2231,11 +2370,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 89
+      "__id__": 95
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 91
+      "__id__": 97
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2259,11 +2398,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 89
+      "__id__": 95
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 93
+      "__id__": 99
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2344,7 +2483,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 96
+      "__id__": 102
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2372,7 +2511,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 98
+      "__id__": 104
     },
     "_id": ""
   },

assets/resources/gui/element/skill_card.prefab.meta

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

assets/resources/gui/gui.plist.meta

@@ -669,10 +669,10 @@
         "height": 130,
         "rawWidth": 65,
         "rawHeight": 130,
-        "borderTop": 0,
+        "borderTop": 50,
-        "borderBottom": 0,
+        "borderBottom": 55,
-        "borderLeft": 0,
+        "borderLeft": 23,
-        "borderRight": 0,
+        "borderRight": 24,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,
@@ -3015,10 +3015,10 @@
         "height": 107,
         "rawWidth": 128,
         "rawHeight": 107,
-        "borderTop": 0,
+        "borderTop": 40,
-        "borderBottom": 0,
+        "borderBottom": 41,
-        "borderLeft": 0,
+        "borderLeft": 30,
-        "borderRight": 0,
+        "borderRight": 28,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,
@@ -8489,10 +8489,10 @@
         "height": 83,
         "rawWidth": 80,
         "rawHeight": 83,
-        "borderTop": 0,
+        "borderTop": 32,
-        "borderBottom": 0,
+        "borderBottom": 33,
-        "borderLeft": 0,
+        "borderLeft": 34,
-        "borderRight": 0,
+        "borderRight": 31,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,
@@ -11295,10 +11295,10 @@
         "height": 56,
         "rawWidth": 190,
         "rawHeight": 56,
-        "borderTop": 0,
+        "borderTop": 19,
-        "borderBottom": 0,
+        "borderBottom": 18,
-        "borderLeft": 0,
+        "borderLeft": 21,
-        "borderRight": 0,
+        "borderRight": 14,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,
@@ -12123,8 +12123,8 @@
         "height": 130,
         "rawWidth": 65,
         "rawHeight": 130,
-        "borderTop": 0,
+        "borderTop": 51,
-        "borderBottom": 0,
+        "borderBottom": 51,
         "borderLeft": 25,
         "borderRight": 23,
         "packable": true,
@@ -12169,10 +12169,10 @@
         "height": 130,
         "rawWidth": 65,
         "rawHeight": 130,
-        "borderTop": 0,
+        "borderTop": 51,
-        "borderBottom": 0,
+        "borderBottom": 57,
-        "borderLeft": 0,
+        "borderLeft": 27,
-        "borderRight": 0,
+        "borderRight": 26,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,