道具icon更新

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.7701642
+    - _Alpha: 0.99977845
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.58696043
+    - _Alpha: 0.9989895
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.23122954
+    - _Alpha: 0.25232142
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.17518914
+    - _MainTexOffsetU: 0.1511172
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/UI/MainHeroPanel/ItemWidgetType1.prefab

@@ -129,6 +129,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7091371511447556559}
+  - {fileID: 3375826015555380777}
   - {fileID: 8879216144060700877}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -208,7 +209,101 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_ItemIconSkill
+    gameObject: {fileID: 4478813827264039601}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!1 &6687755613884693298
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3375826015555380777}
+  - component: {fileID: 3580106330819906449}
+  - component: {fileID: 4478813827264039601}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_ItemIconSkill
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &3375826015555380777
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6687755613884693298}
+  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: 6132543138199057944}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 37.7841, y: -15.66925}
+  m_SizeDelta: {x: 19.4467, y: 19.4467}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &3580106330819906449
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6687755613884693298}
+  m_CullTransparentMesh: 1
+--- !u!114 &4478813827264039601
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6687755613884693298}
+  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_s9002
+  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: 26.404785
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &8748313746680104858
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/ShopPanel/ShopItemWidgetType1.prefab

@@ -8252,7 +8252,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 146, y: -23}
-  m_SizeDelta: {x: 182, y: 50}
+  m_SizeDelta: {x: 0, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7048921669090791528
 CanvasRenderer:

Assets/Scripts/GameUI/UI/MainHeroPnael/ItemWidgetType1.cs

@@ -28,10 +28,21 @@ namespace Fort23.Mono
         public void CustomInit(int id, int count)
         {
             ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(id);
+            if (itemConfig.associateID == 11)
+            {
+                ItemConfig itemConfig2 = ConfigComponent.Instance.Get<ItemConfig>(itemConfig.associateVlaue[0]);
+                SkillConfig skillConfig =
+                    ConfigComponent.Instance.Get<SkillConfig>(itemConfig2.associateVlaue[1] * 10 + 1);
+                Icon_ItemIconSkill.icon_name = skillConfig.icon;
+                Icon_ItemIconSkill.gameObject.SetActive(true);
+                Icon_ItemIcon.gameObject.SetActive(false);
+            }
 
-            
+            else
             {
                 Icon_ItemIcon.icon_name = itemConfig.icon;
+                Icon_ItemIconSkill.gameObject.SetActive(false);
+                Icon_ItemIcon.gameObject.SetActive(true);
             }
 
 

Assets/Scripts/GameUI/UI/MainHeroPnael/ItemWidgetType1Data.cs

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