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

client_linchunjie

2019-04-17 6d101512ba4cb8e37a98ace6320a0b70c96efa2b

 UI/Common/UI3DTreasureExhibition.cs

@@ -42,7 +42,7 @@
            }

        }



        public void BeginShowTreasure(int _treasureId, RawImage _rawImage)

        public void ShowTreasure(int _treasureId, RawImage _rawImage)

        {

            var instance = UI3DModelFactory.LoadUITreasure(_treasureId);

            if (instance == null)

@@ -50,7 +50,7 @@
                return;

            }



            StopShow();

            Stop();



            m_ShowCamera.enabled = true;

            m_TreasureId = _treasureId;

@@ -81,7 +81,7 @@
            }

        }



        public void BeginShowGodWeapon(int _type, RawImage _rawImage)

        public void ShowGodWeapon(int _type, RawImage _rawImage)

        {

            var instance = UI3DModelFactory.LoadUIGodWeapon(_type);

            if (instance == null)

@@ -89,7 +89,7 @@
                return;

            }



            StopShow();

            Stop();



            m_ShowCamera.enabled = true;

            m_GodWeaponType = _type;

@@ -104,7 +104,7 @@
            }

        }



        public void StopShow()

        public void Stop()

        {

            m_ShowCamera.enabled = false;

            if (effect != null)