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

client_Hale

2019-05-22 596790f0ddffe3400365c064c50de7a9b4bbe568

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

 System/Auction/AuctionNewGetBehaviour.cs

@@ -9,7 +9,7 @@
namespace Snxxz.UI
{

    public class AuctionNewGetBehaviour : MonoBehaviour
    public class AuctionNewGetBehaviour : MonoBehaviour, IInGamePush
    {
        [SerializeField] ItemCell m_Auction;
        [SerializeField] Text m_AuctionName;
@@ -56,6 +56,16 @@
            WindowCenter.Instance.Open<AuctionShelfWin>();

            model.ReportConfirmAuction(this.guid);
        }



        public int GetSiblingIndex()

        {

            return transform.GetSiblingIndex();

        }



        public bool IsActive()

        {

            return transform.gameObject.activeSelf;

        }

    }

 System/Auction/MyFocusAuctionBehaviour.cs

@@ -10,7 +10,7 @@

namespace Snxxz.UI

{
    public class MyFocusAuctionBehaviour : MonoBehaviour

    public class MyFocusAuctionBehaviour : MonoBehaviour,IInGamePush

    {
        [SerializeField] Transform m_Container;

        [SerializeField] ItemCell m_ItemCell;

@@ -105,6 +105,17 @@
                model.LocationMyFocusItem(item.itemGuid);

            }

            OnClose();

        }



        public int GetSiblingIndex()

        {

            return transform.GetSiblingIndex();

        }



        public bool IsActive()

        {

            return m_Container.gameObject.activeSelf

                && transform.gameObject.activeSelf;

        }
    }


 System/DailyQuest/ResourceBackBehaviour.cs

@@ -1,44 +1,57 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Sunday, April 29, 2018
//--------------------------------------------------------
using UnityEngine;
using System.Collections;
using UnityEngine.UI;

namespace Snxxz.UI {

    public class ResourceBackBehaviour:MonoBehaviour {
        [SerializeField] GameObject m_ResourceBackBehaviour;
        [SerializeField] Button m_CloseButton;
        [SerializeField] Button m_GoButton;
        ResourcesBackModel resourcesBack { get { return ModelCenter.Instance.GetModel<ResourcesBackModel>(); } }
        private void OnEnable()
        {
            m_CloseButton.AddListener(CloseButton);
            m_GoButton.AddListener(GoButton);
        }

        private void OnDisable()
        {
            m_CloseButton.RemoveAllListeners();
            m_GoButton.RemoveAllListeners();
        }

        private void CloseButton()
        {
            m_ResourceBackBehaviour.SetActive(false);
            resourcesBack.IsMainGo = false;
        }

        private void GoButton()
        {
            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DailyQuestFunc3);
            resourcesBack.IsMainGo = false;
        }
    }

}



//--------------------------------------------------------

//    [Author]:           第二世界

//    [  Date ]:           Sunday, April 29, 2018

//--------------------------------------------------------

using UnityEngine;

using System.Collections;

using UnityEngine.UI;



namespace Snxxz.UI

{



    public class ResourceBackBehaviour : MonoBehaviour, IInGamePush

    {

        [SerializeField] GameObject m_ResourceBackBehaviour;

        [SerializeField] Button m_CloseButton;

        [SerializeField] Button m_GoButton;

        ResourcesBackModel resourcesBack { get { return ModelCenter.Instance.GetModel<ResourcesBackModel>(); } }

        private void OnEnable()

        {

            m_CloseButton.AddListener(CloseButton);

            m_GoButton.AddListener(GoButton);

        }



        private void OnDisable()

        {

            m_CloseButton.RemoveAllListeners();

            m_GoButton.RemoveAllListeners();

        }



        private void CloseButton()

        {

            m_ResourceBackBehaviour.SetActive(false);

            resourcesBack.IsMainGo = false;

        }



        private void GoButton()

        {

            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DailyQuestFunc3);

            resourcesBack.IsMainGo = false;

        }



        public int GetSiblingIndex()

