lzx 1 неделя назад
Родитель
Сommit
98da8cf6c4

+ 400 - 180
Assets/Res/UI/BoxPanel/GachaPanel.prefab

@@ -3079,6 +3079,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 9194368947421187015}
     m_Modifications:
+    - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 82.91
+      objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -3163,25 +3167,45 @@ PrefabInstance:
       propertyPath: m_Name
       value: WidgetItemType2 (7)
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: CurrSpriteAtlas
-      value: 
-      objectReference: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packName
-      value: allIcon
+    - target: {fileID: 5828464522225353660, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_IsActive
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.lasetJsonGUID
-      value: 4b54a953fcd0950cece7d4eeea1f40a9
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packgJsonPath
-      value: /Art/UIAssets/TextrueJson/allIcon.txt
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packgSpritePath
-      value: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 49
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 58.41
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -21.027552
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 13.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -22.7
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -3206,6 +3230,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 9194368947421187015}
     m_Modifications:
+    - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 82.91
+      objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -3290,25 +3318,45 @@ PrefabInstance:
       propertyPath: m_Name
       value: WidgetItemType2
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: CurrSpriteAtlas
-      value: 
-      objectReference: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packName
-      value: allIcon
+    - target: {fileID: 5828464522225353660, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 49
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.lasetJsonGUID
-      value: 4b54a953fcd0950cece7d4eeea1f40a9
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 58.41
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packgJsonPath
-      value: /Art/UIAssets/TextrueJson/allIcon.txt
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -21.027552
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packgSpritePath
-      value: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 13.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -22.7
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -3333,6 +3381,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 9194368947421187015}
     m_Modifications:
+    - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 82.91
+      objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -3417,25 +3469,45 @@ PrefabInstance:
       propertyPath: m_Name
       value: WidgetItemType2 (2)
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: CurrSpriteAtlas
-      value: 
-      objectReference: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packName
-      value: allIcon
+    - target: {fileID: 5828464522225353660, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 49
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 58.41
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.lasetJsonGUID
-      value: 4b54a953fcd0950cece7d4eeea1f40a9
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -21.027552
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packgJsonPath
-      value: /Art/UIAssets/TextrueJson/allIcon.txt
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packgSpritePath
-      value: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 13.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -22.7
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -3460,6 +3532,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 9194368947421187015}
     m_Modifications:
+    - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 82.91
+      objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -3544,25 +3620,45 @@ PrefabInstance:
       propertyPath: m_Name
       value: WidgetItemType2 (1)
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: CurrSpriteAtlas
-      value: 
-      objectReference: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packName
-      value: allIcon
+    - target: {fileID: 5828464522225353660, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 49
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 58.41
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -21.027552
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.lasetJsonGUID
-      value: 4b54a953fcd0950cece7d4eeea1f40a9
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packgJsonPath
-      value: /Art/UIAssets/TextrueJson/allIcon.txt
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 13.5
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packgSpritePath
-      value: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -22.7
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -3587,6 +3683,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 9194368947421187015}
     m_Modifications:
+    - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 82.91
+      objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -3671,25 +3771,45 @@ PrefabInstance:
       propertyPath: m_Name
       value: WidgetItemType2 (9)
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: CurrSpriteAtlas
-      value: 
-      objectReference: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packName
-      value: allIcon
+    - target: {fileID: 5828464522225353660, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_IsActive
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.lasetJsonGUID
-      value: 4b54a953fcd0950cece7d4eeea1f40a9
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packgJsonPath
-      value: /Art/UIAssets/TextrueJson/allIcon.txt
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packgSpritePath
-      value: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 49
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 58.41
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -21.027552
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 13.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -22.7
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -3714,6 +3834,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 9194368947421187015}
     m_Modifications:
+    - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 82.91
+      objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -3798,25 +3922,45 @@ PrefabInstance:
       propertyPath: m_Name
       value: WidgetItemType2 (6)
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: CurrSpriteAtlas
-      value: 
-      objectReference: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packName
-      value: allIcon
+    - target: {fileID: 5828464522225353660, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_IsActive
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.lasetJsonGUID
-      value: 4b54a953fcd0950cece7d4eeea1f40a9
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packgJsonPath
-      value: /Art/UIAssets/TextrueJson/allIcon.txt
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packgSpritePath
-      value: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 49
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 58.41
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -21.027552
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 13.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -22.7
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -3841,6 +3985,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 9194368947421187015}
     m_Modifications:
+    - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 82.91
+      objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -3925,25 +4073,45 @@ PrefabInstance:
       propertyPath: m_Name
       value: WidgetItemType2 (4)
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: CurrSpriteAtlas
-      value: 
-      objectReference: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packName
-      value: allIcon
+    - target: {fileID: 5828464522225353660, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.lasetJsonGUID
-      value: 4b54a953fcd0950cece7d4eeea1f40a9
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 49
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packgJsonPath
-      value: /Art/UIAssets/TextrueJson/allIcon.txt
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 58.41
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packgSpritePath
-      value: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -21.027552
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 13.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -22.7
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -3968,6 +4136,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 9194368947421187015}
     m_Modifications:
