lzx преди 2 дни
родител
ревизия
748490c8ac

BIN
Assets/Res/UI/SkillSelectPanel/1830dd2f7a003facd906901b3588d294.png


+ 324 - 39
Assets/Res/UI/SkillSelectPanel/SkillRoadSelecPanel.prefab

@@ -26,17 +26,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1490570872434045279}
   m_GameObject: {fileID: 1490570872434045279}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Children: []
-  m_Father: {fileID: 6694772361877173011}
+  m_Father: {fileID: 726015717638279626}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   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: -114.6, y: 421.2}
-  m_SizeDelta: {x: 260.4388, y: 80.8716}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2867406168326028376
 --- !u!222 &2867406168326028376
 CanvasRenderer:
 CanvasRenderer:
@@ -59,7 +59,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 0.9568628, g: 0.93725497, b: 0.8588236, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -67,19 +67,109 @@ MonoBehaviour:
     m_PersistentCalls:
     m_PersistentCalls:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 48
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 34
+    m_FontStyle: 1
     m_BestFit: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 0
     m_MaxSize: 48
     m_MaxSize: 48
-    m_Alignment: 0
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
     m_LineSpacing: 1
   m_Text: "\u5927\u9053\u9009\u62E9"
   m_Text: "\u5927\u9053\u9009\u62E9"
+--- !u!1 &1669730567746278746
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 726015717638279626}
+  - component: {fileID: 2372689976706000820}
+  - component: {fileID: 5682764002703610137}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Bg (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &726015717638279626
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1669730567746278746}
+  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: 5339815961499192561}
+  m_Father: {fileID: 5473342035507285947}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 46.1344}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &2372689976706000820
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1669730567746278746}
+  m_CullTransparentMesh: 1
+--- !u!114 &5682764002703610137
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1669730567746278746}
+  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: 0.34117648, g: 0.45882356, b: 0.40000004, 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: dec_juxing_fang
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: a7317dcd301e45af9e341d0ef7191578
+  imageH: 1005.4618
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &2163825726700097317
 --- !u!1 &2163825726700097317
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -131,12 +221,12 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Padding:
   m_Padding:
-    m_Left: 0
+    m_Left: 8
     m_Right: 0
     m_Right: 0
     m_Top: 0
     m_Top: 0
     m_Bottom: 0
     m_Bottom: 0
   m_ChildAlignment: 0
   m_ChildAlignment: 0
-  m_Spacing: 32.59
+  m_Spacing: 19.81
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
   m_ChildControlWidth: 0
@@ -189,16 +279,16 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children:
   m_Children:
   - {fileID: 6720136829288806993}
   - {fileID: 6720136829288806993}
+  - {fileID: 791309569782851632}
   - {fileID: 5473342035507285947}
   - {fileID: 5473342035507285947}
-  - {fileID: 5339815961499192561}
-  - {fileID: 6442201359385258733}
   - {fileID: 6692896303599278569}
   - {fileID: 6692896303599278569}
+  - {fileID: 1245064307668607480}
   - {fileID: 1610363114509281445}
   - {fileID: 1610363114509281445}
   m_Father: {fileID: 0}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 177.5}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 750, y: 1624}
   m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3038665444609316863
 --- !u!114 &3038665444609316863
@@ -235,6 +325,96 @@ MonoBehaviour:
     isList: 0
     isList: 0
     ListCollectorDatas: []
     ListCollectorDatas: []
   isAssetBundle: 1
   isAssetBundle: 1
+--- !u!1 &3504912474689393577
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1245064307668607480}
+  - component: {fileID: 760184074934391424}
+  - component: {fileID: 6766794043768652848}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1245064307668607480
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3504912474689393577}
+  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: 6442201359385258733}
+  m_Father: {fileID: 6694772361877173011}
+  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: 0, y: 301.5}
+  m_SizeDelta: {x: 331, y: 60.9082}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &760184074934391424
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3504912474689393577}
+  m_CullTransparentMesh: 1
+--- !u!114 &6766794043768652848
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3504912474689393577}
+  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: 0.6784314, g: 0.78823537, b: 0.7058824, 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: dec_fenge_jianbian2
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: a7317dcd301e45af9e341d0ef7191578
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &3548195290827644357
 --- !u!1 &3548195290827644357
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -272,8 +452,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -19, y: -125.757385}
-  m_SizeDelta: {x: 568.22, y: 505.3541}
+  m_AnchoredPosition: {x: -0.2788, y: -28.3891}
+  m_SizeDelta: {x: 686.7876, y: 537.8401}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3103100756713606624
 --- !u!222 &3103100756713606624
 CanvasRenderer:
 CanvasRenderer:
