Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 UI/Common/UI3DModelExhibition.cs

@@ -78,7 +78,7 @@


        public static void CreateStage()

        {

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

            var prefab = BuiltInLoader.LoadPrefab("UI3DModelExhibitionStage");

            var gameObject = GameObject.Instantiate(prefab);

            Instance = gameObject.GetComponent<UI3DModelExhibition>();

            Instance.transform.position = new Vector3(1000, 2000, 3000);

@@ -90,7 +90,7 @@


        static void CreateCloneStage()

        {

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

            var prefab = BuiltInLoader.LoadPrefab("UI3DModelExhibitionStage");

            var gameObject = GameObject.Instantiate(prefab);

            m_InstanceClone1 = gameObject.GetComponent<UI3DModelExhibition>();

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