Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-10-10 fe5b1a2c216316911ae92eda2b82ad9b69f9c23d

 System/Skill/TalentModel.cs

@@ -76,7 +76,6 @@
            {

                talent.level = 0;

            }

            talentPoint = 0;

            serverInited = false;

        }



@@ -289,13 +288,12 @@
        }



        #region 服务端数据

        public int talentPoint { get; private set; }

        public int talentPoint { get { return PlayerDatas.Instance.extersion.talentPoint; } }



        private void PlayerDataRefreshInfoEvent(PlayerDataRefresh refreshType)

        {

            if (refreshType == PlayerDataRefresh.CDBPlayerRefresh_TalentPoint)

            {

                talentPoint = PlayerDatas.Instance.extersion.talentPoint;

                if (talentPointUpdate != null)

                {

                    talentPointUpdate();