@@ -378,8 +558,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -14.6, y: 297.4}
-  m_SizeDelta: {x: 128, y: 128}
+  m_AnchoredPosition: {x: 0.28448, y: 439.3}
+  m_SizeDelta: {x: 200.9531, y: 200.9531}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6369158076232522425
 --- !u!222 &6369158076232522425
 CanvasRenderer:
 CanvasRenderer:
@@ -419,7 +599,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_skill_30005
+  _icon_name: icon_s1402
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
   CurrSpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
   packInfo:
   packInfo:
@@ -427,6 +607,96 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
     lasetJsonGUID: 151dde130cdc5228de9614f608886409
     lasetJsonGUID: 151dde130cdc5228de9614f608886409
+  imageH: 128
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &4745408340836489853
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 791309569782851632}
+  - component: {fileID: 8041603356125496281}
+  - component: {fileID: 4181030270382028856}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &791309569782851632
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4745408340836489853}
+  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: 6694772361877173011}
+  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: 0, y: 0}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8041603356125496281
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4745408340836489853}
+  m_CullTransparentMesh: 1
+--- !u!114 &4181030270382028856
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4745408340836489853}
+  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: 21300000, guid: 3e503dbfca7d10046b491191397a384f, type: 3}
+  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: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  imageH: 100
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -441,7 +711,7 @@ GameObject:
   m_Component:
   m_Component:
   - component: {fileID: 5473342035507285947}
   - component: {fileID: 5473342035507285947}
   - component: {fileID: 2958293768953992893}
   - component: {fileID: 2958293768953992893}
-  - component: {fileID: 3885140069835064990}
+  - component: {fileID: 8907292888737577659}
   m_Layer: 5
   m_Layer: 5
   m_HasEditorInfo: 1
   m_HasEditorInfo: 1
   m_Name: Bg
   m_Name: Bg
@@ -461,13 +731,14 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 726015717638279626}
   m_Father: {fileID: 6694772361877173011}
   m_Father: {fileID: 6694772361877173011}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -10.035, y: 7.7963}
-  m_SizeDelta: {x: 618.6685, y: 953.8113}
+  m_AnchoredPosition: {x: 0.2845, y: 95.99423}
+  m_SizeDelta: {x: 703.3597, y: 1005.4618}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2958293768953992893
 --- !u!222 &2958293768953992893
 CanvasRenderer:
 CanvasRenderer:
@@ -477,7 +748,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5304678840201142599}
   m_GameObject: {fileID: 5304678840201142599}
   m_CullTransparentMesh: 1
   m_CullTransparentMesh: 1
---- !u!114 &3885140069835064990
+--- !u!114 &8907292888737577659
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -486,11 +757,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 5304678840201142599}
   m_GameObject: {fileID: 5304678840201142599}
   m_Enabled: 1
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.82745105, g: 0.9058824, b: 0.9490197, a: 1}
+  m_Color: {r: 0.87843144, g: 0.8862746, b: 0.8078432, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -507,6 +778,19 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  imageH: 1005.4618
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &6595933794074151198
 --- !u!1 &6595933794074151198
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -592,6 +876,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgJsonPath: 
     packgSpritePath: 
     packgSpritePath: 
     lasetJsonGUID: 
     lasetJsonGUID: 
+  imageH: 3248
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -666,17 +951,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7288030692701577571}
   m_GameObject: {fileID: 7288030692701577571}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Children: []
-  m_Father: {fileID: 6694772361877173011}
+  m_Father: {fileID: 1245064307668607480}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   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: -14.6, y: 183.6}
-  m_SizeDelta: {x: 260.4388, y: 61.999}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5339901602177257518
 --- !u!222 &5339901602177257518
 CanvasRenderer:
 CanvasRenderer:
@@ -699,7 +984,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 0.96470594, g: 0.9921569, b: 0.92549026, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -707,9 +992,9 @@ MonoBehaviour:
     m_PersistentCalls:
     m_PersistentCalls:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 36
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 40
+    m_FontStyle: 1
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 3
     m_MinSize: 3
     m_MaxSize: 48
     m_MaxSize: 48

