|  | @@ -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)
 | 
	
		
			
				|  |  |              // {
 |