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

client_linchunjie

2018-10-18 2bdca925498c2b06de803cd6ec1704faef8eec30

 System/NewBieGuidance/FunctionalGuideBehaviour.cs

@@ -35,6 +35,7 @@
        }



        float protectTimer = 0f;

        string clickTargetName;

        Transform m_ClickTarget;

        RectTransform rectTransform { get { return this.transform as RectTransform; } }



@@ -131,6 +132,7 @@
                selectBoxPatternBuf = (int)stepConfig.selectBox;

            }



            clickTargetName = string.Empty;

            m_ClickTarget = null;

            m_ClickHintRoot.gameObject.SetActive(false);

            FindClickTarget();

@@ -140,14 +142,18 @@
        private void ReportGuideComplete()

        {

            UnAttachTrigger();

            clickTargetName = string.Empty;

            m_ClickTarget = null;

            FunctionalGuideCenter.Instance.FinishGuide(guide);



            guide = 0;

            FunctionalGuideBehaviourPool.Recycle(this.gameObject);

        }



        private void ClickToCompleteGuide()

        {

            UnAttachTrigger();

            clickTargetName = string.Empty;

            m_ClickTarget = null;



            var config = Config.Instance.Get<GuideConfig>(guide);

@@ -159,12 +165,32 @@
                }

            }



            guide = 0;

            FunctionalGuideBehaviourPool.Recycle(this.gameObject);

        }



        private void LateUpdate()

        {

            if (m_ClickTarget != null)

            {

                if (clickTargetName != m_ClickTarget.name)

                {

                    UnAttachTrigger();

                    m_ClickTarget = null;

                    protectTimer = 0f;

                }

            }



            FindClickTarget();



            if (guide == 0 || NewBieCenter.Instance.IsGuideCompleted(guide))

            {

                UnAttachTrigger();

                clickTargetName = string.Empty;

                m_ClickTarget = null;

                guide = 0;

                FunctionalGuideBehaviourPool.Recycle(this.gameObject);

            }

        }



        private void FindClickTarget()

@@ -222,9 +248,9 @@
        private void FindAndAttachTrigger(string _path)

        {

            m_ClickTarget = WindowCenter.Instance.uiRoot.transform.Find(_path);



            if (m_ClickTarget != null)

            {

                clickTargetName = m_ClickTarget.name;

                var trigger = NewBieEventTrigger.SetPointClick(m_ClickTarget.gameObject);

                if (trigger != null)

                {