+ 194 - 59
Assets/Res/UI/SkillSelectPanel/SkillRoadWidget.prefab

@@ -61,7 +61,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 0.050980397, g: 0.04705883, b: 0.039215688, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -135,7 +135,7 @@ GameObject:
   m_Component:
   m_Component:
   - component: {fileID: 4675738299559414670}
   - component: {fileID: 4675738299559414670}
   - component: {fileID: 6805005419428352554}
   - component: {fileID: 6805005419428352554}
-  - component: {fileID: 8379315486584168666}
+  - component: {fileID: 6380243710851635119}
   m_Layer: 5
   m_Layer: 5
   m_HasEditorInfo: 1
   m_HasEditorInfo: 1
   m_Name: ActiveRoot
   m_Name: ActiveRoot
@@ -161,8 +161,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 190.23042, y: 44.94354}
-  m_SizeDelta: {x: 88.3772, y: 34.9131}
+  m_AnchoredPosition: {x: 270.65823, y: 54.751415}
+  m_SizeDelta: {x: 113.8937, y: 35.0623}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6805005419428352554
 --- !u!222 &6805005419428352554
 CanvasRenderer:
 CanvasRenderer:
@@ -172,7 +172,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3641592348573708383}
   m_GameObject: {fileID: 3641592348573708383}
   m_CullTransparentMesh: 1
   m_CullTransparentMesh: 1
---- !u!114 &8379315486584168666
+--- !u!114 &6380243710851635119
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -181,11 +181,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 3641592348573708383}
   m_GameObject: {fileID: 3641592348573708383}
   m_Enabled: 1
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.1137255, g: 0.61960787, b: 0.5803922, a: 1}
+  m_Color: {r: 0.7137255, g: 0.854902, b: 0.61960787, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -202,6 +202,19 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  imageH: 35.0623
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &3867125575884979505
 --- !u!1 &3867125575884979505
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -239,8 +252,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 78.445, y: -25.714}
-  m_SizeDelta: {x: 387.49, y: 89.0135}
+  m_AnchoredPosition: {x: 73.51247, y: -30.5809}
+  m_SizeDelta: {x: 495.4249, y: 82.7753}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8609369702727514854
 --- !u!222 &8609369702727514854
 CanvasRenderer:
 CanvasRenderer:
@@ -436,8 +449,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -35.3, y: 46.547096}
-  m_SizeDelta: {x: 160, y: 31.7059}
+  m_AnchoredPosition: {x: -94.2, y: 53.6}
+  m_SizeDelta: {x: 160, y: 37.3644}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2345492077379202348
 --- !u!222 &2345492077379202348
 CanvasRenderer:
 CanvasRenderer:
@@ -460,7 +473,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.69803923, g: 0.26666668, b: 0.7725491, a: 1}
+  m_Color: {r: 0.20392159, g: 0.18039216, b: 0.15686275, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -468,13 +481,13 @@ MonoBehaviour:
     m_PersistentCalls:
     m_PersistentCalls:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 24
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 32
+    m_FontStyle: 1
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MinSize: 2
     m_MaxSize: 40
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_HorizontalOverflow: 0
@@ -516,8 +529,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 25.3, y: -22.655}
-  m_SizeDelta: {x: 95.1303, y: 95.1303}
+  m_AnchoredPosition: {x: 13.553, y: -20.8}
+  m_SizeDelta: {x: 116.0916, y: 116.0916}
   m_Pivot: {x: 0, y: 1}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &3435472949245041729
 --- !u!222 &3435472949245041729
 CanvasRenderer:
 CanvasRenderer:
@@ -557,7 +570,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_skill_30005
+  _icon_name: icon_s2017
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
   CurrSpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
   packInfo:
   packInfo:
@@ -565,11 +578,12 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
     lasetJsonGUID: 151dde130cdc5228de9614f608886409
     lasetJsonGUID: 151dde130cdc5228de9614f608886409
+  imageH: 95.1303
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
   direction: 0
---- !u!1 &6619500058135400924
+--- !u!1 &5264814524068657776
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -577,64 +591,58 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   serializedVersion: 7
   m_Component:
   m_Component:
