转表，合并代码。怪物的技能生成， 临时写成这样了，后面改一下。

Assets/Res/Config/HeroModelConfig.json

@@ -22,8 +22,8 @@
       "speed_atk": 1.0,
       "range_atk": 3,
       "skillID": [
-        10011,
-        100011
+        1001,
+        10001
       ],
       "heroStory": null
     },
@@ -49,8 +49,8 @@
       "speed_atk": 1.0,
       "range_atk": 5,
       "skillID": [
-        10011,
-        300011
+        1001,
+        30001
       ],
       "heroStory": null
     },
@@ -76,8 +76,8 @@
       "speed_atk": 1.0,
       "range_atk": 5,
       "skillID": [
-        10011,
-        200011
+        1001,
+        20001
       ],
       "heroStory": null
     },
@@ -103,8 +103,8 @@
       "speed_atk": 1.0,
       "range_atk": 5,
       "skillID": [
-        10011,
-        400011
+        1001,
+        40001
       ],
       "heroStory": null
     },
@@ -130,7 +130,7 @@
       "speed_atk": 1.0,
       "range_atk": 3,
       "skillID": [
-        10011
+        1001
       ],
       "heroStory": 70093
     },
@@ -156,8 +156,8 @@
       "speed_atk": 1.0,
       "range_atk": 3,
       "skillID": [
-        10011,
-        1200011
+        1001,
+        120001
       ],
       "heroStory": 70093
     },
@@ -183,9 +183,9 @@
       "speed_atk": 1.0,
       "range_atk": 3,
       "skillID": [
-        10011,
-        1100011,
-        1100021
+        1001,
+        110001,
+        110002
       ],
       "heroStory": 70093
     },
@@ -211,7 +211,7 @@
       "speed_atk": 1.0,
       "range_atk": 3,
       "skillID": [
-        10011
+        1001
       ],
       "heroStory": 70093
     },
@@ -237,8 +237,8 @@
       "speed_atk": 1.0,
       "range_atk": 3,
       "skillID": [
-        10011,
-        1300011
+        1001,
+        130001
       ],
       "heroStory": 70093
     },
@@ -264,9 +264,9 @@
       "speed_atk": 1.0,
       "range_atk": 3,
       "skillID": [
-        10011,
-        1400011,
-        1400031
+        1001,
+        140001,
+        140003
       ],
       "heroStory": 70093
     }

Assets/Res/Config/SkillUpConfig.json