        {

            return transform.GetSiblingIndex();

        }



        public bool IsActive()

        {

            return transform.gameObject.activeSelf

                && m_ResourceBackBehaviour.activeSelf;

        }

    }



}








 System/FairyAu/FairyGrabBossHelpBehaviour.cs

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


namespace Snxxz.UI

{

    public class FairyGrabBossHelpBehaviour : MonoBehaviour

    public class FairyGrabBossHelpBehaviour : MonoBehaviour,IInGamePush

    {

        [SerializeField] RectTransform m_Container;

        [SerializeField] Button m_Close;

@@ -95,6 +95,17 @@
                MapTransferUtility.Instance.MoveToNPC(help.npcId);

            }

        }



        public int GetSiblingIndex()

        {

            return transform.GetSiblingIndex();

        }



        public bool IsActive()

        {

            return transform.gameObject.activeSelf

                && m_Container.gameObject.activeSelf;

        }

    }

}


 System/FindPrecious/FindPreciousBossRebornBehaviour.cs

@@ -13,7 +13,7 @@
namespace Snxxz.UI

{



    public class FindPreciousBossRebornBehaviour : MonoBehaviour

    public class FindPreciousBossRebornBehaviour : MonoBehaviour, IInGamePush

    {

        [SerializeField] RectTransform m_ContainerBossReborn;

        [SerializeField] Text m_BossRebornTimer;

@@ -467,6 +467,15 @@
        }





        public int GetSiblingIndex()

        {

            return transform.GetSiblingIndex();

        }



        public bool IsActive()

        {

            return m_ContainerBossReborn.gameObject.activeSelf;

        }

    }



}


 System/KnapSack/BetterItemGetBehaviour.cs

@@ -14,7 +14,7 @@
namespace Snxxz.UI

{



    public class BetterItemGetBehaviour : MonoBehaviour

    public class BetterItemGetBehaviour : MonoBehaviour, IInGamePush

    {

        [SerializeField] RectTransform m_ContainerBetterEquip;

        [SerializeField] ItemCell m_EquipBehaviour;

@@ -199,6 +199,16 @@
            model.ReportConfirmBetterEquip(model.currentEquipGuid);

        }



        public int GetSiblingIndex()

        {

            return transform.GetSiblingIndex();

        }



        public bool IsActive()

        {

            return transform.gameObject.activeSelf

                &&m_ContainerBetterEquip.gameObject.activeSelf;

        }

    }

}




 System/KnapSack/DogzNotifyBehaviour.cs

@@ -5,7 +5,7 @@


namespace Snxxz.UI

{

    public class DogzNotifyBehaviour : MonoBehaviour

    public class DogzNotifyBehaviour : MonoBehaviour, IInGamePush

    {

        [SerializeField] Text titleText;

        [SerializeField] Image dogzImg;

@@ -50,5 +50,15 @@
            dogzModel.dogzPutRedId = 0;

            this.gameObject.SetActive(false);

        }



        public int GetSiblingIndex()

        {

            return transform.GetSiblingIndex();

        }



        public bool IsActive()

        {

            return transform.gameObject.activeSelf;

        }

    }

}


 System/KnapSack/EquipDecomposeBehaviour.cs

@@ -11,7 +11,7 @@
namespace Snxxz.UI

{



    public class EquipDecomposeBehaviour : MonoBehaviour

    public class EquipDecomposeBehaviour : MonoBehaviour,IInGamePush

    {

        [SerializeField] GameObject m_ItemDecom;

        [SerializeField] Button m_Close;

@@ -43,6 +43,16 @@
            ModelCenter.Instance.GetModel<PackModel>().isAutoDecompose = false;

            m_ItemDecom.SetActive(false);

        }



        public int GetSiblingIndex()

        {

            return transform.GetSiblingIndex();

        }



        public bool IsActive()

        {

            return transform.gameObject.activeSelf;

        }

    }



}


 System/KnapSack/ItemOverdueBehaviour.cs

