2407 【开发】引导新增再次激活功能

client_Wu Xijin

2018-08-11 da730e386e9c9cd6752caabb4d18c4c3a12440d7

2407 【开发】引导新增再次激活功能

 Core/GameEngine/Model/Config/GuideConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Thursday, June 21, 2018
//    [  Date ]:           Saturday, August 11, 2018
//--------------------------------------------------------

using UnityEngine;
@@ -19,6 +19,7 @@
        public int[] Steps;

        public int CanSkip { get ; private set ; }

        public int RemoveWhenOtherGuide { get ; private set ; }

        public int CannotCompleteByClick { get ; private set ; }


        public override string getKey()

        {

@@ -48,6 +49,8 @@
                CanSkip=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0; 

            

                RemoveWhenOtherGuide=IsNumeric(rawContents[7]) ? int.Parse(rawContents[7]):0; 

			
                CannotCompleteByClick=IsNumeric(rawContents[8]) ? int.Parse(rawContents[8]):0; 
            }

            catch (Exception ex)

            {


 Core/GameEngine/Model/Config/GuideConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 6f83fda8617312f4aa1eb64892fddda5
timeCreated: 1529568678
timeCreated: 1533969000
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/NewBieGuidance/FunctionalGuideBehaviour.cs

@@ -145,6 +145,23 @@
            FunctionalGuideBehaviourPool.Recycle(this.gameObject);

        }



        private void ClickToCompleteGuide()

        {

            UnAttachTrigger();

            m_ClickTarget = null;



            var config = ConfigManager.Instance.GetTemplate<GuideConfig>(guide);

            if (config != null)

            {

                if (config.CannotCompleteByClick != 1)

                {

                    FunctionalGuideCenter.Instance.FinishGuide(guide);

                }

            }



            FunctionalGuideBehaviourPool.Recycle(this.gameObject);

        }



        private void LateUpdate()

        {

            FindClickTarget();

@@ -212,7 +229,7 @@
                if (trigger != null)

                {

                    trigger.onClick.RemoveAllListeners();

                    trigger.onClick.AddListener(ReportGuideComplete);

                    trigger.onClick.AddListener(ClickToCompleteGuide);

                }



                var mask = m_ClickTarget.GetComponentInParent<RectMask2D>();