+    - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 82.91
+      objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -4052,25 +4224,45 @@ PrefabInstance:
       propertyPath: m_Name
       value: WidgetItemType2 (8)
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: CurrSpriteAtlas
-      value: 
-      objectReference: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packName
-      value: allIcon
+    - target: {fileID: 5828464522225353660, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.lasetJsonGUID
-      value: 4b54a953fcd0950cece7d4eeea1f40a9
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 49
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packgJsonPath
-      value: /Art/UIAssets/TextrueJson/allIcon.txt
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 58.41
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packgSpritePath
-      value: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -21.027552
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 13.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -22.7
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4095,6 +4287,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 9194368947421187015}
     m_Modifications:
+    - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 82.91
+      objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -4179,25 +4375,45 @@ PrefabInstance:
       propertyPath: m_Name
       value: WidgetItemType2 (5)
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: CurrSpriteAtlas
-      value: 
-      objectReference: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packName
-      value: allIcon
+    - target: {fileID: 5828464522225353660, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_IsActive
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.lasetJsonGUID
-      value: 4b54a953fcd0950cece7d4eeea1f40a9
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 49
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 58.41
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packgJsonPath
-      value: /Art/UIAssets/TextrueJson/allIcon.txt
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -21.027552
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packgSpritePath
-      value: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 13.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -22.7
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4222,6 +4438,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 9194368947421187015}
     m_Modifications:
+    - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 82.91
+      objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -4306,25 +4526,45 @@ PrefabInstance:
       propertyPath: m_Name
       value: WidgetItemType2 (3)
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: CurrSpriteAtlas
-      value: 
-      objectReference: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packName
-      value: allIcon
+    - target: {fileID: 5828464522225353660, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 49
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 58.41
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -21.027552
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.lasetJsonGUID
-      value: 4b54a953fcd0950cece7d4eeea1f40a9
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packgJsonPath
-      value: /Art/UIAssets/TextrueJson/allIcon.txt
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 13.5
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packgSpritePath
-      value: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -22.7
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4433,26 +4673,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: WidgetItemType2
       objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: CurrSpriteAtlas
-      value: 
-      objectReference: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packName
-      value: allIcon
-      objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.lasetJsonGUID
-      value: 4b54a953fcd0950cece7d4eeea1f40a9
-      objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packgJsonPath
-      value: /Art/UIAssets/TextrueJson/allIcon.txt
-      objectReference: {fileID: 0}
-    - target: {fileID: 8725859952368040408, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
-      propertyPath: packInfo.packgSpritePath
-      value: Assets/Res/UIAtlas/allIcon.spriteatlasv2
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

+ 101 - 6
Assets/Res/UI/BoxPanel/WidgetItemType2.prefab

@@ -32,6 +32,7 @@ RectTransform:
   m_Children:
   - {fileID: 4406617497510563232}
   - {fileID: 1541316921576123231}
+  - {fileID: 646260402244696982}
   - {fileID: 1825629934269939522}
   - {fileID: 3529386165245114290}
   m_Father: {fileID: 3555197382594190730}
@@ -399,14 +400,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_eq_2_3_2
+  _icon_name: dec_gfbook_mu
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
-    packName: allIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
-    lasetJsonGUID: 4b54a953fcd0950cece7d4eeea1f40a9
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 5065c0aff242263ba988030a4cf3800f
   imageH: 78.167946
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -684,6 +685,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_Skill
+    gameObject: {fileID: 5365917677802290657}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &2867608603011516750
 MonoBehaviour:
@@ -805,6 +811,95 @@ MonoBehaviour:
   - {fileID: 1959513863254869355}
   AllComsStateTypes: 000200000002000000040000
   CurrIndex: 2
+--- !u!1 &9186098411269405582
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 646260402244696982}
+  - component: {fileID: 5725457208173664469}
+  - component: {fileID: 5365917677802290657}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Skill
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &646260402244696982
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9186098411269405582}
+  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: 8103003509539381039}
+  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: 7.5, y: 17.8}
+  m_SizeDelta: {x: 43.5479, y: 43.5479}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5725457208173664469
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9186098411269405582}
+  m_CullTransparentMesh: 1
+--- !u!114 &5365917677802290657
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9186098411269405582}
+  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: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_s1302
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
+  packInfo:
+    packName: skillIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
+    lasetJsonGUID: 6482952d0ee2ffcbb245b4e2233d024c
+  imageH: 78.167946
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &9204525041625646555
 GameObject:
   m_ObjectHideFlags: 0

+ 126 - 238
Assets/Res/UI/ItemDetailsPanel/ItemDetailsPanel.prefab