@@ -11,7 +11,7 @@
namespace Snxxz.UI
{

    public class ItemOverdueBehaviour : MonoBehaviour
    public class ItemOverdueBehaviour : MonoBehaviour, IInGamePush
    {
        [SerializeField] RectTransform m_ItemOverdue;
        [SerializeField] ItemCell m_ItemBehaviour;
@@ -119,8 +119,18 @@
                ItemCellModel cellModel = new ItemCellModel(itemId);
                m_ItemBehaviour.Init(cellModel);
            }
        }



        public int GetSiblingIndex()

        {

            return transform.GetSiblingIndex();

        }



        public bool IsActive()

        {

            return transform.gameObject.activeSelf

                && m_ItemOverdue.gameObject.activeSelf;

        }

    }

}

 System/KnapSack/ItemUseBehaviour.cs

@@ -11,7 +11,7 @@
namespace Snxxz.UI
{

    public class ItemUseBehaviour : MonoBehaviour
    public class ItemUseBehaviour : MonoBehaviour, IInGamePush
    {
        [SerializeField] RectTransform m_ItemUse;
        [SerializeField] ItemCell m_ItemBehaviour;
@@ -91,9 +91,18 @@

                m_ItemBehaviour.Init(_item, true);
            }
        }


        }



        public int GetSiblingIndex()

        {

            return transform.GetSiblingIndex();

        }



        public bool IsActive()

        {

            return transform.gameObject.activeSelf

                && m_ItemUse.gameObject.activeSelf;

        }

    }

}

 System/KnapSack/New/FBHelpPointExchageNotify.cs

@@ -4,7 +4,7 @@


namespace Snxxz.UI

{

    public class FBHelpPointExchageNotify : MonoBehaviour

    public class FBHelpPointExchageNotify : MonoBehaviour,IInGamePush

    {

        [SerializeField] Text titleText;

        [SerializeField] Button closeBtn;

@@ -57,5 +57,15 @@
        {

            ExchageModel.GetNextHelpPointShop(ExchageModel.currentShopId);

        }



        public int GetSiblingIndex()

        {

            return transform.GetSiblingIndex();

        }



        public bool IsActive()

        {

            return transform.gameObject.activeSelf;

        }

    }

}


 System/KnapSack/PreciousItemGetBehaviour.cs

@@ -12,7 +12,7 @@
namespace Snxxz.UI

{



    public class PreciousItemGetBehaviour : MonoBehaviour

    public class PreciousItemGetBehaviour : MonoBehaviour, IInGamePush

    {

        [SerializeField] RectTransform m_PreciousItem;

        [SerializeField] ItemCell m_ItemBehaviour;

@@ -130,7 +130,16 @@
            }

        }



        public int GetSiblingIndex()

        {

            return transform.GetSiblingIndex();

        }



        public bool IsActive()

        {

            return transform.gameObject.activeSelf

                && m_PreciousItem.gameObject.activeSelf;

        }

    }



}


 System/KnapSack/RealmBetterEquipBehaviour.cs

@@ -14,7 +14,7 @@
namespace Snxxz.UI

{



    public class RealmBetterEquipBehaviour : MonoBehaviour

    public class RealmBetterEquipBehaviour : MonoBehaviour, IInGamePush

    {

        [SerializeField] RectTransform m_ContainerBetterEquip;

        [SerializeField] ItemCell m_EquipBehaviour;

@@ -83,6 +83,17 @@
            m_EquipBehaviour.button.enabled = false;

            m_EquipBehaviour.Init(betterModel, true);

        }



        public int GetSiblingIndex()

        {

            return transform.GetSiblingIndex();

        }



        public bool IsActive()

        {

            return transform.gameObject.activeSelf

                && m_ContainerBetterEquip.gameObject.activeSelf;

        }

    }

}




 System/MainInterfacePanel/DungeonGuardCheckBehaviour.cs

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


namespace Snxxz.UI

{

    public class DungeonGuardCheckBehaviour : MonoBehaviour

