From 06bac38d743f3f99a294f20e5b02af6d53676b0b Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 21 九月 2018 14:38:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/Vip/FirstTimeRechargeWin.cs |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/System/Vip/FirstTimeRechargeWin.cs b/System/Vip/FirstTimeRechargeWin.cs
index 5644ce4..11eacfe 100644
--- a/System/Vip/FirstTimeRechargeWin.cs
+++ b/System/Vip/FirstTimeRechargeWin.cs
@@ -78,7 +78,7 @@
             }
             else
             {
-                UI3DModelExhibition.Instance.StopShowEquipment();
+                UI3DModelExhibition.Instance.StopShow();
                 m_RewardInformationImage.SetActive(false);
             }
 
@@ -89,13 +89,13 @@
                 {
                     m_RawImageBoy.gameObject.SetActive(true);
                     m_RawImageGirl.gameObject.SetActive(false);
-                    UI3DModelExhibition.Instance.BeginShowEquipment(itemConfig.ChangeOrd, Vec3, m_RawImageBoy);
+                    UI3DModelExhibition.Instance.ShowEquipment(itemConfig.ChangeOrd, Vec3, m_RawImageBoy);
                 }
                 else
                 {
                     m_RawImageBoy.gameObject.SetActive(false);
                     m_RawImageGirl.gameObject.SetActive(true);
-                    UI3DModelExhibition.Instance.BeginShowEquipment(itemConfig.ChangeOrd, Vec3, m_RawImageGirl);
+                    UI3DModelExhibition.Instance.ShowEquipment(itemConfig.ChangeOrd, Vec3, m_RawImageGirl);
                 }
             }
 
@@ -108,7 +108,7 @@
 
         protected override void OnPreClose()
         {
-            UI3DModelExhibition.Instance.StopShowEquipment();
+            UI3DModelExhibition.Instance.StopShow();
             MainInterfaceWin.IsCopyOfThePanel -= IsCopyOfThePanel;
             FirstTimeRechargeModel.FirstTimeRechargeTiime -= FirstTimeRechargeTiime;
             FirstTimeRechargeModel.FirstTimeRecharEffect -= FirstTimeRecharEffect;
@@ -143,25 +143,25 @@
                     {
                         m_RawImageBoy.gameObject.SetActive(true);
                         m_RawImageGirl.gameObject.SetActive(false);
-                        UI3DModelExhibition.Instance.BeginShowEquipment(itemConfig.ChangeOrd, Vec3, m_RawImageBoy);
+                        UI3DModelExhibition.Instance.ShowEquipment(itemConfig.ChangeOrd, Vec3, m_RawImageBoy);
                     }
                     else
                     {
                         m_RawImageBoy.gameObject.SetActive(false);
                         m_RawImageGirl.gameObject.SetActive(true);
-                        UI3DModelExhibition.Instance.BeginShowEquipment(itemConfig.ChangeOrd, Vec3, m_RawImageGirl);
+                        UI3DModelExhibition.Instance.ShowEquipment(itemConfig.ChangeOrd, Vec3, m_RawImageGirl);
                     }
 
                 }
                 else
                 {
-                    UI3DModelExhibition.Instance.StopShowEquipment();
+                    UI3DModelExhibition.Instance.StopShow();
                     m_RewardInformationImage.SetActive(false);
                 }
             }
             else
             {
-                UI3DModelExhibition.Instance.StopShowEquipment();
+                UI3DModelExhibition.Instance.StopShow();
                 m_RewardInformationImage.SetActive(false);
             }
         }
@@ -174,18 +174,18 @@
         {
             LocalSave.SetBool("FirstTimeRechargeBool", false);
             m_RewardInformationImage.SetActive(false);
-            UI3DModelExhibition.Instance.StopShowEquipment();
+            UI3DModelExhibition.Instance.StopShow();
         }
         private void OnClickFirstFlush()
         {
             LocalSave.SetBool("FirstTimeRechargeBool", false);
-            UI3DModelExhibition.Instance.StopShowEquipment();
+            UI3DModelExhibition.Instance.StopShow();
             m_RewardInformationImage.SetActive(false);
             if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && !NewBieCenter.Instance.inGuiding)
             {
                 WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();
             }
-            UI3DModelExhibition.Instance.StopShowEquipment();
+            UI3DModelExhibition.Instance.StopShow();
             if (WindowCenter.Instance.CheckOpen<FirstTimeRechargeWin>())
             {
                 WindowCenter.Instance.CloseImmediately<FirstTimeRechargeWin>();
@@ -200,7 +200,7 @@
             m_TimeText.text = obj;
             if (NewBieCenter.Instance.inGuiding || ModelCenter.Instance.GetModel<TreasureModel>().newGotShowing)
             {
-                UI3DModelExhibition.Instance.StopShowEquipment();
+                UI3DModelExhibition.Instance.StopShow();
                 m_RewardInformationImage.SetActive(false);
             }
         }

--
Gitblit v1.8.0