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

yyl

2 天以前 4b5b31a23a74c1559460643836d70778d7d49931

 Main/System/HeroUI/HeroSelectBehaviour.cs

@@ -12,16 +12,16 @@
    [SerializeField] Button unFoldBtn;  //展开按钮
    [SerializeField] GroupButtonEx[] jobsBtn;
    [SerializeField] GroupButtonEx[] countrysBtn;
    [SerializeField] GroupButtonExManager jobManager; 
    [SerializeField] GroupButtonExManager countryManager; 
    [SerializeField] GroupButtonExManager jobManager;
    [SerializeField] GroupButtonExManager countryManager;

    int m_Job = 0;
    int m_Country = 0;
    int foldState = 0;  //0 收起，1 展开

    //点击按钮需通知响应外部事件
    public Action<int, int> selectAction;
    
    private Action<int, int> selectAction;




@@ -62,6 +62,13 @@

    }

    /// <summary>
    /// 国家职业筛选
    /// </summary>
    /// <param name="state"> 0收起，1展开</param>
    /// <param name="job"></param>
    /// <param name="country"></param>
    /// <param name="onRefresh"> 点击按钮需通知响应外部事件</param>
    public void Display(int state, int job, int country, Action<int, int> onRefresh)
    {
        foldState = state;
@@ -92,5 +99,19 @@
        unFoldForm.SetActive(foldState == 1);
        foldForm.SetActive(foldState == 0);
    }
    

    private void LateUpdate()
    {
        if (foldState == 0)
            return;
        if (Input.GetMouseButtonDown(0))
        {
            if (!RectTransformUtility.RectangleContainsScreenPoint(this.transform as RectTransform, Input.mousePosition, CameraManager.uiCamera))
            {
                foldBtn.onClick.Invoke();
            }
        }
    }
}