    public class DungeonGuardCheckBehaviour : MonoBehaviour,IInGamePush

    {

        [SerializeField] ItemCell m_GuardItem;

        [SerializeField] Text m_ItemName;

@@ -55,6 +55,16 @@
            model.fairyLandGuard = false;

            gameObject.SetActive(false);

        }



        public int GetSiblingIndex()

        {

            return transform.GetSiblingIndex();

        }



        public bool IsActive()

        {

            return transform.gameObject.activeSelf;

        }

    }

}




 System/MainInterfacePanel/InGamePushContainer.cs

@@ -6,7 +6,7 @@
using System.Collections;

using UnityEngine.UI;

using System;



using System.Collections.Generic;



namespace Snxxz.UI

{

@@ -31,6 +31,9 @@
        [SerializeField] MyFocusAuctionBehaviour m_MyFocusBehavio;

        [SerializeField] AuctionNewGetBehaviour m_AuctionNewGetBehaviour;



        List<IInGamePush> m_InGamePushs = new List<IInGamePush>();

        Dictionary<IInGamePush, Transform> m_InGamePushTrans = new Dictionary<IInGamePush, Transform>();



        WorldBossModel worldBossModel { get { return ModelCenter.Instance.GetModel<WorldBossModel>(); } }

        DogzDungeonModel dogzDungeonModel { get { return ModelCenter.Instance.GetModel<DogzDungeonModel>(); } }

        CrossServerBossModel crossServerBossModel { get { return ModelCenter.Instance.GetModel<CrossServerBossModel>(); } }

@@ -52,6 +55,35 @@
        DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }

        InSevenDayModel inSevenDayModel { get { return ModelCenter.Instance.GetModel<InSevenDayModel>(); } }

        AuctionNewGetShowModel auctionNewGetShowModel { get { return ModelCenter.Instance.GetModel<AuctionNewGetShowModel>(); } }



        private void Awake()

        {

            SetInGamePush(m_BetterEquipPusher, m_BetterEquipPusher.transform);

            SetInGamePush(m_RealmBetterEquipPusher, m_RealmBetterEquipPusher.transform);

            SetInGamePush(m_PreciousItemPusher, m_PreciousItemPusher.transform);

            SetInGamePush(m_BossRebornPusher, m_BossRebornPusher.transform);

            SetInGamePush(m_itemUsePusher, m_itemUsePusher.transform);

            SetInGamePush(m_itemOverduePusher, m_itemOverduePusher.transform);

            SetInGamePush(m_ResourceBackBehaviour, m_ResourceBackBehaviour.transform);

            SetInGamePush(m_DecomposePusher, m_DecomposePusher.transform);

            SetInGamePush(m_OffLineTimeLackBehaviour, m_OffLineTimeLackBehaviour.transform);

            SetInGamePush(m_DungeonGuardBehaviour, m_DungeonGuardBehaviour.transform);

            SetInGamePush(m_FirstChargeTrialBehaviour, m_FirstChargeTrialBehaviour.transform);

            SetInGamePush(m_FairyGrabBossHelpBehaviour, m_FairyGrabBossHelpBehaviour.transform);

            SetInGamePush(m_DogzNotifyBehaviour, m_DogzNotifyBehaviour.transform);

            SetInGamePush(m_InSevenDayBehavior, m_InSevenDayBehavior.transform);

            SetInGamePush(m_HelpPointExchangeNotify, m_HelpPointExchangeNotify.transform);

            SetInGamePush(m_MyFocusBehavio, m_MyFocusBehavio.transform);

            SetInGamePush(m_AuctionNewGetBehaviour, m_AuctionNewGetBehaviour.transform);



            SetInGamePushContainerSort();

        }



        void SetInGamePush(IInGamePush inGamePush, Transform trans)

        {

            m_InGamePushs.Add(inGamePush);

            m_InGamePushTrans.Add(inGamePush, trans);

        }



        public void Init()

        {

@@ -367,9 +399,11 @@
            {

                case GuideTriggerType.EquipQuality:

                    m_BetterEquipPusher.transform.SetAsLastSibling();

                    SetInGamePushContainerSort();

                    break;

                case GuideTriggerType.Item:

                    m_PreciousItemPusher.transform.SetAsLastSibling();

                    SetInGamePushContainerSort();

                    break;

                default:

                    break;

@@ -435,8 +469,56 @@
                m_FairyGrabBossHelpBehaviour.gameObject.SetActive(false);

            }

        }



        void SetInGamePushContainerSort()

        {

            m_InGamePushs.Sort((x, y) =>

            {

                return -x.GetSiblingIndex().CompareTo(y.GetSiblingIndex());

            });



            SetInGamePushContainerScale();

        }



        void SetInGamePushContainerScale()

        {

            var alreadyExist = false;

            for (int i = 0; i < m_InGamePushs.Count; i++)

            {

                var inGamePush = m_InGamePushs[i];

                var trans = m_InGamePushTrans[inGamePush];

                if (inGamePush.IsActive())

                {

                    if (!alreadyExist)

                    {

                        if (!trans.localScale.Equals(Vector3.one))

                        {

                            trans.localScale = Vector3.one;

                        }

                    }

                    else

                    {

                        if (!trans.localScale.Equals(Vector3.zero))

                        {

                            trans.localScale = Vector3.zero;

                        }

                    }

                    alreadyExist = true;

                }

            }

        }



        private void LateUpdate()

        {

            SetInGamePushContainerScale();

        }

    }



    public interface IInGamePush

    {

        int GetSiblingIndex();

        bool IsActive();

    }

}






 System/OffLineTime/OffLineTimeLackBehaviour.cs