@@ -89,142 +89,6 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
---- !u!1 &583737062655296145
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 7884348931799053584}
-  - component: {fileID: 5984661092418457972}
-  - component: {fileID: 705275978297865375}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Icon_Quality
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &7884348931799053584
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 583737062655296145}
-  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: 2462319743663962172}
-  m_Father: {fileID: 7793865181194012869}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -10.692, y: -18.3}
-  m_SizeDelta: {x: 125.1, y: 125.1012}
-  m_Pivot: {x: 0.5, y: 1}
---- !u!222 &5984661092418457972
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 583737062655296145}
-  m_CullTransparentMesh: 1
---- !u!114 &705275978297865375
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 583737062655296145}
-  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: dec_wupin_pinzhi1
-  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: 009d01eadc79b5b12c19322b6a4cd057
-  imageH: 113
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
---- !u!1 &1501318962295269995
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 7793865181194012869}
-  - component: {fileID: 736593123517672725}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: ItemRoot
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &7793865181194012869
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1501318962295269995}
-  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: 7884348931799053584}
-  m_Father: {fileID: 4534880848114758260}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -67}
-  m_SizeDelta: {x: 112, y: 113}
-  m_Pivot: {x: 0.5, y: 1}
---- !u!222 &736593123517672725
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1501318962295269995}
-  m_CullTransparentMesh: 1
 --- !u!1 &1593047470368811258
 GameObject:
   m_ObjectHideFlags: 0
@@ -975,7 +839,7 @@ RectTransform:
   - {fileID: 3448986095428033778}
   - {fileID: 626222313926366237}
   - {fileID: 3405432979607021335}
-  - {fileID: 7793865181194012869}
+  - {fileID: 1654689167095705268}
   - {fileID: 7892632760807934045}
   - {fileID: 872147779270780934}
   - {fileID: 6662033111037420653}
@@ -1132,95 +996,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
---- !u!1 &7872658753454459103
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2462319743663962172}
-  - component: {fileID: 3154884708424253563}
-  - component: {fileID: 3274131623436862551}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Icon_ItemIcon
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2462319743663962172
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7872658753454459103}
-  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: 7884348931799053584}
-  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: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3154884708424253563
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7872658753454459103}
-  m_CullTransparentMesh: 1
---- !u!114 &3274131623436862551
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7872658753454459103}
-  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: 1
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_Coins_s
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
-  packInfo:
-    packName: daoju
-    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
-    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
-    lasetJsonGUID: c28e54f99ed5b137a09ad8c2e8fcb311
-  imageH: 92.897125
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
 --- !u!1 &8994874510214016950
 GameObject:
   m_ObjectHideFlags: 0
@@ -1275,16 +1050,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   data:
-  - key: Icon_Quality
-    gameObject: {fileID: 705275978297865375}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: Icon_ItemIcon
-    gameObject: {fileID: 3274131623436862551}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   - key: Text_Name
     gameObject: {fileID: 7765388183148181976}
     isAssetBundle: 0
@@ -1305,9 +1070,132 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: Icon_Quality
-    gameObject: {fileID: 705275978297865375}
+  - key: WidgetItemGame
+    gameObject: {fileID: 8593685795174641794}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
   isAssetBundle: 0
+--- !u!1001 &283969772634552985
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 4534880848114758260}
+    m_Modifications:
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -11
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 212.8
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6624212208645409916, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8408847998961895963, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_Name
+      value: WidgetItemGame
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+--- !u!224 &1654689167095705268 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+  m_PrefabInstance: {fileID: 283969772634552985}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &8593685795174641794 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8408847998961895963, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+  m_PrefabInstance: {fileID: 283969772634552985}
+  m_PrefabAsset: {fileID: 0}

+ 116 - 189
Assets/Res/UI/ItemDetailsPanel/ItemSourcePanel.prefab

@@ -66,18 +66,13 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: Icon_quality
-    gameObject: {fileID: 2996821448000370488}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: Icon_Item
-    gameObject: {fileID: 7895581595427636867}
+  - key: Text_ItemCount
+    gameObject: {fileID: 4544817006371544017}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: Text_ItemCount
-    gameObject: {fileID: 4544817006371544017}
+  - key: WidgetItemGam
+    gameObject: {fileID: 5458519007614094564}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
@@ -386,13 +381,13 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6620055869968090277}
-  - {fileID: 3003256094564086523}
   - {fileID: 2708046515207152597}
   - {fileID: 7597567787362404458}
   - {fileID: 2520625651802089631}
   - {fileID: 2086188629720428156}
   - {fileID: 3258887086271990041}
   - {fileID: 5866622043385976589}
+  - {fileID: 3059292874867151570}
   m_Father: {fileID: 8599819629026832582}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -451,96 +446,6 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
---- !u!1 &2417878530535980868
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3003256094564086523}
-  - component: {fileID: 1007298790523089196}
-  - component: {fileID: 2996821448000370488}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Icon_quality
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3003256094564086523
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2417878530535980868}
-  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: 137673523831264260}
-  m_Father: {fileID: 2569128129379278262}
-  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: -172.75746, y: 256.00378}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1007298790523089196
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2417878530535980868}
-  m_CullTransparentMesh: 1
---- !u!114 &2996821448000370488
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2417878530535980868}
-  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: dec_wupin_pinzhi1
-  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: 
-  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 &2661625032725589361
 GameObject:
   m_ObjectHideFlags: 0
