From 15b3357a13326ea382cf4860f92fd84bf4d68619 Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期二, 11 六月 2019 14:55:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/MainInterfacePanel/HighSettingTip.cs |   57 ++++++++++++++++++++++++++++-----------------------------
 1 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/System/MainInterfacePanel/HighSettingTip.cs b/System/MainInterfacePanel/HighSettingTip.cs
index 429c73b..4e338f2 100644
--- a/System/MainInterfacePanel/HighSettingTip.cs
+++ b/System/MainInterfacePanel/HighSettingTip.cs
@@ -2,19 +2,15 @@
 //    [Author]:           绗簩涓栫晫
 //    [  Date ]:           Friday, September 08, 2017
 //--------------------------------------------------------
-using UnityEngine;
 using System.Collections;
+using UnityEngine;
 using UnityEngine.UI;
 
-using System;
-using System.Collections.Generic;
 //椤跺眰闈㈡澘妗嗘寜閽�
 namespace Snxxz.UI
 {
-
     public class HighSettingTip : MonoBehaviour
     {
-
         [SerializeField] Button _DaTreasureBtn;//鎵撳疂鎸夐挳
         [SerializeField] Button m_LootPrecious;//澶哄疂
         [SerializeField] Button _MarketBtn;//甯傚満鎸夐挳
@@ -100,13 +96,13 @@
 
         void MarketButton()//甯傚満鎸夐挳
         {
-            WindowCenter.Instance.Close<MainInterfaceWin>();
+            HighSettingFadeInFadeOut.SetAutoCloseTimer();
             WindowCenter.Instance.Open<AuctionHouseWin>();
         }
 
         void OpenService()//寮�鏈嶆椿鍔�
         {
-            WindowCenter.Instance.Close<MainInterfaceWin>();
+            HighSettingFadeInFadeOut.SetAutoCloseTimer();
             WindowCenter.Instance.Open<OpenServerActivityWin>();
         }
 
@@ -114,7 +110,7 @@
         {
             if (FuncOpen.Instance.IsFuncOpen(79))
             {
-                WindowCenter.Instance.Close<MainInterfaceWin>();
+                HighSettingFadeInFadeOut.SetAutoCloseTimer();
                 WindowCenter.Instance.Open<StoreWin>();
             }
             else
@@ -125,18 +121,28 @@
 
         void WelfareButton()//绂忓埄鎸夐挳
         {
+            HighSettingFadeInFadeOut.SetAutoCloseTimer();
             WelfareCenter.Instance.OpenWelfare();
         }
 
         void DaTreasureButton()//鎵撳疂鎸夐挳
         {
-            WindowCenter.Instance.Close<MainInterfaceWin>();
-            WindowCenter.Instance.Open<FindPreciousFrameWin>();
+            HighSettingFadeInFadeOut.SetAutoCloseTimer();
+
+            if (NewBieCenter.Instance.inGuiding
+                && NewBieCenter.Instance.currentGuide == 111)
+            {
+                WindowCenter.Instance.Open<FindPreciousFrameWin>(false, 1);
+            }
+            else
+            {
+                WindowCenter.Instance.Open<FindPreciousFrameWin>();
+            }
         }
 
         void LootPreciousButton()//澶哄疂
         {
-            WindowCenter.Instance.Close<MainInterfaceWin>();
+            HighSettingFadeInFadeOut.SetAutoCloseTimer();
             WindowCenter.Instance.Open<LootPreciousFrameWin>(false, 1);
         }
 
@@ -148,17 +154,16 @@
                 return;
             }
 
+            HighSettingFadeInFadeOut.SetAutoCloseTimer();
             switch (m_RechargetBtnBehaviour.state)
             {
                 case 1:
                     if (!NewBieCenter.Instance.inGuiding)
                     {
-                        WindowCenter.Instance.Close<MainInterfaceWin>();
                         WindowCenter.Instance.Open<FirstRechargeWin>(true);
                     }
                     break;
                 case 3:
-                    WindowCenter.Instance.Close<MainInterfaceWin>();
                     WindowCenter.Instance.Open<VipRechargeWin>(false, 0);
                     break;
             }
@@ -166,69 +171,62 @@
 
         void RuneTaButton()//绗﹀嵃濉�
         {
-            WindowCenter.Instance.Close<MainInterfaceWin>();
+            HighSettingFadeInFadeOut.SetAutoCloseTimer();
             WindowCenter.Instance.Open<TowerWin>(false, 0);
         }
 
         void OnClickHappyXBBtn()//瀵诲疂
         {
-            WindowCenter.Instance.Close<MainInterfaceWin>();
+            HighSettingFadeInFadeOut.SetAutoCloseTimer();
             WindowCenter.Instance.Open<HappyXBWin>();
         }
 
         void OnClickFindHostBtn()//浠欏疂瀵讳富
         {
-            WindowCenter.Instance.Close<MainInterfaceWin>();
+            HighSettingFadeInFadeOut.SetAutoCloseTimer();
             WindowCenter.Instance.Open<TreasureFindHostWin>();
         }
 
         void OnClickElfFestivalBtn()
         {
-            WindowCenter.Instance.Close<MainInterfaceWin>();
+            HighSettingFadeInFadeOut.SetAutoCloseTimer();
             WindowCenter.Instance.Open<FairylandCeremonyWin>();
         }
 
         void OnClickCrossServerBtn()//璺ㄦ湇PK
         {
-            int limitlv = FuncOpenLVConfig.Get(157).LimitLV;
+            HighSettingFadeInFadeOut.SetAutoCloseTimer();
             if (FuncOpen.Instance.IsFuncOpen(157) && TimeUtility.OpenDay >= crossServerModel.afterOpenDayOpenCross)
             {
-                WindowCenter.Instance.Close<MainInterfaceWin>();
                 WindowCenter.Instance.Open<CrossServerWin>();
             }
             else
             {
                 WindowCenter.Instance.Open<CrossServerWin>();
-                //if (PlayerDatas.Instance.baseData.LV < limitlv)
-                //{
-                //    SysNotifyMgr.Instance.ShowTip("CrossMatching14", limitlv);
-                //}
-                //else
-                //{
-                //    SysNotifyMgr.Instance.ShowTip("CrossMatching15", crossServerModel.afterOpenDayOpenCross);
-                //}
             }
         }
 
         private void OpenHazyRegion()
         {
-            WindowCenter.Instance.Close<MainInterfaceWin>();
+            HighSettingFadeInFadeOut.SetAutoCloseTimer();
             WindowCenter.Instance.Open<HazyRegionFrameWin>();
         }
 
         void OnClickOpenServiceBtn()
         {
+            HighSettingFadeInFadeOut.SetAutoCloseTimer();
             WindowCenter.Instance.Open<AchievementActivityWin>();
         }
 
         void OnClickNewYearBtn()
         {
-            WindowCenter.Instance.Close<MainInterfaceWin>();
+            HighSettingFadeInFadeOut.SetAutoCloseTimer();
             WindowCenter.Instance.Open<NewYearFairylandCeremonyWin>();
         }
 
         private void RefreshOSCEffect()
         {
+            HighSettingFadeInFadeOut.SetAutoCloseTimer();
             var _open = ModelCenter.Instance.GetModel<ImpactRankModel>().OSCEffectOpen;
             if (_open && !m_OSCEffect.IsPlaying)
             {
@@ -242,6 +240,7 @@
 
         private void OnStoreFuncOpen()
         {
+            HighSettingFadeInFadeOut.SetAutoCloseTimer();
             RefreshStoreEffect();
         }
 

--
Gitblit v1.8.0