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

client_Wu Xijin

2019-04-02 36477b1f3caabc60982d482886b57d214d6cc51d

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

 System/Auction/AuctionModel.cs

@@ -13,6 +13,7 @@
    public class AuctionModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk

    {

        Dictionary<string, AuctionItem> m_AuctionItems = new Dictionary<string, AuctionItem>();

        Dictionary<int, DateTime> m_FocusAuctionTimeDict = new Dictionary<int, DateTime>();



        List<string> m_ServerAuctionItemGuids = new List<string>();//全服拍品列表

        List<string> m_FairyAuctionItemGuids = new List<string>();// 拍卖行仙盟拍卖中的物品信息

@@ -29,12 +30,15 @@


        public bool isLocationQuery { get; set; }

        public string locationGuid { get; set; }

        public string locationMyFocusGuid { get; set; }

        public bool isServerPrepare { get; private set; }

        public bool isAuctionWindowOpen { get; set; }

        public bool isQueryFront { get; set; }

        public bool queryFowardAble { get; set; }

        public bool queryAfterwardAble { get; set; }

        public DateTime queryTime = DateTime.Now;

        public DateTime locationMyFocusTime = DateTime.Now;

        public bool alreadyQueryMyFocus { get; set; }



        int m_SelectClassifyId = 0;

        public int selectClassifyId

@@ -120,6 +124,7 @@
                m_ServerAuctionItemGuids.Clear();

                m_AuctionItems.Clear();

                m_FocusItems.Clear();

                m_FocusAuctionTimeDict.Clear();

            }

        }



@@ -246,6 +251,7 @@
            if (m_FocusItems.Count > 0)

            {

                item = m_FocusItems[0];

                m_FocusAuctionTimeDict[item.itemId] = DateTime.Now;

                return true;

            }

            return false;

@@ -526,6 +532,14 @@
                {

                    continue;

                }

                DateTime lastFocusTime;

                if (m_FocusAuctionTimeDict.TryGetValue((int)data.ItemID, out lastFocusTime))

                {

                    if ((DateTime.Now - lastFocusTime).TotalMinutes < 1)

                    {

                        continue;

                    }

                }

                var focusItem = new FocusAuctionItem()

                {

                    itemGuid = guid,

@@ -533,6 +547,7 @@
                };

                m_FocusItems.Add(focusItem);

            }



            if (onFocusAuctionRefresh != null)

            {

                onFocusAuctionRefresh();

@@ -579,6 +594,8 @@


        public void ReceivePackage(HB506_tagGCAttentionAuctionItemInfo package)//拍卖行关注中的拍品信息

        {

            bool existLocationAuction = false;



            m_MyFocusAuctionItemGuids.Clear();

            for (int i = 0; i < package.AuctionItemCount; i++)

            {

@@ -606,10 +623,22 @@
                {

                    m_MyFocusAuctionItemGuids.Add(guid);

                }



                if (guid.Equals(locationMyFocusGuid) &&

                    (DateTime.Now - locationMyFocusTime).TotalSeconds < 5)

                {

                    existLocationAuction = true;

                }

            }

            if (myFocusAuctionRefresh != null)

            {

                myFocusAuctionRefresh();

            }



            if (existLocationAuction)

            {

                alreadyQueryMyFocus = true;

                WindowCenter.Instance.Open<AuctionHouseWin>(true, 3);

            }

        }



@@ -862,6 +891,19 @@
                SendLocationServerItem(guid);

            }

        }



        public void LocationMyFocusItem(string guid)

        {

            locationMyFocusGuid = guid;

            locationMyFocusTime = DateTime.Now;

            AuctionItem item;

            if (TryGetMyFocusAuctionItem(guid, out item))

            {

                WindowCenter.Instance.Open<AuctionHouseWin>(true, 3);

                return;

            }

            AuctionInquiry.Instance.SendQueryAttentionAuctionItem();

        }

        #endregion



        public void SetDayRemind()


 System/Auction/MyFocusAuctionBehaviour.cs

@@ -98,7 +98,7 @@
            FocusAuctionItem item;

            if (model.TryGetFocusAuctionPop(out item))

            {

                model.LocationItemByGuid(item.itemGuid);

                model.LocationMyFocusItem(item.itemGuid);

            }

            OnClose();

        }

 System/Auction/MyFocusWin.cs

@@ -34,10 +34,22 @@

        protected override void OnPreOpen()
        {

            AuctionInquiry.Instance.SendQueryAttentionAuctionItem();//查询拍卖行的关注物品

            if (!model.alreadyQueryMyFocus)

            {

                AuctionInquiry.Instance.SendQueryAttentionAuctionItem();//查询拍卖行的关注物品

            }

            model.alreadyQueryMyFocus = false;



            GetMyFocusList();
            ListSotr();

            OnCreateGridLineCell(m_ScrollerController);

            var index = myFocusAuctionItems.IndexOf(model.locationMyFocusGuid);
            if (index != -1

                && (DateTime.Now - model.locationMyFocusTime).TotalSeconds < 5)

            {

                m_ScrollerController.JumpIndex(index);

            }
        }

        protected override void OnAfterOpen()
@@ -59,7 +71,9 @@
            model.auctionItemRefresh -= AuctionItemUpdate;//刷新

            model.fairyAuctionRefresh -= ResetUpdate;

            model.onFocusAuctionRefresh -= AddAuctionItemInfoUpdate;

            model.myBiddingAuctionRefresh -= ResetUpdate;
            model.myBiddingAuctionRefresh -= ResetUpdate;



            model.locationMyFocusGuid = string.Empty;
        }





@@ -74,11 +88,19 @@
            AuctionInquiry.Instance.SendQueryAttentionAuctionItem();//查询拍卖行的关注物品

            ResetUpdate();

        }



        private void ResetUpdate()

        {

            GetMyFocusList();
            ListSotr();

            OnCreateGridLineCell(m_ScrollerController);



            var index = myFocusAuctionItems.IndexOf(model.locationMyFocusGuid);
            if (index != -1

                && (DateTime.Now - model.locationMyFocusTime).TotalSeconds < 5)

            {

                m_ScrollerController.JumpIndex(index);

            }

        }



        private void AuctionItemUpdate()


 System/Realm/RealmPoolBehaviour.cs

@@ -56,6 +56,7 @@
        {

            var config = RealmConfig.Get(realmLevel);

            var progress = Mathf.Clamp01((float)model.totalExp / config.expLimit);

            progress *= 100;

            m_Progress.text = StringUtility.Contact(progress.ToString("0.#"), "%");

            DisplayWave();

            DisplayEffect();