@@ -649,95 +554,6 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
---- !u!1 &3264002540092850481
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 137673523831264260}
-  - component: {fileID: 3883765052456846937}
-  - component: {fileID: 7895581595427636867}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Icon_Item
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &137673523831264260
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3264002540092850481}
-  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: 3003256094564086523}
-  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: 78.238, y: 78.2376}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3883765052456846937
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3264002540092850481}
-  m_CullTransparentMesh: 1
---- !u!114 &7895581595427636867
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3264002540092850481}
-  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: 1
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_eq_2_4_2
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
-  packInfo:
-    packName: allIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
-    lasetJsonGUID: 4b54a953fcd0950cece7d4eeea1f40a9
-  imageH: 78.167946
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
 --- !u!1 &3888980628067459391
 GameObject:
   m_ObjectHideFlags: 0
@@ -1325,3 +1141,114 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
+--- !u!1001 &4571915231368742655
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 2569128129379278262}
+    m_Modifications:
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 53.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -52.318
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6624212208645409916, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8408847998961895963, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_Name
+      value: WidgetItemGam
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+--- !u!224 &3059292874867151570 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+  m_PrefabInstance: {fileID: 4571915231368742655}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &5458519007614094564 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8408847998961895963, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+  m_PrefabInstance: {fileID: 4571915231368742655}
+  m_PrefabAsset: {fileID: 0}

+ 191 - 1
Assets/Res/UI/ShopPanel/ShopItemWidgetType2.prefab

@@ -203,7 +203,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_Coins_s
+  _icon_name: dec_gfbook_huo
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
@@ -250,6 +250,8 @@ RectTransform:
   - {fileID: 5650020349936148656}
   - {fileID: 4940957247081514446}
   - {fileID: 7224631103695397948}
+  - {fileID: 7164904183015823438}
+  - {fileID: 4391990160844781279}
   - {fileID: 7133505018926026809}
   - {fileID: 4616542265640154776}
   - {fileID: 3816308717021658680}
@@ -330,6 +332,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_Skill
+    gameObject: {fileID: 7208994236539324151}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Icon_SuiPian
+    gameObject: {fileID: 7686375792857178763}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &143194323039995006
 MonoBehaviour:
@@ -989,6 +1001,95 @@ MonoBehaviour:
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
+--- !u!1 &7728610670714256960
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4391990160844781279}
+  - component: {fileID: 8456850588483809624}
+  - component: {fileID: 7686375792857178763}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_SuiPian
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &4391990160844781279
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7728610670714256960}
+  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: 666260999598083492}
+  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: -38.7, y: 2.3150024}
+  m_SizeDelta: {x: 19.1718, y: 22.7223}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8456850588483809624
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7728610670714256960}
+  m_CullTransparentMesh: 1
+--- !u!114 &7686375792857178763
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7728610670714256960}
+  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: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_chouka_suipian
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 425a9eab85b24b74b81413be06f42b76, type: 3}
+  packInfo:
+    packName: chouka
+    packgJsonPath: /Art/UIAssets/TextrueJson\chouka.txt
+    packgSpritePath: Assets/Res/UIAtlas/chouka.spriteatlasv2
+    lasetJsonGUID: d884f25912221810fe344e7b1e77ccc2
+  imageH: 78.167946
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &9170581502290473048
 GameObject:
   m_ObjectHideFlags: 0
@@ -1078,3 +1179,92 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &9201280335886022771
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7164904183015823438}
+  - component: {fileID: 6125417801808295866}
+  - component: {fileID: 7208994236539324151}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Skill
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &7164904183015823438
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9201280335886022771}
+  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: 666260999598083492}
+  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: 3.5, y: 48.7}
+  m_SizeDelta: {x: 27.5885, y: 27.5885}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6125417801808295866
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9201280335886022771}
+  m_CullTransparentMesh: 1
+--- !u!114 &7208994236539324151
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9201280335886022771}
+  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: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_s1402
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
+  packInfo:
+    packName: skillIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
+    lasetJsonGUID: 6482952d0ee2ffcbb245b4e2233d024c
+  imageH: 78.167946
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0

+ 191 - 1
Assets/Res/UI/WidgetItem.prefab

@@ -165,7 +165,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_ck_gf_jin
+  _icon_name: dec_gfbook_jin
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
@@ -210,6 +210,8 @@ RectTransform:
   m_Children:
   - {fileID: 1835098571422434311}
   - {fileID: 3545244106223690488}
+  - {fileID: 634620019119729600}
+  - {fileID: 5439489424817645504}
   - {fileID: 5126391295778819725}
   - {fileID: 7511937068176871878}
   m_Father: {fileID: 1515036893769208877}
@@ -316,6 +318,95 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &6073983424458382615
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 634620019119729600}
+  - component: {fileID: 775149439118876004}
+  - component: {fileID: 3046952296789768666}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Skill
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &634620019119729600
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6073983424458382615}
+  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: 6062762002596746888}
+  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: 3.7, y: 8.9}
+  m_SizeDelta: {x: 24.3777, y: 24.3777}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &775149439118876004
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6073983424458382615}
+  m_CullTransparentMesh: 1
+--- !u!114 &3046952296789768666
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6073983424458382615}
+  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: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_s1402
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
+  packInfo:
+    packName: skillIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
+    lasetJsonGUID: 6482952d0ee2ffcbb245b4e2233d024c
+  imageH: 78.167946
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &6624212208645409916
 GameObject:
   m_ObjectHideFlags: 0