@@ -2,51 +2,51 @@
   "configList": [
     {
       "ID": 1,
-      "upType": 2,
-      "upValue": 5,
-      "idx": 3,
+      "upType": 1,
+      "upValue": 1,
+      "idx": 0,
       "skillParam": [
         1
       ]
     },
     {
-      "ID": 2,
-      "upType": 2,
-      "upValue": 7,
-      "idx": 4,
+      "ID": 11,
+      "upType": 1,
+      "upValue": 1,
+      "idx": 1,
       "skillParam": [
         1
       ]
     },
     {
-      "ID": 3,
-      "upType": 2,
-      "upValue": 9,
-      "idx": 5,
+      "ID": 12,
+      "upType": 1,
+      "upValue": 31,
+      "idx": 1,
       "skillParam": [
-        1
+        2
       ]
     },
     {
-      "ID": 4,
+      "ID": 13,
       "upType": 1,
-      "upValue": 1,
-      "idx": 0,
+      "upValue": 131,
+      "idx": 1,
       "skillParam": [
-        1
+        3
       ]
     },
     {
-      "ID": 5,
+      "ID": 14,
       "upType": 1,
-      "upValue": 1,
+      "upValue": 231,
       "idx": 1,
       "skillParam": [
-        1
+        4
       ]
     },
     {
-      "ID": 6,
+      "ID": 21,
       "upType": 1,
       "upValue": 11,
       "idx": 2,
@@ -55,129 +55,129 @@
       ]
     },
     {
-      "ID": 7,
+      "ID": 22,
       "upType": 1,
-      "upValue": 31,
-      "idx": 1,
+      "upValue": 51,
+      "idx": 2,
       "skillParam": [
         2
       ]
     },
     {
-      "ID": 8,
+      "ID": 23,
       "upType": 1,
-      "upValue": 51,
+      "upValue": 151,
       "idx": 2,
       "skillParam": [
-        2
+        3
       ]
     },
     {
-      "ID": 9,
+      "ID": 24,
       "upType": 1,
-      "upValue": 71,
-      "idx": 3,
+      "upValue": 251,
+      "idx": 2,
       "skillParam": [
-        2
+        4
       ]
     },
     {
-      "ID": 10,
-      "upType": 1,
-      "upValue": 91,
-      "idx": 4,
+      "ID": 31,
+      "upType": 2,
+      "upValue": 5,
+      "idx": 3,
       "skillParam": [
-        2
+        1
       ]
     },
     {
-      "ID": 11,
+      "ID": 32,
       "upType": 1,
-      "upValue": 111,
-      "idx": 5,
+      "upValue": 71,
+      "idx": 3,
       "skillParam": [
         2
       ]
     },
     {
-      "ID": 12,
+      "ID": 33,
       "upType": 1,
-      "upValue": 131,
-      "idx": 1,
+      "upValue": 171,
+      "idx": 3,
       "skillParam": [
         3
       ]
     },
     {
-      "ID": 13,
+      "ID": 34,
       "upType": 1,
-      "upValue": 151,
-      "idx": 2,
+      "upValue": 271,
+      "idx": 3,
       "skillParam": [
-        3
+        4
       ]
     },
     {
-      "ID": 14,
-      "upType": 1,
-      "upValue": 171,
-      "idx": 3,
+      "ID": 41,
+      "upType": 2,
+      "upValue": 7,
+      "idx": 4,
       "skillParam": [
-        3
+        1
       ]
     },
     {
-      "ID": 15,
+      "ID": 42,
       "upType": 1,
-      "upValue": 191,
+      "upValue": 91,
       "idx": 4,
       "skillParam": [
-        3
+        2
       ]
     },
     {
-      "ID": 16,
+      "ID": 43,
       "upType": 1,
-      "upValue": 211,
-      "idx": 5,
+      "upValue": 191,
+      "idx": 4,
       "skillParam": [
         3
       ]
     },
     {
-      "ID": 17,
+      "ID": 44,
       "upType": 1,
-      "upValue": 231,
-      "idx": 1,
+      "upValue": 291,
+      "idx": 4,
       "skillParam": [
         4
       ]
     },
     {
-      "ID": 18,
-      "upType": 1,
-      "upValue": 251,
-      "idx": 2,
+      "ID": 51,
+      "upType": 2,
+      "upValue": 9,
+      "idx": 5,
       "skillParam": [
-        4
+        1
       ]
     },
     {
-      "ID": 19,
+      "ID": 52,
       "upType": 1,
-      "upValue": 271,
-      "idx": 3,
+      "upValue": 111,
+      "idx": 5,
       "skillParam": [
-        4
+        2
       ]
     },
     {
-      "ID": 20,
+      "ID": 53,
       "upType": 1,
-      "upValue": 291,
-      "idx": 4,
+      "upValue": 211,
+      "idx": 5,
       "skillParam": [
-        4
+        3
       ]
     }
   ]

Assets/Res/UI/HeroDetailPanel.prefab

@@ -2955,6 +2955,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   DotName: sk1_trigger
+  followSkeleton: 0
 --- !u!1 &2664411918127213144
 GameObject:
   m_ObjectHideFlags: 0
@@ -5358,6 +5359,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   DotName: hitpos
+  followSkeleton: 0
 --- !u!1 &4268106224602604728
 GameObject:
   m_ObjectHideFlags: 0
@@ -7821,7 +7823,6 @@ RectTransform:
   - {fileID: 7705411688387883887}
   - {fileID: 7484599139481258495}
   - {fileID: 3289702276652194812}
