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

client_Hale

2019-03-29 fe3028c009c6eb2c9ff06436b69604270be7f4fb

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

 System/Auction/FamilyAuctioncell.cs

@@ -232,7 +232,7 @@
                cacheIsWarmUp = auctionHelpModel.IsItemWarmUp(FamilyAuctionItem);

                if (cacheIsWarmUp)

                {

                    m_BiddingText.text = Language.Get("PMH_07");

                    m_BiddingText.text = Language.Get("PMH_17");

                }

                else if (FamilyAuctionItem.biddingPrice != 0)

                {


 System/Auction/MyAuctionCell.cs

@@ -183,7 +183,7 @@
                cacheIsWarmUp = auctionHelpModel.IsItemWarmUp(MyAuction);

                if (cacheIsWarmUp)

                {

                    m_BiddingText.text = Language.Get("PMH_07");

                    m_BiddingText.text = Language.Get(MyAuction.auctionType == 0 ? "PMH_07" : "PMH_17");

                }

                else if (MyAuction.biddingPrice != 0)

                {


 System/Auction/MyFocusCell.cs

@@ -251,7 +251,7 @@
                cacheIsWarmUp = auctionHelpModel.IsItemWarmUp(MyFocusItem);

                if (cacheIsWarmUp)

                {

                    m_BiddingText.text = Language.Get("PMH_07");

                    m_BiddingText.text = Language.Get(MyFocusItem.auctionType == 0 ? "PMH_07" : "PMH_17");

                }

                else if (MyFocusItem.biddingPrice != 0)

                {


 System/MainInterfacePanel/HighSettingTip.cs

@@ -28,22 +28,16 @@
        [SerializeField] UIEffect m_StoreEffect;//商城特效

        [SerializeField] Button storeDesBtn;  //商城活动描述信息



        [SerializeField] HighSettingFadeInFadeOut m_HighSettingFadeInFadeOut;



        [SerializeField] Button m_HappyXBBtn;//寻宝入口

        [SerializeField] Button m_FindHostBtn;//仙宝寻主



        [SerializeField] RechargeBtnBehaviour m_RechargetBtnBehaviour;



        [SerializeField] Button m_LimitedTimePBtn;//限时礼包

        [SerializeField] Button m_ElfFestivalBtn;//仙界盛典



        [SerializeField] Button m_FlashSaleBtn;//限时特惠

        [SerializeField] Button m_AllThePeopleBtn;//全民冲榜

        [SerializeField] Button m_FlashRushBtn;//限时抢购

        [SerializeField] Button m_CrossServerBtn;//跨服1V1按钮

        [SerializeField] Button m_OpenServiceBtn;//周狂欢按钮

        [SerializeField] Button m_NewYearBtn;//新年盛典



        private bool isNeedTip = true;



        StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }

@@ -53,32 +47,27 @@
        private void Start()

        {

            isNeedTip = true;

            storeDesBtn.SetListener(() => { storeDesBtn.gameObject.SetActive(false); });

            m_LootPrecious.SetListener(LootPreciousButton);

            _MarketBtn.SetListener(MarketButton);

            _ShoppingBtn.SetListener(ShoppingButton);

            _WelfareBtn.SetListener(WelfareButton);

            _DaTreasureBtn.SetListener(DaTreasureButton);

            _RechargeBtn.SetListener(RechargeButton);

            m_HappyXBBtn.SetListener(OnClickHappyXBBtn);

            m_FindHostBtn.SetListener(OnClickFindHostBtn);

            m_OpenService.SetListener(OpenService);

            _RuneTaBtn.SetListener(RuneTaButton);

            m_ElfFestivalBtn.SetListener(OnClickElfFestivalBtn);

            m_CrossServerBtn.SetListener(OnClickCrossServerBtn);

            m_OpenServiceBtn.SetListener(OnClickOpenServiceBtn);

            m_NewYearBtn.SetListener(OnClickNewYearBtn);

        }



        public void Init()

        {

            OpenServerActivityStateChange();

            m_RechargetBtnBehaviour.Init();

            m_HighSettingFadeInFadeOut.Init();

            storeDesBtn.AddListener(() => { storeDesBtn.gameObject.SetActive(false); });

            m_LootPrecious.AddListener(LootPreciousButton);

            _MarketBtn.AddListener(MarketButton);

            _ShoppingBtn.AddListener(ShoppingButton);

            _WelfareBtn.AddListener(WelfareButton);

            _DaTreasureBtn.AddListener(DaTreasureButton);

            _RechargeBtn.AddListener(RechargeButton);

            m_HappyXBBtn.AddListener(OnClickHappyXBBtn);

            m_FindHostBtn.AddListener(OnClickFindHostBtn);

            m_OpenService.AddListener(OpenService);

            _RuneTaBtn.onClick.AddListener(RuneTaButton);

            m_LimitedTimePBtn.AddListener(OnCliCkLimitedTimePBtn);

            m_ElfFestivalBtn.AddListener(OnClickElfFestivalBtn);

            m_FlashSaleBtn.AddListener(OnClickmFlashSaleBtn);

            m_AllThePeopleBtn.AddListener(OnClickmAllThePeopleBtn);

            m_FlashRushBtn.AddListener(OnClickFlashRushBtn);

            m_CrossServerBtn.AddListener(OnClickCrossServerBtn);

            m_OpenServiceBtn.AddListener(OnClickOpenServiceBtn);

            m_NewYearBtn.AddListener(OnClickNewYearBtn);



            storeModel.StoreFuncOpenAct += OnStoreFuncOpen;

            OpenServerActivityCenter.Instance.openServerActivityStateChange += OpenServerActivityStateChange;

@@ -86,24 +75,8 @@


        public void UnInit()

        {

            m_LootPrecious.RemoveAllListeners();

            _MarketBtn.RemoveAllListeners();

            _ShoppingBtn.RemoveAllListeners();

            _WelfareBtn.RemoveAllListeners();

            _DaTreasureBtn.RemoveAllListeners();

            _RechargeBtn.RemoveAllListeners();

            m_OpenService.RemoveAllListeners();

            m_HappyXBBtn.RemoveAllListeners();

            m_FindHostBtn.RemoveAllListeners();

            m_LimitedTimePBtn.RemoveAllListeners();

            _RuneTaBtn.onClick.RemoveAllListeners();

            m_FlashSaleBtn.RemoveAllListeners();

            m_AllThePeopleBtn.RemoveAllListeners();

            m_NewYearBtn.RemoveAllListeners();

            storeModel.StoreFuncOpenAct -= OnStoreFuncOpen;

            OpenServerActivityCenter.Instance.openServerActivityStateChange -= OpenServerActivityStateChange;

            CoroutineMgr.Instance.OnMainStopCorUP();

            m_HighSettingFadeInFadeOut.UnInit();

            m_RechargetBtnBehaviour.UnInit();

        }



@@ -180,6 +153,7 @@
                SysNotifyMgr.Instance.ShowTip("FuncNoOpen_Nowaday");

                return;

            }



            switch (m_RechargetBtnBehaviour.state)

            {

                case 1:

@@ -195,6 +169,7 @@
                    break;

            }

        }



        void RuneTaButton()//符印塔

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

@@ -212,34 +187,13 @@
            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<TreasureFindHostWin>();

        }

        void OnCliCkLimitedTimePBtn()//限时礼包

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<OpenServerActivityWin>(false, 7);

        }



        void OnClickElfFestivalBtn()

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<FairylandCeremonyWin>();

        }

        void OnClickmFlashSaleBtn()//限时特惠

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<OpenServerActivityWin>(false, 4);

        }



        void OnClickmAllThePeopleBtn()//全民冲榜

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            OpenServerActivityCenter.Instance.selectFuncOrder = (int)OpenServerActivityCenter.OSActivityType.ImpactRank;

            WindowCenter.Instance.Open<OpenServerActivityWin>();

        }

        void OnClickFlashRushBtn()//限时抢购

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<OpenServerActivityWin>(false, 14);

        }

        void OnClickCrossServerBtn()//跨服PK

        {

            int limitlv = FuncOpenLVConfig.Get(157).LimitLV;


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -121,6 +121,7 @@
            m_LowSettingTip.Init();

            m_ChatTip.Init();

            m_HighSettingTip.Init();

            m_HighSettingFadeInFadeOut.Init();

            m_TaskListTip.Init();

            m_IsShowXp.Init();

            m_TopRightTip.Init();

@@ -241,6 +242,7 @@
            m_LowSettingTip.UnInit();

            m_ChatTip.UnInit();

            m_HighSettingTip.UnInit();

            m_HighSettingFadeInFadeOut.UnInit();

            m_TaskListTip.UnInit();

            m_TopRightTip.UnInit();

            m_SkillButtonEffects.UnInit();