-  - component: {fileID: 8735754600916403707}
-  - component: {fileID: 5609404847280607431}
-  - component: {fileID: 5198584871815437867}
-  - component: {fileID: 6543471665292757643}
-  m_Layer: 5
+  - component: {fileID: 3118532542722655116}
+  - component: {fileID: 7433158170965256471}
+  - component: {fileID: 4791190539697415945}
+  m_Layer: 0
   m_HasEditorInfo: 1
   m_HasEditorInfo: 1
-  m_Name: SkillRoadWidget
+  m_Name: Icon_Marsk
   m_TagString: Untagged
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
   m_IsActive: 1
---- !u!224 &8735754600916403707
+--- !u!224 &3118532542722655116
 RectTransform:
 RectTransform:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6619500058135400924}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_GameObject: {fileID: 5264814524068657776}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 5776902696569599551}
-  - {fileID: 4675738299559414670}
-  - {fileID: 3318608848651352013}
-  - {fileID: 8732196584680058923}
-  - {fileID: 8271366194180601532}
-  m_Father: {fileID: 0}
+  m_Children: []
+  m_Father: {fileID: 8735754600916403707}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 284.10944, y: -70.220474}
-  m_SizeDelta: {x: 568.2189, y: 140.4411}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5609404847280607431
+--- !u!222 &7433158170965256471
 CanvasRenderer:
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6619500058135400924}
+  m_GameObject: {fileID: 5264814524068657776}
   m_CullTransparentMesh: 1
   m_CullTransparentMesh: 1
---- !u!114 &5198584871815437867
+--- !u!114 &4791190539697415945
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6619500058135400924}
+  m_GameObject: {fileID: 5264814524068657776}
   m_Enabled: 1
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8470589, g: 0.8470589, b: 0.8470589, a: 1}
+  m_Color: {r: 0.72156864, g: 0.7372549, b: 0.6509804, a: 0.43137255}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -651,6 +659,72 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &6619500058135400924
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8735754600916403707}
+  - component: {fileID: 5609404847280607431}
+  - component: {fileID: 6543471665292757643}
+  - component: {fileID: 2290051795891047475}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: SkillRoadWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8735754600916403707
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6619500058135400924}
+  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: 5776902696569599551}
+  - {fileID: 4675738299559414670}
+  - {fileID: 3318608848651352013}
+  - {fileID: 8732196584680058923}
+  - {fileID: 8271366194180601532}
+  - {fileID: 3118532542722655116}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 284.10944, y: -70.220474}
+  m_SizeDelta: {x: 677, y: 160}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5609404847280607431
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6619500058135400924}
+  m_CullTransparentMesh: 1
 --- !u!114 &6543471665292757643
 --- !u!114 &6543471665292757643
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -684,7 +758,55 @@ MonoBehaviour:
     isAssetBundle: 0
     isAssetBundle: 0
     isList: 0
     isList: 0
     ListCollectorDatas: []
     ListCollectorDatas: []
+  - key: Icon_Marsk
+    gameObject: {fileID: 5264814524068657776}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
   isAssetBundle: 1
+--- !u!114 &2290051795891047475
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6619500058135400924}
+  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: 0.95294124, g: 0.9294118, b: 0.8431373, 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: dec_juxing
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: a7317dcd301e45af9e341d0ef7191578
+  imageH: 160.87
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &7410579519138525766
 --- !u!1 &7410579519138525766
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -744,7 +866,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.20392159, g: 0.18039216, b: 0.15686275, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -752,9 +874,9 @@ MonoBehaviour:
     m_PersistentCalls:
     m_PersistentCalls:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 18
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 28
+    m_FontStyle: 1
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MinSize: 1
     m_MaxSize: 40
     m_MaxSize: 40
@@ -775,7 +897,7 @@ GameObject:
   m_Component:
   m_Component:
   - component: {fileID: 5776902696569599551}
   - component: {fileID: 5776902696569599551}
   - component: {fileID: 8413812070612739475}
   - component: {fileID: 8413812070612739475}
-  - component: {fileID: 89121801028984308}
+  - component: {fileID: 6098696712279553797}
   m_Layer: 5
   m_Layer: 5
   m_HasEditorInfo: 1
   m_HasEditorInfo: 1
   m_Name: Image (2)
   m_Name: Image (2)
