Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Zxw

2019-03-28 0eaa2428be82b5c2f683b4e22efa3d01d89acd2c

 System/Role/ReikiRootWin.cs

@@ -21,6 +21,7 @@
        [SerializeField] Text m_FreePoint;

        [SerializeField] Button m_Recommend;

        [SerializeField] Button m_Confirm;

        [SerializeField] Button m_Rule;



        Dictionary<int, int> currentPropertyDict = new Dictionary<int, int>();

        Dictionary<int, int> upPropertyDict = new Dictionary<int, int>();

@@ -43,6 +44,7 @@
        {

            m_Recommend.AddListener(OnRecommend);

            m_Confirm.AddListener(Confirm);

            m_Rule.AddListener(OnRule);



            m_NumKeyboard.onValueChange.AddListener(OnPointValChange);

            m_NumKeyboard.onConfirm.AddListener((bool isOk) =>

@@ -227,6 +229,12 @@
            }

        }



        private void OnRule()

        {

            ModelCenter.Instance.GetModel<HowToPlayModel>().ruleId = 44;

            WindowCenter.Instance.Open<ReikiRootRuleWin>();

        }



        private void OnCacheFreePointRefresh()

        {

            DisplayFreePoint();

@@ -237,10 +245,6 @@
        {

            if (dataType == PlayerDataType.FreePoint)

            {

                foreach (var reikiRootPoint in m_ReikiRootPoints)

                {

                    reikiRootPoint.point = 0;

                }

                if (model.cacheFreePoint == model.freePoint)

                {

                    OnCacheFreePointRefresh();