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

client_linchunjie

2018-11-09 9506bb33048bec53e38d6b39bd29dfb9f69f3ae0

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

 Fight/GameActor/GActorPlayerBase.cs

@@ -899,6 +899,26 @@
        m_ClothesAnimator.enabled = true;

        m_ClothesAnimator.SetInteger(GAStaticDefine.Param_ActorInstID, (int)ClientInstID);



        var _modelName = string.Empty;

        RuntimeAnimatorController _controller = null;

        if (JobSetup.Job == 1)

        {

            _controller = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, "A_Zs");

        }

        else if (JobSetup.Job == 2)

        {

            _controller = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, "A_Fs");

        }

        else

        {

            Debug.LogError("..................职业异常.................");

        }



        if (_controller)

        {

            m_ClothesAnimator.runtimeAnimatorController = _controller;

        }



        if (SkillMgr.CurCastSkill != null)

        {

            SkillMgr.CurCastSkill.SkillCompelete = true;


 System/Launch/LaunchWin.cs

@@ -37,11 +37,23 @@
        float timer = 0.1f;

        float interval = 0.1f;



        float backGroundTimer = 0f;

        int backGroundIndex = 0;

        List<Sprite> backGrounds = new List<Sprite>();



        #region Built-in

        protected override void BindController()

        {

            var sprite = BuiltInLoader.LoadSprite("Launch");

            m_BackGround.overrideSprite = sprite;

            for (var i = 0; i < 3; i++)

            {

                var sprite = BuiltInLoader.LoadSprite(StringUtility.Contact("Launch_", i + 1));

                if (sprite != null)

                {

                    backGrounds.Add(sprite);

                }

            }



            m_BackGround.overrideSprite = backGrounds[0];

        }



        protected override void AddListeners()

@@ -54,6 +66,8 @@


        protected override void OnPreOpen()

        {

            backGroundTimer = 0f;

            backGroundIndex = 0;

            refProgress = 0f;

            behaviourProgress = 0f;

            trueProgress = 0f;

@@ -160,6 +174,12 @@
                }

            }



            backGroundTimer += Time.deltaTime;

            if (backGroundTimer >= 3f)

            {

                backGroundTimer = 0f;

                m_BackGround.overrideSprite = backGrounds[(++backGroundIndex) % backGrounds.Count];

            }

        }



        private void OpenUserHelp()


 System/Loading/LoadingWin.cs

@@ -20,6 +20,7 @@
        [SerializeField] Image m_BackGround;

        [SerializeField] RectTransform m_ContainerFunctions;

        [SerializeField] LoadingFunctionShow[] m_FunctionShows;

        [SerializeField] RectTransform m_ContainerProgress;

        [SerializeField] SmoothSlider m_ProgressSlider;

        [SerializeField] Transform m_EffectPoint;

        [SerializeField] RectTransform m_ContainerMapName;

@@ -101,8 +102,17 @@
                }

            }



            m_ProgressSlider.value = refProgress = 0f;

            StageManager.Instance.loadingProgressEvent += UpdateLoadingProgress;



            if (Application.platform == RuntimePlatform.IPhonePlayer)

            {

                m_ContainerProgress.gameObject.SetActive(false);

            }

            else

            {

                m_ContainerProgress.gameObject.SetActive(true);

                m_ProgressSlider.value = refProgress = 0f;

                StageManager.Instance.loadingProgressEvent += UpdateLoadingProgress;

            }

        }



        protected override void OnAfterOpen()


 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)

            {