@@ -412,6 +503,95 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!1 &8072384164870005523
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5439489424817645504}
+  - component: {fileID: 3137556525202694480}
+  - component: {fileID: 8046817047306265258}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_SuiPian
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &5439489424817645504
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8072384164870005523}
+  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: 6062762002596746888}
+  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: -33.1, y: -31.785}
+  m_SizeDelta: {x: 16.7845, y: 19.8929}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3137556525202694480
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8072384164870005523}
+  m_CullTransparentMesh: 1
+--- !u!114 &8046817047306265258
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8072384164870005523}
+  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: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_chouka_suipian
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 425a9eab85b24b74b81413be06f42b76, type: 3}
+  packInfo:
+    packName: chouka
+    packgJsonPath: /Art/UIAssets/TextrueJson\chouka.txt
+    packgSpritePath: Assets/Res/UIAtlas/chouka.spriteatlasv2
+    lasetJsonGUID: d884f25912221810fe344e7b1e77ccc2
+  imageH: 78.167946
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &8408847998961895963
 GameObject:
   m_ObjectHideFlags: 0
@@ -494,6 +674,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_Skill
+    gameObject: {fileID: 3046952296789768666}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Icon_SuiPian
+    gameObject: {fileID: 8046817047306265258}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &259851968356172009
 MonoBehaviour:

+ 15 - 10
Assets/Scripts/GameUI/UI/BoxPanel/WidgetItemType2.cs

@@ -78,24 +78,26 @@ namespace Fort23.Mono
                 SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(itemConfig.associateVlaue[1]*10+1);
                 if (skillConfig.attribute == 1)
                 {
-                    icon.icon_name = "dec_ck_gf_jin";
+                    icon.icon_name = "dec_gfbook_jin";
                 }
                 else if (skillConfig.attribute == 4)
                 {
-                    icon.icon_name = "dec_ck_gf_mu";
+                    icon.icon_name = "dec_gfbook_mu";
                 }
                 else if (skillConfig.attribute == 2)
                 {
-                    icon.icon_name = "dec_ck_gf_shui";
+                    icon.icon_name = "dec_gfbook_shui";
                 }
                 else if (skillConfig.attribute == 8)
                 {
-                    icon.icon_name = "dec_ck_gf_huo";
+                    icon.icon_name = "dec_gfbook_huo";
                 }
                 else if (skillConfig.attribute == 16)
                 {
-                    icon.icon_name = "dec_ck_gf_tu";
+                    icon.icon_name = "dec_gfbook_tu";
                 }
+                Icon_Skill.gameObject.SetActive(true);
+                Icon_Skill.icon_name = skillConfig.icon;
             }
             //碎片
             else if (itemConfig.associateID == 11)
@@ -104,27 +106,30 @@ namespace Fort23.Mono
                 SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(itemConfig2.associateVlaue[1]*10+1);
                 if (skillConfig.attribute == 1)
                 {
-                    icon.icon_name = "dec_ck_gf_jin";
+                    icon.icon_name = "dec_gfbook_jin";
                 }
                 else if (skillConfig.attribute == 4)
                 {
-                    icon.icon_name = "dec_ck_gf_mu";
+                    icon.icon_name = "dec_gfbook_mu";
                 }
                 else if (skillConfig.attribute == 2)
                 {
-                    icon.icon_name = "dec_ck_gf_shui";
+                    icon.icon_name = "dec_gfbook_shui";
                 }
                 else if (skillConfig.attribute == 8)
                 {
-                    icon.icon_name = "dec_ck_gf_huo";
+                    icon.icon_name = "dec_gfbook_huo";
                 }
                 else if (skillConfig.attribute == 16)
                 {
-                    icon.icon_name = "dec_ck_gf_tu";
+                    icon.icon_name = "dec_gfbook_tu";
                 }
+                Icon_Skill.gameObject.SetActive(true);
+                Icon_Skill.icon_name = skillConfig.icon;
             }
             else
             {
+                Icon_Skill.gameObject.SetActive(false);
                 icon.icon_name = itemInfo.config.icon;
             }
 

+ 11 - 0
Assets/Scripts/GameUI/UI/BoxPanel/WidgetItemType2Data.cs

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

+ 3 - 61
Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsPanel.cs

@@ -37,67 +37,9 @@ namespace Fort23.Mono
 
             Text_Name.text = LanguageManager.Instance.Text(itemInfo.config.itemName);
             Text_Desc.text = LanguageManager.Instance.Text(itemInfo.config.itemDesc2);