@@ -798,11 +920,11 @@ RectTransform:
   m_Children: []
   m_Children: []
   m_Father: {fileID: 8735754600916403707}
   m_Father: {fileID: 8735754600916403707}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   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: -205.35127, y: -0.000015258789}
-  m_SizeDelta: {x: 157.5164, y: 140.4411}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 143.1978, y: 0}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &8413812070612739475
 --- !u!222 &8413812070612739475
 CanvasRenderer:
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -811,7 +933,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8118597541154099336}
   m_GameObject: {fileID: 8118597541154099336}
   m_CullTransparentMesh: 1
   m_CullTransparentMesh: 1
---- !u!114 &89121801028984308
+--- !u!114 &6098696712279553797
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -820,11 +942,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 8118597541154099336}
   m_GameObject: {fileID: 8118597541154099336}
   m_Enabled: 1
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.7843138, g: 0.77647066, b: 0.7803922, a: 1}
+  m_Color: {r: 0.8431373, g: 0.8235295, b: 0.7254902, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -841,3 +963,16 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_juxing
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: a7317dcd301e45af9e341d0ef7191578
+  imageH: 160.87
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0

BIN
Assets/Res/UI/SkillSelectPanel/功法界面-大道选择.png


+ 1 - 1
Assets/Res/UI/SkillSelectPanel/1830dd2f7a003facd906901b3588d294.png.meta → Assets/Res/UI/SkillSelectPanel/功法界面-大道选择.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
 fileFormatVersion: 2
-guid: By5KsX+rBnInaT/6+1BocBCFxcg5Jwf6IaWtm/rpBDTCsOFblLLXui+w9Qg8
+guid: DC8atSn5AS3eZF1jWch3sFCrYsnhuLUyWZ4uIzKGQ07zkL0k5rFqTbOeMWZo
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}

BIN
Assets/Res/UI/SkillSelectPanel/功法界面-领悟.png


+ 0 - 203
Assets/Res/UI/SkillSelectPanel/功法界面-领悟.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: XXIf5ymlVHwVVBGo0fQcccQE6K9zUeyRs8rpe2Z4FyxR4lIT/xKQr1n6UPcM
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  webStreaming: 0
-  priorityLevel: 0
-  uploadedMode: 2
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WeixinMiniGame
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: HMIAndroid
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: OpenHarmony
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: "\u529F\u6CD5\u754C\u9762-\u9886\u609F"
-  assetBundleVariant: 

+ 11 - 7
Assets/Scripts/GameUI/UI/GongFaUpgradePanel/SkillRoadSelecPanel.cs

@@ -31,11 +31,11 @@ namespace Fort23.Mono
             Btn_Close.onClick.AddListener(() =>
             Btn_Close.onClick.AddListener(() =>
             {
             {
                 callBack?.Invoke(0);
                 callBack?.Invoke(0);
-                UIManager.Instance.HideUIUIPanel(this );
+                UIManager.Instance.HideUIUIPanel(this);
             });
             });
         }
         }
 
 
