4434 UI界面模型释放逻辑修改

client_Hale

2018-11-09 9db25d0aa078c39324855c7f606463f38dc1c5e4

4434 UI界面模型释放逻辑修改

 UI/Common/UI3DModelExhibition.cs

@@ -25,7 +25,8 @@
        [SerializeField] UI3DModelInteractProcessor m_InteractProcessor;

        [SerializeField] ColorCorrectionCurves m_CameraColor;



        public bool interactable {

        public bool interactable

        {

            get { return m_Interactable; }

            set { m_Interactable = value; }

        }

@@ -34,7 +35,8 @@


        int m_HorseModelId = 0;

        GameObject horseModel = null;

        public GameObject NpcModelHorse {

        public GameObject NpcModelHorse

        {

            get { return horseModel; }

            set { horseModel = value; }

        }

@@ -42,7 +44,8 @@
        int m_NPCId = 0;

        GameObject npcModel = null;

        SFXController m_NpcEffect;

        public GameObject NpcModelPet {

        public GameObject NpcModelPet

        {

            get { return npcModel; }

            set { npcModel = value; }

        }

@@ -66,8 +69,10 @@
        public static UI3DModelExhibition Instance { get; private set; }



        static UI3DModelExhibition m_InstanceClone1 = null;

        public static UI3DModelExhibition InstanceClone1 {

            get {

        public static UI3DModelExhibition InstanceClone1

        {

            get

            {

                if (m_InstanceClone1 == null)

                {

                    CreateCloneStage();

@@ -445,6 +450,7 @@
            StopShow();

            ResetCameraColor();

            var config = Config.Instance.Get<NPCConfig>(data.npcId);

            m_NPCId = data.npcId;

            var job = 0;

            if (config.MODE.Contains("A_Zs"))

            {

@@ -512,7 +518,7 @@
        {

            StopShow();

            m_ShowCamera.enabled = true;



            m_NPCId = _npcId;

            if (_rawImage != null)

            {

                var x = _rawImage.rectTransform.rect.height * 4f / 3;

@@ -537,7 +543,6 @@
                m_NPCShowPoint.localEulerAngles = _localEulerAngles;

            }



            m_NPCId = _npcId;

            npcModel = instance;

            var config = Config.Instance.Get<NPCConfig>(_npcId);

            instance.transform.SetParentEx(_isDialogue ? m_DialogPoint : m_NPCShowPoint, _offset, Quaternion.identity, Vector3.one * config.UIModeLProportion);


 UI/Common/UI3DModelFactory.cs

@@ -83,7 +83,16 @@
        if (animator != null)

        {

            var suffix = AnimatorControllerLoader.controllerUISuffix;

            var animatorController = AnimatorControllerLoader.LoadMobController(suffix, config.MODE);

            var _modeName = config.MODE;

            if (config.MODE.StartsWith("A_Zs"))

            {

                _modeName = "A_Zs";

            }

            else if (config.MODE.StartsWith("A_Fs"))

            {

                _modeName = "A_Fs";

            }

            var animatorController = AnimatorControllerLoader.LoadMobController(suffix, _modeName);

            if (animatorController != null)

            {

                animator.runtimeAnimatorController = animatorController;