-            Icon_Quality.icon_name = "dec_wupin_pinzhi" + itemInfo.config.quality;
-
-
-            if (itemInfo.config.associateID == 3)
-            {
-                SkillConfig skillConfig =
-                    ConfigComponent.Instance.Get<SkillConfig>(itemInfo.config.associateVlaue[1] * 10 + 1);
-                if (skillConfig.attribute == 1)
-                {
-                    Icon_ItemIcon.icon_name = "dec_ck_gf_jin";
-                }
-                else if (skillConfig.attribute == 4)
-                {
-                    Icon_ItemIcon.icon_name = "dec_ck_gf_mu";
-                }
-                else if (skillConfig.attribute == 2)
-                {
-                    Icon_ItemIcon.icon_name = "dec_ck_gf_shui";
-                }
-                else if (skillConfig.attribute == 8)
-                {
-                    Icon_ItemIcon.icon_name = "dec_ck_gf_huo";
-                }
-                else if (skillConfig.attribute == 16)
-                {
-                    Icon_ItemIcon.icon_name = "dec_ck_gf_tu";
-                }
-            }
-            //碎片
-            else if (itemInfo.config.associateID == 11)
-            {
-                ItemConfig itemConfig2 = ConfigComponent.Instance.Get<ItemConfig>(itemInfo.config.associateVlaue[0]);
-                SkillConfig skillConfig =
-                    ConfigComponent.Instance.Get<SkillConfig>(itemConfig2.associateVlaue[1] * 10 + 1);
-                if (skillConfig.attribute == 1)
-                {
-                    Icon_ItemIcon.icon_name = "dec_ck_gf_jin";
-                }
-                else if (skillConfig.attribute == 4)
-                {
-                    Icon_ItemIcon.icon_name = "dec_ck_gf_mu";
-                }
-                else if (skillConfig.attribute == 2)
-                {
-                    Icon_ItemIcon.icon_name = "dec_ck_gf_shui";
-                }
-                else if (skillConfig.attribute == 8)
-                {
-                    Icon_ItemIcon.icon_name = "dec_ck_gf_huo";
-                }
-                else if (skillConfig.attribute == 16)
-                {
-                    Icon_ItemIcon.icon_name = "dec_ck_gf_tu";
-                }
-            }
-            else
-            {
-                Icon_ItemIcon.icon_name = itemInfo.config.icon;
-            }
-
-
+            WidgetItem widgetItem =
+                await UIManager.Instance.CreateGComponentForObject<WidgetItem>(WidgetItemGame, null);
+            widgetItem.InitWidget(itemInfo, false);
             ItemDetailsWidget itemDetailsWidget1 =
                 await UIManager.Instance.CreateGComponent<ItemDetailsWidget>(null, Connect);
             itemDetailsWidget1.CustomInit("用途", LanguageManager.Instance.Text(itemInfo.config.itemDesc));

+ 11 - 22
Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsPanelData.cs

@@ -8,28 +8,6 @@ namespace Fort23.Mono
 	public partial class ItemDetailsPanel 
 	{
 	  #region 自定义数据 
-	  private MyImage _Icon_Quality;
-	  public MyImage Icon_Quality
-	   {
-	   get{
-	      if (_Icon_Quality == null)
-	       {
-	         _Icon_Quality  = GetUIUnit<MyImage>("Icon_Quality"); 
-	       }
-	      return _Icon_Quality;
-	     }
-	   }
-	  private MyImage _Icon_ItemIcon;
-	  public MyImage Icon_ItemIcon
-	   {
-	   get{
-	      if (_Icon_ItemIcon == null)
-	       {
-	         _Icon_ItemIcon  = GetUIUnit<MyImage>("Icon_ItemIcon"); 
-	       }
-	      return _Icon_ItemIcon;
-	     }
-	   }
 	  private Text _Text_Name;
 	  public Text Text_Name
 	   {
@@ -74,6 +52,17 @@ namespace Fort23.Mono
 	      return _Btn_Close;
 	     }
 	   }