-        public async void CustomInit(int currentSelectId,Action<int> callBack)
+        public async void CustomInit(int currentSelectId, Action<int> callBack)
         {
         {
             this.callBack = callBack;
             this.callBack = callBack;
             List<SkillConfig> skillConfigs = ConfigComponent.Instance.GetAll<SkillConfig>().ToList();
             List<SkillConfig> skillConfigs = ConfigComponent.Instance.GetAll<SkillConfig>().ToList();
@@ -43,8 +43,9 @@ namespace Fort23.Mono
             List<SkillConfig> configs = skillConfigs.Where(s => s.SkillType == 4).ToList();
             List<SkillConfig> configs = skillConfigs.Where(s => s.SkillType == 4).ToList();
             foreach (var skillConfig in configs)
             foreach (var skillConfig in configs)
             {
             {
-                SkillRoadWidget skillRoadWidget = await UIManager.Instance.CreateGComponent<SkillRoadWidget>(null, Content);
-                skillRoadWidget.CustomInti(skillConfig.ID);
+                SkillRoadWidget skillRoadWidget =
+                    await UIManager.Instance.CreateGComponent<SkillRoadWidget>(null, Content);
+                skillRoadWidget.CustomInti(skillConfig.ID, skillConfig.ID == 601011);
                 skillRoadWidget.OnClick = OnClick;
                 skillRoadWidget.OnClick = OnClick;
                 _skillRoadWidgets.Add(skillRoadWidget);
                 _skillRoadWidgets.Add(skillRoadWidget);
             }
             }
@@ -64,6 +65,8 @@ namespace Fort23.Mono
         private void OnClick(ItemWidgetBasic obj)
         private void OnClick(ItemWidgetBasic obj)
         {
         {
             SkillRoadWidget skillRoadWidget = obj as SkillRoadWidget;
             SkillRoadWidget skillRoadWidget = obj as SkillRoadWidget;
+            if (!skillRoadWidget.isUlock)
+                return;
             // PlayerManager.Instance.GongFaControl.SetTaoismSkillIndex(skillRoadWidget.SkillConfig.ID);
             // PlayerManager.Instance.GongFaControl.SetTaoismSkillIndex(skillRoadWidget.SkillConfig.ID);
             // PlayerManager.Instance.myHero.heroData.TaoismSkillId = skillRoadWidget.SkillConfig.ID;
             // PlayerManager.Instance.myHero.heroData.TaoismSkillId = skillRoadWidget.SkillConfig.ID;
             // AccountFileInfo.Instance.SavePlayerData();
             // AccountFileInfo.Instance.SavePlayerData();
@@ -71,10 +74,11 @@ namespace Fort23.Mono
             UIManager.Instance.HideUIUIPanel(this);
             UIManager.Instance.HideUIUIPanel(this);
         }
         }
 
 
-        public async static void OpenPanel(int currentSelectId,Action<int> callBack)
+        public async static void OpenPanel(int currentSelectId, Action<int> callBack)
         {
         {
-            SkillRoadSelecPanel skillRoadSelecPanel = await UIManager.Instance.LoadAndOpenPanel<SkillRoadSelecPanel>(null);
-            skillRoadSelecPanel.CustomInit(currentSelectId,callBack);
+            SkillRoadSelecPanel skillRoadSelecPanel =
+                await UIManager.Instance.LoadAndOpenPanel<SkillRoadSelecPanel>(null);
+            skillRoadSelecPanel.CustomInit(currentSelectId, callBack);
         }
         }
 
 
         public async override CTask Close()
         public async override CTask Close()

+ 8 - 3
Assets/Scripts/GameUI/UI/GongFaUpgradePanel/SkillRoadWidget.cs

@@ -8,7 +8,9 @@ namespace Fort23.Mono
     [UIBinding(prefab = "SkillRoadWidget")]
     [UIBinding(prefab = "SkillRoadWidget")]
     public partial class SkillRoadWidget : ItemWidgetBasic
     public partial class SkillRoadWidget : ItemWidgetBasic
     {
     {
+        public bool isUlock;
         public SkillConfig SkillConfig;
         public SkillConfig SkillConfig;
+
         private void Init()
         private void Init()
         {
         {
         }
         }
@@ -26,15 +28,18 @@ namespace Fort23.Mono
             base.AddButtonEvent();
             base.AddButtonEvent();
         }
         }
 
 
-        public void CustomInti(int id)
+        public void CustomInti(int id, bool isUlock)
         {
         {
+            this.isUlock = isUlock;
             SkillConfig = ConfigComponent.Instance.Get<SkillConfig>(id);
             SkillConfig = ConfigComponent.Instance.Get<SkillConfig>(id);
 
 
             Text_SkillName.text = LanguageManager.Instance.Text(SkillConfig.name);
             Text_SkillName.text = LanguageManager.Instance.Text(SkillConfig.name);
             Icon_SkillIcon.icon_name = SkillConfig.icon;
             Icon_SkillIcon.icon_name = SkillConfig.icon;
-            Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(SkillConfig.PromoteLan),SkillConfig.effectValue);
-            
+            Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(SkillConfig.PromoteLan),
+                SkillConfig.effectValue);
+
             ActiveRoot.SetActive(PlayerManager.Instance.myHero.TaoismSkillId == SkillConfig.ID);
             ActiveRoot.SetActive(PlayerManager.Instance.myHero.TaoismSkillId == SkillConfig.ID);
+            Icon_Marsk.gameObject.SetActive(!isUlock);
         }
         }
     }
     }
 }
 }

+ 11 - 0
Assets/Scripts/GameUI/UI/GongFaUpgradePanel/SkillRoadWidgetData.cs

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