2030【前端】境界功能界面修改

client_linchunjie

2018-08-22 7aa1608923ec1ea73ff701e996dd66a4f753336d

2030【前端】境界功能界面修改

 System/Realm/RealmUpWin.cs

@@ -59,7 +59,6 @@


        int cacheRealmPoint = 0;

        Coroutine cacheCoroutine = null;

        RuntimeAnimatorController cacheController = null;

        const string State_EnterHash = "Show";

        const string State_IdleHash = "Idle";



@@ -127,10 +126,6 @@
                StopCoroutine(cacheCoroutine);

                cacheCoroutine = null;

            }

            if (cacheController != null)

            {

                cacheController = null;

            }

        }



        protected override void OnAfterClose()

@@ -149,7 +144,6 @@
        IEnumerator Co_DisplayBossShow()

        {

            yield return WaitingForSecondConst.WaitMS800;

            ResetRunTimeController();

            var config = Config.Instance.Get<RealmConfig>(PlayerDatas.Instance.baseData.realmLevel);

            m_RawPlayer.gameObject.SetActive(false);

            UI3DModelExhibition.Instance.StopShowPlayer();

@@ -280,7 +274,6 @@
            {

                m_RawBoss.gameObject.SetActive(true);

                m_RawPlayer.gameObject.SetActive(false);

                ResetRunTimeController();

                UI3DModelExhibition.Instance.StopShowPlayer();

                StartBoss(config);

            }

@@ -288,21 +281,7 @@


        private void StopBoss()

        {

            ResetRunTimeController();

            UI3DModelExhibition.Instance.StopShowNPC();

        }



        private void ResetRunTimeController()

        {

            var npcModel = UI3DModelExhibition.Instance.NpcModelPet;

            if (npcModel != null)

            {

                var animator = npcModel.GetComponentInChildren<Animator>();

                if (animator != null && cacheController != null)

                {

                    animator.runtimeAnimatorController = cacheController;

                }

            }

        }



        private void StartBoss(RealmConfig config, bool act = false)

@@ -319,7 +298,6 @@
                var animator = npcModel.GetComponentInChildren<Animator>();

                if (animator != null)

                {

                    cacheController = animator.runtimeAnimatorController;

                    var runtimeController = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerRealmSuffix, npcConfig.MODE);

                    animator.runtimeAnimatorController = runtimeController;

                    animator.Play(act ? State_EnterHash : State_IdleHash, 0);


 UI/Common/UI3DModelFactory.cs

@@ -96,6 +96,15 @@
        var animator = model.GetComponent<Animator>();

        if (animator != null)

        {

            var npcConfig = Config.Instance.Get<NPCConfig>(id);

            if (npcConfig != null)

            {

                var runtimeController = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, npcConfig.MODE);

                if (runtimeController != null)

                {

                    animator.runtimeAnimatorController = runtimeController;

                }

            }

            animator.enabled = false;

        }