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

client_linchunjie

2019-03-27 076120f61b09883b387a9cdb158f6dede4da8962

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

 Core/MapEditor/Behavior/Bhv_Evt_RefreshMonster.cs

@@ -107,7 +107,11 @@
            EditorGUILayout.BeginVertical(guiSkin.box);
            EditorGUILayout.BeginHorizontal(GUILayout.Height(22));
            EditorGUI.indentLevel += 1;
            showDetail = EditorGUILayout.Foldout(showDetail, "  ID:" + id + " | Type: " + type, true, guiSkin.customStyles[3]);
            showDetail = EditorGUILayout.Foldout(showDetail, "", true, guiSkin.customStyles[3]);
            EditorGUILayout.LabelField("ID", guiSkin.label, GUILayout.Height(22), GUILayout.Width(20));
            id = EditorGUILayout.IntField(id, guiSkin.textField, GUILayout.Height(22), GUILayout.Width(70));
            EditorGUILayout.LabelField("Type:" + type.ToString(), guiSkin.label, GUILayout.Height(22));
            GUILayout.FlexibleSpace();
            if (GUILayout.Button("定位", guiSkin.button, GUILayout.Width(60), GUILayout.Height(22)))
            {
                Selection.activeGameObject = gameObject;

 System/Auction/FamilyAuctioncell.cs

@@ -32,6 +32,8 @@
        [SerializeField] Button m_BiddingButton;//竞价按钮

        [SerializeField] ImageEx m_BiddingImage;

        [SerializeField] TextEx m_JadeNumber2;



        [SerializeField] TextEx m_OverTime;//加时时间

        AuctionInquiryModel model { get { return ModelCenter.Instance.GetModel<AuctionInquiryModel>(); } }

        AuctionHelpModel auctionHelpModel { get { return ModelCenter.Instance.GetModel<AuctionHelpModel>(); } }

        ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }

@@ -179,8 +181,11 @@
                var timeNow = TimeUtility.ServerNow;

                TimeSpan timeSpan = timeNow - FamilyAuctionItem.Time;

                int minute = (int)timeSpan.TotalMinutes;



                DateTime extensionTime = FamilyAuctionItem.TimeEnd.AddSeconds(auctionHelpModel.ExtensionTime);

                if (minute < AuctionItem.NoticeSaleMinutes)//预热中

                {

                    m_OverTime.gameObject.SetActive(false);

                    if (m_PriceButton.interactable)

                    {

                        m_PriceButton.interactable = false;

@@ -196,6 +201,7 @@
                }

                else if (minute >= AuctionItem.NoticeSaleMinutes && minute <= AuctionItem.FamilySaleMinutes)//拍卖中

                {

                    m_OverTime.gameObject.SetActive(false);

                    var maxMoney = AuctionItem.BuyoutPrice * FamilyAuctionItem.ItemCount;

                    var needMoney = 0;

                    if (FamilyAuctionItem.BidderPrice == 0)

@@ -224,6 +230,17 @@
                    int seconds = AuctionItem.FamilySaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60);

                    m_TimeText.text = Language.Get("PMH_04", TimeUtility.SecondsToHMS(seconds));

                }

                else if (timeNow < extensionTime)//加时中

                {

                    if (!m_OverTime.gameObject.activeSelf)

                    {

                        m_OverTime.gameObject.SetActive(true);

                    }

                    m_TimeText.text = Language.Get("PMH_04", 0);

                    TimeSpan timeSpan2 = extensionTime - timeNow;

                    int timeSeconds = (int)timeSpan2.TotalSeconds;

                    m_OverTime.text = Language.Get("PMH_18", TimeUtility.SecondsToHMS(timeSeconds));

                }

            }

        }
    }

 System/Auction/FullServiceAuctioncell.cs

@@ -34,6 +34,7 @@
        [SerializeField] Button m_BiddingButton;//竞价按钮

        [SerializeField] ImageEx m_BiddingImage;

        [SerializeField] TextEx m_JadeNumber2;

        [SerializeField] TextEx m_OverTime;//加时时间

        AuctionInquiryModel model { get { return ModelCenter.Instance.GetModel<AuctionInquiryModel>(); } }

        AuctionHelpModel auctionHelpModel { get { return ModelCenter.Instance.GetModel<AuctionHelpModel>(); } }

        ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }

@@ -215,6 +216,7 @@
                DateTime extensionTime = FullServiceAuction.TimeEnd.AddSeconds(auctionHelpModel.ExtensionTime);

                if (minute < AuctionItem.NoticeSaleMinutes)//预热中

                {

                    m_OverTime.gameObject.SetActive(false);

                    if (m_PriceButton.interactable)

                    {

                        m_PriceButton.interactable = false;

@@ -230,6 +232,7 @@
                }

                else if (minute <= AuctionItem.WorldSaleMinutes)//拍卖中

                {

                    m_OverTime.gameObject.SetActive(false);

                    var maxMoney = AuctionItem.BuyoutPrice * FullServiceAuction.ItemCount;

                    var needMoney = 0;

                    if (FullServiceAuction.BidderPrice == 0)

@@ -258,12 +261,16 @@
                    int seconds = AuctionItem.WorldSaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60);

                    m_TimeText.text = Language.Get("PMH_04", TimeUtility.SecondsToHMS(seconds));

                }

                else if (timeNow < extensionTime)

                else if (timeNow < extensionTime)//加时中

                {

                    if (!m_OverTime.gameObject.activeSelf)

                    {

                        m_OverTime.gameObject.SetActive(true);

                    }

                    m_TimeText.text = Language.Get("PMH_04", 0);

                    TimeSpan timeSpan2 = extensionTime - timeNow;

                    int timeSeconds = (int)timeSpan2.TotalSeconds;

                    DebugEx.LogError(Language.Get("PMH_04", TimeUtility.SecondsToHMS(timeSeconds)));

                    m_OverTime.text = Language.Get("PMH_18", TimeUtility.SecondsToHMS(timeSeconds));

                }

            }

        }


 System/Auction/MyAuctionCell.cs

