Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

1 天以前 4b5b31a23a74c1559460643836d70778d7d49931

 Main/System/SkillUI/SkillBaseCell.cs

@@ -50,15 +50,32 @@
        LoadPrefab();
    }

    private void Init(int skillID, UnityAction onclick, bool showType = false)
    public void Init(int skillID, UnityAction onclick = null, bool showType = false)
    {
        LoadPrefab();   //存在被卸载的可能，重新加载
        var config = SkillConfig.Get(skillID);
        skillIcon.SetSprite(config.IconName);
        skillBtn.AddListener(onclick);
        if (config == null)
        {
            Debug.LogErrorFormat("技能未配置 : {0}", skillID);
            return;
        }
        skillIcon.SetOrgSprite(config.IconName, "SkillIcon");
#if UNITY_EDITOR
        if (string.IsNullOrEmpty(config.IconName))
        { 
            //内网测试
            skillIcon.SetOrgSprite("skillicondefault", "SkillIcon");
        }
#endif
        
        skillBtn.AddListener(()=>
        {
            onclick?.Invoke();
        });

        if (showType)
        {
            skillType.text = Language.Get(config.FuncType == 23 ? "HeroSkillType_1" : "HeroSkillType_2");
            skillType.text = Language.Get(config.FuncType == 1 ? "HeroSkillType_1" : "HeroSkillType_2");
        }
        else
        { 
@@ -71,7 +88,7 @@
    {
        if (cellContainer != null)
            return;
        

        var tmp = transform.Find("Container_SkillCell");
        if (tmp != null)
        {
@@ -88,6 +105,24 @@
                cellContainer.transform.SetAsFirstSibling();
            }
        }
        
        //缩放到和父rect一样大
        var scale = 1f;
        var rect = cellContainer.GetComponent<RectTransform>();
        var parentRect = transform.GetComponent<RectTransform>();
        float width = parentRect.sizeDelta.x;
        if (width <= 0f)
        {
            //外部控制了尺寸获取为0
            GridLayoutGroup grid = GetComponentInParent<GridLayoutGroup>();
            if (grid != null)
            { 
                width = grid.cellSize.x;
            }
            
        }
        scale = width / rect.sizeDelta.x;
        cellContainer.transform.localScale = cellContainer.transform.localScale * scale;
    }
}