Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-10-10 c6bc396fe264cd53ba594e7430011c623cc26c4a

 UI/Common/UI3DModelExhibition.cs

@@ -65,6 +65,19 @@


        public static UI3DModelExhibition Instance { get; private set; }



        static UI3DModelExhibition m_InstanceClone1 = null;

        public static UI3DModelExhibition InstanceClone1

        {

            get

            {

                if (m_InstanceClone1 == null)

                {

                    CreateCloneStage();

                }

                return m_InstanceClone1;

            }

        }



        public static void CreateStage()

        {

            var prefab = Resources.Load<GameObject>("UI/Prefabs/UI3DModelExhibitionStage");

@@ -77,6 +90,18 @@
            DontDestroyOnLoad(gameObject);

        }



        static void CreateCloneStage()

        {

            var prefab = Resources.Load<GameObject>("UI/Prefabs/UI3DModelExhibitionStage");

            var gameObject = GameObject.Instantiate(prefab);

            m_InstanceClone1 = gameObject.GetComponent<UI3DModelExhibition>();

            m_InstanceClone1.transform.position = new Vector3(2000, 4000, 5000);

            m_InstanceClone1.name = "UI3DModelExhibitionStage(clone1)";

            m_InstanceClone1.gameObject.SetActive(true);

            m_InstanceClone1.m_ShowCamera.enabled = false;

            DontDestroyOnLoad(gameObject);

        }



        public void ShowLoginPlayer(RawImage _rawImage, int _job)

        {

            var clothesItemId = 0;