@@ -10,7 +10,7 @@
namespace Snxxz.UI

{



    public class OffLineTimeLackBehaviour : MonoBehaviour

    public class OffLineTimeLackBehaviour : MonoBehaviour, IInGamePush

    {

        [SerializeField] ItemBehaviour m_ItemBehaviour;

        [SerializeField] Button m_Close;

@@ -53,6 +53,16 @@
            this.gameObject.SetActive(false);

        }



        public int GetSiblingIndex()

        {

            return transform.GetSiblingIndex();

        }



        public bool IsActive()

        {

            return transform.gameObject.activeSelf;

        }



    }



}


 System/OpenServerActivity/InSevenDayBehavior.cs

@@ -10,7 +10,7 @@


namespace Snxxz.UI {

    public class InSevenDayBehavior:MonoBehaviour {

    public class InSevenDayBehavior:MonoBehaviour,IInGamePush {

        [SerializeField] GameObject m_InSevenDayBehavior;
        [SerializeField] Button m_CloseButton;
        [SerializeField] Button m_GoButton;

@@ -107,6 +107,17 @@
                    return Str;

            }

            return Str;

        }



        public int GetSiblingIndex()

        {

            return transform.GetSiblingIndex();

        }



        public bool IsActive()

        {

            return m_InSevenDayBehavior.gameObject.activeSelf

                && transform.gameObject.activeSelf;

        }
    }


 System/Vip/FirstChargeTrialBehaviour.cs

@@ -9,9 +9,11 @@
using UnityEngine;

using UnityEngine.UI;



namespace Snxxz.UI {

namespace Snxxz.UI

{



    public class FirstChargeTrialBehaviour:MonoBehaviour {

    public class FirstChargeTrialBehaviour : MonoBehaviour,IInGamePush

    {



        [SerializeField] GameObject m_FirstChargeTrialObj;

        [SerializeField] ItemCell m_ItemCell;

@@ -49,6 +51,17 @@
            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.FirstRecharge);

            firstTimeRechargeModel.IsTipShow = false;

        }



        public int GetSiblingIndex()

        {

            return transform.GetSiblingIndex();

        }



        public bool IsActive()

        {

            return transform.gameObject.activeSelf

                && m_FirstChargeTrialObj.activeSelf;

        }

    }



}