+	  private GameObject _WidgetItemGame;
+	  public GameObject WidgetItemGame
+	   {
+	   get{
+	      if (_WidgetItemGame == null)
+	       {
+	         _WidgetItemGame  = GetUIUnit<GameObject>("WidgetItemGame"); 
+	       }
+	      return _WidgetItemGame;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

+ 6 - 3
Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemSourcePanel.cs

@@ -3,6 +3,7 @@ using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
+using GameLogic.Bag;
 using Mono.Utility;
 
 namespace Fort23.Mono
@@ -38,9 +39,11 @@ namespace Fort23.Mono
             callBack = uiData[1] as CTask<bool>;
             ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(itemId);
             Text_ItemName.text = LanguageManager.Instance.Text(itemConfig.itemName);
-            Icon_quality.icon_name = "dec_wupin_pinzhi" + itemConfig.quality;
-
-            Icon_Item.icon_name = itemConfig.icon;
+            
+            WidgetItem widgetItem =
+                await UIManager.Instance.CreateGComponentForObject<WidgetItem>(WidgetItemGam, null);
+            widgetItem.InitWidget(new ItemInfo(itemId),false);
+            
             Text_ItemCount.text = PlayerManager.Instance.BagController.GetItemCount(itemId).ToString();
             if (itemConfig.SkiptoID != null)
             {

+ 10 - 21
Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemSourcePanelData.cs

@@ -41,37 +41,26 @@ namespace Fort23.Mono
 	      return _Text_ItemName;
 	     }
 	   }
-	  private MyImage _Icon_quality;
-	  public MyImage Icon_quality
-	   {
-	   get{
-	      if (_Icon_quality == null)
-	       {
-	         _Icon_quality  = GetUIUnit<MyImage>("Icon_quality"); 
-	       }
-	      return _Icon_quality;
-	     }
-	   }
-	  private MyImage _Icon_Item;
-	  public MyImage Icon_Item
+	  private Text _Text_ItemCount;
+	  public Text Text_ItemCount
 	   {
 	   get{
-	      if (_Icon_Item == null)
+	      if (_Text_ItemCount == null)
 	       {
-	         _Icon_Item  = GetUIUnit<MyImage>("Icon_Item"); 
+	         _Text_ItemCount  = GetUIUnit<Text>("Text_ItemCount"); 
 	       }
-	      return _Icon_Item;
+	      return _Text_ItemCount;
 	     }
 	   }
-	  private Text _Text_ItemCount;
-	  public Text Text_ItemCount
+	  private GameObject _WidgetItemGam;
+	  public GameObject WidgetItemGam
 	   {
 	   get{
-	      if (_Text_ItemCount == null)
+	      if (_WidgetItemGam == null)
 	       {
-	         _Text_ItemCount  = GetUIUnit<Text>("Text_ItemCount"); 
+	         _WidgetItemGam  = GetUIUnit<GameObject>("WidgetItemGam"); 
 	       }
-	      return _Text_ItemCount;
+	      return _WidgetItemGam;
 	     }
 	   }
 	  #endregion 自定义数据结束 

+ 29 - 11
Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItem.cs

@@ -53,31 +53,34 @@ namespace Fort23.Mono
             this.itemInfo = itemInfo;
 
             Icon_quality.icon_name = "dec_wupin_pinzhi" + itemInfo.config.quality;
-
+         
             if (itemInfo.config.associateID == 3)
             {
                 SkillConfig skillConfig =
                     ConfigComponent.Instance.Get<SkillConfig>(itemInfo.config.associateVlaue[1] * 10 + 1);
                 if (skillConfig.attribute == 1)
                 {
-                    icon.icon_name = "dec_ck_gf_jin";
+                    icon.icon_name = "dec_gfbook_jin";
                 }
                 else if (skillConfig.attribute == 4)
                 {
-                    icon.icon_name = "dec_ck_gf_mu";
+                    icon.icon_name = "dec_gfbook_mu";
                 }
                 else if (skillConfig.attribute == 2)
                 {
-                    icon.icon_name = "dec_ck_gf_shui";
+                    icon.icon_name = "dec_gfbook_shui";
                 }
                 else if (skillConfig.attribute == 8)
                 {
-                    icon.icon_name = "dec_ck_gf_huo";
+                    icon.icon_name = "dec_gfbook_huo";
                 }
                 else if (skillConfig.attribute == 16)
                 {
-                    icon.icon_name = "dec_ck_gf_tu";
+                    icon.icon_name = "dec_gfbook_tu";
                 }
+
+                Icon_Skill.gameObject.SetActive(true);
+                Icon_Skill.icon_name = skillConfig.icon;
             }
             //碎片
             else if (itemInfo.config.associateID == 11)
@@ -87,29 +90,44 @@ namespace Fort23.Mono
                     ConfigComponent.Instance.Get<SkillConfig>(itemConfig2.associateVlaue[1] * 10 + 1);
                 if (skillConfig.attribute == 1)
                 {
-                    icon.icon_name = "dec_ck_gf_jin";
+                    icon.icon_name = "dec_gfbook_jin";
                 }
                 else if (skillConfig.attribute == 4)
                 {
-                    icon.icon_name = "dec_ck_gf_mu";
+                    icon.icon_name = "dec_gfbook_mu";
                 }
                 else if (skillConfig.attribute == 2)
                 {
-                    icon.icon_name = "dec_ck_gf_shui";
+                    icon.icon_name = "dec_gfbook_shui";
                 }
                 else if (skillConfig.attribute == 8)
                 {
-                    icon.icon_name = "dec_ck_gf_huo";
+                    icon.icon_name = "dec_gfbook_huo";
                 }
                 else if (skillConfig.attribute == 16)
                 {
-                    icon.icon_name = "dec_ck_gf_tu";
+                    icon.icon_name = "dec_gfbook_tu";
                 }
+
+            
+                Icon_Skill.gameObject.SetActive(true);
+                Icon_Skill.icon_name = skillConfig.icon;
             }
             else
             {
+                Icon_Skill.gameObject.SetActive(false);
                 icon.icon_name = itemInfo.config.icon;
             }
+            
+            //碎片
+            if (itemInfo.config.itemTag == 12 || itemInfo.config.itemTag == 14 || itemInfo.config.itemTag == 25)
+            {
+                Icon_SuiPian.gameObject.SetActive(true);
+            }
+            else
+            {
+                Icon_SuiPian.gameObject.SetActive(false);
+            }
 
             icon.gameObject.SetActive(true);
 

+ 22 - 0
Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItemData.cs

@@ -74,6 +74,28 @@ namespace Fort23.Mono
 	      return _Icon_quality;
 	     }
 	   }
