lzx 5 dní pred
rodič
commit
d814decf7c

+ 1 - 1
Assets/Res/UI/BoxPanel/WidgetItemType2.prefab

@@ -842,7 +842,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 58.41, y: -21.027552}
-  m_SizeDelta: {x: 49, y: 35.3449}
+  m_SizeDelta: {x: 0, y: 35.3449}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1507516687379950841
 CanvasRenderer:

+ 1 - 1
Assets/Res/UI/ItemDetailsPanel/ItemDetailsPanel.prefab

@@ -597,7 +597,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 123.9}
-  m_SizeDelta: {x: 229.7647, y: 45.2188}
+  m_SizeDelta: {x: 455.66, y: 45.2188}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8836854868087396015
 CanvasRenderer:

+ 61 - 3
Assets/Scripts/GameUI/UI/BoxPanel/WidgetItemType2.cs

@@ -1,5 +1,7 @@
 using System.Linq;
 using Core.Language;
+using Excel2Json;
+using Fort23.UTool;
 using GameLogic.Bag;
 using GameLogic.Hero;
 using Utility;
@@ -27,6 +29,7 @@ namespace Fort23.Mono
 
         public void InitWidget(ItemInfo itemInfo)
         {
+            ItemConfig itemConfig = itemInfo.config;
             //法宝
             if (itemInfo.config.itemTag == 11)
             {
@@ -36,6 +39,7 @@ namespace Fort23.Mono
                         f.id == itemInfo.config.associateVlaue[1]);
                 if (faaData != null)
                 {
+                    itemConfig = ConfigComponent.Instance.Get<ItemConfig>(itemInfo.config.associateVlaue[0]);
                     Icon_SuiPian.gameObject.SetActive(true);
                     Text_Count.text = $"x{itemInfo.config.associateVlaue[2]}";
                 }
@@ -53,6 +57,7 @@ namespace Fort23.Mono
                         s.id == itemInfo.config.associateVlaue[1]);
                 if (skillData != null)
                 {
+                    itemConfig = ConfigComponent.Instance.Get<ItemConfig>(itemInfo.config.associateVlaue[0]);
                     Icon_SuiPian.gameObject.SetActive(true);
                     Text_Count.text = $"x{itemInfo.config.associateVlaue[2]}";
                 }
@@ -68,12 +73,65 @@ namespace Fort23.Mono
                 csc.ChangeState(0);
             }
 
+            if (itemConfig.associateID == 3)
+            {
+                SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(itemConfig.associateVlaue[1]*10+1);
+                if (skillConfig.attribute == 1)
+                {
+                    icon.icon_name = "dec_ck_gf_jin";
+                }
+                else if (skillConfig.attribute == 4)
+                {
+                    icon.icon_name = "dec_ck_gf_mu";
+                }
+                else if (skillConfig.attribute == 2)
+                {
+                    icon.icon_name = "dec_ck_gf_shui";
+                }
+                else if (skillConfig.attribute == 8)
+                {
+                    icon.icon_name = "dec_ck_gf_huo";
+                }
+                else if (skillConfig.attribute == 16)
+                {
+                    icon.icon_name = "dec_ck_gf_tu";
+                }
+            }
+            //碎片
+            else if (itemConfig.associateID == 11)
+            {
+                ItemConfig itemConfig2 = ConfigComponent.Instance.Get<ItemConfig>(itemConfig.associateVlaue[0]);
+                SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(itemConfig2.associateVlaue[1]*10+1);
+                if (skillConfig.attribute == 1)
+                {
+                    icon.icon_name = "dec_ck_gf_jin";
+                }
+                else if (skillConfig.attribute == 4)
+                {
+                    icon.icon_name = "dec_ck_gf_mu";
+                }
+                else if (skillConfig.attribute == 2)
+                {
+                    icon.icon_name = "dec_ck_gf_shui";
+                }
+                else if (skillConfig.attribute == 8)
+                {
+                    icon.icon_name = "dec_ck_gf_huo";
+                }
+                else if (skillConfig.attribute == 16)
+                {
+                    icon.icon_name = "dec_ck_gf_tu";
+                }
+            }
+            else
+            {
+                icon.icon_name = itemInfo.config.icon;
+            }
 
-            icon.gameObject.SetActive(true);
-            icon.icon_name = itemInfo.config.icon;
+            // icon.gameObject.SetActive(true);
 
 
-            Text_Name.text = LanguageManager.Instance.Text(itemInfo.config.itemName);
+            Text_Name.text = LanguageManager.Instance.Text(itemConfig.itemName);
 
             // if (itemInfo.count.Value > 0)
             // {

+ 35 - 31
Assets/Scripts/GameUI/UI/MainHeroPnael/ItemWidgetType1.cs

@@ -6,34 +6,38 @@ using Utility;
 
 namespace Fort23.Mono
 {
-	[UIBinding(prefab = "ItemWidgetType1"  )]
-	public partial class ItemWidgetType1 : UIComponent
-	{
-		private void Init()
-		{
-
-		}
-		public override void AddEvent()
-		{
-
-		}
-		public override void DelEvent()
-		{
-
-		}
-		public override void AddButtonEvent()
-		{
-
-		}
-
-		public void CustomInit(int id,int count)
-		{
-			ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(id);
-			Icon_ItemIcon.icon_name = itemConfig.icon;
-			Text_Count.text = $"{count}/{PlayerManager.Instance.BagController.GetItemCount(id).ToStringEx()}";
-			LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Count.GetComponent<RectTransform>());
-			LayoutRebuilder.ForceRebuildLayoutImmediate(transform);
-		}
-
-	}
-}
+    [UIBinding(prefab = "ItemWidgetType1")]
+    public partial class ItemWidgetType1 : UIComponent
+    {
+        private void Init()
+        {
+        }
+
+        public override void AddEvent()
+        {
+        }
+
+        public override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+
+        public void CustomInit(int id, int count)
+        {
+            ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(id);
+
+            
+            {
+                Icon_ItemIcon.icon_name = itemConfig.icon;
+            }
+
+
+            Text_Count.text = $"{count}/{PlayerManager.Instance.BagController.GetItemCount(id).ToStringEx()}";
+            LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Count.GetComponent<RectTransform>());
+            LayoutRebuilder.ForceRebuildLayoutImmediate(transform);
+        }
+    }
+}

+ 34 - 1
Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItem.cs

@@ -1,3 +1,5 @@
+using Excel2Json;
+using Fort23.UTool;
 using GameLogic.Bag;
 using Utility;
 
@@ -52,8 +54,39 @@ namespace Fort23.Mono
 
             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";
+                }
+                else if (skillConfig.attribute == 4)
+                {
+                    icon.icon_name = "dec_ck_gf_mu";
+                }
+                else if (skillConfig.attribute == 2)
+                {
+                    icon.icon_name = "dec_ck_gf_shui";
+                }
+                else if (skillConfig.attribute == 8)
+                {
+                    icon.icon_name = "dec_ck_gf_huo";
+                }
+                else if (skillConfig.attribute == 16)
+                {
+                    icon.icon_name = "dec_ck_gf_tu";
+                }
+                               
+
+            }
+            else
+            {
+                icon.icon_name = itemInfo.config.icon;
+            }
+
             icon.gameObject.SetActive(true);
-            icon.icon_name = itemInfo.config.icon;
+        
             Icon_WenHao.gameObject.SetActive(false);
 
             if (itemInfo.count.Value > 0)