-  - {fileID: 2226371017396893642}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -11942,129 +11943,3 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
---- !u!1001 &7747039035303655237
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 8323024823130982353}
-    m_Modifications:
-    - target: {fileID: 3724598441491386566, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_Name
-      value: SkillUIComponent
-      objectReference: {fileID: 0}
-    - target: {fileID: 3724598441491386566, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7678038991277897505, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7678038991277897505, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7678038991277897505, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 52.884995
-      objectReference: {fileID: 0}
-    - target: {fileID: 7678038991277897505, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -52.425
-      objectReference: {fileID: 0}
-    - target: {fileID: 8439587507723242819, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 83
-      objectReference: {fileID: 0}
-    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 750
-      objectReference: {fileID: 0}
-    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 500
-      objectReference: {fileID: 0}
-    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -1.4569092
-      objectReference: {fileID: 0}
-    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
---- !u!224 &2226371017396893642 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
-  m_PrefabInstance: {fileID: 7747039035303655237}
-  m_PrefabAsset: {fileID: 0}

Assets/Res/UI/SkillUIComponent.prefab

@@ -482,7 +482,7 @@ MonoBehaviour:
     m_MinSize: 2
     m_MaxSize: 40
     m_Alignment: 0
-    m_AlignByGeometry: 1
+    m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
@@ -727,6 +727,7 @@ RectTransform:
   - {fileID: 4388396417434440462}
   - {fileID: 4397437230936891047}
   - {fileID: 4105650447501009726}
+  - {fileID: 723490014355934592}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
@@ -848,6 +849,15 @@ MonoBehaviour:
     - gameObject: {fileID: 1829847571812348693}
     - gameObject: {fileID: 1806108059677379203}
     - gameObject: {fileID: 7033063365279083689}
+  - key: btnBack
+    gameObject: {fileID: 2711588293977141334}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1903911127976497113}
+    - gameObject: {fileID: 1829847571812348693}
+    - gameObject: {fileID: 1806108059677379203}
+    - gameObject: {fileID: 7033063365279083689}
   isAssetBundle: 1
 --- !u!1 &3883852036818116843
 GameObject:
@@ -929,6 +939,136 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6280\u80FD\u5DF2\u8FBE\u6700\u9AD8\u7B49\u7EA7"
+--- !u!1 &4310102973561622993
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 723490014355934592}
+  - component: {fileID: 516774113589680700}
+  - component: {fileID: 2711588293977141334}
+  - component: {fileID: 1690155598512094183}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Button_Back
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &723490014355934592
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4310102973561622993}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6405333098484184124}
+  m_Father: {fileID: 8459636219199963279}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 613, y: 445}
+  m_SizeDelta: {x: 134, y: 100}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &516774113589680700
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4310102973561622993}
+  m_CullTransparentMesh: 1
+--- !u!114 &2711588293977141334
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4310102973561622993}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1690155598512094183}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &1690155598512094183
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4310102973561622993}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_LeftFlush_Dark
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &4356462366393647132
 GameObject:
   m_ObjectHideFlags: 0
@@ -1009,6 +1149,106 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u7B49\u7EA7:"
+--- !u!1 &5657990910231637639
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6405333098484184124}
+  - component: {fileID: 4906605461895174008}
+  - component: {fileID: 2547591136658460327}
+  - component: {fileID: 7459821602363042982}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6405333098484184124
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5657990910231637639}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 723490014355934592}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -9, y: 4}
+  m_SizeDelta: {x: 80.6, y: 69}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4906605461895174008
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5657990910231637639}
+  m_CullTransparentMesh: 1
+--- !u!114 &2547591136658460327
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5657990910231637639}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+  m_EffectDistance: {x: 0, y: -4}
+  m_UseGraphicAlpha: 0
+--- !u!114 &7459821602363042982
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5657990910231637639}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_Back
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &5993052203131053859
 GameObject:
   m_ObjectHideFlags: 0
@@ -1345,42 +1585,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: WidgetIconSkill
       objectReference: {fileID: 0}