@@ -25,6 +25,8 @@
        [SerializeField] TextEx m_JadeNumber;//当前价格

        [SerializeField] TextEx m_TimeText;//时间

        [SerializeField] TextEx m_Income;//收益



        [SerializeField] TextEx m_OverTime;//加时时间

        AuctionInquiryModel model { get { return ModelCenter.Instance.GetModel<AuctionInquiryModel>(); } }

        AuctionHelpModel auctionHelpModel { get { return ModelCenter.Instance.GetModel<AuctionHelpModel>(); } }

        ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }

@@ -146,6 +148,7 @@
            }



        }



        private void LateUpdate()

        {

            if (AuctionItem != null && MyAuction != null)

@@ -153,16 +156,31 @@
                var timeNow = TimeUtility.ServerNow;

                TimeSpan timeSpan = timeNow - MyAuction.Time;

                int minute = (int)timeSpan.TotalMinutes;



                DateTime extensionTime = MyAuction.TimeEnd.AddSeconds(auctionHelpModel.ExtensionTime);

                if (minute < AuctionItem.NoticeSaleMinutes)//预热中

                {

                    m_OverTime.gameObject.SetActive(false);

                    int seconds = AuctionItem.NoticeSaleMinutes * 60 - (int)timeSpan.TotalSeconds;

                    m_TimeText.text = Language.Get("PMH_03", TimeUtility.SecondsToHMS(seconds));

                }

                else if (minute >= AuctionItem.NoticeSaleMinutes && minute <= AuctionItem.FamilySaleMinutes)//拍卖中

                {

                    m_OverTime.gameObject.SetActive(false);

                    int seconds = AuctionItem.FamilySaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60);

                    m_TimeText.text = Language.Get("PMH_04", TimeUtility.SecondsToHMS(seconds));

                }

                else if (timeNow < extensionTime)//加时中

                {

                    if (!m_OverTime.gameObject.activeSelf)

                    {

                        m_OverTime.gameObject.SetActive(true);

                    }

                    m_TimeText.text = Language.Get("PMH_04", 0);

                    TimeSpan timeSpan2 = extensionTime - timeNow;

                    int timeSeconds = (int)timeSpan2.TotalSeconds;

                    m_OverTime.text = Language.Get("PMH_18", TimeUtility.SecondsToHMS(timeSeconds));

                }

            }

        }
    }

 System/Auction/MyFocusCell.cs

@@ -32,6 +32,7 @@
        [SerializeField] Button m_BiddingButton;//竞价按钮

        [SerializeField] ImageEx m_BiddingImage;

        [SerializeField] TextEx m_JadeNumber2;

        [SerializeField] TextEx m_OverTime;//加时时间

        AuctionInquiryModel model { get { return ModelCenter.Instance.GetModel<AuctionInquiryModel>(); } }

        AuctionHelpModel auctionHelpModel { get { return ModelCenter.Instance.GetModel<AuctionHelpModel>(); } }

        ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }

@@ -177,6 +178,7 @@


            });

        }



        private void LateUpdate()

        {

            if (AuctionItem != null && MyFocusItem != null)

@@ -184,8 +186,11 @@
                var timeNow = TimeUtility.ServerNow;

                TimeSpan timeSpan = timeNow - MyFocusItem.Time;

                int minute = (int)timeSpan.TotalMinutes;



                DateTime extensionTime = MyFocusItem.TimeEnd.AddSeconds(auctionHelpModel.ExtensionTime);

                if (minute < AuctionItem.NoticeSaleMinutes)//预热中

                {

                    m_OverTime.gameObject.SetActive(false);

                    if (m_PriceButton.interactable)

                    {

                        m_PriceButton.interactable = false;

@@ -201,6 +206,7 @@
                }

                else if (minute >= AuctionItem.NoticeSaleMinutes && minute <= AuctionItem.FamilySaleMinutes)//拍卖中

                {

                    m_OverTime.gameObject.SetActive(false);

                    var maxMoney = AuctionItem.BuyoutPrice * MyFocusItem.ItemCount;

                    var needMoney = 0;

                    if (MyFocusItem.BidderPrice == 0)

@@ -233,6 +239,17 @@
                    int seconds = AuctionItem.FamilySaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60);

                    m_TimeText.text = Language.Get("PMH_04", TimeUtility.SecondsToHMS(seconds));

                }

                else if (timeNow < extensionTime)//加时中

                {

                    if (!m_OverTime.gameObject.activeSelf)

                    {

                        m_OverTime.gameObject.SetActive(true);

                    }

                    m_TimeText.text = Language.Get("PMH_04", 0);

                    TimeSpan timeSpan2 = extensionTime - timeNow;

                    int timeSeconds = (int)timeSpan2.TotalSeconds;

                    m_OverTime.text = Language.Get("PMH_18", TimeUtility.SecondsToHMS(timeSeconds));

                }

            }

        }