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

client_linchunjie

2018-11-09 9506bb33048bec53e38d6b39bd29dfb9f69f3ae0

 System/MainInterfacePanel/DialogueDuidanceWin.cs

@@ -28,6 +28,7 @@
        [SerializeField] Text m_PlayerNameText;

        [SerializeField] Text m_ContentText;



        [SerializeField] Text m_NextText;

        [SerializeField] List<int> MysteriousTaskID = new List<int>();//新添神秘任务

        Dictionary<int, string> PlayerIcon = new Dictionary<int, string>();

        private int storyMissionsID = 0;//剧情任务ID

@@ -35,6 +36,8 @@
        private int[] sPeaker;//对话对应半身像（0为主角/1为NPC）

        private int nowTaskNum = 0;//获取当前的任务

        private int typesPeaker = -1;



        private float timeType = 0f;

        PlayerTaskDatas m_TaskModel;

        PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } }



@@ -70,6 +73,8 @@
        protected override void OnPreOpen()

        {

            MainInterfaceWin.IsOpenMaininterface += IsOpenMaininterface;

            timeType = 0;

            m_NextText.text = string.Format(Language.Get("TaskContinueCount"), AwaitSecond);

            IsCloseWindow();

            typesPeaker = -1;

            storyMissionsID = taskmodel._TaskNow;

@@ -114,35 +119,35 @@


        protected override void OnAfterOpen()

        {

            Treasure treasure = null;

            if (treasureModel.TryGetTreasure(FabaoId, out treasure))

            {

                if (treasure.state != TreasureState.Collecting && !NewBieCenter.Instance.inGuiding)

                {

                    StartCoroutine("GetMainSelfMotion");

                }

            //Treasure treasure = null;

            //if (treasureModel.TryGetTreasure(FabaoId, out treasure))

            //{

            //    if (treasure.state != TreasureState.Collecting && !NewBieCenter.Instance.inGuiding)

            //    {

            //        StartCoroutine("GetMainSelfMotion");

            //    }



            }

            //}

        }

        IEnumerator GetMainSelfMotion()

        {

            if (mainModel.IsSelfMotionTask)

            {

                yield return WaitingForSecondConst.WaitMS1500;

            }

            else

            {

                yield return new WaitForSeconds(AwaitSecond);

            }

            OnClickSKIPButton();

            mainModel.IsSelfMotionTask = true;

            yield break;

        }

        //IEnumerator GetMainSelfMotion()

        //{

        //    if (mainModel.IsSelfMotionTask)

        //    {

        //        yield return WaitingForSecondConst.WaitMS1500;

        //    }

        //    else

        //    {

        //        yield return new WaitForSeconds(AwaitSecond);

        //    }

        //    OnClickSKIPButton();

        //    mainModel.IsSelfMotionTask = true;

        //    yield break;

        //}

        protected override void OnPreClose()

        {

            MainInterfaceWin.IsOpenMaininterface -= IsOpenMaininterface;

            UI3DModelExhibition.Instance.StopShow();

            StopCoroutine("GetMainSelfMotion");

           // StopCoroutine("GetMainSelfMotion");

        }



        private void IsOpenMaininterface()

@@ -169,7 +174,17 @@
        }

        protected override void LateUpdate()

        {

            base.LateUpdate();

            timeType += Time.deltaTime;

            if (timeType >= AwaitSecond)

            {

                m_NextText.text = string.Format(Language.Get("TaskContinueCount"), 0);

                OnClickSKIPButton();

                mainModel.IsSelfMotionTask = true;

            }

            else

            {

                m_NextText.text= string.Format(Language.Get("TaskContinueCount"), AwaitSecond - (int)timeType);

            }



            if (this is BossShowDialogueWin)

            {

@@ -204,6 +219,7 @@
        }

        private void OnClickMarkRay()

        {

            timeType = 0;

            var config = Config.Instance.Get<StoryMissionsConfig>(storyMissionsID);

            if (config == null)

            {