-    - target: {fileID: 3873412332717944351, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: data.Array.size
-      value: 8
-      objectReference: {fileID: 0}
-    - target: {fileID: 3873412332717944351, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: data.Array.data[7].key
-      value: imgBorder
-      objectReference: {fileID: 0}
-    - target: {fileID: 3873412332717944351, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: data.Array.data[7].gameObject
-      value: 
-      objectReference: {fileID: 6356623614902820956}
-    - target: {fileID: 3873412332717944351, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: data.Array.data[7].ListCollectorDatas.Array.size
-      value: 5
+    - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
+      propertyPath: m_IsActive
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 3873412332717944351, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: data.Array.data[7].ListCollectorDatas.Array.data[0].gameObject
-      value: 
-      objectReference: {fileID: 4730963194112808987}
-    - target: {fileID: 3873412332717944351, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: data.Array.data[7].ListCollectorDatas.Array.data[1].gameObject
-      value: 
-      objectReference: {fileID: 5415807348339721676}
-    - target: {fileID: 3873412332717944351, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: data.Array.data[7].ListCollectorDatas.Array.data[2].gameObject
-      value: 
-      objectReference: {fileID: 6179864305382629958}
-    - target: {fileID: 3873412332717944351, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: data.Array.data[7].ListCollectorDatas.Array.data[3].gameObject
-      value: 
-      objectReference: {fileID: 4218396650660049734}
-    - target: {fileID: 3873412332717944351, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: data.Array.data[7].ListCollectorDatas.Array.data[4].gameObject
-      value: 
-      objectReference: {fileID: 4947217298623276250}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -1395,7 +1603,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1403,7 +1611,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_SizeDelta.x
@@ -1443,11 +1651,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 52.884995
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -52.425
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1466,42 +1674,6 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
---- !u!1 &4218396650660049734 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2719340735970800176, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-  m_PrefabInstance: {fileID: 2249487104835043702}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &4730963194112808987 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 6813956608893737325, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-  m_PrefabInstance: {fileID: 2249487104835043702}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &4947217298623276250 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 6602210470685861292, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-  m_PrefabInstance: {fileID: 2249487104835043702}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &5415807348339721676 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 6061590614435071162, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-  m_PrefabInstance: {fileID: 2249487104835043702}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &6179864305382629958 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 5401084022597182256, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-  m_PrefabInstance: {fileID: 2249487104835043702}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &6356623614902820956 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 5116242993357496618, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-  m_PrefabInstance: {fileID: 2249487104835043702}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!224 &7678038991277897505 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}

Assets/Res/UI/WidgetIconSkill.prefab

@@ -174,6 +174,16 @@ MonoBehaviour:
     - gameObject: {fileID: 5401084022597182256}
     - gameObject: {fileID: 2719340735970800176}
     - gameObject: {fileID: 6602210470685861292}
+  - key: imgBorder
+    gameObject: {fileID: 5116242993357496618}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 6813956608893737325}
+    - gameObject: {fileID: 6061590614435071162}
+    - gameObject: {fileID: 5401084022597182256}
+    - gameObject: {fileID: 2719340735970800176}
+    - gameObject: {fileID: 6602210470685861292}
   isAssetBundle: 1
 --- !u!114 &7265675937267221902
 MonoBehaviour:

Assets/Scripts/GameData/ExcelConfig/SkillUpConfig.cs

@@ -15,7 +15,7 @@ namespace Excel2Json
 	public struct SkillUpConfig : IConfig
	{
 		public int GetID() {return ID;} 
 		/// <summary>
-		///表ID
+		///表ID 技能ID的最后两位 1=普攻
 		/// </summary>
 public int ID;
 

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroInfo.cs

@@ -4,6 +4,7 @@ using Core.Language;
 using Core.Utility;
 using Excel2Json;
 using Fort23.UTool;
+using GameLogic.Hero;
 using UnityEngine;
 using UnityEngine.Serialization;
 using Utility;
@@ -11,6 +12,8 @@ using Utility;
 [System.Serializable]
 public class CombatHeroInfo
 {
+    
+    public SkillData SkillData;
     public int modelID;
     public EncryptionLong hp = new EncryptionLong();
     public EncryptionLong defense = new EncryptionLong();
@@ -52,6 +55,7 @@ public class CombatHeroInfo
     public float maxDis=2;
     public float maxDisTo=2*2;
     public int[] skillId;
+    public List<SkillConfig> skillConfigs;
     public bool isGpu;
     public string heroName;
 
@@ -126,6 +130,8 @@ public class CombatHeroInfo
         SetDataConfig(modelID, level, star);
         CalFactor();
         CalAttribute();
+        SkillData = new SkillData(this);
+        SkillData.InitSkills();
     }
 
     // public void InitMonster(int id,int level)

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroSkillControl.cs

@@ -36,14 +36,19 @@ namespace GameLogic.Combat.Hero
         public void Init(CombatHeroEntity combatHeroEntity)
         {
             _combatHeroEntity = combatHeroEntity;
-            int[] skillId = _combatHeroEntity.CurrCombatHeroInfo.skillId;
-            if (skillId != null)
+            // int[] skillId = _combatHeroEntity.CurrCombatHeroInfo.skillId;
+            // if (skillId != null)
+            // {
+            //     for (int i = 0; i < skillId.Length; i++)
+            //     {
+            //         SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(skillId[i]);
+            //         AddSkill(skillConfig);
+            //     }
+            // }
+
+            foreach (SkillConfig skillConfig in combatHeroEntity.CurrCombatHeroInfo.skillConfigs)
             {
-                for (int i = 0; i < skillId.Length; i++)
-                {
-                    SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(skillId[i]);
-                    AddSkill(skillConfig);
-                }
+                AddSkill(skillConfig);
             }
         }
 

Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -18,7 +18,7 @@ namespace GameLogic.Hero
         /// <summary>
         /// 技能数据
         /// </summary>
-        public SkillData SkillData;
+        // public SkillData SkillData;
 
         public string iconZhiYe
         {

Assets/Scripts/GameLogic/Hero/SkillData.cs

@@ -26,9 +26,9 @@ namespace GameLogic.Hero
         
         public Dictionary<int, List<SkillInfo>> mySkillDic = new Dictionary<int, List<SkillInfo>>();
 
-        public HeroInfo heroInfo;
+        public CombatHeroInfo heroInfo;
 
-        public SkillData(HeroInfo heroInfo)
+        public SkillData(CombatHeroInfo heroInfo)
         {
             this.heroInfo = heroInfo;
         }
@@ -103,12 +103,14 @@ namespace GameLogic.Hero
         public void UpdateSkill4Combat()
         {
             int idx = 0;
+            heroInfo.skillConfigs = new List<SkillConfig>();
             foreach (KeyValuePair<int, List<SkillInfo>> keyValuePair in heroInfo.SkillData.mySkillDic)
             {
                 SkillInfo combatSkill = GetHighestLevelOr1(keyValuePair.Key, true);
                 if (combatSkill != null)
                 {
                     allSkill4Combat.Add(combatSkill);
+                    heroInfo.skillConfigs.Add(combatSkill.skillConfig);
                 }
             }
         }

Assets/Scripts/GameLogic/Hero/SkillInfo.cs

@@ -6,7 +6,7 @@ namespace GameLogic.Hero
 {
     public class SkillInfo
     {
-        public HeroInfo heroInfo;
+        public CombatHeroInfo heroInfo;
         public SkillConfig skillConfig;
         /// <summary>
         /// 是否解锁

Assets/Scripts/GameUI/UI/Hero/HeroDetailPanel.cs

@@ -41,7 +41,8 @@ namespace Fort23.Mono
 
         private async void OnClickSkill()
         {
-            SkillUIComponent skillUIComponent = await UIManager.Instance.CreateGComponent<SkillUIComponent>(null);
+            SkillUIComponent skillUIComponent = await UIManager.Instance.CreateGComponent<SkillUIComponent>(null, poolName:"SkillUIComponent",
+                root:this.transform);
             skillUIComponent.InitUI(heroInfo);
         }
 

Assets/Scripts/GameUI/UI/Hero/SkillUIComponent.cs

@@ -21,6 +21,13 @@ namespace Fort23.Mono
         }
         public override void AddButtonEvent()
         {
+            btnBack.onClick.AddListener(OnClickBack);
+        }
+
+        private void OnClickBack()
+        {
+            UIManager.Instance.DormancyGComponent(this);
+            UIManager.Instance.DormancyAllGComponent<WidgetIconSkill>("WidgetIconSkill");
         }
 
         private HeroInfo heroInfo;

Assets/Scripts/GameUI/UI/Hero/SkillUIComponentData.cs

@@ -129,6 +129,17 @@ namespace Fort23.Mono
 	      return _layoutGroup;
 	     }
 	   }
+	  private Button _btnBack;
+	  public Button btnBack
+	   {
+	   get{
+	      if (_btnBack == null)
+	       {
+	         _btnBack  = GetUIUnit<Button>("btnBack"); 
+	       }
+	      return _btnBack;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

UserSettings/EditorUserSettings.asset

@@ -45,10 +45,10 @@ EditorUserSettings:
       value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615