+	  private MyImage _Icon_Skill;
+	  public MyImage Icon_Skill
+	   {
+	   get{
+	      if (_Icon_Skill == null)
+	       {
+	         _Icon_Skill  = GetUIUnit<MyImage>("Icon_Skill"); 
+	       }
+	      return _Icon_Skill;
+	     }
+	   }
+	  private MyImage _Icon_SuiPian;
+	  public MyImage Icon_SuiPian
+	   {
+	   get{
+	      if (_Icon_SuiPian == null)
+	       {
+	         _Icon_SuiPian  = GetUIUnit<MyImage>("Icon_SuiPian"); 
+	       }
+	      return _Icon_SuiPian;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

+ 28 - 12
Assets/Scripts/GameUI/UI/ShopPanel/ShopItemWidgetType2.cs

@@ -166,31 +166,34 @@ namespace Fort23.Mono
 
             Icon_PriceItem.icon_name = itemConfig.icon;
 
-
+            Icon_SuiPian.gameObject.SetActive(false);
             if (_itemConfig.associateID == 3)
             {
                 SkillConfig skillConfig =
                     ConfigComponent.Instance.Get<SkillConfig>(_itemConfig.associateVlaue[1] * 10 + 1);
                 if (skillConfig.attribute == 1)
                 {
-                    Icon_Item.icon_name = "dec_ck_gf_jin";
+                    Icon_Item.icon_name = "dec_gfbook_jin";
                 }
                 else if (skillConfig.attribute == 4)
                 {
-                    Icon_Item.icon_name = "dec_ck_gf_mu";
+                    Icon_Item.icon_name = "dec_gfbook_mu";
                 }
                 else if (skillConfig.attribute == 2)
                 {
-                    Icon_Item.icon_name = "dec_ck_gf_shui";
+                    Icon_Item.icon_name = "dec_gfbook_shui";
                 }
                 else if (skillConfig.attribute == 8)
                 {
-                    Icon_Item.icon_name = "dec_ck_gf_huo";
+                    Icon_Item.icon_name = "dec_gfbook_huo";
                 }
                 else if (skillConfig.attribute == 16)
                 {
-                    Icon_Item.icon_name = "dec_ck_gf_tu";
+                    Icon_Item.icon_name = "dec_gfbook_tu";
                 }
+
+                Icon_Skill.gameObject.SetActive(true);
+                Icon_Skill.icon_name = skillConfig.icon;
             }
             //碎片
             else if (_itemConfig.associateID == 11)
@@ -200,28 +203,41 @@ namespace Fort23.Mono
                     ConfigComponent.Instance.Get<SkillConfig>(itemConfig2.associateVlaue[1] * 10 + 1);
                 if (skillConfig.attribute == 1)
                 {
-                    Icon_Item.icon_name = "dec_ck_gf_jin";
+                    Icon_Item.icon_name = "dec_gfbook_jin";
                 }
                 else if (skillConfig.attribute == 4)
                 {
-                    Icon_Item.icon_name = "dec_ck_gf_mu";
+                    Icon_Item.icon_name = "dec_gfbook_mu";
                 }
                 else if (skillConfig.attribute == 2)
                 {
-                    Icon_Item.icon_name = "dec_ck_gf_shui";
+                    Icon_Item.icon_name = "dec_gfbook_shui";
                 }
                 else if (skillConfig.attribute == 8)
                 {
-                    Icon_Item.icon_name = "dec_ck_gf_huo";
+                    Icon_Item.icon_name = "dec_gfbook_huo";
                 }
                 else if (skillConfig.attribute == 16)
                 {
-                    Icon_Item.icon_name = "dec_ck_gf_tu";
+                    Icon_Item.icon_name = "dec_gfbook_tu";
                 }
+
+                Icon_Skill.gameObject.SetActive(true);
+                Icon_Skill.icon_name = skillConfig.icon;
+            }
+            else
+            {
+                Icon_Item.icon_name = _itemConfig.icon;
+            }
+
+            //碎片
+            if (_itemConfig.itemTag == 12 || _itemConfig.itemTag == 14 || _itemConfig.itemTag == 25)
+            {
+                Icon_SuiPian.gameObject.SetActive(true);
             }
             else
             {
-                Icon_Item.icon_name =_itemConfig.icon;
+                Icon_SuiPian.gameObject.SetActive(false);
             }
 
             Text_Name.text = LanguageManager.Instance.Text(_itemConfig.itemName);

+ 22 - 0
Assets/Scripts/GameUI/UI/ShopPanel/ShopItemWidgetType2Data.cs

@@ -118,6 +118,28 @@ namespace Fort23.Mono
 	      return _Icon_quality;
 	     }
 	   }
+	  private MyImage _Icon_Skill;
+	  public MyImage Icon_Skill
+	   {
+	   get{
+	      if (_Icon_Skill == null)
+	       {
+	         _Icon_Skill  = GetUIUnit<MyImage>("Icon_Skill"); 
+	       }
+	      return _Icon_Skill;
+	     }
+	   }
+	  private MyImage _Icon_SuiPian;
+	  public MyImage Icon_SuiPian
+	   {
+	   get{
+	      if (_Icon_SuiPian == null)
+	       {
+	         _Icon_SuiPian  = GetUIUnit<MyImage>("Icon_SuiPian"); 
+	       }
+	      return _Icon_SuiPian;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{